diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2023-08-16 22:36:41 +0800 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2023-08-16 22:38:14 +0800 |
| commit | b50067c9497495bae7f2d408a4f9056778e2deb4 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | Revert "repo_name: rename to rap." (diff) | |
| download | heroxbd-b50067c9497495bae7f2d408a4f9056778e2deb4.tar.gz heroxbd-b50067c9497495bae7f2d408a4f9056778e2deb4.tar.bz2 heroxbd-b50067c9497495bae7f2d408a4f9056778e2deb4.zip | |
clear up outdated repository after 7 years.
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
690 files changed, 0 insertions, 77422 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 06b3677..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -cross-* -.pc diff --git a/app-benchmarks/nbench/ChangeLog b/app-benchmarks/nbench/ChangeLog deleted file mode 100644 index 0c12dc0..0000000 --- a/app-benchmarks/nbench/ChangeLog +++ /dev/null @@ -1,140 +0,0 @@ -# ChangeLog for app-benchmarks/nbench -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/ChangeLog,v 1.33 2010/09/30 21:23:29 ranger Exp $ - - 30 Sep 2010; Brent Baude <ranger@gentoo.org> nbench-2.2.3-r1.ebuild: - stable ppc64, bug 331147 - - 18 Sep 2010; Raúl Porcel <armin76@gentoo.org> nbench-2.2.3-r1.ebuild: - alpha/arm/sh/sparc stable wrt #331147 - - 16 Sep 2010; Raúl Porcel <armin76@gentoo.org> nbench-2.2.3.ebuild, - nbench-2.2.3-r1.ebuild: - Add ~arm - - 06 Aug 2010; Christian Faulhammer <fauli@gentoo.org> - nbench-2.2.3-r1.ebuild: - stable x86, bug 331147 - - 05 Aug 2010; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Stable for PPC (bug #331147). - - 05 Aug 2010; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Stable for HPPA (bug #331147). - - 04 Aug 2010; Markos Chandras <hwoarang@gentoo.org> nbench-2.2.3-r1.ebuild: - Stable on amd64 wrt bug #331147 - - 14 Dec 2009; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Space. - - 14 Dec 2009; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3-r1.ebuild: - Remove testing cruft. - -*nbench-2.2.3-r1 (14 Dec 2009) - - 14 Dec 2009; Jeroen Roovers <jer@gentoo.org> +nbench-2.2.3-r1.ebuild, - files/nbench-2.2.3-Makefile.patch: - Bump to hopefully fix missing pointer.h (bug #296860). - - 01 Apr 2009; Jeroen Roovers <jer@gentoo.org> -nbench-2.2.2.ebuild, - nbench-2.2.3.ebuild: - Remove old. Remove silly DEPEND. - - 01 Dec 2008; Brent Baude <ranger@gentoo.org> nbench-2.2.3.ebuild: - stable ppc64, bug 249105 - - 30 Nov 2008; Markus Meier <maekke@gentoo.org> nbench-2.2.3.ebuild: - amd64 stable, bug #249105 - - 29 Nov 2008; Raúl Porcel <armin76@gentoo.org> nbench-2.2.3.ebuild: - alpha/sparc/x86 stable wrt #249105 - - 29 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org> nbench-2.2.3.ebuild: - ppc stable, bug #249105 - - 28 Nov 2008; Jeroen Roovers <jer@gentoo.org> nbench-2.2.3.ebuild: - Stable for HPPA (bug #249105). - - 29 Oct 2008; Jeroen Roovers <jer@gentoo.org> -nbench-2.2.1.ebuild: - Remove old. - -*nbench-2.2.3 (29 Oct 2008) - - 29 Oct 2008; Jeroen Roovers <jer@gentoo.org> - +files/nbench-2.2.3-Makefile.patch, metadata.xml, +nbench-2.2.3.ebuild: - Pick up maintainership. Version bump. Patch Makefile to use toolchain CC - (bug #243520). - - 21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: - Transition to Manifest2. - - 06 Dec 2006; Alexander H. Færøy <eroyf@gentoo.org> nbench-2.2.2.ebuild: - Stable on MIPS. - - 08 Jul 2006; Markus Rothe <corsair@gentoo.org> nbench-2.2.2.ebuild: - Stable on ppc64 - - 15 Jun 2006; Brent Baude <ranger@gentoo.org> nbench-2.2.2.ebuild: - keywording nbench-2.2.2 ~ppc64 per solar's request; looks fine to me too - - 09 Sep 2005; Aron Griffis <agriffis@gentoo.org> nbench-2.2.2.ebuild: - Mark 2.2.2 stable on alpha - - 31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> nbench-2.2.2.ebuild: - ppc stable - - 20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> nbench-2.2.2.ebuild: - Stable on sparc - - 19 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> nbench-2.2.2.ebuild: - Stable on x86, amd64 and sh. - - 29 Mar 2005; Guy Martin <gmsoft@gentoo.org> nbench-2.2.2.ebuild: - Stable on hppa. - - 13 Mar 2005; Tavis Ormandy <taviso@gentoo.org> nbench-2.2.2.ebuild: - add ~alpha keyword - -*nbench-2.2.2 (30 Dec 2004) - - 30 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> +nbench-2.2.2.ebuild: - Version bumped. - - 18 Nov 2004; Daniel Goller <morfic@gentoo.org> nbench-2.2.1.ebuild: - Added support for LDFLAGS - -*nbench-2.2.1 (07 Nov 2004) - - 07 Nov 2004; Daniel Goller <morfic@gentoo.org> +metadata.xml, - +nbench-2.2.1.ebuild: - Moved from sys-apps/nbench to app-benchmarks/nbench. - - 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - nbench-2.2.1.ebuild: - Masked nbench-2.2.1.ebuild stable for ppc - - 30 Jun 2004; Aron Griffis <agriffis@gentoo.org> nbench-2.2.1.ebuild: - glibc -> libc - -*nbench-2.2.1 (15 Mar 2004) - - 15 Mar 2004; <matsuu@gentoo.org> nbench-2.2.1.ebuild: - Version bumped. Bugs #23209. - Removed dosed in src_compile. Bugs #44712. - - 24 Feb 2004; Lars Weiler <pylon@gentoo.org> nbench-2.1.ebuild: - Works on ppc. Masking ~ppc - - 24 Feb 2004; Sven Blumenstein <bazik@gentoo.org> nbench-2.1.ebuild: - Stable on sparc. - - 18 Jan 2004; <tuxus@gentoo.org> nbench-2.1.ebuild: - Added ~mips to KEYWORDS. - - 17 Oct 2003; Sven Blumenstein <bazik@gentoo.org> nbench-2.1.ebuild: - Added ~sparc keyword. - -*nbench-2.1 (30 Jan 2003) - 30 Jan 2003l Joshua Brindle <method@gentoo.org> nbench-2.1.ebuild : - Initial import. Ebuild submitted by MATSUU Takuto <matsuu@7501.net>. diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest deleted file mode 100644 index b85e14c..0000000 --- a/app-benchmarks/nbench/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX nbench-2.2.3-Makefile.patch 709 RMD160 068235291ba5af4f62f6417d574b4a9425731426 SHA1 abf395562b601cd4a023d285f14952cfade51a08 SHA256 b58a2e2213efa31d2a8683e315afb7d330830eaf73024c036092918e209d65de -DIST nbench-byte-2.2.3.tar.gz 111791 RMD160 a07d2a9f1a6162a5071602e89e6360c13521e463 SHA1 f2a03c56dc2bf26e478c2a1828debcafd83983ef SHA256 723dd073f80e9969639eb577d2af4b540fc29716b6eafdac488d8f5aed9101ac -EBUILD nbench-2.2.3-r1.ebuild 1095 RMD160 c292c2d578279b50b6966d56975579691c92c448 SHA1 3edd385899eb1c26578a0de9ab3ff74f4c794eaa SHA256 054c5188cf532625b1415963b12d37cf4e822c3b12ad0b8371691c20afdb2441 -MISC ChangeLog 4587 RMD160 988ccf4e071e7f6f6fd0b8db5baa6bfc87071601 SHA1 47ea1eb0afe8d5439667d28aa6a80c8e069cc7fd SHA256 aa0030c042e38f79b42faf9b327a813c697f43ce29db2ba3ddeaff1a533f9971 -MISC metadata.xml 252 RMD160 ed7e3d6637ec96975f17ce5c33628aa482dfd663 SHA1 ddd00321e20f4a53a140eeb56cb01b9fab24d657 SHA256 76fd24f00e95b2892ca60acdce02d8c85dfeff84fc89ca14ffdbc00b82de44b3 diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch deleted file mode 100644 index c41fd07..0000000 --- a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.org 2004-12-30 03:23:30.000000000 +0100 -+++ Makefile 2009-12-14 13:31:18.000000000 +0100 -@@ -19,10 +19,10 @@ - # You should leave -static in the CFLAGS so that your sysinfo can be - # compiled into the executable. - --CC = gcc -+#CC = gcc - - # generic options for gcc --CFLAGS = -s -static -Wall -O3 -+#CFLAGS = -s -static -Wall -O3 - - # if your gcc lets you do it, then try this one - #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops -@@ -126,7 +126,7 @@ - if [ "4" = `./pointer` ] ; then touch pointer.h ;\ - else echo "#define LONG64" >pointer.h ; fi - --misc.o: misc.h misc.c Makefile -+misc.o: misc.h misc.c pointer.h Makefile - $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ - -c misc.c - diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml deleted file mode 100644 index 6b29bc5..0000000 --- a/app-benchmarks/nbench/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>no-herd</herd> - <maintainer> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> -</pkgmetadata> diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild deleted file mode 100644 index d0c487a..0000000 --- a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild,v 1.10 2010/09/30 21:23:29 ranger Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs - -MY_P="${PN}-byte-${PV}" -DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark" -HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html" -SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz" - -LICENSE="freedist" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" - sed \ - -e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \ - -i sysinfo.sh || die "patching sysinfo.sh failed" - sed -e 's:inpath="NNET.DAT":inpath="/usr/share/nbench/NNET.DAT":' \ - -i nbench1.h || die "patching nbench1.h failed" -} - -src_compile() { - emake LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed" -} - -src_install() { - dobin nbench - insinto /usr/share/nbench - doins NNET.DAT - dodoc Changes README* bdoc.txt -} diff --git a/app-misc/pax-utils/ChangeLog b/app-misc/pax-utils/ChangeLog deleted file mode 100644 index 843c92b..0000000 --- a/app-misc/pax-utils/ChangeLog +++ /dev/null @@ -1,593 +0,0 @@ -# ChangeLog for app-misc/pax-utils -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/ChangeLog,v 1.145 2013/04/07 21:04:00 vapier Exp $ - -*pax-utils-0.7 (07 Apr 2013) - - 07 Apr 2013; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.7.ebuild: - Version bump. - -*pax-utils-0.6 (02 Jan 2013) - - 02 Jan 2013; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.6.ebuild, - metadata.xml: - Version bump. - -*pax-utils-0.5 (04 Nov 2012) - - 04 Nov 2012; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.5.ebuild: - Version bump. - - 10 Jul 2012; Brent Baude <ranger@gentoo.org> pax-utils-0.4.ebuild: - Marking pax-utils-0.4 ppc for bug 420919 - - 08 Jul 2012; Raúl Porcel <armin76@gentoo.org> pax-utils-0.4.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #420919 - - 22 Jun 2012; Brent Baude <ranger@gentoo.org> pax-utils-0.4.ebuild: - Marking pax-utils-0.4 ppc64 for bug 420919 - - 21 Jun 2012; Jeroen Roovers <jer@gentoo.org> pax-utils-0.4.ebuild: - Stable for HPPA (bug #420919). - - 20 Jun 2012; Markus Meier <maekke@gentoo.org> pax-utils-0.4.ebuild: - arm stable, bug #420919 - - 13 Jun 2012; Agostino Sarubbo <ago@gentoo.org> pax-utils-0.4.ebuild: - Stable for amd64, wrt bug #420919 - - 13 Jun 2012; Jeff Horelick <jdhore@gentoo.org> pax-utils-0.4.ebuild: - marked x86 per bug 420919 - -*pax-utils-0.4 (29 Apr 2012) - - 29 Apr 2012; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.4.ebuild: - Version bump. - - 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> pax-utils-0.3.0.ebuild: - keyword ~amd64-fbsd - - 07 Feb 2012; Mike Frysinger <vapier@gentoo.org> pax-utils-0.2.1.ebuild, - pax-utils-0.2.2.ebuild, pax-utils-0.2.3.ebuild, pax-utils-0.3.0.ebuild: - Clean up eclass inherits, and convert to unpacker for xz. - -*pax-utils-0.3.0 (24 Jan 2012) - - 24 Jan 2012; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.3.0.ebuild: - Version bump. - - 30 Dec 2011; Mark Loeser <halcy0n@gentoo.org> pax-utils-0.2.3.ebuild: - Stable for ppc64; bug #381625 - - 06 Nov 2011; Brent Baude <ranger@gentoo.org> pax-utils-0.2.3.ebuild: - Marking pax-utils-0.2.3 ppc for bug 381625 - - 30 Oct 2011; Raúl Porcel <armin76@gentoo.org> pax-utils-0.2.3.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #381625 - - 20 Oct 2011; Jeroen Roovers <jer@gentoo.org> pax-utils-0.2.3.ebuild: - Stable for HPPA (bug #381625). - - 09 Oct 2011; Markus Meier <maekke@gentoo.org> pax-utils-0.2.3.ebuild: - arm stable, bug #381625 - - 09 Oct 2011; Markos Chandras <hwoarang@gentoo.org> pax-utils-0.2.3.ebuild: - Stable on amd64 wrt bug #381625 - - 08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> pax-utils-0.2.3.ebuild: - x86 stable wrt bug #381625 - -*pax-utils-0.2.3 (03 Mar 2011) - - 03 Mar 2011; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.2.3.ebuild: - Version bump. - - 03 Mar 2011; Mike Frysinger <vapier@gentoo.org> pax-utils-0.2.2.ebuild: - Stabilize for all. - -*pax-utils-0.2.2 (08 Dec 2010) - - 08 Dec 2010; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.2.2.ebuild: - Version bump. - - 08 Dec 2010; Mike Frysinger <vapier@gentoo.org> pax-utils-0.2.1.ebuild: - Mark ppc64 stable #332811. - - 29 Aug 2010; Raúl Porcel <armin76@gentoo.org> pax-utils-0.2.1.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #332811 - - 18 Aug 2010; Markus Meier <maekke@gentoo.org> pax-utils-0.2.1.ebuild: - arm stable, bug #332811 - - 18 Aug 2010; Jeroen Roovers <jer@gentoo.org> pax-utils-0.2.1.ebuild: - Stable for HPPA PPC (bug #332811). - - 17 Aug 2010; Markos Chandras <hwoarang@gentoo.org> pax-utils-0.2.1.ebuild: - Stable on amd64 wrt bug #332811 - - 15 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> - pax-utils-0.2.1.ebuild: - x86 stable wrt bug #332811 - -*pax-utils-0.2.1 (14 Feb 2010) - - 14 Feb 2010; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.2.1.ebuild: - Fix garbage in symbol matching output. - -*pax-utils-0.2 (15 Jan 2010) - - 15 Jan 2010; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.2.ebuild: - Version bump. - - 15 Mar 2009; Patrick Lauer <patrick@gentoo.org> Manifest: - Manifest fix - - 29 Jan 2009; Javier Villavicencio <the_paya@gentoo.org> - pax-utils-0.1.19.ebuild: - Rekeyword ~sparc/x86-fbsd. strndup(3) is now backported on - freebsd-lib-7.1-r1. - - 05 Jan 2009; Jose Luis Rivero <yoswink@gentoo.org> - pax-utils-0.1.19.ebuild: - Stable on alpha wrt #253124 - - 03 Jan 2009; Jeroen Roovers <jer@gentoo.org> pax-utils-0.1.19.ebuild: - Stable for HPPA (bug #253124). - - 02 Jan 2009; <solar@gentoo.org> pax-utils-0.1.19.ebuild: - arm,x86,ia64,ppc32 stable - - 31 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> - pax-utils-0.1.19.ebuild: - Stable on sparc, bug #253124 - - 31 Dec 2008; Jeremy Olexa <darkside@gentoo.org> pax-utils-0.1.19.ebuild: - amd64 stable, bug 253124 - - 30 Dec 2008; Brent Baude <ranger@gentoo.org> pax-utils-0.1.19.ebuild: - stable ppc64, bug 253124 - - 09 Dec 2008; Alexis Ballier <aballier@gentoo.org> pax-utils-0.1.18.ebuild, - pax-utils-0.1.19.ebuild: - Keyword -sparc/x86-fbsd versions that dont build on bsd, bug #250359 and - bug #246439 - -*pax-utils-0.1.19 (27 Nov 2008) - - 27 Nov 2008; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.1.19.ebuild: - Version bump. - -*pax-utils-0.1.18 (09 Nov 2008) - - 09 Nov 2008; <solar@gentoo.org> +pax-utils-0.1.18.ebuild: - - version bump - - 25 Apr 2008; <ricmm@gentoo.org> pax-utils-0.1.15.ebuild: - Drop to ~mips due to unstable deps - - 14 Mar 2008; <solar@gentoo.org> pax-utils-0.1.15.ebuild, - pax-utils-0.1.16.ebuild, pax-utils-0.1.17.ebuild: - - tidy up to keep current repoman happy and propagate bug fixes to older - ebuilds - - 14 Mar 2008; <solar@gentoo.org> pax-utils-0.1.17.ebuild: - - make sure CC= is quoted.. distcc can cause problems. Bug 213308 - - 14 Mar 2008; Jeroen Roovers <jer@gentoo.org> pax-utils-0.1.17.ebuild: - Stable for HPPA (bug #212499). - - 11 Mar 2008; Brent Baude <ranger@gentoo.org> pax-utils-0.1.17.ebuild: - stable ppc64, bug 212499 - - 09 Mar 2008; <solar@gentoo.org> pax-utils-0.1.17.ebuild: - - stable on amd64 - - 09 Mar 2008; nixnut <nixnut@gentoo.org> pax-utils-0.1.17.ebuild: - Stable on ppc wrt bug 212499 - - 06 Mar 2008; Raúl Porcel <armin76@gentoo.org> pax-utils-0.1.17.ebuild: - alpha/ia64/sparc/x86 stable - -*pax-utils-0.1.17 (17 Jan 2008) - - 17 Jan 2008; <solar@gentoo.org> +pax-utils-0.1.17.ebuild: - - Mainly a maintenance release. endianness fix. minor new features and - updated docs - - 14 Oct 2007; <solar@gentoo.org> pax-utils-0.1.16.ebuild: - - amd64/hppa/ppc/ppc64 stable - - 26 Sep 2007; Raúl Porcel <armin76@gentoo.org> pax-utils-0.1.16.ebuild: - alpha/ia64/sparc/x86 stable - -*pax-utils-0.1.16 (24 Aug 2007) - - 24 Aug 2007; <solar@gentoo.org> -pax-utils-0.1.13.ebuild, - -pax-utils-0.1.14.ebuild, +pax-utils-0.1.16.ebuild: - - Version bump. man pages moved over to docbook. New: endian and perm - displays.. New: when -Tv are used together the disasm will be displayed of - the offending text rel. The pax-utils code should compile out of the box on - solaris now. Lots of misc fixes.. to many to list.. - - 01 Mar 2007; <genstef@gentoo.org> pax-utils-0.1.13.ebuild, - pax-utils-0.1.14.ebuild, pax-utils-0.1.15.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 03 Feb 2007; Bryan Østergaard <kloeri@gentoo.org> - pax-utils-0.1.15.ebuild: - Stable on Alpha, bug 163453. - - 02 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> - pax-utils-0.1.15.ebuild: - Stable on MIPS; bug #163453 - - 31 Jan 2007; Markus Rothe <corsair@gentoo.org> pax-utils-0.1.15.ebuild: - Stable on ppc64; bug #163453 - - 30 Jan 2007; Steve Dibb <beandog@gentoo.org> pax-utils-0.1.15.ebuild: - amd64 stable, bug 163453 - - 25 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> - pax-utils-0.1.15.ebuild: - Stable on sparc wrt #163453 - - 24 Jan 2007; Jeroen Roovers <jer@gentoo.org> pax-utils-0.1.15.ebuild: - Stable for HPPA (bug #163453). - - 23 Jan 2007; Raúl Porcel <armin76@gentoo.org> pax-utils-0.1.15.ebuild: - x86 stable wrt bug 163453 - - 23 Jan 2007; nixnut <nixnut@gentoo.org> pax-utils-0.1.15.ebuild: - Stable on ppc wrt bug 163453 - -*pax-utils-0.1.15 (13 Dec 2006) - - 13 Dec 2006; <solar@gentoo.org> +pax-utils-0.1.15.ebuild: - Removed *macho* from release files. Lots of minor whitespace and style - updates. List known pkg maintainers for other distributions that carry the - pax-utils. - - scanelf: Improved return values of many functions to be ints vs voids. - Support added for displaying em_machine via %a format flag. Make - scanelf_file_bind() not output anything if quiet mode and the ELF is static - or not setuid. - - pspax: Support added for -u,--user <user/uid> Support added for -g,--group - <group/gid> - - 17 Oct 2006; Roy Marples <uberlord@gentoo.org> pax-utils-0.1.14.ebuild: - Added ~sparc-fbsd keyword. - -*pax-utils-0.1.14 (23 Sep 2006) - - 23 Sep 2006; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.1.14.ebuild: - Add support for NetBSD, add --user/--group options to pspax, and fix QA - envvar handling of .o objects. - - 07 Jun 2006; Jeroen Roovers <jer@gentoo.org> pax-utils-0.1.13.ebuild: - Stable on hppa (bug #135427). - - 06 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> - pax-utils-0.1.13.ebuild: - Stable on sparc wrt #135427 - - 05 Jun 2006; Simon Stelling <blubb@gentoo.org> pax-utils-0.1.13.ebuild: - stable on amd64 - - 04 Jun 2006; Torsten Veller <tove@gentoo.org> pax-utils-0.1.13.ebuild: - Stable on x86 (#135427). - - 04 Jun 2006; Fernando J. Pereda <ferdy@gentoo.org> - pax-utils-0.1.13.ebuild: - Stable on alpha. Thanks to Mike Hlavac <mike@flyingpenguins.org> for - testing. Bug #135427 - - 04 Jun 2006; Markus Rothe <corsair@gentoo.org> pax-utils-0.1.13.ebuild: - Stable on ppc64; bug #135427 - - 03 Jun 2006; <nixnut@gentoo.org> pax-utils-0.1.13.ebuild: - Stable on ppc; bug #135427 - - 03 Jun 2006; <solar@gentoo.org> pax-utils-0.1.13.ebuild: - - stable on arm - -*pax-utils-0.1.13 (17 May 2006) - - 17 May 2006; <solar@gentoo.org> +pax-utils-0.1.13.ebuild: - Improved Makefile handling. (vapier) QA_TEXTREL/QA_EXECSTACK/QA_WX_LOAD exempt - filtering flags. (kevquinn) Handle versioned symbols correctly on unstripped - ELF files when using the -s flag. Do not assume it is ok to read from stdin if - the -l -p flags were given. (solar) - -*pax-utils-0.1.12 (30 Apr 2006) - - 30 Apr 2006; <solar@gentoo.org> -files/pax-utils-0.1.10.patch, - -pax-utils-0.1.10.ebuild, pax-utils-0.1.11-r1.ebuild, - +pax-utils-0.1.12.ebuild, -pax-utils-0.1.9.ebuild: - - new pspax -n/-w flags. new -L handling for the BSD arches. uses ld.so.hints - vs ld.so.cache (thanks flameeyes). tty null term handling should be fixed - - 24 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> - pax-utils-0.1.11-r1.ebuild: - Stable on sparc - - 23 Apr 2006; Michael Hanselmann <hansmi@gentoo.org> - pax-utils-0.1.11-r1.ebuild: - Stable on ppc. - - 22 Apr 2006; Markus Rothe <corsair@gentoo.org> pax-utils-0.1.11-r1.ebuild: - Stable on ppc64 - - 22 Apr 2006; <solar@gentoo.org> pax-utils-0.1.11-r1.ebuild: - - stable on amd64 arm mips x86 - - 16 Apr 2006; Bryan Østergaard <kloeri@gentoo.org - pax-utils-0.1.11-r1.ebuild: - Stable on alpha. - -*pax-utils-0.1.11-r1 (12 Apr 2006) - - 12 Apr 2006; Mike Frysinger <vapier@gentoo.org> - +files/pax-utils-0.1.11.patch, +pax-utils-0.1.11-r1.ebuild: - Fix scanelf hang due to grep-style changes with stdin #128247 by Matteo Azzali. - -*pax-utils-0.1.11 (30 Mar 2006) - - 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> - +pax-utils-0.1.11.ebuild: - New release working on FreeBSD and marked ~x86-fbsd. - - 23 Mar 2006; Luis Medinas <metalgod@gentoo.org> pax-utils-0.1.10.ebuild: - Stable on amd64. Bug #124699. - - 11 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> - pax-utils-0.1.10.ebuild: - Stable on ppc. - - 10 Mar 2006; Torsten Veller <tove@gentoo.org> pax-utils-0.1.10.ebuild: - Stable on x86 (#124699) - - 09 Mar 2006; Aron Griffis <agriffis@gentoo.org> pax-utils-0.1.10.ebuild: - Mark 0.1.10 stable on ia64 - - 08 Mar 2006; Jeroen Roovers <jer@gentoo.org> pax-utils-0.1.10.ebuild: - Stable on hppa (bug #124699). - - 08 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> - pax-utils-0.1.10.ebuild: - Stable on sparc wrt #124699 - - 08 Mar 2006; Markus Rothe <corsair@gentoo.org> pax-utils-0.1.10.ebuild: - Stable on ppc64; bug #124699 - - 22 Feb 2006; <solar@gentoo.org> +files/pax-utils-0.1.10.patch, - pax-utils-0.1.10.ebuild: - - Using the flags -Xe on ppc and probably others would lead to the PT_LOAD - executable bits being stripped (very bad thing). glob64->glob touchup for - the BSD guys - -*pax-utils-0.1.10 (18 Feb 2006) - - 18 Feb 2006; <solar@gentoo.org> -files/pax-utils-0.1.8-etrel-notwx.patch, - -files/pax-utils-0.1.8-paxelf-fd-mmap.patch, +pax-utils-0.1.10.ebuild, - -pax-utils-0.1.4.ebuild, -pax-utils-0.1.8-r1.ebuild, - -pax-utils-0.1.8.ebuild, pax-utils-0.1.9.ebuild: - - added -k/--section %k modifier to detect elf a given section exists. added - -z to unifiy paxctl/chpax handling into a single util. change max pt loads to - 2 for netbsd. The -E option now takes strings. The -l option now reads - ld.so.conf include files. cleaned up old ebuilds. mips 0.1.9 marked stable - checked by kumba - - 08 Feb 2006; Saleem Abdulrasool <compnerd@gentoo.org> - pax-utils-0.1.9.ebuild: - stable on x86 as per bug #121777 - - 07 Feb 2006; Patrick McLean <chutzpah@gentoo.org> pax-utils-0.1.9.ebuild: - Stable on amd64 (bug 121777). - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> pax-utils-0.1.9.ebuild: - Mark 0.1.9 stable on alpha - - 06 Feb 2006; Aron Griffis <agriffis@gentoo.org> pax-utils-0.1.9.ebuild: - Mark 0.1.9 stable on ia64 - - 06 Feb 2006; <nixnut@gentoo.org> pax-utils-0.1.9.ebuild: - Stable on ppc. bug 121777 - - 06 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> - pax-utils-0.1.9.ebuild: - Stable on sparc wrt #121777 - - 06 Feb 2006; Markus Rothe <corsair@gentoo.org> pax-utils-0.1.9.ebuild: - Stable on ppc64: bug #121777 - -*pax-utils-0.1.9 (05 Feb 2006) - - 05 Feb 2006; <solar@gentoo.org> +pax-utils-0.1.9.ebuild: - - version bump. Adds new features. -M bits -E types - - 02 Feb 2006; <solar@gentoo.org> +files/pax-utils-0.1.8-etrel-notwx.patch, - pax-utils-0.1.8-r1.ebuild: - - ET_REL objects were being falsely reported as !WX - -*pax-utils-0.1.8-r1 (29 Jan 2006) - - 29 Jan 2006; <solar@gentoo.org> +files/pax-utils-0.1.8-paxelf-fd-mmap.patch, - +pax-utils-0.1.8-r1.ebuild: - - bugfix. dont report false positives in quiet mode - -*pax-utils-0.1.8 (28 Jan 2006) - - 28 Jan 2006; <solar@gentoo.org> -files/scanelf-null-rpath.patch, - pax-utils-0.1.4.ebuild, -pax-utils-0.1.5.ebuild, -pax-utils-0.1.6.ebuild, - -pax-utils-0.1.7-r1.ebuild, +pax-utils-0.1.8.ebuild: - - New -A option to scan *.a archives. Better handling of invalid elf files. - -*pax-utils-0.1.7-r1 (18 Jan 2006) - - 18 Jan 2006; <solar@gentoo.org> +files/scanelf-null-rpath.patch, - -pax-utils-0.1.7.ebuild, +pax-utils-0.1.7-r1.ebuild: - - bugfix: dont write to memory when NULL rpaths exists and not using - -X/--fix in scanelf - -*pax-utils-0.1.7 (12 Jan 2006) - - 12 Jan 2006; <solar@gentoo.org> +pax-utils-0.1.7.ebuild: - - new -X/--fix option to attempt to fix faulty RPATHs etc. Updated tristate - pax handling. Adds support for obsd. Misc cleanups and improvements - - 31 Dec 2005; Fabian Groffen <grobian@gentoo.org> pax-utils-0.1.6.ebuild: - Marked ~ppc-macos on request of vapier. The tools really work on ELF files, - but their use on Darwin is questionable. - -*pax-utils-0.1.6 (29 Dec 2005) - - 29 Dec 2005; <solar@gentoo.org> -pax-utils-0.1.3.ebuild, - +pax-utils-0.1.6.ebuild: - - fixup for silly NetBSD stdout handling. updates for arches lacking proper - header defines. New -L option to resolve DT_NEEDED cache paths - -*pax-utils-0.1.5 (08 Dec 2005) - - 08 Dec 2005; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.1.5.ebuild: - Have dumpelf show .comment/.interp sections, properly set shdr/phdr to NULL - when an ELF lacks them, fix #e usage, and add support for parsing - .note.GNU-stack in object files. - - 05 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> - pax-utils-0.1.4.ebuild: - Stable on sparc - - 04 Dec 2005; <solar@gentoo.org> pax-utils-0.1.4.ebuild: - - stable on x86 - -*pax-utils-0.1.4 (30 Oct 2005) - - 30 Oct 2005; <solar@gentoo.org> +pax-utils-0.1.4.ebuild: - - version bump. This release adds 3 scanelf options. -S, -b, -g - - 28 Oct 2005; <solar@gentoo.org> pax-utils-0.1.3.ebuild: - - #103173 pax-utils installs docs into /usr/share/doc - -*pax-utils-0.1.3 (25 Jul 2005) - - 25 Jul 2005; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.1.3.ebuild: - Fix building with gcc-2, dont bomb with alignment errors on some arches, and - add support for SONAME scanning in scanelf. - -*pax-utils-0.1.2 (03 Jul 2005) - - 03 Jul 2005; <solar@gentoo.org> +pax-utils-0.1.2.ebuild: - - update textrel handling code to scan only the text segment. New -e -v -p - flags for pspax. minor changes overall - - 16 Jun 2005; <solar@gentoo.org> pax-utils-0.1.1.ebuild: - - arm/m68k/ppc64/s390/sh stable - - 16 Jun 2005; <solar@gentoo.org> -pax-utils-0.0.4.ebuild, - -pax-utils-0.0.7.ebuild, -pax-utils-0.1.0.ebuild, pax-utils-0.1.1.ebuild: - - stable on alpha/hppa/ia64/sparc - -*pax-utils-0.1.1 (16 Jun 2005) - - 16 Jun 2005; <solar@gentoo.org> pax-utils-0.1.1.ebuild: - - stable on x86/ppc/mips/amd64 - - 10 Jun 2005; <solar@gentoo.org> : - - Bugfixes: only report the source of textrels when the executable actually - contains DT_TEXTREL. Only enable -Wdeclaration-after-statement -Wextra if the - compiler supports it - -*pax-utils-0.1.0 (08 Jun 2005) - - 08 Jun 2005; <solar@gentoo.org> -pax-utils-0.0.8.ebuild, - -pax-utils-0.0.9.ebuild, +pax-utils-0.1.0.ebuild: - * scanelf options: -N matches a given lib. -T will print the cause of - the ELF text relocation (-T based on code from Kevin Quinn.. 10x thanks) - -F format modifiers were added for printing the base file name and base - file name with search paths removed, this is ideal for scripting with - use of automated q/a systems so we don't have to re-parse a the string - to get desired output. All format modifiers now accept # in place of % - but # is quiet where % is verbose. Also new to the format handling is - the %x modifier now prints PT_PAX_FLAGS and falls back to EI_PAX if no - PaX flags were found in the program header. - - * The suite should work on OSX. - * Minor touch ups to Makefile/pspax/dumpelf. - * Lots of typecasting fixes for improved portability. - - 05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> - pax-utils-0.0.7.ebuild: - Stable on ppc. - - 31 May 2005; Christian Birchinger <joker@gentoo.org> - pax-utils-0.0.7.ebuild: - Added sparc stable keyword - -*pax-utils-0.0.9 (28 May 2005) - - 28 May 2005; Mike Frysinger <vapier@gentoo.org> +pax-utils-0.0.9.ebuild: - Add support for FreeBSD and fix cross-endian bugs. - - 21 May 2005; <solar@gentoo.org> : - Makefile: include/depend fix. dumpelf: display improvements, 32/64bit phdr - fix, man page updates. scanelf: Two new options. The ability to display run - time bindings -b/--bind and -f/--from read input stream from a filename/stdin - for scanelf. The -F format handling pretty much got a total rewrite for the - better. We used taviso@gentoo fuzz regression tool to help track down bugs - with malformed executables. Now the overall result is greatly improved error - handling for improper elf files. paxelf: Improvements in the mmap error - handling. README: updates to reflect changes man/*.1: updates to reflect - changes - - 15 May 2005; <solar@gentoo.org> metadata.xml: - - update metadata.xml - -*pax-utils-0.0.2 (15 May 2005) - - 15 May 2005; <solar@gentoo.org> -pax-utils-0.0.1.ebuild, - -pax-utils-0.0.2.ebuild, pax-utils-0.0.4.ebuild, -pax-utils-0.0.5.ebuild, - -pax-utils-0.0.6.ebuild, pax-utils-0.0.7.ebuild: - - stable x86 - make all ebuild use toolchain-funcs vs gcc eclass - cleaned non - stabilized versions below 0.0.7 - -*pax-utils-0.0.7 (30 Apr 2005) - - 30 Apr 2005; <solar@gentoo.org> +pax-utils-0.0.7.ebuild: - - uclibc updates and -F format handling - - 21 Apr 2005; Simon Stelling <blubb@gentoo.org> pax-utils-0.0.4.ebuild: - stable on amd64 - -*pax-utils-0.0.6 (14 Apr 2005) - - 14 Apr 2005; <solar@gentoo.org> +pax-utils-0.0.6.ebuild: - - version bump. lots of new treats - - 12 Apr 2005; Daniel Ostrow <dostrow@gentoo.org> pax-utils-0.0.4.ebuild, - pax-utils-0.0.5.ebuild: - ~ppc64 for ppc64 hardened - - 09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> - pax-utils-0.0.4.ebuild: - Stable on ppc. - -*pax-utils-0.0.5 (01 Apr 2005) - - 01 Apr 2005; <solar@gentoo.org> +pax-utils-0.0.5.ebuild: - - major source code cleanup. combine scanexec/scanrexec/pttool into unified - scanelf tool. manpage updates. fixed memleak in readelf function. new options - to detect TEXTREL's, display RPATH info, make display of pax flags markings - optional. A new recursive option was added to scan subdirs. All sorts of good - stuff that makes grandma happy. Many thanks to vapier. - - 31 Mar 2005; Aron Griffis <agriffis@gentoo.org> pax-utils-0.0.4.ebuild: - stable on ia64 - - 12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> pax-utils-0.0.4.ebuild: - Stable on sparc - -*pax-utils-0.0.4 (11 Nov 2004) - - 11 Nov 2004; <solar@gentoo.org> +metadata.xml, pax-utils-0.0.4.ebuild: - marking pax-utils stable on x86/mips diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest deleted file mode 100644 index 3950a27..0000000 --- a/app-misc/pax-utils/Manifest +++ /dev/null @@ -1,19 +0,0 @@ -AUX pax-utils-0.7-lddtree-prefix.patch 1012 SHA256 d63786c4a96bab9596e18cef76c781112652e756df59eb649b3ac0ce979e768f SHA512 a0f3609150e2bf330030eaf44a7dc6af20e1be7eb3f6737d9943677cec2c7743e120f6d84ade6b82c0fa5590ed435a808205a7b6bb3026cfb56c1fe168bdcae2 WHIRLPOOL 64159e5b2f385f9746e80ca50ae733b838495d342bd3d313fe1e96f920dc45c43b431beecf6f178989fc83cac5b476d7654b634d93d6f12c05b5ea5d40427980 -DIST pax-utils-0.2.1.tar.bz2 80580 SHA256 6a5beefb686e425eb6829bc716d2b32b64c2e854287c212c9853bc2beb705c3a SHA512 a8c18a4538227e0a9d34d9e6e6f4c99f50de376b876032092175a7a277d8f5982495ebb28542fddc7361b649e30528a775817749be0c13bd24244bf3c80a57dc WHIRLPOOL 4a77d3ea435a9905a93f0bfc2f1ee33fc709ef7d71e48c44b1b33277ccbd34d586f404c3f7004450612a68f7d4b9810d1cb98c1f255e9d8e0e87fa6fe157eccc -DIST pax-utils-0.2.2.tar.bz2 80999 SHA256 eac86abe7871ee12452d221c1e7c21acb9ba78ba2cba1daa587d3c93c77acd07 SHA512 ed1e2e80fd9a3a24bf520b01f6ab3dc63d3aa48915cd896ca9c98c443ca80a06b7ef00aefee52e770f3fd211257989624b4fcd0b96c6a6cb2f13f9d0fe7a8d84 WHIRLPOOL e1281fc0265e159d4a8085220ed239572f1dea3d269cc4e3f5bba06b0cac7a3091e44924137bf75acc38f999caf16893f978516f3ea4c99caf58f91e5336304d -DIST pax-utils-0.2.3.tar.xz 76652 SHA256 b2cdc20a0c67b78753ff4c4cbaa84b8175b0e2eb926de7390daef34a19297285 SHA512 98ad1410eaf42fd1a279523f73b89166d57e630e0e402343b48b32913c62017eec19aefdc92327a32ef27273d360defbefc9c8b9607747db22224643c03a901a WHIRLPOOL b26569ffe566d12c7097e9fd07b3f9335aaa2a9640c28a3178f28dedd5fcb2305e507f6c34902183d3a6612efe212e5314d3fc89f0d0f8ff59f6568c8245668f -DIST pax-utils-0.3.0.tar.xz 79892 SHA256 d6d2992a40d89ab02d39a90d3c88ef553ecf1c9b93bae82efe16453b9152696a SHA512 0192c95d210a348e1aaec5b7cce14978447e5fb3c5da234e0244b78db096a04bc53d07b457839c16b6a98cadcae6bb3d9e8bb1e807d920c92c271184f1b03a0d WHIRLPOOL 9c5be4c94b1d619c6f8ee6ec039957765226867a0faefc18b689b61a2874b27a42e13c7572dd4b467948eefbd4d5fd1c9be0788d3f53310045e703ea362efddc -DIST pax-utils-0.4.tar.xz 80300 SHA256 2a19285f5793fa30a6540ae67511cd5dabd543cc11130dd2eb741edfd2fc1e7f SHA512 3b9242805a042dc6bf53bfa8355f5f157425a944c49a780ae131642484463aa63cf62959075215cb9dde02b15cdab2210e7ad4f4498dad8218ada9459dbd3be8 WHIRLPOOL e33b91df453d52cbb95ad51bffc307cf5c450ba006a9671217818da870131255529452f3fd4c8644fb09ad28a1faa5f8fd5461e4f1c48349d44233eb502bc53d -DIST pax-utils-0.5.tar.xz 80672 SHA256 1ba4f5e8680449c18841db2397aca320527fb06628b4ad9212e42f5e01de833b SHA512 6831d2495298c16f3eddc1fe2af5864775acbdd9feac17d8660b1a4e807acdb9c121ae667cf2476887e776cae39334ea4f93d2e5f46c8c739d3044db8cfd9248 WHIRLPOOL 73bf1a1875c465afbf3418d286cc7d42b18eb5560f0a941ab7be0745a640fce0fdb1a084ac9dabedf2a1833b9282a9256c1b08b8c9242b69e211f15d3e45ce55 -DIST pax-utils-0.6.tar.xz 87548 SHA256 1ffd4bf7bf3f8bb404007dd1617edfb0297e4c65a2c1153712e4a76875038784 SHA512 1d13659f647cf1f6301fda124cf7092c8e40e3772b4dae9f19f66329c40239f5ee07730c14538bdbfaa65e890515e0468476c8a88850f6d24ea2268a9fdb4193 WHIRLPOOL b889d61f8dbaf2ac06ca532ca381d375d0cef5d8c6fae763fa2c8e12cffa9244e637f90de29cb3ce024a15da143a388499be9654d1a3b9c93c408f4e93e3bc78 -DIST pax-utils-0.7.tar.xz 90188 SHA256 1ac4cee9a9ca97a723505eb29a25e50adeccffba3f0f0ef4f035cf082caf3b84 SHA512 d99f325b1d3ffc4955bc09aedcbeabea2d87a9647da31db1518de9daa55fbe0e5dd09feedd8dbcd8c4b53825a788ae7c9b904a927abc9ae995385dfd00d44f4a WHIRLPOOL dac9bb6c4e9bbf2b374371009ec16e9bf0e7a69e33494511f99e1cf2c34f684638fa8069a9f3845b8b91edea2927f18f410b9c6e62718c376b96c11d92c84634 -EBUILD pax-utils-0.2.1.ebuild 983 SHA256 0120fb70ada52e004a12b287636913c9a4e836665fd4ed8bcd287b44b02e37ad SHA512 2ad58daa4765c8cfd978148a95b86f39ac37b7e41b6f560645e6e27e1ff6697febd106ad7497d3c14023fab8c5f2d3568925584e1099aa00d683bad92dcc0f32 WHIRLPOOL 4c71189d17f24be64345084afbbb00b2aa50f135b49eddaa1e2443c3c9eca953d97ea660f50ee7d1420739798b82b0acc054536de36cf36261061c36075cab0f -EBUILD pax-utils-0.2.2.ebuild 983 SHA256 d9d9b829cf420b27c0c971b1be54e279311cdcbea4eed4cc3dd1a6d32e4dfb3e SHA512 5f9b41428c51d4600b670e87dabe80c59c089af7216f36c3bcc7f9ef83a26b5636ed881d446ba953fd19b786ec56d1b9f4a35f6322c187732a4376963ce4018f WHIRLPOOL 0b4a0bf4ccee731d7f4f4500f2134aaa110f010b0b96aef8f06f9f14249cd1cb7d68d9a1cf72cfb707103b761573db2a71e0f641047c885a75ab6f3c529fd562 -EBUILD pax-utils-0.2.3.ebuild 977 SHA256 87a5405c1a37f269946aa3d2d9517b3b9375719d6775d961cf1e87faff21e10b SHA512 8c1d07d2e267ead3547864111a7633404a87fcd0bc6fe970c3bb984d4cff696971575b1e55e775510093ca45515fbf0e0377c37e8852317f3cc841da2a983652 WHIRLPOOL 887f6b0a78269e81f3162b11c00caeb57e0ab3a6c2bbc2a9318d455ddaa57f707f81fcb458cb900a6fa3a11736edc7baf54a15479faebf336362ce94feddf5e1 -EBUILD pax-utils-0.3.0.ebuild 1003 SHA256 a01efed75963ba64a34d8ff5f24579d4b795a02c577e95049cdcc530b643e6bb SHA512 74807af9e9485bb0e80e56a71b6f470af263110d654325b0c3753abbbd7f7b6daad4559a8374e376575ec7aaf6261b574cd9c5f978823fee07461b49aef5f85d WHIRLPOOL 07fa8f4c6329dfe2047d1bfae47322c941f043bf6574636ed60ed038a31f490a196af85208781944a852714a8db5a8a8871a6f74730b6812c128cd787c5f1fb7 -EBUILD pax-utils-0.4.ebuild 1000 SHA256 ce563e198d9d156427e5ebb4ce29a47dc74e8cfa0c9a1a4b0d97f787e95956de SHA512 156656be75428b727209485d03858bf5cb39191cb8e4f131a6cb9d17d9061c29ce0468399fe6a73cfb3e8009286d345e30dc32f5630d99f9a82ced6add2f870e WHIRLPOOL bebb31433c990c92cf610465134970e1cc474fff3f79bd6fd0b162c1f6e6afb125e2778cfcef0cc2e9863a84c074c59fad4bf4b1f2b12fd16e7c031506af97b5 -EBUILD pax-utils-0.5.ebuild 1012 SHA256 bd95b78d38e17b2375c24d9c72c94c1af7918fdd4306dde60bdf818409c77b4d SHA512 1f91417ce636700c207f015d375b746eb008b74bcc2352d9e76f3fd1608feb4323eb2378fd3c6bcfa36c7f2a63cd32eac97163b5ea1ac203a3ffdbb8c61cadff WHIRLPOOL aeb122f82f107053baaf4e8f3a5c997f04bdfede57c015b3249ecdcb510a38fd8d4d00f0e3cd2fa7ae567719f80c164eb6d5eeb4ab6e9908899464cbcb956ad2 -EBUILD pax-utils-0.6.ebuild 1113 SHA256 790adc6a96e8795eebe2c0b1cb50ed984bf886b7b8c4b008d5e98da161f4cc1f SHA512 e9d025a44a1fcc1fdc06ca97c5c9701d2e66c82ce0b3f7c6f2719c164a2d2a97ea44a3df35d8e803ac15601894f64591b3c5eee4faca18b1fe600a2c4343c556 WHIRLPOOL 40cf7a7ab6557b13a3d0ce7d659d42beba557bed69a7b126e34a62f51c295a582ffbe5c22761fd16a5efce00f199a31b16a7061cb9cb99b26cee1280208ef679 -EBUILD pax-utils-0.7.ebuild 1248 SHA256 71486e5c826335f668fddf39e494a4d9357a9d4af5d46bba21f35f697fe52d15 SHA512 d58d82df20891b6e87189c2a0580372bbbb4a57b5d53d440d29a5d0db460c207fa52c89647076c8c3034acd58a8a3af6a0a01fb682f513bb80ada28f2e960887 WHIRLPOOL c573ae69d4e429339bcad0583517058dc261fed04bb3cd268c9d64cbc492557fb47620243e77a3fb0573fa57886109e6d2a66e72a321e42c3f29417ac87c71c2 -MISC ChangeLog 21028 SHA256 714faf9e24cda0128cac6d7779683add24829dfe69a22697c29b246bfb5694cb SHA512 08a05da1267074334addef727132e2f6664510ff9e224664c79eb3071f89923d7f488ce74806a396491d914cb8f626255394019c6635e3586526805b94ca1701 WHIRLPOOL ac13e919afd9406f87349347b1c68d128f1622177dab5702b9b362bc013090eb2baa72e19934061c7973a682689838363ae62c2db0b256826adc2ffee07fa3d2 -MISC metadata.xml 679 SHA256 7fbf1f71510a3b866ef91b2fe946ce48fea23f800ea2b6c568cb5fe30fea5eae SHA512 0c3430844289afb59f313c972d4f18d535227d28ce3d402df511398d975a2ca788faa359103f5ab4c1db7e0f15670b862d2ead290eb140d6455423bc69f8491a WHIRLPOOL 199ea5829de32ca6950de909d6ce3dde4b0652afaf5c84593a1aeb9db995a0670caa4cff683396e0591326430ef6fd71a14c5cd509d27b4a203e5457108b480c diff --git a/app-misc/pax-utils/files/pax-utils-0.7-lddtree-prefix.patch b/app-misc/pax-utils/files/pax-utils-0.7-lddtree-prefix.patch deleted file mode 100644 index e84cb66..0000000 --- a/app-misc/pax-utils/files/pax-utils-0.7-lddtree-prefix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: pax-utils-0.7/lddtree.py -=================================================================== ---- pax-utils-0.7.orig/lddtree.py -+++ pax-utils-0.7/lddtree.py -@@ -207,7 +207,7 @@ def LoadLdpaths(root='/'): - ldpaths['env'] = ParseLdPaths(env_ldpath, path='') - - # Load up /etc/ld.so.conf. -- ldpaths['conf'] = ParseLdSoConf(root + 'etc/ld.so.conf', root=root) -+ ldpaths['conf'] = ParseLdSoConf(root + '@GENTOO_PORTAGE_EPREFIX@/etc/ld.so.conf', root=root) - - return ldpaths - -@@ -311,9 +311,12 @@ def ParseELF(path, root='/', ldpaths={'c - 'needed': [], - } - # XXX: Should read it and scan for /lib paths. -+ -+ slibdir=os.path.dirname(interp) -+ libdir=os.path.dirname(slibdir) + '/usr/' + os.path.basename(slibdir) - ldpaths['interp'] = [ -- normpath(root + os.path.dirname(interp)), -- normpath(root + '/usr' + os.path.dirname(interp)), -+ normpath(root + slibdir), -+ normpath(root + libdir), - ] - break - diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml deleted file mode 100644 index 448899f..0000000 --- a/app-misc/pax-utils/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>solar@gentoo.org</email> - <description>Maintainer</description> - </maintainer> - <maintainer> - <email>vapier@gentoo.org</email> - <description>Maintainer</description> - </maintainer> - <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription> - <use> - <flag name='python'>Install a more powerful/faster version of lddtree</flag> - </use> -</pkgmetadata> diff --git a/app-misc/pax-utils/pax-utils-0.2.1.ebuild b/app-misc/pax-utils/pax-utils-0.2.1.ebuild deleted file mode 100644 index 7478232..0000000 --- a/app-misc/pax-utils/pax-utils-0.2.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.2.1.ebuild,v 1.8 2012/02/07 16:58:10 vapier Exp $ - -inherit toolchain-funcs - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.bz2 - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.bz2 - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.bz2" -#SRC_URI="http://wh0rd.org/pax-utils-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="caps" -#RESTRICT="mirror" - -DEPEND="caps? ( sys-libs/libcap )" - -src_compile() { - emake CC="$(tc-getCC)" USE_CAP=$(use caps && echo yes) || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc BUGS README TODO -} diff --git a/app-misc/pax-utils/pax-utils-0.2.2.ebuild b/app-misc/pax-utils/pax-utils-0.2.2.ebuild deleted file mode 100644 index e298835..0000000 --- a/app-misc/pax-utils/pax-utils-0.2.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.2.2.ebuild,v 1.3 2012/02/07 16:58:10 vapier Exp $ - -inherit toolchain-funcs - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.bz2 - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.bz2 - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.bz2" -#SRC_URI="http://wh0rd.org/pax-utils-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="caps" -#RESTRICT="mirror" - -DEPEND="caps? ( sys-libs/libcap )" - -src_compile() { - emake CC="$(tc-getCC)" USE_CAP=$(use caps && echo yes) || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc BUGS README TODO -} diff --git a/app-misc/pax-utils/pax-utils-0.2.3.ebuild b/app-misc/pax-utils/pax-utils-0.2.3.ebuild deleted file mode 100644 index 4e5ae3e..0000000 --- a/app-misc/pax-utils/pax-utils-0.2.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.2.3.ebuild,v 1.9 2012/02/07 16:58:10 vapier Exp $ - -inherit toolchain-funcs unpacker - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -IUSE="caps" -#RESTRICT="mirror" - -RDEPEND="caps? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -src_compile() { - emake CC="$(tc-getCC)" USE_CAP=$(use caps && echo yes) || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc BUGS README TODO -} diff --git a/app-misc/pax-utils/pax-utils-0.3.0.ebuild b/app-misc/pax-utils/pax-utils-0.3.0.ebuild deleted file mode 100644 index 4322ee5..0000000 --- a/app-misc/pax-utils/pax-utils-0.3.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.3.0.ebuild,v 1.3 2012/04/26 12:31:36 aballier Exp $ - -inherit toolchain-funcs unpacker - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="caps" -#RESTRICT="mirror" - -RDEPEND="caps? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -src_compile() { - emake CC="$(tc-getCC)" USE_CAP=$(use caps && echo yes) || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc BUGS README TODO -} diff --git a/app-misc/pax-utils/pax-utils-0.4.ebuild b/app-misc/pax-utils/pax-utils-0.4.ebuild deleted file mode 100644 index 09c30a9..0000000 --- a/app-misc/pax-utils/pax-utils-0.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.4.ebuild,v 1.8 2012/07/10 18:05:58 ranger Exp $ - -inherit eutils toolchain-funcs unpacker - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="caps" -#RESTRICT="mirror" - -RDEPEND="caps? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -src_compile() { - emake CC="$(tc-getCC)" USE_CAP=$(usex caps) || die -} - -src_install() { - emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install || die - prepalldocs -} diff --git a/app-misc/pax-utils/pax-utils-0.5.ebuild b/app-misc/pax-utils/pax-utils-0.5.ebuild deleted file mode 100644 index 38afbc2..0000000 --- a/app-misc/pax-utils/pax-utils-0.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.5.ebuild,v 1.1 2012/11/04 08:28:57 vapier Exp $ - -inherit eutils toolchain-funcs unpacker - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="caps" -#RESTRICT="mirror" - -RDEPEND="caps? ( sys-libs/libcap )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -src_compile() { - emake CC="$(tc-getCC)" USE_CAP=$(usex caps) || die -} - -src_install() { - emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install || die - prepalldocs -} diff --git a/app-misc/pax-utils/pax-utils-0.6.ebuild b/app-misc/pax-utils/pax-utils-0.6.ebuild deleted file mode 100644 index 4be416b..0000000 --- a/app-misc/pax-utils/pax-utils-0.6.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.6.ebuild,v 1.1 2013/01/02 18:28:32 vapier Exp $ - -inherit eutils toolchain-funcs unpacker - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="caps python" -#RESTRICT="mirror" - -RDEPEND="caps? ( sys-libs/libcap ) - python? ( dev-python/pyelftools )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -_emake() { - emake \ - USE_CAP=$(usex caps) \ - USE_PYTHON=$(usex python) \ - "$@" || die -} - -src_compile() { - _emake CC="$(tc-getCC)" -} - -src_install() { - _emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install - prepalldocs -} diff --git a/app-misc/pax-utils/pax-utils-0.7.ebuild b/app-misc/pax-utils/pax-utils-0.7.ebuild deleted file mode 100644 index 94f3207..0000000 --- a/app-misc/pax-utils/pax-utils-0.7.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-0.7.ebuild,v 1.1 2013/04/07 21:04:00 vapier Exp $ - -inherit eutils toolchain-funcs unpacker prefix - -DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties" -HOMEPAGE="http://hardened.gentoo.org/pax-utils.xml" -SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~solar/pax/pax-utils-${PV}.tar.xz - http://dev.gentoo.org/~vapier/dist/pax-utils-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="caps python" -#RESTRICT="mirror" - -RDEPEND="caps? ( sys-libs/libcap ) - python? ( dev-python/pyelftools )" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -_emake() { - emake \ - USE_CAP=$(usex caps) \ - USE_PYTHON=$(usex python) \ - "$@" -} - -src_compile() { - if use prefix; then - epatch "${FILESDIR}"/${PN}-0.7-lddtree-prefix.patch - eprefixify lddtree.py - fi - - _emake CC="$(tc-getCC)" -} - -src_test() { - _emake check -} - -src_install() { - _emake DESTDIR="${ED}" PKGDOCDIR='$(DOCDIR)'/${PF} install - prepalldocs -} diff --git a/app-portage/metagen/ChangeLog b/app-portage/metagen/ChangeLog deleted file mode 100644 index 385c6be..0000000 --- a/app-portage/metagen/ChangeLog +++ /dev/null @@ -1,139 +0,0 @@ -# ChangeLog for app-portage/metagen -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/ChangeLog,v 1.36 2012/02/07 16:19:50 jer Exp $ - - 07 Feb 2012; Jeroen Roovers <jer@gentoo.org> metagen-0.6.2.ebuild: - Stable for HPPA (bug #399949). - - 06 Feb 2012; Brent Baude <ranger@gentoo.org> metagen-0.6.2.ebuild: - Marking metagen-0.6.2 ppc for bug 399949 - - 28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> metagen-0.6.2.ebuild: - x86 stable wrt bug #399949 - - 27 Jan 2012; Agostino Sarubbo <ago@gentoo.org> metagen-0.6.2.ebuild: - Stable for amd64, wrt bug #399949 - -*metagen-0.6.2 (28 Sep 2011) - - 28 Sep 2011; Jesus Rivero <neurogeek@gentoo.org> -metagen-0.6.1.ebuild, - +metagen-0.6.2.ebuild: - New version that fixes bug #384535. Removed 0.6.1 - - 25 Sep 2011; Jesus Rivero <neurogeek@gentoo.org> metagen-9999.ebuild: - Removed src_prepare func wrt bug #384271 - -*metagen-0.6.1 (25 Sep 2011) - - 25 Sep 2011; Jesus Rivero <neurogeek@gentoo.org> -metagen-0.6.ebuild, - +metagen-0.6.1.ebuild: - Version bump. Removed older version - -*metagen-0.6 (09 Sep 2011) - - 09 Sep 2011; Jesus Rivero <neurogeek@gentoo.org> +metagen-0.6.ebuild: - Version bump - - 13 Aug 2011; Jesus Rivero <neurogeek@gentoo.org> metagen-9999.ebuild: - Added RDEPEND on sys-apps/portage. Wrt bug #310989 - - 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: - Drop maintainer due retirement, bug #28480 - - 13 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -metagen-0.3.ebuild, -metagen-0.5.ebuild: - Delete. - - 09 Aug 2010; Jeroen Roovers <jer@gentoo.org> metagen-0.5.2.ebuild: - Stable for HPPA (bug #322781). - - 26 Jun 2010; <nixnut@gentoo.org> metagen-0.5.2.ebuild: - ppc stable #322781 - - 14 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> metagen-0.5.2.ebuild: - x86 stable wrt bug #322781 - - 11 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - metagen-0.3.ebuild, metagen-0.5.ebuild, metagen-9999.ebuild: - Fix deprecation warnings. - - 07 Jun 2010; Markos Chandras <hwoarang@gentoo.org> metagen-0.5.2.ebuild: - Stable on amd64 wrt bug #322781 - -*metagen-0.5.2 (09 Apr 2010) - - 09 Apr 2010; Jesus Rivero <neurogeek@gentoo.org> -metagen-0.5.1.ebuild, - +metagen-0.5.2.ebuild: - Added new version wrt bug #314003. Removed older one. - - 31 Mar 2010; Christian Ruppert <idl0r@gentoo.org> metagen-0.3.ebuild: - Fix repoman complains about unquoted variables. - -*metagen-0.5.1 (23 Mar 2010) - - 23 Mar 2010; Jesus Rivero <neurogeek@gentoo.org> +metagen-0.5.1.ebuild: - Fixed deprecation warnings wrt bug #307033. Added Python Multi-ABI support - in ebuild. - -*metagen-9999 (22 Mar 2010) - - 22 Mar 2010; Sebastian Pipping <sping@gentoo.org> +metagen-9999.ebuild, - metadata.xml: - Add live ebuild, add neurogeek and me as maintainers - - 16 Oct 2007; Jeroen Roovers <jer@gentoo.org> metagen-0.5.ebuild: - Stable for HPPA too. Fixed quoting issues. - - 16 Jun 2007; Christoph Mende <angelos@gentoo.org> metagen-0.5.ebuild: - Stable on amd64 wrt bug 182226 - - 06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> metagen-0.5.ebuild: - ppc stable - - 21 Mar 2007; Raúl Porcel <armin76@gentoo.org> metagen-0.5.ebuild: - x86 stable - - 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: - Regenerate digest in Manifest2 format. - - 21 Apr 2005; Simon Stelling <blubb@gentoo.org> metagen-0.3.ebuild: - stable on amd64 - -*metagen-0.5 (07 Jan 2005) - - 07 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> -metagen-0.4.ebuild, - +metagen-0.5.ebuild: - Version bump. Added src_test() Closes bug# 76997 Removed bad version. - -*metagen-0.4 (04 Jan 2005) - - 04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> +metagen-0.4.ebuild: - Version bump. - - 29 Dec 2004; Joseph Jezak <josejx@gentoo.org> metagen-0.3.ebuild: - Marked ppc stable. - - 20 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> metagen-0.3.ebuild: - Marked stable x86, removed obsolete version - - 05 Oct 2004; Dylan Carlson <absinthe@gentoo.org> metagen-0.3.ebuild: - KEYWORDS ~amd64 - -*metagen-0.3 (03 Sep 2004) - - 03 Sep 2004; David Holm <dholm@gentoo.org> metagen-0.3.ebuild: - Added to ~ppc. - - 24 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> : - Version bump. - -*metagen-0.2 (22 Aug 2004) - - 22 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> +metagen-0.2.ebuild: - Version bump - -*metagen-0.1 (22 Aug 2004) - - 22 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> +metagen-0.1.ebuild: - Initial commit - diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest deleted file mode 100644 index b77fdeb..0000000 --- a/app-portage/metagen/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST metagen-0.5.2.tar.gz 6004 SHA256 d12ed1086b237dcfc9c7c9b6b259b67a74bebba22b3aa4965fd8dad77fc91be3 SHA512 1677dc9dcb67506ad8cc1ba3f6851e8ab262cac85411c00905af7a66bdd3e2a20f46d2ad5402918aaf0b365f4a4f99cacba5ece99dcc9feee5735af055b2db50 WHIRLPOOL a8a20d378df407aa006dee97f1e25ccc7031a185324ad0f6233a93bbbde2d5c64a43a7cafea3a68eb9cfdc71cb1347638558b79f378fa08f386902daf9273ae3 -DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c -EBUILD metagen-0.5.2.ebuild 1112 RMD160 d510ec9adc5242053c0f7d1439a7bb73897aaba3 SHA1 a79feec31c35d653b5c59f32e7297ea23e4effa7 SHA256 19d5380e32c6f630aaa3e2fc5a2a6467ec2938f564fac8eb7e7854a38045649d -EBUILD metagen-0.6.2.ebuild 1209 RMD160 35d6e71bcf59f3d6ce22e2a5b72a05307b88fa27 SHA1 3c5e48f69e5549045387c0816577aadca84e90eb SHA256 308bf7742b82f6e4a153a65cb6fb7d8542c95f17e36e10d1664ae543c3145c4c -EBUILD metagen-9999.ebuild 1191 RMD160 f050dd0a73bf61550d023ce62122796b715172e2 SHA1 b10404bc199e993c5b9924c014dd1da2295c64f6 SHA256 a784ada279cf8a87819993dc6528db2f1a6465b0695cb695fdc7670235b14cba -MISC ChangeLog 4447 RMD160 ae9b10dadb4b5d1752f34b41f8c8be268548978c SHA1 60713a645d6a471a635d9815cb81e0f7459dc6a9 SHA256 971d7d0799bf0acb293627e9c299cb55ea2c6c76d0d436a2bbec9897abaca500 -MISC metadata.xml 345 RMD160 5a13d61b002c8229e2865d3e497788c77d706fcd SHA1 2c1f801392d7acbfc9494d09b78f1d1a21f48dbd SHA256 bc2ab83e628ba497d8bb69722f1279453c7811b306112fdaaf4b03ae48748cb2 diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml deleted file mode 100644 index 158dd11..0000000 --- a/app-portage/metagen/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> - <email>neurogeek@gentoo.org</email> -</maintainer> -<maintainer> - <email>sping@gentoo.org</email> -</maintainer> -<longdescription>metagen creates metadata.xml files for ebuilds</longdescription> -</pkgmetadata> diff --git a/app-portage/metagen/metagen-0.5.2.ebuild b/app-portage/metagen/metagen-0.5.2.ebuild deleted file mode 100644 index 47cbe88..0000000 --- a/app-portage/metagen/metagen-0.5.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.5.2.ebuild,v 1.6 2010/08/09 23:20:08 jer Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils - -DESCRIPTION="metadata.xml generator for ebuilds" -HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ppc x86" - -IUSE="" -DEPEND=">=dev-python/jaxml-3.01" - -src_install() { - distutils_src_install - - metagen_install() { - local METAGEN_MOD="$(python_get_sitedir)/${PN}/main.py" - fperms 755 ${METAGEN_MOD} - dosym "${D}"${METAGEN_MOD} "/usr/bin/${PN}-${PYTHON_ABI}" - } - python_execute_function metagen_install - - python_generate_wrapper_scripts "${ED}usr/bin/${PN}" - - doman "docs/metagen.1" -} - -src_test() { - einfo "Starting tests..." - testing() { - $(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()" - } - python_execute_function testing - einfo "Tests completed." -} diff --git a/app-portage/metagen/metagen-0.6.2.ebuild b/app-portage/metagen/metagen-0.6.2.ebuild deleted file mode 100644 index 85505a1..0000000 --- a/app-portage/metagen/metagen-0.6.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.6.2.ebuild,v 1.5 2012/02/07 16:19:50 jer Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils - -DESCRIPTION="metadata.xml generator for ebuilds" -HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary" -SRC_URI="http://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ppc x86 ~amd64-linux" - -IUSE="" -DEPEND=">=dev-python/jaxml-3.01 - >=sys-apps/portage-2.1.9.42" -RDEPEND="${DEPEND}" - -src_install() { - distutils_src_install - - metagen_install() { - local METAGEN_MOD="$(python_get_sitedir)/${PN}/main.py" - fperms 755 ${METAGEN_MOD} - dosym "${D}"${METAGEN_MOD} "/usr/bin/${PN}-${PYTHON_ABI}" - } - - python_execute_function metagen_install - python_generate_wrapper_scripts "${ED}usr/bin/${PN}" - - doman "docs/metagen.1" -} - -src_test() { - einfo "Starting tests..." - testing() { - $(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()" - } - python_execute_function testing - einfo "Tests completed." -} diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild deleted file mode 100644 index ba3a9cf..0000000 --- a/app-portage/metagen/metagen-9999.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.4 2011/09/25 14:31:01 neurogeek Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils git-2 - -DESCRIPTION="metadata.xml generator for ebuilds" -HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary" -SRC_URI="" -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/metagen.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -IUSE="" -DEPEND=">=dev-python/jaxml-3.01 - >=sys-apps/portage-2.1.9.42" -RDEPEND="${DEPEND}" - -src_install() { - distutils_src_install - - metagen_install() { - local METAGEN_MOD="$(python_get_sitedir)/${PN}/main.py" - fperms 755 ${METAGEN_MOD} - dosym "${D}"${METAGEN_MOD} "/usr/bin/${PN}-${PYTHON_ABI}" - } - python_execute_function metagen_install - - python_generate_wrapper_scripts "${ED}usr/bin/${PN}" - - doman "docs/metagen.1" -} - -src_test() { - einfo "Starting tests..." - testing() { - $(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()" - } - python_execute_function testing - einfo "Tests completed." -} diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest deleted file mode 100644 index 501f0aa..0000000 --- a/app-shells/bash/Manifest +++ /dev/null @@ -1,64 +0,0 @@ -AUX autoconf-mktime-2.53.patch 4812 SHA256 f8fd7249e0eaac1a258198b7e2dd435fb287dd826d2b2b85c171f3c801bf5a9b SHA512 52fd04b9ba576ef28a66647307b550e9da074867c2cfd9d517948f3029521d94ca01f3e43b49544ecf6ed1139f8ac4f8beb36470e7e225a65557a6b5fb5348ec WHIRLPOOL 71319dc34c773c9773cc96339cb7b461115311ce42a3758f53a0eb6c7f8c1fadcec0de43f4b226de183867faa53982e8bf3919221e33474d0a1e44f73d32b15e -AUX autoconf-mktime-2.59.patch 4686 SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba SHA512 4ac3951b72fcc50bc90d4fdd6286fc0ce01100d928b51f41043cf7c6f6adaddd7b19bb346bf21f306ce6cbe619750dfe18755c122e3f1a237fb07c02b25594a8 WHIRLPOOL bd4304863415e6e5b79a2df330b9add8e5378de54db2c24a3ea97c41125886204a77997ba179c42a901532ddf49314a91e1937df31d396ac8d4d6c7d612f442d -AUX bash-4.0-configs-prefix.patch 532 SHA256 e83e4659f0d62a5a8c7cac9332bd356d5827a4b89ce7fde05e233477b9785717 SHA512 87132ab99b4bbe9ee5a52bd0f98c8ef27b03135168490babb2c96b4f4799212c3b8132830ad6332b585443a28b0b2121946bf834a04a9c2a5afae81fd547beaa WHIRLPOOL 94fe7e5fca1db131ff046416f693872c8ee354768848b8a1c0b49414924a41ff1e0d3e5f13e556ea710479848eadc83035b9e3304bc737b54e04e1c407723e25 -AUX bash-4.3-append-process-segfault.patch 675 SHA256 cadbc77924ce5e2ba3984263f1e5d5c877214f4b78bd7597c637aec059ee9592 SHA512 2c243f7ca4f689decb0171ae2f5b5babf6b37f8f0988ecfbcb952a8df22dde9a543719d48b64ce45d2308340e9c601c9bd2f14f3f11bd9b9374c0f6fccaf0c7a WHIRLPOOL e614268546796cafd1acc076c3b1212b3f047b809d62480392b0e41283be8decbf32f5db96f4b62fe8d21a61aa95b16b39b93be41e946311490ba198a222feb6 -AUX bash-4.3-arrayfunc.patch 439 SHA256 9407d53d357166464c7c4e3341a72027faba295f416e73f7b5919e10ea15577a SHA512 9db458ea34495e8632d68c072db0c30be103d31ad0535d5327e2ba8db62d9464b2e4427fb0a06c6272dbaa399a2ba939666f4574929d0f53940234a78ca67867 WHIRLPOOL 038eb157225aadf2c7d57aa63b1ca7871986ceea982ae91d319b55551377e79b6023a1844c752586083056ae377813366f032e8c51df0f42e35bef0c037ed803 -AUX bash-4.3-compat-lvl.patch 628 SHA256 3303c12a499c5fb3f3c9ac7b11b020c83d4d4e3d672cc2df734709b22a6d92d7 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286 WHIRLPOOL 066fbb358f4fb9e32a58b4c4edd10d9c47c50f6aa202e0197c6b6d86a0836d48677561b834e5642b9052e64077efe240cb27144e5032c3e5f4bd9cb62201736e -AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 SHA256 0302e96630afc5106ea446defd6890fb0b4c96bb27b375e8fbfd96b09eb10335 SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356 WHIRLPOOL 3bf136afd45fe614e3429079b6f41102dda55390d4a3d190f4584aa189f8e623439c13f9efe623644d3990e0f5d2d1b90a8b61eee322f22050b3d5e63d8f5eda -AUX bash-4.3-protos.patch 174 SHA256 729aded4f907f4bad466785eed850b2b25a145e9ed75f0fc690190d5fccd387a SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0 WHIRLPOOL b1a5def9952b1f8ec4b9c3ff9df09672b2ad55a67a99890bc0796c87e23c1ec86c0eed50125d790120b6eea595f5aeabf981383323aac43b2f790587ec70685a -AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe -AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b -AUX bashrc 4094 SHA256 db1254d22d6c23854779a40578e299e2429d37ca0292ff632bbd038f348a475e SHA512 c394dbf39322e0ab6d76ed215265230b2421f32da6e6fe4bf53f855fa86f1bd345128cb66b373c42fd11b08605aeeade4186767d6444f17889ca34e01d71de52 WHIRLPOOL 9eac53a84ea1ff3166761c7f37344d10d0e57c3987a0e11b1fa3e9aedac6bb4b2f01124c24939bc8f7a2e1c3664ad8c7643cbf2e06f992e9ae94ce0f0c5f10f1 -AUX dot-bash_logout 127 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd WHIRLPOOL 3dc6bc364f8229d123873940743866dfc330e193ab6ec7c5162c61d0ecc319198a64f27176521bfb979c31eed9ed0b2ee2ffce31b050d4cb8e3aa8a5c12c38cf -AUX dot-bash_profile 204 SHA256 4fc40b8960894a3011eca9ed5ee1e65b4a6f26bc8559a8e8cbf605d1966aa2e5 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9 WHIRLPOOL 797471612c96453793ca26065a5edcdccc919e7370366bc56c224ec295a77c275af0650568b74922ee781b2d4f6540f32ff5158f62d8b8c0288488cd51f22d4b -AUX dot-bashrc 551 SHA256 e280e34af6e830c93adb6285f66ead4812ddfb2bbc6a7ff618467f4c933f6446 SHA512 518b62aa2fa30e7d1692847929a6ce8dae4eac93e8b16d223d1ae86f4d5b076bcbe1852c9034f321c013e17502db9f771979957c67f8e8a71ca4eea7bfe9cc1b WHIRLPOOL 27c53e3f59bd89d5517b5b22bcf04a9adddee0492c52d34d26a707062fb4c4fa853cdf2726d6ec2621a08f24c32a53651ce5693b6de1be764de3e088eb9f7ee6 -DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f -DIST bash43-001 1617 SHA256 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 SHA512 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 WHIRLPOOL 94d34b6ae2496b4007bf9b3af69847828179dfa90528d7fc2f9a91facc451535e2fa46120cc3ea22156974c92f2633f91423f2d43b4733f8960cde69dfff81b9 -DIST bash43-002 1594 SHA256 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b SHA512 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 WHIRLPOOL 2d1b6679a1263f7a4325b692c3edac9f5daaa72e3f06dfa88958e70ad64c1fc74b92d8325becfff2c21dd28c002470bdaad50f57037c2676352078291bf0b0bc -DIST bash43-003 1465 SHA256 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d SHA512 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 WHIRLPOOL 1ef78321cfe3ca6e9f690ae3dd6a7c06bc72d2e6590bfdaa8543b0ac3ff84eae998e4a2aa44531423cab1137c974b09ac30baf5fa2746e2e5a2006cde03a2b32 -DIST bash43-004 1534 SHA256 5ea0a42c6506720d26e6d3c5c358e9a0d49f6f189d69a8ed34d5935964821338 SHA512 6a5177d5f4205ca9d3824601052dc6d0cd768638cdfc125501c5643dd51d537f5d075cbd11a10356caf4205e47a0287c72636065789ecce264129fc92fbda420 WHIRLPOOL 90c2f4f7752cf84a67b1f648137b6c25b8a6f5212fc5dde26d6f0fb6f316e923bec916368ba9ebc6b608bfa0fd82f86b6ac7ec6db32d06b83c3d22730788cfa1 -DIST bash43-005 2636 SHA256 1ac83044032b9f5f11aeca8a344ae3c524ec2156185d3adbb8ad3e7a165aa3fa SHA512 e201aa8ef0ce0d74fa5ee42e8171bbb5ba633d831d863a8e8afc5d5157581bb055d16c52b316cc945979a852b0eae7921244a24b89818acfb7c96572ed04d1f8 WHIRLPOOL fd4c6b03fb8b4344cc3833beb0310738af9826c56d2b0cf7c5262f3d2a99e83f700485dafe0e726e84a2dffcb1b907efcc860a685160ff22c99e40c8a2b659b0 -DIST bash43-006 1445 SHA256 a0648ee72d15e4a90c8b77a5c6b19f8d89e28c1bc881657d22fe26825f040213 SHA512 d1da3c9d3781482d87cdcbfd69ab3958ed4950f2a00e9d15228ecb4ad5ca8ae253eff378010b4908d04df2ecf658e08f7c2efc97d6a0b8dd2317552c1895d7b2 WHIRLPOOL 55e3c5e7be01f5928247a7677482dde1f0c89a0344ca23c947e9f84bf93d43ce1d7f621b39d74e09f0dd2de85ef304c5d34e68eb0af35cdf61c611e649dcbf68 -DIST bash43-007 1331 SHA256 1113e321c59cf6a8648a36245bbe4217cf8acf948d71e67886dad7d486f8f3a3 SHA512 c445b5cdd486d06991c78d4c88e2e44e49f74d1fc07b8e4bc9492cccfc4ff4045587bed6b24d745974c6339340e45b9756c27723fdb79e7591e7d6c5d350a86e WHIRLPOOL 0537006403347466536de5843d62725be75b6f5b4e6d9228c9f5671201de6a473ba04d8fcfa29894584b51f3ee35718bb46c2acc5c014713e03ee24828f10d43 -DIST bash43-008 4575 SHA256 9941a98a4987192cc5ce3d45afe879983cad2f0bec96d441a4edd9033767f95e SHA512 53bae88cd3341a4ef8c60d6a294c09402103d1b20f485cf85775e6730a3d2eec8e6ebe15aa6dd95336e4a1f540f21db394823b9d04b416e5af071a7a6c618900 WHIRLPOOL 94a3e9f004729490f70cb3a33de0605fc11f498b6bde2dc37bc08578283e47a3b625619de9d823b2796ce6fbd4982871fa2d428e94c892c863fc448ef2711482 -DIST bash43-009 2413 SHA256 c0226d6728946b2f53cdebf090bcd1c01627f01fee03295768605caa80bb40a5 SHA512 8d06fe612cd32cb414fdcdc34d4420b8991b268dd3ddd2dd47b3d01679954debd78e21f697a7f495d2340f0dcc8acdc3ad6809b8870bf5fd300afb1439788776 WHIRLPOOL 66e13efba99362a361e9e7d317773d51862f4c474f5c213654eba875a86b6d83b531b246bbd22c53e8a81fa7b67cb564c2de264ce28063967426fcf586ddda4d -DIST bash43-010 5357 SHA256 ce05799c0137314c70c7b6ea0477c90e1ac1d52e113344be8e32fa5a55c9f0b7 SHA512 e36e550d749f52bab01256ed5f8f1b48fe53190c1a0a0a15c545328261c1f50b85f574b44188855858de1f2d045945770c4940bdecadd8381ea2cf174bde2fee WHIRLPOOL 830e7c82afd2650cbb00818928d22be0e0518aec2752736ff7a5085c5628bc8852c6c409f21684beec0c675d79898917efafb3f8dc1bc6bfcea41e1a8521d4fb -DIST bash43-011 1533 SHA256 7c63402cdbc004a210f6c1c527b63b13d8bb9ec9c5a43d5c464a9010ff6f7f3b SHA512 678bbcd92b927c86631cd42d6d3ab7596a3ffd20b640f471a9783a7972f05d2d4fb15970c12e7645e90d407c5a2d2aadcad698113211724b0ef8d89eccd2cd66 WHIRLPOOL 1d0b84ff75d19db1bfbd60b37551978825902be2187b6407471a8810ebeb9136b2846e6c76505fec0c828a3e83ba8d4dd0950c5e6020b649da7ae530f7d5bf05 -DIST bash43-012 1365 SHA256 3e1379030b35fbcf314e9e7954538cf4b43be1507142b29efae39eef997b8c12 SHA512 169453248edb55baf761b0c9c7b296ed2c24543b80fcf4756b8dd398054b6317da285c5e9cd68828f2620b05874f21a08773844ee32416daef76b88d0ef3ee6d WHIRLPOOL 52b6c6d6c374b307ac562c1dfda730dc3ba322d3d6e9c7acb3f2a40461bb61ad5cb54dd65e2e4b72e492b55b436c323cae95ed63948df3b06bcd64a3487b3374 -DIST bash43-013 2151 SHA256 bfa8ca5336ab1f5ef988434a4bdedf71604aa8a3659636afa2ce7c7446c42c79 SHA512 536bbf0c9b23eb824579955e7fce892cfc1e1d9fbcfc66810353ac4ff238e9e57361c0a46b3f3573ca8ca563331070ce55442ffea38e2a632840b6a318db1c88 WHIRLPOOL 15fe2e97ac2a07a1d4c0f9946adc63e64b9141a3837391206fd5c934853f7e9ad9ede3baeecdd7a0dbb73e2bf007db8a5b57f0f8e2d03d693de09502dff32636 -DIST bash43-014 3533 SHA256 5a4d6fa2365b6eb725a9d4966248b5edf7630a4aeb3fa8d526b877972658ac13 SHA512 79fb50f62dbdca5e45a1359570e6d2173d442b3d4ddd4eb44809ed45ac022de4fe3f0aadd7672b4c8d9739405d51762486ee0c677b56f9c7d60e6224be84b87a WHIRLPOOL 10b6a2b7a7e5e6dfb3dd730b9ccc2ce3152bda1983a78745aa7367e9f5671695577d45070ad800158a36ffeb7db176e29f6b48d139075770ec773a478adfa1b2 -DIST bash43-015 1894 SHA256 13293e8a24e003a44d7fe928c6b1e07b444511bed2d9406407e006df28355e8d SHA512 38a7af22f13f1f45705ceadf3abb52be75f3239959c2b1d57f333d137f25f14ed92c4d209b35417d449b1ec4291bbd984bb5fd11ad40375b22d2668b33fb8efb WHIRLPOOL c06aa4977f891ec606f107157a0295d5025fbd24a620644547ee3f3a79582aae1ea4cd4be4254f92c6d2aee9322934839f01cc118148cea85af700e6f83c21cc -DIST bash43-016 3674 SHA256 92d60bcf49f61bd7f1ccb9602bead6f2c9946d79dea0e5ec0589bb3bfa5e0773 SHA512 52ab2966ccd42554c8bd76041e07921388220b46c93c34190197cdda38a085fd499d71e2e0a10daea130e6782ada556f35b1a37d06d023e83c4c4d665d07cd3f WHIRLPOOL 9b7eb252291680d5db2596700774fddcab7e5c6c14ed5b1da7f8e23e1eaae85a927cf69d7662807b99c63fa083d2267f7e70076d4d4927a8bd4cb9273c416b4c -DIST bash43-017 1565 SHA256 1267c25c6b5ba57042a7bb6c569a6de02ffd0d29530489a16666c3b8a23e7780 SHA512 88b11f324a780823b459b1e8a0904348c56079b4103cb86025d34dbba02543b0b7fbc2397bf043c24c1363f30539a6fe9b9f9fc717be9798f466071d1d420bb9 WHIRLPOOL 1aa1160771b98d393a2fb341e9025c2169aa43123f682bbe7648038e555b4f70eb1dbdba90492edb514c9621468f5005c2cf5fff82921e941ad3ca42534e7b1d -DIST bash43-018 1315 SHA256 7aa8b40a9e973931719d8cc72284a8fb3292b71b522db57a5a79052f021a3d58 SHA512 f83d8e1d6d8fa8adf1715b8d4130730a13f5cd626f75e9e4b8c63244645a45a3f1fbac03081bb9d1e46864919d1b3189a9bb6d7a5e7a8854e6270ab3269c771f WHIRLPOOL 14a216257c3d1d3501dfc23d72ad8c085a216cdac83d5d909922d51b502ce83fb454c7e64a8d44e91a87a1a09237d965272fb563ae945c5d81688e9f0686264e -DIST bash43-019 2610 SHA256 a7a91475228015d676cafa86d2d7aa9c5d2139aa51485b6bbdebfdfbcf0d2d23 SHA512 77e6dac3079d9282f6f85940a762b0da2473ac0d35e9bad2ebc2862bf0f3c4376a6220c746c1c37de0b4d492251ec9531a62c8a042a1be5e485f8f5ae6fa0704 WHIRLPOOL 5acde269ea62e2074ca5eb30750dbd67512b69658908f532165a90873f54de7705b0d41515ac6278e942f8ea66e0abe67c13b842e404a41cd7684ec0683928ef -DIST bash43-020 2777 SHA256 ca5e86d87f178128641fe91f2f094875b8c1eb2de9e0d2e9154f5d5cc0336c98 SHA512 fa06563eb46609115750ffa88098b07c608cc8b13fc31356f33e1428a4da4d2610e122e0241356afcfadfecc5ccee5db4b7cf07f74005e7f30240ada4a81b5f7 WHIRLPOOL 9f05ce5028f20e7cbc11c1995d99a47274f782f228faa752919e0444afe1df748adb7837c0a3affa20633c63ad0175780327b9a02a39f5ada494736f0fd694dd -DIST bash43-021 1623 SHA256 41439f06883e6bd11c591d9d5e9ae08afbc2abd4b935e1d244b08100076520a9 SHA512 90dc85302d9bc60e68fa8cce472b7e022d8a6ccee361f97aad4cbe5f1585b4870ab9997a3e6fac420aaf84c3dce9757716eb08f4fa6b38e14bac4f2d5d503731 WHIRLPOOL e7930992f6e2a1f5a07458eee74ed118fe93152ceb78fbdb41a4a3d799c5f9aa71fac52bc3cd43c321b983c5a4309e9884d37cac1facb54a2f38383527c8e765 -DIST bash43-022 1782 SHA256 fd4d47bb95c65863f634c4706c65e1e3bae4ee8460c72045c0a0618689061a88 SHA512 721b772349f9e0cc65975e419fabe4acdb23c77796a5d8fde01f110687ea1cb7d23fb706fc0452fb3c2082958a81c95b82f277e1f8f722b1156913efd59afc30 WHIRLPOOL 7387429460d85bffb9f7ce9cbd524f4b2c21b116beff30424db2cb66d48ec81707c7cb9479d5d72bcf36879248963a405dcdf87515fc0f5b6642568d9d236df2 -DIST bash43-023 3414 SHA256 9ac250c7397a8f53dbc84dfe790d2a418fbf1fe090bcece39b4a5c84a2d300d4 SHA512 d45b5f5dc4682c7260c8b6ef6faa99c929d2159cc34534931790f71f76e7324376e4a5d4a2a3bc21c16c25a8206554580943e7a3f672ec5a4af16cbccd216819 WHIRLPOOL 4cee4cdbe8525aff748a42a19d1d7cbc659cc8fe99b0bca3b2875ddfe5b8325f504cfdf09fb6edc70b1040f00eae3a4ab5fcda64cfa93ce96ce1e8d8c902b78f -DIST bash43-024 1909 SHA256 3b505882a0a6090667d75824fc919524cd44cc3bd89dd08b7c4e622d3f960f6c SHA512 eada2b4839b81f28f63a874e08c72dfee9708c0982d2447347c17770a29c8fbb3d3f8c58c8a22b0d46a9d10abbd79dec11b5815257fb39af06420ef3602f8499 WHIRLPOOL 06059921dccb590aa7847ff5212bcb3e6a177aa96749eb19012d633ebf86badb83aad3b75ba8b304c620380d08395c0e37da4e2934a833ef1c0e1daf0f42ca72 -DIST bash43-025 3940 SHA256 1e5186f5c4a619bb134a1177d9e9de879f3bb85d9c5726832b03a762a2499251 SHA512 b4ea28ea0a24c8609d5c3a10114c5fec87ab978ec60700c36992d093e7afd976dbaee4a0d62c6e41e8ed6674c356fc26589f4c5168642dec8df8d727d7127822 WHIRLPOOL b3385e49dfbbf156bea9ebbd10f18dcb88c1d489c61c5bd6c16d1caac8a2ebf1ce057ec350d661ebd0307330a61f8c1088bef1cb133368919ccd0b5e81c3e7e3 -DIST bash43-026 1575 SHA256 2ecc12201b3ba4273b63af4e9aad2305168cf9babf6d11152796db08724c214d SHA512 d55620c86ab4835eaf53c18033a939e00ebbef7045d1429bd6fb212be6da167c368b4c03aec6c00ba60a1363b9cf8a4828e85c8108c5476b4a342e6c57f03897 WHIRLPOOL 3c21e3b21f1967d85b49386c05945859ee0fab2bbe0062052319876bbe3283bf3a7b50a9e160e36e9ee96fbe79ac13c90d86ffb4157ef0cb0641acd9dafb917e -DIST bash43-027 6889 SHA256 1eb76ad28561d27f7403ff3c76a36e932928a4b58a01b868d663c165f076dabe SHA512 6941156db9a6ab35b2d6ddc63eec064e03da779e29f47e33b467711e3405c9adb58ad33be3ad3c77aea1e84a314d5404c8e1a8475408991f5f719b93c5a276b3 WHIRLPOOL 241a77807f142765fac71490987bd62a93bbd57c6ad2f83fbc645bf0618286fbfc3cd269eadf99e7f973a9e88ac08c5065868f8ad38727c17bb6056cedc83888 -DIST bash43-028 69606 SHA256 e8b0dbed4724fa7b9bd8ff77d12c7f03da0fbfc5f8251ef5cb8511eb082b469d SHA512 4317380539e3a93167f195eddd0acf0c75a5d86d5ef243cb7f7dca43e745badc3ebbc081b099678ac17dc03d9a3ed4a3ff3c6636bb1887e73e94b8ff9ced7c88 WHIRLPOOL f01e8fe2c09a7bdefacd7114cc8377f7ccd65de6c3bafac05595f1400f330ba0ba63ce97fe7b9b49957639c75438bb5ceb853890094cb0c4e43fadc1795b89b6 -DIST bash43-029 1824 SHA256 4cc4a397fe6bc63ecb97d030a4e44258ef2d4e076d0e90c77782968cc43d6292 SHA512 e25783c7557c1cda8344ba779d59f83e26b90b0aca393b5f7ee389e0583ccf81eba394589e992b33eb6c969083a8a4ff7fc8ce52059cab3b71289d085d381f07 WHIRLPOOL 857275184a8a449461b5aebba12d8231e1e33a2119693fa2c865ead18d4c462dea8151cfc3e0d121c2e5569d9984856ba69820aaa54399ddc77bb849ea9de890 -DIST bash43-030 63206 SHA256 85434f8a2f379d0c49a3ff6d9ffa12c8b157188dd739e556d638217d2a58385b SHA512 ae41a9a5326ceb8e7105e359be097e14876160f6357bfa7c5cd3c4a495a629be762c3db671754c2cffc6abb34998aad91dde4a449ba16a0c6da844bac53feca4 WHIRLPOOL 2184fa715fb90de89f18ba2b27dca612b684a85e9228d58ccf2d62a96a2e575929b3e1a47fbb5809e4c231a6657084be4a076271cfdd5b8b7dde493f2cb40a01 -DIST bash43-031 3689 SHA256 cd529f59dd0f2fdd49d619fe34691da6f0affedf87cc37cd460a9f3fe812a61d SHA512 3178b4ab48860ed284bb64ac9b36b6d4d1681c0d4bc37ceeb93e73c9dd140bd0a71e86a86ae595aab43babedae79d75a4b11c57e6ad6800f43ab5f7647f6c4c9 WHIRLPOOL 1e21f10a8ade1317e6672fc76e7b0e988d7c02feed3b1e553c60e4717df0b6036ce0822e9f9bf603abaf5b9b248ffa63421601a7f5c2dfcc9c60a98fe77b23dc -DIST bash43-032 1734 SHA256 889357d29a6005b2c3308ca5b6286cb223b5e9c083219e5db3156282dd554f4a SHA512 47afc6308bd4bed20661a87761330854508a745a1c2a7f2d661fbe0d95b00d2d5707cc04f510fcd027b3fdb065d9414697715bff33c707a56955e27341d1bfd0 WHIRLPOOL 4b7ef4ac84269a292fa4527d2796508f4da16f9579726d90664305bbd3c2a3fa9002db6c0d60b022a54e756590a196f5dfcb86492a6d776476189546edb488c7 -DIST bash43-033 7038 SHA256 fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16 SHA512 3eed328960d77317e1742a9b53ccf40b304657cd535d7f283bdc24219c65ebdcb7aca3019fc8fd9e7152f42dc411625acb1b529f80e4a6c5b750b8f7cbd2e4d0 WHIRLPOOL bdfa9cd681ff499daa14b2c28e294b929f4c8526f11d555046158f035cc2c7a9c48f49aa0837c3ea80cdbc6d960119f40260da4a664944d7e599e40d6227254e -DIST bash43-034 2392 SHA256 f1694f04f110defe1330a851cc2768e7e57ddd2dfdb0e3e350ca0e3c214ff889 SHA512 95d09b843287dc18845b75ac6657a2bd7bd71c31a62f922e7177368678ddf13c0f20498bc17bdf4cd5c1c34d40838174791d1e464ceca168957c68e789e34d06 WHIRLPOOL b9919bf7aabb11e6cc4dd17dd9433775320bc025a22e23b40edbc649e54dfae3e86a3670e30af4863ff8612ade43c91906d15acdb652ac2c37f84f731fba3279 -DIST bash43-035 1800 SHA256 370d85e51780036f2386dc18c5efe996eba8e652fc1973f0f4f2ab55a993c1e3 SHA512 1ea68e7ffb15356fdcf5eed08dd7fe0e16aea2928a4510fcfafe79e926d7ac25f013641bf547bfff0401bbb7e1476a802208e4f1ccb8b02ed20c094f99e450d2 WHIRLPOOL a5818ea98353c191210e8d66af0ea998c0b831e6af73035112405c228e18afc8ff243bdc2f3263728fc1d8aa2e7be43ae559cb02662b277478081e127b4fc37a -DIST bash43-036 1539 SHA256 ac5f82445b36efdb543dbfae64afed63f586d7574b833e9aa9cd5170bc5fd27c SHA512 089a05879b8b65c9f11c55127364a3281b651e71cbedfad6221e31dc88eca15d813986f999a22921726873db9590b7b50afcd6162027fe516c2a94e8734e3ee7 WHIRLPOOL 3468783b0c10ae74c548e0d0cca3694c21775e6ea83ea1a071ae27b24542b67ffc785e17d6bc849c8030c667c7f531ba1a2de8e808f7820b19e88576e12e098c -DIST bash43-037 1284 SHA256 33f170dd7400ab3418d749c55c6391b1d161ef2de7aced1873451b3a3fca5813 SHA512 7977c0fb9142cdea259b06322092aab3231b9773cc397519bedb6f731aea02a46441c67615b31fd19c886678eb1985687d07357d15fc7f08e946404efc564966 WHIRLPOOL fc3e010f065aa3087ac4e22352459dc2cdd5a232653749250dfebf17023a405ed78e0b2dd8ad66727aaa2645173dc14be111e32e8fb71a13786f4fe6ac6875ac -DIST bash43-038 2354 SHA256 adbeaa500ca7a82535f0e88d673661963f8a5fcdc7ad63445e68bf5b49786367 SHA512 2ef2557b17867b5820a9e5619daa1cddb3fadcff7470504c148828a3007217767da4bf540dc835cf263f9c943b2c1aa909c845f8410f69e2d04c8b3d659efee3 WHIRLPOOL 66a2878b850cce96e532625cdcd88d0402c775dc585419c946ddebb206fbf8bee91846cbdce7a88b9caef09e1b02c144e3e71734c918c1b2c09cec67c68fa8d0 -DIST bash43-039 1531 SHA256 ab94dced2215541097691f60c3eb323cc28ef2549463e6a5334bbcc1e61e74ec SHA512 f9745a05bfbbe39f8e5af3865de3a32391d7ff291289977e23340c79a3783b4fad15bdcf8ce62478916b43fe18501c4d7c65cd54d3c20e8bb889919df48a9a19 WHIRLPOOL 3ee69bc81a25afe4998f76d43c9c2f4f6aca61f545a7304156fceda0f8a99c86379b673967bc7f72c26f5bde01248f77d7aee6372164c2e3b94c7781c7f6bd08 -DIST bash43-040 1532 SHA256 84bb396b9262992ca5424feab6ed3ec39f193ef5c76dfe4a62b551bd8dd9d76b SHA512 25a0696f1f0e78cb971afa404e0b7fe634b70d49d6a5a9d6ff5506c42063968e8ede83ad80bd0b79601363676fe3abfedc3b76984f6f9ad2e7798790682e21d0 WHIRLPOOL a435f25ae432161f676b4965cc20cc096fa18af8a191dca7cb311a41e3504e5d27c668fb3430fece1de45e0eed9cb34357dc887e83ace9819f24d585eddf6720 -DIST bash43-041 2362 SHA256 4ec432966e4198524a7e0cd685fe222e96043769c9613e66742ac475db132c1a SHA512 d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab821fd8c57f44fb07f811b087d077359242caff3b54cfc6819 WHIRLPOOL c88e754d694b69bcb3ce390ab3e29932b30a74f8f15b75b570cc46699c072b0f872824766c45bc2a98627529896bdf5aaf6493a493ffd33932d9ed6a362defb3 -DIST bash43-042 1535 SHA256 ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919 SHA512 01a6601029c0a55c9bf1a4ace3f387f9d094a9b9ee3511e2113c000123d85b1d5813c369e62d5a6dd329f515ef0d67d11394a6c0e4516956387556c13d13009a WHIRLPOOL 790b15282a81f5717fb675ea4ae752382ddb1b101766e32c68deb1ec1d64fcf8841b3da556b87ac685e18b528a1de31bc4b94900369f6386f8e3991ed76232c1 -DIST bash43-043 1942 SHA256 47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180 SHA512 eb05e537fac08587d0755ad59218bb5a51685aefc1476d6e3feaf72acd1e08cbda512988d8c157425e7939863b313d1e36f51b32f8a8497655c6b0710a24b738 WHIRLPOOL 3c9a466b68ea5d94b5ad9d1868ad1ace80df6608a9bd1b77c1cd06f7edb588090061f7f4e2639dd7190763864511d573dec33aad77be722516a1300e8a45ce31 -DIST bash43-044 1658 SHA256 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99 SHA512 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd WHIRLPOOL 488f567b900e49a9de9b92e9a8e29a92a087d390e9f24c3986bf1d89524878c88c7a3c2cae959844427fb20e6858a7b8eae112aac640f3d97ba1f79888f9f25d -DIST bash43-045 1312 SHA256 ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d WHIRLPOOL f361e523879ff1898574ac5eca480661bd787dc278fff204e7f27da89e85439b4e9d36a5f556046b760f3beb115302e745b5196bfa081b402d3f76fb44463558 -DIST bash43-046 1494 SHA256 b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d WHIRLPOOL d58384a2ca77f9a80a69a117221da51a701539cf5497d8e0fc634cd1cc0cb0024e02675bea810a0f42b873b557d479ba1b7aee6e6f73bd1422df2dbb29396477 -EBUILD bash-4.3_p42-r2.ebuild 7355 SHA256 9e3e57dd0af1f66e27493a1e2f31d404084846ddc82dbbef6c67e25d6b4e2280 SHA512 58a5931cfcd89c2587ab336ad87b334127df65f5818cec1b6a3b7871e3b8173a7a46dd0c0956104b9d270351dd873e10c1e3666a37df168725f039edea1b32e0 WHIRLPOOL 72d9a680334722fd0a326c388495cbf77b9776d6ad3497117cffc075ad3acfca2d6677e1fe735ec70b96a6acf2318075be3a91f00ea9278db056cc5c215fd2e0 -EBUILD bash-4.3_p46.ebuild 7302 SHA256 9d776281eaeb4faec790b751312417a01634d69e4906e068de214409749ce0f5 SHA512 3b50d6a0949d00ca4eb8bccc7c75a4e4b91e7379c56a8455b9c219cc7c1228186a86aaa6ed5d55fbc91f026a1faf7960d775ee47b741ab1d76f1a085a96dec92 WHIRLPOOL d7c7081a31b891aed5d6b1ebd0af74f82d67cb43a0551fb3218949a8ef7f7c52c6ecc92d200733965a0b256ed8db281fe1492c858a65835b01f55cdac2ffc2d9 -MISC metadata.xml 734 SHA256 7850abd55e656b9360deafb278c98598922eb3b6f884d024d199110afdcf6ff0 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1 WHIRLPOOL ce0e36bc0ae83b73aee7abee391d1b0a384f0277dfb7f7282043624a523699685d866ef3291a02e9ad1bde3abf196b47e1351f646e0149f942a40ed4dc940a37 diff --git a/app-shells/bash/bash-4.3_p42-r2.ebuild b/app-shells/bash/bash-4.3_p42-r2.ebuild deleted file mode 100644 index 5e590c6..0000000 --- a/app-shells/bash/bash-4.3_p42-r2.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs multilib prefix - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -patches() { - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} - [[ ${plevel} -eq 0 ]] && return 1 - eval set -- {1..${plevel}} - set -- $(printf "${pn}${pv/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do - printf "${u}/${pn}-${pv}-patches/%s " "$@" - done - fi -} - -# The version of readline this bash normally ships with. -READLINE_VER="6.3" - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" -SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" -[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-${READLINE_VER} ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !<sys-apps/portage-2.1.6.7_p1 - !<sys-apps/paludis-0.26.0_alpha5" -# we only need yacc when the .y files get patched (bash42-005) -DEPEND+=" virtual/yacc" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if is-flag -malign-double ; then #7332 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this" - eerror "as it breaks LFS (struct stat64) on x86." - die "remove -malign-double from your CFLAGS mr ricer" - fi - if use bashlogger ; then - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." - ewarn "This will log ALL output you enter into the shell, you have been warned." - fi -} - -src_unpack() { - unpack ${MY_P}.tar.gz -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones w/releases. - if [[ ${PV} != *_rc* ]] ; then - rm -rf lib/{readline,termcap}/* - touch lib/{readline,termcap}/Makefile.in # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die - fi - - # Avoid regenerating docs after patches #407985 - sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die - touch -r . doc/* - - epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch - epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch - epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch - epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch - - fprefixify epatch "${FILESDIR}"/${PN}-4.0-configs-prefix.patch - - epatch_user -} - -src_configure() { - local myconf=() - - # For descriptions of these, see config-top.h - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 - append-cppflags \ - -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ - -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ - -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \ - -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \ - -DNON_INTERACTIVE_LOGIN_SHELLS \ - -DSSH_SOURCE_BASHRC \ - -DUSE_MKTEMP -DUSE_MKSTEMP \ - $(use bashlogger && echo -DSYSLOG_HISTORY) - - # Don't even think about building this statically without - # reading Bug 7714 first. If you still build it statically, - # don't come crying to us with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf+=( --disable-nls ) - - # Historically, we always used the builtin readline, but since - # our handling of SONAME upgrades has gotten much more stable - # in the PM (and the readline ebuild itself preserves the old - # libs during upgrades), linking against the system copy should - # be safe. - # Exact cached version here doesn't really matter as long as it - # is at least what's in the DEPEND up above. - export ac_cv_rl_version=${READLINE_VER} - - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses. For the most part, ncurses - # is here because readline needs it. But bash itself calls - # ncurses in one or two small places :(. - - if [[ ${PV} != *_rc* ]] ; then - # Use system readline only with released versions. - myconf+=( --with-installed-readline=. ) - fi - - if use plugins; then - append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash - else - # Disable the plugins logic by hand since bash doesn't - # provide a way of doing it. - export ac_cv_func_dl{close,open,sym}=no \ - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no - sed -i \ - -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ - configure || die - fi - tc-export AR #444070 - econf \ - --docdir='$(datarootdir)'/doc/${PF} \ - --htmldir='$(docdir)/html' \ - --with-curses \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - $(use_enable mem-scramble) \ - $(use_with mem-scramble bash-malloc) \ - $(use_enable readline) \ - $(use_enable readline history) \ - $(use_enable readline bang-history) \ - "${myconf[@]}" -} - -src_compile() { - emake - - if use plugins ; then - emake -C examples/loadables all others - fi -} - -src_install() { - local d f - - default - - dodir /bin - mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/bash_logout - fprefixify doins "${FILESDIR}"/bashrc - keepdir /etc/bash/bashrc.d - insinto /etc/skel - for f in bash{_logout,_profile,rc} ; do - newins "${FILESDIR}"/dot-${f} .${f} - done - - local sed_args=( - -e "s:#${USERLAND}#@::" - -e '/#@/d' - ) - if ! use readline ; then - sed_args+=( #432338 - -e '/^shopt -s histappend/s:^:#:' - -e 's:use_color=true:use_color=false:' - ) - fi - sed -i \ - "${sed_args[@]}" \ - "${ED}"/etc/skel/.bashrc \ - "${ED}"/etc/bash/bashrc || die - - if use plugins ; then - exeinto /usr/$(get_libdir)/bash - doexe $(echo examples/loadables/*.o | sed 's:\.o::g') - insinto /usr/include/bash-plugins - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} - fi - - if use examples ; then - for d in examples/{functions,misc,scripts,startup-files} ; do - exeinto /usr/share/doc/${PF}/${d} - insinto /usr/share/doc/${PF}/${d} - for f in ${d}/* ; do - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then - doexe ${f} - else - doins ${f} - fi - done - done - fi - - doman doc/*.1 - newdoc CWRU/changelog ChangeLog - dosym bash.info /usr/share/info/bashref.info -} - -pkg_preinst() { - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then - mkdir -p "${EROOT}"/etc/bash - mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ - fi - - if [[ -L ${EROOT}/bin/sh ]] ; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp=$(emktemp "${EROOT}"/bin) - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi -} - -pkg_postinst() { - # If /bin/sh does not exist, provide it - if [[ ! -e ${EROOT}/bin/sh ]] ; then - ln -sf bash "${EROOT}"/bin/sh - fi -} diff --git a/app-shells/bash/bash-4.3_p46.ebuild b/app-shells/bash/bash-4.3_p46.ebuild deleted file mode 100644 index b3ef638..0000000 --- a/app-shells/bash/bash-4.3_p46.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils flag-o-matic toolchain-funcs multilib prefix - -# Official patchlevel -# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/ -PLEVEL=${PV##*_p} -MY_PV=${PV/_p*} -MY_PV=${MY_PV/_/-} -MY_P=${PN}-${MY_PV} -[[ ${PV} != *_p* ]] && PLEVEL=0 -patches() { - local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}} - [[ ${plevel} -eq 0 ]] && return 1 - eval set -- {1..${plevel}} - set -- $(printf "${pn}${pv/\.}-%03d " "$@") - if [[ ${opt} == -s ]] ; then - echo "${@/#/${DISTDIR}/}" - else - local u - for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do - printf "${u}/${pn}-${pv}-patches/%s " "$@" - done - fi -} - -# The version of readline this bash normally ships with. -READLINE_VER="6.3" - -DESCRIPTION="The standard GNU Bourne again shell" -HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html" -SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" -[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" - -DEPEND=">=sys-libs/ncurses-5.2-r2 - readline? ( >=sys-libs/readline-${READLINE_VER} ) - nls? ( virtual/libintl )" -RDEPEND="${DEPEND} - !<sys-apps/portage-2.1.6.7_p1 - !<sys-apps/paludis-0.26.0_alpha5" -# we only need yacc when the .y files get patched (bash42-005) -DEPEND+=" virtual/yacc" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if is-flag -malign-double ; then #7332 - eerror "Detected bad CFLAGS '-malign-double'. Do not use this" - eerror "as it breaks LFS (struct stat64) on x86." - die "remove -malign-double from your CFLAGS mr ricer" - fi - if use bashlogger ; then - ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs." - ewarn "This will log ALL output you enter into the shell, you have been warned." - fi -} - -src_unpack() { - unpack ${MY_P}.tar.gz -} - -src_prepare() { - # Include official patches - [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s) - - # Clean out local libs so we know we use system ones w/releases. - if [[ ${PV} != *_rc* ]] ; then - rm -rf lib/{readline,termcap}/* - touch lib/{readline,termcap}/Makefile.in # for config.status - sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die - fi - - # Avoid regenerating docs after patches #407985 - sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die - touch -r . doc/* - - epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch - epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch - epatch "${FILESDIR}"/${PN}-4.3-protos.patch - epatch "$(prefixify_ro "${FILESDIR}"/${PN}-4.0-configs-prefix.patch)" - - epatch_user -} - -src_configure() { - local myconf=() - - # For descriptions of these, see config-top.h - # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426 - append-cppflags \ - -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \ - -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \ - -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \ - -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \ - -DNON_INTERACTIVE_LOGIN_SHELLS \ - -DSSH_SOURCE_BASHRC \ - -DUSE_MKTEMP -DUSE_MKSTEMP \ - $(use bashlogger && echo -DSYSLOG_HISTORY) - - # Don't even think about building this statically without - # reading Bug 7714 first. If you still build it statically, - # don't come crying to us with bugs ;). - #use static && export LDFLAGS="${LDFLAGS} -static" - use nls || myconf+=( --disable-nls ) - - # Historically, we always used the builtin readline, but since - # our handling of SONAME upgrades has gotten much more stable - # in the PM (and the readline ebuild itself preserves the old - # libs during upgrades), linking against the system copy should - # be safe. - # Exact cached version here doesn't really matter as long as it - # is at least what's in the DEPEND up above. - export ac_cv_rl_version=${READLINE_VER} - - # Force linking with system curses ... the bundled termcap lib - # sucks bad compared to ncurses. For the most part, ncurses - # is here because readline needs it. But bash itself calls - # ncurses in one or two small places :(. - - if [[ ${PV} != *_rc* ]] ; then - # Use system readline only with released versions. - myconf+=( --with-installed-readline=. ) - fi - - if use plugins; then - append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash - else - # Disable the plugins logic by hand since bash doesn't - # provide a way of doing it. - export ac_cv_func_dl{close,open,sym}=no \ - ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no - sed -i \ - -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ - configure || die - fi - tc-export AR #444070 - econf \ - --docdir='$(datarootdir)'/doc/${PF} \ - --htmldir='$(docdir)/html' \ - --with-curses \ - $(use_with afs) \ - $(use_enable net net-redirections) \ - --disable-profiling \ - $(use_enable mem-scramble) \ - $(use_with mem-scramble bash-malloc) \ - $(use_enable readline) \ - $(use_enable readline history) \ - $(use_enable readline bang-history) \ - "${myconf[@]}" -} - -src_compile() { - emake - - if use plugins ; then - emake -C examples/loadables all others - fi -} - -src_install() { - local d f - - default - - dodir /bin - mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die - dosym bash /bin/rbash - - insinto /etc/bash - doins "${FILESDIR}"/bash_logout - doins "$(prefixify_ro "${FILESDIR}"/bashrc)" - keepdir /etc/bash/bashrc.d - insinto /etc/skel - for f in bash{_logout,_profile,rc} ; do - newins "${FILESDIR}"/dot-${f} .${f} - done - - local sed_args=( - -e "s:#${USERLAND}#@::" - -e '/#@/d' - ) - if ! use readline ; then - sed_args+=( #432338 - -e '/^shopt -s histappend/s:^:#:' - -e 's:use_color=true:use_color=false:' - ) - fi - sed -i \ - "${sed_args[@]}" \ - "${ED}"/etc/skel/.bashrc \ - "${ED}"/etc/bash/bashrc || die - - if use plugins ; then - exeinto /usr/$(get_libdir)/bash - doexe $(echo examples/loadables/*.o | sed 's:\.o::g') - insinto /usr/include/bash-plugins - doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h} - fi - - if use examples ; then - for d in examples/{functions,misc,scripts,startup-files} ; do - exeinto /usr/share/doc/${PF}/${d} - insinto /usr/share/doc/${PF}/${d} - for f in ${d}/* ; do - if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then - doexe ${f} - else - doins ${f} - fi - done - done - fi - - doman doc/*.1 - newdoc CWRU/changelog ChangeLog - dosym bash.info /usr/share/info/bashref.info -} - -pkg_preinst() { - if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then - mkdir -p "${EROOT}"/etc/bash - mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ - fi - - if [[ -L ${EROOT}/bin/sh ]] ; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp=$(emktemp "${EROOT}"/bin) - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi -} - -pkg_postinst() { - # If /bin/sh does not exist, provide it - if [[ ! -e ${EROOT}/bin/sh ]] ; then - ln -sf bash "${EROOT}"/bin/sh - fi -} diff --git a/app-shells/bash/files/autoconf-mktime-2.53.patch b/app-shells/bash/files/autoconf-mktime-2.53.patch deleted file mode 100644 index 7632b63..0000000 --- a/app-shells/bash/files/autoconf-mktime-2.53.patch +++ /dev/null @@ -1,199 +0,0 @@ -https://bugs.gentoo.org/220040 - ---- a/configure -+++ b/configure -@@ -12393,22 +12393,25 @@ else - #line $LINENO "configure" - #include "confdefs.h" - /* Test program from Paul Eggert and Tony Leneis. */ --#if TIME_WITH_SYS_TIME -+#ifdef TIME_WITH_SYS_TIME - # include <sys/time.h> - # include <time.h> - #else --# if HAVE_SYS_TIME_H -+# ifdef HAVE_SYS_TIME_H - # include <sys/time.h> - # else - # include <time.h> - # endif - #endif - --#if HAVE_UNISTD_H -+#include <limits.h> -+#include <stdlib.h> -+ -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif - --#if !HAVE_ALARM -+#ifndef HAVE_ALARM - # define alarm(X) /* empty */ - #endif - -@@ -12416,6 +12419,7 @@ else - #undef putenv - - static time_t time_t_max; -+static time_t time_t_min; - - /* Values we'll use to set the TZ environment variable. */ - static const char *const tz_strings[] = { -@@ -12424,9 +12428,9 @@ static const char *const tz_strings[] = { - }; - #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - --/* Fail if mktime fails to convert a date in the spring-forward gap. -+/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ --static void -+static int - spring_forward_gap () - { - /* glibc (up to about 1998-10-07) failed this test. */ -@@ -12445,23 +12449,27 @@ spring_forward_gap () - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; -- if (mktime (&tm) == (time_t)-1) -- exit (1); -+ return mktime (&tm) != (time_t) -1; - } - --static void --mktime_test (now) -+static int -+mktime_test1 (now) - time_t now; - { - struct tm *lt; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -- now = time_t_max - now; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -+ return ! (lt = localtime (&now)) || mktime (lt) == now; - } - --static void -+static int -+mktime_test (now) -+ time_t now; -+{ -+ return (mktime_test1 (now) -+ && mktime_test1 ((time_t) (time_t_max - now)) -+ && mktime_test1 ((time_t) (time_t_min + now))); -+} -+ -+static int - irix_6_4_bug () - { - /* Based on code from Ariel Faigon. */ -@@ -12474,11 +12482,10 @@ irix_6_4_bug () - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); -- if (tm.tm_mon != 2 || tm.tm_mday != 31) -- exit (1); -+ return tm.tm_mon == 2 && tm.tm_mday == 31; - } - --static void -+static int - bigtime_test (j) - int j; - { -@@ -12500,8 +12507,39 @@ bigtime_test (j) - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) -- exit (1); -+ return 0; - } -+ return 1; -+} -+ -+static int -+year_2050_test () -+{ -+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, -+ ignoring leap seconds. */ -+ unsigned long int answer = 2527315200UL; -+ -+ struct tm tm; -+ time_t t; -+ tm.tm_year = 2050 - 1900; -+ tm.tm_mon = 2 - 1; -+ tm.tm_mday = 1; -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ -+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" -+ instead of "TZ=America/Vancouver" in order to detect the bug even -+ on systems that don't support the Olson extension, or don't have the -+ full zoneinfo tables installed. */ -+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); -+ -+ t = mktime (&tm); -+ -+ /* Check that the result is either a failure, or close enough -+ to the correct answer that we can assume the discrepancy is -+ due to leap seconds. */ -+ return (t == (time_t) -1 -+ || (0 < t && answer - 120 <= t && t <= answer + 120)); - } - - int -@@ -12515,9 +12553,15 @@ main () - isn't worth using anyway. */ - alarm (60); - -- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) -- continue; -- time_t_max--; -+ for (;;) -+ { -+ t = (time_t_max << 1) + 1; -+ if (t <= time_t_max) -+ break; -+ time_t_max = t; -+ } -+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -+ - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { -@@ -12525,17 +12569,22 @@ main () - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) -- mktime_test (t); -- mktime_test ((time_t) 60 * 60); -- mktime_test ((time_t) 60 * 60 * 24); -- -- for (j = 1; 0 < j; j *= 2) -- bigtime_test (j); -- bigtime_test (j - 1); -+ if (! mktime_test (t)) -+ return 1; -+ if (! (mktime_test ((time_t) 1) -+ && mktime_test ((time_t) (60 * 60)) -+ && mktime_test ((time_t) (60 * 60 * 24)))) -+ return 1; -+ -+ for (j = 1; ; j <<= 1) -+ if (! bigtime_test (j)) -+ return 1; -+ else if (INT_MAX / 2 < j) -+ break; -+ if (! bigtime_test (INT_MAX)) -+ return 1; - } -- irix_6_4_bug (); -- spring_forward_gap (); -- exit (0); -+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/app-shells/bash/files/autoconf-mktime-2.59.patch b/app-shells/bash/files/autoconf-mktime-2.59.patch deleted file mode 100644 index 3ac3ad1..0000000 --- a/app-shells/bash/files/autoconf-mktime-2.59.patch +++ /dev/null @@ -1,197 +0,0 @@ -http://bugs.gentoo.org/220040 ---- configure -+++ configure -@@ -5299,26 +6059,25 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - /* Test program from Paul Eggert and Tony Leneis. */ --#if TIME_WITH_SYS_TIME -+#ifdef TIME_WITH_SYS_TIME - # include <sys/time.h> - # include <time.h> - #else --# if HAVE_SYS_TIME_H -+# ifdef HAVE_SYS_TIME_H - # include <sys/time.h> - # else - # include <time.h> - # endif - #endif - --#if HAVE_STDLIB_H --# include <stdlib.h> --#endif -+#include <limits.h> -+#include <stdlib.h> - --#if HAVE_UNISTD_H -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif - --#if !HAVE_ALARM -+#ifndef HAVE_ALARM - # define alarm(X) /* empty */ - #endif - -@@ -5335,9 +6094,9 @@ - }; - #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - --/* Fail if mktime fails to convert a date in the spring-forward gap. -+/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ --static void -+static int - spring_forward_gap () - { - /* glibc (up to about 1998-10-07) failed this test. */ -@@ -5356,29 +6115,27 @@ - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; -- if (mktime (&tm) == (time_t)-1) -- exit (1); -+ return mktime (&tm) != (time_t) -1; - } - --static void -+static int - mktime_test1 (now) - time_t now; - { - struct tm *lt; -- if ((lt = localtime (&now)) && mktime (lt) != now) -- exit (1); -+ return ! (lt = localtime (&now)) || mktime (lt) == now; - } - --static void -+static int - mktime_test (now) - time_t now; - { -- mktime_test1 (now); -- mktime_test1 ((time_t) (time_t_max - now)); -- mktime_test1 ((time_t) (time_t_min + now)); -+ return (mktime_test1 (now) -+ && mktime_test1 ((time_t) (time_t_max - now)) -+ && mktime_test1 ((time_t) (time_t_min + now))); - } - --static void -+static int - irix_6_4_bug () - { - /* Based on code from Ariel Faigon. */ -@@ -5391,11 +6148,10 @@ - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); -- if (tm.tm_mon != 2 || tm.tm_mday != 31) -- exit (1); -+ return tm.tm_mon == 2 && tm.tm_mday == 31; - } - --static void -+static int - bigtime_test (j) - int j; - { -@@ -5417,8 +6173,39 @@ - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) -- exit (1); -+ return 0; - } -+ return 1; -+} -+ -+static int -+year_2050_test () -+{ -+ /* The correct answer for 2050-02-01 00:00:00 in Pacific time, -+ ignoring leap seconds. */ -+ unsigned long int answer = 2527315200UL; -+ -+ struct tm tm; -+ time_t t; -+ tm.tm_year = 2050 - 1900; -+ tm.tm_mon = 2 - 1; -+ tm.tm_mday = 1; -+ tm.tm_hour = tm.tm_min = tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ -+ /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" -+ instead of "TZ=America/Vancouver" in order to detect the bug even -+ on systems that don't support the Olson extension, or don't have the -+ full zoneinfo tables installed. */ -+ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); -+ -+ t = mktime (&tm); -+ -+ /* Check that the result is either a failure, or close enough -+ to the correct answer that we can assume the discrepancy is -+ due to leap seconds. */ -+ return (t == (time_t) -1 -+ || (0 < t && answer - 120 <= t && t <= answer + 120)); - } - - int -@@ -5432,12 +6219,15 @@ - isn't worth using anyway. */ - alarm (60); - -- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) -- continue; -- time_t_max--; -- if ((time_t) -1 < 0) -- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) -- continue; -+ for (;;) -+ { -+ t = (time_t_max << 1) + 1; -+ if (t <= time_t_max) -+ break; -+ time_t_max = t; -+ } -+ time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -+ - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { -@@ -5445,18 +6235,22 @@ - putenv (tz_strings[i]); - - for (t = 0; t <= time_t_max - delta; t += delta) -- mktime_test (t); -- mktime_test ((time_t) 1); -- mktime_test ((time_t) (60 * 60)); -- mktime_test ((time_t) (60 * 60 * 24)); -- -- for (j = 1; 0 < j; j *= 2) -- bigtime_test (j); -- bigtime_test (j - 1); -+ if (! mktime_test (t)) -+ return 1; -+ if (! (mktime_test ((time_t) 1) -+ && mktime_test ((time_t) (60 * 60)) -+ && mktime_test ((time_t) (60 * 60 * 24)))) -+ return 1; -+ -+ for (j = 1; ; j <<= 1) -+ if (! bigtime_test (j)) -+ return 1; -+ else if (INT_MAX / 2 < j) -+ break; -+ if (! bigtime_test (INT_MAX)) -+ return 1; - } -- irix_6_4_bug (); -- spring_forward_gap (); -- exit (0); -+ return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); - } - _ACEOF - rm -f conftest$ac_exeext diff --git a/app-shells/bash/files/bash-4.0-configs-prefix.patch b/app-shells/bash/files/bash-4.0-configs-prefix.patch deleted file mode 100644 index c6ada7c..0000000 --- a/app-shells/bash/files/bash-4.0-configs-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bash-4.0/pathnames.h.in -+++ bash-4.0/pathnames.h.in -@@ -22,10 +22,10 @@ - #define _PATHNAMES_H_ - - /* The default file for hostname completion. */ --#define DEFAULT_HOSTS_FILE "/etc/hosts" -+#define DEFAULT_HOSTS_FILE "@GENTOO_PORTAGE_EPREFIX@/etc/hosts" - - /* The default login shell startup file. */ --#define SYS_PROFILE "/etc/profile" -+#define SYS_PROFILE "@GENTOO_PORTAGE_EPREFIX@/etc/profile" - - /* The default location of the bash debugger initialization/startup file. */ - #define DEBUGGER_START_FILE "@DEBUGGER_START_FILE@" diff --git a/app-shells/bash/files/bash-4.3-append-process-segfault.patch b/app-shells/bash/files/bash-4.3-append-process-segfault.patch deleted file mode 100644 index 6c9b2e8..0000000 --- a/app-shells/bash/files/bash-4.3-append-process-segfault.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2014-08/msg00048.html - -*** ../bash-4.3-patched/execute_cmd.c 2014-07-30 10:26:52.000000000 -0400 ---- execute_cmd.c 2014-08-11 16:55:57.000000000 -0400 -*************** -*** 2406,2410 **** - { - #if defined (JOB_CONTROL) -! append_process (savestring (the_printed_command), dollar_dollar_pid, exec_result, lastpipe_jid); - #endif - lstdin = wait_for (lastpid); ---- 2433,2438 ---- - { - #if defined (JOB_CONTROL) -! if (INVALID_JOB (lastpipe_jid) == 0) -! append_process (savestring (the_printed_command_except_trap), dollar_dollar_pid, exec_result, lastpipe_jid); - #endif - lstdin = wait_for (lastpid); diff --git a/app-shells/bash/files/bash-4.3-arrayfunc.patch b/app-shells/bash/files/bash-4.3-arrayfunc.patch deleted file mode 100644 index f44d184..0000000 --- a/app-shells/bash/files/bash-4.3-arrayfunc.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00178.html - -diff --git a/arrayfunc.c b/arrayfunc.c -index 804e6da..0f900aa 100644 ---- a/arrayfunc.c -+++ b/arrayfunc.c -@@ -498,7 +498,7 @@ assign_compound_array_list (var, nlist, flags) - - for (list = nlist; list; list = list->next) - { -- iflags = flags; -+ iflags = (flags & ~ASS_APPEND); - w = list->word->word; - - /* We have a word of the form [ind]=value */ diff --git a/app-shells/bash/files/bash-4.3-compat-lvl.patch b/app-shells/bash/files/bash-4.3-compat-lvl.patch deleted file mode 100644 index 5734687..0000000 --- a/app-shells/bash/files/bash-4.3-compat-lvl.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00046.html - ---- a/builtins/shopt.def -+++ b/builtins/shopt.def -@@ -160,7 +160,7 @@ static struct { - { "compat32", &shopt_compat32, set_compatibility_level }, - { "compat40", &shopt_compat40, set_compatibility_level }, - { "compat41", &shopt_compat41, set_compatibility_level }, -- { "compat42", &shopt_compat41, set_compatibility_level }, -+ { "compat42", &shopt_compat42, set_compatibility_level }, - #if defined (READLINE) - { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, - { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, diff --git a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch b/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch deleted file mode 100644 index 20bf340..0000000 --- a/app-shells/bash/files/bash-4.3-mapfile-improper-array-name-validation.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://lists.gnu.org/archive/html/bug-bash/2014-11/msg00097.html - ---- bash-4.3/builtins/mapfile.def -+++ bash-4.3/builtins/mapfile.def -@@ -339,7 +339,7 @@ - else - array_name = list->word->word; - -- if (legal_identifier (array_name) == 0 && valid_array_reference (array_name) == 0) -+ if (legal_identifier (array_name) == 0) - { - sh_invalidid (array_name); - return (EXECUTION_FAILURE); diff --git a/app-shells/bash/files/bash-4.3-protos.patch b/app-shells/bash/files/bash-4.3-protos.patch deleted file mode 100644 index 7af84ff..0000000 --- a/app-shells/bash/files/bash-4.3-protos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/redir.c -+++ b/redir.c -@@ -31,6 +31,7 @@ - #endif - #include "filecntl.h" - #include "posixstat.h" -+#include "trap.h" - - #if defined (HAVE_UNISTD_H) - # include <unistd.h> diff --git a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch b/app-shells/bash/files/bash-4.x-deferred-heredocs.patch deleted file mode 100644 index 698d277..0000000 --- a/app-shells/bash/files/bash-4.x-deferred-heredocs.patch +++ /dev/null @@ -1,47 +0,0 @@ -http://bugs.gentoo.org/310197 -http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html - -fix heredocs handling in `set` output - -*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 ---- print_cmd.c 2010-03-22 21:15:30.000000000 -0400 -*************** -*** 114,117 **** ---- 114,123 ---- - #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) - -+ #define PRINT_DEFERRED_HEREDOCS(x) \ -+ do { \ -+ if (deferred_heredocs) \ -+ print_deferred_heredocs (x); \ -+ } while (0) -+ - /* Non-zero means the stuff being printed is inside of a function def. */ - static int inside_function_def; -*************** -*** 561,571 **** - { - print_for_command_head (for_command); -- - cprintf (";"); - newline ("do\n"); - indentation += indentation_amount; - make_command_string_internal (for_command->action); - semicolon (); - indentation -= indentation_amount; - newline ("done"); - } ---- 566,578 ---- - { - print_for_command_head (for_command); - cprintf (";"); - newline ("do\n"); -+ - indentation += indentation_amount; - make_command_string_internal (for_command->action); -+ PRINT_DEFERRED_HEREDOCS (""); - semicolon (); - indentation -= indentation_amount; -+ - newline ("done"); - } diff --git a/app-shells/bash/files/bash_logout b/app-shells/bash/files/bash_logout deleted file mode 100644 index 50a7933..0000000 --- a/app-shells/bash/files/bash_logout +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/bash/bash_logout - -# This file is sourced when a login shell terminates. - -# You may wish to clear everyone's screen when they logout. -#clear - -# Or maybe you want to leave a thoughtful note. -#fortune diff --git a/app-shells/bash/files/bashrc b/app-shells/bash/files/bashrc deleted file mode 100644 index 2bd746d..0000000 --- a/app-shells/bash/files/bashrc +++ /dev/null @@ -1,126 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc -# -# This file is sourced by all *interactive* bash shells on startup, -# including some apparently interactive shells such as scp and rcp -# that can't tolerate any output. So make sure this doesn't display -# anything or bad things will happen ! - - -# Test for an interactive shell. There is no need to set anything -# past this point for scp and rcp, and it's important to refrain from -# outputting anything in those cases. -if [[ $- != *i* ]] ; then - # Shell is non-interactive. Be done now! - return -fi - -# Bash won't get SIGWINCH if another process is in the foreground. -# Enable checkwinsize so that bash will check the terminal size when -# it regains control. #65623 -# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) -shopt -s checkwinsize - -# Disable completion when the input buffer is empty. i.e. Hitting tab -# and waiting a long time for bash to expand all of $PATH. -shopt -s no_empty_cmd_completion - -# Enable history appending instead of overwriting when exiting. #139609 -shopt -s histappend - -# Save each command to the history file as it's executed. #517342 -# This does mean sessions get interleaved when reading later on, but this -# way the history is always up to date. History is not synced across live -# sessions though; that is what `history -n` does. -# Disabled by default due to concerns related to system recovery when $HOME -# is under duress, or lives somewhere flaky (like NFS). Constantly syncing -# the history will halt the shell prompt until it's finished. -#PROMPT_COMMAND='history -a' - -# Change the window title of X terminals -case ${TERM} in - [aEkx]term*|rxvt*|gnome*|konsole*|interix) - PS1='\[\033]0;\u@\h:\w\007\]' - ;; - screen*) - PS1='\[\033k\u@\h:\w\033\\\]' - ;; - *) - unset PS1 - ;; -esac - -# Set colorful PS1 only on colorful terminals. -# dircolors --print-database uses its own built-in database -# instead of using /etc/DIR_COLORS. Try to use the external file -# first to take advantage of user additions. -use_color=false -if type -P dircolors >/dev/null ; then - # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 - LS_COLORS= - if [[ -f ~/.dir_colors ]] ; then - # If you have a custom file, chances are high that it's not the default. - used_default_dircolors="no" - eval "$(dircolors -b ~/.dir_colors)" - elif [[ -f @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS ]] ; then - # People might have customized the system database. - used_default_dircolors="maybe" - eval "$(dircolors -b @GENTOO_PORTAGE_EPREFIX@/etc/DIR_COLORS)" - else - used_default_dircolors="yes" - eval "$(dircolors -b)" - fi - if [[ -n ${LS_COLORS:+set} ]] ; then - use_color=true - - # The majority of systems out there do not customize these files, so we - # want to avoid always exporting the large $LS_COLORS variable. This - # keeps the active env smaller, and it means we don't have to deal with - # running new/old (incompatible) versions of `ls` compared to when we - # last sourced this file. - case ${used_default_dircolors} in - no) ;; - yes) unset LS_COLORS ;; - *) - ls_colors=$(eval "$(dircolors -b)"; echo "${LS_COLORS}") - if [[ ${ls_colors} == "${LS_COLORS}" ]] ; then - unset LS_COLORS - fi - ;; - esac - fi - unset used_default_dircolors -else - # Some systems (e.g. BSD & embedded) don't typically come with - # dircolors so we need to hardcode some terminals in here. - case ${TERM} in - [aEkx]term*|rxvt*|gnome*|konsole*|screen|cons25|*color) use_color=true;; - esac -fi - -if ${use_color} ; then - if [[ ${EUID} == 0 ]] ; then - PS1+='\[\033[01;31m\]\h\[\033[01;34m\] \W \$\[\033[00m\] ' - else - PS1+='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' - fi - - #BSD#@export CLICOLOR=1 - #GNU#@alias ls='ls --color=auto' - alias grep='grep --colour=auto' - alias egrep='egrep --colour=auto' - alias fgrep='fgrep --colour=auto' -else - if [[ ${EUID} == 0 ]] ; then - # show root@ when we don't have colors - PS1+='\u@\h \W \$ ' - else - PS1+='\u@\h \w \$ ' - fi -fi - -for sh in @GENTOO_PORTAGE_EPREFIX@/etc/bash/bashrc.d/* ; do - [[ -r ${sh} ]] && source "${sh}" -done - -# Try to keep environment pollution down, EPA loves us. -unset use_color sh diff --git a/app-shells/bash/files/dot-bash_logout b/app-shells/bash/files/dot-bash_logout deleted file mode 100644 index 44b6f79..0000000 --- a/app-shells/bash/files/dot-bash_logout +++ /dev/null @@ -1,6 +0,0 @@ -# /etc/skel/.bash_logout - -# This file is sourced when a login shell terminates. - -# Clear the screen for security's sake. -clear diff --git a/app-shells/bash/files/dot-bash_profile b/app-shells/bash/files/dot-bash_profile deleted file mode 100644 index 1de05a4..0000000 --- a/app-shells/bash/files/dot-bash_profile +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/skel/.bash_profile - -# This file is sourced by bash for login shells. The following line -# runs your .bashrc and is recommended by the bash info pages. -if [[ -f ~/.bashrc ]] ; then - . ~/.bashrc -fi diff --git a/app-shells/bash/files/dot-bashrc b/app-shells/bash/files/dot-bashrc deleted file mode 100644 index 34dbd8c..0000000 --- a/app-shells/bash/files/dot-bashrc +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/skel/.bashrc -# -# This file is sourced by all *interactive* bash shells on startup, -# including some apparently interactive shells such as scp and rcp -# that can't tolerate any output. So make sure this doesn't display -# anything or bad things will happen ! - - -# Test for an interactive shell. There is no need to set anything -# past this point for scp and rcp, and it's important to refrain from -# outputting anything in those cases. -if [[ $- != *i* ]] ; then - # Shell is non-interactive. Be done now! - return -fi - - -# Put your fun stuff here. diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml deleted file mode 100644 index 9b5e498..0000000 --- a/app-shells/bash/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be - used in restricted environments such as honeypots</flag> - <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag> - <flag name="net">Enable /dev/tcp/host/port redirection</flag> - <flag name="plugins">Add support for loading builtins at runtime via - 'enable'</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:gnu:bash</remote-id> -</upstream> -</pkgmetadata> diff --git a/app-text/convmv/ChangeLog b/app-text/convmv/ChangeLog deleted file mode 100644 index 2153388..0000000 --- a/app-text/convmv/ChangeLog +++ /dev/null @@ -1,128 +0,0 @@ -# ChangeLog for app-text/convmv -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.38 2011/02/06 05:44:18 leio Exp $ - - 06 Feb 2011; Mart Raudsepp <leio@gentoo.org> convmv-1.10.ebuild: - Drop to ~mips - - 21 Feb 2010; Jonathan Callen <abcd@gentoo.org> convmv-1.14.ebuild: - Bump EAPI, add prefix support & keywords - -*convmv-1.14 (28 Jun 2009) - - 28 Jun 2009; Patrick Lauer <patrick@gentoo.org> +convmv-1.14.ebuild: - Bump to 1.14, fixes #272747 - - 07 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> -convmv-1.05.ebuild, - -convmv-1.08.ebuild, -convmv-1.09.ebuild: - Clean up old ebuilds. - -*convmv-1.12 (07 Jun 2008) - - 07 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> convmv-1.10.ebuild, - +convmv-1.12.ebuild: - Version bump per bug #214424, and also clean up syntax. - - 10 Jun 2007; Joshua Kinard <kumba@gentoo.org> convmv-1.10.ebuild: - Stable on mips, per #181572. - - 22 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> convmv-1.10.ebuild: - Stable on Alpha + IA64. - - 23 Nov 2006; <blubb@gentoo.org> convmv-1.10.ebuild: - stable on amd64 - - 17 Nov 2006; nixnut <nixnut@gentoo.org> convmv-1.10.ebuild: - Stable on ppc wrt bug 154981 - - 15 Nov 2006; Tom Gall <tgall@gentoo.org> convmv-1.10.ebuild: - stable on ppc64, bug 154981 - - 15 Nov 2006; Robin H. Johnson <robbat2@gentoo.org> convmv-1.10.ebuild: - Change to use unpack instead of tar in src_test. - - 15 Nov 2006; Jeroen Roovers <jer@gentoo.org> convmv-1.10.ebuild: - Stable for HPPA (bug #154981). - - 13 Nov 2006; Fabian Groffen <grobian@gentoo.org> convmv-1.08.ebuild, - convmv-1.09.ebuild, convmv-1.10.ebuild: - Dropped ppc-macos keyword, see you in prefix. - - 13 Nov 2006; Andrej Kacian <ticho@gentoo.org> convmv-1.10.ebuild: - Stable on x86, bug #154981. - - 13 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> convmv-1.10.ebuild: - Stable on sparc wrt #154981 - - 13 Nov 2006; Robin H. Johnson <robbat2@gentoo.org> - +files/convmv-1.10-testcase-cleanup.patch, convmv-1.10.ebuild: - Bug #151071, fix testsuite making assumptions about filesystem. - - 13 Oct 2006; Markus Rothe <corsair@gentoo.org> convmv-1.09.ebuild: - Stable on ppc64 - - 02 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> convmv-1.10.ebuild: - Redigest for weird CVS failure. - -*convmv-1.10 (01 Oct 2006) - 01 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> +convmv-1.10.ebuild: - Version bump, bug #146168. - - 16 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> convmv-1.09.ebuild: - ppc stable - - 04 Sep 2006; Markus Rothe <corsair@gentoo.org> convmv-1.05.ebuild, - convmv-1.08.ebuild, convmv-1.09.ebuild: - Added ~ppc64 - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> convmv-1.09.ebuild: - Mark 1.09 stable on alpha - -*convmv-1.09 (12 Dec 2005) - - 12 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> +convmv-1.09.ebuild: - Version bump. convmv-1.09.ebuild - - 11 Oct 2005; Fabian Groffen <grobian@gentoo.org> convmv-1.08.ebuild: - Marked ~ppc-macos (bug #108594) - - 09 Sep 2005; Aron Griffis <agriffis@gentoo.org> convmv-1.08.ebuild: - Mark 1.08 stable on alpha - - 03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> convmv-1.08.ebuild: - Stable on ppc. - - 31 Aug 2005; Tom Martin <slarti@gentoo.org> convmv-1.08.ebuild: - Stable on amd64, ia64, sparc. - - 30 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> convmv-1.08.ebuild: - Stable on x86. - - 24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> convmv-1.05.ebuild: - Stable on ppc. - - 21 Apr 2005; Simon Stelling <blubb@gentoo.org> convmv-1.05.ebuild: - stable on amd64 - - 31 Mar 2005; Aron Griffis <agriffis@gentoo.org> convmv-1.05.ebuild: - stable on ia64 - - 02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - -*convmv-1.08 (23 Nov 2004) - 23 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> +convmv-1.08.ebuild: - Bug #66451, new version. old version stable on x86. - - 12 May 2004; Bryan Østergaard <kloeri@gentoo.org> convmv-1.05.ebuild: - Stable on alpha. - - 21 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> convmv-1.05.ebuild: - header fix; arm needs deps first; tidy - -*convmv-1.05 (08 Oct 2003) - - 08 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> convmv-1.05.ebuild, - metadata.xml: - initial commit - diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest deleted file mode 100644 index f4296ad..0000000 --- a/app-text/convmv/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST convmv-1.14.tar.gz 26620 RMD160 3b9c2a89dccad4d0361241a71d588f37450338b0 SHA1 e6261eed4771014e84ffe68aac8041c02fb1834d SHA256 9695f5e24a17c9056f69479efc4c1b60174de1901ad83d8dbd6ecea2fdca7cef -EBUILD convmv-1.14.ebuild 819 RMD160 503747302d74a09395bddb81a844d16567f05211 SHA1 5e72caba66218461d38a54c0e222870bddc33941 SHA256 557dee97feb78ebc74ec8bde781f08490878997db2ceba97da6e3fb903dd7d3d -MISC ChangeLog 4235 RMD160 32d437d96a5ab3429770b482f306c8e2114c5176 SHA1 9ef704e3c808102bd71dea447378eef0ffc998c0 SHA256 ced9f215df38ced4d35970eb0850cef2275cf616ab35bda34030095e32205ce0 -MISC metadata.xml 227 RMD160 f5f0634a711ba86e4b09a18d7041a19d63c9dab7 SHA1 c1ce24553570154843237270b9f43c304d03073b SHA256 f8502ce290838ee791f56f0024d4180c8b6dc32dc7df01d1b6c50519050147f7 diff --git a/app-text/convmv/convmv-1.14.ebuild b/app-text/convmv/convmv-1.14.ebuild deleted file mode 100644 index dde2168..0000000 --- a/app-text/convmv/convmv-1.14.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.14.ebuild,v 1.2 2010/02/21 03:53:20 abcd Exp $ - -EAPI=3 - -inherit eutils - -DESCRIPTION="convert filenames to utf8 or any other charset" -HOMEPAGE="http://j3e.de/linux/convmv" -SRC_URI="http://j3e.de/linux/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux" -IUSE="" - -DEPEND="dev-lang/perl" - -src_prepare() { - sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die -} - -src_install() { - einstall DESTDIR="${D}" PREFIX="${EPREFIX}"/usr || die "einstall failed" - dodoc CREDITS Changes TODO VERSION -} - -src_test() { - unpack ./testsuite.tar - - cd "${S}"/suite - ./dotests.sh || die "Tests failed" -} diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml deleted file mode 100644 index 0ef469f..0000000 --- a/app-text/convmv/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> - <herd>no-herd</herd> -<maintainer> - <email>robbat2@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/dev-embedded/u-boot-tools/ChangeLog b/dev-embedded/u-boot-tools/ChangeLog deleted file mode 100644 index 5593651..0000000 --- a/dev-embedded/u-boot-tools/ChangeLog +++ /dev/null @@ -1,105 +0,0 @@ -# ChangeLog for dev-embedded/u-boot-tools -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/ChangeLog,v 1.20 2011/10/14 22:29:35 vapier Exp $ - -*u-boot-tools-2011.09 (14 Oct 2011) - - 14 Oct 2011; Mike Frysinger <vapier@gentoo.org> - +files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch, - +files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch, - +files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch, - +u-boot-tools-2011.09.ebuild: - Version bump. - - 14 Oct 2011; Mike Frysinger <vapier@gentoo.org> u-boot-tools-2011.06.ebuild: - Stabilize for all. - -*u-boot-tools-2011.06 (21 Aug 2011) - - 21 Aug 2011; Tim Harder <radhermit@gentoo.org> +u-boot-tools-2011.06.ebuild: - Version bump - -*u-boot-tools-2010.12 (14 Mar 2011) - - 14 Mar 2011; Tim Harder <radhermit@gentoo.org> -u-boot-tools-2009.03.ebuild, - -u-boot-tools-2009.11.1.ebuild, +u-boot-tools-2010.12.ebuild: - Version bump (bug #355669 by Jacob Galbreath) and remove old. Update to EAPI - 4 and remove unnecessary compile setup and die usage. - - 07 Mar 2011; Raúl Porcel <armin76@gentoo.org> u-boot-tools-2010.06.ebuild: - x86stable wrt #355671 - - 06 Mar 2011; Michael Weber <xmw@gentoo.org> u-boot-tools-2010.06.ebuild: - arm stable (bug 355671) - - 21 Feb 2011; Markos Chandras <hwoarang@gentoo.org> - u-boot-tools-2010.06.ebuild: - Stable on amd64 wrt bug #355671 - -*u-boot-tools-2010.06 (15 Aug 2010) - - 15 Aug 2010; Mike Frysinger <vapier@gentoo.org> +u-boot-tools-2010.06.ebuild: - Version bump #319647 by Jesse Adelman. - -*u-boot-tools-2009.11.1 (05 Jun 2010) - - 05 Jun 2010; Raúl Porcel <armin76@gentoo.org> - +u-boot-tools-2009.11.1.ebuild: - Version bump - -*u-boot-tools-2009.08 (04 Sep 2009) - - 04 Sep 2009; Mike Frysinger <vapier@gentoo.org> - +u-boot-tools-2009.08.ebuild: - Version bump. - -*u-boot-tools-2009.08_rc3 (26 Aug 2009) - - 26 Aug 2009; Raúl Porcel <armin76@gentoo.org> - +u-boot-tools-2009.08_rc3.ebuild: - Version bump - -*u-boot-tools-2009.06 (19 Jul 2009) - - 19 Jul 2009; Mike Frysinger <vapier@gentoo.org> - +u-boot-tools-2009.06.ebuild: - Version bump. - - 07 May 2009; Raúl Porcel <armin76@gentoo.org> - u-boot-tools-2009.03.ebuild: - amd64/arm/x86 stable - -*u-boot-tools-2009.03 (29 Mar 2009) - - 29 Mar 2009; Raúl Porcel <armin76@gentoo.org> - +u-boot-tools-2009.03.ebuild: - Version bump - -*u-boot-tools-2009.01 (16 Mar 2009) - - 16 Mar 2009; Raúl Porcel <armin76@gentoo.org> - +u-boot-tools-2009.01.ebuild: - Version bump wrt #258414 - - 25 Nov 2008; Raúl Porcel <armin76@gentoo.org> - u-boot-tools-2008.10.ebuild: - arm stable - - 26 Oct 2008; Markus Meier <maekke@gentoo.org> u-boot-tools-1.3.1.ebuild: - amd64/x86 stable, bug #242518 - -*u-boot-tools-2008.10 (26 Oct 2008) - - 26 Oct 2008; Mike Frysinger <vapier@gentoo.org> - +u-boot-tools-2008.10.ebuild: - Version bump. - - 12 May 2008; <solar@gentoo.org> u-boot-tools-1.3.1.ebuild: - - keyworded ~arm per request. Builds native but fails at cross-compiles. - TODO: Fix CROSS_COMPILE= logic to allow the variable to be passed so it gets - the right CTARGET-CC - -*u-boot-tools-1.3.1 (24 Dec 2007) - - 24 Dec 2007; Mike Frysinger <vapier@gentoo.org> +u-boot-tools-1.3.1.ebuild: - Initial import. Ebuild by me. diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest deleted file mode 100644 index 0a84963..0000000 --- a/dev-embedded/u-boot-tools/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX 2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch 2988 RMD160 88742bf92ebd9286033f93338564c0a53bbee8d8 SHA1 8e6ffb9944b2c550efe04b43d336363c7bc5d2ad SHA256 c115ca451fd71b0e660321c11828cf703e26ff96563666aa6f0c5a49d7fdad33 -AUX 2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch 1211 RMD160 4f216364912bf6b4ce497bdbd0ff461ad1c1ed3b SHA1 78f7160cd070faf31f189720c7d4b833cd25681b SHA256 63c1770b41b4fba383d1ac78530e54b7e44a7dbd351d83fdad9036aa588b4bd3 -AUX 2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch 1933 RMD160 38f39a49afa683b3e7c656152bf278a5cd746589 SHA1 fdd31de13952c4eb35040f723235eb5de622f30a SHA256 a1f1dd216604b0b6cc1983bf269589fbf2117962713d0bc7b31f60d8c21729f6 -DIST u-boot-2011.09.tar.bz2 8430168 RMD160 30a56bae6615b1e70c928e0f93a0676d1ee98a1d SHA1 9cd450c74f7c572df3b28701e641b03b42393d10 SHA256 6223d0141d2451dde6a9bfb8abbbdbc3696e1c3d289744d1918296561306ab4b -EBUILD u-boot-tools-2011.09.ebuild 1005 RMD160 2dc151d1169a4168d4bee2082b70afd759e9c804 SHA1 8cbcb04ffd911745405926df145fd1a0d40441f1 SHA256 5e2b13a72e941fb804d7d4c8c7e0f13962de92a7ab65e89f61c85e13aab6c193 -MISC ChangeLog 3277 RMD160 756eb2cb67b5b30a631054c4b788f1aab829c5ec SHA1 fdd396f43677f52a2b24ac5558ef9dbccdb2a31c SHA256 282b266009f1f947a339a807d69fb520b259c8a3c1120dd7255c4f210279dcb3 -MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a diff --git a/dev-embedded/u-boot-tools/files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch b/dev-embedded/u-boot-tools/files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch deleted file mode 100644 index 95ff18e..0000000 --- a/dev-embedded/u-boot-tools/files/2011.09/0001-Build-timestamp_autogenerated.h-without-config.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 60b382058c223625aedeb0162f493edce9c7a991 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org> -Date: Mon, 3 Oct 2011 11:57:10 +0200 -Subject: [PATCH 1/3] Build timestamp_autogenerated.h without config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Tools such as mkimage include version information but are -config-agnostic; build timestamp_autogenerated.h even when config.mk -isn't generated to fix "make tools" build failure: -gcc [...] -o mkimage.o mkimage.c -c -In file included from include/version.h:27:0, from mkimage.c:26: -include/timestamp.h:27:37: fatal error: timestamp_autogenerated.h: No -such file or directory - -Cc: patches@linaro.org -Signed-off-by: Loïc Minier <loic.minier@linaro.org> -Acked-by: Mike Frysinger <vapier@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index b5fb288..a2d2cd7 100644 ---- a/Makefile -+++ b/Makefile -@@ -141,7 +141,7 @@ SUBDIRS = tools \ - examples/standalone \ - examples/api - --.PHONY : $(SUBDIRS) $(VERSION_FILE) -+.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE) - - ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk)) - -@@ -294,7 +294,7 @@ LIBS += $(CPUDIR)/s5p-common/libs5p-common.o - endif - - LIBS := $(addprefix $(obj),$(sort $(LIBS))) --.PHONY : $(LIBS) $(TIMESTAMP_FILE) -+.PHONY : $(LIBS) - - LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o - LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) -@@ -459,10 +459,6 @@ $(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl - $(obj)spl/u-boot-spl.bin: depend - $(MAKE) -C spl all - --$(TIMESTAMP_FILE): -- @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@ -- @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@ -- - updater: - $(MAKE) -C tools/updater all - -@@ -553,12 +549,12 @@ $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s: $(obj)include/autoconf.mk.dep - else # !config.mk - all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \ - $(obj)u-boot.img $(obj)u-boot.dis $(obj)u-boot \ --$(filter-out tools,$(SUBDIRS)) $(TIMESTAMP_FILE) \ -+$(filter-out tools,$(SUBDIRS)) \ - updater depend dep tags ctags etags cscope $(obj)System.map: - @echo "System not configured - see README" >&2 - @ exit 1 - --tools: $(VERSION_FILE) -+tools: $(VERSION_FILE) $(TIMESTAMP_FILE) - $(MAKE) -C $@ all - endif # config.mk - -@@ -576,11 +572,16 @@ $(VERSION_FILE): - '$(shell $(LD) -v | head -n 1)' )>> $@.tmp - @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ - -+$(TIMESTAMP_FILE): -+ @mkdir -p $(dir $(TIMESTAMP_FILE)) -+ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@ -+ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@ -+ - easylogo env gdb: - $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION} - gdbtools: gdb - --tools-all: easylogo env gdb $(VERSION_FILE) -+tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE) - $(MAKE) -C tools HOST_TOOLS_ALL=y - - .PHONY : CHANGELOG --- -1.7.6.1 - diff --git a/dev-embedded/u-boot-tools/files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch b/dev-embedded/u-boot-tools/files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch deleted file mode 100644 index b359ddb..0000000 --- a/dev-embedded/u-boot-tools/files/2011.09/0002-Safer-timestamp_autogenerated.h-generation.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 205c4b02cd165b8641f08c3aee48d5ed6bd603bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org> -Date: Mon, 3 Oct 2011 11:57:11 +0200 -Subject: [PATCH 2/3] Safer timestamp_autogenerated.h generation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Generate timestamp_autogenerated.h as safely as version_autogenerated.h. - -Cc: patches@linaro.org -Signed-off-by: Loïc Minier <loic.minier@linaro.org> -Acked-by: Mike Frysinger <vapier@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - Makefile | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index a2d2cd7..845789d 100644 ---- a/Makefile -+++ b/Makefile -@@ -574,8 +574,9 @@ $(VERSION_FILE): - - $(TIMESTAMP_FILE): - @mkdir -p $(dir $(TIMESTAMP_FILE)) -- @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@ -- @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@ -+ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@.tmp -+ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@.tmp -+ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ - - easylogo env gdb: - $(MAKE) -C tools/$@ all MTD_VERSION=${MTD_VERSION} --- -1.7.6.1 - diff --git a/dev-embedded/u-boot-tools/files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch b/dev-embedded/u-boot-tools/files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch deleted file mode 100644 index 2eca356..0000000 --- a/dev-embedded/u-boot-tools/files/2011.09/0003-ublimage-NAND-block-size-isn-t-set-at-build-time.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 4195b47f8aad7e83b54c62f793c3b249838afc84 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <loic.minier@linaro.org> -Date: Mon, 3 Oct 2011 11:57:12 +0200 -Subject: [PATCH 3/3] ublimage: NAND block size isn't set at build-time -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -mkimage's ublimage support can't depend of build-time board configs; -instead, this should be set in ublimage.cfg. Since currently no configs -in u-boot override the NAND block size, hardcode it as such in -ublimage.h to fix a build failure with "make tools": -gcc [...] -o ublimage.o ublimage.c -c -In file included from ublimage.c:37:0: -ublimage.h:31:20: fatal error: config.h: No such file or directory - -Cc: Heiko Schocher <hs@denx.de> -Cc: patches@linaro.org -Signed-off-by: Loïc Minier <loic.minier@linaro.org> -Acked-by: Heiko Schocher <hs@denx.de> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - tools/ublimage.h | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/tools/ublimage.h b/tools/ublimage.h -index c926689..93ec8ee 100644 ---- a/tools/ublimage.h -+++ b/tools/ublimage.h -@@ -28,12 +28,6 @@ - #ifndef _UBLIMAGE_H_ - #define _UBLIMAGE_H_ - --#include <config.h> -- --#if !defined(CONFIG_SYS_UBL_BLOCK) --#define CONFIG_SYS_UBL_BLOCK 512 --#endif -- - enum ublimage_cmd { - CMD_INVALID, - CMD_BOOT_MODE, -@@ -71,6 +65,9 @@ enum ublimage_fld_types { - /* Define max UBL image size */ - #define UBL_IMAGE_SIZE (0x00003800u) - -+/* one NAND block */ -+#define UBL_BLOCK_SIZE 512 -+ - /* from sprufg5a.pdf Table 109 */ - struct ubl_header { - uint32_t magic; /* Magic Number, see UBL_* defines */ -@@ -97,7 +94,7 @@ struct ubl_header { - * Magic Number indicates fast EMIF boot). - */ - /* to fit in one nand block */ -- unsigned char res[CONFIG_SYS_UBL_BLOCK - 8 * 4]; -+ unsigned char res[UBL_BLOCK_SIZE - 8 * 4]; - }; - - #endif /* _UBLIMAGE_H_ */ --- -1.7.6.1 - diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml deleted file mode 100644 index 9211408..0000000 --- a/dev-embedded/u-boot-tools/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>dev-embedded</herd> -</pkgmetadata> diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2011.09.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2011.09.ebuild deleted file mode 100644 index adb6b84..0000000 --- a/dev-embedded/u-boot-tools/u-boot-tools-2011.09.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/u-boot-tools/u-boot-tools-2011.09.ebuild,v 1.1 2011/10/14 22:29:35 vapier Exp $ - -EAPI="4" - -inherit toolchain-funcs eutils - -MY_P="u-boot-${PV/_/-}" -DESCRIPTION="utilities for working with Das U-Boot" -HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome" -SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PV}/*.patch - sed -i -e "s:-g ::" tools/Makefile || die -} - -src_compile() { - emake \ - HOSTSTRIP=echo \ - HOSTCC="$(tc-getCC)" \ - HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \ - HOSTLDFLAGS="${LDFLAGS}" \ - tools-all -} - -src_install() { - cd tools - dobin bmp_logo gen_eth_addr img2srec mkimage - dobin easylogo/easylogo - dobin env/fw_printenv - dosym fw_printenv /usr/bin/fw_setenv - insinto /etc - doins env/fw_env.config -} diff --git a/dev-java/ecj-gcj/ChangeLog b/dev-java/ecj-gcj/ChangeLog deleted file mode 100644 index 75cd34d..0000000 --- a/dev-java/ecj-gcj/ChangeLog +++ /dev/null @@ -1,42 +0,0 @@ -# ChangeLog for dev-java/ecj-gcj -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ChangeLog,v 1.4 2012/05/12 12:12:13 sera Exp $ - - 12 May 2012; Ralph Sennhauser <sera@gentoo.org> +files/ecj-gcj-3.6: - Add missing ecj-gcj-3.6. Thanks to genstorm - -*ecj-gcj-3.6 (06 May 2012) - - 06 May 2012; Ralph Sennhauser <sera@gentoo.org> +ecj-gcj-3.6.ebuild: - Version bump. Import from java-overlay. - - 15 Apr 2012; Mike Frysinger <vapier@gentoo.org> ecj-gcj-3.5.2-r2.ebuild: - Add back ia64 love #349020 by Dennis Schridde. - -*ecj-gcj-3.5.2-r2 (31 Oct 2010) - - 31 Oct 2010; Vlastimil Babka <caster@gentoo.org> +files/ecj-gcj-3.5, - +ecj-gcj-3.5.2-r2.ebuild, +metadata.xml: - Move from java-overlay. - - 14 Sep 2010; Vlastimil Babka <caster@gentoo.org> +files/ecj-gcj-3.5-r1, - +ecj-gcj-3.5.2-r2.ebuild: - Revbump to fix CLASSPATH handling, fixes e.g. build of ant-core. - - 01 Apr 2010; Vlastimil Babka <caster@gentoo.org> ecj-gcj-3.5.2-r1.ebuild: - Block the former eclipse-ecj:3.5[gcj] ebuild to prevent file collisions. - Downgrade eclipse-ecj:3.5 to the main tree version if you hit the block. - - 01 Apr 2010; Vlastimil Babka <caster@gentoo.org> +ecj-gcj-3.5.2-r1.ebuild: - Revbump to ensure everyone gets the changes. Remove dependencies on jdk/jre - and use gcj manually to compile, to break circular deps. Put back the native - flag (enabled by default) for troubleshooting / low memory cases. - - 01 Apr 2010; Andrew John Hughes <andrew@gentoo.org> -ecj-gcj-3.5.2.ebuild: - Use new ecj-3.5 ebuild as basis, not old native binary version. - - 22 Mar 2010; Vlastimil Babka <caster@gentoo.org> +ecj-gcj-3.5.2.ebuild, - +files/ecj-gcj, +metadata.xml: - New package, a subset of eclipse-ecj that can be compiled and used with - gcj-jdk. - diff --git a/dev-java/ecj-gcj/Manifest b/dev-java/ecj-gcj/Manifest deleted file mode 100644 index cb541cb..0000000 --- a/dev-java/ecj-gcj/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX ecj-gcj-3.5 723 RMD160 fb62d5bf35ef27f96c574b774410a0a1931d0e2d SHA1 713b2a237296af6d6745d31bf21447a0f4faeeb6 SHA256 6272829cdc298abd20683a78d3d159bcd4c29f96478e20428d4214c743cce21b -AUX ecj-gcj-3.6 771 RMD160 6778575d6bc7fccd9239aacf9c6d37f8ea6feadd SHA1 6edb13ee4de3db9aab5870c9715b579fedbe7123 SHA256 814eebbd0e9f6f3eb7e573d7258157b82609e0023a533eb3dffd230db8774c80 -DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74 -DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242 -EBUILD ecj-gcj-3.5.2-r2.ebuild 2790 RMD160 5813b257d32760fc443625aae12a563933ec7ca7 SHA1 2a4a38b0999d628c53d469f37e1c62bb14c36e50 SHA256 4a93bf9d49d9ef0bb8c5272661601812b98884a33db39b7f51646ed459a759ca -EBUILD ecj-gcj-3.6.ebuild 2878 RMD160 a44022e335984c2261a4d3bae25dbccdd0d5f660 SHA1 142f446be4dee48b8fcaccbcbeefb0b0de02f715 SHA256 168c4947f8d422c83e8a1d86a666cb1ecf252d7ab9c691c98958a017af927016 -MISC ChangeLog 1798 RMD160 f2e29e676720b7763a836e0d9a3f24449b092f52 SHA1 382a20080da09f3253fbb8d52303065758192dbd SHA256 8459db5ea4070d0043991de1117991d6c457ec091504d12a010859df55e86a0b -MISC metadata.xml 328 RMD160 d09d8ec2e29ba96d03ede0ce6ddfc93c07c3436f SHA1 3a1c230643120b795fa9e2d835bb817b44dd560e SHA256 11219fb9b559b3e9737938e679434957b00c212473c71995cc4deeb734e60399 diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild deleted file mode 100644 index 5d57788..0000000 --- a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.5.2-r2.ebuild,v 1.2 2012/04/15 17:50:45 vapier Exp $ - -EAPI=2 - -inherit java-pkg-2 toolchain-funcs - -MY_PN="ecj" -DMF="R-${PV}-201002111343" -S="${WORKDIR}" - -DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk" -HOMEPAGE="http://www.eclipse.org/" -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip" - -IUSE="+native userland_GNU" - -LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" -SLOT="3.5" - -MY_PS="${MY_PN}-${SLOT}" - -# for compatibility with java eclass functions -JAVA_PKG_WANT_SOURCE=1.4 -JAVA_PKG_WANT_TARGET=1.4 - -CDEPEND="sys-devel/gcc[gcj] - >=app-admin/eselect-ecj-0.6" -DEPEND="${CDEPEND} - app-arch/unzip - userland_GNU? ( sys-apps/findutils ) - !dev-java/eclipse-ecj:3.5[gcj]" -RDEPEND="${CDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - # We don't need the ant adapter here - rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -fr org/eclipse/jdt/internal/antadapter || die - - # upstream build.xml excludes this - rm -f META-INF/eclipse.inf || die - - # these java6 specific classes cannot compile with ecj - rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die -} - -src_compile() { - local javac_opts javac java jar - - local gccbin=$(gcc-config -B) - local gccver=$(gcc-fullversion) - - local gcj="${gccbin}/gcj" - javac="${gcj} -C" - jar="${gccbin}/gjar" - java="${gccbin}/gij" - - mkdir -p bootstrap || die - cp -pPR org bootstrap || die - cd "${S}/bootstrap" || die - - einfo "bootstrapping ${MY_PN} with ${javac} ..." - ${javac} ${javac_opts} $(find org/ -name '*.java') || die - find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\ - xargs ${jar} cf ${MY_PN}.jar - - cd "${S}" || die - - einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..." - ${java} -classpath bootstrap/${MY_PN}.jar \ - org.eclipse.jdt.internal.compiler.batch.Main \ - ${javac_opts} -nowarn org || die - find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\ - xargs ${jar} cf ${MY_PN}.jar - - if use native; then - einfo "Building native ${MY_PS} library, patience needed ..." - ${gcj} ${CFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \ - -o ${MY_PS}.so ${MY_PN}.jar || die - fi -} - -src_install() { - java-pkg_dojar ${MY_PN}.jar - dobin "${FILESDIR}/${PN}-${SLOT}" - use native && dolib.so ${MY_PS}.so -} - -pkg_postinst() { - if use native; then - $(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \ - /usr/share/${PN}-${SLOT}/lib/ecj.jar \ - /usr/$(get_libdir)/${MY_PN}-${SLOT}.so - fi - - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ${PN}-${SLOT} -} - -pkg_postrm() { - eselect ecj update -} diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild deleted file mode 100644 index a3cb737..0000000 --- a/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ecj-gcj/ecj-gcj-3.6.ebuild,v 1.1 2012/05/06 17:41:31 sera Exp $ - -EAPI=4 - -inherit java-pkg-2 toolchain-funcs prefix - -MY_PN="ecj" -DMF="R-${PV}-201006080911" -S="${WORKDIR}" - -DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk" -HOMEPAGE="http://www.eclipse.org/" -SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip" - -IUSE="+native userland_GNU" - -LICENSE="EPL-1.0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" -SLOT="3.6" - -MY_PS="${MY_PN}-${SLOT}" - -# for compatibility with java eclass functions -JAVA_PKG_WANT_SOURCE=1.4 -JAVA_PKG_WANT_TARGET=1.4 - -CDEPEND="sys-devel/gcc[gcj] - >=app-admin/eselect-ecj-0.6" -DEPEND="${CDEPEND} - app-arch/unzip - userland_GNU? ( sys-apps/findutils ) - !dev-java/eclipse-ecj:3.5[gcj]" -RDEPEND="${CDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - # We don't need the ant adapter here - rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die - rm -fr org/eclipse/jdt/internal/antadapter || die - - # upstream build.xml excludes this - rm -f META-INF/eclipse.inf || die - - # these java6 specific classes cannot compile with ecj - rm -fr org/eclipse/jdt/internal/compiler/{apt,tool}/ || die -} - -src_compile() { - local javac_opts javac java jar - - local gccbin=$(gcc-config -B) - local gccver=$(gcc-fullversion) - - local gcj="${gccbin}/gcj" - javac="${gcj} -C --encoding=ISO-8859-1" - jar="${gccbin}/gjar" - java="${gccbin}/gij" - - mkdir -p bootstrap || die - cp -pPR org bootstrap || die - cd "${S}/bootstrap" || die - - einfo "bootstrapping ${MY_PN} with ${javac} ..." - ${javac} ${javac_opts} $(find org/ -name '*.java') || die - find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\ - xargs ${jar} cf ${MY_PN}.jar - - cd "${S}" || die - - einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..." - ${java} -classpath bootstrap/${MY_PN}.jar \ - org.eclipse.jdt.internal.compiler.batch.Main \ - ${javac_opts} -nowarn org || die - find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' |\ - xargs ${jar} cf ${MY_PN}.jar - - if use native; then - einfo "Building native ${MY_PS} library, patience needed ..." - ${gcj} ${CFLAGS} -findirect-dispatch -shared -fPIC -Wl,-Bsymbolic \ - -o ${MY_PS}.so ${MY_PN}.jar || die - fi -} - -src_install() { - java-pkg_dojar ${MY_PN}.jar - dobin "${FILESDIR}/${PN}-${SLOT}" - eprefixify "${ED}/usr/bin/${PN}-${SLOT}" - use native && dolib.so ${MY_PS}.so -} - -pkg_postinst() { - if use native; then - $(gcc-config -B)/gcj-dbtool -a $(gcj-dbtool -p) \ - "${EPREFIX}"/usr/share/${PN}-${SLOT}/lib/ecj.jar \ - "${EPREFIX}"/usr/$(get_libdir)/${MY_PN}-${SLOT}.so - fi - - einfo "To select between slots of ECJ..." - einfo " # eselect ecj" - - eselect ecj update ${PN}-${SLOT} -} - -pkg_postrm() { - eselect ecj update -} diff --git a/dev-java/ecj-gcj/files/ecj-gcj-3.5 b/dev-java/ecj-gcj/files/ecj-gcj-3.5 deleted file mode 100644 index bbb3225..0000000 --- a/dev-java/ecj-gcj/files/ecj-gcj-3.5 +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular -# so we fallback to gcc-config discovery -GIJ_BIN="/usr/bin/gij" -if [[ ! -f ${GIJ_BIN} ]]; then - GIJ_BIN="$(gcc-config -B)/gij" -fi -if [[ ! -f ${GIJ_BIN} ]]; then - echo "gij not found! check that gcc is compiled with gcj flag" - exit 1 -fi -# calling java-config would be an unnecessary slowdown here - -# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter -# this breaks e.g. bootstrap of ant-core -ecj_cp="/usr/share/ecj-gcj-3.5/lib/ecj.jar" -if [[ -n "${CLASSPATH}" ]]; then - ecj_cp="${ecj_cp}:${CLASSPATH}" -fi - -${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}" diff --git a/dev-java/ecj-gcj/files/ecj-gcj-3.6 b/dev-java/ecj-gcj/files/ecj-gcj-3.6 deleted file mode 100644 index 35b1810..0000000 --- a/dev-java/ecj-gcj/files/ecj-gcj-3.6 +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# gcj-jdk installs /usr/bin/gcj-jdk symlink, depending on it would be circular -# so we fallback to gcc-config discovery -GIJ_BIN="@GENTOO_PORTAGE_EPREFIX@/usr/bin/gij" -if [[ ! -f ${GIJ_BIN} ]]; then - GIJ_BIN="$(gcc-config -B)/gij" -fi -if [[ ! -f ${GIJ_BIN} ]]; then - echo "gij not found! check that gcc is compiled with gcj flag" - exit 1 -fi -# calling java-config would be an unnecessary slowdown here - -# we need to append user CLASSPATH otherwise it will be overriden by the -classpath parameter -# this breaks e.g. bootstrap of ant-core -ecj_cp="@GENTOO_PORTAGE_EPREFIX@/usr/share/ecj-gcj-3.6/lib/ecj.jar" -if [[ -n "${CLASSPATH}" ]]; then - ecj_cp="${ecj_cp}:${CLASSPATH}" -fi - -${GIJ_BIN} -classpath "${ecj_cp}" org.eclipse.jdt.internal.compiler.batch.Main "${@}" diff --git a/dev-java/ecj-gcj/metadata.xml b/dev-java/ecj-gcj/metadata.xml deleted file mode 100644 index b16b316..0000000 --- a/dev-java/ecj-gcj/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> -<herd>java</herd> -<use> - <flag name="native">Build a native binary along with the jar. Provides faster execution time, but needs about 1G memory and some patience to compile.</flag> -</use> -</pkgmetadata> diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog deleted file mode 100644 index 9d5089f..0000000 --- a/dev-lang/php/ChangeLog +++ /dev/null @@ -1,2603 +0,0 @@ -# ChangeLog for dev-lang/php -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.583 2012/05/03 20:27:33 maekke Exp $ - - 03 May 2012; Markus Meier <maekke@gentoo.org> php-5.3.11.ebuild: - arm stable, bug #410957 - -*php-5.3.12 (03 May 2012) -*php-5.4.2 (03 May 2012) - - 03 May 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.12.ebuild, - +php-5.4.2.ebuild: - Version bump. Fixes recently found security issue with the CGI SAPI - - 01 May 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.11.ebuild: - Stable for HPPA (bug #410957). - - 30 Apr 2012; Agostino Sarubbo <ago@gentoo.org> php-5.3.11.ebuild: - Stable for amd64, wrt bug #410957 - - 29 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> php-5.3.11.ebuild: - x86 stable, see bug 410857 - - 28 Apr 2012; Matti Bickel <mabi@gentoo.org> php-5.3.11.ebuild: - custom suhosin patch no longer needed, revert back to upstream one (fixes - #413785) - -*php-5.4.1 (26 Apr 2012) - - 26 Apr 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.1.ebuild: - Version bump of PHP 5.4 - -*php-5.3.11 (26 Apr 2012) - - 26 Apr 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.11.ebuild: - Version bump of PHP 5.3.11 - - 24 Apr 2012; Matti Bickel <mabi@gentoo.org> php-5.3.11_rc2.ebuild: - current suhosin patch misapplies in 5.3.11; use a custom patch with changed - offsets to fix this (based on and fixes #411935) - -*php-5.4.1_rc2 (13 Apr 2012) -*php-5.3.11_rc2 (13 Apr 2012) - - 13 Apr 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.11_rc2.ebuild, - +php-5.4.1_rc2.ebuild: - Bumping rc versions - - 30 Mar 2012; Ole Markus With <olemarkus@gentoo.org> Manifest: - Manifest fix - - 06 Mar 2012; Ole Markus With <olemarkus@gentoo.org> php-5.3.10-r2.ebuild, - php-5.3.10.ebuild, php-5.4.0.ebuild: - Changing patchset location. Bug #405823 - - 03 Mar 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.3.9.ebuild, - -php-5.4.0_rc8.ebuild: - Removed older versions - - 03 Mar 2012; Brent Baude <ranger@gentoo.org> php-5.3.10.ebuild: - Marking php-5.3.10 ppc64 for bug 401997 - - 02 Mar 2012; Ole Markus With <olemarkus@gentoo.org> - files/eblits/src_configure-v53.eblit, php-5.4.0.ebuild: - Adding runtime dependencies - -*php-5.4.0 (01 Mar 2012) - - 01 Mar 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0.ebuild, - files/eblits/src_configure-v53.eblit: - PHP 5.4 final released - - 28 Feb 2012; Ole Markus With <olemarkus@gentoo.org> - files/eblits/src_configure-v53.eblit, files/eblits/src_configure-v54.eblit: - Fixed another bad mabi. Issue 406107 - - 28 Feb 2012; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v53.eblit: - fix typo in src_configure-v53.eblit (bug #406107), thanks to Matthew for - catching this - - 27 Feb 2012; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v53.eblit, files/eblits/src_configure-v54.eblit: - rely on /etc/env.d/50oracle-instantclient-basic to provide oci configuration - for php (bug #380581) - - 18 Feb 2012; Raúl Porcel <armin76@gentoo.org> php-5.3.10.ebuild: - ia64/s390/sh/sparc stable wrt #401997 - - 18 Feb 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.4.0_rc7-r1.ebuild, - -php-5.4.0_rc7.ebuild, metadata.xml: - Cleaned up metadata.xml and removed some old versions - - 17 Feb 2012; Tobias Klausmann <klausman@gentoo.org> php-5.3.10.ebuild: - Stable on alpha, bug #401997 - - 17 Feb 2012; Ole Markus With <olemarkus@gentoo.org> php-5.4.0_rc8.ebuild: - Remove rc8 dep on <libpcre-8.30 - -*php-5.4.0_rc8 (16 Feb 2012) - - 16 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc8.ebuild, - php-5.3.10-r2.ebuild: - Bumping RC - - 13 Feb 2012; Markus Meier <maekke@gentoo.org> php-5.3.10.ebuild: - arm stable, bug #401997 - -*php-5.4.0_rc7-r1 (09 Feb 2012) - - 09 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc7-r1.ebuild, - php-5.3.10.ebuild, php-5.4.0_rc7.ebuild: - Revbump making php build against libpcre-8.30 - - 09 Feb 2012; Thomas Kahle <tomka@gentoo.org> php-5.3.10.ebuild: - marked x86 per bug 401997 - -*php-5.3.10-r2 (06 Feb 2012) - - 06 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.10-r2.ebuild, - -php-5.3.10-r1.ebuild: - Another fix for bug 402357. Should be somewhat safer than the previous fix - - 06 Feb 2012; Brent Baude <ranger@gentoo.org> php-5.3.10.ebuild: - Marking php-5.3.10 ppc for bug 401997 - - 06 Feb 2012; Ole Markus With <olemarkus@gentoo.org> - files/eblits/src_test-v1.eblit: - Fixed FEATURES="test", which apparently has not been working for a while. - -*php-5.3.10-r1 (06 Feb 2012) - - 06 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.10-r1.ebuild, - -php-5.4.0_rc6.ebuild, php-5.3.10.ebuild, php-5.3.9.ebuild, - php-5.4.0_rc7.ebuild: - Fixed compile fail against libpcre. Bug 402357 Non-fixed versions block - libpcre-8.30+ - - 06 Feb 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.10.ebuild: - Stable for HPPA (bug #401997). - - 03 Feb 2012; Agostino Sarubbo <ago@gentoo.org> php-5.3.10.ebuild: - Stable for AMD64, wrt security bug #401997 - -*php-5.4.0_rc7 (03 Feb 2012) - - 03 Feb 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc7.ebuild: - RC version bump - - 02 Feb 2012; Matti Bickel <mabi@gentoo.org> php-5.3.10.ebuild: - use upstream suhosin patch instead of our own with php-5.3.10 - -*php-5.3.10 (02 Feb 2012) - - 02 Feb 2012; Matti Bickel <mabi@gentoo.org> +php-5.3.10.ebuild: - security bump, this closes a remote code execution possibility (see #401997); - this version can still use unchanged gentoo patchset/suhosin from php-5.3.9 - - 26 Jan 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.3.8.ebuild, - -php-5.3.9_rc1.ebuild, -php-5.3.9_rc2.ebuild, -php-5.3.9_rc3.ebuild, - -php-5.3.9_rc4.ebuild, -php-5.4.0_rc3.ebuild, -php-5.4.0_rc4.ebuild, - -php-5.4.0_rc5.ebuild: - Removed older versions - - 21 Jan 2012; Ole Markus With <olemarkus@gentoo.org> -php-5.2.17.ebuild: - Removing PHP 5.2. Bye bye - -*php-5.4.0_rc6 (20 Jan 2012) - - 20 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc6.ebuild: - Bump of 5.4 RC - - 17 Jan 2012; Jeroen Roovers <jer@gentoo.org> php-5.3.9.ebuild: - Stable for HPPA (bug #384301). - - 16 Jan 2012; Mark Loeser <halcy0n@gentoo.org> php-5.3.9.ebuild: - Stable for ppc/ppc64; bug #384301 - - 14 Jan 2012; Raúl Porcel <armin76@gentoo.org> php-5.3.9.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #384301 - - 12 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.3.9.ebuild: - x86 stable wrt bug #384301 - - 11 Jan 2012; Agostino Sarubbo <ago@gentoo.org> php-5.3.9.ebuild: - Stable for AMD64, wrt security bug #384301 - - 11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> php-5.3.9.ebuild: - Added support for suhosin again. Thanks a bunch to Hanno Boeck (bug 398495) - - 11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> php-5.3.9.ebuild: - Removed suhosin for 5.3.9 as it has not been released yet (bug #398495) - -*php-5.3.9 (11 Jan 2012) - - 11 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9.ebuild: - Version bump - -*php-5.4.0_rc5 (06 Jan 2012) - - 06 Jan 2012; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc5.ebuild: - Added 5.4.0 RC5 - -*php-5.4.0_rc4 (24 Dec 2011) -*php-5.3.9_rc4 (24 Dec 2011) - - 24 Dec 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9_rc4.ebuild, - +php-5.4.0_rc4.ebuild: - Bumping php release candidates - - 23 Dec 2011; Ole Markus With <olemarkus@gentoo.org> - files/eblits/src_configure-v53.eblit: - Fixed a typo leading to bug 395725 - - 18 Dec 2011; Ole Markus With <olemarkus@gentoo.org> - +files/eblits/src_configure-v54.eblit, -files/eblits/src_configure-v3.eblit, - php-5.4.0_rc3.ebuild: - Changed src_config eblit versions to make it easier to figure out which eblit - is used where - - 17 Dec 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.9_rc3.ebuild: - Removed other REQUIRED_USE entries referencing USE flags not in IUSE - - 17 Dec 2011; Zac Medico <zmedico@gentoo.org> php-5.3.9_rc3.ebuild: - Bug #394995 - Remove invalid birdstep? conditionals from RDEPEND and - REQUIRED_USE, since the birdstep flag is no longer listed in IUSE. - -*php-5.3.9_rc3 (16 Dec 2011) - - 16 Dec 2011; Ole Markus With <olemarkus@gentoo.org> - +files/eblits/src_configure-v53.eblit, files/eblits/src_install-v2.eblit, - +php-5.3.9_rc3.ebuild, php-5.4.0_rc3.ebuild: - Bumping rc of 5.3.9. Contains a bunch of fixes backported from the 5.4 - ebuilds. - - 14 Dec 2011; Matti Bickel <mabi@gentoo.org> php-5.2.17.ebuild, - php-5.3.8.ebuild, php-5.3.9_rc1.ebuild, php-5.3.9_rc2.ebuild, - php-5.4.0_rc3.ebuild: - Merging categories dev-php5 and dev-php (bug #324665) - - 09 Dec 2011; Ole Markus With <olemarkus@gentoo.org> - -files/eblits/pkg_postinst-v2.eblit, php-5.2.17.ebuild, php-5.3.8.ebuild, - -php-5.4.0_rc1.ebuild, -php-5.4.0_rc2.ebuild, php-5.4.0_rc3.ebuild: - Removed pkg_postinst and all references due to bug #380845 - - 09 Dec 2011; Ole Markus With <olemarkus@gentoo.org> - -files/eblits/common-v1.eblit, php-5.2.17.ebuild, php-5.3.8.ebuild, - php-5.3.9_rc1.ebuild, php-5.3.9_rc2.ebuild: - Remove referenes to common v1 eblit - -*php-5.4.0_rc3 (09 Dec 2011) - - 09 Dec 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc3.ebuild: - Version bump of 5.4 RC. 5.3 will follow, but I want to backport some ebuild - changes first - - 06 Dec 2011; Ole Markus With <olemarkus@gentoo.org> -files/php-fpm.init, - files/php-fpm-r4.init: - Migrated changes from issue 390307 - -*php-5.4.0_rc2 (25 Nov 2011) -*php-5.3.9_rc2 (25 Nov 2011) - - 25 Nov 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9_rc2.ebuild, - +php-5.4.0_rc2.ebuild: - Bump of the release candidates - - 18 Nov 2011; Ole Markus With <olemarkus@gentoo.org> files/php-fpm.init: - Fixed init script for multislotting. Bug 390307. Thanks to Guillaume - Castagnino and Piotr Karbowski for input - - 11 Nov 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.4.0_beta2.ebuild: - Removed beta of 5.4 - -*php-5.4.0_rc1 (11 Nov 2011) - - 11 Nov 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_rc1.ebuild: - Added php 5.4 RC1 - - 08 Nov 2011; Ole Markus With <olemarkus@gentoo.org> - -files/70_mod_php5.conf-apache2-r1, -files/eblits/src_install-v1.eblit, - php-5.4.0_beta2.ebuild, -files/eblits/pkg_postinst-v1.eblit, - -files/eblits/pkg_setup-v1.eblit, -files/php-fpm-gentooified-5.3.4.patch, - -php-5.4.0_beta1.ebuild, -files/eblits/src_configure-snapshots.eblit, - -files/eblits/src_configure-v1.eblit, - -files/eblits/src_prepare-snapshots.eblit, -files/php-fpm.conf, - -files/php-fpm-gentooified.patch, -files/php-fpm-r0.conf, - -files/php-fpm-r3.init, files/eblits/src_install-v3.eblit: - Major cleanup of the ./files. Hopefully I did not break anything - -*php-5.3.9_rc1 (04 Nov 2011) - - 04 Nov 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.9_rc1.ebuild: - Added 5.3.9 RC1. The PHP release candidates are now released directly to - ~arch - - 31 Oct 2011; Matti Bickel <mabi@gentoo.org> - +files/eblits/src_compile-v2.eblit, files/eblits/src_install-v3.eblit, - php-5.4.0_beta2.ebuild: - Simplify src_compile and grab binaries/apache modules directly from - sapis-build directory, circumventing make install-sapi to fix bug #351266 - -*php-5.4.0_beta2 (20 Oct 2011) - - 20 Oct 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_beta2.ebuild: - Bump beta version of 5.4.0 - - 22 Sep 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.8.ebuild: - Enabling xml USE flag by default - - 16 Sep 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.6.ebuild, - -php-5.3.6-r1.ebuild, -php-5.3.7_rc5.ebuild, -php-5.4.0_alpha3.ebuild: - Removed older versions - -*php-5.4.0_beta1 (16 Sep 2011) - - 16 Sep 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_beta1.ebuild: - Bump 5.4 to beta1 - - 16 Sep 2011; Ole Markus With <olemarkus@gentoo.org> - files/eblits/src_configure-v3.eblit, files/eblits/src_install-v3.eblit, - php-5.4.0_alpha3.ebuild: - Remove deps on phpconfutils and php-common-r1 - - 03 Sep 2011; Raúl Porcel <armin76@gentoo.org> php-5.3.8.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #372745 - - 28 Aug 2011; Markus Meier <maekke@gentoo.org> php-5.3.8.ebuild: - arm stable, bug #372745 - - 26 Aug 2011; Markos Chandras <hwoarang@gentoo.org> php-5.3.8.ebuild: - Stable on amd64 wrt bug #372745 - - 26 Aug 2011; Ole Markus With <olemarkus@gentoo.org> metadata.xml: - Removed older versions - - 26 Aug 2011; Thomas Kahle <tomka@gentoo.org> php-5.3.8.ebuild: - x86 stable per bug 372745 - - 25 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> php-5.3.8.ebuild: - ppc/ppc64 stable wrt #372745 - - 25 Aug 2011; Jeroen Roovers <jer@gentoo.org> php-5.3.8.ebuild: - Stable for HPPA (bug #372745). - -*php-5.3.8 (24 Aug 2011) - - 24 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.8.ebuild: - Version bump - - 22 Aug 2011; Ole Markus With <olemarkus@gentoo.org> - files/eblits/pkg_postinst-v1.eblit, php-5.2.17.ebuild: - Disable installing suhosin extension on use suhosin for 5.2.17. Should always - be installed manually. Same behaviour as all other versions of php - - 21 Aug 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.7_rc2.ebuild, - -php-5.3.7_rc3.ebuild, -php-5.3.7.ebuild, -php-5.4.0_alpha1.ebuild, - -php-5.5.0_pre201105211430.ebuild: - Removed older alphas and rcs - - 21 Aug 2011; Ole Markus With <olemarkus@gentoo.org> - -files/eblits/src_configure-v52.eblit, -php-5.2.14.ebuild, - -php-5.3.3-r1.ebuild, +php-5.3.7.ebuild, -files/eblits/src_prepare-v1.eblit: - Removed all php:5 ebuilds (bug 363809) - -*php-5.3.7 (18 Aug 2011) - - 18 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.7.ebuild: - Version bump - -*php-5.3.7_rc5 (12 Aug 2011) - - 12 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.7_rc5.ebuild: - Bumped RC for 5.3.7 - -*php-5.4.0_alpha3 (08 Aug 2011) - - 08 Aug 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.4.0_alpha3.ebuild: - Bumping 5.4 to alpha3 - - 26 Jul 2011; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit: - Removed some unnecessary warnings - -*php-5.3.7_rc3 (23 Jul 2011) - - 23 Jul 2011; Ole Markus With <olemarkus@gentoo.org> +files/php-fpm-r0.conf, - +files/php-fpm-r1.conf, +files/php-fpm-r4.init, - files/eblits/src_install-v2.eblit, +php-5.3.7_rc3.ebuild: - New rc. Includes new init script with better pid handling - - 20 Jul 2011; <olemarkus@gentoo.org> files/eblits/src_install-v3.eblit: - Removed some 'security' fixes for php.ini. - - 02 Jul 2011; Ole Markus With <olemarkus@gentoo.org> - +files/eblits/pkg_setup-v3.eblit, files/eblits/src_configure-v3.eblit, - php-5.4.0_alpha1.ebuild: - Removed call to silly phpconfutils_init. Added addpredict to src_configure - (also silly) - -*php-5.3.7_rc2 (01 Jul 2011) - - 01 Jul 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.7_rc1.ebuild, - +php-5.3.7_rc2.ebuild: - Bumped 5.3.7 rc version - - 29 Jun 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.3.5.ebuild, - -php-5.3.5-r1.ebuild, -php-5.4.0_pre201105211430.ebuild: - Removed older versions - -*php-5.4.0_alpha1 (29 Jun 2011) - - 29 Jun 2011; Ole Markus With <olemarkus@gentoo.org> - +files/eblits/src_configure-v3.eblit, +files/eblits/src_prepare-v4.eblit, - +php-5.4.0_alpha1.ebuild: - Added php 5.4 alpha 1 - -*php-5.3.7_rc1 (17 Jun 2011) - - 17 Jun 2011; Ole Markus With <olemarkus@gentoo.org> - files/eblits/src_install-v2.eblit, +php-5.3.7_rc1.ebuild: - Added php-5.3.7_rc1 - Fixed bug 359905 - -*php-5.5.0_pre201105211430 (22 May 2011) -*php-5.4.0_pre201105211430 (22 May 2011) - - 22 May 2011; Ole Markus With <olemarkus@gentoo.org> - -php-5.4.0_pre201105151030.ebuild, +php-5.4.0_pre201105211430.ebuild, - +php-5.5.0_pre201105211430.ebuild: - Bumped snapshot versions and added a snapshot from the 5.4 branch (5.5 being - trunk now) - -*php-5.4.0_pre201105151030 (15 May 2011) - - 15 May 2011; <olemarkus@gentoo.org> -php-5.4.0_pre201104301030.ebuild, - +php-5.4.0_pre201105151030.ebuild, - +files/eblits/src_configure-snapshots.eblit: - Bumped the php snapshot version - - 08 May 2011; <olemarkus@gentoo.org> php-5.4.0_pre201104301030.ebuild, - +files/eblits/src_configure-snapshots.eblit: - Remove sqlite2 support and the sqlite3 USE flag. sqlite USE flag now enabled - sqlite3 - -*php-5.4.0_pre201104301030 (01 May 2011) - - 01 May 2011; <olemarkus@gentoo.org> +php-5.4.0_pre201104301030.ebuild, - +files/eblits/src_prepare-snapshots.eblit: - Added SVN snapshot ebuild - -*php-5.3.6-r1 (19 Apr 2011) - - 19 Apr 2011; <olemarkus@gentoo.org> php-5.2.14.ebuild, php-5.2.17.ebuild, - +php-5.3.6-r1.ebuild: - Added an EAPI4 version - - 09 Apr 2011; Raúl Porcel <armin76@gentoo.org> php-5.3.6.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #358791 - - 05 Apr 2011; Markus Meier <maekke@gentoo.org> php-5.3.6.ebuild: - arm stable, bug #358791 - - 02 Apr 2011; Christoph Mende <angelos@gentoo.org> php-5.3.6.ebuild: - Stable on amd64 wrt bug #358791 - - 02 Apr 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.3.6.ebuild: - x86 stable wrt security bug #358791 - - 02 Apr 2011; Jeroen Roovers <jer@gentoo.org> php-5.3.6.ebuild: - Stable for HPPA (bug #358791). - - 01 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> php-5.3.6.ebuild: - ppc/ppc64 stable wrt #358791 - - 20 Mar 2011; <olemarkus@gentoo.org> -php-5.3.6_rc3.ebuild: - Removed RC as PHP 5.3.6 is now released - - 18 Mar 2011; <olemarkus@gentoo.org> +php-5.2.14.ebuild: - Readded 5.2.14 to unbreak a few neglected packages - -*php-5.3.6 (17 Mar 2011) - - 17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.6.ebuild: - Version bump - - 17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> - files/eblits/pkg_setup-v1.eblit, php-5.2.17.ebuild, php-5.3.3-r1.ebuild, - php-5.3.5.ebuild, php-5.3.5-r1.ebuild, files/eblits/pkg_setup-v2.eblit, - php-5.3.6_rc3.ebuild: - Removed use of php_check_imap. #359221 - - 17 Mar 2011; Ole Markus With <olemarkus@gentoo.org> -php-5.2.14.ebuild, - -php-5.2.16.ebuild, -php-5.3.4.ebuild: - Removed older versions - - 16 Mar 2011; <olemarkus@gentoo.org> php-5.3.6_rc3.ebuild: - Reordered the SAPIs so that embed is always the first sapi to be built if - selected. Fixes #358687 - - 13 Mar 2011; <olemarkus@gentoo.org> +files/eblits/src_prepare-v3.eblit, - php-5.3.6_rc3.ebuild: - Added epatch_user. #357637 - -*php-5.3.6_rc3 (10 Mar 2011) - - 10 Mar 2011; <olemarkus@gentoo.org> -php-5.3.6_rc1.ebuild, - -php-5.3.6_rc2.ebuild, +php-5.3.6_rc3.ebuild: - Another RC added - -*php-5.3.6_rc2 (03 Mar 2011) - - 03 Mar 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.6_rc2.ebuild: - New 5.3.6 RC2 - - 25 Feb 2011; Kevin McCarthy <signals@gentoo.org> php-5.2.14.ebuild, - php-5.2.16.ebuild, php-5.2.17.ebuild, php-5.3.3-r1.ebuild: - Updated depends from media-libs/jpeg to virtual/jpeg - - 25 Feb 2011; Ole Markus With <olemarkus@gentoo.org> php-5.3.5.ebuild, - php-5.3.6_rc1.ebuild: - Remove dependency on libevent - - 17 Feb 2011; Ole Markus With <olemarkus@gentoo.org> +php-5.3.6_rc1.ebuild, - metadata.xml: - Added an ebuild for 5.3.6 RC1 - The suhosin USE flag no longer installs the extension, only the suhosin - patch - -*php-5.3.6_rc1 (17 Feb 2011) - - 30 Jan 2011; Raúl Porcel <armin76@gentoo.org> php-5.2.16.ebuild, - php-5.2.17.ebuild, php-5.3.3-r1.ebuild, php-5.3.4.ebuild, php-5.3.5.ebuild, - php-5.3.5-r1.ebuild: - alpha/ia64/s390/sh/sparc stable - -*php-5.3.5-r1 (29 Jan 2011) - - 29 Jan 2011; Matti Bickel <mabi@gentoo.org> php-5.2.17.ebuild, - +php-5.3.5-r1.ebuild: - fixed bugs #327049 (phar locale failure), #348567 (crypt_r typo), #352560 - (suhosin caused circular dep), #329071 (disable phpize autoconf checks) - - 11 Jan 2011; Jeroen Roovers <jer@gentoo.org> php-5.2.17.ebuild, - php-5.3.5.ebuild: - Stable for HPPA (bug #350908). - - 10 Jan 2011; Kacper Kowalik <xarthisius.kk@gmail.com> php-5.2.17.ebuild, - php-5.3.5.ebuild: - ppc64 stable wrt #350908 - - 09 Jan 2011; Brent Baude <ranger@gentoo.org> php-5.3.5.ebuild: - Marking php-5.3.5 ppc for bug 350908 - - 08 Jan 2011; Markus Meier <maekke@gentoo.org> php-5.3.5.ebuild: - arm stable, bug #350908 - - 08 Jan 2011; Markus Meier <maekke@gentoo.org> php-5.2.17.ebuild: - arm stable, bug #350908 - - 08 Jan 2011; Brent Baude <ranger@gentoo.org> php-5.3.5.ebuild: - Marking php-5.3.5 ~ppc for bug 349659 - - 08 Jan 2011; Brent Baude <ranger@gentoo.org> php-5.2.17.ebuild: - Marking php-5.2.17 ppc for bug 350908 - - 07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> php-5.3.5.ebuild: - stable x86, security bug 350908 - - 07 Jan 2011; Christian Faulhammer <fauli@gentoo.org> php-5.2.17.ebuild: - stable x86, security bug 350908 - - 07 Jan 2011; Markos Chandras <hwoarang@gentoo.org> php-5.2.17.ebuild, - php-5.3.5.ebuild: - Stable on amd64 wrt bug #350908 - -*php-5.3.5 (06 Jan 2011) -*php-5.2.17 (06 Jan 2011) - - 06 Jan 2011; Matti Bickel <mabi@gentoo.org> - files/eblits/pkg_postinst-v2.eblit, -php-5.2.16-r1.ebuild, - +php-5.2.17.ebuild, -php-5.3.4-r1.ebuild, +php-5.3.5.ebuild: - security version bump, remove old - - 05 Jan 2011; Matti Bickel <mabi@gentoo.org> php-5.2.16-r1.ebuild, - php-5.3.4-r1.ebuild: - restore ~alpha and ~ppc64 keywords - -*php-5.3.4-r1 (05 Jan 2011) -*php-5.2.16-r1 (05 Jan 2011) - - 05 Jan 2011; Matti Bickel <mabi@gentoo.org> - files/eblits/pkg_postinst-v2.eblit, +php-5.2.16-r1.ebuild, - files/eblits/src_configure-v2.eblit, +php-5.3.4-r1.ebuild, - files/eblits/src_prepare-v2.eblit: - now includes new suhosin patch, mhash is usable again, interbase/firebird - configure fixed, now includes a warning about stale config dirs - - 02 Jan 2011; Tobias Klausmann <klausman@gentoo.org> php-5.2.16.ebuild: - Stable on alpha, bug #340807 - - 02 Jan 2011; Tobias Klausmann <klausman@gentoo.org> php-5.3.4.ebuild: - Stable on alpha, bug #340807 - - 28 Dec 2010; Brent Baude <ranger@gentoo.org> php-5.2.16.ebuild, - php-5.3.4.ebuild: - Marking -5.2.16 and -5.3.4 ppc64 for bug 340807 - - 27 Dec 2010; <olemarkus@gentoo.org> -php-5.2.14-r2.ebuild, - -php-5.3.3-r3.ebuild: - Removed vulnerable versions from 5.2 and 5.3 slots - - 27 Dec 2010; <olemarkus@gentoo.org> php-5.2.16.ebuild, php-5.3.4.ebuild: - Readded some keywords that was dropped without reason - - 25 Dec 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.16.ebuild, - php-5.3.4.ebuild: - Stable for HPPA (bug #340807). - - 25 Dec 2010; <olemarkus@gentoo.org> php-5.3.4.ebuild: - Prevented the fpm sapi from force-enabling the cli sapi (bug 349122) - - 21 Dec 2010; Matti Bickel <mabi@gentoo.org> +files/php-fpm.conf, - files/eblits/src_configure-v2.eblit, files/php-fpm-r3.init: - fixed missing php-fpm.conf (bug #349179), removed unused configure option, - simplified php-fpm path (you need to use eselect php set php-fpm php5.3 - before starting!) - - 20 Dec 2010; Brent Baude <ranger@gentoo.org> php-5.2.14-r2.ebuild, - php-5.3.3-r3.ebuild: - Marking -5.3.3-r3 and -5.2.14-r2 ~ppc64 for bug 343597 - - 20 Dec 2010; Markos Chandras <hwoarang@gentoo.org> php-5.2.16.ebuild, - php-5.3.4.ebuild: - Stable on amd64 wrt bug #340807 - - 19 Dec 2010; Matti Bickel <mabi@gentoo.org> - +files/php-fpm-gentooified-5.3.4.patch, +files/php-fpm-r3.init, - -files/php-fpm-r1.init, files/eblits/src_install-v2.eblit: - somehow managed to miss the fpm part of the src_install update: new init/conf - files fix bugs #343649, #348507 - - 19 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.2.16.ebuild, - php-5.3.4.ebuild: - x86 stable wrt security bug #340807 - -*php-5.3.4 (19 Dec 2010) -*php-5.2.16 (19 Dec 2010) - - 19 Dec 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_install-v2.eblit, files/eblits/src_prepare-v2.eblit, - +php-5.2.16.ebuild, +php-5.3.4.ebuild: - new upstream version with security fixes (bug #340807), also provide complete - fpm config/init file instead of patching upstream (thanks to Ole Markus) - - 22 Nov 2010; Ole Markus With <olemarkus@gentoo.org> - files/eblits/pkg_postinst-v1.eblit, files/eblits/pkg_postinst-v2.eblit: - Added link to upgrade guide - - 09 Nov 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.14-r2.ebuild, - php-5.3.3-r3.ebuild: - Marked ~hppa (bug #343597). - - 05 Nov 2010; Markus Meier <maekke@gentoo.org> php-5.2.14-r2.ebuild: - add ~arm, bug #343597 - - 05 Nov 2010; Markus Meier <maekke@gentoo.org> php-5.3.3-r3.ebuild: - add ~arm, bug #343597 - - 05 Nov 2010; Jeroen Roovers <jer@gentoo.org> php-5.3.3-r1.ebuild: - Stable for HPPA (bug #336869). - - 04 Nov 2010; Matti Bickel <mabi@gentoo.org> php-5.3.3-r3.ebuild: - do not block versions of pecl-fileinfo supporting minor version slotting - - 02 Nov 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit, - files/eblits/src_install-v2.eblit: - Added abit more information to postinst - - 01 Nov 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/pkg_postinst-v2.eblit: - fix typo causing skip of eselect (bug #343723) - -*php-5.3.3-r3 (31 Oct 2010) -*php-5.2.14-r2 (31 Oct 2010) - - 31 Oct 2010; <olemarkus@gentoo.org> -php-5.2.14-r1.ebuild, - +php-5.2.14-r2.ebuild, -php-5.3.3-r2.ebuild, +php-5.3.3-r3.ebuild: - Revbumping with a new patchset (bug 342397) - - 31 Oct 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v2.eblit: - properly fix bug #281316 (thanks to Alex Kiesel for noticing) - - 31 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit: - Fixed a QA issue related to nonexisting SAPIs - - 30 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v2.eblit, - php-5.2.14-r1.ebuild, files/eblits/src_install-v2.eblit, - php-5.3.3-r2.ebuild: - Changed ebuild to use php.ini-development by default - Also made ebuilds add symlink to php-cgi if the cgi SAPI is installed - - 27 Oct 2010; <olemarkus@gentoo.org> files/eblits/src_install-v1.eblit, - files/eblits/src_install-v2.eblit: - Corrected typo in the src_install eblit (#342769) - - 24 Oct 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_install-v2.eblit: - install apache module config file into standard directory - - 24 Oct 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v2.eblit: - enable pdo-sqlite via USE="sqlite3" not USE="sqlite" - - 21 Oct 2010; <olemarkus@gentoo.org> files/eblits/pkg_postinst-v1.eblit: - Added an additional warning about extension_dir to pkg_postinst - - 20 Oct 2010; Markos Chandras <hwoarang@gentoo.org> php-5.3.3-r1.ebuild: - Stable on amd64 wrt bug #336869 - - 19 Oct 2010; <olemarkus@gentoo.org> -php-5.2.13.ebuild: - Removing old version - - 19 Oct 2010; <olemarkus@gentoo.org> files/eblits/src_install-v2.eblit, - +files/php-fpm-r1.init: - Added new fpm.init script that works with minor version slotting - - 17 Oct 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_install-v1.eblit, files/eblits/src_install-v2.eblit: - change allow_url_fopen back to Off (bug #332763) - - 14 Oct 2010; Christian Faulhammer <fauli@gentoo.org> php-5.3.3-r1.ebuild: - x86 stable, bug 336869 - -*php-5.3.3-r2 (06 Oct 2010) -*php-5.2.14-r1 (06 Oct 2010) - - 06 Oct 2010; <olemarkus@gentoo.org> +php-5.2.14-r1.ebuild, - +php-5.3.3-r2.ebuild: - Added PHP ebuilds with minor version slotting support - - 19 Sep 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v52.eblit: - fix building against IBM DB2, you now can use your DB2_HOME env variable - again (bug #337512, thanks reavertm for the patch) - - 07 Sep 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild: - enable spl and reflection by default, following upstream (bug #310383) - - 22 Aug 2010; Mark Loeser <halcy0n@gentoo.org> php-5.3.3-r1.ebuild: - Add back ~arm. It was dropped during the bump - - 16 Aug 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.14.ebuild: - Stable for HPPA (bug #332039). - - 14 Aug 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_compile-v1.eblit: - snmp causes sandbox errors in src_compile, too (bug #324739) - - 14 Aug 2010; Raúl Porcel <armin76@gentoo.org> php-5.2.14.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #332039 - - 12 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild: - patch tarball now includes the correctly named kolab patch (bug #332423) - - 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> php-5.2.14.ebuild, - php-5.3.3-r1.ebuild: - Marked ppc/ppc64 stable for bug #332039. Marked ~ppc/~ppc64 for bug - #321743. - - 11 Aug 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v52.eblit, php-5.3.3-r1.ebuild: - 5.3 does not need flex; also fix a compile error with - -Wimplicit-function-declaration (bug #332273) - - 11 Aug 2010; Matti Bickel <mabi@gentoo.org> -php-5.3.2.ebuild: - remove php-5.3.2 due to security issues (bug #332039) - - 11 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild, - php-5.3.3-r1.ebuild: - enable xml, xmlreader and xmlwriter per default, as upstream does, too - (bug #332311) - - 11 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> php-5.2.14.ebuild: - x86 stable wrt security bug #332039 - - 10 Aug 2010; Markos Chandras <hwoarang@gentoo.org> php-5.2.14.ebuild: - Stable on amd64 wrt bug #332039 - - 09 Aug 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v52.eblit: - configure sapi build dirs in 5.2, too (bug #331751); use proper path for - libevent, fix sharedext, fpm config file install (bug #331735) - - 09 Aug 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_test-v1.eblit: - run from cli sapi build dir (bug #330023) - - 09 Aug 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_install-v1.eblit: - cd to sapi dirs to make fpm config patches apply again (bug #331735) - -*php-5.3.3-r1 (08 Aug 2010) - - 08 Aug 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_compile-v1.eblit, -php-5.3.3.ebuild, - files/eblits/src_configure-v1.eblit, files/eblits/src_install-v1.eblit, - +php-5.3.3-r1.ebuild: - fix QA warnings by building each SAPI in its own dir, add patch to fix bug - #327589 (thanks to Martin von Gagern) - - 03 Aug 2010; Matti Bickel <mabi@gentoo.org> php-5.2.14.ebuild: - added missing mhash in IUSE - -*php-5.2.14 (02 Aug 2010) - - 02 Aug 2010; Matti Bickel <mabi@gentoo.org> - +files/eblits/src_configure-v52.eblit, +php-5.2.14.ebuild: - version bump; this is a security update - see - http://www.php.net/archive/2010.php#id2010-07-22-1 for details - - 29 Jul 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_install-v1.eblit: - use /tmp for session.save_path (bug #282768) - - 29 Jul 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_install-v1.eblit: - add addpredict to work-around bug #324739 - - 28 Jul 2010; Markus Meier <maekke@gentoo.org> php-5.3.3.ebuild: - add ~arm, bug #321743 - - 26 Jul 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_compile-v1.eblit, files/eblits/src_configure-v1.eblit, - files/eblits/src_install-v1.eblit, +files/php-fpm.init, - +files/php-fpm-gentooified.patch, metadata.xml: - update fpm description, actually support fpm in the eblits - -*php-5.3.3 (26 Jul 2010) - - 26 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild, - +php-5.3.3.ebuild, metadata.xml: - version bump, simplify postgres deps (bug #326967), fixes strict aliasing - issues (#329753), version bump is a security update - - 25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> php-5.3.2.ebuild: - Keyworded on alpha, bug #321743 - - 19 Jul 2010; Jeroen Roovers <jer@gentoo.org> php-5.3.2.ebuild: - Marked ~hppa (bug #321743). - - 08 Jul 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/pkg_setup-v1.eblit, php-5.3.2.ebuild: - can not have use-deps on old style virtuals - - 05 Jul 2010; Matti Bickel <mabi@gentoo.org> - files/eblits/src_configure-v1.eblit: - fix compilation on x64 systems (bug #327025) - - 05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.2.13.ebuild: - introduced new style virtual httpd-php (bug #319623) - - 05 Jul 2010; Matti Bickel <mabi@gentoo.org> -php-5.2.9-r2.ebuild, - -php-5.2.10.ebuild, -php-5.2.10-r1.ebuild, -php-5.2.10-r2.ebuild, - -php-5.2.11.ebuild, -php-5.2.11-r1.ebuild, -php-5.2.12.ebuild: - remove old - - 05 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild: - introduced new style virtual httpd-php (bug #319623) - - 04 Jul 2010; Matti Bickel <mabi@gentoo.org> php-5.3.2.ebuild: - include patch to compile with gmp-5* (bug #322303) - - 14 Jun 2010; <mabi@gentoo.org> files/eblits/src_install-v1.eblit, - php-5.3.2.ebuild: - sync with overlay: repair apache2 USE dep, cli SAPI on by default (bug - #310383), show all SAPIs in php-config (bug #278439) - - 12 Jun 2010; <mabi@gentoo.org> php-5.3.2.ebuild, metadata.xml: - USE="mbstring" already covered by USE="unicode"; set USE-defaults to match - upstream defaults (bug #285816) - - 11 Jun 2010; <mabi@gentoo.org> files/eblits/src_compile-v1.eblit, - php-5.3.2.ebuild, files/eblits/src_configure-v1.eblit: - make USE="iodbc" independant from USE="odbc", fix embed SAPI compile - failure - - 01 Jun 2010; <mabi@gentoo.org> -files/eblits/common-v2.eblit, - -files/eblits/src_compile-v2.eblit, -files/eblits/src_install-v2.eblit, - files/eblits/src_prepare-v1.eblit, php-5.3.2.ebuild, metadata.xml: - align more closely with original php-5.3 work from hoffie@gentoo.org, fix - missing mbstring use description, remove unneeded -v2 eblits, remove - dangling mcve references - - 30 May 2010; <mabi@gentoo.org> -files/20php4-envd, php-5.3.2.ebuild, - -files/php4-ldvs: - fix iodbc USE dep (bug #285419), remove unneeded php4 files - - 28 May 2010; <mabi@gentoo.org> php-5.3.2.ebuild: - add flex dependency (bug #221357) - - 28 May 2010; <mabi@gentoo.org> files/eblits/src_prepare-v1.eblit: - use portable find command (bug #321781) - -*php-5.3.2 (27 May 2010) - - 27 May 2010; <mabi@gentoo.org> files/70_mod_php5_concurr.conf-apache2, - files/70_mod_php5.conf-apache2, +files/eblits/common-v1.eblit, - +files/eblits/common-v2.eblit, +files/eblits/pkg_postinst-v1.eblit, - +files/eblits/pkg_setup-v1.eblit, +files/eblits/src_compile-v1.eblit, - +files/eblits/src_compile-v2.eblit, +files/eblits/src_configure-v1.eblit, - +files/eblits/src_install-v1.eblit, +files/eblits/src_install-v2.eblit, - +files/eblits/src_prepare-v1.eblit, +files/eblits/src_test-v1.eblit, - +php-5.3.2.ebuild: - version bump (bug #274512, #312775); see - http://www.php.net/ChangeLog-5.php#5.3.2 for a list of changes and the - migration guide for an update from 5.2: - http://www.php.net/manual/en/migration53.php; expect more bumps as we fix - open bugs - thanks to GiDis and olemarkus for providing patches and a lot of testing - - 29 Mar 2010; Markus Meier <maekke@gentoo.org> php-5.2.13.ebuild: - amd64 stable, bug #306939 - - 26 Mar 2010; Raúl Porcel <armin76@gentoo.org> php-5.2.13.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #306939 - - 24 Mar 2010; Jeroen Roovers <jer@gentoo.org> php-5.2.13.ebuild: - Stable for HPPA (bug #306939). - - 23 Mar 2010; Brent Baude <ranger@gentoo.org> php-5.2.13.ebuild: - Marking php-5.2.13 ppc for bug 306939 - - 22 Mar 2010; Christian Faulhammer <fauli@gentoo.org> php-5.2.13.ebuild: - stable x86, security bug 306939 - - 21 Mar 2010; Brent Baude <ranger@gentoo.org> php-5.2.13.ebuild: - Marking php-5.2.13 ppc64 for bug 306939 - -*php-5.2.13 (20 Mar 2010) - - 20 Mar 2010; Tobias Heinlein <keytoaster@gentoo.org> +php-5.2.13.ebuild: - Non-maintainer commit; Version bump, security bug #306939, patch by Bernd - Lommerzheim - - 13 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> php-5.2.12.ebuild, - +files/php-5.2.12-libpng14.patch: - Fix building with libpng14. - - 31 Jan 2010; Torsten Veller <tove@gentoo.org> php-5.2.9-r2.ebuild, - php-5.2.10.ebuild, php-5.2.10-r1.ebuild, php-5.2.10-r2.ebuild, - php-5.2.11.ebuild, php-5.2.11-r1.ebuild, php-5.2.12.ebuild: - Change vecho to echo - - 05 Jan 2010; Raúl Porcel <armin76@gentoo.org> php-5.2.12.ebuild: - ia64/s390/sh/sparc stable wrt #293888 - - 05 Jan 2010; Joseph Jezak <josejx@gentoo.org> php-5.2.12.ebuild: - Marked ppc stable for bug #293888. - - 01 Jan 2010; Tobias Klausmann <klausman@gentoo.org> php-5.2.12.ebuild: - Stable on alpha, bug #293888 - - 31 Dec 2009; Markus Meier <maekke@gentoo.org> php-5.2.12.ebuild: - amd64/arm stable, bug #293888 - - 31 Dec 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.12.ebuild: - stable x86, security bug 293888 - - 31 Dec 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.12.ebuild: - Stable for HPPA (bug #293888). - - 31 Dec 2009; Brent Baude <ranger@gentoo.org> php-5.2.12.ebuild: - Marking php-5.2.12 ppc64 for bug 293888 - -*php-5.2.12 (30 Dec 2009) - - 30 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.12.ebuild: - version bump to 5.2.12 wrt security bug 297399, please note that - USE=concurrentmodphp is broken (but should not be needed at the moment - anyway), bug 298969 - - 16 Dec 2009; Christian Hoffmann <hoffie@gentoo.org> php-5.2.11.ebuild, - php-5.2.11-r1.ebuild: - trying to fix the circular dependency we are seeing with suhosin since - 5.2.11 (where I added a version dependency without much thinking), bug - 295871, thanks to Oleg Gawriloff <barzog@telecom.by> - - 21 Nov 2009; nixnut <nixnut@gentoo.org> php-5.2.11-r1.ebuild: - ppc stable #292132 - - 17 Nov 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.11-r1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #292132 - - 17 Nov 2009; Brent Baude <ranger@gentoo.org> php-5.2.11-r1.ebuild: - Marking php-5.2.11-r1 ppc64 for bug 292132 - - 15 Nov 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.11-r1.ebuild: - Stable for HPPA (bug #292132). - - 14 Nov 2009; Markus Meier <maekke@gentoo.org> php-5.2.11-r1.ebuild: - arm stable, bug #292132 - - 14 Nov 2009; Markus Meier <maekke@gentoo.org> php-5.2.11-r1.ebuild: - amd64/x86 stable, bug #292132 - -*php-5.2.11-r1 (13 Nov 2009) - - 13 Nov 2009; Dawid Węgliński <cla@gentoo.org> +php-5.2.11-r1.ebuild: - Revision bump with fix for gdMaxColors (security bug #292132) - - 19 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> php-5.2.11.ebuild: - Stabilizing for ppc, bug 285434 (also fixing bug 278064) - - 18 Oct 2009; Brent Baude <ranger@gentoo.org> php-5.2.11.ebuild: - Marking php-5.2.11 ppc64 for bug 285434 - - 09 Oct 2009; Christian Hoffmann <hoffie@gentoo.org> php-5.2.11.ebuild: - adding dependency on recent enough suhosin per bug 276583 - - 07 Oct 2009; <chainsaw@gentoo.org> php-5.2.11.ebuild: - Marked stable on AMD64 as requested by Bernd Marienfeldt in security bug - #285434. Tested with USE="apache2 berkdb bzip2 calendar cgi cli crypt - ctype curl gd iconv imap ipv6 mhash mysql ncurses nls pcre pic posix - readline session snmp spl ssl threads tokenizer truetype unicode xml - xmlrpc zlib" serving www.linx.net on hardened AMD64 non-multilib system. - - 07 Oct 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.11.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #285434 - - 07 Oct 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.11.ebuild: - Stable for HPPA (bug #285434). - - 06 Oct 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.11.ebuild: - stable x86, security bug 285434 - -*php-5.2.11 (29 Sep 2009) - - 29 Sep 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.11.ebuild: - version bump per bug 285434 (security) - -*php-5.2.10-r2 (24 Sep 2009) - - 24 Sep 2009; Dawid Węgliński <cla@gentoo.org> +php-5.2.10-r2.ebuild, - +files/php-5.2.10-pdo_dblib.patch: - Add quick fix for bug #279576 and remove tests/lang/bug45392.phpt which is - not included in 5.2.10 - -*php-5.2.10-r1 (05 Jul 2009) - - 05 Jul 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.10-r1.ebuild: - revbump with the latest suhosin patch (might fix suhosin-related - segfaults, reported in bug 276583), also fixing a curl regression, both - might be the reason for bug 276135 - - 30 Jun 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.10.ebuild: - arm/ia64/s390/sh/sparc stable wrt #274670 - - 27 Jun 2009; Brent Baude <ranger@gentoo.org> php-5.2.10.ebuild: - Marking php-5.2.10 ppc64 and ppc for bug 274670 - - 26 Jun 2009; Tobias Klausmann <klausman@gentoo.org> php-5.2.10.ebuild: - Stable on alpha, bug #274670 - - 26 Jun 2009; Tobias Heinlein <keytoaster@gentoo.org> php-5.2.10.ebuild: - amd64 stable, security bug #274670 - - 25 Jun 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.10.ebuild: - stable x86, security bug 274670 - - 24 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> metadata.xml: - restoring metadata.xml with zip-external description, somehow repoman - complains otherwise - - 23 Jun 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.10.ebuild, - metadata.xml: - Stable for HPPA (bug #274670). - - 21 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> metadata.xml: - removing traces of USE=zip-external - -*php-5.2.10 (19 Jun 2009) - - 19 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.10.ebuild: - version bump per security bug 274670, fixes at least one security problem - (DoS) and introduces getopt long support for Gentoo users as requested - - 19 Jun 2009; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.8-r2.ebuild, - -php-5.2.9.ebuild, -php-5.2.9-r1.ebuild: - clean up old and vulnerable - - 26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - ChangeLog: - Call depend.apache_pkg_setup() in pkg_setup() (bug #268371). - - 26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - php-5.2.8-r2.ebuild, php-5.2.9.ebuild, php-5.2.9-r1.ebuild, - php-5.2.9-r2.ebuild: - Call depend.apache_pkg_setup() in pkg_setup() (bug #268371). - - 20 Apr 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.9-r2.ebuild: - arm/ia64/s390/sh/sparc stable wrt #260576 - - 18 Apr 2009; Tobias Klausmann <klausman@gentoo.org> php-5.2.9-r2.ebuild: - Stable on alpha, bug #260576 - - 18 Apr 2009; Brent Baude <ranger@gentoo.org> php-5.2.9-r2.ebuild: - Marking php-5.2.9-r2 ppc64 for bug 260576 - - 18 Apr 2009; Markus Meier <maekke@gentoo.org> php-5.2.9-r2.ebuild: - x86 stable, bug #260576 - - 18 Apr 2009; nixnut <nixnut@gentoo.org> php-5.2.9-r2.ebuild: - ppc stable #260576 - - 17 Apr 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.9-r2.ebuild: - Stable for HPPA (bug #260576). - - 17 Apr 2009; Tobias Heinlein <keytoaster@gentoo.org> php-5.2.9-r2.ebuild: - amd64 stable wrt security bug #260576 - -*php-5.2.9-r2 (16 Apr 2009) - - 16 Apr 2009; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6-r7.ebuild, - -php-5.2.8-r1.ebuild, +php-5.2.9-r2.ebuild: - cleaning old; revision bump to fix yet three possible security issues, see - bug 260576 for details - -*php-5.2.9-r1 (10 Apr 2009) -*php-5.2.9 (10 Apr 2009) - - 10 Apr 2009; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.9.ebuild, - +php-5.2.9-r1.ebuild: - version bump to fix several possible security issues, details to follow, - bug 260576 (5.2.9 is more or less vanilla php, 5.2.9-r1 has lots of - additional backported patches) - - 07 Apr 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.8-r1.ebuild, - php-5.2.8-r2.ebuild: - revert from EAPI 2 to 0 again, see bug 265245 - - 18 Mar 2009; Raúl Porcel <armin76@gentoo.org> php-5.2.8-r1.ebuild, - php-5.2.8-r2.ebuild: - arm/ia64/s390/sh stable - - 07 Mar 2009; Christian Faulhammer <fauli@gentoo.org> php-5.2.8-r1.ebuild, - php-5.2.8-r2.ebuild: - use EAPI 2 for USE flag check - - 02 Feb 2009; Mike Frysinger <vapier@gentoo.org> metadata.xml: - Document local USE=pic flag. - - 01 Feb 2009; Tobias Klausmann <klausman@gentoo.org> php-5.2.8-r2.ebuild: - Stable on alpha, bug #249703 - - 31 Jan 2009; Tiago Cunha <tcunha@gentoo.org> php-5.2.8-r2.ebuild: - stable sparc, bug 249703 - - 25 Jan 2009; Markus Meier <maekke@gentoo.org> php-5.2.8-r2.ebuild: - x86 stable, bug #249703 - - 24 Jan 2009; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.8-r2.ebuild: - ppc stable, bug #249703 - - 23 Jan 2009; Brent Baude <ranger@gentoo.org> php-5.2.8-r2.ebuild: - Marking php-5.2.8-r2 ppc64 for bug 249703 - - 20 Jan 2009; Tobias Heinlein <keytoaster@gentoo.org> php-5.2.8-r2.ebuild: - amd64 stable wrt security bug 249703 - - 20 Jan 2009; Jeroen Roovers <jer@gentoo.org> php-5.2.8-r2.ebuild: - Stable for HPPA (bug #249703). - -*php-5.2.8-r2 (11 Jan 2009) - - 11 Jan 2009; Christian Hoffmann <hoffie@gentoo.org> - -files/70_mod_php.conf-apache2, - +files/70_mod_php5_concurr.conf-apache2-r1, - +files/70_mod_php5.conf-apache2-r1, - -files/70_mod_php_concurr.conf-apache2, -php-5.2.8.ebuild, - +php-5.2.8-r2.ebuild: - revision bump to fix bug 162478 (dropping usage of AddType apache config - directive) and bug 249703 (libxml2-2.7 breakage) and an upstream fix for - bug 217392; removing old and unused files - - 24 Dec 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.8-r1.ebuild: - alpha/ia64 stable wrt #249875 - - 23 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> php-5.2.8-r1.ebuild: - Stable on sparc, security bug #249875 - - 22 Dec 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.8-r1.ebuild: - Stable for HPPA (bug #249875). - - 21 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.8-r1.ebuild: - ppc stable, bug #249875 - - 20 Dec 2008; Markus Meier <maekke@gentoo.org> php-5.2.8-r1.ebuild: - amd64/x86 stable, bug #249875 - - 19 Dec 2008; Brent Baude <ranger@gentoo.org> php-5.2.8-r1.ebuild: - Marking php-5.2.8-r1 ppc64 for bug 249875 - - 19 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.8-r1.ebuild: - Fix die message when libpcre is not built with unicode support. - -*php-5.2.8-r1 (18 Dec 2008) - - 18 Dec 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.8-r1.ebuild: - revbump for security bug 249875, shipping several new security fixes; - incorporate suggestion from Bernd Lommerzheim <bernd@lommerzheim.com> in - bug 238127 to check libpcre for USE=unicode; adding patch for interbase - precision improvements as suggested by Viesturs <viesturs@dps.lv> in bug - 250640 - -*php-5.2.8 (08 Dec 2008) - - 08 Dec 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.8.ebuild: - version bump wrt security bug 249875; also attempting to make the build - failure fix for bug 217392 more portable; using system pcre now to avoid - problems with apache/mod_php (bug 238127) - - 10 Nov 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.5-r1.ebuild, - -php-5.2.6-r6.ebuild: - dropping old and vulnerable - - 22 Sep 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6-r7.ebuild: - Stable for HPPA (bug #231528). - - 21 Sep 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6-r7.ebuild: - alpha/ia64/sparc stable wrt #231528 - - 20 Sep 2008; Markus Meier <maekke@gentoo.org> php-5.2.6-r7.ebuild: - x86 stable, bug #231528 - - 16 Sep 2008; Brent Baude <ranger@gentoo.org> php-5.2.6-r7.ebuild: - Marking php-5.2.6-r7 ppc64 and ppc for bug 231528 - - 16 Sep 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r7.ebuild: - stable on amd64 wrt bug 231528 - -*php-5.2.6-r7 (06 Sep 2008) - - 06 Sep 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6.ebuild, - -php-5.2.6-r2.ebuild, +php-5.2.6-r7.ebuild: - importing -r7 (patchset: r8) from php-testing overlay, including the snmp - memory leak fix from bug 231528; no need to upgrade for users with - USE=-snmp - - 23 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml: - Add GLEP 56 USE flag descriptions. - - 15 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6.ebuild, - -php-5.2.6-r2.ebuild: - removing old and vulnerable - - 09 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-4.4.8.ebuild: - Removing php-4 (bug 189172); use the php-4 (layman) overlay instead, if - you really insist on keeping it installed - - 08 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.6-r6.ebuild: - ppc stable, bug #234102 - - 08 Aug 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6-r6.ebuild: - alpha/ia64/sparc stable wrt #234102 - - 07 Aug 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6-r6.ebuild: - Stable for HPPA (bug #234102). - - 07 Aug 2008; Markus Meier <maekke@gentoo.org> php-5.2.6-r6.ebuild: - x86 stable, bug #234102 - - 07 Aug 2008; Markus Rothe <corsair@gentoo.org> php-5.2.6-r6.ebuild: - Stable on ppc64; bug #234102 - - 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r6.ebuild: - stable on amd64 wrt security bug 234102 - - 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r6.ebuild: - patchset bump (without rev bump) which changes the new-memory-corruption - patch to fix a build issue (it used to contain the bison-generated .c - version of zend_language_parser.y, we now rely on configure to invoke - bison, which seems to work better) - -*php-5.2.6-r6 (07 Aug 2008) - - 07 Aug 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.6_rc4.ebuild, - -php-5.2.6-r1.ebuild, -php-5.2.6-r5.ebuild, +php-5.2.6-r6.ebuild: - lots of new security/crash fixes, bug 234102 (CVE-2008-2665, CVE-2008-2666 - and other issues); dropping old - - 24 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild, - php-5.2.6-r5.ebuild: - changing explicit depend on c-client back to the virtual, now that a - recent enough uw-imap version is in the tree; stable dependencies are - still broken in case of uw-imap, as the needed version is not stable - - 20 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild: - previous commit replaced CXXFLAGS by CFLAGS by accident, thanks to Rafał - Mużyło <galtgendo@o2.pl> in bug 230809 - - 20 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild: - yet another attempt at fixing _GNU_SOURCE-related build problems - (configure screws up FFLAGS which isn't used at all, so we stop - manipulating it now), bug 230809 - - 19 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild: - build-time-specific (no revbump): fixing warnings (which sometimes seem to - be fatal) regarding to missing function prototypes because of _GNU_SOURCE - being defined too late (bug 230809) - -*php-5.2.6-r5 (17 Jul 2008) - - 17 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6-r5.ebuild: - Fixing USE=suhosin on sparc and maybe other 'exotic' archs (gave SIGBUS, - bug 209501), adding >=freetds-0.82 compatibility patch for ext/mssql and - ext/pdo_dblib (thanks to matthias@dsx.at in bug 223891); other users don't - need to update [imported from php-testing overlay] - - 11 Jul 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6-r2.ebuild: - Stable for HPPA (bug #230575). - - 10 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild: - d'oh, the DEPEND on c-client was supposed to only show up for USE=imap, - thanks to Cardoe for noticing that - - 10 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r2.ebuild: - the ext/imap security patch introduced in php-5.2.6-r2 raises the - dependency on c-client to version 2006k, fixing DEPEND accordingly, bug - 231258 - - 08 Jul 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6-r2.ebuild: - alpha/ia64/sparc stable wrt security #230575 - - 07 Jul 2008; Markus Meier <maekke@gentoo.org> php-5.2.6-r2.ebuild: - x86 stable, bug #230575 - - 07 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> php-5.2.6-r2.ebuild: - stable amd64, security bug 230575 - - 07 Jul 2008; Brent Baude <ranger@gentoo.org> php-5.2.6-r2.ebuild: - Marking php-5.2.6-r2 ppc64 and ppc for bug 230575 - -*php-5.2.6-r2 (02 Jul 2008) - - 02 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6-r2.ebuild: - revbump to include newer patchset, employing lots of security/crash fixes, - bug 230575 - -*php-5.2.6-r1 (05 May 2008) - - 05 May 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6-r1.ebuild: - using official suhosin for version 5.2.6 now, adding patch to fix bug - 212679 (ext/ldap build failure with --as-needed, thanks to Peter Volkov) - - 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> - -php-4.4.8_pre20070816.ebuild: - removing php-4.4.8_pre, 4.4.8 still left; yes, it was latest stable for - all arches, but php-4* and everything depending on it are hardmasked - anyway and one shouldn't continue using it either... - - 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6.ebuild: - only try to fix the open_basedir test cases when suhosin is enabled, - otherwise it breaks for non-suhosin - -*php-5.2.6 (01 May 2008) - - 01 May 2008; Christian Hoffmann <hoffie@gentoo.org> - -php-5.2.6_rc1-r1.ebuild, -php-5.2.6_rc3.ebuild, -php-5.2.6_rc3-r1.ebuild, - +php-5.2.6.ebuild: - version bump to 5.2.6, including kolab support (bug 210977, thanks to - wrobel and jakub), fixing bug 215623 in the same go; removing - old/vulnerable - - 16 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> - php-5.2.6_rc4.ebuild: - ppc stable, bug #215266 - - 16 Apr 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6_rc4.ebuild: - workaround autoconf-2.62 behavior change which made build fail w/ - USE=posix (bug 217392), no revbump - - 15 Apr 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc4.ebuild: - Stable for HPPA (bug #215266). - - 15 Apr 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc4.ebuild: - alpha/ia64/sparc stable wrt security #215266 - - 14 Apr 2008; Markus Meier <maekke@gentoo.org> php-5.2.6_rc4.ebuild: - amd64/x86 stable, security bug #215266 - - 14 Apr 2008; Markus Rothe <corsair@gentoo.org> php-5.2.6_rc4.ebuild: - Stable on ppc64; bug #215266 - -*php-5.2.6_rc4 (05 Apr 2008) - - 05 Apr 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6_rc4.ebuild: - bump to rc4 to address even more possible security issues (stack overflow - in fastcgi handling, several imap-related crashes) - -*php-5.2.6_rc3-r1 (30 Mar 2008) - - 30 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.6_rc3-r1.ebuild: - revbump with a patch to fix a regression in escapeshell{arg,cmd}() - functions in regards to multi-byte handling, phpbug 44564 - - 29 Mar 2008; Markus Meier <maekke@gentoo.org> php-5.2.6_rc3.ebuild: - x86 stable, security bug #215266 - - 29 Mar 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc3.ebuild: - alpha/ia64/sparc stable wrt security #215266 - - 29 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6_rc3.ebuild: - stable on amd64, bug 215266 - - 29 Mar 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc3.ebuild: - Stable for HPPA (bug #215266). - - 29 Mar 2008; Brent Baude <ranger@gentoo.org> php-5.2.6_rc3.ebuild: - Marking php-5.2.6_rc3 ppc64 and ppc for bug 215266 - -*php-5.2.6_rc3 (28 Mar 2008) - - 28 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6_rc3.ebuild: - bump, mainly to address the issues listed in security bug 215266 - - 23 Mar 2008; Benedikt Böhm <hollow@gentoo.org> - php-4.4.8_pre20070816.ebuild, php-4.4.8.ebuild, php-5.2.5-r1.ebuild, - php-5.2.6_rc1-r1.ebuild: - fix depend.apache usage wrt #208033 - - 19 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> - -php-5.2.4_pre200708051230-r2.ebuild, -php-5.2.5_p20080206-r3.ebuild, - -php-5.2.6_rc1.ebuild: - removing old and/or vulnerable versions - - 09 Mar 2008; Tobias Scherbaum <dertobi123@gentoo.org> - php-5.2.6_rc1-r1.ebuild: - ppc stable, bug #212211 - - 08 Mar 2008; <pva@gentoo.org> php-5.2.6_rc1-r1.ebuild: - amd64 stable, security bug #212211. - - 07 Mar 2008; Dawid Węgliński <cla@gentoo.org> php-5.2.6_rc1-r1.ebuild: - Stable on x86 (bug #212211) - - 06 Mar 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc1-r1.ebuild: - alpha/ia64/sparc stable wrt #212211 - - 06 Mar 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc1-r1.ebuild: - Stable for HPPA (bug #212211). - - 06 Mar 2008; Brent Baude <ranger@gentoo.org> php-5.2.6_rc1-r1.ebuild: - Marking php-5.2.6_rc1-r1 ppc64 for bug 212211 - -*php-5.2.6_rc1-r1 (05 Mar 2008) - - 05 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.6_rc1-r1.ebuild: - revbump to -r1 to include new patchset which fixes a mysql_(p)connect crash - (introduced in >5.2.5-r1), several memory corruption issues, a crash in the - soap extension and several test failures - - 04 Mar 2008; Markus Rothe <corsair@gentoo.org> php-5.2.6_rc1.ebuild: - Stable on ppc64; bug #212211 - - 04 Mar 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.6_rc1.ebuild: - alpha/ia64/sparc stable wrt security #212211 - - 03 Mar 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.6_rc1.ebuild: - Stable for HPPA (bug #212211). - - 03 Mar 2008; Markus Meier <maekke@gentoo.org> php-5.2.6_rc1.ebuild: - x86 stable, security bug #212211 - -*php-5.2.6_rc1 (03 Mar 2008) - - 03 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.6_rc1.ebuild: - bump to 5.2.6_rc1 - - 03 Mar 2008; Christian Hoffmann <hoffie@gentoo.org> - -php-5.2.5_p20080206.ebuild, -php-5.2.5_p20080206-r2.ebuild: - removing old - - 28 Feb 2008; Steve Dibb <beandog@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - amd64 stable, bug 209148 - - 24 Feb 2008; Brent Baude <ranger@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - Marking php-5.2.5_p20080206-r3 ppc64 for bug 209148 - - 24 Feb 2008; Raúl Porcel <armin76@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - alpha/ia64/sparc stable wrt security #209148 - - 22 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - ppc stable, bug #209148 - - 21 Feb 2008; Markus Meier <maekke@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - x86 stable, security bug #209148 - - 21 Feb 2008; Jeroen Roovers <jer@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - Stable for HPPA (bug #209148). - - 13 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> - php-5.2.5_p20080206-r3.ebuild: - yet another attempt at fixing src_test (no revbump) - -*php-5.2.5_p20080206-r3 (12 Feb 2008) - - 12 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.5_p20080206-r3.ebuild: - hopefully improved upstream patch for bug #209606 - -*php-5.2.5_p20080206-r2 (12 Feb 2008) - - 12 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.5_p20080206-r2.ebuild: - revbump to fix a pretty severe crash problem: fixes bug #209606 and maybe - bug #209501; also reworking src_test so that it works more reliable - (hopefully) - - 08 Feb 2008; Raúl Porcel <armin76@gentoo.org> php-5.2.5_p20080206.ebuild: - alpha/ia64/sparc stable wrt security #209148 - - 08 Feb 2008; Jeroen Roovers <jer@gentoo.org> php-5.2.5_p20080206.ebuild: - Stable for HPPA (bug #209148). - - 08 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> - php-5.2.5_p20080206.ebuild: - ppc stable, bug #209148 - - 08 Feb 2008; Brent Baude <ranger@gentoo.org> php-5.2.5_p20080206.ebuild: - Marking php-5.2.5_p20080206 ppc64 for bug 209148 - - 07 Feb 2008; Dawid Węgliński <cla@gentoo.org> - php-5.2.5_p20080206.ebuild: - Stable on x86 (bug #209148) - -*php-5.2.5_p20080206 (06 Feb 2008) - - 06 Feb 2008; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.5_p20080206.ebuild: - adding new snapshot 5.2.5_p20080206 for security bug 209148 - - 31 Jan 2008; Christian Hoffmann <hoffie@gentoo.org> - files/70_mod_php.conf-apache2, files/70_mod_php5_concurr.conf-apache2, - files/70_mod_php5.conf-apache2, files/70_mod_php_concurr.conf-apache2: - changing AddDirectoryIndex to DirectoryIndex in apache configs per bug 139451 - -*php-4.4.8 (08 Jan 2008) - - 08 Jan 2008; Christian Hoffmann <hoffie@gentoo.org> +php-4.4.8.ebuild: - bumping to 4.4.8 by user request; completely untested except quick compile - test (it's hardmasked anyway, you should really switch to php-5*) - - 08 Jan 2008; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.5.ebuild: - removing php-5.2.5, -r1 is more secure and has same KEYWORDS - - 15 Dec 2007; <welp@gentoo.org> php-5.2.5-r1.ebuild: - Stable on amd64; bug 201885 - - 12 Dec 2007; Brent Baude <ranger@gentoo.org> php-5.2.5-r1.ebuild: - Marked php-5.2.5-r1 ppc & ppc64 stable for bug 201885 - - 11 Dec 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.5-r1.ebuild: - Stable for HPPA (bug #201885). - - 11 Dec 2007; Raúl Porcel <armin76@gentoo.org> php-5.2.5-r1.ebuild: - alpha/ia64/sparc stable wrt security #201885 - - 11 Dec 2007; Dawid Węgliński <cla@gentoo.org> php-5.2.5-r1.ebuild: - Stable on x86 (bug #201885) - -*php-5.2.5-r1 (08 Dec 2007) - - 08 Dec 2007; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.5-r1.ebuild: - revision bump w/ updated patchset to fix most of the security issues listed - in bug 199156 - - 15 Nov 2007; Christian Hoffmann <hoffie@gentoo.org> -php-4.4.7.ebuild, - -php-5.2.4.ebuild, -php-5.2.4_p20070914-r2.ebuild: - removing old/vulnerable versions 4.4.7, 5.2.4 and 5.2.4_p20070914-r2 - - 14 Nov 2007; Alex Howells <astinus@gentoo.org> php-5.2.5.ebuild: - changing ~amd64 -> amd64 with regard to #198650 - - 13 Nov 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.5.ebuild: - ppc stable, bug #198650 - - 12 Nov 2007; Markus Rothe <corsair@gentoo.org> php-5.2.5.ebuild: - Stable on ppc64; bug #198650 - - 12 Nov 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.5.ebuild: - Stable for HPPA (bug #198650 ). - - 12 Nov 2007; Raúl Porcel <armin76@gentoo.org> php-5.2.5.ebuild: - alpha/ia64/sparc stable wrt #198650 - - 11 Nov 2007; Dawid Węgliński <cla@gentoo.org> php-5.2.5.ebuild: - Stable on x86 (bug #198650) - -*php-5.2.5 (09 Nov 2007) - - 09 Nov 2007; Christian Hoffmann <hoffie@gentoo.org> +php-5.2.5.ebuild: - bump to php-5.2.5, http://www.php.net/ChangeLog-5.php#5.2.5 - Gentoo-wise improvements: zero or very little expected test failures, depending - on the USE flags - - 03 Nov 2007; Christian Hoffmann <hoffie@gentoo.org> -php-5.1.6-r11.ebuild: - removing php-5.1* - - 21 Oct 2007; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.2-r1.ebuild, - -php-5.2.4_p20070914.ebuild: - cleanup old - - 25 Sep 2007; Raúl Porcel <armin76@gentoo.org> - php-5.2.4_p20070914-r2.ebuild: - sparc stable wrt security #191034 - - 22 Sep 2007; Raúl Porcel <armin76@gentoo.org> - php-5.2.4_p20070914-r2.ebuild: - alpha/ia64 stable wrt security #191034 - - 20 Sep 2007; Brent Baude <ranger@gentoo.org> - php-5.2.4_p20070914-r2.ebuild: - MArking php-5.2.4_p20070914-r2 ppc64 stable for 191034 - - 20 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> - php-5.2.4_p20070914-r2.ebuild: - Stable on amd64/x86 wrt bug #191034. - - 20 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org> - php-5.2.4_p20070914-r2.ebuild: - ppc stable, bug #191034 - - 20 Sep 2007; Jeroen Roovers <jer@gentoo.org> - php-5.2.4_p20070914-r2.ebuild: - Stable for HPPA (bug #191034). - -*php-5.2.4_p20070914-r2 (19 Sep 2007) - - 19 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.4_p20070914-r2.ebuild: - adding php-5.2.4_p20070914-r2 as per bug 191034 - * fix CVE-2007-4887 (dl() segfault with very long filenames) - * fix CVE-2007-4783, CVE-2007-4840 (segfault in iconv functions with very - long charset parameters); - * use almost-official suhosin again (based on the patch for 5.2.4) - * fix crashes in xmlrpc - -*php-5.2.4_p20070914 (14 Sep 2007) - - 14 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> - +php-5.2.4_p20070914.ebuild: - adding php-5.2.4_p20070914, bug 191034 - -*php-5.2.4 (08 Sep 2007) - - 08 Sep 2007; Christian Hoffmann <hoffie@gentoo.org> -php-5.2.3-r3.ebuild, - +php-5.2.4.ebuild: - adding php-5.2.4, bug 191034; removing broken php-5.2.3* - - 29 Aug 2007; Markus Rothe <corsair@gentoo.org> - php-4.4.8_pre20070816.ebuild: - Stable on ppc64; bug #189172 - - 24 Aug 2007; Raúl Porcel <armin76@gentoo.org> - php-4.4.8_pre20070816.ebuild: - alpha/ia64 stable wrt security #189172 - - 23 Aug 2007; Christoph Mende <angelos@gentoo.org> - php-4.4.8_pre20070816.ebuild: - Stable on amd64 wrt security bug #189172 - - 22 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> - php-4.4.8_pre20070816.ebuild: - ppc stable, bug #189172 - - 21 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> - php-4.4.8_pre20070816.ebuild: - Stable on sparc wrt security #189172 - - 20 Aug 2007; Markus Ullmann <jokey@gentoo.org> - php-4.4.8_pre20070816.ebuild: - Stable on x86 wrt security bug #189172 - - 19 Aug 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.8_pre20070816.ebuild: - Stable for HPPA (bug #189172). - -*php-4.4.8_pre20070816 (18 Aug 2007) - - 18 Aug 2007; Christian Hoffmann <hoffie@gentoo.org> - +php-4.4.8_pre20070816.ebuild: - version bump to fix several security issues, see bug 189172 - - 15 Aug 2007; Jeroen Roovers <jer@gentoo.org> - php-5.2.4_pre200708051230-r2.ebuild: - Stable for HPPA (bug #180556). - - 14 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> - php-5.2.4_pre200708051230-r2.ebuild: - ppc stable, bug #180556 - - 14 Aug 2007; Markus Rothe <corsair@gentoo.org> - php-5.2.4_pre200708051230-r2.ebuild: - Stable on ppc64; bug #180556 - - 13 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> - php-5.2.4_pre200708051230-r2.ebuild: - Stable on sparc wrt #180556 - - 12 Aug 2007; Steve Dibb <beandog@gentoo.org> - php-5.2.4_pre200708051230-r2.ebuild: - amd64 stable, bug 180556 - - 11 Aug 2007; Raúl Porcel <armin76@gentoo.org> - php-5.2.4_pre200708051230-r2.ebuild: - alpha/ia64/x86 stable wrt #180556 - -*php-5.2.4_pre200708051230-r2 (09 Aug 2007) - - 09 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> - +php-5.2.4_pre200708051230-r2.ebuild: - Import from the php-testing overlay wrt security bug #180556, thanks to - Christian Hoffmann! - - 30 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> php-5.2.3-r3.ebuild: - Stable on sparc wrt security #180556 - - 30 Jul 2007; Markus Rothe <corsair@gentoo.org> php-5.2.3-r3.ebuild: - Stable on ppc64; bug #180556 - - 28 Jul 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.3-r3.ebuild: - Stable for HPPA (bug #180556). - - 28 Jul 2007; Steve Dibb <beandog@gentoo.org> php-5.2.3-r3.ebuild: - amd64 stable, security bug 180556 - - 28 Jul 2007; Raúl Porcel <armin76@gentoo.org> php-5.2.3-r3.ebuild: - alpha/ia64/x86 stable wrt #180556 - - 28 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-5.2.3-r3.ebuild: - ppc stable, bug #180556 - -*php-5.2.3-r3 (22 Jul 2007) - - 22 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org> - +php-5.2.3-r3.ebuild: - Import php-5.2.3-r3 from the php-experimental overlay wrt security bug - #180556, thanks to Christian Hoffmann! - - 30 Jun 2007; Luca Longinotti <chtekk@gentoo.org> -php-4.4.6.ebuild, - -php-5.2.1-r3.ebuild: - Remove old versions. - - 12 May 2007; Markus Rothe <corsair@gentoo.org> php-4.4.7.ebuild, - php-5.2.2-r1.ebuild: - Stable on ppc64; bug #169372 - - 12 May 2007; Luca Longinotti <chtekk@gentoo.org> - files/70_mod_php.conf-apache2, files/70_mod_php5_concurr.conf-apache2, - -files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2, - files/20php4-envd, files/20php5-envd, -files/70_mod_php.conf-apache1, - files/70_mod_php_concurr.conf-apache2, php-4.4.6.ebuild, php-4.4.7.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild, php-5.2.2-r1.ebuild: - Apache 1.X masking (fix ebuilds to not require apache-1*). - - 10 May 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.7.ebuild, - php-5.2.2-r1.ebuild: - Stable for HPPA (bug #169372). - - 10 May 2007; Jose Luis Rivero <yoswink@gentoo.org> php-5.2.2-r1.ebuild: - Stable on alpha wrt security bug #169372 - - 09 May 2007; Luca Longinotti <chtekk@gentoo.org> php-4.4.7.ebuild, - php-5.2.2-r1.ebuild: - AMD64 stable for security bug #169372. - - 09 May 2007; Jose Luis Rivero <yoswink@gentoo.org> php-4.4.7.ebuild: - Stable on alpha wrt security bug #169372 - - 08 May 2007; Raúl Porcel <armin76@gentoo.org> php-4.4.7.ebuild, - php-5.2.2-r1.ebuild: - ia64 + x86 stable wrt security bug 169372 - - 08 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.7.ebuild, - php-5.2.2-r1.ebuild: - Stable on sparc wrt security #169372 - - 08 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.7.ebuild, - php-5.2.2-r1.ebuild: - ppc stable, bug #169372 - -*php-5.2.2-r1 (07 May 2007) -*php-4.4.7 (07 May 2007) - - 07 May 2007; Luca Longinotti <chtekk@gentoo.org> +php-4.4.7.ebuild, - +php-5.2.2-r1.ebuild: - PHP 4.4.7 and 5.2.2, fixes various security issues, see bug #169372. - - 04 May 2007; Luca Longinotti <chtekk@gentoo.org> -php-4.3.11-r5.ebuild, - -php-4.4.4-r6.ebuild, php-4.4.6.ebuild, -php-5.0.5-r5.ebuild, - -php-5.1.6-r6.ebuild, php-5.1.6-r11.ebuild: - Remove 4.3 and 5.0 and old versions. - - 31 Mar 2007; Raúl Porcel <armin76@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - ia64 stable wrt bug 153911 - - 31 Mar 2007; Raúl Porcel <armin76@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - ia64 stable wrt security bug 153911 - - 10 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - Stable on alpha wrt security #153911 - - 08 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - Stable on sparc wrt security #153911 - - 06 Mar 2007; René Nussbaumer <killerfox@gentoo.org> php-5.1.6-r11.ebuild: - Stable on hppa. See bug #153911. - - 06 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - Stable on ppc wrt bug #153911. - - 06 Mar 2007; Christian Faulhammer <opfer@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - stable x86; security bug 153911 - - 06 Mar 2007; Jeroen Roovers <jer@gentoo.org> php-5.2.1-r3.ebuild: - Stable for HPPA (bug #153911). - - 06 Mar 2007; Markus Rothe <corsair@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - Stable on ppc64; bug #153911 - - 06 Mar 2007; Jeroen Roovers <jer@gentoo.org> php-4.4.6.ebuild: - Stable for HPPA (bug #153911). - - 05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> php-4.4.6.ebuild, - php-5.1.6-r11.ebuild, php-5.2.1-r3.ebuild: - Keyword on amd64 wrt bug #153911. - -*php-5.2.1-r3 (05 Mar 2007) -*php-5.1.6-r11 (05 Mar 2007) -*php-4.4.6 (05 Mar 2007) - - 05 Mar 2007; Luca Longinotti <chtekk@gentoo.org> +files/20php4-envd, - +files/20php5-envd, -php-4.4.4-r8.ebuild, +php-4.4.6.ebuild, - -php-5.1.6-r8.ebuild, +php-5.1.6-r11.ebuild, +php-5.2.1-r3.ebuild: - New PHP versions, fix lots of bugs, add Suhosin support. - - 26 Nov 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.3-r1.ebuild, - -php-4.4.4-r4.ebuild, -php-5.1.4-r6.ebuild, -php-5.1.6-r4.ebuild: - Cleanup old versions, thanks arch-teams! - - 29 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.4-r6.ebuild: - Stable on ia64, bug 150261. - -*php-5.1.6-r8 (27 Oct 2006) -*php-4.4.4-r8 (27 Oct 2006) - - 27 Oct 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.4-r8.ebuild, - +php-5.1.6-r8.ebuild: - Add new PHP revisions, fix a few issues, improve a open_basedir check. - - 24 Oct 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.4-r6.ebuild, - php-5.1.6-r6.ebuild: - Stable x86; bug #150261 - - 15 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.4-r6.ebuild, - php-5.1.6-r6.ebuild: - hppa stable, bug #150261 - - 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> php-5.1.6-r6.ebuild: - Mark 5.1.6-r6 stable on ia64. #150261 - - 11 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> php-4.4.4-r6.ebuild, - php-5.1.6-r6.ebuild: - Stable on alpha as per security bug #150261 - - 11 Oct 2006; Markus Rothe <corsair@gentoo.org> php-4.4.4-r6.ebuild, - php-5.1.6-r6.ebuild: - Stable on ppc64; bug #150261 - - 11 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.4-r6.ebuild, - php-5.1.6-r6.ebuild: - Stable on sparc wrt security #150261 - - 11 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.4-r6.ebuild, - php-5.1.6-r6.ebuild: - ppc stable, bug #150261 - -*php-5.1.6-r6 (07 Oct 2006) -*php-4.4.4-r6 (07 Oct 2006) - - 07 Oct 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.4-r6.ebuild, - +php-5.1.6-r6.ebuild: - Fix security bug #150261, amd64 stable. - - 16 Sep 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.4-r4.ebuild, - php-5.1.6-r4.ebuild: - Stable on hppa. See bug #147061. - - 14 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.4-r4.ebuild, - php-5.1.6-r4.ebuild: - Stable on ia64, bug 147061. - - 11 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.4-r4.ebuild, - php-5.1.6-r4.ebuild: - ppc stable, bug #147061 - - 11 Sep 2006; Thomas Cort <tcort@gentoo.org> php-4.4.4-r4.ebuild, - php-5.1.6-r4.ebuild: - Stable on alpha and amd64 wrt security Bug #147061. - - 11 Sep 2006; Markus Rothe <corsair@gentoo.org> php-4.4.4-r4.ebuild, - php-5.1.6-r4.ebuild: - Stable on ppc64; bug #147061 - - 11 Sep 2006; Jason Wever <weeve@gentoo.org> php-4.4.4-r4.ebuild, - php-5.1.6-r4.ebuild: - Stable on SPARC wrt security bug #147061. - - 10 Sep 2006; <ticho@gentoo.org> php-4.4.4-r4.ebuild, php-5.1.6-r4.ebuild: - Stable on x86, security bug #147061. - -*php-5.1.6-r4 (10 Sep 2006) -*php-4.4.4-r4 (10 Sep 2006) - - 10 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.4-r2.ebuild, - +php-4.4.4-r4.ebuild, -php-5.1.6-r2.ebuild, +php-5.1.6-r4.ebuild: - Revision bump to fix INI restore issue and other bugs, updates Hardened-PHP - to 0.4.15. Cleanup old versions. - - 10 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.2.ebuild, - -php-4.4.2-r2.ebuild, -php-4.4.2-r6.ebuild: - Remove old versions. - - 08 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.3-r1.ebuild: - Stable on ia64. - - 05 Sep 2006; Luca Longinotti <chtekk@gentoo.org> -php-5.1.4.ebuild, - -php-5.1.4-r4.ebuild: - Remove old versions. - - 03 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> php-5.1.4-r6.ebuild: - Stable on ia64. - -*php-5.1.6-r2 (30 Aug 2006) -*php-4.4.4-r2 (30 Aug 2006) - - 30 Aug 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.4-r1.ebuild, - +php-4.4.4-r2.ebuild, -php-5.1.6-r1.ebuild, +php-5.1.6-r2.ebuild: - Revbump to force upgrading because of missing mbstring headers which can - break extension compiles. - -*php-5.1.6-r1 (29 Aug 2006) -*php-4.4.4-r1 (29 Aug 2006) - - 29 Aug 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.4.ebuild, - +php-4.4.4-r1.ebuild, -php-5.1.6.ebuild, +php-5.1.6-r1.ebuild: - Revbump to force reverting back to bundled libpcre, the external one can - result is strange brokenness in PHP, see bug #145220 for more info. - -*php-5.1.6 (29 Aug 2006) -*php-4.4.4 (29 Aug 2006) - - 29 Aug 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.4.ebuild, - +php-5.1.6.ebuild: - Version bump, add PHP 4.4.4 and PHP 5.1.6 with Hardened-PHP 0.4.14, fixes - bug #144297. Also switch the eclasses to use external libraries for PCRE and - SQLite support, fixes bug #145220. - - 15 Aug 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.3-r1.ebuild, - php-5.1.4-r6.ebuild: - See below for the security bug that makes this x86 stable - - 14 Aug 2006; Jose Luis Rivero <yoswink@gentoo.org> php-4.4.3-r1.ebuild, - php-5.1.4-r6.ebuild: - Stable on alpha wrt security bug #143126 - - 12 Aug 2006; Jason Wever <weeve@gentoo.org> php-4.4.3-r1.ebuild: - Updated the patchset for php-4.4.3-r1 to fix bug #143508 (with permission - from jakub). - - 12 Aug 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.3-r1.ebuild, - php-5.1.4-r6.ebuild: - Stable on hppa. See bug #143126. - - 12 Aug 2006; Markus Rothe <corsair@gentoo.org> php-4.4.3-r1.ebuild, - php-5.1.4-r6.ebuild: - Stable on ppc64; bug #143126 - - 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: - Retry with manually diffed patch, works here now, hopefully out there too. ;) - - 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: - Revert, now it got even worse, fails on some of my systems too. :S - - 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.3-r1.ebuild: - Update patchset for PHP 4.4.3, it seems one of the patches randomly failed - to apply on some systems, probably due to bad line-endings. - - 10 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> php-4.4.3-r1.ebuild, - php-5.1.4-r6.ebuild: - Stable on sparc wrt security #143126 - - 10 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.3-r1.ebuild, - php-5.1.4-r6.ebuild: - ppc stable, bug #143126 - -*php-5.1.4-r6 (10 Aug 2006) -*php-4.4.3-r1 (10 Aug 2006) - - 10 Aug 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.3-r1.ebuild, - +php-5.1.4-r6.ebuild: - Version/revision bump, fixes security bug #143126. Add support for the PHP - test suite, activated by FEATURES="test". - - 20 Jul 2006; Luca Longinotti <chtekk@gentoo.org> php-4.3.11-r5.ebuild, - php-4.4.2.ebuild, php-4.4.2-r2.ebuild, php-4.4.2-r6.ebuild, - php-5.0.5-r5.ebuild, php-5.1.4.ebuild, php-5.1.4-r4.ebuild: - Fix bug #141098. - - 18 Jul 2006; Luca Longinotti <chtekk@gentoo.org> php-4.4.2-r6.ebuild, - php-5.1.4-r4.ebuild: - Stable on amd64 wrt bug #133524. - - 18 Jul 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.2-r6.ebuild, - php-5.1.4-r4.ebuild: - Stable x86; security bug #133524 - - 18 Jul 2006; Thomas Cort <tcort@gentoo.org> php-4.4.2-r6.ebuild, - php-5.1.4-r4.ebuild: - Stable on alpha wrt security Bug #133524. - - 17 Jul 2006; Markus Rothe <corsair@gentoo.org> php-4.4.2-r6.ebuild, - php-5.1.4-r4.ebuild: - Stable on ppc64; bug #133524 - - 17 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.2-r6.ebuild, - php-5.1.4-r4.ebuild: - ppc stable, bug #133524 - - 16 Jul 2006; Jason Wever <weeve@gentoo.org> php-4.4.2-r6.ebuild, - php-5.1.4-r4.ebuild: - Stable on SPARC wrt security bug #133524. - -*php-5.1.4-r4 (14 Jul 2006) -*php-4.4.2-r6 (14 Jul 2006) - - 14 Jul 2006; Luca Longinotti <chtekk@gentoo.org> - +files/70_mod_php5_concurr.conf-apache2, - +files/70_mod_php_concurr.conf-apache2, +files/php4-ldvs, - +files/php5-ldvs, php-4.3.11-r5.ebuild, php-4.4.2.ebuild, - php-4.4.2-r2.ebuild, -php-4.4.2-r5.ebuild, +php-4.4.2-r6.ebuild, - php-5.0.5-r5.ebuild, php-5.1.4.ebuild, -php-5.1.4-r3.ebuild, - +php-5.1.4-r4.ebuild: - Restructure PHP ebuilds and eclasses to accomodate for future expansion and - new features, cleaner separation between eclasses and ebuilds. Fixes - security related bugs #133524, #136566, #138180, #135860 and bugs #137568, - #134171, #138665. - - 13 Jul 2006; Luca Longinotti <chtekk@gentoo.org> -php-5.1.2.ebuild: - Remove PHP 5.1.2. - -*php-5.1.4-r3 (20 Jun 2006) -*php-4.4.2-r5 (20 Jun 2006) - - 20 Jun 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.2-r3.ebuild, - +php-4.4.2-r5.ebuild, -php-5.1.4-r1.ebuild, +php-5.1.4-r3.ebuild: - Revision bumps. Fix bug #105489 and add a couple of other fixes for various - bugs. - - 18 Jun 2006; Bryan Østergaard <kloeri@gentoo.org> php-4.4.2-r2.ebuild, - php-5.1.4.ebuild: - Stable on ia64, bug 131135. - -*php-5.1.4-r1 (29 May 2006) -*php-4.4.2-r3 (29 May 2006) - - 29 May 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.2-r3.ebuild, - +php-5.1.4-r1.ebuild: - New revisions, fix a couple of bugs, and update Hardened-PHP patch to 0.4.11. - - 18 May 2006; Diego Pettenò <flameeyes@gentoo.org> php-4.4.2-r2.ebuild: - Add ~x86-fbsd keyword to 4.4 version. - - 06 May 2006; Jason Wever <weeve@gentoo.org> php-4.4.2-r2.ebuild: - Stable on SPARC wrt security bug #131135. - - 06 May 2006; Markus Rothe <corsair@gentoo.org> php-4.4.2-r2.ebuild, - php-5.1.4.ebuild: - Stable on ppc64; bug #131135 - - 06 May 2006; Mark Loeser <halcy0n@gentoo.org> php-4.4.2-r2.ebuild, - php-5.1.4.ebuild: - Stable on x86; bug #131135 - - 05 May 2006; <tcort@gentoo.org> php-4.4.2-r2.ebuild, php-5.1.4.ebuild: - Stable on alpha wrt security Bug #131135. - - 05 May 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.2-r2.ebuild, - php-5.1.4.ebuild: - Stable on hppa. See bug #131135. - - 05 May 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.2-r2.ebuild, - php-5.1.4.ebuild: - ppc stable, bug #131135 - - 05 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> php-5.1.4.ebuild: - Stable on sparc wrt security #131135 - - 05 May 2006; Luca Longinotti <chtekk@gentoo.org> php-5.1.4.ebuild: - Readd ~x86-fbsd keyword to PHP 5.1.4 which I dropped accidentally, sorry! - Update digests to reflect the fixed patchset, please make sure you have the - php-patchset-4.4.2-r3.tar.bz2 with the md5sum of - eac1d9e4aa78195953e33e566a1f39ce, thanks, and sorry again. ;) - - 05 May 2006; Jon Hood <squinky86@gentoo.org> php-5.1.4.ebuild, - php-4.4.2-r2.ebuild: - Stable on amd64, #131135. - -*php-5.1.4 (05 May 2006) -*php-4.4.2-r2 (05 May 2006) - - 05 May 2006; Luca Longinotti <chtekk@gentoo.org> -php-4.4.2-r1.ebuild, - +php-4.4.2-r2.ebuild, -php-5.1.2-r1.ebuild, +php-5.1.4.ebuild: - Sync with PHP overlay, fixes various bugs and security bugs, see bug #131135 - for more details. - - 23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> php-5.1.2-r1.ebuild: - Add ~x86-fbsd keyword. - - 20 Apr 2006; Luca Longinotti <chtekk@gentoo.org> php-4.3.11-r5.ebuild, - php-4.4.2.ebuild, php-4.4.2-r1.ebuild, php-5.0.5-r5.ebuild, - php-5.1.2.ebuild, php-5.1.2-r1.ebuild: - Don't die on USE=-*, ebuild part. - -*php-5.1.2-r1 (13 Apr 2006) -*php-4.4.2-r1 (13 Apr 2006) - - 13 Apr 2006; Luca Longinotti <chtekk@gentoo.org> +php-4.4.2-r1.ebuild, - +php-5.1.2-r1.ebuild: - Add new revisions to fix an issue with the MySQL charsets. - See bug #129761 about it. - - 28 Mar 2006; Luca Longinotti <chtekk@gentoo.org> - files/70_mod_php.conf-apache1, files/70_mod_php.conf-apache2, - files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2: - Revert config changes for bug #127645. - - 28 Mar 2006; Luca Longinotti <chtekk@gentoo.org> - files/70_mod_php.conf-apache1, files/70_mod_php.conf-apache2, - files/70_mod_php5.conf-apache1, files/70_mod_php5.conf-apache2: - Change config files to fix bug #127645. - - 24 Mar 2006; Luca Longinotti <chtekk@gentoo.org> - files/70_mod_php.conf-apache1, files/70_mod_php5.conf-apache1, - files/70_mod_php5.conf-apache2, php-4.3.11-r5.ebuild, - -php-4.4.1-r3.ebuild, php-4.4.2.ebuild, php-5.0.5-r5.ebuild, - php-5.1.2.ebuild: - Introduce usage of phpconfutils eclass to handle USE flag dependencies - automatically, allowing to build dev-lang/php without intervention on - default USE flags, solves bug #120088. Fix bug #122379. - - 14 Mar 2006; Joshua Jackson <tsunam@gentoo.org> php-4.4.2.ebuild, - php-5.1.2.ebuild: - Stable php-4.4.2 and 5.1.2 for x86; bug #125878 - - 13 Mar 2006; Rene Nussbaumer <killerfox@gentoo.org> php-4.4.2.ebuild, - php-5.1.2.ebuild: - Stable on hppa. See bug #125878. - - 12 Mar 2006; Markus Rothe <corsair@gentoo.org> php-4.4.2.ebuild, - php-5.1.2.ebuild: - Stable on ppc64; bug #125878 - - 12 Mar 2006; Tobias Scherbaum <dertobi123@gentoo.org> php-4.4.2.ebuild, - php-5.1.2.ebuild: - ppc stable, bug #125878 - - 12 Mar 2006; Jason Wever <weeve@gentoo.org> php-4.4.2.ebuild, - php-5.1.2.ebuild: - Stable on SPARC wrt security bug #125878. - - 12 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> php-5.1.2.ebuild: - Stable on alpha wrt security bug #125878 - - 12 Mar 2006; Simon Stelling <blubb@gentoo.org> php-4.4.2.ebuild, - php-5.1.2.ebuild: - stable on amd64 wrt bug 125878 - - 12 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org> php-4.4.2.ebuild: - Stable on alpha wrt security bug #125878 - -*php-5.1.2 (12 Mar 2006) -*php-4.4.2 (12 Mar 2006) - - 12 Mar 2006; Luca Longinotti <chtekk@gentoo.org> - -files/4-any/php4-fastbuild.patch, -files/4-any/php4-imap-symlink.diff, - -files/4-any/php4-iodbc-config.diff, +files/70_mod_php.conf-apache1, - +files/70_mod_php.conf-apache2, -files/4-any/php4-libtool-1.5.patch, - -files/4-any/php4-uClibc-have_dn_skipname.patch, - -files/4-any/php4-with-iodbc.diff, +files/70_mod_php5.conf-apache1, - +files/70_mod_php5.conf-apache2, -files/4-any/apache-1.3/70_mod_php.conf, - -files/4-any/apache-2.0/70_mod_php.conf, - -files/5.0-any/php5-imap-symlink.diff, - -files/5.0-any/php5-iodbc-config.diff, - -files/5.0-any/php5-libtool-1.5.patch, -files/5.0-any/php5-prefork.patch, - -files/5.0-any/php5-soap_persistence_session.diff, - -files/5.0-any/php5-with-iodbc.diff, - -files/5.0-any/apache-1.3/70_mod_php5.conf, - -files/5.0-any/apache-2.0/70_mod_php5.conf, - -files/5.1-any/php5-fastbuild.patch, - -files/5.1-any/php5-imap-symlink.diff, - -files/5.1-any/php5-iodbc-config.diff, -files/5.1-any/php5-prefork.patch, - -files/5.1-any/php5-soap_persistence_session.diff, - -files/5.1-any/php5-with-iodbc.diff, - -files/5.1-any/apache-1.3/70_mod_php5.conf, - -files/5.1-any/apache-2.0/70_mod_php5.conf, php-4.3.11-r5.ebuild, - php-4.4.1-r3.ebuild, +php-4.4.2.ebuild, php-5.0.5-r5.ebuild, - -php-5.1.1.ebuild, +php-5.1.2.ebuild: - Sync with PHP Overlay: reworked ebuilds, eclasses and patchsets to be easier - to maintain. Add PHP 4.4.2 and PHP 5.1.2 to the tree, fixing bugs #125878 - and #118846. Fix too bugs #120908, #123376, #122724 and #121190. - - 24 Feb 2006; Jeroen Roovers <jer@gentoo.org> php-5.0.5-r5.ebuild: - Stable on hppa (preparation for bug #119461). - - 21 Feb 2006; Jeroen Roovers <jer@gentoo.org> php-5.0.5-r5.ebuild: - Marked ~hppa. - - 26 Jan 2006; Jeroen Roovers <jer@gentoo.org> php-4.4.1-r3.ebuild: - Marked stable on hppa (bug #102649). - - 26 Jan 2006; Jeroen Roovers <jer@gentoo.org> php-5.1.1.ebuild: - Marked ~hppa (bug #119461). - - 25 Jan 2006; Bryan Østergaard <kloeri@gentoo.org php-4.4.1-r3.ebuild, - php-5.0.5-r5.ebuild: - Stable on alpha. - - 22 Jan 2006; Simon Stelling <blubb@gentoo.org> php-4.3.11-r5.ebuild, - php-4.4.1-r3.ebuild: - stable on amd64 - - 22 Jan 2006; Simon Stelling <blubb@gentoo.org> php-5.0.5-r5.ebuild: - stable on amd64 - - 22 Jan 2006; <nixnut@gentoo.org> php-4.3.11-r5.ebuild: - Added ~ppc keyword to php-4.3.11-r5 - - 21 Jan 2006; Jason Wever <weeve@gentoo.org> php-4.3.11-r5.ebuild, - php-4.4.1-r3.ebuild, php-5.0.5-r5.ebuild: - Stable on SPARC wrt bug #119461. - - 21 Jan 2006; <nixnut@gentoo.org> php-5.0.5-r5.ebuild: - Added ppc keyword to php-4.4.1-r3, php-5.0.5-r5. bug 119461 - - 19 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> php-4.3.11-r5.ebuild, - php-4.4.1-r3.ebuild, php-5.0.5-r5.ebuild: - Stable on x86. - - 18 Jan 2006; Markus Rothe <corsair@gentoo.org> php-4.4.1-r3.ebuild, - php-5.0.5-r5.ebuild: - Stable on ppc64; bug #119461 - - 10 Jan 2006; Luca Longinotti <chtekk@gentoo.org> - -files/4.3.11/php4.3.11-apache2sapi.patch, - -files/4.3.11/php4.3.11-apachesapi.patch, - -files/4.3.11/php4.3.11-curl-open_basedir.patch, - -files/4.3.11/php4.3.11-fopen_wrappers.patch, - -files/4.3.11/php4.3.11-gd-safe_mode.patch, - -files/4.3.11/php4.3.11-globals_overwrite.patch, - -files/4.3.11/php4.3.11-mbstring-header_inj.patch, - -files/4.3.11/php4.3.11-multilib-search-path.patch, - -files/4.3.11/php4.3.11-pcre-security.patch, - -files/4.3.11/php4.3.11-phpinfo_xss.patch, - -files/4.3.11/php4.3.11-pspell-ext-segf.patch, - -files/4.4.1/php4.4.1-apache2sapi.patch, - -files/4.4.1/php4.4.1-curl-open_basedir.patch, - -files/4.4.1/php4.4.1-current_key_by_reference.patch, - -files/4.4.1/php4.4.1-gd-safe_mode.patch, - -files/4.4.1/php4.4.1-mbstring-header_inj.patch, - -files/4.4.1/php4.4.1-multilib-search-path.patch, - -files/5.0.5/php5.0.5-apache2sapi.patch, - -files/5.0.5/php5.0.5-curl-open_basedir.patch, - -files/5.0.5/php5.0.5-fopen_wrappers.patch, - -files/5.0.5/php5.0.5-gd-safe_mode.patch, - -files/5.0.5/php5.0.5-globals_overwrite.patch, - -files/5.0.5/php5.0.5-mbstring-header_inj.patch, - -files/5.0.5/php5.0.5-multilib-search-path.patch, - -files/5.0.5/php5.0.5-obj-serialize.patch, - -files/5.0.5/php5.0.5-pspell-ext-segf.patch, - -files/5.0.5/php5.0.5-tsrm-gcc4.patch, - -files/5.1.1/php5.1.1-curl-gcry_threads.patch, - -files/5.1.1/php5.1.1-ming-config.patch, - -files/5.1.1/php5.1.1-multilib-search-path.patch, php-4.3.11-r5.ebuild, - php-4.4.1-r3.ebuild, php-5.0.5-r5.ebuild, php-5.1.1.ebuild: - Move version-specific patches into external tarballs. - - 05 Jan 2006; Luca Longinotti <chtekk@gentoo.org> - +files/5.1.1/php5.1.1-curl-gcry_threads.patch, php-5.1.1.ebuild: - Fix bug #117767. - -*php-5.1.1 (28 Dec 2005) -*php-5.0.5-r5 (28 Dec 2005) -*php-4.4.1-r3 (28 Dec 2005) -*php-4.3.11-r5 (28 Dec 2005) - - 28 Dec 2005; Luca Longinotti <chtekk@gentoo.org> - files/4-any/php4-imap-symlink.diff, files/4-any/php4-iodbc-config.diff, - +files/4.3.11/php4.3.11-apache2sapi.patch, - +files/4.3.11/php4.3.11-apachesapi.patch, - +files/4.3.11/php4.3.11-curl-open_basedir.patch, - -files/4.3.11/php4.3.11-curl_safemode.patch, - +files/4.3.11/php4.3.11-gd-safe_mode.patch, - -files/4.3.11/php4.3.11-gd_safe_mode.patch, - +files/4.3.11/php4.3.11-mbstring-header_inj.patch, - +files/4.3.11/php4.3.11-multilib-search-path.patch, - -files/4.3.11/php4.3.11-session_save_path-segf.patch, - -files/4.4.0/php4.4.0-curl_safemode.patch, - -files/4.4.0/php4.4.0-fopen_wrappers.patch, - -files/4.4.0/php4.4.0-gd_safe_mode.patch, - -files/4.4.0/php4.4.0-globals_overwrite.patch, - -files/4.4.0/php4.4.0-pcre-security.patch, - -files/4.4.0/php4.4.0-phpinfo_xss.patch, - -files/4.4.0/php4.4.0-pspell-ext-segf.patch, - -files/4.4.0/php4.4.0-session_save_path-segf.patch, - +files/4.4.1/php4.4.1-apache2sapi.patch, - +files/4.4.1/php4.4.1-curl-open_basedir.patch, - +files/4.4.1/php4.4.1-gd-safe_mode.patch, - +files/4.4.1/php4.4.1-mbstring-header_inj.patch, - -files/4.4.1/php4.4.1-mod_rewrite-crash.patch, - +files/4.4.1/php4.4.1-multilib-search-path.patch, - files/5.0-any/php5-iodbc-config.diff, - -files/5.0.4/php5.0.4-curl_safemode.patch, - -files/5.0.4/php5.0.4-fopen_wrappers.patch, - -files/5.0.4/php5.0.4-gd_safe_mode.patch, - -files/5.0.4/php5.0.4-globals_overwrite.patch, - -files/5.0.4/php5.0.4-pcre-security.patch, - -files/5.0.4/php5.0.4-phpinfo_xss.patch, - -files/5.0.4/php5.0.4-pspell-ext-segf.patch, - -files/5.0.4/php5.0.4-session_save_path-segf.patch, - -files/5.0.4/php5.0.4-xmlrcp-ccode.diff, - +files/5.0.5/php5.0.5-apache2sapi.patch, - +files/5.0.5/php5.0.5-curl-open_basedir.patch, - -files/5.0.5/php5.0.5-curl_safemode.patch, - +files/5.0.5/php5.0.5-gd-safe_mode.patch, - -files/5.0.5/php5.0.5-gd_safe_mode.patch, - +files/5.0.5/php5.0.5-mbstring-header_inj.patch, - +files/5.0.5/php5.0.5-multilib-search-path.patch, - -files/5.0.5/php5.0.5-session_save_path-segf.patch, - +files/5.0.5/php5.0.5-tsrm-gcc4.patch, - files/5.1-any/php5-iodbc-config.diff, - +files/5.1.1/php5.1.1-ming-config.patch, - +files/5.1.1/php5.1.1-multilib-search-path.patch, -php-4.3.11-r4.ebuild, - +php-4.3.11-r5.ebuild, -php-4.4.0-r4.ebuild, -php-4.4.1-r2.ebuild, - +php-4.4.1-r3.ebuild, -php-5.0.4-r4.ebuild, -php-5.0.5-r4.ebuild, - +php-5.0.5-r5.ebuild, +php-5.1.1.ebuild: - Sync with PHP Overlay. Delete PHP 4.4.0 and PHP 5.0.4, add PHP 5.1.1. Update - a lot of patches, update Hardened-PHP patches, add lib64 patch for multilib - systems. Fixes many bugs. - - 19 Nov 2005; Markus Rothe <corsair@gentoo.org> php-4.4.1-r2.ebuild, - php-5.0.5-r4.ebuild: - Added ~ppc64 keywords; bug #102649 - - 10 Nov 2005; Jason Wever <weeve@gentoo.org> php-4.4.1-r2.ebuild: - Added ~sparc keyword as all arches but ~x86 were dropped from the 4.4.1 - ebuilds. - -*php-5.0.5-r4 (04 Nov 2005) -*php-5.0.4-r4 (04 Nov 2005) -*php-4.4.1-r2 (04 Nov 2005) -*php-4.4.0-r4 (04 Nov 2005) -*php-4.3.11-r4 (04 Nov 2005) - - 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - files/4.3.11/php4.3.11-session_save_path-segf.patch, - files/5.0.4/php5.0.4-session_save_path-segf.patch, - files/4.4.0/php4.4.0-session_save_path-segf.patch, - files/5.0.5/php5.0.5-session_save_path-segf.patch, -php-4.3.11-r3.ebuild, - +php-4.3.11-r4.ebuild, -php-4.4.0-r3.ebuild, +php-4.4.0-r4.ebuild, - -php-4.4.1-r1.ebuild, +php-4.4.1-r2.ebuild, -php-5.0.4-r3.ebuild, - +php-5.0.4-r4.ebuild, -php-5.0.5-r3.ebuild, +php-5.0.5-r4.ebuild: - Revbump to fix a bug in the Apache2 SAPI and a bug with key() and current(). - - 04 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - files/4.3.11/php4.3.11-globals_overwrite.patch, - files/4.4.0/php4.4.0-globals_overwrite.patch, - +files/4.4.1/php4.4.1-current_key_by_reference.patch, - files/5.0.4/php5.0.4-globals_overwrite.patch, - files/5.0.5/php5.0.5-globals_overwrite.patch, php-4.4.1-r1.ebuild: - Fix for http://bugs.php.net/bug.php?id=35067. - -*php-4.4.1-r1 (03 Nov 2005) - - 03 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - +files/4.4.1/php4.4.1-mod_rewrite-crash.patch, -php-4.4.1.ebuild, - +php-4.4.1-r1.ebuild: - Update Hardened-PHP to latest version for PHP 4.4.1 and 5.0.5, fix bug in - the Apache2 SAPI of PHP 4.4.1 (mentioned in bug #111032). - -*php-5.0.5-r3 (02 Nov 2005) -*php-5.0.4-r3 (02 Nov 2005) -*php-4.4.1 (02 Nov 2005) -*php-4.4.0-r3 (02 Nov 2005) -*php-4.3.11-r3 (02 Nov 2005) - - 02 Nov 2005; Luca Longinotti <chtekk@gentoo.org> - +files/4.3.11/php4.3.11-curl_safemode.patch, - +files/4.3.11/php4.3.11-globals_overwrite.patch, - +files/4.3.11/php4.3.11-phpinfo_xss.patch, - +files/4.4.0/php4.4.0-curl_safemode.patch, - +files/4.4.0/php4.4.0-globals_overwrite.patch, - +files/4.4.0/php4.4.0-phpinfo_xss.patch, - +files/5.0.4/php5.0.4-curl_safemode.patch, - +files/5.0.4/php5.0.4-globals_overwrite.patch, - +files/5.0.4/php5.0.4-phpinfo_xss.patch, - +files/5.0.5/php5.0.5-curl_safemode.patch, - +files/5.0.5/php5.0.5-globals_overwrite.patch, -php-4.3.11-r2.ebuild, - +php-4.3.11-r3.ebuild, -php-4.4.0-r2.ebuild, +php-4.4.0-r3.ebuild, - +php-4.4.1.ebuild, -php-5.0.4-r2.ebuild, +php-5.0.4-r3.ebuild, - -php-5.0.5-r2.ebuild, +php-5.0.5-r3.ebuild: - Security-update: fix bugs #111032, #111015, #111011 and bug #111014. Also - add PHP 4.4.1 to the tree, wich fixes those vulnerabilities. - -*php-5.0.5-r2 (31 Oct 2005) -*php-5.0.4-r2 (31 Oct 2005) -*php-4.4.0-r2 (31 Oct 2005) -*php-4.3.11-r2 (31 Oct 2005) - - 31 Oct 2005; Luca Longinotti <chtekk@gentoo.org> - -files/4.4.0/php4.3.11-pcre-security.patch, - +files/4.4.0/php4.4.0-fopen_wrappers.patch, - +files/4.4.0/php4.4.0-gd_safe_mode.patch, - files/4.4.0/php4.4.0-pcre-security.patch, - +files/4.4.0/php4.4.0-pspell-ext-segf.patch, - +files/4.4.0/php4.4.0-session_save_path-segf.patch, - -files/4.4.0/apache-1.3/70_mod_php.conf, - -files/4.4.0/apache-2.0/70_mod_php.conf, - +files/4-any/php4-fastbuild.patch, +files/4-any/php4-imap-symlink.diff, - +files/4-any/php4-iodbc-config.diff, - +files/5.0-any/php5-imap-symlink.diff, - +files/4-any/php4-libtool-1.5.patch, - +files/4-any/php4-uClibc-have_dn_skipname.patch, - +files/4-any/php4-with-iodbc.diff, +files/5.0-any/php5-iodbc-config.diff, - +files/4-any/apache-1.3/70_mod_php.conf, - +files/5.0-any/php5-libtool-1.5.patch, - +files/4-any/apache-2.0/70_mod_php.conf, - +files/4.3.11/php4.3.11-fopen_wrappers.patch, - +files/4.3.11/php4.3.11-gd_safe_mode.patch, - +files/4.3.11/php4.3.11-pcre-security.patch, - +files/4.3.11/php4.3.11-pspell-ext-segf.patch, - +files/4.3.11/php4.3.11-session_save_path-segf.patch, - -files/4.4.0/fastbuild.patch, -files/4.4.0/php4-imap-symlink.diff, - -files/4.4.0/php4-iodbc-config.diff, -files/4.4.0/php4-libtool-1.5.patch, - -files/4.4.0/php4-with-iodbc.diff, +files/5.0-any/php5-prefork.patch, - +files/5.0-any/php5-soap_persistence_session.diff, - +files/5.0-any/php5-with-iodbc.diff, - +files/5.0-any/apache-1.3/70_mod_php5.conf, - +files/5.0-any/apache-2.0/70_mod_php5.conf, - -files/5.0.0/php5-imap-symlink.diff, -files/5.0.0/php5-iodbc-config.diff, - -files/5.0.0/php5-libtool-1.5.patch, - -files/5.0.0/php5.0.4-pcre-security.patch, - -files/5.0.0/php5.0.4-xmlrcp-ccode.diff, - -files/5.0.0/php5.0.5-obj-serialize.patch, - +files/5.0.4/php5.0.4-fopen_wrappers.patch, - +files/5.0.4/php5.0.4-gd_safe_mode.patch, - +files/5.0.4/php5.0.4-pcre-security.patch, - +files/5.0.4/php5.0.4-pspell-ext-segf.patch, - +files/5.0.4/php5.0.4-session_save_path-segf.patch, - +files/5.0.4/php5.0.4-xmlrcp-ccode.diff, - +files/5.0.5/php5.0.5-fopen_wrappers.patch, - +files/5.0.5/php5.0.5-gd_safe_mode.patch, - +files/5.0.5/php5.0.5-obj-serialize.patch, - +files/5.0.5/php5.0.5-pspell-ext-segf.patch, - +files/5.0.5/php5.0.5-session_save_path-segf.patch, - +files/5.1-any/php5-fastbuild.patch, - +files/5.1-any/php5-imap-symlink.diff, - +files/5.1-any/php5-iodbc-config.diff, +files/5.1-any/php5-prefork.patch, - +files/5.1-any/php5-soap_persistence_session.diff, - +files/5.1-any/php5-with-iodbc.diff, - +files/5.1-any/apache-1.3/70_mod_php5.conf, - +files/5.1-any/apache-2.0/70_mod_php5.conf, - -files/5.1.0/php5-imap-symlink.diff, -files/5.1.0/php5-iodbc-config.diff, - -files/5.1.0/php5-prefork.patch, -files/5.1.0/php5-with-iodbc.diff, - -files/5.1.0/php5_soap_persistence_session.diff, - -files/5.1.0/apache-1.3/70_mod_php5.conf, - -files/5.1.0/apache-2.0/70_mod_php5.conf, -php-4.3.11-r1.ebuild, - +php-4.3.11-r2.ebuild, -php-4.4.0-r1.ebuild, +php-4.4.0-r2.ebuild, - -php-5.0.4-r1.ebuild, +php-5.0.4-r2.ebuild, -php-5.0.5-r1.ebuild, - +php-5.0.5-r2.ebuild: - New-style PHP update: fix quotation of some vars, change URI of a mirror, - change ordering of patches in the files/ directory, add 'mnogosearch' USE - flag, add 'oci8-instant-client' USE flag, add 'pic' USE flag, add 'cjk' USE - flag, delete 'png' and 'jpeg' USE flags now directly controlled by 'gd' USE - flag, change PHP extensions enabling/disabling system, fix a bug with - Apache1 + fastbuild, fix elibtoolize call (bug #106176) and fix bugs #99312, - #109669, #102943, #107602, #99225, #108834. - - 24 Sep 2005; Jason Wever <weeve@gentoo.org> php-5.0.5-r1.ebuild: - Added ~sparc keyword. - -*php-5.0.5-r1 (18 Sep 2005) -*php-5.0.4-r1 (18 Sep 2005) -*php-4.4.0-r1 (18 Sep 2005) -*php-4.3.11-r1 (18 Sep 2005) - - 18 Sep 2005; Benedikt Boehm <hollow@gentoo.org> - +files/4.4.0/php4-libtool-1.5.patch, +files/5.0.0/php5-libtool-1.5.patch, - +files/4.4.0/php4.3.11-pcre-security.patch, - +files/4.4.0/php4.4.0-pcre-security.patch, - +files/5.0.0/php5.0.4-pcre-security.patch, - +files/5.0.0/php5.0.4-xmlrcp-ccode.diff, - +files/5.0.0/php5.0.5-obj-serialize.patch, files/4.4.0/fastbuild.patch, - -files/5.0.0/php5-hphp-acinclude.patch, - -files/4.4.0/php4-hphp-acinclude.patch, -php-4.3.11.ebuild, - +php-4.3.11-r1.ebuild, -php-4.4.0.ebuild, +php-4.4.0-r1.ebuild, - -php-5.0.4.ebuild, +php-5.0.4-r1.ebuild, -php-5.0.5.ebuild, - +php-5.0.5-r1.ebuild: - Fix security issue in bundled PCRE lib for PHP 4.3.11, 4.4.0 and 5.0.4, bug #102373. - Fix object serialization bug in PHP 5.0.5, bug #105374. - Fix Hardened-PHP support for all PHP releases. - Various compilation fixes for all PHP releases. - Various dependency fixes for all PHP releases. - Deleted 'dbm' USE flag from all PHP ebuilds, it's not supported upstream. - Changed 'java' USE flag to 'java-internal' USE flag for PHP4. - - 17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-5.0.4.ebuild: - Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug - 102649. - - 17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> php-4.4.0.ebuild: - Fixed up the remaining deps, tested here and looks good. Marking ~amd64, bug - 102649. - - 17 Sep 2005; Brian Harring <ferringb@gentoo.org> php-4.4.0.ebuild, - php-5.0.4.ebuild: - Backed out ~amd64 keywording. bad deps. - - 16 Sep 2005; Christian Parpart <trapni@gentoo.org> php-4.4.0.ebuild, - php-5.0.4.ebuild: - added to ~amd64 - - 14 Sep 2005; Joseph Jezak <josejx@gentoo.org> php-5.0.4.ebuild: - Marked ~ppc for bug #105673. - - 14 Sep 2005; Joseph Jezak <josejx@gentoo.org> php-4.4.0.ebuild, - php-5.0.5.ebuild: - Marked ~ppc for bug #105673. - -*php-4.3.11 (11 Sep 2005) - - 11 Sep 2005; Benedikt Boehm <hollow@gentoo.org> +php-4.3.11.ebuild: - add 4.3.11, b/c 4.4.0 breaks compatibility - remove some archs, get your deps tested! - - 09 Sep 2005; Jason Wever <weeve@gentoo.org> php-4.4.0.ebuild, - php-5.0.4.ebuild: - Added ~sparc keyword to help fix the broken dependencies of - dev-php/PEAR-Date-1.4.3-r1. - -*php-4.4.0 (08 Sep 2005) - - 08 Sep 2005; Stuart Herbert <stuart@gentoo.org> - +files/4.4.0/php4-hphp-acinclude.patch, - +files/5.0.0/php5-hphp-acinclude.patch, php-4.4.0.ebuild, php-5.0.4.ebuild, - php-5.0.5.ebuild: - Hardened-PHP fix from the overlay - Slight change to symlink creation behaviour - - 07 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> php-5.0.4.ebuild, - php-5.0.5.ebuild: - Added to ~amd64. - -*php-5.0.5 (06 Sep 2005) - - 06 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org> +php-5.0.5.ebuild: - Version bump. - - 04 Sep 2005; Stuart Herbert <stuart@gentoo.org> - +files/5.1.0/php5-imap-symlink.diff, +files/5.1.0/php5-iodbc-config.diff, - +files/5.1.0/php5-prefork.patch, +files/5.1.0/php5-with-iodbc.diff, - +files/5.1.0/php5_soap_persistence_session.diff: - Added missing patch files for PHP 5.0 from the overlay - - 05 Sep 2005; <stuart@gentoo.org> ChangeLog: - Initial version; replaces older dev-php/* packages - - diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest deleted file mode 100644 index 1ae8ec0..0000000 --- a/dev-lang/php/Manifest +++ /dev/null @@ -1,51 +0,0 @@ -AUX 20php5-envd 145 RMD160 8c81fb7dc1d1ddf16fd956d748514db3bcb27603 SHA1 f1cef57c0def8e2c5422aaf136f40b4ff47801d2 SHA256 efaae9e6ae5f7010e073c2ab6d8a9dda009f0707c7d7b0c027e142c94f7041a4 -AUX 70_mod_php5.conf-apache2 348 RMD160 9f3f49a52ebf92c2650501c5ceb6f95ce4bb2e76 SHA1 62992e793446b4a9a64900d1ecba7bae06873382 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c -AUX eblits/common-v2.eblit 389 RMD160 10a23452d6f55dfccb9625a8e92899b5f339a7be SHA1 34be294b26c2e4118c6beb2b84d19c4faf426278 SHA256 bf6e4b7ddc7d884e5039df47bd754e6289844faa7a03cc3095ee6aa552c7a39c -AUX eblits/pkg_setup-v2.eblit 393 RMD160 430ab1f0227011172d422886862bd59d3886034a SHA1 2fdb587135cd0fe84ea51bfee8cf4ea9fd67dcb5 SHA256 17f9316065960ff0ca56aeec918c2c9e6c80ffdf951a238f7271a589753e320c -AUX eblits/pkg_setup-v3.eblit 283 RMD160 f1b8307ad0c1f05e6acdd38fb70cec2c65e47cf8 SHA1 97361e7542a3dc3bb6d803ddab2a150f40ba8531 SHA256 5905eb3e6d984a9f8fe49e088adad99db7249f62a957c19f0ae4bf3f56ecaecd -AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06bf519 SHA1 09124cbc9008bfb72eb24cd24b2319d22df52c2c SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 -AUX eblits/src_compile-v2.eblit 515 RMD160 566e373f081d0310768753cde2320966ec5809a5 SHA1 af5d50abc74decb1c3f084d6d5b56dde1afe88d8 SHA256 60fe1529591f7531ad4af37fab1a52e2ffe197f27a19f269b3b62fdbc044261c -AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a -AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d -AUX eblits/src_configure-v53.eblit 6468 RMD160 b1cd05f6cc4ecbf90d9db075156aecc46cd87a93 SHA1 5e2a86355b5cab42e4d59a288223b165476281e2 SHA256 95f0a22481b07155f9615ee38919f0f0c814142e2cf3fcd632b4f0cf84a73232 -AUX eblits/src_configure-v54.eblit 7370 RMD160 316ebe25e04a0e0298a3016fb716f995b222765b SHA1 de8a84cb8d747f16b873249ffdfd97625cf143e8 SHA256 bb5f1c965e18d9edbe4d48e1687b003b09a82e1692a6ccda11169c10107a31f3 -AUX eblits/src_install-v2.eblit 5428 RMD160 16576daadfb29143a64ad4290df0486ba37fd0cd SHA1 9fd26ae714507bdfbfd1a5239ab6ffa67aca4953 SHA256 b40477e008fdab54d0716e1bb0b487ff9346dc9febaba9c089da450e1716b043 -AUX eblits/src_install-v3.eblit 4857 RMD160 fcd7ad250639a20e9e2dc0d5d96ece28a8b16b0e SHA1 b8756d62af95e27b75ecce3006dcd77228337a36 SHA256 a837364615c5aedf8d42733639ab3ed527114a46870505b452dd0d42c45eb542 -AUX eblits/src_install.patch 5490 RMD160 cb0df2032b855c717b36b5a65c6ec7c184090787 SHA1 3623d59894f344d5afcb340da3125824f3143159 SHA256 5e47f138054f77f3417309b35a4164ec2d7d9da9d12473df9b4f8d842f286b61 -AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790 -AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486 -AUX eblits/src_prepare-v4.eblit 2317 RMD160 22833c1caa6f7530230b0809e119eeb2dbba7b27 SHA1 2f7a5fdd113cdf026de5b565fb073e3968db946b SHA256 7c18252a49a6d8e071471d14624f284d7b3ad8b95cad4a001e10e6e521f4c9b1 -AUX eblits/src_test-v1.eblit 1557 RMD160 2afc2b505f2b4bd786635e5b7e997248e93009c3 SHA1 070c2b58b55fc2cec939d7a333057506413e8e99 SHA256 81e9ecf94793377e42508d9e57cd7ab3faff78bce722b84b63999a23bdb2098a -AUX php-fpm-r1.conf 12966 RMD160 2710840ccbd847f74af0486929b6b9af87bf2c51 SHA1 4f0cca8cf24936012c9ee5cb2eaa1a0b391e77b3 SHA256 c4308a92ade93812c6579b74a72cd1f3e1a35f7e63289722f461771d5702448c -AUX php-fpm-r4.init 1157 RMD160 19b129c9254efcbba39d4bf3f77745681497a34d SHA1 0b4b5ba0f10ca1dedc2ea6143781b3bc6fa5915c SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7 -AUX php5-ldvs 22 RMD160 5846dab2745b68a88175dd4e72d0b8cf4756dd46 SHA1 592398c92575adb14ec972847ce2aca28a7b9c2c SHA256 b79d0e52b1b3b4543b31ad45525ae1c2814a27ea8e676772ab10bf6fb12dfe79 -DIST php-5.3.10.tar.bz2 11707402 RMD160 acab30a19b340f21a64e06b524906f2b064dd1c9 SHA1 689d8463b5d9e24b9bf297e35826f2ebdb69afda SHA256 339157af2b386534597d287da292f2545e81d9b452e8b3fe525fb2c534ff344a -DIST php-5.3.11.tar.bz2 11396215 RMD160 cdad550e94cb911fa68b99acba2a5925d0848cf3 SHA1 b7df71d926643b97a08ba0b103d010cbac01d5a1 SHA256 b4174c97ca8d8bcf4b52b8b9ef2c2f35e1b611a5a660e02d7cd3edf263a6bd5d -DIST php-5.3.11RC2.tar.bz2 11269745 RMD160 5126bfce7f2adc4f5098ed50902fa56f47025a6d SHA1 1ccf52990e1cc456296aa05d99c0632f8147917b SHA256 ce0297adc6a81bb38114928703dc052e709cc9847fe21d309b1c2735c4f4d1d9 -DIST php-5.3.12.tar.bz2 11394871 RMD160 5d91c2d16b54632aa123677f63776b312872997c SHA1 1aef7c01207637671299e3eb2d74eb81dd6a8f83 SHA256 91659fd645b03011e1620134fa2457fade1e502499111cef8c4e23f428ad16ac -DIST php-5.4.0.tar.bz2 11439508 RMD160 7842f4f2b0aa064e10c82b5702cb8333bcb97f24 SHA1 c7411438f10ba483ea865f7fe70efe586d67cef1 SHA256 5a6402b53aeebaccdb28d314121a68c3962a46d43457c82249bc9f4aaf516a9d -DIST php-5.4.1.tar.bz2 11145742 RMD160 9d2f0b9c43eba65ca0882d72f44d3613f2a3ecc7 SHA1 3f94f06665c80ddae286feb3bd3c80009efe38f7 SHA256 0b191b9e5466e99b3094aefdd1fbe9b21947ccc5be461f20eb20d9052f2a12ea -DIST php-5.4.1RC1.tar.bz2 11145942 RMD160 213a172122c08fe38a0577a369a9c9b599e55782 SHA1 1716f172292c74293d6de95c6e9f027eafa3aac0 SHA256 1f274b2fe4fc431a8ddf5d5be71270273b339f137567825f76278cad9b3f415e -DIST php-5.4.1RC2.tar.bz2 11147699 RMD160 0f48076bfb98540b0e248ed3f2e315d8f40f2fa7 SHA1 cf0735f64813a9cb8d487c2f4fd21c6af497b523 SHA256 f3138f8d151d19e8c26adb95e47063d710c91bdbe735ada24b6477900a79c387 -DIST php-5.4.2.tar.bz2 11450091 RMD160 b4e88bf65d9ed6488f9b9baa7ea597c47b60c7da SHA1 c25699b2b7454ac1cf481ecba6df90de13d0f3ec SHA256 7f4c13f3b8c7e217b5d0fa04d4dd5bb5d86654f8dc79f49feeffe13e510ad7ce -DIST php-patchset-5.3.10-r0.tar.bz2 7522 RMD160 84165162d1374557a297890ea546cd53a732ad22 SHA1 1dbcb722a21e4f2e0a5159403849c329c76f282d SHA256 6c12c61525095b3672fe821ae4835fe4792a498af62cc38afa624ec5ddbc554f -DIST php-patchset-5.3.10-r2.tar.bz2 7981 RMD160 e17e9ea671e2583a0422361bb80f9d7b1fde5ea7 SHA1 25f6ad8a7cbd3d1d4c3ad4d726e8bbd28c508371 SHA256 f22cef3b678eb7cc548ffce93087e85eba1d01a363c72de2b037bec967980fd0 -DIST php-patchset-5.3.11-r0.tar.bz2 7349 RMD160 403218e70b327c4ab73b713cfea4d7e05c542106 SHA1 e807b6df4049dd5aaf5068ed733bfa6b96d81060 SHA256 47f9ef1bbf9e7adfb0057b840b373980547c8ce400784da1e5f3d7f56b5385ae -DIST php-patchset-5.3.11_rc2-r0.tar.bz2 7363 RMD160 dee5776e8ad40bf727a8a71827e7f5f8bf4c521e SHA1 1a26f55317b689ee3f4f7570f08ab6fdd02b5161 SHA256 a27e7250448cde95e8d031d80d5f4aaf3a2b1579af0da8e2c88e4a28aa118791 -DIST php-patchset-5.3.12-r0.tar.bz2 7349 RMD160 c361241ce8d1f480e6906cf7d0b0e2071e44712c SHA1 8062cd7fd9a6575f3aed855936ff3e70a3ca243a SHA256 3203cda7ab2ae687a89dee35a9523a22d4fe0e223e1311550a35843129625b65 -DIST php-patchset-5.4-1.tar.bz2 6001 RMD160 0200e6ada41e471a30bfddeeb166d3254a9e2856 SHA1 3b1f71255db1c003f452c2fe41f93284a50967c4 SHA256 06834d624ce6269aa8005a28ccc0e55b2e8d500af57e4392e641978d5993a3ea -DIST php-patchset-5.4-2.tar.bz2 5824 RMD160 9a83b507c92babe3a4403841a9a63bb361cf96d2 SHA1 2b6037bb544aa3e62c9116478f350b22325ef9e7 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef -DIST suhosin-patch-5.3.9-0.9.10-gentoo.patch.gz 40949 RMD160 f9a0aa13344f066a161959978d7555796b142ac9 SHA1 8cf4c81d219a6f03a314ba736a900945eeee3a15 SHA256 3c41881e529ff070de1911fcbbda8bfcf04433e3ecbf737bafd525f015791866 -DIST suhosin-patch-5.3.9-0.9.10.patch.gz 40967 RMD160 ce43921fd9b183b154713ecda98294f6c68d5f22 SHA1 7b9ef5c3e0831154df0d6290aba0989ca90138ed SHA256 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317 -EBUILD php-5.3.10-r2.ebuild 10728 RMD160 6efa2579731ac875f7a66cc1cbf3158664d80eaf SHA1 56be71155d20d8ef7dcf22b6a79e664904486628 SHA256 96ac9ece0c03ad3e96c56a9f9a208575a76c0adb05da9f5b0643870033fb7131 -EBUILD php-5.3.10.ebuild 10717 RMD160 a0f3b9fb238ba8d08266355715b4da9daf9c475f SHA1 7a48defb26df39024ec96a04b8e6ce53d9bbbad7 SHA256 0c3497b0b0bfdd7c6d65e9ada0c3f26bd9e87607121bb381fa121a32eb141fbe -EBUILD php-5.3.11.ebuild 10718 RMD160 dc0ee3de476b2f5b1347e1b82d0de7d6e4c4d0e4 SHA1 f0962b89e7412ebbcbabe1cd319f2440f4d907a2 SHA256 6615ecd42f2812e2c462041b37711863810d380fa45d03424c5371550c8998dc -EBUILD php-5.3.11_rc2.ebuild 10735 RMD160 c71f16c312a996e38c4fe4291fed2d97505044d3 SHA1 1f3f7270a4e38ebbac0bc5c9d83ac8684954619e SHA256 aad078b004cfdd5600cafb82e3e3cf38c81c9bdc57d8ef4851eb42131f0c3815 -EBUILD php-5.3.12.ebuild 10725 RMD160 d11d9d40a650b778a4d75a11ca78d69f4623d484 SHA1 1dcb8af708deaa3a00c19c44b73cb32e0f43765a SHA256 240778782551730773274e6f7fe79101d60ead976fe3ec6bcd82132f36394107 -EBUILD php-5.4.0.ebuild 10383 RMD160 197db3ea01b2f4f08e184865a27461c1180eff14 SHA1 f44a034f7c712d76ca56153469d0b951ca4c97c0 SHA256 ad3bd3ab26b4f2f0e27a779dad9936605638bb7b7981b63f6f88f3f6b61cde7c -EBUILD php-5.4.1.ebuild 10383 RMD160 2bce8d2805a1a1ed039fcc64231d3fe21dc9c1bd SHA1 38d2e47bb5e7f87a88681d2356181768c2db9503 SHA256 8b792da02290617c02900e4a557441ee72eb9ccb5cf4afa5c334db229cf63ee8 -EBUILD php-5.4.1_rc1.ebuild 10392 RMD160 d68eff9dfbff6989288980758165affd2932bbb5 SHA1 5b0e0e968cf0967832c6a5bd5d573353ae8ba620 SHA256 300d446e3b116ba13cf5c51a6b9baacfa3d2df8921d22f46c63020da6ccb49a6 -EBUILD php-5.4.1_rc2.ebuild 10392 RMD160 463f249001785d73845dadd486b80cea2b3ddc15 SHA1 b9f1676429dc5548ecd1edc19c9ce58a8b8f18f4 SHA256 bd576d24805b82b2c4c530fc95e5332291d22d29648f881b3ff8aa3043a767c2 -EBUILD php-5.4.2.ebuild 10496 RMD160 56472f5cffa77f7fd09034d1a2856d69af38052f SHA1 648a1b78f259f4684664fd24b592cf9ad3983d10 SHA256 f536347f081062a6ccc7a27f225c7188854b3204f1be3aa6333d724c534e92e8 -MISC ChangeLog 98418 RMD160 c190169fff2693743c7fa481bb26fa658ab26e0b SHA1 a3b2f5ef51097ad1363d2e87c91792111e139a98 SHA256 8159c70c52dc488ccf4d5aa1680a45295366a3adda017c887b5554dc0ce0cc04 -MISC metadata.xml 1497 RMD160 36fa3f3676c4105cb869d88f02a5c0e5aeed991c SHA1 69cbd4cdc604044e270b350945a3d02ba723d075 SHA256 3d6a278c7a85c8b478ca03860b80a8ceda5f3a5ddc64e2d41ab9ca686e7162df diff --git a/dev-lang/php/files/20php5-envd b/dev-lang/php/files/20php5-envd deleted file mode 100644 index f6033ae..0000000 --- a/dev-lang/php/files/20php5-envd +++ /dev/null @@ -1,2 +0,0 @@ -MANPATH="/usr/lib/php5/man/" -CONFIG_PROTECT_MASK="/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/apache2-php5/ext-active/" diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2 deleted file mode 100644 index 7ec8739..0000000 --- a/dev-lang/php/files/70_mod_php5.conf-apache2 +++ /dev/null @@ -1,14 +0,0 @@ -<IfDefine PHP5> - # Load the module first - <IfModule !mod_php5.c> - LoadModule php5_module modules/libphp5.so - </IfModule> - - # Set it to handle the files - <IfModule mod_mime.c> - AddHandler application/x-httpd-php .php .php5 .phtml - AddHandler application/x-httpd-php-source .phps - </IfModule> - - DirectoryIndex index.php index.phtml -</IfDefine> diff --git a/dev-lang/php/files/eblits/common-v2.eblit b/dev-lang/php/files/eblits/common-v2.eblit deleted file mode 100644 index b733299..0000000 --- a/dev-lang/php/files/eblits/common-v2.eblit +++ /dev/null @@ -1,9 +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/php/files/eblits/common-v2.eblit,v 1.3 2010/10/08 18:25:10 olemarkus Exp $ - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} diff --git a/dev-lang/php/files/eblits/pkg_setup-v2.eblit b/dev-lang/php/files/eblits/pkg_setup-v2.eblit deleted file mode 100644 index a5218b3..0000000 --- a/dev-lang/php/files/eblits/pkg_setup-v2.eblit +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v2.eblit,v 1.2 2011/03/17 16:34:47 olemarkus Exp $ - -eblit-php-pkg_setup() { - # Mail support - php_check_mta - - # Oracle support - php_check_oracle_8 - - phpconfutils_warn_about_external_deps - depend.apache_pkg_setup -} - - diff --git a/dev-lang/php/files/eblits/pkg_setup-v3.eblit b/dev-lang/php/files/eblits/pkg_setup-v3.eblit deleted file mode 100644 index ca81906..0000000 --- a/dev-lang/php/files/eblits/pkg_setup-v3.eblit +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/pkg_setup-v3.eblit,v 1.1 2011/07/02 15:14:41 olemarkus Exp $ - -eblit-php-pkg_setup() { - depend.apache_pkg_setup -} - - diff --git a/dev-lang/php/files/eblits/src_compile-v1.eblit b/dev-lang/php/files/eblits/src_compile-v1.eblit deleted file mode 100644 index cb0d56c..0000000 --- a/dev-lang/php/files/eblits/src_compile-v1.eblit +++ /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/php/files/eblits/src_compile-v1.eblit,v 1.6 2010/08/14 19:37:31 mabi Exp $ - -eblit-php-src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - - SAPI_DIR="${WORKDIR}/sapis" - - for sapi in ${SAPIS} ; do - use "${sapi}" || continue - - php_sapi_build "${sapi}" - php_sapi_copy "${sapi}" - done -} - -php_sapi_build() { - mkdir -p "${SAPI_DIR}/$1" - - cd "${WORKDIR}/sapis-build/$1" - emake || die "emake failed" -} - -php_sapi_copy() { - local sapi="$1" - local source="" - - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}.so" - ;; - - apache2) - # apache2 is a special case; the necessary files - # (yes, multiple) are copied by make install, not - # by the ebuild; that's the reason, why apache2 has - # to be the last sapi - emake INSTALL_ROOT="${SAPI_DIR}/${sapi}/" install-sapi - ;; - - *) - die "unhandled sapi in php_sapi_copy" - ;; - esac - - if [[ "${source}" ]] ; then - cp "$source" "${SAPI_DIR}/$sapi" || die "Unable to copy ${sapi} SAPI" - fi -} diff --git a/dev-lang/php/files/eblits/src_compile-v2.eblit b/dev-lang/php/files/eblits/src_compile-v2.eblit deleted file mode 100644 index 6e3d277..0000000 --- a/dev-lang/php/files/eblits/src_compile-v2.eblit +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_compile-v2.eblit,v 1.3 2011/10/31 16:18:04 mabi Exp $ - -eblit-php-src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - - for sapi in ${SAPIS} ; do - use "${sapi}" && php_sapi_build "${sapi}" - done -} - -php_sapi_build() { - cd "${WORKDIR}/sapis-build/$1" - emake || die "emake failed" -} diff --git a/dev-lang/php/files/eblits/src_configure-v2.eblit b/dev-lang/php/files/eblits/src_configure-v2.eblit deleted file mode 100644 index ab09832..0000000 --- a/dev-lang/php/files/eblits/src_configure-v2.eblit +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v2.eblit,v 1.5 2011/01/05 11:23:16 mabi Exp $ - -eblit-php-src_configure() { - PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - phpconfutils_init - - # extension USE flag shared - phpconfutils_extension_enable "bcmath" "bcmath" 1 - phpconfutils_extension_with "bz2" "bzip2" 1 - phpconfutils_extension_enable "calendar" "calendar" 1 - phpconfutils_extension_disable "ctype" "ctype" 0 - phpconfutils_extension_with "curl" "curl" 1 - phpconfutils_extension_with "curlwrappers" "curlwrappers" 0 - phpconfutils_extension_disable "dom" "xml" 0 - phpconfutils_extension_with "enchant" "enchant" 1 "/usr" - phpconfutils_extension_enable "exif" "exif" 1 - phpconfutils_extension_disable "fileinfo" "fileinfo" 1 - phpconfutils_extension_disable "filter" "filter" 0 - phpconfutils_extension_enable "ftp" "ftp" 1 - phpconfutils_extension_with "gettext" "nls" 1 - phpconfutils_extension_with "gmp" "gmp" 1 - phpconfutils_extension_disable "hash" "hash" 0 - phpconfutils_extension_with "mhash" "mhash" 0 - phpconfutils_extension_without "iconv" "iconv" 0 - phpconfutils_extension_enable "intl" "intl" 1 - phpconfutils_extension_disable "ipv6" "ipv6" 0 - phpconfutils_extension_disable "json" "json" 0 - phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr" - phpconfutils_extension_disable "libxml" "xml" 0 - phpconfutils_extension_enable "mbstring" "unicode" 1 - phpconfutils_extension_with "mcrypt" "crypt" 1 - phpconfutils_extension_with "mssql" "mssql" 1 - phpconfutils_extension_with "onig" "unicode" 0 "/usr" - phpconfutils_extension_with "openssl" "ssl" 0 - phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr" - phpconfutils_extension_enable "pcntl" "pcntl" 1 - phpconfutils_extension_disable "phar" "phar" 1 - phpconfutils_extension_disable "pdo" "pdo" 0 - phpconfutils_extension_with "pgsql" "postgres" 1 - phpconfutils_extension_disable "posix" "posix" 0 - phpconfutils_extension_with "pspell" "spell" 1 - phpconfutils_extension_with "recode" "recode" 1 - phpconfutils_extension_disable "simplexml" "simplexml" 0 - phpconfutils_extension_enable "shmop" "sharedmem" 0 - phpconfutils_extension_with "snmp" "snmp" 1 - phpconfutils_extension_enable "soap" "soap" 1 - phpconfutils_extension_enable "sockets" "sockets" 1 - phpconfutils_extension_without "sqlite3" "sqlite3" 1 "/usr" - phpconfutils_extension_with "sybase-ct" "sybase-ct" 1 "/usr" - phpconfutils_extension_enable "sysvmsg" "sysvipc" 1 - phpconfutils_extension_enable "sysvsem" "sysvipc" 1 - phpconfutils_extension_enable "sysvshm" "sysvipc" 1 - phpconfutils_extension_with "tidy" "tidy" 1 - phpconfutils_extension_disable "tokenizer" "tokenizer" 0 - phpconfutils_extension_enable "wddx" "wddx" 1 - phpconfutils_extension_disable "xml" "xml" 0 - phpconfutils_extension_disable "xmlreader" "xmlreader" 0 - phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0 - phpconfutils_extension_with "xmlrpc" "xmlrpc" 1 - phpconfutils_extension_with "xsl" "xsl" 1 - phpconfutils_extension_enable "zip" "zip" 1 - phpconfutils_extension_with "zlib" "zlib" 1 - phpconfutils_extension_enable "debug" "debug" 0 - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - phpconfutils_extension_with "cdb" "cdb" 0 - phpconfutils_extension_with "db4" "berkdb" 0 - phpconfutils_extension_enable "flatfile" "flatfile" 0 - phpconfutils_extension_with "gdbm" "gdbm" 0 - phpconfutils_extension_enable "inifile" "inifile" 0 - phpconfutils_extension_with "qdbm" "qdbm" 0 - - # Support for the GD graphics library - if use gd-external ; then - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" - phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "gd" "gd-external" 1 "/usr" - else - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" - phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr" - phpconfutils_extension_with "png-dir" "gd" 0 "/usr" - phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr" - # enable gd last, so configure can pick up the previous settings - phpconfutils_extension_with "gd" "gd" 0 - fi - - # IMAP support - if use imap ; then - phpconfutils_extension_with "imap" "imap" 1 - phpconfutils_extension_with "imap-ssl" "ssl" 0 - fi - - # Interbase/firebird support - if use interbase ; then - phpconfutils_extension_with "interbase" "interbase" 0 "/opt" - fi - - if use firebird ; then - phpconfutils_extension_with "interbase" "firebird" 0 "/usr" - fi - - # LDAP support - if use ldap ; then - if use oci8 ; then - phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}" - else - phpconfutils_extension_with "ldap" "ldap" 1 - phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0 - fi - fi - - # MySQL support - if use mysql ; then - if use mysqlnd ; then - phpconfutils_extension_with "mysql" "mysql" 1 "mysqlnd" - else - phpconfutils_extension_with "mysql" "mysql" 1 "/usr" - fi - phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock" - fi - - # MySQLi support - if use mysqlnd ; then - phpconfutils_extension_with "mysqli" "mysqli" 1 "mysqlnd" - else - phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config" - fi - - # ODBC support - if use odbc ; then - phpconfutils_extension_with "unixODBC" "odbc" 1 "/usr" - phpconfutils_extension_with "adabas" "adabas" 1 - phpconfutils_extension_with "birdstep" "birdstep" 1 - phpconfutils_extension_with "dbmaker" "dbmaker" 1 - phpconfutils_extension_with "empress" "empress" 1 - if use empress ; then - phpconfutils_extension_with "empress-bcs" "empress-bcs" 0 - fi - phpconfutils_extension_with "esoob" "esoob" 1 - # Needed to run conftest for IBM DB2 - [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`" - phpconfutils_extension_with "ibm-db2" "db2" 1 "${DB2_HOME}" - phpconfutils_extension_with "sapdb" "sapdb" 1 - phpconfutils_extension_with "solid" "solid" 1 - fi - - if use iodbc ; then - phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr" - fi - - # Oracle support - phpconfutils_extension_with "oci8" "oci8" 1 - if use oci8-instant-client ; then - OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \ - sed -e 's|dev-db/oracle-instantclient-basic-||g' | \ - sed -e 's|-r.*||g')" - - phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \ - "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib" - fi - - # PDO support - if use pdo ; then - phpconfutils_extension_with "pdo-dblib" "mssql" 1 - if use mysqlnd ; then - phpconfutils_extension_with "pdo-mysql" "mysql" 1 "mysqlnd" - else - phpconfutils_extension_with "pdo-mysql" "mysql" 1 "/usr" - fi - phpconfutils_extension_with "pdo-pgsql" "postgres" 1 - phpconfutils_extension_with "pdo-sqlite" "sqlite3" 1 "/usr" - phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr" - if use oci8 ; then - phpconfutils_extension_with "pdo-oci" "oci8" 1 - fi - if use oci8-instant-client ; then - phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \ - "instantclient,/usr,${OCI8IC_PKG}" - fi - fi - - # readline/libedit support - phpconfutils_extension_with "readline" "readline" 0 - phpconfutils_extension_with "libedit" "libedit" 0 - - # Session support - if use session ; then - phpconfutils_extension_with "mm" "sharedmem" 0 - else - phpconfutils_extension_disable "session" "session" 0 - fi - - # SQLite support - if use sqlite ; then - phpconfutils_extension_with "sqlite" "sqlite" 0 "/usr" - phpconfutils_extension_enable "sqlite-utf8" "unicode" 0 - else - phpconfutils_extension_without "sqlite" "sqlite" 0 - fi - - if use pic ; then - my_conf="${my_conf} --with-pic" - fi - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" - - # Catch CFLAGS problems - php_check_cflags - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} diff --git a/dev-lang/php/files/eblits/src_configure-v521.eblit b/dev-lang/php/files/eblits/src_configure-v521.eblit deleted file mode 100644 index 61e6389..0000000 --- a/dev-lang/php/files/eblits/src_configure-v521.eblit +++ /dev/null @@ -1,273 +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/php/files/eblits/src_configure-v521.eblit,v 1.1 2010/10/08 18:25:10 olemarkus Exp $ - -eblit-php-src_configure() { - export CFLAGS="${CFLAGS} -D_GNU_SOURCE" - PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - phpconfutils_init - - # extension USE flag shared - phpconfutils_extension_enable "bcmath" "bcmath" 1 - phpconfutils_extension_with "bz2" "bzip2" 1 - phpconfutils_extension_enable "calendar" "calendar" 1 - phpconfutils_extension_disable "ctype" "ctype" 0 - phpconfutils_extension_with "curl" "curl" 1 - phpconfutils_extension_with "curlwrappers" "curlwrappers" 0 - phpconfutils_extension_enable "dbase" "dbase" 1 - phpconfutils_extension_disable "dom" "xml" 0 - phpconfutils_extension_enable "exif" "exif" 1 - phpconfutils_extension_with "fbsql" "frontbase" 1 - phpconfutils_extension_with "fdftk" "fdftk" 1 "/opt/fdftk-6.0" - phpconfutils_extension_disable "filter" "filter" 0 - phpconfutils_extension_enable "ftp" "ftp" 1 - phpconfutils_extension_with "gettext" "nls" 1 - phpconfutils_extension_with "gmp" "gmp" 1 - phpconfutils_extension_disable "hash" "hash" 0 - phpconfutils_extension_without "iconv" "iconv" 0 - phpconfutils_extension_disable "ipv6" "ipv6" 0 - phpconfutils_extension_disable "json" "json" 0 - phpconfutils_extension_with "kerberos" "kerberos" 0 "/usr" - phpconfutils_extension_disable "libxml" "xml" 0 - phpconfutils_extension_enable "mbstring" "unicode" 1 - phpconfutils_extension_with "mcrypt" "crypt" 1 - phpconfutils_extension_with "mhash" "mhash" 1 - phpconfutils_extension_with "msql" "msql" 1 - phpconfutils_extension_with "mssql" "mssql" 1 - phpconfutils_extension_with "ncurses" "ncurses" 1 - phpconfutils_extension_with "openssl" "ssl" 0 - phpconfutils_extension_with "openssl-dir" "ssl" 0 "/usr" - phpconfutils_extension_enable "pcntl" "pcntl" 1 - phpconfutils_extension_without "pcre-regex" "pcre" 0 - phpconfutils_extension_disable "pdo" "pdo" 0 - phpconfutils_extension_with "pgsql" "postgres" 1 - phpconfutils_extension_disable "posix" "posix" 0 - phpconfutils_extension_with "pspell" "spell" 1 - phpconfutils_extension_with "recode" "recode" 1 - phpconfutils_extension_disable "reflection" "reflection" 0 - phpconfutils_extension_disable "simplexml" "simplexml" 0 - phpconfutils_extension_enable "shmop" "sharedmem" 0 - phpconfutils_extension_with "snmp" "snmp" 1 - phpconfutils_extension_enable "soap" "soap" 1 - phpconfutils_extension_enable "sockets" "sockets" 1 - phpconfutils_extension_disable "spl" "spl" 0 - phpconfutils_extension_with "sybase-ct" "sybase-ct" 1 - phpconfutils_extension_enable "sysvmsg" "sysvipc" 1 - phpconfutils_extension_enable "sysvsem" "sysvipc" 1 - phpconfutils_extension_enable "sysvshm" "sysvipc" 1 - phpconfutils_extension_with "tidy" "tidy" 1 - phpconfutils_extension_disable "tokenizer" "tokenizer" 0 - phpconfutils_extension_enable "wddx" "wddx" 1 - phpconfutils_extension_disable "xml" "xml" 0 - phpconfutils_extension_disable "xmlreader" "xmlreader" 0 - phpconfutils_extension_disable "xmlwriter" "xmlwriter" 0 - phpconfutils_extension_with "xmlrpc" "xmlrpc" 1 - phpconfutils_extension_with "xsl" "xsl" 1 - phpconfutils_extension_enable "zip" "zip" 1 - phpconfutils_extension_with "zlib" "zlib" 1 - phpconfutils_extension_enable "debug" "debug" 0 - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - phpconfutils_extension_with "cdb" "cdb" 0 - phpconfutils_extension_with "db4" "berkdb" 0 - phpconfutils_extension_enable "flatfile" "flatfile" 0 - phpconfutils_extension_with "gdbm" "gdbm" 0 - phpconfutils_extension_enable "inifile" "inifile" 0 - phpconfutils_extension_with "qdbm" "qdbm" 0 - - # Support for the GD graphics library - if use gd-external ; then - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" - phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "gd" "gd-external" 1 "/usr" - else - phpconfutils_extension_with "freetype-dir" "truetype" 0 "/usr" - phpconfutils_extension_with "t1lib" "truetype" 0 "/usr" - phpconfutils_extension_enable "gd-jis-conv" "cjk" 0 - phpconfutils_extension_with "jpeg-dir" "gd" 0 "/usr" - phpconfutils_extension_with "png-dir" "gd" 0 "/usr" - phpconfutils_extension_with "xpm-dir" "xpm" 0 "/usr" - # enable gd last, so configure can pick up the previous settings - phpconfutils_extension_with "gd" "gd" 0 - fi - - # IMAP support - if use imap ; then - phpconfutils_extension_with "imap" "imap" 1 - phpconfutils_extension_with "imap-ssl" "ssl" 0 - fi - - phpconfutils_extension_with "interbase" "interbase" 0 "/opt" - phpconfutils_extension_with "interbase" "firebird" 0 "/usr" - - # LDAP support - if use ldap ; then - if use oci8 ; then - phpconfutils_extension_with "ldap" "ldap" 1 "${ORACLE_HOME}" - else - phpconfutils_extension_with "ldap" "ldap" 1 - phpconfutils_extension_with "ldap-sasl" "ldap-sasl" 0 - fi - fi - - # MySQL support - if use mysql ; then - phpconfutils_extension_with "mysql" "mysql" 1 "/usr" - phpconfutils_extension_with "mysql-sock" "mysql" 0 "/var/run/mysqld/mysqld.sock" - fi - - # MySQLi support - phpconfutils_extension_with "mysqli" "mysqli" 1 "/usr/bin/mysql_config" - - # ODBC support - if use odbc ; then - phpconfutils_extension_with "unixODBC" "odbc" 1 "/usr" - phpconfutils_extension_with "adabas" "adabas" 1 - phpconfutils_extension_with "birdstep" "birdstep" 1 - phpconfutils_extension_with "dbmaker" "dbmaker" 1 - phpconfutils_extension_with "empress" "empress" 1 - if use empress ; then - phpconfutils_extension_with "empress-bcs" "empress-bcs" 0 - fi - phpconfutils_extension_with "esoob" "esoob" 1 - # Needed to run conftest for IBM DB2 - [[ -n ${DB2_HOME} ]] && export LD_LIBRARY_PATH="${DB2_HOME}/`get_libdir`" - phpconfutils_extension_with "ibm-db2" "db2" 1 "${DB2_HOME}" - phpconfutils_extension_with "sapdb" "sapdb" 1 - phpconfutils_extension_with "solid" "solid" 1 - fi - - if use iodbc ; then - phpconfutils_extension_with "iodbc" "iodbc" 1 "/usr" - fi - - # Oracle support - phpconfutils_extension_with "oci8" "oci8" 1 - if use oci8-instant-client ; then - OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \ - sed -e 's|dev-db/oracle-instantclient-basic-||g' | \ - sed -e 's|-r.*||g')" - - phpconfutils_extension_with "oci8" "oci8-instant-client" 1 \ - "instantclient,/usr/lib/oracle/${OCI8IC_PKG}/client/lib" - fi - - # PDO support - if use pdo ; then - phpconfutils_extension_with "pdo-dblib" "mssql" 1 - phpconfutils_extension_with "pdo-mysql" "mysql" 1 "/usr" - phpconfutils_extension_with "pdo-pgsql" "postgres" 1 - phpconfutils_extension_with "pdo-sqlite" "sqlite" 1 "/usr" - phpconfutils_extension_with "pdo-odbc" "odbc" 1 "unixODBC,/usr" - if use oci8 ; then - phpconfutils_extension_with "pdo-oci" "oci8" 1 - fi - if use oci8-instant-client ; then - phpconfutils_extension_with "pdo-oci" "oci8-instant-client" 1 \ - "instantclient,/usr,${OCI8IC_PKG}" - fi - fi - - # readline/libedit support - phpconfutils_extension_with "readline" "readline" 0 - phpconfutils_extension_with "libedit" "libedit" 0 - - # Session support - if use session ; then - phpconfutils_extension_with "mm" "sharedmem" 0 - else - phpconfutils_extension_disable "session" "session" 0 - fi - - # SQLite support - if use sqlite ; then - phpconfutils_extension_with "sqlite" "sqlite" 0 "/usr" - phpconfutils_extension_enable "sqlite-utf8" "unicode" 0 - else - phpconfutils_extension_without "sqlite" "sqlite" 0 - fi - - if use pic ; then - my_conf="${my_conf} --with-pic" - fi - - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - if use pcre ; then - my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" - fi - - # Catch CFLAGS problems - php_check_cflags - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|embed) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - cgi) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=" --enable-cgi --enable-fastcgi" - use discard-path && sapi_conf+=" --enable-discard-path" - use force-cgi-redirect && sapi_conf+=" --enable-force-cgi-redirect" - else - sapi_conf+=" --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} diff --git a/dev-lang/php/files/eblits/src_configure-v53.eblit b/dev-lang/php/files/eblits/src_configure-v53.eblit deleted file mode 100644 index 04bc455..0000000 --- a/dev-lang/php/files/eblits/src_configure-v53.eblit +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v53.eblit,v 1.4 2012/02/28 10:59:13 mabi Exp $ - -eblit-php-src_configure() { - addpredict /usr/share/snmp/mibs/.index - - PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf="--prefix=${PHP_DESTDIR} - --mandir=${PHP_DESTDIR}/man - --infodir=${PHP_DESTDIR}/info - --libdir=${PHP_DESTDIR}/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - # extension USE flag shared - my_conf+=" - $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 ) - $(use_enable calendar calendar ) - $(use_enable ctype ctype ) - $(use_with curl curl ) - $(use_with curlwrappers curlwrappers ) - $(use_enable xml dom ) - $(use_with enchant enchant /usr) - $(use_enable exif exif ) - $(use_enable fileinfo fileinfo ) - $(use_enable filter filter ) - $(use_enable ftp ftp ) - $(use_with nls gettext ) - $(use_with gmp gmp ) - $(use_enable hash hash ) - $(use_with mhash mhash ) - $(use_with iconv iconv ) - $(use_enable intl intl ) - $(use_enable ipv6 ipv6 ) - $(use_enable json json ) - $(use_with kerberos kerberos /usr) - $(use_enable xml libxml ) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt ) - $(use_with mssql mssql ) - $(use_with unicode onig /usr) - $(use_with ssl openssl ) - $(use_with ssl openssl-dir /usr) - $(use_enable pcntl pcntl ) - $(use_enable phar phar ) - $(use_enable pdo pdo ) - $(use_with postgres pgsql ) - $(use_enable posix posix ) - $(use_with spell pspell ) - $(use_with recode recode ) - $(use_enable simplexml simplexml ) - $(use_enable sharedmem shmop ) - $(use_with snmp snmp ) - $(use_enable soap soap ) - $(use_enable sockets sockets ) - $(use_with sqlite sqlite /usr)" - use sqlite && my_conf+=" $(use_enable unicode sqlite-utf8)" - my_conf+=" - $(use_with sqlite3 sqlite3 /usr) - $(use_with sybase-ct sybase-ct /usr) - $(use_enable sysvipc sysvmsg ) - $(use_enable sysvipc sysvsem ) - $(use_enable sysvipc sysvshm ) - $(use_with tidy tidy ) - $(use_enable tokenizer tokenizer ) - $(use_enable wddx wddx ) - $(use_enable xml xml ) - $(use_enable xmlreader xmlreader ) - $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc ) - $(use_with xsl xsl ) - $(use_enable zip zip ) - $(use_with zlib zlib ) - $(use_enable debug debug )" - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - my_conf+=" - $(use_with cdb cdb ) - $(use_with berkdb db4 ) - $(use_enable flatfile flatfile ) - $(use_with gdbm gdbm ) - $(use_enable inifile inifile ) - $(use_with qdbm qdbm )" - - # Support for the GD graphics library - my_conf+=" - $(use_with truetype freetype-dir /usr) - $(use_with truetype t1lib /usr) - $(use_enable cjk gd-jis-conv ) - $(use_with gd jpeg-dir /usr) - $(use_with gd png-dir /usr) - $(use_with xpm xpm-dir /usr)" - # enable gd last, so configure can pick up the previous settings - my_conf+=" - $(use_with gd gd )" - - # IMAP support - if use imap ; then - my_conf+=" - $(use_with imap imap ) - $(use_with ssl imap-ssl )" - fi - - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase /usr)" - fi - - # LDAP support - if use ldap ; then - my_conf+=" - $(use_with ldap ldap ) - $(use_with ldap-sasl ldap-sasl )" - fi - - # MySQL support - if use mysql ; then - if use mysqlnd ; then - my_conf+=" - $(use_with mysql mysql mysqlnd)" - else - my_conf+=" - $(use_with mysql mysql /usr)" - fi - my_conf+=" - $(use_with mysql mysql-sock /var/run/mysqld/mysqld.sock)" - fi - - # MySQLi support - if use mysqlnd ; then - my_conf+=" - $(use_with mysqli mysqli mysqlnd)" - else - my_conf+=" - $(use_with mysqli mysqli /usr/bin/mysql_config)" - fi - - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC /usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc /usr)" - fi - - # Oracle support - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client oci8)" - fi - - # PDO support - if use pdo ; then - my_conf+=" - $(use_with mssql pdo-dblib )" - if use mysqlnd ; then - my_conf+=" - $(use_with mysql pdo-mysql mysqlnd)" - else - my_conf+=" - $(use_with mysql pdo-mysql /usr)" - fi - my_conf+=" - $(use_with postgres pdo-pgsql ) - $(use_with sqlite3 pdo-sqlite /usr) - $(use_with odbc pdo-odbc unixODBC,/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci)" - fi - fi - - # readline/libedit support - my_conf+=" - $(use_with readline readline ) - $(use_with libedit libedit )" - - # Session support - if use session ; then - my_conf+=" - $(use_with sharedmem mm )" - else - my_conf+=" - $(use_enable session session )" - fi - - if use pic ; then - my_conf="${my_conf} --with-pic" - fi - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr" - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} diff --git a/dev-lang/php/files/eblits/src_configure-v54.eblit b/dev-lang/php/files/eblits/src_configure-v54.eblit deleted file mode 100644 index 7ca5ab2..0000000 --- a/dev-lang/php/files/eblits/src_configure-v54.eblit +++ /dev/null @@ -1,261 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v54.eblit,v 1.1 2011/12/18 09:00:26 olemarkus Exp $ - -eblit-php-src_configure() { - addpredict /usr/share/snmp/mibs/.index - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - # extension USE flag shared - my_conf+=" - $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 "${EPREFIX}"/usr) - $(use_enable calendar calendar ) - $(use_enable ctype ctype ) - $(use_with curl curl "${EPREFIX}"/usr) - $(use_with curlwrappers curlwrappers "${EPREFIX}"/usr) - $(use_enable xml dom ) - $(use_with enchant enchant "${EPREFIX}"/usr) - $(use_enable exif exif ) - $(use_enable fileinfo fileinfo ) - $(use_enable filter filter ) - $(use_enable ftp ftp ) - $(use_with nls gettext "${EPREFIX}"/usr) - $(use_with gmp gmp "${EPREFIX}"/usr) - $(use_enable hash hash ) - $(use_with mhash mhash "${EPREFIX}"/usr) - $(use_with iconv iconv ) - $(use_enable intl intl ) - $(use_enable ipv6 ipv6 ) - $(use_enable json json ) - $(use_with kerberos kerberos "${EPREFIX}"/usr) - $(use_enable xml libxml ) - $(use_with xml libxml-dir "${EPREFIX}"/usr) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt "${EPREFIX}"/usr) - $(use_with mssql mssql "${EPREFIX}"/usr) - $(use_with unicode onig "${EPREFIX}"/usr) - $(use_with ssl openssl "${EPREFIX}"/usr) - $(use_with ssl openssl-dir "${EPREFIX}"/usr) - $(use_enable pcntl pcntl ) - $(use_enable phar phar ) - $(use_enable pdo pdo ) - $(use_with postgres pgsql "${EPREFIX}"/usr) - $(use_enable posix posix ) - $(use_with spell pspell "${EPREFIX}"/usr) - $(use_with recode recode "${EPREFIX}"/usr) - $(use_enable simplexml simplexml ) - $(use_enable sharedmem shmop ) - $(use_with snmp snmp "${EPREFIX}"/usr) - $(use_enable soap soap ) - $(use_enable sockets sockets ) - $(use_with sqlite3 sqlite3 "${EPREFIX}"/usr) - $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) - $(use_enable sysvipc sysvmsg ) - $(use_enable sysvipc sysvsem ) - $(use_enable sysvipc sysvshm ) - $(use_with tidy tidy "${EPREFIX}"/usr) - $(use_enable tokenizer tokenizer ) - $(use_enable wddx wddx ) - $(use_enable xml xml ) - $(use_enable xmlreader xmlreader ) - $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc "${EPREFIX}"/usr) - $(use_with xsl xsl "${EPREFIX}"/usr) - $(use_enable zip zip ) - $(use_with zlib zlib "${EPREFIX}"/usr) - $(use_enable debug debug )" - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - my_conf+=" - $(use_with cdb cdb ${EPREFIX}/usr) - $(use_with berkdb db4 ${EPREFIX}/usr) - $(use_enable flatfile flatfile ) - $(use_with gdbm gdbm ${EPREFIX}/usr) - $(use_enable inifile inifile ) - $(use_with qdbm qdbm ${EPREFIX}/usr)" - - # Support for the GD graphics library - my_conf+=" - $(use_with truetype freetype-dir ${EPREFIX}/usr) - $(use_with truetype t1lib ${EPREFIX}/usr) - $(use_enable cjk gd-jis-conv ) - $(use_with gd jpeg-dir ${EPREFIX}/usr) - $(use_with gd png-dir ${EPREFIX}/usr) - $(use_with xpm xpm-dir ${EPREFIX}/usr)" - # enable gd last, so configure can pick up the previous settings - my_conf+=" - $(use_with gd gd ${EPREFIX}/usr)" - - # IMAP support - if use imap ; then - my_conf+=" - $(use_with imap imap ${EPREFIX}/usr) - $(use_with ssl imap-ssl ${EPREFIX}/usr)" - fi - - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi - - # LDAP support - if use ldap ; then - my_conf+=" - $(use_with ldap ldap ${EPREFIX}/usr) - $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" - fi - - # MySQL support - if use mysql ; then - if use mysqlnd ; then - my_conf+=" - $(use_with mysql mysql mysqlnd)" - else - my_conf+=" - $(use_with mysql mysql ${EPREFIX}/usr)" - fi - my_conf+=" - $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" - fi - - # MySQLi support - if use mysqlnd ; then - my_conf+=" - $(use_with mysqli mysqli mysqlnd)" - else - my_conf+=" - $(use_with mysqli mysqli ${EPREFIX}/usr/bin/mysql_config)" - fi - - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi - - # Oracle support - if use oci8-instant-client ; then - OCI8IC_PKG="$(best_version dev-db/oracle-instantclient-basic | \ - sed -e 's|dev-db/oracle-instantclient-basic-||g' | \ - sed -e 's|-r.*||g')" - - my_conf+=" - $(use_with oci8-instant-client oci8 instantclient,${EPREFIX}/usr/lib/oracle/${OCI8IC_PKG}/client/lib)" - fi - - # PDO support - if use pdo ; then - my_conf+=" - $(use_with mssql pdo-dblib )" - if use mysqlnd ; then - my_conf+=" - $(use_with mysql pdo-mysql mysqlnd)" - else - my_conf+=" - $(use_with mysql pdo-mysql ${EPREFIX}/usr)" - fi - my_conf+=" - $(use_with postgres pdo-pgsql ) - $(use_with sqlite3 pdo-sqlite ${EPREFIX}/usr) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci instantclient,${EPREFIX}/usr,${OCI8IC_PKG} )" - fi - fi - - # readline/libedit support - my_conf+=" - $(use_with readline readline ${EPREFIX}/usr) - $(use_with libedit libedit ${EPREFIX}/usr)" - - # Session support - if use session ; then - my_conf+=" - $(use_with sharedmem mm ${EPREFIX}/usr)" - else - my_conf+=" - $(use_enable session session )" - fi - - if use pic ; then - my_conf="${my_conf} --with-pic" - fi - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} diff --git a/dev-lang/php/files/eblits/src_install-v2.eblit b/dev-lang/php/files/eblits/src_install-v2.eblit deleted file mode 100644 index 7fcbbed..0000000 --- a/dev-lang/php/files/eblits/src_install-v2.eblit +++ /dev/null @@ -1,163 +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/php/files/eblits/src_install-v2.eblit,v 1.14 2011/12/16 09:02:43 olemarkus Exp $ - -eblit-php-src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # And install the modules to it - if use sharedext ; then - insinto "${extension_dir#${EPREFIX}}" - doins "${WORKDIR}/sapis-build/${first_sapi}/modules/"*$(get_modname) - fi - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - # needed each time, php_install_ini would reset it - into "${PHP_DESTDIR#${EPREFIX}}" - file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1) - - if [[ "${file: -3}" == ".so" ]]; then - if [[ "${sapi}" == "apache2" ]]; then - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins "${file}" "${file/*\/}" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - dolib.so "${file}" || die "Unable to install ${sapi} sapi" - fi - else - dobin "${file}" || die "Unable to install ${sapi} sapi" - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Install env.d files - newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ - "20php${SLOT}" - eprefixify "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to allow_url_open=Off, bug 332763 - sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}" - - # default to expose_php=Off, bug 300695 - sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - # Install any extensions built as shared objects - if use sharedext ; then - insinto "${PHP_EXT_INI_DIR#${EPREFIX}}" - for extension in "${ED}/${extension_dir#${EPREFIX}}/"*$(get_modname) ; do - extension="${extension##*/}" - inifilename="${extension/$(get_modname)/.ini}" - echo "extension=${extension}" > "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename" - doins "${WORKDIR}/sapis-build/${phpsapi}/modules/$inifilename" - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/${inifilename}" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/${inifilename}" - done - fi - - # SAPI-specific handling - if [[ "${sapi}" == "apache2" ]] ; then - insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" - newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ - "70_mod_php${PHP_MV}.conf" - fi - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - dodir "/etc/init.d" - insinto "/etc/init.d" - newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" -# dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm" - fi - - # Install PHP ini files into /usr/share/php - if [[ ${SLOT} == '5.2' ]]; then - newdoc php.ini-dist php.ini-development - newdoc php.ini-recommended php.ini-production - fi - - if [[ ${SLOT} == '5.3' ]]; then - dodoc php.ini-development - dodoc php.ini-production - fi - -} diff --git a/dev-lang/php/files/eblits/src_install-v3.eblit b/dev-lang/php/files/eblits/src_install-v3.eblit deleted file mode 100644 index 836ba0c..0000000 --- a/dev-lang/php/files/eblits/src_install-v3.eblit +++ /dev/null @@ -1,158 +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/php/files/eblits/src_install-v3.eblit,v 1.5 2011/11/08 18:14:08 olemarkus Exp $ - -eblit-php-src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - into "${PHP_DESTDIR#${EPREFIX}}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" || die "Unable to install ${sapi} sapi" - else - dobin "${source}" || die "Unable to install ${sapi} sapi" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Install env.d files - newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ - "20php${SLOT}" - eprefixify "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - # SAPI-specific handling - if [[ "${sapi}" == "apache2" ]] ; then - insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" - newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ - "70_mod_php${PHP_MV}.conf" - fi - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - dodir "/etc/init.d" - insinto "/etc/init.d" - newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" - # dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm" - fi - - # Install PHP ini files into /usr/share/php - if [[ ${SLOT} == '5.2' ]]; then - newdoc php.ini-dist php.ini-development - newdoc php.ini-recommended php.ini-production - fi - - if [[ ${SLOT} == '5.3' ]]; then - dodoc php.ini-development - dodoc php.ini-production - fi - -} diff --git a/dev-lang/php/files/eblits/src_install.patch b/dev-lang/php/files/eblits/src_install.patch deleted file mode 100644 index 400de12..0000000 --- a/dev-lang/php/files/eblits/src_install.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- src_install-v3.eblit 2012-05-05 11:20:31.000000000 +0900 -+++ /gentoo/usr/portage/dev-lang/php/files/eblits/src_install-v3.eblit 2012-05-05 12:29:49.927983645 +0900 -@@ -1,4 +1,4 @@ --# Copyright 1999-2011 Gentoo Foundation -+# Copyright 1999-2010 Gentoo Foundation - # Distributed under the terms of the GNU General Public License v2 - # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.5 2011/11/08 18:14:08 olemarkus Exp $ - -@@ -16,7 +16,7 @@ eblit-php-src_install() { - done - - # Makefile forgets to create this before trying to write to it... -- dodir "${PHP_DESTDIR}/bin" -+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" -@@ -24,7 +24,7 @@ eblit-php-src_install() { - install-build install-headers install-programs \ - || die "emake install failed" - -- local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)" -+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} -@@ -41,7 +41,7 @@ eblit-php-src_install() { - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR}/apache2/" -- newins ".libs/libphp5.so" "libphp${PHP_MV}.so" -+ newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it -@@ -57,14 +57,14 @@ eblit-php-src_install() { - source="sapi/fpm/php-fpm" - ;; - embed) -- source="libs/libphp${PHP_MV}.so" -+ source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - -- if [[ "${source: -3}" == ".so" ]]; then -+ if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" || die "Unable to install ${sapi} sapi" - else - dobin "${source}" || die "Unable to install ${sapi} sapi" -@@ -84,16 +84,17 @@ eblit-php-src_install() { - done - - # Install env.d files -- newenvd "${FILESDIR}/20php5-envd" \ -+ newenvd "${FILESDIR}/20php${PHP_MV}-envd" \ - "20php${SLOT}" -+ eprefixify "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ -- "${D}/etc/env.d/20php${SLOT}" -+ "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ -- "${D}/etc/env.d/20php${SLOT}" -+ "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ -- "${D}/usr/$(get_libdir)/php${SLOT}/bin/php-config" -+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" - } - - php_install_ini() { -@@ -106,47 +107,44 @@ php_install_ini() { - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 -- sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}" -+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages -- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}" -- -- dodir "${PHP_INI_DIR}" -- insinto "${PHP_INI_DIR}" -+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" -+ -+ dodir "${PHP_INI_DIR#${EPREFIX}}" -+ insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - -- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}" -+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - -- dodir "${PHP_EXT_INI_DIR}" -- dodir "${PHP_EXT_INI_DIR_ACTIVE}" -+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" -+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - # SAPI-specific handling - if [[ "${sapi}" == "apache2" ]] ; then -- insinto "${APACHE_MODULES_CONFDIR}" -- newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ -- "70_mod_php${PHP_MV}.conf" -+ insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}" -+ newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ -+ "70_mod_php${PHP_MV}.conf" - fi - - if [[ "${sapi}" == "fpm" ]] ; then -- [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 -- [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 -+ [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3 -+ [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" -- insinto ${PHP_INI_DIR} -+ insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - dodir "/etc/init.d" - insinto "/etc/init.d" - newinitd "${FILESDIR}/php-fpm-r${PHP_FPM_INIT_VER}.init" "php-fpm" -- #dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm" -- -- # Remove bogus /etc/php-fpm.conf.default (bug 359906) -- [[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default" -+ # dosym "${PHP_DESTDIR#${EPREFIX}}/bin/php-fpm" "/usr/bin/php-fpm" - fi - -- # Install PHP ini files into /usr/share/php -+ # Install PHP ini files into /usr/share/php - if [[ ${SLOT} == '5.2' ]]; then - newdoc php.ini-dist php.ini-development - newdoc php.ini-recommended php.ini-production diff --git a/dev-lang/php/files/eblits/src_prepare-v2.eblit b/dev-lang/php/files/eblits/src_prepare-v2.eblit deleted file mode 100644 index b6bd72e..0000000 --- a/dev-lang/php/files/eblits/src_prepare-v2.eblit +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit,v 1.3 2011/01/05 11:23:16 mabi Exp $ - -eblit-php-src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # kolab support (support for imap annotations) - use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch" - - # Change PHP branding - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Apply generic PHP patches - EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - # Suhosin support - if [[ -n $SUHOSIN_VERSION ]] ; then - if use suhosin ; then - epatch "${WORKDIR}/${SUHOSIN_PATCH}" - fi - else - ewarn "Please note that this version of PHP does not yet come with a suhosin patch" - fi - - - # rebuild the whole autotools stuff as we are heavily patching it - # (suhosin, fastbuild, ...) - - # eaclocal doesn't accept --force, so we try to force re-generation - # this way - rm aclocal.m4 - - # work around divert() issues with newer autoconf, bug #281697 - if has_version '>=sys-devel/autoconf-2.64' ; then - sed -i -r \ - -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - $(grep -l divert $(find . -name '*.m4') configure.in) || die - fi - eautoreconf --force -W no-cross -} - - diff --git a/dev-lang/php/files/eblits/src_prepare-v3.eblit b/dev-lang/php/files/eblits/src_prepare-v3.eblit deleted file mode 100644 index 7e270f9..0000000 --- a/dev-lang/php/files/eblits/src_prepare-v3.eblit +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v3.eblit,v 1.1 2011/03/13 09:48:06 olemarkus Exp $ - -eblit-php-src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # kolab support (support for imap annotations) - use kolab && epatch "${WORKDIR}/${PV}/opt/imap-kolab-annotations.patch" - - # Change PHP branding - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Apply generic PHP patches - EPATCH_SOURCE="${WORKDIR}/${PV}/generic" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - # Suhosin support - if [[ -n $SUHOSIN_VERSION ]] ; then - if use suhosin ; then - epatch "${WORKDIR}/${SUHOSIN_PATCH}" - fi - else - ewarn "Please note that this version of PHP does not yet come with a suhosin patch" - fi - - #Add user patches #357637 - epatch_user - - # rebuild the whole autotools stuff as we are heavily patching it - # (suhosin, fastbuild, ...) - - # eaclocal doesn't accept --force, so we try to force re-generation - # this way - rm aclocal.m4 - - # work around divert() issues with newer autoconf, bug #281697 - if has_version '>=sys-devel/autoconf-2.64' ; then - sed -i -r \ - -e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ - $(grep -l divert $(find . -name '*.m4') configure.in) || die - fi - eautoreconf --force -W no-cross -} - - diff --git a/dev-lang/php/files/eblits/src_prepare-v4.eblit b/dev-lang/php/files/eblits/src_prepare-v4.eblit deleted file mode 100644 index cab740f..0000000 --- a/dev-lang/php/files/eblits/src_prepare-v4.eblit +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v4.eblit,v 1.1 2011/06/29 06:38:38 olemarkus Exp $ - -eblit-php-src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # kolab support (support for imap annotations) - use kolab && epatch "${WORKDIR}/patches/opt/imap-kolab-annotations.patch" - - # Change PHP branding - # Get the alpha/beta/rc version - local ver=$(get_version_component_range 4) - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1${PHP_EXTRA_BRANDING}-${ver}-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Apply generic PHP patches - EPATCH_SOURCE="${WORKDIR}/patches/generic" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_MULTI_MSG="Applying generic patches and fixes from upstream..." epatch - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - # Suhosin support - if [[ -n $SUHOSIN_VERSION ]] ; then - if use suhosin ; then - epatch "${WORKDIR}/${SUHOSIN_PATCH}" - fi - else - ewarn "Please note that this version of PHP does not yet come with a suhosin patch" - fi - - #Add user patches #357637 - epatch_user - - #force rebuilding aclocal.m4 - rm aclocal.m4 - eautoreconf -} diff --git a/dev-lang/php/files/eblits/src_test-v1.eblit b/dev-lang/php/files/eblits/src_test-v1.eblit deleted file mode 100644 index 07f8d6f..0000000 --- a/dev-lang/php/files/eblits/src_test-v1.eblit +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.3 2012/02/06 13:53:17 olemarkus Exp $ - -eblit-php-src_test() { - vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - - diff --git a/dev-lang/php/files/php-fpm-r1.conf b/dev-lang/php/files/php-fpm-r1.conf deleted file mode 100644 index 0b0a7f8..0000000 --- a/dev-lang/php/files/php-fpm-r1.conf +++ /dev/null @@ -1,311 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;; -; FPM Configuration ; -;;;;;;;;;;;;;;;;;;;;; - -; All relative paths in this configuration file are relative to PHP's install -; prefix (/usr/lib/php5.3). This prefix can be dynamicaly changed by using the -; '-p' argument from the command line. - -; Include one or more files. If glob(3) exists, it is used to include a bunch of -; files from a glob(3) pattern. This directive can be used everywhere in the -; file. -; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p arguement) -; - /usr/lib/php5.3 otherwise -;include=/etc/php/fpm-php5.3/fpm.d/*.conf - -;;;;;;;;;;;;;;;;;; -; Global Options ; -;;;;;;;;;;;;;;;;;; - -[global] -; Pid file -; Note: the default prefix is /var/lib -; Default Value: none -; Warning: pid file is overriden by the Gentoo init script. -; FPM will refuse to start if you uncomment this settingi and make use of the -; init script. -; pid = /var/run/php-fpm.pid - -; Error log file -; Note: the default prefix is /var/lib -; Default Value: log/php-fpm.log -error_log = /var/log/php-fpm.log - -; Log level -; Possible Values: alert, error, warning, notice, debug -; Default Value: notice -;log_level = notice - -; If this number of child processes exit with SIGSEGV or SIGBUS within the time -; interval set by emergency_restart_interval then FPM will restart. A value -; of '0' means 'Off'. -; Default Value: 0 -;emergency_restart_threshold = 0 - -; Interval of time used by emergency_restart_interval to determine when -; a graceful restart will be initiated. This can be useful to work around -; accidental corruptions in an accelerator's shared memory. -; Available Units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -;emergency_restart_interval = 0 - -; Time limit for child processes to wait for a reaction on signals from master. -; Available units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -;process_control_timeout = 0 - -; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. -; Default Value: yes -;daemonize = yes - -;;;;;;;;;;;;;;;;;;;; -; Pool Definitions ; -;;;;;;;;;;;;;;;;;;;; - -; Multiple pools of child processes may be started with different listening -; ports and different management options. The name of the pool will be -; used in logs and stats. There is no limitation on the number of pools which -; FPM can handle. Your system will tell you anyway :) - -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr/lib/php5.3) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = 127.0.0.1:9000 - -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = -1 - -; List of ipv4 addresses of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0666 -;listen.owner = nobody -;listen.group = nobody -;listen.mode = 0666 - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = nobody -group = nobody - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives: -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes to be created when pm is set to 'dynamic'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. -; Note: Used when pm is set to either 'static' or 'dynamic' -; Note: This value is mandatory. -pm.max_children = 50 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -;pm.start_servers = 20 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 5 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 35 - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. By default, the status page shows the following -; information: -; accepted conn - the number of request accepted by the pool; -; pool - the name of the pool; -; process manager - static or dynamic; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes. -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic') -; The values of 'idle processes', 'active processes' and 'total processes' are -; updated each second. The value of 'accepted conn' is updated in real time. -; Example output: -; accepted conn: 12073 -; pool: www -; process manager: static -; idle processes: 35 -; active processes: 65 -; total processes: 100 -; max children reached: 1 -; By default the status page output is formatted as text/plain. Passing either -; 'html' or 'json' as a query string will return the corresponding output -; syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = /var/log/php-fpm-$pool.log.slow - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr/lib/php5.3) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/dev-lang/php/files/php-fpm-r4.init b/dev-lang/php/files/php-fpm-r4.init deleted file mode 100644 index a186d83..0000000 --- a/dev-lang/php/files/php-fpm-r4.init +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/runscript - -set_phpvars() { - PHPSLOT=${SVCNAME#php-fpm-} - [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)" - - PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" - PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid" -} - -extra_commands="depend" -extra_started_commands="reload" - -depend() { - need net - use apache2 lighttpd nginx -} - -start() { - ebegin "Starting PHP FastCGI Process Manager" - set_phpvars - start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \ - /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}" - local i=0 - local timeout=5 - while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do - sleep 1 - i=$(($i + 1)) - done - - [ $timeout -gt $i ] - eend $? -} - -stop() { - ebegin "Stopping PHP FastCGI Process Manager" - set_phpvars - start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID} - eend $? -} - -reload() { - ebegin "Reloading PHP FastCGI Process Manager" - set_phpvars - [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID}) - eend $? -} diff --git a/dev-lang/php/files/php5-ldvs b/dev-lang/php/files/php5-ldvs deleted file mode 100644 index 783b0f6..0000000 --- a/dev-lang/php/files/php5-ldvs +++ /dev/null @@ -1 +0,0 @@ -PHP_5 { global: *; }; diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml deleted file mode 100644 index cbeb509..0000000 --- a/dev-lang/php/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>php</herd> - <use> - <flag name='cli'>Enable CLI SAPI</flag> - <flag name='embed'>Enable embed SAPI</flag> - <flag name='enchant'>Add supports Enchant spelling library.</flag> - <flag name='fileinfo'>Add fileinfo extension support</flag> - <flag name='filter'>Add filter extension support</flag> - <flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag> - <flag name='hash'>Enable the hash extension</flag> - <flag name='json'>Enable JSON support</flag> - <flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag> - <flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag> - <flag name='intl'>Enables the intl extension for extended internalization support</flag> - <flag name='pic'>Force shared modules to build as PIC on x86 (speed tradeoff with memory usage)</flag> - <flag name='pdo'>Enable the bundled PDO extensions</flag> - <flag name='phar'>Enables the phar extension to provide phar archive support</flag> - <flag name='suhosin'>Add Suhosin support (patch and extension from http://www.suhosin.org/)</flag> - <flag restrict=">=dev-lang/php-5.3.6_rc1" name='suhosin'>Add the Suhosin patch from http://www.suhosin.org/)</flag> - <flag name='xmlreader'>Enable XMLReader support</flag> - <flag name='xmlwriter'>Enable XMLWriter support</flag> - <flag name='zip'>Enable ZIP file support</flag> - </use> -</pkgmetadata> diff --git a/dev-lang/php/php-5.3.10-r2.ebuild b/dev-lang/php/php-5.3.10-r2.ebuild deleted file mode 100644 index 095f22d..0000000 --- a/dev-lang/php/php-5.3.10-r2.ebuild +++ /dev/null @@ -1,392 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10-r2.ebuild,v 1.3 2012/03/06 08:05:46 olemarkus Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -RESTRICT="mirror" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.9-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="2" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="olemarkus" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) - filter? ( !dev-php5/pecl-filter ) - json? ( !dev-php5/pecl-json ) - phar? ( !dev-php5/pecl-phar ) - zip? ( !dev-php5/pecl-zip )" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.10.ebuild b/dev-lang/php/php-5.3.10.ebuild deleted file mode 100644 index b64c88c..0000000 --- a/dev-lang/php/php-5.3.10.ebuild +++ /dev/null @@ -1,391 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.10.ebuild,v 1.13 2012/03/06 08:05:46 olemarkus Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.9-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="gentoo" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="olemarkus" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - <dev-libs/libpcre-8.30 - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) - filter? ( !dev-php5/pecl-filter ) - json? ( !dev-php5/pecl-json ) - phar? ( !dev-php5/pecl-phar ) - zip? ( !dev-php5/pecl-zip )" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.11.ebuild b/dev-lang/php/php-5.3.11.ebuild deleted file mode 100644 index 0872dfd..0000000 --- a/dev-lang/php/php-5.3.11.ebuild +++ /dev/null @@ -1,392 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.11.ebuild,v 1.6 2012/05/03 20:27:33 maekke Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -RESTRICT="mirror" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.9-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="olemarkus" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) - filter? ( !dev-php5/pecl-filter ) - json? ( !dev-php5/pecl-json ) - phar? ( !dev-php5/pecl-phar ) - zip? ( !dev-php5/pecl-zip )" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.11_rc2.ebuild b/dev-lang/php/php-5.3.11_rc2.ebuild deleted file mode 100644 index 2165892..0000000 --- a/dev-lang/php/php-5.3.11_rc2.ebuild +++ /dev/null @@ -1,392 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.11_rc2.ebuild,v 1.2 2012/04/24 14:16:26 mabi Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -RESTRICT="mirror" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.9-0.9.10-gentoo" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="olemarkus" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) - filter? ( !dev-php5/pecl-filter ) - json? ( !dev-php5/pecl-json ) - phar? ( !dev-php5/pecl-phar ) - zip? ( !dev-php5/pecl-zip )" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.3.12.ebuild b/dev-lang/php/php-5.3.12.ebuild deleted file mode 100644 index 023bfe0..0000000 --- a/dev-lang/php/php-5.3.12.ebuild +++ /dev/null @@ -1,392 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.3.12.ebuild,v 1.1 2012/05/03 20:15:23 olemarkus Exp $ - -EAPI=4 - -PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob interbase oci8 sapdb solid" - -RESTRICT="mirror" - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="5.3.9-0.9.10" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="0" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-${PV}-r${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="olemarkus" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -SLOT="$(get_version_component_range 1-2)" -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND="!dev-lang/php:5 - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) - sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -DEPEND="${DEPEND} - enchant? ( !dev-php5/pecl-enchant ) - fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) - filter? ( !dev-php5/pecl-filter ) - json? ( !dev-php5/pecl-json ) - phar? ( !dev-php5/pecl-phar ) - zip? ( !dev-php5/pecl-zip )" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -RDEPEND="${DEPEND}" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common "v2" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v3 ; } -src_configure() { eblit-run src_configure v53 ; } -src_compile() { eblit-run src_compile v1 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php5/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.0.ebuild b/dev-lang/php/php-5.4.0.ebuild deleted file mode 100644 index 0c21370..0000000 --- a/dev-lang/php/php-5.4.0.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0.ebuild,v 1.3 2012/03/06 08:05:46 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="1" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND=" - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.1.ebuild b/dev-lang/php/php-5.4.1.ebuild deleted file mode 100644 index 8b0be47..0000000 --- a/dev-lang/php/php-5.4.1.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1.ebuild,v 1.1 2012/04/26 11:33:41 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="2" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND=" - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.1_rc1.ebuild b/dev-lang/php/php-5.4.1_rc1.ebuild deleted file mode 100644 index 4db162e..0000000 --- a/dev-lang/php/php-5.4.1_rc1.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1_rc1.ebuild,v 1.1 2012/03/30 11:23:07 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php-stas" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="2" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND=" - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.1_rc2.ebuild b/dev-lang/php/php-5.4.1_rc2.ebuild deleted file mode 100644 index a08b88a..0000000 --- a/dev-lang/php/php-5.4.1_rc2.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1_rc2.ebuild,v 1.1 2012/04/13 06:43:50 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php-stas" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="2" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND=" - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in /etc/make.conf" - ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${ROOT}"/etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/php/php-5.4.2.ebuild b/dev-lang/php/php-5.4.2.ebuild deleted file mode 100644 index 48196a3..0000000 --- a/dev-lang/php/php-5.4.2.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.2.ebuild,v 1.1 2012/05/03 20:15:23 olemarkus Exp $ - -EAPI=4 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool - -SUHOSIN_VERSION="" -FPM_VERSION="builtin" -EXPECTED_TEST_FAILURES="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-stas") - echo "http://downloads.php.net/stas/${2}" - ;; - "php-pre") - echo "http://downloads.php.net/johannes/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "suhosin") - echo "http://download.suhosin.org/${2}" - ;; - "olemarkus") - echo "http://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -PHP_P="${PN}-${PHP_PV}" - -PHP_PATCHSET_LOC="olemarkus" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_PATCHSET="2" -PHP_PATCHSET_URI=" - $(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${PHP_PATCHSET}.tar.bz2")" - -PHP_FPM_INIT_VER="4" -PHP_FPM_CONF_VER="1" - -if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then - # in some cases we use our own suhosin patch (very recent version, - # patch conflicts, etc.) - SUHOSIN_TYPE="gentoo" -else - SUHOSIN_TYPE="suhosin" -fi - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch"; - SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )" -fi - -SRC_URI=" - ${PHP_SRC_URI} - ${PHP_PATCHSET_URI}" - -if [[ -n ${SUHOSIN_VERSION} ]]; then - SRC_URI="${SRC_URI} - suhosin? ( ${SUHOSIN_URI} )" -fi - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs." -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# Gentoo-specific, common features -IUSE="kolab" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl curlwrappers debug doc - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql mysqlnd mysqli nls - oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm - readline recode +session sharedmem - +simplexml snmp soap sockets spell sqlite3 ssl - sybase-ct sysvipc tidy +tokenizer truetype unicode wddx - +xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib" - -# Enable suhosin if available -[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin" - -DEPEND=" - >=app-admin/eselect-php-0.6.2 - >=dev-libs/libpcre-8.12[unicode] - apache2? ( www-servers/apache[threads=] ) - berkdb? ( =sys-libs/db-4* ) - bzip2? ( app-arch/bzip2 ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg - media-libs/libpng - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - kolab? ( >=net-libs/c-client-2004g-r1 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - !mysqlnd? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql-base ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg media-libs/libpng sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg - media-libs/libpng sys-libs/zlib - ) - xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xsl? ( xml ) - ldap-sasl? ( ldap ) - kolab? ( imap ) - mhash? ( hash ) - phar? ( hash ) - mysqlnd? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? ( -=${CATEGORY}/${PN}-${SLOT}*[unicode] )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# They are in PDEPEND because we need PHP installed first! -PDEPEND="doc? ( app-doc/php-docs )" - -# No longer depend on the extension. The suhosin USE flag only installs the -# patch -#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -# eblit-core -# Usage: <function> [version] [eval] -# Main eblit engine -eblit-core() { - [[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files" - local e v func=$1 ver=$2 eval_=$3 - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - [[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }" - return 0 - fi - done - return 1 -} - -# eblit-include -# Usage: [--skip] <function> [version] -# Includes an "eblit" -- a chunk of common code among ebuilds in a given -# package so that its functions can be sourced and utilized within the -# ebuild. -eblit-include() { - local skipable=false r=0 - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - [[ -z $1 ]] && die "Usage: eblit-include <function> [version]" - eblit-core $1 $2 - r="$?" - ${skipable} && return 0 - [[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe -# Usage: <function> -# Runs a function if it is defined in an eblit -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run -# Usage: <function> [version] -# Runs a function defined in an eblit -eblit-run() { - eblit-include --skip common v2 - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -# eblit-pkg -# Usage: <phase> [version] -# Includes the given functions AND evals them so they're included in the binpkgs -eblit-pkg() { - [[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]" - eblit-core $1 $2 1 -} - -eblit-pkg pkg_setup v3 - -src_prepare() { eblit-run src_prepare v4 ; } -src_configure() { eblit-run src_configure v54 ; } -src_compile() { eblit-run src_compile v2 ; } -src_install() { eblit-run src_install v3 ; } -src_test() { eblit-run src_test v1 ; } - -#Do not use eblit for this because it will not get sourced when installing from -#binary package (bug #380845) -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" - ewarn "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" - - # check for not yet migrated old style config dirs - ls "${EROOT}"etc/php/*-php5 &>/dev/null - if [[ $? -eq 0 ]]; then - ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config" - ewarn "files are now kept at ${EROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x" - fi - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog - - if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then - ewarn "The suhosin USE flag now only installs the suhosin patch!" - ewarn "If you want the suhosin extension, make sure you install" - ewarn " dev-php/suhosin" - ewarn - fi -} diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog deleted file mode 100644 index 022a456..0000000 --- a/dev-lang/python/ChangeLog +++ /dev/null @@ -1,1041 +0,0 @@ -# ChangeLog for dev-lang/python -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.818 2015/04/23 19:25:27 floppym Exp $ - - 23 Apr 2015; Mike Gilbert <floppym@gentoo.org> python-2.6.9.ebuild: - Fix dep on eselect-python. - -*python-2.6.9 (23 Apr 2015) - - 23 Apr 2015; Mike Gilbert <floppym@gentoo.org> +files/python-2.5-tcl86.patch, - +python-2.6.9.ebuild: - Restore python-2.6.9, without keywords. - - 31 Mar 2015; Ulrich Müller <ulm@gentoo.org> python-2.7.9-r1.ebuild, - python-2.7.9-r2.ebuild, python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild, - python-3.4.0.ebuild, python-3.4.1.ebuild, python-3.4.2.ebuild, - python-3.4.3.ebuild: - Update dependency after package move of eselect modules to app-eselect. - - 03 Mar 2015; Mike Frysinger <vapier@gentoo.org> - +files/python-2.7.9-ncurses-pkg-config.patch, - +files/python-3.3.5-ncurses-pkg-config.patch, - +files/python-3.4.3-ncurses-pkg-config.patch, python-2.7.9-r2.ebuild, - python-3.3.5-r1.ebuild, python-3.4.3.ebuild: - Use pkg-config to locate ncurses headers to fix cross-compiling. - -*python-3.4.3 (03 Mar 2015) - - 03 Mar 2015; Mike Gilbert <floppym@gentoo.org> +python-3.4.3.ebuild: - Version bump. - - 09 Feb 2015; Mike Frysinger <vapier@gentoo.org> python-2.7.9-r1.ebuild, - python-3.4.1.ebuild: - Mark arm64/m68k/s390/sh stable. - -*python-2.7.9-r2 (07 Feb 2015) - - 07 Feb 2015; Mike Gilbert <floppym@gentoo.org> +python-2.7.9-r2.ebuild: - Drop 61_all_process_data.patch, fixes musl build, bug 539210. - - 07 Feb 2015; Mike Gilbert <floppym@gentoo.org> -python-2.7.7.ebuild, - -python-2.7.8.ebuild: - Remove old. - - 09 Jan 2015; Tobias Klausmann <klausman@gentoo.org> python-2.7.9-r1.ebuild: - Stable on alpha, bug 532232 - - 30 Dec 2014; Markus Meier <maekke@gentoo.org> python-2.7.9-r1.ebuild: - arm stable, bug #532232 - - 26 Dec 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.9-r1.ebuild: - Stable for sparc, wrt bug #532232 - - 25 Dec 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.9-r1.ebuild: - Stable for ia64, wrt bug #532232 - -*python-2.7.9-r1 (24 Dec 2014) - - 24 Dec 2014; Mike Gilbert <floppym@gentoo.org> +python-2.7.9-r1.ebuild, - -python-2.7.9.ebuild: - Revbump for ensurepip change. - - 24 Dec 2014; Mike Gilbert <floppym@gentoo.org> python-2.7.9.ebuild: - Pass --without-ensurepip to configure. - - 24 Dec 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.9.ebuild: - Stable for ppc64, wrt bug #532232 - - 24 Dec 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.9.ebuild: - Stable for ppc, wrt bug #532232 - - 23 Dec 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.9.ebuild: - Stable for x86, wrt bug #532232 - - 23 Dec 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.9.ebuild: - Stable for amd64, wrt bug #532232 - - 22 Dec 2014; Jeroen Roovers <jer@gentoo.org> python-2.7.9.ebuild: - Stable for HPPA (bug #532232). - -*python-2.7.9 (14 Dec 2014) - - 14 Dec 2014; Mike Gilbert <floppym@gentoo.org> +python-2.7.9.ebuild: - Version bump. - - 11 Dec 2014; Michał Górny <mgorny@gentoo.org> python-3.2.5-r6.ebuild: - Add a postinst explaining that Python 3.2 is not supported. - - 11 Nov 2014; Markus Meier <maekke@gentoo.org> python-3.4.1.ebuild: - arm stable, bug #522322 - - 02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for alpha, wrt bug #522322 - - 29 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for sparc, wrt bug #522322 - - 28 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for ia64, wrt bug #522322 - - 27 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for ppc64, wrt bug #522322 - - 18 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for ppc, wrt bug #522322 - -*python-3.4.2 (12 Oct 2014) - - 12 Oct 2014; Mike Gilbert <floppym@gentoo.org> +python-3.4.2.ebuild: - Version bump. Thanks to Arfrever for updating the patchset. - - 12 Oct 2014; Dirkjan Ochtman <djc@gentoo.org> files/pydoc.init: - Remove net dependency from pydoc init scripts (fixes bug 439662) - - 12 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for x86, wrt bug #522322 - - 10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> python-3.4.1.ebuild: - Stable for amd64, wrt bug #522322 - - 26 Sep 2014; Jeroen Roovers <jer@gentoo.org> python-3.4.1.ebuild: - Stable for HPPA (bug #522322). - - 22 Sep 2014; Mike Gilbert <floppym@gentoo.org> python-2.7.8.ebuild: - New patchset, should resolve bug 523072. Thanks for Arfrever for the updates. - - 09 Sep 2014; Mike Frysinger <vapier@gentoo.org> python-2.7.7.ebuild, - python-3.3.5-r1.ebuild: - Mark m68k/s390/sh stable. - - 18 Aug 2014; Dirkjan Ochtman <djc@gentoo.org> -python-3.3.4.ebuild: - Additional cleanup for bug 514686 - - 18 Aug 2014; Dirkjan Ochtman <djc@gentoo.org> -python-2.7.5-r3.ebuild, - -python-2.7.5-r4.ebuild, -python-2.7.6-r1.ebuild, -python-2.7.6.ebuild, - -python-3.2.5-r3.ebuild, -python-3.3.2-r2.ebuild, -python-3.3.3.ebuild, - -python-3.4.0_rc1.ebuild, -python-3.4.0_rc3.ebuild: - Cleanup for bug 500518 - - 09 Aug 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.7.ebuild, - python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild: - Stable for ppc64, wrt bug #500518 - - 08 Aug 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.7.ebuild, - python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild: - Stable for ppc, wrt bug #500518 - - 04 Aug 2014; Raúl Porcel <armin76@gentoo.org> python-2.7.7.ebuild, - python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild: - arm64/ia64/sparc stable wrt #500518 - - 03 Aug 2014; Markus Meier <maekke@gentoo.org> python-3.3.5-r1.ebuild: - arm stable, bug #500518 - - 03 Aug 2014; Markus Meier <maekke@gentoo.org> python-3.2.5-r6.ebuild: - arm stable, bug #500518 - - 03 Aug 2014; Markus Meier <maekke@gentoo.org> python-2.7.7.ebuild: - arm stable, bug #500518 - - 02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.7.ebuild, - python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild: - Stable for x86, wrt bug #500518 - - 02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> python-2.7.7.ebuild, - python-3.2.5-r6.ebuild, python-3.3.5-r1.ebuild: - Stable for amd64, wrt bug #500518 - - 31 Jul 2014; Tobias Klausmann <klausman@gentoo.org> python-3.2.5-r6.ebuild: - Stable on alpha, bug #500518 - - 31 Jul 2014; Tobias Klausmann <klausman@gentoo.org> python-2.7.7.ebuild: - Stable on alpha, bug #500518 - - 31 Jul 2014; Tobias Klausmann <klausman@gentoo.org> python-3.3.5-r1.ebuild: - Stable on alpha, bug #500518 - - 31 Jul 2014; Jeroen Roovers <jer@gentoo.org> python-3.2.5-r6.ebuild: - Stable for HPPA (bug #500518). - - 31 Jul 2014; Jeroen Roovers <jer@gentoo.org> python-3.3.5-r1.ebuild: - Stable for HPPA (bug #500518). - - 30 Jul 2014; Jeroen Roovers <jer@gentoo.org> python-2.7.7.ebuild: - Stable for HPPA (bug #500518). - -*python-2.7.8 (29 Jul 2014) - - 29 Jul 2014; Patrick McLean <chutzpah@gentoo.org> +python-2.7.8.ebuild: - Version bump. - -*python-3.2.5-r6 (29 Jul 2014) - - 29 Jul 2014; Sergey Popov <pinkbyte@gentoo.org> -python-3.2.5-r5.ebuild, - +python-3.2.5-r6.ebuild, +files/python-3.2-CVE-2014-1912.patch: - Revision bump: backport patch for CVE-2014-1912, bug #500518. Drop old - revision. Acked by Python team - -*python-3.3.5-r1 (29 Jul 2014) -*python-3.2.5-r5 (29 Jul 2014) - - 29 Jul 2014; Sergey Popov <pinkbyte@gentoo.org> -python-3.2.5-r4.ebuild, - +python-3.2.5-r5.ebuild, -python-3.3.5.ebuild, +python-3.3.5-r1.ebuild, - +files/python-3.2-CVE-2014-4616.patch, +files/python-3.3-CVE-2014-4616.patch: - Revision bump: add patch for CVE-2014-4616, bug #514686. Drop old revisions. - Acked by Python team - - 18 Jul 2014; Tobias Klausmann <klausman@gentoo.org> python-2.7.6.ebuild: - Stable on alpha, bug #504742 - - 06 Jul 2014; Michał Górny <mgorny@gentoo.org> -files/CVE-2013-4238_py26.patch, - -files/python-2.5-tcl86.patch, -python-2.6.8-r3.ebuild, -python-2.6.9.ebuild: - Remove python:2.6 and relevant patches. - -*python-2.7.7 (28 Jun 2014) -*python-3.4.1 (28 Jun 2014) - - 28 Jun 2014; Mike Gilbert <floppym@gentoo.org> +python-2.7.7.ebuild, - +python-3.4.1.ebuild: - Version bumps. - - 15 Jun 2014; Akinori Hattori <hattya@gentoo.org> python-2.7.6.ebuild: - ia64 stable wrt bug #504742 - - 14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> python-2.7.6.ebuild: - x86 stable wrt bug #504742 - - 24 May 2014; Markos Chandras <hwoarang@gentoo.org> python-2.7.6.ebuild: - Stable on amd64 wrt bug #504742 - -*python-3.2.5-r4 (10 May 2014) - - 10 May 2014; Mike Gilbert <floppym@gentoo.org> +python-3.2.5-r4.ebuild, - python-2.7.6-r1.ebuild, python-3.3.5.ebuild, python-3.4.0.ebuild: - Add optional dependency on dev-tcltk/tix, bug 413393 by John Keeping. - -*python-2.7.6-r1 (25 Apr 2014) - - 25 Apr 2014; Patrick McLean <chutzpah@gentoo.org> +python-2.7.6-r1.ebuild, - +files/python-2.7.6-recvfrom_into_buffer_overflow.patch: - Revision bump, add patch for CVE-2014-1912 (bug #500518) - - 06 Apr 2014; Mike Frysinger <vapier@gentoo.org> python-2.7.6.ebuild: - Mark arm64/m68k/s390/sh stable. - - 01 Apr 2014; Markus Meier <maekke@gentoo.org> python-2.7.6.ebuild: - arm stable, bug #504742 - - 30 Mar 2014; Mike Gilbert <floppym@gentoo.org> python-3.4.0.ebuild: - Update postinst message; python.eclass does not support 3.4. - - 28 Mar 2014; Mike Gilbert <floppym@gentoo.org> python-3.2.5-r3.ebuild: - Backport readline-6.3 fixes to python-3.2.5, bug 505416. - -*python-3.4.0 (28 Mar 2014) - - 28 Mar 2014; Mike Gilbert <floppym@gentoo.org> +python-3.4.0.ebuild: - Version bump. Permanently drop the 'doc' use flag. - -*python-3.3.5 (28 Mar 2014) - - 28 Mar 2014; Mike Gilbert <floppym@gentoo.org> +python-3.3.5.ebuild: - Version bump. - - 20 Mar 2014; Jeroen Roovers <jer@gentoo.org> python-2.7.6.ebuild: - Stable for HPPA (bug #504742). - - 18 Mar 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.3.ebuild: - Stable for ia64, wrt bug #497758 - - 16 Mar 2014; Mike Gilbert <floppym@gentoo.org> python-2.6.9.ebuild: - Backport fix for bug 503180. - -*python-3.4.0_rc3 (15 Mar 2014) - - 15 Mar 2014; Mike Gilbert <floppym@gentoo.org> +python-3.4.0_rc3.ebuild: - Bump. - - 15 Mar 2014; Mike Gilbert <floppym@gentoo.org> python-2.7.6.ebuild: - Backport upstream fixes for bug 503180. - - 01 Mar 2014; Mike Gilbert <floppym@gentoo.org> python-3.4.0_rc1.ebuild: - Disable ensurepip. - -*python-3.4.0_rc1 (17 Feb 2014) - - 17 Feb 2014; Mike Gilbert <floppym@gentoo.org> +python-3.4.0_rc1.ebuild: - Version bump for testing. Thanks to Arfrever for the patches. - -*python-3.3.4 (17 Feb 2014) - - 17 Feb 2014; Mike Gilbert <floppym@gentoo.org> +python-3.3.4.ebuild: - Version bump. Thanks to Arfrever for maintaining the patchset. - - 08 Feb 2014; Mike Gilbert <floppym@gentoo.org> python-3.3.3.ebuild: - Add workaround for race condition when generating Python-ast.c and Python- - ast.h. Thanks to Arfrever. - - 05 Feb 2014; Mike Frysinger <vapier@gentoo.org> python-3.3.3.ebuild: - Mark arm64/m68k/s390/sh stable. - - 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.3.ebuild: - Stable for sparc, wrt bug #497758 - - 26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.3.ebuild: - Stable for x86, wrt bug #497758 - - 20 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.3.ebuild: - Stable for ppc, wrt bug #497758 - - 19 Jan 2014; Markus Meier <maekke@gentoo.org> python-3.3.3.ebuild: - arm stable, bug #497758 - - 19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.3.ebuild: - Stable for ppc64, wrt bug #497758 - - 18 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.3.ebuild: - Stable for alpha, wrt bug #497758 - - 18 Jan 2014; Pacho Ramos <pacho@gentoo.org> python-3.3.3.ebuild: - amd64 stable, bug #497758 - - 18 Jan 2014; Mike Frysinger <vapier@gentoo.org> python-2.7.6.ebuild: - Fix cross-compiling tests that try to read /dev/ paths. - - 18 Jan 2014; Mike Frysinger <vapier@gentoo.org> python-2.7.5-r3.ebuild, - python-2.7.5-r4.ebuild, python-2.7.6.ebuild, python-3.3.2-r2.ebuild, - python-3.3.3.ebuild: - Add arm64 love. - - 16 Jan 2014; Mike Frysinger <vapier@gentoo.org> python-3.3.2-r2.ebuild: - Mark m68k/s390/sh stable. - - 15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.2-r2.ebuild: - Stable for ia64, wrt bug #474128 - - 11 Jan 2014; Jeroen Roovers <jer@gentoo.org> python-3.3.3.ebuild: - Stable for HPPA (bug #497758). - - 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.2-r2.ebuild: - Stable for ppc64, wrt bug #474128 - - 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> python-3.3.2-r2.ebuild: - Stable for ppc, wrt bug #474128 - - 30 Dec 2013; Mike Gilbert <floppym@gentoo.org> python-2.6.8-r3.ebuild, - python-2.6.9.ebuild, python-2.7.5-r3.ebuild, python-2.7.5-r4.ebuild, - python-2.7.6.ebuild, python-3.2.5-r3.ebuild, python-3.3.2-r2.ebuild, - python-3.3.3.ebuild: - Don't die on broken sem_open if threads flag is disabled. - - 30 Dec 2013; Mike Gilbert <floppym@gentoo.org> python-2.6.8-r3.ebuild, - python-2.6.9.ebuild, python-2.7.5-r3.ebuild, python-2.7.5-r4.ebuild, - python-2.7.6.ebuild, python-3.2.5-r3.ebuild, python-3.3.2-r2.ebuild, - python-3.3.3.ebuild: - Die if sem_open is detected as broken, bug 496328. - - 26 Dec 2013; Markus Meier <maekke@gentoo.org> python-3.3.2-r2.ebuild: - arm stable, bug #474128 - -*python-2.6.9 (25 Dec 2013) - - 25 Dec 2013; Mike Gilbert <floppym@gentoo.org> +python-2.6.9.ebuild: - Bump for security bug 495224. - - 15 Dec 2013; Agostino Sarubbo <ago@gentoo.org> python-3.3.2-r2.ebuild: - Stable for sparc, wrt bug #474128 - - 13 Dec 2013; Matt Turner <mattst88@gentoo.org> python-3.3.2-r2.ebuild: - alpha stable, bug 474128. - - 08 Dec 2013; Pacho Ramos <pacho@gentoo.org> python-3.3.2-r2.ebuild: - x86 stable, bug #474128 - - 07 Dec 2013; Mike Frysinger <vapier@gentoo.org> python-2.7.6.ebuild, - python-3.3.3.ebuild: - Drop redundant die statements with EAPI=4. - -*python-2.7.6 (01 Dec 2013) - - 01 Dec 2013; Mike Gilbert <floppym@gentoo.org> +python-2.7.6.ebuild: - Version bump. Thanks to Arfrever for the patches. - - 30 Nov 2013; Jeroen Roovers <jer@gentoo.org> python-3.3.2-r2.ebuild: - Stable for HPPA (bug #474128). - - 30 Nov 2013; Pacho Ramos <pacho@gentoo.org> python-3.3.2-r2.ebuild: - amd64 stable, bug #474128 - - 23 Nov 2013; Jeroen Roovers <jer@gentoo.org> python-3.3.2-r2.ebuild, - python-3.3.3.ebuild: - Typo. - - 23 Nov 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.2-r2.ebuild, - python-3.3.3.ebuild: - Update the postinst upgrade message. - -*python-3.3.3 (21 Nov 2013) - - 21 Nov 2013; Mike Gilbert <floppym@gentoo.org> +python-3.3.3.ebuild: - Version bump. Thanks to Arfrever for maintaining the patchset. - -*python-2.7.5-r4 (26 Oct 2013) - - 26 Oct 2013; Mike Gilbert <floppym@gentoo.org> - +files/python-2.7-issue18851.patch, +python-2.7.5-r4.ebuild: - Apply patch to fix regression in subprocess module, bug 489378. - -*python-2.7.5-r3 (16 Oct 2013) -*python-3.2.5-r3 (16 Oct 2013) - - 16 Oct 2013; Mike Gilbert <floppym@gentoo.org> - +files/python-2.7-issue16248.patch, +files/python-3.2-issue16248.patch, - +python-2.7.5-r3.ebuild, +python-3.2.5-r3.ebuild, -python-2.7.5-r2.ebuild, - -python-3.2.5-r2.ebuild: - Apply upstream fix for regression in Tkinter, bug 488208 by jlec. - - 10 Oct 2013; Dirkjan Ochtman <djc@gentoo.org> -files/python-3.2.3-x32.patch, - -python-2.6.8-r1.ebuild, -python-2.6.8-r2.ebuild, -python-2.7.3-r2.ebuild, - -python-2.7.3-r3.ebuild, -python-2.7.5-r1.ebuild, -python-2.7.5.ebuild, - -python-3.2.3-r1.ebuild, -python-3.2.3-r2.ebuild, -python-3.2.3.ebuild, - -python-3.2.4.ebuild, -python-3.2.5-r1.ebuild, -python-3.2.5.ebuild, - -python-3.3.1.ebuild, -python-3.3.2-r1.ebuild, -python-3.3.2.ebuild: - Remove old versions of python. - - 26 Sep 2013; Mike Gilbert <floppym@gentoo.org> - +files/python-2.7.5-nonfatal-compileall.patch, python-2.7.5-r2.ebuild: - Apply cross-compile fixes to python-2.7.5. - - 26 Sep 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.2-r2.ebuild: - Fix/simplify cross-compiles. - - 26 Sep 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.2-r2.ebuild: - Depend on xz-utils (_lzma module). - - 05 Sep 2013; Mike Gilbert <floppym@gentoo.org> - -files/CVE-2013-4238_py32.patch: - Drop another patch. - - 05 Sep 2013; Michał Górny <mgorny@gentoo.org> -files/linux2.patch, - -files/python-2.4.4-test-cross.patch, -files/python-2.5-cross-printf.patch, - -files/python-2.6-chflags-cross.patch, -files/python-2.6-test-cross.patch, - -files/python-3-distutils-egg-utf8.patch, -files/python-3.2-soname_typo.patch, - -python-2.5.4-r5.ebuild, -python-2.5.4-r6.ebuild, -python-3.1.5-r1.ebuild, - -python-3.1.5.ebuild: - Remove Python 2.5 and 3.1. Purge old patches. - - 05 Sep 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.2-r2.ebuild: - Disable network tests, bug 483656. - - 28 Aug 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.3-r2.ebuild, - python-2.7.3-r3.ebuild, python-2.7.5-r1.ebuild, python-2.7.5-r2.ebuild, - python-2.7.5.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild, - python-3.2.3.ebuild, python-3.2.4.ebuild, python-3.2.5-r1.ebuild, - python-3.2.5-r2.ebuild, python-3.2.5.ebuild, python-3.3.1.ebuild, - python-3.3.2-r1.ebuild, python-3.3.2-r2.ebuild, python-3.3.2.ebuild: - Drop extensions usedep from sqlite dep; sqlite is dropping the use flag. - - 26 Aug 2013; Michał Górny <mgorny@gentoo.org> python-2.5.4-r6.ebuild: - Replace internal eclass functions with a simple sed. - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for sparc, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for sh, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for s390, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for ppc, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for ppc64, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for ia64, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for arm, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for alpha, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for x86, wrt bug #480856 - - 23 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for amd64, wrt bug #480856 - - 20 Aug 2013; Jeroen Roovers <jer@gentoo.org> python-2.6.8-r3.ebuild, - python-2.7.5-r2.ebuild, python-3.2.5-r2.ebuild: - Stable for HPPA (bug #480856). - -*python-2.7.5-r2 (18 Aug 2013) -*python-3.2.5-r2 (18 Aug 2013) -*python-2.6.8-r3 (18 Aug 2013) - - 18 Aug 2013; Mike Gilbert <floppym@gentoo.org> - +files/CVE-2013-4238_py26.patch, +files/CVE-2013-4238_py27.patch, - +files/CVE-2013-4238_py32.patch, +files/CVE-2013-4238_py33.patch, - +python-2.6.8-r3.ebuild, +python-2.7.5-r2.ebuild, +python-3.2.5-r2.ebuild, - -files/CVE-2013-4073_py33.patch, python-3.3.2-r2.ebuild: - Apply fix for CVE-2013-4238, bug 480856. - -*python-3.3.2-r2 (18 Aug 2013) - - 18 Aug 2013; Mike Gilbert <floppym@gentoo.org> - +files/CVE-2013-4073_py33.patch, +python-3.3.2-r2.ebuild: - Use Arfrever's patchset, bug 354877. Apply fix for CVS-2013-4238, bug 480856. - - 06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for s390, wrt bug #475424 - - 06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for s390, wrt bug #469988 - - 03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for sparc, wrt bug #475424 - - 22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for sparc, wrt bug #469988 - - 21 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for sh, wrt bug #469988 - -*python-2.7.5-r1 (12 Jul 2013) - - 12 Jul 2013; Mike Gilbert <floppym@gentoo.org> - +files/python-2.7.5-re_unsigned_ptrdiff.patch, +python-2.7.5-r1.ebuild: - Apply patch to fix regex crash, bug 476426 by Fabio Rossi. - - 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for ia64, wrt bug #469988 - - 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for ia64, wrt bug #475424 - - 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for arm, wrt bug #469988 - - 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for arm, wrt bug #475424 - - 06 Jul 2013; Mike Gilbert <floppym@gentoo.org> -python-2.7.4.ebuild: - Remove old. - - 06 Jul 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.5.ebuild: - Move uclibc test removal after everything else, bug 475972. - - 06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for alpha, wrt bug #469988 - - 04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for ppc64, wrt bug #469988 - - 04 Jul 2013; Jeroen Roovers <jer@gentoo.org> python-3.2.5-r1.ebuild: - Stable for HPPA (bug #469988). - - 04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for ppc64, wrt bug #475424 - - 04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for ppc, wrt bug #469988 - - 04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for ppc, wrt bug #475424 - - 03 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for x86, wrt bug #469988 - - 03 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-3.2.5-r1.ebuild: - Stable for amd64, wrt bug #469988 - -*python-3.2.5-r1 (03 Jul 2013) -*python-3.3.2-r1 (03 Jul 2013) - - 03 Jul 2013; Mike Gilbert <floppym@gentoo.org> - +files/python-3.2-CVE-2013-2099.patch, +files/python-3.3-CVE-2013-2099.patch, - +python-3.2.5-r1.ebuild, +python-3.3.2-r1.ebuild: - Add patch to fix CVE-2013-2099, bug 469988. - - 02 Jul 2013; Jeroen Roovers <jer@gentoo.org> python-2.7.5.ebuild: - Stable for HPPA (bug #475424). - - 02 Jul 2013; Tobias Klausmann <klausman@gentoo.org> python-2.7.5.ebuild: - Stable on alpha, bug #475424 - - 02 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for x86, wrt bug #475424 - - 02 Jul 2013; Agostino Sarubbo <ago@gentoo.org> python-2.7.5.ebuild: - Stable for amd64, wrt bug #475424 - -*python-2.6.8-r2 (30 Jun 2013) -*python-2.5.4-r6 (30 Jun 2013) - - 30 Jun 2013; Mike Gilbert <floppym@gentoo.org> +files/python-2.5-tcl86.patch, - +python-2.5.4-r6.ebuild, +python-2.6.8-r2.ebuild: - Apply patch to allow old python versions to use tk-8.6, bug 454342. Also fix - the python shebang in idle2.5 and pydoc2.5, bugs 275241 and 383009. - - 30 Jun 2013; Mike Gilbert <floppym@gentoo.org> -python-2.5.4-r4.ebuild, - -python-2.6.8.ebuild, python-2.5.4-r5.ebuild, python-2.6.8-r1.ebuild: - Place upper bound on dev-lang/tk dep, bug 454342. Also stabilize on m68k since - nobody is responding on bug 458318. - - 28 Jun 2013; Mike Gilbert <floppym@gentoo.org> - +files/python-2.7.5-library-path.patch, python-2.7.5.ebuild: - Fix library paths when not cross-compiling. Should resolve bug 474882. Thanks - to Arfrever for finding the upstream commit. - -*python-2.7.5 (25 May 2013) -*python-3.2.5 (25 May 2013) - - 25 May 2013; Mike Gilbert <floppym@gentoo.org> +python-2.7.5.ebuild, - +python-3.2.5.ebuild, python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, - python-3.2.3-r2.ebuild: - Version bump. Also resolves bug 462288 and 471124. - -*python-3.3.2 (21 May 2013) - - 21 May 2013; Patrick McLean <chutz@gentoo.org> -python-3.3.0.ebuild, - -python-3.3.0-r1.ebuild, +python-3.3.2.ebuild: - Version bump to 3.3.2, clean out old 3.3 versions preparing for unmasking. - - 18 May 2013; Magnus Granberg <zorry@gentoo.org> python-2.7.4.ebuild, - python-3.2.4.ebuild, python-3.3.1.ebuild: - Add fix to support pax emutramp on libffi - - 09 May 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.4.ebuild: - Don't build the 'maninstall' target; this installs generic symlinks python.1 - and python2.1, which we manage using eselect-python. Bug 469148 by Alphat-PC. - - 09 May 2013; Michał Górny <mgorny@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.4.ebuild, python-3.1.5-r1.ebuild, - python-3.2.4.ebuild, python-3.3.1.ebuild: - Add epatch_user wrt bug #447714. - - 01 May 2013; Mike Gilbert <floppym@gentoo.org> python-3.2.4.ebuild: - Enable byte-compilation during tests. - - 01 May 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.4.ebuild, - python-3.2.4.ebuild: - Use Arfrever's patches. Remove some unnecessary || die. - - 28 Apr 2013; Patrick McLean <chutzpah@gentoo.org> python-3.3.1.ebuild: - Re-add patch from Arfrever to fix compilation on non-UTF-8 platforms, drop - patches that are no longer needed. - -*python-3.3.1 (28 Apr 2013) - - 28 Apr 2013; Patrick McLean <chutzpah@gentoo.org> +python-3.3.1.ebuild: - Version bump. Add new patch to fix import tests from Arferver. - -*python-3.2.4 (27 Apr 2013) - - 27 Apr 2013; Mike Gilbert <floppym@gentoo.org> +python-3.2.4.ebuild: - Version bump. Fails tests at the moment. - - 27 Apr 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.4.ebuild: - Downgrade to EAPI 4. - - 27 Apr 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.4.ebuild: - Increment patchset. - - 13 Apr 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for s390, wrt bug #458318 - - 07 Apr 2013; Mike Gilbert <floppym@gentoo.org> python-2.7.4.ebuild: - Adjust the sys-libs/db dep and add some || die. - - 07 Apr 2013; Michał Górny <mgorny@gentoo.org> python-2.6.8-r1.ebuild, - python-2.7.3-r3.ebuild, python-2.7.4.ebuild: - Fix wininst removal typo. Fixes bug #462862. - -*python-2.7.4 (07 Apr 2013) - - 07 Apr 2013; Mike Gilbert <floppym@gentoo.org> +python-2.7.4.ebuild: - Version bump. - - 31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for sh, wrt bug #458318 - - 31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for sparc, wrt bug #458318 - - 28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for ia64, wrt bug #458318 - - 26 Mar 2013; Mike Frysinger <vapier@gentoo.org> python-2.6.8-r1.ebuild, - python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, python-3.2.3-r2.ebuild, - python-3.3.0-r1.ebuild: - When cross-compiling, run the configures in parallel for a nice speed up - #462264 by SpanKY. - - 24 Mar 2013; Mike Gilbert <floppym@gentoo.org> python-3.3.0-r1.ebuild, - python-3.3.0.ebuild: - Add hard blocker on <sys-apps/sandbox-2.6-r1 to ensure we don't hit bug - 364877. - - 23 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for alpha, wrt bug #458318 - - 23 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for arm, wrt bug #458318 - - 21 Mar 2013; Jeroen Roovers <jer@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for HPPA (bug #458318). - - 19 Mar 2013; Mike Frysinger <vapier@gentoo.org> python-2.7.3-r3.ebuild, - python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild: - Install the python gdb module in the right place #443510 by Jan Pobrislo. - - 19 Mar 2013; Mike Frysinger <vapier@gentoo.org> python-2.7.3-r2.ebuild, - python-2.7.3-r3.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild, - python-3.2.3.ebuild, python-3.3.0-r1.ebuild, python-3.3.0.ebuild: - Export ac_cv_have_long_long_format=yes when cross-compiling #362945 by - Patrick. - - 19 Mar 2013; Mike Frysinger <vapier@gentoo.org> python-2.7.3-r2.ebuild, - python-2.7.3-r3.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild, - python-3.2.3.ebuild, python-3.3.0-r1.ebuild, python-3.3.0.ebuild: - Set ac_cv_buggy_getaddrinfo=no when cross-compiling. - - 19 Mar 2013; Mike Frysinger <vapier@gentoo.org> python-2.5.4-r4.ebuild, - python-2.5.4-r5.ebuild, python-2.6.8-r1.ebuild, python-2.6.8.ebuild, - python-2.7.3-r2.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.1.5.ebuild, python-3.2.3-r1.ebuild, python-3.2.3-r2.ebuild, - python-3.2.3.ebuild, python-3.3.0-r1.ebuild, python-3.3.0.ebuild: - Add hardened to IUSE since we `use` it #447264 by Alphat-PC. - - 18 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for ppc64, wrt bug #458318 - - 18 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for ppc, wrt bug #458318 - - 18 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for x86, wrt bug #458318 - - 18 Mar 2013; Agostino Sarubbo <ago@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild: - Stable for amd64, wrt bug #458318 - - 19 Dec 2012; Mike Gilbert <floppym@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild: - Don't depend on dev-lang/python. Bug 447752. - - 03 Dec 2012; Mike Gilbert <floppym@gentoo.org> python-2.5.4-r5.ebuild: - Copy eselect_python logic from more recent ebuilds. - - 02 Dec 2012; Michał Górny <mgorny@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild: - Stop renaming python-config wrt bug #445592. Keep a symlink for compatibility. - - 01 Dec 2012; Michał Górny <mgorny@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild: - Use python-any-r1 to clearly enforce build-time Python dependency. - - 30 Nov 2012; Michał Górny <mgorny@gentoo.org> python-2.5.4-r5.ebuild, - python-2.6.8-r1.ebuild, python-2.7.3-r3.ebuild, python-3.1.5-r1.ebuild, - python-3.2.3-r2.ebuild, python-3.3.0-r1.ebuild: - Fix byte-compiling the installed epython module when installing a new Python - version. - -*python-2.7.3-r3 (30 Nov 2012) -*python-3.3.0-r1 (30 Nov 2012) -*python-2.6.8-r1 (30 Nov 2012) -*python-2.5.4-r5 (30 Nov 2012) -*python-3.2.3-r2 (30 Nov 2012) -*python-3.1.5-r1 (30 Nov 2012) - - 30 Nov 2012; Michał Górny <mgorny@gentoo.org> +python-2.5.4-r5.ebuild, - +python-2.6.8-r1.ebuild, +python-2.7.3-r3.ebuild, +python-3.1.5-r1.ebuild, - +python-3.2.3-r2.ebuild, +python-3.3.0-r1.ebuild: - Introduce a cleaned up, -r1-quality Python ebuilds. Stop using python.eclass, - install epython module for python-exec. - - 14 Oct 2012; Raúl Porcel <armin76@gentoo.org> python-3.1.5.ebuild: - ia64/m68k/s390/sh/sparc stable - - 06 Oct 2012; Markus Meier <maekke@gentoo.org> python-3.1.5.ebuild: - arm stable, bug #427544 - - 02 Oct 2012; Jeroen Roovers <jer@gentoo.org> python-3.1.5.ebuild: - Stable for HPPA (bug #427548). - - 02 Oct 2012; Jeroen Roovers <jer@gentoo.org> python-3.2.3-r1.ebuild: - Stable for HPPA (bug #427548). - - 02 Oct 2012; Mike Gilbert <floppym@gentoo.org> python-3.3.0.ebuild: - Bump patchset revision for bug 436904. Drop wide-unicode use flag. - - 30 Sep 2012; Raúl Porcel <armin76@gentoo.org> python-3.2.3.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #427548 - - 30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> python-3.3.0.ebuild: - Fix 3.3 slot. - - 30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> -python-2.6.6-r2.ebuild, - -python-2.6.7-r2.ebuild, -python-2.7.2-r3.ebuild, -python-2.7.3.ebuild, - -python-2.7.3-r1.ebuild, -python-3.1.4-r3.ebuild, -python-3.1.4-r4.ebuild, - -python-3.2.2.ebuild, -python-3.2.2-r1.ebuild: - Remove old versions. - -*python-3.3.0 (30 Sep 2012) - - 30 Sep 2012; Dirkjan Ochtman <djc@gentoo.org> +python-3.3.0.ebuild: - Add tentative python-3.3 ebuild. Some tests still fail. - - 27 Sep 2012; Matt Turner <mattst88@gentoo.org> python-3.1.5.ebuild, - python-3.2.3-r1.ebuild: - Stable on alpha, bug 427548. - - 03 Aug 2012; Anthony G. Basile <blueness@gentoo.org> python-3.2.3.ebuild: - Stable arm, bug #427548 - - 30 Jul 2012; Mike Frysinger <vapier@gentoo.org> python-2.5.4-r4.ebuild, - python-2.6.6-r2.ebuild, python-2.6.7-r2.ebuild, python-2.6.8.ebuild, - python-2.7.2-r3.ebuild, python-2.7.3-r1.ebuild, python-2.7.3-r2.ebuild, - python-2.7.3.ebuild, python-3.1.4-r3.ebuild, python-3.1.4-r4.ebuild, - python-3.1.5.ebuild, python-3.2.2-r1.ebuild, python-3.2.2.ebuild, - python-3.2.3-r1.ebuild, python-3.2.3.ebuild: - Make sure $PKG_CONFIG is respected. - - 29 Jul 2012; Raúl Porcel <armin76@gentoo.org> python-2.7.3-r2.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #419575 - - 03 Jul 2012; Brent Baude <ranger@gentoo.org> python-2.7.3-r2.ebuild: - Marking python-2.7.3-r2 ppc for bug 419575 - - 22 Jun 2012; Brent Baude <ranger@gentoo.org> python-2.7.3-r2.ebuild: - Marking python-2.7.3-r2 ppc64 for bug 419575 - - 17 Jun 2012; Markus Meier <maekke@gentoo.org> python-2.7.3-r2.ebuild: - arm stable, bug #419575 - - 17 Jun 2012; Jeff Horelick <jdhore@gentoo.org> python-2.7.3-r2.ebuild: - marked x86 per bug 419575 - - 14 Jun 2012; Jeroen Roovers <jer@gentoo.org> python-2.7.3-r2.ebuild: - Stable for HPPA (bug #419575). - - 11 Jun 2012; Agostino Sarubbo <ago@gentoo.org> python-2.7.3-r2.ebuild: - Stable for amd64, wrt bug #419575 - - 04 Jun 2012; Mike Frysinger <vapier@gentoo.org> +files/python-3.2.3-x32.patch, - python-3.2.3.ebuild, python-3.2.3-r1.ebuild: - Fix posix subprocess module on x32. - - 26 May 2012; Raúl Porcel <armin76@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild: - ia64/m68k/s390/sh/sparc stable wrt #396329 - - 26 May 2012; Markus Meier <maekke@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild: - arm stable, bug #396329 - - 17 May 2012; Jeff Horelick <jdhore@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - marked x86 per bug 396329 - - 15 May 2012; Jeroen Roovers <jer@gentoo.org> python-3.1.4-r3.ebuild, - python-3.1.5.ebuild, python-3.2.2.ebuild, python-3.2.3.ebuild: - Marked ~hppa until it is ready. - - 15 May 2012; Jeroen Roovers <jer@gentoo.org> python-2.6.8.ebuild, - python-3.1.5.ebuild, python-3.2.3.ebuild: - Stable for HPPA (bug #396329). - - 14 May 2012; Jeroen Roovers <jer@gentoo.org> python-2.7.3-r1.ebuild: - Stable for HPPA (bug #396329). - - 14 May 2012; Mark Loeser <halcy0n@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Stable for ppc/ppc64; bug #369329 - - 14 May 2012; Agostino Sarubbo <ago@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Stable for amd64, wrt bug #396329 - - 12 May 2012; Tobias Klausmann <klausman@gentoo.org> python-2.6.8.ebuild: - Stable on alpha, bug #396329 - - 12 May 2012; Tobias Klausmann <klausman@gentoo.org> python-2.7.3-r1.ebuild: - Stable on alpha, bug #396329 - - 03 May 2012; Jeff Horelick <jdhore@gentoo.org> python-2.5.4-r4.ebuild, - python-2.6.6-r2.ebuild, python-2.6.7-r2.ebuild, python-2.6.8.ebuild, - python-2.7.2-r3.ebuild, python-2.7.3.ebuild, python-2.7.3-r1.ebuild, - python-2.7.3-r2.ebuild, python-3.1.4-r3.ebuild, python-3.1.4-r4.ebuild, - python-3.1.5.ebuild, python-3.2.2.ebuild, python-3.2.2-r1.ebuild, - python-3.2.3.ebuild, python-3.2.3-r1.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 03 May 2012; Mike Gilbert <floppym@gentoo.org> python-3.2.3-r1.ebuild: - Revert to previous patchset due to bug 414333. - - 01 May 2012; Mike Gilbert <floppym@gentoo.org> +python-2.7.3-r2.ebuild, - +python-3.2.3-r1.ebuild: - Restore ebuilds now that mirrors have the files. - - 01 May 2012; Mike Gilbert <floppym@gentoo.org> -python-2.7.3-r2.ebuild, - -python-3.2.3-r1.ebuild: - Drop ebuilds until the patchsets get mirrored. - -*python-3.2.3-r1 (01 May 2012) -*python-2.7.3-r2 (01 May 2012) - - 01 May 2012; Mike Gilbert <floppym@gentoo.org> +python-2.7.3-r2.ebuild, - +python-3.2.3-r1.ebuild: - Drop several patches that upstream has not accepted. - - 28 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Document reason for pax marking. Bug 413751. - - 28 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Drop sys-apps/paxctl dep and restore fbsd keywords. Bug 413671 should be - resolved by not calling pax-mark on libpython. - - 28 Apr 2012; Alexis Ballier <aballier@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - remove fbsd keywords on ebuilds depending on sys-apps/paxctl which doesnt - build and isnt keyworded - - 26 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Restore djc's fix for bug 368207. - - 26 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Don't pax-mark libpython.so. Bug 413671. - - 26 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-2.6.8.ebuild, - python-2.7.3-r1.ebuild, python-3.1.5.ebuild, python-3.2.3.ebuild: - Re-add dependency on sys-apps/paxctl due to bug 413671. - -*python-3.1.5 (26 Apr 2012) -*python-2.7.3-r1 (26 Apr 2012) -*python-3.2.3 (26 Apr 2012) -*python-2.6.8 (26 Apr 2012) - - 26 Apr 2012; Mike Gilbert <floppym@gentoo.org> +python-2.6.8.ebuild, - +python-2.7.3-r1.ebuild, +python-3.1.5.ebuild, +python-3.2.3.ebuild: - Version bumps for security bug 396329. Ebuilds and patchsets based on work by - Arfrever in Progress overlay. - - 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> python-3.2.2-r1.ebuild: - keyword ~amd64-fbsd - - 26 Apr 2012; Alexis Ballier <aballier@gentoo.org> python-2.7.3.ebuild: - keyword ~amd64-fbsd - -*python-2.7.3 (12 Apr 2012) - - 12 Apr 2012; Dirkjan Ochtman <djc@gentoo.org> +python-2.7.3.ebuild: - Version bump to 2.7.3, addressing bugs 368207, 301691. - -*python-3.1.4-r4 (21 Mar 2012) -*python-3.2.2-r1 (21 Mar 2012) - - 21 Mar 2012; Mike Gilbert <floppym@gentoo.org> - +files/python-3-distutils-egg-utf8.patch, +python-3.1.4-r4.ebuild, - +python-3.2.2-r1.ebuild: - Resolve distutils issue with unicode characters in egg-info files. Patch - backported by mgorny. Bug 343721. - - 07 Mar 2012; Brent Baude <ranger@gentoo.org> python-3.2.2.ebuild: - Marking python-3.2.2 ppc for bug 403875 - - 05 Mar 2012; Jeff Horelick <jdhore@gentoo.org> python-3.2.2.ebuild: - marked x86 per bug 403875 - - 05 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> python-2.5.4-r4.ebuild: - Remove obsolete sys-devel/gcc[libffi] built_with_use check wrt #406927 by - Michael Weber - - 03 Mar 2012; Brent Baude <ranger@gentoo.org> python-3.2.2.ebuild: - Marking python-3.2.2 ppc64 for bug 403875 - - 18 Feb 2012; Jeroen Roovers <jer@gentoo.org> python-3.2.2.ebuild: - Stable for HPPA (bug #403875). - - 17 Feb 2012; Agostino Sarubbo <ago@gentoo.org> python-3.2.2.ebuild: - Stable for amd64, wrt bug #403875 - - 15 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> -python-2.7.1-r1.ebuild, - -python-3.1.3-r1.ebuild: - Remove some old versions. - - 13 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> python-2.7.2-r3.ebuild, - python-3.1.4-r3.ebuild: - ppc64 stable wrt #387849 - - 10 Feb 2012; Patrick Lauer <patrick@gentoo.org> -python-2.4.6.ebuild: - Removing last python-2.4 ebuilds. Was nice having you around ... - - 01 Feb 2012; Brent Baude <ranger@gentoo.org> python-2.7.2-r3.ebuild, - python-3.1.4-r3.ebuild: - Marking -2.7.2-r3 and -3.1.4-r3 for bug 387849 - - 01 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2011: - Split ChangeLog. For older entries, please see ChangeLog-2011. diff --git a/dev-lang/python/ChangeLog-2011 b/dev-lang/python/ChangeLog-2011 deleted file mode 100644 index 7e2ecbc..0000000 --- a/dev-lang/python/ChangeLog-2011 +++ /dev/null @@ -1,2583 +0,0 @@ -# ChangeLog for dev-lang/python -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog-2011,v 1.1 2012/01/01 20:25:25 dilfridge Exp $ - - 14 Dec 2011; Mike Gilbert <floppym@gentoo.org> python-2.5.4-r4.ebuild: - Apply linux3 platform workaround. Fixes bug 394143. - - 13 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> files/linux2.patch: - Prune back linux2.patch to prevent race conditions (bug 394547). - - 09 Dec 2011; Mike Frysinger <vapier@gentoo.org> python-3.2.2.ebuild: - Replace hardcoded /lib64 searching with /<abi_libdir> paths. - - 01 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> python-2.7.2-r3.ebuild, - python-3.1.4-r3.ebuild, python-3.2.2.ebuild: - Fix autogen problems (bug 355733). - - 01 Dec 2011; Dirkjan Ochtman <djc@gentoo.org> -python-2.7.2-r2.ebuild, - -python-3.1.4-r2.ebuild, -python-3.2-r2.ebuild: - Remove old versions from the tree. - - 26 Nov 2011; Mike Gilbert <floppym@gentoo.org> python-2.6.7-r2.ebuild, - python-2.7.2-r2.ebuild, python-2.7.2-r3.ebuild, python-3.1.4-r2.ebuild, - python-3.1.4-r3.ebuild: - Remove reference to snapshots in python overlay. - - 31 Oct 2011; Mike Frysinger <vapier@gentoo.org> python-2.6.7-r2.ebuild, - python-2.7.2-r2.ebuild, python-2.7.2-r3.ebuild, python-3.1.4-r2.ebuild, - python-3.1.4-r3.ebuild, python-3.2-r2.ebuild, python-3.2.2.ebuild: - Drop unnecessary USE=kernel_linux check in plat-linux3 setup. - - 30 Oct 2011; Raúl Porcel <armin76@gentoo.org> python-2.7.2-r3.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #387849 - - 27 Oct 2011; Tony Vroon <chainsaw@gentoo.org> python-2.7.2-r3.ebuild, - python-3.1.4-r3.ebuild: - Marked stable on AMD64; objections in arch testing by Ian "idella4" Delaney & - Agostino "ago" Sarubbo in bug #387849 were overridden by request of Dirkjan - Ochtman. - - 27 Oct 2011; Jesus Rivero <neurogeek@gentoo.org> python-2.4.6.ebuild, - python-2.5.4-r4.ebuild, python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, - python-3.1.3-r1.ebuild, python-3.2-r2.ebuild, python-3.2.2.ebuild, - files/pydoc.conf, files/pydoc.init: - Changes to pydoc conf.d and init.d files wrt bug #361867. Patch by - Arfrever - - 26 Oct 2011; Jeroen Roovers <jer@gentoo.org> python-3.1.4-r3.ebuild: - Stable for HPPA (bug #387849). - - 26 Oct 2011; Jeroen Roovers <jer@gentoo.org> python-2.7.2-r3.ebuild: - Stable for HPPA (bug #387849). - - 24 Oct 2011; Markus Meier <maekke@gentoo.org> python-2.7.2-r3.ebuild: - arm stable, bug #387849 - - 23 Oct 2011; Markus Meier <maekke@gentoo.org> python-3.1.4-r3.ebuild: - x86 stable, bug #387849 - - 23 Oct 2011; Markus Meier <maekke@gentoo.org> python-2.7.2-r3.ebuild: - x86 stable, bug #387849 - -*python-3.2.2 (16 Sep 2011) - - 16 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> +python-3.2.2.ebuild: - Version bump to 3.2.2 (fixes bug 375051). - -*python-3.1.4-r3 (16 Sep 2011) -*python-2.7.2-r3 (16 Sep 2011) - - 16 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> +files/linux2.patch, - +python-2.7.2-r3.ebuild, +python-3.1.4-r3.ebuild: - Set sys.platform to linux2 even on linux3 (bug 375257). - - 16 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> -python-2.6.5-r3.ebuild, - -python-2.7.1-r2.ebuild: - Remove old versions. - - 27 Aug 2011; Jesus Rivero <neurogeek@gentoo.org> python-2.7.2-r2.ebuild, - python-3.1.3-r1.ebuild, python-3.1.4-r2.ebuild: - Change to generic license - - 23 Aug 2011; Jesus Rivero <neurogeek@gentoo.org> python-3.2-r2.ebuild, - +files/python-3.2-soname_typo.patch: - Applied patch from upstream, wrt bug #376303. Fixed License - - 07 Aug 2011; Naohiro Aota <naota@gentoo.org> python-2.6.7-r2.ebuild, - python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild: - Move more linux3 compat hack into kernel_linux check. Bug #374579 - - 05 Aug 2011; Naohiro Aota <naota@gentoo.org> python-2.6.7-r2.ebuild, - python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild: - Move linux3 compat hack into kernel_linux check. Bug #374579 - -*python-3.2-r2 (24 Jul 2011) -*python-3.1.4-r2 (24 Jul 2011) -*python-2.7.2-r2 (24 Jul 2011) -*python-2.6.7-r2 (24 Jul 2011) - - 24 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> -python-2.6.7-r1.ebuild, - +python-2.6.7-r2.ebuild, -python-2.7.2-r1.ebuild, +python-2.7.2-r2.ebuild, - -python-3.1.4-r1.ebuild, +python-3.1.4-r2.ebuild, -python-3.2-r1.ebuild, - +python-3.2-r2.ebuild: - Revbump N. 2 for all testing versions of Python wrt bug #374579 and linux-3 - -*python-3.2-r1 (22 Jul 2011) -*python-3.1.4-r1 (22 Jul 2011) -*python-2.7.2-r1 (22 Jul 2011) -*python-2.6.7-r1 (22 Jul 2011) - - 22 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> -python-2.6.7.ebuild, - +python-2.6.7-r1.ebuild, -python-2.7.2.ebuild, +python-2.7.2-r1.ebuild, - -python-3.1.4.ebuild, +python-3.1.4-r1.ebuild, -python-3.2.ebuild, - +python-3.2-r1.ebuild: - Revbump for all testing versions of Python wrt bug #374579 and linux-3 - - 27 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> python-2.7.2.ebuild, - python-3.2.ebuild: - Bump required autoconf version to 2.65 (bug 372461). - -*python-3.1.4 (27 Jun 2011) -*python-2.7.2 (27 Jun 2011) -*python-2.6.7 (27 Jun 2011) - - 27 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> +python-2.6.7.ebuild, - +python-2.7.2.ebuild, +python-3.1.4.ebuild: - Version bumps. Ebuilds and patchsets by Arfrever. - -*python-2.7.1-r2 (17 May 2011) - - 17 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.7.1-r2.ebuild: - Use PyXML only after calling xml.use_pyxml(). - - 17 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, - python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.3-r1.ebuild, - python-3.2.ebuild, files/pydoc.init: - Use target pydoc script in pydoc init.d script (bug #361867). - - 22 Apr 2011; Raúl Porcel <armin76@gentoo.org> python-2.7.1-r1.ebuild: - alpha/ia64/m68k/s390/sh stable wrt #358717 - - 18 Apr 2011; Thomas Kahle <tomka@gentoo.org> python-2.7.1-r1.ebuild: - x86 stable per bug 358717 - - 05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> python-2.4.6.ebuild, - python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild, - python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.2-r4.ebuild, - python-3.1.3-r1.ebuild, python-3.2.ebuild: - Don't PROVIDE virtual/python, bug 358849. - - 04 Apr 2011; Jeroen Roovers <jer@gentoo.org> python-2.7.1-r1.ebuild: - Stable for HPPA (bug #358717). - - 04 Apr 2011; Michael Weber <xmw@gentoo.org> python-2.7.1-r1.ebuild: - arm/sparc stable (bug 358717) - - 25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> python-2.7.1-r1.ebuild: - ppc64 stable wrt #358717 - - 24 Mar 2011; Christoph Mende <angelos@gentoo.org> python-2.7.1-r1.ebuild: - Stable on amd64 wrt bug #358717 - - 22 Mar 2011; Brent Baude <ranger@gentoo.org> python-2.7.1-r1.ebuild: - Marking python-2.7.1-r1 ppc for bug 358717 - - 18 Mar 2011; Mike Frysinger <vapier@gentoo.org> python-2.4.6.ebuild, - python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild, - python-2.6.6-r2.ebuild, python-2.7.1-r1.ebuild, python-3.1.2-r4.ebuild, - python-3.1.3-r1.ebuild, python-3.2.ebuild: - Drop useless calls to prep_ml_includes #357727. - - 26 Feb 2011; Raúl Porcel <armin76@gentoo.org> python-2.6.6-r2.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #355927 - - 26 Feb 2011; Markos Chandras <hwoarang@gentoo.org> python-2.6.6-r2.ebuild, - python-3.1.3-r1.ebuild: - Stable on amd64 wrt bug #355927 - - 24 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> - python-2.6.6-r2.ebuild, python-3.1.3-r1.ebuild: - x86 stable wrt security bug #355927 - - 23 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> - python-2.6.6-r2.ebuild, python-3.1.3-r1.ebuild: - ppc/ppc64 stable wrt #355927 - - 23 Feb 2011; Jeroen Roovers <jer@gentoo.org> python-2.6.6-r2.ebuild, - python-3.1.3-r1.ebuild: - Stable for HPPA (bug #355927). - -*python-3.2 (21 Feb 2011) - - 21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.2.ebuild: - Version bump. - -*python-3.1.3-r1 (21 Feb 2011) - - 21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -python-3.1.3.ebuild, +python-3.1.3-r1.ebuild: - Fix regression in unicodedata.normalize() (Python issue #10254). Fix - NameError in logging.handlers.TimedRotatingFileHandler.__init__() (Gentoo bug - #350400, Python issue #10810). Don't skip test_ctypes tests on hardened/PAX - (Gentoo bug #348745). - -*python-2.7.1-r1 (21 Feb 2011) - - 21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -python-2.7.ebuild, -python-2.7.1.ebuild, +python-2.7.1-r1.ebuild: - Fix incompatible API change in xmlrpclib.Transport.parse_response() (Gentoo - bug #347465, Python issue #8194). Fix regression in unicodedata.normalize() - (Python issue #10254). Don't skip test_ctypes tests on hardened/PAX (Gentoo - bug #348745). - -*python-2.6.6-r2 (21 Feb 2011) - - 21 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.6-r2.ebuild: - Fix DoS vulnerability in smtpd (Python issue #9129). Fix regression in - unicodedata.normalize() (Python issue #10254). Don't skip test_ctypes tests - on hardened/PAX (Gentoo bug #348745). - - 20 Feb 2011; Raúl Porcel <armin76@gentoo.org> python-2.6.6-r1.ebuild: - ia64/m68k/s390/sh/sparc stable wrt #342927 - - 06 Jan 2011; Brent Baude <ranger@gentoo.org> python-2.6.6-r1.ebuild: - Marking python-2.6.6-r1 ppc for bug 342927 - - 01 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - python-2.6.6-r1.ebuild: - Non-maintainer commit. - Reverting commit that broke stage generation for python-2.6.6-r1 as it wasn't - reverted before - bug 347867. - This commit was accepted by Arfrever. - - 29 Dec 2010; Markos Chandras <hwoarang@gentoo.org> python-2.6.6-r1.ebuild: - Stable on amd64 wrt bug #342927 - - 27 Dec 2010; Brent Baude <ranger@gentoo.org> python-2.6.6-r1.ebuild: - Marking python-2.6.6-r1 ppc64 for bug 342927 - - 27 Dec 2010; Brent Baude <ranger@gentoo.org> python-3.1.2-r4.ebuild: - Marking python-3.1.2-r4 ppc64 for bug 325593 - - 22 Dec 2010; Tobias Klausmann <klausman@gentoo.org> python-2.6.6-r1.ebuild: - Stable on alpha, bug #342927 - - 21 Dec 2010; Markus Meier <maekke@gentoo.org> python-2.6.6-r1.ebuild: - arm stable, bug #342927 - - 16 Dec 2010; Jesus Rivero <neurogeek@gentoo.org> python-2.4.6.ebuild, - python-2.5.4-r4.ebuild, python-2.7.ebuild, python-2.7.1.ebuild, - python-3.1.3.ebuild: - Reverting commit that broke stage generation - bug 347867. - - 14 Dec 2010; Jeroen Roovers <jer@gentoo.org> python-2.6.6-r1.ebuild: - Stable for HPPA (bug #342927). - - 07 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> - python-2.6.6-r1.ebuild: - x86 stable wrt bug #342927 - - 06 Dec 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - python-2.6.5-r3.ebuild, python-3.1.2-r4.ebuild: - Non-maintainer commit. - Reverting commit that broke stage generation - bug 347867. - - 01 Dec 2010; <sping@gentoo.org> python-2.4.6.ebuild, python-2.5.4-r4.ebuild, - python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild, python-2.7.ebuild, - python-2.7.1.ebuild, python-3.1.2-r4.ebuild, python-3.1.3.ebuild: - Save/restore active Python version across calls to pkg_postrm() of the ebuild - about to be replaced. Ensure /usr/bin/python symlink. - - 29 Nov 2010; <sping@gentoo.org> python-2.7.1.ebuild, python-3.1.3.ebuild: - Remove eselect_python_update() from 2.7.1 and 3.1.3 - -*python-3.1.3 (28 Nov 2010) -*python-2.7.1 (28 Nov 2010) - - 28 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.7.1.ebuild, +python-3.1.3.ebuild: - Version bumps. 2.7: Enable loadable sqlite extensions (bug #335505). - - 27 Nov 2010; Sebastian Pipping <sping@gentoo.org> python-2.4.6.ebuild, - python-2.5.4-r4.ebuild, python-2.6.5-r3.ebuild, python-2.6.6-r1.ebuild, - python-2.7.ebuild, python-3.1.2-r4.ebuild: - Disable auto-bumping of active Python version by removing - eselect_python_update() and its invocation as explained and announced on - gentoo-dev - - 27 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> -python-2.6.4-r1.ebuild, - -python-2.6.5-r2.ebuild, -python-3.1.2-r3.ebuild: - Remove old versions. - - 27 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> python-2.6.6-r1.ebuild: - Disable test___all__ to fix bug 321075. - - 13 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> python-2.6.6-r1.ebuild: - Use mirrors for the patch set. - -*python-2.6.6-r1 (12 Oct 2010) - - 12 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> -python-2.6.6.ebuild, - +python-2.6.6-r1.ebuild: - 2.6.6-r1 actually has the rwx-mmap patch and the portage blocker. - - 11 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> python-2.6.6.ebuild: - Block 2.6.6 on portage-2.1.9 (earlier portage suffers from bug 330937). - -*python-2.6.6 (08 Oct 2010) - - 08 Oct 2010; Dirkjan Ochtman <djc@gentoo.org> +python-2.6.6.ebuild: - Version bump to 2.6.6 (bug 334425). - - 15 Aug 2010; Jeroen Roovers <jer@gentoo.org> python-3.1.2-r4.ebuild: - Stable for HPPA (bug #325593). - - 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> python-2.6.5-r3.ebuild, - python-3.1.2-r4.ebuild: - Marked ppc/ppc64 stable for bug #325593. - - 08 Aug 2010; Raúl Porcel <armin76@gentoo.org> python-2.6.5-r3.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #325593 - - 06 Aug 2010; Markos Chandras <hwoarang@gentoo.org> python-2.6.5-r3.ebuild, - python-3.1.2-r4.ebuild: - Stable on amd64 wrt bug #325593 - - 06 Aug 2010; Jeroen Roovers <jer@gentoo.org> python-2.6.5-r3.ebuild: - Stable for HPPA (bug #325593). - - 06 Aug 2010; Christian Faulhammer <fauli@gentoo.org> - python-3.1.2-r4.ebuild: - stable x86, security bug 325593 - - 06 Aug 2010; Christian Faulhammer <fauli@gentoo.org> - python-2.6.5-r3.ebuild: - stable x86, security bug 325593 - - 02 Aug 2010; Brian Harring <ferringb@gentoo.org> - -python-2.6.5_p20100801.ebuild, -python-2.7_p20100801.ebuild, - -python-3.1.2_p20100801.ebuild: - Remove untested versions, one of which flat out breaks emerge (bug 330937). - These should not be re-added without going through devrel/qa. - -*python-3.1.2_p20100801 (02 Aug 2010) -*python-2.7_p20100801 (02 Aug 2010) -*python-2.6.5_p20100801 (02 Aug 2010) - - 02 Aug 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.5_p20100801.ebuild, +python-2.7_p20100801.ebuild, - +python-3.1.2_p20100801.ebuild: - Improve usage of mmap in _ctypes module (bug #329499). Fix handling of - environmental variables (bug #329705). Backport some fixes from release - branches. - - 31 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.4-r1.ebuild, python-2.6.5-r2.ebuild, python-2.6.5-r3.ebuild, - python-2.7.ebuild, python-3.1.2-r3.ebuild, python-3.1.2-r4.ebuild: - Revert wrong change in _ctypes module (bug #329499). - - 30 Jul 2010; Jeroen Roovers <jer@gentoo.org> python-3.1.2-r3.ebuild: - Stable for HPPA (bug #320043). - - 25 Jul 2010; <solar@gentoo.org> python-2.6.4-r1.ebuild, - python-2.6.5-r2.ebuild, python-2.6.5-r3.ebuild, python-2.7.ebuild, - python-3.1.2-r3.ebuild, python-3.1.2-r4.ebuild: - - The Modules/_ctypes/malloc_closure.c misuses a mmap() call trying to set - a mem segment to rwx when it does not need it. Bug 329499 - - 22 Jul 2010; Markus Meier <maekke@gentoo.org> python-2.6.5-r2.ebuild: - arm stable, bug #319723 - - 18 Jul 2010; <nixnut@gentoo.org> python-3.1.2-r3.ebuild: - ppc stable #320043 - - 17 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.2-r4.ebuild: - Fix parallel installation (bug #328009). - - 15 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.2-r4.ebuild: - Fix building with some locales (bug #328047). - -*python-3.1.2-r4 (12 Jul 2010) - - 12 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.2-r4.ebuild: - Fix segmentation fault with non-module encodings directory on PYTHONPATH (bug #314883). - Fix building with Linux <2.6.9 headers (bug #317937). Fix httplib.HTTPResponse.read() - (bug #321545). Fix vulnerabilities in audioop module (bug #325593). Backport some - fixes from 3.1 branch. - -*python-2.6.5-r3 (12 Jul 2010) - - 12 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.5-r3.ebuild: - Fix building with Linux <2.6.9 headers (bug #317937). Fix httplib.HTTPResponse.read() - (bug #321545). Fix vulnerabilities in audioop module (bug #325593). Backport some - fixes from 2.6 branch. - -*python-2.7 (04 Jul 2010) - - 04 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.7.ebuild: - Version bump. - - 22 Jun 2010; Christian Faulhammer <fauli@gentoo.org> - python-2.6.5-r2.ebuild: - stable x86, bug 319723 - - 04 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> - python-3.1.2-r3.ebuild: - x86 stable wrt bug #320043 - - 04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.2-r3.ebuild: - Disable tests with USE="-threads" (bug #322755). - - 26 May 2010; Markos Chandras <hwoarang@gentoo.org> python-3.1.2-r3.ebuild: - Stable on amd64 wrt bug #320043 - - 25 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild, - python-2.6.5-r2.ebuild, python-3.1.2-r3.ebuild: - Work around bug #321145. - - 24 May 2010; <nixnut@gentoo.org> python-2.6.5-r2.ebuild: - ppc stable #319723 - - 23 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.5-r2.ebuild, - python-3.1.2-r3.ebuild: - Support FEATURES="test-fail-continue". Don't install byte-compiled Python - modules (bug #301915). - - 21 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.5-r2.ebuild: - amd64 stable (tested by rullzer) (bug #319723). - - 14 May 2010; Jeroen Roovers <jer@gentoo.org> python-2.6.5-r2.ebuild: - Stable for HPPA (bug #319723). - - 02 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.2-r3.ebuild: - Don't use ebeep() (bug #318091). - -*python-3.1.2-r3 (01 May 2010) - - 01 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.2-r3.ebuild: - Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919). - Backport some fixes from 3.1 branch. Use EAPI="3". - -*python-2.6.5-r2 (01 May 2010) - - 01 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.5-r2.ebuild: - Don't add GENTOO_PYTHON_WRAPPER_SCRIPT_PATH to os.environ (bug #315919). - Fix failure of test_zlib with zlib 1.2.4 (Python issue #8193). Backport - some fixes from 2.6 branch. - -*python-3.1.2-r2 (11 Apr 2010) - - 11 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.2-r2.ebuild: - Use correct types of pointers. Fix failure of test_zlib with zlib 1.2.4 - (Python issue #8193). - -*python-3.1.2-r1 (25 Mar 2010) - - 25 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.2-r1.ebuild: - Allow str subclasses to override __str__ method (Python issue #1583863). - Fix argument validation in sys.setfilesystemencoding() (Python issue #8226). - -*python-2.6.5-r1 (25 Mar 2010) - - 25 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.5-r1.ebuild: - Allow unicode subclasses to override __unicode__ method (Python issue #1583863). - Fix thread creation in low memory condition (Python issue #7544). - Fix unicodedata.normalize (Python issue #1054943). Set sys.executable to - empty string when program name is invalid (Python issue #7774). - - 25 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.5.ebuild, python-3.1.2.ebuild: - Unset variables after using them to avoid affecting child processes. - -*python-3.1.2 (22 Mar 2010) - - 22 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.2.ebuild: - Version bump. Fixed bugs: #189283, #279234, #300961, #301848, #302519. - Respect GENTOO_PYTHON_PROCESS_NAME, GENTOO_PYTHON_WRAPPER_SCRIPT_PATH and - GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variables. - -*python-2.6.5 (21 Mar 2010) - - 21 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.5.ebuild: - Version bump. Fixed bugs: #189283, #279234, #282859, #300961, #301848. - Respect GENTOO_PYTHON_PROCESS_NAME, GENTOO_PYTHON_WRAPPER_SCRIPT_PATH and - GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variables. - - 20 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild, - python-3.1.1-r1.ebuild: - Use -fwrapv (bug #297276). Install email module with USE="build". - - 10 Mar 2010; Joseph Jezak <josejx@gentoo.org> python-2.6.4-r1.ebuild: - Marked ppc/ppc64 stable for bug #306793. - - 07 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> - python-2.6.4-r1.ebuild: - amd64 stable wrt #306793 - - 07 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4.ebuild, - python-2.6.4-r1.ebuild: - Delete no longer needed recommendation (bug #307887). - - 04 Mar 2010; Raúl Porcel <armin76@gentoo.org> python-2.6.4-r1.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #306793 - - 04 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.1-r1.ebuild: - Depend on >=app-admin/python-updater-0.8, which supports packages - installable for multiple versions of Python. - - 26 Feb 2010; Jeroen Roovers <jer@gentoo.org> python-2.6.4-r1.ebuild: - Stable for HPPA (bug #306793). - - 25 Feb 2010; Christian Faulhammer <fauli@gentoo.org> - python-2.6.4-r1.ebuild: - stable x86, bug 306793 - - 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r4.ebuild, python-2.6.4-r1.ebuild, - python-3.1.1-r1.ebuild: - Don't install idle${SLOT} and idlelib module with USE="-tk" (bug #237788). - Enable "ssl" USE flag by default via IUSE (bug #304891). - - 13 Feb 2010; Raúl Porcel <armin76@gentoo.org> python-2.5.4-r4.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #303005 - - 10 Feb 2010; Jeroen Roovers <jer@gentoo.org> python-2.5.4-r4.ebuild: - Stable for HPPA (bug #303005). - - 10 Feb 2010; Joseph Jezak <josejx@gentoo.org> python-2.5.4-r4.ebuild: - Marked ppc stable for bug #303005. - - 07 Feb 2010; Markus Meier <maekke@gentoo.org> python-2.5.4-r4.ebuild: - arm/x86 stable, bug #303005 - - 04 Feb 2010; Brent Baude <ranger@gentoo.org> python-2.5.4-r4.ebuild: - Marking python-2.5.4-r4 ppc64 for bug 303005 - - 01 Feb 2010; Markos Chandras <hwoarang@gentoo.org> python-2.5.4-r4.ebuild: - Stable on amd64 wrt bug #303005 - -*python-2.6.4-r1 (26 Jan 2010) - - 26 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.4-r1.ebuild: - Respect PYTHONDONTWRITEBYTECODE / sys.dont_write_bytecode in distutils. - Check availability of nis headers before building of nis module (bug #288110). - Use pkg-config found by AC_PATH_TOOL() to avoid problem during crosscompilation - (bug #299044). Don't ignore __cmp__() of metaclasses. - - 12 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.5.4-r4.ebuild, - python-2.6.4.ebuild, python-3.1.1-r1.ebuild: - Fix building with Portage <2.1.7 (bug #300671). - - 01 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.1-r1.ebuild: - Respect PYTHONDONTWRITEBYTECODE / sys.dont_write_bytecode in distutils. - Check availability of nis headers before building of nis module (bug #288110). - Use pkg-config found by AC_PATH_TOOL() to avoid problem during crosscompilation - (bug #299044). Depend on >=app-admin/eselect-python-20091230, which allows - wrapper scipts generated by python_generate_wrapper_scripts() and requiring - Python-2-specific target scripts to work correctly, when Python 3 is set as - main active version of Python. - -*python-2.5.4-r4 (01 Jan 2010) - - 01 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.5.4-r4.ebuild: - Use external libffi (bug #209673). Respect PYTHONDONTWRITEBYTECODE in - distutils. Check availability of nis headers before building of nis - module (bug #288110). - - 01 Jan 2010; Brent Baude <ranger@gentoo.org> python-2.6.4.ebuild: - Marking python-2.6.4 ppc64 for bug 295066 - - 20 Dec 2009; Raúl Porcel <armin76@gentoo.org> python-2.6.4.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #295066 - - 19 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.4.ebuild: - Restrict tests from test_httpservers (bug #293201). - - 19 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.1-r1.ebuild: - Use --with-computed-gotos (bug #296574). - - 13 Dec 2009; Raúl Porcel <armin76@gentoo.org> python-2.6.4.ebuild, - python-3.1.1-r1.ebuild: - Add ~m68k, thanks to kolla for testing - - 09 Dec 2009; nixnut <nixnut@gentoo.org> python-2.6.4.ebuild: - ppc stable #295066 - - 06 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild, - python-2.6.2-r2.ebuild, python-2.6.3.ebuild, python-2.6.4.ebuild, - python-3.1.1-r1.ebuild, metadata.xml: - Remove "ucs2" USE flag and add "wide-unicode" USE flag (bug #293135). - - 04 Dec 2009; Jeroen Roovers <jer@gentoo.org> python-2.6.4.ebuild: - Stable for HPPA (bug #295066). - - 03 Dec 2009; Markus Meier <maekke@gentoo.org> python-2.6.4.ebuild: - amd64/arm/x86 stable, bug #295066 - - 29 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.4.ebuild, python-3.1.1-r1.ebuild: - _ctypes module doesn't work with GCC's internal libffi. - - 07 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.1-r1.ebuild: - Make logging module ignore absence of multiprocessing module (bug - #291109). - -*python-2.6.4 (30 Oct 2009) - - 30 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.4.ebuild: - Version bump. - - 24 Oct 2009; Alexey Shvetsov <alexxy@gentoo.org> python-2.6.3.ebuild, - python-3.1.1-r1.ebuild: - Add ~mips keyword #287383 - - 19 Oct 2009; Raúl Porcel <armin76@gentoo.org> python-2.6.2-r1.ebuild: - s390/sh stable wrt #277645 - - 17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.5.4-r3.ebuild, python-2.6.3.ebuild, python-3.1.1-r1.ebuild: - Fix paths passed to python_mod_optimize() and python_mod_cleanup() (bug - #288354). - - 14 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> - python-3.1.1-r1.ebuild: - Keyword ~sparc-fbsd wrt #287383. - - 14 Oct 2009; Alexis Ballier <aballier@gentoo.org> python-2.6.3.ebuild: - keyword ~sparc-fbsd - - 03 Oct 2009; Fabian Groffen <grobian@gentoo.org> python-2.4.6.ebuild, - python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild, python-2.6.3.ebuild, - python-3.1.1-r1.ebuild: - Python's _locale module needs libintl, which on non-Linux is in gettext, - depend on virtual/libintl for that case - -*python-2.6.3 (02 Oct 2009) - - 02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.3.ebuild: - Version bump. - - 02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.2-r2.ebuild, python-3.1.1-r1.ebuild: - Remove a workaround for missing keywords. - - 27 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild, - python-3.1.1-r1.ebuild: - Enable "ncurses" and "readline" USE flags by default. Don't activate - Python 2 when Python 3 is already active. Ensure that Python 2 is - installed. - - 27 Sep 2009; nixnut <nixnut@gentoo.org> python-2.6.2-r1.ebuild: - ppc stable #277645 - - 25 Sep 2009; Zac Medico <zmedico@gentoo.org> python-3.1.1.ebuild, - python-3.1.1-r1.ebuild: - For python 3, don't remove the encodings directory with USE=build, in - order to avoid 'Fatal Python error: Py_Initialize: can't initialize sys - standard streams ImportError: No module named encodings.utf_8'. - - 23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild: - Fix handling of USE="-berkdb". - - 23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r2.ebuild, - python-3.1.1-r1.ebuild: - Add dependency on app-misc/mime-types which is used by mimetypes module. - Reported by Dirkjan Ochtman. - -*python-3.1.1-r1 (22 Sep 2009) -*python-2.6.2-r2 (22 Sep 2009) - - 22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.2-r2.ebuild, +python-3.1.1-r1.ebuild: - Use external libffi on some architectures (bug #209673). - - 22 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild: - Restrict sys-libs/db dependencies and add warnings (bug #285553). - - 21 Sep 2009; Tom Gall <tgall@gentoo.org> python-2.6.2-r1.ebuild: - stable for ppc64, bug #277645 - - 17 Sep 2009; Jeroen Roovers <jer@gentoo.org> python-2.6.2-r1.ebuild: - Stable for HPPA (bug #277645). - - 06 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -files/python-config-2.4, -python-3.1.ebuild: - Delete old ebuild and old python-config. - - 05 Sep 2009; Raúl Porcel <armin76@gentoo.org> python-2.6.2-r1.ebuild: - ia64/sparc stable wrt #277645 - - 01 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.2-r1.ebuild: - Fix building on arm OABI (bug #266703). - - 30 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.4.6.ebuild, python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild, - python-3.1.1.ebuild: - Reenable test_math.py and test_pow.py on alpha (bug #282786). - - 28 Aug 2009; Raúl Porcel <armin76@gentoo.org> python-2.6.2-r1.ebuild: - arm/m68k stable wrt #277645 - - 26 Aug 2009; Tobias Klausmann <klausman@gentoo.org> - python-2.6.2-r1.ebuild: - Stable on alpha, bug #277645 - - 26 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.2-r1.ebuild, python-3.1.1.ebuild: - Skip test_math.py on alpha (bug #282786). - - 25 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.6.2-r1.ebuild, python-3.1.1.ebuild: - Fix building of Python 2.6.2-r1 with USE=-threads (bug #282518). Fix - building with USE=build or USE=-xml (bug #282259). Small updates. - - 21 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild, python-3.1.1.ebuild: - Add missing dependency on >=dev-libs/expat-2 and non-zero exit status of - setup.py when building of extensions has failed (bug #281968). - -*python-3.1.1 (17 Aug 2009) - - 17 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.1.ebuild: - Version bump. Don't install sqlite3 and _sqlite3 modules with USE="-sqlite" - (bug #236466). - - 16 Aug 2009; Christian Faulhammer <fauli@gentoo.org> - python-2.6.2-r1.ebuild: - stable x86, bug 277645 - - 04 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-3.1.ebuild: - Fix building with sys-libs/db headers containing non-UTF-8 characters (bug - #280001). - - 02 Aug 2009; Jeremy Olexa <darkside@gentoo.org> metadata.xml: - Be more verbose about the 'threads' USE flag. - -*python-3.1 (01 Aug 2009) - - 01 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-3.1.ebuild: - Version bump (bug #250186). - - 01 Aug 2009; Zac Medico <zmedico@gentoo.org> python-2.6.2-r1.ebuild: - Bug #248081 - Fix tests not to assume that stdin is a tty. - - 31 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - python-2.5.4-r3.ebuild, python-2.6.2-r1.ebuild: - Skip test_ctypes on systems with PAX (bug #234498). - - 30 Jul 2009; Jeremy Olexa <darkside@gentoo.org> python-2.6.2-r1.ebuild: - amd64 stable, bug 277645 - - 19 Jul 2009; Raúl Porcel <armin76@gentoo.org> python-2.5.4-r3.ebuild: - arm/ia64/m68k/s390/sh/sparc stable wrt #275311 - - 17 Jul 2009; nixnut <nixnut@gentoo.org> python-2.5.4-r3.ebuild: - ppc stable #275311 - - 05 Jul 2009; Markus Meier <maekke@gentoo.org> python-2.5.4-r3.ebuild: - amd64 stable, bug #275311 - - 04 Jul 2009; Brent Baude <ranger@gentoo.org> python-2.5.4-r3.ebuild: - stable ppc64, bug 275311 - - 30 Jun 2009; Christian Faulhammer <fauli@gentoo.org> - python-2.5.4-r3.ebuild: - stable x86, bug 275311 - - 28 Jun 2009; Tobias Klausmann <klausman@gentoo.org> - python-2.5.4-r3.ebuild: - Stable on alpha, bug #275311 - - 26 Jun 2009; Jeroen Roovers <jer@gentoo.org> python-2.5.4-r3.ebuild: - Stable for HPPA (bug #275311). - -*python-2.6.2-r1 (28 May 2009) - - 28 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.2-r1.ebuild: - Install libpython2.6.a in /usr/lib instead of /usr/lib/python2.6/config - (bug #252372). Fix building with Subversion 1.7. - - 27 May 2009; Raúl Porcel <armin76@gentoo.org> python-2.4.6.ebuild: - arm/ia64/m68k/s390/sh/sparc stable wrt #252317 - - 25 May 2009; Markus Meier <maekke@gentoo.org> python-2.4.6.ebuild: - amd64 stable, bug #252317 - - 25 May 2009; Christian Faulhammer <fauli@gentoo.org> python-2.4.6.ebuild: - stable x86, security bug 252317 - -*python-2.5.4-r3 (25 May 2009) - - 25 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.5.4-r3.ebuild: - Install libpython2.5.a in /usr/lib instead of /usr/lib/python2.5/config - (bug #252372). Fix building with Subversion 1.7. Use `eselect python` - instead of alternatives.eclass. - - 25 May 2009; Brent Baude <ranger@gentoo.org> python-2.4.6.ebuild: - Marking python-2.4.6 ppc64 and ppc for bug 252317 - - 24 May 2009; Jeroen Roovers <jer@gentoo.org> python-2.4.6.ebuild: - Stable for HPPA (bug #252317). - - 24 May 2009; Tobias Klausmann <klausman@gentoo.org> python-2.4.6.ebuild: - Stable on alpha, bug #252317 - - 24 May 2009; Tobias Klausmann <klausman@gentoo.org> python-2.4.6.ebuild: - Keyworded on alpha, bug #252317 - -*python-2.4.6 (24 May 2009) - - 24 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.4.6.ebuild: - Version bump (bug #252317). - - 24 Apr 2009; Raúl Porcel <armin76@gentoo.org> python-2.5.4-r2.ebuild: - arm/ia64/m68k/s390/sh/sparc stable wrt #265790 - - 22 Apr 2009; Jeroen Roovers <jer@gentoo.org> python-2.5.4-r2: - Stable for HPPA (bug #265790). - - 19 Apr 2009; Markus Meier <maekke@gentoo.org> python-2.5.4-r2: - amd64/x86 stable, bug #265790 - - 19 Apr 2009; Brent Baude <ranger@gentoo.org> python-2.5.4-r2.ebuild: - Marking python-2.5.4-r2 ppc64 and ppc for bug 265790 - -*python-2.6.2 (18 Apr 2009) - - 18 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +python-2.6.2.ebuild: - Version bump (bug #266596). - - 18 Apr 2009; Tobias Klausmann <klausman@gentoo.org> - python-2.5.4-r2.ebuild: - Stable on alpha, bug #265790 - - 17 Apr 2009; Joshua Kinard <kumba@gentoo.org> python-2.6-r5.ebuild, - python-2.6.1-r1.ebuild: - Python 2.6 has a build failure on MIPS for now. Dropping our unstable - keywords until it's fixed by upstream or if Upstreams latest patch on - their bug is added. Refer to #266471 for Gentoo for the tracker, or - http://bugs.python.org/issue4305 for the Python issue. - - 12 Apr 2009; Mike Frysinger <vapier@gentoo.org> - +files/python-2.6-chflags-cross.patch, - +files/python-2.6-cross-patch-tweak.patch, python-2.6.1-r1.ebuild: - Fix up cross-compiling with python-2.6. - - 26 Mar 2009; Zac Medico <zmedico@gentoo.org> python-2.5.2-r7.ebuild, - python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild, python-2.6-r5.ebuild, - python-2.6.1-r1.ebuild: - In src_test, redirect stdin from /dev/tty as a workaround for bug #248081. - -*python-2.6.1-r1 (21 Mar 2009) - - 21 Mar 2009; Jesus Rivero <neurogeek@gentoo.org> -python-2.6.1.ebuild, - +python-2.6.1-r1.ebuild: - Fixed typo in sqlite3 extension. Removed old version - - 26 Feb 2009; Mike Frysinger <vapier@gentoo.org> - +files/python-2.5-cross-printf.patch, python-2.5.2-r7.ebuild, - python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild: - Fix cross-compilation with %zd printf tests #239110 by xeb and #184308 by - Joel Martin. - - 26 Feb 2009; Mike Frysinger <vapier@gentoo.org> python-2.4.4-r5.ebuild, - python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild, - python-2.5.2-r7.ebuild, python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild, - python-2.6-r5.ebuild, python-2.6.1.ebuild: - Drop host python ver check when cross-compiling since we build up a local - hostpython, and pass CBUILD to the hostpython configure so it detects the - full name of the compiler. - - 10 Feb 2009; <neurogeek@gentoo.org> python-2.6-r5.ebuild, - python-2.6.1.ebuild: - Python 2.6 series. Added +xml use flag to standarize. - - 10 Feb 2009; <neurogeek@gentoo.org> python-2.5.2-r7.ebuild, - python-2.5.2-r8.ebuild, python-2.5.4-r2.ebuild: - Python 2.5 series. Added +xml use flag to standarize. - - 10 Feb 2009; <neurogeek@gentoo.org> python-2.4.4-r5.ebuild, - python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild: - Python 2.4.4 series. Added +xml use flag to standarize. - -*python-2.5.4-r2 (24 Jan 2009) - - 24 Jan 2009; Jesus Rivero <neurogeek@gentoo.org> -python-2.5.4-r1.ebuild, - +python-2.5.4-r2.ebuild: - Fixed line breaks errors in ebuild. Removed older version. Closes Bug - #255946. Thanks Walter and Steve for helping - -*python-2.5.4-r1 (22 Jan 2009) - - 22 Jan 2009; Jesus Rivero <neurogeek@gentoo.org> - files/python-2.5.2_turkish.patch, files/python-2.6_turkish.patch, - -python-2.5.4.ebuild, +python-2.5.4-r1.ebuild: - Rev bump. Patch bundle updated to fix turkish locale patch. Updated older - patches too and removed previous version. - -*python-2.5.4 (21 Jan 2009) - - 21 Jan 2009; Jesus Rivero <neurogeek@gentoo.org> +python-2.5.4.ebuild: - Version bump. Some of the patches used in previous versions are not - needed. - - 24 Dec 2008; Jesus Rivero <neurogeek@gentoo.org> python-2.6-r5.ebuild, - python-2.6.1.ebuild: - Added dev-python/python-docs:2.6 - -*python-2.6.1 (13 Dec 2008) - - 13 Dec 2008; Jesus Rivero <neurogeek@gentoo.org> - +files/python-2.6_turkish.patch, +python-2.6.1.ebuild: - Version bump - - 09 Dec 2008; Mike Frysinger <vapier@gentoo.org> python-2.5.2-r8.ebuild, - python-2.6-r5.ebuild: - Set expat to default to on. - - 08 Dec 2008; Mike Frysinger <vapier@gentoo.org> python-2.5.2-r8.ebuild, - python-2.6-r5.ebuild: - Make dev-libs/expat optional via USE=expat. - - 06 Dec 2008; Jesus Rivero <neurogeek@gentoo.org> - +files/python-2.5.2_turkish.patch, python-2.5.2-r8.ebuild: - Fixed support for tr_TR locale. Bug #250075. Thanks to Serkan - -*python-2.6-r5 (17 Nov 2008) - - 17 Nov 2008; <neurogeek@gentoo.org> -python-2.6-r4.ebuild, - +python-2.6-r5.ebuild: - Revision bump. Fixes Bug #219238. Removed older version - - 26 Oct 2008; Ali Polatel <hawking@gentoo.org> python-2.4.4-r5.ebuild, - python-2.4.4-r6.ebuild, python-2.4.4-r14.ebuild, python-2.4.4-r15.ebuild, - python-2.5.2-r7.ebuild, python-2.5.2-r8.ebuild: - Use python_{en,dis}able_pyc. - -*python-2.6-r4 (26 Oct 2008) - - 26 Oct 2008; Ali Polatel <hawking@gentoo.org> +python-2.6-r4.ebuild: - Revbump. Updated patchset to use PYTHONDONTWRITEBYTECODE instead of - PYTHON_DONT_COMPILE. - - 25 Oct 2008; Ali Polatel <hawking@gentoo.org> python-2.5.2-r7.ebuild, - python-2.5.2-r8.ebuild, python-2.6-r3.ebuild: - Nuke the useless bootstrap USE flag for >=python-2.5. Thanks to Arfrever. - -*python-2.6-r3 (25 Oct 2008) - - 25 Oct 2008; Ali Polatel <hawking@gentoo.org> -python-2.6-r2.ebuild, - +python-2.6-r3.ebuild: - Revbump. Bump eselect-python DEPEND to fix bug 240149. Don't install empty - directories. - -*python-2.6-r2 (07 Oct 2008) - - 07 Oct 2008; Ali Polatel <hawking@gentoo.org> -python-2.6-r1.ebuild, - +python-2.6-r2.ebuild: - Revbump. Bump to EAPI 2 and some minor fixes. Drop old. - -*python-2.6-r1 (06 Oct 2008) - - 06 Oct 2008; Ali Polatel <hawking@gentoo.org> -python-2.6.ebuild, - +python-2.6-r1.ebuild: - Revbump. Use use_with for threads, remove die from econf, use emake - instead of make, remove redundant python_mod_{cleanup,optimize}. Drop old. - -*python-2.6 (05 Oct 2008) - - 05 Oct 2008; Ali Polatel <hawking@gentoo.org> - +files/python-2.6-test-cross.patch, -python-2.5.2-r6.ebuild, - +python-2.6.ebuild: - Version bump. Drop old. - -*python-2.5.2-r8 (19 Sep 2008) -*python-2.4.4-r15 (19 Sep 2008) - - 19 Sep 2008; Ali Polatel <hawking@gentoo.org> +python-2.4.4-r15.ebuild, - +python-2.5.2-r8.ebuild: - Revbumps. Updated patchset to fix bug 238124. Install examples under - /usr/share/doc/$PF/examples. - - 17 Sep 2008; Brent Baude <ranger@gentoo.org> python-2.5.2-r7.ebuild: - stable ppc64, bug 236723 - - 14 Sep 2008; Sven Wegener <swegener@gentoo.org> python-2.5.2-r6.ebuild, - python-2.5.2-r7.ebuild: - Use correct sqlite module name, when disabling it. - - 12 Sep 2008; Raúl Porcel <armin76@gentoo.org> python-2.5.2-r7.ebuild: - alpha/ia64 stable wrt #236723 - - 12 Sep 2008; Ferris McCormick <fmccor@gentoo.org> python-2.5.2-r7.ebuild: - Sparc stable --- Bug #236723 --- tests all good. - - 11 Sep 2008; Markus Meier <maekke@gentoo.org> python-2.5.2-r7.ebuild: - amd64/x86 stable, bug #236723 - - 11 Sep 2008; Jeroen Roovers <jer@gentoo.org> python-2.5.2-r7.ebuild: - Stable for HPPA (bug #236723). - - 10 Sep 2008; Brent Baude <ranger@gentoo.org> python-2.5.2-r7.ebuild: - stable ppc, bug 236723 - - 19 Aug 2008; Ali Polatel <hawking@gentoo.org> -files/python-config-2.2, - -files/python-config-2.3, -files/python-2.3.6-disable-failing-tests.patch, - metadata.xml, -python-2.3.5-r2.ebuild, -python-2.3.5-r3.ebuild, - -python-2.3.6.ebuild, -python-2.3.6-r3.ebuild, -python-2.3.6-r6.ebuild, - -python-2.4.4-r13.ebuild, -python-2.5.2-r5.ebuild: - Drop python-2.3, drop old 2.4, 2.5 ebuilds. Add local use flag - descriptions to metadata.xml. - - 31 Jul 2008; Raúl Porcel <armin76@gentoo.org> python-2.5.2-r6.ebuild: - sparc stable - -*python-2.5.2-r7 (31 Jul 2008) - - 31 Jul 2008; Tiziano Müller <dev-zero@gentoo.org> - +python-2.5.2-r7.ebuild: - Added patches for bug #218378 (thanks to Duane Griffin) and bug #233312 - (thanks to Arfrever Frehtes Taifersar Arahesis). - -*python-2.5.2-r6 (31 Jul 2008) -*python-2.4.4-r14 (31 Jul 2008) - - 31 Jul 2008; Tiziano Müller <dev-zero@gentoo.org> - +python-2.4.4-r14.ebuild, +python-2.5.2-r6.ebuild: - Revision bump to fix bug #230640 (CVE-2008-2315, CVE-2008-2316) and bug - #232137 (CVE-2008-{3142,3143,3144}). - - 18 Jul 2008; Olivier Crête <tester@gentoo.org> python-2.5.2-r5.ebuild: - Stable on amd64, bug #178800 - - 18 Jul 2008; Jeroen Roovers <jer@gentoo.org> python-2.5.2-r5.ebuild: - Stable for HPPA (bug #178800). - - 17 Jul 2008; Tobias Klausmann <klausman@gentoo.org> - python-2.5.2-r5.ebuild: - Stable on alpha, bug #178800 - - 17 Jul 2008; Raúl Porcel <armin76@gentoo.org> python-2.5.2-r5.ebuild: - ia64/sparc stable wrt #178800 - - 17 Jul 2008; Christian Faulhammer <opfer@gentoo.org> - python-2.5.2-r5.ebuild: - stable x86, bug 178800 - - 16 Jul 2008; nixnut <nixnut@gentoo.org> python-2.5.2-r5.ebuild: - Stable on ppc wrt bug 178800 - - 09 Jul 2008; Markus Rothe <corsair@gentoo.org> python-2.5.2-r5.ebuild: - Stable on ppc64; bug #178800 - - 30 Jun 2008; Ali Polatel <hawking@gentoo.org> files/pydoc.conf, - files/pydoc.init: - Fixed files/pydoc* headers - -*python-2.5.2-r5 (24 Jun 2008) - - 24 Jun 2008; Ali Polatel <hawking@gentoo.org> -python-2.3.6-r4.ebuild, - -python-2.3.6-r5.ebuild, -python-2.4.4-r9.ebuild, - -python-2.4.4-r10.ebuild, -python-2.4.4-r11.ebuild, - -python-2.4.4-r12.ebuild, -python-2.5.2-r1.ebuild, - -python-2.5.2-r2.ebuild, -python-2.5.2-r3.ebuild, -python-2.5.2-r4.ebuild, - +python-2.5.2-r5.ebuild: - Revbump. Append -fwrapv to CFLAGS if we're using gcc-4, #228905. Updated - patchset to fix memory issues with unicode objects, #222481. Drop old. - - 20 Jun 2008; Ali Polatel <hawking@gentoo.org> python-2.5.2-r4.ebuild: - Fix bsddb dependency, bug 223133. Cosmetics - - 29 May 2008; Ali Polatel <hawking@gentoo.org> python-2.3.5-r2.ebuild, - python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r3.ebuild, - python-2.3.6-r4.ebuild, python-2.3.6-r5.ebuild, python-2.3.6-r6.ebuild, - python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild, python-2.4.4-r9.ebuild, - python-2.4.4-r10.ebuild, python-2.4.4-r11.ebuild, python-2.4.4-r12.ebuild, - python-2.4.4-r13.ebuild, python-2.5.2-r1.ebuild, python-2.5.2-r2.ebuild, - python-2.5.2-r3.ebuild, python-2.5.2-r4.ebuild: - Fix -x option passed to python_mod_optimize, thanks to Remy Blank, - #224137. - - 29 May 2008; Ali Polatel <hawking@gentoo.org> python-2.3.5-r2.ebuild, - python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r3.ebuild, - python-2.3.6-r4.ebuild, python-2.3.6-r5.ebuild, python-2.3.6-r6.ebuild, - python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild, python-2.4.4-r9.ebuild, - python-2.4.4-r10.ebuild, python-2.4.4-r11.ebuild, python-2.4.4-r12.ebuild, - python-2.4.4-r13.ebuild, python-2.5.2-r1.ebuild, python-2.5.2-r2.ebuild, - python-2.5.2-r3.ebuild, python-2.5.2-r4.ebuild: - python_mod_optimize is ROOT aware. - - 28 May 2008; Markus Meier <maekke@gentoo.org> python-2.3.6-r6.ebuild, - python-2.4.4-r13.ebuild: - amd64/x86 stable, security bug #216673 - - 27 May 2008; Markus Rothe <corsair@gentoo.org> python-2.3.6-r6.ebuild, - python-2.4.4-r13.ebuild: - Stable on ppc64; bug #216673 - - 26 May 2008; Tobias Scherbaum <dertobi123@gentoo.org> - python-2.3.6-r6.ebuild, python-2.4.4-r13.ebuild: - ppc stable, bug #216673 - - 26 May 2008; Raúl Porcel <armin76@gentoo.org> python-2.3.6-r6.ebuild, - python-2.4.4-r13.ebuild: - ia64/sparc stable wrt security #216673 - - 25 May 2008; Tobias Klausmann <klausman@gentoo.org> - python-2.3.6-r6.ebuild: - Stable on alpha, bug #216673 - - 25 May 2008; Tobias Klausmann <klausman@gentoo.org> - python-2.4.4-r13.ebuild: - Stable on alpha, bug #216673 - - 25 May 2008; Ali Polatel <hawking@gentoo.org> - +files/python-2.3.6-disable-failing-tests.patch, python-2.3.6-r6.ebuild, - python-2.4.4-r13.ebuild, python-2.5.2-r4.ebuild: - Added patch to disable failing test_bsddb test for 2.3. Disable test_pow - on alpha until upstream comes up with a fix. - - 24 May 2008; Jeroen Roovers <jer@gentoo.org> python-2.3.6-r6.ebuild, - python-2.4.4-r13.ebuild: - Stable for HPPA (bug #216673). - -*python-2.5.2-r4 (21 May 2008) -*python-2.4.4-r13 (21 May 2008) -*python-2.3.6-r6 (21 May 2008) - - 21 May 2008; Ali Polatel <hawking@gentoo.org> +python-2.3.6-r6.ebuild, - +python-2.4.4-r13.ebuild, +python-2.5.2-r4.ebuild: - Revision bumps. Don't build the imageop module on 32 bit as well, #216673. - - 13 May 2008; Ali Polatel <hawking@gentoo.org> python-2.4.4-r12.ebuild, - python-2.5.2-r3.ebuild: - Drop dev-python/python-fchksum from PDEPEND. It's not needed anymore. - -*python-2.5.2-r3 (13 May 2008) -*python-2.4.4-r12 (13 May 2008) - - 13 May 2008; Ali Polatel <hawking@gentoo.org> +python-2.4.4-r12.ebuild, - +python-2.5.2-r3.ebuild: - Revbumps. Updated CXXFLAGS patch so packages overriding - distutils.CCompiler._compile won't fail to build, #219238. Added patch to - fix executable stack for ctypes, thanks to Sandro Bonazzola, #218753. - Added patch to build with system expat, thanks to Diego, #178921. - -*python-2.5.2-r2 (19 Apr 2008) -*python-2.4.4-r11 (19 Apr 2008) - - 19 Apr 2008; Ali Polatel <hawking@gentoo.org> +python-2.4.4-r11.ebuild, - +python-2.5.2-r2.ebuild: - Revbumps. Updated patchset to fix compilation of extensions when CXXFLAGS - is unset. - -*python-2.5.2-r1 (18 Apr 2008) - - 18 Apr 2008; Ali Polatel <hawking@gentoo.org> python-2.3.5-r2.ebuild, - python-2.3.5-r3.ebuild, python-2.3.6.ebuild, -python-2.3.6-r2.ebuild, - python-2.3.6-r3.ebuild, -python-2.4.4-r4.ebuild, python-2.4.4-r5.ebuild, - -python-2.4.4-r7.ebuild, -python-2.4.4-r8.ebuild, -python-2.5.1-r2.ebuild, - -python-2.5.1-r3.ebuild, -python-2.5.1-r4.ebuild, -python-2.5.1-r5.ebuild, - -python-2.5.2.ebuild, +python-2.5.2-r1.ebuild: - Revbump. Updated patchset. Backported upstream patch to make file objects - as thread safe as the underlying libc FILE* implementation. Backported - upstream patch fixing a bunch of infinite C recursions. Dropped old. - Quoting. - -*python-2.5.2 (18 Apr 2008) -*python-2.4.4-r10 (18 Apr 2008) -*python-2.3.6-r5 (18 Apr 2008) - - 18 Apr 2008; Ali Polatel <hawking@gentoo.org> +python-2.3.6-r5.ebuild, - +python-2.4.4-r10.ebuild, +python-2.5.2.ebuild: - Version bumps. Updated patchsets to fix buffer overflow in zlib extension - (CVE-2008-1721) bug 217221 and unsafe PyString_FromStringAndSize(). Added - patch by Mark Peloquin for distutils to respect CXXFLAGS, bug 145206. Add - wininst USE flag to conditionally install MS Windows executables, bug - 198021. Use EAPI=1, rename nothreads and nocxx USE flags to threads and - cxx. - - 11 Mar 2008; Markus Rothe <corsair@gentoo.org> python-2.4.4-r9.ebuild: - Stable on ppc64; bug #211281 - - 11 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> python-2.4.4-r9.ebuild, - python-2.5.1-r5.ebuild: - Changed newinitd/newconfd for pydoc to install the init.d/conf.d scripts as - pydoc-2.x (aka don't break slotting) - - 06 Mar 2008; nixnut <nixnut@gentoo.org> python-2.4.4-r9.ebuild: - Stable on ppc wrt bug 211281 - - 03 Mar 2008; Christoph Mende <angelos@gentoo.org> python-2.4.4-r9.ebuild: - Stable on amd64, bug #211281 - - 03 Mar 2008; Raúl Porcel <armin76@gentoo.org> python-2.4.4-r9.ebuild: - alpha/ia64/sparc/x86 stable wrt #211281 - - 03 Mar 2008; Jeroen Roovers <jer@gentoo.org> python-2.4.4-r9.ebuild: - Stable for HPPA (bug #211281). - - 01 Mar 2008; Tiziano Müller <dev-zero@gentoo.org> +files/pydoc.conf, - +files/pydoc.init, python-2.4.4-r9.ebuild, python-2.5.1-r5.ebuild: - Added init.d/conf.d scripts for the integrated pydoc webserver (bug #59903, - thanks to compnerd). - -*python-2.4.4-r9 (16 Feb 2008) - - 16 Feb 2008; Christian Faulhammer <opfer@gentoo.org> - +python-2.4.4-r9.ebuild: - fix bug 179377, with a dependency adjustment to proper slots of sys-libs/db, - provided by Petr Pisar <petr DOT pisar AT atlas DOT cz> - - 25 Jan 2008; Markus Rothe <corsair@gentoo.org> python-2.3.6-r4.ebuild: - Stable on ppc64; bug #198373 - - 23 Jan 2008; Peter Weller <welp@gentoo.org> python-2.3.6-r4.ebuild: - Stable on amd64; bug 198373 - - 23 Jan 2008; Raúl Porcel <armin76@gentoo.org> python-2.3.6-r4.ebuild: - alpha/ia64/sparc stable wrt security #198373 - - 23 Jan 2008; Christian Faulhammer <opfer@gentoo.org> - python-2.3.6-r4.ebuild: - stable x86, security bug 198373 - - 23 Jan 2008; Jeroen Roovers <jer@gentoo.org> python-2.3.6-r4.ebuild: - Stable for HPPA (bug #198373). - - 23 Jan 2008; Brent Baude <ranger@gentoo.org> python-2.3.6-r4.ebuild: - Marking python-2.3.6-r4 ppc for bug 198373 - -*python-2.3.6-r4 (22 Jan 2008) - - 22 Jan 2008; Ali Polatel <hawking@gentoo.org> +python-2.3.6-r4.ebuild: - Revision bump. New patchset for 2.3.6 including fixes for #198373 and #204343. - Changed berkdb DEPEND, quoting. - -*python-2.5.1-r5 (07 Jan 2008) -*python-2.4.4-r8 (07 Jan 2008) - - 07 Jan 2008; Ali Polatel <hawking@gentoo.org> +python-2.4.4-r8.ebuild, - +python-2.5.1-r5.ebuild: - Revision bump(s). New patchsets for 2.4.4 and 2.5.1 wrt #204700 and #204343 - -*python-2.5.1-r4 (18 Nov 2007) -*python-2.4.4-r7 (18 Nov 2007) - - 18 Nov 2007; Ali Polatel <hawking@gentoo.org> +python-2.4.4-r7.ebuild, - +python-2.5.1-r4.ebuild: - revbump(s). don't install windows executables, bug 198021. updated patchset - to fix implicit dependency on openssl, bug 198398. fix quoting. - - 27 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org> - python-2.3.6-r3.ebuild, python-2.4.4-r6.ebuild: - ppc stable, bug #192876 - - 26 Oct 2007; Ali Polatel <hawking@gentoo.org> python-2.4.4-r4.ebuild, - python-2.4.4-r5.ebuild, python-2.4.4-r6.ebuild: - Changed SRC_URI of python-gentoo-patches-2.4* to mirror://gentoo - - 25 Oct 2007; Jeroen Roovers <jer@gentoo.org> python-2.4.4-r6.ebuild: - Stable for HPPA (bug #192876). Fixed quoting issues. - - 25 Oct 2007; Jeroen Roovers <jer@gentoo.org> python-2.3.6-r3.ebuild: - Stable for HPPA (bug #192876). - - 25 Oct 2007; Raúl Porcel <armin76@gentoo.org> python-2.3.6-r3.ebuild, - python-2.4.4-r6.ebuild: - alpha/ia64/sparc stable wrt security #192876 - - 25 Oct 2007; Daniel Gryniewicz <dang@gentoo.org> python-2.3.6-r3.ebuild, - python-2.4.4-r6.ebuild: - Marked stable on amd64 for bug #192876 - - 25 Oct 2007; Markus Rothe <corsair@gentoo.org> python-2.3.6-r3.ebuild, - python-2.4.4-r6.ebuild: - Stable on ppc64; bug #192876 - - 25 Oct 2007; Christian Faulhammer <opfer@gentoo.org> - python-2.3.6-r3.ebuild: - stable x86, security bug 192876 - - 25 Oct 2007; Christian Faulhammer <opfer@gentoo.org> - python-2.4.4-r6.ebuild: - stable x86, security bug 192876 - -*python-2.5.1-r3 (24 Oct 2007) -*python-2.4.4-r6 (24 Oct 2007) -*python-2.3.6-r3 (24 Oct 2007) - - 24 Oct 2007; Ali Polatel <hawking@gentoo.org> +python-2.3.6-r3.ebuild, - +python-2.4.4-r6.ebuild, +python-2.5.1-r3.ebuild: - revbump(s). fix imageop integer overflows (CVE-2007-4965), bug 192876 - - 26 Sep 2007; Joshua Kinard <kumba@gentoo.org> python-2.4.4-r5.ebuild: - Stable on mips, per #188029. - - 24 Sep 2007; Ali Polatel <hawking@gentoo.org> python-2.5.1-r2.ebuild: - don't set LINKCC, removed nocxx use flag. don't pass --with-cxx=no to - configure. bug 193190 - - 22 Sep 2007; Jeroen Roovers <jer@gentoo.org> python-2.4.4-r5.ebuild: - Stable for HPPA (bug #188029). - - 22 Sep 2007; Ferris McCormick <fmccor@gentoo.org> python-2.4.4-r5.ebuild: - Sparc stable --- Bug #188029 --- all tests pass and portage still works. - - 22 Sep 2007; Brent Baude <ranger@gentoo.org> ChangeLog: - MArking python-2.4.4-r5 ppc64 for bug 188029 - - 22 Sep 2007; nixnut <nixnut@gentoo.org> python-2.4.4-r5.ebuild: - Stable on ppc wrt bug 188029 - - 22 Sep 2007; Tom Gall <tgall@gentoo.org> python-2.4.4-r5.ebuild: - stable on ppc64 - - 21 Sep 2007; Raúl Porcel <armin76@gentoo.org> python-2.4.4-r5.ebuild: - alpha/ia64 stable wrt #188029 - - 21 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org> - python-2.4.4-r5.ebuild: - Stable on x86 wrt bug #188029. - - 21 Sep 2007; Daniel Gryniewicz <dang@gentoo.org> python-2.4.4-r5.ebuild: - Marked stable on amd64 for bug #188029 - - 10 Sep 2007; Joel Martin <kanaka@gentoo.org> - +files/python-2.4.4-test-cross.patch, python-2.4.4-r4.ebuild, - python-2.4.4-r5.ebuild, python-2.5.1-r2.ebuild: - Fix cross-compile check and add small cross-compile patch to remove unicode - in one of the tests when cross-compiling. - - 08 Sep 2007; Zac Medico <zmedico@gentoo.org> - python-2.4.4-r4.ebuild, python-2.4.4-r5.ebuild: - Add build? ( !dev-python/pycrypto ) to RDEPEND in order to enforce - correct merge order for a stage building issue similar to bug #88777. - - 07 Sep 2007; Ali Polatel <hawking@gentoo.org> - -files/python-2.4.3-db4.patch, -files/python-2.4.3-gentoo_obsd.patch, - -files/python-2.4.3-gentoo_obsd-r1.patch, -python-2.4.3-r1.ebuild, - -python-2.4.3-r4.ebuild, -python-2.4.4.ebuild, -python-2.5-r2.ebuild: - Clean out old versions - - 03 Sep 2007; Zac Medico <zmedico@gentoo.org> python-2.4.4-r4.ebuild, - python-2.4.4-r5.ebuild, python-2.5-r2.ebuild, python-2.5.1-r2.ebuild: - Add build? ( !dev-python/python-fchksum ) to RDEPEND in order - to enforce correct merge order for bug #88777. - -*python-2.4.4-r5 (24 Aug 2007) - - 24 Aug 2007; Ali Polatel <hawking@gentoo.org> +files/python-config-2.4-r1, - +python-2.4.4-r5.ebuild: - Revision bump. Use python-config provided by python-2.5 with small changes - instead of our custom python-config-2.4. bug 188029 - - 20 Aug 2007; Roy Marples <uberlord@gentoo.org> python-2.5.1-r2.ebuild: - export LDFLAGS="-L." -> append-ldflags "-L.", #189298 - thanks to Arfrever Frehtes Taifersar Arahesis. - - 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> python-2.3.5-r2.ebuild, - python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r2.ebuild, - python-2.4.3-r1.ebuild, python-2.4.3-r4.ebuild, python-2.4.4.ebuild, - python-2.4.4-r4.ebuild, python-2.5-r2.ebuild, python-2.5.1-r2.ebuild: - (QA) RESTRICT clean up. - - 30 Jun 2007; Lars Weiler <pylon@gentoo.org> python-2.3.6-r2.ebuild, - python-2.5.1-r2.ebuild: - Keyworded ~ppc; bug #177426. - - 31 May 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: - Remove myself as I'm retiring. - - 19 May 2007; Peter Weller <welp@gentoo.org> python-2.5.1-r2.ebuild: - Keyworded ~amd64 wrt bug 177426 - - 19 May 2007; Peter Weller <welp@gentoo.org> python-2.3.6-r2.ebuild: - Added ~amd64 to python-2.3.6-r2 - - 17 May 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: - Mark myself as maintainer. - - 16 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> - python-2.4.4-r4.ebuild: - ppc stable, bug #177804 - - 16 May 2007; Daniel Gryniewicz <dang@gentoo.org> python-2.4.4-r4.ebuild: - Marked stable on amd64 for bug #177804 - - 14 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> - python-2.3.6-r2.ebuild, python-2.5.1-r2.ebuild: - Keyworded ~sparc wrt #177426 - - 14 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.4.4-r4.ebuild: - Stable on Alpha and Mips. - - 14 May 2007; Daniel Gryniewicz <dang@gentoo.org> python-2.4.4-r4.ebuild: - Marked ~amd64 for bug #177804 - - 14 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.4.4-r4.ebuild: - Fix 2.4.4-r4 tests always being disabled. - - 14 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> - python-2.4.4-r4.ebuild: - Stable on sparc wrt security #177804 - - 14 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.3.6-r2.ebuild, - python-2.4.4-r4.ebuild, -python-2.5.1-r1.ebuild, python-2.5.1-r2.ebuild: - Fix small bug preventing tests from running, fix manpage symlinks (bug - 177471) and filter as-needed in python-2.3.6-r2 (bug 177614). - - 14 May 2007; Jeroen Roovers <jer@gentoo.org> python-2.4.4-r4.ebuild: - Stable for HPPA (bug #177804). - - 13 May 2007; Markus Rothe <corsair@gentoo.org> python-2.4.4-r4.ebuild: - Stable on ppc64; bug #177804 - - 12 May 2007; Roy Marples <uberlord@gentoo.org> python-2.4.4-r4.ebuild: - Added ~sparc-fbsd keyword. - - 12 May 2007; Raúl Porcel <armin76@gentoo.org> python-2.4.4-r4.ebuild: - ia64 + x86 stable wrt security bug #177804 - - 12 May 2007; Markus Rothe <corsair@gentoo.org> python-2.3.6-r2.ebuild, - python-2.4.4-r4.ebuild, python-2.5.1-r2.ebuild: - Added ~ppc64; bug #177426 - - 11 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.4.4-r4.ebuild, - python-2.5.1-r2.ebuild: - Add ~alpha and ~mips keywords. - - 11 May 2007; Bryan Østergaard <kloeri@gentoo.org> - -python-2.1.3-r1.ebuild, -python-2.2.3-r6.ebuild: - More cleanups, this time removing <python-2.3. - - 11 May 2007; Bryan Østergaard <kloeri@gentoo.org> - -python-2.3.6-r1.ebuild, -python-2.4.4-r2.ebuild, -python-2.4.4-r3.ebuild, - -python-2.5-r1.ebuild, -python-2.5.1.ebuild: - Clean out some old versions. - -*python-2.5.1-r2 (11 May 2007) -*python-2.4.4-r4 (11 May 2007) - - 11 May 2007; Bryan Østergaard <kloeri@gentoo.org> - +python-2.4.4-r4.ebuild, +python-2.5.1-r2.ebuild: - Only apply crosscompile patch conditionally, drop tests if crosscompiling - and fix PyLocale.strxfrm leak from bug 177804. srtxfrm from Debian bug - 416934 - -*python-2.5.1-r1 (10 May 2007) -*python-2.4.4-r3 (10 May 2007) -*python-2.3.6-r2 (10 May 2007) - - 10 May 2007; Bryan Østergaard <kloeri@gentoo.org> - +python-2.3.6-r2.ebuild, +python-2.4.4-r3.ebuild, +python-2.5.1-r1.ebuild: - Change threads USE flag to nothreads, fix non-linux linker issue and fix - man-page symlink. - - 08 May 2007; Roy Marples <uberlord@gentoo.org> python-2.5.1.ebuild: - Added ~sparc-fbsd keyword, #177426. - Added ~x86-fbsd keyword, #177426. - export LDFLAGS="-L." so we link modules correctly on FreeBSD and possibly - other systems where python2.5 isn't installed yet. - - 08 May 2007; Raúl Porcel <armin76@gentoo.org> python-2.3.6-r1.ebuild, - python-2.4.4-r2.ebuild, python-2.5.1.ebuild: - Add ~ia64 wrt 177426 - - 08 May 2007; Roy Marples <uberlord@gentoo.org> python-2.4.4-r2.ebuild: - Added ~x86-fbsd keyword, #177426. - - 08 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.3.6-r1.ebuild, - python-2.4.4-r2.ebuild, python-2.5.1.ebuild: - Change nptl USE flag to threads. - - 08 May 2007; Jeroen Roovers <jer@gentoo.org> python-2.5.1.ebuild: - Marked ~hppa (bug #177426). - - 07 May 2007; Jeroen Roovers <jer@gentoo.org> python-2.4.4-r2.ebuild: - Marked ~hppa (bug #177426). - - 07 May 2007; Jeroen Roovers <jer@gentoo.org> python-2.3.6-r1.ebuild: - Marked ~hppa (bug #177426). - -*python-2.4.4-r2 (07 May 2007) - - 07 May 2007; Bryan Østergaard <kloeri@gentoo.org> - -python-2.4.4-r1.ebuild, +python-2.4.4-r2.ebuild: - Fix broken 2.4.4 patch causing wrong linking. - - 07 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> python-2.4.4.ebuild: - Stable on sparc - - 07 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.3.6-r1.ebuild, - python-2.4.4.ebuild, python-2.4.4-r1.ebuild: - Fix 2.3.6-r1 patch (bug 177464) and disable sax test in 2.4.4. - - 07 May 2007; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild, - python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.3.6-r1.ebuild, - python-2.4.3-r1.ebuild, python-2.4.3-r4.ebuild, python-2.4.4.ebuild, - python-2.4.4-r1.ebuild, python-2.5-r1.ebuild, python-2.5-r2.ebuild: - Stable on Alpha, IA64 and x86 + fix digest issue reported in bug 177440. - -*python-2.5.1 (06 May 2007) -*python-2.4.4-r1 (06 May 2007) -*python-2.3.6-r1 (06 May 2007) - - 06 May 2007; Bryan Østergaard <kloeri@gentoo.org> - +python-2.3.6-r1.ebuild, +python-2.4.4-r1.ebuild, +python-2.5.1.ebuild: - Build problems fixed: - bug 120099 dev-lang/python-2.4.2 builds against sys-libs/gdbm with USE="-gdbm" - bug 135239 crosscompiling python. python-2.4.1-bindir-libdir.patch - bug 138647 dev-lang/python-x.x.x distutils installer does not link libraries - bug 150595 dev-lang/python-2.5 fails to compile with LC_ALL=de_DE@euro - bug 150732 python-2.4.3-r4 does not honor ROOT - bug 159967 python doesn't add pthread to LIBS correctly on BSD - - Other problems fixed: - bug 148362 File collision between python-2.4* and python-2.5* - bug 151695 dev-python/python-docs env.d entry incorrect - bug 158383 emerging python-2.4.3-r4 segfaults with -ipv6 - bug 165268 dev-lang/python-2.4.4 fails to build the dbm module - - Test failures fixed: - bug 82469: QA issue: python-2.3.5-maketest failes with propolice - bug 124188 dev-lang/python-2.4.2 fails test_cookielib - bug 154247 dev-lang/python-2.4.4 tests failed: test_sax failed -- 1 of 42 tests failed: test_xmlgen_attr_escape - - Feature requests: - bug 131325 python 2.4.4/2.3.6 enable pthreads inconditionaly - bug 135617 dev-lang/python should install Tools/freeze - bug 176066 dev-lang/python-2.5.1 bump - - Fixed in current upstream version: - bug 90660 python-2.3.5: No module named fcntl - bug 144798 dev-lang/python-2.4.3 with TZ=Australia/Melbourne fails test - bug 151246 signed integer overflow bug in dev-lang/python-2.4.3 - bug 159553 dev-lang/python-2.4.3-r4 fails test_openpty - bug 162057 dev-lang/python fails tests in test_expanduser - -*python-2.5-r2 (31 Mar 2007) - - 31 Mar 2007; Marien Zwart <marienz@gentoo.org> +python-2.5-r2.ebuild: - Revision bump python 2.5 with distutils and execstack fixes (rebuilding - installed extensions is recommended if upgrading from an older python 2.5 - ebuild). Remove unnecessary pysqlite block. Fix python 2.3 digest problem. - - 06 Feb 2007; Marius Mauch <genone@gentoo.org> python-2.3.5-r2.ebuild, - python-2.3.5-r3.ebuild, python-2.3.6.ebuild, python-2.4.3-r1.ebuild, - python-2.4.3-r4.ebuild, python-2.4.4.ebuild, python-2.5-r1.ebuild: - Replacing einfo with elog - - 11 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> python-2.3.6.ebuild: - Fix lib64 patch, bug 154711. - -*python-2.3.6 (09 Nov 2006) - - 09 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> +python-2.3.6.ebuild: - Bump version, bug 153944. - -*python-2.4.4 (04 Nov 2006) - - 04 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> +python-2.4.4.ebuild: - Version bump. - - 18 Oct 2006; Roy Marples <uberlord@gentoo.org> python-2.4.3-r4.ebuild, - python-2.5-r1.ebuild: - Added ~sparc-fbsd keyword. - - 27 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r3.ebuild, - python-2.4.3-r4.ebuild: - Stable on ia64. - - 27 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r3.ebuild, - python-2.4.3-r4.ebuild: - Stable on Alpha. - - 27 Sep 2006; Joshua Jackson <tsunam@gentoo.org> python-2.3.5-r3.ebuild, - python-2.4.3-r4.ebuild: - Stable x86; bug #149065 - - 27 Sep 2006; Jason Wever <weeve@gentoo.org> python-2.3.5-r3.ebuild, - python-2.4.3-r4.ebuild: - Stable on SPARC wrt security bug #149065. - - 26 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> - python-2.3.5-r3.ebuild, python-2.4.3-r4.ebuild: - Stable on hppa wrt security #149065 - - 26 Sep 2006; Simon Stelling <blubb@gentoo.org> python-2.3.5-r3.ebuild: - stable on amd64; bug 149065 - - 26 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> - python-2.3.5-r3.ebuild, python-2.4.3-r4.ebuild: - ppc stable, bug #149065 - - 26 Sep 2006; Simon Stelling <blubb@gentoo.org> python-2.4.3-r4.ebuild: - stable on amd64; bug 149065 - - 26 Sep 2006; Markus Rothe <corsair@gentoo.org> python-2.3.5-r3.ebuild, - python-2.4.3-r4.ebuild: - Stable on ppc64; bug #149065 - -*python-2.4.3-r4 (26 Sep 2006) -*python-2.3.5-r3 (26 Sep 2006) - - 26 Sep 2006; Marien Zwart <marienz@gentoo.org> +python-2.3.5-r3.ebuild, - +python-2.4.3-r4.ebuild: - Revision bumps for bug #149065. - -*python-2.5-r1 (19 Sep 2006) - - 19 Sep 2006; Alastair Tse <liquidx@gentoo.org> python-2.5.ebuild - +python-2.5-r1.ebuild: - Fixed patches that still contain the zlib mistake from the 2.4 - patchset. Disabled etree tests. - -*python-2.5 (19 Sep 2006) - - 19 Sep 2006; Alastair Tse <liquidx@gentoo.org> -python-2.4.3-r2.ebuild, - +python-2.5.ebuild: - python 2.5 released. - -*python-2.4.3-r3 (28 Aug 2006) - - 28 Aug 2006; Alastair Tse <liquidx@gentoo.org> +python-2.4.3-r3.ebuild: - fix mistake introduced in 2.4.3-r2 where system zlib was used that caused - problems on certain machines (#145242) - -*python-2.4.3-r2 (26 Aug 2006) - - 26 Aug 2006; Alastair Tse <liquidx@gentoo.org> +python-2.4.3-r2.ebuild: - cleanup 2.4.3 ebuild, fix collisions with slotted versions of pydoc and - idle, fix multilib installs so that everything is installed in /usr/lib64 - rather than just the .so (#118805) - - 22 Aug 2006; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r6.ebuild, - python-2.3.5-r2.ebuild, -python-2.4.2.ebuild, -python-2.4.2-r1.ebuild, - -python-2.4.2-r2.ebuild, -python-2.4.3.ebuild, python-2.4.3-r1.ebuild: - renamed patches to have short names and version numbers to indicate when - they were introduced. patches tarballs are now generated from gentoo-svn. - cleaned up older unstable versions of python leaving the latest version for - each major release. fixed some installed file collisions between the two - version. - - 20 Jul 2006; Simon Stelling <blubb@gentoo.org> python-2.4.3-r1.ebuild: - stable on amd64 - - 11 Jul 2006; Alastair Tse <liquidx@gentoo.org> python-2.4.3-r1.ebuild: - python-2.2.3-r6.ebuild, python-2.3.5-r2.ebuild, python-2.4.2.ebuild, - python-2.4.2-r1.ebuild, python-2.4.2-r2.ebuild, python-2.4.3.ebuild, - python-2.4.3-r1.ebuild: - Typo fix in DESCRIPTION (#139463) - - 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> python-2.4.3-r1.ebuild: - Marked stable on mips. - - 08 Jul 2006; Doug Goldstein <cardoe@gentoo.org> python-2.1.3-r1.ebuild, - python-2.2.3-r6.ebuild, python-2.3.5-r2.ebuild, python-2.4.2.ebuild, - python-2.4.2-r1.ebuild, python-2.4.2-r2.ebuild, python-2.4.3.ebuild, - python-2.4.3-r1.ebuild: - split USE='tcltk' to 'tcl' & 'tk' per bug #17808. Nuked X USE flag since it - was only to find tk from tcltk - - 30 Jun 2006; Joel Martin <kanaka@gentoo.org> python-2.4.3-r1.ebuild: - Cross-compile update: bindir-libdir patch is no longer needed and will break - the patching if it's there. Also, unset CC to force the native python build - to use the native compiler. - - 28 Jun 2006; Tobias Scherbaum <dertobi123@gentoo.org> - python-2.4.3-r1.ebuild: - ppc stable, #138268 - - 28 Jun 2006; Gustavo Zacarias <gustavoz@gentoo.org> - python-2.4.3-r1.ebuild: - Stable on sparc wrt #138268 - - 28 Jun 2006; Guy Martin <gmsoft@gentoo.org> python-2.4.3-r1.ebuild: - Stable on hppa. - - 28 Jun 2006; Markus Rothe <corsair@gentoo.org> python-2.4.3-r1.ebuild: - Stable on ppc64; bug #138268 - - 27 Jun 2006; Bryan Østergaard <kloeri@gentoo.org> python-2.4.3-r1.ebuild: - Stable on alpha, ia64 and x86. - -*python-2.4.3-r1 (04 May 2006) -*python-2.4.2-r2 (04 May 2006) - - 04 May 2006; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.4.2-gentoo_obsd-r1.patch, - +files/python-2.4.3-gentoo_obsd-r1.patch, +python-2.4.2-r2.ebuild, - +python-2.4.3-r1.ebuild: - Fix obsd patch (thanks reb) fixing bugs 117261 and 130140. - - 27 Apr 2006; Marien Zwart <marienz@gentoo.org> - files/digest-python-2.1.3-r1, files/digest-python-2.2.3-r6, Manifest: - Fixing SHA256 digest, pass four - - 14 Apr 2006; Bryan Østergaard <kloeri@gentoo.org - +files/python-2.4.2-gentoo_obsd.patch, - +files/python-2.4.3-gentoo_obsd.patch, python-2.4.2-r1.ebuild, - python-2.4.3.ebuild: - Add gentoo/obsd patch, bug 117261. - -*python-2.4.3 (13 Apr 2006) - - 13 Apr 2006; Bryan Østergaard <kloeri@gentoo.org - +files/python-2.4.3-db4.patch, +python-2.4.3.ebuild: - Version bump to 2.4.3. - - 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> python-2.4.2-r1.ebuild: - Add ~x86-fbsd keyword. - - 16 Feb 2006; Marien Zwart <marienz@gentoo.org> - -files/python-2.2.3-db4.patch, - -files/python-2.2.3-disable_modules_and_ssl.patch, - -files/python-2.2.3-fPIC.patch, - -files/python-2.2.3-gentoo_py_dontcompile.patch, - -files/python-2.2.3-xmlrpc.patch, - -files/python-2.3.2-disable_modules_and_ssl.patch, - -files/python-2.3.4-lib64.patch, -files/python-2.3.5-st_flags.patch, - -files/python-2.3-add_portage_search_path.patch, - -files/python-2.3-add_portage_search_path_take_2.patch, - -files/python-2.3-db4.2.patch, - -files/python-2.3-gentoo_py_dontcompile.patch, - -files/python-2.3-mimetypes_apache.patch, -files/python-2.3-pcre.patch, - -files/python-2.3-readline.patch, -files/python-2.4.1-bindir-libdir.patch, - -files/python-2.4.1-crosscompile.patch, -files/python-2.4.1-db4.patch, - -files/python-2.4.1-libdir.patch, -files/python-2.4.1-st_flags.patch, - -files/python-2.4.2-mmap+fd.patch, -files/python-2.4.2-no-threads.patch, - -files/python-2.4.2-readline.patch, - -files/python-2.4-add_portage_search_path.patch, - -files/python-2.4-disable_modules_and_ssl.patch, - -files/python-2.4-gentoo_py_dontcompile.patch, - -files/python-2.4-mimetypes_apache.patch, python-2.2.3-r6.ebuild, - python-2.3.5-r2.ebuild, python-2.4.2.ebuild, python-2.4.2-r1.ebuild: - Move patches from files dir to separate tarballs. - - 16 Feb 2006; Marien Zwart <marienz@gentoo.org> -files/python-config-2.2.1, - -files/python-2.2.1-r5-gentoo.diff, -files/python-config-2.2.2, - -files/python-2.2.2-tk-8.4.x.patch, -files/python-2.3-xmlrpc.patch, - -files/python-2.4-db4.2.patch, -files/python-2.4-lib64.patch, - -files/python-2.4.1-readline.patch, -files/python-2.4-libdir.patch, - -files/python-2.4-readline.patch, -files/python-2.4-xmlrpc.patch, - -python-2.3.4-r1.ebuild, -python-2.3.5.ebuild, -python-2.3.5-r1.ebuild, - -python-2.4-r3.ebuild, -python-2.4.1.ebuild, -python-2.4.1-r1.ebuild: - Remove old versions. - - 08 Feb 2006; Marien Zwart <marienz@gentoo.org> python-2.3.5-r2.ebuild, - python-2.4.2.ebuild, python-2.4.2-r1.ebuild: - Disable confcache (breaks .so loading). - - 02 Feb 2006; Bryan Østergaard <kloeri@gentoo.org - +files/python-2.4.2-mmap+fd.patch: - Add missing python-2.4.2-mmap+fd.patch. - -*python-2.4.2-r1 (02 Feb 2006) - - 02 Feb 2006; Bryan Østergaard <kloeri@gentoo.org - +files/depreorder-topsort.py, +files/python-updater-r1, - +python-2.4.2-r1.ebuild: - No more libstdc++.so linking, fix python-updater ordering (bug #95538) + - mmap (bug #113439) and fd leak (bug #118575) fixes. - - 13 Jan 2006; Mike Frysinger <vapier@gentoo.org> - +files/python-2.4.2-no-threads.patch, python-2.4.2.ebuild: - Fix from upstream for building without threads. - - 24 Nov 2005; Markus Rothe <corsair@gentoo.org> python-2.4.2.ebuild: - Stable on ppc64 - - 17 Nov 2005; Guy Martin <gmsoft@gentoo.org> python-2.4-r3.ebuild, - python-2.4.1.ebuild, python-2.4.1-r1.ebuild, python-2.4.2.ebuild: - Readded critical fix for HPPA. - - 21 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> python-2.4.2.ebuild: - Stable on mips. - - 15 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> python-2.4.2.ebuild: - Stable on sh. - - 15 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> python-2.4.2.ebuild: - Stable on hppa, ppc. - - 14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> python-2.4.2.ebuild: - Stable on sparc - - 14 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.2.ebuild: - Stable on alpha. - - 13 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-2.4.2.ebuild: - Marked Stable on amd64. - - 13 Oct 2005; Aron Griffis <agriffis@gentoo.org> python-2.4.2.ebuild: - Mark 2.4.2 stable on ia64 - - 13 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.2.ebuild: - Marked x86 stable per Mr_Bones_ - memory leak in posix.access() - - 10 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> - python-2.4.1-r1.ebuild: - Stable on sparc - - 10 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-2.4.1-r1.ebuild: - Marked Stable on amd64. - - 10 Oct 2005; Markus Rothe <corsair@gentoo.org> python-2.4.1-r1.ebuild: - Stable on ppc64 - - 09 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> - python-2.4.1-r1.ebuild: - Stable on hppa, ppc. - - 08 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.1-r1.ebuild: - Stable python-2.4 on alpha, ia64 and x86. - - 01 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild, - python-2.4.1-r1.ebuild, python-2.4.2.ebuild: - Disable additional test, fixing bug 82469, 94859, 96366 and 96488. - -*python-2.4.2 (28 Sep 2005) - - 28 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.4.2-readline.patch, +python-2.4.2.ebuild: - Bump version to 2.4.2. - - 14 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> python-2.3.5-r2.ebuild: - 2.3.5-r2 stable on mips for security bug #104009. - - 11 Sep 2005; Simon Stelling <blubb@gentoo.org> python-2.3.5-r2.ebuild: - stable on amd64 wrt bug 104009 - - 10 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - python-2.3.5-r2.ebuild: - Stable on ppc and hppa. - - 10 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> python-2.3.5-r2.ebuild: - Stable on sh. - - 09 Sep 2005; Josh Grebe <squash@gentoo.org> python-2.3.5-r2.ebuild: - Sparc stable bump for bug #104009 - - 09 Sep 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5-r2.ebuild: - Stable on ppc64 - - 08 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r2.ebuild: - Stable on x86, alpha and ia64 - bug 104009. - -*python-2.3.5-r2 (08 Sep 2005) - - 08 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.3-pcre.patch, +python-2.3.5-r2.ebuild: - Version bump to fix pcre security vulnerability, bug 104009. - - 16 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.4-r1.ebuild, - python-2.3.5.ebuild: - Add fix for bug 88777 to arch versions. - - 15 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5-r1.ebuild, - python-2.4.1-r1.ebuild: - Fix bug 88777 in ~arch versions. - - 11 Aug 2005; Mike Frysinger <vapier@gentoo.org> - +files/python-2.4.1-bindir-libdir.patch, - +files/python-2.4.1-crosscompile.patch, python-2.4.1-r1.ebuild: - Add support for cross-compiling. Grabbed patches from uClibc/OpenEmbedded. - - 19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.4.1-st_flags.patch, python-2.4.1-r1.ebuild: - Update st_flags patch, bug 94637. - - 03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild: - Stable on alpha. - - 27 Jun 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5.ebuild: - Stable on ppc64 - - 18 Jun 2005; Markus Rothe <corsair@gentoo.org> python-2.4.1-r1.ebuild: - added ~ppc64 - -*python-2.4.1-r1 (16 Jun 2005) -*python-2.3.5-r1 (16 Jun 2005) - - 16 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> - +files/python-2.3.5-st_flags.patch, +python-2.3.5-r1.ebuild, - +python-2.4.1-r1.ebuild: - Add st_flags patch, requested in bug 94637. - - 09 Jun 2005; Herbie Hopkins <herbs@gentoo.org> - files/python-2.4.1-libdir.patch, python-2.4.1.ebuild: - Fix libdir patch to work with amd64s no-symlink profile, removed - append-flags -fPIC as this seems to no longer be necessary. - - 29 May 2005; <solar@gentoo.org> python-2.3.4-r1.ebuild, python-2.3.5.ebuild, - python-2.4-r3.ebuild, python-2.4.1.ebuild: - echangelog - update package to use libc expanded variable elibc_uclibc vs - uclibc so USE=-* works - - 29 May 2005; Alastair Tse <liquidx@gentoo.org> - files/python-2.4.1-libdir.patch: - remove zlib from libpython dependency (#90545) - - 28 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild, - python-2.2.3-r6.ebuild, python-2.3.4-r1.ebuild, python-2.3.5.ebuild, - python-2.4-r3.ebuild, python-2.4.1.ebuild: - Add missing inherit versionator. - - 21 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.1.3-r1.ebuild: - Fix PROVIDE according to bug 93028. - - 18 May 2005; Markus Rothe <corsair@gentoo.org> python-2.3.5.ebuild: - Added ~ppc64 to KEYWORDS - - 11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> python-2.3.5.ebuild: - Stable on amd64. - - 07 May 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild, - python-2.4.1.ebuild: - Fix FEATURES=test using slightly modified patch by Rob Cakebread, bug 67970. - - 01 May 2005; Stephen Bennett <spb@gentoo.org> python-2.3.4-r1.ebuild, - python-2.3.5.ebuild, python-2.4.1.ebuild: - Added compile fix for when $LIBC is set. - - 30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> python-2.3.5.ebuild: - Stable on ppc. - - 28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.5.ebuild: - Stable on sparc - -*python-2.4.1 (27 Apr 2005) - - 27 Apr 2005; Alastair Tse <liquidx@gentoo.org> - +files/python-2.4.1-db4.patch, +files/python-2.4.1-libdir.patch, - +files/python-2.4.1-readline.patch, files/python-2.4-readline.patch, - -python-2.3.3-r2.ebuild, python-2.3.5.ebuild, -python-2.4-r1.ebuild, - -python-2.4-r2.ebuild, +python-2.4.1.ebuild: - version bump for 2.4.1, clean up readling, db4 and libdir patch for 2.4.1. - - 20 Apr 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild, - python-2.4-r3.ebuild: - reverting changes to deps and adding note about why they are arranged in - that way (to remind myself never to touch them again :) - - 20 Apr 2005; Alastair Tse <liquidx@gentoo.org> - +files/python-2.3-readline.patch, +files/python-2.4-readline.patch, - python-2.3.5.ebuild, python-2.4-r3.ebuild: - fixing readline support to not require termcap (#79013). fixed DEPEND - and RDEPEND order (python-fchksum isn't a DEPEND only) - - 08 Apr 2005; Markus Rothe <corsair@gentoo.org> python-2.3.4-r1.ebuild: - Stable on ppc64 - -*python-2.4-r3 (19 Mar 2005) - - 19 Mar 2005; Rob Cakebread <pythonhead@gentoo.org> - files/python-2.4-libdir.patch, +python-2.4-r3.ebuild: - Removed multiple dirs in sys path. bug# 83109 - - 15 Mar 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild: - more multilib fixes (#76791) - - 01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.5.ebuild, - python-2.4-r1.ebuild: - Fix conditional c++ support for remaining versions. - - 27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r2.ebuild, - python-2.3.4-r1.ebuild, python-2.4-r2.ebuild: - Disable c++ conditionally. - -*python-2.3.5 (17 Feb 2005) - - 17 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> +python-2.3.5.ebuild: - Version bump. - - 09 Feb 2005; Luca Barbato <lu_zero@gentoo.org> python-2.3.4-r1.ebuild: - Marked ppc - -*python-2.4-r2 (07 Feb 2005) - - 07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - +files/python-2.4-libdir.patch, files/python-updater, +python-2.4-r2.ebuild: - Multilib releated cleanup. - -*python-2.2.3-r6 (06 Feb 2005) - - 06 Feb 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/python-2.2.3-xmlrpc.patch, +files/python-2.3-xmlrpc.patch, - +files/python-2.4-xmlrpc.patch, -python-2.2.3-r5.ebuild, - +python-2.2.3-r6.ebuild, -python-2.3.3-r1.ebuild, +python-2.3.3-r2.ebuild, - -python-2.3.3.ebuild, +python-2.3.4-r1.ebuild, -python-2.3.4.ebuild, - +python-2.4-r1.ebuild, -python-2.4.ebuild: - Patches and version bumps for security bug# 80592 Python bug# PSF-2005-001 xmlrpc - vulnerability. Removed obsolete versions. - - 06 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> python-2.4.ebuild: - Fix broken Manifest. - - 05 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> python-2.4.ebuild: - Only apply lib64 patch on CONF_LIBDIR == lib64 - - 04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/python-2.4-lib64.patch, python-2.4.ebuild: - Added lib64 patch - -*python-2.4 (04 Jan 2005) - - 04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/python-2.4-add_portage_search_path.patch, - +files/python-2.4-db4.2.patch, - +files/python-2.4-disable_modules_and_ssl.patch, - +files/python-2.4-gentoo_py_dontcompile.patch, - +files/python-2.4-mimetypes_apache.patch, files/python-updater, - +python-2.4.ebuild: - Version bump. bug# 68775 - - 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 06 Nov 2004; Joshua Kinard <kumba@gentoo.org> python-2.3.4.ebuild: - Marked stable on mips. - - 29 Oct 2004; Alastair Tse <liquidx@gentoo.org> files/python-updater: - improvements with tmp log creation with python-updater (#68843) - - 19 Oct 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.4.ebuild: - Stable on hppa. - - 19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> python-2.3.4.ebuild: - Stable on amd64. - - 19 Oct 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.4.ebuild: - fix problem with tk-inter and USE flags handing (grumble) - - 18 Oct 2004; Mike Frysinger <vapier@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.4.ebuild: - Forward part from 2.3.3-r1 the removal of directories in /usr/lib/python - based upon USE flags. - - 17 Oct 2004; Jason Wever <weeve@gentoo.org> python-2.3.4.ebuild: - Stable on sparc. - - 24 Sep 2004; Alastair Tse <liquidx@gentoo.org> -python-2.2.2.ebuild, - python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild, - -python-2.3.4_rc1.ebuild: - adding workaround for -fstack-protector-all (#50309) - - 06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.3.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: - Switch to use epause and ebeep, bug #62950 - - 31 Aug 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.4.ebuild: - Removed useless -fPIC for hppa. - - 18 Aug 2004; Aron Griffis <agriffis@gentoo.org> python-2.3.4.ebuild: - stable on alpha - - 14 Aug 2004; Travis Tilley <lv@gentoo.org> +files/python-2.3.4-lib64.patch, - python-2.3.3-r1.ebuild, python-2.3.4.ebuild: - added logic for installing to /usr/lib64, triggered by the CONF_LIBDIR - variable. proper CONF_LIBDIR support will require portage 2.0.51_pre18, soon - to be released. - - 20 Jul 2004; Lars Weiler <pylon@gentoo.org> python-2.1.3-r1.ebuild: - Made python-2.1 stable on ppc as there are still some ebuilds which require - this version. - - 03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> python-2.3.3-r1.ebuild: - Stable on alpha. - - 03 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> python-2.3.4.ebuild: - x86-obsd minor fix - - 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> - python-2.1.3-r1.ebuild, python-2.2.2.ebuild, python-2.2.3-r5.ebuild, - python-2.3.3-r1.ebuild, python-2.3.3.ebuild, python-2.3.4.ebuild, - python-2.3.4_rc1.ebuild: - virtual/glibc -> virtual/libc - - 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.2.ebuild, - python-2.2.3-r5.ebuild, python-2.3.3-r1.ebuild, python-2.3.3.ebuild, - python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: - QA - fix use invocation and a bug in the 2.3.4 ebuilds: - [ -z "use X" -o -z "use tcltk" ] doesn't do what you meant it to do - - 20 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.3-r1.ebuild: - Sparc happy stable - - 15 Jun 2004; <solar@gentoo.org> python-2.3.3-r1.ebuild: - USE= cleanups and added uclibc - - 12 Jun 2004; Tom Gall <tgall@gentoo.org> python-2.3.3-r1.ebuild: - stable on ppc64, bug #53575 - - 06 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.3-r1.ebuild, python-2.3.4.ebuild, python-2.3.4_rc1.ebuild: - Fix use invocation - -*python-2.3.4 (04 Jun 2004) - - 04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +python-2.3.4.ebuild: - Bump version. - - 02 Jun 2004; Travis Tilley <lv@gentoo.org> python-2.3.3-r1.ebuild: - stable on amd64 - - 30 May 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3-r1.ebuild: - Marked stable on hppa. - - 22 May 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.3.ebuild, python-2.3.4_rc1.ebuild: - Fix os.utime() on hppa. utimes it not supported but unfortunately reported as - working. - -*python-2.3.4_rc1 (15 May 2004) - - 15 May 2004; Joshua Kinard <kumba@gentoo.org> python-2.3.3-r1.ebuild, - python-2.3.4_rc1.ebuild: - Marking 2.3.3 stable on mips (someone yanked the ~mips keyword at some - point...), and 2.3.4 unstable. - - 27 Apr 2004; Michael McCabe <randy@gentoo.org> python-2.3.3-r1.ebuild: - Marked stable on s390 - -*python-2.3.3-r1 (12 Apr 2004) - - 12 Apr 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3-r1.ebuild, - files/python-2.3-add_portage_search_path_take_2.patch: - add workaround for python-2.2 to python-2.3 upgrade possibly breaking older - portage versions. make /usr/lib/portage/pym appear before - /usr/lib/python*/site-packages in sys.path (not really critical, but better be - safe than sorry). also removed c++ support to reduce gcc/glibc upgrade pain - - 11 Mar 2004; Alastair Tse <liquidx@gentoo.org> python-2.2.1-r5.ebuild: - removing 2.2.1 from tree for security reasons (#44230) - - 09 Mar 2004; <agriffis@gentoo.org> python-2.3.3.ebuild: - stable on alpha and ia64 - - 05 Mar 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - added X useflag for greater tcltk seperation. now needs both X and tcltk USE - flags to enable tkinter support - - 03 Mar 2004; David Holm <dholm@gentoo.org> python-2.1.3-r1.ebuild: - Added to ~ppc. - - 27 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - completely removed pkg_setup(), added note at the top of the ebuild where you - can't miss it. - - 27 Feb 2004; Jason Stubbs <jstubbs@gentoo.org> python-2.3.3.ebuild: - Removing portage version check again as it's preventing new installations. - Bug #43036 - - 25 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> python-2.3.3.ebuild: - Reinstating portage version check as people keep upgrading python without - upgrading portage. - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-2.1.3-r1.ebuild: - Fix duplicate KEYWORDS settings and mark stable on alpha and ia64 for the sake - of dev-python/PyXML-py21 - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-2.1.3-r1.ebuild: - add ~alpha for the sake of dev-python/Imaging-py21 - - 10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> python-2.3.3.ebuild: - set ppc in keywords - - 10 Feb 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild, - files/python-2.3-db4.2.patch: - add fix to make python-2.3.3 db-4.2 (gentoo flavour) aware - - 06 Feb 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild: - Stable on sparc - - 03 Feb 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3.ebuild : - Marked stable on hppa. - - 02 Feb 2004; Alastair Tse <liquidx@gentoo.org> files/depreorder.py: - update python-updater thanks to a well spotted mistake by Chris Bainbridge - <chrb@dcs.ed.ac.uk> (#40198) - - 27 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - disabling pkg_setup again after testing with stage2 - - 26 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - re-instating pkg_setup() warning/abort message. added apache mime.types to - mime type search list. modified to use tar.bz2 (saves 1MB of downloads) - - 24 Jan 2004; Guy Martin <gmsoft@gentoo.org> python-2.3.3.ebuild: - Added ~hppa to KEYWORDS. - - 24 Jan 2004; <gustavoz@gentoo.org> python-2.3.3.ebuild: - keyworded ~sparc - - 24 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - add missing doc IUSE (#39232) - - 22 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild, - files/depreorder.py: - updated python-updater for portage-2.0.50, installed python-updater in - /usr/sbin for convienence - - 19 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild, - python-2.3.3.ebuild: - disable portage check because stable portage already is compatible with - python-2.3 - - 18 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.3.ebuild: - make ROOT var more robust during postinst() - - 12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> python-2.2.3-r5.ebuild: - Marked ppc - - 06 Jan 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild: - Stable on ia64 to enable fix for bug 36954; portage-2.0.49-r20 depends on - this revision. - - 03 Jan 2004; Jason Wever <weeve@gentoo.org> python-2.2.3-r5.ebuild: - Marked stable on sparc as portage-2.0.49-r20 really depends on this version of - python rather than what the portage ebuild says. Fixes bug #36954 on sparc. - -*python-2.3.3 (03 Jan 2004) - - 03 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild, - python-2.3.3.ebuild, files/python-2.3.2-disable_modules_and_ssl.patch: - version bump to 2.3.3, re-add python disable_modules_and_ssl patch and changed - ebuild to build 'socket' module under USE=build - - 28 Dec 2003; Joshua Kinard <kumba@gentoo.org> python-2.2.3-r5.ebuild: - Move to mips stable (~mips -> mips) - - 24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> python-2.3.2-r2.ebuild, - files/python-2.3.2-disable_modules_and_ssl.patch: - Removed python-2.3.2-disable_modules_and_ssl.patch as - it broke python and caused 'ImportError: No module named _socket'. - More info: http://article.gmane.org/gmane.linux.gentoo.devel/14621 - - 14 Dec 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.3-r5.ebuild: - Marked stable on hppa. - - 13 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild: - clarified warning to prevent more bug reports - - 13 Dec 2003; Luca Barbato <lu_zero@gentoo.org> python-2.3.2-r2.ebuild: - Marked ~ppc - - 08 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.2-r2.ebuild: - fix python .pyc .pyo cleaning code - - 03 Dec 2003; Aron Griffis <agriffis@gentoo.org> python-2.2.3-r5.ebuild: - Stable on alpha - - 27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild: - Make -fPIC compilation available for all platforms and not just amd64. - - 25 Nov 2003; Brad House <brad_mssw@gentoo.org> python-2.2.3-r5.ebuild: - mark stable on amd64 - - 23 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild: - add pkg_setup() to 2.3 as a temporary measure to stop people messing up their - own system. Also added a ucs2 local useflag just in case someone complains - loudly and knows what they're doing - -*python-2.3.2-r2 (22 Nov 2003) - - 22 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r2.ebuild, - files/python-updater: - ucs4 is now default. if you previously had python-2.3 merged, you'll need to - update your packages again. (sorry, that is the price for running p.mask'ed - versions). to update your python packages if you had python-2.3 installed, - run : - - /usr/portage/dev-lang/python/files/python-updater -o 2.3 - - if you are upgrading from python-2.2, then you will need to run: - - /usr/portage/dev-lang/python/files/python-updater - - python-updater script also modified to have more robust command-line - parsing. hopefully this will be the last revision till we can go ~x86. - - 13 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild: - fix python-config install for python-2.3 - - 12 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild, - python-2.2.3-r2.ebuild, python-2.2.3-r3.ebuild, python-2.2.3-r4.ebuild, - python-2.3.2-r1.ebuild, python-2.3.2.ebuild, files/python-updater: - cleanup and add warning on python-updated or PORTDIR is not set - - 12 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> python-2.2.3-r5.ebuild : - Add a patch that adds CFLAGSFORSHARED variable to some extra modules defined in the Makefile. - This variable could hold -fPIC so that the compiled libraries will work on amd64 (and maybe others) - without using append-flags -fPIC. - - 03 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.2-r1.ebuild: - added ncurses and ssl to IUSE - - 03 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild: - export environment in src_install() - - 01 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - python-2.3.2-r1.ebuild, files/python-2.2.3-disable_modules_and_ssl.patch, - files/python-2.3.2-disable_modules_and_ssl.patch: - reordered deps to allow minimal python build for USE='build'. makes python - respect useflags explicitly even if the dependency exists. added support to - disable SSL. tweaked python_mod_optimize. - -*python-2.2.3-r5 (27 Oct 2003) - - 27 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r5.ebuild, - files/python-2.2.3-db4.patch: - rev bump. fixes to idle.py and bsddb with db-4.1 for 2.2.3 - - 26 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> python-2.2.3-r4.ebuild: - Fixed symlink to idle.py - -*python-2.2.3-r4 (22 Oct 2003) - - 22 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r4.ebuild, - files/python-2.2.3-gentoo_py_dontcompile.patch: - Fixed PYTHON_DONTCOMPILE patch for 2.2.3 thanks to TGL - <degrenier@easyconnect.fr> (#31730) - -*python-2.2.3-r3 (17 Oct 2003) - - 17 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r3.ebuild, - files/python-2.2.3-db4.patch, - files/python-2.2.3-gentoo_py_dontcompile.patch, files/python-updater: - Add support for db-4.1, fixes for ewarn hanging for python-updater - - 14 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r3.ebuild: - new 2.2.3 version that adds PYTHON_DONTCOMPILE support - - 10 Oct 2003; Alastair Tse <liquidx@gentoo.org> files/python-updater: - fix typo in python-updater - - 09 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild, - files/depreorder.py, files/python-2.2.3-gentoo_py_dontcompile.patch, - files/python-updater: - improved byte-compiling, fixed out-of-order python-updater and added - sys-apps/portage to exclusions - - 09 Oct 2003; <tuxus@gentoo.org> python-2.2.3-r1.ebuild: - stable on mips - -*python-2.3.2-r1 (08 Oct 2003) - - 08 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.3.2-r1.ebuild, - files/python-2.3-gentoo_py_dontcompile.patch: - add patch to stop automatic generation of .pyc and .pyo by setting - PYTHON_DONTCOMPILE in your environment. also moved to use the new python - eclass to automatically optimize and cleanup compiled modules. - -*python-2.3.2 (07 Oct 2003) - - 07 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r2.ebuild, - python-2.3.2.ebuild, files/python-2.2.3-db4.patch, - files/python-2.3-add_portage_search_path.patch, files/python-config-2.3, - files/python-updater: - it has been a long time coming, but finally there's a 2.3.x release in portage - along with a python-2.2.3 update that should fix some niggling issues and also - uses the new alternative class. 2.3.2 is still masked and should stay that way - until we can confirm the rebuilding script works. - - 03 Oct 2003; Alexander Gabert <pappy@gentoo.org> python-2.2.3-r1.ebuild: - filter-flags because of segfaulting with fstackprotector in CFLAGS - - 23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> python-2.2.3-r1.ebuild: - set ppc in keywords - - 17 Sep 2003; Jon Portnoy <avenj@gentoo.org> python-2.2.3-r1.ebuild : - ia64 keywords. - - 16 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r1.ebuild, - python-2.2.3.ebuild: - marked 2.2.3 stable for x86 - - 13 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.3-r1.ebuild: - add doc useflag to install python documentation. (#24318) - -*python-2.2.3-r1 (03 Jul 2003) - - 23 Jul 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.3-r1.ebuild : - Marked stable on hppa. - - 03 Jul 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml, - python-2.2.3-r1.ebuild: - added db4 support and enabled threads (pthread) support - -*python-2.2.3 (02 Jun 2003) - - 06 Jul 2003; Joshua Kinard <kumba@gentoo.org> python-2.2.3.ebuild: - Changed ~mips to mips in KEYWORDS - - 01 Jul 2003; Todd Sunderlin <todd@gentoo.org> python-2.2.3.ebuild: - set stable on sparc - - 02 Jun 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild, - python-2.2.3.ebuild, files/python-config-2.2: - version bump to new bugfix release. fixed python-config location for unstable - versions - -*python-2.2.2-r1 (08 May 2003) - - 08 May 2003; Alastair Tse <liquidx@gentoo.org> python-2.2.2-r1.ebuild, - files/python-2.2.2-tk-8.4.x.patch: - backported patch to fix tk-8.4.x problems (#20318) - - 23 Feb 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.2.ebuild : - Added -fPIC to CFLAGS on hppa. It's needed by apps linking to some python libs. - - 21 Feb 2003; Zach Welch <zwelch@gentoo.org> python-2.2.2.ebuild : - Added arm to keywords. - - 07 Feb 2003; Guy Martin <gmsoft@gentoo.org> python-2.2.2.ebuild : - Added hppa to keywords. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 29 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : - - Added missing python-config for 2.2.2. - -*python-2.2.2 (20 Oct 2002) - - 07 Jan 2003; Jan Seidel <tuxus@gentoo.org> python-2.2.2.ebuild : - Added mips to keywords - - 20 Oct 2002; Jon Nelson <jnelson@gentoo.org> : - 2.2.2 is released - -*python-2.2.1-r5 (03 Oct 2002) - - 15 Oct 2002; Martin Schlemmer <azarah@gentoo.org> : - Fix the sed on /usr/lib/python<ver>/config/Makefile to change - OPT to 'OPT = -DNDEBUG', and not 'OPT = -NDEBUG' which caused - gcc warnings. - - 03 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> : - Security update. - -*python-2.2.1-r4 (7 Sep 2002) - 7 Sep 2002; Nicholas Jones <carpaski@gentoo.org> python-2.2.1-r4.ebuild - Fix for bug #7641 -- Fixes the OPT flags in Makefile so that gcc - isn't confused by conflicting build types of i386 and user set. - -*python-2.2.1-r3 (2 Sep 2002) - 2 Sep 2002; Jon Nelson <jnelson@gentoo.org> python-2.2.1-r3.ebuild - Filter -malign-double from flags - -*python-2.1.3-r1 (2 Jul 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3-r1.ebuild - Added missing KEYWORDS - - 2 Jul 2002; Jon Nelson <jnelson@gentoo.org> python-2.1.3-r1.ebuild: - Fix Makefile.pre.in install (the one we want is located in Misc) - -*python-2.1.3 (1 Jul 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3.ebuild - Added missing KEYWORDS - - 1 Jul 2002; Jon Nelson <jnelson@gentoo.org>: python-2.1.3.ebuild - This is a python 2.1.3 ebuild that does *not* conflict with - python 2.2.* - Note that 99.9% of the people out there won't use it anyway, - because 2.2 will always be selected as most recent. ;-) - -*python-2.2.1-r2 (1 Jul 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r2.ebuild - Added missing KEYWORDS - - 30 Jun 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r2.ebuild - Add "-lm" to the python-config script. Closes bug #4217. - 2.2.1-r2 has a 100% identical ebuild file to 2.2.1-r1, just the - python-config file has changed. - -*python-2.2.1-r1 (29 May 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r1.ebuild - Added missing KEYWORDS - - 29 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r1.ebuild - Add expat to build depends (except during bootstrap), use econf - and emake, and don't mess with Modules/Setup.local because modules - are build as shared on Linux as default. - -*python-2.2.1 (2 May 2002) - - 20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1.ebuild - Added missing KEYWORDS - - 2 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1.ebuild - Update to 2.2.1, and completely re-vamp build procedure - This should solve several build issues. - -*python-2.2-r7 (29 Apr 2002) - - 29 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: New rev to fix bug #2199; - python-config should now work properly. - -*python-2.2-r6 (24 Apr 2002) - - 24 Apr 2002; Jon Nelson <jnelson@gentoo.org> python-2.2-r6.ebuild : Make - python build with shared modules. Depends on python-fchksum, as fchksum *no - longer built in* - -*python-2.2-r5 (8 Apr 2002) - - 8 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> python-2.2-r5.ebuild : - - Added include flag for compilation of tcltk with python to compile - correctly. - - -------- - - 06 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : the 2.2-r4 ebuild now - disables C++ support if we are creating a new build image (since we have no - C++ in that case). - - 30 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : changed PROVIDE from - virtual/python-2.2 to virtual/python. No rev bump. - -*python-2.2-r4 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest deleted file mode 100644 index 8042abd..0000000 --- a/dev-lang/python/Manifest +++ /dev/null @@ -1,50 +0,0 @@ -AUX CVE-2013-4238_py27.patch 11591 SHA256 050cc2d4b9d588f2587010a30819591e02130fde90594782993a39c945c1559b SHA512 f9b1d0573bc7175b8fe6bdd8b6777a376cd717a594a14a6ddb334e0107596b0fbfbfe8a0c1743a0da54ce8ac8905cb7385aa2ae26698272f679763542c13e7e2 WHIRLPOOL bbf89edb2e3620aae3f54e80feba98d75fa566594b2e71e88b75c22036201a2692a77daf56080f4413612edf159f4282f5494a0a5dd11b350bcde248ef51f139 -AUX CVE-2013-4238_py33.patch 11437 SHA256 e4f78490fc247df9d1133dc9f2deec47b1c582c4af1c8e93bd503d889c9eb716 SHA512 d1f1b64c46056f178b89abfe61c7c653afc0ed67cf9a8ef8c981d1cf6a1c389cb20bd354cac3a30c1241e6fe24a49e165527571276c1f8afb55989f5f069ba00 WHIRLPOOL e5889b6be0a2db7ec45ff8cbe9fa8481c6c69b25091b62635d2ff595ef5d0b1136485f7adb04f4c0c97402edfd9d915d4fd05e2b6bf1942497d81de1b1cefdce -AUX pydoc.conf 279 SHA256 6437e85d16d34efaf2665b3cabb0707392e6dee3df04989d3fcac63fd22997e8 SHA512 2d552b6262fa4c7cd75f45d93b8a2657eb9154decbc08f9b73d2e67e1d84367b498f8556fbba20f7b57414281cfd673fff607da3c688c1d6bb9842e92cf0c32a WHIRLPOOL 1ba44797765939d7c0bcbecb08cb6201eeff9b134d4d3caef9339729dcad9f258e20b16db5f369f49b378df3c91e530115dbce5ce3595d71cd325a48793ac814 -AUX pydoc.init 711 SHA256 bf42ce358c4505bb9c9923758cf7c237113b5465778fe8d0d9781625586003fd SHA512 328597e0f7594dcc1d929dcf15feb39e08a0f85067b226140219c03c2f0a0a5fa9518f26d52723aeb77e36eb5e46d54b5ee4ddbcfc52aa81540a738c49c03b73 WHIRLPOOL 846c7d90fc4b7b74d65c6019ea8e7c9f0d2efb0b6cad5b91d53b5b7bda509f3b625fb30eb27ea59cacf6233378d800c35375108762ba82fb4c2155f2dbf08f13 -AUX python-2.5-tcl86.patch 615 SHA256 cc649fbd471c7e348fc64f3844d9f4e1aab604cb3a028c9fb2cc58ba816b7bda SHA512 dca5eaff3ba981d699805c310dba0a7412ab2b856256ef25e41eb49e1441c382f868406ddce04a1e9768ccfacab1fb39e5e7a320f4ca6884a51583ca61a77dc8 WHIRLPOOL 515f1a5a163d4b34adff2b8e10e43c83f9575f185391440cf89155076b0399d3c5249e5a8741894d94092af4c5271c125b032bbc76c9e4e6f6d94f26133e5672 -AUX python-2.7-issue16248.patch 735 SHA256 ed137a0ab513e6d9c910e37f637aef2d58fb730070e447572f39d46d9cc99568 SHA512 da00f8571741d4cfb529b9db875b5d831d5d8e43fdc464bc43adee046f208165ab6b13d671bc90be988b1099afeac4fc0e7ba7fa473ff74a9ec7731da89e11a9 WHIRLPOOL ad770b848666efb5cc3b8c07a530f2a9aaca683f4b447c2d835e39be59a5dde35a28ab8cdb278ecf456e15e57b7401ff83fb04ac71bd8d80abc19d45beb84d62 -AUX python-2.7-issue18851.patch 11805 SHA256 4ecff8db20cdc4d9b0692a126859c318a9ba20bf1eff6e633c964871b2410d66 SHA512 b1eeec1451d011f37c65676819bf8391b9657d93a0b9f03d0db09956ef052fa3f2d922d1d5fc3c69567f549aa86f65a06670dcf3ead8300c0ac97651f9a503cd WHIRLPOOL b4b51d590175959df1f8373ff86343618b4474ea9afc2ef9360c680c986f30fa8f432eeb076de676cb87052cc6453a2b613dfaab51ab1ec5945a7c7c496a4f9f -AUX python-2.7.5-library-path.patch 991 SHA256 ff7a4a1846ebcadc2dbf979ea619072caac22e47909fe188fc4b6becce6ea2eb SHA512 74916d541eb38c526dc1243fe5e5a9de3a7875f02c53e5f49e60182ba042de2f15514364e7fbd821146dcf92db2bba88d8a9f46d4c71237b73fd39cbabf93d85 WHIRLPOOL 62bb1c85941ccaac7ca6f6fb2d93dc27f206cf9f815b90ef1f89748dfdd1d38deda9f6bf7eb2ce9fd8635d1a77576819192e8049ec5de52fdeb9f981dfb32f9f -AUX python-2.7.5-nonfatal-compileall.patch 750 SHA256 3f5a137602f1b3f0522f561c168a740f0080b29c2c888cb3a8dbbcc4407c2d9e SHA512 d2e93e2a6fcd55d516df0ddaca31af97faed677ea6b4be282eb99e7864f8a7399b5ca11139844a4b3c264832183483b0f4c8c9865c05de0e8520e6d2c8f1dbc6 WHIRLPOOL ab576e3a4e67f881d6d5c705503230ace125fe94d907d7f69bb573dd492070b8b34078a2b1205f315eb45244fbae8855c0f15ce35158f1d356f1bd4acf83b3c2 -AUX python-2.7.5-re_unsigned_ptrdiff.patch 941 SHA256 5b0c0465a23d27e1c8f0961a8d88b3af75fbc9933ab60c2a71091720a3681079 SHA512 d46fbbc8411fae78cdfca2564faca42f32bb95ee348b9aa3fd1ca90b346cc52cd468945cee07e6df4dff46c10cee6856a58004f8e453960f6dca2751c077802b WHIRLPOOL 10bb08242dd9a055f6bdaf3eb1546786b58f180667c6355ea7276114cbac0ffba6c34822add7965fe3b5d41cc92ce8ec45e2d1d56377d8a6aa2755ef4267d101 -AUX python-2.7.6-recvfrom_into_buffer_overflow.patch 563 SHA256 bdf280058fe31b6e9d08a32e4ce16e958e3dddeed515417a03b25e5ec62d41b4 SHA512 21b534e41ce1cd1bf954849f4246ef0ae907ba7335b42ccfc914cc33068db91140dc1fea0f1b8a83818609e7f5a5f5df6623f029c2c86004f2126eb3f2699c06 WHIRLPOOL 2ffe173be651aae7d43ad8ee75600133ea96952431140c7c00e0ca6ad431d3faa230207f93f1191bfd3bcdf7b0c9af61948871b06158e6953106d7f2d0c7e9f5 -AUX python-2.7.9-ncurses-pkg-config.patch 305 SHA256 0464ec04985c642b40d53cb8f816abf18702aeae97cb52ec73541694317180c7 SHA512 2c18b5041a7a2f306dd4d0d6695bd851ca14c9107b2e3e856ec094bc53c7cc407b49e1f4813ee9e753b3ad2d4f6edda943a66bb1e6c895ab956a5f84d30646c6 WHIRLPOOL 774e2707a0c6ace106df30c0d4915527fb0ac7584cd0f1e12bbdb29d584c3b38c770d8fe8999d0166e94deab561cbed0c8ad09c27fcd83ed27045dfdede89a5a -AUX python-3.2-CVE-2013-2099.patch 2102 SHA256 76a89951e7efcf14d37e30e0104446429ca121c68cbb1753ec362a177c1b5a54 SHA512 03d2a09fe730bf8c94df1eb10f8bac37a31a28dfb45b7d49abe1c3ffe26ca948f8d00eb58319d34102f8a747a038d447d3507b11c051c778c42ae21ac1066c8e WHIRLPOOL 3cd701c606ef1f4f557d1d250af41a860a6a5c4b6d9ff9a9f469ab6974f13e1205d2c4c791e9bd353fd4ff726f6cbf979f9a3927b83b04af5128c1aea7070496 -AUX python-3.2-CVE-2014-1912.patch 1635 SHA256 044a5857f54f1c6adfc8e3018cbcc5230ca21bc8efaf6b68f95fc47560ed13aa SHA512 afca87c0491087715f54bac777c15be426dbf3cf079859bc8559b4f4bab520e0835976221d16073b14b2fa584c0260a565307bea039f345fa5c7e3e1f9396228 WHIRLPOOL 97c08598f7cbaa28fa83819c9b9423ec218363c18781afc8ab98a3e9847459e59ae35d567b1f775eca7bc1ec53b17c656203ea6e332559607c507ec958eb8291 -AUX python-3.2-CVE-2014-4616.patch 1515 SHA256 8d971bca441c3b17cf7c2a1ee2391059de472d8a10ec4060af23bae65ffddf8c SHA512 fff6cdbde476a5804184fad6615dab3577c2e81bf2dc8f2276ad02d213239e6f47a642e9c8270de352e7123fcd712a1b0073d85146c9bee59d9b6644f5a2cb3f WHIRLPOOL 4894fd9f33a01d4aae477cc558f790ad792f02965ca841b4fb1119711ff4254bd19bac3f67872ae3fc761c677ec078b6c156d71ba036cc91fdbfe32b43044cfc -AUX python-3.2-issue16248.patch 738 SHA256 b5e94ead2622f355d733232dcfdac4dab53889aab12980fa1e4496c296191e77 SHA512 6fcf3d4cf05e41758a6d51ad9cc25ce9fcd1d33854f096b599811a07ef6b7f0cc4f178c4db6b15c5c9ee86eb53fcc736fede0dfb4eae81ca429d0fad62d84db9 WHIRLPOOL dd620bdce394a74910f4deed50b8bcd2b5d6b61af1e2e225a7c36fe4f293560fe1237a2111a4a4a334dfd1272fa4b7faf6289b2a018864c4f154c8a8a8b85c5c -AUX python-3.3-CVE-2013-2099.patch 2102 SHA256 d5ccc8de43a176d9d16c3a7be58d32dcf3c952147d8866f84dffcd8fa66f6396 SHA512 a8e2c8fd3d3c3924acb856e89b6dc6965c887688e4c7d078c27abacfaf6b33b12484d86942b75643f28e4a14a465e2ec6a30fe53acf2ab036ae667fb7f76d737 WHIRLPOOL c02bd815d5143b6a916a91f40bb7971f1be188e836ab6095a5befd6410545acba0d44b4b0a75a5f7e7d84105018c0ef27887eefdcd883c73e68f872bb4138e35 -AUX python-3.3-CVE-2014-4616.patch 1896 SHA256 50262c507dff44a2ec928281251882aa7c192954713f5a29def8eee7cc29d3d0 SHA512 98d7929d7b6dd88de511690776bf6cabfb5a2d21f89cd21573aba39cb03156666ce0404bd9e380c8193a28cf73d386a6b56c71f90ff3b66da48689953dea997b WHIRLPOOL 5debc17107a9d15a36bc73ef8c68f6f9c89ba060191f6d310709852a2cb01d9b4143c40cd0ce0a3df1b02ace8afe865122bd10dab38aafc1d1ec1e1c2c1b7331 -AUX python-3.3.5-ncurses-pkg-config.patch 1175 SHA256 2a64b3b5628f9114c091bfc5221c244f8966d83ce08e81971ec890a59f2d93c3 SHA512 25e37ac17a8fc5907bf9ce55e5c58337895a38cf4d4a6bd333a44f30a0f6ac65510a8594d3e953f477a8d724de9932450e6df56e79d7884bc451b23c9a7ad8e0 WHIRLPOOL b213fa0c9707b1e04036fd3cd85f040b7d459f1046b90c619f85a4c221e946b09ffb2d1a7c5b10f795674f89af886ac7f93ff8fd440c2f7014ee40e77b752e21 -AUX python-3.4.3-ncurses-pkg-config.patch 302 SHA256 43e704d8dc96606d96c5eee82ecb53798d6586f591b4ee54d08137e962705101 SHA512 9e2bc2af0077d6282d9512b172d80ee294c47a6d41855474eed641afa8139ce4667a64c4676f5b2e40a90278b780a46e998d1096422ed0fe1d83b973dc455dc2 WHIRLPOOL 321452dd6f443609fddd4da7f5fb0c8897e99f9f4eea77eafc81ca14a9a4995818ea5e1400e44d9531c2b5d9491326c64d838b262b9e1b4814ec47f564a069ef -AUX python-config-2.4-r1 1624 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f SHA512 f8a0e12bed93385b3dddfa64a416ff4a560ec1b12c6c4a0dd715a2c804a43b6a292f0fe13e28d7828d4c4d620cde9dd7eab6a3423216786917ea6f51856ff53c WHIRLPOOL f2fe759b05ac0eb3b8dd196b0c68b8b8e0145ab79659eb4a45adee1bf7ae7260f457ae6192b9792990babd59cb98cceec05a8d93a50a3203517fe49ec30f5e0e -DIST Python-2.6.9.tgz 13285074 SHA256 7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db SHA512 7ff28f41f7dc12e1504a781060520440bbf74b96c5df269ca5218f5910eae63898b94fdd398f549217912689814bc5275bb3b5ec4cc892f20bb468fc1b041c0c WHIRLPOOL 909f612286314ea004eef328a58d7b0aecffc1a524f6b283333ef0f299413055c1f7ec4e2d21a44d1beeaa8e11aabd68510cf9c5840cb5394176cbc8f2e5c147 -DIST Python-2.7.9.tar.xz 12164712 SHA256 90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916 SHA512 6939182463272a6bb9da0e327bfb9efc574a87820f2ae39eaf02d9fae053dbe0004330e916e6828becfef94cbe294acb0a88a600f8930b99b94fcfc4efc44ff4 WHIRLPOOL 993313811eddef1820e6f3ee0e02848c73bdfce65b85ab0e360603e726c31e1cc9dc6c128e3fe086cafc94164d2d628ff5d859e13b90648da6352c35ddeedcd4 -DIST Python-3.2.5.tar.xz 9221624 SHA256 8ccb9645b9779fc4550055b2ebb21a724ab7a63dee45643286eb4f79b2f84116 SHA512 6e71d01695c7b1e74d9781e4ac40a8d1560cae659d5351d392fc685b84316568d93740a99d2ed878dd87d4ce1708d0474cb01c6bad7b3dab610c639f3255b09d WHIRLPOOL d5e5fae5e1d4110861e1e1dac00c9812abbbc37205e8ce3cd268535ab9f66e24038ab4778af8bb834fd472eaa0281730f1f2fabdf6dffc4f6b54ef32c1d75953 -DIST Python-3.3.5.tar.xz 12116308 SHA256 abe99b484434503d8b23be0f243ec27139e743a4798cd71c1dce3cf40e63b6e5 SHA512 562ebd85291f29ff18d37f05682763fc45aa9d070688006f4ef5c89392a48022357c3ca9ee1d795e9e863bdef413e6bab77b8d65581d374a76dbe7cacec65550 WHIRLPOOL f4b6010d32b28b7bb038cbb7c5f98d325cc4253fd1be9a0a1089ed6fd7dd414c5169931d21ef819137d5c1084517a650828f260cf2a1d8ce871bc67aeef3fff8 -DIST Python-3.4.0.tar.xz 14084912 SHA256 f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe SHA512 4fd4d3352e3b64ef8017ba083a2d894b99e89882581bcf30cdb218578f0f384aa6efc89211ffe44f5bb3d783c79763e26823242d27382fd05900099dd966ca31 WHIRLPOOL 82a1bb14a7683e2bce32221792923f334b61fabc75b0b293b0ecc0d810c8a4bebf05b75a061d85dd6612a8ca699c9b4f358e2aef5d14706aad1c18f42c9b8d55 -DIST Python-3.4.1.tar.xz 14125788 SHA256 c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4 SHA512 09b6390c07334974f189fb1c90bc2310898aef76661b1cecaa2b4d50001fa3df0fa0c63d3471a5a0dc7f9e08dd559d38d3bc45a6c05a816d8b2ed6b2a20e5fa9 WHIRLPOOL c8f879bb5d42a759b0804aa58d90330d9be6f4c29652ec40f07ca7da31510eadbd6b4eceb2b213af9a1af031c8321fc25faccae77763a31814eb0569831b8bfd -DIST Python-3.4.2.tar.xz 14223804 SHA256 1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def SHA512 12de5309cfaf91f5292efd660b5abe31581b902fdcc302317b597ffa74c9f5ec14ec1dd55994bcccd50d40473ae344ae19bf917ccfb8ab4906c8777d6ea95b17 WHIRLPOOL 358a2ca605676a7b6decf7cc9edfcf5edd6e15eb7b08e48fbf5f78422d3470a1233830867e3986a6bd564e105726298d3664ad04b90a233f90a46d6b81d8d60f -DIST Python-3.4.3.tar.xz 14421964 SHA256 b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 SHA512 55b2d7c07da8ad3a3971b4687da2e45809c6f1474732e93b0432f121f287d0b63ad8a9bf381987ea70f47a03d9474c3e55b7d86d14800bf7ef29b3324d8d35b9 WHIRLPOOL f851dedc6a1ea35adec83d60784a5fbcd9dfcf6aa8858bb5ada114fa2ff55add1fbf323ab94ec039ecdedb26d59e8f2e6e171cd9fc1ed41ad9cfa434a555cff3 -DIST python-gentoo-patches-2.6.9-0.tar.xz 17532 SHA256 6ff9448c3a8412f9624363ec6f321b4e7f098aff350a82fde74f82adfbb0cae3 SHA512 e6d134200df8320fe137f0a282b7564aba02b10eab2d4585fa82de5b4740223ddeac7a5ea922a40cea8496a1a706b6787310eae45978a3e69342bb80a7670a39 WHIRLPOOL 09b38d10f9415f41205dec2c9e9df5f0687e23f791d31ce1127d96bd489c9fc7825912096b37329d62e66d8c99778ad1ffcbdbd4a2b77b5305f75ea7c28fe15d -DIST python-gentoo-patches-2.7.9-0.tar.xz 14020 SHA256 d1ae164ab14e265ff63d6a724e0c2b5519bdb790fe8b7796c2124a30cecc8ef8 SHA512 83aa867ce562ff3acf970a4b3ecf7132f34aca1ecf286b90575a20e6e044600b98ff1d7f1a7ee613d4429a6a71cfe8beaff144b64b6beb456ea8691ca00937b0 WHIRLPOOL 5b4f7bd2dcec3a45e12fe5baf1c196faf2b754376a6bccb555dd12a1af28a202d51a0d956e4450ff2f334df13b296ee27b36aa967cb179925c386cd58389050b -DIST python-gentoo-patches-2.7.9-1.tar.xz 12872 SHA256 9d912c55db56b5bfe054a6164614969fc9605f48f2ffec8770941f798a16470a SHA512 cbbae0faa246516361cd39e55d841660471931bb26cae8396a7d3929c9f4b4a3d8d5a76f7fa295deeb6335c26ed95aab18399e34c2603a582743b6e760f2b280 WHIRLPOOL 422ace8a204481458acd9cfd3b3b85e4b02fb2fe656c8ef8473a76444d5a1b54cd9d690e0009904f8c251697f60105769ce6a97c26224548476c0ece6595e484 -DIST python-gentoo-patches-3.2.5-1.tar.xz 14628 SHA256 0acc5531421781ab7f30e6fc8a502f202b79aa285b4f411eb16ea0a9e6d958c1 SHA512 1abbd53e92466d258802717309e1839ae931b8a4b0a5a27d4d0da748e71cf96ac47c6837bdbae5dd6921a46cee339c178f86ff3108afe95e6a0a42c4f4300791 WHIRLPOOL de003cccb8b311413889713d66b7987f28a1f906cc9642621d1fd2a379ceae4f0f901c137503d808dc3da7295ac611de09781bf8661cdbcd14c1d7c94ba489c2 -DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e -DIST python-gentoo-patches-3.4.0-0.tar.xz 12900 SHA256 5e5ca54eaf446c7dde4155e5d792df5229c7790b32abb5aca38cbc4fc30f9c45 SHA512 be9851f9062f6aebbd2f23d91a4038dad1a8757049745ccbb1cc618ff6bc3dfab0326d520d27678541f4421e5db41d64f632fe6fb3e80f2cf4e73dadd3d5620b WHIRLPOOL df998b5588c928ca506f9f4434093a1f60637206f03f5e067444531dae02168f88b22c8de7d58e745bdb9d85e17abd667ed51f7f5651779c2c94da98f0925679 -DIST python-gentoo-patches-3.4.1-0.tar.xz 11164 SHA256 7d88e40ed02bef2d26802516fc0138a28cca58e298204e6b1a32054f9224fcb6 SHA512 5ecdf6a1ccb8d12b5b7436e1b7f641a41afcd7fde573e9249e3dc0d438bacb1eb6a5255e149388194dbfd2951fee4f8c800199362dfd072ff96776bbbcad0bbe WHIRLPOOL 707f943f9af7c3fc6deed7cfca5a4198f65a34434893840ba8e4f4c2a3d055e8f927069cb8855b5fe20dff643b7e2d41f35f65e1f3f300e350c0f291b4df6bc2 -DIST python-gentoo-patches-3.4.2-0.tar.xz 11568 SHA256 86028c50ecb16fdbaae68662d9749f8c5dbbad6359423ed02c7b379d4aaeb7e3 SHA512 786d74df8ca168655f38d052a3e79541fd1d9f58845f8fdc296246208f8ddc61e5a0d95d675432fcac77dda7c0ab419162790d0e39337bce2fb5c5d3f23c9ef4 WHIRLPOOL 5b26c7d5facd93ca334f23057e26e3a2af71d9d590ab270d4619bb57e0d14bc6465c08ea34c53e1ccf347f5938fd0199a0edf2ddada3c3a891a5568f1eb81227 -DIST python-gentoo-patches-3.4.3-0.tar.xz 11736 SHA256 917a9d98d40a91379c81ea57922a8632ba3c6f6db6f304ed6262bc88c5044946 SHA512 7ad1b30cf8bb7900fe518ed71e4ee55dd92ce7e23ae583a1f2f851b26cfa8c4f4271d28f418e780f3725a48d4ca8eeb8fd083f850810c66c29fb08c430828d72 WHIRLPOOL 074e8c0055b49a028eebda21d1acfb8a25ec968eb8b350c2bed37e042f9f354871e413db13e0ef2fe41d7e56d647178a7b3622019f36c4819c2c68f088366eb1 -EBUILD python-2.6.9.ebuild 11294 SHA256 afd73be1f2aeaa83d2ada51f126115cd99e83f1d28323fe7294e67fc46883346 SHA512 ef6952a0c69267534d9c4875ae5a6179f8e1fca2d431ea75085f100240297a2de4cf48aca72491628b20ac6d40773bca06176ff7191a6fd6f481653f8c975b2d WHIRLPOOL 29883ed256da0abe6ef2b4c8ee35ee9c95cb64564486d74a7dd0d32b2c157b17779ce31347f39bb003a7a06dc68557de5081c5af6a4d15ca3fd7c6793bf767c2 -EBUILD python-2.7.9-r1.ebuild 10532 SHA256 b257af119d2bb1fe14c9ffb9d7f5eb083446ecb2e455d54de878bd081ae52342 SHA512 46199fa81a8aa897f853ad50bc9d63127ab16f4062f57e10b536f49c09c37ba1fb357f449ad4570b3878414c58b80f14019ec1ecd12d1fe764c0c14a883478e7 WHIRLPOOL fe66cf76e68fa1ac211c0a60bc75b69f0d55ecf151611aa7b7f3ecaa6f5f42979b471ce9d7ce275083b9d1e2ba1b1d43b4a0c913730099036213a646d151a6e1 -EBUILD python-2.7.9-r2.ebuild 10701 SHA256 b1e73f3646351b27baa31079a18db4b51b47151e25655856fb037f8144ff3cf8 SHA512 2f4b782941c933a0e09b9a9459812a1bcdd46126f7d675ad3ca8753aa505efabc8e5b68009c7f7956027f040c944a6974b759bf696110c60a8371a2f5a8c867c WHIRLPOOL 0399f5ae86ff253bd8e4f379822bef7404f968689718abae366e49c32646350677d0f873e44d3163eed98036f4c0cfa23abf3df97017fcfc286941b1121db840 -EBUILD python-3.2.5-r6.ebuild 11463 SHA256 3dc64bc08b641e7befa7366f8a5bb34567beb970adeeccd8f3c71a36876fc27f SHA512 615d181fd1587ba106f1ad68a081752a1bea4163fa340abacebc13b9fac2c556e186db39763c59b4e100eda15e404bb100480d7f839cb8c4746cdc32d1662ae0 WHIRLPOOL 5c998bfe4d8b2d3874b2c2bbb121b84b6e7dd3d247d3e4fe657153226f12c5eb98b6802ddbc53c6ce2ea3a72dc1e830fe00e6963157768ca3012a8e118dd4d70 -EBUILD python-3.3.5-r1.ebuild 9581 SHA256 45e32db6d88b744d1f0100c4ca80a946e727379df4ce1d4a75046cf1fa49f3dc SHA512 58b1c4d0c3bc78f90dd2eebcd4864b163d4d7f4c919727c34b80f554025a57b0ac4c72dd78b3fdb4985f0fc8453ce46b530f5864ffa39b2f8449f9fc1db869b7 WHIRLPOOL 99e84e88f81f430d319fcf316c71af148a5cf155802a5132bc9dc34fa59fa1ea9fa27570181ab9866f501ab4f5a9908f7b9ada4c2a553750c1ea6276b81ec4a2 -EBUILD python-3.4.0.ebuild 9306 SHA256 ecb382171c85b5dae6f9da1b1ead58548ae0077669bc851c2416abdc5180a25c SHA512 6b51e94abefde02c569969f2f4e3d6ab19dd548ec8c3d925b519d9abd91c13e29b13d84695ec02a5cc526a38af4e0965c6eb2a90745ffcc75c88072696e8b0c4 WHIRLPOOL 41e110e37c8fa282183bec1fe628e4b36416396094f8548a32b8a7714a49e1a11bc1874aea89e808eb20fc34b011836c22b22755aa09886833e1cde9144cf2fa -EBUILD python-3.4.1.ebuild 9228 SHA256 2e0c3853e037995afde3f233889eb05e9f5459a94a4cccbad28a4b1d97084441 SHA512 344a2903f47be14248edb1318cb138fe20113610211d368aca1e0a298fe4c3a169665884d39a882f2f488537c441a0d4fd87f52c2d3a595a0b40886c84fc6f50 WHIRLPOOL bcc30f3ef7f67327634f066c1b0de6c0549dfd7a32d03d22a8bcd5f8468d17c8f7e31da5fa8910add24fab64dfbb663c8dcf3127d86dff6f165274a538dcd14a -EBUILD python-3.4.2.ebuild 9240 SHA256 24914c177f25fd847a792bbca0739b217dd02a44e101d38940eb28730984a29c SHA512 0f154558579481c3549a2969ee9a300d82aa266106faa02d4e5a547a0344de795ad7c6f255b833e2b89a3098a9c3f7166c221de0b8ba4f00b8a657b6ebae5851 WHIRLPOOL d7df13b58fdac0ac1ec351fa802bbb7b30605de2eda7934b395480de9bbdb4d97beeb5f581e99e6ce707ced024728edc389930ef8df5dfcc89352e71f4077d45 -EBUILD python-3.4.3.ebuild 9267 SHA256 19eeba5229976e9c59ee03f46b3a2d743c401ff0098ba434eb79b4cf211b2843 SHA512 82aa5c9011c9b0cf06dd8df1dc4af3048f5eebd8a3d7909883cf778294f34c11db0ff4e2d2cd90c64c1362d410de297dd134eb1c89e4e0b66e4dae8a974a49f8 WHIRLPOOL 802f5b8c7d3ea08a2dbbea243028f273e556dacedd20fb5d936555e88d9441cd3580715ffd946cd9bf890303fdaaa4378b002138cdf04980ec4eebdabfb7f895 -MISC ChangeLog 40613 SHA256 94b40f7cf900a8e63e8715d5c1005320498c5fee93e8aad6cf44a7063816d534 SHA512 6dfa11e154c8c8c6beb69876610c39a17ffcd22115f2c141c57e600e3ace0c37e44495716425afdc371fec295dbb04c5ba5b3c90133eef0b720ed9a128fe631c WHIRLPOOL 70bbdf38d65786423874e77872c544a77504f17667e9fdca58c09111c6935b26f5e7bb8afdab521e9e936224806b625258875c2a5ba27e7880fe5c61208a6bf0 -MISC ChangeLog-2011 100599 SHA256 23129cb47321b2a6b1cb9323f1815d0cd11d6f30c3893908ed51575c270a0cc8 SHA512 4181ba9d965139ba58218da5b960c87b7a611b27606a1ab1ce1b4c3c9255b4e0e2947307cbfffc531f0f8b6b545ee11e083fcb29dc7b2b7ba31c6bb40b8ab128 WHIRLPOOL 4ceebb6a6ed58b906d3a7331795748ac6e4fe2e1401bcccae9024a8e81e2c444aebc5fec610398cfe6002354ad3b10487484598da5091867874727f07e239c56 -MISC metadata.xml 661 SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 SHA512 871989a29417ce20d95da950fa385f1a958139de7b1567beb9cda28a1217901243cd9d25235fe3c7b0e43a82176d72286e31e4e97310b26488d2a3252ef3a8a0 WHIRLPOOL b694b1b4270ba15640d04a3b0b26a08575ea4afc9be256717f7f3b1768d75da9f71ceca6afd2f69971906227d5ba42263d2df2fc9387441aa240222d39fd094e diff --git a/dev-lang/python/files/CVE-2013-4238_py27.patch b/dev-lang/python/files/CVE-2013-4238_py27.patch deleted file mode 100644 index e215589..0000000 --- a/dev-lang/python/files/CVE-2013-4238_py27.patch +++ /dev/null @@ -1,247 +0,0 @@ -diff -r 9ddc63c039ba Lib/test/nullbytecert.pem ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/Lib/test/nullbytecert.pem Sun Aug 11 18:13:17 2013 +0200 -@@ -0,0 +1,90 @@ -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Serial Number: 0 (0x0) -+ Signature Algorithm: sha1WithRSAEncryption -+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Validity -+ Not Before: Aug 7 13:11:52 2013 GMT -+ Not After : Aug 7 13:12:52 2013 GMT -+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Subject Public Key Info: -+ Public Key Algorithm: rsaEncryption -+ Public-Key: (2048 bit) -+ Modulus: -+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: -+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: -+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: -+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: -+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: -+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: -+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: -+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: -+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: -+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: -+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: -+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: -+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: -+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: -+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: -+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: -+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: -+ 2f:85 -+ Exponent: 65537 (0x10001) -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:FALSE -+ X509v3 Subject Key Identifier: -+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C -+ X509v3 Key Usage: -+ Digital Signature, Non Repudiation, Key Encipherment -+ X509v3 Subject Alternative Name: -+ ************************************************************* -+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL -+ doesn't print the text after a NULL byte. -+ ************************************************************* -+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 -+ Signature Algorithm: sha1WithRSAEncryption -+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: -+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: -+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: -+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: -+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: -+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: -+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: -+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: -+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: -+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: -+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: -+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: -+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: -+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: -+ c1:ca:a9:94 -+-----BEGIN CERTIFICATE----- -+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx -+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ -+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg -+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y -+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw -+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI -+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv -+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt -+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq -+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j -+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P -+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv -+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA -+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL -+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV -+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E -+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu -+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 -+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA -+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 -+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j -+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk -+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx -+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW -+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= -+-----END CERTIFICATE----- -diff -r 9ddc63c039ba Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py Sun Aug 11 13:04:50 2013 +0300 -+++ b/Lib/test/test_ssl.py Sun Aug 11 18:13:17 2013 +0200 -@@ -25,6 +25,7 @@ - HOST = test_support.HOST - CERTFILE = None - SVN_PYTHON_ORG_ROOT_CERT = None -+NULLBYTECERT = None - - def handle_error(prefix): - exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) -@@ -123,6 +124,27 @@ - ('DNS', 'projects.forum.nokia.com')) - ) - -+ def test_parse_cert_CVE_2013_4073(self): -+ p = ssl._ssl._test_decode_cert(NULLBYTECERT) -+ if test_support.verbose: -+ sys.stdout.write("\n" + pprint.pformat(p) + "\n") -+ subject = ((('countryName', 'US'),), -+ (('stateOrProvinceName', 'Oregon'),), -+ (('localityName', 'Beaverton'),), -+ (('organizationName', 'Python Software Foundation'),), -+ (('organizationalUnitName', 'Python Core Development'),), -+ (('commonName', 'null.python.org\x00example.org'),), -+ (('emailAddress', 'python-dev@python.org'),)) -+ self.assertEqual(p['subject'], subject) -+ self.assertEqual(p['issuer'], subject) -+ self.assertEqual(p['subjectAltName'], -+ (('DNS', 'altnull.python.org\x00example.com'), -+ ('email', 'null@python.org\x00user@example.org'), -+ ('URI', 'http://null.python.org\x00http://example.org'), -+ ('IP Address', '192.0.2.1'), -+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) -+ ) -+ - def test_DER_to_PEM(self): - with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: - pem = f.read() -@@ -1360,7 +1382,7 @@ - - - def test_main(verbose=False): -- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT -+ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT - CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, - "keycert.pem") - SVN_PYTHON_ORG_ROOT_CERT = os.path.join( -@@ -1368,10 +1390,13 @@ - "https_svn_python_org_root.pem") - NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, - "nokia.pem") -+ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, -+ "nullbytecert.pem") - - if (not os.path.exists(CERTFILE) or - not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or -- not os.path.exists(NOKIACERT)): -+ not os.path.exists(NOKIACERT) or -+ not os.path.exists(NULLBYTECERT)): - raise test_support.TestFailed("Can't read certificate files!") - - tests = [BasicTests, BasicSocketTests] -diff -r 9ddc63c039ba Modules/_ssl.c ---- a/Modules/_ssl.c Sun Aug 11 13:04:50 2013 +0300 -+++ b/Modules/_ssl.c Sun Aug 11 18:13:17 2013 +0200 -@@ -741,8 +741,13 @@ - - /* get a rendering of each name in the set of names */ - -+ int gntype; -+ ASN1_STRING *as = NULL; -+ - name = sk_GENERAL_NAME_value(names, j); -- if (name->type == GEN_DIRNAME) { -+ gntype = name-> type; -+ switch (gntype) { -+ case GEN_DIRNAME: - - /* we special-case DirName as a tuple of tuples of attributes */ - -@@ -764,11 +769,61 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - -- } else { -+ case GEN_EMAIL: -+ case GEN_DNS: -+ case GEN_URI: -+ /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string -+ correctly. */ -+ t = PyTuple_New(2); -+ if (t == NULL) -+ goto fail; -+ switch (gntype) { -+ case GEN_EMAIL: -+ v = PyUnicode_FromString("email"); -+ as = name->d.rfc822Name; -+ break; -+ case GEN_DNS: -+ v = PyUnicode_FromString("DNS"); -+ as = name->d.dNSName; -+ break; -+ case GEN_URI: -+ v = PyUnicode_FromString("URI"); -+ as = name->d.uniformResourceIdentifier; -+ break; -+ } -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 0, v); -+ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 1, v); -+ break; - -+ default: - /* for everything else, we use the OpenSSL print form */ -- -+ switch (gntype) { -+ /* check for new general name type */ -+ case GEN_OTHERNAME: -+ case GEN_X400: -+ case GEN_EDIPARTY: -+ case GEN_IPADD: -+ case GEN_RID: -+ break; -+ default: -+ if (PyErr_Warn(PyExc_RuntimeWarning, -+ "Unknown general name type") == -1) { -+ goto fail; -+ } -+ break; -+ } - (void) BIO_reset(biobuf); - GENERAL_NAME_print(biobuf, name); - len = BIO_gets(biobuf, buf, sizeof(buf)-1); -@@ -794,6 +849,7 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - } - - /* and add that rendering to the list */ diff --git a/dev-lang/python/files/CVE-2013-4238_py33.patch b/dev-lang/python/files/CVE-2013-4238_py33.patch deleted file mode 100644 index 41db4d2..0000000 --- a/dev-lang/python/files/CVE-2013-4238_py33.patch +++ /dev/null @@ -1,241 +0,0 @@ -diff -r e0f86c3b3685 Lib/test/nullbytecert.pem ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/Lib/test/nullbytecert.pem Sun Aug 11 18:17:23 2013 +0200 -@@ -0,0 +1,90 @@ -+Certificate: -+ Data: -+ Version: 3 (0x2) -+ Serial Number: 0 (0x0) -+ Signature Algorithm: sha1WithRSAEncryption -+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Validity -+ Not Before: Aug 7 13:11:52 2013 GMT -+ Not After : Aug 7 13:12:52 2013 GMT -+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org -+ Subject Public Key Info: -+ Public Key Algorithm: rsaEncryption -+ Public-Key: (2048 bit) -+ Modulus: -+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: -+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: -+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: -+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: -+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: -+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: -+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: -+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: -+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: -+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: -+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: -+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: -+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: -+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: -+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: -+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: -+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: -+ 2f:85 -+ Exponent: 65537 (0x10001) -+ X509v3 extensions: -+ X509v3 Basic Constraints: critical -+ CA:FALSE -+ X509v3 Subject Key Identifier: -+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C -+ X509v3 Key Usage: -+ Digital Signature, Non Repudiation, Key Encipherment -+ X509v3 Subject Alternative Name: -+ ************************************************************* -+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL -+ doesn't print the text after a NULL byte. -+ ************************************************************* -+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 -+ Signature Algorithm: sha1WithRSAEncryption -+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: -+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: -+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: -+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: -+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: -+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: -+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: -+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: -+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: -+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: -+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: -+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: -+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: -+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: -+ c1:ca:a9:94 -+-----BEGIN CERTIFICATE----- -+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx -+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ -+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg -+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y -+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw -+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI -+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv -+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt -+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq -+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB -+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j -+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P -+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv -+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA -+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL -+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV -+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E -+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu -+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 -+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA -+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 -+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j -+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk -+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx -+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW -+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= -+-----END CERTIFICATE----- -diff -r e0f86c3b3685 Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py Sun Aug 11 13:04:50 2013 +0300 -+++ b/Lib/test/test_ssl.py Sun Aug 11 18:17:23 2013 +0200 -@@ -55,6 +55,7 @@ - WRONGCERT = data_file("XXXnonexisting.pem") - BADKEY = data_file("badkey.pem") - NOKIACERT = data_file("nokia.pem") -+NULLBYTECERT = data_file("nullbytecert.pem") - - DHFILE = data_file("dh512.pem") - BYTES_DHFILE = os.fsencode(DHFILE) -@@ -162,6 +163,27 @@ - ('DNS', 'projects.forum.nokia.com')) - ) - -+ def test_parse_cert_CVE_2013_4073(self): -+ p = ssl._ssl._test_decode_cert(NULLBYTECERT) -+ if support.verbose: -+ sys.stdout.write("\n" + pprint.pformat(p) + "\n") -+ subject = ((('countryName', 'US'),), -+ (('stateOrProvinceName', 'Oregon'),), -+ (('localityName', 'Beaverton'),), -+ (('organizationName', 'Python Software Foundation'),), -+ (('organizationalUnitName', 'Python Core Development'),), -+ (('commonName', 'null.python.org\x00example.org'),), -+ (('emailAddress', 'python-dev@python.org'),)) -+ self.assertEqual(p['subject'], subject) -+ self.assertEqual(p['issuer'], subject) -+ self.assertEqual(p['subjectAltName'], -+ (('DNS', 'altnull.python.org\x00example.com'), -+ ('email', 'null@python.org\x00user@example.org'), -+ ('URI', 'http://null.python.org\x00http://example.org'), -+ ('IP Address', '192.0.2.1'), -+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) -+ ) -+ - def test_DER_to_PEM(self): - with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: - pem = f.read() -@@ -294,6 +316,13 @@ - fail(cert, 'foo.a.com') - fail(cert, 'bar.foo.com') - -+ # NULL bytes are bad, CVE-2013-4073 -+ cert = {'subject': ((('commonName', -+ 'null.python.org\x00example.org'),),)} -+ ok(cert, 'null.python.org\x00example.org') # or raise an error? -+ fail(cert, 'example.org') -+ fail(cert, 'null.python.org') -+ - # Slightly fake real-world example - cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT', - 'subject': ((('commonName', 'linuxfrz.org'),),), -diff -r e0f86c3b3685 Modules/_ssl.c ---- a/Modules/_ssl.c Sun Aug 11 13:04:50 2013 +0300 -+++ b/Modules/_ssl.c Sun Aug 11 18:17:23 2013 +0200 -@@ -771,12 +771,14 @@ - ext->value->length)); - - for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { -- - /* get a rendering of each name in the set of names */ -+ int gntype; -+ ASN1_STRING *as = NULL; - - name = sk_GENERAL_NAME_value(names, j); -- if (name->type == GEN_DIRNAME) { -- -+ gntype = name-> type; -+ switch (gntype) { -+ case GEN_DIRNAME: - /* we special-case DirName as a tuple of - tuples of attributes */ - -@@ -798,11 +800,62 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - -- } else { -+ case GEN_EMAIL: -+ case GEN_DNS: -+ case GEN_URI: -+ /* GENERAL_NAME_print() doesn't handle NUL bytes in ASN1_string -+ correctly. */ -+ t = PyTuple_New(2); -+ if (t == NULL) -+ goto fail; -+ switch (gntype) { -+ case GEN_EMAIL: -+ v = PyUnicode_FromString("email"); -+ as = name->d.rfc822Name; -+ break; -+ case GEN_DNS: -+ v = PyUnicode_FromString("DNS"); -+ as = name->d.dNSName; -+ break; -+ case GEN_URI: -+ v = PyUnicode_FromString("URI"); -+ as = name->d.uniformResourceIdentifier; -+ break; -+ } -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 0, v); -+ v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as), -+ ASN1_STRING_length(as)); -+ if (v == NULL) { -+ Py_DECREF(t); -+ goto fail; -+ } -+ PyTuple_SET_ITEM(t, 1, v); -+ break; - -+ default: - /* for everything else, we use the OpenSSL print form */ -- -+ switch (gntype) { -+ /* check for new general name type */ -+ case GEN_OTHERNAME: -+ case GEN_X400: -+ case GEN_EDIPARTY: -+ case GEN_IPADD: -+ case GEN_RID: -+ break; -+ default: -+ if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1, -+ "Unknown general name type %d", -+ gntype) == -1) { -+ goto fail; -+ } -+ break; -+ } - (void) BIO_reset(biobuf); - GENERAL_NAME_print(biobuf, name); - len = BIO_gets(biobuf, buf, sizeof(buf)-1); -@@ -829,6 +882,7 @@ - goto fail; - } - PyTuple_SET_ITEM(t, 1, v); -+ break; - } - - /* and add that rendering to the list */ diff --git a/dev-lang/python/files/pydoc.conf b/dev-lang/python/files/pydoc.conf deleted file mode 100644 index 20e3628..0000000 --- a/dev-lang/python/files/pydoc.conf +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/init.d/pydoc.conf -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.conf,v 1.3 2011/10/27 13:56:55 neurogeek Exp $ - -# This file contains the configuration for pydoc's internal webserver. - -# Default port for Python's pydoc server. -@PYDOC_PORT_VARIABLE@="7464" diff --git a/dev-lang/python/files/pydoc.init b/dev-lang/python/files/pydoc.init deleted file mode 100755 index 3f02ae9..0000000 --- a/dev-lang/python/files/pydoc.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public Licence v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/files/pydoc.init,v 1.5 2014/10/12 12:37:07 djc Exp $ - -start() { - local pydoc_port="${@PYDOC_PORT_VARIABLE@-${PYDOC_PORT}}" - - if [ -z "${pydoc_port}" ]; then - eerror "Port not set" - return 1 - fi - - ebegin "Starting pydoc server on port ${pydoc_port}" - start-stop-daemon --start --background --make-pidfile \ - --pidfile /var/run/@PYDOC@.pid \ - --exec /usr/bin/@PYDOC@ -- -p "${pydoc_port}" - eend $? -} - -stop() { - ebegin "Stopping pydoc server" - start-stop-daemon --stop --quiet --pidfile /var/run/@PYDOC@.pid - eend $? -} diff --git a/dev-lang/python/files/python-2.5-tcl86.patch b/dev-lang/python/files/python-2.5-tcl86.patch deleted file mode 100644 index 2362e98..0000000 --- a/dev-lang/python/files/python-2.5-tcl86.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1518,7 +1518,7 @@ - # The versions with dots are used on Unix, and the versions without - # dots on Windows, for detection by cygwin. - tcllib = tklib = tcl_includes = tk_includes = None -- for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2', -+ for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83', '8.2', - '82', '8.1', '81', '8.0', '80']: - tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version) - tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version) diff --git a/dev-lang/python/files/python-2.7-issue16248.patch b/dev-lang/python/files/python-2.7-issue16248.patch deleted file mode 100644 index ce9c654..0000000 --- a/dev-lang/python/files/python-2.7-issue16248.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Antoine Pitrou <solipsis@pitrou.net> -# Date 1375388712 -7200 -# Node ID 0f17aed78168e63ec058c219d03cea7240f83dd6 -# Parent bb546f6d8ab4f513804d7a420657963881e5b447 -Fix tkinter regression introduced by the security fix in #16248. - -diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py ---- a/Lib/lib-tk/Tkinter.py -+++ b/Lib/lib-tk/Tkinter.py -@@ -1736,7 +1736,7 @@ class Tk(Misc, Wm): - # ensure that self.tk is always _something_. - self.tk = None - if baseName is None: -- import sys, os -+ import os - baseName = os.path.basename(sys.argv[0]) - baseName, ext = os.path.splitext(baseName) - if ext not in ('.py', '.pyc', '.pyo'): diff --git a/dev-lang/python/files/python-2.7-issue18851.patch b/dev-lang/python/files/python-2.7-issue18851.patch deleted file mode 100644 index 35c69ae..0000000 --- a/dev-lang/python/files/python-2.7-issue18851.patch +++ /dev/null @@ -1,287 +0,0 @@ -# HG changeset patch -# User Antoine Pitrou <solipsis@pitrou.net> -# Date 1377898693 -7200 -# Node ID 43749cb6bdbd0fdab70f76cd171c3c02a3f600dd -# Parent ba54011aa295004ad87438211fe3bb1568dd69ab -Issue #18851: Avoid a double close of subprocess pipes when the child process fails starting. - -diff --git a/Lib/subprocess.py b/Lib/subprocess.py ---- a/Lib/subprocess.py -+++ b/Lib/subprocess.py -@@ -698,12 +698,12 @@ class Popen(object): - - (p2cread, p2cwrite, - c2pread, c2pwrite, -- errread, errwrite) = self._get_handles(stdin, stdout, stderr) -+ errread, errwrite), to_close = self._get_handles(stdin, stdout, stderr) - - try: - self._execute_child(args, executable, preexec_fn, close_fds, - cwd, env, universal_newlines, -- startupinfo, creationflags, shell, -+ startupinfo, creationflags, shell, to_close, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite) -@@ -711,18 +711,12 @@ class Popen(object): - # Preserve original exception in case os.close raises. - exc_type, exc_value, exc_trace = sys.exc_info() - -- to_close = [] -- # Only close the pipes we created. -- if stdin == PIPE: -- to_close.extend((p2cread, p2cwrite)) -- if stdout == PIPE: -- to_close.extend((c2pread, c2pwrite)) -- if stderr == PIPE: -- to_close.extend((errread, errwrite)) -- - for fd in to_close: - try: -- os.close(fd) -+ if mswindows: -+ fd.Close() -+ else: -+ os.close(fd) - except EnvironmentError: - pass - -@@ -816,8 +810,9 @@ class Popen(object): - """Construct and return tuple with IO objects: - p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite - """ -+ to_close = set() - if stdin is None and stdout is None and stderr is None: -- return (None, None, None, None, None, None) -+ return (None, None, None, None, None, None), to_close - - p2cread, p2cwrite = None, None - c2pread, c2pwrite = None, None -@@ -835,6 +830,10 @@ class Popen(object): - # Assuming file-like object - p2cread = msvcrt.get_osfhandle(stdin.fileno()) - p2cread = self._make_inheritable(p2cread) -+ # We just duplicated the handle, it has to be closed at the end -+ to_close.add(p2cread) -+ if stdin == PIPE: -+ to_close.add(p2cwrite) - - if stdout is None: - c2pwrite = _subprocess.GetStdHandle(_subprocess.STD_OUTPUT_HANDLE) -@@ -848,6 +847,10 @@ class Popen(object): - # Assuming file-like object - c2pwrite = msvcrt.get_osfhandle(stdout.fileno()) - c2pwrite = self._make_inheritable(c2pwrite) -+ # We just duplicated the handle, it has to be closed at the end -+ to_close.add(c2pwrite) -+ if stdout == PIPE: -+ to_close.add(c2pread) - - if stderr is None: - errwrite = _subprocess.GetStdHandle(_subprocess.STD_ERROR_HANDLE) -@@ -863,10 +866,14 @@ class Popen(object): - # Assuming file-like object - errwrite = msvcrt.get_osfhandle(stderr.fileno()) - errwrite = self._make_inheritable(errwrite) -+ # We just duplicated the handle, it has to be closed at the end -+ to_close.add(errwrite) -+ if stderr == PIPE: -+ to_close.add(errread) - - return (p2cread, p2cwrite, - c2pread, c2pwrite, -- errread, errwrite) -+ errread, errwrite), to_close - - - def _make_inheritable(self, handle): -@@ -895,7 +902,7 @@ class Popen(object): - - def _execute_child(self, args, executable, preexec_fn, close_fds, - cwd, env, universal_newlines, -- startupinfo, creationflags, shell, -+ startupinfo, creationflags, shell, to_close, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite): -@@ -934,6 +941,10 @@ class Popen(object): - # kill children. - creationflags |= _subprocess.CREATE_NEW_CONSOLE - -+ def _close_in_parent(fd): -+ fd.Close() -+ to_close.remove(fd) -+ - # Start the process - try: - hp, ht, pid, tid = _subprocess.CreateProcess(executable, args, -@@ -958,11 +969,11 @@ class Popen(object): - # pipe will not close when the child process exits and the - # ReadFile will hang. - if p2cread is not None: -- p2cread.Close() -+ _close_in_parent(p2cread) - if c2pwrite is not None: -- c2pwrite.Close() -+ _close_in_parent(c2pwrite) - if errwrite is not None: -- errwrite.Close() -+ _close_in_parent(errwrite) - - # Retain the process handle, but close the thread handle - self._child_created = True -@@ -1088,6 +1099,7 @@ class Popen(object): - """Construct and return tuple with IO objects: - p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite - """ -+ to_close = set() - p2cread, p2cwrite = None, None - c2pread, c2pwrite = None, None - errread, errwrite = None, None -@@ -1096,6 +1108,7 @@ class Popen(object): - pass - elif stdin == PIPE: - p2cread, p2cwrite = self.pipe_cloexec() -+ to_close.update((p2cread, p2cwrite)) - elif isinstance(stdin, int): - p2cread = stdin - else: -@@ -1106,6 +1119,7 @@ class Popen(object): - pass - elif stdout == PIPE: - c2pread, c2pwrite = self.pipe_cloexec() -+ to_close.update((c2pread, c2pwrite)) - elif isinstance(stdout, int): - c2pwrite = stdout - else: -@@ -1116,6 +1130,7 @@ class Popen(object): - pass - elif stderr == PIPE: - errread, errwrite = self.pipe_cloexec() -+ to_close.update((errread, errwrite)) - elif stderr == STDOUT: - errwrite = c2pwrite - elif isinstance(stderr, int): -@@ -1126,7 +1141,7 @@ class Popen(object): - - return (p2cread, p2cwrite, - c2pread, c2pwrite, -- errread, errwrite) -+ errread, errwrite), to_close - - - def _set_cloexec_flag(self, fd, cloexec=True): -@@ -1170,7 +1185,7 @@ class Popen(object): - - def _execute_child(self, args, executable, preexec_fn, close_fds, - cwd, env, universal_newlines, -- startupinfo, creationflags, shell, -+ startupinfo, creationflags, shell, to_close, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite): -@@ -1189,6 +1204,10 @@ class Popen(object): - if executable is None: - executable = args[0] - -+ def _close_in_parent(fd): -+ os.close(fd) -+ to_close.remove(fd) -+ - # For transferring possible exec failure from child to parent - # The first char specifies the exception type: 0 means - # OSError, 1 means some other error. -@@ -1283,17 +1302,17 @@ class Popen(object): - # be sure the FD is closed no matter what - os.close(errpipe_write) - -- if p2cread is not None and p2cwrite is not None: -- os.close(p2cread) -- if c2pwrite is not None and c2pread is not None: -- os.close(c2pwrite) -- if errwrite is not None and errread is not None: -- os.close(errwrite) -- - # Wait for exec to fail or succeed; possibly raising exception - # Exception limited to 1M - data = _eintr_retry_call(os.read, errpipe_read, 1048576) - finally: -+ if p2cread is not None and p2cwrite is not None: -+ _close_in_parent(p2cread) -+ if c2pwrite is not None and c2pread is not None: -+ _close_in_parent(c2pwrite) -+ if errwrite is not None and errread is not None: -+ _close_in_parent(errwrite) -+ - # be sure the FD is closed no matter what - os.close(errpipe_read) - -diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py ---- a/Lib/test/test_subprocess.py -+++ b/Lib/test/test_subprocess.py -@@ -14,6 +14,10 @@ try: - import resource - except ImportError: - resource = None -+try: -+ import threading -+except ImportError: -+ threading = None - - mswindows = (sys.platform == "win32") - -@@ -629,6 +633,36 @@ class ProcessTestCase(BaseTestCase): - if c.exception.errno not in (errno.ENOENT, errno.EACCES): - raise c.exception - -+ @unittest.skipIf(threading is None, "threading required") -+ def test_double_close_on_error(self): -+ # Issue #18851 -+ fds = [] -+ def open_fds(): -+ for i in range(20): -+ fds.extend(os.pipe()) -+ time.sleep(0.001) -+ t = threading.Thread(target=open_fds) -+ t.start() -+ try: -+ with self.assertRaises(EnvironmentError): -+ subprocess.Popen(['nonexisting_i_hope'], -+ stdin=subprocess.PIPE, -+ stdout=subprocess.PIPE, -+ stderr=subprocess.PIPE) -+ finally: -+ t.join() -+ exc = None -+ for fd in fds: -+ # If a double close occurred, some of those fds will -+ # already have been closed by mistake, and os.close() -+ # here will raise. -+ try: -+ os.close(fd) -+ except OSError as e: -+ exc = e -+ if exc is not None: -+ raise exc -+ - def test_handles_closed_on_exception(self): - # If CreateProcess exits with an error, ensure the - # duplicate output handles are released -@@ -783,7 +817,7 @@ class POSIXProcessTestCase(BaseTestCase) - - def _execute_child( - self, args, executable, preexec_fn, close_fds, cwd, env, -- universal_newlines, startupinfo, creationflags, shell, -+ universal_newlines, startupinfo, creationflags, shell, to_close, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite): -@@ -791,7 +825,7 @@ class POSIXProcessTestCase(BaseTestCase) - subprocess.Popen._execute_child( - self, args, executable, preexec_fn, close_fds, - cwd, env, universal_newlines, -- startupinfo, creationflags, shell, -+ startupinfo, creationflags, shell, to_close, - p2cread, p2cwrite, - c2pread, c2pwrite, - errread, errwrite) diff --git a/dev-lang/python/files/python-2.7.5-library-path.patch b/dev-lang/python/files/python-2.7.5-library-path.patch deleted file mode 100644 index 6f43575..0000000 --- a/dev-lang/python/files/python-2.7.5-library-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -# HG changeset patch -# User Ned Deily <nad@acm.org> -# Date 1368666045 25200 -# Node ID cd577c3288860b0deb459443ca5c489dc0f99ef6 -# Parent 149340b3004acfcb68e5ed36b1e96b7463c756c7 -Issue #17990: Only modify include and library search paths when cross-compiling. - -diff --git a/setup.py b/setup.py ---- a/setup.py -+++ b/setup.py -@@ -437,9 +437,11 @@ class PyBuildExt(build_ext): - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -- self.add_gcc_paths() -+ if not cross_compiling: -+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ if cross_compiling: -+ self.add_gcc_paths() - self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and diff --git a/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch b/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch deleted file mode 100644 index a762dfb..0000000 --- a/dev-lang/python/files/python-2.7.5-nonfatal-compileall.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1000,12 +1000,12 @@ - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ diff --git a/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch b/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch deleted file mode 100644 index a905839..0000000 --- a/dev-lang/python/files/python-2.7.5-re_unsigned_ptrdiff.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=476426 -http://bugs.python.org/issue17998 -diff -r d91da96a55bf Modules/_sre.c ---- a/Modules/_sre.c Thu May 16 22:47:47 2013 +0100 -+++ b/Modules/_sre.c Fri May 17 21:02:48 2013 +0300 -@@ -1028,7 +1028,7 @@ - TRACE(("|%p|%p|REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr, - ctx->pattern[1], ctx->pattern[2])); - -- if (ctx->pattern[1] > end - ctx->ptr) -+ if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr) - RETURN_FAILURE; /* cannot match */ - - state->ptr = ctx->ptr; -@@ -1111,7 +1111,7 @@ - TRACE(("|%p|%p|MIN_REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr, - ctx->pattern[1], ctx->pattern[2])); - -- if (ctx->pattern[1] > end - ctx->ptr) -+ if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr) - RETURN_FAILURE; /* cannot match */ - - state->ptr = ctx->ptr; diff --git a/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch b/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch deleted file mode 100644 index 37e786b..0000000 --- a/dev-lang/python/files/python-2.7.6-recvfrom_into_buffer_overflow.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r 40fb60df4755 Modules/socketmodule.c ---- a/Modules/socketmodule.c Sun Jan 12 12:11:47 2014 +0200 -+++ b/Modules/socketmodule.c Mon Jan 13 16:36:35 2014 -0800 -@@ -2744,6 +2744,13 @@ - recvlen = buflen; - } - -+ /* Check if the buffer is large enough */ -+ if (buflen < recvlen) { -+ PyErr_SetString(PyExc_ValueError, -+ "buffer too small for requested bytes"); -+ goto error; -+ } -+ - readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); - if (readlen < 0) { - /* Return an error */ diff --git a/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch b/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch deleted file mode 100644 index 38ce6f7..0000000 --- a/dev-lang/python/files/python-2.7.9-ncurses-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -do not hardcode /usr/include paths - ---- a/configure.ac -+++ b/configure.ac -@@ -4316,7 +4316,7 @@ fi - - # first curses configure check - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" - - AC_CHECK_HEADERS(curses.h ncurses.h) - diff --git a/dev-lang/python/files/python-3.2-CVE-2013-2099.patch b/dev-lang/python/files/python-3.2-CVE-2013-2099.patch deleted file mode 100644 index 9055a03..0000000 --- a/dev-lang/python/files/python-3.2-CVE-2013-2099.patch +++ /dev/null @@ -1,51 +0,0 @@ -# HG changeset patch -# User Antoine Pitrou <solipsis@pitrou.net> -# Date 1368892602 -7200 -# Sat May 18 17:56:42 2013 +0200 -# Branch 3.2 -# Node ID b9b521efeba385af0142988899a55de1c1c805c7 -# Parent 6255b40c6a6127933d8ea7a2b9de200f5a0e6154 -Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). - -diff --git a/Lib/ssl.py b/Lib/ssl.py ---- a/Lib/ssl.py -+++ b/Lib/ssl.py -@@ -108,9 +108,16 @@ - pass - - --def _dnsname_to_pat(dn): -+def _dnsname_to_pat(dn, max_wildcards=1): - pats = [] - for frag in dn.split(r'.'): -+ if frag.count('*') > max_wildcards: -+ # Issue #17980: avoid denials of service by refusing more -+ # than one wildcard per fragment. A survery of established -+ # policy among SSL implementations showed it to be a -+ # reasonable choice. -+ raise CertificateError( -+ "too many wildcards in certificate DNS name: " + repr(dn)) - if frag == '*': - # When '*' is a fragment by itself, it matches a non-empty dotless - # fragment. -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -326,6 +326,17 @@ - self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') - self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') - -+ # Issue #17980: avoid denials of service by refusing more than one -+ # wildcard per fragment. -+ cert = {'subject': ((('commonName', 'a*b.com'),),)} -+ ok(cert, 'axxb.com') -+ cert = {'subject': ((('commonName', 'a*b.co*'),),)} -+ ok(cert, 'axxb.com') -+ cert = {'subject': ((('commonName', 'a*b*.com'),),)} -+ with self.assertRaises(ssl.CertificateError) as cm: -+ ssl.match_hostname(cert, 'axxbxxc.com') -+ self.assertIn("too many wildcards", str(cm.exception)) -+ - def test_server_side(self): - # server_hostname doesn't work for server sockets - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/dev-lang/python/files/python-3.2-CVE-2014-1912.patch b/dev-lang/python/files/python-3.2-CVE-2014-1912.patch deleted file mode 100644 index 0e09507..0000000 --- a/dev-lang/python/files/python-3.2-CVE-2014-1912.patch +++ /dev/null @@ -1,51 +0,0 @@ -# HG changeset patch -# User Benjamin Peterson <benjamin@python.org> -# Date 1389671978 18000 -# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c -# Parent 2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6 -complain when nbytes > buflen to fix possible buffer overflow (closes #20246) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -1968,6 +1968,14 @@ class BufferIOTest(SocketConnectedTest): - - _testRecvFromIntoMemoryview = _testRecvFromIntoArray - -+ def testRecvFromIntoSmallBuffer(self): -+ # See issue #20246. -+ buf = bytearray(8) -+ self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024) -+ -+ def _testRecvFromIntoSmallBuffer(self): -+ self.serv_conn.send(MSG*2048) -+ - - TIPC_STYPE = 2000 - TIPC_LOWER = 200 -diff --git a/Misc/ACKS b/Misc/ACKS ---- a/Misc/ACKS -+++ b/Misc/ACKS -@@ -1020,6 +1020,7 @@ Eric V. Smith - Christopher Smith - Gregory P. Smith - Roy Smith -+Ryan Smith-Roberts - Rafal Smotrzyk - Dirk Soede - Paul Sokolovsky -diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c ---- a/Modules/socketmodule.c -+++ b/Modules/socketmodule.c -@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s - if (recvlen == 0) { - /* If nbytes was not specified, use the buffer's length */ - recvlen = buflen; -+ } else if (recvlen > buflen) { -+ PyBuffer_Release(&pbuf); -+ PyErr_SetString(PyExc_ValueError, -+ "nbytes is greater than the length of the buffer"); -+ return NULL; - } - - readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr); diff --git a/dev-lang/python/files/python-3.2-CVE-2014-4616.patch b/dev-lang/python/files/python-3.2-CVE-2014-4616.patch deleted file mode 100644 index 5b0a397..0000000 --- a/dev-lang/python/files/python-3.2-CVE-2014-4616.patch +++ /dev/null @@ -1,39 +0,0 @@ -# HG changeset patch -# User Benjamin Peterson <benjamin@python.org> -# Date 1397441438 14400 -# Node ID 50c07ed1743da9cd4540d83de0c30bd17aeb41b0 -# Parent 218e28a935ab4494d05215c243e2129625a71893 -in scan_once, prevent the reading of arbitrary memory when passed a negative index - -Bug reported by Guido Vranken. - -Index: Python-3.2.5/Lib/json/tests/test_decode.py -=================================================================== ---- Python-3.2.5.orig/Lib/test/json_tests/test_decode.py 2014-06-26 18:40:10.825269130 +0200 -+++ Python-3.2.5/Lib/test/json_tests/test_decode.py 2014-06-26 18:40:21.962323035 +0200 -@@ -60,5 +60,9 @@ - msg = 'escape' - self.assertRaisesRegexp(ValueError, msg, self.loads, s) - -+ def test_negative_index(self): -+ d = self.json.JSONDecoder() -+ self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000) -+ - class TestPyDecode(TestDecode, PyTest): pass - class TestCDecode(TestDecode, CTest): pass -Index: Python-3.2.5/Modules/_json.c -=================================================================== ---- a/Modules/_json.c -+++ b/Modules/_json.c -@@ -930,7 +930,10 @@ scan_once_unicode(PyScannerObject *s, Py - PyObject *res; - Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr); - Py_ssize_t length = PyUnicode_GET_SIZE(pystr); -- if (idx >= length) { -+ if (idx < 0) -+ /* Compatibility with Python version. */ -+ idx += length; -+ if (idx < 0 || idx >= length) { - PyErr_SetNone(PyExc_StopIteration); - return NULL; - } diff --git a/dev-lang/python/files/python-3.2-issue16248.patch b/dev-lang/python/files/python-3.2-issue16248.patch deleted file mode 100644 index d0e80ca..0000000 --- a/dev-lang/python/files/python-3.2-issue16248.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Georg Brandl <georg@python.org> -# Date 1379142489 -7200 -# Node ID c18c18774e240377d47638fb23e8276c1ac2e606 -# Parent b9b521efeba385af0142988899a55de1c1c805c7 -Fix tkinter regression introduced by the security fix in #16248. - -diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py ---- a/Lib/tkinter/__init__.py -+++ b/Lib/tkinter/__init__.py -@@ -1722,7 +1722,7 @@ class Tk(Misc, Wm): - # ensure that self.tk is always _something_. - self.tk = None - if baseName is None: -- import sys, os -+ import os - baseName = os.path.basename(sys.argv[0]) - baseName, ext = os.path.splitext(baseName) - if ext not in ('.py', '.pyc', '.pyo'): diff --git a/dev-lang/python/files/python-3.3-CVE-2013-2099.patch b/dev-lang/python/files/python-3.3-CVE-2013-2099.patch deleted file mode 100644 index 44b9ace..0000000 --- a/dev-lang/python/files/python-3.3-CVE-2013-2099.patch +++ /dev/null @@ -1,51 +0,0 @@ -# HG changeset patch -# User Antoine Pitrou <solipsis@pitrou.net> -# Date 1368892602 -7200 -# Sat May 18 17:56:42 2013 +0200 -# Branch 3.3 -# Node ID c627638753e2d25a98950585b259104a025937a9 -# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d -Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). - -diff --git a/Lib/ssl.py b/Lib/ssl.py ---- a/Lib/ssl.py -+++ b/Lib/ssl.py -@@ -129,9 +129,16 @@ - pass - - --def _dnsname_to_pat(dn): -+def _dnsname_to_pat(dn, max_wildcards=1): - pats = [] - for frag in dn.split(r'.'): -+ if frag.count('*') > max_wildcards: -+ # Issue #17980: avoid denials of service by refusing more -+ # than one wildcard per fragment. A survery of established -+ # policy among SSL implementations showed it to be a -+ # reasonable choice. -+ raise CertificateError( -+ "too many wildcards in certificate DNS name: " + repr(dn)) - if frag == '*': - # When '*' is a fragment by itself, it matches a non-empty dotless - # fragment. -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -349,6 +349,17 @@ - self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') - self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') - -+ # Issue #17980: avoid denials of service by refusing more than one -+ # wildcard per fragment. -+ cert = {'subject': ((('commonName', 'a*b.com'),),)} -+ ok(cert, 'axxb.com') -+ cert = {'subject': ((('commonName', 'a*b.co*'),),)} -+ ok(cert, 'axxb.com') -+ cert = {'subject': ((('commonName', 'a*b*.com'),),)} -+ with self.assertRaises(ssl.CertificateError) as cm: -+ ssl.match_hostname(cert, 'axxbxxc.com') -+ self.assertIn("too many wildcards", str(cm.exception)) -+ - def test_server_side(self): - # server_hostname doesn't work for server sockets - ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/dev-lang/python/files/python-3.3-CVE-2014-4616.patch b/dev-lang/python/files/python-3.3-CVE-2014-4616.patch deleted file mode 100644 index c67b2e5..0000000 --- a/dev-lang/python/files/python-3.3-CVE-2014-4616.patch +++ /dev/null @@ -1,52 +0,0 @@ -# HG changeset patch -# User Benjamin Peterson <benjamin@python.org> -# Date 1397441438 14400 -# Node ID 50c07ed1743da9cd4540d83de0c30bd17aeb41b0 -# Parent 218e28a935ab4494d05215c243e2129625a71893 -in scan_once, prevent the reading of arbitrary memory when passed a negative index - -Bug reported by Guido Vranken. - -Index: Python-3.3.5/Lib/json/tests/test_decode.py -=================================================================== ---- Python-3.3.5.orig/Lib/test/test_json/test_decode.py 2014-06-26 18:40:10.825269130 +0200 -+++ Python-3.3.5/Lib/test/test_json/test_decode.py 2014-06-26 18:40:21.962323035 +0200 -@@ -60,5 +60,10 @@ - msg = 'escape' - self.assertRaisesRegexp(ValueError, msg, self.loads, s) - -+ def test_negative_index(self): -+ d = self.json.JSONDecoder() -+ self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000) -+ self.assertRaises(ValueError, d.raw_decode, u'a'*42, -50000) -+ - class TestPyDecode(TestDecode, PyTest): pass - class TestCDecode(TestDecode, CTest): pass -Index: Python-3.3.5/Misc/ACKS -=================================================================== ---- Python-3.3.5.orig/Misc/ACKS 2014-06-26 18:40:10.826269135 +0200 -+++ Python-3.3.5/Misc/ACKS 2014-06-26 18:40:21.962323035 +0200 -@@ -1085,6 +1085,7 @@ - Frank Visser - Johannes Vogel - Alex Volkov -+Guido Vranken - Martijn Vries - Niki W. Waibel - Wojtek Walczak -Index: Python-3.3.5/Modules/_json.c -=================================================================== ---- a/Modules/_json.c -+++ b/Modules/_json.c -@@ -975,7 +975,10 @@ scan_once_unicode(PyScannerObject *s, Py - kind = PyUnicode_KIND(pystr); - length = PyUnicode_GET_LENGTH(pystr); - -- if (idx >= length) { -+ if (idx < 0) -+ /* Compatibility with Python version. */ -+ idx += length; -+ if (idx < 0 || idx >= length) { - PyErr_SetNone(PyExc_StopIteration); - return NULL; - } diff --git a/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch b/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch deleted file mode 100644 index d963b9e..0000000 --- a/dev-lang/python/files/python-3.3.5-ncurses-pkg-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -do not hardcode /usr/include paths - ---- a/configure.ac -+++ b/configure.ac -@@ -668,6 +668,8 @@ AC_ARG_WITH(cxx_main, - ]) - AC_MSG_RESULT($with_cxx_main) - -+AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+ - preset_cxx="$CXX" - if test -z "$CXX" - then -@@ -1513,7 +1515,7 @@ dnl AC_MSG_RESULT($cpp_type) - # checks for header files - AC_HEADER_STDC - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" - AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \ - fcntl.h grp.h \ - ieeefp.h io.h langinfo.h libintl.h ncurses.h process.h pthread.h \ -@@ -2225,8 +2227,6 @@ LIBS="$withval $LIBS" - ], - [AC_MSG_RESULT(no)]) - --AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -- - # Check for use of the system expat library - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, -@@ -4273,7 +4273,7 @@ then - fi - - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" - # On HP/UX 11.0, mvwdelch is a block with a return statement - AC_MSG_CHECKING(whether mvwdelch is an expression) - AC_CACHE_VAL(ac_cv_mvwdelch_is_expression, diff --git a/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch b/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch deleted file mode 100644 index 8bfad11..0000000 --- a/dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch +++ /dev/null @@ -1,13 +0,0 @@ -do not hardcode /usr/include paths - ---- a/configure.ac -+++ b/configure.ac -@@ -4402,7 +4402,7 @@ fi - - # first curses header check - ac_save_cppflags="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -+CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags ncursesw`" - - AC_CHECK_HEADERS(curses.h ncurses.h) - diff --git a/dev-lang/python/files/python-config-2.4-r1 b/dev-lang/python/files/python-config-2.4-r1 deleted file mode 100644 index af45113..0000000 --- a/dev-lang/python/files/python-config-2.4-r1 +++ /dev/null @@ -1,58 +0,0 @@ -#! /usr/bin/python2.4 - -import sys -import os -import getopt -from distutils import sysconfig - -valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', - 'ldflags', 'help'] - -def exit_with_usage(code=1): - print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], - '|'.join('--'+opt for opt in valid_opts)) - sys.exit(code) - -try: - opts, args = getopt.getopt(sys.argv[1:], '', valid_opts) -except getopt.error: - exit_with_usage() - -if not opts: - #exit_with_usage() - #be compatible with our old python-config-2.4 - import string - print "-lpython2.4 -lm -L/usr/lib/python2.4/config",string.join(string.split(sysconfig.get_config_var("MODLIBS"))) - sys.exit(0) - -opt = opts[0][0] - -pyver = sysconfig.get_config_var('VERSION') -getvar = sysconfig.get_config_var - -if opt == '--help': - exit_with_usage(0) - -elif opt == '--prefix': - print sysconfig.PREFIX - -elif opt == '--exec-prefix': - print sysconfig.EXEC_PREFIX - -elif opt in ('--includes', '--cflags'): - flags = ['-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True)] - if opt == '--cflags': - flags.extend(getvar('CFLAGS').split()) - print ' '.join(flags) - -elif opt in ('--libs', '--ldflags'): - libs = getvar('LIBS').split() + getvar('SYSLIBS').split() - libs.append('-lpython'+pyver) - # add the prefix/lib/pythonX.Y/config dir, but only if there is no - # shared library in prefix/lib/. - if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): - libs.insert(0, '-L' + getvar('LIBPL')) - print ' '.join(libs) - - diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml deleted file mode 100644 index 51a9e80..0000000 --- a/dev-lang/python/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>python</herd> -<use> - <flag name="threads">Enable threading support. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag> - <flag name="wide-unicode">Enable wide Unicode implementation which uses 4-byte Unicode characters. Switching of this USE flag changes ABI of Python and requires reinstallation of many Python modules. (DON'T DISABLE THIS UNLESS YOU KNOW WHAT YOU'RE DOING)</flag> - <flag name="wininst">Install Windows executables required to create an executable installer for MS Windows.</flag> -</use> -</pkgmetadata> diff --git a/dev-lang/python/python-2.6.9.ebuild b/dev-lang/python/python-2.6.9.ebuild deleted file mode 100644 index 9ca66c6..0000000 --- a/dev-lang/python/python-2.6.9.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.9.ebuild,v 1.7 2015/04/23 19:25:27 floppym Exp $ - -EAPI="2" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib multiprocessing pax-utils python-utils-r1 toolchain-funcs unpacker - -MY_P="Python-${PV}" -PATCHSET_VERSION="${PV}-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tgz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.6" -#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - berkdb? ( || ( - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.3:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/portage-2.1.9" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.61 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types ) - doc? ( dev-python/python-docs:${SLOT} )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use berkdb; then - ewarn "'bsddb' module is out-of-date and no longer maintained inside" - ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally" - ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" - ewarn "is provided by dev-python/bsddb3." - else - if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then - ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]" - ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]." - ewarn "You might need to migrate your databases." - fi - fi -} - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib - - local excluded_patches - if ! tc-is-cross-compiler; then - excluded_patches="*_all_crosscompile.patch" - fi - - EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}/patches" - - epatch "${FILESDIR}/python-2.5-tcl86.patch" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - # dbm module can be linked against berkdb or gdbm. - # Defaults to gdbm when both are enabled, #204343. - local disable - use berkdb || use gdbm || disable+=" dbm" - use berkdb || disable+=" _bsddb" - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Run the configure scripts in parallel. - multijob_init - - mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}} - - if tc-is-cross-compiler; then - ( - multijob_child_init - cd "${WORKDIR}"/${CBUILD} >/dev/null - OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \ - "${S}"/configure \ - --{build,host}=${CBUILD} \ - || die "cross-configure failed" - ) & - multijob_post_fork - fi - - # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython2.6 correctly. - # Needed on FreeBSD unless Python 2.6 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - cd "${WORKDIR}"/${CHOST} - ECONF_SOURCE=${S} OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-libc="" \ - --with-system-ffi - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi - - if tc-is-cross-compiler; then - # Modify the Makefile.pre so we don't regen for the host/ one. - # We need to link the host python programs into $PWD and run - # them from here because the distutils sysconfig module will - # parse Makefile/etc... from argv[0], and we need it to pick - # up the target settings, not the host ones. - sed -i \ - -e '1iHOSTPYTHONPATH = ./hostpythonpath:' \ - -e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \ - -e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \ - Makefile{.pre,} || die "sed failed" - fi - - multijob_finish -} - -src_compile() { - if tc-is-cross-compiler; then - cd "${WORKDIR}"/${CBUILD} - # Disable as many modules as possible -- but we need a few to install. - PYTHON_DISABLE_MODULES=$( - sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \ - egrep -v '(unicodedata|time|cStringIO|_struct|binascii)' - ) \ - PTHON_DISABLE_SSL="1" \ - SYSROOT= \ - emake || die "cross-make failed" - # See comment in src_configure about these. - ln python ../${CHOST}/hostpython || die - ln Parser/pgen ../${CHOST}/Parser/hostpgen || die - ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die - fi - - cd "${WORKDIR}"/${CHOST} - default - - # Work around bug 329499. See also bug 413751. - pax-mark m python -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${WORKDIR}"/${CHOST} - - # Skip failing tests. - local skipped_tests="distutils tcl" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - # Rerun failed tests in verbose mode (regrtest -w). - PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-w" < /dev/tty - local result="$?" - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ "${result}" -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - [[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/" - - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${WORKDIR}"/${CHOST} - emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} || die - - # Fix collisions between different slots of Python. - mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" - mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" - mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" - mv "${ED}usr/share/man/man1/python.1" "${ED}usr/share/man/man1/python${SLOT}.1" - rm -f "${ED}usr/bin/smtpd.py" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test} - else - use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} - use berkdb || rm -fr "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed" - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r "${S}"/Tools || die "doins failed" - fi - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed" - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed" - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python \ - LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - export LD_LIBRARY_PATH - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.6" && ! has_version "${CATEGORY}/${PN}:2.7"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - [[ -z "${EROOT}" || (! -d "${EROOT}" && -d "${ROOT}") ]] && EROOT="${ROOT%/}${EPREFIX}/" - - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn "You should switch active version of Python ${PV%%.*} and run" - ewarn "'python-updater [options]' to rebuild Python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-2.7.9-r1.ebuild b/dev-lang/python/python-2.7.9-r1.ebuild deleted file mode 100644 index 774893e..0000000 --- a/dev-lang/python/python-2.7.9-r1.ebuild +++ /dev/null @@ -1,358 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.9-r1.ebuild,v 1.7 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.9-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.2 - sys-libs/db:5.1 - sys-libs/db:5.0 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/portage-2.1.9" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types ) - doc? ( dev-python/python-docs:${SLOT} )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use berkdb; then - ewarn "'bsddb' module is out-of-date and no longer maintained inside" - ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally" - ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" - ewarn "is provided by dev-python/bsddb3." - else - if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then - ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]" - ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]." - ewarn "You might need to migrate your databases." - fi - fi -} - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -r Modules/expat || die - rm -r Modules/_ctypes/libffi* || die - rm -r Modules/zlib || die - - if tc-is-cross-compiler; then - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - # Fix for cross-compiling. - epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - # dbm module can be linked against berkdb or gdbm. - # Defaults to gdbm when both are enabled, #204343. - local disable - use berkdb || use gdbm || disable+=" dbm" - use berkdb || disable+=" _bsddb" - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - if tc-is-cross-compiler; then - # Force some tests that try to poke fs paths. - export ac_cv_file__dev_ptc=no - export ac_cv_file__dev_ptmx=yes - fi - - # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython2.7 correctly. - # Needed on FreeBSD unless Python 2.7 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - if use berkdb; then - dbmliborder+="${dbmliborder:+:}bdb" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c - - cd "${BUILD_DIR}" || die - emake - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="distutils gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - # Rerun failed tests in verbose mode (regrtest -w). - emake test EXTRATESTOPTS="-w" < /dev/tty - local result="$?" - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ "${result}" -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - emake DESTDIR="${D}" altinstall - - sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" - mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" - mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" - rm -f "${ED}usr/bin/smtpd.py" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test} - else - use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die - use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die - use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} - fi - - use threads || rm -r "${libdir}/multiprocessing" || die - use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn "You should switch active version of Python ${PV%%.*} and run" - ewarn "'python-updater [options]' to rebuild Python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-2.7.9-r2.ebuild b/dev-lang/python/python-2.7.9-r2.ebuild deleted file mode 100644 index a91fa4a..0000000 --- a/dev-lang/python/python-2.7.9-r2.ebuild +++ /dev/null @@ -1,362 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.9-r2.ebuild,v 1.3 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.9-1" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.2 - sys-libs/db:5.1 - sys-libs/db:5.0 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/portage-2.1.9" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types ) - doc? ( dev-python/python-docs:${SLOT} )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use berkdb; then - ewarn "'bsddb' module is out-of-date and no longer maintained inside" - ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally" - ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" - ewarn "is provided by dev-python/bsddb3." - else - if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then - ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]" - ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]." - ewarn "You might need to migrate your databases." - fi - fi -} - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -r Modules/expat || die - rm -r Modules/_ctypes/libffi* || die - rm -r Modules/zlib || die - - if tc-is-cross-compiler; then - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - # Fix for cross-compiling. - epatch "${FILESDIR}/python-2.7.5-nonfatal-compileall.patch" - epatch "${FILESDIR}/python-2.7.9-ncurses-pkg-config.patch" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - # dbm module can be linked against berkdb or gdbm. - # Defaults to gdbm when both are enabled, #204343. - local disable - use berkdb || use gdbm || disable+=" dbm" - use berkdb || disable+=" _bsddb" - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - if tc-is-cross-compiler; then - # Force some tests that try to poke fs paths. - export ac_cv_file__dev_ptc=no - export ac_cv_file__dev_ptmx=yes - fi - - # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython2.7 correctly. - # Needed on FreeBSD unless Python 2.7 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - if use berkdb; then - dbmliborder+="${dbmliborder:+:}bdb" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c - - # Guide h2py to look into glibc of Prefix - use rap && export INCLUDE="${EPREFIX}"/usr/include - - cd "${BUILD_DIR}" || die - emake - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="distutils gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - # Rerun failed tests in verbose mode (regrtest -w). - emake test EXTRATESTOPTS="-w" < /dev/tty - local result="$?" - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ "${result}" -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - emake DESTDIR="${D}" altinstall - - sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}" - mv "${ED}usr/bin/pydoc" "${ED}usr/bin/pydoc${SLOT}" - mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" - rm -f "${ED}usr/bin/smtpd.py" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test} - else - use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*} || die - use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die - use tk || rm -r "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk} || die - use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} - fi - - use threads || rm -r "${libdir}/multiprocessing" || die - use wininst || rm -r "${libdir}/distutils/command/"wininst-*.exe || die - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version "${CATEGORY}/${PN}:2.7"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn "You should switch active version of Python ${PV%%.*} and run" - ewarn "'python-updater [options]' to rebuild Python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.2.5-r6.ebuild b/dev-lang/python/python-3.2.5-r6.ebuild deleted file mode 100644 index e11eff0..0000000 --- a/dev-lang/python/python-3.2.5-r6.ebuild +++ /dev/null @@ -1,384 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.5-r6.ebuild,v 1.11 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV}" -PATCHSET_REVISION="1" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.2" -KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types ) - doc? ( dev-python/python-docs:${SLOT} )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if [[ "${PV}" =~ ^3\.2(\.[1234])?(_pre)? ]]; then - rm -f "${EROOT}usr/$(get_libdir)/llibpython3.so" - else - die "Deprecated code not deleted" - fi -} - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -r Modules/expat - rm -r Modules/_ctypes/libffi* - rm -r Modules/zlib - - local excluded_patches - if ! tc-is-cross-compiler; then - excluded_patches="*_all_crosscompile.patch" - fi - - EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}/patches" - - epatch "${FILESDIR}/python-3.2-CVE-2013-2099.patch" - epatch "${FILESDIR}/CVE-2013-4238_py33.patch" - epatch "${FILESDIR}/python-3.2-issue16248.patch" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - # Disable ABI flags. - sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" - - # bug #514686 - epatch "${FILESDIR}/${PN}-3.2-CVE-2014-4616.patch" - # bug #500518 - epatch "${FILESDIR}/${PN}-3.2-CVE-2014-1912.patch" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Run the configure scripts in parallel. - multijob_init - - mkdir -p "${WORKDIR}"/{${CBUILD},${CHOST}} - - if tc-is-cross-compiler; then - ( - multijob_child_init - cd "${WORKDIR}"/${CBUILD} >/dev/null - OPT="-O1" CFLAGS="" CPPFLAGS="" LDFLAGS="" CC="" \ - "${S}"/configure \ - --{build,host}=${CBUILD} \ - || die "cross-configure failed" - ) & - multijob_post_fork - - # The configure script assumes it's buggy when cross-compiling. - export ac_cv_buggy_getaddrinfo=no - export ac_cv_have_long_long_format=yes - fi - - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - - cd "${WORKDIR}"/${CHOST} - ECONF_SOURCE=${S} OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - $(use_with wide-unicode) \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-computed-gotos \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi - - if tc-is-cross-compiler; then - # Modify the Makefile.pre so we don't regen for the host/ one. - # We need to link the host python programs into $PWD and run - # them from here because the distutils sysconfig module will - # parse Makefile/etc... from argv[0], and we need it to pick - # up the target settings, not the host ones. - sed -i \ - -e '1iHOSTPYTHONPATH = ./hostpythonpath:' \ - -e '/^HOSTPYTHON/s:=.*:= ./hostpython:' \ - -e '/^HOSTPGEN/s:=.*:= ./Parser/hostpgen:' \ - Makefile{.pre,} || die "sed failed" - fi - - multijob_finish -} - -src_compile() { - if tc-is-cross-compiler; then - cd "${WORKDIR}"/${CBUILD} - # Disable as many modules as possible -- but we need a few to install. - PYTHON_DISABLE_MODULES=$( - sed -n "/Extension('/{s:^.*Extension('::;s:'.*::;p}" "${S}"/setup.py | \ - egrep -v '(unicodedata|time|cStringIO|_struct|binascii)' - ) \ - PTHON_DISABLE_SSL="1" \ - SYSROOT= \ - emake - # See comment in src_configure about these. - ln python ../${CHOST}/hostpython || die - ln Parser/pgen ../${CHOST}/Parser/hostpgen || die - ln -s ../${CBUILD}/build/lib.*/ ../${CHOST}/hostpythonpath || die - fi - - cd "${WORKDIR}"/${CHOST} - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${WORKDIR}"/${CHOST} - - # Skip failing tests. - local skipped_tests="gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - # Rerun failed tests in verbose mode (regrtest -w). - PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-w" CPPFLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty - local result="$?" - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ "${result}" -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${WORKDIR}"/${CHOST} - emake DESTDIR="${D}" altinstall - - sed \ - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ - -e "s/\(PY_LDFLAGS=\).*/\1/" \ - -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - rm "${ED}usr/$(get_libdir)/libpython3.so" || die - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} - else - use elibc_uclibc && rm -fr "${libdir}/test" - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python \ - LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - export LD_LIBRARY_PATH - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - ewarn "Please note that Python ${PV%.*} is no longer supported in Gentoo." - ewarn "The interpreter is not well maintained, and may contain security" - ewarn "vulnerabilities. Gentoo ebuilds will no longer be built with support" - ewarn "for Python ${PV%.*}." - ewarn - ewarn "If you wish to use Python ${PV%.*} for your own purposes (development," - ewarn "testing), we suggest establishing a virtualenv for this interpreter," - ewarn "and installing the necessary dependencies inside it. However, we also" - ewarn "strongly discourage using Python ${PV%.*} on production systems." -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.3.5-r1.ebuild b/dev-lang/python/python-3.3.5-r1.ebuild deleted file mode 100644 index 7beb6c9..0000000 --- a/dev-lang/python/python-3.3.5-r1.ebuild +++ /dev/null @@ -1,325 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.5-r1.ebuild,v 1.12 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV}" -PATCHSET_VERSION="${PV}-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz - mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - app-arch/xz-utils - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/sandbox-2.6-r1" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types ) - doc? ( dev-python/python-docs:${SLOT} )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib - - if tc-is-cross-compiler; then - # Invokes BUILDPYTHON, which is built for the host arch - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - epatch "${FILESDIR}/${PN}-3.3.5-ncurses-pkg-config.patch" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - # Disable ABI flags. - sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" - - # bug #514686 - epatch "${FILESDIR}/${PN}-3.3-CVE-2014-4616.patch" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-computed-gotos \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c || die - - cd "${BUILD_DIR}" || die - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - PYTHONDONTWRITEBYTECODE="" emake test EXTRATESTOPTS="-u -network" FLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty - local result="$?" - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ "${result}" -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - - emake DESTDIR="${D}" altinstall - - sed \ - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ - -e "s/\(PY_LDFLAGS=\).*/\1/" \ - -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} - else - use elibc_uclibc && rm -fr "${libdir}/test" - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - ewarn - ewarn "For legacy packages, you should switch active version of Python and run 'python-updater [options]' to rebuild Python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.4.0.ebuild b/dev-lang/python/python-3.4.0.ebuild deleted file mode 100644 index b89c063..0000000 --- a/dev-lang/python/python-3.4.0.ebuild +++ /dev/null @@ -1,320 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.0.ebuild,v 1.4 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.0-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz - mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - app-arch/xz-utils - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/sandbox-2.6-r1" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib - - if tc-is-cross-compiler; then - # Invokes BUILDPYTHON, which is built for the host arch - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - # Disable ABI flags. - sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-computed-gotos \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c || die - - cd "${BUILD_DIR}" || die - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty - local result=$? - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ ${result} -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - - emake DESTDIR="${D}" altinstall - - sed \ - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ - -e "s/\(PY_LDFLAGS=\).*/\1/" \ - -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} - else - use elibc_uclibc && rm -fr "${libdir}/test" - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.4.1.ebuild b/dev-lang/python/python-3.4.1.ebuild deleted file mode 100644 index 0ef929b..0000000 --- a/dev-lang/python/python-3.4.1.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.1.ebuild,v 1.12 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.1-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - app-arch/xz-utils - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/sandbox-2.6-r1" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib - - if tc-is-cross-compiler; then - # Invokes BUILDPYTHON, which is built for the host arch - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - # Disable ABI flags. - sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-computed-gotos \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c || die - - cd "${BUILD_DIR}" || die - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty - local result=$? - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ ${result} -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - - emake DESTDIR="${D}" altinstall - - sed \ - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ - -e "s/\(PY_LDFLAGS=\).*/\1/" \ - -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} - else - use elibc_uclibc && rm -fr "${libdir}/test" - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.4.2.ebuild b/dev-lang/python/python-3.4.2.ebuild deleted file mode 100644 index fa9b136..0000000 --- a/dev-lang/python/python-3.4.2.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.2.ebuild,v 1.2 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_AUTOMAKE="none" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.2-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - app-arch/xz-utils - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/sandbox-2.6-r1" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib - - if tc-is-cross-compiler; then - # Invokes BUILDPYTHON, which is built for the host arch - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - # Disable ABI flags. - sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" - - epatch_user - - eautoconf - eautoheader -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-computed-gotos \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c || die - - cd "${BUILD_DIR}" || die - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty - local result=$? - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ ${result} -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - - emake DESTDIR="${D}" altinstall - - sed \ - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ - -e "s/\(PY_LDFLAGS=\).*/\1/" \ - -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} - else - use elibc_uclibc && rm -fr "${libdir}/test" - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild deleted file mode 100644 index c70b8d5..0000000 --- a/dev-lang/python/python-3.4.3.ebuild +++ /dev/null @@ -1,318 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.4.3.ebuild,v 1.3 2015/03/31 18:46:33 ulm Exp $ - -EAPI="4" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.4.3-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.4" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2 - app-arch/xz-utils - >=sys-libs/zlib-1.1.3 - virtual/libffi - virtual/libintl - !build? ( - gdbm? ( sys-libs/gdbm[berkdb] ) - ncurses? ( - >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) - ) - sqlite? ( >=dev-db/sqlite-3.3.8:3 ) - ssl? ( dev-libs/openssl ) - tk? ( - >=dev-lang/tk-8.0 - dev-tcltk/blt - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - ) - !!<sys-apps/sandbox-2.6-r1" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/autoconf-2.65 - !sys-devel/gcc[libffi]" -RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND="app-eselect/eselect-python - app-admin/python-updater" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Ensure that internal copies of expat, libffi and zlib are not used. - rm -fr Modules/expat - rm -fr Modules/_ctypes/libffi* - rm -fr Modules/zlib - - if tc-is-cross-compiler; then - # Invokes BUILDPYTHON, which is built for the host arch - local EPATCH_EXCLUDE="*_regenerate_platform-specific_modules.patch" - fi - - EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" - epatch "${FILESDIR}/${PN}-3.4.3-ncurses-pkg-config.patch" - - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Lib/sysconfig.py \ - Lib/test/test_site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" - - # Disable ABI flags. - sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" - - epatch_user - - eautoreconf -} - -src_configure() { - if use build; then - # Disable extraneous modules with extra dependencies. - export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat" - export PYTHON_DISABLE_SSL="1" - else - local disable - use gdbm || disable+=" gdbm" - use ncurses || disable+=" _curses _curses_panel" - use readline || disable+=" readline" - use sqlite || disable+=" _sqlite3" - use ssl || export PYTHON_DISABLE_SSL="1" - use tk || disable+=" _tkinter" - use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. - export PYTHON_DISABLE_MODULES="${disable}" - - if ! use xml; then - ewarn "You have configured Python without XML support." - ewarn "This is NOT a recommended configuration as you" - ewarn "may face problems parsing any XML documents." - fi - fi - - if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then - einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" - fi - - if [[ "$(gcc-major-version)" -ge 4 ]]; then - append-flags -fwrapv - fi - - filter-flags -malign-double - - [[ "${ARCH}" == "alpha" ]] && append-flags -fPIC - - # https://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flagq -O3; then - is-flagq -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. - tc-export CXX - # The configure script fails to use pkg-config correctly. - # http://bugs.python.org/issue15506 - export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) - - # Set LDFLAGS so we link modules with -lpython3.2 correctly. - # Needed on FreeBSD unless Python 3.2 is already installed. - # Please query BSD team before removing this! - append-ldflags "-L." - - local dbmliborder - if use gdbm; then - dbmliborder+="${dbmliborder:+:}gdbm" - fi - - BUILD_DIR="${WORKDIR}/${CHOST}" - mkdir -p "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - ECONF_SOURCE="${S}" OPT="" \ - econf \ - --with-fpectl \ - --enable-shared \ - $(use_enable ipv6) \ - $(use_with threads) \ - --infodir='${prefix}/share/info' \ - --mandir='${prefix}/share/man' \ - --with-computed-gotos \ - --with-dbmliborder="${dbmliborder}" \ - --with-libc="" \ - --enable-loadable-sqlite-extensions \ - --with-system-expat \ - --with-system-ffi \ - --without-ensurepip - - if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then - eerror "configure has detected that the sem_open function is broken." - eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." - die "Broken sem_open function (bug 496328)" - fi -} - -src_compile() { - # Avoid invoking pgen for cross-compiles. - touch Include/graminit.h Python/graminit.c || die - - cd "${BUILD_DIR}" || die - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" - - # Work around bug 329499. See also bug 413751 and 457194. - if has_version dev-libs/libffi[pax_kernel]; then - pax-mark E python - else - pax-mark m python - fi -} - -src_test() { - # Tests will not work when cross compiling. - if tc-is-cross-compiler; then - elog "Disabling tests due to crosscompiling." - return - fi - - cd "${BUILD_DIR}" || die - - # Skip failing tests. - local skipped_tests="gdb" - - for test in ${skipped_tests}; do - mv "${S}"/Lib/test/test_${test}.py "${T}" - done - - local -x PYTHONDONTWRITEBYTECODE= - emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty - local result=$? - - for test in ${skipped_tests}; do - mv "${T}/test_${test}.py" "${S}"/Lib/test - done - - elog "The following tests have been skipped:" - for test in ${skipped_tests}; do - elog "test_${test}.py" - done - - elog "If you would like to run them, you may:" - elog "cd '${EPREFIX}/usr/$(get_libdir)/python${SLOT}/test'" - elog "and run the tests separately." - - if [[ ${result} -ne 0 ]]; then - die "emake test failed" - fi -} - -src_install() { - local libdir=${ED}/usr/$(get_libdir)/python${SLOT} - - cd "${BUILD_DIR}" || die - - emake DESTDIR="${D}" altinstall - - sed \ - -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ - -e "s/\(PY_LDFLAGS=\).*/\1/" \ - -i "${libdir}/config-${SLOT}/Makefile" || die "sed failed" - - # Backwards compat with Gentoo divergence. - dosym python${SLOT}-config /usr/bin/python-config-${SLOT} - - # Fix collisions between different slots of Python. - rm -f "${ED}usr/$(get_libdir)/libpython3.so" - - if use build; then - rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,sqlite3,test,tkinter} - else - use elibc_uclibc && rm -fr "${libdir}/test" - use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*} - use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,tkinter,test/test_tk*} - fi - - use threads || rm -fr "${libdir}/multiprocessing" - use wininst || rm -f "${libdir}/distutils/command/"wininst-*.exe - - dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS} - - if use examples; then - insinto /usr/share/doc/${PF}/examples - find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr - doins -r "${S}"/Tools - fi - insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 - local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ - emake --no-print-directory -s -f - 2>/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - python_export python${SLOT} EPYTHON PYTHON PYTHON_SITEDIR - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}. - fi - - echo "EPYTHON='${EPYTHON}'" > epython.py - python_domodule epython.py -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest deleted file mode 100644 index 9321414..0000000 --- a/dev-libs/libdbusmenu-qt/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX libdbusmenu-qt-0.9.2-optionaltests.patch 307 SHA256 54ab953b82ca7d42900d6141b1f276c34b58f332c339962545eddf025327ee4c SHA512 902d98866fb01614d443afb67d355420f3bc0153a39b154366f19d74ea167886178aec341af0a21f252b84bc8d9323de59401073d8e0e32ed0b912f3bf4a0b51 WHIRLPOOL 333e5588b9a64165060a6054f86ad04d76fbfd00148cf279edfe6d950d06b5531e18922620d0d00ec025e13125a948446d0625911f101776347ad5ade5e41e3c -AUX libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch 383 SHA256 ecd136a04d75f7f7bb0579b3f873a7c2672af632c4b0265c856c2dcbabe618fe SHA512 e4eb10ac0be553efb57b1b9d74dd28e05ad370b3e1e38496122c950083181184f4d442790ff3017badcabf2393424b6416ad268d7cc3f9ec60cee6048d091271 WHIRLPOOL 65d8e8a9c25466847f14b8c3cc11c743c0ade5c828441ba56285c1b5f6bfdb1dda2670dd31d3b26b98d2c1579efc67272b0f11f2b7317a1469e9b1d9976b58d6 -DIST libdbusmenu-qt-0.9.2.tar.xz 242888 SHA256 ecd1108f637c4c58946aff2aba70010f8060bd87c1acc85a917c2b3f43cf406d SHA512 93471a03cfc127babc58cf07b1caa30ae901ad2d213790d5085117f331a6cea0d2ab6b5ba21abdf582c40f172ff8e8168a185fa1a27d7d367a01a3b6ed731155 WHIRLPOOL b38e23c9def7802040c8ce94bcce6a644cf5e088a90fda091a2ba75b5a332b36d97f00d998f8c1b1942101eceecdb8c78612fcb3ee5f0604de98f65aa33cb3f7 -DIST libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz 46641 SHA256 e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968 SHA512 791c1904a1c960a94bba2c624469d8a9c1c76e14fc40917feb5aeb8c55acc6c68a0b03509037440f35ad8416710cbe705c1b117b23a9a684b6ff0d919d1d5e18 WHIRLPOOL b76294a4c9cdf943594f685aeae13e12db8d6f0b85f4a86031023c15072cdae619ff70c95e8db40eaeb9acb8d234e48e45ca79899c835b068387df040f688160 -EBUILD libdbusmenu-qt-0.9.2.ebuild 1462 SHA256 26d334c6ed3e1a9300fb9cc4d927e2d8d8b8297d38f2122050702df11c39e80c SHA512 e177b06fba176ac4ebe17a80c4823d2a678b66fb0cd7789e1996a75bd429ce2ed76fefa632142d6bd569e684150e41954bb14edf6a321c925814a115c9a55900 WHIRLPOOL fffedd78e414bdce4d307363273a7c219ba3929e420b7b532cbb3fff3382709d689b07d33283f5126bf7e1e711d984ef57b2c5c751517307e80ad83993a8fb88 -EBUILD libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild 3078 SHA256 170dafd85790f25b4e007fc688b5627d033cababb3b974f861deb598e50d9366 SHA512 2111bf39e1ea2810c45cf4377be030d986ca3c6f5a13bbb2b02c6a760871c957cf514492006924d4cfc6c5c63542f1489accb001f5a1ef25ca28ee028d1cccfe WHIRLPOOL ce6eca263d49e26151757e54f812a77424135343875e2051ae1c0b476167493d5e4d01b66c164e60caee56fe258671e66902a1dc4e30d6fa89d90c664fa046b0 -EBUILD libdbusmenu-qt-0.9.3_pre20140619.ebuild 2214 SHA256 fd0fc0c7f8170312bdf0c77ac78ff3a0f9e7f6d201469f18462d81b7fdae7f4c SHA512 57531fca03a8ddf4ca6975c6e24da33b8e2a4bd3240ee316ab1e159c873f9e6f8e7f91aa3e84b7a306b83c671a236bdea89b4367a693ceaf14001da989800d4a WHIRLPOOL 19a14a3f93c0a24ebe218f3dbccdf4cc41c319d3215852733ba77ddb4fc6efabd6456b081a70dc927291346df9c3e0e9ce2433eed83ccb65ee67d2226675e734 -MISC metadata.xml 333 SHA256 5b6f9ebdea3a331b723d00c0f5d44da4487b01fd9aaab7c63b28398369db5886 SHA512 ff7239d66ef81a8b02d446194b53d54c61a12fa139a621f6dc71d61f5e3e3b75c036a1648ce75d7340af27e067d1ff15492be2edbbab4a44d51a7ee25177a94b WHIRLPOOL ff845f015fa8e65678a4be5dcdad0af011c4004a4c227ac01a741bd7030bbe7be70a7f3f3da19f3125df2e4cb4eae581b42beb7dc5a547b44a1085a13a91caff diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch deleted file mode 100644 index 35df463..0000000 --- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -59,8 +59,13 @@ - DESTINATION lib${LIB_SUFFIX}/pkgconfig - ) - -+ -+option(BUILD_TESTS "Build tests" ON) -+ - add_subdirectory(src) --add_subdirectory(tests) -+if(BUILD_TESTS) -+ add_subdirectory(tests) -+endif(BUILD_TESTS) - add_subdirectory(tools) - - if(WITH_DOC) diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch deleted file mode 100644 index 7f6d82e..0000000 --- a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.old 2014-10-10 21:14:47.139654992 +0200 -+++ CMakeLists.txt 2014-10-10 21:16:17.114656451 +0200 -@@ -90,8 +90,12 @@ - ) - - add_subdirectory(src) -+ -+option(BUILD_TESTS "Build tests for qt4" ON) - if (NOT USE_QT5) # TODO port tests to Qt5 --add_subdirectory(tests) -+ if(BUILD_TESTS) -+ add_subdirectory(tests) -+ endif(BUILD_TESTS) - endif() - add_subdirectory(tools) - diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild deleted file mode 100644 index 9da60e5..0000000 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -QT_DEPEND="4.6.3" -EBZR_REPO_URI="lp:libdbusmenu-qt" - -[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr" -inherit cmake-utils virtualx ${BZR_ECLASS} - -DESCRIPTION="A library providing Qt implementation of DBusMenu specification" -HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" -if [[ ${PV} == 9999* ]] ; then - KEYWORDS="" -else - #SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - # upstream has no permissions to use some kde written code so repack git - # repo every time - SRC_URI="https://dev.gentoo.org/~creffett/${P}.tar.xz" - KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc" - -RDEPEND=" - >=dev-qt/qtcore-${QT_DEPEND}:4 - >=dev-qt/qtdbus-${QT_DEPEND}:4 - >=dev-qt/qtgui-${QT_DEPEND}:4 -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-libs/qjson - >=dev-qt/qttest-${QT_DEPEND}:4 - ) -" - -DOCS=( NEWS README ) -PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" ) - -# tests fail due to missing conection to dbus -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_build test TESTS) - $(cmake-utils_use_with doc) - ) - cmake-utils_src_configure -} - -src_test() { - local builddir=${CMAKE_BUILD_DIR} - - CMAKE_BUILD_DIR=${CMAKE_BUILD_DIR}/tests \ - VIRTUALX_COMMAND=cmake-utils_src_test virtualmake - - CMAKE_BUILD_DIR=${builddir} -} diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild deleted file mode 100644 index 2c43b71..0000000 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EBZR_REPO_URI="lp:libdbusmenu-qt" - -[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr" -inherit multibuild multilib virtualx ${BZR_ECLASS} cmake-multilib - -DESCRIPTION="A library providing Qt implementation of DBusMenu specification" -HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" -if [[ ${PV} == 9999* ]] ; then - KEYWORDS="ppc64 x86" -else - MY_PV=${PV/_pre/+14.10.} - SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz" - # upstream has no permissions to use some kde written code so repack git - # repo every time - #SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" ) -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +qt4 qt5" -S=${WORKDIR}/${PN}-${MY_PV} - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - qt4? ( - >=dev-qt/qtcore-4.8.6:4[${MULTILIB_USEDEP}] - >=dev-qt/qtdbus-4.8.6:4[${MULTILIB_USEDEP}] - >=dev-qt/qtgui-4.8.6:4[${MULTILIB_USEDEP}] - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-libs/qjson[${MULTILIB_USEDEP}] - qt4? ( >=dev-qt/qttest-4.8.6:4[${MULTILIB_USEDEP}] ) - qt5? ( dev-qt/qttest:5 ) - ) -" - -DOCS=( NEWS README ) - -# tests fail due to missing connection to dbus -RESTRICT="test" - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usex qt4 4) $(usex qt5 5) ) -} - -src_prepare() { - [[ ${PV} == 9999* ]] && bzr_src_prepare - cmake-utils_src_prepare - - comment_add_subdirectory tools - use test || comment_add_subdirectory tests -} - -multilib_src_configure() { - local mycmakeargs=( - $(cmake-utils_use_with doc) - -DUSE_QT${QT_MULTIBUILD_VARIANT}=ON - -DQT_QMAKE_EXECUTABLE="${EPREFIX}/usr/bin/qmake" - ) - export QT_SELECT=${QT_MULTIBUILD_VARIANT} - cmake-utils_src_configure -} - -src_configure() { - myconfigure() { - local QT_MULTIBUILD_VARIANT=${MULTIBUILD_VARIANT} - if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then - cmake-multilib_src_configure - elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then - multilib_src_configure - fi - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - mycompile() { - if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then - cmake-multilib_src_compile - elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then - cmake-utils_src_compile - fi - } - - multibuild_foreach_variant mycompile -} - -src_install() { - myinstall() { - if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then - cmake-multilib_src_install - elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then - cmake-utils_src_install - fi - } - - multibuild_foreach_variant myinstall -} - -src_test() { - mytest() { - if [[ ${MULTIBUILD_VARIANT} = 4 ]] ; then - cmake-multilib_src_test - elif [[ ${MULTIBUILD_VARIANT} = 5 ]] ; then - multilib_src_test - fi - } - - multibuild_foreach_variant mytest -} - -multilib_src_test() { - local builddir=${BUILD_DIR} - - BUILD_DIR=${BUILD_DIR}/tests \ - VIRTUALX_COMMAND=cmake-utils_src_test virtualmake - - BUILD_DIR=${builddir} -} diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild deleted file mode 100644 index e01132c..0000000 --- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EBZR_REPO_URI="lp:libdbusmenu-qt" - -[[ ${PV} == 9999* ]] && BZR_ECLASS="bzr" -inherit cmake-utils multibuild virtualx ${BZR_ECLASS} - -DESCRIPTION="A library providing Qt implementation of DBusMenu specification" -HOMEPAGE="https://launchpad.net/libdbusmenu-qt/" -if [[ ${PV} == 9999* ]] ; then - KEYWORDS="" -else - MY_PV=${PV/_pre/+14.10.} - SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz" - # upstream has no permissions to use some kde written code so repack git - # repo every time - #SRC_URI="https://dev.gentoo.org/~scarabeus/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" ) -fi - -LICENSE="LGPL-2" -SLOT="0" -IUSE="debug doc +qt4 qt5" -S=${WORKDIR}/${PN}-${MY_PV} - -REQUIRED_USE="|| ( qt4 qt5 )" - -RDEPEND=" - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - dev-libs/qjson - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - ) -" - -DOCS=( NEWS README ) - -# tests fail due to missing connection to dbus -RESTRICT="test" - -pkg_setup() { - MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) ) -} - -src_prepare() { - [[ ${PV} == 9999* ]] && bzr_src_prepare - cmake-utils_src_prepare - - use test || comment_add_subdirectory tests -} - -src_configure() { - myconfigure() { - local mycmakeargs=( - $(cmake-utils_use_with doc) - ) - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then - mycmakeargs+=( -DUSE_QT4=ON ) - fi - if [[ ${MULTIBUILD_VARIANT} = qt5 ]] ; then - mycmakeargs+=( -DUSE_QT5=ON ) - fi - - cmake-utils_src_configure - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant cmake-utils_src_compile -} - -src_test() { - mytest() { - local builddir=${BUILD_DIR} - - BUILD_DIR=${BUILD_DIR}/tests \ - VIRTUALX_COMMAND=cmake-utils_src_test virtualmake - - BUILD_DIR=${builddir} - } - - multibuild_foreach_variant mytest -} - -src_install() { - multibuild_foreach_variant cmake-utils_src_install -} diff --git a/dev-libs/libdbusmenu-qt/metadata.xml b/dev-libs/libdbusmenu-qt/metadata.xml deleted file mode 100644 index 87f282a..0000000 --- a/dev-libs/libdbusmenu-qt/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>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <remote-id type="launchpad">ubuntu</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-python/mongodict/Manifest b/dev-python/mongodict/Manifest deleted file mode 100644 index f1a5503..0000000 --- a/dev-python/mongodict/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mongodict-0.3.0.tar.gz 16079 SHA256 ff5867db78c9f79bd4f95e04ae6943bb93b7d194e45220697207e0e7378d419e SHA512 3695f76f14d4bbf00a2f5c0f79079eaf339b94c3704c9d290e6289b4ded6de8adf2d02a36e674d54fc53be35b217f52708a42449b25ca5c6aaf895f676fead92 WHIRLPOOL 506602f402b035e0df39507a39771d859960c1e7f06f976b0dcd80ce2393c8d5284936c4686e1e695266f21630958e5f0a9c169d6da108f78130b3d1c33e6e2e -EBUILD mongodict-0.3.0.ebuild 418 SHA256 6270a42e032f59479c7a1e0a9cfd259acc88436d9a323d75180da8a6def03dfc SHA512 0f9f740b1e33ddb71d1d7fbd26624949657ec85e399cd9e058ac0ca168c9c4983af0b397b581e66536fe1a9491a66e1c1d695875c20ab06df8c2012359522e3b WHIRLPOOL 8095d966870dec0962109745c9ab188e23b22a5b9a0f4397423e6223e99d377368366392846aa1de8b0b55dec4351164f56171d759ef21b43615380f38849b81 -MISC metadata.xml 198 SHA256 a6cced7fd655d4e5e10239d91957eb486c00169084460d93433922262241bcab SHA512 33543ed4e9dc5bc7a5459c9125d4261d6fb1b148e8b11a84c87180e91fc5df01e3198145283d225e2155f0da9f601df3f52501e8e8805029fe6f4ce039ca87f6 WHIRLPOOL 721377940fa57bccddaeb00f9862f73dd97d6eb58115d7ff85e81743e89d58f16efe91d84ebc4f2dd9aeb84802aa229a2be3182b15750e38cfbe581629232f54 diff --git a/dev-python/mongodict/metadata.xml b/dev-python/mongodict/metadata.xml deleted file mode 100644 index 0923903..0000000 --- a/dev-python/mongodict/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>no-herd</herd> - <longdescription></longdescription> -</pkgmetadata> diff --git a/dev-python/mongodict/mongodict-0.3.0.ebuild b/dev-python/mongodict/mongodict-0.3.0.ebuild deleted file mode 100644 index 9f30066..0000000 --- a/dev-python/mongodict/mongodict-0.3.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - - -DESCRIPTION="MongoDB-backed Python dict-like interface" -HOMEPAGE="https://github.com/turicas/mongodict/" -SRC_URI="mirror://pypi/m/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -RDEPEND="dev-python/pymongo" - - diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog deleted file mode 100644 index 15e529d..0000000 --- a/dev-python/wxpython/ChangeLog +++ /dev/null @@ -1,1008 +0,0 @@ -# ChangeLog for dev-python/wxpython -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.209 2014/12/31 17:38:10 floppym Exp $ - -*wxpython-3.0.2.0 (31 Dec 2014) - - 31 Dec 2014; Mike Gilbert <floppym@gentoo.org> +wxpython-3.0.2.0.ebuild: - Version bump, bug 532016. - -*wxpython-3.0.1.1 (06 Oct 2014) - - 06 Oct 2014; Mart Raudsepp <leio@gentoo.org> +wxpython-3.0.1.1.ebuild: - Version bump - - 19 May 2014; Michał Górny <mgorny@gentoo.org> -wxpython-2.8.12.1-r1.ebuild: - Drop the old versions that required python-exec:0. - - 19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - Stable for alpha, wrt bug #499472 - - 18 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - Stable for ia64, wrt bug #499472 - - 12 Mar 2014; Markus Meier <maekke@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - arm stable, bug #499472 - - 12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - Stable for sparc, wrt bug #499472 - - 06 Mar 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - Stable for ppc64, wrt bug #499472 - - 02 Mar 2014; Pacho Ramos <pacho@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - amd64 stable, bug #499472 - - 24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> - wxpython-2.8.12.1-r2.ebuild: - x86 stable wrt bug #499472 - - 02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - Stable for ppc, wrt bug #499472 - - 28 Jan 2014; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.12.1-r2.ebuild: - Stable for HPPA (bug #499472). - - 27 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.12.1.ebuild, - -wxpython-2.9.3.1.ebuild, -wxpython-2.9.4.1-r1.ebuild: - Remove old. - - 18 Jan 2014; Ryan Hill <dirtyepic@gentoo.org> wxpython-3.0.0.0.ebuild: - Add libnotify USE flag to force a rebuild if the corresponding wxGTK flag - changes (bug #498068). - -*wxpython-3.0.0.0 (30 Dec 2013) - - 30 Dec 2013; Ryan Hill <dirtyepic@gentoo.org> +wxpython-3.0.0.0.ebuild, - +files/wxpython-3.0.0.0-wxversion-scripts.patch, - +files/wxpython-3.0-wxversion-demo.patch: - Version bump (bug #485184). - - 12 Dec 2013; Justin Lecher <jlec@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.8.12.1-r1.ebuild, wxpython-2.8.12.1-r2.ebuild, - wxpython-2.9.4.1-r1.ebuild, wxpython-2.9.4.1-r2.ebuild, metadata.xml: - Call distutils-r1_python_install_all; don't use elog for empty lines - - 30 Oct 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild, - wxpython-2.8.12.1-r2.ebuild, wxpython-2.9.4.1-r1.ebuild, - wxpython-2.9.4.1-r2.ebuild: - Update the dep to use dev-lang/python-exec. - -*wxpython-2.9.4.1-r2 (23 Oct 2013) -*wxpython-2.8.12.1-r2 (23 Oct 2013) - - 23 Oct 2013; Michał Górny <mgorny@gentoo.org> +wxpython-2.8.12.1-r2.ebuild, - +wxpython-2.9.4.1-r2.ebuild: - Support python-exec:2. - - 06 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.12.1.ebuild: - Drop to ~sh. - - 17 Sep 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild, - wxpython-2.9.4.1-r1.ebuild: - Force python-exec:0 since the ebuild does hackery on top of script wrapping. - - 06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for sparc, wrt bug #477480 - - 05 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for ppc64, wrt bug #477480 - - 01 Sep 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for alpha, wrt bug #477480 - - 29 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for ia64, wrt bug #477480 - - 25 Aug 2013; Markus Meier <maekke@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - arm stable, bug #477480 - - 19 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for ppc, wrt bug #477480 - - 18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for x86, wrt bug #477480 - - 15 Aug 2013; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for HPPA (bug #477480). - - 13 Aug 2013; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1-r1.ebuild: - Stable for amd64, wrt bug #477480 - - 22 Apr 2013; Michał Górny <mgorny@gentoo.org> - +files/wxpython-2.8.12.1-disable-egging-mode.patch, - wxpython-2.8.12.1-r1.ebuild, wxpython-2.9.4.1-r1.ebuild: - Fix alternating install design by the egg_info command. Fixes bug #466302. - - 10 Apr 2013; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.12.1-r1.ebuild, - -wxpython-2.9.4.1.ebuild, wxpython-2.9.4.1-r1.ebuild: - Add slot operator to libpng dep. - - 26 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.12.1-r1.ebuild, - +files/wxpython-2.8-no-preservatives-added.patch, wxpython-2.9.3.1.ebuild, - wxpython-2.9.4.1-r1.ebuild: - Prevent build system from considering preserved libs when checking wxGTK - features. (bug #376339). - - 19 Mar 2013; Michał Górny <mgorny@gentoo.org> wxpython-2.8.12.1-r1.ebuild, - wxpython-2.9.4.1-r1.ebuild: - Use separate platlib & purelib build directory, fixes bug #455332. - - 04 Mar 2013; Ian Delaney <idella4@gentoo.org> - files/wxpython-2.8.12-drop-categories.patch: - Correction to patch wrt Bug #457586 - - 04 Mar 2013; Ian Delaney <idella4@gentoo.org> - +files/wxpython-2.8.12-drop-categories.patch, wxpython-2.8.12.1-r1.ebuild: - Patch added wrt Bug #457586 by Ago - -*wxpython-2.9.4.1-r1 (06 Feb 2013) -*wxpython-2.8.12.1-r1 (06 Feb 2013) - - 06 Feb 2013; Michał Górny <mgorny@gentoo.org> +wxpython-2.8.12.1-r1.ebuild, - +wxpython-2.9.4.1-r1.ebuild: - Migrate to distutils-r1. Reviewed by Ryan Hill in bug #455332. - - 05 Sep 2012; Justin Lecher <jlec@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.9.3.1.ebuild, wxpython-2.9.4.1.ebuild: - Use doicon instead insinto + doins to install icon files - - 05 Sep 2012; Justin Lecher <jlec@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.9.3.1.ebuild, wxpython-2.9.4.1.ebuild: - Use domenu instead insinto + doins to install .desktop files - - 08 Aug 2012; Ryan Hill <dirtyepic@gentoo.org> - +files/wxpython-2.8.11-drop-editra.patch: - Restore lost patch (bug #430288). - -*wxpython-2.9.4.1 (28 Jul 2012) - - 28 Jul 2012; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.9.4.1.ebuild, - +files/wxpython-2.9.4.1-wxversion-scripts.patch: - Version bump. - - 28 Jul 2012; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.11.0.ebuild, - -files/wxpython-2.8.11-drop-editra.patch, -wxpython-2.8.12.0.ebuild, - -wxpython-2.9.1.1.ebuild: - Remove old. - - 29 May 2012; Alexis Ballier <aballier@gentoo.org> wxpython-2.8.12.1.ebuild: - keyword ~amd64-fbsd - - 06 May 2012; Justin Lecher <jlec@gentoo.org> wxpython-2.8.11.0.ebuild, - wxpython-2.8.12.0.ebuild, wxpython-2.8.12.1.ebuild: - Add workaround to respect CXXFLAGS - - 04 May 2012; Patrick Lauer <patrick@gentoo.org> wxpython-2.8.11.0.ebuild, - wxpython-2.8.12.0.ebuild, wxpython-2.8.12.1.ebuild, wxpython-2.9.1.1.ebuild, - wxpython-2.9.3.1.ebuild: - Migrating dev-util/pkgconfig -> virtual/pkgconfig - - 25 Mar 2012; Raúl Porcel <armin76@gentoo.org> wxpython-2.8.12.1.ebuild: - alpha/ia64/sh/sparc stable wrt #403235 - - 08 Mar 2012; Brent Baude <ranger@gentoo.org> wxpython-2.8.12.1.ebuild: - Marking wxpython-2.8.12.1 ppc64 for bug 403235 - - 28 Feb 2012; Brent Baude <ranger@gentoo.org> wxpython-2.8.12.1.ebuild: - Marking wxpython-2.8.12.1 ppc for bug 403235 - - 22 Feb 2012; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.12.1.ebuild: - Stable for HPPA (bug #403235). - - 22 Feb 2012; Patrick Lauer <patrick@gentoo.org> wxpython-2.8.11.0.ebuild, - wxpython-2.8.12.0.ebuild, wxpython-2.8.12.1.ebuild, wxpython-2.9.1.1.ebuild, - wxpython-2.9.3.1.ebuild: - Restricting pypy - - 16 Feb 2012; Markus Meier <maekke@gentoo.org> wxpython-2.8.12.1.ebuild: - arm stable, bug #403235 - - 16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> - wxpython-2.8.12.1.ebuild: - x86 stable wrt bug #403235 - - 13 Feb 2012; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1.ebuild: - Stable for amd64, wrt bug #403235 - -*wxpython-2.9.3.1 (12 Feb 2012) - - 12 Feb 2012; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.9.3.1.ebuild: - Version bump (bug #384037 by radhermit). - - 08 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild: - Fix a typo. Patch by Arfrever - - 06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.9.1.1.ebuild: - Synchronize ebuilds. Use distutils.eclass. Patch by Arfrever. - - 06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.9.1.1.ebuild: - Don't inherit unused eclass. Properly set local variables. Patch by Arfrever. - - 09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> - -files/scripts-multiver-2.6.1.0.diff, -wxpython-2.6.4.0-r2.ebuild: - old - -*wxpython-2.8.12.1 (09 Dec 2011) - - 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.12.1.ebuild: - Version bump. - - 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.10.1.ebuild, - -files/wxpython-2.8-drop-editra.patch: - Remove old. - - 16 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> wxpython-2.8.11.0.ebuild: - ppc64 stable wrt #364203 - - 28 Jun 2011; Brent Baude <ranger@gentoo.org> wxpython-2.8.11.0.ebuild: - Marking wxpython-2.8.11.0 ppc for bug 364203 - - 04 Jun 2011; Raúl Porcel <armin76@gentoo.org> wxpython-2.8.11.0.ebuild: - alpha/ia64/sh/sparc stable wrt #364203 - - 21 May 2011; Thomas Kahle <tomka@gentoo.org> wxpython-2.8.11.0.ebuild: - x86 stable per bug 364203 - - 13 May 2011; Markus Meier <maekke@gentoo.org> wxpython-2.8.11.0.ebuild: - arm stable, bug #364203 - - 27 Apr 2011; Christoph Mende <angelos@gentoo.org> wxpython-2.8.11.0.ebuild: - Stable on amd64 wrt bug #364203 - - 26 Apr 2011; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.11.0.ebuild: - Stable for HPPA (bug #364203). - - 22 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.11.0.ebuild, - wxpython-2.8.12.0.ebuild: - Don't install non-working binary stuff into DOCDIR (bug #364393 by ago). - -*wxpython-2.8.12.0 (20 Apr 2011) - - 20 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.12.0.ebuild, - +files/wxpython-2.8.12-drop-editra.patch: - Version bump (bug #363319). - - 29 Mar 2011; Christoph Mende <angelos@gentoo.org> wxpython-2.6.4.0-r2.ebuild, - wxpython-2.8.10.1.ebuild: - Fixed slot deps - - 27 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.10.1.ebuild, - wxpython-2.8.11.0.ebuild, wxpython-2.9.1.1.ebuild: - Slot gnome stuff. - -*wxpython-2.9.1.1 (23 Jan 2011) - - 23 Jan 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.9.1.1.ebuild, - +files/wxpython-2.9-wxversion-demo.patch, - +files/wxpython-2.9-wxversion-scripts.patch: - Version bump. - - 12 Dec 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild, - wxpython-2.8.10.1.ebuild, wxpython-2.8.11.0.ebuild: - media-libs/jpeg -> virtual/jpeg (bug #347958) - - 27 Jul 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild, - wxpython-2.8.10.1.ebuild: - Depend on wxGTK[X] (bug #327795 by Arttu Valo). - -*wxpython-2.8.11.0 (27 May 2010) - - 27 May 2010; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.11.0.ebuild, - +files/wxpython-2.8.11-drop-editra.patch: - Version bump. - http://wxpython.org/recentchanges.php - - 05 Mar 2010; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r2.ebuild, - wxpython-2.8.10.1.ebuild: - Port 2.6 ebuild to SUPPORT_PYTHON_ABIS. Use EAPI 2. Add missing setuptools - RDEPEND. Drop use of deprecated python functions. - - 17 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> - -files/wxpython-2.8.8-wxversion-scripts.patch, - -wxpython-2.8.9.1-r2.ebuild, -wxpython-2.8.9.1-r3.ebuild, - -wxpython-2.8.9.2.ebuild: - Drop old. - - 25 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> - wxpython-2.8.10.1.ebuild: - Require SLOT="0" of media-libs/jpeg for headers. - - 02 Jan 2010; Brent Baude <ranger@gentoo.org> wxpython-2.8.10.1.ebuild: - Marking wxpython-2.8.10.1 ppc64 for bug 284996 - - 26 Oct 2009; Raúl Porcel <armin76@gentoo.org> wxpython-2.8.10.1.ebuild: - ia64/sh/sparc stable wrt #284996 - - 21 Oct 2009; Markus Meier <maekke@gentoo.org> wxpython-2.8.10.1.ebuild: - arm stable, bug #284996 - - 01 Oct 2009; Tobias Klausmann <klausman@gentoo.org> - wxpython-2.8.10.1.ebuild: - Stable on alpha, bug #284996 - - 27 Sep 2009; nixnut <nixnut@gentoo.org> wxpython-2.8.10.1.ebuild: - ppc stable #284996 - - 22 Sep 2009; Markus Meier <maekke@gentoo.org> wxpython-2.8.10.1.ebuild: - amd64/x86 stable, bug #284996 - - 18 Sep 2009; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.10.1.ebuild: - Stable for HPPA (bug #284996). - - 06 Sep 2009; Christian Ruppert <idl0r@gentoo.org> - -files/wxpython-2.8.7-wxversion-scripts.patch, - -files/wxpython-2.8.8.1-musthaveapp.patch, -files/wxpy-config.py: - Remove unused patches. - - 30 Aug 2009; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.10.1.ebuild: - Revert usage of += operators. They're a bash-3.1 feature and PMS is stuck - at bash-3.0. - - 29 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - wxpython-2.8.10.1.ebuild: - Set SUPPORT_PYTHON_ABIS. Add missing dependency on dev-python/setuptools. - -*wxpython-2.8.10.1 (18 May 2009) - - 18 May 2009; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.10.1.ebuild: - Version bump. - -*wxpython-2.8.9.2 (21 Feb 2009) - - 21 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> - +files/wxpython-2.8.9-wxversion-scripts.patch, - +files/wxpython-2.8-drop-editra.patch, +wxpython-2.8.9.2.ebuild: - Version bump. - Split editra out into its own package: app-editors/editra - Install desktop entries for utilities. - - 15 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> ChangeLog, Manifest: - Fix broken commit. - - 15 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> ChangeLog, Manifest: - Remove old. - - 15 Feb 2009; Brent Baude <ranger@gentoo.org> wxpython-2.8.9.1-r2.ebuild: - Marking wxpython-2.8.9.1-r2 ppc for bug 254696 - - 07 Feb 2009; Raúl Porcel <armin76@gentoo.org> wxpython-2.8.9.1-r2.ebuild, - wxpython-2.8.9.1-r3.ebuild: - arm/ia64/sh/sparc stable wrt #254696 - - 06 Feb 2009; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.9.1-r3.ebuild: - Stable for HPPA (bug #254696). - - 28 Jan 2009; Brent Baude <ranger@gentoo.org> wxpython-2.8.9.1-r2.ebuild: - Marking wxpython-2.8.9.1-r2 ppc64 for bug 254696 - - 24 Jan 2009; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.6.4.0.ebuild: - Remove ancient ebuild. - - 24 Jan 2009; Alexis Ballier <aballier@gentoo.org> - wxpython-2.6.4.0-r2.ebuild: - keyword ~x86-fbsd - - 22 Jan 2009; Raúl Porcel <armin76@gentoo.org> wxpython-2.6.4.0-r2.ebuild, - wxpython-2.8.9.1-r3.ebuild: - Readd ~arm/~sh - - 19 Jan 2009; Alexis Ballier <aballier@gentoo.org> - wxpython-2.8.9.1-r3.ebuild: - keyword ~x86-fbsd, bug #254696 - - 18 Jan 2009; Markus Meier <maekke@gentoo.org> wxpython-2.8.9.1-r2.ebuild: - amd64/x86 stable, bug #254696 - - 18 Jan 2009; Tobias Klausmann <klausman@gentoo.org> - wxpython-2.8.9.1-r2.ebuild: - Stable on alpha, bug #254696 - -*wxpython-2.8.9.1-r3 (18 Jan 2009) - - 18 Jan 2009; Ryan Hill <dirtyepic@gentoo.org> - +files/wxpython-2.8-cache-writable.patch, - +files/wxpython-2.8-wxversion-demo.patch, metadata.xml, - wxpython-2.6.4.0.ebuild, -wxpython-2.6.4.0-r1.ebuild, - -wxpython-2.8.7.1.ebuild, +wxpython-2.8.9.1-r3.ebuild: - Integrate dev-python/wxpython-docs into wxpython ebuild for bug #230305. - Remove old and drop all keywords except arm, sh, and x86-fbsd on the - 2.6.4.0 ebuild. - -*wxpython-2.8.9.1-r2 (26 Nov 2008) - - 26 Nov 2008; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.9.1-r1.ebuild, - +wxpython-2.8.9.1-r2.ebuild: - Fix build options not getting passed to src_compile due to mypyconf being - declared locally in src_configure. - - 27 Oct 2008; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.8.1.ebuild: - Stable for HPPA (bug #242088). - -*wxpython-2.8.9.1-r1 (18 Oct 2008) - - 18 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.9.1.ebuild, - +wxpython-2.8.9.1-r1.ebuild: - Revert to EAPI 1 for stable candidate and add -r1 using EAPI 2. - - 18 Oct 2008; Raúl Porcel <armin76@gentoo.org> wxpython-2.8.8.1.ebuild: - alpha/ia64/sparc stable wrt #242088 - - 16 Oct 2008; Markus Meier <maekke@gentoo.org> wxpython-2.8.8.1.ebuild: - amd64/x86 stable, bug #242088 - - 15 Oct 2008; Markus Rothe <corsair@gentoo.org> wxpython-2.8.8.1.ebuild: - Stable on ppc64; bug #242088 - - 15 Oct 2008; Ferris McCormick <fmccor@gentoo.org> wxpython-2.8.8.1.ebuild: - Sparc stable, part of Bug #242088. - - 15 Oct 2008; Brent Baude <ranger@gentoo.org> wxpython-2.8.8.1.ebuild: - Marking wxpython-2.8.8.1 ppc for bug 242088 - -*wxpython-2.8.9.1 (14 Oct 2008) - - 14 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.9.1.ebuild: - Version bump. EAPI 2. New cairo USE flag. - - 04 Oct 2008; Brent Baude <ranger@gentoo.org> wxpython-2.6.4.0-r2.ebuild: - stable ppc64, bug 238437 - - 02 Oct 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.8.1.ebuild: - Remove old comment. - - 30 Sep 2008; Raúl Porcel <armin76@gentoo.org> wxpython-2.6.4.0-r2.ebuild: - alpha/ia64 stable wrt #238437 - - 28 Sep 2008; Markus Meier <maekke@gentoo.org> wxpython-2.6.4.0-r2.ebuild: - amd64/x86 stable, bug #238437 - - 27 Sep 2008; nixnut <nixnut@gentoo.org> wxpython-2.6.4.0-r2.ebuild: - Stable on ppc wrt bug 238437 - - 23 Sep 2008; Ferris McCormick <fmccor@gentoo.org> - wxpython-2.6.4.0-r2.ebuild: - Sparc stable --- Bug #238437 --- it's been around over 6 weeks now. - - 23 Sep 2008; Jeroen Roovers <jer@gentoo.org> wxpython-2.6.4.0-r2.ebuild: - Stable for HPPA (bug #238437). - -*wxpython-2.6.4.0-r2 (28 Jul 2008) - - 28 Jul 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - +wxpython-2.6.4.0-r2.ebuild, wxpython-2.8.7.1.ebuild: - Revision bump. - - 28 Jul 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0.ebuild, - wxpython-2.6.4.0-r1.ebuild, wxpython-2.8.7.1.ebuild, - wxpython-2.8.8.1.ebuild: - Work around aliasing bug in GCC 4.1 by building with -fno-strict-aliasing. - Manifested as 'TypeError: wx.Window, wx.Sizer, wx.Size, or (w,h) expected - for item' errors in various apps. - - Bug #233154, reported by Henrik Sankala. - -*wxpython-2.8.8.1 (25 Jul 2008) - - 25 Jul 2008; Ryan Hill <dirtyepic@gentoo.org> - +files/wxpython-2.8.8.1-musthaveapp.patch, - +files/wxpython-2.8.8-wxversion-scripts.patch, +wxpython-2.8.8.1.ebuild: - Version bump. - - 29 May 2008; Ali Polatel <hawking@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - Fix python_mod_optimize usage. - - 21 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - Move wxaddons module into version-specific directories to fix bug #213819. - - 17 Mar 2008; Peter Volkov <pva@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - amd64 stable, bug #207648. - - 16 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - Fix modules getting installed into lib rather than lib64 on multilib - systems w/ python-2.4. - - 29 Jan 2008; nixnut <nixnut@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - Stable on ppc wrt bug 207648 - - 28 Jan 2008; Jeroen Roovers <jer@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - Stable for HPPA (bug #207648). - - 28 Jan 2008; Raúl Porcel <armin76@gentoo.org> metadata.xml: - Replace wxwindows with wxwidgets in metadata - - 27 Jan 2008; Raúl Porcel <armin76@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - alpha/ia64/sparc stable wrt #207648 - - 27 Jan 2008; Brent Baude <ranger@gentoo.org> wxpython-2.6.4.0-r1.ebuild, - wxpython-2.8.7.1.ebuild: - Marking wxpython-2.6.4.0-r1 and wxpython-2.8.7.1 ppc64 stable per bug 207648 - - 27 Jan 2008; Christian Faulhammer <opfer@gentoo.org> - wxpython-2.8.7.1.ebuild: - stable x86, bug 207648 - - 27 Jan 2008; Christian Faulhammer <opfer@gentoo.org> - wxpython-2.6.4.0-r1.ebuild: - stable x86, bug 207648 - - 10 Jan 2008; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.6.3.3.ebuild: - Remove old. - - 25 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0.ebuild: - Make sure we set WX_GTK_VER before calling check_wxuse. Bug #203298 by Fabio - Rossi. - - 24 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.7.1.ebuild: - Re-add dropped ppc keyword, touch up deps. - -*wxpython-2.8.7.1 (24 Dec 2007) - - 24 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> - +files/wxpython-2.8.7-wxversion-scripts.patch, +wxpython-2.8.7.1.ebuild: - Version bump. Masked for testing. - - 22 Dec 2007; nixnut <nixnut@gentoo.org> wxpython-2.6.4.0-r1.ebuild: - Added ~ppc wrt bug 199594 - - 22 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.3.3.ebuild, - wxpython-2.6.4.0.ebuild, wxpython-2.6.4.0-r1.ebuild: - Lock DEPEND to wxGTK-2.6 for bug #202998. - - 13 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild: - Drop arm, ppc, sh, and x86-fbsd keywords for bug #199594. - - 04 Dec 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.4.0-r1.ebuild: - Remove EA_ADD_OPTS=0 from configuration, leftover from testing. - -*wxpython-2.6.4.0-r1 (25 Nov 2007) - - 25 Nov 2007; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.6.4.0-r1.ebuild: - Add 2.6.4.0-r1, masked for testing. - - 04 Nov 2007; Christoph Mende <angelos@gentoo.org> wxpython-2.6.4.0.ebuild: - Stable on amd64 wrt bug #197186 - - 30 Oct 2007; Jeroen Roovers <jer@gentoo.org> wxpython-2.6.4.0.ebuild: - Stable for HPPA (bug #197186). - - 29 Oct 2007; Raúl Porcel <armin76@gentoo.org> wxpython-2.6.4.0.ebuild: - alpha/ia64/sparc stable wrt #197358 - - 28 Oct 2007; Markus Rothe <corsair@gentoo.org> wxpython-2.6.4.0.ebuild: - Stable on ppc64; bug #197186 - - 28 Oct 2007; Markus Meier <maekke@gentoo.org> wxpython-2.6.4.0.ebuild: - x86 stable, bug #197186 - - 27 Oct 2007; nixnut <nixnut@gentoo.org> wxpython-2.6.4.0.ebuild: - Stable on ppc wrt bug 197186 - - 22 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.3.3.ebuild, - wxpython-2.6.4.0.ebuild: - Adjust deps. - - 19 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.3.3.ebuild, - wxpython-2.6.4.0.ebuild: - Lock deps further to wxGTK-${PV} for wxpython. - - 19 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.3.3.ebuild, - wxpython-2.6.4.0.ebuild: - lock wxGTK depend to 2.6 - -*wxpython-2.6.4.0 (01 Sep 2007) - - 01 Sep 2007; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.6.4.0.ebuild: - Version bump. No major groundbreakery. Masked due to dep on - =x11-libs/wxGTK-2.6.4.0. - - 07 May 2007; Bryan Østergaard <kloeri@gentoo.org> - wxpython-2.6.3.3.ebuild: - Add missing category to built_with_use call. Bug reported by kimrhh on irc. - - 01 May 2007; Mart Raudsepp <leio@gentoo.org> - -files/scripts-multiver-2.6.0.0.diff, -files/wxversion.py, - -wxpython-2.6.1.0.ebuild: - Remove old version and stale patches - - 01 May 2007; Torsten Veller <tove@gentoo.org> Manifest: - Recreated old Manifest. Fix #176649. - - 30 Apr 2007; Jose Luis Rivero <yoswink@gentoo.org> - wxpython-2.6.3.3.ebuild: - Stable on alpha although there is a known bug in wxDirDialog. See #136924 - for details. - - 29 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> - -files/wxpython-2.4.2.4-64bit.patch, -wxpython-2.4.2.4-r3.ebuild, - -wxpython-2.4.2.4-r4.ebuild: - Remove wxpython-2.4 from the tree. Bug #146073. - - 07 Apr 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.6.3.3.ebuild: - When USE="opengl" make sure wxGTK was built with opengl support. - - 10 Feb 2007; Simon Stelling <blubb@gentoo.org> wxpython-2.6.3.3.ebuild: - stable on amd64; bug 136924 - -*wxpython-2.4.2.4-r4 (03 Feb 2007) - - 03 Feb 2007; Simon Stelling <blubb@gentoo.org> - +files/wxpython-2.4.2.4-64bit.patch, +wxpython-2.4.2.4-r4.ebuild: - fix 64bit issues; bug 117885 - - 23 Jan 2007; Jeroen Roovers <jer@gentoo.org> wxpython-2.6.3.3.ebuild: - Stable for HPPA (bug #136924). - - 16 Jan 2007; Joseph Jezak <josejx@gentoo.org> wxpython-2.6.3.3.ebuild: - Marked ppc stable for bug #136924. - - 15 Jan 2007; Raúl Porcel <armin76@gentoo.org> wxpython-2.6.3.3.ebuild: - x86 stable, wrt bug 136924 - - 15 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> - wxpython-2.6.3.3.ebuild: - Stable on sparc wrt #136924 - - 14 Jan 2007; Markus Rothe <corsair@gentoo.org> wxpython-2.6.3.3.ebuild: - Stable on ppc64; bug #136924 - - 05 Jan 2007; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.4.2.4-r3.ebuild, - wxpython-2.6.1.0.ebuild, wxpython-2.6.3.3.ebuild: - einfo -> elog - -*wxpython-2.6.3.3 (29 Dec 2006) - - 29 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> - -wxpython-2.6.3.2.ebuild, +wxpython-2.6.3.3.ebuild: - Version bump (bug #156805), fixes bugs #154505, #148399, #158050 - - 15 Oct 2006; Mart Raudsepp <leio@gentoo.org> -wxpython-2.4.2.4.ebuild, - -wxpython-2.6.0.0-r1.ebuild: - Drop old versions - - 06 Sep 2006; Javier Villavicencio <the_paya@gentoo.org> - wxpython-2.6.3.2.ebuild: - Add ~x86-fbsd keyword. - - 27 Aug 2006; Mart Raudsepp <leio@gentoo.org> metadata.xml: - Change primary herd to wxwindows. - - 03 Aug 2006; Mart Raudsepp <leio@gentoo.org> wxpython-2.6.3.2.ebuild: - Change wxGTK depend to avoid dependency problems after a version bump. - - 14 Apr 2006; Mark Loeser <halcy0n@gentoo.org> wxpython-2.6.3.2.ebuild: - Fix dependencies so that wxpython and wxGTK versions always match; bug #129937 - -*wxpython-2.6.3.2 (13 Apr 2006) - - 13 Apr 2006; Mark Loeser <halcy0n@gentoo.org> +wxpython-2.6.3.2.ebuild: - Bump to new upstream version 2.6.3.2; bug #121856 - - 18 Dec 2005; Markus Rothe <corsair@gentoo.org> wxpython-2.6.1.0.ebuild: - Stable on ppc64 - - 29 Nov 2005; Luis Medinas <metalgod@gentoo.org> - wxpython-2.4.2.4-r3.ebuild: - Stable on amd64. Fixes bug #113893. - - 29 Nov 2005; Luis Medinas <metalgod@gentoo.org> wxpython-2.6.1.0.ebuild: - Stable on amd64. - - 25 Nov 2005; Tom Gall <tgall@gentoo.org> - wxpython-2.6.1.0.ebuild: - added ~ppc64 - - 11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> - wxpython-2.6.1.0.ebuild: - Stable on ppc. - - 17 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> - wxpython-2.6.1.0.ebuild: - Stable on sparc - - 17 Oct 2005; Aron Griffis <agriffis@gentoo.org> wxpython-2.6.1.0.ebuild: - Mark 2.6.1.0 stable on alpha - - 15 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.6.1.0.ebuild: - Stable x86. Fixed wxGTK dep - -*wxpython-2.4.2.4-r3 (11 Oct 2005) - - 11 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> - +wxpython-2.4.2.4-r3.ebuild: - Fixes bug #108643 - - 10 Sep 2005; Aron Griffis <agriffis@gentoo.org> - wxpython-2.4.2.4-r2.ebuild: - Mark 2.4.2.4-r2 stable on alpha - - 07 Sep 2005; Simon Stelling <blubb@gentoo.org> wxpython-2.4.2.4.ebuild, - wxpython-2.4.2.4-r2.ebuild, wxpython-2.6.0.0-r1.ebuild, - wxpython-2.6.1.0.ebuild: - make multilib-strict aware; bug 103535 - -*wxpython-2.6.1.0 (12 Jul 2005) - - 12 Jul 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/scripts-multiver-2.6.1.0.diff, +wxpython-2.6.1.0.ebuild: - Version bump. - - 17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> - wxpython-2.4.2.4-r2.ebuild: - Stable on ppc. - - 06 Jun 2005; Markus Rothe <corsair@gentoo.org> wxpython-2.4.2.4-r2.ebuild: - Stable on ppc64 - - 22 May 2005; Jason Wever <weeve@gentoo.org> wxpython-2.4.2.4-r2.ebuild: - Stable on SPARC. - - 22 May 2005; Rene Nussbaumer <killerfox@gentoo.org> - wxpython-2.4.2.4-r2.ebuild: - Stable on hppa - - 18 May 2005; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.4.2.4-r2.ebuild: - Marked stable x86 - -*wxpython-2.6.0.0-r1 (11 May 2005) - - 11 May 2005; Rob Cakebread <pythonhead@gentoo.org> - -wxpython-2.6.0.0.ebuild, +wxpython-2.6.0.0-r1.ebuild: - Changed to non-monolithic build. bug# 91574, removed monolithic ebuild - -*wxpython-2.6.0.0 (02 May 2005) -*wxpython-2.4.2.4-r2 (02 May 2005) - - 02 May 2005; Rob Cakebread <pythonhead@gentoo.org> - +files/scripts-multiver-2.6.0.0.diff, files/wxpy-config.py, - +wxpython-2.4.2.4-r2.ebuild, -wxpython-2.5.3.1.ebuild, - +wxpython-2.6.0.0.ebuild: - Version bump. Now using SLOTs. - - 25 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.4.2.4.ebuild: - Moved to SLOT 2.4 - - 31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 11 Dec 2004; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.5.3.1.ebuild: - Put headers in a better place. Closes #74019 - - 13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.5.3.1.ebuild: - Fixed site_pkgs location - - 13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.4.2.4.ebuild: - Pegged deps on wxGTK at 2.4* - - 13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> - wxpython-2.4.2.4-r1.ebuild, wxpython-2.5.3.1.ebuild: - wxpy-config.py wasn't being copied. bug# 71043 - -*wxpython-2.4.2.4-r1 (12 Nov 2004) - - 12 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> +files/wxpy-config.py, - +files/wxversion.py, +wxpython-2.4.2.4-r1.ebuild, - +wxpython-2.5.3.1.ebuild: - Version bump, retrofitted with SLOTs, bug# 47810 - - 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : - Fixed ChangeLog header. - - 18 Aug 2004; Tom Gall <tgall@gentoo.org> wxpython-2.4.2.4.ebuild: - stable on ppc64, bug #58420 - - 06 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> -wxpython-2.4.0.7.ebuild, - -wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild: - Removed obsolete versions, changed 2.4.2.4 to use new wxwidgets eclass - - 02 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> - +files/controsl2.py.patch: - Added missing controls2.py.patch - - 02 Aug 2004; Ferris McCormick <fmccor@gentoo.org> wxpython-2.4.2.4.ebuild: - Stable for sparc. This version runs fine, and the previous stable - version (2.4.1.2) no longer builds because its patch file is missing. - This version runs both +gtk2, -gtk2. Also, it (and wxGTK) build with - gcc-3.3.3, hardened gcc-3.3.4-r1 as of the date of this entry, and run. - - 20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wxpython-2.4.0.7.ebuild, - wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild: - dev-python/PyOpenGL is now dev-python/pyopengl - adjust dependencies - accordingly. - - 05 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> wxpython-2.4.2.4.ebuild: - Clarified USE='gtk2' messages. Bug# 56153 - - 03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wxpython-2.4.0.7.ebuild, - wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild: - Fix error messages. - -*wxpython-2.4.2.4 (03 Jul 2004) - - 03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +wxpython-2.4.0.7.ebuild, - +wxpython-2.4.1.2.ebuild, +wxpython-2.4.2.4.ebuild: - Follow naming policy, rename wxPython to wxpython. - - 30 Jun 2004; Guy Martin <gmsoft@gentoo.org> wxPython-2.4.2.4.ebuild: - Marked stable on hppa. - - 22 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> wxPython-2.4.2.4.ebuild: - Marked stable on x86 - - 03 Jun 2004; Aron Griffis <agriffis@gentoo.org> wxPython-2.4.0.7.ebuild, - wxPython-2.4.1.2.ebuild, wxPython-2.4.2.4.ebuild: - Fix use invocation - - 25 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> - wxPython-2.4.0.7.ebuild: - don't use deprecated ? : use syntax - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> wxPython-2.4.0.7.ebuild, - wxPython-2.4.1.2.ebuild, wxPython-2.4.2.4.ebuild: - stable on alpha and ia64 - - 17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> : - manifest fix - - 16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> wxPython-2.4.2.4.ebuild: - set ppc in keywords - - 29 Dec 2003; Guy Martin <gmsoft@gentoo.org> wxPython-2.4.1.2.ebuild: - Marked stable on hppa. - - 25 Dec 2003; Jason Wever <weeve@gentoo.org> wxPython-2.4.1.2.ebuild: - Marked stable on sparc. - - 12 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.2.4.ebuild: - add unicode support to match wxGTK-2.4.2 thanks to Vaclav Slavik - <vaclav.slavik@matfyz.cz> (#30768) - - 08 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.1.2.ebuild, - wxPython-2.4.2.4.ebuild: - added debug config wx*-config and stable bumped wxPython-2.4.1.2 - - 08 Oct 2003; Seemant Kulleen <seemant@gentoo.org> wxPython-2.4.1.2.ebuild, - wxPython-2.4.2.4.ebuild: - the dependency is tiff, not libtiff - -*wxPython-2.4.2.4 (08 Oct 2003) - - 08 Oct 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.7.ebuild, - wxPython-2.4.1.2.ebuild, wxPython-2.4.2.4.ebuild: - version bump. incorporating license changes thanks to Vaclav Slavik - <vaclav.slavik@matfyz.cz> (#28697) - - 10 Jul 2003; Nick Hadaway <raker@gentoo.org> wxPython-2.4.1.2.ebuild, - files/controls2.py.patch: - Added a tiny patch to fix a typo in controls2.py - -*wxPython-2.4.1.2 (09 Jul 2003) - - 09 Jul 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.1.2.ebuild: - new version. needs wxGTK-2.4.1 - - 08 Jul 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.2.ebuild: - removed non-functional patch from wxWindows-2.4.0.2 - - 07 Jul 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.7.ebuild: - bump to stable - - 07 May 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.6.ebuild, - wxPython-2.4.0.7.ebuild: - Detect non-unicode wxGTK - -*wxPython-2.4.0.7 (27 Apr 2003) - - 27 Apr 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.7.ebuild: - version bump - -*wxPython-2.4.0.6 (16 Mar 2003) - - 26 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.6.ebuild: - Fixed typo that disallows wxPython from merging. Fixes #18203. - - 26 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.6.ebuild: - add check to make sure wxGTK is compiled with the right use flags - - 16 Mar 2003; Alastair Tse <liquidx@gentoo.org> wxPython-2.4.0.6.ebuild: - version bump - -*wxPython-2.4.0.2 (01 Feb 2003) - - 01 Feb 2003; Nick Hadaway <raker@gentoo.org> wxPython-2.4.0.2.ebuild : - Version bump. Bug fixes. - -*wxPython-2.4.0.1 (12 Jan 2003) - - 15 Jan 2003; Nick Hadaway <raker@gentoo.org> wxPython-2.4.0.1.ebuild : - Marked stable for x86. - - 13 Jan 2003; Nick Hadaway <raker@gentoo.org> wxPython-2.4.0.1.ebuild : - Added gtk2 support based on code submitted by Jose Fonseca on bug - #13860 - - 12 Jan 2003; Nick Hadaway <raker@gentoo.org> wxPython-2.4.0.1.ebuild, - files/digest-wxPython-2.4.0.1 : - A much needed upgrade. Works with the latest wxGTK release. - As we have had much problems with the 2.3.4 wxGTK series I am hoping - this may actually make into the stable 1.4 release or we need to bump - back to to 2.3.3 series of wxGTK. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*wxPython-2.3.3.1-r2 (30 Oct 2002) - - 30 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - Removed all the crap put into the first 2.3.3.1 ebuild to build wxGTK and - updated the patch to remove glcanvas - -*wxPython-2.3.3.1-r1 (29 Oct 2002) - - 29 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - added some changes per discussion on #9693 - -*wxPython-2.3.3.1 (28 Oct 2002) - - 28 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - This version bump was nasty rough ... - They added configure/make scripts to this package now, so mirrored much of - the configure setup after wxGTK ... - -*wxPython-2.3.2.1-r2 (29 Aug 2002) - - 13 Sep 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild : - Moved glcanvas patch from -r1 as specifying GLCANVAS=0 doesn't disable - the opengl portion of the build fully. Should fix bug #7777. - - 11 Sep 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild : - tightened wxGTK dependancy to wxGTK-2.3.2* - - 01 Sep 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild : - Updated ebuild with missing ${myconf}'s - - 29 Aug 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r2.ebuild, - file/digest-wxPython-2.3.2.1-r2, files/ledctrl.diff : - GLCANVAS and GIZMOS extensions are now re-enabled and we should have a - full-featured ebuild of wxPython. - -*wxPython-2.3.2.1-r1 (2 Jul 2002) - - 22 Aug 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r1.ebuild, - files/noglcanvas.diff, files/nogizmos.diff : - Ebuild disables glcancas and gizmos extensions as they currently are - not building correctly. - - 2 Jul 2002; Jon Nelson <jnelson@gentoo.org> wxPython-2.3.2.1-r1: - Make lintool happy - expressly don't build GLCANVAS - -*wxPython-2.3.2.1 (11 Apr 2002) - - 11 Apr 2002; Spider <spider@gentoo.org> - Update all glib dependencies to use glib-1.2* in preparation of - unmasking the glib-2.0.1 packages - -*wxPython-2.3.2.1 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest deleted file mode 100644 index 9f50986..0000000 --- a/dev-python/wxpython/Manifest +++ /dev/null @@ -1,43 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX wxpython-2.8-cache-writable.patch 538 SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 SHA512 e0232ff7bcb713358a2981b84b0eac3b3b0825d43b43dd6f19d3d21f9b45a9e63fbf39dc87c2fedc0342a88007ef43fcd9d890177dc38e15b4f89576fdf363a0 WHIRLPOOL c2c0488d0d5a840d1be68c95a2f53d3bce7d58798f0e09f2116f16655d73c8a5b525af7d7b836c7f820bd729acff441942510055b8f455a9b2f742361effd6c3 -AUX wxpython-2.8-no-preservatives-added.patch 525 SHA256 590ef2435f3bb24ce061213628467652509aa39992d9b0f94e1c784952d523b8 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd WHIRLPOOL 218e72aa785c762f0171987c79cb7d998864252ebd259537e463f134caabca17d8f5d5d75f2ec7791cf5353edb8331d173eb6f08d4fbb7f7713d9ca14ad91831 -AUX wxpython-2.8-wxversion-demo.patch 219 SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c SHA512 a20e79dc2f96400046dd5d5697533466529c30bde96a2e8ace1984c7e3fb42a6b38375cacddeb319253dbaabff6571b52af41da5268d22cfb294b11da56421f8 WHIRLPOOL 3af6ad578fcc1144f0172b4a959665441880ba20b9d471049f9c48602987e4265df34b180cd98727d0beadef66e6603fbdad7f1d0b0358a795b3372a8f46d2df -AUX wxpython-2.8.11-drop-editra.patch 2197 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b SHA512 3800b68ba13c52e81a4411940e297f83f9e98c76b4d8d9d3e53ac55564a38b1376b57df337e4f009b1cbbd44199293554058341aa2122ec329c3a42dd38593a6 WHIRLPOOL c79b106c6cbcbc1089bcbdb13bc7e5aeb613a8f374edf7a3d4680d3240b27de2f1d8a0e15ddf13257d7878cc2828b8fe49b2db8ff23eeb1bf7f7ebcf69c9f885 -AUX wxpython-2.8.12-drop-categories.patch 1554 SHA256 37c4e706e5a63e51995bbd99ceceace0cf12789aacbb6a8cc4ed6e13c2c22531 SHA512 d622cdd72db26ff44a058b9c4dd0a0a20b504d4799933636ffa3fd131e4746ae993ec80a74dc7a6496cb1306187222fb075004db547937b7c91857b8c18fe0e1 WHIRLPOOL 49fa7a4e53402d4fc4a77213fe3760ae271e85680fcc5d6a1623ef4a7621b926d672a760313c33b5450c7256b4964b8203bd6ce8543f55033a09ccd41f1cee23 -AUX wxpython-2.8.12-drop-editra.patch 2643 SHA256 bbe4960ab735f344916e36cb772a1a6c7e27d6540c7ee1dcd8437bff8fb6bee8 SHA512 d49e2ab9cbc388e21b387c04524979840a52b167fe718e333d742a427fc18d7dbab0d2554263697796c802b81435ae8499e33b640f5840b4b626d01bc2f9780d WHIRLPOOL 70dd7825b701d5bd4589f8e6c6c9881dba250ef03b5c4bde0bc552e8154f729439e17caee2bfb16922ddbe34db60be60e0eb2d91156a9a7a6ce35ccbde7241ba -AUX wxpython-2.8.12.1-disable-egging-mode.patch 1146 SHA256 47d3fe389cc8da061c936ba12e4ca27941a756cb76264286c8ab78f4203fb5b9 SHA512 a834a2c3f009f6855755bd07b54683b8f3d9dc58ee9d0631e51c0450e3bac98245e4dab0e40820ba1727b6a0d8528675443c986d7fa4f7c58d606d60975e4190 WHIRLPOOL d61f64f3cc36a6696eb33abbea96f2e1693d35d443c13c777512668487836c26251177967a38c0f2742decebc5bceb62da9602447e9080bb7a77e87a20d17bcf -AUX wxpython-2.8.9-wxversion-scripts.patch 7730 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6 SHA512 f6ff14045487b53733ed71ed4fd2d5a2d847d5f267f2c6348fefe38f1f0db11a3b0b4cbdd61a3a391d820bc39e13c0aa1b57360c045f49ae539212f08fb07332 WHIRLPOOL c4d946f0e1625623f8d98063901c790a99799eb7d46fb8afcbd59b458330bbe40bc9e1e29c954f8c0c07cd65afd1ec7b02d12fe53e803a6a742f9b01afbc733e -AUX wxpython-2.9-wxversion-demo.patch 147 SHA256 79c0cb7455fe6947ba9b7278d98e2c6da156edd5e5c276b03cc7fff5d3073d14 SHA512 7fe67f8d292f186b9271e1f8761f53e0e68df9a85d7624aa401e907411f58e3d6961cea8bcee3a575c97b2ed1caf596a6a0b47acc72efe5b4222c8795302700d WHIRLPOOL 164f70695f19d45919f56e0b6986a019b6a21092bc52599bbb45f1ef0d74e5fb44777d551cb95d6757aa62312e33644a5d7042e5cd18e42e33c0f00b4000f4e5 -AUX wxpython-2.9-wxversion-scripts.patch 4600 SHA256 6c5cd5f3daa51bf3c033f1c934ac1ce219a421a7e993660c64ac532a9dd96675 SHA512 fab5031bbbae567a5cc4a8adadcc7b3db0bebd55b1c8aae71217e5159a0e3f730ba98f8a8587bf9b6a715e8661292a962339c4362dbdf66d33f551c588d29aea WHIRLPOOL 8ff8d7e3346ce63db5ffc68079e3c4792d20fe99f7747076731398964cfaf94b15abfe5187013d3c035218979ac59bd16cddd007e3077df29214f08ccada9c82 -AUX wxpython-2.9.4.1-wxversion-scripts.patch 4187 SHA256 79ae53ed557ff2de9d7936ece32a0f8ee6a26c9e921f248399adbc44ff3e17b5 SHA512 befed0b915205b191c9980cfa5074e11dc28d5bf8b62827b100cd2c41b56af638febda43fe93452f1d280eda86e19f5d8d95356143378d49b6e27d889d0815b1 WHIRLPOOL 058be7d59a2336ef94c19c44743c127a874b39e764a5c961cbeebce0eca79a82d0b47b51ce9aef359fab2fcd7edc6df700772dbc709b3d3df7896cdfdd2f89ef -AUX wxpython-3.0-wxversion-demo.patch 147 SHA256 23e89aaf72171b2c0ec3a302f2252137c2c087a6672726e626d20fb430a1c763 SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1 WHIRLPOOL 04cff26f220526c17bf8fa3249aaaa2fa6293e6ffb7a49ef4d06a634ec8cf684c92280e1b9cc1cc5dcc50897569b52f68fdfa1f1d4b1d2ab6ace553784ae309c -AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 SHA256 1fbca19b7281245801160de2ebf8a1f00057840078355977f169cb20eafe32ad SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6 WHIRLPOOL 10fcdfcf96fe992194d899941a7c75854c7afb016c39014e7827b90f09fa1cf523b22c9c668aea52084b85895989d498aa4a715626c716169686b1f144071f82 -DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a SHA512 aab71cf4e4fb6632afd4607cbe5cdef6785c4ed3f1c7f67d6cef5487d1caee2f7652bfd974ba95a6a03e8d7809c94e291aca00c2fdf74ea29e118e1e30c947d5 WHIRLPOOL e9eb0803350e3dac8c5f2228a3f4d54a26ae4c4307c924729bbdff712747419fdfaa155d83ef1bea7dcb849dbacf9f48c323bf7997ed1df85f182ba3878d1324 -DIST wxPython-demo-2.9.4.0.tar.bz2 3992754 SHA256 c1a57ef7c71ea1a332df98b80cfa7ba178ef6dcd24a31393dff905a145ba8b7b SHA512 dac61d9bb09deffd54c89c1a09803968a4c4b2951a00ebb4d618a2a1b48775c62e3ddf2c642e9005d7362fdeab44c07bc2a38bc96dc94a5c891982847d0c19fe WHIRLPOOL 2093d3d0f81c15b7ca1a346fae29429952d299f8e33d5c2e356846bd98df890b731fe4ef0311ec32b7a913a4038aa8881396d9878dde98322136ccb5244a867b -DIST wxPython-demo-3.0.0.0.tar.bz2 3991989 SHA256 426aaf20c7b01f5e9fbd7bd41455441bb126585f5544a848a5fa060e07f7b443 SHA512 4fe8a87faacac99c54c4fcbdb707c9790b49f485186e1741cc1ba05e955e474ca4ea31ff704a57e73b32b4fad310ef490066743d1c6ad4339191cde2daec255d WHIRLPOOL c6a2b12111572164474083f66dd0e2eff12e4faea5ce880767bfba3de493e8d56e6747c659ff1a3d533d0f6bcde1d5c9daabb9bccb2148278cdce074f5ddcbae -DIST wxPython-demo-3.0.1.1.tar.bz2 3991248 SHA256 bb264db3369c7228f0356f1ad64f6a9ca3000b167bc1ce3fee94d3d2fa20d069 SHA512 b75ca80b5a247f5c97691c4c77c36d64ebe82d94803cd8d687b2110e9de290067c7da893797ae13d0a9f42a4da83170b630dcdeb9460657355c43005dfeac89a WHIRLPOOL 3db15c676252f4f96b585271d0ef005b84cbb4538f01db53e18c587b33fdfc5b57da40d9ba2f2c467063de79c81ed6440982fe5e21547a21fbe2d7d4e252f69c -DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 SHA256 8bf195138744898b4b6fbe11f52f7ee2f6319c2e3adf832917769b2e2d4994f3 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702 WHIRLPOOL a944790a4c7b38dc8d8d28c7def50f765cd5566118d801cb576a0ab9d8370a803f8feedbf3211d0352dd838c92d9d4f092eaf6d78354a1974f2345304dd7b2e1 -DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb SHA512 88591ef4f61bcbac29050d7dfecc230f7338cc006e7c3abc072b15da478e4fd994ab73ee5d072cb8b84f9de62ce182f1774354b0a7a4502ea639e59fdf965358 WHIRLPOOL 97bc66c8f781b5092e2274edc0b9bac35c21c91a66e4c0da75d543dc471f25d02334b28a5afe4ad0681b7a018a93f08b6ef5d3c6afd127ccfc24da208252cd89 -DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 SHA512 e114b2b44a7fd3ac292ca9735fb2e075459211384bc98d62ff2ba49e45111825101e74abd4af2ab0e5e52ede7b831641367c11a5c80e79f2da6ada3442463bfc WHIRLPOOL 91ccbe19e8311f0404fb0096efff68750fa0c3b505d05c9278e0488e138788dc399ff2345e13c712126475957a1c1fcc53556d70cd9c835524207be5758a6e2b -DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d -DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507 -DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811 -DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647 -DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a -DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d -EBUILD wxpython-2.8.12.1-r2.ebuild 5708 SHA256 93c2cea4038a5d8fcfe6d1d2db586825fe69f6098571d35279c3d4a8cf7da4b9 SHA512 0be889af0b9a55a94e55643c5c6c397ceb58368cf8dfb4ff067ba71464aa55ef987cc3888268e6c2e2dc87af66b2d3ce343891a8e9effe344556343d4161686b WHIRLPOOL 81094252e0df00ac88fe35db495e29ac19e9f29899219bfef23946de8cde73c70e4ccf206cc0fb376b7070c91f09ef6fae84d2590dac3025a40b0fcafdfab8f5 -EBUILD wxpython-2.9.4.1-r2.ebuild 4882 SHA256 c9e93b5996caa02e9d5219b1f3358a5e1b9089646fecc335bddf2d1730838a26 SHA512 db43ab67839a5f1cbaf11ae0086a5a8246edf66bdff35fe6260dd4de959dba4801c4a8f5daf9bc040d3071442d54a461c4d0e0c665d12ea6015b65aaef29d390 WHIRLPOOL d5b8b74ef5edab244cfb7199184560bd1e586456464bd73105637d2e00e462f819e6cc32bc399a69c0ac327085494842deede429e0e487b583ba3f01608f4dd8 -EBUILD wxpython-3.0.0.0.ebuild 4737 SHA256 9365f0144ea62631b64174a30484b889b16451ba783361acba921dbc4fc0211d SHA512 cecaac75c8914378322459a50f410ddc15050b0c5f36f510e1f4331fc264d4c296575082f548d30ff504c6633113b3ce8064ba5215050c91d0b0ab7355ffc08e WHIRLPOOL 1eecfaf66373f7d267c1979e7aeccc2b44968c523f872bea9bb74c8e18eb353f40509c2f17f057ee819eecf10ed5729a8d28e3ac3e724b1c43677c72b5ab0e4f -EBUILD wxpython-3.0.1.1.ebuild 4741 SHA256 b4f8ebcbe229b33f0ece7d4154f4e3cd55304334c493cf7cbe7448edce2c6f43 SHA512 cdaea755c5d2c213b49c0a8b0e3cce3563e6c57abeb26a8ea73259c0819829360108f8500cbbbbf666bf9c6c1f0acd782d5238ed1161c614ef0ba5d8b0c36586 WHIRLPOOL 03f8b5f406f8033c0b3d0d2314bdaa662834cec5ba1659b6c8fe80de6d297e9f3fbe416308e389a85208654065ae0f439ad5436178ddfd3f34ba4e3ffa2aea28 -EBUILD wxpython-3.0.2.0.ebuild 4744 SHA256 be5f525d42c2a97e296242acbf9b6bc5debc71f1f1f5553b1a3b4d25f08d4e4b SHA512 6a73e711964ac463ec0a6b2007218214477d40f4b868ad013946a853688c6fedde53146de50b767093e4eca702149876fea1bf05a50916afdb5a13aa3ccdd71e WHIRLPOOL b4f368d50313ebaeae7f8cefc207548ab019fc00b2566f85798f3b2b552b93ebc99fc27cff2a4dc8e914180a45e6e62b33cfacd44ce1a100caa2983adca68c22 -MISC ChangeLog 36172 SHA256 d3aef9377a489c6db2082209718ce590773ea2bf60275855981f449a825fe778 SHA512 fd6266ad7bf9de9fc18b145480f897f1f082f5dce5f06c8138a2b5affcae11cedad6ade373cee03daeafbe2341df68d866b85548fdcf08ea24d01872e02b45d7 WHIRLPOOL 00d988dc0bc5a16a221b85984bd53cdddd2b6c306148298e1839c8744f1c741fcff6572f816287fbc14e5cb9d910fd1a9ffa3a1e554d53116c4cd39bd7493522 -MISC metadata.xml 380 SHA256 4f8e2237b4a7281039211900504d5e8d7004e87c120631f18dd078a01178dfa8 SHA512 8b742161313fb1b1b0db6d07f1665988b061dbf2dd44c1e49e2fab8d1aa1dfbb218207c5696bcd027199a1ae2fbcb4673106c09d5169a44863deb021840288a8 WHIRLPOOL dbce4f031c171464b3cda63ec2f9c7f2841e108d441a45bfe1d7ec2d6b35874d9b04ab364836bb3d7be7ff12ef60e029fce7a841e156994f04820254bad91e6c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iF4EAREIAAYFAlSkNIQACgkQC77qH+pIQ6R87QD+O1bkuqkF9wy7ZiasGSzLnefi -Vhfl5W1+RVMWaOV8ygkBAJ/CvrGk/HQdGtespaxpEEWT6yAsW+Culje9UvO/VQUz -=b8AI ------END PGP SIGNATURE----- diff --git a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch deleted file mode 100644 index 57f26b3..0000000 --- a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch +++ /dev/null @@ -1,20 +0,0 @@ -Use /tmp for cache files since the user won't have -write permissions on ${DOCDIR}. - -diff -Naurp docs-orig/viewdocs.py docs/viewdocs.py ---- docs-orig/viewdocs.py 2008-09-28 15:59:16.000000000 -0600 -+++ docs/viewdocs.py 2009-01-18 00:16:27.000000000 -0600 -@@ -16,11 +16,11 @@ if not basePath: - - - # test for write access --if os.access(basePath, os.W_OK): -+if os.access('/tmp', os.W_OK): - - # setup the args - args = ['', -- '--cache='+basePath, -+ '--cache=/tmp', - os.path.join(basePath, 'wx.zip'), - ] - diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch deleted file mode 100644 index 5e4221d..0000000 --- a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch +++ /dev/null @@ -1,16 +0,0 @@ -Portage preserve-libs removes the linker name (.so) of a library but leaves -the soname (.so.4) and realname (.so.4.0) installed. findLib searches for -mywxlibname.* and returns true if anything is found. Disaster ensues. - - ---- a/wxPython/config.py -+++ b/wxPython/config.py -@@ -612,7 +612,7 @@ def findLib(name, libdirs): - dirs = libdirs[:] - for d in dirs: - p = os.path.join(d, name) -- if glob.glob(p+'*') != []: -+ if glob.glob(p+'*.so') != []: - return True - return False - diff --git a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch deleted file mode 100644 index 9782919..0000000 --- a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- demo/demo.org 2005-04-28 03:00:13.431583384 +0000 -+++ demo/demo.py 2005-04-28 03:00:31.886777768 +0000 -@@ -1,4 +1,7 @@ - #!/usr/bin/env python - -+import wxversion -+wxversion.select("2.8") -+ - import Main - Main.main() diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch deleted file mode 100644 index 9555bb5..0000000 --- a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/wxPython/setup.py -+++ b/wxPython/setup.py -@@ -887,13 +887,6 @@ WX_PKGLIST = [ 'wx', - 'wx.tools', - 'wx.tools.XRCed', - 'wx.tools.XRCed.plugins', -- 'wx.tools.Editra', -- 'wx.tools.Editra.src', -- 'wx.tools.Editra.src.autocomp', -- 'wx.tools.Editra.src.eclib', -- 'wx.tools.Editra.src.ebmlib', -- 'wx.tools.Editra.src.extern', -- 'wx.tools.Editra.src.syntax', - ] - - if not EGGing: -@@ -920,7 +913,6 @@ else: - opj('scripts/pywrap'), - opj('scripts/pywxrc'), - opj('scripts/xrced'), -- opj('scripts/editra'), - ] - if os.name == 'nt': - SCRIPTS.append( opj('scripts/genaxmodule') ) -@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb') - DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') - DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') - --DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') --DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') --DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', -- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') --DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') --DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') --DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') --DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') --DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) - - - ## import pprint -@@ -993,7 +976,6 @@ if EGGing: - 'pyshell = wx.py.PyShell:main', - 'pywrap = wx.py.PyWrap:main', - 'helpviewer = wx.tools.helpviewer:main', -- 'editra = wx.tools.Editra.launcher:main', - 'xrced = wx.tools.XRCed.xrced:main', - ], - }, diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch deleted file mode 100644 index d860238..0000000 --- a/dev-python/wxpython/files/wxpython-2.8.12-drop-categories.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix QA issue wrt Bug 457586 -diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyAlaMode.desktop ---- distrib/PyAlaMode.desktop 2007-07-19 06:33:55.000000000 +0800 -+++ distrib/PyAlaMode.desktop 2013-03-04 13:48:51.737419595 +0800 -@@ -5,4 +5,4 @@ - Icon=PyCrust.png - Terminal=false - Type=Application --Categories=Application;Development; -+Categories=Development; -diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyCrust.desktop ---- distrib/PyCrust.desktop 2007-07-19 06:33:55.000000000 +0800 -+++ distrib/PyCrust.desktop 2013-03-04 13:49:12.209418445 +0800 -@@ -5,4 +5,4 @@ - Icon=PyCrust.png - Terminal=false - Type=Application --Categories=Application;Development; -+Categories=Development; -diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.12.1/wxPython/distrib/PyShell.desktop ---- distrib/PyShell.desktop 2007-07-19 06:33:55.000000000 +0800 -+++ distrib/PyShell.desktop 2013-03-04 13:49:28.713417518 +0800 -@@ -5,4 +5,4 @@ - Icon=PyCrust.png - Terminal=false - Type=Application --Categories=Application;Development; -+Categories=Development; -diff -ur wxPython-src-2.8.12.1.orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.12.1/wxPython/distrib/XRCed.desktop ---- distrib/XRCed.desktop 2007-07-19 06:33:55.000000000 +0800 -+++ distrib/XRCed.desktop 2013-03-04 13:49:46.345416526 +0800 -@@ -5,4 +5,4 @@ - Icon=XRCed.png - Terminal=false - Type=Application --Categories=Application;Development; -+Categories=Development; diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch deleted file mode 100644 index 4b49f30..0000000 --- a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/wxPython/setup.py -+++ b/wxPython/setup.py -@@ -887,20 +887,6 @@ WX_PKGLIST = [ 'wx', - 'wx.tools', - 'wx.tools.XRCed', - 'wx.tools.XRCed.plugins', -- 'wx.tools.Editra', -- 'wx.tools.Editra.src', -- 'wx.tools.Editra.src.autocomp', -- 'wx.tools.Editra.src.eclib', -- 'wx.tools.Editra.src.ebmlib', -- 'wx.tools.Editra.src.extern', -- 'wx.tools.Editra.src.extern.aui', -- 'wx.tools.Editra.src.extern.dexml', -- 'wx.tools.Editra.src.extern.pygments', -- 'wx.tools.Editra.src.extern.pygments.filters', -- 'wx.tools.Editra.src.extern.pygments.formatters', -- 'wx.tools.Editra.src.extern.pygments.lexers', -- 'wx.tools.Editra.src.extern.pygments.styles', -- 'wx.tools.Editra.src.syntax', - ] - - if not EGGing: -@@ -927,7 +913,6 @@ else: - opj('scripts/pywrap'), - opj('scripts/pywxrc'), - opj('scripts/xrced'), -- opj('scripts/editra'), - ] - if os.name == 'nt': - SCRIPTS.append( opj('scripts/genaxmodule') ) -@@ -941,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb') - DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') - DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') - --DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') --DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') --DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', -- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') --DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') --DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') --DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') --DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') --DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) - - - ## import pprint -@@ -1000,7 +976,6 @@ if EGGing: - 'pyshell = wx.py.PyShell:main', - 'pywrap = wx.py.PyWrap:main', - 'helpviewer = wx.tools.helpviewer:main', -- 'editra = wx.tools.Editra.launcher:main', - 'xrced = wx.tools.XRCed.xrced:main', - ], - }, diff --git a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch deleted file mode 100644 index 1497a2c..0000000 --- a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 22 Apr 2013 18:02:37 +0200 -Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'. - -We use the 'egg_info' command to explicitly enforce temporary EGG file -location outside the source tree on Gentoo. As a result, our build -command activates the 'EGGing' mode and wxPython is not installed -properly. - -I believe that the 'EGGing' mode should be activated only by an explicit -call to 'bdist_egg' command where the expected files are actually -created. The 'egg_info' command is a more broad one and is often used -implicitly, e.g. by the 'install' command. ---- - config.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.py b/config.py -index 4fbd83f..b45707d 100644 ---- a/config.py -+++ b/config.py -@@ -23,7 +23,7 @@ - import sys, os, glob, fnmatch, tempfile - import subprocess - --EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv -+EGGing = 'bdist_egg' in sys.argv - if not EGGing: - from distutils.core import setup, Extension - else: --- -1.8.1.5 - diff --git a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch deleted file mode 100644 index 6a45678..0000000 --- a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop ---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop 2009-02-21 15:04:55.000000000 -0600 -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyAlaMode -+Name=PyAlaMode (2.8) - Comment=GUI Python Shell with Filling and editor windows --Exec=pyalamode --Icon=PyCrust.png -+Exec=pyalamode-2.8 -+Icon=/usr/share/pixmaps/PyCrust.png - Terminal=false - Type=Application - Categories=Application;Development; -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop ---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop 2009-02-21 15:06:42.000000000 -0600 -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyCrust -+Name=PyCrust (2.8) - Comment=GUI Python Shell with Filling --Exec=pycrust --Icon=PyCrust.png -+Exec=pycrust-2.8 -+Icon=/usr/share/pixmaps/PyCrust.png - Terminal=false - Type=Application - Categories=Application;Development; -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop ---- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop 2009-02-21 15:08:19.000000000 -0600 -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyShell -+Name=PyShell (2.8) - Comment=GUI Python Shell --Exec=pyshell --Icon=PyCrust.png -+Exec=pyshell-2.8 -+Icon=/usr/share/pixmaps/PyCrust.png - Terminal=false - Type=Application - Categories=Application;Development; -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop ---- wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop 2009-02-21 15:09:22.000000000 -0600 -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=XRCed -+Name=XRCed (2.8) - Comment=wxPython XRC resource editor --Exec=xrced --Icon=XRCed.png -+Exec=xrced-2.8 -+Icon=/usr/share/pixmaps/XRCed.png - Terminal=false - Type=Application - Categories=Application;Development; -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/editra wxPython-src-2.8.9.2/wxPython/scripts/editra ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/editra 2008-02-29 14:32:17.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/editra 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.Editra.launcher import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule 2008-02-29 14:32:17.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.genaxmodule import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer wxPython-src-2.8.9.2/wxPython/scripts/helpviewer ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/helpviewer 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.helpviewer import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png wxPython-src-2.8.9.2/wxPython/scripts/img2png ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/img2png 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.img2png import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py wxPython-src-2.8.9.2/wxPython/scripts/img2py ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py 2008-02-29 14:32:17.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/img2py 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.img2py import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm wxPython-src-2.8.9.2/wxPython/scripts/img2xpm ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/img2xpm 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.img2xpm import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.py.PyAlaCarte import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode wxPython-src-2.8.9.2/wxPython/scripts/pyalamode ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/pyalamode 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.py.PyAlaMode import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust wxPython-src-2.8.9.2/wxPython/scripts/pycrust ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/pycrust 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.py.PyCrust import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell wxPython-src-2.8.9.2/wxPython/scripts/pyshell ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/pyshell 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.py.PyShell import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap wxPython-src-2.8.9.2/wxPython/scripts/pywrap ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/pywrap 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.py.PyWrap import main - main() -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc wxPython-src-2.8.9.2/wxPython/scripts/pywxrc ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc 2008-02-29 14:32:17.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/pywxrc 2009-02-21 15:09:58.000000000 -0600 -@@ -1,5 +1,7 @@ - #!/usr/bin/env python - -+import wxversion -+wxversion.select("2.8") - from wx.tools.pywxrc import main - main() - -diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced wxPython-src-2.8.9.2/wxPython/scripts/xrced ---- wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced 2007-07-18 16:33:55.000000000 -0600 -+++ wxPython-src-2.8.9.2/wxPython/scripts/xrced 2009-02-21 15:03:24.000000000 -0600 -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.8") - - from wx.tools.XRCed.xrced import main - main() diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch deleted file mode 100644 index c928ae2..0000000 --- a/dev-python/wxpython/files/wxpython-2.9-wxversion-demo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- demo/demo.org -+++ demo/demo.py -@@ -1,4 +1,7 @@ - #!/usr/bin/env python - -+import wxversion -+wxversion.select("2.9") -+ - import Main - Main.main() diff --git a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch deleted file mode 100644 index d037cc9..0000000 --- a/dev-python/wxpython/files/wxpython-2.9-wxversion-scripts.patch +++ /dev/null @@ -1,221 +0,0 @@ ---- a/distrib/PyAlaMode.desktop -+++ b/distrib/PyAlaMode.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyAlaMode -+Name=PyAlaMode (2.9) - Comment=GUI Python Shell with Filling and editor windows --Exec=pyalamode --Icon=PyCrust.png -+Exec=pyalamode-2.9 -+Icon=/usr/share/pixmaps/PyCrust-2.9.png - Terminal=false - Type=Application - Categories=Application;Development; ---- a/distrib/PyCrust.desktop -+++ b/distrib/PyCrust.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyCrust -+Name=PyCrust (2.9) - Comment=GUI Python Shell with Filling --Exec=pycrust --Icon=PyCrust.png -+Exec=pycrust-2.9 -+Icon=/usr/share/pixmaps/PyCrust-2.9.png - Terminal=false - Type=Application - Categories=Application;Development; ---- a/distrib/PyShell.desktop -+++ b/distrib/PyShell.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyShell -+Name=PyShell (2.9) - Comment=GUI Python Shell --Exec=pyshell --Icon=PyCrust.png -+Exec=pyshell-2.9 -+Icon=/usr/share/pixmaps/PyCrust-2.9.png - Terminal=false - Type=Application - Categories=Application;Development; ---- a/distrib/PySlices.desktop -+++ b/distrib/PySlices.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PySlices -+Name=PySlices (2.9) - Comment=GUI Python Shell with Filling --Exec=pyslices --Icon=PySlices.png -+Exec=pyslices-2.9 -+Icon=/usr/share/pixmaps/PySlices-2.9.png - Terminal=false - Type=Application - Categories=Application;Development; ---- a/distrib/PySlicesShell.desktop -+++ b/distrib/PySlicesShell.desktop -@@ -1,9 +1,9 @@ - - [Desktop Entry] --Name=PySlicesShell -+Name=PySlicesShell (2.9) - Comment=GUI Python Shell --Exec=pysliceshell --Icon=PySlices.png -+Exec=pysliceshell-2.9 -+Icon=/usr/share/pixmaps/PySlices-2.9.png - Terminal=false - Type=Application - Categories=Application;Development; ---- a/distrib/XRCed.desktop -+++ b/distrib/XRCed.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=XRCed -+Name=XRCed (2.9) - Comment=wxPython XRC resource editor --Exec=xrced --Icon=XRCed.png -+Exec=xrced-2.9 -+Icon=/usr/share/pixmaps/XRCed-2.9.png - Terminal=false - Type=Application - Categories=Application;Development; ---- a/scripts/editra -+++ b/scripts/editra -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.Editra.launcher import main - main() ---- a/scripts/genaxmodule -+++ b/scripts/genaxmodule -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.genaxmodule import main - main() ---- a/scripts/helpviewer -+++ b/scripts/helpviewer -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.helpviewer import main - main() ---- a/scripts/img2png -+++ b/scripts/img2png -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.img2png import main - main() ---- a/scripts/img2py -+++ b/scripts/img2py -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.img2py import main - main() ---- a/scripts/img2xpm -+++ b/scripts/img2xpm -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.img2xpm import main - main() ---- a/scripts/pyalacarte -+++ b/scripts/pyalacarte -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyAlaCarte import main - main() ---- a/scripts/pyalamode -+++ b/scripts/pyalamode -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyAlaMode import main - main() ---- a/scripts/pycrust -+++ b/scripts/pycrust -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyCrust import main - main() ---- a/scripts/pyshell -+++ b/scripts/pyshell -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyShell import main - main() ---- a/scripts/pyslices -+++ b/scripts/pyslices -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PySlices import main - main() ---- a/scripts/pysliceshell -+++ b/scripts/pysliceshell -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PySlicesShell import main - main() ---- a/scripts/pywrap -+++ b/scripts/pywrap -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyWrap import main - main() ---- a/scripts/pywxrc -+++ b/scripts/pywxrc -@@ -1,5 +1,7 @@ - #!/usr/bin/env python - -+import wxversion -+wxversion.select("2.9") - from wx.tools.pywxrc import main - main() - ---- a/scripts/xrced -+++ b/scripts/xrced -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.XRCed.xrced import main - main() diff --git a/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch deleted file mode 100644 index 7067af9..0000000 --- a/dev-python/wxpython/files/wxpython-2.9.4.1-wxversion-scripts.patch +++ /dev/null @@ -1,211 +0,0 @@ ---- a/distrib/PyAlaMode.desktop -+++ b/distrib/PyAlaMode.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyAlaMode -+Name=PyAlaMode (2.9) - Comment=GUI Python Shell with Filling and editor windows --Exec=pyalamode --Icon=PyCrust -+Exec=pyalamode-2.9 -+Icon=PyCrust-2.9 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PyCrust.desktop -+++ b/distrib/PyCrust.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyCrust -+Name=PyCrust (2.9) - Comment=GUI Python Shell with Filling --Exec=pycrust --Icon=PyCrust -+Exec=pycrust-2.9 -+Icon=PyCrust-2.9 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PyShell.desktop -+++ b/distrib/PyShell.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyShell -+Name=PyShell (2.9) - Comment=GUI Python Shell --Exec=pyshell --Icon=PyCrust -+Exec=pyshell-2.9 -+Icon=PyCrust-2.9 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PySlices.desktop -+++ b/distrib/PySlices.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PySlices -+Name=PySlices (2.9) - Comment=GUI Python Shell with Filling --Exec=pyslices --Icon=PySlices -+Exec=pyslices-2.9 -+Icon=PySlices-2.9 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PySlicesShell.desktop -+++ b/distrib/PySlicesShell.desktop -@@ -1,9 +1,8 @@ -- - [Desktop Entry] --Name=PySlicesShell -+Name=PySlicesShell (2.9) - Comment=GUI Python Shell --Exec=pysliceshell --Icon=PySlices -+Exec=pysliceshell-2.9 -+Icon=PySlices-2.9 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/XRCed.desktop -+++ b/distrib/XRCed.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=XRCed -+Name=XRCed (2.9) - Comment=wxPython XRC resource editor --Exec=xrced --Icon=XRCed -+Exec=xrced-2.9 -+Icon=XRCed-2.9 - Terminal=false - Type=Application - Categories=Development; ---- a/scripts/genaxmodule -+++ b/scripts/genaxmodule -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.genaxmodule import main - main() ---- a/scripts/helpviewer -+++ b/scripts/helpviewer -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.helpviewer import main - main() ---- a/scripts/img2png -+++ b/scripts/img2png -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.img2png import main - main() ---- a/scripts/img2py -+++ b/scripts/img2py -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.img2py import main - main() ---- a/scripts/img2xpm -+++ b/scripts/img2xpm -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.img2xpm import main - main() ---- a/scripts/pyalacarte -+++ b/scripts/pyalacarte -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyAlaCarte import main - main() ---- a/scripts/pyalamode -+++ b/scripts/pyalamode -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyAlaMode import main - main() ---- a/scripts/pycrust -+++ b/scripts/pycrust -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyCrust import main - main() ---- a/scripts/pyshell -+++ b/scripts/pyshell -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyShell import main - main() ---- a/scripts/pyslices -+++ b/scripts/pyslices -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PySlices import main - main() ---- a/scripts/pysliceshell -+++ b/scripts/pysliceshell -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PySlicesShell import main - main() ---- a/scripts/pywrap -+++ b/scripts/pywrap -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.py.PyWrap import main - main() ---- a/scripts/pywxrc -+++ b/scripts/pywxrc -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.pywxrc import main - main() ---- a/scripts/xrced -+++ b/scripts/xrced -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("2.9") - - from wx.tools.XRCed.xrced import main - main() diff --git a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch deleted file mode 100644 index a4f6b0b..0000000 --- a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- demo/demo.org -+++ demo/demo.py -@@ -1,4 +1,7 @@ - #!/usr/bin/env python - -+import wxversion -+wxversion.select("3.0") -+ - import Main - Main.main() diff --git a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch deleted file mode 100644 index 9f0cb89..0000000 --- a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch +++ /dev/null @@ -1,211 +0,0 @@ ---- a/distrib/PyAlaMode.desktop -+++ b/distrib/PyAlaMode.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyAlaMode -+Name=PyAlaMode (3.0) - Comment=GUI Python Shell with Filling and editor windows --Exec=pyalamode --Icon=PyCrust -+Exec=pyalamode-3.0 -+Icon=PyCrust-3.0 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PyCrust.desktop -+++ b/distrib/PyCrust.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyCrust -+Name=PyCrust (3.0) - Comment=GUI Python Shell with Filling --Exec=pycrust --Icon=PyCrust -+Exec=pycrust-3.0 -+Icon=PyCrust-3.0 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PyShell.desktop -+++ b/distrib/PyShell.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PyShell -+Name=PyShell (3.0) - Comment=GUI Python Shell --Exec=pyshell --Icon=PyCrust -+Exec=pyshell-3.0 -+Icon=PyCrust-3.0 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PySlices.desktop -+++ b/distrib/PySlices.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=PySlices -+Name=PySlices (3.0) - Comment=GUI Python Shell with Filling --Exec=pyslices --Icon=PySlices -+Exec=pyslices-3.0 -+Icon=PySlices-3.0 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/PySlicesShell.desktop -+++ b/distrib/PySlicesShell.desktop -@@ -1,9 +1,8 @@ -- - [Desktop Entry] --Name=PySlicesShell -+Name=PySlicesShell (3.0) - Comment=GUI Python Shell --Exec=pysliceshell --Icon=PySlices -+Exec=pysliceshell-3.0 -+Icon=PySlices-3.0 - Terminal=false - Type=Application - Categories=Development; ---- a/distrib/XRCed.desktop -+++ b/distrib/XRCed.desktop -@@ -1,8 +1,8 @@ - [Desktop Entry] --Name=XRCed -+Name=XRCed (3.0) - Comment=wxPython XRC resource editor --Exec=xrced --Icon=XRCed -+Exec=xrced-3.0 -+Icon=XRCed-3.0 - Terminal=false - Type=Application - Categories=Development; ---- a/scripts/genaxmodule -+++ b/scripts/genaxmodule -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.genaxmodule import main - main() ---- a/scripts/helpviewer -+++ b/scripts/helpviewer -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.helpviewer import main - main() ---- a/scripts/img2png -+++ b/scripts/img2png -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.img2png import main - main() ---- a/scripts/img2py -+++ b/scripts/img2py -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.img2py import main - main() ---- a/scripts/img2xpm -+++ b/scripts/img2xpm -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.img2xpm import main - main() ---- a/scripts/pyalacarte -+++ b/scripts/pyalacarte -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PyAlaCarte import main - main() ---- a/scripts/pyalamode -+++ b/scripts/pyalamode -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PyAlaMode import main - main() ---- a/scripts/pycrust -+++ b/scripts/pycrust -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PyCrust import main - main() ---- a/scripts/pyshell -+++ b/scripts/pyshell -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PyShell import main - main() ---- a/scripts/pyslices -+++ b/scripts/pyslices -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PySlices import main - main() ---- a/scripts/pysliceshell -+++ b/scripts/pysliceshell -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PySlicesShell import main - main() ---- a/scripts/pywrap -+++ b/scripts/pywrap -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.py.PyWrap import main - main() ---- a/scripts/pywxrc -+++ b/scripts/pywxrc -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.pywxrc import main - main() ---- a/scripts/xrced -+++ b/scripts/xrced -@@ -1,4 +1,6 @@ - #!/usr/bin/env python -+import wxversion -+wxversion.select("3.0") - - from wx.tools.XRCed.xrced import main - main() diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml deleted file mode 100644 index b68c477..0000000 --- a/dev-python/wxpython/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>wxwidgets</herd> - <herd>python</herd> - <use> - <flag name="examples">Install interactive demo module browser and sample applets.</flag> - <flag name="doc">Install HTML wxWidgets docs and wxpython API reference.</flag> - </use> -</pkgmetadata> diff --git a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild b/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild deleted file mode 100644 index aac69dc..0000000 --- a/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1-r2.ebuild,v 1.12 2014/03/19 16:14:13 ago Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -WX_GTK_VER="2.8" - -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets - -MY_P="${P/wxpython-/wxPython-src-}" - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI=" - mirror://sourceforge/wxpython/${MY_P}.tar.bz2 - doc? ( - mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 - mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) - examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" - -LICENSE="wxWinLL-3" -SLOT="2.8" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="cairo doc examples opengl" - -RDEPEND=" - dev-lang/python-exec:2[${PYTHON_USEDEP}] - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] - dev-libs/glib:2 - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/libpng:0= - media-libs/tiff:0 - virtual/jpeg - x11-libs/gtk+:2 - x11-libs/pango[X] - cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}/wxPython" -DOC_S="${WORKDIR}/wxPython-${PV}" - -# The hacky build system seems to be broken with out-of-source builds, -# and installs 'wx' package globally. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - - if use doc; then - cd "${DOC_S}" || die - epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch - fi - - if use examples; then - cd "${DOC_S}" || die - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch - fi - - cd "${S}" || die - - local PATCHES=( - "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch - # drop editra - we have it as a separate package now - "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch - "${FILESDIR}"/${PN}-2.8.12-drop-categories.patch - "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch - # fix handling egg_info command - "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch - ) - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - # Workaround, buildsystem uses CFLAGS as CXXFLAGS - export CFLAGS="${CXXFLAGS}" - need-wxwidgets unicode - - mydistutilsargs=( - WX_CONFIG="${WX_CONFIG}" - WXPORT=gtk2 - UNICODE=1 - BUILD_GLCANVAS=$(usex opengl 1 0) - ) -} - -python_compile() { - # We need to have separate libdirs due to hackery, bug #455332. - distutils-r1_python_compile \ - build --build-purelib "${BUILD_DIR}"/lib.common -} - -python_install() { - distutils-r1_python_install \ - build --build-purelib "${BUILD_DIR}"/lib.common - - # adjust the filenames for wxPython slots. - local file - for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do - mv "${file}" "${file}-${SLOT}" || die - done - cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die - for file in *; do - mv "${file}" "${file}-${SLOT}" || die - - # wrappers are common to all impls, so a parallel run may - # move it for us. ln+rm is more failure-proof. - ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die - rm -f "${ED}usr/bin/${file}" - done -} - -python_install_all() { - dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt - - domenu distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop - newicon wx/py/PyCrust_32.png PyCrust.png - newicon wx/tools/XRCed/XRCed_32.png XRCed.png - - docdir=${D}usr/share/doc/${PF} - - if use doc; then - docinto docs - dodoc -r "${DOC_S}"/docs/. - # For some reason newer API docs aren't available so use 2.8.9.2's - dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs/. - - docompress -x /usr/share/doc/${PF}/docs - fi - - if use examples; then - docinto demo - dodoc -r "${DOC_S}"/demo/. - docinto samples - dodoc -r "${DOC_S}"/samples/. - - [[ -e ${docdir}/samples/embedded/embedded ]] \ - && rm -f "${docdir}"/samples/embedded/embedded - - docompress -x /usr/share/doc/${PF}/{demo,samples} - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl create_symlinks - - echo - elog "Gentoo uses the Multi-version method for SLOT'ing." - elog "Developers, see this site for instructions on using" - elog "2.6 or 2.8 with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - if use doc; then - echo - elog "To access the general wxWidgets documentation, run" - elog "/usr/share/doc/${PF}/docs/viewdocs.py" - echo - elog "wxPython documentation is available by pointing a browser" - elog "at /usr/share/doc/${PF}/docs/api/index.html" - fi - if use examples; then - echo - elog "The demo.py app which contains hundreds of demo modules" - elog "with documentation and source code has been installed at" - elog "/usr/share/doc/${PF}/demo/demo.py" - echo - elog "Many more example apps and modules can be found in" - elog "/usr/share/doc/${PF}/samples/" - fi - echo - elog "Editra is not packaged with wxpython in Gentoo." - elog "You can find it in the tree as app-editors/editra" -} - -pkg_postrm() { - fdo-mime_desktop_database_update - - update_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl update_symlinks -} diff --git a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild b/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild deleted file mode 100644 index a2621cc..0000000 --- a/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.4.1-r2.ebuild,v 1.3 2013/12/12 12:57:30 jlec Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -WX_GTK_VER="2.9" - -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets - -MY_PN="wxPython-src" - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI=" - mirror://sourceforge/wxpython/${MY_PN}-2.9.4.0.tar.bz2 - examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.9.4.0.tar.bz2 ) - mirror://sourceforge/wxpython/${MY_PN}-2.9.4.1.patch" - -LICENSE="wxWinLL-3" -SLOT="2.9" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="cairo examples opengl" - -RDEPEND=" - dev-lang/python-exec:2[${PYTHON_USEDEP}] - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] - dev-libs/glib:2 - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/libpng:0= - media-libs/tiff:0 - virtual/jpeg - x11-libs/gtk+:2 - x11-libs/pango[X] - cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_PN}-2.9.4.0/wxPython" -DOC_S="${WORKDIR}/wxPython-2.9.4.0" - -# The hacky build system seems to be broken with out-of-source builds, -# and installs 'wx' package globally. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - - cd .. || die - epatch "${DISTDIR}"/${MY_PN}-${PV}.patch - - if use examples; then - cd "${DOC_S}" - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch - fi - - cd "${S}" || die - local PATCHES=( - "${FILESDIR}"/${P}-wxversion-scripts.patch - # drop editra - we have it as a separate package now - "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch - "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch - # fix handling egg_info command - "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch - ) - - distutils-r1_python_prepare_all -} - -src_configure() { - append-flags -fno-strict-aliasing - need-wxwidgets unicode - - mydistutilsargs=( - WX_CONFIG="${WX_CONFIG}" - WXPORT=gtk2 - UNICODE=1 - BUILD_GLCANVAS=$(usex opengl 1 0) - ) -} - -python_compile() { - # We need to have separate libdirs due to hackery, bug #455332. - distutils-r1_python_compile \ - build --build-purelib "${BUILD_DIR}"/lib.common -} - -python_install() { - distutils-r1_python_install \ - build --build-purelib "${BUILD_DIR}"/lib.common - - # adjust the filenames for wxPython slots. - local file - for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do - mv "${file}" "${file}-${SLOT}" || die - done - cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die - for file in *; do - mv "${file}" "${file}-${SLOT}" || die - - # wrappers are common to all impls, so a parallel run may - # move it for us. ln+rm is more failure-proof. - ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die - rm -f "${ED}usr/bin/${file}" - done -} - -python_install_all() { - dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt - - for x in {Py{AlaMode,Crust,Shell},XRCed}; do - newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop - done - newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png - newicon wx/py/PySlices_32.png PySlices-${SLOT}.png - newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png - - if use examples; then - docinto demo - dodoc -r "${DOC_S}"/demo/. - docinto samples - dodoc -r "${DOC_S}"/samples/. - - [[ -e ${docdir}/samples/embedded/embedded ]] \ - && rm -f "${docdir}"/samples/embedded/embedded - - docompress -x /usr/share/doc/${PF}/{demo,samples} - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl create_symlinks - - echo - elog "Gentoo uses the Multi-version method for SLOT'ing." - elog "Developers, see this site for instructions on using" - elog "2.8 or 2.9 with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - if use examples; then - echo - elog "The demo.py app which contains demo modules with" - elog "documentation and source code has been installed at" - elog "/usr/share/doc/${PF}/demo/demo.py" - echo - elog "More example apps and modules can be found in" - elog "/usr/share/doc/${PF}/samples/" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - - update_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl update_symlinks -} diff --git a/dev-python/wxpython/wxpython-3.0.0.0.ebuild b/dev-python/wxpython/wxpython-3.0.0.0.ebuild deleted file mode 100644 index 13e973c..0000000 --- a/dev-python/wxpython/wxpython-3.0.0.0.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-3.0.0.0.ebuild,v 1.2 2014/01/18 01:24:44 dirtyepic Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -WX_GTK_VER="3.0" - -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets - -MY_PN="wxPython-src" - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI=" - mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2 - examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" - -LICENSE="wxWinLL-3" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="cairo examples libnotify opengl" - -RDEPEND=" - dev-lang/python-exec:2[${PYTHON_USEDEP}] - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X] - dev-libs/glib:2 - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/libpng:0= - media-libs/tiff:0 - virtual/jpeg - x11-libs/gtk+:2 - x11-libs/pango[X] - cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_PN}-${PV}/wxPython" -DOC_S="${WORKDIR}/wxPython-${PV}" - -# The hacky build system seems to be broken with out-of-source builds, -# and installs 'wx' package globally. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - - if use examples; then - cd "${DOC_S}" - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch - fi - - cd "${S}" - local PATCHES=( - "${FILESDIR}"/${P}-wxversion-scripts.patch - # drop editra - we have it as a separate package now - "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch - "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch - # fix handling egg_info command - "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch - ) - - distutils-r1_python_prepare_all -} - -src_configure() { - need-wxwidgets unicode - - mydistutilsargs=( - WX_CONFIG="${WX_CONFIG}" - WXPORT=gtk2 - UNICODE=1 - BUILD_GLCANVAS=$(usex opengl 1 0) - ) -} - -python_compile() { - # We need to have separate libdirs due to hackery, bug #455332. - distutils-r1_python_compile \ - build --build-purelib "${BUILD_DIR}"/lib.common -} - -python_install() { - distutils-r1_python_install \ - build --build-purelib "${BUILD_DIR}"/lib.common - - # adjust the filenames for wxPython slots. - local file - for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do - mv "${file}" "${file}-${SLOT}" || die - done - cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die - for file in *; do - mv "${file}" "${file}-${SLOT}" || die - - # wrappers are common to all impls, so a parallel run may - # move it for us. ln+rm is more failure-proof. - ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die - rm -f "${ED}usr/bin/${file}" - done -} - -python_install_all() { - dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt - - for x in {Py{AlaMode,Crust,Shell},XRCed}; do - newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop - done - newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png - newicon wx/py/PySlices_32.png PySlices-${SLOT}.png - newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png - - if use examples; then - docinto demo - dodoc -r "${DOC_S}"/demo/. - docinto samples - dodoc -r "${DOC_S}"/samples/. - - [[ -e ${docdir}/samples/embedded/embedded ]] \ - && rm -f "${docdir}"/samples/embedded/embedded - - docompress -x /usr/share/doc/${PF}/{demo,samples} - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl create_symlinks - - echo - elog "Gentoo uses the Multi-version method for SLOT'ing." - elog "Developers, see this site for instructions on using" - elog "it with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - if use examples; then - echo - elog "The demo.py app which contains demo modules with" - elog "documentation and source code has been installed at" - elog "/usr/share/doc/${PF}/demo/demo.py" - echo - elog "More example apps and modules can be found in" - elog "/usr/share/doc/${PF}/samples/" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - - update_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl update_symlinks -} diff --git a/dev-python/wxpython/wxpython-3.0.1.1.ebuild b/dev-python/wxpython/wxpython-3.0.1.1.ebuild deleted file mode 100644 index aa30d6c..0000000 --- a/dev-python/wxpython/wxpython-3.0.1.1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-3.0.1.1.ebuild,v 1.1 2014/10/06 01:09:03 leio Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -WX_GTK_VER="3.0" - -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets - -MY_PN="wxPython-src" - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI=" - mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2 - examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" - -LICENSE="wxWinLL-3" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="cairo examples libnotify opengl" - -RDEPEND=" - dev-lang/python-exec:2[${PYTHON_USEDEP}] - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X] - dev-libs/glib:2 - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/libpng:0= - media-libs/tiff:0 - virtual/jpeg - x11-libs/gtk+:2 - x11-libs/pango[X] - cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_PN}-${PV}/wxPython" -DOC_S="${WORKDIR}/wxPython-${PV}" - -# The hacky build system seems to be broken with out-of-source builds, -# and installs 'wx' package globally. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - - if use examples; then - cd "${DOC_S}" - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch - fi - - cd "${S}" - local PATCHES=( - "${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch - # drop editra - we have it as a separate package now - "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch - "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch - # fix handling egg_info command - "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch - ) - - distutils-r1_python_prepare_all -} - -src_configure() { - need-wxwidgets unicode - - mydistutilsargs=( - WX_CONFIG="${WX_CONFIG}" - WXPORT=gtk2 - UNICODE=1 - BUILD_GLCANVAS=$(usex opengl 1 0) - ) -} - -python_compile() { - # We need to have separate libdirs due to hackery, bug #455332. - distutils-r1_python_compile \ - build --build-purelib "${BUILD_DIR}"/lib.common -} - -python_install() { - distutils-r1_python_install \ - build --build-purelib "${BUILD_DIR}"/lib.common - - # adjust the filenames for wxPython slots. - local file - for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do - mv "${file}" "${file}-${SLOT}" || die - done - cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die - for file in *; do - mv "${file}" "${file}-${SLOT}" || die - - # wrappers are common to all impls, so a parallel run may - # move it for us. ln+rm is more failure-proof. - ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die - rm -f "${ED}usr/bin/${file}" - done -} - -python_install_all() { - dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt - - for x in {Py{AlaMode,Crust,Shell},XRCed}; do - newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop - done - newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png - newicon wx/py/PySlices_32.png PySlices-${SLOT}.png - newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png - - if use examples; then - docinto demo - dodoc -r "${DOC_S}"/demo/. - docinto samples - dodoc -r "${DOC_S}"/samples/. - - [[ -e ${docdir}/samples/embedded/embedded ]] \ - && rm -f "${docdir}"/samples/embedded/embedded - - docompress -x /usr/share/doc/${PF}/{demo,samples} - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl create_symlinks - - echo - elog "Gentoo uses the Multi-version method for SLOT'ing." - elog "Developers, see this site for instructions on using" - elog "it with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - if use examples; then - echo - elog "The demo.py app which contains demo modules with" - elog "documentation and source code has been installed at" - elog "/usr/share/doc/${PF}/demo/demo.py" - echo - elog "More example apps and modules can be found in" - elog "/usr/share/doc/${PF}/samples/" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - - update_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl update_symlinks -} diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild deleted file mode 100644 index abed59a..0000000 --- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-3.0.2.0.ebuild,v 1.1 2014/12/31 17:38:10 floppym Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_7} ) -WX_GTK_VER="3.0" - -inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets - -MY_PN="wxPython-src" - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE="http://www.wxpython.org/" -SRC_URI=" - mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2 - examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" - -LICENSE="wxWinLL-3" -SLOT="3.0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="cairo examples libnotify opengl" - -RDEPEND=" - dev-lang/python-exec:2[${PYTHON_USEDEP}] - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X] - dev-libs/glib:2 - dev-python/setuptools[${PYTHON_USEDEP}] - media-libs/libpng:0= - media-libs/tiff:0 - virtual/jpeg - x11-libs/gtk+:2 - x11-libs/pango[X] - cairo? ( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MY_PN}-${PV}/wxPython" -DOC_S="${WORKDIR}/wxPython-${PV}" - -# The hacky build system seems to be broken with out-of-source builds, -# and installs 'wx' package globally. -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - - if use examples; then - cd "${DOC_S}" - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch - fi - - cd "${S}" - local PATCHES=( - "${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch - # drop editra - we have it as a separate package now - "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch - "${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch - # fix handling egg_info command - "${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch - ) - - distutils-r1_python_prepare_all -} - -src_configure() { - need-wxwidgets unicode - - mydistutilsargs=( - WX_CONFIG="${WX_CONFIG}" - WXPORT=gtk2 - UNICODE=1 - BUILD_GLCANVAS=$(usex opengl 1 0) - ) -} - -python_compile() { - # We need to have separate libdirs due to hackery, bug #455332. - distutils-r1_python_compile \ - build --build-purelib "${BUILD_DIR}"/lib.common -} - -python_install() { - distutils-r1_python_install \ - build --build-purelib "${BUILD_DIR}"/lib.common - - # adjust the filenames for wxPython slots. - local file - for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do - mv "${file}" "${file}-${SLOT}" || die - done - cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die - for file in *; do - mv "${file}" "${file}-${SLOT}" || die - - # wrappers are common to all impls, so a parallel run may - # move it for us. ln+rm is more failure-proof. - ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die - rm -f "${ED}usr/bin/${file}" - done -} - -python_install_all() { - dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt - - for x in {Py{AlaMode,Crust,Shell},XRCed}; do - newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop - done - newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png - newicon wx/py/PySlices_32.png PySlices-${SLOT}.png - newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png - - if use examples; then - docinto demo - dodoc -r "${DOC_S}"/demo/. - docinto samples - dodoc -r "${DOC_S}"/samples/. - - [[ -e ${docdir}/samples/embedded/embedded ]] \ - && rm -f "${docdir}"/samples/embedded/embedded - - docompress -x /usr/share/doc/${PF}/{demo,samples} - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - create_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl create_symlinks - - echo - elog "Gentoo uses the Multi-version method for SLOT'ing." - elog "Developers, see this site for instructions on using" - elog "it with your apps:" - elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - if use examples; then - echo - elog "The demo.py app which contains demo modules with" - elog "documentation and source code has been installed at" - elog "/usr/share/doc/${PF}/demo/demo.py" - echo - elog "More example apps and modules can be found in" - elog "/usr/share/doc/${PF}/samples/" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - - update_symlinks() { - alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" - alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" - } - python_foreach_impl update_symlinks -} diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest deleted file mode 100644 index 9be302e..0000000 --- a/dev-qt/qtwebkit/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX 4.10.4-gcc5.patch 1599 SHA256 f5a998dcf3b21ef15b281d86cd7245e4d0ceb885f0e18c0fb7b367f81d1c8a6f SHA512 76cdccc1f1cd07ae226599b5f0e03b4e3f347d11aa1bc025a0c2ac4d30842852666393dcf3a5302156fb6adee874d87e8f89d3a63a72cde3a7dff2328201a974 WHIRLPOOL 10df94f2e1d9bb322b8f605631aa577ca45c5b72b056e258211d5cc94a9b007f790044d9d04032e7fedf22c47e2db5b7365343ba3832cccca63208984a45cb34 -AUX 4.10.4-use-correct-icu-typedef.patch 1262 SHA256 356a316ef34902e1738803d6ad6e2c6f9265bca7dd67fd41d3912436e96c459e SHA512 73915919247a09796c5923f1524b1a003f196a9bcd8b19ef47e10196c59febcf4792cb3da02c93f881773a1b0d6bb041dd4c2dffc894dec9fb3a641032919558 WHIRLPOOL 34305ddc7734379aaf87dfeb6c666e222d15ba3b7feca7f421d65ed2677e66be8e7551d2bc9e1369fa7f97404528bf7d2a9438f6cfb8d318b9661d71fcb58b78 -AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2bc7ab45f5dc66f10698e8a5baefa90 SHA512 4fa7e280de9364e9eb8df651075aa0a2dded58db0db44d008bad3f053146f539c82c9aa1312006cc85b8367850ec385d3e3f716d2d4b8f4f1d15cd4756957632 WHIRLPOOL bc3241264a78353b0235a7caeb099d49a5fe93677f7fe88316a24c14b35a7f3a0c19b834b3b78a3fcd14d8b265ff5021153147a40f6332b680ad2f70095afe80 -AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71 -AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274 -AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7 -AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec -DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2 -DIST qtwebkit-2.3.4.tar.gz 51648808 SHA256 c6cfa9d068f7eb024fee3f6c24f5b8b726997f669007587f35ed4a97d40097ca SHA512 f7aa3762f84b8ef6c75ceb40beaad750b5c09bb3f14964cda17b42f489ff2c876e35678b57404057e909948160450a144de67ad1337a42992dc5a1d4b796bec4 WHIRLPOOL 1d8e78a8d7f920b132ed79dbc6a6a71b784080d8aa4b9123f22797efa6062eb4f85236ab66f3232900a131049d7c78fc5fc333511b161dc72c30434cd7fef542 -DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea -DIST qtwebkit-opensource-src-5.5.1.tar.xz 33489924 SHA256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 SHA512 a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a WHIRLPOOL a54eabaf72fdd4ffba4317b0c64b57da239605f0d1c8020be4282c0ce802727fd9321c4da14f9cb977419bedc97a4ac44cbc34e7003ff80ae31cfd983a577dc9 -EBUILD qtwebkit-4.10.4.ebuild 3600 SHA256 aabf382813e02775b2764a93c5980b399f90ad4e1e6681fcec4bba5d047bbc64 SHA512 051caffee291b48ff5d13689a30992763852754b7de1b77343024bef9e60da7997a2b0d6d9a969e86e3c5ec1b4282ff2c0e0d957898a6ea0f5fe28682c3792f9 WHIRLPOOL a76e93173c41a7038926fb318f9b28d9f6baca1a80171b9ecbe60e09125a464bb93d7d48386a5264f723f614266f728d612fafb869172a1fa5b48c3e5bc73417 -EBUILD qtwebkit-4.8.6-r1.ebuild 2192 SHA256 0382e9c71181294d63accb41888862a5552cd983310a69b94980411bdd942a66 SHA512 1898f3434485a4f73b757f9cea902edc9ae5d03bb5a23e30f3601f0194adae6606c675e857cebe62f64f0cc913f014209ec9d5e83a5cf8ab62a486aba8831f56 WHIRLPOOL f1085999dc3ce2d0c1a719291ed11aacde1ad1d36969ca057e0828e42456433a6a23399db611c29480e697460a283fb15c8b5c82898f18acd64ef955c0ea55d8 -EBUILD qtwebkit-4.8.7.ebuild 2164 SHA256 37c37f9e03370f2026fa9020ea7cc84a044d5b2a78799b6eb0875a81759c3f12 SHA512 cf50323ea360002b49971411d4a5aa640eafc7396ad38469bb1291d5b292b3af4968a222641cdef241c819497b4d6ad3a6f083c1d958537066c97aa55627a357 WHIRLPOOL d6c805d2cb973708a25ef98eaadee4ff619ad25eac60d619dfe74a151fdc68d454d1a338183d6bc4eacd274ee2cfbc78d06d0adb281cf4f0e6d9b4aa1d781578 -EBUILD qtwebkit-5.4.2.ebuild 2911 SHA256 687320874749d58ecfd8da686d7a4f8c08b6fc5481c12659ba8e943de617fe90 SHA512 a41685e954d90b90feeecffdb17620b6c8cb824a08f39eb14575b6fa0e2b88854ded898b99026b249f16a798a5358b398623e50fccfcfd9ecb221e1cd2823cff WHIRLPOOL 1b3bd82d32002994dd208fef326fcafee2cac7a424436c87fb8a085867247b68a7869ee406dcbbe5b00c361d78a6d5ffae8b1628f58e769d04f182dd57cafa94 -EBUILD qtwebkit-5.5.1-r1.ebuild 3114 SHA256 e871de2a4ffb6fc98c4693adb4d93c0d3ccd41b5a87f8df0ecf1e052e0242fda SHA512 a74dfda32969119497128b90f492d0dd4402f8f1434b6aec6394bf26c1ad6d2fb3be6c3e2bc4fefbd66878d16ce8f317cbfebe62abb7821104c82f93eaa4bfeb WHIRLPOOL b752a6d6939c40c6deb22d8279d4167e911a385f242e774399d9a3e18fe056b78a65c6b194d294291b2953a9fd9dd44d2db657c5af74c62e232c7457636e860c -MISC metadata.xml 1313 SHA256 0605f518e0777628f9976865a7c937bd0206954f2da0725e569608ea18d17e93 SHA512 ef2dce2348d143978b87e262da505adb5f3d09e13800c0ba8602b7ee8453ccd39ac77ac9795731367fd4dbce80f2c12a3eb0e4796321665ba6d9d176500a181c WHIRLPOOL 126a21713c1a2d449a1fc710b9cf23b220d3c55b3ece950b0c71cb4a8230f7436cff86a5ef93135673e96d32281e47178106f552b7de250253f05daedfb2ff82 diff --git a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch b/dev-qt/qtwebkit/files/4.10.4-gcc5.patch deleted file mode 100644 index 3a6b2a3..0000000 --- a/dev-qt/qtwebkit/files/4.10.4-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Fri, 6 Mar 2015 10:20:13 +0000 (+0100) -Subject: Fix g++ 5.0 build -X-Git-Tag: v5.4.2~12 -X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=650c6ee8e76bb574d3a1bea09e2494992d8f070e;hp=f9966f351678351ee6b971d7b6b25a4987407e46 - -Fix g++ 5.0 build - -A non-inline template needs to be explicitly instantiated if used -outside the object where it is declared. - -Patch suggested by Khem Raj. - -Task-number: QTBUG-44829 -Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792 -Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> ---- - -diff --git a/Source/JavaScriptCore/runtime/JSObject.cpp b/Source/JavaScriptCore/runtime/JSObject.cpp -index 5637e20..bd55919 100644 ---- a/Source/JavaScriptCore/runtime/JSObject.cpp -+++ b/Source/JavaScriptCore/runtime/JSObject.cpp -@@ -1909,6 +1909,11 @@ void JSObject::putByIndexBeyondVectorLengthWithoutAttributes(ExecState* exec, un - } - } - -+// Used in JSArray.cpp so we must instantiate explicit -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); -+template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); -+ - void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) - { - VM& vm = exec->vm(); - diff --git a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch b/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch deleted file mode 100644 index 3e48162..0000000 --- a/dev-qt/qtwebkit/files/4.10.4-use-correct-icu-typedef.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 916f00008b602ae1b260106e7fb1274d2282f61f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@flaska.net> -Date: Tue, 3 Sep 2013 16:59:35 +0200 -Subject: [PATCH] ICU has defined UChar32 to be an int32_t since 2002 - -This fixes the build failure of qtwebkit23 on my Gentoo machine. ---- - Source/WTF/wtf/unicode/qt4/UnicodeQt4.h | 2 +- - Source/WTF/wtf/unicode/wchar/UnicodeWchar.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -index a2d1ad4..392d2db 100644 ---- a/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -+++ b/Source/WTF/wtf/unicode/qt4/UnicodeQt4.h -@@ -69,7 +69,7 @@ typedef uint16_t UChar; - #endif - - #if !USE(ICU_UNICODE) --typedef uint32_t UChar32; -+typedef int32_t UChar32; - #endif - - namespace WTF { -diff --git a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -index 10c2026..db8944e 100644 ---- a/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -+++ b/Source/WTF/wtf/unicode/wchar/UnicodeWchar.h -@@ -31,7 +31,7 @@ - #include <wtf/unicode/UnicodeMacrosFromICU.h> - - typedef wchar_t UChar; --typedef uint32_t UChar32; -+typedef int32_t UChar32; - - namespace WTF { - namespace Unicode { --- -1.7.1 - diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch deleted file mode 100644 index 16f52d9..0000000 --- a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2012-07-17 15:06:26.692276108 +0000 -+++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17 15:06:54.480928701 +0000 -@@ -993,7 +993,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ -+#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \ - || (CPU(IA64) && !CPU(IA64_32)) \ - || CPU(ALPHA) \ - || CPU(SPARC64) \ diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch deleted file mode 100644 index 05e41a1..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:35:47.795676444 +0000 -+++ Tools/qmake/mkspecs/features/features.prf 2014-03-19 18:36:38.602433220 +0000 -@@ -99,12 +99,6 @@ - - # HTML5 Media Support for builds with GStreamer - unix:!mac:!contains(QT_CONFIG, no-pkg-config) { -- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { -- WEBKIT_CONFIG += video use_gstreamer -- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { -- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 -- } -- use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video - } - - !enable?(video):qtHaveModule(multimediawidgets) { diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch b/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch deleted file mode 100644 index 1c02e45..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.3.2-use-gstreamer010.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:09:50.010617142 +0100 -+++ Tools/qmake/mkspecs/features/features.prf 2014-09-27 11:17:10.741678989 +0100 -@@ -96,14 +96,8 @@ - use?(3d_graphics): WEBKIT_CONFIG += webgl - - # HTML5 Media Support for builds with GStreamer -- unix:!mac:!contains(QT_CONFIG, no-pkg-config) { -- packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") { -- WEBKIT_CONFIG += video use_gstreamer -- } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") { -- WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 -- } -+ WEBKIT_CONFIG += video use_gstreamer use_gstreamer010 - use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video -- } - - !enable?(video):qtHaveModule(multimediawidgets) { - WEBKIT_CONFIG += video use_qt_multimedia diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch deleted file mode 100644 index 0a476c6..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch +++ /dev/null @@ -1,25 +0,0 @@ -Correct header location so system dev-libs/leveldb can be detected. - ---- Tools/qmake/config.tests/leveldb/leveldb.cpp -+++ Tools/qmake/config.tests/leveldb/leveldb.cpp -@@ -19,7 +19,7 @@ - - #include <leveldb/db.h> - #include <leveldb/env.h> --#include <helpers/memenv/memenv.h> -+#include <leveldb/helpers/memenv.h> - - int main(int, char**) - { - ---- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -+++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp -@@ -38,7 +38,7 @@ - #include <leveldb/comparator.h> - #include <leveldb/db.h> - #include <leveldb/env.h> --#include <helpers/memenv/memenv.h> -+#include <leveldb/helpers/memenv.h> - #include <leveldb/slice.h> - #include <string> - #include <wtf/PassOwnPtr.h> diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch deleted file mode 100644 index 40e58f0..0000000 --- a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch +++ /dev/null @@ -1,15 +0,0 @@ -Allow disabling JIT for hardened. - -Author: Magnus Granberg <zorry@gentoo.org> -Gentoo-bug: 562396 - ---- a/Tools/qmake/mkspecs/features/features.pri -+++ b/Tools/qmake/mkspecs/features/features.pri -@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \ - ENABLE_INPUT_TYPE_WEEK=0 \ - ENABLE_INSPECTOR=1 \ - ENABLE_INSPECTOR_SERVER=1 \ -+ ENABLE_JIT=0 \ - ENABLE_JAVASCRIPT_DEBUGGER=1 \ - ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \ - ENABLE_LEGACY_NOTIFICATIONS=1 \ diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml deleted file mode 100644 index 68b6e35..0000000 --- a/dev-qt/qtwebkit/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> - <use> - <flag name="exceptions">Add support for exceptions - like catching them - inside the event loop (recommended by upstream)</flag> - <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> - <flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag> - <flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag> - <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag> - <flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag> - <flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag> - <flag name="qml">Build QML/QtQuick bindings</flag> - <flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag> - <flag name="webp">Add support for WebP image format</flag> - </use> - <upstream> - <bugs-to>https://bugreports.qt.io/</bugs-to> - <doc>http://doc.qt.io/</doc> - </upstream> -</pkgmetadata> diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild deleted file mode 100644 index dc656a5..0000000 --- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils multilib python-any-r1 qmake-utils toolchain-funcs multilib-minimal - -MY_PV=${PV/4.10/2.3} - -DESCRIPTION="The WebKit module for the Qt toolkit" -HOMEPAGE="https://www.qt.io/ http://trac.webkit.org/wiki/QtWebKit" -SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz" - -LICENSE="|| ( LGPL-2.1 GPL-3 )" -SLOT="4" -KEYWORDS="~amd64" -IUSE="debug +gstreamer" - -RDEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - >=dev-qt/qtcore-4.8.6-r1:4[ssl,${MULTILIB_USEDEP}] - >=dev-qt/qtdeclarative-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtgui-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtopengl-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtscript-4.8.6-r1:4[${MULTILIB_USEDEP}] - >=dev-qt/qtsql-4.8.6-r1:4[sqlite,${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/jpeg:0[${MULTILIB_USEDEP}] - virtual/libudev:=[${MULTILIB_USEDEP}] - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXrender[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/perl - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/perl-Digest-MD5 - virtual/perl-File-Spec - virtual/perl-Getopt-Long - virtual/pkgconfig[${MULTILIB_USEDEP}] -" - -S=${WORKDIR} - -PATCHES=( - "${FILESDIR}/${PV}-gcc5.patch" - "${FILESDIR}/${PV}-use-correct-icu-typedef.patch" -) - -src_prepare() { - # examples cause a sandbox violation (bug 458222) - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - # respect CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS_RELEASE.*=/d' \ - Source/WTF/WTF.pro \ - Source/JavaScriptCore/Target.pri || die - - # fix perl shebang - sed -i -r -e "1s,/usr,${EPREFIX}/usr," \ - Tools/Scripts/build-webkit || die - - # apply patches - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - epatch_user -} - -multilib_src_compile() { - local -x \ - QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4 \ - WEBKITOUTPUTDIR=${BUILD_DIR} - - local myconf=( - "${S}"/Tools/Scripts/build-webkit - --qt - # tell the build system where to find the qmake binary for the current ABI - --qmake="$(qt4_get_bindir)"/qmake - --qmakearg="CONFIG+=nostrip DEFINES+=HAVE_QTTESTLIB=0" - --makeargs="${MAKEOPTS}" - --$(usex debug debug release) - --$(usex gstreamer video no-video) - # disable WebKit2 since it requires Qt5 - --no-webkit2 - # prevent automagic dependency on qt-mobility (bug 547350) - --no-geolocation - --no-device-orientation - --no-orientation-events - # copied from eqmake4 - QMAKE_AR="'$(tc-getAR) cqs'" - QMAKE_CC="'$(tc-getCC)'" - QMAKE_CXX="'$(tc-getCXX)'" - QMAKE_LINK="'$(tc-getCXX)'" - QMAKE_LINK_C="'$(tc-getCC)'" - QMAKE_OBJCOPY="'$(tc-getOBJCOPY)'" - QMAKE_RANLIB= - QMAKE_STRIP= - QMAKE_CFLAGS="'${CFLAGS}'" - QMAKE_CFLAGS_RELEASE= - QMAKE_CFLAGS_DEBUG= - QMAKE_CXXFLAGS="'${CXXFLAGS}'" - QMAKE_CXXFLAGS_RELEASE= - QMAKE_CXXFLAGS_DEBUG= - QMAKE_LFLAGS="'${LDFLAGS}'" - QMAKE_LFLAGS_RELEASE= - QMAKE_LFLAGS_DEBUG= - ) - echo "${myconf[@]}" - "${myconf[@]}" || die -} - -multilib_src_install() { - emake INSTALL_ROOT="${D}" install -C $(usex debug Debug Release) - - # move pkgconfig file to the correct location - mv "${ED}"/usr/$(get_libdir){/qt4/pkgconfig,} || die -} diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild deleted file mode 100644 index 47f09d1..0000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qt4-build-multilib - -DESCRIPTION="The WebKit module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == live ]]; then - KEYWORDS="arm ia64 ppc ppc64" -else - KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt" - -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - # Fix version number in generated pkgconfig file (bug 406443) - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Prevent automagic dependency on qt-mobility (bug 547350) - sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ - src/3rdparty/webkit/Source/WebCore/features.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build-multilib_src_prepare -} - -multilib_src_configure() { - local myconf=( - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild deleted file mode 100644 index 53a6f56..0000000 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit qt4-build-multilib - -DESCRIPTION="The WebKit module for the Qt toolkit" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+gstreamer icu +jit" - -# libxml2[!icu?] is needed for bugs 407315 and 411091 -DEPEND=" - >=dev-db/sqlite-3.8.3:3[${MULTILIB_USEDEP}] - ~dev-qt/qtcore-${PV}[aqua=,debug=,ssl,${MULTILIB_USEDEP}] - ~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) - icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/4.8.2-javascriptcore-x32.patch" -) - -QT4_TARGET_DIRECTORIES=" - src/3rdparty/webkit/Source/JavaScriptCore - src/3rdparty/webkit/Source/WebCore - src/3rdparty/webkit/Source/WebKit/qt" - -QCONFIG_ADD="webkit" -QCONFIG_DEFINE="QT_WEBKIT" - -src_prepare() { - # Remove -Werror from CXXFLAGS - sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ - src/3rdparty/webkit/Source/WebKit.pri || die - - # Fix version number in generated pkgconfig file (bug 406443) - sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ - src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die - - # Prevent automagic dependency on qt-mobility (bug 547350) - sed -i -e 's/contains(MOBILITY_CONFIG,\s*\w\+)/false/' \ - src/3rdparty/webkit/Source/WebCore/features.pri || die - - if use icu; then - sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ - src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die - fi - - qt4-build-multilib_src_prepare -} - -multilib_src_configure() { - local myconf=( - -webkit - -system-sqlite - $(qt_use icu) - $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) - ) - qt4_multilib_src_configure -} diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild deleted file mode 100644 index 70eab16..0000000 --- a/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm ~arm64 ppc64 ~x86" -fi - -# TODO: qttestlib, geolocation, orientation/sensors - -IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - >=dev-libs/leveldb-1.18-r1 - dev-libs/libxml2:2 - dev-libs/libxslt - >=dev-qt/qtcore-${PV}:5[icu] - >=dev-qt/qtgui-${PV}:5 - >=dev-qt/qtnetwork-${PV}:5 - >=dev-qt/qtsql-${PV}:5 - >=dev-qt/qtwidgets-${PV}:5 - media-libs/fontconfig:1.0 - media-libs/libpng:0= - >=sys-libs/zlib-1.2.5 - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] ) - opengl? ( >=dev-qt/qtopengl-${PV}:5 ) - printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 ) - qml? ( >=dev-qt/qtdeclarative-${PV}:5 ) - udev? ( virtual/udev ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/rubygems -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" -) - -src_prepare() { - # ensure bundled library cannot be used - rm -r Source/ThirdParty/leveldb || die - - # bug 466216 - sed -i -e '/CONFIG +=/s/rpath//' \ - Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ - Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ - || die - - if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" - elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - fi - use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use qml || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \ - Source/QtWebKit.pro || die - use udev || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ - Tools/qmake/mkspecs/features/features.prf || die - - # bug 458222 - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - qt5-build_src_prepare -} diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild deleted file mode 100644 index f54851b..0000000 --- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit python-any-r1 qt5-build - -DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" - -if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -# TODO: qttestlib - -IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp" -REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )" - -RDEPEND=" - dev-db/sqlite:3 - dev-libs/icu:= - >=dev-libs/leveldb-1.18-r1 - dev-libs/libxml2:2 - dev-libs/libxslt - ~dev-qt/qtcore-${PV}[icu] - ~dev-qt/qtgui-${PV} - ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtsql-${PV} - ~dev-qt/qtwidgets-${PV} - media-libs/fontconfig:1.0 - media-libs/libpng:0= - >=sys-libs/zlib-1.2.5 - virtual/jpeg:0 - virtual/opengl - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXrender - geolocation? ( ~dev-qt/qtpositioning-${PV} ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gstreamer010? ( - dev-libs/glib:2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] ) - opengl? ( ~dev-qt/qtopengl-${PV} ) - orientation? ( ~dev-qt/qtsensors-${PV} ) - printsupport? ( ~dev-qt/qtprintsupport-${PV} ) - qml? ( ~dev-qt/qtdeclarative-${PV} ) - webchannel? ( ~dev-qt/qtwebchannel-${PV} ) - webp? ( media-libs/libwebp:0= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-lang/ruby - dev-util/gperf - sys-devel/bison - sys-devel/flex - virtual/rubygems -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4.2-system-leveldb.patch" -) - -src_prepare() { - # ensure bundled library cannot be used - rm -r Source/ThirdParty/leveldb || die - - # bug 466216 - sed -i -e '/CONFIG +=/s/rpath//' \ - Source/WebKit/qt/declarative/{experimental/experimental,public}.pri \ - Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \ - || die - - qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf - qt_use_disable_mod webchannel webchannel \ - Source/WebKit2/Target.pri \ - Source/WebKit2/WebKit2.pri - - if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" - elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" - fi - - # bug 562396 - use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" - - use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ - Tools/qmake/mkspecs/features/features.prf || die - use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \ - Tools/qmake/mkspecs/features/features.prf || die - - # bug 458222 - sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die - - qt5-build_src_prepare -} diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest deleted file mode 100644 index be378cf..0000000 --- a/dev-util/cmake/Manifest +++ /dev/null @@ -1,42 +0,0 @@ -AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa -AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 SHA512 fe3148f9a09363c5943f09b963391a4276f2da6095e66c28a1c365fd655e2124e1931b40890152836e24a3c9e330db799199d8ae295fe4581f7124b42f09f928 WHIRLPOOL 322a805a2df9afa40c7ff217481819462d90d8259856696fa4ef76fda1571fa081577eb8cd06fbee899911b01243a912e43a9dcc667932f9885492fcb92c0f98 -AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 SHA512 13dfb5d1ed271eaf673aa53c40a5a17a89812c7617e840ffd3df962e9ed6e46da7b507121f56314a2ef8b86a80b2453cf327684e2c4e82bb903cd8210807f507 WHIRLPOOL b43a187a6f90590460b6e499630a6f6d550cee09309c4c32c0b7d68189bcd84dac309ae4b80bc345de5b32dcc4ac94f789c1fea8162cea4175847c49dc862ccf -AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8 -AUX cmake-2.8.10-darwin-isysroot.patch 1913 SHA256 a706da7288dd1f1fcd78291e411f34cb5e6d8eec3ea620011da9c7182e3e4df6 SHA512 862fcedba5abab3f7dab6eb56a680cc0f81090e551a1519f40a638a3dfd08ec083b2c67cdd174f2f32aa3e417b178e8b3bcde1e9db9d34f740b8e72be4306c6d WHIRLPOOL 46a523c1e9c8f17828a3130cc1ce37810cea408d04870939f30c4a5c0e777e1c5537b3e1c2e36690f6a21fa783057d6f5f9b8b7186b45b0f8056dc72041cdd1d -AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e19118670d4e2e955cdcf5a14f25fefe15 SHA512 bc5c6ca27e3317ac7c65e09733331e3732ea31c28d5b08b7fbd150845cf6657238b017d0782237ef57abab9fec249cacf78762dfe66c6389bc0fd9a91add0f08 WHIRLPOOL 5c446ba04f0d88a022a415c03e601ee6dc7cbfaebe8c564f9e5ca88a92e9f5755ae8435789e477ff14980a22e690748c7b0bc602e51bc8a074fb025010337dbf -AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51af51a8d224ef1003a043ce468f4 SHA512 08a0fb45f2b4c1a8ba0e961539d650e38feedd4b2ca3b5acc2fcad3d68fe3fcdb5b114663b1f84b26027e902d28cc2d4f50cc1e3491ba90d6c3c273aa32d62d9 WHIRLPOOL 505231f51be487dd71eb2f17cb65560eb86039673a593e1e76f3d7f27c3cb64dad36ef1c507aa9e97aae28b20f642dfcb4d023537e0a1af361e74c43b88a51e1 -AUX cmake-2.8.10.2-FindPythonInterp.patch 651 SHA256 bae58e84982de8331a4038fdc1339baa42512ffb254dfbf553d3bf6f04221cfe SHA512 a1c68cc9f24addc771b8eb33ca6ac0d841311b634e5c5d6500924d70678408a666353791a8b2a00013e1b31545ecef6d26f939216b8fe7dcb8b6152c9e89f17c WHIRLPOOL 3c6a3f084d402244d8628bce6ac17a11eda0d55ced3824584284f63b5f1300f89921941257ded395e2aec88950ab65ca80dd9ff0fa6932f7eee908bd4778c688 -AUX cmake-2.8.10.2-FindPythonLibs.patch 968 SHA256 4a2bbd60a2c526387ac8088d6bbecff1cc4399259d737530f2d55a6afd033b15 SHA512 e42713242202409e06a1b0725c6ea0a89c6d623d143e6c06def9681b72516a760ebddeccdf16e141e6b21ced2fb63e42337536afd6ca799e6d6d8689d48037cb WHIRLPOOL f92e7981f267310e471425b9f6595c54bf6df2af3fd99a0502bebaa39d87dcc14e31389d1c1bd99271718ce6b33f837842a0cdb454de09da60df5252f86cf826 -AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2d80318d0914ab21c704286b1d15e SHA512 20b4f594a5fee9e20cccd1ec79797d2ac2e930ae2252ac544248ee7825ee76dbd32459ae6b87afd0d684a9a780dd1e1e78da361519dbb767fe761eeff6b545f6 WHIRLPOOL 38e13557dc7009ba422c5e6487b89c9847c2b51fa69c0d02eac20ea8c9d9d212a5b66f4ab9049d241ff0e4ffc23096117592c584b3b787dceb5e225a06ea9d75 -AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1 -AUX cmake-2.8.12.1-FindFreetype.patch 1404 SHA256 68e4d69aadde939087d257e88273e6fa075b9533dcccc32b0c3ed7d96af6a832 SHA512 f07a6ca20251bd517e4e63ed81a6d67c388de7c53cce6177252a86eb1c68b3fe2ecfdf7493d3f6baba56d58d1b35da181dee7f4a99ae63ac18b0c2398f3d3d76 WHIRLPOOL e7ab5a1987ba1ae0fe8e91ff1535cc870cedc3b4282d4c3721a627cd8fc948a5e2f81214287cf50b35f7b20928526022ed13bc900fd8334244c10c89435267c3 -AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40 -AUX cmake-2.8.12.2-FindBoost-python.patch 5494 SHA256 4e514122d8078f2b1db10c842f2c5d35713849b72d742848281954040eade4cc SHA512 450be7d80edd54e9d2a609645a0c58f6672fbe623a49bddfa01c3903f9fb2f0d944ae7bc884829fcb48c194e873bede372dd350b9a9d521be2ff2c0e3198b0cb WHIRLPOOL c8486b950f35ce4bad76ba9dd4b3b256c8b6a62e5321d1cb1f99ca5a3c8146830eea5c487494571d92bddf0a10a2db5d89e5ad53bd0aca9f29d218665290077a -AUX cmake-2.8.12.2-FindCurses.patch 1525 SHA256 85d71d32b0bafffaa2c24e6e7432db1c35e04eae790fc27e515210c8c5f7e812 SHA512 74d6390fa253764c7d6e94e5ed566b886dcd93f35ce840979faeb86f48e3cb5c35aa77895adf39df5708954c256dbd2d277eb1f58f21829805abb11ba2802462 WHIRLPOOL b4041827630a9f53f499d3b448c30cdba32ab4d7962d51e1e6a8a779f55d502a529127ebc477331d3d4fdc87249449e95a51601ca10125d75d19605204e585a6 -AUX cmake-2.8.12.2-hppa-bootstrap.patch 1195 SHA256 fb31515c540fc6d5b2e9d0a3ba3df8d11a74b84fa474e3845285345a219c8a65 SHA512 25ca780843248638502d389d078588194a4eeaa2cde163076b57c588ea6acf78a8ee832eb76d45b747467b31da5562f7d05715ecabcb6c1ce985a98d5f677e68 WHIRLPOOL 41d723a818b6e8d0993abfd6cb77ad505013526b4b2ba11e00200b590b9a27efa1dabeef02ec22c9dafbbcdb003b76b110ce0c9b22f0f1d8a29adf35ccd6de90 -AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005 -AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911 -AUX cmake-3.0.0-FindBLAS.patch 1577 SHA256 25be4e8671eff94b5cb7fe955215d9b97cc39e61f7203b4eb9b28e16977c3842 SHA512 c6239fe3d8b8e437b66399a3ebdf09da94f747dc6c45aaaba43773ce29a106727c7d4f8a570e1fd9603a9cdbade6b9702398c1989267adbcc5aebbeb59d30915 WHIRLPOOL 44366678ff681b3c876c90274d3b6709ad4ef7de051663db03fecdb77baffbd87b02c5edf53126b383680a58ef4c0a0100982240e58db352c781cd204907f2bc -AUX cmake-3.0.0-FindBoost-python.patch 6481 SHA256 bd8ff52ce3565ab67806e2417d3c1e3c05215dde1da588f65dfc8db061ea3116 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf WHIRLPOOL ba4965b6e390a30178cd99806eda5d1fd669ccb894ba94d1f8ea358dcfbf10f9559918711912786cc3be16569b87d931d13712bd84a433b561f1092d8c71c416 -AUX cmake-3.0.0-prefix-dirs.patch 4280 SHA256 55dcc8203a802659c21bd6449b847b4477bfa4d140f30ba8dceac5f4e536d92a SHA512 1d0f2c9b2831a79dac61bf156ad981388dd8f340960f78b2800b559a5f2d18dd8a2b69499c4a8b1ee3677b7a116a6cec9666bacb8a8429c77fb0bd589dc47ade WHIRLPOOL 6952c370d3963f2a1c6d762b652e8c19ecc0aec0b9be5d2b2084cbfaaa9c329712b5a67ba4e6e44c3c89d8da50e639a1e223b5cabe4c4bb9cf3607dba2170b00 -AUX cmake-3.0.2-FindLAPACK.patch 1442 SHA256 394388bdf47c995bc540537ad2cb497c719eafc5298a19d41d1a672c02d3b221 SHA512 60b673005bb3cec6830a3f68922c5661bccd8d7d39d77172d1f59383e8f9912e3e74e052d5e632479d1b091357dbabef656049dffaf705cebae9ae99ea35e74e WHIRLPOOL 7b46096381aa9a94e92c9aac80993a3da75b80203050f609adf7672ac238d4dd3ad89ff8261e87bd040a4ba5b4b1b4e73bfdf9ac3ba55b2c33a6f7800315748c -AUX cmake-3.1.0-FindPythonInterp.patch 1072 SHA256 463c0a681b92ed02f7802153457d530109c6a6ec686d6c02968ea84085134705 SHA512 5e3445f43793fbea561d24cf502d06264f3f27134420d7df18aee678901bb895912a0b7b7f73ec7321155284f821aab5dbd6046bb050c02f58a0bd5188dc85f0 WHIRLPOOL 65aaa246da0230df4ff45a21e398224751d67820153ed5b871ee6095ae97804da98057de114354ec7ff2abb8f438fbcdd5c0b70a718fef6974d39ee69f94ca6e -AUX cmake-3.1.0-darwin-isysroot.patch 1922 SHA256 05b3f77f8f8a25c809cf0819867fa785a739d3dc9c34e5e9fbbb6b4ad9115710 SHA512 9fcdac45f1c4d8c90839e5f4a6c9f1d28c1767bf6b1767dd7d8d04d332558ef8dc775af65926c3d08a72a6e535c063a85956bf20a10e48016fa13533037979d0 WHIRLPOOL 31ea327e6c41132923a26dfce39b19961b1862e79fcfa3f9c80773f6c3181acbf44ab655a2b837c0ab2165d918c8709aa82321958ca4e0d93277d0a2a47c1127 -AUX cmake-3.3.2-FindQt4.patch 1581 SHA256 33aadc81151b4113865d6a959698667ef42456252deeb11ee988e8ecf62ecd2c SHA512 253b8035c8ffd791fded345882caa609012b738dfce3d48ee8f1ee16d34eb6b8521de22915b89a195b93a37267c0a593b6a77dac5fe5223f26f8b719c8c2131c WHIRLPOOL 8af2141261ae4e581e05f1833b5b01309b8a1663457c837d8886e40ade6ee36a2fde064d48763ae1a4bb6771d6347ea402f2dadced4427de1b49430098ff010c -AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 SHA256 e3a8f2ff999ffe32c71de3779fb7b349120cafce7f2be26d89ba393085cffcad SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9 WHIRLPOOL 49add46771d80ead6d4648d747816e728f2b59bfddd403936b2e13079a9f268d126d56ba3c6de4bdf7c1eb91cb7c3391c9008f3b25ccee8ba38563753670487c -AUX cmake-3.4.3-utimensat-test.patch 1454 SHA256 9f4cc03a9426c5517e2542ec023067f8752aebf182c1b75af4ad0f86cf78a322 SHA512 26a4ce3e7c94648b1620e254d65d98cc62169e7fc7630b0208fb9b004e14a1134a3d28d67bff81bd46bbf980d4788231f3d75882e5d60d75ca75157e8f269766 WHIRLPOOL 8da4951a4febc2e3fd20344144a91dc7c04b475ea98deb6ce3e96f9fa5127376fdcd2416c14e25d4bb6d3cab2b4d6272a5f2d9fd491a7842a228d47fd761653a -AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc -DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29 -DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2 -DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f -DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b -DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7 -DIST cmake-3.4.2.tar.gz 6722152 SHA256 da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392 SHA512 a06a3f1d2d2dcbc3c1d432bd7416632393b4f5219b89dc0ba000acefe6f0d713c35878344884ea9d9e595a6387b362c97a2432acd92c385cbddb4e7b916723bb WHIRLPOOL 42f66e4273367e821b4b06b630f84919a68bc0d4a2be2085a0f24fb79e1b20fb208abe78a1806570401ba6ca24ad1077b1be27c3e7a774491c8beb63f7d501af -DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad -EBUILD cmake-2.8.12.2-r1.ebuild 5504 SHA256 1d39b4ff30e7b99174e593ecf01ff303659a9adfec48507a5490b620b248bd32 SHA512 d3286337d2133499d02d3a08329d91fec708d587c50669094dd964938da3159e882cc29d2527d144a10beca6b26b64694a6943df5d2d716ea138900221b93d54 WHIRLPOOL 87e492c17a12b89258d5e0a2daa42f6cba43661fa923b5dd5fde1e2519f7661c37b8976cf1ed76ce087b722afd2fe81cd114827c7000abff880047a9379fc05f -EBUILD cmake-3.2.2.ebuild 5173 SHA256 378f7aa192174ae74bff82d2d4c3d24b4e2e68ac1210641ae9209c8c447bb80b SHA512 27e64539209d172ff1b6edee1617e47cc1baf93a521363b271455d73ffae835f05d01b5e8af97754a836d0bf7149c9902627a004000e5e9a6e7dbed8c23702f2 WHIRLPOOL 461cc51621db5cb195f1ec87fe9963c44de8bf7227d46869d109577a6c3e4d06e33c7d0471b08d0ff0c79c8655d348ac8f67aedd53ce5fceac113560b223c529 -EBUILD cmake-3.3.1-r1.ebuild 5515 SHA256 14aa1543b0049b1a4e24ecff3f4d1d53cc71e911a454313cc42d9405f4538ba0 SHA512 1adf9e15c9570f7ce99a14f1ff3d30aef3882971b38b80df1fe9afae789ef6659716b9bc79181d046676192398499468342b2f708bf6a41732c57398d72b60b7 WHIRLPOOL ef0ff3277fa27e0366a5498af706ba5dd2464e3769fc83e23c970b47862c158de430ca3476caa991d795a0def95362dcd76e0bc6a6fb7ce85b177a83f4712c92 -EBUILD cmake-3.3.2-r1.ebuild 5654 SHA256 b27f6758711377c0ceba18fbadebfbcce14752943744e4d2a790c2213bd36bc0 SHA512 c9ddb10f5b7440ffbd8dba8079576809b15ede87464f54527e25fe6dfa7d9f527c7fd5c98979ae3f760e5284c5c1516466196f9482cf688386628c2485d116b3 WHIRLPOOL d4a25da32afd4607c2665acca56a3c7a10a9ce81563e70287e5d92d76d2c6b36efa856c7e250e7849956a1a57de43f863c6f420c64d1e715125028127818f344 -EBUILD cmake-3.4.2.ebuild 5339 SHA256 68fc3890cacc64110d76f3ea37b4eeb1368aab5b2cd1701bea8aa1ed4a380b58 SHA512 7a56c5f5c65fd938e7ab11067be868a2112dd41cc567806b3333392c513e9dd38c988f4ee3fececcd5fa6c62a92dbce165b6a70b38ff6f5861589b6c898c2734 WHIRLPOOL 406d9b6dcc9f7e7bcfa457a8239d13ab225940c8faf68f55e5f338f4a73ce644128aa6b6e1a1cecf5a159ef7058ecbc652fe6f9643fbb6778d2dadb04554374d -EBUILD cmake-3.4.3.ebuild 5429 SHA256 dd9a77c62cf4a5e208612760c3dd57ee5be9fe6126db3305f239ed9518def8b0 SHA512 bbda813b582d999d5efebab4d9a567bdc17dceccf904b9f1928718a517329c9d5f1b8723b013e0f52c8ce7eb8dc3faac115cac1ee50a002ae051652fc7ee50a9 WHIRLPOOL 47d7a7a8ee822242203745ec10cf998a4a5f72a843d64f66192c85ce28e07c21b6651e7cfa26f9757bfc66a9025d152e5df411a78db306fa3cbff3c2f3a3fd49 -MISC metadata.xml 372 SHA256 78d93866535e604c9aa6a148da808af80312bee964a0c56b0e8d591b0f83ebb8 SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a WHIRLPOOL 5fb2acc7f68b1dd0beeb65685674103e5dfa195ee83bca3a356e8d17aafe5fdc84821d2461a988977a44e0f01fa8a8cf8ee014a932ada4580ac0555b9e2408b2 diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild deleted file mode 100644 index af20ec7..0000000 --- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -SLOT="0" -IUSE="emacs ncurses qt4 qt5" - -REQUIRED_USE="?? ( qt4 qt5 )" - -DEPEND=" - >=app-arch/libarchive-2.8.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch - "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch - "${FILESDIR}"/${PN}-2.8.10-desktop.patch - "${FILESDIR}"/${PN}-2.8.10-libform.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch - "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch - "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch - "${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch - "${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # CTest.updatecvs, which fails to commit as root - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -pkg_setup() { - # bug 387227 - addpredict /proc/self/coredump_filter -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - # per bug #315229 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Docs/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Docs/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Docs/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Docs/bash-completion/{${PN},ctest,cpack} - rm -rf "${D}/usr/share/cmake/completions" || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild deleted file mode 100644 index 51c7679..0000000 --- a/dev-util/cmake/cmake-3.2.2.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild deleted file mode 100644 index 0f3a6c5..0000000 --- a/dev-util/cmake/cmake-3.3.1-r1.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz - http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) - "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild deleted file mode 100644 index 9604865..0000000 --- a/dev-util/cmake/cmake-3.3.2-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx prefix - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz - http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) - "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch - "${FILESDIR}"/${PN}-3.4.3-utimensat-test.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - eprefixify Modules/FindQt4.cmake - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -rf "${D}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-3.4.2.ebuild b/dev-util/cmake/cmake-3.4.2.ebuild deleted file mode 100644 index acd76b8..0000000 --- a/dev-util/cmake/cmake-3.4.2.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/cmake-3.4.3.ebuild b/dev-util/cmake/cmake-3.4.3.ebuild deleted file mode 100644 index 802fc61..0000000 --- a/dev-util/cmake/cmake-3.4.3.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx prefix - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/" -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" - -RDEPEND=" - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) - "${FILESDIR}"/${PN}-3.4.3-utimensat-test.patch -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_src_prepare - - eprefixify Modules/FindQt4.cmake - - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ - Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - - cmake_src_bootstrap -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - $(cmake-utils_use_build ncurses CursesDialog) - ) - - if use qt4 || use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - VIRTUALX_COMMAND="cmake_src_test" virtualmake -} - -src_install() { - cmake-utils_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/cmake-syntax.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/cmake-indent.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/cmake/files/50cmake-gentoo.el b/dev-util/cmake/files/50cmake-gentoo.el deleted file mode 100644 index e4a1a6d..0000000 --- a/dev-util/cmake/files/50cmake-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t) -(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) -(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch deleted file mode 100644 index 02c3011..0000000 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://public.kitware.com/Bug/view.php?id=7933 - -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx ---- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 -@@ -38,6 +38,13 @@ - int main() { return 0; } - #endif - -+#ifdef TEST_KWSYS_LFS_SUPPORT -+#define _LARGE_FILES -+#include <iostream> -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include <iosfwd> - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap ---- cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrap Tue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \ diff --git a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch b/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch deleted file mode 100644 index ceb205f..0000000 --- a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch by Heiko Przybyl - ---- Source/cmComputeLinkInformation.cxx -+++ Source/cmComputeLinkInformation.cxx -@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge - for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin(); - ri != runtimeDirs.end(); ++ri) - { -+ // Do not add duplicates. -+ // I'd like to have that check already in the list generation code -+ // but that would need lots of more changes, even in ExpandListArgument(). -+ if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos) -+ { -+ //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl; -+ continue; -+ } - // Separate from previous path. - rpath += sep; - sep = this->GetRuntimeSep().c_str(); diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch deleted file mode 100644 index 9cb4777..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - ---- Modules/Platform/Darwin.cmake -+++ Modules/Platform/Darwin.cmake -@@ -26,7 +26,7 @@ - set(CMAKE_SHARED_LIBRARY_PREFIX "lib") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") - set(CMAKE_SHARED_MODULE_PREFIX "lib") --set(CMAKE_SHARED_MODULE_SUFFIX ".so") -+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") - set(CMAKE_MODULE_EXISTS 1) - set(CMAKE_DL_LIBS "") - -@@ -48,7 +48,7 @@ - set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") - set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch deleted file mode 100644 index 97c93aa..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch +++ /dev/null @@ -1,50 +0,0 @@ -Do not detect Xcode and set -isysroot for its SDK, since that messes up -our toolchain, and hence makes any compilation fail, bug #445308 - ---- Modules/Platform/Darwin.cmake -+++ Modules/Platform/Darwin.cmake -@@ -60,18 +60,18 @@ - endif() - - # Ask xcode-select where to find /Developer or fall back to ancient location. --execute_process(COMMAND xcode-select -print-path -- OUTPUT_VARIABLE _stdout -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ERROR_VARIABLE _stderr -- RESULT_VARIABLE _failed) --if(NOT _failed AND IS_DIRECTORY ${_stdout}) -- set(OSX_DEVELOPER_ROOT ${_stdout}) --elseif(IS_DIRECTORY "/Developer") -- set(OSX_DEVELOPER_ROOT "/Developer") --else() -+#execute_process(COMMAND xcode-select -print-path -+# OUTPUT_VARIABLE _stdout -+# OUTPUT_STRIP_TRAILING_WHITESPACE -+# ERROR_VARIABLE _stderr -+# RESULT_VARIABLE _failed) -+#if(NOT _failed AND IS_DIRECTORY ${_stdout}) -+# set(OSX_DEVELOPER_ROOT ${_stdout}) -+#elseif(IS_DIRECTORY "/Developer") -+# set(OSX_DEVELOPER_ROOT "/Developer") -+#else() - set(OSX_DEVELOPER_ROOT "") --endif() -+#endif() - - execute_process(COMMAND sw_vers -productVersion - OUTPUT_VARIABLE CURRENT_OSX_VERSION -@@ -91,10 +91,10 @@ - # CMAKE_OSX_DEPLOYMENT_TARGET - - # Set cache variable - end user may change this during ccmake or cmake-gui configure. --if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") --endif() -+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") -+#endif() - - #---------------------------------------------------------------------------- - # CMAKE_OSX_SYSROOT diff --git a/dev-util/cmake/files/cmake-2.8.10-desktop.patch b/dev-util/cmake/files/cmake-2.8.10-desktop.patch deleted file mode 100644 index e0cefa9..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-desktop.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop -index 645eb76..7be495f 100644 ---- a/Source/QtDialog/CMake.desktop -+++ b/Source/QtDialog/CMake.desktop -@@ -3,7 +3,7 @@ Version=1.0 - Name=CMake - Comment=Cross-platform buildsystem - Exec=cmake-gui %f --Icon=CMakeSetup32.png -+Icon=CMakeSetup32 - Terminal=false - X-MultipleArgs=false - Type=Application diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch deleted file mode 100644 index 052cc30..0000000 --- a/dev-util/cmake/files/cmake-2.8.10-libform.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea1c033..ae479ce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) - else () - set(BUILD_CursesDialog 0) - endif () -- if(BUILD_CursesDialog) -- add_subdirectory(Source/CursesDialog/form) -- endif() - endmacro () - - #----------------------------------------------------------------------- -diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt -index 96e28b4..4102379 100644 ---- a/Source/CursesDialog/CMakeLists.txt -+++ b/Source/CursesDialog/CMakeLists.txt -@@ -25,13 +25,16 @@ set( CURSES_SRCS - CursesDialog/ccmake - ) - --include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form -- ${CMake_BINARY_DIR}/Source/CursesDialog/form) - include_directories(${CURSES_INCLUDE_PATH}) - - - add_executable(ccmake ${CURSES_SRCS} ) - target_link_libraries(ccmake CMakeLib) --target_link_libraries(ccmake cmForm) -+TARGET_LINK_LIBRARIES(ccmake form) -+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) -+IF(CURSES_EXTRA_LIBRARY) -+ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) -+ENDIF(CURSES_EXTRA_LIBRARY) -+ - - install_targets(/bin ccmake) -diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h -index b157a28..f131ea4 100644 ---- a/Source/CursesDialog/cmCursesStandardIncludes.h -+++ b/Source/CursesDialog/cmCursesStandardIncludes.h -@@ -15,8 +15,6 @@ - #define _MSE_INT_H - #endif - --#include <cmFormConfigure.h> -- - #if defined(__hpux) - # define _BOOL_DEFINED - # include <sys/time.h> diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch deleted file mode 100644 index a7e8688..0000000 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -60,6 +60,10 @@ - - list(APPEND _Python_NAMES python) - -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ set(_Python_NAMES python) -+endif() -+ - # Search for the current active python version first - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) - -@@ -76,7 +80,7 @@ - unset(_PYTHON3_VERSIONS) - - # Search for newest python version if python executable isn't found --if(NOT PYTHON_EXECUTABLE) -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) - set(_Python_NAMES python${_CURRENT_VERSION}) - if(WIN32) diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch deleted file mode 100644 index 2a83ff7..0000000 --- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake -index bffa9fb..8fc90ee 100644 ---- a/Modules/FindPythonLibs.cmake -+++ b/Modules/FindPythonLibs.cmake -@@ -74,6 +74,19 @@ set(_Python_VERSIONS - ${_PYTHON_FIND_OTHER_VERSIONS} - ) - -+# Gentoo portage requires that you use exactly the given python version -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" -+ OUTPUT_VARIABLE _Gentoo_Python_VERSION) -+ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) -+ if (_Gentoo_Python_INDEX EQUAL -1) -+ # the current Gentoo python version is not compatible with what is requested -+ set(_Python_VERSIONS) -+ else () -+ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") -+ endif () -+endif() -+ - unset(_PYTHON_FIND_OTHER_VERSIONS) - unset(_PYTHON1_VERSIONS) - unset(_PYTHON2_VERSIONS) diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch b/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch deleted file mode 100644 index 02e44fb..0000000 --- a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- b/Modules/FindBLAS.cmake -+++ a/Modules/FindBLAS.cmake -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration for blas is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find BLAS library - # This module finds an installed fortran library that implements the BLAS - # linear-algebra interface (see http://www.netlib.org/blas/). -@@ -40,6 +46,26 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_BLAS blas) -+if(PC_BLAS_FOUND) -+ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) -+ mark_as_advanced(BLAS_LIBRARIES) -+else(PC_BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ -+ -+ - include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) - -@@ -604,3 +630,8 @@ - endif() - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+ -+endif(PC_BLAS_FOUND) -+ -+ diff --git a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch b/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch deleted file mode 100644 index 36f4ded..0000000 --- a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Tue, 6 Nov 2012 23:35:34 +1100 -Subject: [PATCH] Set some proper paths to make cmake find our tools. - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - -Original patch by Heiko Przybyl. -Updated by Chris Reffett (cmake-2.8.8) -Updated by Johannes Huber (cmake-2.8.9) -Updated by Michael Palimaka (cmake-2.8.10) -Updated by Chris Reffett (cmake-2.8.11) - ---- a/Modules/Platform/Darwin.cmake -+++ b/Modules/Platform/Darwin.cmake -@@ -252,9 +252,9 @@ - "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>") - - --# default to searching for frameworks first -+# default to searching for frameworks last - if(NOT DEFINED CMAKE_FIND_FRAMEWORK) -- set(CMAKE_FIND_FRAMEWORK FIRST) -+ set(CMAKE_FIND_FRAMEWORK LAST) - endif() - - # Older OS X linkers do not report their framework search path -@@ -276,6 +276,8 @@ - - # set up the default search directories for frameworks - set(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - /Library/Frameworks - /Network/Library/Frameworks -@@ -298,13 +300,15 @@ - endif() - endif() - --# default to searching for application bundles first -+# default to searching for application bundles last - if(NOT DEFINED CMAKE_FIND_APPBUNDLE) -- set(CMAKE_FIND_APPBUNDLE FIRST) -+ set(CMAKE_FIND_APPBUNDLE LAST) - endif() - # set up the default search directories for application bundles - set(_apps_paths) - foreach(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -44,43 +45,41 @@ - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch deleted file mode 100644 index 6dc244c..0000000 --- a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Sun Dec 8 13:38:06 UTC 2013 -Subject: fix check for freetype-2.5.1 - ---- Modules/FindFreetype.cmake -+++ Modules/FindFreetype.cmake -@@ -64,6 +64,19 @@ - PATH_SUFFIXES include/freetype2 include - ) - -+if(NOT FREETYPE_INCLUDE_DIR_freetype2) -+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h -+ HINTS -+ ENV FREETYPE_DIR -+ PATHS -+ /usr/X11R6 -+ /usr/local/X11R6 -+ /usr/local/X11 -+ /usr/freeware -+ PATH_SUFFIXES include/freetype2 include -+ ) -+endif() -+ - find_library(FREETYPE_LIBRARY - NAMES freetype libfreetype freetype219 - HINTS -@@ -82,8 +95,14 @@ - endif() - set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}") - --if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") -- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str -+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") -+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h") -+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") -+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h") -+endif() -+ -+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H) -+ file(STRINGS "${FREETYPE_H}" freetype_version_str - REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$") - - unset(FREETYPE_VERSION_STRING) diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch deleted file mode 100644 index b094f17..0000000 --- a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- Modules/FindImageMagick.cmake -+++ Modules/FindImageMagick.cmake -@@ -147,17 +147,17 @@ - ) - if(component STREQUAL "Magick++") - FIND_IMAGEMAGICK_API(Magick++ Magick++.h -- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI -+ Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) - elseif(component STREQUAL "MagickWand") - FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h -- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI -+ Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) - elseif(component STREQUAL "MagickCore") - FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h -- Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI -+ Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) - else() diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch deleted file mode 100644 index 4a5474a..0000000 --- a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- Modules/FindBoost.cmake -+++ Modules/FindBoost.cmake -@@ -905,6 +905,15 @@ - - set( _boost_docstring_release "Boost ${COMPONENT} library (release)") - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ # Get version of Python. -+ if (NOT PYTHON_EXECUTABLE) -+ #if a certain version of python was detected by cmake before use that one -+ set(PYTHON_EXECUTABLE "python") -+ endif (NOT PYTHON_EXECUTABLE) -+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) -+ endif() -+ - - # - # Find RELEASE libraries -@@ -915,6 +924,14 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -922,6 +939,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) -@@ -951,6 +975,15 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}boost_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -958,6 +991,13 @@ - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) diff --git a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch b/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch deleted file mode 100644 index 43a2a7f..0000000 --- a/dev-util/cmake/files/cmake-2.8.12.2-FindCurses.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- cmake-2.8.12.1-orig/Modules/FindCurses.cmake 2013-11-06 06:07:22.000000000 +1100 -+++ cmake-2.8.12.1/Modules/FindCurses.cmake 2014-01-17 21:55:40.630142386 +1100 -@@ -30,7 +30,7 @@ - find_library(CURSES_NCURSES_LIBRARY NAMES ncurses ) - set(CURSES_USE_NCURSES FALSE) - --if(CURSES_NCURSES_LIBRARY AND NOT CURSES_CURSES_LIBRARY) -+if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) - set(CURSES_USE_NCURSES TRUE) - endif() - # http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html -@@ -125,10 +125,20 @@ - CACHE FILEPATH "The curses library" ${FORCE_IT}) - endif() - -+ CHECK_LIBRARY_EXISTS("${CURSES_NCURSES_LIBRARY}" -+ cbreak "" CURSES_NCURSES_HAS_CBREAK) -+ if(NOT CURSES_NCURSES_HAS_CBREAK) -+ find_library(CURSES_EXTRA_LIBRARY tinfo HINTS "${_cursesLibDir}") -+ find_library(CURSES_EXTRA_LIBRARY tinfo ) -+ CHECK_LIBRARY_EXISTS("${CURSES_EXTRA_LIBRARY}" -+ cbreak "" CURSES_TINFO_HAS_CBREAK) -+ endif() - endif() - --find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") --find_library(CURSES_EXTRA_LIBRARY cur_colr ) -+if (NOT CURSES_TINFO_HAS_CBREAK) -+ find_library(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}") -+ find_library(CURSES_EXTRA_LIBRARY cur_colr ) -+endif() - - find_library(CURSES_FORM_LIBRARY form HINTS "${_cursesLibDir}") - find_library(CURSES_FORM_LIBRARY form ) -@@ -172,5 +182,7 @@ - CURSES_INCLUDE_DIR - CURSES_CURSES_HAS_WSYNCUP - CURSES_NCURSES_HAS_WSYNCUP -+ CURSES_NCURSES_HAS_CBREAK -+ CURSES_TINFO_HAS_CBREAK - ) - diff --git a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch b/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch deleted file mode 100644 index 99e39a2..0000000 --- a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CompileFlags.cmake b/CompileFlags.cmake -index 20f5dec..24ac58d 100644 ---- a/CompileFlags.cmake -+++ b/CompileFlags.cmake -@@ -66,5 +66,5 @@ endif () - # avoid binutils problem with large binaries, e.g. when building CMake in debug mode - # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 - if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*") -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") - endif () -diff --git a/bootstrap b/bootstrap -index 9784d5d..51d067e 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then - # avoid binutils problem with large binaries, e.g. when building CMake in debug mode - # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 - if ${cmake_machine_parisc}; then -- # if -O[s23] is given the effect is inverted, so do not use the flag then -- if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then -- cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*" -- fi -+ cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" - fi - fi - diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch deleted file mode 100644 index 6808b80..0000000 --- a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake ---- cmake-2.8.7.orig/Modules/FindLAPACK.cmake 2011-12-30 17:49:56.000000000 +0100 -+++ cmake-2.8.7/Modules/FindLAPACK.cmake 2012-03-09 02:15:46.000000000 +0100 -@@ -1,3 +1,9 @@ -+# -+# Version modified for Gentoo Linux -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# -+ - # - Find LAPACK library - # This module finds an installed fortran library that implements the LAPACK - # linear-algebra interface (see http://www.netlib.org/lapack/). -@@ -36,6 +42,24 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_LAPACK lapack) -+if(PC_LAPACK_FOUND) -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) -+ mark_as_advanced(LAPACK_LIBRARIES) -+else(PC_LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") -+ - set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - - get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES) -@@ -305,3 +329,5 @@ - endif(BLA_F95) - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch b/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch deleted file mode 100644 index c5e17c5..0000000 --- a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake -index c47f583..5783d37 100644 ---- a/Modules/FindPkgConfig.cmake -+++ b/Modules/FindPkgConfig.cmake -@@ -87,7 +87,12 @@ - set(PKG_CONFIG_VERSION 1) - set(PKG_CONFIG_FOUND 0) - --find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -+if(NOT PKG_CONFIG_EXECUTABLE) -+ set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG}) -+ if(NOT PKG_CONFIG_EXECUTABLE) -+ find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -+ endif(NOT PKG_CONFIG_EXECUTABLE) -+endif(NOT PKG_CONFIG_EXECUTABLE) - mark_as_advanced(PKG_CONFIG_EXECUTABLE) - - if(PKG_CONFIG_EXECUTABLE) diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch b/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch deleted file mode 100644 index 86c5dc7..0000000 --- a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- Modules/FindBLAS.cmake -+++ Modules/FindBLAS.cmake -@@ -4,6 +4,10 @@ - # - # Find BLAS library - # -+# Version modified for Gentoo Linux. -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# - # This module finds an installed fortran library that implements the - # BLAS linear-algebra interface (see http://www.netlib.org/blas/). The - # list of libraries searched for is taken from the autoconf macro file, -@@ -50,6 +54,23 @@ - # (To distribute this file outside of CMake, substitute the full - # License text for the above reference.) - -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_BLAS blas) -+if(PC_BLAS_FOUND) -+ foreach(PC_LIB ${PC_BLAS_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES) -+ mark_as_advanced(BLAS_LIBRARIES) -+else(PC_BLAS_FOUND) -+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.") -+ - include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake) - -@@ -688,3 +709,5 @@ - endif() - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_BLAS_FOUND) diff --git a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch b/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch deleted file mode 100644 index a6291d2..0000000 --- a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Thu, 19 Jun 2014 00:17:48 +1000 -Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries - wrt bug #400969. - ---- - Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 41 insertions(+) - -diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake -index dfd4460..70bfb4f 100644 ---- a/Modules/FindBoost.cmake -+++ b/Modules/FindBoost.cmake -@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - set( _boost_docstring_release "Boost ${COMPONENT} library (release)") - set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") - -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ # Get version of Python. -+ if (NOT PYTHON_EXECUTABLE) -+ #if a certain version of python was detected by cmake before use that one -+ set(PYTHON_EXECUTABLE "python") -+ endif (NOT PYTHON_EXECUTABLE) -+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version) -+ endif() -+ - # Compute component-specific hints. - set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "") - if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR -@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() -+ - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}") - list(APPEND _boost_RELEASE_NAMES -@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_RELEASE_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES}) -@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} ) -+ endif() - if(_boost_STATIC_RUNTIME_WORKAROUND) - set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}") - list(APPEND _boost_DEBUG_NAMES -@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} - ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python") -+ list(APPEND _boost_DEBUG_NAMES -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION} -+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} ) -+ endif() - endif() - if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread") - _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES}) --- -1.8.5.5 - diff --git a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch deleted file mode 100644 index 1cee3bc..0000000 --- a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch +++ /dev/null @@ -1,142 +0,0 @@ -From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001 -From: Michael Palimaka <kensington@gentoo.org> -Date: Thu, 19 Jun 2014 00:08:13 +1000 -Subject: [PATCH] Set some proper paths to make cmake find our tools. - -The ebuild now adds an extra / at the end of $EPREFIX so that it is -never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains -correct) - -Original patch by Heiko Przybyl. -Updated by Chris Reffett (cmake-2.8.8) -Updated by Johannes Huber (cmake-2.8.9) -Updated by Michael Palimaka (cmake-2.8.10) -Updated by Chris Reffett (cmake-2.8.11) -Updated by Michael Palimaka (cmake-3.0.0) ---- - Modules/Platform/Darwin.cmake | 12 +++++++---- - Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++-------------------- - 2 files changed, 29 insertions(+), 26 deletions(-) - -diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake -index e25df1e..9b22a6a 100644 ---- a/Modules/Platform/Darwin.cmake -+++ b/Modules/Platform/Darwin.cmake -@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F) - set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F) - set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F) - --# default to searching for frameworks first -+# default to searching for frameworks last - if(NOT DEFINED CMAKE_FIND_FRAMEWORK) -- set(CMAKE_FIND_FRAMEWORK FIRST) -+ set(CMAKE_FIND_FRAMEWORK LAST) - endif() - - # Older OS X linkers do not report their framework search path -@@ -156,6 +156,8 @@ endif() - - # set up the default search directories for frameworks - set(CMAKE_SYSTEM_FRAMEWORK_PATH -+ @GENTOO_PORTAGE_EPREFIX@Frameworks -+ @GENTOO_PORTAGE_EPREFIX@usr/lib - ~/Library/Frameworks - ) - if(_CMAKE_OSX_SYSROOT_PATH) -@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT) - endif() - endif() - --# default to searching for application bundles first -+# default to searching for application bundles last - if(NOT DEFINED CMAKE_FIND_APPBUNDLE) -- set(CMAKE_FIND_APPBUNDLE FIRST) -+ set(CMAKE_FIND_APPBUNDLE LAST) - endif() - # set up the default search directories for application bundles - set(_apps_paths) - foreach(_path -+ @GENTOO_PORTAGE_EPREFIX@Applications -+ @GENTOO_PORTAGE_EPREFIX@usr/bin - "~/Applications" - "/Applications" - "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index 20ee1d1..3481ca8 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH - # Standard -+ @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@ - /usr/local /usr / - - # CMake install location -@@ -53,43 +54,41 @@ endif() - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @GENTOO_PORTAGE_EPREFIX@usr/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @GENTOO_PORTAGE_EPREFIX@usr/bin -+ @GENTOO_PORTAGE_EPREFIX@bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ @GENTOO_PORTAGE_GCCLIBDIR@/gcc -+ @GENTOO_PORTAGE_GCCLIBDIR@ -+ @GENTOO_PORTAGE_EPREFIX@usr/lib64 -+ @GENTOO_PORTAGE_EPREFIX@usr/libx32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib32 -+ @GENTOO_PORTAGE_EPREFIX@usr/lib -+ @GENTOO_PORTAGE_EPREFIX@lib -+ /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32 - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -+ @GENTOO_PORTAGE_EPREFIX@usr/include - /usr/include - ) - --- -1.8.5.5 - diff --git a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch deleted file mode 100644 index 57250e4..0000000 --- a/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- Modules/FindLAPACK.cmake.orig 2014-09-15 23:50:11.377111987 +0200 -+++ Modules/FindLAPACK.cmake 2014-09-15 23:52:54.734388375 +0200 -@@ -4,6 +4,10 @@ - # - # Find LAPACK library - # -+# Version modified for Gentoo Linux. -+# If a valid PkgConfig configuration is found, this overrides and cancels -+# all further checks. -+# - # This module finds an installed fortran library that implements the - # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/). - # -@@ -140,6 +144,23 @@ - - endmacro() - -+# -+# first, try PkgConfig -+# -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(PC_LAPACK lapack) -+if(PC_LAPACK_FOUND) -+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES}) -+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} ) -+ if (NOT ${PC_LIB}_LIBRARY) -+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}") -+ endif (NOT ${PC_LIB}_LIBRARY) -+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) -+ endforeach(PC_LIB) -+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES) -+ mark_as_advanced(LAPACK_LIBRARIES) -+else(PC_LAPACK_FOUND) -+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.") - - set(LAPACK_LINKER_FLAGS) - set(LAPACK_LIBRARIES) -@@ -348,3 +369,5 @@ - endif() - - set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) -+ -+endif(PC_LAPACK_FOUND) diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch deleted file mode 100644 index 78f622d..0000000 --- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Modules/FindPythonInterp.cmake.orig 2015-01-06 11:50:03.376357898 +0100 -+++ Modules/FindPythonInterp.cmake 2015-01-06 12:25:48.614989290 +0100 -@@ -75,6 +75,11 @@ - else() - set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS}) - endif() -+ -+if (CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ set(_Python_NAMES python) -+endif() -+ - find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES}) - - # Set up the versions we know about, in the order we will search. Always add -@@ -99,12 +104,13 @@ - unset(_PYTHON3_VERSIONS) - - # Search for newest python version if python executable isn't found --if(NOT PYTHON_EXECUTABLE) -+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo) - foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS) - set(_Python_NAMES python${_CURRENT_VERSION}) - if(WIN32) - list(APPEND _Python_NAMES python) - endif() -+ - find_program(PYTHON_EXECUTABLE - NAMES ${_Python_NAMES} - PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath] diff --git a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch deleted file mode 100644 index 119001a..0000000 --- a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch +++ /dev/null @@ -1,48 +0,0 @@ -Do not detect Xcode and set -isysroot for its SDK, since that messes up -our toolchain, and hence makes any compilation fail, bug #445308 - ---- Modules/Platform/Darwin-Initialize.cmake -+++ Modules/Platform/Darwin-Initialize.cmake -@@ -1,16 +1,16 @@ - # Ask xcode-select where to find /Developer or fall back to ancient location. --execute_process(COMMAND xcode-select -print-path -- OUTPUT_VARIABLE _stdout -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ERROR_VARIABLE _stderr -- RESULT_VARIABLE _failed) --if(NOT _failed AND IS_DIRECTORY ${_stdout}) -- set(OSX_DEVELOPER_ROOT ${_stdout}) --elseif(IS_DIRECTORY "/Developer") -- set(OSX_DEVELOPER_ROOT "/Developer") --else() -+#execute_process(COMMAND xcode-select -print-path -+# OUTPUT_VARIABLE _stdout -+# OUTPUT_STRIP_TRAILING_WHITESPACE -+# ERROR_VARIABLE _stderr -+# RESULT_VARIABLE _failed) -+#if(NOT _failed AND IS_DIRECTORY ${_stdout}) -+# set(OSX_DEVELOPER_ROOT ${_stdout}) -+#elseif(IS_DIRECTORY "/Developer") -+# set(OSX_DEVELOPER_ROOT "/Developer") -+#else() - set(OSX_DEVELOPER_ROOT "") --endif() -+#endif() - - execute_process(COMMAND sw_vers -productVersion - OUTPUT_VARIABLE CURRENT_OSX_VERSION -@@ -91,10 +91,10 @@ - # CMAKE_OSX_DEPLOYMENT_TARGET - - # Set cache variable - end user may change this during ccmake or cmake-gui configure. --if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") --endif() -+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") -+#endif() - - #---------------------------------------------------------------------------- - # CMAKE_OSX_SYSROOT diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch deleted file mode 100644 index 604cb22..0000000 --- a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch +++ /dev/null @@ -1,45 +0,0 @@ -Ensure that the correct version of Qt is always used. - -With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to -/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. - -There is no guarantee to which version of Qt these symlinks might point, so it -is necessary to find the correct version explicitly. - -Once qmake is found, it is queried for the correct location of all other items. - -Gentoo-bug: 547222 - ---- Modules/FindQt4.cmake -+++ Modules/FindQt4.cmake -@@ -482,13 +482,23 @@ - - get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) - -- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} -- PATHS -- ENV QTDIR -- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" -- PATH_SUFFIXES bin -- DOC "The qmake executable for the Qt installation to use" -- ) -+ if(CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} -+ PATHS -+ @GENTOO_PORTAGE_EPREFIX@/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin -+ @GENTOO_PORTAGE_EPREFIX@/usr/bin -+ NO_DEFAULT_PATH -+ DOC "The qmake executable for the Qt installation to use" -+ ) -+ else() -+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} -+ PATHS -+ ENV QTDIR -+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" -+ PATH_SUFFIXES bin -+ DOC "The qmake executable for the Qt installation to use" -+ ) -+ endif() - - set(major 0) - if (QT_QMAKE_EXECUTABLE) diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch deleted file mode 100644 index 2808ed7..0000000 --- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch +++ /dev/null @@ -1,25 +0,0 @@ -Don't use .so for modules on darwin/macos. Use .bundle instead. -Patch by Heiko Przybyl - -Forward-ported from 2.8.10 to 3.4.0-rc1 - ---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake -+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake -@@ -26,7 +26,7 @@ - set(CMAKE_SHARED_LIBRARY_PREFIX "lib") - set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") - set(CMAKE_SHARED_MODULE_PREFIX "lib") --set(CMAKE_SHARED_MODULE_SUFFIX ".so") -+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle") - set(CMAKE_MODULE_EXISTS 1) - set(CMAKE_DL_LIBS "") - -@@ -53,7 +53,7 @@ - set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") - set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache diff --git a/dev-util/cmake/files/cmake-3.4.3-utimensat-test.patch b/dev-util/cmake/files/cmake-3.4.3-utimensat-test.patch deleted file mode 100644 index 42a06a5..0000000 --- a/dev-util/cmake/files/cmake-3.4.3-utimensat-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -Before linux-2.6.22, utimensat does not exist in the kernel. ->=glibc-2.6 exposes it, but would always fail if the kernel -does not has an implementation. - -Just compiling utimensat does not mean it is usable. Thus -runtime test is necessary. - -Index: cmake-3.4.3/Source/kwsys/CMakeLists.txt -=================================================================== ---- cmake-3.4.3.orig/Source/kwsys/CMakeLists.txt -+++ cmake-3.4.3/Source/kwsys/CMakeLists.txt -@@ -509,7 +509,7 @@ IF(KWSYS_USE_SystemTools) - "Checking whether CXX compiler has environ in stdlib.h" DIRECT) - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMES - "Checking whether CXX compiler has utimes" DIRECT) -- KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_UTIMENSAT -+ KWSYS_PLATFORM_CXX_TEST_RUN(KWSYS_CXX_HAS_UTIMENSAT - "Checking whether CXX compiler has utimensat" DIRECT) - SET_PROPERTY(SOURCE SystemTools.cxx APPEND PROPERTY COMPILE_DEFINITIONS - KWSYS_CXX_HAS_SETENV=${KWSYS_CXX_HAS_SETENV} -Index: cmake-3.4.3/Source/kwsys/kwsysPlatformTestsCXX.cxx -=================================================================== ---- cmake-3.4.3.orig/Source/kwsys/kwsysPlatformTestsCXX.cxx -+++ cmake-3.4.3/Source/kwsys/kwsysPlatformTestsCXX.cxx -@@ -272,7 +272,7 @@ int main() - int main() - { - struct timespec times[2] = {{0,UTIME_OMIT},{0,UTIME_NOW}}; -- return utimensat(AT_FDCWD, "/example", times, AT_SYMLINK_NOFOLLOW); -+ return utimensat(AT_FDCWD, ".", times, AT_SYMLINK_NOFOLLOW); - } - #endif - diff --git a/dev-util/cmake/files/cmake.vim b/dev-util/cmake/files/cmake.vim deleted file mode 100644 index 5cecd7d..0000000 --- a/dev-util/cmake/files/cmake.vim +++ /dev/null @@ -1,3 +0,0 @@ -autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim -autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake -autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml deleted file mode 100644 index 437189f..0000000 --- a/dev-util/cmake/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>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag> - </use> -</pkgmetadata> diff --git a/dev-util/debootstrap/ChangeLog b/dev-util/debootstrap/ChangeLog deleted file mode 100644 index 7115e97..0000000 --- a/dev-util/debootstrap/ChangeLog +++ /dev/null @@ -1,636 +0,0 @@ -# ChangeLog for dev-util/debootstrap -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.159 2011/11/21 19:46:55 jer Exp $ - -*debootstrap-1.0.38 (21 Nov 2011) - - 21 Nov 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.38.ebuild: - Version bump. - -*debootstrap-1.0.37 (06 Oct 2011) - - 06 Oct 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.37.ebuild: - Version bump. - -*debootstrap-1.0.36 (22 Aug 2011) - - 22 Aug 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.36.ebuild: - Version bump. - -*debootstrap-1.0.35 (10 Aug 2011) - - 10 Aug 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.35.ebuild: - Version bump. - -*debootstrap-1.0.34 (30 Jul 2011) - - 30 Jul 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.34.ebuild: - Version bump. - -*debootstrap-1.0.33 (25 Jul 2011) - - 25 Jul 2011; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.26.ebuild, - -debootstrap-1.0.27.ebuild, -debootstrap-1.0.28.ebuild, - -debootstrap-1.0.29.ebuild, -debootstrap-1.0.30.ebuild, - -debootstrap-1.0.31.ebuild, +debootstrap-1.0.33.ebuild: - Version bump. - - 24 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> - debootstrap-1.0.32.ebuild: - ppc/ppc64 stable wrt #372763 - - 17 Jul 2011; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.32.ebuild: - Stable for HPPA (bug #372763). - - 16 Jul 2011; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.32.ebuild: - alpha/ia64/sparc stable wrt #372763 - - 15 Jul 2011; Markus Meier <maekke@gentoo.org> debootstrap-1.0.32.ebuild: - x86 stable, bug #372763 - - 10 Jul 2011; Markus Meier <maekke@gentoo.org> debootstrap-1.0.32.ebuild: - arm stable, bug #372763 - - 02 Jul 2011; Markos Chandras <hwoarang@gentoo.org> debootstrap-1.0.32.ebuild: - Stable on amd64 wrt bug #372763 - -*debootstrap-1.0.32 (31 May 2011) - - 31 May 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.32.ebuild: - Version bump. - -*debootstrap-1.0.31 (21 May 2011) - - 21 May 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.31.ebuild: - Version bump. - -*debootstrap-1.0.30 (27 Apr 2011) - - 27 Apr 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.30.ebuild: - Version bump. - - 22 Mar 2011; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.27.ebuild, - debootstrap-1.0.28.ebuild: - Same for the older ebuilds. - - 22 Mar 2011; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.29.ebuild: - Remove comment about directory name is this seems to have become standard. - -*debootstrap-1.0.29 (22 Mar 2011) - - 22 Mar 2011; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.29.ebuild: - Version bump. - - 01 Mar 2011; Brent Baude <ranger@gentoo.org> debootstrap-1.0.26.ebuild: - stable ppc64, bug 354099 - -*debootstrap-1.0.28 (22 Feb 2011) - - 22 Feb 2011; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.25.ebuild, - +debootstrap-1.0.28.ebuild: - Version bump. - - 13 Feb 2011; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.26.ebuild: - Stable for HPPA PPC (bug #354099). - - 13 Feb 2011; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.25.ebuild, - debootstrap-1.0.26.ebuild, debootstrap-1.0.27.ebuild: - alpha/arm/ia64/sparc stable wrt #354099, add ~sh - - 11 Feb 2011; Markos Chandras <hwoarang@gentoo.org> debootstrap-1.0.26.ebuild: - Stable on amd64 wrt bug #354099 - - 09 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> - debootstrap-1.0.26.ebuild: - x86 stable wrt bug #354099 - -*debootstrap-1.0.27 (08 Feb 2011) - - 08 Feb 2011; Yuri Vasilevski <yvasilev@gentoo.org> - +debootstrap-1.0.27.ebuild: - Version bump to v1.0.27. - - 14 Nov 2010; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.25.ebuild: - alpha/ia64/sparc stable wrt #343947 - -*debootstrap-1.0.26 (12 Nov 2010) - - 12 Nov 2010; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.26.ebuild: - Version bump. - - 09 Nov 2010; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.25.ebuild: - Stable for PPC (bug #343947). - - 09 Nov 2010; Markus Meier <maekke@gentoo.org> debootstrap-1.0.25.ebuild: - arm stable, bug #343947 - - 04 Nov 2010; Dane Smith <c1pher@gentoo.org> debootstrap-1.0.25.ebuild: - Stable x86 wrt bug 343947. - - 04 Nov 2010; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.25.ebuild: - Stable for HPPA (bug #343947). - - 03 Nov 2010; Markos Chandras <hwoarang@gentoo.org> - debootstrap-1.0.25.ebuild: - Stable on amd64 wrt bug #343947 - -*debootstrap-1.0.25 (27 Sep 2010) - - 27 Sep 2010; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.25.ebuild: - Version bump. - -*debootstrap-1.0.24 (20 Sep 2010) - - 20 Sep 2010; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.24.ebuild: - Version bump (wtf wheezy and natty?). - -*debootstrap-1.0.23-r1 (05 Aug 2010) - - 05 Aug 2010; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.22.ebuild, - debootstrap-1.0.23.ebuild, +debootstrap-1.0.23-r1.ebuild: - Stable for PPC (bug #327631). Add notice about validating Release files - against a keyring (bug #328647). Fix LICENSE. Install debian/changelog. - - 24 Jul 2010; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.23.ebuild: - alpha/arm/ia64/sparc stable wrt #327631 - - 13 Jul 2010; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.23.ebuild: - Stable for HPPA (bug #327631). - - 12 Jul 2010; Christian Faulhammer <fauli@gentoo.org> - debootstrap-1.0.23.ebuild: - stable x86, bug 327631 - - 10 Jul 2010; Markos Chandras <hwoarang@gentoo.org> - debootstrap-1.0.23.ebuild: - Stable on amd64 wrt bug #327631 - -*debootstrap-1.0.23 (19 May 2010) - - 19 May 2010; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.20.ebuild, - +debootstrap-1.0.23.ebuild: - Version bump. - - 09 May 2010; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.22.ebuild: - alpha/ia64/sparc stable wrt #315197 - - 07 May 2010; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.22.ebuild: - Stable for PPC (bug #315197). - - 07 May 2010; Jeroen Roovers <jer@gentoo.org> metadata.xml: - Add appropriate herd. - - 22 Apr 2010; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.22.ebuild: - Stable for HPPA (bug #315197). - - 18 Apr 2010; Markus Meier <maekke@gentoo.org> debootstrap-1.0.22.ebuild: - amd64/arm/x86 stable, bug #315197 - -*debootstrap-1.0.22 (23 Feb 2010) - - 23 Feb 2010; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.22.ebuild: - Version bump. - - 24 Jan 2010; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.15.ebuild, - -debootstrap-1.0.17.ebuild, -debootstrap-1.0.18.ebuild, - -debootstrap-1.0.19.ebuild: - Remove old. - - 10 Jan 2010; Mike Frysinger <vapier@gentoo.org> debootstrap-1.0.20.ebuild: - Add ppc64 love. - - 15 Dec 2009; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.20.ebuild: - alpha/ia64/sparc stable wrt #295481 - - 09 Dec 2009; Markus Meier <maekke@gentoo.org> debootstrap-1.0.20.ebuild: - arm stable, bug #295481 - - 09 Dec 2009; nixnut <nixnut@gentoo.org> debootstrap-1.0.20.ebuild: - ppc stable #295481 - - 07 Dec 2009; Markus Meier <maekke@gentoo.org> debootstrap-1.0.20.ebuild: - amd64/x86 stable, bug #295481 - - 03 Dec 2009; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.20.ebuild: - Stable for HPPA (bug #295481). - - 02 Dec 2009; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.13.ebuild, - -debootstrap-1.0.14.ebuild: - Remove old. - - 05 Oct 2009; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.15.ebuild: - arm/ia64/sparc stable wrt #283986 - -*debootstrap-1.0.20 (05 Oct 2009) - - 05 Oct 2009; <yvasilev@gentoo.org> +debootstrap-1.0.20.ebuild: - Version bump to 1.0.20 - - 29 Sep 2009; Tobias Klausmann <klausman@gentoo.org> - debootstrap-1.0.15.ebuild: - Stable on alpha, bug #283986 - - 27 Sep 2009; nixnut <nixnut@gentoo.org> debootstrap-1.0.15.ebuild: - ppc stable #283986 - -*debootstrap-1.0.19 (25 Sep 2009) - - 25 Sep 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.19.ebuild: - Version bump. - -*debootstrap-1.0.18 (23 Sep 2009) - - 23 Sep 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.18.ebuild: - Version bump. - -*debootstrap-1.0.17 (23 Sep 2009) - - 23 Sep 2009; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.16.ebuild, - +debootstrap-1.0.17.ebuild: - Version bump. Remove old. - -*debootstrap-1.0.16 (21 Sep 2009) - - 21 Sep 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.16.ebuild: - Version bump. - - 15 Sep 2009; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.15.ebuild: - Stable for HPPA (bug #283986). - - 11 Sep 2009; Markus Meier <maekke@gentoo.org> debootstrap-1.0.15.ebuild: - amd64/x86 stable, bug #283986 - -*debootstrap-1.0.15 (27 Jul 2009) - - 27 Jul 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.15.ebuild: - Version bump. - -*debootstrap-1.0.14 (23 Jul 2009) - - 23 Jul 2009; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.12.ebuild, - +debootstrap-1.0.14.ebuild: - Version bump. Remove old. - - 19 Jul 2009; nixnut <nixnut@gentoo.org> debootstrap-1.0.13.ebuild: - ppc stable #274191 - - 05 Jul 2009; Markus Meier <maekke@gentoo.org> debootstrap-1.0.13.ebuild: - amd64 stable, bug #274191 - - 19 Jun 2009; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.13.ebuild: - arm/ia64/sparc stable wrt #274191 - - 17 Jun 2009; Christian Faulhammer <fauli@gentoo.org> - debootstrap-1.0.13.ebuild: - stable x86, bug 274191 - - 16 Jun 2009; Tobias Klausmann <klausman@gentoo.org> - debootstrap-1.0.13.ebuild: - Stable on alpha, bug #274191 - - 15 Jun 2009; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.13.ebuild: - Stable for HPPA (bug #274191). - - 18 May 2009; Jeroen Roovers <jer@gentoo.org> - -files/mkdirs-before-install.patch: - Remove unused patch. - - 18 May 2009; Jeroen Roovers <jer@gentoo.org> -debootstrap-0.3.3.2.ebuild, - -debootstrap-1.0.10.ebuild, -debootstrap-1.0.10_p1.ebuild, - -debootstrap-1.0.11.ebuild: - Remove old. - - 17 May 2009; nixnut <nixnut@gentoo.org> debootstrap-1.0.12.ebuild: - ppc stable #266957 - -*debootstrap-1.0.13 (30 Apr 2009) - - 30 Apr 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.13.ebuild: - Version bump. - - 23 Apr 2009; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.12: - Stable for HPPA (bug #266957). - - 23 Apr 2009; Markus Meier <maekke@gentoo.org> debootstrap-1.0.12: - amd64 stable, bug #266957 - - 21 Apr 2009; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.12.ebuild: - alpha/arm/ia64/sparc/x86 stable - -*debootstrap-1.0.12 (18 Mar 2009) - - 18 Mar 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.12.ebuild: - Version bump. - - 12 Mar 2009; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.11.ebuild: - Add ~arm - - 21 Feb 2009; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.10.ebuild, - debootstrap-1.0.10_p1.ebuild, debootstrap-1.0.11.ebuild: - Switch DEPEND to RDEPEND. Install man page (1.0.11 only). - -*debootstrap-1.0.11 (21 Feb 2009) - - 21 Feb 2009; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.11.ebuild: - Version bump. - -*debootstrap-1.0.10_p1 (04 Feb 2009) - - 04 Feb 2009; Jeroen Roovers <jer@gentoo.org> - -debootstrap-0.2.45-r1.ebuild, +debootstrap-1.0.10_p1.ebuild: - Version bump to support the (as yet unavailable) squeeze suite. Remove - old. - - 09 Oct 2008; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.9.ebuild: - Remove old. - - 27 Sep 2008; nixnut <nixnut@gentoo.org> debootstrap-1.0.10.ebuild: - Stable on ppc wrt bug 235550 - - 24 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> - debootstrap-1.0.10.ebuild: - stable amd64, bug 235550 - - 24 Sep 2008; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.10.ebuild: - alpha/ia64/sparc/x86 stable wrt #235550 - - 23 Sep 2008; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.10.ebuild: - Stable for HPPA (bug #235550). - - 25 Aug 2008; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.9.ebuild, - debootstrap-1.0.10.ebuild: - Readd old stable version. Drop 1.0.10 back to ~arch. Add dep on - app-arch/dpkg-1.14.20. - - 25 Aug 2008; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.9.ebuild: - Remove old. - - 25 Aug 2008; nixnut <nixnut@gentoo.org> debootstrap-1.0.10.ebuild: - Stable on ppc wrt bug 235550 - - 25 Aug 2008; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.10.ebuild: - alpha/ia64 stable wrt #235550 - - 24 Aug 2008; Markus Meier <maekke@gentoo.org> debootstrap-1.0.10.ebuild: - amd64/x86 stable, bug #235550 - - 24 Aug 2008; <bluebird@gentoo.org> debootstrap-1.0.10.ebuild: - Stable on sparc, bug #235550 - - 23 Aug 2008; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.10.ebuild: - Stable for HPPA (bug #235550). - - 29 Jul 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml: - Describe local USE flags for GLEP 56. - - 15 Jul 2008; Jeroen Roovers <jer@gentoo.org> debootstrap-0.2.45-r1.ebuild, - debootstrap-0.3.3.2.ebuild, debootstrap-1.0.9.ebuild, - debootstrap-1.0.10.ebuild: - Use PN instead of package name. - - 15 Jul 2008; Jeroen Roovers <jer@gentoo.org> -debootstrap-1.0.8.ebuild: - Remove old version. - -*debootstrap-1.0.10 (15 Jul 2008) - - 15 Jul 2008; Jeroen Roovers <jer@gentoo.org> +debootstrap-1.0.10.ebuild: - Version bump. - - 23 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org> - debootstrap-1.0.9.ebuild: - amd64 stable, bug #225533 - - 16 Jun 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml: - Take up maintainership. - - 16 Jun 2008; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.9.ebuild: - Stable for HPPA (bug #225533). - - 14 Jun 2008; nixnut <nixnut@gentoo.org> debootstrap-1.0.9.ebuild: - Stable on ppc wrt bug 225533 - - 09 Jun 2008; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.9.ebuild: - alpha/ia64/sparc/x86 stable - -*debootstrap-1.0.9 (30 Apr 2008) - - 30 Apr 2008; Raúl Porcel <armin76@gentoo.org> -debootstrap-1.0.7.ebuild, - +debootstrap-1.0.9.ebuild: - Version bump - - 21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml: - Fix up metadata.xml. If there's no maintainer for the package, the metadata - also needs to contain m-needed@g.o. - - 15 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> - debootstrap-1.0.8.ebuild: - amd64 stable wrt bug #210911 - - 23 Feb 2008; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.8.ebuild: - Stable for HPPA (bug #210911). - - 21 Feb 2008; nixnut <nixnut@gentoo.org> debootstrap-1.0.8.ebuild: - Stable on ppc wrt bug 210911 - - 20 Feb 2008; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.8.ebuild: - alpha/ia64/sparc/x86 stable - -*debootstrap-1.0.8 (19 Jan 2008) - - 19 Jan 2008; Raúl Porcel <armin76@gentoo.org> -debootstrap-1.0.3.ebuild, - -debootstrap-1.0.6.ebuild, debootstrap-1.0.7.ebuild, - +debootstrap-1.0.8.ebuild: - alpha/ia64/sparc/x86 stable, remove old, version bump - - 19 Jan 2008; Samuli Suominen <drac@gentoo.org> debootstrap-1.0.7.ebuild: - amd64 stable. - - 14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org> - debootstrap-1.0.7.ebuild: - ppc. stable - - 20 Dec 2007; Jeroen Roovers <jer@gentoo.org> debootstrap-1.0.7.ebuild: - Stable for HPPA. - - 18 Nov 2007; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.7.ebuild: - Re-fix, thanks to drac - - 18 Nov 2007; Raúl Porcel <armin76@gentoo.org> - +files/mkdirs-before-install.patch, debootstrap-1.0.7.ebuild: - Fix 1.0.7 failure, bug #199516 - -*debootstrap-1.0.7 (17 Nov 2007) - - 17 Nov 2007; Raúl Porcel <armin76@gentoo.org> +debootstrap-1.0.7.ebuild: - Version bump - -*debootstrap-1.0.6 (22 Oct 2007) - - 22 Oct 2007; Raúl Porcel <armin76@gentoo.org> -debootstrap-1.0.1.ebuild, - +debootstrap-1.0.6.ebuild: - Version bump - - 03 Oct 2007; Christoph Mende <angelos@gentoo.org> - debootstrap-1.0.3.ebuild: - Stable on amd64 - - 27 Sep 2007; Raúl Porcel <armin76@gentoo.org> debootstrap-1.0.3.ebuild: - Add ~sparc - -*debootstrap-1.0.3 (27 Aug 2007) - - 27 Aug 2007; Raúl Porcel <armin76@gentoo.org> - -debootstrap-0.3.3-r1.ebuild, -debootstrap-1.0.2.ebuild, - +debootstrap-1.0.3.ebuild: - Version bump, remove old - - 15 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> - debootstrap-0.3.3.2.ebuild: - Stable on sparc wrt #188376 - - 15 Aug 2007; Jeroen Roovers <jer@gentoo.org> debootstrap-0.3.3.2.ebuild: - Stable for HPPA (bug #188376). - - 14 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> - debootstrap-0.3.3.2.ebuild: - ppc stable, bug #188376 - - 11 Aug 2007; Steve Dibb <beandog@gentoo.org> debootstrap-0.3.3.2.ebuild: - amd64 stable, bug 188376 - -*debootstrap-1.0.2 (10 Aug 2007) -*debootstrap-1.0.1 (10 Aug 2007) - - 10 Aug 2007; Raúl Porcel <armin76@gentoo.org> -debootstrap-0.2.41.ebuild, - -debootstrap-0.2.45.ebuild, -debootstrap-0.3.2.2.ebuild, - -debootstrap-0.3.3.ebuild, debootstrap-0.3.3.2.ebuild, - -debootstrap-1.0.0.ebuild, +debootstrap-1.0.1.ebuild, - +debootstrap-1.0.2.ebuild: - Version bump, remove old, alpha/ia64/x86 stable - -*debootstrap-1.0.0 (25 Jun 2007) - - 25 Jun 2007; <solar@gentoo.org> +debootstrap-1.0.0.ebuild: - - version bump to get ubuntu scripts - - 13 Mar 2007; Raúl Porcel <armin76@gentoo.org> - debootstrap-0.3.3-r1.ebuild: - x86 stable - -*debootstrap-0.3.3.2 (05 Mar 2007) - - 05 Mar 2007; Anant Narayanan <anant@gentoo.org> +debootstrap-0.3.3.2.ebuild: - vBump to 0.3.3.2, closes bug #165436 - - 21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> - debootstrap-0.3.3-r1.ebuild: - ppc stable - - 20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> - debootstrap-0.3.3-r1.ebuild: - Stable on Alpha. - - 12 Aug 2006; Jason Wever <weeve@gentoo.org> debootstrap-0.3.3-r1.ebuild: - Added ~sparc keyword (not sure where it went in the last few - version/revision bumps). - - 12 Aug 2006; Jason Wever <weeve@gentoo.org> debootstrap-0.2.45-r1.ebuild: - Stable on SPARC. - - 15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: - Remove lanius from metadata.xml as he's retired. - - 05 Jan 2006; Mike Frysinger <vapier@gentoo.org> debootstrap-0.3.3.ebuild: - Make sure we set S properly #117501 by Maxxer. - -*debootstrap-0.3.3 (02 Jan 2006) - - 02 Jan 2006; Mike Frysinger <vapier@gentoo.org> +debootstrap-0.3.3.ebuild: - Version bump. - -*debootstrap-0.3.2.2 (04 Nov 2005) - - 04 Nov 2005; Mike Frysinger <vapier@gentoo.org> - +debootstrap-0.3.2.2.ebuild: - Version bump. - -*debootstrap-0.2.45-r1 (06 Jun 2005) - - 06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> - +debootstrap-0.2.45-r1.ebuild: - version bump - - 24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> - debootstrap-0.2.45.ebuild: - Stable on ppc. - - 27 Jan 2005; lanius@gentoo.org -debootstrap-0.2.31.ebuild, - debootstrap-0.2.45.ebuild: - mark x86; amd64 - - 30 Oct 2004; Jason Wever <weeve@gentoo.org> debootstrap-0.2.41.ebuild: - Stable on sparc. - -*debootstrap-0.2.45 (05 Oct 2004) - - 05 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -debootstrap-0.2.23.ebuild, - debootstrap-0.2.41.ebuild, +debootstrap-0.2.45.ebuild: - mark 0.2.41 stable, bump to 0.2.45 - - 25 Sep 2004; Jason Wever <weeve@gentoo.org> debootstrap-0.2.31.ebuild: - Stable on sparc. - - 24 Aug 2004; Heinrich Wendel <lanius@gentoo.org> debootstrap-0.2.31.ebuild, - -debootstrap-0.2.4.ebuild: - mark 0.2.31 stable; bump to 0.2.41 - - 21 Jul 2004; David Holm <dholm@gentoo.org> debootstrap-0.2.31.ebuild: - Added to ~ppc. - - 18 Apr 2004; Jason Wever <weeve@gentoo.org> debootstrap-0.2.23.ebuild: - Stable on sparc. - - 13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> debootstrap-0.2.31.ebuild: - marked ~amd64 - - 09 Apr 2004; Heinrich Wendel <lanius@gentoo.org> debootstrap-0.2.4.ebuild: - remove S=${WORKDIR}/${P} - -*debootstrap-0.2.31 (08 Apr 2004) - - 08 Apr 2004; Heinrich Wendel <lanius@gentoo.org> - debootstrap-0.1.17.30.ebuild, debootstrap-0.2.23.ebuild, - debootstrap-0.2.31.ebuild: - version bump, bug #47080, marked 0.2.31 x86 - - 25 Jan 2004; Sven Blumenstein <bazik@gentoo.org> debootstrap-0.2.4.ebuild: - Stable on sparc. Hooray, we can downgr^H^H^H^H^H^Hmigrate to Debian now :P - - 23 Jan 2004; Heinrich Wendel <lanius@gentoo.org> - debootstrap-0.1.17.30.ebuild, debootstrap-0.2.23.ebuild, - debootstrap-0.2.4.ebuild: - use debian mirrors - -*debootstrap-0.2.23 (23 Jan 2004) - - 23 Jan 2004; Heinrich Wendel <lanius@gentoo.org> debootstrap-0.2.23.ebuild, - debootstrap-0.2.4.ebuild: - add dpkg dep; mark 0.2.4 stable; add 0.2.23 - -*debootstrap-0.2.4 (23 Jan 2004) - - 23 Jan 2004; Heinrich Wendel <lanius@gentoo.org> debootstrap-0.2.4.ebuild: - add dpkg dep, bug #39093 - - 18 Sep 2003; Heinrich Wendel <lanius@gentoo.org> : - version bump - - 29 Jul 2003; lanius@gentoo.org debootstrap-0.1.17.30.ebuild: - stalbe bump - -*debootstrap-0.1.17.30 (15 Jul 2003) - - 15 Jul 2003; Heinrich Wendel <lanius@gentoo.org> - debootstrap-0.1.17.30.ebuild: - initial release - diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest deleted file mode 100644 index 0a9ab19..0000000 --- a/dev-util/debootstrap/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST debootstrap_1.0.38.tar.gz 55586 RMD160 60061bdcb86280e8325133fc21dd7b93b3d09e7b SHA1 49495b19fb890001508ce5c5a8d7a4b8188bf93f SHA256 74e9aca4a5aa61f95467e849c04e1b8a2df1ca63d98fe31a2fa2c30e49fe6aa6 -DIST devices.tar.gz 47835 RMD160 5ef7477a58c48a25765ce6aae981e36a794e5440 SHA1 90d717258702cb147e1e7a2fe2ae5352794565c2 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 -EBUILD debootstrap-1.0.38.ebuild 956 RMD160 9d342cf5010196d6aafc832e497853eed076722f SHA1 e815ac0a1538c8d8ab6c1553ac746611f586bd75 SHA256 0f5341ad6fdda81f6be902348feb4c40adeea78c0df7406cc78fd91a630815c2 -MISC ChangeLog 20027 RMD160 3ca3ae7593073d6e0cd692c078017a5df1117a9d SHA1 6eacb3e4b4a0130bcde640a30b502b0b7cad93fd SHA256 784bd7db9cd99bbe571640870e2b9d7c6ab234d3be778475f625af4de89fbc60 -MISC metadata.xml 254 RMD160 fafc94bb5f11971a95352c47958403b296982aaa SHA1 bdaa9d87c2a2beaeccdd15c0a557a7e26bf6099b SHA256 2790aaa1752a64752fb0a90f28f292669aa359e1c1583ad3834746b55e86dbd2 diff --git a/dev-util/debootstrap/debootstrap-1.0.38.ebuild b/dev-util/debootstrap/debootstrap-1.0.38.ebuild deleted file mode 100644 index 36f3f8c..0000000 --- a/dev-util/debootstrap/debootstrap-1.0.38.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.38.ebuild,v 1.1 2011/11/21 19:46:55 jer Exp $ - -inherit eutils - -DESCRIPTION="Debian/Ubuntu bootstrap scripts" -HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html" -SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz - mirror://gentoo/devices.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="" - -RDEPEND="sys-devel/binutils - net-misc/wget - >=app-arch/dpkg-1.14.20" - -S="${WORKDIR}/${PN}" - -src_unpack() { - unpack ${PN}_${PV}.tar.gz - cp "${DISTDIR}"/devices.tar.gz "${S}" -} - -src_compile() { - return -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc TODO debian/changelog - doman debootstrap.8 -} - -pkg_postinst() { - elog "To check Release files against a keyring" - elog " (--keyring=K), please install app-crypt/gnupg." -} diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml deleted file mode 100644 index d5fca45..0000000 --- a/dev-util/debootstrap/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>deb-tools</herd> - <maintainer> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> -</pkgmetadata> diff --git a/eclass/db.eclass b/eclass/db.eclass deleted file mode 100644 index f7070d4..0000000 --- a/eclass/db.eclass +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/db.eclass,v 1.49 2013/07/21 09:23:45 pacho Exp $ -# This is a common location for functions used in the sys-libs/db ebuilds -# -# Bugs: maintainer-needed@gentoo.org - -inherit eutils multilib - -IUSE="doc test examples" - -EXPORT_FUNCTIONS src_test - -DEPEND="test? ( >=dev-lang/tcl-8.4 )" - -RDEPEND="" - -db_fix_so() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" - LIB="${EROOT}/usr/$(get_libdir)" - - cd "${LIB}" - - # first clean up old symlinks - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1_-]*'"$(get_libname)" -delete - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1_-]*'"$(get_libname "[23]")" -delete - find "${LIB}" -maxdepth 1 -type l -name "libdb$(get_libname)" -delete #519364 - find "${LIB}" -maxdepth 1 -type l -name "libdb$(get_libname "[23]")" -delete #519364 - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete - - # now rebuild all the correct ones - for ext in so a dylib sl; do - for name in libdb libdb_{cxx,tcl,java,sql,stl}; do - target=`find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -n |tail -n 1` - [ -n "${target}" ] || continue; - case ${CHOST} in - *-aix*) - aixdll --merge-runtime \ - --keepdir=false \ - --target="${name}.${ext}" \ - --current="${target}" \ - `find . -maxdepth 1 -type f -name "${name}-*.${ext}"` - ;; - *) - ln -sf ${target//.\//} ${name}.${ext} - ;; - esac; - done; - done; - - # db[23] gets some extra-special stuff - if [ -f libdb1$(get_libname 2) ]; then - ln -sf libdb1$(get_libname 2) libdb$(get_libname 2) - ln -sf libdb1$(get_libname 2) libdb1$(get_libname) - ln -sf libdb1$(get_libname 2) libdb-1$(get_libame) - fi - # what do we do if we ever get 3.3 ? - for i in libdb libdb_{cxx,tcl,java,sql,stl}; do - if [ -f $i-3$(get_libname 2) ]; then - ln -sf $i-3$(get_libname 2) $i-3$(get_libname) - ln -sf $i-3$(get_libname 2) $i$(get_libname 3) - fi - done - - # do the same for headers now - # but since there are only two of them, just overwrite them - cd "${EROOT}"/usr/include - target=`find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -n |cut -d/ -f2- | tail -n1` - if [ -n "${target}" ] && [ -e "${target}/db.h" ] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then - einfo "Creating db.h symlinks to ${target}" - ln -sf "${target}"/db.h . - ln -sf "${target}"/db_185.h . - elif [ ! -e "${target}/db.h" ]; then - if [ -n "${target}" ]; then - ewarn "Could not find ${target}/db.h" - elif [ -h db.h ]; then - einfo "Apparently you just removed the last instance of $PN. Removing the symlinks" - rm -f db.h db_185.h - fi - fi -} - -db_src_install_doc() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - # not everybody wants this wad of documentation as it is primarily API docs - if use doc; then - dodir /usr/share/doc/${PF}/html - mv "${ED}"/usr/docs/* "${ED}"/usr/share/doc/${PF}/html/ - rm -rf "${ED}"/usr/docs - else - rm -rf "${ED}"/usr/docs - fi - - db_src_install_examples -} - -db_src_install_examples() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - if use examples ; then - local langs="c cxx stl" - [[ "${IUSE/java}" != "${IUSE}" ]] \ - && use java \ - && langs="${langs} java" - for i in $langs ; do - destdir="/usr/share/doc/${PF}/" - src="${S}/../examples_${i}/" - if [ -f "${src}" ]; then - dodir "${destdir}" - cp -ra "${src}" "${ED}${destdir}/" - fi - done - fi -} - -db_src_install_usrbinslot() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - # slot all program names to avoid overwriting - for fname in "${ED}"/usr/bin/db* - do - dn="$(dirname "${fname}")" - bn="$(basename "${fname}")" - bn="${bn/db/db${SLOT}}" - mv "${fname}" "${dn}/${bn}" || \ - die "Failed to rename ${fname} to ${dn}/${bn}" - done -} - -db_src_install_headerslot() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - # install all headers in a slotted location - dodir /usr/include/db${SLOT} - mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ -} - -db_src_install_usrlibcleanup() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - LIB="${ED}/usr/$(get_libdir)" - # Clean out the symlinks so that they will not be recorded in the - # contents (bug #60732) - - if [ "${ED}" = "" ]; then - die "Calling clean_links while \$ED not defined" - fi - - if [ -e "${LIB}"/libdb.a ] && [ ! -e "${LIB}"/libdb-${SLOT}.a ]; then - einfo "Moving libdb.a to a versioned name" - mv "${LIB}/libdb.a" "${LIB}/libdb-${SLOT}.a" - fi - - if [ -e "${LIB}"/libdb_cxx.a ] && [ ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]; then - einfo "Moving libdb_cxx.a to a versioned name" - mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a" - fi - - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1_-]*'"$(get_libname)" -delete - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1_-]*'"$(get_libname "[23]")" -delete - find "${LIB}" -maxdepth 1 -type l -name "libdb$(get_libname)" -delete #519364 - find "${LIB}" -maxdepth 1 -type l -name "libdb$(get_libname "[23]")" -delete #519364 - einfo "removing unversioned static archives" - find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete - - rm -f \ - "${ED}"/usr/include/{db,db_185}.h \ - "${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a -} - -db_src_test() { - if [[ $UID -eq 0 ]]; then - M="You must run the testsuite as non-root, skipping" - ewarn "${M}" - elog "${M}" - return 0 - fi - - if use tcl; then - einfo "Running sys-libs/db testsuite" - ewarn "This can take 6+ hours on modern machines" - # Fix stuff that fails with relative paths, and upstream moving files - # around... - local test_parallel='' - for t in \ - "${S}"/test/parallel.tcl \ - "${S}"/../test/parallel.tcl \ - "${S}"/test/tcl/parallel.tcl \ - "${S}"/../test/tcl/parallel.tcl \ - ; do - [[ -f "${t}" ]] && test_parallel="${t}" && break - done - - sed -ri \ - -e '/regsub .test_path ./s,(regsub),#\1,g' \ - -e '/regsub .src_root ./s,(regsub),#\1,g' \ - -e '/regsub .tcl_utils ./s,(regsub),#\1,g' \ - "${test_parallel}" - cd "${S}" - for t in \ - ../test/test.tcl \ - ../test/tcl/test.tcl \ - ; do - [[ -f "${t}" ]] && testbase="${t}" && break - done - echo "source ${t}" > testrunner.tcl - echo "run_parallel $(makeopts_jobs) run_std" >> testrunner.tcl - - tclsh testrunner.tcl - egrep -qs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*" - else - eerror "You must have USE=tcl to run the sys-libs/db testsuite." - fi -} diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass deleted file mode 100644 index 5a4c92d..0000000 --- a/eclass/toolchain.eclass +++ /dev/null @@ -1,2356 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Maintainer: Toolchain Ninjas <toolchain@gentoo.org> - -DESCRIPTION="The GNU Compiler Collection" -HOMEPAGE="https://gcc.gnu.org/" -RESTRICT="strip" # cross-compilers need controlled stripping - -inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator prefix - -if [[ ${PV} == *_pre9999* ]] ; then - EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git" - # naming style: - # gcc-4.7.1_pre9999 -> gcc-4_7-branch - # Note that the micro version is required or lots of stuff will break. - # To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before - # inheriting this eclass. - EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch" - EGIT_BRANCH=${EGIT_BRANCH//./_} - inherit git-2 -fi - -FEATURES=${FEATURES/multilib-strict/} - -EXPORTED_FUNCTIONS="pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm" -case ${EAPI:-0} in - 0|1) die "Need to upgrade to at least EAPI=2";; - 2|3) EXPORTED_FUNCTIONS+=" src_prepare src_configure" ;; - 4*|5*) EXPORTED_FUNCTIONS+=" pkg_pretend src_prepare src_configure" ;; - *) die "I don't speak EAPI ${EAPI}." -esac -EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} - -#---->> globals <<---- - -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi -: ${TARGET_ABI:=${ABI}} -: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} -: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -if [[ ${EAPI:-0} == [012] ]] ; then - : ${ED:=${D}} - : ${EROOT:=${ROOT}} -fi - -# General purpose version check. Without a second arg matches up to minor version (x.x.x) -tc_version_is_at_least() { - version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}" -} - -# General purpose version range check -# Note that it matches up to but NOT including the second version -tc_version_is_between() { - tc_version_is_at_least "${1}" && ! tc_version_is_at_least "${2}" -} - -GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}} -GCC_PVR=${GCC_PV} -[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR} -GCC_RELEASE_VER=$(get_version_component_range 1-3 ${GCC_PV}) -GCC_BRANCH_VER=$(get_version_component_range 1-2 ${GCC_PV}) -GCCMAJOR=$(get_version_component_range 1 ${GCC_PV}) -GCCMINOR=$(get_version_component_range 2 ${GCC_PV}) -GCCMICRO=$(get_version_component_range 3 ${GCC_PV}) -[[ ${BRANCH_UPDATE-notset} == "notset" ]] && \ - BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV}) - -# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex. -# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)? -GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})} - -# Pre-release support -if [[ ${GCC_PV} == *_pre* ]] ; then - PRERELEASE=${GCC_PV/_pre/-} -elif [[ ${GCC_PV} == *_alpha* ]] ; then - SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha} -elif [[ ${GCC_PV} == *_beta* ]] ; then - SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta} -elif [[ ${GCC_PV} == *_rc* ]] ; then - SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc} -fi - -if [[ ${SNAPSHOT} == [56789].0-* ]] ; then - # The gcc-5+ releases have dropped the .0 for some reason. - SNAPSHOT=${SNAPSHOT/.0} -fi - -export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} - -PREFIX=${TOOLCHAIN_PREFIX:-${EPREFIX}/usr} - -if tc_version_is_at_least 3.4.0 ; then - LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}} -else - LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}} -fi -INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include} - -if is_crosscompile ; then - BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}} - HOSTLIBPATH=${PREFIX}/${CHOST}/${CTARGET}/lib/${GCC_CONFIG_VER} -else - BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}} -fi - -DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}} - -# Dont install in /usr/include/g++-v3/, but in gcc internal directory. -# We will handle /usr/include/g++-v3/ with gcc-config ... -STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}} - -#---->> LICENSE+SLOT+IUSE logic <<---- - -if tc_version_is_at_least 4.6 ; then - LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+" -elif tc_version_is_at_least 4.4 ; then - LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+" -elif tc_version_is_at_least 4.3 ; then - LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+" -elif tc_version_is_at_least 4.2 ; then - LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+" -elif tc_version_is_at_least 3.3 ; then - LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+" -else - LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" -fi - -IUSE="multislot regression-test vanilla" -IUSE_DEF=( nls nptl ) - -if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then - IUSE+=" altivec debug" - IUSE_DEF+=( cxx fortran ) - [[ -n ${PIE_VER} ]] && IUSE+=" nopie" - [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking" - [[ -n ${D_VER} ]] && IUSE+=" d" - [[ -n ${SPECS_VER} ]] && IUSE+=" nossp" - tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc" - tc_version_is_at_least 4.0 && IUSE+=" objc-gc" - tc_version_is_between 4.0 4.9 && IUSE+=" mudflap" - tc_version_is_at_least 4.1 && IUSE+=" libssp objc++" - tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp ) - tc_version_is_at_least 4.3 && IUSE+=" fixed-point" - tc_version_is_at_least 4.7 && IUSE+=" go" - # Note: while <=gcc-4.7 also supported graphite, it required forked ppl - # versions which we dropped. Since graphite was also experimental in - # the older versions, we don't want to bother supporting it. #448024 - tc_version_is_at_least 4.8 && IUSE+=" graphite" IUSE_DEF+=( sanitize ) - tc_version_is_at_least 4.9 && IUSE+=" cilk +vtv" - tc_version_is_at_least 5.0 && IUSE+=" jit mpx" - tc_version_is_at_least 6.0 && IUSE+=" pie +ssp" -fi - -IUSE+=" ${IUSE_DEF[*]/#/+}" - -SLOT="${GCC_CONFIG_VER}" - -#---->> DEPEND <<---- - -RDEPEND="sys-libs/zlib - nls? ( virtual/libintl )" - -tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv" - -if tc_version_is_at_least 4 ; then - GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2:0 >=dev-libs/mpfr-2.4.2:0" - if tc_version_is_at_least 4.3 ; then - RDEPEND+=" ${GMP_MPFR_DEPS}" - elif in_iuse fortran ; then - RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )" - fi -fi - -tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1:0" - -if in_iuse graphite ; then - if tc_version_is_at_least 5.0 ; then - RDEPEND+=" graphite? ( >=dev-libs/isl-0.14 )" - elif tc_version_is_at_least 4.8 ; then - RDEPEND+=" - graphite? ( - >=dev-libs/cloog-0.18.0 - >=dev-libs/isl-0.11.1 - )" - fi -fi - -DEPEND="${RDEPEND} - >=sys-devel/bison-1.875 - >=sys-devel/flex-2.5.4 - nls? ( sys-devel/gettext ) - regression-test? ( - >=dev-util/dejagnu-1.4.4 - >=sys-devel/autogen-5.5.4 - )" - -if in_iuse gcj ; then - GCJ_DEPS=">=media-libs/libart_lgpl-2.1" - GCJ_GTK_DEPS=" - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXtst - x11-proto/xproto - x11-proto/xextproto - =x11-libs/gtk+-2* - virtual/pkgconfig - " - tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango" - tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip" - DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )" -fi - -PDEPEND=">=sys-devel/gcc-config-1.7" - -#---->> S + SRC_URI essentials <<---- - -# Set the source directory depending on whether we're using -# a prerelease, snapshot, or release tarball. -S=$( - if [[ -n ${PRERELEASE} ]] ; then - echo ${WORKDIR}/gcc-${PRERELEASE} - elif [[ -n ${SNAPSHOT} ]] ; then - echo ${WORKDIR}/gcc-${SNAPSHOT} - else - echo ${WORKDIR}/gcc-${GCC_RELEASE_VER} - fi -) - -gentoo_urls() { - local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI - HTTP~zorry/patches/gcc/URI HTTP~blueness/dist/URI" - devspace=${devspace//HTTP/https:\/\/dev.gentoo.org\/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} - -# This function handles the basics of setting the SRC_URI for a gcc ebuild. -# To use, set SRC_URI with: -# -# SRC_URI="$(get_gcc_src_uri)" -# -# Other than the variables normally set by portage, this function's behavior -# can be altered by setting the following: -# -# SNAPSHOT -# If set, this variable signals that we should be using a snapshot of -# gcc. It is expected to be in the format "YYYY-MM-DD". Note that if -# the ebuild has a _pre suffix, this variable is ignored and the -# prerelease tarball is used instead. -# -# BRANCH_UPDATE -# If set, this variable signals that we should be using the main -# release tarball (determined by ebuild version) and applying a -# CVS branch update patch against it. The location of this branch -# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}. -# Just like with SNAPSHOT, this variable is ignored if the ebuild -# has a _pre suffix. -# -# PATCH_VER -# PATCH_GCC_VER -# This should be set to the version of the gentoo patch tarball. -# The resulting filename of this tarball will be: -# gcc-${PATCH_GCC_VER:-${GCC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2 -# -# PIE_VER -# PIE_GCC_VER -# These variables control patching in various updates for the logic -# controlling Position Independant Executables. PIE_VER is expected -# to be the version of this patch, and PIE_GCC_VER the gcc version of -# the patch: -# An example: -# PIE_VER="8.7.6.5" -# PIE_GCC_VER="3.4.0" -# The resulting filename of this tarball will be: -# gcc-${PIE_GCC_VER:-${GCC_RELEASE_VER}}-piepatches-v${PIE_VER}.tar.bz2 -# -# SPECS_VER -# SPECS_GCC_VER -# This is for the minispecs files included in the hardened gcc-4.x -# The specs files for hardenedno*, vanilla and for building the "specs" file. -# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER -# the gcc version of the patch. -# An example: -# SPECS_VER="8.7.6.5" -# SPECS_GCC_VER="3.4.0" -# The resulting filename of this tarball will be: -# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2 -# -# HTB_VER -# HTB_GCC_VER -# These variables control whether or not an ebuild supports Herman -# ten Brugge's bounds-checking patches. If you want to use a patch -# for an older gcc version with a new gcc, make sure you set -# HTB_GCC_VER to that version of gcc. -get_gcc_src_uri() { - export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} - export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}} - export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} - export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} - export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}} - - # Set where to download gcc itself depending on whether we're using a - # prerelease, snapshot, or release tarball. - if [[ ${PV} == *9999* ]] ; then - # Nothing to do w/git snapshots. - : - elif [[ -n ${PRERELEASE} ]] ; then - GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2" - elif [[ -n ${SNAPSHOT} ]] ; then - GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2" - else - GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2" - # we want all branch updates to be against the main release - [[ -n ${BRANCH_UPDATE} ]] && \ - GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)" - fi - - [[ -n ${UCLIBC_VER} ]] && \ - GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)" - [[ -n ${PATCH_VER} ]] && \ - GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)" - - # strawberry pie, Cappuccino and a Gauloises (it's a good thing) - [[ -n ${PIE_VER} ]] && \ - PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \ - GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})" - - # gcc minispec for the hardened gcc 4 compiler - [[ -n ${SPECS_VER} ]] && \ - GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)" - - # gcc bounds checking patch - if [[ -n ${HTB_VER} ]] ; then - local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" - GCC_SRC_URI+=" - boundschecking? ( - mirror://sourceforge/boundschecking/${HTBFILE} - $(gentoo_urls ${HTBFILE}) - )" - fi - - [[ -n ${D_VER} ]] && \ - GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )" - - if in_iuse gcj ; then - if tc_version_is_at_least 4.5 ; then - GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )" - elif tc_version_is_at_least 4.3 ; then - GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )" - fi - fi - - echo "${GCC_SRC_URI}" -} - -SRC_URI=$(get_gcc_src_uri) - -#---->> pkg_pretend <<---- - -toolchain_pkg_pretend() { - if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] && - [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]] ; then - die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it" \ - "in your make.conf if you want to use this version." - fi - - [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \ - die "Sorry, this version does not support uClibc" - - if ! use_if_iuse cxx ; then - use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"' - use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"' - use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"' - fi - - want_minispecs -} - -#---->> pkg_setup <<---- - -toolchain_pkg_setup() { - case ${EAPI} in - 2|3) toolchain_pkg_pretend ;; - esac - - # we dont want to use the installed compiler's specs to build gcc - unset GCC_SPECS - unset LANGUAGES #265283 -} - -#---->> src_unpack <<---- - -toolchain_src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-2_src_unpack - else - gcc_quick_unpack - fi -} - -gcc_quick_unpack() { - pushd "${WORKDIR}" > /dev/null - export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}} - export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}} - export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}} - export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}} - export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}} - - if [[ -n ${GCC_A_FAKEIT} ]] ; then - unpack ${GCC_A_FAKEIT} - elif [[ -n ${PRERELEASE} ]] ; then - unpack gcc-${PRERELEASE}.tar.bz2 - elif [[ -n ${SNAPSHOT} ]] ; then - unpack gcc-${SNAPSHOT}.tar.bz2 - elif [[ ${PV} != *9999* ]] ; then - unpack gcc-${GCC_RELEASE_VER}.tar.bz2 - # We want branch updates to be against a release tarball - if [[ -n ${BRANCH_UPDATE} ]] ; then - pushd "${S}" > /dev/null - epatch "${DISTDIR}"/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - popd > /dev/null - fi - fi - - if [[ -n ${D_VER} ]] && use d ; then - pushd "${S}"/gcc > /dev/null - unpack gdc-${D_VER}-src.tar.bz2 - cd .. - ebegin "Adding support for the D language" - ./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log - if ! eend $? ; then - eerror "The D GCC package failed to apply" - eerror "Please include this log file when posting a bug report:" - eerror " ${T}/dgcc.log" - die "failed to include the D language" - fi - popd > /dev/null - fi - - [[ -n ${PATCH_VER} ]] && \ - unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2 - - [[ -n ${UCLIBC_VER} ]] && \ - unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2 - - if want_pie ; then - if [[ -n ${PIE_CORE} ]] ; then - unpack ${PIE_CORE} - else - unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2 - fi - [[ -n ${SPECS_VER} ]] && \ - unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2 - fi - - use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2" - - popd > /dev/null -} - -#---->> src_prepare <<---- - -toolchain_src_prepare() { - export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}" - cd "${S}" - - if ! use vanilla ; then - if [[ -n ${PATCH_VER} ]] ; then - guess_patch_type_in_dir "${WORKDIR}"/patch - EPATCH_MULTI_MSG="Applying Gentoo patches ..." \ - epatch "${WORKDIR}"/patch - BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} p${PATCH_VER}" - fi - if [[ -n ${UCLIBC_VER} ]] ; then - guess_patch_type_in_dir "${WORKDIR}"/uclibc - EPATCH_MULTI_MSG="Applying uClibc patches ..." \ - epatch "${WORKDIR}"/uclibc - fi - fi - do_gcc_HTB_patches - do_gcc_PIE_patches - epatch_user - - if ( tc_version_is_at_least 4.8.2 || use hardened ) && ! use vanilla ; then - make_gcc_hard - fi - - # install the libstdc++ python into the right location - # http://gcc.gnu.org/PR51368 - if tc_version_is_between 4.5 4.7 ; then - sed -i \ - '/^pythondir =/s:=.*:= $(datadir)/python:' \ - "${S}"/libstdc++-v3/python/Makefile.in || die - fi - - # make sure the pkg config files install into multilib dirs. - # since we configure with just one --libdir, we can't use that - # (as gcc itself takes care of building multilibs). #435728 - find "${S}" -name Makefile.in \ - -exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} + - - # No idea when this first started being fixed, but let's go with 4.3.x for now - if ! tc_version_is_at_least 4.3 ; then - fix_files="" - for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do - [[ -e ${x} ]] && fix_files="${fix_files} ${x}" - done - ht_fix_file ${fix_files} */configure *.sh */Makefile.in - fi - - setup_multilib_osdirnames - gcc_version_patch - - if tc_version_is_at_least 4.1 ; then - if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then - # BASE-VER must be a three-digit version number - # followed by an optional -pre string - # eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999 - # If BASE-VER differs from ${PV/_/-} then libraries get installed in - # the wrong directory. - echo ${PV/_/-} > "${S}"/gcc/BASE-VER - fi - fi - - # >= gcc-4.3 doesn't bundle ecj.jar, so copy it - if tc_version_is_at_least 4.3 && use gcj ; then - if tc_version_is_at_least 4.5 ; then - einfo "Copying ecj-4.5.jar" - cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die - else - einfo "Copying ecj-4.3.jar" - cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die - fi - fi - - # disable --as-needed from being compiled into gcc specs - # natively when using a gcc version < 3.4.4 - # http://gcc.gnu.org/PR14992 - if ! tc_version_is_at_least 3.4.4 ; then - sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in - fi - - # In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names - # in line with gcc-4. - if tc_version_is_between 3.3 4.0 ; then - do_gcc_rename_java_bins - fi - - # Prevent libffi from being installed - if tc_version_is_between 3.0 4.8 ; then - sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die - sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die - fi - - # Fixup libtool to correctly generate .la files with portage - elibtoolize --portage --shallow --no-uclibc - - gnuconfig_update - - # update configure files - local f - einfo "Fixing misc issues in configure files" - for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do - ebegin " Updating ${f/${S}\/} [LANG]" - patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \ - || eerror "Please file a bug about this" - eend $? - done - sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828 - - # Prevent new texinfo from breaking old versions (see #198182, #464008) - tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch - - if [[ -x contrib/gcc_update ]] ; then - einfo "Touching generated files" - ./contrib/gcc_update --touch | \ - while read f ; do - einfo " ${f%%...}" - done - fi -} - -guess_patch_type_in_dir() { - [[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \ - && EPATCH_SUFFIX="patch.bz2" \ - || EPATCH_SUFFIX="patch" -} - -do_gcc_HTB_patches() { - use_if_iuse boundschecking || return 0 - - # modify the bounds checking patch with a regression patch - epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch" - BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}" -} - -do_gcc_PIE_patches() { - want_pie || return 0 - use vanilla && return 0 - - if tc_version_is_at_least 4.3.2 ; then - guess_patch_type_in_dir "${WORKDIR}"/piepatch/ - EPATCH_MULTI_MSG="Applying pie patches ..." \ - epatch "${WORKDIR}"/piepatch/ - else - guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream - - # corrects startfile/endfile selection and shared/static/pie flag usage - EPATCH_MULTI_MSG="Applying upstream pie patches ..." \ - epatch "${WORKDIR}"/piepatch/upstream - # adds non-default pie support (rs6000) - EPATCH_MULTI_MSG="Applying non-default pie patches ..." \ - epatch "${WORKDIR}"/piepatch/nondef - # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined - EPATCH_MULTI_MSG="Applying default pie patches ..." \ - epatch "${WORKDIR}"/piepatch/def - fi - - BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}" -} - -# configure to build with the hardened GCC specs as the default -make_gcc_hard() { - # we want to be able to control the pie patch logic via something other - # than ALL_CFLAGS... - sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \ - -e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \ - -i "${S}"/gcc/Makefile.in - # Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7 - if tc_version_is_at_least 4.7 ; then - sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \ - -e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \ - -i "${S}"/gcc/Makefile.in - fi - - # defaults to enable for all toolchains - local gcc_hard_flags="" - if use hardened ; then - if hardened_gcc_works ; then - einfo "Updating gcc to use automatic PIE + SSP building ..." - gcc_hard_flags+=" -DEFAULT_PIE_SSP" - elif hardened_gcc_works pie ; then - einfo "Updating gcc to use automatic PIE building ..." - ewarn "SSP has not been enabled by default" - gcc_hard_flags+=" -DEFAULT_PIE" - elif hardened_gcc_works ssp ; then - einfo "Updating gcc to use automatic SSP building ..." - ewarn "PIE has not been enabled by default" - gcc_hard_flags+=" -DEFAULT_SSP" - else - # do nothing if hardened isn't supported, but don't die either - ewarn "hardened is not supported for this arch in this gcc version" - return 0 - fi - # rebrand to make bug reports easier - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened} - else - if hardened_gcc_works ssp ; then - einfo "Updating gcc to use automatic SSP building ..." - gcc_hard_flags+=" -DEFAULT_SSP" - fi - fi - - sed -i \ - -e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \ - "${S}"/gcc/Makefile.in || die - -} - -# This is a historical wart. The original Gentoo/amd64 port used: -# lib32 - 32bit binaries (x86) -# lib64 - 64bit binaries (x86_64) -# lib - "native" binaries (a symlink to lib64) -# Most other distros use the logic (including mainline gcc): -# lib - 32bit binaries (x86) -# lib64 - 64bit binaries (x86_64) -# Over time, Gentoo is migrating to the latter form. -# -# Unfortunately, due to distros picking the lib32 behavior, newer gcc -# versions will dynamically detect whether to use lib or lib32 for its -# 32bit multilib. So, to keep the automagic from getting things wrong -# while people are transitioning from the old style to the new style, -# we always set the MULTILIB_OSDIRNAMES var for relevant targets. -setup_multilib_osdirnames() { - is_multilib || return 0 - - local config - local libdirs="../lib64 ../lib32" - - # this only makes sense for some Linux targets - case ${CTARGET} in - x86_64*-linux*) config="i386" ;; - powerpc64*-linux*) config="rs6000" ;; - sparc64*-linux*) config="sparc" ;; - s390x*-linux*) config="s390" ;; - *) return 0 ;; - esac - config+="/t-linux64" - - local sed_args=() - if tc_version_is_at_least 4.6 ; then - sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' ) - fi - if [[ ${SYMLINK_LIB} == "yes" ]] ; then - einfo "updating multilib directories to be: ${libdirs}" - if tc_version_is_at_least 4.6.4 || tc_version_is_at_least 4.7 ; then - sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' ) - else - sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" ) - fi - else - einfo "using upstream multilib; disabling lib32 autodetection" - sed_args+=( -r -e 's:[$][(]if.*,(.*)[)]:\1:' ) - fi - sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die -} - -gcc_version_patch() { - # gcc-4.3+ has configure flags (whoo!) - tc_version_is_at_least 4.3 && return 0 - - local version_string=${GCC_CONFIG_VER} - [[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}" - - einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})" - - local gcc_sed=( -e 's:gcc\.gnu\.org/bugs\.html:bugs\.gentoo\.org/:' ) - if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then - gcc_sed+=( -e "/VERSUFFIX \"\"/s:\"\":\" (${BRANDING_GCC_PKGVERSION})\":" ) - else - version_string="${version_string} (${BRANDING_GCC_PKGVERSION})" - gcc_sed+=( -e "/const char version_string\[\] = /s:= \".*\":= \"${version_string}\":" ) - fi - sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die -} - -do_gcc_rename_java_bins() { - # bug #139918 - conflict between gcc and java-config-2 for ownership of - # /usr/bin/rmi{c,registry}. Done with mv & sed rather than a patch - # because patches would be large (thanks to the rename of man files), - # and it's clear from the sed invocations that all that changes is the - # rmi{c,registry} names to grmi{c,registry} names. - # Kevin F. Quinn 2006-07-12 - einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry." - # 1) Move the man files if present (missing prior to gcc-3.4) - for manfile in rmic rmiregistry ; do - [[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue - mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1 - done - # 2) Fixup references in the docs if present (mission prior to gcc-3.4) - for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do - [[ -f ${S}/${jfile} ]] || continue - sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} || - die "Failed to fixup file ${jfile} for rename to grmiregistry" - sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} || - die "Failed to fixup file ${jfile} for rename to grmic" - done - # 3) Fixup Makefiles to build the changed executable names - # These are present in all 3.x versions, and are the important bit - # to get gcc to build with the new names. - for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do - sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} || - die "Failed to fixup file ${jfile} for rename to grmiregistry" - # Careful with rmic on these files; it's also the name of a directory - # which should be left unchanged. Replace occurrences of 'rmic$', - # 'rmic_' and 'rmic '. - sed -i -e 's:rmic\([$_ ]\):grmic\1:g' "${S}"/${jfile} || - die "Failed to fixup file ${jfile} for rename to grmic" - done -} - -#---->> src_configure <<---- - -toolchain_src_configure() { - downgrade_arch_flags - gcc_do_filter_flags - - einfo "CFLAGS=\"${CFLAGS}\"" - einfo "CXXFLAGS=\"${CXXFLAGS}\"" - einfo "LDFLAGS=\"${LDFLAGS}\"" - - # Force internal zip based jar script to avoid random - # issues with 3rd party jar implementations. #384291 - export JAR=no - - # For hardened gcc 4.3 piepatchset to build the hardened specs - # file (build.specs) to use when building gcc. - if ! tc_version_is_at_least 4.4 && want_minispecs ; then - setup_minispecs_gcc_build_specs - fi - - local confgcc=( --host=${CHOST} ) - - if is_crosscompile || tc-is-cross-compiler ; then - # Straight from the GCC install doc: - # "GCC has code to correctly determine the correct value for target - # for nearly all native systems. Therefore, we highly recommend you - # not provide a configure target when configuring a native compiler." - confgcc+=( --target=${CTARGET} ) - fi - [[ -n ${CBUILD} ]] && confgcc+=( --build=${CBUILD} ) - - confgcc+=( - --prefix="${PREFIX}" - --bindir="${BINPATH}" - --includedir="${INCLUDEPATH}" - --datadir="${DATAPATH}" - --mandir="${DATAPATH}/man" - --infodir="${DATAPATH}/info" - --with-gxx-include-dir="${STDCXX_INCDIR}" - ) - - # Stick the python scripts in their own slotted directory (bug #279252) - # - # --with-python-dir=DIR - # Specifies where to install the Python modules used for aot-compile. DIR - # should not include the prefix used in installation. For example, if the - # Python modules are to be installed in /usr/lib/python2.5/site-packages, - # then --with-python-dir=/lib/python2.5/site-packages should be passed. - # - # This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python" - if tc_version_is_at_least 4.4 ; then - confgcc+=( --with-python-dir=${DATAPATH/$PREFIX/}/python ) - fi - - ### language options - - local GCC_LANG="c" - is_cxx && GCC_LANG+=",c++" - is_d && GCC_LANG+=",d" - is_gcj && GCC_LANG+=",java" - is_go && GCC_LANG+=",go" - is_jit && GCC_LANG+=",jit" - if is_objc || is_objcxx ; then - GCC_LANG+=",objc" - if tc_version_is_at_least 4 ; then - use objc-gc && confgcc+=( --enable-objc-gc ) - fi - is_objcxx && GCC_LANG+=",obj-c++" - fi - - # fortran support just got sillier! the lang value can be f77 for - # fortran77, f95 for fortran95, or just plain old fortran for the - # currently supported standard depending on gcc version. - is_fortran && GCC_LANG+=",fortran" - is_f77 && GCC_LANG+=",f77" - is_f95 && GCC_LANG+=",f95" - - # We do NOT want 'ADA support' in here! - # is_ada && GCC_LANG+=",ada" - - confgcc+=( --enable-languages=${GCC_LANG} ) - - ### general options - - confgcc+=( - --enable-obsolete - --enable-secureplt - --disable-werror - --with-system-zlib - ) - - if use nls ; then - confgcc+=( --enable-nls --without-included-gettext ) - else - confgcc+=( --disable-nls ) - fi - - tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions ) - - # Use the default ("release") checking because upstream usually neglects - # to test "disabled" so it has a history of breaking. #317217 - if tc_version_is_at_least 3.4 ; then - # The "release" keyword is new to 4.0. #551636 - local off=$(tc_version_is_at_least 4.0 && echo release || echo no) - confgcc+=( --enable-checking="${GCC_CHECKS_LIST:-$(usex debug yes ${off})}" ) - fi - - # Branding - tc_version_is_at_least 4.3 && confgcc+=( - --with-bugurl=https://bugs.gentoo.org/ - --with-pkgversion="${BRANDING_GCC_PKGVERSION}" - ) - - # If we want hardened support with the newer piepatchset for >=gcc 4.4 - if tc_version_is_at_least 4.4 && want_minispecs ; then - confgcc+=( $(use_enable hardened esp) ) - fi - - # allow gcc to search for clock funcs in the main C lib. - # if it can't find them, then tough cookies -- we aren't - # going to link in -lrt to all C++ apps. #411681 - if tc_version_is_at_least 4.4 && is_cxx ; then - confgcc+=( --enable-libstdcxx-time ) - fi - - # The jit language requires this. - is_jit && confgcc+=( --enable-host-shared ) - - # # Turn on the -Wl,--build-id flag by default for ELF targets. #525942 - # # This helps with locating debug files. - # case ${CTARGET} in - # *-linux-*|*-elf|*-eabi) - # tc_version_is_at_least 4.5 && confgcc+=( - # --enable-linker-build-id - # ) - # ;; - # esac - - # newer gcc versions like to bootstrap themselves with C++, - # so we need to manually disable it ourselves - if tc_version_is_between 4.7 4.8 && ! is_cxx ; then - confgcc+=( --disable-build-with-cxx --disable-build-poststage1-with-cxx ) - fi - - ### Cross-compiler options - if is_crosscompile ; then - # Enable build warnings by default with cross-compilers when system - # paths are included (e.g. via -I flags). - confgcc+=( --enable-poison-system-directories ) - - # When building a stage1 cross-compiler (just C compiler), we have to - # disable a bunch of features or gcc goes boom - local needed_libc="" - case ${CTARGET} in - *-linux) needed_libc=no-fucking-clue;; - *-dietlibc) needed_libc=dietlibc;; - *-elf|*-eabi) needed_libc=newlib;; - *-freebsd*) needed_libc=freebsd-lib;; - *-gnu*) needed_libc=glibc;; - *-klibc) needed_libc=klibc;; - *-musl*) needed_libc=musl;; - *-uclibc*) - if ! echo '#include <features.h>' | \ - $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \ - grep -q __HAVE_SHARED__ - then #291870 - confgcc+=( --disable-shared ) - fi - needed_libc=uclibc - ;; - *-cygwin) needed_libc=cygwin;; - x86_64-*-mingw*|\ - *-w64-mingw*) needed_libc=mingw64-runtime;; - mingw*|*-mingw*) needed_libc=mingw-runtime;; - avr) confgcc+=( --enable-shared --disable-threads );; - esac - if [[ -n ${needed_libc} ]] ; then - local confgcc_no_libc=( --disable-shared ) - tc_version_is_at_least 4.8 && confgcc_no_libc+=( --disable-libatomic ) - if ! has_version ${CATEGORY}/${needed_libc} ; then - confgcc+=( - "${confgcc_no_libc[@]}" - --disable-threads - --without-headers - ) - elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then - confgcc+=( - "${confgcc_no_libc[@]}" - --with-sysroot="${PREFIX}"/${CTARGET} - ) - else - confgcc+=( --with-sysroot="${PREFIX}"/${CTARGET} ) - fi - fi - - tc_version_is_at_least 4.2 && confgcc+=( --disable-bootstrap ) - else - if tc-is-static-only ; then - confgcc+=( --disable-shared ) - else - confgcc+=( --enable-shared ) - fi - case ${CHOST} in - mingw*|*-mingw*|*-cygwin) - confgcc+=( --enable-threads=win32 ) ;; - *) - confgcc+=( --enable-threads=posix ) ;; - esac - fi - - # __cxa_atexit is "essential for fully standards-compliant handling of - # destructors", but apparently requires glibc. - case ${CTARGET} in - *-uclibc*) - confgcc+=( - --disable-__cxa_atexit - $(use_enable nptl tls) - ) - tc_version_is_between 3.3 3.4 && confgcc+=( --enable-sjlj-exceptions ) - if tc_version_is_between 3.4 4.3 ; then - confgcc+=( --enable-clocale=uclibc ) - fi - ;; - *-elf|*-eabi) - confgcc+=( --with-newlib ) - ;; - *-gnu*) - confgcc+=( - --enable-__cxa_atexit - --enable-clocale=gnu - ) - ;; - *-freebsd*) - confgcc+=( --enable-__cxa_atexit ) - ;; - *-solaris*) - confgcc+=( --enable-__cxa_atexit ) - ;; - esac - - ### arch options - - gcc-multilib-configure - - # ppc altivec support - confgcc+=( $(use_enable altivec) ) - - # gcc has fixed-point arithmetic support in 4.3 for mips targets that can - # significantly increase compile time by several hours. This will allow - # users to control this feature in the event they need the support. - tc_version_is_at_least 4.3 && confgcc+=( $(use_enable fixed-point) ) - - case $(tc-is-softfloat) in - yes) confgcc+=( --with-float=soft ) ;; - softfp) confgcc+=( --with-float=softfp ) ;; - *) - # If they've explicitly opt-ed in, do hardfloat, - # otherwise let the gcc default kick in. - case ${CTARGET//_/-} in - *-hardfloat-*|*eabihf) confgcc+=( --with-float=hard ) ;; - esac - esac - - local with_abi_map=() - case $(tc-arch) in - arm) #264534 #414395 - local a arm_arch=${CTARGET%%-*} - # Remove trailing endian variations first: eb el be bl b l - for a in e{b,l} {b,l}e b l ; do - if [[ ${arm_arch} == *${a} ]] ; then - arm_arch=${arm_arch%${a}} - break - fi - done - # Convert armv7{a,r,m} to armv7-{a,r,m} - [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-} - # See if this is a valid --with-arch flag - if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch}; - . "${srcdir}"/config.gcc) &>/dev/null - then - confgcc+=( --with-arch=${arm_arch} ) - fi - - # Make default mode thumb for microcontroller classes #418209 - [[ ${arm_arch} == *-m ]] && confgcc+=( --with-mode=thumb ) - - # Enable hardvfp - if [[ $(tc-is-softfloat) == "no" ]] && \ - [[ ${CTARGET} == armv[67]* ]] && \ - tc_version_is_at_least 4.5 - then - # Follow the new arm hardfp distro standard by default - confgcc+=( --with-float=hard ) - case ${CTARGET} in - armv6*) confgcc+=( --with-fpu=vfp ) ;; - armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;; - esac - fi - ;; - mips) - # Add --with-abi flags to set default ABI - confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) ) - ;; - amd64) - # drop the older/ABI checks once this get's merged into some - # version of gcc upstream - if tc_version_is_at_least 4.8 && has x32 $(get_all_abis TARGET) ; then - confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) ) - fi - ;; - x86) - # Default arch for x86 is normally i386, lets give it a bump - # since glibc will do so based on CTARGET anyways - confgcc+=( --with-arch=${CTARGET%%-*} ) - ;; - hppa) - # Enable sjlj exceptions for backward compatibility on hppa - [[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions ) - ;; - ppc) - # Set up defaults based on current CFLAGS - is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double ) - [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double ) - ;; - esac - - # if the target can do biarch (-m32/-m64), enable it. overhead should - # be small, and should simplify building of 64bit kernels in a 32bit - # userland by not needing sys-devel/kgcc64. #349405 - case $(tc-arch) in - ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=( --enable-targets=all ) ;; - sparc) tc_version_is_at_least 4.4 && confgcc+=( --enable-targets=all ) ;; - amd64|x86) tc_version_is_at_least 4.3 && confgcc+=( --enable-targets=all ) ;; - esac - - # On Darwin we need libdir to be set in order to get correct install names - # for things like libobjc-gnu, libgcj and libfortran. If we enable it on - # non-Darwin we screw up the behaviour this eclass relies on. We in - # particular need this over --libdir for bug #255315. - [[ ${CTARGET} == *-darwin* ]] && \ - confgcc+=( --enable-version-specific-runtime-libs ) - - ### library options - - if ! is_gcj ; then - confgcc+=( --disable-libgcj ) - elif use awt ; then - confgcc+=( --enable-java-awt=gtk ) - fi - - if tc_version_is_at_least 4.2 ; then - if in_iuse openmp ; then - # Make sure target has pthreads support. #326757 #335883 - # There shouldn't be a chicken & egg problem here as openmp won't - # build without a C library, and you can't build that w/out - # already having a compiler ... - if ! is_crosscompile || \ - $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null - then - confgcc+=( $(use_enable openmp libgomp) ) - else - # Force disable as the configure script can be dumb #359855 - confgcc+=( --disable-libgomp ) - fi - else - # For gcc variants where we don't want openmp (e.g. kgcc) - confgcc+=( --disable-libgomp ) - fi - fi - - if tc_version_is_at_least 4.0 ; then - if in_iuse mudflap ; then - confgcc+=( $(use_enable mudflap libmudflap) ) - else - confgcc+=( --disable-libmudflap ) - fi - - if use_if_iuse libssp ; then - confgcc+=( --enable-libssp ) - else - if hardened_gcc_is_stable ssp; then - export gcc_cv_libc_provides_ssp=yes - fi - confgcc+=( --disable-libssp ) - fi - fi - - if in_iuse cilk ; then - confgcc+=( $(use_enable cilk libcilkrts) ) - fi - - if in_iuse mpx ; then - confgcc+=( $(use_enable mpx libmpx) ) - fi - - if in_iuse vtv ; then - confgcc+=( - $(use_enable vtv vtable-verify) - $(use_enable vtv libvtv) - ) - fi - - # newer gcc's come with libquadmath, but only fortran uses - # it, so auto punt it when we don't care - if tc_version_is_at_least 4.6 && ! is_fortran ; then - confgcc+=( --disable-libquadmath ) - fi - - if tc_version_is_at_least 4.6 ; then - confgcc+=( --enable-lto ) - elif tc_version_is_at_least 4.5 ; then - confgcc+=( --disable-lto ) - fi - - # graphite was added in 4.4 but we only support it in 4.8+ due to external - # library issues. #448024 - if tc_version_is_at_least 5.0 ; then - confgcc+=( $(use_with graphite isl) ) - use graphite && confgcc+=( --disable-isl-version-check ) - elif tc_version_is_at_least 4.8 ; then - confgcc+=( $(use_with graphite cloog) ) - use graphite && confgcc+=( --disable-isl-version-check ) - elif tc_version_is_at_least 4.4 ; then - confgcc+=( --without-{cloog,ppl} ) - fi - - if tc_version_is_at_least 4.8 ; then - confgcc+=( $(use_enable sanitize libsanitizer) ) - fi - - if tc_version_is_at_least 6.0 ; then - confgcc+=( - $(use_enable pie default-pie) - # This defaults to -fstack-protector-strong. - $(use_enable ssp default-ssp) - ) - fi - - # Disable gcc info regeneration -- it ships with generated info pages - # already. Our custom version/urls/etc... trigger it. #464008 - export gcc_cv_prog_makeinfo_modern=no - - # Do not let the X detection get in our way. We know things can be found - # via system paths, so no need to hardcode things that'll break multilib. - # Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up - # killing the 32bit builds which want /usr/lib. - export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries=' - - confgcc+=( "$@" ${EXTRA_ECONF} ) - - # Nothing wrong with a good dose of verbosity - echo - einfo "PREFIX: ${PREFIX}" - einfo "BINPATH: ${BINPATH}" - einfo "LIBPATH: ${LIBPATH}" - einfo "DATAPATH: ${DATAPATH}" - einfo "STDCXX_INCDIR: ${STDCXX_INCDIR}" - echo - einfo "Languages: ${GCC_LANG}" - echo - einfo "Configuring GCC with: ${confgcc[@]//--/\n\t--}" - echo - - # Build in a separate build tree - mkdir -p "${WORKDIR}"/build - pushd "${WORKDIR}"/build > /dev/null - - # and now to do the actual configuration - addwrite /dev/zero - echo "${S}"/configure "${confgcc[@]}" - # Older gcc versions did not detect bash and re-exec itself, so force the - # use of bash. Newer ones will auto-detect, but this is not harmeful. - CONFIG_SHELL="/bin/bash" \ - bash "${S}"/configure "${confgcc[@]}" || die "failed to run configure" - - # return to whatever directory we were in before - popd > /dev/null -} - -# Replace -m flags unsupported by the version being built with the best -# available equivalent -downgrade_arch_flags() { - local arch bver i isa myarch mytune rep ver - - bver=${1:-${GCC_BRANCH_VER}} - [[ $(gcc-version) < ${bver} ]] && return 0 - [[ $(tc-arch) != amd64 && $(tc-arch) != x86 ]] && return 0 - - myarch=$(get-flag march) - mytune=$(get-flag mtune) - - # If -march=native isn't supported we have to tease out the actual arch - if [[ ${myarch} == native || ${mytune} == native ]] ; then - if [[ ${bver} < 4.2 ]] ; then - arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \ - | sed -rn "/cc1.*-march/s:.*-march=([^ ']*).*:\1:p") - replace-cpu-flags native ${arch} - fi - fi - - # Handle special -mtune flags - [[ ${mytune} == intel && ${bver} < 4.9 ]] && replace-cpu-flags intel generic - [[ ${mytune} == generic && ${bver} < 4.2 ]] && filter-flags '-mtune=*' - [[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*' - [[ ${bver} < 3.4 ]] && filter-flags '-mtune=*' - - # "added" "arch" "replacement" - local archlist=( - 4.9 bdver4 bdver3 - 4.9 bonnell atom - 4.9 broadwell core-avx2 - 4.9 haswell core-avx2 - 4.9 ivybridge core-avx-i - 4.9 nehalem corei7 - 4.9 sandybridge corei7-avx - 4.9 silvermont corei7 - 4.9 westmere corei7 - 4.8 bdver3 bdver2 - 4.8 btver2 btver1 - 4.7 bdver2 bdver1 - 4.7 core-avx2 core-avx-i - 4.6 bdver1 amdfam10 - 4.6 btver1 amdfam10 - 4.6 core-avx-i core2 - 4.6 corei7 core2 - 4.6 corei7-avx core2 - 4.5 atom core2 - 4.3 amdfam10 k8 - 4.3 athlon64-sse3 k8 - 4.3 barcelona k8 - 4.3 core2 nocona - 4.3 geode k6-2 # gcc.gnu.org/PR41989#c22 - 4.3 k8-sse3 k8 - 4.3 opteron-sse3 k8 - 3.4 athlon-fx x86-64 - 3.4 athlon64 x86-64 - 3.4 c3-2 c3 - 3.4 k8 x86-64 - 3.4 opteron x86-64 - 3.4 pentium-m pentium3 - 3.4 pentium3m pentium3 - 3.4 pentium4m pentium4 - ) - - for ((i = 0; i < ${#archlist[@]}; i += 3)) ; do - myarch=$(get-flag march) - mytune=$(get-flag mtune) - - ver=${archlist[i]} - arch=${archlist[i + 1]} - rep=${archlist[i + 2]} - - [[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue - - if [[ ${ver} > ${bver} ]] ; then - einfo "Replacing ${myarch} (added in gcc ${ver}) with ${rep}..." - [[ ${myarch} == ${arch} ]] && replace-cpu-flags ${myarch} ${rep} - [[ ${mytune} == ${arch} ]] && replace-cpu-flags ${mytune} ${rep} - continue - else - break - fi - done - - # we only check -mno* here since -m* get removed by strip-flags later on - local isalist=( - 4.9 -mno-sha - 4.9 -mno-avx512pf - 4.9 -mno-avx512f - 4.9 -mno-avx512er - 4.9 -mno-avx512cd - 4.8 -mno-xsaveopt - 4.8 -mno-xsave - 4.8 -mno-rtm - 4.8 -mno-fxsr - 4.7 -mno-lzcnt - 4.7 -mno-bmi2 - 4.7 -mno-avx2 - 4.6 -mno-tbm - 4.6 -mno-rdrnd - 4.6 -mno-fsgsbase - 4.6 -mno-f16c - 4.6 -mno-bmi - 4.5 -mno-xop - 4.5 -mno-movbe - 4.5 -mno-lwp - 4.5 -mno-fma4 - 4.4 -mno-pclmul - 4.4 -mno-fma - 4.4 -mno-avx - 4.4 -mno-aes - 4.3 -mno-ssse3 - 4.3 -mno-sse4a - 4.3 -mno-sse4 - 4.3 -mno-sse4.2 - 4.3 -mno-sse4.1 - 4.3 -mno-popcnt - 4.3 -mno-abm - ) - - for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do - ver=${isalist[i]} - isa=${isalist[i + 1]} - [[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-} - done -} - -gcc_do_filter_flags() { - strip-flags - replace-flags -O? -O2 - - # dont want to funk ourselves - filter-flags '-mabi*' -m31 -m32 -m64 - - filter-flags -frecord-gcc-switches # 490738 - filter-flags -mno-rtm -mno-htm # 506202 - - if tc_version_is_between 3.2 3.4 ; then - # XXX: this is so outdated it's barely useful, but it don't hurt... - replace-cpu-flags G3 750 - replace-cpu-flags G4 7400 - replace-cpu-flags G5 7400 - - # XXX: should add a sed or something to query all supported flags - # from the gcc source and trim everything else ... - filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs - filter-flags -f{no-,}stack-protector{,-all} - filter-flags -fvisibility-inlines-hidden -fvisibility=hidden - fi - - if tc_version_is_at_least 3.4 ; then - case $(tc-arch) in - amd64|x86) - filter-flags '-mcpu=*' - - tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287 - - if tc_version_is_between 4.6 4.7 ; then - # https://bugs.gentoo.org/411333 - # https://bugs.gentoo.org/466454 - replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686 - fi - ;; - alpha) - # https://bugs.gentoo.org/454426 - append-ldflags -Wl,--no-relax - ;; - sparc) - # temporary workaround for random ICEs reproduced by multiple users - # https://bugs.gentoo.org/457062 - tc_version_is_between 4.6 4.8 && MAKEOPTS+=" -j1" - ;; - *-macos) - # http://gcc.gnu.org/PR25127 - tc_version_is_between 4.0 4.2 && \ - filter-flags '-mcpu=*' '-march=*' '-mtune=*' - ;; - esac - fi - - strip-unsupported-flags - - # these are set here so we have something sane at configure time - if is_crosscompile ; then - # Set this to something sane for both native and target - CFLAGS="-O2 -pipe" - FFLAGS=${CFLAGS} - FCFLAGS=${CFLAGS} - - local VAR="CFLAGS_"${CTARGET//-/_} - CXXFLAGS=${!VAR} - fi - - export GCJFLAGS=${GCJFLAGS:-${CFLAGS}} -} - -setup_minispecs_gcc_build_specs() { - # Setup the "build.specs" file for gcc 4.3 to use when building. - if hardened_gcc_works pie ; then - cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs - fi - if hardened_gcc_works ssp ; then - for s in ssp sspall ; do - cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs - done - fi - for s in nostrict znow ; do - cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs - done - export GCC_SPECS="${WORKDIR}"/build.specs -} - -gcc-multilib-configure() { - if ! is_multilib ; then - confgcc+=( --disable-multilib ) - # Fun times: if we are building for a target that has multiple - # possible ABI formats, and the user has told us to pick one - # that isn't the default, then not specifying it via the list - # below will break that on us. - else - confgcc+=( --enable-multilib ) - fi - - # translate our notion of multilibs into gcc's - local abi list - for abi in $(get_all_abis TARGET) ; do - local l=$(gcc-abi-map ${abi}) - [[ -n ${l} ]] && list+=",${l}" - done - if [[ -n ${list} ]] ; then - case ${CTARGET} in - x86_64*) - tc_version_is_at_least 4.8 && confgcc+=( --with-multilib-list=${list:1} ) - ;; - esac - fi -} - -gcc-abi-map() { - # Convert the ABI name we use in Gentoo to what gcc uses - local map=() - case ${CTARGET} in - mips*) map=("o32 32" "n32 n32" "n64 64") ;; - x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;; - esac - - local m - for m in "${map[@]}" ; do - l=( ${m} ) - [[ $1 == ${l[0]} ]] && echo ${l[1]} && break - done -} - -#----> src_compile <---- - -toolchain_src_compile() { - touch "${S}"/gcc/c-gperf.h - - # Do not make manpages if we do not have perl ... - [[ ! -x /usr/bin/perl ]] \ - && find "${WORKDIR}"/build -name '*.[17]' -exec touch {} + - - gcc_do_make ${GCC_MAKE_TARGET} -} - -gcc_do_make() { - # This function accepts one optional argument, the make target to be used. - # If omitted, gcc_do_make will try to guess whether it should use all, - # or bootstrap-lean depending on CTARGET and arch. - # An example of how to use this function: - # - # gcc_do_make all-target-libstdc++-v3 - - [[ -n ${1} ]] && GCC_MAKE_TARGET=${1} - - # default target - if is_crosscompile || tc-is-cross-compiler ; then - # 3 stage bootstrapping doesnt quite work when you cant run the - # resulting binaries natively ^^; - GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all} - else - GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean} - fi - - # Older versions of GCC could not do profiledbootstrap in parallel due to - # collisions with profiling info. - # boundschecking also seems to introduce parallel build issues. - if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] || use_if_iuse boundschecking ; then - ! tc_version_is_at_least 4.6 && export MAKEOPTS="${MAKEOPTS} -j1" - fi - - if [[ ${GCC_MAKE_TARGET} == "all" ]] ; then - STAGE1_CFLAGS=${STAGE1_CFLAGS-"${CFLAGS}"} - elif [[ $(gcc-version) == "3.4" && ${GCC_BRANCH_VER} == "3.4" ]] && gcc-specs-ssp ; then - # See bug #79852 - STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O2"} - fi - - if is_crosscompile; then - # In 3.4, BOOT_CFLAGS is never used on a crosscompile... - # but I'll leave this in anyways as someone might have had - # some reason for putting it in here... --eradicator - BOOT_CFLAGS=${BOOT_CFLAGS-"-O2"} - else - # we only want to use the system's CFLAGS if not building a - # cross-compiler. - BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"} - fi - - einfo "Compiling ${PN} (${GCC_MAKE_TARGET})..." - - pushd "${WORKDIR}"/build >/dev/null - - emake \ - LDFLAGS="${LDFLAGS}" \ - STAGE1_CFLAGS="${STAGE1_CFLAGS}" \ - LIBPATH="${LIBPATH}" \ - BOOT_CFLAGS="${BOOT_CFLAGS}" \ - ${GCC_MAKE_TARGET} \ - || die "emake failed with ${GCC_MAKE_TARGET}" - - if ! is_crosscompile && use cxx && use_if_iuse doc ; then - if type -p doxygen > /dev/null ; then - if tc_version_is_at_least 4.3 ; then - cd "${CTARGET}"/libstdc++-v3/doc - emake doc-man-doxygen || ewarn "failed to make docs" - elif tc_version_is_at_least 3.0 ; then - cd "${CTARGET}"/libstdc++-v3 - emake doxygen-man || ewarn "failed to make docs" - fi - # Clean bogus manpages. #113902 - find -name '*_build_*' -delete - # Blow away generated directory references. Newer versions of gcc - # have gotten better at this, but not perfect. This is easier than - # backporting all of the various doxygen patches. #486754 - find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \ - xargs rm -f - else - ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed" - fi - fi - - popd >/dev/null -} - -#---->> src_test <<---- - -toolchain_src_test() { - if use regression-test ; then - cd "${WORKDIR}"/build - emake -k check - fi -} - -#---->> src_install <<---- - -toolchain_src_install() { - cd "${WORKDIR}"/build - - # Do allow symlinks in private gcc include dir as this can break the build - find gcc/include*/ -type l -delete - - # Copy over the info pages. We disabled their generation earlier, but the - # build system only expects to install out of the build dir, not the source. #464008 - mkdir -p gcc/doc - local x= - for x in "${S}"/gcc/doc/*.info* ; do - if [[ -f ${x} ]] ; then - cp "${x}" gcc/doc/ || die - fi - done - - # We remove the generated fixincludes, as they can cause things to break - # (ncurses, openssl, etc). We do not prevent them from being built, as - # in the following commit which we revert: - # https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.647&r2=1.648 - # This is because bsd userland needs fixedincludes to build gcc, while - # linux does not. Both can dispose of them afterwards. - while read x ; do - grep -q 'It has been auto-edited by fixincludes from' "${x}" \ - && rm -f "${x}" - done < <(find gcc/include*/ -name '*.h') - - # Do the 'make install' from the build directory - S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die - - # Punt some tools which are really only useful while building gcc - find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \; - # This one comes with binutils - find "${D}" -name libiberty.a -delete - - # Move the libraries to the proper location - gcc_movelibs - - # Basic sanity check - if ! is_crosscompile ; then - local EXEEXT - eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log) - [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${D}" - fi - - dodir /etc/env.d/gcc - create_gcc_env_entry - - # Setup the gcc_env_entry for hardened gcc 4 with minispecs - want_minispecs && copy_minispecs_gcc_specs - - # Make sure we dont have stuff lying around that - # can nuke multiple versions of gcc - gcc_slot_java - - dodir /usr/bin - cd "${D}"${BINPATH} - # Ugh: we really need to auto-detect this list. - # It's constantly out of date. - for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do - # For some reason, g77 gets made instead of ${CTARGET}-g77... - # this should take care of that - if [[ -f ${x} ]] ; then - # In case they're hardlinks, clear out the target first - # otherwise the mv below will complain. - rm -f ${CTARGET}-${x} - mv ${x} ${CTARGET}-${x} - fi - - if [[ -f ${CTARGET}-${x} ]] ; then - if ! is_crosscompile ; then - ln -sf ${CTARGET}-${x} ${x} - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${x}-${GCC_CONFIG_VER} - fi - # Create versioned symlinks - dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \ - /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} - fi - - if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then - rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} - ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} - fi - done - # Rename the main go binaries as we don't want to clobber dev-lang/go - # when gcc-config runs. #567806 - if tc_version_is_at_least 5 && is_go ; then - for x in go gofmt; do - mv ${x} ${x}-${GCCMAJOR} || die - done - fi - - # Now do the fun stripping stuff - env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}" - is_crosscompile && \ - env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${HOSTLIBPATH}" - env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}" - # gcc used to install helper binaries in lib/ but then moved to libexec/ - [[ -d ${D}${PREFIX}/libexec/gcc ]] && \ - env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}" - - cd "${S}" - if is_crosscompile; then - rm -rf "${ED}"usr/share/{man,info} - rm -rf "${D}"${DATAPATH}/{man,info} - else - if tc_version_is_at_least 3.0 ; then - local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man) - if [[ -d ${cxx_mandir} ]] ; then - cp -r "${cxx_mandir}"/man? "${D}/${DATAPATH}"/man/ - fi - fi - has noinfo ${FEATURES} \ - && rm -r "${D}${DATAPATH}"/info \ - || prepinfo "${DATAPATH#${EPREFIX}}" - has noman ${FEATURES} \ - && rm -r "${D}${DATAPATH}"/man \ - || prepman "${DATAPATH#${EPREFIX}}" - fi - # prune empty dirs left behind - find "${D}" -depth -type d -delete 2>/dev/null - - # install testsuite results - if use regression-test; then - docinto testsuite - find "${WORKDIR}"/build -type f -name "*.sum" -exec dodoc {} + - find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -exec dodoc {} + - fi - - # Rather install the script, else portage with changing $FILESDIR - # between binary and source package borks things .... - if ! is_crosscompile ; then - insinto "${DATAPATH#${EPREFIX}}" - fprefixify newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die - exeinto "${DATAPATH#${EPREFIX}}" - fprefixify doexe "${GCC_FILESDIR}"/fix_libtool_files.sh || die - doexe "${GCC_FILESDIR}"/c{89,99} || die - fi - - # libstdc++.la: Delete as it doesn't add anything useful: g++ itself - # handles linkage correctly in the dynamic & static case. It also just - # causes us pain: any C++ progs/libs linking with libtool will gain a - # reference to the full libstdc++.la file which is gcc version specific. - # libstdc++fs.la: It doesn't link against anything useful. - # libsupc++.la: This has no dependencies. - # libcc1.la: There is no static library, only dynamic. - # libcc1plugin.la: Same as above, and it's loaded via dlopen. - # libgomp.la: gcc itself handles linkage (libgomp.spec). - # libgomp-plugin-*.la: Same as above, and it's an internal plugin only - # loaded via dlopen. - # libgfortran.la: gfortran itself handles linkage correctly in the - # dynamic & static case (libgfortran.spec). #573302 - # libgfortranbegin.la: Same as above, and it's an internal lib. - # libmpx.la: gcc itself handles linkage correctly (libmpx.spec). - # libmpxwrappers.la: See above. - # libitm.la: gcc itself handles linkage correctly (libitm.spec). - # libvtv.la: gcc itself handles linkage correctly. - # lib*san.la: Sanitizer linkage is handled internally by gcc, and they - # do not support static linking. #487550 #546700 - find "${D}/${LIBPATH}" \ - '(' \ - -name libstdc++.la -o \ - -name libstdc++fs.la -o \ - -name libsupc++.la -o \ - -name libcc1.la -o \ - -name libcc1plugin.la -o \ - -name 'libgomp.la' -o \ - -name 'libgomp-plugin-*.la' -o \ - -name libgfortran.la -o \ - -name libgfortranbegin.la -o \ - -name libmpx.la -o \ - -name libmpxwrappers.la -o \ - -name libitm.la -o \ - -name libvtv.la -o \ - -name 'lib*san.la' \ - ')' -type f -delete - - # Use gid of 0 because some stupid ports don't have - # the group 'root' set to gid 0. Send to /dev/null - # for people who are testing as non-root. - chown -R root:0 "${D}${LIBPATH}" 2>/dev/null - - # Move pretty-printers to gdb datadir to shut ldconfig up - local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/} - pushd "${D}${LIBPATH}" >/dev/null - for py in $(find . -name '*-gdb.py') ; do - local multidir=${py%/*} - insinto "${gdbdir}/${multidir}" - sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128 - doins "${py}" || die - rm "${py}" || die - done - popd >/dev/null - - # Don't scan .gox files for executable stacks - false positives - export QA_EXECSTACK="usr/lib*/go/*/*.gox" - export QA_WX_LOAD="usr/lib*/go/*/*.gox" - - # Disable RANDMMAP so PCH works. #301299 - if tc_version_is_at_least 4.3 ; then - pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1" - pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus" - fi -} - -# Move around the libs to the right location. For some reason, -# when installing gcc, it dumps internal libraries into /usr/lib -# instead of the private gcc lib path -gcc_movelibs() { - # older versions of gcc did not support --print-multi-os-directory - tc_version_is_at_least 3.2 || return 0 - - # For non-target libs which are for CHOST and not CTARGET, we want to - # move them to the compiler-specific CHOST internal dir. This is stuff - # that you want to link against when building tools rather than building - # code to run on the target. - if tc_version_is_at_least 5 && is_crosscompile ; then - dodir "${HOSTLIBPATH#${EPREFIX}}" - mv "${ED}"usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die - fi - - # For all the libs that are built for CTARGET, move them into the - # compiler-specific CTARGET internal dir. - local x multiarg removedirs="" - for multiarg in $($(XGCC) -print-multi-lib) ; do - multiarg=${multiarg#*;} - multiarg=${multiarg//@/ -} - - local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory) - local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory) - local TODIR="${D}${LIBPATH}"/${MULTIDIR} - local FROMDIR= - - [[ -d ${TODIR} ]] || mkdir -p ${TODIR} - - for FROMDIR in \ - "${LIBPATH}"/${OS_MULTIDIR} \ - "${LIBPATH}"/../${MULTIDIR} \ - "${PREFIX}"/lib/${OS_MULTIDIR} \ - "${PREFIX}"/${CTARGET}/lib/${OS_MULTIDIR} - do - removedirs="${removedirs} ${FROMDIR}" - FROMDIR=${D}${FROMDIR} - if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then - local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null) - if [[ -n ${files} ]] ; then - mv ${files} "${TODIR}" - fi - fi - done - fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}" - - # SLOT up libgcj.pc if it's available (and let gcc-config worry about links) - FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}" - for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do - [[ -f ${x} ]] || continue - sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}" || die - mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die - done - done - - # We remove directories separately to avoid this case: - # mv SRC/lib/../lib/*.o DEST - # rmdir SRC/lib/../lib/ - # mv SRC/lib/../lib32/*.o DEST # Bork - for FROMDIR in ${removedirs} ; do - rmdir "${D}"${FROMDIR} >& /dev/null - done - find -depth "${D}" -type d -exec rmdir {} + >& /dev/null -} - -# make sure the libtool archives have libdir set to where they actually -# -are-, and not where they -used- to be. also, any dependencies we have -# on our own .la files need to be updated. -fix_libtool_libdir_paths() { - local libpath="$1" - - pushd "${D}" >/dev/null - - pushd "./${libpath}" >/dev/null - local dir="${PWD#${D%/}}" - local allarchives=$(echo *.la) - allarchives="\(${allarchives// /\\|}\)" - popd >/dev/null - - # The libdir might not have any .la files. #548782 - find "./${dir}" -maxdepth 1 -name '*.la' \ - -exec sed -i -e "/^libdir=/s:=.*:='${dir}':" {} + || die - # Would be nice to combine these, but -maxdepth can not be specified - # on sub-expressions. - find "./${PREFIX}"/lib* -maxdepth 3 -name '*.la' \ - -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die - find "./${dir}/" -maxdepth 1 -name '*.la' \ - -exec sed -i -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${libpath}/\1:g" {} + || die - - popd >/dev/null -} - -create_gcc_env_entry() { - dodir /etc/env.d/gcc - local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}" - - local gcc_specs_file - local gcc_envd_file="${ED}${gcc_envd_base}" - if [[ -z $1 ]] ; then - # I'm leaving the following commented out to remind me that it - # was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset - # on chroot or in non-toolchain.eclass gcc ebuilds! - #gcc_specs_file="${LIBPATH}/specs" - gcc_specs_file="" - else - gcc_envd_file+="-$1" - gcc_specs_file="${LIBPATH}/$1.specs" - fi - - # We want to list the default ABI's LIBPATH first so libtool - # searches that directory first. This is a temporary - # workaround for libtool being stupid and using .la's from - # conflicting ABIs by using the first one in the search path - local ldpaths mosdirs - if tc_version_is_at_least 3.2 ; then - local mdir mosdir abi ldpath - for abi in $(get_all_abis TARGET) ; do - mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory) - ldpath="${LIBPATH}" - [[ ${mdir} != "." ]] && ldpath+="/${mdir}" - ldpaths="${ldpath}${ldpaths:+:${ldpaths}}" - - mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory) - mosdirs="${mosdir}${mosdirs:+:${mosdirs}}" - done - else - # Older gcc's didn't do multilib, so logic is simple. - ldpaths="${LIBPATH}" - fi - - cat <<-EOF > ${gcc_envd_file} - PATH="${BINPATH}" - ROOTPATH="${BINPATH}" - GCC_PATH="${BINPATH}" - LDPATH="${ldpaths}" - MANPATH="${DATAPATH}/man" - INFOPATH="${DATAPATH}/info" - STDCXX_INCDIR="${STDCXX_INCDIR##*/}" - CTARGET="${CTARGET}" - GCC_SPECS="${gcc_specs_file}" - MULTIOSDIRS="${mosdirs}" - EOF -} - -copy_minispecs_gcc_specs() { - # setup the hardenedno* specs files and the vanilla specs file. - if hardened_gcc_works ; then - create_gcc_env_entry hardenednopiessp - fi - if hardened_gcc_works pie ; then - create_gcc_env_entry hardenednopie - fi - if hardened_gcc_works ssp ; then - create_gcc_env_entry hardenednossp - fi - create_gcc_env_entry vanilla - insinto ${LIBPATH#${EPREFIX}} - doins "${WORKDIR}"/specs/*.specs || die "failed to install specs" - # Build system specs file which, if it exists, must be a complete set of - # specs as it completely and unconditionally overrides the builtin specs. - if ! tc_version_is_at_least 4.4 ; then - $(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs - cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs - doins "${WORKDIR}"/specs/specs || die "failed to install the specs file" - fi -} - -gcc_slot_java() { - local x - - # Move Java headers to compiler-specific dir - for x in "${D}${PREFIX}"/include/gc*.h "${D}${PREFIX}"/include/j*.h ; do - [[ -f ${x} ]] && mv -f "${x}" "${D}${LIBPATH}"/include/ - done - for x in gcj gnu java javax org ; do - if [[ -d ${D}${PREFIX}/include/${x} ]] ; then - dodir /${LIBPATH#${EPREFIX}}/include/${x} - mv -f "${D}${PREFIX}"/include/${x}/* "${D}${LIBPATH}"/include/${x}/ - rm -rf "${D}${PREFIX}"/include/${x} - fi - done - - if [[ -d ${D}${PREFIX}/lib/security ]] || [[ -d ${D}${PREFIX}/$(get_libdir)/security ]] ; then - dodir /${LIBPATH#${EPREFIX}}/security - mv -f "${D}${PREFIX}"/lib*/security/* "${D}${LIBPATH}"/security - rm -rf "${D}${PREFIX}"/lib*/security - fi - - # Move random gcj files to compiler-specific directories - for x in libgcj.spec logging.properties ; do - x="${D}${PREFIX}/lib/${x}" - [[ -f ${x} ]] && mv -f "${x}" "${D}${LIBPATH}"/ - done - - # Rename jar because it could clash with Kaffe's jar if this gcc is - # primary compiler (aka don't have the -<version> extension) - cd "${D}${BINPATH}" - [[ -f jar ]] && mv -f jar gcj-jar -} - -#---->> pkg_post* <<---- - -toolchain_pkg_postinst() { - do_gcc_config - - if ! is_crosscompile ; then - echo - ewarn "If you have issues with packages unable to locate libstdc++.la," - ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions." - echo - ewarn "You might want to review the GCC upgrade guide when moving between" - ewarn "major versions (like 4.2 to 4.3):" - ewarn "https://wiki.gentoo.org/wiki/Upgrading_GCC" - echo - - # Clean up old paths - rm -f "${EROOT}"*/rcscripts/awk/fixlafiles.awk "${EROOT}"sbin/fix_libtool_files.sh - rmdir "${EROOT}"*/rcscripts{/awk,} 2>/dev/null - - mkdir -p "${EROOT}"usr/{share/gcc-data,sbin,bin} - # DATAPATH has EPREFIX already, use ROOT with it - cp "${ROOT}${DATAPATH}"/fixlafiles.awk "${EROOT}"usr/share/gcc-data/ || die - cp "${ROOT}${DATAPATH}"/fix_libtool_files.sh "${EROOT}"usr/sbin/ || die - - # Since these aren't critical files and portage sucks with - # handling of binpkgs, don't require these to be found - cp "${ROOT}${DATAPATH}"/c{89,99} "${EROOT}"usr/bin/ 2>/dev/null - fi - - if use regression-test ; then - elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite" - echo - fi - - if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then - einfo "This GCC ebuild is provided for your convenience, and the use" - einfo "of this compiler is not supported by the Gentoo Developers." - einfo "Please report bugs to upstream at http://gcc.gnu.org/bugzilla/" - fi -} - -toolchain_pkg_postrm() { - # to make our lives easier (and saner), we do the fix_libtool stuff here. - # rather than checking SLOT's and trying in upgrade paths, we just see if - # the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are - # unmerging. if it does, that means this was a simple re-emerge. - - # clean up the cruft left behind by cross-compilers - if is_crosscompile ; then - if [[ -z $(ls "${EROOT}"etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then - rm -f "${EROOT}"etc/env.d/gcc/config-${CTARGET} - rm -f "${EROOT}"etc/env.d/??gcc-${CTARGET} - rm -f "${EROOT}"usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} - fi - return 0 - fi - - # ROOT isnt handled by the script - [[ ${ROOT} != "/" ]] && return 0 - - if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then - # make sure the profile is sane during same-slot upgrade #289403 - do_gcc_config - - einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'" - fix_libtool_files.sh ${GCC_RELEASE_VER} - if [[ -n ${BRANCH_UPDATE} ]] ; then - einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}'" - fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE} - fi - fi - - return 0 -} - -do_gcc_config() { - if ! should_we_gcc_config ; then - env -i PATH="${PATH}" ROOT="${ROOT}" gcc-config --use-old --force - return 0 - fi - - local current_gcc_config target - - current_gcc_config=$(env -i PATH="${PATH}" ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>/dev/null) - if [[ -n ${current_gcc_config} ]] ; then - local current_specs use_specs - # figure out which specs-specific config is active - current_specs=$(gcc-config -S ${current_gcc_config} | awk '{print $3}') - [[ -n ${current_specs} ]] && use_specs=-${current_specs} - - if [[ -n ${use_specs} ]] && \ - [[ ! -e ${ROOT}/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}${use_specs} ]] - then - ewarn "The currently selected specs-specific gcc config," - ewarn "${current_specs}, doesn't exist anymore. This is usually" - ewarn "due to enabling/disabling hardened or switching to a version" - ewarn "of gcc that doesnt create multiple specs files. The default" - ewarn "config will be used, and the previous preference forgotten." - use_specs="" - fi - - target="${CTARGET}-${GCC_CONFIG_VER}${use_specs}" - else - # The curent target is invalid. Attempt to switch to a valid one. - # Blindly pick the latest version. #529608 - # TODO: Should update gcc-config to accept `-l ${CTARGET}` rather than - # doing a partial grep like this. - target=$(gcc-config -l 2>/dev/null | grep " ${CTARGET}-[0-9]" | tail -1 | awk '{print $2}') - fi - - gcc-config "${target}" -} - -should_we_gcc_config() { - # if the current config is invalid, we definitely want a new one - # Note: due to bash quirkiness, the following must not be 1 line - local curr_config - curr_config=$(env -i PATH="${PATH}" ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>&1) || return 0 - - # if the previously selected config has the same major.minor (branch) as - # the version we are installing, then it will probably be uninstalled - # for being in the same SLOT, make sure we run gcc-config. - local curr_config_ver=$(env -i PATH="${PATH}" ROOT="${ROOT}" gcc-config -S ${curr_config} | awk '{print $2}') - - local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver}) - - # If we're using multislot, just run gcc-config if we're installing - # to the same profile as the current one. - use multislot && return $([[ ${curr_config_ver} == ${GCC_CONFIG_VER} ]]) - - if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then - return 0 - else - # if we're installing a genuinely different compiler version, - # we should probably tell the user -how- to switch to the new - # gcc version, since we're not going to do it for him/her. - # We don't want to switch from say gcc-3.3 to gcc-3.4 right in - # the middle of an emerge operation (like an 'emerge -e world' - # which could install multiple gcc versions). - # Only warn if we're installing a pkg as we might be called from - # the pkg_{pre,post}rm steps. #446830 - if [[ ${EBUILD_PHASE} == *"inst" ]] ; then - einfo "The current gcc config appears valid, so it will not be" - einfo "automatically switched for you. If you would like to" - einfo "switch to the newly installed gcc version, do the" - einfo "following:" - echo - einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}" - einfo "source /etc/profile" - echo - fi - return 1 - fi -} - -#---->> support and misc functions <<---- - -# This is to make sure we don't accidentally try to enable support for a -# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc. -# -# Also add a hook so special ebuilds (kgcc64) can control which languages -# exactly get enabled -gcc-lang-supported() { - grep ^language=\"${1}\" "${S}"/gcc/*/config-lang.in > /dev/null || return 1 - [[ -z ${TOOLCHAIN_ALLOWED_LANGS} ]] && return 0 - has $1 ${TOOLCHAIN_ALLOWED_LANGS} -} - -is_ada() { - gcc-lang-supported ada || return 1 - use ada -} - -is_cxx() { - gcc-lang-supported 'c++' || return 1 - ! is_crosscompile && tc_version_is_at_least 4.8 && return 0 - use cxx -} - -is_d() { - gcc-lang-supported d || return 1 - use_if_iuse d -} - -is_f77() { - gcc-lang-supported f77 || return 1 - use fortran -} - -is_f95() { - gcc-lang-supported f95 || return 1 - use fortran -} - -is_fortran() { - gcc-lang-supported fortran || return 1 - use fortran -} - -is_gcj() { - gcc-lang-supported java || return 1 - use cxx && use_if_iuse gcj -} - -is_go() { - gcc-lang-supported go || return 1 - use cxx && use_if_iuse go -} - -is_jit() { - gcc-lang-supported jit || return 1 - use_if_iuse jit -} - -is_multilib() { - tc_version_is_at_least 3 || return 1 - use multilib -} - -is_objc() { - gcc-lang-supported objc || return 1 - use_if_iuse objc -} - -is_objcxx() { - gcc-lang-supported 'obj-c++' || return 1 - use cxx && use_if_iuse objc++ -} - -# Grab a variable from the build system (taken from linux-info.eclass) -get_make_var() { - local var=$1 makefile=${2:-${WORKDIR}/build/Makefile} - echo -e "e:\\n\\t@echo \$(${var})\\ninclude ${makefile}" | \ - r=${makefile%/*} emake --no-print-directory -s -f - 2>/dev/null -} - -XGCC() { get_make_var GCC_FOR_TARGET ; } - -# The gentoo piessp patches allow for 3 configurations: -# 1) PIE+SSP by default -# 2) PIE by default -# 3) SSP by default -hardened_gcc_works() { - if [[ $1 == "pie" ]] ; then - # $gcc_cv_ld_pie is unreliable as it simply take the output of - # `ld --help | grep -- -pie`, that reports the option in all cases, also if - # the loader doesn't actually load the resulting executables. - # To avoid breakage, blacklist FreeBSD here at least - [[ ${CTARGET} == *-freebsd* ]] && return 1 - - want_pie || return 1 - use_if_iuse nopie && return 1 - hardened_gcc_is_stable pie - return $? - elif [[ $1 == "ssp" ]] ; then - [[ -n ${SPECS_VER} ]] || return 1 - use_if_iuse nossp && return 1 - hardened_gcc_is_stable ssp - return $? - else - # laziness ;) - hardened_gcc_works pie || return 1 - hardened_gcc_works ssp || return 1 - return 0 - fi -} - -hardened_gcc_is_stable() { - local tocheck - if [[ $1 == "pie" ]] ; then - if [[ ${CTARGET} == *-uclibc* ]] ; then - tocheck=${PIE_UCLIBC_STABLE} - else - tocheck=${PIE_GLIBC_STABLE} - fi - elif [[ $1 == "ssp" ]] ; then - if [[ ${CTARGET} == *-uclibc* ]] ; then - tocheck=${SSP_UCLIBC_STABLE} - elif [[ ${CTARGET} == *-gnu* ]] ; then - tocheck=${SSP_STABLE} - fi - else - die "hardened_gcc_stable needs to be called with pie or ssp" - fi - - has $(tc-arch) ${tocheck} && return 0 - return 1 -} - -want_minispecs() { - if tc_version_is_at_least 4.3.2 && use hardened ; then - if ! want_pie ; then - ewarn "PIE_VER or SPECS_VER is not defined in the GCC ebuild." - elif use vanilla ; then - ewarn "You will not get hardened features if you have the vanilla USE-flag." - elif use nopie && use nossp ; then - ewarn "You will not get hardened features if you have the nopie and nossp USE-flag." - elif ! hardened_gcc_works ; then - ewarn "Your $(tc-arch) arch is not supported." - else - return 0 - fi - ewarn "Hope you know what you are doing. Hardened will not work." - return 0 - fi - return 1 -} - -want_pie() { - ! use hardened && [[ -n ${PIE_VER} ]] && use nopie && return 1 - [[ -n ${PIE_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0 - tc_version_is_at_least 4.3.2 && return 1 - [[ -z ${PIE_VER} ]] && return 1 - use !nopie && return 0 - return 1 -} - -has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice" -toolchain_death_notice() { - if [[ -e "${WORKDIR}"/build ]] ; then - pushd "${WORKDIR}"/build >/dev/null - (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log - [[ -e "${T}"/build.log ]] && cp "${T}"/build.log . - tar jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \ - gccinfo.log build.log $(find -name config.log) - rm gccinfo.log build.log - eerror - eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report." - eerror - popd >/dev/null - fi -} diff --git a/eclass/user.eclass b/eclass/user.eclass deleted file mode 100644 index 9fddbbb..0000000 --- a/eclass/user.eclass +++ /dev/null @@ -1,474 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# @ECLASS: user.eclass -# @MAINTAINER: -# base-system@gentoo.org (Linux) -# Joe Jezak <josejx@gmail.com> (OS X) -# usata@gentoo.org (OS X) -# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD) -# @BLURB: user management in ebuilds -# @DESCRIPTION: -# The user eclass contains a suite of functions that allow ebuilds -# to quickly make sure users in the installed system are sane. - -if [[ -z ${_USER_ECLASS} ]]; then -_USER_ECLASS=1 - -# @FUNCTION: _assert_pkg_ebuild_phase -# @INTERNAL -# @USAGE: <calling func name> -_assert_pkg_ebuild_phase() { - case ${EBUILD_PHASE} in - setup|preinst|postinst) ;; - *) - eerror "'$1()' called from '${EBUILD_PHASE}' phase which is not OK:" - eerror "You may only call from pkg_{setup,preinst,postinst} functions." - eerror "Package fails at QA and at life. Please file a bug." - die "Bad package! $1 is only for use in some pkg_* functions!" - esac -} - -# @FUNCTION: egetent -# @USAGE: <database> <key> -# @DESCRIPTION: -# Small wrapper for getent (Linux), nidump (< Mac OS X 10.5), -# dscl (Mac OS X 10.5), and pw (FreeBSD) used in enewuser()/enewgroup(). -# -# Supported databases: group passwd -egetent() { - local db=$1 key=$2 - - [[ $# -ge 3 ]] && die "usage: egetent <database> <key>" - - case ${db} in - passwd|group) ;; - *) die "sorry, database '${db}' not yet supported; file a bug" ;; - esac - - case ${CHOST} in - *-darwin[678]) - case ${key} in - *[!0-9]*) # Non numeric - nidump ${db} . | awk -F: "(\$1 ~ /^${key}\$/) {print;exit;}" - ;; - *) # Numeric - nidump ${db} . | awk -F: "(\$3 == ${key}) {print;exit;}" - ;; - esac - ;; - *-darwin*) - local mykey - case ${db} in - passwd) db="Users" mykey="UniqueID" ;; - group) db="Groups" mykey="PrimaryGroupID" ;; - esac - - case ${key} in - *[!0-9]*) # Non numeric - dscl . -read /${db}/${key} 2>/dev/null |grep RecordName - ;; - *) # Numeric - dscl . -search /${db} ${mykey} ${key} 2>/dev/null - ;; - esac - ;; - *-freebsd*|*-dragonfly*) - case ${db} in - passwd) db="user" ;; - *) ;; - esac - - # lookup by uid/gid - local opts - if [[ ${key} == [[:digit:]]* ]] ; then - [[ ${db} == "user" ]] && opts="-u" || opts="-g" - fi - - pw show ${db} ${opts} "${key}" -q - ;; - *-netbsd*|*-openbsd*) - grep "${key}:\*:" /etc/${db} - ;; - *) - # ignore output if nscd doesn't exist, or we're not running as root - nscd -i "${db}" 2>/dev/null - getent "${db}" "${key}" - ;; - esac -} - -# @FUNCTION: enewuser -# @USAGE: <user> [uid] [shell] [homedir] [groups] -# @DESCRIPTION: -# Same as enewgroup, you are not required to understand how to properly add -# a user to the system. The only required parameter is the username. -# Default uid is (pass -1 for this) next available, default shell is -# /bin/false, default homedir is /dev/null, and there are no default groups. -enewuser() { - if [[ ${EUID} != 0 ]] ; then - einfo "Donot have enough privilege to execute ${FUNCNAME[0]}" - return 0 - fi - _assert_pkg_ebuild_phase ${FUNCNAME} - - # get the username - local euser=$1; shift - if [[ -z ${euser} ]] ; then - eerror "No username specified !" - die "Cannot call enewuser without a username" - fi - - # lets see if the username already exists - if [[ -n $(egetent passwd "${euser}") ]] ; then - return 0 - fi - einfo "Adding user '${euser}' to your system ..." - - # options to pass to useradd - local opts=() - - # handle uid - local euid=$1; shift - if [[ -n ${euid} && ${euid} != -1 ]] ; then - if [[ ${euid} -gt 0 ]] ; then - if [[ -n $(egetent passwd ${euid}) ]] ; then - euid="next" - fi - else - eerror "Userid given but is not greater than 0 !" - die "${euid} is not a valid UID" - fi - else - euid="next" - fi - if [[ ${euid} == "next" ]] ; then - for ((euid = 101; euid <= 999; euid++)); do - [[ -z $(egetent passwd ${euid}) ]] && break - done - fi - opts+=( -u ${euid} ) - einfo " - Userid: ${euid}" - - # handle shell - local eshell=$1; shift - if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then - if [[ ! -e ${ROOT}${eshell} ]] ; then - eerror "A shell was specified but it does not exist !" - die "${eshell} does not exist in ${ROOT}" - fi - if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then - eerror "Do not specify ${eshell} yourself, use -1" - die "Pass '-1' as the shell parameter" - fi - else - for eshell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do - [[ -x ${ROOT}${eshell} ]] && break - done - - if [[ ${eshell} == "/dev/null" ]] ; then - eerror "Unable to identify the shell to use, proceeding with userland default." - case ${USERLAND} in - GNU) eshell="/bin/false" ;; - BSD) eshell="/sbin/nologin" ;; - Darwin) eshell="/usr/sbin/nologin" ;; - *) die "Unable to identify the default shell for userland ${USERLAND}" - esac - fi - fi - einfo " - Shell: ${eshell}" - opts+=( -s "${eshell}" ) - - # handle homedir - local ehome=$1; shift - if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then - ehome="/dev/null" - fi - einfo " - Home: ${ehome}" - opts+=( -d "${ehome}" ) - - # handle groups - local egroups=$1; shift - local g egroups_arr - IFS="," read -r -a egroups_arr <<<"${egroups}" - shift - if [[ ${#egroups_arr[@]} -gt 0 ]] ; then - local defgroup exgroups - for g in "${egroups_arr[@]}" ; do - if [[ -z $(egetent group "${g}") ]] ; then - eerror "You must add group ${g} to the system first" - die "${g} is not a valid GID" - fi - if [[ -z ${defgroup} ]] ; then - defgroup=${g} - else - exgroups+=",${g}" - fi - done - opts+=( -g "${defgroup}" ) - if [[ ! -z ${exgroups} ]] ; then - opts+=( -G "${exgroups:1}" ) - fi - fi - einfo " - Groups: ${egroups:-(none)}" - - # handle extra args - if [[ $# -gt 0 ]] ; then - die "extra arguments no longer supported; please file a bug" - else - local comment="added by portage for ${PN}" - opts+=( -c "${comment}" ) - einfo " - GECOS: ${comment}" - fi - - # add the user - case ${CHOST} in - *-darwin*) - ### Make the user - dscl . create "/users/${euser}" uid ${euid} - dscl . create "/users/${euser}" shell "${eshell}" - dscl . create "/users/${euser}" home "${ehome}" - dscl . create "/users/${euser}" realname "added by portage for ${PN}" - ### Add the user to the groups specified - for g in "${egroups_arr[@]}" ; do - dscl . merge "/groups/${g}" users "${euser}" - done - ;; - - *-freebsd*|*-dragonfly*) - pw useradd "${euser}" "${opts[@]}" || die - ;; - - *-netbsd*) - useradd "${opts[@]}" "${euser}" || die - ;; - - *-openbsd*) - # all ops the same, except the -g vs -g/-G ... - useradd -u ${euid} -s "${eshell}" \ - -d "${ehome}" -g "${egroups}" "${euser}" || die - ;; - - *) - useradd -r "${opts[@]}" "${euser}" || die - ;; - esac - - if [[ ! -e ${ROOT}/${ehome} ]] ; then - einfo " - Creating ${ehome} in ${ROOT}" - mkdir -p "${ROOT}/${ehome}" - chown "${euser}" "${ROOT}/${ehome}" - chmod 755 "${ROOT}/${ehome}" - fi -} - -# @FUNCTION: enewgroup -# @USAGE: <group> [gid] -# @DESCRIPTION: -# This function does not require you to understand how to properly add a -# group to the system. Just give it a group name to add and enewgroup will -# do the rest. You may specify the gid for the group or allow the group to -# allocate the next available one. -enewgroup() { - if [[ ${EUID} != 0 ]] ; then - einfo "Donot have enough privilege to execute ${FUNCNAME[0]}" - return 0 - fi - _assert_pkg_ebuild_phase ${FUNCNAME} - - # get the group - local egroup=$1; shift - if [[ -z ${egroup} ]] ; then - eerror "No group specified !" - die "Cannot call enewgroup without a group" - fi - - # see if group already exists - if [[ -n $(egetent group "${egroup}") ]] ; then - return 0 - fi - einfo "Adding group '${egroup}' to your system ..." - - # handle gid - local egid=$1; shift - if [[ ! -z ${egid} ]] ; then - if [[ ${egid} -gt 0 ]] ; then - if [[ -n $(egetent group ${egid}) ]] ; then - egid="next available; requested gid taken" - fi - else - eerror "Groupid given but is not greater than 0 !" - die "${egid} is not a valid GID" - fi - else - egid="next available" - fi - einfo " - Groupid: ${egid}" - - # handle extra - if [[ $# -gt 0 ]] ; then - die "extra arguments no longer supported; please file a bug" - fi - - # Some targets need to find the next available GID manually - _enewgroup_next_gid() { - if [[ ${egid} == *[!0-9]* ]] ; then - # Non numeric - for ((egid = 101; egid <= 999; egid++)) ; do - [[ -z $(egetent group ${egid}) ]] && break - done - fi - } - - # add the group - case ${CHOST} in - *-darwin*) - _enewgroup_next_gid - dscl . create "/groups/${egroup}" gid ${egid} - dscl . create "/groups/${egroup}" passwd '*' - ;; - - *-freebsd*|*-dragonfly*) - _enewgroup_next_gid - pw groupadd "${egroup}" -g ${egid} || die - ;; - - *-netbsd*) - _enewgroup_next_gid - groupadd -g ${egid} "${egroup}" || die - ;; - - *) - local opts - if [[ ${egid} == *[!0-9]* ]] ; then - # Non numeric; let groupadd figure out a GID for us - opts="" - else - opts="-g ${egid}" - fi - # We specify -r so that we get a GID in the system range from login.defs - groupadd -r ${opts} "${egroup}" || die - ;; - esac -} - -# @FUNCTION: egethome -# @USAGE: <user> -# @DESCRIPTION: -# Gets the home directory for the specified user. -egethome() { - local pos - - [[ $# -eq 1 ]] || die "usage: egethome <user>" - - case ${CHOST} in - *-darwin*|*-freebsd*|*-dragonfly*) - pos=9 - ;; - *) # Linux, NetBSD, OpenBSD, etc... - pos=6 - ;; - esac - - egetent passwd "$1" | cut -d: -f${pos} -} - -# @FUNCTION: egetshell -# @USAGE: <user> -# @DESCRIPTION: -# Gets the shell for the specified user. -egetshell() { - local pos - - [[ $# -eq 1 ]] || die "usage: egetshell <user>" - - case ${CHOST} in - *-darwin*|*-freebsd*|*-dragonfly*) - pos=10 - ;; - *) # Linux, NetBSD, OpenBSD, etc... - pos=7 - ;; - esac - - egetent passwd "$1" | cut -d: -f${pos} -} - -# @FUNCTION: esethome -# @USAGE: <user> <homedir> -# @DESCRIPTION: -# Update the home directory in a platform-agnostic way. -# Required parameters is the username and the new home directory. -# Specify -1 if you want to set home to the enewuser default -# of /dev/null. -# If the new home directory does not exist, it is created. -# Any previously existing home directory is NOT moved. -esethome() { - _assert_pkg_ebuild_phase ${FUNCNAME} - - # get the username - local euser=$1; shift - if [[ -z ${euser} ]] ; then - eerror "No username specified !" - die "Cannot call esethome without a username" - fi - - # lets see if the username already exists - if [[ -z $(egetent passwd "${euser}") ]] ; then - ewarn "User does not exist, cannot set home dir -- skipping." - return 1 - fi - - # handle homedir - local ehome=$1; shift - if [[ -z ${ehome} ]] ; then - eerror "No home directory specified !" - die "Cannot call esethome without a home directory or '-1'" - fi - - if [[ ${ehome} == "-1" ]] ; then - ehome="/dev/null" - fi - - # exit with no message if home dir is up to date - if [[ $(egethome "${euser}") == ${ehome} ]]; then - return 0 - fi - - einfo "Updating home for user '${euser}' ..." - einfo " - Home: ${ehome}" - - # ensure home directory exists, otherwise update will fail - if [[ ! -e ${ROOT}/${ehome} ]] ; then - einfo " - Creating ${ehome} in ${ROOT}" - mkdir -p "${ROOT}/${ehome}" - chown "${euser}" "${ROOT}/${ehome}" - chmod 755 "${ROOT}/${ehome}" - fi - - # update the home directory - case ${CHOST} in - *-darwin*) - dscl . change "/users/${euser}" home "${ehome}" - ;; - - *-freebsd*|*-dragonfly*) - pw usermod "${euser}" -d "${ehome}" && return 0 - [[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" - eerror "There was an error when attempting to update the home directory for ${euser}" - eerror "Please update it manually on your system:" - eerror "\t pw usermod \"${euser}\" -d \"${ehome}\"" - ;; - - *) - usermod -d "${ehome}" "${euser}" && return 0 - [[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" - eerror "There was an error when attempting to update the home directory for ${euser}" - eerror "Please update it manually on your system (as root):" - eerror "\t usermod -d \"${ehome}\" \"${euser}\"" - ;; - esac -} - -fi diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass deleted file mode 100644 index aa8f920..0000000 --- a/eclass/wxwidgets.eclass +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/wxwidgets.eclass,v 1.39 2014/04/21 21:55:31 ottxor Exp $ - -# @ECLASS: wxwidgets.eclass -# @MAINTAINER: -# wxwidgets@gentoo.org -# @BLURB: Manages build configuration for wxGTK-using packages. -# @DESCRIPTION: -# This eclass gives ebuilds the ability to build against a specific wxGTK -# SLOT and profile without interfering with the system configuration. Any -# ebuild with a x11-libs/wxGTK dependency must use this eclass. -# -# There are two ways to do it: -# -# - set WX_GTK_VER before inheriting the eclass -# - set WX_GTK_VER and call need-wxwidgets from a phase function -# -# (where WX_GTK_VER is the SLOT you want) -# -# If your package has optional support for wxGTK (ie. by a USE flag) then -# you should use need-wxwidgets. This is important because some packages -# will force-enable wxGTK if they find WX_CONFIG set in the environment. -# -# @CODE -# inherit wxwidgets -# -# IUSE="X wxwidgets" -# DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X?] )" -# -# src_configure() { -# if use wxwidgets; then -# WX_GTK_VER="2.8" -# if use X; then -# need-wxwidgets unicode -# else -# need-wxwidgets base-unicode -# fi -# fi -# econf --with-wx-config="${WX_CONFIG}" -# } -# @CODE -# -# That's about as complicated as it gets. 99% of ebuilds can get away with: -# -# @CODE -# inherit wxwidgets -# DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X] ) -# ... -# WX_GTK_VER=2.8 need-wxwidgets unicode -# @CODE -# -# Note: unless you know your package works with wxbase (which is very -# doubtful), always depend on wxGTK[X]. - -inherit eutils multilib - -# We do this in global scope so ebuilds can get sane defaults just by -# inheriting. -if [[ -z ${WX_CONFIG} ]]; then - if [[ -n ${WX_GTK_VER} ]]; then - for wxtoolkit in mac gtk2 base; do - # newer versions don't have a seperate debug profile - for wxdebug in xxx release- debug-; do - wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}" - - [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] || continue - - WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" - WX_ECLASS_CONFIG="${WX_CONFIG}" - break - done - [[ -n ${WX_CONFIG} ]] && break - done - [[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG - fi -fi - -# @FUNCTION: need-wxwidgets -# @USAGE: <profile> -# @DESCRIPTION: -# -# Available configurations are: -# -# unicode (USE="X") -# base-unicode (USE="-X") - -need-wxwidgets() { - local wxtoolkit wxdebug wxconf - - if [[ -z ${WX_GTK_VER} ]]; then - eerror "WX_GTK_VER must be set before calling $FUNCNAME." - echo - die - fi - - if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then - eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT." - echo - die - fi - - case $1 in - unicode|base-unicode) ;; - *) eerror "Invalid $FUNCNAME profile: $1" - echo - die - ;; - esac - - # wxbase is provided by both gtk2 and base installations - if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then - wxtoolkit="mac" - elif has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then - wxtoolkit="gtk2" - else - wxtoolkit="base" - fi - - # 2.8 has a separate debug element - if [[ ${WX_GTK_VER} == 2.8 ]]; then - if has_version "x11-libs/wxGTK:${WX_GTK_VER}[debug]"; then - wxdebug="debug-" - else - wxdebug="release-" - fi - fi - - wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}" - - if [[ ! -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]]; then - echo - eerror "Failed to find configuration ${wxconf}" - echo - die - fi - - export WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" - export WX_ECLASS_CONFIG="${WX_CONFIG}" - - echo - einfo "Requested wxWidgets: ${1} ${WX_GTK_VER}" - einfo "Using wxWidgets: ${wxconf}" - echo -} diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest deleted file mode 100644 index 40caba1..0000000 --- a/kde-base/kdelibs/Manifest +++ /dev/null @@ -1,21 +0,0 @@ -AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 SHA512 33a7eeb58b65ce28f0fadc1f6c7133e670391330d084df39990bb0a5b4ddd78f52375c1ebc620823adfe4eee22f10b85064d3fdcb6df0f63c5f6e757357e7ca7 WHIRLPOOL c585ed614ae27e0694156a7af68e222fe13578db95e611b592896475772572c316a05a60b39d1797d28f2c7bea52736ac41c5ee096a92e09e945c34f07ecf69c -AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be -AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb4732ee9203c9d6799a4616e53f25 SHA512 b22d2f70f17618d5f2d11e9037c4d198a1fa11252d59098f120cc77cc12bcb3d90f1a69c63f33abb01217f396f3eb51ea8285e5ff5306eb41e63cc15654ced33 WHIRLPOOL 6c6b33afdb29fda62798f9b7121711bf8f8de44bd4839523316abb9a2a05e6e9f773e700b1e43fc75564aa82d18490aeec5ca04c51418d37d2f9b3c8924daf9f -AUX kdelibs-4.14.13-FindQt4.patch 1446 SHA256 1b64f6ab5a72f9be4fdc3bf92dfe4d6292e3ad39d322ac695e8d167f8cc9664b SHA512 454dcad581e38e296e16bf3be507966f97889789492c1c8b82ebd92f68fbdf6d5015da65a70fcc25285d520748497ee7ae55fc5e422588a505dc5a0408ac0b1e WHIRLPOOL 0bf15dce7432160b2f3d2bf780e648c0cce17b31b70d80b355de5d95989faa5eb9cf613c70e37dfad42d999211215a0399e7e5c6c27afb15eb186272f7d3127e -AUX kdelibs-4.14.15-revert.patch 1641 SHA256 02d0655afdfafc19894dc208ee8bec7e50e628015b1cf0ae9a735a7d7c4963bd SHA512 92a60ca8abed64cd0af40ce886e86d9451ae269b099a5f2e6b37cdeae6e20fe301cf99d16b5d2534d9c4b3a9d4fb0884d4f30d2db8c8f5820eaf7fbbbf40f586 WHIRLPOOL 5b3b456041dd524a801d66b2ca2419338282e6120a6db38c14cfe5a64eaf770f3aa16b174052c51caf59a57fbbc206fa98640159488b71eab9231fed77b080d3 -AUX kdelibs-4.14.5-fatalwarnings.patch 1066 SHA256 480fb7374bb00e6ff3b97a4082cf5ab90fd9384c8a5b3b49f0d73ad12ae103e5 SHA512 4758f504752a3ff5e1f315626eb58a796b8320a088b4821c2111723ae8ac63eeb368f7d9307e6e88dfa88e52611e80ae068ac15302265ae44b7bb55b98530f41 WHIRLPOOL 9c487d26a6ec2f6749bcf162b311ab3c441ed062182653a4dd322e78fa3d2049bd0edee677e99687e368b57a6d821f351804747c91432cb36318bc68dc300746 -AUX kdelibs-4.14.5-mimetypes.patch 801 SHA256 4506dcac847d7fd407b249135c849dcd4992f56a06970a7c5985e9249554e69b SHA512 bd39c356fc88ad09c31c33fc91a35827846f30056a05e4ca6a5483e422709d28e887dbf1c5f9ce229331ee534553bf43ae88e9e51a6e5d759896ebe3e336c2e0 WHIRLPOOL 2c53dde672d2b417745ee63a5e2b91ebfd74dab5861e19d8236060ec0502094190af1cf3d2dc86efb7090dc637481d938b17d2254ec86ec9ff591d3b3dbdd5e0 -AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d -AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46 -AUX kdelibs-4.6.3-no_suid_kdeinit.patch 963 SHA256 2d0ab01c1e495e77f911a073310615d1f57b2d6981a23c9349d45be5e133d8bb SHA512 5e538746b94dc7006e20ce7ac5135ff19d1fefa98b1d2417ad01acd67fb930ca4fc16c4900d9405aeb5a4de2cfc3b75aeb25676b25a6f216ce8e8e06aca009e1 WHIRLPOOL 8c9817b7595f64f7484ecaa2d3f57ae434ec573378a0d857a39d4dfbfa61af74ada92bc20be7964049ccba88b9444b4176bfaceb014d8f0b1d5bffd00b08a1e7 -AUX kdelibs-4.8.1-norpath.patch 788 SHA256 813acf8e0b23eeac94d6f504ca53a3a5cc2fb8c33fa93b0398c99bb862a8cead SHA512 6c8b3bfb9e468ec05508919ef7aca04421334c99dac0b8f1550efc2fb04554b8af97b3da52050102417db3d46884f5f4e677fd42ecb3b768b3b7a77d413c3d89 WHIRLPOOL 9861fe4b4b61c6d659c31c102938f9b0377bfff90744a852f8d0251c6c66e1df29dacb4059610d9ec78e706ad36f66b3cb6179550de47270d759acb4004c46e8 -AUX kdelibs-4.9.3-werror.patch 1521 SHA256 0dbcfe622041387fddac550c37b30bfd5cf369fab24d08de566e1a64849e2e79 SHA512 79777b19e8ab56a855540c89d0f2d8a00fa40143efa5bded05be71b9ef45045f533128ccef691dd6667f3934c076968abf7fcf5aa311af56c63ba201efe4e3d5 WHIRLPOOL 428f477ccfcf0e4bec3b80d073d4f18d18e520afb24780a5682d146395bbb4067b3fbcb5aabc2f2304de435a8e316433fb32c9d1fc84380fcf17a4d428f521f7 -DIST kdelibs-4.14.14.tar.xz 11631016 SHA256 63199b12957211b5ba0250b82da1d8ebc84cd5e55df287ea588cc69745c0b614 SHA512 93e6bb918449df51bc39b7b952e9487f77759616ebdae1f6f244e3a6dd7a60ee49ca2cf21eca7bc90226b7a7b9669096717ceefbc2af43cc96291f849dfe3791 WHIRLPOOL 603652472b0e813cf101d41b55afc7ed1b373f7cb7b5757cac2713615481483c1f8618968673cad5e79d5e42af505acb5bf932f29bfd142b4d9cf2616e8655d8 -DIST kdelibs-4.14.15.tar.xz 11633836 SHA256 479ddc9cab1c6c615456bebd0f09a2710f76273157e99c11c8f3e902e3b22819 SHA512 a50dcf8bd06024efe4c4e62a7822cd4e20820452812e1a41961d32b8b8dd2ae52346220830a5ab2ebf6f7a99071852fa21f8dca6e4ba6ddb872b5023b7b2d6df WHIRLPOOL 067aac20c9cca4a3acf06daeed4c15214f8579b8475a45ec4ceeabfce5c0caa7256d847a9dd417680cca30cdd3edd49c826cb11f1c7a2bc67ab2f4d8220edcdb -DIST kdelibs-4.14.16.tar.xz 11633476 SHA256 7bf6b930c49952dceb1a090c20bf567f4385a2bbc0069a4393608b2a79e6b3aa SHA512 882df4ce0a2f77fdc2fddbeae401c961c639b12ee2f198c2afd458eb7bcb41268924033b348fc1ef187f273783b92ae05a87422def3751d4003836bda9b153bd WHIRLPOOL 96e45ac474e4c79bf031047fdb6fe74066ae95cfaf13484498632cfcfd18409ffe46e13b3e72403d2d53fc24e78008f55061c146fbdb5631a80b4ae759e6bebf -DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4 -EBUILD kdelibs-4.14.14.ebuild 8650 SHA256 5d51aab7d255cc370262ff70d89f1e11988cb1e5602e7d29d2548f5506b2bdd2 SHA512 c3b9351d26cf215dddad4240dd19e6b9902715a715304b3b7bae373277166d9c77a154a6e228ce2ea04d6c32764689227b285464f0a737cbf543e5892caf50e0 WHIRLPOOL db210cc8a7b829323a508e07f98dbb5e63968f1857f9f1fc34996f276d2a58ed7650bf99dca37bacc8f79141270f5dd556ac521f090aa0a0029f895acbdc5294 -EBUILD kdelibs-4.14.15-r1.ebuild 8694 SHA256 90e5a64b770a27206cccf3de3bdc6add9133df683c32178cc4c4637a668a60b7 SHA512 5a1da6a38359d667bb31de9dbb6c5e52976c8dc8b9deea51c5b4bb6bb6e762d5f92603ffac76c0703680c2848e464fffb013b11e8dc29c691ef19b90822a4dd8 WHIRLPOOL ba74808061e5825618273597fa707cb1d848c2534c37fe7be8c9bbd6a7fa1a44883e0ff516d4cb3603608a4c69ee87b340c563ea11a83e452d0a701016954c06 -EBUILD kdelibs-4.14.16.ebuild 8732 SHA256 6581e07d4d3d74f440d9dddda78329e7c1ec6d0c6288d6dbde1b3cbc64182012 SHA512 3dc192008de2c3ec49730b5e40116dfbb0a2781c7a8ac71b5e5f9486949ab03f23ef0f2838e3eca78948e18b5fcae236f1cd06c61f8a6b2354117ed0f83787fe WHIRLPOOL a25f26a099d92d8c13a6bf496cf550a65285f6708033519fe43c35a5b36c7d93b6be6bac661f4762553aa84d061fe1198a7f5936a8de8687cacc7df50212e25c -EBUILD kdelibs-4.14.8.ebuild 8513 SHA256 a0f89fcb157a47809f4a2e99057af8408a5eeb6e63a0f917a5947ae8901d946f SHA512 cf0de703b4d311ee41badedb73af6577b3d97ce869cda72f5ef851dfd21fa0c96fc60273e42cb25dcf17d75a701e3fe841e60d7884c86e97669aee02f440f0c5 WHIRLPOOL fc9d7c8482e1b456d70b20b9256875bf047b49414d224469dc9af4db7ab9c3edb7d32e8e682f89194c663235007de256b3d0e1d3c5b55c33482409b0c04c4c07 -MISC metadata.xml 337 SHA256 6ed84743a51fdfeaa4bb8b6822b54e7e0750e1e99ac23a8589524b48e8f5f138 SHA512 47b35bcbaea571d9b84c97ab849cd2f7a6287908e1bf71ffee62d13d3a77bf53feaa34ed21c7aaae7e342ffd2f3dccd9b2037c5343c98cb609faf216b0e225ab WHIRLPOOL 41200da9552745447bc17ed06ae263fe6c3a18844c58aa8d473d5391b37bf1296e63e0198a2fb9f2013f59de4c1dec8bdaf60b424a0caea47acb99ad81d2ad0c diff --git a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch deleted file mode 100644 index 228914f..0000000 --- a/kde-base/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch +++ /dev/null @@ -1,18 +0,0 @@ -Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running -KDE4 applications outside of KDE4 environment. - -Index: kded/vfolder_menu.cpp -=================================================================== ---- kded/vfolder_menu.cpp (revision 1014368) -+++ kded/vfolder_menu.cpp (working copy) -@@ -770,7 +770,9 @@ - QString result; - - QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX")); -- if (!xdgMenuPrefix.isEmpty()) -+ if (xdgMenuPrefix.isEmpty()) -+ xdgMenuPrefix = "kde-4-"; -+ - { - QFileInfo fileInfo(fileName); - diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch deleted file mode 100644 index 3049b0a..0000000 --- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -Set up XDG_CONFIG_DIRS lookup in order: -1. custom XDG_CONFIG_DIRS from env -2. kdeprefix xdg config dirs -3. /etc/xdg - -Index: kdecore/kernel/kstandarddirs.cpp -=================================================================== ---- kdecore/kernel/kstandarddirs.cpp (revision 1014759) -+++ kdecore/kernel/kstandarddirs.cpp (working copy) -@@ -1664,16 +1664,13 @@ - { - tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR))); - } -- else -- { -- xdgdirList.clear(); -- xdgdirList.append(QString::fromLatin1("/etc/xdg")); -+ - #ifdef Q_WS_WIN -- xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); -+ xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg")); - #else -- xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); -+ xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg")); - #endif -- } -+ xdgdirList.append(QString::fromLatin1("/etc/xdg")); - - QString localXdgDir = readEnvPath("XDG_CONFIG_HOME"); - if (!localXdgDir.isEmpty()) diff --git a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch deleted file mode 100644 index 7de5ec9..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.10.0-udisks.patch +++ /dev/null @@ -1,51 +0,0 @@ -udisks1 is deprecated and going away, so removing this clause -will permit us to build without udisks at all. - ---- solid/solid/CMakeLists.txt -+++ solid/solid/CMakeLists.txt -@@ -283,20 +283,6 @@ - backends/udisks2/udisksgenericinterface.cpp - backends/udisks2/dbus/manager.cpp - ) -- else ( WITH_SOLID_UDISKS2 ) -- message(STATUS "Building Solid UDisks backend." ) -- set(solid_LIB_SRCS ${solid_LIB_SRCS} -- backends/udisks/udisksmanager.cpp -- backends/udisks/udisksdevice.cpp -- backends/udisks/udisksblock.cpp -- backends/udisks/udisksstoragevolume.cpp -- backends/udisks/udisksdeviceinterface.cpp -- backends/udisks/udisksopticaldisc.cpp -- backends/udisks/udisksopticaldrive.cpp -- backends/udisks/udisksstoragedrive.cpp -- backends/udisks/udisksstorageaccess.cpp -- backends/udisks/udisksgenericinterface.cpp -- ) - endif ( WITH_SOLID_UDISKS2 ) - endif (CMAKE_SYSTEM_NAME MATCHES Linux) - ---- solid/solid/managerbase.cpp -+++ solid/solid/managerbase.cpp -@@ -33,8 +33,6 @@ - #include "backends/hal/halmanager.h" - #if defined (WITH_SOLID_UDISKS2) - #include "backends/udisks2/udisksmanager.h" --#else --#include "backends/udisks/udisksmanager.h" - #endif - #include "backends/upower/upowermanager.h" - -@@ -88,11 +86,9 @@ - m_backends << new Solid::Backends::UDev::UDevManager(0); - # endif - # if defined(WITH_SOLID_UDISKS2) -- m_backends << new Solid::Backends::UDisks2::Manager(0) --# else -- m_backends << new Solid::Backends::UDisks::UDisksManager(0) -+ m_backends << new Solid::Backends::UDisks2::Manager(0); - # endif -- << new Solid::Backends::UPower::UPowerManager(0) -+ m_backends << new Solid::Backends::UPower::UPowerManager(0) - << new Solid::Backends::Fstab::FstabManager(0); - } - # endif diff --git a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch b/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch deleted file mode 100644 index bd54725..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.13-FindQt4.patch +++ /dev/null @@ -1,38 +0,0 @@ -Ensure that the correct version of Qt is always used. - -With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to -/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. - -There is no guarantee to which version of Qt these symlinks might point, so it -is necessary to find the correct version explicitly. - -Once qmake is found, it is queried for the correct location of all other items. - -Gentoo-bug: 562746 - ---- cmake/modules/FindQt4.cmake -+++ cmake/modules/FindQt4.cmake -@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac -+if(CMAKE_BUILD_TYPE STREQUAL Gentoo) -+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake -+ PATHS -+ @GENTOO_PORTAGE_EPREFIX@/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin -+ @GENTOO_PORTAGE_EPREFIX@/usr/bin -+ NO_DEFAULT_PATH -+ DOC "The qmake executable for the Qt installation to use" -+ ) -+else() - FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" -@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS - $ENV{QTDIR}/bin - DOC "The qmake executable for the Qt installation to use" - ) -+endif() - - IF (QT_QMAKE_EXECUTABLE) - diff --git a/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch b/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch deleted file mode 100644 index 3840331..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.15-revert.patch +++ /dev/null @@ -1,52 +0,0 @@ -From: Alex Merry <alex.merry@kde.org> -Date: Tue, 15 Dec 2015 19:26:47 +0000 -Subject: Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4" -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a02df05e4bd083f98147c86f88da2f818fc6c9f4 ---- -Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4" - -This reverts commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb. - -This change seems to be causing more problems than it fixes - it's -probably just too big of a behaviour change for kdelibs. Which means -that akregator will probably keep randomly crashing, but the alternative -seems to be various other applications consistently crashing at exit. - -If we can fix those applications (Kopete in particular), we can consider -re-applying this afterwards. - -BUG: 355275 ---- - - ---- a/kparts/part.cpp -+++ b/kparts/part.cpp -@@ -350,7 +350,7 @@ - d->m_widget = 0; - if (d->m_autoDeletePart) { - kDebug(1000) << "deleting part" << objectName(); -- this->deleteLater(); -+ delete this; // ouch, this should probably be deleteLater() - } - } - - ---- a/kparts/tests/parttest.cpp -+++ b/kparts/tests/parttest.cpp -@@ -48,7 +48,6 @@ - KParts::Part* part = new TestPart(0, 0); - QPointer<KParts::Part> partPointer(part); - delete part->widget(); -- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QVERIFY(partPointer.isNull()); - } - -@@ -58,7 +57,6 @@ - QPointer<KParts::Part> partPointer(part); - QPointer<QWidget> widgetPointer(part->widget()); - delete part; -- QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QVERIFY(widgetPointer.isNull()); - } - - diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch deleted file mode 100644 index 78c1ac7..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid build failure due to harmless warnings on some platforms (eg. ARM) being -forced fatal. - ---- cmake/modules/FindKDE4Internal.cmake -+++ cmake/modules/FindKDE4Internal.cmake -@@ -1100,8 +1100,8 @@ - if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) - if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE) -- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") -+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") -+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") - - set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}") - set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}") diff --git a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch deleted file mode 100644 index dc8f87e..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.14.5-mimetypes.patch +++ /dev/null @@ -1,27 +0,0 @@ -Remove fake MIME types that cause warnings. - -The offending MIME types are commented out rather than -physically removed because doing so would cause the patch -to be too large. - ---- mimetypes/kde.xml -+++ mimetypes/kde.xml -@@ -1784,7 +1784,8 @@ - <glob pattern="*.abc"/> - </mime-type> - -- <!-- all/ fake mime types --> -+ <!-- -+ all/ fake mime types - <mime-type type="all/all"> - <comment>all files and folders</comment> - <comment xml:lang="ar">كل الملفات و المجلدات</comment> -@@ -1901,7 +1902,7 @@ - <comment xml:lang="zh_CN">全部文件</comment> - <comment xml:lang="zh_TW">所有檔案</comment> - </mime-type> -- -+ --> - <mime-type type="application/vnd.kde.fontspackage"> - <sub-class-of type="application/zip"/> - <comment>fonts package</comment> diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch deleted file mode 100644 index 22e6279..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp ---- kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:05:26.284881642 -0500 -+++ kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp 2009-12-14 17:11:23.393094384 -0500 -@@ -68,7 +68,7 @@ namespace KKeyServer { - #ifdef QT_MAC_USE_COCOA - static TISInputSourceRef lastLayout = 0; - #else -- static KeyboardLayoutRef lastLayout = NULL; -+ static TISInputSourceRef lastLayout = NULL; - #endif - - void updateScancodes() { -@@ -125,16 +125,27 @@ namespace KKeyServer { - #endif - lastLayout = layout; - scancodes.clear(); -- void *kchr; -- if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) { -+ UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData); -+ if (uchr == NULL) { - kWarning() << "Couldn't load active keyboard layout"; - } else { - for (int i = 0; i < 128; i++) { - UInt32 tmpState = 0; -- UInt32 chr = KeyTranslate(kchr, i, &tmpState); -- if (chr && chr != kFunctionKeyCharCode) { -- scancodes.insert(chr, i); -- } -+ UInt32 deadKeyState = 0; -+ UInt32 flags = 0; -+ UniCharCount maxStringLength = 255; -+ UniCharCount actualStringLength = 0; -+ UniChar unicodeString[maxStringLength]; -+ -+ UCKeyTranslate(uchr, i, kUCKeyActionDown, -+ flags, LMGetKbdType(), -+ 1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString); -+ fprintf(stderr, "Got key: %s\n", unicodeString); -+ fflush(stderr); -+ //UInt32 chr = KeyTranslate(kchr, i, &tmpState); -+ //if (chr && chr != kFunctionKeyCharCode) { -+ // scancodes.insert(chr, i); -+ //} - } - } - } diff --git a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch deleted file mode 100644 index 0d25ada..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.4.90-xslt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl ---- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl 2008-05-21 13:07:13.000000000 +0200 -+++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl 2010-07-08 23:32:28.184204481 +0200 -@@ -35,7 +35,7 @@ - </entry> - </xsl:template> - --<xsl:template match="sect*/title|emphasis"> -+<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis"> - <entry header="2"> - <xsl:apply-templates/> - </entry> diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch deleted file mode 100644 index 4b34f62..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt ---- kdelibs-4.6.3.old/kinit/CMakeLists.txt 2011-05-02 00:19:10.000000000 +0200 -+++ kdelibs-4.6.3/kinit/CMakeLists.txt 2011-05-02 00:20:32.000000000 +0200 -@@ -170,15 +170,6 @@ - install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR}) - endif (NOT WIN32) - --if (CMAKE_SYSTEM_NAME MATCHES Linux) -- MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer") -- set(KDEINIT_OOM_PROTECT 1) -- install(CODE " -- set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\") -- EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\") -- ") --endif (CMAKE_SYSTEM_NAME MATCHES Linux) -- - ########### install files ############### - - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch deleted file mode 100644 index 83d5576..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.8.1-norpath.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake ---- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake 2012-02-29 22:55:52.000000000 +0100 -+++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake 2012-03-24 17:18:59.452942648 +0100 -@@ -1045,7 +1045,13 @@ - - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+ -+ # the RPATH to be used when installing -+ SET(CMAKE_INSTALL_RPATH "") -+ -+ # don't add the automatically determined parts of the RPATH -+ # which point to directories outside the build tree to the install RPATH -+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) - endif (APPLE) - endif (UNIX) - diff --git a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch deleted file mode 100644 index 6ec0b7d..0000000 --- a/kde-base/kdelibs/files/kdelibs-4.9.3-werror.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/modules/FindKDE4Internal.cmake -+++ cmake/modules/FindKDE4Internal.cmake -@@ -1204,7 +1204,7 @@ - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline") - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs") - -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") - # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") - -@@ -1295,7 +1295,7 @@ - endif(NOT _compile_result) - - if (GCC_IS_NEWER_THAN_4_2) -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") - endif (GCC_IS_NEWER_THAN_4_2) - else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) - set (__KDE_HAVE_GCC_VISIBILITY 0) diff --git a/kde-base/kdelibs/kdelibs-4.14.14.ebuild b/kde-base/kdelibs/kdelibs-4.14.14.ebuild deleted file mode 100644 index ca8747b..0000000 --- a/kde-base/kdelibs/kdelibs-4.14.14.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_MIN_VERSION="3.3.1-r1" -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -OPENGL_REQUIRED="optional" -KDE_HANDBOOK="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -EGIT_BRANCH="KDE/4.14" - -DESCRIPTION="KDE libraries needed by all KDE programs" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - >=app-misc/strigi-0.7.7 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - >=x11-misc/shared-mime-info-0.60 - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - !kernel_SunOS? ( - || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) - ) - ) - bzip2? ( app-arch/bzip2 ) - crypt? ( app-crypt/qca:2[qt4(+)] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl ) - !libressl? ( dev-libs/openssl:0 ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - !<=kde-base/plasma-workspace-4.7.1:4 - !<=kde-base/kcontrol-4.4.50:4 - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - $(add_kdebase_dep kde-env '' 4.14.3) - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - >=x11-misc/xdg-utils-1.0.2-r3 - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdebase_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( - || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-plasma/khelpcenter:5[compat(+)] - ) - ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.13-FindQt4.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - if use aqua; then - sed -i -e \ - "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ - cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" - - #if [[ ${CHOST} == *-darwin8 ]]; then - sed -i -e \ - "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ - cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" - #fi - - # solid/solid/backends/iokit doesn't properly link, so disable it. - sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ - || die "disabling solid/solid/backends/iokit failed" - sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ - || die "disabling solid/solid/backends/iokit failed" - - # There's no fdatasync on OSX and the check fails to detect that. - sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ - || die "disabling fdatasync failed" - - # Fix nameser include to nameser8_compat - sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ - || die "fixing nameser include failed" - append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 - - # Try to fix kkeyserver_mac - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DWITH_DNSSD=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DBUILD_libkactivities=OFF - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW) - $(cmake-utils_use_has altivec PPC_ALTIVEC) - $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX) - $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE) - $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2) - $(cmake-utils_use_with acl) - $(cmake-utils_use_with alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with crypt QCA2) - $(cmake-utils_use_with fam) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with lzma LibLZMA) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with policykit PolkitQt-1) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - $(cmake-utils_use_with udev UDev) - $(cmake-utils_use_with udisks SOLID_UDISKS2) - $(cmake-utils_use_with zeroconf Avahi) - ) - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* - fi - - if use aqua; then - einfo "fixing ${PN} plugins" - - local _PV=${PV:0:3}.0 - local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script - - install_name_tool -id \ - "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - || die "failed fixing libkrossqtsplugin.${_PV}.dylib" - - einfo "fixing ${PN} cmake detection files" - #sed -i -e \ - # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ - echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ - "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ - || die "failed fixing FindXKB.cmake" - fi - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild deleted file mode 100644 index e09003d..0000000 --- a/kde-base/kdelibs/kdelibs-4.14.15-r1.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_MIN_VERSION="3.3.1-r1" -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -OPENGL_REQUIRED="optional" -KDE_HANDBOOK="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -EGIT_BRANCH="KDE/4.14" - -DESCRIPTION="KDE libraries needed by all KDE programs" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - >=app-misc/strigi-0.7.7 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib:= - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - >=x11-misc/shared-mime-info-0.60 - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - !kernel_SunOS? ( - || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) - ) - ) - bzip2? ( app-arch/bzip2 ) - crypt? ( app-crypt/qca:2[qt4(+)] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl ) - !libressl? ( dev-libs/openssl:0 ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - !<=kde-base/plasma-workspace-4.7.1:4 - !<=kde-base/kcontrol-4.4.50:4 - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - $(add_kdebase_dep kde-env '' 4.14.3) - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - >=x11-misc/xdg-utils-1.0.2-r3 - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdebase_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( - || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-plasma/khelpcenter:5[compat(+)] - ) - ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.13-FindQt4.patch" - "${FILESDIR}/${PN}-4.14.15-revert.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - if use aqua; then - sed -i -e \ - "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ - cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" - - #if [[ ${CHOST} == *-darwin8 ]]; then - sed -i -e \ - "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ - cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" - #fi - - # solid/solid/backends/iokit doesn't properly link, so disable it. - sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ - || die "disabling solid/solid/backends/iokit failed" - sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ - || die "disabling solid/solid/backends/iokit failed" - - # There's no fdatasync on OSX and the check fails to detect that. - sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ - || die "disabling fdatasync failed" - - # Fix nameser include to nameser8_compat - sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ - || die "fixing nameser include failed" - append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 - - # Try to fix kkeyserver_mac - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DWITH_DNSSD=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DBUILD_libkactivities=OFF - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW) - $(cmake-utils_use_has altivec PPC_ALTIVEC) - $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX) - $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE) - $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2) - $(cmake-utils_use_with acl) - $(cmake-utils_use_with alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with crypt QCA2) - $(cmake-utils_use_with fam) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with lzma LibLZMA) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with policykit PolkitQt-1) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - $(cmake-utils_use_with udev UDev) - $(cmake-utils_use_with udisks SOLID_UDISKS2) - $(cmake-utils_use_with zeroconf Avahi) - ) - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* - fi - - if use aqua; then - einfo "fixing ${PN} plugins" - - local _PV=${PV:0:3}.0 - local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script - - install_name_tool -id \ - "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - || die "failed fixing libkrossqtsplugin.${_PV}.dylib" - - einfo "fixing ${PN} cmake detection files" - #sed -i -e \ - # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ - echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ - "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ - || die "failed fixing FindXKB.cmake" - fi - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild deleted file mode 100644 index 9a30894..0000000 --- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CMAKE_MIN_VERSION="3.3.1-r1" -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -OPENGL_REQUIRED="optional" -KDE_HANDBOOK="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic prefix - -EGIT_BRANCH="KDE/4.14" - -DESCRIPTION="KDE libraries needed by all KDE programs" - -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell -cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - >=app-misc/strigi-0.7.7 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib:= - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - >=x11-misc/shared-mime-info-0.60 - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - !kernel_SunOS? ( - || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) - ) - ) - bzip2? ( app-arch/bzip2 ) - crypt? ( app-crypt/qca:2[qt4(+)] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) - spell? ( app-text/enchant ) - ssl? ( - libressl? ( dev-libs/libressl ) - !libressl? ( dev-libs/openssl:0 ) - ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - !<=kde-base/plasma-workspace-4.7.1:4 - !<=kde-base/kcontrol-4.4.50:4 - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - $(add_kdebase_dep kde-env '' 4.14.3) - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - >=x11-misc/xdg-utils-1.0.2-r3 - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdebase_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( - || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-plasma/khelpcenter:5[compat(+)] - ) - ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" - "${FILESDIR}/${PN}-4.14.13-FindQt4.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - eprefixify cmake/modules/FindQt4.cmake - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - if use aqua; then - sed -i -e \ - "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ - cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" - - #if [[ ${CHOST} == *-darwin8 ]]; then - sed -i -e \ - "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ - cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" - #fi - - # solid/solid/backends/iokit doesn't properly link, so disable it. - sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ - || die "disabling solid/solid/backends/iokit failed" - sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ - || die "disabling solid/solid/backends/iokit failed" - - # There's no fdatasync on OSX and the check fails to detect that. - sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ - || die "disabling fdatasync failed" - - # Fix nameser include to nameser8_compat - sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ - || die "fixing nameser include failed" - append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 - - # Try to fix kkeyserver_mac - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DWITH_DNSSD=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DBUILD_libkactivities=OFF - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW) - $(cmake-utils_use_has altivec PPC_ALTIVEC) - $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX) - $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE) - $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2) - $(cmake-utils_use_with acl) - $(cmake-utils_use_with alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with crypt QCA2) - $(cmake-utils_use_with fam) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with lzma LibLZMA) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with policykit PolkitQt-1) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - $(cmake-utils_use_with udev UDev) - $(cmake-utils_use_with udisks SOLID_UDISKS2) - $(cmake-utils_use_with zeroconf Avahi) - -Wno-dev - --debug-trycompile - ) - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* - fi - - if use aqua; then - einfo "fixing ${PN} plugins" - - local _PV=${PV:0:3}.0 - local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script - - install_name_tool -id \ - "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - || die "failed fixing libkrossqtsplugin.${_PV}.dylib" - - einfo "fixing ${PN} cmake detection files" - #sed -i -e \ - # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ - echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ - "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ - || die "failed fixing FindXKB.cmake" - fi - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/kdelibs-4.14.8.ebuild b/kde-base/kdelibs/kdelibs-4.14.8.ebuild deleted file mode 100644 index fa3753a..0000000 --- a/kde-base/kdelibs/kdelibs-4.14.8.ebuild +++ /dev/null @@ -1,298 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -CPPUNIT_REQUIRED="optional" -DECLARATIVE_REQUIRED="always" -OPENGL_REQUIRED="optional" -KDE_HANDBOOK="optional" -inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic - -EGIT_BRANCH="KDE/4.14" - -DESCRIPTION="KDE libraries needed by all KDE programs" - -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -LICENSE="LGPL-2.1" -IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k -kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse -cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf" - -REQUIRED_USE=" - udisks? ( udev ) - upower? ( udev ) -" - -# needs the kate regression testsuite from svn -RESTRICT="test" - -COMMONDEPEND=" - >=app-misc/strigi-0.7.7 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libattica-0.4.2 - >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] - dev-libs/libpcre[unicode] - dev-libs/libxml2 - dev-libs/libxslt - media-libs/fontconfig - media-libs/freetype:2 - media-libs/giflib - media-libs/libpng:0= - media-libs/phonon[qt4] - sys-libs/zlib - virtual/jpeg:0 - >=x11-misc/shared-mime-info-0.60 - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - !kernel_SunOS? ( - || ( - sys-libs/libutempter - >=sys-freebsd/freebsd-lib-9.0 - ) - ) - ) - bzip2? ( app-arch/bzip2 ) - crypt? ( app-crypt/qca:2[qt4(+)] ) - fam? ( virtual/fam ) - jpeg2k? ( media-libs/jasper ) - kerberos? ( virtual/krb5 ) - openexr? ( - media-libs/openexr:= - media-libs/ilmbase:= - ) - policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) - spell? ( app-text/enchant ) - ssl? ( dev-libs/openssl:0 ) - udev? ( virtual/udev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${COMMONDEPEND} - doc? ( app-doc/doxygen ) - nls? ( virtual/libintl ) -" -RDEPEND="${COMMONDEPEND} - !dev-qt/qtphonon - !<=kde-base/plasma-workspace-4.7.1:4 - !<=kde-base/kcontrol-4.4.50:4 - >=app-crypt/gnupg-2.0.11 - app-misc/ca-certificates - $(add_kdebase_dep kde-env '' 4.14.3) - sys-apps/dbus[X] - !aqua? ( - udisks? ( sys-fs/udisks:2 ) - x11-apps/iceauth - x11-apps/rgb - >=x11-misc/xdg-utils-1.0.2-r3 - upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) - ) - udev? ( app-misc/media-player-info ) -" -PDEPEND=" - $(add_kdebase_dep katepart '' 4.14.3) - || ( - $(add_kdeapps_dep kfmclient '' 4.14.3) - x11-misc/xdg-utils - ) - handbook? ( - || ( - $(add_kdebase_dep khelpcenter '' 4.14.3) - kde-plasma/khelpcenter:5[compat(+)] - ) - ) - policykit? ( || ( - >=sys-auth/polkit-kde-agent-0.99 - kde-plasma/polkit-kde-agent - ) ) -" - -PATCHES=( - "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" - "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" - "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch" - "${FILESDIR}/${PN}-4.14.5-mimetypes.patch" - "${FILESDIR}/${PN}-4.4.90-xslt.patch" - "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch" - "${FILESDIR}/${PN}-4.8.1-norpath.patch" - "${FILESDIR}/${PN}-4.9.3-werror.patch" - "${FILESDIR}/${PN}-4.10.0-udisks.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ - && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)." - fi -} - -src_prepare() { - kde4-base_src_prepare - - # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work) - sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \ - -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed." - - if use aqua; then - sed -i -e \ - "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \ - cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake" - - #if [[ ${CHOST} == *-darwin8 ]]; then - sed -i -e \ - "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \ - cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake" - #fi - - # solid/solid/backends/iokit doesn't properly link, so disable it. - sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \ - || die "disabling solid/solid/backends/iokit failed" - sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \ - || die "disabling solid/solid/backends/iokit failed" - - # There's no fdatasync on OSX and the check fails to detect that. - sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \ - || die "disabling fdatasync failed" - - # Fix nameser include to nameser8_compat - sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \ - || die "fixing nameser include failed" - append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1 - - # Try to fix kkeyserver_mac - epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_HSPELL=OFF - -DWITH_ASPELL=OFF - -DWITH_DNSSD=OFF - -DKDE_DEFAULT_HOME=.kde4 - -DKAUTH_BACKEND=POLKITQT-1 - -DBUILD_libkactivities=OFF - -DWITH_Soprano=OFF - -DWITH_SharedDesktopOntologies=OFF - $(cmake-utils_use_build handbook doc) - $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW) - $(cmake-utils_use_has altivec PPC_ALTIVEC) - $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX) - $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE) - $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2) - $(cmake-utils_use_with acl) - $(cmake-utils_use_with alsa) - $(cmake-utils_use_with bzip2 BZip2) - $(cmake-utils_use_with crypt QCA2) - $(cmake-utils_use_with fam) - $(cmake-utils_use_with jpeg2k Jasper) - $(cmake-utils_use_with kerberos GSSAPI) - $(cmake-utils_use_with lzma LibLZMA) - $(cmake-utils_use_with nls Libintl) - $(cmake-utils_use_with openexr OpenEXR) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with policykit PolkitQt-1) - $(cmake-utils_use_with spell ENCHANT) - $(cmake-utils_use_with ssl OpenSSL) - $(cmake-utils_use_with udev UDev) - $(cmake-utils_use_with udisks SOLID_UDISKS2) - $(cmake-utils_use_with zeroconf Avahi) - ) - kde4-base_src_configure -} - -src_compile() { - kde4-base_src_compile - - # The building of apidox is not managed anymore by the build system - if use doc; then - einfo "Building API documentation" - cd "${S}"/doc/api/ - ./doxygen.sh "${S}" || die "APIDOX generation failed" - fi -} - -src_install() { - kde4-base_src_install - - # use system certificates - rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die - dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt - - if use doc; then - einfo "Installing API documentation. This could take a bit of time." - cd "${S}"/doc/api/ - docinto /HTML/en/kdelibs-apidox - dohtml -r ${P}-apidocs/* - fi - - if use aqua; then - einfo "fixing ${PN} plugins" - - local _PV=${PV:0:3}.0 - local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script - - install_name_tool -id \ - "${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \ - || die "failed fixing libkrossqtsplugin.${_PV}.dylib" - - einfo "fixing ${PN} cmake detection files" - #sed -i -e \ - # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \ - echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \ - "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \ - || die "failed fixing FindXKB.cmake" - fi - - einfo Installing environment file. - # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined. - echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde" - echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde" - doenvd "${T}/77kde" -} - -pkg_postinst() { - fdo-mime_mime_database_update - - if use zeroconf; then - echo - elog "To make zeroconf support available in KDE make sure that the avahi daemon" - elog "is running." - echo - einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns" - einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf" - einfo "to include 'mdns', e.g.:" - einfo " hosts: files mdns dns" - echo - fi - - kde4-base_pkg_postinst -} - -pkg_prerm() { - # Remove ksycoca4 global database - rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4 -} - -pkg_postrm() { - fdo-mime_mime_database_update - - kde4-base_pkg_postrm -} diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml deleted file mode 100644 index 63ad9f4..0000000 --- a/kde-base/kdelibs/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>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="opengl">Enable OpenGL support for Plasma (GLApplet)</flag> - </use> -</pkgmetadata> diff --git a/media-gfx/gpicview/ChangeLog b/media-gfx/gpicview/ChangeLog deleted file mode 100644 index 53ee59b..0000000 --- a/media-gfx/gpicview/ChangeLog +++ /dev/null @@ -1,74 +0,0 @@ -# ChangeLog for media-gfx/gpicview -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpicview/ChangeLog,v 1.17 2011/07/26 08:05:52 hwoarang Exp $ - -*gpicview-0.2.2 (26 Jul 2011) - - 26 Jul 2011; Markos Chandras <hwoarang@gentoo.org> +gpicview-0.2.2.ebuild: - Version bump - - 07 Mar 2011; Tobias Klausmann <klausman@gentoo.org> gpicview-0.2.1.ebuild: - Keyworded on alpha, bug #330911 - - 08 Nov 2010; Markus Meier <maekke@gentoo.org> gpicview-0.2.1.ebuild: - change jpeg dep to virtual/jpeg - - 24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> gpicview-0.2.1.ebuild: - Missing dev-util/intltool depend wrt #306601. - - 23 Feb 2010; Raúl Porcel <armin76@gentoo.org> gpicview-0.2.1.ebuild: - arm stable wrt #306433 - - 24 Jan 2010; Raúl Porcel <armin76@gentoo.org> gpicview-0.2.1.ebuild: - Add ~arm - - 30 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> gpicview-0.2.1.ebuild: - Stable for ppc, bug 292698 - - 27 Sep 2009; Markus Meier <maekke@gentoo.org> gpicview-0.2.1.ebuild: - amd64/x86 stable, bug #286414 - -*gpicview-0.2.1 (04 Jul 2009) - - 04 Jul 2009; Markus Meier <maekke@gentoo.org> +gpicview-0.2.1.ebuild: - version bump, reported by Arseny Solokha in bug #276263; remove old - -*gpicview-0.2.0 (01 Jun 2009) - - 01 Jun 2009; Markus Meier <maekke@gentoo.org> +gpicview-0.2.0.ebuild: - version bump, reported by Arseny Solokha, bug #271978 - -*gpicview-0.1.11 (24 May 2009) - - 24 May 2009; Markus Meier <maekke@gentoo.org> -gpicview-0.1.10.ebuild, - +gpicview-0.1.11.ebuild: - version bump, reported by Arseny Solokha, bug #270135 - -*gpicview-0.1.10 (12 Sep 2008) - - 12 Sep 2008; Markus Meier <maekke@gentoo.org> -gpicview-0.1.8.ebuild, - -gpicview-0.1.9.ebuild, +gpicview-0.1.10.ebuild: - bump to 0.1.10, remove old ebuilds, security bug #236525 - -*gpicview-0.1.9 (17 May 2008) - - 17 May 2008; Samuli Suominen <drac@gentoo.org> +gpicview-0.1.9.ebuild: - Version bump. - - 17 May 2008; nixnut <nixnut@gentoo.org> gpicview-0.1.8.ebuild: - Added ~ppc wrt bug 212370 - -*gpicview-0.1.8 (02 Feb 2008) - - 02 Feb 2008; Samuli Suominen <drac@gentoo.org> -gpicview-0.1.7.ebuild, - +gpicview-0.1.8.ebuild: - Version bump. - - 09 Jan 2008; Markus Meier <maekke@gentoo.org> gpicview-0.1.7.ebuild: - add ~x86 - -*gpicview-0.1.7 (08 Jan 2008) - - 08 Jan 2008; Samuli Suominen <drac@gentoo.org> +gpicview-0.1.7.ebuild: - Initial commit wrt #199724. - diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest deleted file mode 100644 index 205b384..0000000 --- a/media-gfx/gpicview/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST gpicview-0.2.2.tar.gz 471953 RMD160 620e5e62907fa5ef33b586fc4bfc993df173c8c6 SHA1 bde109c23dc9497f18a06944cd38c95dc8f34821 SHA256 7c62e396804c2e97e3d6eea071dc1865eb207f2f499ca5ab35b2e768749d036c -EBUILD gpicview-0.2.2.ebuild 634 RMD160 0d3f7af75ef010cc281e72b4b5d53fa8e861caca SHA1 7d4bd8489379bd6f9a595f10a1e6893c7c734b27 SHA256 0a71e9a32df4b1ea545236d22d17e1074eab313fffa6e09275a3baf6ba7731df -MISC ChangeLog 2388 RMD160 87bbb4a7e5141e6f98165bc1ab5ca679446abd82 SHA1 f7afd1f75972a607e09d51331c1eb87de3d1d307 SHA256 3c40af450cb2075e4b7047013e3c6c92f88eb44c86c6c541fe15cddba0c2d058 -MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1 diff --git a/media-gfx/gpicview/gpicview-0.2.2.ebuild b/media-gfx/gpicview/gpicview-0.2.2.ebuild deleted file mode 100644 index 3691118..0000000 --- a/media-gfx/gpicview/gpicview-0.2.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gpicview/gpicview-0.2.2.ebuild,v 1.1 2011/07/26 08:05:52 hwoarang Exp $ - -EAPI=4 - -DESCRIPTION="A Simple and Fast Image Viewer for X" -HOMEPAGE="http://lxde.sourceforge.net/gpicview" -SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64-linux" -IUSE="" - -RDEPEND="virtual/jpeg - >=x11-libs/gtk+-2.6:2" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - dev-util/pkgconfig - sys-devel/gettext" - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS -} diff --git a/media-gfx/gpicview/metadata.xml b/media-gfx/gpicview/metadata.xml deleted file mode 100644 index e770d1b..0000000 --- a/media-gfx/gpicview/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>graphics</herd> -</pkgmetadata> diff --git a/media-gfx/pydot/ChangeLog b/media-gfx/pydot/ChangeLog deleted file mode 100644 index 3c186db..0000000 --- a/media-gfx/pydot/ChangeLog +++ /dev/null @@ -1,103 +0,0 @@ -# ChangeLog for media-gfx/pydot -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/ChangeLog,v 1.28 2011/06/23 15:37:35 hwoarang Exp $ - - 23 Jun 2011; Markos Chandras <hwoarang@gentoo.org> - -files/pydot-1.0.2-setup.patch: - remove unused file - - 23 Jun 2011; Markos Chandras <hwoarang@gentoo.org> -pydot-1.0.2-r1.ebuild: - Remove old ebuilds. Requested by Arfrever - - 22 Jun 2011; Fabian Groffen <grobian@gentoo.org> pydot-1.0.23.ebuild: - Marked ~x64-macos, bug #371861 - - 14 Jun 2011; Matt Turner <mattst88@gentoo.org> pydot-1.0.23.ebuild: - Added ~mips, bug 352300 - - 25 May 2011; Brent Baude <ranger@gentoo.org> pydot-1.0.23.ebuild: - Marking pydot-1.0.23 ppc for bug 361987 - - 06 May 2011; Thomas Kahle <tomka@gentoo.org> pydot-1.0.23.ebuild: - x86 stable per bug 361987 - - 09 Apr 2011; Christoph Mende <angelos@gentoo.org> pydot-1.0.23.ebuild: - Stable on amd64 wrt bug #361987 - - 04 Apr 2011; Brent Baude <ranger@gentoo.org> pydot-1.0.2-r1.ebuild: - Marking pydot-1.0.2-r1 ppc for bug 357457 - - 22 Mar 2011; Thomas Kahle <tomka@gentoo.org> pydot-1.0.2-r1.ebuild: - x86 stable per bug 357457 - - 06 Mar 2011; Markos Chandras <hwoarang@gentoo.org> pydot-1.0.2-r1.ebuild: - Stable on amd64 wrt bug #357457 - -*pydot-1.0.23 (04 Mar 2011) - - 04 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pydot-1.0.23.ebuild, +files/pydot-1.0.23-setup.patch: - Version bump. - - 27 Feb 2011; Raúl Porcel <armin76@gentoo.org> pydot-1.0.2-r1.ebuild: - Add ~alpha/~ia64/~s390/~sh/~sparc wrt #342513 - - 06 Feb 2011; Markus Meier <maekke@gentoo.org> pydot-1.0.2-r1.ebuild: - add ~arm, bug #352300 - - 26 Jan 2011; Fabian Groffen <grobian@gentoo.org> pydot-1.0.2-r1.ebuild: - Marked ~ppc-macos for bug #352300 - - 24 Jan 2011; Jeroen Roovers <jer@gentoo.org> pydot-1.0.2-r1.ebuild: - Marked ~hppa (bug #352300). - - 12 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - pydot-1.0.2-r1.ebuild: - Set SUPPORT_PYTHON_ABIS (bug #313511). - - 07 Feb 2010; Peter Volkov <pva@gentoo.org> pydot-0.9.10.ebuild: - Add inherit eutils: epatch is defined there. - - 14 Nov 2008; Alexis Ballier <aballier@gentoo.org> pydot-1.0.2-r1.ebuild: - keyword ~ppc64, working fine on a PowerMac 970 - - 25 Oct 2008; Cédric Krier <cedk@gentoo.org> pydot-1.0.2-r1.ebuild: - Add missing inherit eutils - -*pydot-1.0.2-r1 (25 Oct 2008) - - 25 Oct 2008; Cédric Krier <cedk@gentoo.org> - +files/pydot-1.0.2-setup.patch, -pydot-1.0.2.ebuild, - +pydot-1.0.2-r1.ebuild: - Fix setup for bug #242066 - - 10 Jun 2008; Cédric Krier <cedk@gentoo.org> pydot-1.0.2.ebuild: - Fix DEPEND - -*pydot-1.0.2 (10 Jun 2008) - - 10 Jun 2008; Cédric Krier <cedk@gentoo.org> +pydot-1.0.2.ebuild: - Version bump - - 14 Jul 2007; Cédric Krier <cedk@gentoo.org> pydot-0.9.10.ebuild: - Fix homepage - - 18 Mar 2007; Christian Faulhammer <opfer@gentoo.org> pydot-0.9.10.ebuild: - stable x86, bug 171261 - - 18 Mar 2007; Simon Stelling <blubb@gentoo.org> pydot-0.9.10.ebuild: - stable on amd64; bug 171261 - - 17 Mar 2007; nixnut <nixnut@gentoo.org> pydot-0.9.10.ebuild: - Stable on ppc wrt bug 171261 - - 03 Feb 2007; Steve Dibb <beandog@gentoo.org> pydot-0.9.10.ebuild: - add ~amd64, bug 164086 - -*pydot-0.9.10 (06 Dec 2006) - - 06 Dec 2006; Cedric Krier <cedk@gentoo.org> - +files/pydot-0.9.10-quote.patch, +metadata.xml, +pydot-0.9.10.ebuild: - New ebuild for bug #106983 thanks to Tommie, Thomas Fullhart , lzap, tim, - Raimondo Giammanco, Sam Jacobson, David Grant, Alastair Tse, Jakub Moc - diff --git a/media-gfx/pydot/Manifest b/media-gfx/pydot/Manifest deleted file mode 100644 index 7c10333..0000000 --- a/media-gfx/pydot/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX pydot-1.0.23-setup.patch 623 SHA1 7816e4cc21a197f87f916d8e52af6ff2cbc6be89 SHA256 47704452635aeae4db252ae2f71eaa386efb0a863b0ad173597d081031c7e29d -DIST pydot-1.0.23.tar.gz 19033 RMD160 ecb4da582b77383f482699e31a9a706ed11e535f SHA1 6e7c5db9e47ee1083268987a4717fbfc33a64fc3 SHA256 7366bf9f8fc8854b3a1f63ceba36b06553b9606c30eb76edb67a2ba56f85c497 -EBUILD pydot-1.0.23.ebuild 889 SHA1 8cb03bfd73509d91cb39c87a7db27ca644961cb9 SHA256 bf108b6fb2b57dcd4f52f28d9bb033cf672285d872b617050ce8448ba37043ee -MISC ChangeLog 3519 SHA1 23be76fb6f5ce804c9b37a86a7c8ff22fcdc3b80 SHA256 b72dbe244e6d6472312a4e247d49afc73c139bcbbc99e856a78990739aa51943 -MISC metadata.xml 284 SHA1 ea1f81d89301da594a253852fd0766e05b8ff27b SHA256 b9f64d9c88beea0454379fce5b08665aaaf5fc19c1fbbc95c67361af4b8f9705 diff --git a/media-gfx/pydot/files/pydot-1.0.23-setup.patch b/media-gfx/pydot/files/pydot-1.0.23-setup.patch deleted file mode 100644 index c87cc32..0000000 --- a/media-gfx/pydot/files/pydot-1.0.23-setup.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- setup.py -+++ setup.py -@@ -1,9 +1,9 @@ - #!/usr/bin/env python - - try: -- from distutils.core import setup --except ImportError, excp: - from setuptools import setup -+except ImportError, excp: -+ from distutils.core import setup - - import pydot - import os -@@ -31,5 +31,4 @@ - 'Topic :: Software Development :: Libraries :: Python Modules'], - long_description = "\n".join(pydot.__doc__.split('\n')), - py_modules = ['pydot', 'dot_parser'], -- install_requires = ['pyparsing', 'setuptools'], -- data_files = [('.', ['LICENSE', 'README'])] ) -+ install_requires = ['pyparsing', 'setuptools'] ) diff --git a/media-gfx/pydot/metadata.xml b/media-gfx/pydot/metadata.xml deleted file mode 100644 index 4ca1281..0000000 --- a/media-gfx/pydot/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>cedk@gentoo.org</email> -</maintainer> -<longdescription>Python bindings for Graphviz</longdescription> -</pkgmetadata> diff --git a/media-gfx/pydot/pydot-1.0.23.ebuild b/media-gfx/pydot/pydot-1.0.23.ebuild deleted file mode 100644 index 918bb46..0000000 --- a/media-gfx/pydot/pydot-1.0.23.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.23.ebuild,v 1.6 2011/06/22 19:13:14 grobian Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils eutils - -DESCRIPTION="Python interface to Graphviz's Dot language" -HOMEPAGE="http://code.google.com/p/pydot/ http://pypi.python.org/pypi/pydot" -SRC_URI="http://pydot.googlecode.com/files/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="" - -RDEPEND="dev-python/pyparsing - media-gfx/graphviz" -DEPEND="${RDEPEND} - dev-python/setuptools" - -PYTHON_MODNAME="dot_parser.py pydot.py" - -src_prepare() { - distutils_src_prepare - epatch "${FILESDIR}/${P}-setup.patch" -} diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest deleted file mode 100644 index f7d68bc..0000000 --- a/media-libs/libjpeg-turbo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libjpeg-turbo-1.0.90.tar.gz 1423804 SHA1 6bf1e2961b13ec62dcc033280a0be9f37d6a252b SHA256 6d62e4200829fa08c826417afef2c0bc40f690a86621c8d051b424e9982cc26c -EBUILD libjpeg-turbo-1.0.90-r1.ebuild 1958 RMD160 71033ff57ba2533528a89996dc27e2971eb150d2 SHA1 37bdebd1ac0932476d74286ab42887820845a4fd SHA256 2d11ba6521ce83ad972df33bc08d4674fa848baed4779b13511c0b5005c911b4 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90-r1.ebuild deleted file mode 100644 index 0fbb424..0000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.0.90-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# media-libs/libjpeg-turbo - -EAPI="2" - -DESCRIPTION="A high-performance, drop-in libjpeg replacement which uses SIMD instructions (MMX, SSE2, etc.) for x86 and x86-64 processors" -HOMEPAGE="http://libjpeg-turbo.virtualgl.org/" -# http://sourceforge.net/projects/libjpeg-turbo/files/1.0.90%20(1.1beta1)/libjpeg-turbo-1.0.90.tar.gz/download -SRC_URI="mirror://sourceforge/${PN}/${PV}%20%281.1beta1%29/${P}.tar.gz" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="as-is LGPL-2.1 wxWinLL-3.1" -RESTRICT="mirror" - -# Shouldn't this have a PROVIDE="virtual/jpeg"? - -IUSE="static-libs" -RDEPEND="!media-libs/jpeg:0" -DEPEND="${RDEPEND} - dev-lang/nasm" - - -MY_S="${S}/build" -MY_S32="${S}/build32" -ECONF_SOURCE="${S}" - -src_prepare() { - mkdir "${MY_S}" "${MY_S32}" || die "Failed to create build dirs" -} - -configure32() { - local CHOST=i686-pc-linux-gnu - local CBUILD= - local CFLAGS="${CFLAGS} -m32" - local CXXFLAGS="${CXXFLAGS} -m32" - local LDFLAGS="${LDFLAGS} -m32" - - cd "${MY_S32}" - einfo "Configuring 32-bit sources" - ABI=x86 econf \ - --with-pic \ - --with-jpeg8 \ - --disable-dependency-tracking \ - $(use_enable static-libs static) - einfo "Configuring 64-bit sources" -} -src_configure() { - use amd64 && configure32 - - cd "${MY_S}" - econf \ - --with-pic \ - --with-jpeg8 \ - --disable-dependency-tracking \ - $(use_enable static-libs static) -} - -src_compile() { - if use amd64; then - cd "${MY_S32}" - einfo "Building 32-bit sources" - emake - einfo "Building 64-bit sources" - fi - - cd "${MY_S}" - emake -} - -src_install() { - if use amd64; then - cd "${MY_S32}" && \ - emake install-libLTLIBRARIES DESTDIR="${D}" libdir=usr/lib32 \ - || die "32-bit install failed" - fi - - cd "${MY_S}" - emake install DESTDIR="${D}" || die "install failed" - cd "${S}" - dodoc BUILDING.txt ChangeLog.txt example.c README-turbo.txt - find "${D}" -name '*.la' -delete -} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest deleted file mode 100644 index 0b1a7fd..0000000 --- a/media-libs/mesa/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX eselect-mesa.conf.7.11 1670 RMD160 74d85b0481f36a8e2b2e09245d49d09671500946 SHA1 5c5f468feaae946e5901698d1c0ffe8fc480b783 SHA256 448d08e97e931563aa2e33f22feeaf911caf9a2eb9fd7b446485311d1dcc1225 -AUX glx_ro_text_segm.patch 731 RMD160 6d2bd85591d6349fa45a5ee16c724859c640e902 SHA1 3015aa2bd139bcdf2c3fae61f460f0c5aaeb1df7 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c -AUX mesa-glibc-2.3.5-initstate_r.patch 851 RMD160 7719973b9e528aad9be5db555d083a5c50af58dc SHA1 6df8b389f1a70b14f4a4582be6582e07d2799c25 SHA256 b5598436ea525e339d837f740300c35f232967384cad8bb81e7a2ec4990ee734 -DIST MesaLib-7.11.1.tar.bz2 6255382 RMD160 4d63a0485eaa26d61f08249b209245eed16b11bb SHA1 226ce14d3adf8fe5a6d98f785bb5f63d2a8656da SHA256 229a8b38502147fbbb99665ed9b892d194ebcb5f5875a1701a54acea94a9c8c9 -EBUILD mesa-7.11.1.ebuild 10057 RMD160 28bdb30ef5d7468a08af1e5edb9e86f61400972d SHA1 c61fed5bf32845a690f22a5599f22dc266ddeba6 SHA256 8591c63ed4ed9b43c459b73b88a21d7a8ac42f8bc1c93067d38cc88f39d1456d diff --git a/media-libs/mesa/files/eselect-mesa.conf.7.11 b/media-libs/mesa/files/eselect-mesa.conf.7.11 deleted file mode 100644 index 3a1b196..0000000 --- a/media-libs/mesa/files/eselect-mesa.conf.7.11 +++ /dev/null @@ -1,39 +0,0 @@ -# mesa classic/gallium implementations in this release - -# Syntax description: -# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable -# classic/gallium implementations. -# * MESA_DRIVERS is an associative array, for each member "foo" of -# MESA_IMPLEMENTATIONS it contains the following elements: -# foo,description - Human-readable description of the driver -# foo,classicdriver - Filename of the classic driver -# foo,galliumdriver - Filename of the gallium driver -# foo,default - which of classic or gallium is chosen by default - -MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw" -declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative." - -MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)" -MESA_DRIVERS[i915,classicdriver]="i915_dri.so" -MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so" -MESA_DRIVERS[i915,default]="classic" - -MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)" -MESA_DRIVERS[i965,classicdriver]="i965_dri.so" -MESA_DRIVERS[i965,galliumdriver]="i965g_dri.so" -MESA_DRIVERS[i965,default]="classic" - -MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)" -MESA_DRIVERS[r300,classicdriver]="r300_dri.so" -MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so" -MESA_DRIVERS[r300,default]="gallium" - -MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)" -MESA_DRIVERS[r600,classicdriver]="r600_dri.so" -MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so" -MESA_DRIVERS[r600,default]="gallium" - -MESA_DRIVERS[sw,description]="sw (Software renderer)" -MESA_DRIVERS[sw,classicdriver]="swrast_dri.so" -MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so" -MESA_DRIVERS[sw,default]="gallium" diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch deleted file mode 100644 index 495b7dc..0000000 --- a/media-libs/mesa/files/glx_ro_text_segm.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org - - #240956 - * configure.ac add support to enable readonly test segment on x86 - ---- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 -+++ configure.ac 2008-11-17 23:20:17.000000000 +0100 -@@ -499,6 +499,20 @@ - enable_xcb=no - fi - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl libGL configuration per driver - dnl diff --git a/media-libs/mesa/files/mesa-glibc-2.3.5-initstate_r.patch b/media-libs/mesa/files/mesa-glibc-2.3.5-initstate_r.patch deleted file mode 100644 index 1252965..0000000 --- a/media-libs/mesa/files/mesa-glibc-2.3.5-initstate_r.patch +++ /dev/null @@ -1,25 +0,0 @@ -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=323811 ---- src/glx/glxhash.c.old 2011-11-29 23:51:43.000000000 +0900 -+++ src/glx/glxhash.c 2011-11-29 23:52:23.000000000 +0900 -@@ -88,21 +88,10 @@ - - #define HASH_ALLOC malloc - #define HASH_FREE free --#ifndef __GLIBC__ - #define HASH_RANDOM_DECL char *ps, rs[256] - #define HASH_RANDOM_INIT(seed) ps = initstate(seed, rs, sizeof(rs)) - #define HASH_RANDOM random() - #define HASH_RANDOM_DESTROY setstate(ps) --#else --#define HASH_RANDOM_DECL struct random_data rd; int32_t rv; char rs[256] --#define HASH_RANDOM_INIT(seed) \ -- do { \ -- (void) memset(&rd, 0, sizeof(rd)); \ -- (void) initstate_r(seed, rs, sizeof(rs), &rd); \ -- } while(0) --#define HASH_RANDOM ((void) random_r(&rd, &rv), rv) --#define HASH_RANDOM_DESTROY --#endif - - typedef struct __glxHashBucket - { diff --git a/media-libs/mesa/mesa-7.11.1.ebuild b/media-libs/mesa/mesa-7.11.1.ebuild deleted file mode 100644 index 7446587..0000000 --- a/media-libs/mesa/mesa-7.11.1.ebuild +++ /dev/null @@ -1,370 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.1.ebuild,v 1.1 2011/11/18 16:16:49 chithanh Exp $ - -EAPI=3 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-2" - EXPERIMENTAL="true" -fi - -inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS} - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV/_/-}" -MY_SRC_P="${MY_PN}Lib-${PV/_/-}" - -FOLDER="${PV/_rc*/}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" - -#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 - ${SRC_PATCHES}" -fi - -LICENSE="MIT LGPL-3 SGI-B-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" - -INTEL_CARDS="intel" -RADEON_CARDS="radeon" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic debug +egl +gallium gbm gles +llvm motif +nptl openvg osmesa pic pax_kernel selinux shared-dricore +shared-glapi kernel_FreeBSD" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24" -# not a runtime dependency of this package, but dependency of packages which -# depend on this package, bug #342393 -EXTERNAL_DEPEND=" - >=x11-proto/dri2proto-2.2 - >=x11-proto/glproto-1.4.11 -" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND="${EXTERNAL_DEPEND} - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - classic? ( app-admin/eselect-mesa ) - gallium? ( app-admin/eselect-mesa ) - app-admin/eselect-opengl - dev-libs/expat - gbm? ( sys-fs/udev ) - x11-libs/libICE - >=x11-libs/libX11-1.3.99.901 - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) - gallium? ( - llvm? ( >=sys-devel/llvm-2.8 ) - ) - ${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?] -" -for card in ${INTEL_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - " -done - -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done - -DEPEND="${RDEPEND} - =dev-lang/python-2* - dev-libs/libxml2[python] - dev-util/pkgconfig - sys-devel/bison - sys-devel/flex - x11-misc/makedepend - x11-proto/inputproto - >=x11-proto/xextproto-7.0.99.1 - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto -" - -S="${WORKDIR}/${MY_P}" - -# It is slow without texrels, if someone wants slow -# mesa without texrels +pic use is worth the shot -QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" -QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" - -# Think about: ggi, fbcon, no-X configs - -pkg_setup() { - # gcc 4.2 has buggy ivopts - if [[ $(gcc-version) = "4.2" ]]; then - append-flags -fno-ivopts - fi - - # recommended by upstream - append-flags -ffast-math - # workaround toc-issue wrt #386545 - use ppc64 && append-flags -mminimal-toc - - python_set_active_version 2 - python_pkg_setup -} - -src_unpack() { - default - [[ $PV = 9999* ]] && git-2_src_unpack -} - -src_prepare() { - # apply patches - if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/patches" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - # fix for hardened pax_kernel, bug 240956 - [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch - [[ -n ${GLIBC2dot3} ]] && epatch "${FILESDIR}"/mesa-glibc-2.3.5-initstate_r.patch - - # FreeBSD 6.* doesn't have posix_memalign(). - if [[ ${CHOST} == *-freebsd6.* ]]; then - sed -i \ - -e "s/-DHAVE_POSIX_MEMALIGN//" \ - configure.ac || die - fi - # Solaris needs some recent POSIX stuff in our case - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die - sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die - fi - - # In order for mesa to complete it's build process we need to use a tool - # that it compiles. When we cross compile this clearly does not work - # so we require mesa to be built on the host system first. -solar - if tc-is-cross-compiler; then - sed -i -e "s#^GLSL_CL = .*\$#GLSL_CL = glsl_compiler#g" \ - "${S}"/src/mesa/shader/slang/library/Makefile || die - fi - - base_src_prepare - - eautoreconf -} - -src_configure() { - local myconf - - if use classic; then - # Configurable DRI drivers - driver_enable swrast - driver_enable video_cards_intel i810 i915 i965 - driver_enable video_cards_nouveau nouveau - driver_enable video_cards_mach64 mach64 - driver_enable video_cards_mga mga - driver_enable video_cards_r128 r128 - driver_enable video_cards_radeon radeon r200 r300 r600 - driver_enable video_cards_savage savage - driver_enable video_cards_sis sis - driver_enable video_cards_tdfx tdfx - driver_enable video_cards_via unichrome - fi - - myconf+=" - $(use_enable !bindist texture-float) - $(use_enable gles gles1) - $(use_enable gles gles2) - $(use_enable egl) - " - if use egl; then - use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ." - myconf+=" - --with-egl-platforms=x11$(use gbm && echo ",drm") - $(use_enable gallium gallium-egl) - " - fi - - if use !gallium && use !classic; then - ewarn "You enabled neither classic nor gallium USE flags. No hardware" - ewarn "drivers will be built." - fi - if use gallium; then - myconf+=" - --with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega") - $(use_enable llvm gallium-llvm) - $(use_enable openvg) - " - gallium_enable swrast - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_intel i915 i965 - gallium_enable video_cards_radeon r300 r600 - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # --with-driver=dri|xlib|osmesa || do we need osmesa? - econf \ - --disable-option-checking \ - --with-driver=dri \ - --disable-glut \ - --without-demos \ - --enable-xcb \ - $(use_enable debug) \ - $(use_enable gbm) \ - $(use_enable motif glw) \ - $(use_enable motif) \ - $(use_enable nptl glx-tls) \ - $(use_enable osmesa) \ - $(use_enable !pic asm) \ - $(use_enable shared-dricore) \ - $(use_enable shared-glapi) \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - ${myconf} -} - -src_install() { - base_src_install - - # Save the glsl-compiler for later use - if ! tc-is-cross-compiler; then - dobin "${S}"/src/glsl/glsl_compiler || die - fi - # Remove redundant headers - # GLUT thing - rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed." - # Glew includes - rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \ - || die "Removing glew includes failed." - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.7.11" eselect-mesa.conf || die - - # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib - # because user can eselect desired GL provider. - ebegin "Moving libGL and friends for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x - for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ - || die "Failed to move ${x}" - fi - done - for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \ - || die "Failed to move ${x}" - fi - done - eend $? - - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - insinto "/usr/$(get_libdir)/dri/" - if [ -f "${S}/$(get_libdir)/${x}" ]; then - insopts -m0755 - doins "${S}/$(get_libdir)/${x}" || die "failed to install ${x}" - fi - fi - done - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - - # warn about patent encumbered texture-float - if use !bindist; then - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" - elog "enabled." - fi -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -# TODO: avoid code duplication for a more elegant implementation -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -gallium_enable() { - case $# in - # for enabling unconditionally - 1) - GALLIUM_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - GALLIUM_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog deleted file mode 100644 index a82b813..0000000 --- a/media-video/libav/ChangeLog +++ /dev/null @@ -1,411 +0,0 @@ -# ChangeLog for media-video/libav -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.96 2012/06/23 08:43:36 ago Exp $ - - 23 Jun 2012; Agostino Sarubbo <ago@gentoo.org> libav-0.8.3.ebuild: - amd64 really stable - - 23 Jun 2012; Jeroen Roovers <jer@gentoo.org> libav-0.8.3.ebuild: - Stable for HPPA (bug #422537). - - 20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2.ebuild: - 0.8.2 works on ppc64 stable too, so stabilise. - -*libav-0.8.3 (20 Jun 2012) - - 20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.3.ebuild: - Version bump to latest release. - - 08 Jun 2012; Brent Baude <ranger@gentoo.org> libav-0.8.2.ebuild: - Marking libav-0.8.2 ppc for bug 408555 - - 22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.8.2-r2.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - Drop PDEPEND over libpostproc, since the packages using it should depend on it - directly. - - 18 May 2012; Samuli Suominen <ssuominen@gentoo.org> libav-0.8.2-r2.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - Move libpostproc RDEPEND from virtual/ffmpeg to here as PDEPEND to resolve - circular dependencies wrt #416411 - - 17 May 2012; Samuli Suominen <ssuominen@gentoo.org> libav-0.8.2.ebuild: - Block media-libs/libpostproc wrt #416421 - - 17 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r2.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - Postproc is no longer here. - - 15 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild: - Tests needs bc. - - 15 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild: - Sort IUSE to not contain dupes. Expand tools with all the available binaries. - Restrict test on live due to fate req rather than providing ewarn. Sort deps - alphabetically. Drop dirac that is no longer in configure. Drop sse test that - is handled by configure. Quote configure params. - -*libav-0.8.2-r2 (15 May 2012) - - 15 May 2012; Luca Barbato <lu_zero@gentoo.org> -libav-0.8.2-r1.ebuild, - +libav-0.8.2-r2.ebuild, libav-0.8.9999.ebuild, libav-9999.ebuild, - metadata.xml: - Cleanup ebuilds, enable fate for 0.8 - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r1.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - Actually ffmpeg has openal, libav does not. My overlook. - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.9999.ebuild, - libav-9999.ebuild: - Drop code that is commented since ever. - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r1.ebuild, - libav-0.8.9999.ebuild: - Fix the cosmetic also on 0.8 branch as requested. - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r1.ebuild, - libav-0.8.9999.ebuild: - Unmask tests as they pass. - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild: - Fix typo. - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.2-r1.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - use the same use expand for tools like ffmpeg does so we are more inline with - each other. - -*libav-0.8.2-r1 (14 May 2012) - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.2-r1.ebuild, - libav-0.8.9999.ebuild: - Sync and update 0.8 branch with configure switches. - - 14 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild: - Remove redundant check for sse3 handled by configure. - - 13 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild, - metadata.xml: - Update live ebuild, cleanup various parts. Line up some changes from ffmpeg. - - 13 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.8.1.ebuild: - Delete security affected version. - - 12 May 2012; Raúl Porcel <armin76@gentoo.org> libav-0.8.2.ebuild: - ia64/sparc stable wrt #408555 - - 12 May 2012; Tobias Klausmann <klausman@gentoo.org> libav-0.8.2.ebuild: - Stable on alpha, bug 408555 - - 12 May 2012; Markus Meier <maekke@gentoo.org> libav-0.8.2.ebuild: - arm stable, bug #408555 - - 10 May 2012; Jeroen Roovers <jer@gentoo.org> libav-0.8.2.ebuild: - Stable for HPPA (bug #408555). - - 07 May 2012; Markos Chandras <hwoarang@gentoo.org> libav-0.8.2.ebuild: - Stable on amd64 wrt bug #408555 - - 06 May 2012; Andreas Schuerch <nativemad@gentoo.org> libav-0.8.2.ebuild: - x86 stable, see bug 408555 - -*libav-0.8.2 (05 May 2012) - - 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.2.ebuild, - -libav-0.7.5.ebuild, -libav-0.7.9999.ebuild: - Version bump to latest version. Punt older with security issues. - - 05 May 2012; Markus Meier <maekke@gentoo.org> libav-0.8.1.ebuild: - x86 stable, bug #408555 - - 05 May 2012; Jeff Horelick <jdhore@gentoo.org> libav-0.7.5.ebuild, - libav-0.7.9999.ebuild, libav-0.8.1.ebuild, libav-0.8.9999.ebuild, - libav-9999.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - -*libav-0.7.5 (16 Apr 2012) - - 16 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.7.5.ebuild, - -libav-0.6.5.ebuild, -libav-0.7.4.ebuild, -libav-0.8.ebuild: - Version bump 0.7 series to latest. Drop all security affected ebuilds, - effectively loosing stable on amd64 and hppa again. - - 22 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.6.5.ebuild, - libav-0.7.4.ebuild, libav-0.8.1.ebuild, libav-0.8.ebuild: - Rename the variable on all ebuilds, since it could never have worked before - anyway. - - 22 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.7.4.ebuild, - libav-0.7.9999.ebuild, libav-0.8.1.ebuild, libav-0.8.9999.ebuild, - libav-0.8.ebuild, libav-9999.ebuild: - Complete rename on live ebuilds, and fix overwriting of the variable on all. - - 22 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Use EXTRA_LIBAV_CONF instead of EXTRA_FFMPEG_CONF - - 20 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.7.4.ebuild, - libav-0.7.9999.ebuild, libav-0.8.ebuild, libav-0.8.1.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild, metadata.xml: - Small update, mark proper license and introduce tools useflag in the - live ebuild - -*libav-0.8.1 (16 Mar 2012) - - 16 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8.ebuild, - +libav-0.8.1.ebuild, libav-0.8.9999.ebuild, libav-9999.ebuild: - Introduce libav 0.8.1 and minor updates - - 13 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - iwmmxt removed upstream - - 07 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - Make sure librtmp requires network enabled - - 04 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - libpostproc spun off - - 29 Feb 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8.ebuild, - libav-0.8.9999.ebuild, libav-9999.ebuild: - vdpau is not nvidia only now, thanks to Nikoli for testing and the patch - provided in bug #406269 - - 09 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.8.9999.ebuild, - libav-0.8.ebuild, libav-9999.ebuild: - Do not create symlink for utilities that weren't built. - - 09 Feb 2012; Jeroen Roovers <jer@gentoo.org> libav-0.6.5.ebuild: - Stable for HPPA (bug #401017). - - 08 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.7.9999.ebuild, - libav-0.8.9999.ebuild, libav-0.8.ebuild, libav-9999.ebuild: - Add missing GPL requirement over x264. Ack by Luca. - - 07 Feb 2012; Agostino Sarubbo <ago@gentoo.org> libav-0.6.5.ebuild: - Stable for AMD64, wrt bug #401017 - - 27 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml: - Whitespace. - -*libav-0.8.9999 (27 Jan 2012) - - 27 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.9999.ebuild: - Add 0.8 live branch ebuild. - - 27 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.8.ebuild, - libav-9999.ebuild: - Fix repoman warning. - -*libav-0.7.4 (27 Jan 2012) -*libav-0.6.5 (27 Jan 2012) - - 27 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> - -files/0.6.2-fix_enable_hardcoded_tables.patch, - -libav-0.8_pre20110818.ebuild, -files/0.6.2-float_arrays.patch, - -libav-0.6.2.ebuild, +libav-0.6.5.ebuild, -libav-0.6.9999.ebuild, - -libav-0.7.2.ebuild, +libav-0.7.4.ebuild, -libav-0.8_beta1.ebuild, - -libav-0.8_pre20111116.ebuild, -libav-0.8_pre20111222.ebuild, - libav-0.8.ebuild, libav-9999.ebuild: - Version bump to latest versions. Remove overshadowed ebuilds. Remove 0.6 - series live as nobody would use it nowdays. Update x264 dep on 0.8 series and - later. - -*libav-0.8 (25 Jan 2012) - - 25 Jan 2012; Luca Barbato <lu_zero@gentoo.org> +libav-0.8.ebuild: - New version - - 04 Jan 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8_beta1.ebuild, - libav-9999.ebuild: - Fix dodoc when html docs aren't being generated - - 04 Jan 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8_beta1.ebuild, - libav-9999.ebuild: - Fix dodoc invocation - -*libav-0.8_beta1 (02 Jan 2012) - - 02 Jan 2012; Luca Barbato <lu_zero@gentoo.org> +libav-0.8_beta1.ebuild: - New beta version - - 02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> metadata.xml: - USE description for flag "neon" is in use.desc now. - -*libav-0.8_pre20111222 (22 Dec 2011) - - 22 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org> - +libav-0.8_pre20111222.ebuild: - Add new snapshot to build mplayer1 and provide something for ffmpeg-0.9 - virtual. - - 02 Dec 2011; Steve Dibb <beandog@gentoo.org> libav-0.6.2.ebuild, - libav-0.6.9999.ebuild, libav-0.7.2.ebuild, libav-0.7.9999.ebuild, - libav-0.8_pre20110818.ebuild, libav-0.8_pre20111116.ebuild, - libav-9999.ebuild: - Build qt-faststart by default - - 27 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20111116.ebuild: - Fix dependency, as reported in bug #391255 - -*libav-0.8_pre20111116 (16 Nov 2011) - - 16 Nov 2011; Luca Barbato <lu_zero@gentoo.org> +libav-0.8_pre20111116.ebuild: - New snapshot - - 15 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Make neon sure we enable and build neon code on use neon - - 13 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild, - metadata.xml: - Update useflags to expose new features - - 12 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Remove typo - - 08 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Add support for drawtext - - 01 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> libav-0.6.2.ebuild, - libav-0.6.9999.ebuild, libav-0.7.2.ebuild, libav-0.7.9999.ebuild, - libav-0.8_pre20110818.ebuild, libav-9999.ebuild: - Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt - #385241 - - 07 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> - -libav-0.7_pre20110327.ebuild, -libav-0.7.ebuild, -libav-0.7.1.ebuild: - Drop quite few overshadowed versions. - - 03 Oct 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.7.2.ebuild: - Fix wrong option bump, 0.7.2 doesn't introduce avtools - -*libav-0.7.2 (30 Sep 2011) - - 30 Sep 2011; Luca Barbato <lu_zero@gentoo.org> +libav-0.7.2.ebuild: - New version - - 22 Sep 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Update vaapi logic, thanks to Tobias Jakobi for the notice - - 18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20110818.ebuild, - libav-9999.ebuild: - disable tests and let faac and voaacenc built together - - 18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20110818.ebuild: - Switch to local permanent url - -*libav-0.8_pre20110818 (18 Aug 2011) - - 18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> +libav-0.8_pre20110818.ebuild: - New snapshot - - 18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Fix eprefix usage, dosym already adds it - - 10 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Update the ebuild to follow the program name changes - -*libav-0.7.1 (23 Jul 2011) - - 23 Jul 2011; Luca Barbato <lu_zero@gentoo.org> +libav-0.7.1.ebuild: - Version Bump - - 21 Jul 2011; Matt Turner <mattst88@gentoo.org> libav-0.7.9999.ebuild, - libav-9999.ebuild: - Add ~mips to 7.9999 and 9999 ebuilds so that the keyword doesn't get lost - again. - - 12 Jul 2011; Matt Turner <mattst88@gentoo.org> libav-0.7.ebuild: - Added ~mips, bug 154882 - -*libav-0.7.9999 (21 Jun 2011) -*libav-0.7 (21 Jun 2011) - - 21 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.7_rc1.ebuild, - +libav-0.7.ebuild, +libav-0.7.9999.ebuild: - Version bump to final 0.7 release. Remove older RC. Add 0.7 branch live - ebuild. - -*libav-0.7_rc1 (15 Jun 2011) - - 15 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.7_beta2.ebuild, - +libav-0.7_rc1.ebuild: - Version bump to rc1, drop older beta. - - 24 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild: - Bump dependency over x264. - -*libav-0.7_beta2 (13 May 2011) - - 13 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -libav-0.7_beta1.ebuild, - +libav-0.7_beta2.ebuild, libav-9999.ebuild: - Version bump to beta2 drop beta1. - - 20 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.9999.ebuild, - libav-9999.ebuild: - Migrate to git-2 eclass. - -*libav-0.7_beta1 (19 Apr 2011) - - 19 Apr 2011; Luca Barbato <lu_zero@gentoo.org> +libav-0.7_beta1.ebuild: - Prerelease - - 12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild, - metadata.xml: - Try to split up gpl code so user can compile just LGPL version. - - 12 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-9999.ebuild: - Update deps to match latest reality. - - 11 Apr 2011; Luca Barbato <lu_zero@gentoo.org> metadata.xml, - libav-9999.ebuild: - Add support for the Google/VisualOn encoders for aac and amrwb - - 01 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.2.ebuild, - libav-0.6.9999.ebuild: - Drop frei0r option that is availible only in trunk. - - 30 Mar 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild: - Drop removed configure option - - 28 Mar 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.6.2.ebuild, - libav-0.6.9999.ebuild, libav-0.7_pre20110327.ebuild, libav-9999.ebuild: - Add Gentoo Prefix support - - 27 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> libav-0.6.9999.ebuild, - libav-0.7_pre20110327.ebuild, libav-9999.ebuild: - Fixup version settings in snapshot. Remove useless quoting. Handle branching - magically. - -*libav-0.7_pre20110327 (27 Mar 2011) - - 27 Mar 2011; Luca Barbato <lu_zero@gentoo.org> - -libav-0.6_p20110327.ebuild, +libav-0.7_pre20110327.ebuild: - Rename - -*libav-0.6_p20110327 (27 Mar 2011) - - 27 Mar 2011; Luca Barbato <lu_zero@gentoo.org> - +libav-0.6_p20110327.ebuild, libav-0.6.9999.ebuild, libav-9999.ebuild: - New snapshot - - 25 Mar 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.6.2.ebuild, - libav-0.6.9999.ebuild, libav-9999.ebuild: - Typo fix - - 22 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml: - Fix whitespace in metadata.xml to be nicer. Drop unused flag (result of copy - from ffmpeg). - -*libav-9999 (22 Mar 2011) -*libav-0.6.9999 (22 Mar 2011) -*libav-0.6.2 (22 Mar 2011) - - 22 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> - +files/0.6.2-fix_enable_hardcoded_tables.patch, +libav-9999.ebuild, - +files/0.6.2-float_arrays.patch, +libav-0.6.2.ebuild, +libav-0.6.9999.ebuild, - +metadata.xml: - Initial commit for ffmpeg fork/alternative. Ebuild adjusted from ffmpeg ones. - Thanks for lu_zero for help with testing it. Virtual pkg and dependency - testing on current ffmpeg deps still needs to be done. - diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest deleted file mode 100644 index e2f5814..0000000 --- a/media-video/libav/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX libav-0.8.3-frei0r-ldl.patch 727 RMD160 d0e4447528bf8828a18ee7db3a1bbb749777c4e9 SHA1 19ca4e2077fe6ff6b89fe894417c15e89c84a913 SHA256 b4bc37377c4efc8673862887c479419082de0a1216be87b548032a0291348fa5 -DIST fate-0.8.2.tar.xz 443503168 RMD160 24fd9c0d30a8a6c20bfcc1a5402208cf8c64fec2 SHA1 49e54a76180a4343bb66442cf57dfd8017ba412c SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 -DIST libav-0.8.2.tar.xz 3807340 RMD160 599d8c385bf0ca25a053188fed4488508b501e50 SHA1 99e10a7132636652cf45ee3fc85ce36ff5818ce5 SHA256 96df20327396937add9df2693bba8ec109ef3eda7251065ddcaa86a8d9f3a7df -DIST libav-0.8.3.tar.xz 3798260 RMD160 6b57d6d693876b16559ebbb8907298e799fa9bdb SHA1 6af9fc0094de6190f5328cfc8405dd92f73cfc50 SHA256 37a9fc8bb5e56dcb0487afbb013f745a14addff61cea08a6009e2fd01251f080 -EBUILD libav-0.8.2-r2.ebuild 8983 RMD160 f6efa9092ba682602dabd5c644f398247c2fbb05 SHA1 8db29cf124405aa6b331d80fcdcaa556f3320a0e SHA256 f9f492b6de3efd5097ce64828a91fe771a5264de03a3d7da1dcec0710d7e3665 -EBUILD libav-0.8.2.ebuild 8984 RMD160 c9aa0b69a33d88dca270b567ce498545a486e73a SHA1 e6a2d316a568571abe0caf7b4d4c96d67e8b27d8 SHA256 88bd7e5abcf25fa6c6e3269f764d27aa64fba8c5c8291ee03583b2656e8206c5 -EBUILD libav-0.8.3.ebuild 9020 RMD160 cf1442ad05539f2db3f5b87990696cb827679431 SHA1 71b10cb92c2a421a1074cc923ad2c68a7712b1c1 SHA256 e73a1480d885319dc78bc5650ec53bfb5d6f86635214ee64f0829a13290ee32f -EBUILD libav-0.8.9999.ebuild 8984 RMD160 73120c97cb9bf958f22f422e3bdcc4d3b3b2b78a SHA1 178237b4e2b1b781dffa88126b75aaeb6f0e4232 SHA256 3eb7ace30ce59a697addde65ea3b5fdc914db9601404713205eb5efb447c1bcb -EBUILD libav-9999.ebuild 8910 RMD160 d78f9d41b4dfaeb990cdb018bf44503a586c0816 SHA1 a8feb13a3a00a509215be2bc0b2c20e6c3f8d8f1 SHA256 196a1efcedc144dfcd2d82bc13a5a3bb8dcf49aaf59e2d85ff03743be9cd3ab2 -MISC ChangeLog 15150 RMD160 056b548598636a97e8659797784f4590ed60dff6 SHA1 15855aeebfafd3f6b8cff4dba0004fac57789a0f SHA256 f13d234f90085ae7cba1dd848c7f84711c7db7932e387734fa1492f961e9d202 -MISC metadata.xml 2956 RMD160 b0091da3f452f2fd28859ce2e54ce0800269d154 SHA1 7392af83e5480254d3bc33026fac0b8cf2cbd00b SHA256 c7b04d7524f77f7116e95a33c7cb58e898defc88458d62b44d8975af61974675 diff --git a/media-video/libav/files/libav-0.8.3-frei0r-ldl.patch b/media-video/libav/files/libav-0.8.3-frei0r-ldl.patch deleted file mode 100644 index 37cd2d6..0000000 --- a/media-video/libav/files/libav-0.8.3-frei0r-ldl.patch +++ /dev/null @@ -1,17 +0,0 @@ -backported from git -X-Git-Url: http://git.libav.org/?p=libav.git;a=blobdiff_plain;f=configure;h=e207ed82fed35a5cde35547c210995a17cf76feb;hp=4606b236e334319456ebbd08132a7a9610e84f06;hb=cfec77aaf8186f556e1201be13ce487b99b3b831;hpb=6b81da2fd030dbc03d36b38558b58e8f0f667501 - -diff --git a/configure b/configure -index 4606b23..e207ed8 100755 ---- a/configure -+++ b/configure -@@ -1526,7 +1526,9 @@ cropdetect_filter_deps="gpl" - delogo_filter_deps="gpl" - drawtext_filter_deps="libfreetype" - frei0r_filter_deps="frei0r dlopen strtok_r" -+frei0r_filter_extralibs='$ldl' - frei0r_src_filter_deps="frei0r dlopen strtok_r" -+frei0r_src_filter_extralibs='$ldl' - hqdn3d_filter_deps="gpl" - ocv_filter_deps="libopencv" - scale_filter_deps="swscale" diff --git a/media-video/libav/libav-0.8.2-r2.ebuild b/media-video/libav/libav-0.8.2-r2.ebuild deleted file mode 100644 index 3116c7b..0000000 --- a/media-video/libav/libav-0.8.2-r2.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2-r2.ebuild,v 1.4 2012/05/22 16:52:18 flameeyes Exp $ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video." -HOMEPAGE="http://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="http://${PN}.org/releases/${P}.tar.xz" -fi - -SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-${PV}.tar.xz )" - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0" -[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -~x64-solaris ~x86-solaris" -IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection - custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm - +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl - oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 - static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid - +zlib" - -CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 -neon ssse3 vis" - -for i in ${CPU_FEATURES}; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - dirac? ( media-video/dirac ) - encode? ( - aac? ( media-libs/vo-aacenc ) - amr? ( media-libs/vo-amrwbenc ) - faac? ( media-libs/faac ) - mp3? ( >=media-sound/lame-3.98.3 ) - theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) - x264? ( >=media-libs/x264-0.0.20111017 ) - xvid? ( >=media-libs/xvid-1.1.0 ) - ) - truetype? ( media-libs/freetype:2 ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - pulseaudio? ( media-sound/pulseaudio ) - rtmp? ( >=media-video/rtmpdump-2.2f ) - ssl? ( openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) - schroedinger? ( media-libs/schroedinger ) - speex? ( >=media-libs/speex-1.2_beta3 ) - vaapi? ( x11-libs/libva ) - vdpau? ( x11-libs/libvdpau ) - vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) - zlib? ( sys-libs/zlib ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - dirac? ( virtual/pkgconfig ) - doc? ( app-text/texi2html ) - mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - truetype? ( virtual/pkgconfig ) - test? ( net-misc/wget ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE="bindist? ( !faac !openssl ) - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) - test? ( encode )" - -src_prepare() { - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi -} - -src_configure() { - local myconf="${EXTRA_LIBAV_CONF}" - local uses i - - myconf+=" - $(use_enable gpl) - $(use_enable gpl version3) - --enable-avfilter - " - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bzip2 || myconf+=" --disable-bzlib" - use sdl || myconf+=" --disable-avplay" - - if use ssl; then - use openssl && myconf+=" --enable-openssl --enable-nonfree" \ - || myconf+=" --enable-gnutls" - fi - - use custom-cflags && myconf+=" --disable-optimizations" - use cpudetection && myconf+=" --enable-runtime-cpudetect" - - #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do - # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" - # use vdpau || myconf="${myconf} --disable-decoder=${i}" - #done - use vdpau || myconf+=" --disable-vdpau" - - use vaapi && myconf+=" --enable-vaapi" - - # Encoders - if use encode; then - use mp3 && myconf+=" --enable-libmp3lame" - use amr && myconf+=" --enable-libvo-amrwbenc" - use faac && myconf+=" --enable-libfaac --enable-nonfree" - use aac && myconf+=" --enable-libvo-aacenc" - uses="theora vorbis x264 xvid" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - else - myconf+=" --disable-encoders" - fi - - # libavdevice options - use cdio && myconf+=" --enable-libcdio" - use ieee1394 && myconf+=" --enable-libdc1394" - use pulseaudio && myconf+=" --enable-libpulse" - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=" --disable-indev=v4l" - use v4l || myconf+=" --disable-indev=v4l2" - for i in alsa oss jack; do - use ${i} || myconf+=" --disable-indev=${i}" - done - use X && myconf+=" --enable-x11grab" - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=" --disable-outdev=${i}" - done - # libavfilter options - use frei0r && myconf+=" --enable-frei0r" - use truetype && myconf+=" --enable-libfreetype" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads && myconf+=" --enable-pthreads" - - # Decoders - use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - uses="gsm dirac rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - use jpeg2k && myconf+=" --enable-libopenjpeg" - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=" --disable-${i#*:}" - done - - # pass the right -mfpu as extra - use neon && myconf+=" --extra-cflags=-mfpu=neon" - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && use x86 ; then - myconf+=" --disable-mmx --disable-mmx2" - fi - - # Option to force building pic - use pic && myconf+=" --enable-pic" - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 - myconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - myconf+=" --target-os=freebsd" - ;; - mingw32*) - myconf+=" --target-os=mingw32" - ;; - *linux*) - myconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=" --enable-hardcoded-tables" - - # Specific workarounds for too-few-registers arch... - if [[ $(tc-arch) == "x86" ]]; then - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - cd "${S}" - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_compile() { - emake - - if use qt-faststart; then - tc-export CC - emake tools/qt-faststart - fi -} - -src_install() { - emake DESTDIR="${D}" install install-man - - dodoc Changelog README INSTALL - dodoc doc/*.txt - use doc && dodoc doc/*.html - - if use qt-faststart; then - dobin tools/qt-faststart - fi - - for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do - dosym ${i} /usr/bin/${i/av/ff} - done -} - -pkg_postinst() { - elog "Please note that the programs formerly known as ffplay, ffserver" - elog "and ffprobe are now called avplay, avserver and avprobe." - elog - elog "ffmpeg had been replaced by the feature incompatible avconv thus" - elog "the legacy ffmpeg is provided for compatibility with older scripts" -} - -src_test() { - LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ - emake fate SAMPLES="${WORKDIR}/fate" -} diff --git a/media-video/libav/libav-0.8.2.ebuild b/media-video/libav/libav-0.8.2.ebuild deleted file mode 100644 index a7140c2..0000000 --- a/media-video/libav/libav-0.8.2.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2.ebuild,v 1.10 2012/06/20 11:10:40 scarabeus Exp $ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video." -HOMEPAGE="http://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="http://${PN}.org/releases/${P}.tar.xz" -fi - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0" -[[ ${PV} == *9999 ]] || \ -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection - custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm - +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl - oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 - static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid - +zlib" - -CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt" - -for i in ${CPU_FEATURES}; do - IUSE="${IUSE} ${i%:*}" -done - -RDEPEND=" - !media-libs/libpostproc - !media-video/ffmpeg - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - dirac? ( media-video/dirac ) - encode? ( - aac? ( media-libs/vo-aacenc ) - amr? ( media-libs/vo-amrwbenc ) - faac? ( media-libs/faac ) - mp3? ( >=media-sound/lame-3.98.3 ) - theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) - x264? ( >=media-libs/x264-0.0.20111017 ) - xvid? ( >=media-libs/xvid-1.1.0 ) - ) - truetype? ( media-libs/freetype ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - rtmp? ( >=media-video/rtmpdump-2.2f ) - ssl? ( openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) - schroedinger? ( media-libs/schroedinger ) - speex? ( >=media-libs/speex-1.2_beta3 ) - vaapi? ( x11-libs/libva ) - vdpau? ( x11-libs/libvdpau ) - vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext ) - zlib? ( sys-libs/zlib ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - dirac? ( virtual/pkgconfig ) - doc? ( app-text/texi2html ) - mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - test? ( net-misc/wget ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE="bindist? ( !faac !openssl ) - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )" - -RESTRICT="test" - -src_prepare() { - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi -} - -src_configure() { - local myconf="${EXTRA_LIBAV_CONF}" - local uses i - - myconf+=" - $(use_enable gpl) - $(use_enable gpl version3) - --enable-postproc - --enable-avfilter - " - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bzip2 || myconf+=" --disable-bzlib" - use sdl || myconf+=" --disable-avplay" - - if use ssl; then - use openssl && myconf+=" --enable-openssl --enable-nonfree" \ - || myconf+=" --enable-gnutls" - fi - - use custom-cflags && myconf+=" --disable-optimizations" - use cpudetection && myconf+=" --enable-runtime-cpudetect" - - #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do - # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" - # use vdpau || myconf="${myconf} --disable-decoder=${i}" - #done - use vdpau || myconf+=" --disable-vdpau" - - use vaapi && myconf+=" --enable-vaapi" - - # Encoders - if use encode; then - use mp3 && myconf+=" --enable-libmp3lame" - use amr && myconf+=" --enable-libvo-amrwbenc" - use faac && myconf+=" --enable-libfaac --enable-nonfree" - use aac && myconf+=" --enable-libvo-aacenc" - uses="theora vorbis x264 xvid" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - else - myconf+=" --disable-encoders" - fi - - # libavdevice options - use cdio && myconf+=" --enable-libcdio" - use ieee1394 && myconf+=" --enable-libdc1394" - use pulseaudio && myconf+=" --enable-libpulse" - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=" --disable-indev=v4l" - use v4l || myconf+=" --disable-indev=v4l2" - for i in alsa oss jack; do - use ${i} || myconf+=" --disable-indev=${i}" - done - use X && myconf+=" --enable-x11grab" - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=" --disable-outdev=${i}" - done - # libavfilter options - use frei0r && myconf+=" --enable-frei0r" - use truetype && myconf+=" --enable-libfreetype" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads && myconf+=" --enable-pthreads" - - # Decoders - use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - uses="gsm dirac rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - use jpeg2k && myconf+=" --enable-libopenjpeg" - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=" --disable-${i#*:}" - done - - # pass the right -mfpu as extra - use neon && myconf+=" --extra-cflags=-mfpu=neon" - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && use x86 ; then - myconf+=" --disable-mmx --disable-mmx2" - fi - - # Option to force building pic - use pic && myconf+=" --enable-pic" - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 - myconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - myconf+=" --target-os=freebsd" - ;; - mingw32*) - myconf+=" --target-os=mingw32" - ;; - *linux*) - myconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=" --enable-hardcoded-tables" - - # Specific workarounds for too-few-registers arch... - if [[ $(tc-arch) == "x86" ]]; then - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - cd "${S}" - ./configure \ - --prefix="$EPREFIX"/usr \ - --libdir="$EPREFIX"/usr/$(get_libdir) \ - --shlibdir="$EPREFIX"/usr/$(get_libdir) \ - --mandir="$EPREFIX"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_compile() { - emake - - if use qt-faststart; then - tc-export CC - emake tools/qt-faststart - fi -} - -src_install() { - emake DESTDIR="${D}" install install-man - - dodoc Changelog README INSTALL - dodoc doc/*.txt - use doc && dodoc doc/*.html - - if use qt-faststart; then - dobin tools/qt-faststart - fi - - for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do - dosym ${i} /usr/bin/${i/av/ff} - done -} - -pkg_postinst() { - elog "Please note that the programs formerly known as ffplay, ffserver" - elog "and ffprobe are now called avplay, avserver and avprobe." - elog - elog "ffmpeg had been replaced by the feature incompatible avconv thus" - elog "the legacy ffmpeg is provided for compatibility with older scripts" -} - -src_test() { - local i tests - if use encode; then - tests="codectest lavftest seektest" - for i in ${tests}; do - LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ - emake ${i} - done - else - ewarn "Tests fail without USE=encode, skipping" - fi -} diff --git a/media-video/libav/libav-0.8.3.ebuild b/media-video/libav/libav-0.8.3.ebuild deleted file mode 100644 index 6dc2b06..0000000 --- a/media-video/libav/libav-0.8.3.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.3.ebuild,v 1.3 2012/06/23 08:43:36 ago Exp $ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video." -HOMEPAGE="http://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="http://${PN}.org/releases/${P}.tar.xz" -fi - -SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )" - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0" -[[ ${PV} == *9999 ]] || \ -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection - custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm - +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl - oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 - static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid - +zlib" - -CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 -neon ssse3 vis" - -for i in ${CPU_FEATURES}; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - dirac? ( media-video/dirac ) - encode? ( - aac? ( media-libs/vo-aacenc ) - amr? ( media-libs/vo-amrwbenc ) - faac? ( media-libs/faac ) - mp3? ( >=media-sound/lame-3.98.3 ) - theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) - x264? ( >=media-libs/x264-0.0.20111017 ) - xvid? ( >=media-libs/xvid-1.1.0 ) - ) - truetype? ( media-libs/freetype:2 ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - pulseaudio? ( media-sound/pulseaudio ) - rtmp? ( >=media-video/rtmpdump-2.2f ) - ssl? ( openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) - schroedinger? ( media-libs/schroedinger ) - speex? ( >=media-libs/speex-1.2_beta3 ) - vaapi? ( x11-libs/libva ) - vdpau? ( x11-libs/libvdpau ) - vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) - zlib? ( sys-libs/zlib ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - dirac? ( virtual/pkgconfig ) - doc? ( app-text/texi2html ) - mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - truetype? ( virtual/pkgconfig ) - test? ( net-misc/wget ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE="bindist? ( !faac !openssl ) - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) - test? ( encode )" - -src_prepare() { - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi - epatch "${FILESDIR}"/"${P}"-frei0r-ldl.patch -} - -src_configure() { - local myconf="${EXTRA_LIBAV_CONF}" - local uses i - - myconf+=" - $(use_enable gpl) - $(use_enable gpl version3) - --enable-avfilter - " - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bzip2 || myconf+=" --disable-bzlib" - use sdl || myconf+=" --disable-avplay" - - if use ssl; then - use openssl && myconf+=" --enable-openssl --enable-nonfree" \ - || myconf+=" --enable-gnutls" - fi - - use custom-cflags && myconf+=" --disable-optimizations" - use cpudetection && myconf+=" --enable-runtime-cpudetect" - - #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do - # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" - # use vdpau || myconf="${myconf} --disable-decoder=${i}" - #done - use vdpau || myconf+=" --disable-vdpau" - - use vaapi && myconf+=" --enable-vaapi" - - # Encoders - if use encode; then - use mp3 && myconf+=" --enable-libmp3lame" - use amr && myconf+=" --enable-libvo-amrwbenc" - use faac && myconf+=" --enable-libfaac --enable-nonfree" - use aac && myconf+=" --enable-libvo-aacenc" - uses="theora vorbis x264 xvid" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - else - myconf+=" --disable-encoders" - fi - - # libavdevice options - use cdio && myconf+=" --enable-libcdio" - use ieee1394 && myconf+=" --enable-libdc1394" - use pulseaudio && myconf+=" --enable-libpulse" - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=" --disable-indev=v4l" - use v4l || myconf+=" --disable-indev=v4l2" - for i in alsa oss jack; do - use ${i} || myconf+=" --disable-indev=${i}" - done - use X && myconf+=" --enable-x11grab" - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=" --disable-outdev=${i}" - done - # libavfilter options - use frei0r && myconf+=" --enable-frei0r" - use truetype && myconf+=" --enable-libfreetype" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads && myconf+=" --enable-pthreads" - - # Decoders - use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - uses="gsm dirac rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - use jpeg2k && myconf+=" --enable-libopenjpeg" - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=" --disable-${i#*:}" - done - - # pass the right -mfpu as extra - use neon && myconf+=" --extra-cflags=-mfpu=neon" - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && use x86 ; then - myconf+=" --disable-mmx --disable-mmx2" - fi - - # Option to force building pic - use pic && myconf+=" --enable-pic" - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 - myconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - myconf+=" --target-os=freebsd" - ;; - mingw32*) - myconf+=" --target-os=mingw32" - ;; - *linux*) - myconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=" --enable-hardcoded-tables" - - # Specific workarounds for too-few-registers arch... - if [[ $(tc-arch) == "x86" ]]; then - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - cd "${S}" - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_compile() { - emake - - if use qt-faststart; then - tc-export CC - emake tools/qt-faststart - fi -} - -src_install() { - emake DESTDIR="${D}" install install-man - - dodoc Changelog README INSTALL - dodoc doc/*.txt - use doc && dodoc doc/*.html - - if use qt-faststart; then - dobin tools/qt-faststart - fi - - for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do - dosym ${i} /usr/bin/${i/av/ff} - done -} - -pkg_postinst() { - elog "Please note that the programs formerly known as ffplay, ffserver" - elog "and ffprobe are now called avplay, avserver and avprobe." - elog - elog "ffmpeg had been replaced by the feature incompatible avconv thus" - elog "the legacy ffmpeg is provided for compatibility with older scripts" -} - -src_test() { - LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ - emake fate SAMPLES="${WORKDIR}/fate" -} diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild deleted file mode 100644 index 46056c0..0000000 --- a/media-video/libav/libav-0.8.9999.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.19 2012/05/22 16:52:18 flameeyes Exp $ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video." -HOMEPAGE="http://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="http://${PN}.org/releases/${P}.tar.xz" -fi - -SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )" - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0" -[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -~x64-solaris ~x86-solaris" -IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection - custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm - +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl - oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 - static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid - +zlib" - -CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 -neon ssse3 vis" - -for i in ${CPU_FEATURES}; do - IUSE+=" ${i%:*}" -done - -RDEPEND=" - !media-video/ffmpeg - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - dirac? ( media-video/dirac ) - encode? ( - aac? ( media-libs/vo-aacenc ) - amr? ( media-libs/vo-amrwbenc ) - faac? ( media-libs/faac ) - mp3? ( >=media-sound/lame-3.98.3 ) - theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) - x264? ( >=media-libs/x264-0.0.20111017 ) - xvid? ( >=media-libs/xvid-1.1.0 ) - ) - truetype? ( media-libs/freetype:2 ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - pulseaudio? ( media-sound/pulseaudio ) - rtmp? ( >=media-video/rtmpdump-2.2f ) - ssl? ( openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) - schroedinger? ( media-libs/schroedinger ) - speex? ( >=media-libs/speex-1.2_beta3 ) - vaapi? ( x11-libs/libva ) - vdpau? ( x11-libs/libvdpau ) - vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) - zlib? ( sys-libs/zlib ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - dirac? ( virtual/pkgconfig ) - doc? ( app-text/texi2html ) - mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - truetype? ( virtual/pkgconfig ) - test? ( net-misc/wget ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE="bindist? ( !faac !openssl ) - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) - test? ( encode )" - -src_prepare() { - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi -} - -src_configure() { - local myconf="${EXTRA_LIBAV_CONF}" - local uses i - - myconf+=" - $(use_enable gpl) - $(use_enable gpl version3) - --enable-avfilter - " - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bzip2 || myconf+=" --disable-bzlib" - use sdl || myconf+=" --disable-avplay" - - if use ssl; then - use openssl && myconf+=" --enable-openssl --enable-nonfree" \ - || myconf+=" --enable-gnutls" - fi - - use custom-cflags && myconf+=" --disable-optimizations" - use cpudetection && myconf+=" --enable-runtime-cpudetect" - - #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do - # use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}" - # use vdpau || myconf="${myconf} --disable-decoder=${i}" - #done - use vdpau || myconf+=" --disable-vdpau" - - use vaapi && myconf+=" --enable-vaapi" - - # Encoders - if use encode; then - use mp3 && myconf+=" --enable-libmp3lame" - use amr && myconf+=" --enable-libvo-amrwbenc" - use faac && myconf+=" --enable-libfaac --enable-nonfree" - use aac && myconf+=" --enable-libvo-aacenc" - uses="theora vorbis x264 xvid" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - else - myconf+=" --disable-encoders" - fi - - # libavdevice options - use cdio && myconf+=" --enable-libcdio" - use ieee1394 && myconf+=" --enable-libdc1394" - use pulseaudio && myconf+=" --enable-libpulse" - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=" --disable-indev=v4l" - use v4l || myconf+=" --disable-indev=v4l2" - for i in alsa oss jack; do - use ${i} || myconf+=" --disable-indev=${i}" - done - use X && myconf+=" --enable-x11grab" - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=" --disable-outdev=${i}" - done - # libavfilter options - use frei0r && myconf+=" --enable-frei0r" - use truetype && myconf+=" --enable-libfreetype" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads && myconf+=" --enable-pthreads" - - # Decoders - use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - uses="gsm dirac rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - use jpeg2k && myconf+=" --enable-libopenjpeg" - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=" --disable-${i#*:}" - done - - # pass the right -mfpu as extra - use neon && myconf+=" --extra-cflags=-mfpu=neon" - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && use x86 ; then - myconf+=" --disable-mmx --disable-mmx2" - fi - - # Option to force building pic - use pic && myconf+=" --enable-pic" - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 - myconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - myconf+=" --target-os=freebsd" - ;; - mingw32*) - myconf+=" --target-os=mingw32" - ;; - *linux*) - myconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=" --enable-hardcoded-tables" - - # Specific workarounds for too-few-registers arch... - if [[ $(tc-arch) == "x86" ]]; then - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - cd "${S}" - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_compile() { - emake - - if use qt-faststart; then - tc-export CC - emake tools/qt-faststart - fi -} - -src_install() { - emake DESTDIR="${D}" install install-man - - dodoc Changelog README INSTALL - dodoc doc/*.txt - use doc && dodoc doc/*.html - - if use qt-faststart; then - dobin tools/qt-faststart - fi - - for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do - dosym ${i} /usr/bin/${i/av/ff} - done -} - -pkg_postinst() { - elog "Please note that the programs formerly known as ffplay, ffserver" - elog "and ffprobe are now called avplay, avserver and avprobe." - elog - elog "ffmpeg had been replaced by the feature incompatible avconv thus" - elog "the legacy ffmpeg is provided for compatibility with older scripts" -} - -src_test() { - LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ - emake fate SAMPLES="${WORKDIR}/fate" -} diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild deleted file mode 100644 index 078f809..0000000 --- a/media-video/libav/libav-9999.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.50 2012/05/22 16:52:18 flameeyes Exp $ - -EAPI=4 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-2" - EGIT_REPO_URI="git://git.libav.org/libav.git" - [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}" -fi - -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM} - -DESCRIPTION="Complete solution to record, convert and stream audio and video." -HOMEPAGE="http://libav.org/" -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" -elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" -else # Official release - SRC_URI="http://${PN}.org/releases/${P}.tar.xz" -fi - -LICENSE="LGPL-2.1 gpl? ( GPL-3 )" -SLOT="0" -[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos -~x64-solaris ~x86-solaris" -IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc - +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 - network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl - static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X - x264 xvid +zlib" - -# String for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 neon ssse3 vis" -for i in ${CPU_FEATURES} ; do - IUSE+=" ${i%:*}" -done - -TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher" - -RDEPEND=" - !media-video/ffmpeg - alsa? ( media-libs/alsa-lib ) - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - cdio? ( dev-libs/libcdio ) - encode? ( - aac? ( media-libs/vo-aacenc ) - amr? ( media-libs/vo-amrwbenc ) - faac? ( media-libs/faac ) - mp3? ( >=media-sound/lame-3.98.3 ) - theora? ( - >=media-libs/libtheora-1.1.1[encode] - media-libs/libogg - ) - vorbis? ( media-libs/libvorbis media-libs/libogg ) - x264? ( >=media-libs/x264-0.0.20111017 ) - xvid? ( >=media-libs/xvid-1.1.0 ) - ) - frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - ieee1394? ( - media-libs/libdc1394 - sys-libs/libraw1394 - ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - pulseaudio? ( media-sound/pulseaudio ) - rtmp? ( >=media-video/rtmpdump-2.2f ) - ssl? ( - openssl? ( dev-libs/openssl ) - !openssl? ( net-libs/gnutls ) - ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) - schroedinger? ( media-libs/schroedinger ) - speex? ( >=media-libs/speex-1.2_beta3 ) - truetype? ( media-libs/freetype:2 ) - vaapi? ( x11-libs/libva ) - vdpau? ( x11-libs/libvdpau ) - vpx? ( >=media-libs/libvpx-0.9.6 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - ) - zlib? ( sys-libs/zlib ) -" - -DEPEND="${RDEPEND} - >=sys-devel/make-3.81 - doc? ( app-text/texi2html ) - ieee1394? ( virtual/pkgconfig ) - mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig ) - schroedinger? ( virtual/pkgconfig ) - ssl? ( virtual/pkgconfig ) - test? ( sys-devel/bc ) - truetype? ( virtual/pkgconfig ) - v4l? ( sys-kernel/linux-headers ) -" - -# faac can't be binary distributed -# openssl support marked as nonfree -# faac and aac are concurent implementations -# amr and aac require at least lgpl3 -# x264 requires gpl2 -REQUIRED_USE="bindist? ( !faac !openssl ) - rtmp? ( network ) - amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) - test? ( encode zlib ) -" - -# Test on live ebuild are not possible as they require trunk fate -RESTRICT="test" - -src_prepare() { - # if we have snapshot then we need to hardcode the version - if [[ ${PV%_p*} != ${PV} ]]; then - sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die - fi -} - -src_configure() { - local myconf="${EXTRA_LIBAV_CONF}" - local uses i - - use zlib && TOOLS+=" cws2fws" - - myconf+=" - $(use_enable gpl) - $(use_enable gpl version3) - --enable-avfilter - " - - # enabled by default - uses="debug doc network zlib" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use bzip2 || myconf+=" --disable-bzlib" - use sdl || myconf+=" --disable-avplay" - - if use ssl; then - use openssl && myconf+=" --enable-openssl --enable-nonfree" \ - || myconf+=" --enable-gnutls" - fi - - use custom-cflags && myconf+=" --disable-optimizations" - use cpudetection && myconf+=" --enable-runtime-cpudetect" - - use vdpau || myconf+=" --disable-vdpau" - - use vaapi && myconf+=" --enable-vaapi" - - # Encoders - if use encode; then - use faac && myconf+=" --enable-nonfree" - use mp3 && myconf+=" --enable-libmp3lame" - use amr && myconf+=" --enable-libvo-amrwbenc" - use aac && myconf+=" --enable-libvo-aacenc" - uses="faac theora vorbis x264 xvid" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - else - myconf+=" --disable-encoders" - fi - - # libavdevice options - use cdio && myconf+=" --enable-libcdio" - use ieee1394 && myconf+=" --enable-libdc1394" - use pulseaudio && myconf+=" --enable-libpulse" - - # Indevs - # v4l1 is gone since linux-headers-2.6.38 - myconf+=" --disable-indev=v4l" - use v4l || myconf+=" --disable-indev=v4l2" - for i in alsa oss jack; do - use ${i} || myconf+=" --disable-indev=${i}" - done - use X && myconf+=" --enable-x11grab" - # Outdevs - for i in alsa oss ; do - use ${i} || myconf+=" --disable-outdev=${i}" - done - # libavfilter options - use frei0r && myconf+=" --enable-frei0r" - use truetype && myconf+=" --enable-libfreetype" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads && myconf+=" --enable-pthreads" - - # Decoders - use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - uses="gsm rtmp schroedinger speex vpx" - for i in ${uses}; do - use ${i} && myconf+=" --enable-lib${i}" - done - use jpeg2k && myconf+=" --enable-libopenjpeg" - - # CPU features - for i in ${CPU_FEATURES}; do - use ${i%:*} || myconf+=" --disable-${i#*:}" - done - - # pass the right -mfpu as extra - use neon && myconf+=" --extra-cflags=-mfpu=neon" - - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC for x86. - if use pic && use x86 ; then - myconf+=" --disable-mmx --disable-mmx2" - fi - - # Option to force building pic - use pic && myconf+=" --enable-pic" - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [[ "${i}" == "native" ]] && i="host" # bug #273421 - myconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - myconf+=" --target-os=freebsd" - ;; - mingw32*) - myconf+=" --target-os=mingw32" - ;; - *linux*) - myconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && myconf+=" --enable-hardcoded-tables" - - # Specific workarounds for too-few-registers arch... - if [[ $(tc-arch) == "x86" ]]; then - filter-flags -fforce-addr -momit-leaf-frame-pointer - append-flags -fomit-frame-pointer - is-flag -O? || append-flags -O2 - if use debug; then - # no need to warn about debug if not using debug flag - ewarn "" - ewarn "Debug information will be almost useless as the frame pointer is omitted." - ewarn "This makes debugging harder, so crashes that has no fixed behavior are" - ewarn "difficult to fix. Please have that in mind." - ewarn "" - fi - fi - - cd "${S}" - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --shlibdir="${EPREFIX}"/usr/$(get_libdir) \ - --mandir="${EPREFIX}"/usr/share/man \ - --enable-shared \ - --cc="$(tc-getCC)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - $(use_enable static-libs static) \ - ${myconf} || die -} - -src_compile() { - local i - - emake - - if use tools; then - tc-export CC - - for i in ${TOOLS}; do - emake tools/${i} - done - fi -} - -src_install() { - local i - - emake DESTDIR="${D}" install install-man - - dodoc Changelog README INSTALL - dodoc doc/*.txt - use doc && dodoc doc/*.html - - if use tools; then - for i in ${TOOLS}; do - dobin tools/${i} - done - fi - - for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do - dosym ${i} /usr/bin/${i/av/ff} - done -} - -pkg_postinst() { - elog "Please note that the programs formerly known as ffplay, ffserver" - elog "and ffprobe are now called avplay, avserver and avprobe." - elog - elog "ffmpeg had been replaced by the feature incompatible avconv" -} - -src_test() { - LD_LIBRARY_PATH="${S}/libavcore:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \ - emake V=1 -j1 fate -} diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml deleted file mode 100644 index a5f9f99..0000000 --- a/media-video/libav/metadata.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>video</herd> -<maintainer> - <email>media-video@gentoo.org</email> -</maintainer> -<use> - <flag name="3dnowext"> - Enable manually-optimised routines using the AMD 3DNow!Ex SIMD - instruction set, present in modern AMD CPUs. (Check for - 3dnowext in /proc/cpuinfo to know whether your CPU supports it). - </flag> - <flag name="aac">Use external vo-aacenc library for AAC encoding</flag> - <flag name="amr">Enable Adaptive Multi-Rate Audio support</flag> - <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag> - <flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag> - <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).</flag> - <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag> - <flag name="faac">Use external faac library for AAC encoding</flag> - <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag> - <flag name="gpl">Build all GPL licensed code. Without this flag set the package is build under LGPL license.</flag> - <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag> - <flag name="mmxext">Enable mmx2 support.</flag> - <flag name="network">Enable network streaming support.</flag> - <flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag> - <flag name="pulseaudio">Enable pulseaudio input support.</flag> - <flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag> - <flag name="qt-faststart">Build and install qt-faststart application.</flag> - <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag> - <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag> - <flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/gnutls</pkg>.</flag> - <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips).</flag> - <flag name="tools">Build and install small tools like aviocat, cws2fws, graph2dot, ismindex, qt-faststart.</flag> - <flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding.</flag> - <flag name="vdpau">Enable VDPAU decoders (requires nVidia video cards to offload CPU processing to video card.</flag> - <flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag> - <flag name="vpx">Enable vp8 encoding support using libvpx.</flag> -</use> -</pkgmetadata> diff --git a/metadata/layout.conf b/metadata/layout.conf deleted file mode 100644 index ddfae5d..0000000 --- a/metadata/layout.conf +++ /dev/null @@ -1,3 +0,0 @@ -masters = gentoo - -profile-formats = portage-2 diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog deleted file mode 100644 index 3ff98b8..0000000 --- a/net-analyzer/cacti/ChangeLog +++ /dev/null @@ -1,788 +0,0 @@ -# ChangeLog for net-analyzer/cacti -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.188 2012/01/01 15:12:25 armin76 Exp $ - - 01 Jan 2012; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7i.ebuild: - alpha/sparc/x86 stable wrt #394595 - - 23 Dec 2011; Mark Loeser <halcy0n@gentoo.org> cacti-0.8.7g.ebuild: - Drop stable ppc/ppc64 - - 16 Dec 2011; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7i.ebuild: - Stable for HPPA (bug #394595). - - 15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> cacti-0.8.7i.ebuild: - Stable for AMD64, wrt security bug #394595 - - 12 Dec 2011; Peter Volkov <pva@gentoo.org> +cacti-0.8.7i.ebuild: - Version bump. Plugin architecture is now includded, bug #346741 wrt Jens Ott - and Alon Bar-Lev. - - 13 Nov 2011; Markus Meier <maekke@gentoo.org> cacti-0.8.7h.ebuild: - x86 stable, bug #387661 - - 20 Oct 2011; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7h.ebuild: - Stable for HPPA (bug #387661). - - 20 Oct 2011; Tony Vroon <chainsaw@gentoo.org> cacti-0.8.7h.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian - "idella4" Delaney in bug #387661. - -*cacti-0.8.7h (02 Oct 2011) - - 02 Oct 2011; Peter Volkov <pva@gentoo.org> +cacti-0.8.7h.ebuild: - Version bump, bug #384627 thank Martin Samek for report. - - 01 Apr 2011; Peter Volkov <pva@gentoo.org> -cacti-0.8.7e-r2.ebuild, - -cacti-0.8.7e-r3.ebuild: - Drop old. - - 20 Dec 2010; Brent Baude <ranger@gentoo.org> cacti-0.8.7g.ebuild: - Marking cacti-0.8.7g ppc64 for bug 324031 - - 20 Nov 2010; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7g.ebuild: - alpha/sparc stable wrt #324031 - - 19 Nov 2010; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7g.ebuild: - Stable for HPPA PPC (bug #324031). - - 17 Nov 2010; Markos Chandras <hwoarang@gentoo.org> cacti-0.8.7g.ebuild: - Stable on amd64 wrt bug #324031 - - 16 Nov 2010; Thomas Kahle <tomka@gentoo.org> cacti-0.8.7g.ebuild: - x86 stable per bug 324031 - -*cacti-0.8.7g (15 Nov 2010) - - 15 Nov 2010; Peter Volkov <pva@gentoo.org> -cacti-0.8.7e-r1.ebuild, - +cacti-0.8.7g.ebuild: - Version bump, bug #324457, thank Luca Lesinigo for report and Jens Ott for - initial work. Fixes multiple vulnerabilities, security bug #324031, thank - Matthias Geerdsen for report. Fixes installation with new php version, bug - #343205, thank Bradley Leininger for report. - -*cacti-0.8.7e-r3 (03 Jul 2010) - - 03 Jul 2010; Matti Bickel <mabi@gentoo.org> +cacti-0.8.7e-r3.ebuild: - eapi bump for php-5.3 (bug #298205) - - 01 Jun 2010; Joseph Jezak <josejx@gentoo.org> cacti-0.8.7e-r2.ebuild: - Marked ppc stable for bug #317615. - - 26 May 2010; Brent Baude <ranger@gentoo.org> cacti-0.8.7e-r2.ebuild: - Marking cacti-0.8.7e-r2 ppc64 for bug 317615 - - 23 May 2010; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7e-r2.ebuild: - alpha/sparc stable wrt #317615 - - 23 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> - cacti-0.8.7e-r2.ebuild: - x86 stable wrt security bug #317615 - - 20 May 2010; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7e-r2.ebuild: - Stable for HPPA (bug #317615). - - 20 May 2010; Peter Volkov <pva@gentoo.org> cacti-0.8.7e-r2.ebuild: - amd64 stable, bug 317615. - -*cacti-0.8.7e-r2 (18 May 2010) - - 18 May 2010; Peter Volkov <pva@gentoo.org> +cacti-0.8.7e-r2.ebuild: - Added sql_injection_template_export patch, fixes security bug #317615, - thank Marcin Mirosław for report. - - 14 Apr 2010; Gordon Malm <gengor@gentoo.org> cacti-0.8.7e-r1.ebuild: - Fix RDEPEND for bug #304583. - - 14 Feb 2010; Peter Volkov <pva@gentoo.org> cacti-0.8.7e-r1.ebuild: - cacti 087 does not work with >rddtool-1.4, bug #304583, thank Emmanuel - Andry for report. - - 20 Dec 2009; Peter Volkov <pva@gentoo.org> -cacti-0.8.7b-r3.ebuild, - -cacti-0.8.7e.ebuild: - Drop old. - - 20 Dec 2009; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7e-r1.ebuild: - Stable for PPC (bug #294573). - - 19 Dec 2009; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7e-r1.ebuild: - Stable for HPPA too. - - 09 Dec 2009; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7e-r1.ebuild: - sparc stable wrt #294573 - - 30 Nov 2009; Markus Meier <maekke@gentoo.org> cacti-0.8.7e-r1.ebuild: - amd64 stable, bug #294573 - - 29 Nov 2009; Tobias Klausmann <klausman@gentoo.org> - cacti-0.8.7e-r1.ebuild: - Stable on alpha, bug #294573 - - 26 Nov 2009; Christian Faulhammer <fauli@gentoo.org> - cacti-0.8.7e-r1.ebuild: - stable x86, security bug 294573 - - 25 Nov 2009; Brent Baude <ranger@gentoo.org> cacti-0.8.7e-r1.ebuild: - Marking cacti-0.8.7e-r1 ppc64 for bug 294573 - -*cacti-0.8.7e-r1 (25 Nov 2009) - - 25 Nov 2009; Peter Volkov <pva@gentoo.org> -cacti-0.8.6j-r8.ebuild, - -files/cacti-0.8.6j-dos-large-values.patch, -cacti-0.8.7d.ebuild, - +cacti-0.8.7e-r1.ebuild: - Added patch to fix HTML injection vulnerabilities, thank Vadim Efimov for - report, bug #294573. Removed old. - - 21 Nov 2009; nixnut <nixnut@gentoo.org> cacti-0.8.7e.ebuild: - ppc stable #293268 - - 19 Nov 2009; Markus Meier <maekke@gentoo.org> cacti-0.8.7e.ebuild: - amd64/x86 stable, bug #293268 - -*cacti-0.8.7e (06 Oct 2009) - - 06 Oct 2009; Peter Volkov <pva@gentoo.org> +cacti-0.8.7e.ebuild: - Version bump, bug #280193. Thank Rudy Grigar and Luca Lesinigo for report - and updates. - - 26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - cacti-0.8.6j-r8.ebuild: - Call depend.apache_pkg_setup() in pkg_setup() (bug #268371). - -*cacti-0.8.7d (08 Mar 2009) - - 08 Mar 2009; Peter Volkov <pva@gentoo.org> -cacti-0.8.7b-r2.ebuild, - +cacti-0.8.7d.ebuild: - Version bump, bug #261463, thank Thomas Beinicke for report. - - 13 Nov 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.7b-r3.ebuild: - stable ppc64, bug 244956 - - 01 Nov 2008; nixnut <nixnut@gentoo.org> cacti-0.8.7b-r3.ebuild: - Stable on ppc wrt bug 244956 - - 01 Nov 2008; Jeremy Olexa <darkside@gentoo.org> cacti-0.8.7b-r3.ebuild: - amd64 stable, bug 244956 - - 31 Oct 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b-r3.ebuild: - alpha/x86 stable wrt #244956 - - 30 Oct 2008; Ferris McCormick <fmccor@gentoo.org> cacti-0.8.7b-r3.ebuild: - Sparc stable, Bug #244956. - - 13 Oct 2008; Peter Volkov <pva@gentoo.org> metadata.xml, - cacti-0.8.7b-r3.ebuild: - Added doc USE flag to install html manual, fixed a bit dependencies to - allow installation with any php capable web-server, bug #229523, thank - Tiziano Müller for report. - -*cacti-0.8.7b-r3 (19 Aug 2008) - - 19 Aug 2008; Peter Volkov <pva@gentoo.org> -cacti-0.8.7b.ebuild, - -cacti-0.8.7b-r1.ebuild, +cacti-0.8.7b-r3.ebuild: - Added reset_each_patch upstream patch. Removed unused. - - 04 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml: - Describe local USE flags for GLEP 56. - - 27 Apr 2008; Markus Meier <maekke@gentoo.org> cacti-0.8.7b-r2.ebuild: - amd64 stable, bug #214862 - - 12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> - cacti-0.8.7b-r2.ebuild: - ppc stable, bug #214862 - - 27 Mar 2008; Markus Rothe <corsair@gentoo.org> ChangeLog: - Stable on ppc64; bug #214862 - - 27 Mar 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b-r2.ebuild: - alpha/sparc/x86 stable wrt #214862 - - 26 Mar 2008; Markus Rothe <corsair@gentoo.org> cacti-0.8.7b-r2.ebuild: - Stable on ppc64; bug #214862 - -*cacti-0.8.7b-r2 (07 Mar 2008) - - 07 Mar 2008; <pva@gentoo.org> +cacti-0.8.7b-r2.ebuild: - Another patch from upstream, finally it applies correctly. - -*cacti-0.8.7b-r1 (03 Mar 2008) - - 03 Mar 2008; <pva@gentoo.org> -cacti-0.8.6j-r7.ebuild, - -cacti-0.8.7a-r2.ebuild, +cacti-0.8.7b-r1.ebuild: - Added official upstream patch. Cleaned out php4 stuff. Removed bundled-adodb - USE flag, thank Donnie Berkholz for kind review. Removed old and unused - ebuilds. - - 26 Feb 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.7b.ebuild: - alpha/sparc stable wrt #210840 - - 25 Feb 2008; Steve Dibb <beandog@gentoo.org> cacti-0.8.6j-r8.ebuild: - amd64 stable, security bug 209918 - - 25 Feb 2008; Steve Dibb <beandog@gentoo.org> cacti-0.8.7b.ebuild: - amd64 stable, security bug 209918 - - 24 Feb 2008; Markus Meier <maekke@gentoo.org> cacti-0.8.7b.ebuild: - x86 stable, bug #210840 - - 22 Feb 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.7b.ebuild: - Marking cacti-0.8.7b ppc64 for bug 210840 - - 21 Feb 2008; nixnut <nixnut@gentoo.org> cacti-0.8.7b.ebuild: - Stable on ppc wrt bug 210840 - - 19 Feb 2008; Tobias Scherbaum <dertobi123@gentoo.org> - cacti-0.8.6j-r8.ebuild: - ppc stable, bug #209918 - - 15 Feb 2008; Raúl Porcel <armin76@gentoo.org> cacti-0.8.6j-r8.ebuild: - alpha/sparc stable wrt security #209918 - - 14 Feb 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.6j-r8.ebuild: - Marking cacti-0.8.6j-r8 ppc64 for bug 209918 - - 14 Feb 2008; Christian Faulhammer <opfer@gentoo.org> - cacti-0.8.6j-r8.ebuild: - stable x86, security bug 209918 - -*cacti-0.8.7b (13 Feb 2008) -*cacti-0.8.7a-r2 (13 Feb 2008) -*cacti-0.8.6j-r8 (13 Feb 2008) - - 13 Feb 2008; <pva@gentoo.org> files/postinstall-en.txt, metadata.xml, - +cacti-0.8.6j-r8.ebuild, -cacti-0.8.7a.ebuild, -cacti-0.8.7a-r1.ebuild, - +cacti-0.8.7a-r2.ebuild, +cacti-0.8.7b.ebuild: - Version bump. Cleaned a bit postinstall. Security fixes for bug 209918. - Thank you Pierre-Yves Rofes <py AT gentoo.org> for report! Cleaned unstable - vulnerable versions. - - 05 Feb 2008; Markus Rothe <corsair@gentoo.org> cacti-0.8.7a.ebuild: - Stable on ppc64 - - 22 Jan 2008; Brent Baude <ranger@gentoo.org> cacti-0.8.6j-r7.ebuild: - Marking cacti-0.8.6j-r7 ppc to make a happy tree - -*cacti-0.8.7a-r1 (22 Jan 2008) - - 22 Jan 2008; <pva@gentoo.org> -cacti-0.8.6j-r6.ebuild, - -cacti-0.8.7-r1.ebuild, +cacti-0.8.7a-r1.ebuild: - Added upstream fixes. Removed unused ebuilds. - - 21 Jan 2008; Jeroen Roovers <jer@gentoo.org> cacti-0.8.7a.ebuild: - Stable for HPPA (bug #206921). - - 23 Nov 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r7.ebuild: - Stable on ppc64; bug #199509 - - 22 Nov 2007; Raúl Porcel <armin76@gentoo.org> cacti-0.8.6j-r7.ebuild: - alpha/sparc stable wrt security #199509 - - 22 Nov 2007; Christian Faulhammer <opfer@gentoo.org> - cacti-0.8.6j-r7.ebuild: - stable x86, security bug 199509 - - 21 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> - cacti-0.8.6j-r7.ebuild: - Stable on amd64 wrt bug #199509. - -*cacti-0.8.7a (18 Nov 2007) -*cacti-0.8.6j-r7 (18 Nov 2007) - - 18 Nov 2007; <pva@gentoo.org> +cacti-0.8.6j-r7.ebuild, - -cacti-0.8.7.ebuild, +cacti-0.8.7a.ebuild: - New release 0.8.7a and new patch 0.8.6j-r7. Fixes possible Possible SQL - injection issue was resolved, bug #199509. - -*cacti-0.8.7-r1 (03 Nov 2007) - - 03 Nov 2007; <pva@gentoo.org> cacti-0.8.6j-r6.ebuild, - +cacti-0.8.7-r1.ebuild: - Added patches from upstream, fix bug #194166, small changes in 0.8.6j-r6 to - shut up repoman. - -*cacti-0.8.7 (29 Oct 2007) - - 29 Oct 2007; Markus Ullmann <jokey@gentoo.org> metadata.xml, - +cacti-0.8.7.ebuild: - Version bump with a bunch of fixes, check upstream changelog for details - - 19 Jul 2007; Christoph Mende <angelos@gentoo.org> cacti-0.8.6j-r6.ebuild: - Stable on amd64 wrt bug #172378 - - 03 Jul 2007; <pva@gentoo.org> -cacti-0.8.6i-r1.ebuild, - -cacti-0.8.6j-r4.ebuild, -cacti-0.8.6j-r5.ebuild, cacti-0.8.6j-r6.ebuild: - Added pcre and session php checks. Fixed bug #184057. Removed vulnerable to - bug #181112 versions. - - 09 Jun 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r6.ebuild: - Stable on ppc64; bug #181112 - - 09 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> - cacti-0.8.6j-r6.ebuild: - ppc stable, bug #181112 - - 08 Jun 2007; Raúl Porcel <armin76@gentoo.org> cacti-0.8.6j-r6.ebuild: - alpha stable wrt security #181112 - - 08 Jun 2007; <pva@gentoo.org> cacti-0.8.6j-r6.ebuild: - Call require_php_with_use only once. Thank armin76 for the fix. - - 07 Jun 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r5.ebuild: - Stable on ppc64; bug #181112 - - 07 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> - cacti-0.8.6j-r6.ebuild: - Stable on sparc wrt #181112 - - 07 Jun 2007; Christian Faulhammer <opfer@gentoo.org> - cacti-0.8.6j-r6.ebuild: - stable x86, security bug 181112 - -*cacti-0.8.6j-r6 (07 Jun 2007) - - 07 Jun 2007; <pva@gentoo.org> +cacti-0.8.6j-r6.ebuild: - New patch from upstream: snmpwalk_fix. - - 06 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> - cacti-0.8.6j-r5.ebuild: - Stable on sparc wrt security #181112 - -*cacti-0.8.6j-r5 (06 Jun 2007) - - 06 Jun 2007; Raphael Marichez <falco@gentoo.org> - +files/cacti-0.8.6j-dos-large-values.patch, +cacti-0.8.6j-r5.ebuild: - Version bump, security bug 181112 - - 02 Jun 2007; Lars Weiler <pylon@gentoo.org> cacti-0.8.6j-r4.ebuild: - Stable on ppc; bug #174551. - - 13 May 2007; <pva@gentoo.org> cacti-0.8.6i-r1.ebuild, - cacti-0.8.6j-r4.ebuild: - lighttpd is stable on alpha and sparc so removing !archs from RDEPEND. - Actually remove snmp from php check, bug #178263. - - 12 May 2007; Luca Longinotti <chtekk@gentoo.org> cacti-0.8.6i-r1.ebuild, - cacti-0.8.6j-r4.ebuild: - Fix bug #178258 (remove apache1 support). - - 12 May 2007; <pva@gentoo.org> ChangeLog: - I was too fast in my previous bump. cacti works with snmp utilities fine - too. No need in snmp support in php. - - 12 May 2007; <pva@gentoo.org> cacti-0.8.6j-r4.ebuild: - php should be compiled with snmp for cacti. - - 19 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> - cacti-0.8.6j-r4.ebuild: - Stable on sparc wrt #174551 - - 16 Apr 2007; Christian Faulhammer <opfer@gentoo.org> - cacti-0.8.6j-r4.ebuild: - stable x86, bug 174551 - - 15 Apr 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6j-r4.ebuild: - Stable on ppc64; bug #174551 - -*cacti-0.8.6j-r4 (27 Mar 2007) - - 27 Mar 2007; <pva@gentoo.org> -cacti-0.8.6j-r2.ebuild, - -cacti-0.8.6j-r3.ebuild, +cacti-0.8.6j-r4.ebuild: - Patch from upstream (Graph Debug Apache Lockup Issue). - - 10 Mar 2007; Matti Bickel <mabi@gentoo.org> cacti-0.8.6i-r1.ebuild: - ppc stable (bug #155147) - -*cacti-0.8.6j-r3 (27 Feb 2007) - - 27 Feb 2007; <pva@gentoo.org> +cacti-0.8.6j-r3.ebuild: - Use external adodb instead of bundled with package if bundeled-adodb USE - flag is off. Thank Francisco Javier <ffelix AT sshinf.com> for report. - -*cacti-0.8.6j-r2 (26 Feb 2007) - - 26 Feb 2007; <pva@gentoo.org> -cacti-0.8.6j-r1.ebuild, - +cacti-0.8.6j-r2.ebuild: - Another patch from UPSTREAM. - -*cacti-0.8.6j-r1 (28 Jan 2007) - - 28 Jan 2007; <pva@gentoo.org> -cacti-0.8.6j.ebuild, - +cacti-0.8.6j-r1.ebuild: - Upstream released ping_php_version4_snmpgetnext and - tree_console_missing_hosts patches. Thank Hans Rakers <hans AT parse.nl> for - report about ping problem in bug #159278. - - 26 Jan 2007; <pva@gentoo.org> -cacti-0.8.6h_p20060108-r2.ebuild, - -cacti-0.8.6i.ebuild: - Cleaning out vulnerable (see bug #159278) versions. - -*cacti-0.8.6j (21 Jan 2007) - - 21 Jan 2007; <pva@gentoo.org> +cacti-0.8.6j.ebuild: - Version bump reported by Hans Rakers <hans AT parse.nl> in bug #159278. - - 16 Jan 2007; Jason Wever <weeve@gentoo.org> cacti-0.8.6i-r1.ebuild: - Stable on SPARC wrt security bug #159278. - - 14 Jan 2007; Jose Luis Rivero <yoswink@gentoo.org> cacti-0.8.6i-r1.ebuild: - Stable on alpha wrt security bug #159278 - - 14 Jan 2007; Andrej Kacian <ticho@gentoo.org> cacti-0.8.6i-r1.ebuild: - Stable on x86, security bug #159278. - - 13 Jan 2007; Markus Rothe <corsair@gentoo.org> cacti-0.8.6i-r1.ebuild: - Stable on ppc64; bug #159278 - -*cacti-0.8.6i-r1 (07 Jan 2007) - - 07 Jan 2007; Peter Volkov <pva@gentoo.org> +cacti-0.8.6i-r1.ebuild: - Include patches released by upstream. Should close vulnerabilities reported - in bug #159278. - - 23 Nov 2006; Francesco Riosa <vivo@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild, cacti-0.8.6i.ebuild: - dev-db/mysql => virtual/mysql - - 01 Nov 2006; Markus Ullmann <jokey@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - Fixing DEPEND wrt bug #153243 - -*cacti-0.8.6i (14 Oct 2006) - - 14 Oct 2006; Lance Albertson <ramereth@gentoo.org> +cacti-0.8.6i.ebuild: - * Version bump - * Fix misc issues in bug #132038 - * Fixed patching code to be more scalable - - 01 Jun 2006; Markus Ullmann <jokey@gentoo.org> files/postinstall-en.txt: - Adjusting postinstall instructions wrt bug #135082 - - 29 May 2006; Daniel Black <dragonheart@gentoo.org> -cacti-0.8.6g.ebuild, - -cacti-0.8.6g_p20051023.ebuild, -cacti-0.8.6h.ebuild, - -cacti-0.8.6h_p20060108.ebuild, -cacti-0.8.6h_p20060108-r1.ebuild: - punt security vulnerable versions - - 23 May 2006; Markus Rothe <corsair@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - Stable on ppc64 - - 12 May 2006; Michael Sterrett <mr_bones_@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - ppc64 needs www-servers/lighttpd first before being marked stable - - 07 May 2006; Markus Rothe <corsair@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - Stable on ppc64 - - 27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-cacti-0.8.6g, - files/digest-cacti-0.8.6g_p20051023, files/digest-cacti-0.8.6h, - files/digest-cacti-0.8.6h_p20060108, - files/digest-cacti-0.8.6h_p20060108-r1, - files/digest-cacti-0.8.6h_p20060108-r2, Manifest: - Fixing SHA256 digest, pass four - - 13 Apr 2006; Jason Wever <weeve@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - Stable on SPARC wrt security bug #129284. - - 11 Apr 2006; Jose Luis Rivero <yoswink@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - Stable on alpha wrt bug #129284 - - 11 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> - cacti-0.8.6h_p20060108-r2.ebuild: - Stable on x86 wrt bug #129284. - -*cacti-0.8.6h_p20060108-r2 (11 Apr 2006) - - 11 Apr 2006; Lance Albertson <ramereth@gentoo.org> - +cacti-0.8.6h_p20060108-r2.ebuild: - * Rev bump to fix security bug #129284 - -*cacti-0.8.6h_p20060108-r1 (03 Apr 2006) - - 03 Apr 2006; Lance Albertson <ramereth@gentoo.org> - +cacti-0.8.6h_p20060108-r1.ebuild: - * Fixed log/cacti.log to be server owned per bug #126142 - - 12 Mar 2006; Lance Albertson <ramereth@gentoo.org> - files/postinstall-en.txt, cacti-0.8.6h.ebuild, - cacti-0.8.6h_p20060108.ebuild: - * Stable on x86 - * Fixed the rra/ dir to be server owned - * Added additional step to postinst doc - -*cacti-0.8.6h_p20060108 (16 Jan 2006) - - 16 Jan 2006; Lance Albertson <ramereth@gentoo.org> - +cacti-0.8.6h_p20060108.ebuild: - * Version bump (new patched version) - - 16 Jan 2006; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6h.ebuild: - * Corrected ebuild to use httpd-like virtual - -*cacti-0.8.6h (04 Jan 2006) - - 04 Jan 2006; Lance Albertson <ramereth@gentoo.org> - -cacti-0.8.6f-r1.ebuild, -cacti-0.8.6f-r2.ebuild, - cacti-0.8.6g_p20051023.ebuild, +cacti-0.8.6h.ebuild: - * Version bump - * Stable on x86 - * Clean out old ebuilds - - 19 Dec 2005; Bryan Østergaard <kloeri@gentoo.org cacti-0.8.6g.ebuild: - Stable on alpha. - - 17 Dec 2005; Markus Rothe <corsair@gentoo.org> - cacti-0.8.6g_p20051023.ebuild: - Added ~ppc64 - - 18 Nov 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6f.ebuild, - cacti-0.8.6f-r1.ebuild, cacti-0.8.6g.ebuild, - cacti-0.8.6g_p20051023.ebuild: - * Removed old ebuild - * Added >=dev-db/mysql-5 blocker (bug #112010) - * Adjusted httpd dep (now have a choice between apache1, apache2, or - lighttpd (only on 0.8.6g_p20051023)) bug #107512 - - 24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> cacti-0.8.6g.ebuild: - Stable on sparc - -*cacti-0.8.6g_p20051023 (23 Oct 2005) - - 23 Oct 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6g.ebuild, - +cacti-0.8.6g_p20051023.ebuild: - * Stable on x86 - * Added new patched version for fixes - - 15 Sep 2005; Aron Griffis <agriffis@gentoo.org> cacti-0.8.6f-r1.ebuild: - Mark 0.8.6f-r1 stable on alpha - -*cacti-0.8.6g (10 Sep 2005) - - 10 Sep 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6e.ebuild, - +cacti-0.8.6g.ebuild: - * New version release bump - * Remove old version - -*cacti-0.8.6f-r2 (09 Sep 2005) - - 09 Sep 2005; Lance Albertson <ramereth@gentoo.org> - +cacti-0.8.6f-r2.ebuild: - * Fixed php DEPEND to use virtuals per bug #102827 - - 03 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> - cacti-0.8.6f-r1.ebuild: - Stable on sparc - -*cacti-0.8.6f-r1 (03 Aug 2005) - - 03 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> - +cacti-0.8.6f-r1.ebuild: - Revision bump with upstream patches. - - 03 Jul 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6f.ebuild: - * stable on x86 (bug #97475) - - 02 Jul 2005; Jason Wever <weeve@gentoo.org> cacti-0.8.6f.ebuild: - Stable on SPARC wrt bug #97475. - -*cacti-0.8.6f (02 Jul 2005) - - 02 Jul 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6b.ebuild, - -cacti-0.8.6c.ebuild, -cacti-0.8.6d.ebuild, +cacti-0.8.6f.ebuild: - * Added 0.8.6f for a security bump (bug #97475) - * Cleaned out old ebuilds - - 30 Jun 2005; Lance Albertson <ramereth@gentoo.org> - files/digest-cacti-0.8.6e, Manifest: - fixed digest and uploaded correct tarball for 0.8.6e - - 21 Jun 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml, - cacti-0.8.6e.ebuild: - Security Bump per bug #96243 - (SQL injection / global php var security issues) - * x86 & sparc marked stable - * alpha, amd64, ppc marked testing - * Updated metadata - - 17 Jun 2005; Lance Albertson <ramereth@gentoo.org> - files/digest-cacti-0.8.6e, Manifest: - Updated digest for new tarball from author - -*cacti-0.8.6e (15 Jun 2005) - - 15 Jun 2005; <solar@gentoo.org> +cacti-0.8.6e.ebuild: - - added cacti-0.8.6e masked by request. - - 02 May 2005; Eldad Zack <eldad@gentoo.org> files/postinstall-en.txt, - cacti-0.8.6b.ebuild, cacti-0.8.6c.ebuild, cacti-0.8.6d.ebuild: - Fixed to use the webapp_configfile function for include/config.php. Updated - postinstall accordingly. Closes bug #90908. Thanks to Andy Blyler - <ajb@blyler.cc>. - -*cacti-0.8.6d (29 Apr 2005) - - 29 Apr 2005; Martin Holzer <mholzer@gentoo.org> +cacti-0.8.6d.ebuild: - Version bumped. - - 15 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt: - More updates to postinst-en.txt for bug 83673. Thanks to Jakub Moc for - helping me get the upgrade instructions up-to-date (and correct). - - 09 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt, - cacti-0.8.6b.ebuild, cacti-0.8.6c.ebuild: - Update postinst-en.txt for bug 83673; updated both ebuilds to use - built_with_use instead of the homegrown check_with_use() function. Also - fixed the dodir ${D}... tidbit which caused obvious unwanted side effects. - - 04 Mar 2005; Jason Wever <weeve@gentoo.org> cacti-0.8.6c.ebuild: - Stable on sparc. - - 25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> cacti-0.8.6c.ebuild: - Marked stable on x86. - -*cacti-0.8.6c (02 Jan 2005) - - 02 Jan 2005; Martin Holzer <mholzer@gentoo.org> files/postinstall-en.txt, - +cacti-0.8.6c.ebuild: - Version bumped. - - 07 Nov 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.6b.ebuild: - Stable on sparc. - - 06 Nov 2004; Eldad Zack <eldad@gentoo.org> -cacti-0.8.5a-r1.ebuild, - cacti-0.8.6b.ebuild: - x86 stable - - 25 Oct 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.5a-r2.ebuild: - Stable on sparc. - - 24 Oct 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r2.ebuild: - Marked x86 stable - - 14 Oct 2004; Eldad Zack <eldad@gentoo.org> +files/postinstall-en.txt, - cacti-0.8.6b.ebuild: - Better postinst instructions: using webapp.eclass postinst support - -*cacti-0.8.6b (14 Oct 2004) - - 14 Oct 2004; Eldad Zack <eldad@gentoo.org> +cacti-0.8.6b.ebuild: - Version bump. Updated deps (cron, php). Check useflags of php/mod_php. Got rid - of version detection, and corrrected a few postinst instructions. - -*cacti-0.8.5a-r2 (23 Aug 2004) - - 23 Aug 2004; Eldad Zack <eldad@gentoo.org> +cacti-0.8.5a-r2.ebuild: - Migrated ebuild from webapp-apache.eclass to use the webapp.eclass. - Closes bug #52596. - - 17 Aug 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r1.ebuild: - Moved include/config.php to include/config-sample.php, so we won't overwrite - old config. - -*cacti-0.8.5a-r1 (17 Aug 2004) - - 17 Aug 2004; Eldad Zack <eldad@gentoo.org> - +files/cacti-0.8.5a-sql-injection.patch, +cacti-0.8.5a-r1.ebuild: - Security patch (SQL Injection): bumping to -r1 with x86 stable. - - 08 Aug 2004; Tom Martin <slarti@gentoo.org> cacti-0.8.5a.ebuild: - Typo in DESCRIPTION: frondend -> frontend. Bug 59717. - - 07 Jul 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.5a.ebuild: - Stable on sparc. - - 05 Jul 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a.ebuild: - Added additional install instructions (crontab). Closes #53709. Thanks to - Lorinc Czegledi <lorinc.czegledi@mail.cpst.hu>. Also fixed previous version - detection. - - 08 May 2004; Danny van Dyk <kugelfang@gentoo.org> cacti-0.8.5a.ebuild: - Marked ~amd64. - - 19 Apr 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5a.ebuild: - x86 stable. - -*cacti-0.8.5a (10 Apr 2004) - - 10 Apr 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5a.ebuild: - Version bumped. - -*cacti-0.8.5 (29 Feb 2004) - - 29 Feb 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5.ebuild: - Version bumped. Closes 43137. - - 15 Dec 2003; Stuart Herbert <stuart@gentoo.org> cacti-0.8.3a.ebuild, - cacti-0.8.4.ebuild: - Fix for bug #32636 - - 05 Dec 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.4.ebuild: - x86 stable. - - 05 Dec 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild, - cacti-0.8.3a.ebuild, cacti-0.8.4.ebuild: - changing chown. closes #35127. - -*cacti-0.8.4 (17 Nov 2003) - - 17 Nov 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild, - cacti-0.8.4.ebuild: - Version bumped. - - 17 Nov 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild: - adding webapps-apache.eclass - - 23 Sep 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild, - cacti-0.8.3.ebuild, cacti-0.8.3a.ebuild: - Changed mysql depend to useflag. Closes #29429. - -*cacti-0.8.3a (01 Sep 2003) - - 01 Sep 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild: - Version bumpe.d - -*cacti-0.8.3 (31 Aug 2003) - - 31 Aug 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3.ebuild: - Version bumped. - -*cacti-0.8.2a (30 Jul 2003) - - 30 Jul 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.2a.ebuild: - Version bumped. - -*cacti-0.8.1-r1 (30 Jul 2003) - - 30 Jul 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.1-r1.ebuild: - Source is no more installed. Closes #23393. - -*cacti-0.8.1 (12 Jun 2003) - - 12 Jun 2003; Troy Dack <tad@gentoo.org> cacti-0.8.1.ebuild: - Version Bump. Now works with net-snmp (default for virtual/snmp) and ucd-snmp. - Updated postinst einfo message. - - 13 Jun 2003; Mike Frysinger <vapier@gentoo.org> : - Permissions fix, variable fix, dos format fix (#20686) - -*cacti-0.6.8a (23 Oct 2002) - - 13 Jun 2003; Mike Frysinger <vapier@gentoo.org> : - Permissions fix, variable fix, dos format fix (#20686) - - 13 May 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild: - Added net-analyzer/rrdtool to RDEPEND. Closes #20953 - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 05 Apr 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild: - Digest fix, marked as stable - - 14 Nov 2002; Mike Frysinger <vapier@gentoo.org> : - Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf - - 23 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by me. diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest deleted file mode 100644 index aaa329f..0000000 --- a/net-analyzer/cacti/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX postinstall-en.txt 2249 RMD160 2703588d7971022699b58b2e5a113ab970124f4d SHA1 8c34cadfe75d1bca0eaaae66a5981f0ab575ea3f SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d -DIST cacti-0.8.7g.tar.gz 2236916 RMD160 4972f1fe2787925da6a1f0f71990ff4f5e74df7f SHA1 a5a710653e158b1bc950de0a1e2c60ee364bf782 SHA256 d09b3bf54f51bd42b2db0a62521cf6e408716978f75d6509ec56027c49c44585 -DIST cacti-0.8.7h.tar.gz 2249323 RMD160 923492a3f36e5d320570ebfad9b4136acf7b9eb7 SHA1 4311cff2ec8883c013efd0225c73d145bcc1cf00 SHA256 2e3dc330b5b3ee374b2e553650d032441c25831b39ddcf123ef102492f20603c -DIST cacti-0.8.7i.tar.gz 2250128 RMD160 6163b5fccb850db4d7083419ef5b9116dc4018a2 SHA1 a3fd64b8ced45be95b9cf6154a31038d575baa02 SHA256 89846762b8f4586532ff247ec7331958f5e4a8c3c599ff8aceb53815fbf9d1cb -DIST cacti-0.8.8a.tar.gz 2273280 RMD160 1462a71af844810a3451c24fd733b3f2351b75df SHA1 e66f5fde96b28b273a9e62f79f8a7bb8827812c2 SHA256 9fea2b6c438ebf2740b5982a6ff7cfd2816e48ea88a347ef0ef238c7b4875955 -DIST data_source_deactivate.patch 510 RMD160 92c634ba94e0e268a6cbfe299de62e4205ddba17 SHA1 27bb624280ad74cbede70da8984fb28b342b5c2b SHA256 52155c5ca38a8df1adcc8a5b4d0bc1b4befa7ede4c56d10dba64cbde2c54042e -DIST graph_list_view.patch 7636 RMD160 24df29f9e1c6bff6b7dfc6617770eccfa0ec60ba SHA1 80dbfc9fdb206845726102cee529b221592b91d3 SHA256 e43b2cf3c53029880ac16a9b86036d5136ab2de116bfba868fac2abd2ed14778 -DIST html_output.patch 7317 RMD160 2f4e418ae9dd0fea0471fbdb5f899d6308599554 SHA1 f4c98092fbdf894f667be419dd114da47a6abf67 SHA256 276811704d6f4353542461c04a2561721bcc784326feefff460fae45c3849278 -DIST ldap_group_authenication.patch 591 RMD160 8d1a72bf0a0e27d95acd70ec3bdea678b2b356c0 SHA1 7fdedb203493ea139f2590ccd38840e108705ef4 SHA256 413a781c5aaa4c6ce8eb152f1ecbeb87c4efa5623c5b839c9c5103b6db6e0989 -DIST ping.patch 1033 RMD160 32946f8a0fa169fd711a2ff1c292e5022e772211 SHA1 23e5844a311bd5549d71bf784366d7e4969a4f41 SHA256 63c56b55aaf41a5e10908bb8ecffb47f74e11254d7e46223d8d04a9df48eda5e -DIST poller_interval.patch 5852 RMD160 06a6edbb80c4c05ec00cf17340a68252e8b26b27 SHA1 2764aad8ab9335c105e5aa8e3fb9f80b9a2bcb9d SHA256 64a6748573395956565c9886cc999a92655ad7f5ba62c53b3299d047912d3aaf -DIST script_server_command_line_parse.patch 3038 RMD160 b87ecd44d0d31ceead87e67447990407d84fbeb5 SHA1 72b35e1b7388062301ed8c8bed99b98dec62bd22 SHA256 40c8ad2dcc6664360ee9941849d7fff1c136e1d942f7ba2a2ea602da20a39e56 -EBUILD cacti-0.8.7g.ebuild 2115 RMD160 da2268f75bbfc9a6ad1fd68be5aa26af0047be7e SHA1 daaa1fee7695ccde4923e0cc9c9ea1a6a39ca208 SHA256 1b221d71f9497008d4c7de9d56102e1ab223abd3ca6457beae3aafc615bbb54a -EBUILD cacti-0.8.7h.ebuild 1964 RMD160 5c0dc7f641cd2365fce2e4b55218ff44a2ab3c4c SHA1 fb7f090f6d92071f081f1f4a6e79bf768ec3e404 SHA256 af5365fbc6b0bc2da49885abe0ba64c810ce87d6d691d030e05bc3b59c49b378 -EBUILD cacti-0.8.7i.ebuild 1963 RMD160 b94d0875ec3f0857676f5a3cf40efae9c88a27a6 SHA1 6508fb7732dd49b673d4558af286cf1864655e39 SHA256 5c962312f6102a9ab2b5bacdce09226a42fca1513ebeecbc26ba6cf0cd16aafb -EBUILD cacti-0.8.8a.ebuild 2017 RMD160 ef6f1f15081e3c060d45a7634b030f5e4e99fb73 SHA1 0eeb3807b9ceeb19b0e35228c4895b36fb606d76 SHA256 a36a139b49e9bb1ffaa88db174f03cde94f87c7b599e270045bd4aebcc189b05 -MISC ChangeLog 26824 RMD160 6e7c510168866686b301a8584c46cdd0f695ecb8 SHA1 ca0ea7ffd1836278a1fcc4114090f8691ce34ee0 SHA256 0bda9f8fb626076c31d5d3a617a1f19de722bb0330dd558e42388ac859d48614 -MISC metadata.xml 803 RMD160 b497804bac33062b7f13330acef0ef28bea19f65 SHA1 031e32c4f5ffe0fc67943674530e880d02f5f2a0 SHA256 db81b920eb3683d9e4fc323bb2399156dfc4a8a0f5d4874505e0c1891dd17819 diff --git a/net-analyzer/cacti/cacti-0.8.7g.ebuild b/net-analyzer/cacti/cacti-0.8.7g.ebuild deleted file mode 100644 index 5367e24..0000000 --- a/net-analyzer/cacti/cacti-0.8.7g.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7g.ebuild,v 1.7 2011/12/23 00:04:10 halcy0n Exp $ - -EAPI="2" - -inherit eutils webapp depend.php - -# Support for _p* in version. -MY_P=${P/_p*/} -HAS_PATCHES=1 - -DESCRIPTION="Cacti is a complete frontend to rrdtool" -HOMEPAGE="http://www.cacti.net/" -SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" - -# patches -if [ "${HAS_PATCHES}" == "1" ] ; then - UPSTREAM_PATCHES="data_source_deactivate - graph_list_view - html_output - ldap_group_authenication - script_server_command_line_parse - ping - poller_interval" - for i in ${UPSTREAM_PATCHES} ; do - SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch" - done -fi - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86" -IUSE="snmp doc" - -DEPEND="" - -need_httpd_cgi - -RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 ) - net-analyzer/rrdtool - dev-php/adodb - virtual/mysql - virtual/cron - dev-lang/php[cli,mysql,xml,session,sockets] - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )" - -src_unpack() { - unpack ${MY_P}.tar.gz - if [ "${HAS_PATCHES}" == "1" ] ; then - [ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P} - fi -} - -src_prepare() { - if [ "${HAS_PATCHES}" == "1" ] ; then - # patches - for i in ${UPSTREAM_PATCHES} ; do - EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch - done ; - fi - - sed -i -e \ - 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ - "${S}"/include/global.php - - rm -rf lib/adodb # don't use bundled adodb -} - -src_compile() { :; } - -src_install() { - webapp_src_preinst - - rm LICENSE README - dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die - use doc && dohtml -r docs/html/ - rm -rf docs - - edos2unix `find -type f -name '*.php'` - - dodir ${MY_HTDOCSDIR} - cp -r . "${D}"${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR}/rra - webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log - webapp_configfile ${MY_HTDOCSDIR}/include/config.php - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - webapp_src_install -} diff --git a/net-analyzer/cacti/cacti-0.8.7h.ebuild b/net-analyzer/cacti/cacti-0.8.7h.ebuild deleted file mode 100644 index eca3a6d..0000000 --- a/net-analyzer/cacti/cacti-0.8.7h.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7h.ebuild,v 1.4 2011/11/13 14:50:52 maekke Exp $ - -EAPI="2" - -inherit eutils webapp depend.php - -# Support for _p* in version. -MY_P=${P/_p*/} -UPSTREAM_PATCHES="" - -DESCRIPTION="Cacti is a complete frontend to rrdtool" -HOMEPAGE="http://www.cacti.net/" -SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" - -# patches -if [[ -n ${UPSTREAM_PATCHES} ]]; then - for i in ${UPSTREAM_PATCHES}; do - SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch" - done -fi - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86" -IUSE="snmp doc" - -DEPEND="" - -need_httpd - -RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 ) - net-analyzer/rrdtool - dev-php/adodb - virtual/mysql - virtual/cron - dev-lang/php[cli,mysql,xml,session,sockets] - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )" - -src_unpack() { - unpack ${MY_P}.tar.gz - if [[ -n ${UPSTREAM_PATCHES} ]]; then - [ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P} - fi -} - -src_prepare() { - if [[ -n ${UPSTREAM_PATCHES} ]]; then - for i in ${UPSTREAM_PATCHES} ; do - EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch - done ; - fi - - sed -i -e \ - 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ - "${S}"/include/global.php || die - - rm -rf lib/adodb || die # don't use bundled adodb -} - -src_compile() { :; } - -src_install() { - webapp_src_preinst - - rm LICENSE README || die - dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die - use doc && dohtml -r docs/html/ - rm -rf docs - - edos2unix `find -type f -name '*.php'` - - dodir ${MY_HTDOCSDIR} - cp -r . "${D}"${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR}/rra - webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log - webapp_configfile ${MY_HTDOCSDIR}/include/config.php - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - webapp_src_install -} diff --git a/net-analyzer/cacti/cacti-0.8.7i.ebuild b/net-analyzer/cacti/cacti-0.8.7i.ebuild deleted file mode 100644 index 8fbcd93..0000000 --- a/net-analyzer/cacti/cacti-0.8.7i.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7i.ebuild,v 1.4 2012/01/01 15:12:25 armin76 Exp $ - -EAPI="2" - -inherit eutils webapp depend.php - -# Support for _p* in version. -MY_P=${P/_p*/} -UPSTREAM_PATCHES="" - -DESCRIPTION="Cacti is a complete frontend to rrdtool" -HOMEPAGE="http://www.cacti.net/" -SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" - -# patches -if [[ -n ${UPSTREAM_PATCHES} ]]; then - for i in ${UPSTREAM_PATCHES}; do - SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch" - done -fi - -LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86" -IUSE="snmp doc" - -DEPEND="" - -need_httpd - -RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 ) - net-analyzer/rrdtool - dev-php/adodb - virtual/mysql - virtual/cron - dev-lang/php[cli,mysql,xml,session,sockets] - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )" - -src_unpack() { - unpack ${MY_P}.tar.gz - if [[ -n ${UPSTREAM_PATCHES} ]]; then - [ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P} - fi -} - -src_prepare() { - if [[ -n ${UPSTREAM_PATCHES} ]]; then - for i in ${UPSTREAM_PATCHES} ; do - EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch - done ; - fi - - sed -i -e \ - 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ - "${S}"/include/global.php || die - - rm -rf lib/adodb || die # don't use bundled adodb -} - -src_compile() { :; } - -src_install() { - webapp_src_preinst - - rm LICENSE README || die - dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die - use doc && dohtml -r docs/html/ - rm -rf docs - - edos2unix `find -type f -name '*.php'` - - dodir ${MY_HTDOCSDIR} - cp -r . "${D}"${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR}/rra - webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log - webapp_configfile ${MY_HTDOCSDIR}/include/config.php - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - webapp_src_install -} diff --git a/net-analyzer/cacti/cacti-0.8.8a.ebuild b/net-analyzer/cacti/cacti-0.8.8a.ebuild deleted file mode 100644 index d0fb04e..0000000 --- a/net-analyzer/cacti/cacti-0.8.8a.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.7i.ebuild,v 1.4 2012/01/01 15:12:25 armin76 Exp $ - -EAPI="4" - -inherit eutils webapp depend.php - -# Support for _p* in version. -MY_P=${P/_p*/} -UPSTREAM_PATCHES="" - -DESCRIPTION="Cacti is a complete frontend to rrdtool" -HOMEPAGE="http://www.cacti.net/" -SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz" - -# patches -if [[ -n ${UPSTREAM_PATCHES} ]]; then - for i in ${UPSTREAM_PATCHES}; do - SRC_URI="${SRC_URI} http://www.cacti.net/downloads/patches/${PV/_p*}/${i}.patch" - done -fi - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="snmp doc" - -DEPEND="" - -need_httpd - -RDEPEND="snmp? ( >=net-analyzer/net-snmp-5.1.2 ) - net-analyzer/rrdtool - dev-php/adodb - virtual/mysql - virtual/cron - dev-lang/php[cli,mysql,xml,session,sockets] - || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )" - -src_unpack() { - unpack ${MY_P}.tar.gz - if [[ -n ${UPSTREAM_PATCHES} ]]; then - [ ! ${MY_P} == ${P} ] && mv ${MY_P} ${P} - fi -} - -src_prepare() { - if [[ -n ${UPSTREAM_PATCHES} ]]; then - for i in ${UPSTREAM_PATCHES} ; do - EPATCH_OPTS="-p1 -d ${S} -N" epatch "${DISTDIR}"/${i}.patch - done ; - fi - - sed -i -e \ - 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \ - "${S}"/include/global.php || die - - rm -rf lib/adodb || die # don't use bundled adodb -} - -src_compile() { :; } - -src_install() { - webapp_src_preinst - - rm LICENSE README || die - dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt} || die - use doc && dohtml -r docs/html/ - rm -rf docs - - edos2unix `find -type f -name '*.php'` - - dodir ${MY_HTDOCSDIR#${EPREFIX}} - cp -r . "${D}"${MY_HTDOCSDIR} - - webapp_serverowned ${MY_HTDOCSDIR#${EPREFIX}}/rra - webapp_serverowned ${MY_HTDOCSDIR#${EPREFIX}}/log/cacti.log - webapp_configfile ${MY_HTDOCSDIR#${EPREFIX}}/include/config.php - webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt - - webapp_src_install -} diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt deleted file mode 100644 index 732c718..0000000 --- a/net-analyzer/cacti/files/postinstall-en.txt +++ /dev/null @@ -1,62 +0,0 @@ - -New Install - -1. Create the new cacti database - shell> mysqladmin -p --user=root create cacti -2. Import the default cacti database: - shell> mysql -p --user=root cacti < ${MY_INSTALLDIR}/cacti.sql -3. Create a MySQL username and password for cacti. - shell> mysql -p --user=root mysql - mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword'; - mysql> flush privileges; -4. Edit ${MY_INSTALLDIR}/include/config.php and modify the MySQL user, - password and database for your cacti configuration. - - Example: - \$database_default = "cacti"; - \$database_hostname = "localhost"; - \$database_username = "cactiuser"; - \$database_password = "somepassword"; - -5. Point your web browser to: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/ - Make sure to fill in all of the path variables carefully and - correctly on the following screen. -6. After you've gone through the setup wizard, go back to the main cacti page - and login as: - Username: admin - Password: admin - -Upgrading - -1. Backup DB in the case that something goes wrong. - shell> mysqldump -l --add-drop-table cacti > mysql.cacti -2. Backup your rra/ directory and any custom scripts in your scripts/ - directory. -3. Edit ${MY_INSTALLDIR}/include/config.php, and confirm that the MySQL user, - password and database is correct for your cacti configuration. - - Example: - \$database_default = "cacti"; - \$database_hostname = "localhost"; - \$database_username = "cactiuser"; - \$database_password = "somepassword"; -4. Point your web browser to: http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/ - Select "Upgrade". - Make sure to fill in all of the path variables carefully and - correctly on the following screen. - -Cronjob - -Either new or upgrading, make sure you have a cron job - Add this line to -your /etc/crontab file: - - */5 * * * * ${VHOST_SERVER_GID} /usr/bin/php ${MY_INSTALLDIR}/poller.php > /dev/null 2>&1 - -Note that you should use poller.php as the cronjob instead of cmd.php (as it was with -earlier versions) to enable you to switch between cmd.php and cactid. - -Also make sure that the user poller.php runs as ( ${VHOST_SERVER_GID} ) has -permission to create new files in Cacti's 'rra/' directory which is -${MY_INSTALLDIR}/rra - - diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml deleted file mode 100644 index 2ade181..0000000 --- a/net-analyzer/cacti/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>netmon</herd> - <maintainer> - <email>pva@gentoo.org</email> - <name>Peter Volkov</name> - </maintainer> - <longdescription lang="en"> - Cacti is a complete network graphing solution designed to harness the - power of RRDTool's data storage and graphing functionality. Cacti - provides a fast poller, advanced graph templating, multiple data - acquisition methods, and user management features out of the box. All of - this is wrapped in an intuitive, easy to use interface that makes sense - for LAN-sized installations up to complex networks with hundreds of - devices. - </longdescription> - <use> - <flag name='doc'>install html documentation</flag> - </use> -</pkgmetadata> diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog deleted file mode 100644 index ae0afb6..0000000 --- a/net-analyzer/hping/ChangeLog +++ /dev/null @@ -1,212 +0,0 @@ -# ChangeLog for net-analyzer/hping -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.52 2011/05/10 10:38:41 xmw Exp $ - - 10 May 2011; Michael Weber <xmw@gentoo.org> hping-2.0.0_rc3-r2.ebuild, - hping-3_pre20051105-r3.ebuild, files/bytesex.h.patch: - added arm support (bug 361279), added ~arm keyword (bug 302981) - - 02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> - hping-2.0.0_rc3-r1.ebuild, hping-2.0.0_rc3-r2.ebuild: - Use net-libs/libpcap instead of virtual/libpcap wrt #358835. - -*hping-3_pre20051105-r3 (30 Nov 2010) - - 30 Nov 2010; Jeroen Roovers <jer@gentoo.org> -hping-3_pre20051105-r1.ebuild, - -hping-3_pre20051105-r2.ebuild, +hping-3_pre20051105-r3.ebuild, - +files/hping-3_pre20051105-scan-overflow.patch: - Fix overflow in scan.c (bug #340251). Simplify src_configure and export CC - there. Set RDEPEND. - -*hping-3_pre20051105-r2 (11 May 2010) - - 11 May 2010; Jeroen Roovers <jer@gentoo.org> - +hping-3_pre20051105-r2.ebuild: - Do not hardcode better values in Makefile.in either, but set them in the - emake env. Change program name in man page thanks to Džen (bug #318823) - and install man page without version suffix. - - 23 Dec 2009; Jeroen Roovers <jer@gentoo.org> - hping-3_pre20051105-r1.ebuild, +files/hping-3_pre20051105-libtcl.patch: - Build the Tcl linker arguments more reliably (bug #247282). - - 22 Dec 2009; Jeroen Roovers <jer@gentoo.org> hping-2.0.0_rc3-r2.ebuild: - Do not install COPYING. Break up long line. - -*hping-2.0.0_rc3-r2 (22 Dec 2009) - - 22 Dec 2009; Jeroen Roovers <jer@gentoo.org> +hping-2.0.0_rc3-r2.ebuild, - +files/hping-2.0.0_rc3-gentoo.patch, hping-3_pre20051105-r1.ebuild: - Apply the same patches to hping-2 (see previous ChangeLog entry, bar the - tcl stuff). Remove useless USE=debug (set -g through CFLAGS instead if you - want, both v2 and v3). - -*hping-3_pre20051105-r1 (22 Dec 2009) - - 22 Dec 2009; Jeroen Roovers <jer@gentoo.org> hping-3_pre20051105.ebuild, - +hping-3_pre20051105-r1.ebuild, +files/hping-3_pre20051105-ldflags.patch, - +files/hping-3_pre20051105-tcl.patch: - Add tcl8.5 patch (stupid configure script). Respect LDFLAGS. Call epatch - just once. Call sed just once. Respect libdir. Do not call econf but - configure. Readd mysteriously disappearing keywords. - - 06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -hping-2.0.0_rc2-r1.ebuild, - -hping-2.0.0_rc3.ebuild: - Cleanup - - 30 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org> - hping-3_pre20051105.ebuild: - Re-add bytesex.h.patch for hping3, bug #185679 - - 21 Feb 2007; Charlie Shepherd <masterdriverz@gentoo.org> metadata.xml: - avenj has retired - removing from metadata - - 03 Feb 2007; Jason Wever <weeve@gentoo.org> hping-3_pre20051105.ebuild: - Added ~sparc keyword. - - 20 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> - hping-2.0.0_rc3-r1.ebuild: - marked ~mips; bug #102489 - - 09 Dec 2006; Cedric Krier <cedk@gentoo.org> hping-3_pre20051105.ebuild: - Fix tcltk flag for bug #157597 - -*hping-3_pre20051105 (13 Nov 2006) - - 13 Nov 2006; Markus Ullmann <jokey@gentoo.org> - +files/hping-3_pre20051105.patch, metadata.xml, - +hping-3_pre20051105.ebuild: - Version bump thanks to Robert Buchholz - - 25 Aug 2005; Aron Griffis <agriffis@gentoo.org> files/bytesex.h.patch, - hping-2.0.0_rc3-r1.ebuild: - update bytesex patch and stable on ia64 - - 07 Apr 2005; Simon Stelling <blubb@gentoo.org> hping-2.0.0_rc3-r1.ebuild: - stable on amd64 - - 05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> - hping-2.0.0_rc3-r1.ebuild: - Stable on ppc. - - 29 Jan 2005; Daniel Black <dragonheart@gentoo.org> - hping-2.0.0_rc2-r1.ebuild, hping-2.0.0_rc3-r1.ebuild, - hping-2.0.0_rc3.ebuild: - changed net-libs/libpcap depend to virtual/libcap - - 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 30 Nov 2004; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc3-r1.ebuild: - Stable on hppa. - - 11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> - hping-2.0.0_rc3-r1.ebuild: - Stable on alpha. - - 07 Nov 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc3-r1.ebuild: - Stable on sparc. - - 06 Nov 2004; Eldad Zack <eldad@gentoo.org> -hping-2.0.0_rc1.ebuild, - -hping-2.0.0_rc2.ebuild, hping-2.0.0_rc3-r1.ebuild: - x86 stable. - - 19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> hping-2.0.0_rc2.ebuild, - hping-2.0.0_rc3.ebuild: - Stable on amd64. - -*hping-2.0.0_rc3-r1 (20 Aug 2004) - - 20 Aug 2004; Eldad Zack <eldad@gentoo.org> +files/hping-bridge.patch, - +hping-2.0.0_rc3-r1.ebuild: - Ethernet bridge interface fix: patch contributed by Nathan - <nathan.stocks@gmail.com>. Closes #59534. - - 08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> hping-2.0.0_rc3.ebuild: - Stable on alpha. - - 29 Jul 2004; Guy Martin <gmsoft@gentoo.org> -files/amd64-header-fix.patch, - +files/bytesex.h.patch, hping-2.0.0_rc3.ebuild: - Added byte ordering fix for amd64 and hppa in bytesex.h.patch. Stable on hppa. - - 22 Jul 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc3.ebuild: - Stable on sparc. - - 27 Jul 2004; <malc@gentoo.org> hping-2.0.0_rc3.ebuild: - Teach bytesex.h to know __x86_64__ fixes bug #57834 - - 11 Jul 2004; Eldad Zack <eldad@gentoo.org> hping-2.0.0_rc3.ebuild: - marked x86 stable - - 08 Jul 2004; Eldad Zack <eldad@gentoo.org> hping-2.0.0_rc2-r1.ebuild, - hping-2.0.0_rc2.ebuild, hping-2.0.0_rc3.ebuild: - added debug to IUSE - - 07 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> hping-2.0.0_rc3.ebuild: - fix use invocation (again); IUSE; tidy - - 01 Jul 2004; Eldad Zack <eldad@gentoo.org> hping-2.0.0_rc3.ebuild: - Added extra docs. Closes #52234. Thanks to Devon <gentoo@noved.org>. - - 09 Jun 2004; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc1.ebuild, - hping-2.0.0_rc2-r1.ebuild, hping-2.0.0_rc2.ebuild, hping-2.0.0_rc3.ebuild: - Fix use invocation - - 05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> hping-2.0.0_rc2-r1.ebuild: - Stable on alpha. - -*hping-2.0.0_rc3 (14 May 2004) - - 14 May 2004; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc3.ebuild : - Version bump. Ebuild from Daniel Fullmer (lsmod@hotmail.com) in bug - #50140. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc2-r1.ebuild: - Add inherit eutils - - 06 Jan 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc2-r1.ebuild: - Marked stable on sparc. - - 19 Dec 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2-r1.ebuild : - Fix for a fix. Bug 33495. - - 18 Dec 2003; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc2-r1.ebuild: - Marked stable on hppa. - -*hping-2.0.0_rc2-r1 (03 Dec 2003) - - 03 Dec 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2-r1.ebuild, - files/wlan-header-fix.patch : - Patch from GMsoft to fix a WLAN bug. Bug #34481. - - 20 Nov 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild : - Build fixes from trauma@web.de, bug #33495. - - 24 Nov 2003; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc2.ebuild: - Add ~alpha - -*hping-2.0.0_rc2 (03 March 2003) - - 03 Aug 2003; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc2.ebuild : - Added hppa to KEYWORDS. - - 03 March 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild : - Version bump. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - - 28 Jun 2002; Thilo Bangert <bangert@gentoo.org> : - moved to net-analyzer - added SLOT - -*hping-2.0.0_rc1 (1 Feb 2002) - - 15 Feb 2003; Mark Guertin <gerk@gentoo.org> hping-2.0.0_rc1.ebuild : - set ppc in keywords - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest deleted file mode 100644 index 5cac269..0000000 --- a/net-analyzer/hping/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX bytesex.h.patch 672 SHA1 888e93fd1278f7a7c4a63ef925bc7f462a04c060 SHA256 4d4c4538eb0d3d52295b8ef39f82222b43f2e95338ee64b5ef214c3f4cf7d24e -AUX hping-3_pre20051105-ldflags.patch 674 SHA1 92e910de467ee708fce9d39db7bd9d6a12a75015 SHA256 e544623ffae1dbf33617dd572573d82366b14104c683740f63d9d77daaf7fe59 -AUX hping-3_pre20051105-libtcl.patch 579 SHA1 d7f6ed8789b05f44123d16d07c4d493c74100f78 SHA256 dae42d02d5498fb27e86bf41c47d5bcec960c811ad3c6e8556c40aa84693d914 -AUX hping-3_pre20051105-scan-overflow.patch 371 SHA1 97ea7b28214d30864323a289c77c50acfe151a06 SHA256 ada10fb6eb9ff56fb1382b52e8710c37338dfd7b6b746eae026af84af3105986 -AUX hping-3_pre20051105-tcl.patch 326 SHA1 5387d407bf0ac765b55188253aba62fb09168426 SHA256 1640cc7e63ddfb27b182e79ca5ebbc8d611926142b7ac3de11d7afefaa11d4cf -AUX hping-3_pre20051105.patch 1325 SHA1 f46d4f8836e39bb7bc817b1b28b1952ad8da258d SHA256 d1f52547424d4f169a809ccf371b2e5e75242054065342c7dc2633a78bfd6586 -DIST hping3-20051105.tar.gz 584001 RMD160 e4ec209228b5cb99e2d561c5a7b1c82ff8abe540 SHA1 e13d27e14e7f90c2148a9b00a480781732fd351e SHA256 f5a671a62a11dc8114fa98eade19542ed1c3aa3c832b0e572ca0eb1a5a4faee8 -EBUILD hping-3_pre20051105-r3.ebuild 1697 SHA1 b6663ed28666c0bcbdf7cb8d42951057004870dd SHA256 0c2e35d52be99b75adbc504b91f72376f535977d35b4d8beb997f53a7ad4398f -MISC ChangeLog 7852 SHA1 04c4b0f38561068d1d280c200495a9c90bae9678 SHA256 f60d987a5e406b32c223b2c032fc3cad05fe925a7a428543c9126980867076e8 -MISC metadata.xml 160 SHA1 3d83752be0891265dc3cbf88a33aea6a80b92067 SHA256 c82849713c30b773ed7a8d44e0fb27b0573ca6b756587c9a1a33e8451180a1cf diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch deleted file mode 100644 index 8788a10..0000000 --- a/net-analyzer/hping/files/bytesex.h.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -uNr hping2-rc3.orig/bytesex.h hping2-rc3/bytesex.h ---- hping2-rc3.orig/bytesex.h 2004-07-29 15:46:47.572596272 +0000 -+++ hping2-rc3/bytesex.h 2004-07-29 15:48:14.557372576 +0000 -@@ -9,11 +9,15 @@ - - #if defined(__i386__) \ - || defined(__alpha__) \ -+ || defined(__arm__) \ -+ || defined(__x86_64__) \ -+ || defined(__ia64__) \ - || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) - #define BYTE_ORDER_LITTLE_ENDIAN - #elif defined(__mc68000__) \ - || defined (__sparc__) \ - || defined (__sparc) \ -+ || defined (__hppa__) \ - || defined (__PPC__) \ - || defined (__BIG_ENDIAN__) \ - || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch deleted file mode 100644 index 125db33..0000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.in.org 2009-12-22 21:06:55.000000000 +0100 -+++ Makefile.in 2009-12-22 21:09:17.000000000 +0100 -@@ -50,11 +50,11 @@ - $(RANLIB) $@ - - hping3: byteorder.h $(OBJ) -- $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -+ $(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ - @echo - - hping3-static: byteorder.h $(OBJ) -- $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl -+ $(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl - - byteorder.h: - ./configure diff --git a/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch deleted file mode 100644 index 4d374cf..0000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-libtcl.patch +++ /dev/null @@ -1,16 +0,0 @@ -When anything libtcl (bug #247282) this will fail, and we're only finding out -the version of the library anyway, so why not use TCL_VER, which is found using -a slightly less fishy method. -JeR - ---- configure.org 2009-12-23 14:53:34.000000000 +0100 -+++ configure 2009-12-23 14:56:34.000000000 +0100 -@@ -98,8 +98,7 @@ - fi - if [ -n $USE_TCL ] - then -- LIBPOSTFIX=`ls -1 /usr/local/lib/ /usr/lib | grep 'libtcl[0-9]' | grep so | sed -e 's/\.so.*//g' -e 's/libtcl//g' | sort -r | head -1` -- TCL_LIB="-ltcl${LIBPOSTFIX} -lm -lpthread" -+ TCL_LIB="-ltcl${TCL_VER} -lm -lpthread" - fi - - # diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch deleted file mode 100644 index 003424b..0000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scan.c 2003-10-22 12:41:00.000000000 +0200 -+++ b/scan.c 2010-11-30 22:19:23.000000000 +0100 -@@ -456,7 +456,7 @@ - continue; - /* time to copy headers in a safe place */ - p = packet+linkhdr_size+iphdrlen; -- memcpy(&icmp, p, sizeof(subtcp)); -+ memcpy(&icmp, p, sizeof(icmp)); - p += sizeof(icmp); - memcpy(&subip, p, sizeof(ip)); - p += sizeof(ip); diff --git a/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch b/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch deleted file mode 100644 index ae1525b..0000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-tcl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.org 2009-12-22 21:05:11.000000000 +0100 -+++ configure 2009-12-22 21:06:07.000000000 +0100 -@@ -63,7 +63,7 @@ - # - for TCLPATH_TRY in "/usr/bin/" "/usr/local/bin/" "/bin/" - do -- for TCLVER_TRY in "8.4" "8.3" "8.2" "8.1" "8.0" -+ for TCLVER_TRY in "8.5" "8.4" "8.3" "8.2" "8.1" "8.0" - do - if [ -z $TCLSH ] - then diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch deleted file mode 100644 index 1542379..0000000 --- a/net-analyzer/hping/files/hping-3_pre20051105.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- libpcap_stuff.c.old 2004-06-15 18:38:08.062799704 +1200 -+++ libpcap_stuff.c 2004-06-15 18:38:22.515602544 +1200 -@@ -17,7 +17,7 @@ - #include <stdlib.h> - #include <sys/ioctl.h> - #include <pcap.h> --#include <net/bpf.h> -+#include <pcap-bpf.h> - - #include "globals.h" - ---- script.c.old 2004-06-15 18:38:59.135035544 +1200 -+++ script.c 2004-06-15 18:39:11.210199840 +1200 -@@ -24,7 +24,7 @@ - - #include <sys/ioctl.h> - #include <pcap.h> --#include <net/bpf.h> -+#include <pcap-bpf.h> - - #include "release.h" - #include "hping2.h" ---- configure.old 2004-06-15 19:00:55.992842728 +1200 -+++ configure 2004-06-15 19:00:04.961600656 +1200 -@@ -93,7 +93,7 @@ - else - USE_TCL="" - TCL_LIB="" -- echo "==> WARNING: no Tcl header files found!" -+ echo "==> WARNING: no Tcl header files found." - fi - fi - if [ -n $USE_TCL ] ---- Makefile.in.orig 2006-10-31 01:21:53.000000000 +0100 -+++ Makefile.in 2006-10-31 01:22:08.000000000 +0100 -@@ -52,9 +52,6 @@ - hping3: byteorder.h $(OBJ) - $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ - @echo -- ./hping3 -v -- @echo "use \`make strip' to strip hping3 binary" -- @echo "use \`make install' to install hping3" - - hping3-static: byteorder.h $(OBJ) - $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl diff --git a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild deleted file mode 100644 index e87d0e5..0000000 --- a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-3_pre20051105-r3.ebuild,v 1.2 2011/05/10 10:38:41 xmw Exp $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs - -MY_P="${PN}${PV//_pre/-}" -DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer" -HOMEPAGE="http://www.hping.org" -SRC_URI="http://www.hping.org/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64-linux" -IUSE="tcl" - -S="${WORKDIR}/${MY_P}" - -DEPEND="net-libs/libpcap - tcl? ( dev-lang/tcl )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}.patch \ - "${FILESDIR}"/bytesex.h.patch \ - "${FILESDIR}"/${P}-tcl.patch \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-libtcl.patch \ - "${FILESDIR}"/${P}-scan-overflow.patch - - # Correct hard coded values - sed -i Makefile.in \ - -e '/^CC=/d' \ - -e '/^AR=/d' \ - -e '/^RANLIB=/d' \ - -e 's:/usr/local/lib:/usr/$(LIBDIR):g' \ - -e 's:-O2:$(CFLAGS):' \ - || die "sed Makefile.in failed" - - # Change name from hping2 to hping3 - sed -i docs/hping3.8 \ - -e 's|HPING2|HPING|g' \ - -e 's|hping2|hping|g' \ - || die "sed hping3.8 failed" -} - -src_configure() { - tc-export CC - - # Not an autotools type configure: - sh configure $(use tcl || echo --no-tcl) || die "configure failed" -} - -src_compile() { - emake \ - DEBUG="" \ - "CFLAGS=${CFLAGS}" \ - "AR=$(tc-getAR)" \ - "RANLIB=$(tc-getRANLIB)" \ - "LIBDIR=$(get_libdir)" \ - || die "emake failed" -} - -src_install () { - dosbin hping3 - dosym /usr/sbin/hping3 /usr/sbin/hping - dosym /usr/sbin/hping3 /usr/sbin/hping2 - - newman docs/hping3.8 hping.8 - - dodoc INSTALL NEWS README TODO AUTHORS BUGS CHANGES -} diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml deleted file mode 100644 index 9ca15ca..0000000 --- a/net-analyzer/hping/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>netmon</herd> -</pkgmetadata> - diff --git a/net-dialup/slirp/Manifest b/net-dialup/slirp/Manifest deleted file mode 100644 index f25a9b3..0000000 --- a/net-dialup/slirp/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX slirp-1.0.17-destdir.patch 612 SHA1 2d4d5b050013e07df6cb4e1cc8881dec40103a60 SHA256 7383a8f7308a10718d4bf57a0a0d134bcd64d183361c82460f541fdfebb44934 -AUX slirp-1.0.17-fullbolt.patch 479 SHA1 d584a9032a03c5779e56982bb36f75020d3dda94 SHA256 748c6632da9e9af00a19b3a540892252522f155bab28d333a4e4a50eb7ccec58 -AUX slirp-1.0.17-perl.patch 452 SHA1 418f3fb33f5de9747bee1e9ead9109eb71ad3d3f SHA256 13f5596baf6791e129a4b990b8508b883928dc0c0227ba89287690f9b3f15c5d -DIST slirp_1.0.17-4.debian.tar.gz 13774 SHA1 b1bb2c184e67dcaa794540470d661bd0ceaa1395 SHA256 824915cf0575ccf22c8cf00fe970ced7aee01596bc9f82ce1cb75e6ef5f81570 -DIST slirp_1.0.17.orig.tar.gz 305754 SHA1 9b660f5365f1d9536d9171c1e0de490ab2232ec8 SHA256 afe59cd298075aa1b9eba5a5f7cf720597372b8b81657de529b2cd35a2a2bc2e -EBUILD slirp-1.0.17.ebuild 1479 SHA1 3c79a4f150809c0a537058d4c98e67db69db82e0 SHA256 f84217a8e5f10516352be625b7d7f2f51c2a01536450d4979cdbe94e7cb9c76f -MISC slirp-1.0.17.ebuild~ 915 SHA1 fa4abcd3cdd222e7865995f077d89055496b324c SHA256 344f81231bc93311e3654f0735ad6ab5f23ff709ed483032d9b3c222ea2e7a36 diff --git a/net-dialup/slirp/files/slirp-1.0.17-destdir.patch b/net-dialup/slirp/files/slirp-1.0.17-destdir.patch deleted file mode 100644 index 71657a7..0000000 --- a/net-dialup/slirp/files/slirp-1.0.17-destdir.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index b0c1fc6..c21da84 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -35,7 +35,7 @@ COMMON_H = config.h ${srcdir}/slirp.h - - BINDIR = @prefix@/bin - --MANDIR = @prefix@/man/man1 -+MANDIR = @prefix@/share/man/man1 - - MANEXT = 1 - -@@ -45,11 +45,10 @@ slirp: $(PROTO) $(OBJ) - $(CC) @LDFLAGS@ -o slirp $(OBJ) $(LIBS) - - install: slirp install.man -- strip slirp -- cp slirp $(BINDIR) -+ install -D slirp $(DESTDIR)$(BINDIR)/slirp - - install.man: -- cp slirp.man $(MANDIR)/slirp.$(MANEXT) -+ install -D -m 644 slirp.man $(DESTDIR)$(MANDIR)/slirp.$(MANEXT) - - objclean: - rm -f $(OBJ) diff --git a/net-dialup/slirp/files/slirp-1.0.17-fullbolt.patch b/net-dialup/slirp/files/slirp-1.0.17-fullbolt.patch deleted file mode 100644 index 879d456..0000000 --- a/net-dialup/slirp/files/slirp-1.0.17-fullbolt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp slirp-1.0.17.old//config.h.in slirp-1.0.17/config.h.in ---- slirp-1.0.17.old//config.h.in 2011-02-16 00:57:54.000000000 +0900 -+++ slirp-1.0.17/config.h.in 2011-02-16 00:58:43.000000000 +0900 -@@ -30,7 +30,7 @@ - /* pretty good job on single modems already, and seting this will make */ - /* interactive sessions less responsive */ - /* XXXXX Talk about having fast modem as unit 0 */ --#undef FULL_BOLT -+#define FULL_BOLT - - /* - * Define if you want slirp to use less CPU diff --git a/net-dialup/slirp/files/slirp-1.0.17-perl.patch b/net-dialup/slirp/files/slirp-1.0.17-perl.patch deleted file mode 100644 index 2ab80a3..0000000 --- a/net-dialup/slirp/files/slirp-1.0.17-perl.patch +++ /dev/null @@ -1,15 +0,0 @@ -# this is a fix for use with perl-5.12, where split no longer -# affects @_ by default. - -diff -Naurp slirp-1.0.17.old/mkpro slirp-1.0.17/mkpro ---- slirp-1.0.17.old/mkpro 2004-09-01 18:58:51.000000000 +0900 -+++ slirp-1.0.17/mkpro 2011-02-15 22:09:37.000000000 +0900 -@@ -87,7 +87,7 @@ STATE0: - $1 =~ /([^\*]+)/; # Remove "*" - $type = $1; - -- $n = split(/,/); -+ $n = @_ = split /,/; - $nargs += $n; - goto STATE0 if ($nargs > $nargs_guess); - diff --git a/net-dialup/slirp/slirp-1.0.17.ebuild b/net-dialup/slirp/slirp-1.0.17.ebuild deleted file mode 100644 index 61d19ae..0000000 --- a/net-dialup/slirp/slirp-1.0.17.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Tiziano Müller -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit eutils - -DESCRIPTION="TCP/IP emulator which turns an ordinary shell account into a (C)SLIP/PPP account." -HOMEPAGE="http://packages.qa.debian.org/s/slirp.html" -SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_1.0.17.orig.tar.gz - mirror://debian/pool/main/s/${PN}/${PN}_1.0.17-4.debian.tar.gz" - -LICENSE="NEWLIB" -SLOT="0" -KEYWORDS="~amd64-linux" -IUSE="+ppp" - -DEPEND="" -RDEPEND="" - -src_prepare() { - - epatch \ - "${WORKDIR}/debian/patches/001-update-man-fix-hyphens-as-minus.patch" \ - "${WORKDIR}/debian/patches/002-fix-arguements.patch" \ - "${WORKDIR}/debian/patches/003-socklen_t.patch" \ - "${WORKDIR}/debian/patches/004-compilation-warnings.patch" \ - "${WORKDIR}/debian/patches/005-use-snprintf.patch" \ - "${WORKDIR}/debian/patches/006-changelog-1.0.17.patch" \ - "${WORKDIR}/debian/patches/007-debian-changes.patch" \ - "${WORKDIR}/debian/patches/008-slirp-amd64-log-crash.patch" - - # We do not need extra src subdir - mv src/* ./ && rmdir src - - epatch \ - "${FILESDIR}/${P}-perl.patch" \ - "${FILESDIR}/${P}-destdir.patch" \ - "${FILESDIR}/${P}-fullbolt.patch" -} - -src_configure() { - local myconf="" - use ppp || myconf="--disable-ppp" - econf {myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc ChangeLog CONTRIB README README.NEXT TODO docs/* - # newdoc ${WORKDIR}/README README-1.0.17 -} - diff --git a/net-libs/libtirpc/ChangeLog b/net-libs/libtirpc/ChangeLog deleted file mode 100644 index fd057ad..0000000 --- a/net-libs/libtirpc/ChangeLog +++ /dev/null @@ -1,100 +0,0 @@ -# ChangeLog for net-libs/libtirpc -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/ChangeLog,v 1.20 2011/06/11 19:52:16 vapier Exp $ - -*libtirpc-0.2.2-r1 (11 Jun 2011) - - 11 Jun 2011; Mike Frysinger <vapier@gentoo.org> +libtirpc-0.2.2-r1.ebuild, - +files/libtirpc-0.2.2-rpc-des-prot.patch: - Stub out des_crypt for now #370713 by Nicolas Schlumberger, fix building with - glibc-2.14 #370663 by Diego Elio Pettenò, restore static lib support, and - start installing into / for glibc replacement. - -*libtirpc-0.2.2 (07 Jun 2011) - - 07 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> +libtirpc-0.2.2.ebuild: - Version bump, which should hopefully build with glibc-2.14. - - 20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> - libtirpc-0.2.1-r1.ebuild: - ppc64 stable wrt #340189 - - 13 Nov 2010; Raúl Porcel <armin76@gentoo.org> libtirpc-0.2.1-r1.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #340189 - - 26 Oct 2010; Jeroen Roovers <jer@gentoo.org> libtirpc-0.2.1-r1.ebuild: - Stable for HPPA (bug #340189). - - 16 Oct 2010; Markus Meier <maekke@gentoo.org> libtirpc-0.2.1-r1.ebuild: - arm stable, bug #340189 - - 15 Oct 2010; Brent Baude <ranger@gentoo.org> libtirpc-0.2.1-r1.ebuild: - stable ppc, bug 340189 - - 10 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> - libtirpc-0.2.1-r1.ebuild: - x86 stable wrt bug #340189 - - 10 Oct 2010; Markos Chandras <hwoarang@gentoo.org> - libtirpc-0.2.1-r1.ebuild: - Stable on amd64 wrt bug #340189 - - 12 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org> - files/libtirpc-0.2.1-fortify.patch: - Use an even better patch to avoid overflow on the other senses if - hp_length is less than four. - -*libtirpc-0.2.1-r1 (12 Sep 2010) - - 12 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org> - -libtirpc-0.2.0.ebuild, -files/libtirpc-0.2.0-hppa-float.patch, - -files/libtirpc-0.2.0-no-gss.patch, -libtirpc-0.2.1.ebuild, - +libtirpc-0.2.1-r1.ebuild, +files/libtirpc-0.2.1-fortify.patch: - Add patch to fix a possible overflow (reported by _FORTIFY_SOURCE=2); - thanks to Joshua Kinard (Kumba) for reporting. Cleanup old versions and - patches. - -*libtirpc-0.2.1 (23 Jul 2010) - - 23 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> - +libtirpc-0.2.1.ebuild: - Version bump, disable static libraries (it needs gssapi that uses libdl - anyway), remove .la file (helps fixing bug #293593), move to EAPI=2 while - at it. - - 30 May 2009; Mike Frysinger <vapier@gentoo.org> libtirpc-0.2.0.ebuild, - +files/libtirpc-0.2.0-hppa-float.patch: - Fix build failure on hppa and add keywords for all. - - 30 May 2009; Mike Frysinger <vapier@gentoo.org> libtirpc-0.2.0.ebuild: - Restore /etc/netconfig file. - - 30 May 2009; Mike Frysinger <vapier@gentoo.org> libtirpc-0.2.0.ebuild, - +files/libtirpc-0.2.0-no-gss.patch: - Fix link error when USE=-gss. - -*libtirpc-0.2.0 (30 May 2009) - - 30 May 2009; Mike Frysinger <vapier@gentoo.org> +libtirpc-0.2.0.ebuild: - Version bump. - - 01 Feb 2009; Markus Meier <maekke@gentoo.org> libtirpc-0.1.10.ebuild: - amd64/x86 stable, bug #256691 - -*libtirpc-0.1.10 (28 Nov 2008) - - 28 Nov 2008; Mike Frysinger <vapier@gentoo.org> +libtirpc-0.1.10.ebuild: - Version bump #249151 by Chi-Thanh Christopher Nguyen. - -*libtirpc-0.1.7-r1 (11 May 2008) - - 11 May 2008; Mike Frysinger <vapier@gentoo.org> - +files/libtirpc-0.1.7-CVE-2007-3999.patch, +libtirpc-0.1.7-r1.ebuild: - Add fix for CVE-2007-3999 #214208 by Robert Buchholz. - -*libtirpc-0.1.7 (29 Dec 2007) - - 29 Dec 2007; Mike Frysinger <vapier@gentoo.org> +metadata.xml, - +libtirpc-0.1.7.ebuild: - Initial ebuild by me. - diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest deleted file mode 100644 index 1a202a1..0000000 --- a/net-libs/libtirpc/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX libtirpc-0.2.1-fortify.patch 704 RMD160 4030f5f8a583d36affa19536c83aa63c21ecdedb SHA1 c14fcb21e0dfa37fce5b5e23d5a04ddf0090da35 SHA256 e3436a6de8182e51c577000917feffc6428b6907d8bf1b56318acd999d34b056 -AUX libtirpc-0.2.2-rpc-des-prot.patch 979 RMD160 b60af12a2d9a27fb7e855c053ea8698b8a374d4f SHA1 29cdbb22e478bf2bc28c84a378ddb64327a8e378 SHA256 f09e866816973c6aac5c6e19d3007440b85ff42fe3c36ad0c3ee02dd657eb90c -DIST libtirpc-0.2.2.tar.bz2 464094 RMD160 b244a9fefa6cf2c2bc84300c9a51339ad87e229b SHA1 576c8826a91110580b60c973c672836559d2805a SHA256 f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705 -DIST libtirpc-glibc-nfs.tar.xz 8948 RMD160 0f1254307780d5fc2004b5fc006a770d9626d935 SHA1 35496dd459ec014756be6816ca888271feb8e03d SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 -EBUILD libtirpc-0.2.2-r1.ebuild 1454 RMD160 9b399630e1230a9a04818ca8c9dec287e54441b6 SHA1 6c3da3c2deafc5a550f5eea1ac74d892b410ce44 SHA256 31820c7e88280def5de230b54c4ce1c0f45f72531de387a8149a4c2617f9f159 -MISC ChangeLog 3591 RMD160 e9be2a61c58b3f2a2d17b7b8f17b948c5b7ae740 SHA1 8f114f73de275a2750c800b0729a3a1ed61aefaa SHA256 ab955a12e6f1f50c32981baa159ae05cecc02496d962e20343f7b4c191e12dc7 -MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b diff --git a/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch b/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch deleted file mode 100644 index 7375bf8..0000000 --- a/net-libs/libtirpc/files/libtirpc-0.2.1-fortify.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libtirpc-0.2.1/src/getrpcport.c -=================================================================== ---- libtirpc-0.2.1.orig/src/getrpcport.c -+++ libtirpc-0.2.1/src/getrpcport.c -@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto - - if ((hp = gethostbyname(host)) == NULL) - return (0); -+ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) -+ return (0); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; -- if (hp->h_length > sizeof(addr)) -- hp->h_length = sizeof(addr); - memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); - /* Inconsistent interfaces need casts! :-( */ - return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, diff --git a/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch b/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch deleted file mode 100644 index c5de6da..0000000 --- a/net-libs/libtirpc/files/libtirpc-0.2.2-rpc-des-prot.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 11 Jun 2011 15:21:55 -0400 -Subject: [PATCH] add multiple inclusion protection to rpc/des.h - -If you try to include this file multiple times, you get a build failure -due to redefinitions of enums and such. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - tirpc/rpc/des.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h -index e3d6897..d2881ad 100644 ---- a/tirpc/rpc/des.h -+++ b/tirpc/rpc/des.h -@@ -33,6 +33,9 @@ - * Copyright (c) 1986 by Sun Microsystems, Inc. - */ - -+#ifndef _RPC_DES_H_ -+#define _RPC_DES_H_ -+ - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ - -@@ -80,3 +83,5 @@ struct desparams { - * Software DES. - */ - extern int _des_crypt( char *, int, struct desparams * ); -+ -+#endif --- -1.7.5.3 - diff --git a/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild b/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild deleted file mode 100644 index 09036f7..0000000 --- a/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.2-r1.ebuild,v 1.1 2011/06/11 19:52:16 vapier Exp $ - -EAPI="3" - -inherit eutils toolchain-funcs - -DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" -HOMEPAGE="http://libtirpc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - mirror://gentoo/${PN}-glibc-nfs.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64-linux" -IUSE="kerberos static-libs" - -RDEPEND="kerberos? ( net-libs/libgssglue )" -DEPEND="${RDEPEND} - app-arch/xz-utils - dev-util/pkgconfig" - -src_unpack() { - unpack ${A} - cp -r tirpc "${S}"/ || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.2.1-fortify.patch - epatch "${FILESDIR}"/${PN}-0.2.2-rpc-des-prot.patch - > src/des_crypt.c #370713 -} - -src_configure() { - econf \ - $(use_enable kerberos gss) \ - $(use_enable static-libs static) -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc AUTHORS ChangeLog NEWS README THANKS TODO - insinto /etc - newins doc/etc_netconfig netconfig || die - - insinto /usr/include/tirpc - doins -r "${WORKDIR}"/tirpc/* || die - - # libtirpc replaces rpc support in glibc, so we need it in / - gen_usr_ldscript -a tirpc - - # makes sure that the linking order for nfs-utils is proper, as - # libtool would inject a libgssglue dependency in the list. - use static-libs || find "${ED}" -name '*.la' -delete -} diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml deleted file mode 100644 index ca66751..0000000 --- a/net-libs/libtirpc/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>net-fs</herd> -</pkgmetadata> diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog deleted file mode 100644 index 4ab8e2f..0000000 --- a/net-libs/rb_libtorrent/ChangeLog +++ /dev/null @@ -1,831 +0,0 @@ -# ChangeLog for net-libs/rb_libtorrent -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.167 2013/09/08 10:25:08 hwoarang Exp $ - -*rb_libtorrent-0.16.11 (08 Sep 2013) - - 08 Sep 2013; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.11.ebuild: - Version bump - - 07 Sep 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.10.ebuild: - Stable for sparc, wrt bug #481440 - - 05 Sep 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.10.ebuild: - Stable for ppc64, wrt bug #481440 - - 28 Aug 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.10.ebuild: - Stable for x86, wrt bug #481440 - - 26 Aug 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.10.ebuild: - Stable for ppc, wrt bug #481440 - - 24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.10.ebuild: - Stable for arm, wrt bug #481440 - - 17 Aug 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.10.ebuild: - Stable for amd64, wrt bug #481440 - -*rb_libtorrent-0.16.10 (15 May 2013) - - 15 May 2013; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.10.ebuild: - Version bump - -*rb_libtorrent-0.16.9 (13 Mar 2013) - - 13 Mar 2013; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.9.ebuild: - Version bump - - 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.8.ebuild: - Stable for sparc, wrt bug #460188 - - 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.8.ebuild: - Stable for x86, wrt bug #460188 - - 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.8.ebuild: - Stable for ppc, wrt bug #460188 - - 09 Mar 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.8.ebuild: - Stable for ppc64, wrt bug #460188 - - 08 Mar 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.8.ebuild: - Stable for arm, wrt bug #460188 - - 05 Mar 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.8.ebuild: - Stable for amd64, wrt bug #460188 - - 03 Mar 2013; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.16.3.ebuild, -rb_libtorrent-0.16.6.ebuild, - -rb_libtorrent-0.16.7.ebuild: - remove old - -*rb_libtorrent-0.16.8 (10 Feb 2013) - - 10 Feb 2013; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.8.ebuild: - Version bump - -*rb_libtorrent-0.16.7 (22 Jan 2013) - - 22 Jan 2013; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.7.ebuild: - Version bump - - 01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.5.ebuild: - Stable for arm, wrt bug #442314 - - 29 Dec 2012; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.5.ebuild: - Stable for sparc, wrt bug #442314 - - 26 Dec 2012; Jeff Horelick <jdhore@gentoo.org> rb_libtorrent-0.16.5.ebuild: - marked x86 per bug 442314 - - 22 Dec 2012; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.5.ebuild: - Stable for ppc, wrt bug #442314 - - 18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.5.ebuild: - Stable for amd64, wrt bug #442314 - -*rb_libtorrent-0.16.6 (17 Dec 2012) - - 17 Dec 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.6.ebuild: - Version bump - - 10 Dec 2012; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.16.5.ebuild: - Stable for ppc64, wrt bug #442314 - - 22 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> - -files/rb_libtorrent-0.14.12_boost-1.45.patch, - -files/rb_libtorrent-0.14.8-boost-detect.patch, - -files/rb_libtorrent-0.14.9-as-needed-fix.patch, - -files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch, - -rb_libtorrent-0.15.5.ebuild, -rb_libtorrent-0.15.9.ebuild: - Remove old versions requiring boost that is no longer in tree. Cleanup old - files. - - 21 Nov 2012; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.16.5.ebuild: - Enable verbose build. Bug #441842 - - 08 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> - rb_libtorrent-0.15.10.ebuild, rb_libtorrent-0.15.5.ebuild, - rb_libtorrent-0.15.9.ebuild, rb_libtorrent-0.16.3.ebuild, - rb_libtorrent-0.16.5.ebuild: - Handle USE=threads for boost 1.52.0-r1 and later. Remove keywords from ebuilds - that depends on older boost versions. - - 03 Nov 2012; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.10.ebuild, rb_libtorrent-0.15.5.ebuild, - rb_libtorrent-0.15.9.ebuild, rb_libtorrent-0.16.3.ebuild: - Backport boost fix to 0.15.X releases. Bug #441582 - - 02 Nov 2012; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.16.4.ebuild, rb_libtorrent-0.16.3.ebuild: - Backport fix from 0.16.5. Bug #440976 - - 31 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> - rb_libtorrent-0.16.5.ebuild: - Simplify finding boost library so that it works with all versions, now that - it's unslotted. - -*rb_libtorrent-0.16.5 (23 Oct 2012) - - 23 Oct 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.5.ebuild: - Version bump - -*rb_libtorrent-0.16.4 (02 Oct 2012) - - 02 Oct 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.4.ebuild: - Version bump - - 23 Sep 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml: - Remove qt herd from metadata - - 31 Aug 2012; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.16.1.ebuild, -rb_libtorrent-0.16.2.ebuild: - Remove old - -*rb_libtorrent-0.16.3 (24 Aug 2012) - - 24 Aug 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.3.ebuild: - Version bump - -*rb_libtorrent-0.16.2 (14 Jul 2012) - - 14 Jul 2012; Ben de Groot <yngwin@gentoo.org> +rb_libtorrent-0.16.2.ebuild: - Version bump - - 16 Jun 2012; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.15.6.ebuild, -rb_libtorrent-0.15.8.ebuild, - -rb_libtorrent-0.15.9-r1.ebuild, -rb_libtorrent-0.16.0.ebuild: - Remove old - -*rb_libtorrent-0.16.1 (15 Jun 2012) - - 15 Jun 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.1.ebuild: - Version bump - - 14 Jun 2012; Jeff Horelick <jdhore@gentoo.org> rb_libtorrent-0.15.10.ebuild: - marked x86 per bug 413815 - - 08 Jun 2012; Michael Weber <xmw@gentoo.org> rb_libtorrent-0.15.10.ebuild: - ppc stable (bug 413815) - - 23 May 2012; Agostino Sarubbo <ago@gentoo.org> rb_libtorrent-0.15.10.ebuild: - Stable for amd64, wrt bug #413815 - - 28 Apr 2012; <heroxbd@gentoo.org> rb_libtorrent-0.15.10.ebuild, - rb_libtorrent-0.16.0.ebuild: - fix boost dirs with EPREFIX for Prefix - - 19 Apr 2012; Brent Baude <ranger@gentoo.org> rb_libtorrent-0.15.9.ebuild: - Marking rb_libtorrent-0.15.9 ppc64 for bug 411871 - - 18 Apr 2012; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.9.ebuild: - Stable on amd64 wrt bug #411871 - - 17 Apr 2012; Jeff Horelick <jdhore@gentoo.org> rb_libtorrent-0.15.9.ebuild: - marked x86 per bug 411871 - -*rb_libtorrent-0.16.0 (17 Apr 2012) - - 17 Apr 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.16.0.ebuild: - version bump. Bug #412357 - -*rb_libtorrent-0.15.10 (25 Feb 2012) - - 25 Feb 2012; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.10.ebuild: - version bump - - 05 Feb 2012; Mike Gilbert <floppym@gentoo.org> rb_libtorrent-0.15.9-r1.ebuild: - Drop duplicate multilib (oops). - - 05 Feb 2012; Mike Gilbert <floppym@gentoo.org> rb_libtorrent-0.15.5.ebuild, - rb_libtorrent-0.15.6.ebuild, rb_libtorrent-0.15.8.ebuild, - rb_libtorrent-0.15.9-r1.ebuild, rb_libtorrent-0.15.9.ebuild: - Inherit multilib. - -*rb_libtorrent-0.15.9-r1 (28 Jan 2012) - - 28 Jan 2012; Mike Gilbert <floppym@gentoo.org> - +rb_libtorrent-0.15.9-r1.ebuild, rb_libtorrent-0.15.5.ebuild, - rb_libtorrent-0.15.6.ebuild, rb_libtorrent-0.15.8.ebuild, - rb_libtorrent-0.15.9.ebuild: - Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Patch - by Arfrever. - -*rb_libtorrent-0.15.9 (22 Nov 2011) - - 22 Nov 2011; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.9.ebuild, -rb_libtorrent-0.15.7.ebuild, - -rb_libtorrent-0.15.7-r1.ebuild: - version bump. remove old - -*rb_libtorrent-0.15.8 (30 Sep 2011) - - 30 Sep 2011; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.8.ebuild: - Version bump - -*rb_libtorrent-0.15.7-r1 (25 Sep 2011) - - 25 Sep 2011; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.7-r1.ebuild: - Add static-libs useflag. Drop .la files. BUg #384433. Thanks to Hans - <immerdabeiundnie@abwesend.de> - -*rb_libtorrent-0.15.7 (02 Aug 2011) - - 02 Aug 2011; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.14.9-r1.ebuild, -rb_libtorrent-0.14.12.ebuild, - +rb_libtorrent-0.15.7.ebuild: - Version bump. remove old ebuilds - - 30 May 2011; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.14.12.ebuild: - Revert my previous commit - - 30 May 2011; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.14.12.ebuild: - Fix python dependency - - 26 May 2011; Markus Meier <maekke@gentoo.org> rb_libtorrent-0.15.6.ebuild: - x86 stable, bug #365393 - - 11 May 2011; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.6.ebuild: - Stable on amd64 wrt bug #365393 - - 15 Apr 2011; Pacho Ramos <pacho@gentoo.org> rb_libtorrent-0.15.6.ebuild: - Needs python2 to compile ok (bug #315321 with Markos Chandras permission). - -*rb_libtorrent-0.15.6 (11 Apr 2011) - - 11 Apr 2011; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.15.1.ebuild, -rb_libtorrent-0.15.4.ebuild, - +rb_libtorrent-0.15.6.ebuild: - Version bump. Remove old ebuilds - - 23 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> - rb_libtorrent-0.15.5.ebuild: - ppc64 stable wrt #354519 - - 05 Mar 2011; Michael Weber <xmw@gentoo.org> rb_libtorrent-0.15.5.ebuild: - ppc/sparc stable (bug 354519) - - 14 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> - rb_libtorrent-0.15.5.ebuild: - x86 stable wrt bug #354519 - - 12 Feb 2011; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.5.ebuild: - Stable on amd64 wrt bug #354519 - - 31 Jan 2011; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.14.12.ebuild, +files/rb_libtorrent-0.14.12_boost-1.45.patch: - Make it build against dev-libs/boost-1.45. Bug #352001 - - 13 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> - rb_libtorrent-0.15.1.ebuild: - ppc64 stable wrt #333775 - -*rb_libtorrent-0.15.5 (08 Jan 2011) - - 08 Jan 2011; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.15.0.ebuild, -rb_libtorrent-0.15.3.ebuild, - +rb_libtorrent-0.15.5.ebuild: - Version bump - - 06 Jan 2011; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.1.ebuild, rb_libtorrent-0.15.3.ebuild, - rb_libtorrent-0.15.4.ebuild: - Adjust boost dependencies. Bug #342589 - - 09 Dec 2010; Michael Weber <xmw@gentoo.org> rb_libtorrent-0.15.1.ebuild, - rb_libtorrent-0.15.3.ebuild, rb_libtorrent-0.15.4.ebuild: - add ~sparc (bug 348217) - - 03 Dec 2010; Bernard Cafarelli <voyageur@gentoo.org> - rb_libtorrent-0.15.3.ebuild, rb_libtorrent-0.15.4.ebuild: - Also allow python:2.7 - - 11 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> - rb_libtorrent-0.14.9-r1.ebuild, rb_libtorrent-0.14.12.ebuild, - rb_libtorrent-0.15.0.ebuild, rb_libtorrent-0.15.1.ebuild, - rb_libtorrent-0.15.3.ebuild, rb_libtorrent-0.15.4.ebuild: - Fix sys-devel/libtool depend from = to >= wrt #345115 by Attila Jecs. - - 21 Oct 2010; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.4.ebuild: - Fix my latest commit and remove useless --enable-statistics switch - - 20 Oct 2010; Brent Baude <ranger@gentoo.org> rb_libtorrent-0.15.1.ebuild: - stable ppc, bug 333775 - - 17 Oct 2010; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.15.4.ebuild: - Add ssl useflag for encryption purposes. Fix debug useflag usage - -*rb_libtorrent-0.15.4 (05 Oct 2010) - - 05 Oct 2010; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.4.ebuild: - Version bump - -*rb_libtorrent-0.15.3 (08 Sep 2010) -*rb_libtorrent-0.14.12 (08 Sep 2010) - - 08 Sep 2010; Markos Chandras <hwoarang@gentoo.org> - -rb_libtorrent-0.14.10.ebuild, -rb_libtorrent-0.14.11.ebuild, - +rb_libtorrent-0.14.12.ebuild, -rb_libtorrent-0.15.2.ebuild, - +rb_libtorrent-0.15.3.ebuild: - Version bump. Remove old ebuilds - - 23 Aug 2010; Markus Meier <maekke@gentoo.org> rb_libtorrent-0.15.1.ebuild: - amd64/x86 stable, bug #333775 - - 21 Aug 2010; Markos Chandras <hwoarang@gentoo.org> - -files/0.14.6-configure-ldflags-fix.patch, - -files/rb_libtorrent-0.14.8-as-needed-fix.patch: - Remove unused files - -*rb_libtorrent-0.15.2 (21 Aug 2010) -*rb_libtorrent-0.14.11 (21 Aug 2010) - - 21 Aug 2010; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.14.11.ebuild, +rb_libtorrent-0.15.2.ebuild: - Version bump - -*rb_libtorrent-0.15.1 (01 Jul 2010) - - 01 Jul 2010; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.1.ebuild, - +files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch: - Version bump. Fixes tracker announcement bug wrt bug #325313. Remove - obsolete configure options. Proper fix for lpthread linking - -*rb_libtorrent-0.15.0 (16 Jun 2010) - - 16 Jun 2010; Markos Chandras <hwoarang@gentoo.org> - +rb_libtorrent-0.15.0.ebuild: - Version bump - - 12 Apr 2010; Ben de Groot <yngwin@gentoo.org> - -rb_libtorrent-0.14.6.ebuild: - Remove obsolete version. >=0.14.9-r1 ebuilds have several fixes. - - 11 Apr 2010; Markos Chandras <hwoarang@gentoo.org> - rb_libtorrent-0.14.9-r1.ebuild: - Stable on amd64 wrt bug #312825 - -*rb_libtorrent-0.14.10 (10 Apr 2010) - - 10 Apr 2010; Ben de Groot <yngwin@gentoo.org> - +rb_libtorrent-0.14.10.ebuild: - Version bump. Fixes bug #313457. - - 08 Apr 2010; Christian Faulhammer <fauli@gentoo.org> - rb_libtorrent-0.14.9-r1.ebuild: - stable x86, bug 312825 - - 02 Apr 2010; Ben de Groot <yngwin@gentoo.org> - -rb_libtorrent-0.14.9.ebuild: - Remove version obsoleted by the revbump - -*rb_libtorrent-0.14.9-r1 (27 Mar 2010) - - 27 Mar 2010; Ben de Groot <yngwin@gentoo.org> rb_libtorrent-0.14.6.ebuild, - -rb_libtorrent-0.14.8-r2.ebuild, rb_libtorrent-0.14.9.ebuild, - +rb_libtorrent-0.14.9-r1.ebuild, - +files/rb_libtorrent-0.14.9-as-needed-fix.patch: - Revbump to fix bugs with as-needed (#276873) and mixed libtool (#298069). - Add blocker to mldonkey when examples useflag is enabled (#292998). Remove - older ~arch ebuild. - -*rb_libtorrent-0.14.9 (27 Feb 2010) - - 27 Feb 2010; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.14.9.ebuild: - Version bump - -*rb_libtorrent-0.14.8-r2 (15 Jan 2010) - - 15 Jan 2010; Ben de Groot <yngwin@gentoo.org> - -rb_libtorrent-0.14.8-r1.ebuild, +rb_libtorrent-0.14.8-r2.ebuild, - +files/rb_libtorrent-0.14.8-boost-detect.patch: - Add new boost detection patch to really fix bug 295474 - - 14 Jan 2010; Ben de Groot <yngwin@gentoo.org> - rb_libtorrent-0.14.8-r1.ebuild, - +files/rb_libtorrent-0.14.8-as-needed-fix.patch: - Add a patch to fix as-needed issues (bug 276873). - -*rb_libtorrent-0.14.8-r1 (14 Jan 2010) - - 14 Jan 2010; Ben de Groot <yngwin@gentoo.org> - -rb_libtorrent-0.14.7.ebuild, -rb_libtorrent-0.14.8.ebuild, - +rb_libtorrent-0.14.8-r1.ebuild: - Fix boost detection, thanks to Sebastian Mingramm in bug 295474. Remove - previous version. 0.14.8-r1 is next stable candidate. - -*rb_libtorrent-0.14.8 (11 Jan 2010) - - 11 Jan 2010; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.14.8.ebuild: - Version bump - - 09 Jan 2010; Raúl Porcel <armin76@gentoo.org> - rb_libtorrent-0.14.6.ebuild, rb_libtorrent-0.14.7.ebuild: - Add ~arm - - 09 Jan 2010; Raúl Porcel <armin76@gentoo.org> - rb_libtorrent-0.14.6.ebuild, rb_libtorrent-0.14.7.ebuild: - Fix python dependency - - 19 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> - rb_libtorrent-0.14.6.ebuild, rb_libtorrent-0.14.7.ebuild: - Remove block to net-libs/libtorrent wrt #190171. - -*rb_libtorrent-0.14.7 (18 Dec 2009) - - 18 Dec 2009; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.14.7.ebuild: - Version bump - - 17 Dec 2009; Markus Meier <maekke@gentoo.org> rb_libtorrent-0.14.6.ebuild: - x86 stable, bug #290705 - - 17 Dec 2009; Markus Meier <maekke@gentoo.org> rb_libtorrent-0.14.6.ebuild: - restrict test as they fail - - 10 Nov 2009; Ben de Groot <yngwin@gentoo.org> - +files/0.14.6-configure-ldflags-fix.patch, rb_libtorrent-0.14.6.ebuild: - Adding patch to fix problematic ldflags use in configure, bug 290756. - - 27 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> - rb_libtorrent-0.14.6.ebuild: - amd64 stable wrt #290705 - - 04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> - rb_libtorrent-0.13-r1.ebuild: - Replace -Wl,--no-as-needed with function from flag-o-matic eclass. - -*rb_libtorrent-0.14.6 (30 Sep 2009) - - 30 Sep 2009; Ben de Groot <yngwin@gentoo.org> - +rb_libtorrent-0.14.6.ebuild: - Version bump - -*rb_libtorrent-0.14.5 (15 Aug 2009) - - 15 Aug 2009; Ben de Groot <yngwin@gentoo.org> -rb_libtorrent-0.13.ebuild, - +rb_libtorrent-0.14.5.ebuild: - Remove unpatched ebuild. Add version bump (bug 280967). - - 29 Jun 2009; Markus Meier <maekke@gentoo.org> - rb_libtorrent-0.13-r1.ebuild: - amd64/x86 stable, bug #273156 - - 29 Jun 2009; Ben de Groot <yngwin@gentoo.org> - rb_libtorrent-0.13-r1.ebuild, - +files/rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch, - -files/rb_libtorrent-0.14.1-ax_python_path.patch: - Add patch to fix the tests complementing the CVE patch. Remove no longer - used patch from filesdir. - - 29 Jun 2009; Ben de Groot <yngwin@gentoo.org> - rb_libtorrent-0.13-r1.ebuild, -rb_libtorrent-0.14.4.ebuild: - Restrict test on 0.13-r1, which breaks due to CVE patch. Remove old - ebuild. - -*rb_libtorrent-0.14.4-r1 (28 Jun 2009) - - 28 Jun 2009; Ben de Groot <yngwin@gentoo.org> - +rb_libtorrent-0.14.4-r1.ebuild: - Update ebuild for version 0.14.4: - - migrate to eapi-2 - - add doc useflag to install HTML documentation - - check for python-enabled boost if USE=python (bug 270608) - - add switch for verbose logging if USE=debug (todo from previous - revision) - -*rb_libtorrent-0.13-r1 (27 Jun 2009) - - 27 Jun 2009; Ben de Groot <yngwin@gentoo.org> - -rb_libtorrent-0.12.1.ebuild, +rb_libtorrent-0.13-r1.ebuild, - -rb_libtorrent-0.13_p2335.ebuild, - +files/rb_libtorrent-0.13-CVE-2009-1760.patch, - -rb_libtorrent-0.13.1.ebuild, +files/rb_libtorrent-0.13-boost-1.37.patch, - +files/rb_libtorrent-0.13-gcc44.patch, -rb_libtorrent-0.14.1.ebuild, - -rb_libtorrent-0.14.2.ebuild: - Remove all older ebuilds, except for latest stable. - Add 0.13-r1 with the following changes: - - add security patch for CVE-2009-1760 (bug 273156) - - add patch to fix building with boost-1.37 (bug 270447) - - migrate to EAPI=2 and general cleanup - - use append-ldflags from flag-o-matic.eclass - - disable as-needed for now (bug 271818) - - add minor patch to fix compilation with gcc-4.4 - - add doc useflag to install HTML documentation - - 27 Jun 2009; Ben de Groot <yngwin@gentoo.org> metadata.xml: - Add qt herd as co-maintainer, as this is a dependency of qbittorrent - - 13 Jun 2009; Raúl Porcel <armin76@gentoo.org> metadata.xml: - Remove me as maintainer, adding net-p2p, feel free to maintain this - package - -*rb_libtorrent-0.14.4 (06 Jun 2009) - - 06 Jun 2009; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.14.4.ebuild: - Version bump - - 29 Mar 2009; Raúl Porcel <armin76@gentoo.org> - rb_libtorrent-0.14.2.ebuild: - Remove epatch line, its not needed - -*rb_libtorrent-0.14.2 (28 Mar 2009) - - 28 Mar 2009; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.14.2.ebuild: - Version bump wrt #263785 - -*rb_libtorrent-0.14.1 (28 Dec 2008) - - 28 Dec 2008; Santiago M. Mola <coldwind@gentoo.org> - +files/rb_libtorrent-0.14.1-ax_python_path.patch, - +rb_libtorrent-0.14.1.ebuild: - Version bump (bug #245731), thanks to Atman Sense <atman.sense@zise.de>. - Closes bug #225931 too. - - 09 Aug 2008; Santiago M. Mola <coldwind@gentoo.org> - rb_libtorrent-0.13.ebuild: - amd64 stable wrt bug #231595 - - 05 Aug 2008; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.13.ebuild: - x86 stable - -*rb_libtorrent-0.13.1 (05 Jul 2008) - - 05 Jul 2008; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.13.1.ebuild: - Version bump - -*rb_libtorrent-0.13_p2335 (03 Jun 2008) - - 03 Jun 2008; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.13_p2335.ebuild: - New snapshot - - 19 Apr 2008; Raúl Porcel <armin76@gentoo.org> - rb_libtorrent-0.12.1.ebuild, rb_libtorrent-0.13.ebuild: - Some tweaks - -*rb_libtorrent-0.13 (09 Apr 2008) - - 09 Apr 2008; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_rc3.ebuild, +rb_libtorrent-0.13.ebuild: - Version bump - -*rb_libtorrent-0.13_rc3 (24 Mar 2008) - - 24 Mar 2008; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1912.ebuild, -rb_libtorrent-0.13_rc1.ebuild, - +rb_libtorrent-0.13_rc3.ebuild: - Version bump - - 22 Mar 2008; Markus Rothe <corsair@gentoo.org> - rb_libtorrent-0.13_rc1.ebuild: - Added ~ppc/~ppc64 (ranger missed the latest version for ~ppc64); bug #211992 - - 11 Mar 2008; Brent Baude <ranger@gentoo.org> - rb_libtorrent-0.13_pre1912.ebuild: - Marking rb_libtorrent-0.13_pre1912 ~ppc64 for bug 211992 - -*rb_libtorrent-0.13_rc1 (09 Mar 2008) - - 09 Mar 2008; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.13_rc1.ebuild: - Version bump - - 10 Feb 2008; Raúl Porcel <armin76@gentoo.org> -rb_libtorrent-0.12.ebuild: - old - - 05 Feb 2008; Samuli Suominen <drac@gentoo.org> - rb_libtorrent-0.12.1.ebuild: - amd64 stable wrt security #208854 - - 04 Feb 2008; Dawid Węgliński <cla@gentoo.org> - rb_libtorrent-0.12.1.ebuild: - Stable on x86 (bug #208854) - -*rb_libtorrent-0.12.1 (04 Feb 2008) - - 04 Feb 2008; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.12.1.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1912 (09 Jan 2008) - - 09 Jan 2008; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1876.ebuild, +rb_libtorrent-0.13_pre1912.ebuild: - Version bump, remove old - -*rb_libtorrent-0.13_pre1876 (31 Dec 2007) - - 31 Dec 2007; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.13_pre1876.ebuild, -rb_libtorrent-0.13_pre1806_p1.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1806_p1 (09 Dec 2007) - - 09 Dec 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1791.ebuild, +rb_libtorrent-0.13_pre1806_p1.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1791 (04 Dec 2007) - - 04 Dec 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1762.ebuild, +rb_libtorrent-0.13_pre1791.ebuild: - Version bump, remove old - -*rb_libtorrent-0.13_pre1762 (24 Nov 2007) - - 24 Nov 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1724.ebuild, +rb_libtorrent-0.13_pre1762.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1724 (15 Nov 2007) - - 15 Nov 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1720.ebuild, +rb_libtorrent-0.13_pre1724.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1720 (06 Nov 2007) - - 06 Nov 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1719.ebuild, +rb_libtorrent-0.13_pre1720.ebuild: - Version bump, remove old - -*rb_libtorrent-0.13_pre1719 (02 Nov 2007) - - 02 Nov 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1683.ebuild, +rb_libtorrent-0.13_pre1719.ebuild: - Version bump, remove old - -*rb_libtorrent-0.13_pre1683 (22 Oct 2007) - - 22 Oct 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1651.ebuild, +rb_libtorrent-0.13_pre1683.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1651 (08 Oct 2007) - - 08 Oct 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1615.ebuild, +rb_libtorrent-0.13_pre1651.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1615 (01 Oct 2007) - - 01 Oct 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1610.ebuild, +rb_libtorrent-0.13_pre1615.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1610 (28 Sep 2007) - - 28 Sep 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1606.ebuild, +rb_libtorrent-0.13_pre1610.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1606 (25 Sep 2007) - - 25 Sep 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1578.ebuild, +rb_libtorrent-0.13_pre1606.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1578 (19 Sep 2007) - - 19 Sep 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1520.ebuild, +rb_libtorrent-0.13_pre1578.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1520 (02 Sep 2007) - - 02 Sep 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1496.ebuild, +rb_libtorrent-0.13_pre1520.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1496 (24 Aug 2007) - - 24 Aug 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1437.ebuild, +rb_libtorrent-0.13_pre1496.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1437 (11 Aug 2007) - - 11 Aug 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1429.ebuild, +rb_libtorrent-0.13_pre1437.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1429 (05 Aug 2007) - - 05 Aug 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1422.ebuild, +rb_libtorrent-0.13_pre1429.ebuild: - Version bump, drop old - -*rb_libtorrent-0.13_pre1422 (01 Aug 2007) - - 01 Aug 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1415.ebuild, +rb_libtorrent-0.13_pre1422.ebuild: - Version bump, old - -*rb_libtorrent-0.13_pre1415 (26 Jul 2007) - - 26 Jul 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.13_pre1409.ebuild, +rb_libtorrent-0.13_pre1415.ebuild: - Version bump - -*rb_libtorrent-0.13_pre1409 (19 Jul 2007) - - 19 Jul 2007; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.13_pre1409.ebuild: - Version bump - - 27 Jun 2007; Raúl Porcel <armin76@gentoo.org> -rb_libtorrent-0.11.ebuild: - old - - 27 Jun 2007; Christoph Mende <angelos@gentoo.org> - rb_libtorrent-0.12.ebuild: - Stable on amd64 - - 12 Jun 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild, - rb_libtorrent-0.12.ebuild: - GPL-2 -> BSD - - 08 Jun 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.12.ebuild: - x86 stable - - 30 May 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild, - rb_libtorrent-0.12.ebuild: - Re-fix threads use-flag check if >boost-1.33, bug 180322 - -*rb_libtorrent-0.12 (04 May 2007) - - 04 May 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.12_rc3.ebuild, +rb_libtorrent-0.12.ebuild: - Version bump, remove rc - - 20 Apr 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild, - rb_libtorrent-0.12_rc3.ebuild: - Fix threads USE-flag check if boost >1.33, bug 174714 - -*rb_libtorrent-0.12_rc3 (13 Apr 2007) - - 13 Apr 2007; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.12_rc3.ebuild, -rb_libtorrent-0.12_rc2_p1071.ebuild: - Version bump - -*rb_libtorrent-0.12_rc2_p1071 (13 Apr 2007) - - 13 Apr 2007; Raúl Porcel <armin76@gentoo.org> - -rb_libtorrent-0.12_rc2.ebuild, +rb_libtorrent-0.12_rc2_p1071.ebuild: - Version bump - -*rb_libtorrent-0.12_rc2 (03 Apr 2007) - - 03 Apr 2007; Raúl Porcel <armin76@gentoo.org> - +rb_libtorrent-0.12_rc2.ebuild: - Version bump - - 18 Mar 2007; Peter Weller <welp@gentoo.org> rb_libtorrent-0.11.ebuild: - Stable on amd64, keyworded ~x86-fbsd - - 18 Mar 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild: - Make it work with g/fbsd, thanks to welp for testing - - 14 Mar 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild: - Use -mt prefix for the boost libs, thanks to Peter Koeleman - <peter@peerweb.nl> for reporting, bug 170887 - - 14 Feb 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild: - Fix built_with_use, thanks to Constantine D. Kardaris <ckardaris at gmail - dot com>, bug 166834 - - 13 Feb 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild: - x86 stable - -*rb_libtorrent-0.11 (08 Jan 2007) - - 08 Jan 2007; <armin@gentoo.org> +metadata.xml, +rb_libtorrent-0.11.ebuild: - New ebuild, from bug 148667 diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest deleted file mode 100644 index 545abe5..0000000 --- a/net-libs/rb_libtorrent/Manifest +++ /dev/null @@ -1,29 +0,0 @@ -AUX rb_libtorrent-0.14.12_boost-1.45.patch 507 SHA256 0030390334b95595fef64f0b7c647ef2457cbb628a4d27a6e62be495dbc0b237 SHA512 772c34d86ccfda9809b31ef1bdf9cfd7c02c5bf7861e05debdb7a82edfdc2cd8e55206928c0ef97c90a71fbd69144ac60a6452286f60b6d8814dfec8ed8814fa WHIRLPOOL 080cfe6d721378b97ed39805e0b77a176ed93bc00708d685fabeb5eea0aa51df8decdef22e6c3e35f4a2258c90fa563e3753e498266006dd7f9506983593eb97 -AUX rb_libtorrent-0.14.8-boost-detect.patch 1969 SHA256 63d782c54b18ff1fccc08345c4b9afe112b146fa41021da3d717ee313c862ec0 SHA512 1423837af191a0bf2fdb4f462c6e75d183aeb597ec1d44274c1f3c249817f0b5a34a7de0a5db9be6ed654ebbc8c1f94f2e8a20c4dbc59b5bba22bcc99d052c1f WHIRLPOOL e5c5d608d2302a93fbe0dfd043b78019a81aa7a8ba5aa515670348f06b71cd80eebb31b2b79ebd4316a923c3bcdc12543804b0c0e6bf89529e1132374baa67ea -AUX rb_libtorrent-0.14.9-as-needed-fix.patch 520 SHA256 04d0b833d109523764bbb410cebc59196a047bd72a8c6267a32bdf458a48877c SHA512 9e5e74b239652f4997793beef1bbc9ed49a837513ab889d6c4db3dd442703da8a287addabd516204df982ddfc8635de97f5665c84a8fad9f67cc731769bd88c6 WHIRLPOOL 6c77a2a286f00bbdcc330c8e2f58600642df39dd85b00ca175f25dd75515bde65f1cc782c88ae886c0c00b4ab5dcdd20f45ee7f40bf2f8d1e7cd6302f4aa62ae -AUX rb_libtorrent-0.15.1-ax_pthread_asneeded.patch 4254 SHA256 aeba842df39d7149ef3722b6c62956f7c20ed1a81b778252ea7ed0514ab2ece3 SHA512 7d6de4ff8d9feef140c15dc351b26d69f9ae91272b34bcf1ae808742f68423c9f086ce6a4c5116ff2fd136b3624b27c0bafed9382f96142981f598fd3f816b7f WHIRLPOOL 49a80071b6b30819c4289b95cfcbb3bb2b72e5b89c8f06ef10d3978ab7f916faec9a614e60a809cae6162fc0ff4df79732317a4455ba96ae8ff5ab8ba5264e82 -DIST libtorrent-rasterbar-0.15.10.tar.gz 2623718 SHA256 36e79fa4e79d5b0911ade11bc41ee75375048acc06526a23fad8558612ac38c4 SHA512 b66791a62dc3478dcfd8d7045891bccb660af51a313feb795140353c249b00794cc031d6ad6c47020c0e29601c5da5a2f0f2dc646148c7e616285af8ef44bc70 WHIRLPOOL dacd32e103c4ad9b563221e3bf18cc74b03cc415a155c15516b55bd345a31474362a12c26ccfc5eeb724498f5366704acae2dc68ee32e162a261a12abdb43c2f -DIST libtorrent-rasterbar-0.15.5.tar.gz 2606717 SHA256 150cbda406ac5ff57330446487961503c87d22bfb61a72d695ab4520b4c18a43 SHA512 0d2572c6f1d6b99e1b668d1e2e999538d6083e9a788473fa1a663bf752e70f2a4908f8d7f9d268741bc54c1e201600d9c4b57e6ad1912f1387e109b9ba0b9926 WHIRLPOOL 27bfda4413227433978bb66884d4a8f974757e725873bc063ff5932ea039f134879481ac3d9120ce9d999a53a287f5487d6e04da5888429cd66fa7ed3d56724b -DIST libtorrent-rasterbar-0.15.6.tar.gz 2608765 SHA256 dc84775911129942d21ed94569f7c06accffcf31dc909b26eca5f824efb63f13 SHA512 b62939fd8e067c536236bc5b96498c65de454eaeb76e23c360c848a523f6b306410164ef90ca2540324f4f6d6be88072903f6002075621e108c26550ad447e2d WHIRLPOOL c72ed103a0a618278e053c741a08f25f3725ba16f88bca469c7e191971455ef3868f2bd7c69468e2fec1bde275f17e3b2c20b9a7c34d382ea0d0ac98adfb139e -DIST libtorrent-rasterbar-0.15.8.tar.gz 2605456 SHA256 f5dfe715e4f49784d5cc2821983a5fbe454c5a53beedc1996ecae5178188c71c SHA512 c33ef003823ba263e57068cd7c67179bfa69ffae6597eacc40ab154dbd2bc66507b1f91fc80f970d388423461f6eab8ed4e245980b7c0f6c10aa886b60155500 WHIRLPOOL 29fa50225e64a52823fc6d9fe800af2885e6be434b500a77adb2e98d2e41f1051d853342de580ed26008652bbe61eb46aa6c00e2446de08944589ff2e83f1567 -DIST libtorrent-rasterbar-0.15.9.tar.gz 2619950 SHA256 a2ea68011e9933c7deb473268122f016171d24f0f35e744fbdadd14bf6bac23d SHA512 abbf237b03c1ca5ff0022487caea6b533254467dbc3d74450cc000a3c9fca4c88c9589e17f88534fe49e87bd29a179fa964eea821873dcab62ac07cfc6246a40 WHIRLPOOL 7de400e51564273021ca7694335e58c6e8bbe12f2a65208d7ca002def4c32e1ca744d68fb4cf74de31a8cb09d7a914206dcbbc3305ee6b7a78741e94c99b04ea -DIST libtorrent-rasterbar-0.16.0.tar.gz 2880619 SHA256 c645f2507f97f80d8681fe44ece00d266c5cd14cfb1ef68fbd005c9a93dec620 SHA512 1ad4ee0ce698a7ad8912031df18ef2d351424f171c8bdd584e2077595f05d001d9b19a7f3123ea7aade7ff1b582059d6ba504b821868f5dc87b9f2436985b048 WHIRLPOOL a10ba0979abdd67827bbc84a1e5a92182e885e581bd4bfdd39ff68175ab4f2b8f31f6b852f555e2c7e09f5ab4bfd4574413ee67b526def8d99d8e330320009a8 -DIST libtorrent-rasterbar-0.16.10.tar.gz 2985640 SHA256 4c0d78b28af8051ff8a19a3a3e10a5edfec50945b8f3c9a76612111c47d671bc SHA512 a8b5d762f2b50ded1f8589efeedf2d1e0b5cc39d71bcc1840658137c1058cd03fe249c6855c5c483304aafb74b616d241456fecf00dec50608aa82af9f795819 WHIRLPOOL 20cc12a8bfcafd079a0d8ab6132bb3a4aa289089ed12c895bc2b2047b5a10a15a3ba20d6f0f767ba0e01f19dc3e1baa05518d08454b502a8b125e513bf05ce51 -DIST libtorrent-rasterbar-0.16.11.tar.gz 2989445 SHA256 09dc00f8ab9c90327cdfa46c4a68b59ebd3a949c8bfb641b4a99e974d49ad2e5 SHA512 2e058e3eae7eeb6229c40428415313c52f5a85bc79a8ec7f6d495ee14c99f871792c7109c081638533dfdd7961ad78d9d8592eedb864fee9f311aff434737a8a WHIRLPOOL 255d5561302c2cab087ff0f9be1c28108a3964f669fcd304872f0fecba425bddb512012c45bdb901ce0bb9fa765c4edd25147bcd300d8e375cf18da759d50dec -DIST libtorrent-rasterbar-0.16.5.tar.gz 2912302 SHA256 35884b450e49b7d62d327c9952241adfcfa534af8f7b1bdab1d3333cf9b0f3cb SHA512 eb6a2af19c185acda0a93c1adc87c8eedaa1323a01ba169414066fe6063e6ff8b78843adf38f2ade1246afdc7bebcaaa0533f45c92ecdb3b08f408dcb9773963 WHIRLPOOL 08153d61a9f5158dd1f4e387c390a3f840025c7673432d9d97eae6582a2d1d94c405a3c11f7b2b6445a792add2b7aa7c7790a58117ee638dee0831e291c3b40d -DIST libtorrent-rasterbar-0.16.8.tar.gz 2941811 SHA256 80a510f8f1f39d21dd9948b145722697c261f406bc68219ec2804ddcac875d06 SHA512 9cdb0ec2a9e3e5f30f89437729480d2326590c6711567aa0ad08662263b9a1a97a918287cd6514aa7f11ed58e63d156304acf2f4ecaba02fbe297afa8747d1c1 WHIRLPOOL 0acbbd3975089ef31e1606ccb3de193bd9983d4f94f4e30fcf09d0c990e53677a49a192e9f9a4d2b0c8de2416100b30715e11ab4636d16482c04401a91e1946a -DIST libtorrent-rasterbar-0.16.9.tar.gz 2945330 SHA256 7b7e1f68c75bd80c14a3b8ab937be0823363d60f32df1373fa6c76f9d7346f1d SHA512 753e6fa5a2321f7849c9caf6ef11bea12d6cb957a4314de425f671c6d7de8e0b2ba7240ebc4545647126bb5e3429d9616a1b6b3a728c2f456d7f136ab29c93d9 WHIRLPOOL 83800819beef2e278c36f689cd697d4169940c8567c51d4cc346d4f13fb2ccf3e320542bcbb44c4375183db1c011357e59a0089b94b54e5e9b39b0a0a02ac68e -EBUILD rb_libtorrent-0.15.10.ebuild 1887 SHA256 5161e0553948276c8b87dcf135422ebb08426bada7d8c279a9157ebf1c6897e5 SHA512 0eaee600f482ec706195380a4f65506da73191fc416196a4e9724d754f3ce9a222adedae736fa25e53c4016b22f4a5c60ab281333766a45c4e30b13e01fc70a3 WHIRLPOOL 166a15af4c949298e3d15ca9fdf0c194c2bc988b0d2eac543b4ae04d11718e0f82a4fe740f420ea657a995643e433a5f9c15e929f6c50c57329e646f66629e1b -EBUILD rb_libtorrent-0.15.5.ebuild 2099 SHA256 62793b52847ed2bb992fdb01631ca50e77253b45537bd56118391648b197b36a SHA512 238a7ee418c8e022278c25507402ec329bc15c79b10fa8518b0edae95e57c1e238ee20dfd6b5c3629b616ae355cb9028d7d797cb6023bbe3d366a3cb57602049 WHIRLPOOL 3c99e6c5eab5055f884b3c9e314775bef44b64adb71c41103ad013ca2846ae4a4c8d97262253cb4392826f227d4091f4d76e7f30653f023b5c7c478c994c3544 -EBUILD rb_libtorrent-0.15.6.ebuild 2226 SHA256 3c0363b784ae23b3c105cbb50e768b6237785033c17beb5199988e997dac18ef SHA512 364f2099b1d89da82104f2e206733a6ec66521bda0090d861c37533936962bcb55235d73f67325f5245b573abdbfbf9d33c2b9517033ef840ffc621f98e3f47a WHIRLPOOL 38dd65cba9a4eb1afb2d3a097cfc7ca7d97ee403354e1f83b08f4f0e5d5f8d261e73aee05b6a8b8fd1110c0dddfd6f05e7858a2e5416e0629e3610871bfc80e3 -EBUILD rb_libtorrent-0.15.8.ebuild 2339 SHA256 798fab4ca38ac58de2a149fc3f8f2d652c8b53b3f762b17fb0715aedf747a500 SHA512 b6318d78ba004728778ac958839de8595dab7df02c6128b51782d51d699cbce3951274fbf08108e19dc8d7194f2045102da02255e83280828a8dea6b9b12b5dd WHIRLPOOL 6bd129dfd7e6a557c5899cb2c6ef9ec7b93fc5dee9eeccc5ef8813e143208450365fcf533e629b9b3e50048cd490546ba46101c30488e332546f61b00a5cf6dd -EBUILD rb_libtorrent-0.15.9-r1.ebuild 2302 SHA256 84b4f2a4f29eb845a8485487d3f4e3ea62da8040d386d36a96ab2c061e630b71 SHA512 b30ffb88d4e9dd8b67c92989654861b36996bfa0676bee3382dcd4db7c01de93a9b0f86f72dea0d865c9ef0d60e695c78808fe11dc7bf8b5cc8805eb6829b80a WHIRLPOOL f83ee7ca5684f28008f4644d366287a1079511c681039a7ecc6cb3e177bf3710bcc1c4f3111d48f49f6d94076185ac48d3b09b6edc3aaf1253da64c9fa0fe776 -EBUILD rb_libtorrent-0.15.9.ebuild 2335 SHA256 65b4cd3a8e89eba0a13c911e5b9f3b5bc85269eeceb08ebb3272fc623ef66659 SHA512 9413a278a70b5e15e7bcf61a86c7e6cc0b79a329a986df815216bbc8e3abe36027f7852f976bce63586360f098c7e845d7ba8accee70e793bcd55a861a4d9e40 WHIRLPOOL ad28a500ecf7e2b7ea1d25d417e886a6b01f59944bf595d9a192062f44e4d155e6f4528d0e151840cfbc9d8014b815c026f1ff45ea75cf25c0ffc66adb777b54 -EBUILD rb_libtorrent-0.16.0.ebuild 2189 SHA256 91cddce5218ee738317239f625a9a8db80131d4ace5b68f3f59a2ea7f8e5a123 SHA512 307f061fe0a25ca7cc1bb2d4c791db5bfa35d8b15b165beda932db0bdd7ee57fb31acf908f90b39bf0d67d7fd9023657c064a87d79348be672dfdb85c34c4789 WHIRLPOOL 08e71879152fb6e6dc050b1d30de57044e085a18a59bf2054c3b7fe9df9a55db5101e4cdb85d0fdc5d0bc6ef779d373696cbef5168279964c808566440a1b6f1 -EBUILD rb_libtorrent-0.16.10.ebuild 1926 SHA256 3eccbe9d904c43c58c7626842eae539895526db28941c0a9b2a159c8404ab64a SHA512 6ca665f1a6fbe6f27cb94ef586db66a36e9f72e416a890626793090a0bacc4694c53eb43b16ef6c0e655dd6cdda2d159d969aecb75191c076fbbaebbdf67d845 WHIRLPOOL 04cfc293b94a34898fc5a8837bbb1bc819dba65c3c5702a30162457f79d47dd508cab16519562ef220ed9b5aab07bb90943f8d5ce3437124147182e2dfdbb4bd -EBUILD rb_libtorrent-0.16.11.ebuild 1975 SHA256 741f29f9c1191d4381bb08bb4b468d8752857bc2057306fa0a8b11c3f4f034e5 SHA512 2e053c92d22ede7a53b54c7808d1e95f5d327b496afe821129f1668b5dd90cfdee19d0eda9389e1281abd1cfec497fc3ec8cc7f27c5813d0d27d7b25e933e52b WHIRLPOOL dc7d8a12404f4900590a3eb7b848cfc3a1e6ffe715d7ded8a138cb4408a4da3a18366eff6727847a3af9a1882f8fc4d0faa8440d5a3996da255696decef92329 -EBUILD rb_libtorrent-0.16.5.ebuild 1926 SHA256 284159e96120e1b6fe74b68ff005e146eef9d4a8c3522612c56121c53c5e130f SHA512 bb4b3b2e5d7c65fe603e4e8b7af611e6f7ea36921774d898042686e232e53e8c0ab8bdec28ddb9a6e648d5f1dc9a772f9b2511c999cc7b3b29d139d59aa2af88 WHIRLPOOL 4a025c28e7b02258d50bdb7e270a5fc1bb3c1db34c39665514dba3c0c65ad3d422fb967dbb06b4813412be2c7507932b7880099457c03d2db58bb1307e4f65ab -EBUILD rb_libtorrent-0.16.8.ebuild 1925 SHA256 3001ade1d123144b5982f3413182044c4b9e9381912c8aca936ee9e334f3e1bf SHA512 3b68e48cb781480ff3410aa50383c5511f6bc00f22852c98e85d72b082509a0dc4b84bb2560ca25096aa5e37e26243069bd221da2d40f5f4ce0dd685d9333081 WHIRLPOOL b102dd12b2f1c221efad850aea9be8f75608bf2e9abf1a90d562909e19f9ad038ae2c8276355c0ce8d17964d7855123111903806e84db9d1589ab7dab863122a -EBUILD rb_libtorrent-0.16.9.ebuild 1936 SHA256 afceca6d2fdac06aff54c5942fe76efc1173eea05c73848a2fd723733d8dc294 SHA512 945c616f3755d5b98d2054e6e602c789f4777fd79b2d4203df10b130f7992f2fff72f90712d12897e0f59072908ac34b32e2fb0e4da271f609ac508aebd8e118 WHIRLPOOL 5a242fa0d34501d50c3433779c6051247ef4cecd3a83daf5c6ccfe80dd3306b696e5a943af7e570e7be1845f2d72f7794eb26d8e3a9ee627e76673f5b42975e9 -MISC ChangeLog 27232 SHA256 17d0700424fe33f8a8101f9b0b6011b829fd89a5ccc3d3b23953e6bc793ab4d4 SHA512 b03cd93085d21833403e5c646e0c21e46bcaefac861963a6c128c8bac9785f86bf20d59866fb67d850311d45c19ac4282e52f624a086a7bf13907d64bd7a3444 WHIRLPOOL 3a55f9da6e947f0e95c51c87ea098a051489a45a8fb33f7dfc44e2aceacfaf1a3ddbe388f6cfd2451667c5ea9c1a055bb569649b0cbe306a7323d1a91ef3f860 -MISC metadata.xml 338 SHA256 c3c6440b48a876a0f8126eaf17c31f5f77f2eaf2d84068c9d43bfba6cd5d187c SHA512 b9b57d5e8f907705b27f55f31bc4d7e68c8f076162d2ca2f6a34be64a0e17c80f20798f15df493d7a1ba29d88148b1ddb49ef757acda58f2b7e1b5d1126d9418 WHIRLPOOL 1ca916d0c644bd428c6f21cd7c126cf6b8783a5b84eb4468712f6843bb14bff6869d39440af9c482a0bb9d40fd037aace45524609476b7e83d92420a757892f5 diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.12_boost-1.45.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.12_boost-1.45.patch deleted file mode 100644 index 7dbf230..0000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.12_boost-1.45.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtorrent-rasterbar-0.14.12/include/libtorrent/udp_socket.hpp -=================================================================== ---- libtorrent-rasterbar-0.14.12.orig/include/libtorrent/udp_socket.hpp -+++ libtorrent-rasterbar-0.14.12/include/libtorrent/udp_socket.hpp -@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. - #include "libtorrent/buffer.hpp" - #include "libtorrent/session_settings.hpp" - --#include <vector> -+#include <list> - #include <boost/function.hpp> - #include <boost/thread/mutex.hpp> - diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch deleted file mode 100644 index 6f55754..0000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- m4/ax_boost_base-fixed.m4.orig 2010-01-16 00:10:19.000000000 +0100 -+++ m4/ax_boost_base-fixed.m4 2010-01-16 00:12:32.000000000 +0100 -@@ -89,7 +89,7 @@ - dnl or if you install boost with RPM - if test "$ac_boost_path" != ""; then - BOOST_LDFLAGS="-L$ac_boost_path/lib" -- BOOST_CPPFLAGS="-I$ac_boost_path/include" -+ BOOST_CPPFLAGS="-I$ac_boost_path" - else - for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then ---- bindings/python/setup.py.in.orig 2010-01-16 00:14:36.000000000 +0100 -+++ bindings/python/setup.py.in 2010-01-16 00:15:15.000000000 +0100 -@@ -62,7 +62,7 @@ - source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src")) - source_list = [os.path.join("src", s) for s in source_list if s.endswith(".cpp")] - --extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ @BOOST_SYSTEM_LIB@ @SSL_LDFLAGS@ @SSL_CXXFLAGS@' -+extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ @BOOST_SYSTEM_LIB@ @SSL_LDFLAGS@ @SSL_CXXFLAGS@' - - setup( name='python-libtorrent', - version='@PACKAGE_VERSION@', ---- src/Makefile.am.orig 2010-01-16 00:16:08.000000000 +0100 -+++ src/Makefile.am 2010-01-16 00:17:16.000000000 +0100 -@@ -108,7 +108,7 @@ - $(top_srcdir)/include/libtorrent/version.hpp - - --libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO) -+libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO) @BOOST_LDFLAGS@ - libtorrent_rasterbar_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ - - AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@ diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch deleted file mode 100644 index fc18070..0000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.in.orig 2010-02-19 08:03:57.000000000 +0100 -+++ configure.in 2010-03-24 01:04:37.000000000 +0100 -@@ -157,7 +157,6 @@ - - dnl Apply boost config. - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" --LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - - if [[ "x$BUILD_TESTCLIENT" != "xno" ]]; then - CLIENT_TEST_BIN=client_test; -@@ -519,6 +518,9 @@ - dnl Compile time options. - AC_SUBST(COMPILETIME_OPTIONS) - -+dnl Check for clock_gettime -+AC_SEARCH_LIBS([clock_gettime],[rt]) -+ - AC_OUTPUT([Makefile - src/Makefile - include/Makefile diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch deleted file mode 100644 index 3171d03..0000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.15.1-ax_pthread_asneeded.patch +++ /dev/null @@ -1,122 +0,0 @@ -http://bugs.gentoo.org/247067 - ---- m4/ax_pthread.m4 -+++ m4/ax_pthread.m4 -@@ -266,6 +266,117 @@ - else - PTHREAD_CC=$CC - fi -+ -+ # The next part tries to detect GCC inconsistency with -shared on some -+ # architectures and systems. The problem is that in certain -+ # configurations, when -shared is specified, GCC "forgets" to -+ # internally use various flags which are still necessary. -+ -+ # -+ # Prepare the flags -+ # -+ save_LDFLAGS="$LDFLAGS" -+ save_CFLAGS="$CFLAGS" -+ save_LIBS="$LIBS" -+ save_CC="$CC" -+ -+ # Try with the flags determined by the earlier checks. -+ # -+ # -Wl,-z,defs forces link-time symbol resolution, so that the -+ # linking checks with -shared actually have any value -+ # -+ # FIXME: -fPIC is required for -shared on many architectures, -+ # so we specify it here, but the right way would probably be to -+ # properly detect whether it is actually required. -+ CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS" -+ LIBS="$PTHREAD_LIBS $LIBS" -+ CC="$PTHREAD_CC" -+ -+ # In order not to create several levels of indentation, we test -+ # the value of "$done" until we find the cure or run out of ideas. -+ done="no" -+ -+ # First, make sure the CFLAGS we added are actually accepted by our -+ # compiler. If not (and OS X's ld, for instance, does not accept -z), -+ # then we can't do this test. -+ if test x"$done" = xno; then -+ AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies]) -+ AC_TRY_LINK(,, , [done=yes]) -+ -+ if test "x$done" = xyes ; then -+ AC_MSG_RESULT([no]) -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ fi -+ -+ if test x"$done" = xyes; then -+ done="no" -+ AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) -+ AC_TRY_LINK([#include <pthread.h>], -+ [pthread_t th; pthread_join(th, 0); -+ pthread_attr_init(0); pthread_cleanup_push(0, 0); -+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -+ [done=yes]) -+ -+ if test "x$done" = xyes; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ fi -+ -+ # -+ # Linux gcc on some architectures such as mips/mipsel forgets -+ # about -lpthread -+ # -+ if test x"$done" = xno; then -+ AC_MSG_CHECKING([whether -lpthread fixes that]) -+ LIBS="-lpthread $PTHREAD_LIBS $save_LIBS" -+ AC_TRY_LINK([#include <pthread.h>], -+ [pthread_t th; pthread_join(th, 0); -+ pthread_attr_init(0); pthread_cleanup_push(0, 0); -+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -+ [done=yes]) -+ -+ if test "x$done" = xyes; then -+ AC_MSG_RESULT([yes]) -+ PTHREAD_LIBS="-lpthread $PTHREAD_LIBS" -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ fi -+ # -+ # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc -+ # -+ if test x"$done" = xno; then -+ AC_MSG_CHECKING([whether -lc_r fixes that]) -+ LIBS="-lc_r $PTHREAD_LIBS $save_LIBS" -+ AC_TRY_LINK([#include <pthread.h>], -+ [pthread_t th; pthread_join(th, 0); -+ pthread_attr_init(0); pthread_cleanup_push(0, 0); -+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -+ [done=yes]) -+ -+ if test "x$done" = xyes; then -+ AC_MSG_RESULT([yes]) -+ PTHREAD_LIBS="-lc_r $PTHREAD_LIBS" -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ fi -+ if test x"$done" = xno; then -+ # OK, we have run out of ideas -+ AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries]) -+ -+ # so it's not safe to assume that we may use pthreads -+ acx_pthread_ok=no -+ fi -+ -+ CFLAGS="$save_CFLAGS" -+ LIBS="$save_LIBS" -+ CC="$save_CC" -+ - else - PTHREAD_CC="$CC" - fi diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml deleted file mode 100644 index 08864fd..0000000 --- a/net-libs/rb_libtorrent/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-p2p</herd> - <maintainer> - <email>hwoarang@gentoo.org</email> - <name>Markos Chandras</name> - </maintainer> - <upstream> - <remote-id type="google-code">libtorrent</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild deleted file mode 100644 index cb9eb4e..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.10.ebuild,v 1.7 2012/11/08 06:24:13 flameeyes Exp $ - -EAPI="4" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit multilib python versionator - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs" -RESTRICT="test" - -DEPEND=">=dev-libs/boost-1.48[python?,threads(+)] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - use python && python_convert_shebangs -r 2 . -} - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-python=boost_python-${PYTHON_ABI}-mt" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - $(use_enable static-libs static) \ - --with-zlib=system \ - ${LOGGING} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install - use static-libs || find "${D}" -name '*.la' -exec rm -f {} + - dodoc ChangeLog AUTHORS NEWS README - if use doc; then - dohtml docs/* - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild deleted file mode 100644 index 7cf2fce..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.5.ebuild,v 1.7 2012/02/05 01:32:54 floppym Exp $ - -EAPI="2" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit eutils multilib python versionator - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="debug doc examples python ssl" -RESTRICT="test" - -DEPEND="<dev-libs/boost-1.48[python?] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-python=boost_python-mt" - - # detect boost version and location, bug 295474 - BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" - BOOST_INC="/usr/include/boost-${BOOST_VER}" - BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - --with-zlib=system \ - ${LOGGING} \ - --with-boost=${BOOST_INC} \ - --with-boost-libdir=${BOOST_LIB} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild deleted file mode 100644 index a8d1fdb..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.6.ebuild,v 1.7 2012/02/05 01:32:54 floppym Exp $ - -EAPI="2" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit eutils multilib versionator python - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" -IUSE="debug doc examples python ssl" -RESTRICT="test" - -DEPEND="<dev-libs/boost-1.48[python?] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - use python && python_convert_shebangs -r 2 . -} - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-python=boost_python-mt" - # detect boost version and location, bug 295474 - BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" - BOOST_INC="/usr/include/boost-${BOOST_VER}" - BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - --with-zlib=system \ - ${LOGGING} \ - --with-boost=${BOOST_INC} \ - --with-boost-libdir=${BOOST_LIB} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild deleted file mode 100644 index 70de22e..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.8.ebuild,v 1.3 2012/02/05 01:32:54 floppym Exp $ - -EAPI="2" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit eutils multilib versionator python - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs" -RESTRICT="test" - -DEPEND="<dev-libs/boost-1.48[python?] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - use python && python_convert_shebangs -r 2 . -} - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-python=boost_python-mt" - # detect boost version and location, bug 295474 - BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" - BOOST_INC="/usr/include/boost-${BOOST_VER}" - BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - $(use_enable static-libs static) \ - --with-zlib=system \ - ${LOGGING} \ - --with-boost=${BOOST_INC} \ - --with-boost-libdir=${BOOST_LIB} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - use static-libs || find "${D}" -name '*.la' -exec rm -f {} + - dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild deleted file mode 100644 index eb5f37a..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.9-r1.ebuild,v 1.3 2012/02/05 03:32:12 floppym Exp $ - -EAPI="4" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit multilib python versionator - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs" -RESTRICT="test" - -DEPEND=">=dev-libs/boost-1.48[python?] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - use python && python_convert_shebangs -r 2 . -} - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-python=boost_python-${PYTHON_ABI}-mt" - # detect boost version and location, bug 295474 - BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" - BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}" - BOOST_LIB="${EPREFIX}/usr/$(get_libdir)/boost-${BOOST_VER}" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - $(use_enable static-libs static) \ - --with-zlib=system \ - ${LOGGING} \ - --with-boost=${BOOST_INC} \ - --with-boost-libdir=${BOOST_LIB} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install - use static-libs || find "${D}" -name '*.la' -exec rm -f {} + - dodoc ChangeLog AUTHORS NEWS README - if use doc; then - dohtml docs/* - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild deleted file mode 100644 index c5436d0..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.15.9.ebuild,v 1.6 2012/04/19 14:40:00 ranger Exp $ - -EAPI="2" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit eutils multilib python versionator - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs" -RESTRICT="test" - -DEPEND="<dev-libs/boost-1.48[python?] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - use python && python_set_active_version 2 -} - -src_prepare() { - use python && python_convert_shebangs -r 2 . -} - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-python=boost_python-mt" - # detect boost version and location, bug 295474 - BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" - BOOST_INC="/usr/include/boost-${BOOST_VER}" - BOOST_LIB="/usr/$(get_libdir)/boost-${BOOST_VER}" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - $(use_enable static-libs static) \ - --with-zlib=system \ - ${LOGGING} \ - --with-boost=${BOOST_INC} \ - --with-boost-libdir=${BOOST_LIB} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - use static-libs || find "${D}" -name '*.la' -exec rm -f {} + - dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.0.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.0.ebuild deleted file mode 100644 index 863625e..0000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.0.ebuild,v 1.1 2012/04/17 15:42:02 hwoarang Exp $ - -EAPI="4" -PYTHON_DEPEND="python? 2:2.6" -PYTHON_USE_WITH="threads" -PYTHON_USE_WITH_OPT="python" - -inherit multilib python versionator - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="http://libtorrent.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc examples python ssl static-libs" -RESTRICT="test" - -DEPEND=">=dev-libs/boost-1.48[python?] - >=sys-devel/libtool-2.2 - sys-libs/zlib - examples? ( !net-p2p/mldonkey ) - ssl? ( dev-libs/openssl )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - use python && python_convert_shebangs -r 2 . -} - -src_configure() { - # use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-python=boost_python-${PYTHON_ABI}-mt" - # detect boost version and location, bug 295474 - BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")" - BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")" - BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")" - BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}" - BOOST_LIB="${EPREFIX}/usr/$(get_libdir)/boost-${BOOST_VER}" - - local LOGGING - use debug && LOGGING="--enable-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - $(use_enable ssl encryption) \ - $(use_enable static-libs static) \ - ${LOGGING} \ - --with-boost=${BOOST_INC} \ - --with-boost-libdir=${BOOST_LIB} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install - use static-libs || find "${D}" -name '*.la' -exec rm -f {} + - dodoc ChangeLog AUTHORS NEWS README - if use doc; then - dohtml docs/* - fi -} diff --git a/net-mail/lurker/Manifest b/net-mail/lurker/Manifest deleted file mode 100644 index c841fe1..0000000 --- a/net-mail/lurker/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST lurker-2.3.tar.gz 320420 RMD160 c4514fb90d21b0d470ca928b58a708f24abe2155 SHA1 11976e94f3846e09b7164d359605f5a5081b7d70 SHA256 d174d16d62c32ee5899cb346544b35ccde1b70e8a81aa971e52ec8818365d038 -DIST mimelib-3.1.1.tar.gz 194838 RMD160 7f7f246245cdc70264a0b3f4997ff8d1ca51a84c SHA1 6890d5aaeb51543c2b4104d624dfdfbb8a7e77a1 SHA256 831f553639944d23ef7fc6d27a98c88b7a1afa4626b8feef98e8932403ec6e6c -EBUILD lurker-2.3.ebuild 1890 RMD160 5c94b515f339e11cc3ad186d4fef8ce1db688b31 SHA1 f75c4c9487efc8acb0c9d335d9ebf252b14912e6 SHA256 a6bc0e2862b57c01309fab52bc0c389f6dbe6838be82ddff8549b60173dc9c5c diff --git a/net-mail/lurker/lurker-2.3.ebuild b/net-mail/lurker/lurker-2.3.ebuild deleted file mode 100644 index ce9df92..0000000 --- a/net-mail/lurker/lurker-2.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit eutils autotools flag-o-matic webapp - -DESCRIPTION="Lurker is a mailing list archiver designed for capacity, speed, simplicity, and configurability." -HOMEPAGE="http://lurker.sourceforge.net/" -MIMELIB_URI="mirror://sourceforge/lurker/mimelib-3.1.1.tar.gz" -SRC_URI="mirror://sourceforge/lurker/${P}.tar.gz ${MIMELIB_URI}" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86 ~x86-linux" -IUSE="" - -RDEPEND="" - -DEPEND="sys-libs/zlib - dev-libs/libxslt" - -need_httpd_cgi - -S=${WORKDIR}/${P} -MIMELIB=${WORKDIR}/mimelib - -pkg_setup() { - webapp_pkg_setup -} - -src_configure() { - echo "jopa!" - cd ${S} - ln -s ${MIMELIB} mimelib - echo ${S} - econf --with-mimelib-local \ - --with-default-www-dir=${MY_HTDOCSDIR} \ - --with-cgi-bin-dir=${MY_CGIBINDIR} \ - || die "econf failed" -} - -src_compile() { - cd ${S} - emake || die "make failed" -} - -src_install() { - webapp_src_preinst - emake install DESTDIR=${D} || die "install failed" - emake install-config DESTDIR=${D} || die "install-config failed" - dodoc ChangeLog FAQ INSTALL README AUTHORS COPYING - # mv ${ED}/etc/lurker/lurker.conf ${D}${MY_HOSTROOTDIR} || die - # webapp_configfile ${D}${MY_HOSTROOTDIR}/lurker.conf - # webapp_postinst_txt en INSTALL - # webapp_src_install -} - -pkg_postinst() { - ewarn "The lurker.conf file will be installed into your " - ewarn "document root directory for the virtual host." - ewarn "use the command:" - ewarn "webapp-config -I -d / -h lurker.example.org lurker 2.3" - ewarn "to install lurker for each virtual host and then edit" - ewarn "the lurker.conf file for that host." - ewarn - ewarn "You should also have access control in place over the" - ewarn "lurker website. There is a sample apache configuration" - ewarn "file in /etc/lurker/apache.conf that you could include" - ewarn "in your apache configuration." -} diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog deleted file mode 100644 index 37dd399..0000000 --- a/net-misc/minidlna/ChangeLog +++ /dev/null @@ -1,78 +0,0 @@ -# ChangeLog for net-misc/minidlna -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.15 2012/05/05 03:20:42 jdhore Exp $ - - 05 May 2012; Jeff Horelick <jdhore@gentoo.org> minidlna-1.0.23.ebuild, - minidlna-1.0.23-r1.ebuild, minidlna-1.0.24.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - -*minidlna-1.0.24 (26 Mar 2012) - - 26 Mar 2012; Michael Weber <xmw@gentoo.org> -minidlna-1.0.22.ebuild, - minidlna-1.0.23-r1.ebuild, +files/minidlna-1.0.23-r1.initd, - +minidlna-1.0.24.ebuild, -files/minidlna.confd, -files/minidlna.initd: - Clean up old version/files. Fix /var/run/minidlna permissions and version - bump (thanks Daniel Pielmeier, bug 404571) - -*minidlna-1.0.23-r1 (26 Mar 2012) - - 26 Mar 2012; Michael Weber <xmw@gentoo.org> +minidlna-1.0.23-r1.ebuild: - Re-add lost config file (thanks Thomas Kucharczyk, bug 404523) - -*minidlna-1.0.23 (29 Jan 2012) - - 29 Jan 2012; Michael Weber <xmw@gentoo.org> +minidlna-1.0.23.ebuild, - +files/minidlna-1.0.23.confd, +files/minidlna-1.0.23.initd: - Version bump. No longer run as root per default (thanks Yuri Karaban, bug - 394373) - - 14 Nov 2011; Michael Weber <xmw@gentoo.org> minidlna-1.0.22.ebuild: - remove whitespace - - 14 Nov 2011; Michael Weber <xmw@gentoo.org> -minidlna-1.0.21.ebuild, - minidlna-1.0.22.ebuild: - remove old version, bump EAPI. - -*minidlna-1.0.22 (02 Sep 2011) - - 02 Sep 2011; Michael Weber <xmw@gentoo.org> minidlna-1.0.21.ebuild, - +minidlna-1.0.22.ebuild: - Version bump, calling ./genconfig.sh from src_configure (bug 350985) - - 23 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> minidlna-1.0.21.ebuild: - QA: add -j1 to make, for bug #350985, until fixed. - - 22 Aug 2011; Michael Weber <xmw@gentoo.org> -minidlna-1.0.19.ebuild, - -minidlna-1.0.20.ebuild: - Removing old versions - -*minidlna-1.0.21 (31 Jul 2011) - - 31 Jul 2011; Michael Weber <xmw@gentoo.org> +minidlna-1.0.21.ebuild: - Version bump, thanks to Sylvain BERTRAND for the report (bug 375951) - -*minidlna-1.0.20 (15 Jun 2011) - - 15 Jun 2011; Michael Weber <xmw@gentoo.org> -minidlna-1.0.18.ebuild, - +minidlna-1.0.20.ebuild: - Version bump, thanks to Opportunist for the hint (bug 371777) - -*minidlna-1.0.19 (06 Apr 2011) - - 06 Apr 2011; Michael Weber <xmw@gentoo.org> +minidlna-1.0.19.ebuild: - Version bump, thanks to dylan.thies@gmail.com for the report on bug 362183. - - 04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> minidlna-1.0.18.ebuild: - Move to virtual/ffmpeg from media-video/ffmpeg. - - 31 Dec 2010; Michael Weber <xmw@gentoo.org> minidlna-1.0.18.ebuild: - Added ~x86 keyword (bug 350118) - -*minidlna-1.0.18 (29 Dec 2010) - - 29 Dec 2010; Michael Weber <xmw@gentoo.org> +minidlna-1.0.18.ebuild, - +files/minidlna-1.0.18-Makefile.patch, +files/minidlna.confd, - +files/minidlna.initd, +metadata.xml: - Initial import, fixes bug 284647. Thanks to Daniel Klaffenbach - <direx@betriebsdirektor.de> for his work on the ebuild. - diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest deleted file mode 100644 index 79bb724..0000000 --- a/net-misc/minidlna/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX minidlna-1.0.18-Makefile.patch 452 RMD160 81fad7433ccf2cdbccac8735772705a6a9ebca60 SHA1 431c0d0a49d231f70059d4fd2713b6a8613aa115 SHA256 036047d07f5fa9395104ca16c79d332ee17e2b3b83292ba3de019e97d5cafced -AUX minidlna-1.0.23-r1.initd 1226 RMD160 cf43515323011d00bde02fe56cf850ef5426a23c SHA1 88745d823146ab9f3ee415f7d7c404b53e977815 SHA256 26ef5686db85f14c0f7b493c693f7da134a95f58553643581d6e186f68c9c05e -AUX minidlna-1.0.23.confd 310 RMD160 5a3e150d34c59126b45c7f64d84d39e211eeab27 SHA1 be093a5ea697b7292c1f0c312560e93cb1b1e530 SHA256 6c11dee4e893d24900cbe8efcd5f2b0eaf5476d0f3c16b809f48607efe7154a8 -AUX minidlna-1.0.23.initd 1085 RMD160 f46f29417dc47b9b73f67ec92a85c70685939838 SHA1 8a11a512e96d79908b404ff22688f4e76ba810a8 SHA256 7a557a91f0c2944b69b1d659d66cd10913c1bdcf3eca3fd396575c0b1a1dcbe0 -DIST minidlna_1.0.23_src.tar.gz 210175 RMD160 b95b44b112f8531c9028f70c1bccfb91272a5f9a SHA1 354d35ffd43249a7cea6a6ce316ceb2623bf8cde SHA256 efc3a5de564c42782714eb89186254910e343f309b9b78635865a4592cd0c28a -DIST minidlna_1.0.24_src.tar.gz 210775 RMD160 dad61a48059678c202b8ef009470f72622d7a38a SHA1 5e7fe50dbac5b5784e3d7a4eb9251fa9b37e97f2 SHA256 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942 -EBUILD minidlna-1.0.23-r1.ebuild 1190 RMD160 cb34949833b91518752ff0e75f39ae625275e71c SHA1 62b174a9f857438435e35ace4f6d8485fbfa9fce SHA256 2d8db131dad0cc8643afdeef523c003a2714e71adab4680f7e1b3107b78b45d8 -EBUILD minidlna-1.0.23.ebuild 1171 RMD160 78465e74e88208b1650aa7516c9bd2b967504dd8 SHA1 aae0a54609f5019888f4fda32c4aa134206e3ed0 SHA256 794c950e6c0cb39661db856fb2fd8fc110ae42effd5d3f632531a93be80f4e1e -EBUILD minidlna-1.0.24.ebuild 1463 RMD160 7bd1c6797f8615d6b060b2d6f78c6b8d27b40b54 SHA1 ce85306f3861cbfcf99cb90a3fb84211bee3d295 SHA256 f53518d67f99b1b412a91d0a783850a0590eff7eb480d523f3e6ea736b320dd0 -MISC ChangeLog 2962 RMD160 1dd8acc45e217639b94c8fe12054a297b8fe5eb4 SHA1 9fac3b138cfc5cf73fae1dd6440031d31794bbdf SHA256 9dd993d3e7d64a9e426e9ff8a7391e9ae248b349dddc80f369eea18164840586 -MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 diff --git a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch b/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch deleted file mode 100644 index 2ce5e64..0000000 --- a/net-misc/minidlna/files/minidlna-1.0.18-Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile -+++ Makefile -@@ -12,7 +12,7 @@ - # - #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG - #CFLAGS = -Wall -g -Os -D_GNU_SOURCE --CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ -+CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ - -I/usr/include/ffmpeg \ - -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ - -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat diff --git a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd deleted file mode 100644 index 998bddb..0000000 --- a/net-misc/minidlna/files/minidlna-1.0.23-r1.initd +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.0.23-r1.initd,v 1.1 2012/03/26 00:23:14 xmw Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting MiniDLNA" - local params="" - local stop=0 - - checkpath -q -d -m 0755 -o ${M_USER:-nobody}:${M_GROUP:-nogroup} /var/run/minidlna - - params="$params -P /var/run/minidlna/minidlna.pid" - - if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then - params="$params -R" - fi - - #set the config file and check if it exists - if [ -z "${CONFIG}" ]; then - if [ ! -f "/etc/minidlna.conf" ]; then - ewarn "You did not set the config file correctly" - stop=1 - fi - params="$params -f /etc/minidlna.conf" - else - if [ ! -f "${CONFIG}" ]; then - ewarn "The specified config file does not exist" - stop=1 - fi - params="$params -f ${CONFIG}" - fi - - - if [ $stop -eq 1 ]; then - eend 1 - else - start-stop-daemon --start \ - --user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \ - --exec /usr/sbin/minidlna -- ${params} - eend $? - fi -} - -stop() { - ebegin "Stopping MiniDLNA" - start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna - eend $? -} diff --git a/net-misc/minidlna/files/minidlna-1.0.23.confd b/net-misc/minidlna/files/minidlna-1.0.23.confd deleted file mode 100644 index c98c7ab..0000000 --- a/net-misc/minidlna/files/minidlna-1.0.23.confd +++ /dev/null @@ -1,14 +0,0 @@ -# /etc/conf.d/minidlna - -# Should minidlna rescan the entire collection on startup? -# Warning: This may take a long time! -RESCAN="false" - -# The location of the config file -#CONFIG="/etc/minidlna.conf" - -# Specify the user/group minidlna should run as -#M_USER="nobody" -#M_GROUP="nogroup" - -# vim: ft=gentoo-conf-d diff --git a/net-misc/minidlna/files/minidlna-1.0.23.initd b/net-misc/minidlna/files/minidlna-1.0.23.initd deleted file mode 100644 index 1f08cde..0000000 --- a/net-misc/minidlna/files/minidlna-1.0.23.initd +++ /dev/null @@ -1,49 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.0.23.initd,v 1.1 2012/01/29 00:33:27 xmw Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting MiniDLNA" - local params="" - local stop=0 - - if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then - params="$params -R" - fi - - #set the config file and check if it exists - if [ -z "${CONFIG}" ]; then - if [ ! -f "/etc/minidlna.conf" ]; then - ewarn "You did not set the config file correctly" - stop=1 - fi - params="$params -f /etc/minidlna.conf" - else - if [ ! -f "${CONFIG}" ]; then - ewarn "The specified config file does not exist" - stop=1 - fi - params="$params -f ${CONFIG}" - fi - - - if [ $stop -eq 1 ]; then - eend 1 - else - start-stop-daemon --start \ - --user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \ - --exec /usr/sbin/minidlna -- ${params} - eend $? - fi -} - -stop() { - ebegin "Stopping MiniDLNA" - start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna - eend $? -} diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml deleted file mode 100644 index 59acc2c..0000000 --- a/net-misc/minidlna/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer> -<email>xmw@gentoo.org</email> -<name>Michael Weber</name> -</maintainer> -</pkgmetadata> - diff --git a/net-misc/minidlna/minidlna-1.0.23-r1.ebuild b/net-misc/minidlna/minidlna-1.0.23-r1.ebuild deleted file mode 100644 index 76ac784..0000000 --- a/net-misc/minidlna/minidlna-1.0.23-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.23-r1.ebuild,v 1.3 2012/05/05 03:20:42 jdhore Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="server software with the aim of being fully compliant with DLNA/UPnP-AV clients" -HOMEPAGE="http://minidlna.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="dev-db/sqlite - media-libs/flac - media-libs/libexif - media-libs/libid3tag - media-libs/libogg - media-libs/libvorbis - virtual/ffmpeg - virtual/jpeg" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch -} - -src_configure() { - ./genconfig.sh || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" install install-conf - - newconfd "${FILESDIR}"/${P}.confd ${PN} - newinitd "${FILESDIR}"/${P}-r1.initd ${PN} - - dodoc README TODO -} - -pkg_postinst() { - ewarn "minidlna no longer runs as root:root, per bug 394373." - ewarn "Please edit /etc/conf.d/${PN} to suit your needs." -} diff --git a/net-misc/minidlna/minidlna-1.0.23.ebuild b/net-misc/minidlna/minidlna-1.0.23.ebuild deleted file mode 100644 index 22343fa..0000000 --- a/net-misc/minidlna/minidlna-1.0.23.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.23.ebuild,v 1.2 2012/05/05 03:20:42 jdhore Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="server software with the aim of being fully compliant with DLNA/UPnP-AV clients" -HOMEPAGE="http://minidlna.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="dev-db/sqlite - media-libs/flac - media-libs/libexif - media-libs/libid3tag - media-libs/libogg - media-libs/libvorbis - virtual/ffmpeg - virtual/jpeg" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch -} - -src_configure() { - ./genconfig.sh || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" install - - newconfd "${FILESDIR}"/${P}.confd ${PN} - newinitd "${FILESDIR}"/${P}.initd ${PN} - - dodoc README TODO -} - -pkg_postinst() { - ewarn "minidlna no longer runs as root:root, per bug 394373." - ewarn "Please edit /etc/conf.d/${PN} to suit your needs." -} diff --git a/net-misc/minidlna/minidlna-1.0.24.ebuild b/net-misc/minidlna/minidlna-1.0.24.ebuild deleted file mode 100644 index cae1b9b..0000000 --- a/net-misc/minidlna/minidlna-1.0.24.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.24.ebuild,v 1.2 2012/05/05 03:20:42 jdhore Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="server software with the aim of being fully compliant with DLNA/UPnP-AV clients" -HOMEPAGE="http://minidlna.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -RDEPEND="dev-db/sqlite - media-libs/flac - media-libs/libexif - media-libs/libid3tag - media-libs/libogg - media-libs/libvorbis - virtual/ffmpeg - virtual/jpeg" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch - sed -i "s,-I/usr,-I\"${EPREFIX}\"/usr,g" Makefile || die "prefixifying Makefile failed" - sed -i -e "s,/tmp,${EPREFIX}/tmp," \ - -e "s,/var,${EPREFIX}/var," \ - -e "1,/^echo/{s,/usr,${EPREFIX}/usr,}" \ - genconfig.sh || die "prefixifying genconfig.sh failed" -} - -src_configure() { - ./genconfig.sh || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${ED}" install install-conf - - newconfd "${FILESDIR}"/${PN}-1.0.23.confd ${PN} - newinitd "${FILESDIR}"/${PN}-1.0.23-r1.initd ${PN} - - dodoc README TODO -} - -pkg_postinst() { - ewarn "minidlna no longer runs as root:root, per bug 394373." - ewarn "Please edit /etc/conf.d/${PN} to suit your needs." -} diff --git a/net-misc/vde/ChangeLog b/net-misc/vde/ChangeLog deleted file mode 100644 index 264d3ab..0000000 --- a/net-misc/vde/ChangeLog +++ /dev/null @@ -1,113 +0,0 @@ -# ChangeLog for net-misc/vde -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/ChangeLog,v 1.23 2010/08/26 01:28:02 dang Exp $ - -*vde-2.3.1 (26 Aug 2010) - - 26 Aug 2010; Daniel Gryniewicz <dang@gentoo.org> +vde-2.3.1.ebuild: - Bump to vde-2.3.1 - - - 12 Jan 2010; Daniel Gryniewicz <dang@gentoo.org> files/vde.conf, - files/vde.init: - Make it possible to change the options to vde_switch; bug #300282 - -*vde-2.2.3 (21 Oct 2009) - - 21 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org> +vde-2.2.3.ebuild, - metadata.xml: - Version bump (with dang's permission); add USE flags for pcap and ssl, fix - installed documentation. Patches were all merged upstream. - - 06 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - +files/vde-2.2.2-slirpvde-buffer-overflow.patch, vde-2.2.2.ebuild: - Added patch to fix the buffer overflow that kills slirpvde under fortify. - - 03 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> - metadata.xml: - Added myself to vde metadata.xml. - - 24 Mar 2009; Daniel Gryniewicz <dang@gentoo.org> metadata.xml: - Taking maintainership for genstef - - 01 Feb 2009; Markus Meier <maekke@gentoo.org> vde-2.2.2.ebuild: - x86 stable, bug #245300 - - 20 Jan 2009; Caleb Tennis <caleb@gentoo.org> vde-2.2.2.ebuild: - amd64 stable - -*vde-2.2.2 (04 Sep 2008) - - 04 Sep 2008; Peter Alfredsen <loki_val@gentoo.org> - +files/vde-2.2.2-gcc43.patch, +vde-2.2.2.ebuild: - Bump, thx to jbergstroem for the nudge. - - 20 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> - +files/vde-2.1.6-gcc43.patch, vde-2.1.6-r1.ebuild: - Fix to compile with gcc-4.3. Bug 231428. Thanks to Bernd Buschinski - <b.buschinski@web.de> - - 11 Mar 2008; Stefan Schweizer <genstef@gentoo.org> files/vde.init: - needs to start after net.tap according to Etaoin Shrdlu - <shrdlu@unlimitedmail.org> in bug 199929 - -*vde-2.1.6-r1 (07 Jul 2007) - - 07 Jul 2007; Stefan Schweizer <genstef@gentoo.org> - +files/Unixterm_20070403.patch, +vde-2.1.6-r1.ebuild: - patch to enable unixterm to receive commands from standard input thanks to - Adrian Lambeck <adrian@basicsedv.de> in bug 184429 - - 09 Jun 2007; Stefan Schweizer <genstef@gentoo.org> files/vde.init: - Fix failing script thanks to Giuliano Gagliardi <gentoo@gogi.tv> in bug 181193 - - 12 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> vde-2.1.6.ebuild: - Add ~amd64 wrt bug #166346. - -*vde-2.1.6 (10 Feb 2007) - - 10 Feb 2007; <genstef@gentoo.org> +vde-2.1.6.ebuild: - version bump thanks to Josh G <joshin@hotmail.com> in bug 166161 - - 24 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> vde-2.0.2.ebuild: - Marked ~amd64 for bug #143194 - -*vde-2.1.1 (16 Aug 2006) - - 16 Aug 2006; Stefan Schweizer <genstef@gentoo.org> +vde-2.1.1.ebuild: - version bump thanks to Clemmitt M. Sigler <csigler@vt.edu> in bug 144150 - - 26 Jun 2006; Stefan Schweizer <genstef@gentoo.org> - -files/vde-1.5.8-makefile.patch, -files/vde.init.d, -vde-1.5.8.ebuild, - vde-2.0.2.ebuild: - inherit eutils and remove old versions - -*vde-2.0.2 (26 Jun 2006) - - 26 Jun 2006; Stefan Schweizer <genstef@gentoo.org> +files/vde.conf, - +files/vde.init, metadata.xml, +vde-2.0.2.ebuild: - Take over maintainer and version bump thanks to Lorenzo Grandi - <popposoft@gmail.com> in bug 113554 also allows to set a group in the init - script, thanks to Jean-François Richard <jean-francois@richard.name> in bug - 113482 and works with qemu 0.8, thanks to Tim Redman - <tredman1@tampabay.rr.com> and Nico Baggus <mlspamcb@noci.xs4all.nl> in bug - 116840, big thanks to Rob M. (Adamant) <thehandoftyr@gmail.com> to notify me - of this one in IRC #gentoo-dev-help. - - 04 Apr 2006; <rphillips@gentoo.org> +files/vde-1.5.8-makefile.patch: - Committed halycon's patches from bug #125135 - - 09 Jun 2005; <rphillips@gentoo.org> +files/vde.init.d, vde-1.5.8.ebuild: - Added init script from Nico Baggus - -*vde-1.5.8 (09 Jun 2005) - - 09 Jun 2005; <rphillips@gentoo.org> +files/vde-qemu-Makefile.in.diff, - +vde-1.5.8.ebuild: - version bump. Thanks to Nico Baggus. Fixes #95611 - -*vde-1.5.7 (06 Feb 2005) - - 06 Feb 2005; <rphillips@gentoo.org> vde-1.5.7.ebuild: - Initial commit. thanks to Nico Baggus. - diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest deleted file mode 100644 index 7be4d55..0000000 --- a/net-misc/vde/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX vde.conf 305 SHA1 60f6a47b947160d7fb0e40299ca7d85f800a6778 SHA256 821da54d238d80324677df7d6647a2224984bf80d292b20655cf374c16e44424 -AUX vde.init 733 SHA1 a11051d77fda5ac98c5502936c9d593890fd260f SHA256 e8dfaab2d00625ffe72e62df60309ab238fd51f6cd0e7516814f5dc3126e657b -DIST vde2-2.3.1.tar.bz2 510947 RMD160 a1d0055422f34871ad3762b6093b1d39d9657184 SHA1 10e199a2dbc3d207ee29269e34f05cc5140878d9 SHA256 0baa6d429e022eb4069252c0f58636c4b5e0dd2e3a495bdb14b32ecc363d147f -EBUILD vde-2.3.1.ebuild 1296 SHA1 5c79f238bc9c46f52cbab32673e906e0031f2835 SHA256 b47a03c974b958b55a2628b06b82c6bd4f96ff3a630abfda9d5d1e5472311e45 -MISC ChangeLog 4162 SHA1 944ac23b07012c756e2b3120b3662304704faaa3 SHA256 52aa31a7a7841930d3669a61d541093bb874fdf18774495a8bf1bc267cc9bf36 -MISC metadata.xml 606 SHA1 73839c97284da922fbbc3a0b8ee831cf8c49da06 SHA256 5d2110fbf67918bdb0ef10077fc9f57add5aa2ad0091a9d6bb5064667d45d9a3 diff --git a/net-misc/vde/files/vde.conf b/net-misc/vde/files/vde.conf deleted file mode 100644 index d879453..0000000 --- a/net-misc/vde/files/vde.conf +++ /dev/null @@ -1,10 +0,0 @@ -# load the tun module -VDE_MODPROBE_TUN="yes" -# virtual tap networking device to be used for vde -VDE_TAP="tap0" -# mode and group for the socket -VDE_SOCK_CHMOD="770" -VDE_SOCK_CHOWN=":qemu" - -# This is the actual options string passed to VDE. Change this at your own risk. -VDE_OPTS="-tap ${VDE_TAP} -daemon" diff --git a/net-misc/vde/files/vde.init b/net-misc/vde/files/vde.init deleted file mode 100644 index 6400f9b..0000000 --- a/net-misc/vde/files/vde.init +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/files/vde.init,v 1.4 2010/01/12 12:58:36 dang Exp $ - -depend() { - after net.${VDE_TAP} -} - - -start() { - ebegin "Starting vde" - [ "${VDE_MODPROBE_TUN}" == "yes" ] && modprobe tun - start-stop-daemon --start --quiet \ - --exec /usr/bin/vde_switch -- ${VDE_OPTS} - eend $? "Failed to start vde" - chmod -R ${VDE_SOCK_CHMOD} /var/run/vde.ctl - chown -R ${VDE_SOCK_CHOWN} /var/run/vde.ctl -} - -stop() { - ebegin "Stopping vde" - [ "${VDE_MODPROBE_TUN}" == "yes" ] && modprobe -r tun - start-stop-daemon --stop --quiet --exec /usr/bin/vde_switch - eend $? "Failed to stop vde" -} diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml deleted file mode 100644 index f3375b8..0000000 --- a/net-misc/vde/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>dang@gentoo.org</email> -</maintainer> -<maintainer> - <email>mlspamcb@noci.xs4all.nl</email> -</maintainer> -<maintainer> - <email>jmbsvicetto@gentoo.org</email> -</maintainer> -<use> - <flag name="pcap"> - Enable the pcap-based plugin that allows creating a switch against - a real interface. - </flag> - <flag name="ssl"> - Enable the cryptcab plugin that allows creating an encrypted - virtual cable. - </flag> -</use> -</pkgmetadata> diff --git a/net-misc/vde/vde-2.3.1.ebuild b/net-misc/vde/vde-2.3.1.ebuild deleted file mode 100644 index 22f96ee..0000000 --- a/net-misc/vde/vde-2.3.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vde/vde-2.3.1.ebuild,v 1.1 2010/08/26 01:28:02 dang Exp $ - -EAPI=2 - -inherit eutils - -MY_P="${PN}2-${PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="vde2 is a virtual distributed ethernet emulator for emulators like qemu, bochs, and uml." -SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" -HOMEPAGE="http://vde.sourceforge.net/" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64-linux" - -IUSE="pcap ssl" - -RDEPEND="pcap? ( net-libs/libpcap ) - ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - $(use_enable pcap) \ - $(use_enable ssl cryptcab) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - newinitd "${FILESDIR}"/vde.init vde || die - newconfd "${FILESDIR}"/vde.conf vde || die - - dodoc README Changelog || die -} - -pkg_postinst() { - # default group already used in kqemu - enewgroup qemu - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" - einfo "Users of the group can then run: $ vdeq qemu -sock /var/run/vde.ctl ..other opts" -} diff --git a/net-misc/vncsnapshot/ChangeLog b/net-misc/vncsnapshot/ChangeLog deleted file mode 100644 index dc47a73..0000000 --- a/net-misc/vncsnapshot/ChangeLog +++ /dev/null @@ -1,56 +0,0 @@ -# ChangeLog for net-misc/vncsnapshot -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/ChangeLog,v 1.15 2011/02/26 22:07:18 signals Exp $ - - 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> vncsnapshot-1.2a.ebuild: - Updated depends from media-libs/jpeg to virtual/jpeg - - 04 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> - vncsnapshot-1.2a.ebuild: - Add -j1 for build (bug #295741). - - 24 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> - +files/vncsnapshot-1.2a-amd64grey.patch, vncsnapshot-1.2a.ebuild: - Fix grey image problems on amd64; Fixes bug #210036 - - 21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml: - Fix up metadata.xml. If there's no maintainer for the package, the metadata - also needs to contain m-needed@g.o. - - 26 Jan 2008; Raúl Porcel <armin76@gentoo.org> -vncsnapshot-1.1.ebuild: - old - - 11 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml: - fix herd - - 06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> - vncsnapshot-1.2a.ebuild: - ppc stable, bug #171820 - - 22 Mar 2007; Raúl Porcel <armin76@gentoo.org> vncsnapshot-1.2a.ebuild: - x86 stable wrt bug 171820 - - 13 Feb 2007; Simon Stelling <blubb@gentoo.org> vncsnapshot-1.2a.ebuild: - mark ~amd64; bug 153789 - - 10 Sep 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml: - Remove fserb from metadata.xml. - - 07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> - vncsnapshot-1.1.ebuild: - Stable on ppc. - -*vncsnapshot-1.2a (25 Jun 2005) - - 25 Jun 2005; Fernando Serboncini <fserb@gentoo.org> +metadata.xml, - +vncsnapshot-1.2a.ebuild: - Version bump. Assuming maintainership. - - 19 Jun 2004; David Holm <dholm@gentoo.org> vncsnapshot-1.1.ebuild: - Added to ~ppc. - -*vncsnapshot-1.1 (21 Apr 2003) - - 21 Apr 2003; Grant Goodyear <g2boojum@gentoo.org> vncsnapshot-1.1.ebuild: - New package - diff --git a/net-misc/vncsnapshot/Manifest b/net-misc/vncsnapshot/Manifest deleted file mode 100644 index 9161d63..0000000 --- a/net-misc/vncsnapshot/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX vncsnapshot-1.2a-amd64grey.patch 408 RMD160 16c4a65f8b4fabe740cd5a41b6c502eb7be6eccd SHA1 6d45d4c64754a7480c7557e7e38b6e72aa217242 SHA256 04f97cc37e33d0925521ab9b3551db06a1cd7e0eff71c5b2eeaa7528658e6318 -DIST vncsnapshot-1.2a-src.tar.bz2 70121 RMD160 2c79eaa84943efbfd8b6ce5d3e935e08cdea8261 SHA1 fe948744a320fd6a52efdc8a76b90f41ef6f295d SHA256 ac490c4b3810d419c65cdfb48d742ca382218c3c0f04e7868520ff9a06149ca6 -EBUILD vncsnapshot-1.2a.ebuild 1004 RMD160 061bad413b40a57f6bc373c196aae2f4b883a903 SHA1 132533b1b21030b7759c138f4263b03607821c73 SHA256 22e0f68ac3fd2117dc31d9b15796239efb4075829cb2ae1462c2371d395b40fa -MISC ChangeLog 1879 RMD160 9808f77d8ad93738b0c74e0b12848ab9262e29aa SHA1 d01abee7e87a0058b6d1bc1dd3a3e8d3e87e2fb1 SHA256 0080e28a9c4a51ae40de1a8d8c4c52156424dbd6965888fc434a8bf4f30b134e -MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85 diff --git a/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch b/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch deleted file mode 100644 index ee5807b..0000000 --- a/net-misc/vncsnapshot/files/vncsnapshot-1.2a-amd64grey.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur vncsnapshot-1.2a-orig/rfb.h vncsnapshot-1.2a/rfb.h ---- vncsnapshot-1.2a-orig/rfb.h 2002-02-09 16:00:42.000000000 -0500 -+++ vncsnapshot-1.2a/rfb.h 2008-09-24 16:57:13.000000000 -0400 -@@ -34,7 +34,7 @@ - - // Define the CARD* types as used in X11/Xmd.h - --typedef unsigned long CARD32; -+typedef unsigned int CARD32; - typedef unsigned short CARD16; - typedef short INT16; - typedef unsigned char CARD8; diff --git a/net-misc/vncsnapshot/metadata.xml b/net-misc/vncsnapshot/metadata.xml deleted file mode 100644 index fae7d74..0000000 --- a/net-misc/vncsnapshot/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>no-herd</herd> - <maintainer> - <email>maintainer-needed@gentoo.org</email> - <name>Default assignee for orphaned packages</name> - </maintainer> -</pkgmetadata> diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild deleted file mode 100644 index a18aa3c..0000000 --- a/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vncsnapshot/vncsnapshot-1.2a.ebuild,v 1.9 2011/02/26 22:07:18 signals Exp $ - -inherit eutils - -LICENSE="GPL-2" -DESCRIPTION="A command-line tool for taking JPEG snapshots of VNC servers" -SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" -HOMEPAGE="http://vncsnapshot.sourceforge.net/" -KEYWORDS="~x86-linux" -IUSE="" -SLOT="0" -DEPEND="virtual/jpeg - >=sys-libs/zlib-1.1.4" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-amd64grey.patch" -} - -# no configure for this puppy -src_compile() { - #note: We override CDEBUGFLAGS instead of CFLAGS because otherwise - # we lost the INCLUDES in the makefile. - # bug #295741 - emake -j1 CDEBUGFLAGS="${CFLAGS}" || die "make failed" -} - -# likewise, no make install (we're real Unix hackers, we are) -src_install() { - dobin vncsnapshot || die - cp vncsnapshot.man1 vncsnapshot.1 - doman vncsnapshot.1 -} diff --git a/net-misc/wondershaper/Manifest b/net-misc/wondershaper/Manifest deleted file mode 100644 index 1920ecc..0000000 --- a/net-misc/wondershaper/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX Makefile 403 RMD160 d620a996d31bb2724c19d3aa4d4b58a5e636797d SHA1 1f4a154854be3101a2f78cc2e487d30ffbf0f50c SHA256 432a6f9c1c0892f122f8ad7808e7fe21252c15b7db7a03e59fb84bffc1a9f427 -AUX append-return-1.awk 181 RMD160 600b15e3f786806f4f69c0e3d2490a9f9fa63abe SHA1 86496fdb51a9314c6b7eb69a5a1aad3c2387b20f SHA256 4e9592d425c37a04320407294790e8ed8bcf1ff66043077ce0f1930e6e44ef50 -AUX rc.skel 293 RMD160 01bbf93e02db199094c0b8eaf80e6cfa41b4ab8e SHA1 349823c747bad5104acb9f1c3637efef3f3448bf SHA256 82d89c39363a1b260abc678096c628d6e99ddfbea2c07d610a2b3fdd82f2b4c4 -AUX wondershaper-1.1a.patch 2202 RMD160 f96389ae43b5da1190d71d20ea6a93f00254de70 SHA1 fc64a67121620a63a97e69231f996ba873e1f9bc SHA256 a48965187d7a4e669740d7dc8f17138e153fb5d4a844335c1dff33ae589da94b -DIST wondershaper-1.1a.tar.gz 12486 RMD160 31478a760c623468c98343a0d45ac64a4ca86937 SHA1 9d8e1ce7f0758c246ead34e8c9f1ec9d7e80b8ea SHA256 5695373d1bd24f10a1ba6cc2e0c5e12c59c32322b66ba9870e3005bbdfa6525b -EBUILD wondershaper-1.1a.ebuild 722 RMD160 b4eb68657c1f878a188fdecd51e63455260c1a62 SHA1 4160cb8f702f92568bc01d9c9508c4688ca3d0ef SHA256 89636a4d786daf48d105f21acb6a31788ee95736436459fca7c05fb180790186 -MISC metadata.xml 221 RMD160 5c03415a123ca23f57aec3ff525fd718062440f3 SHA1 41cc18d6ee6f23cf13ea7c85322f65d148dd8ab6 SHA256 6aee2681df7d7e2a704fc34217720d6d67ecbf0c974dbd0b27eee13c34df29bd diff --git a/net-misc/wondershaper/files/Makefile b/net-misc/wondershaper/files/Makefile deleted file mode 100644 index 52a3bf2..0000000 --- a/net-misc/wondershaper/files/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -.PHONY: all -all: wondershaper.config wondershaper - -wondershaper.config: - tail -n+2 wshaper \ - | awk '/^# Now remove/{firstPartOver=1}{if (! firstPartOver) print $0}' \ - >> $@ -wondershaper: wshaper - cp rc.skel $@ - awk '/^if \[/{firstPartOver=1}{if (firstPartOver) print $0}' $^ \ - | awk -f append-return-1.awk \ - | sed 's/exit/return 0/' >> $@ - echo "}" >> $@ - -clean: - rm wondershaper wondershaper.config
\ No newline at end of file diff --git a/net-misc/wondershaper/files/append-return-1.awk b/net-misc/wondershaper/files/append-return-1.awk deleted file mode 100644 index 75fc244..0000000 --- a/net-misc/wondershaper/files/append-return-1.awk +++ /dev/null @@ -1,16 +0,0 @@ -{ - addOR=nextAddOR;nextAddOR=0 -} -/tc.*add/{ - addOR=1 -} -/\\$/{ - nextAddOR=addOR;addOR=0 -} -{ - printf("%s",$0); - if (addOR) - print " || return 1" - else - printf "\n" -}
\ No newline at end of file diff --git a/net-misc/wondershaper/files/rc.skel b/net-misc/wondershaper/files/rc.skel deleted file mode 100644 index e78ce3b..0000000 --- a/net-misc/wondershaper/files/rc.skel +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript - -# wraps wondershaper - -opts="${opts} showstatus" - -start() { - ebegin "Starting wondershaper" - real_shaper start - eend $? -} - -stop() { - ebegin "Stopping wondershaper" - real_shaper stop - eend $? -} - -showstatus() { - ebegin "Status" - real_shaper status - eend $? -} - -real_shaper() { - diff --git a/net-misc/wondershaper/files/wondershaper-1.1a.patch b/net-misc/wondershaper/files/wondershaper-1.1a.patch deleted file mode 100644 index 22c849c..0000000 --- a/net-misc/wondershaper/files/wondershaper-1.1a.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -u -d --minimal --ignore-all-space -r wondershaper-1.1a/wshaper wondershaper-1.1a_patched/wshaper ---- wondershaper-1.1a/wshaper 2002-04-16 16:26:35.000000000 +0200 -+++ wondershaper-1.1a_patched/wshaper 2003-05-09 11:58:51.000000000 +0200 -@@ -102,14 +102,24 @@ - # some traffic however suffers a worse fate - for a in $NOPRIOPORTDST - do -+ PORT=${a%/*} -+ MASK=${a#*/} -+ if [ "${PORT}" = "${a}" ]; then -+ MASK='0xffff' -+ fi - tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \ -- match ip dport $a 0xffff flowid 1:30 -+ match ip dport ${PORT} ${MASK} flowid 1:30 - done - - for a in $NOPRIOPORTSRC - do -+ PORT=${a%/*} -+ MASK=${a#*/} -+ if [ "${PORT}" = "${a}" ]; then -+ MASK='0xffff' -+ fi - tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \ -- match ip sport $a 0xffff flowid 1:30 -+ match ip sport ${PORT} ${MASK} flowid 1:30 - done - - for a in $NOPRIOHOSTSRC -diff -u -d --minimal --ignore-all-space -r wondershaper-1.1a/wshaper.htb wondershaper-1.1a_patched/wshaper.htb ---- wondershaper-1.1a/wshaper.htb 2002-04-16 16:26:51.000000000 +0200 -+++ wondershaper-1.1a_patched/wshaper.htb 2003-05-09 11:59:07.000000000 +0200 -@@ -66,10 +66,10 @@ - # and a lower priority: - - tc class add dev $DEV parent 1:1 classid 1:20 htb rate $[9*$UPLINK/10]kbit \ -- burst 6k prio 2 -+ ceil ${UPLINK}kbit burst 6k prio 2 - - tc class add dev $DEV parent 1:1 classid 1:30 htb rate $[8*$UPLINK/10]kbit \ -- burst 6k prio 2 -+ ceil ${UPLINK}kbit burst 6k prio 2 - - # all get Stochastic Fairness: - tc qdisc add dev $DEV parent 1:10 handle 10: sfq perturb 10 -@@ -101,14 +101,24 @@ - # some traffic however suffers a worse fate - for a in $NOPRIOPORTDST - do -+ PORT=${a%/*} -+ MASK=${a#*/} -+ if [ "${PORT}" = "${a}" ]; then -+ MASK='0xffff' -+ fi - tc filter add dev $DEV parent 1: protocol ip prio 14 u32 \ -- match ip dport $a 0xffff flowid 1:30 -+ match ip dport ${PORT} ${MASK} flowid 1:30 - done - - for a in $NOPRIOPORTSRC - do -+ PORT=${a%/*} -+ MASK=${a#*/} -+ if [ "${PORT}" = "${a}" ]; then -+ MASK='0xffff' -+ fi - tc filter add dev $DEV parent 1: protocol ip prio 15 u32 \ -- match ip sport $a 0xffff flowid 1:30 -+ match ip sport ${PORT} ${MASK} flowid 1:30 - done - - for a in $NOPRIOHOSTSRC diff --git a/net-misc/wondershaper/metadata.xml b/net-misc/wondershaper/metadata.xml deleted file mode 100644 index 2bce140..0000000 --- a/net-misc/wondershaper/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<use> - <flag name="htb">Use Hierarchy Token Bucket as tc algorithm</flag> -</use> -</pkgmetadata> diff --git a/net-misc/wondershaper/wondershaper-1.1a.ebuild b/net-misc/wondershaper/wondershaper-1.1a.ebuild deleted file mode 100644 index 1e6b84a..0000000 --- a/net-misc/wondershaper/wondershaper-1.1a.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit eutils - -DESCRIPTION="a QoS script" -HOMEPAGE="http://lartc.org/wondershaper" -SRC_URI="${HOMEPAGE}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -DEPEND="" -RDEPEND="sys-apps/iproute2" - -IUSE="+htb" - -src_prepare() { - epatch "${FILESDIR}/${P}.patch" - for FILE in rc.skel Makefile append-return-1.awk - do - cp "${FILESDIR}"/${FILE} "${S}"/ || die "copy ${FILE} failed" - done - use htb && { cp -f wshaper.htb wshaper || die "copy wshaper.htb failed" ; } -} - -src_install() { - doinitd ${PN} - newconfd ${PN}.config ${PN} - dodoc ChangeLog README TODO VERSION -} diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog deleted file mode 100644 index a65cbb9..0000000 --- a/net-proxy/squid/ChangeLog +++ /dev/null @@ -1,1947 +0,0 @@ -# ChangeLog for net-proxy/squid -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.339 2012/03/09 15:40:32 eras Exp $ - -*squid-3.1.19 (09 Mar 2012) - - 09 Mar 2012; Eray Aslan <eras@gentoo.org> +squid-3.1.19.ebuild: - Non-maintainer version bump - bug #407337. Fix sandbox violation - bug - #382535 - - 02 Jan 2012; Lars Wendler <polynomial-c@gentoo.org> - files/squid.initd-logrotate: - non-maintainer commit: Replaced deprecated opts variable in logrotate init - script (bug #397357). - - 29 Dec 2011; Jeroen Roovers <jer@gentoo.org> squid-3.1.18.ebuild, - +files/squid-3.1.18-ecap.patch: - Apply upstream patch by Adam Carter (bug #396163). - -*squid-3.1.18 (24 Dec 2011) - - 24 Dec 2011; Patrick Lauer <patrick@gentoo.org> +squid-3.1.18.ebuild: - Bump for #395195 - - 18 Dec 2011; Mark Loeser <halcy0n@gentoo.org> squid-3.1.16.ebuild: - Stable for ppc64; bug #389133 - - 13 Nov 2011; Raúl Porcel <armin76@gentoo.org> squid-3.1.16.ebuild: - alpha/arm/ia64/sparc stable wrt #389133 - - 06 Nov 2011; Brent Baude <ranger@gentoo.org> squid-3.1.16.ebuild: - Marking squid-3.1.16 ppc for bug 389133 - - 05 Nov 2011; Andreas Schuerch <nativemad@gentoo.org> squid-3.1.16.ebuild: - x86 stable, see bug 389133 - - 02 Nov 2011; Jeroen Roovers <jer@gentoo.org> squid-3.1.16.ebuild: - Stable for HPPA (bug #389133). - - 01 Nov 2011; Homer Parker <hparker@gentoo.org> squid-3.1.16.ebuild: - Stable on amd64 fixing security bug #389133 - -*squid-3.1.16 (01 Nov 2011) - - 01 Nov 2011; Eray Aslan <eras@gentoo.org> +squid-3.1.16.ebuild: - non-maintainer version bump - security bug #389133 - - 23 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> files/squid.initd: - non-maintainer commit: Replaced deprecated opts variable in init script (bug - #385641). - - 17 Oct 2011; Eray Aslan <eras@gentoo.org> -squid-3.1.8.ebuild, - -files/squid-3.1.8-gentoo.patch, -files/squid-3.1.8-libmd5.patch, - -files/squid-3.1.8-qafixes.patch, -squid-3.1.9.ebuild, - -files/squid-3.1.9-gentoo.patch, -files/squid-3.1.9-libmd5.patch, - -files/squid-3.1.9-qafixes.patch, -squid-3.1.12.ebuild, - -files/squid-3.1.12-gentoo.patch: - remove vulnerable versions - - 03 Sep 2011; Raúl Porcel <armin76@gentoo.org> squid-3.1.15.ebuild: - alpha/arm/ia64/sparc/x86 stable wrt #381065 - - 03 Sep 2011; Kacper Kowalik <xarthisius@gentoo.org> squid-3.1.15.ebuild: - ppc/ppc64 stable wrt #381065 - - 03 Sep 2011; Jeroen Roovers <jer@gentoo.org> squid-3.1.15.ebuild: - Stable for HPPA (bug #381065). - - 01 Sep 2011; Tony Vroon <chainsaw@gentoo.org> squid-3.1.15.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian - "idella4" Delaney in security bug #381065. - -*squid-3.1.15 (31 Aug 2011) - - 31 Aug 2011; Eray Aslan <eras@gentoo.org> +squid-3.1.15.ebuild, - +files/squid-3.1.15-gentoo.patch: - version bump - security bug #381065 - - 30 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> squid-3.1.12.ebuild: - Fix install with USE=-pam. - -*squid-3.1.12 (29 Apr 2011) - - 29 Apr 2011; Eray Aslan <eras@gentoo.org> +squid-3.1.12.ebuild, - +files/squid-3.1.12-gentoo.patch: - Non-maintainer version bump - bug #362049 - - 03 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> squid-3.1.9.ebuild: - Come back to using eautoreconf, it works fine with libtool-2 and 3.1.9. - -*squid-3.1.9 (27 Nov 2010) - - 27 Nov 2010; Alin Năstac <mrness@gentoo.org> -squid-2.7.7.ebuild, - -files/squid-2.7.7-gentoo.patch, -files/squid-2-capability.patch, - -squid-3.1.6-r1.ebuild, -files/squid-3.1.6-bug3011.patch, - -files/squid-3.1.6-gentoo.patch, -files/squid-3.1.6-libmd5.patch, - -files/squid-3.1.6-qafixes.patch, +squid-3.1.9.ebuild, - +files/squid-3.1.9-gentoo.patch, +files/squid-3.1.9-libmd5.patch, - +files/squid-3.1.9-qafixes.patch, -files/squid-3-capability.patch: - Version bump (#342997). - - 09 Oct 2010; Raúl Porcel <armin76@gentoo.org> squid-3.1.8.ebuild: - ia64/sparc stable wrt #334263 - - 01 Oct 2010; Brent Baude <ranger@gentoo.org> squid-2.7.9.ebuild: - Marking squid-2.7.9 ppc64 for bug 301828 - - 30 Sep 2010; Brent Baude <ranger@gentoo.org> squid-3.1.8.ebuild: - Marking squid-3.1.8 ppc64 for bug 334263 - - 29 Sep 2010; Jeroen Roovers <jer@gentoo.org> squid-3.1.8.ebuild: - Stable for HPPA (bug #334263). - - 26 Sep 2010; Tobias Klausmann <klausman@gentoo.org> squid-3.1.8.ebuild: - Stable on alpha, bug #334263 - - 26 Sep 2010; Markus Meier <maekke@gentoo.org> squid-3.1.8.ebuild: - x86 stable, bug #334263 - - 25 Sep 2010; Markus Meier <maekke@gentoo.org> squid-3.1.8.ebuild: - arm stable, bug #334263 - - 25 Sep 2010; Jeroen Roovers <jer@gentoo.org> squid-3.1.8.ebuild: - Stable for PPC (bug #334263). - - 24 Sep 2010; Markos Chandras <hwoarang@gentoo.org> squid-3.1.8.ebuild: - Stable on amd64 wrt bug #334263 - -*squid-3.1.8 (23 Sep 2010) - - 23 Sep 2010; Alin Năstac <mrness@gentoo.org> -squid-3.0.19.ebuild, - -files/squid-3.0.19-adapted-zph.patch, - -files/squid-3.0.19-cross-compile.patch, -files/squid-3.0.19-gentoo.patch, - -squid-3.0.20-r1.ebuild, -files/squid-3.0.20-adapted-zph.patch, - -files/squid-3.0.20-cross-compile.patch, -files/squid-3.0.20-gentoo.patch, - -files/squid-3.0.20-libmd5.patch, +squid-3.1.8.ebuild, - +files/squid-3.1.8-gentoo.patch, +files/squid-3.1.8-libmd5.patch, - +files/squid-3.1.8-qafixes.patch: - Version bump wrt security bug #334263. - - 06 Sep 2010; Brent Baude <ranger@gentoo.org> squid-3.1.6-r1.ebuild: - Marking squid-3.1.6-r1 ppc64 for bug 301828 - - 04 Sep 2010; Raúl Porcel <armin76@gentoo.org> squid-2.7.9.ebuild, - squid-3.0.20-r1.ebuild, squid-3.1.6-r1.ebuild: - alpha/arm/ia64/sparc stable wrt #301828 - -*squid-3.1.6-r1 (12 Aug 2010) - - 12 Aug 2010; Alin Năstac <mrness@gentoo.org> -squid-3.1.6.ebuild, - +squid-3.1.6-r1.ebuild, +files/squid-3.1.6-bug3011.patch: - Merge upstream fix for broken https support (#331965). - - 09 Aug 2010; Jeroen Roovers <jer@gentoo.org> squid-2.7.9.ebuild, - squid-3.1.6.ebuild: - Stable for PPC (bug #301828). - - 09 Aug 2010; Jeroen Roovers <jer@gentoo.org> squid-2.7.9.ebuild, - squid-3.1.6.ebuild: - Stable for HPPA (bug #301828). - - 08 Aug 2010; Markos Chandras <hwoarang@gentoo.org> squid-2.7.9.ebuild, - squid-3.1.6.ebuild: - Stable on amd64. Security bug #301828 - - 07 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> squid-2.7.9.ebuild, - squid-3.1.6.ebuild: - x86 stable wrt security bug #301828 - - 07 Aug 2010; Alin Năstac <mrness@gentoo.org> squid-3.1.6.ebuild: - Add sys-apps/ed DEPEND (#311927). - -*squid-3.1.6 (07 Aug 2010) -*squid-2.7.9 (07 Aug 2010) - - 07 Aug 2010; Alin Năstac <mrness@gentoo.org> -squid-2.7.6-r2.ebuild, - -files/squid-2.7.6-cve-2009-2855.patch, -files/squid-2.7.6-gentoo.patch, - -files/squid-2.7.6-heimdal.patch, +squid-2.7.9.ebuild, - +files/squid-2.7.9-gentoo.patch, -squid-3.0.18-r1.ebuild, - -files/squid-3.0.18-adapted-zph.patch, - -files/squid-3.0.18-cross-compile.patch, - -files/squid-3.0.18-cve-2009-2855.patch, -files/squid-3.0.18-gentoo.patch, - -squid-3.1.0.14_beta.ebuild, -files/squid-3.1.0.14_beta-gentoo.patch, - -files/squid-3.1.0.14_beta-qafixes.patch, -squid-3.1.0.15_beta-r1.ebuild, - -files/squid-3.1.0.15_beta-gentoo.patch, - -files/squid-3.1.0.15_beta-libmd5.patch, - -files/squid-3.1.0.15_beta-qafixes.patch, +squid-3.1.6.ebuild, - +files/squid-3.1.6-gentoo.patch, +files/squid-3.1.6-libmd5.patch, - +files/squid-3.1.6-qafixes.patch, metadata.xml: - Version bumps wrt security bugs #301828 and #304751. Simplify kerberos - dependency atom (#303979). Add tproxy USE flag (#313587). - - 21 Mar 2010; Brent Baude <ranger@gentoo.org> squid-3.0.19.ebuild: - Marking squid-3.0.19 ppc64 for bug 290185 - - 21 Mar 2010; Brent Baude <ranger@gentoo.org> squid-2.7.7.ebuild: - Marking squid-2.7.7 ppc64 for bug 290185 - - 03 Dec 2009; Jeroen Roovers <jer@gentoo.org> squid-2.7.7.ebuild, - squid-3.0.19.ebuild: - Stable for HPPA (bug #290185). - - 30 Nov 2009; Raúl Porcel <armin76@gentoo.org> squid-2.7.7.ebuild, - squid-3.0.19.ebuild: - arm/ia64/sparc stable wrt #290185 - -*squid-3.1.0.15_beta-r1 (29 Nov 2009) -*squid-3.0.20-r1 (29 Nov 2009) - - 29 Nov 2009; Alin Năstac <mrness@gentoo.org> -squid-3.0.20.ebuild, - +squid-3.0.20-r1.ebuild, +files/squid-3.0.20-libmd5.patch, - -squid-3.1.0.15_beta.ebuild, +squid-3.1.0.15_beta-r1.ebuild, - +files/squid-3.1.0.15_beta-libmd5.patch: - Avoid linking with md5.so installed by libwww (#292406). - -*squid-3.1.0.15_beta (28 Nov 2009) -*squid-3.0.20 (28 Nov 2009) - - 28 Nov 2009; Alin Năstac <mrness@gentoo.org> +squid-3.0.20.ebuild, - +files/squid-3.0.20-adapted-zph.patch, - +files/squid-3.0.20-cross-compile.patch, +files/squid-3.0.20-gentoo.patch, - -squid-3.1.0.13_beta-r2.ebuild, - -files/squid-3.1.0.13_beta-cve-2009-2855.patch, - -files/squid-3.1.0.13_beta-gentoo.patch, - -files/squid-3.1.0.13_beta-qafixes.patch, +squid-3.1.0.15_beta.ebuild, - +files/squid-3.1.0.15_beta-gentoo.patch, - +files/squid-3.1.0.15_beta-qafixes.patch, files/squid.initd, - files/squid.initd-logrotate: - Version bumps (#294871). Speed up service stop when squid has crashed - (#291911). Add digest_auth_ldap helper (#293803). - - 08 Nov 2009; Tobias Klausmann <klausman@gentoo.org> squid-3.0.19.ebuild: - Stable on alpha, bug #290185 - - 08 Nov 2009; Tobias Klausmann <klausman@gentoo.org> squid-2.7.7.ebuild: - Stable on alpha, bug #290185 - - 01 Nov 2009; nixnut <nixnut@gentoo.org> squid-2.7.7.ebuild, - squid-3.0.19.ebuild: - ppc stable #290185 - - 30 Oct 2009; Markus Meier <maekke@gentoo.org> squid-2.7.7.ebuild, - squid-3.0.19.ebuild: - amd64/x86 stable, bug #290185 - - 25 Oct 2009; Alin Năstac <mrness@gentoo.org> files/squid.confd, - files/squid.initd, files/squid.initd-logrotate: - Add support for multiple instances of squid service (#287941). - -*squid-3.1.0.14_beta (22 Oct 2009) - - 22 Oct 2009; Alin Năstac <mrness@gentoo.org> +squid-3.1.0.14_beta.ebuild, - +files/squid-3.1.0.14_beta-gentoo.patch, - +files/squid-3.1.0.14_beta-qafixes.patch, files/squid.logrotate, - metadata.xml: - Version bump. Add ecap USE flag (#277885). - -*squid-2.7.7 (22 Sep 2009) - - 22 Sep 2009; Alin Năstac <mrness@gentoo.org> +squid-2.7.7.ebuild, - +files/squid-2.7.7-gentoo.patch, +files/squid-2-heimdal.patch: - Version bump (#285877). - -*squid-3.1.0.13_beta-r2 (19 Sep 2009) - - 19 Sep 2009; Alin Năstac <mrness@gentoo.org> - -squid-3.1.0.13_beta-r1.ebuild, +squid-3.1.0.13_beta-r2.ebuild, - files/squid-3.1.0.13_beta-qafixes.patch: - Fix rpath security check failures reported by scanelf (#280639). - -*squid-3.0.19 (12 Sep 2009) - - 12 Sep 2009; Alin Năstac <mrness@gentoo.org> - -files/squid-3.0.16-adapted-zph.patch, - -files/squid-3.0.16-cross-compile.patch, -files/squid-3.0.16-gentoo.patch, - +files/squid-3.0.19-adapted-zph.patch, - +files/squid-3.0.19-cross-compile.patch, +files/squid-3.0.19-gentoo.patch, - -squid-2.7.6-r1.ebuild, -squid-3.0.16.ebuild, -squid-3.0.18.ebuild, - +squid-3.0.19.ebuild: - Remove obsolete versions. Version bump (#284211). - - 31 Aug 2009; Brent Baude <ranger@gentoo.org> squid-2.7.6-r2.ebuild, - squid-3.0.18-r1.ebuild: - squid-2.7.6-r2 squid-3.0.18-r1 for bug 279380 - - 27 Aug 2009; Steve Dibb <beandog@gentoo.org> squid-2.7.6-r2.ebuild, - squid-3.0.18-r1.ebuild: - amd64 stable, bug 279380 - - 25 Aug 2009; Raúl Porcel <armin76@gentoo.org> squid-2.7.6-r2.ebuild, - squid-3.0.18-r1.ebuild: - alpha/arm/ia64/sparc stable wrt #279380 - - 25 Aug 2009; Christian Faulhammer <fauli@gentoo.org> - squid-2.7.6-r2.ebuild, squid-3.0.18-r1.ebuild: - stable x86, security bug 279380 - - 23 Aug 2009; nixnut <nixnut@gentoo.org> squid-2.7.6-r2.ebuild, - squid-3.0.18-r1.ebuild: - ppc stable #279380 - - 22 Aug 2009; Jeroen Roovers <jer@gentoo.org> squid-3.0.18-r1.ebuild: - Stable for HPPA (bug #279380). - - 22 Aug 2009; Jeroen Roovers <jer@gentoo.org> squid-2.7.6-r2.ebuild: - Stable for HPPA (bug #279380). - -*squid-3.1.0.13_beta-r1 (22 Aug 2009) -*squid-3.0.18-r1 (22 Aug 2009) -*squid-2.7.6-r2 (22 Aug 2009) - - 22 Aug 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-2.7.6-cve-2009-2855.patch, - -files/squid-3.0.15-adapted-zph.patch, - -files/squid-3.0.15-cross-compile.patch, -files/squid-3.0.15-gcc43.patch, - -files/squid-3.0.15-gentoo.patch, -files/squid-3.0.15-heimdal.patch, - +files/squid-3.0.18-cve-2009-2855.patch, - -files/squid-3.1.0.9_beta-gentoo.patch, - -files/squid-3.1.0.9_beta-invconv.patch, - +files/squid-3.1.0.13_beta-cve-2009-2855.patch, - files/squid-3.1.0.13_beta-gentoo.patch, - files/squid-3.1.0.13_beta-qafixes.patch, +squid-2.7.6-r2.ebuild, - -squid-3.0.15.ebuild, +squid-3.0.18-r1.ebuild, -squid-3.1.0.9_beta.ebuild, - -squid-3.1.0.13_beta.ebuild, +squid-3.1.0.13_beta-r1.ebuild: - Fix security bug 279380. Add fix for -Wl,--as-needed problem when 3.1.0.13 - is compiled with kerberos USE flag enabled. Remove resource consuming PURGE - method from the default squid.conf installed by 3.1.0.13 version. - - 16 Aug 2009; Alin Năstac <mrness@gentoo.org> files/squid.initd, - files/squid.initd-logrotate, squid-2.7.6-r1.ebuild, squid-3.0.18.ebuild, - squid-3.1.0.13_beta.ebuild: - Enable epoll USE flag by default and increase max_user_watches to - SQUID_MAXFD when squid is built with epoll support (#280666). - - 14 Aug 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.18.ebuild: - arm/ia64/sparc stable wrt #279379 - - 10 Aug 2009; Markus Meier <maekke@gentoo.org> squid-3.0.18.ebuild: - amd64 stable, bug #279379 - - 10 Aug 2009; Tobias Klausmann <klausman@gentoo.org> squid-3.0.18.ebuild: - Stable on alpha, bug #279379 - - 09 Aug 2009; Jeroen Roovers <jer@gentoo.org> squid-3.0.18.ebuild: - Stable for HPPA (bug #279379). - - 08 Aug 2009; Brent Baude <ranger@gentoo.org> squid-3.0.18.ebuild: - Marking squid-3.0.18 ppc64 for bug 279379 - - 07 Aug 2009; Christian Faulhammer <fauli@gentoo.org> squid-3.0.18.ebuild: - stable x86, security bug 279379 - -*squid-3.1.0.13_beta (06 Aug 2009) -*squid-3.0.18 (06 Aug 2009) - - 06 Aug 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0.18-adapted-zph.patch, - +files/squid-3.0.18-cross-compile.patch, +files/squid-3.0.18-gentoo.patch, - +files/squid-3.1.0.13_beta-gentoo.patch, - +files/squid-3.1.0.13_beta-qafixes.patch, +squid-3.0.18.ebuild, - +squid-3.1.0.13_beta.ebuild: - Security version bumps (#279379, #280441). Fix zph patch QA issue. Enable - test phase on squid-3.1.0.13 (#278648). - - 23 Jul 2009; Alin Năstac <mrness@gentoo.org> - -files/squid-3.0.14-adapted-zph.patch, - -files/squid-3.0.14-cross-compile.patch, -files/squid-3.0.14-gcc43.patch, - -files/squid-3.0.14-gentoo.patch, -files/squid-3.0.14-heimdal.patch, - -files/squid-3.0.14-max-forwards.patch, squid-2.7.6-r1.ebuild, - -squid-3.0.14-r2.ebuild, squid-3.0.16.ebuild, squid-3.1.0.9_beta.ebuild: - Remove linux-info inheritance (#278272). - - 22 Jul 2009; Dawid Węgliński <cla@gentoo.org> squid-3.0.16.ebuild: - Stable on amd64 (bug #277749) - - 22 Jul 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.16.ebuild: - alpha/arm/ia64/sparc stable wrt #277749 - - 22 Jul 2009; Jeroen Roovers <jer@gentoo.org> squid-3.0.16.ebuild: - Stable for HPPA (bug #277749). - - 19 Jul 2009; nixnut <nixnut@gentoo.org> squid-3.0.16.ebuild: - ppc stable #277749 - - 15 Jul 2009; Christian Faulhammer <fauli@gentoo.org> squid-3.0.16.ebuild: - stable x86, bug 277749 - -*squid-3.1.0.9_beta (14 Jul 2009) - - 14 Jul 2009; Alin Năstac <mrness@gentoo.org> - -files/squid-3.1.0.8_beta-gentoo.patch, - +files/squid-3.1.0.9_beta-gentoo.patch, - +files/squid-3.1.0.9_beta-invconv.patch, -squid-3.1.0.8_beta.ebuild, - +squid-3.1.0.9_beta.ebuild: - Version bump (#277657). - - 05 Jul 2009; Markus Meier <maekke@gentoo.org> squid-3.0.15.ebuild: - amd64 stable, bug #274405 - - 04 Jul 2009; Brent Baude <ranger@gentoo.org> squid-3.0.15.ebuild: - stable ppc64, bug 274405 - - 23 Jun 2009; Alin Năstac <mrness@gentoo.org> - files/squid-2-capability.patch, -files/squid-3.0.13-adapted-zph.patch, - -files/squid-3.0.13-gentoo.patch, -files/squid-3.0.13-heimdal.patch, - -files/squid-3.1.0.7_beta-gentoo.patch, files/squid-3-capability.patch, - squid-2.7.6-r1.ebuild, -squid-3.0.13.ebuild, squid-3.0.15.ebuild, - squid-3.0.16.ebuild, -squid-3.1.0.7_beta.ebuild, - squid-3.1.0.8_beta.ebuild: - Add libcap dependency (#274668). - - 19 Jun 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.15.ebuild: - alpha/arm/ia64/sparc stable wrt #274405 - - 18 Jun 2009; Jeroen Roovers <jer@gentoo.org> squid-3.0.15.ebuild: - Stable for HPPA (bug #274405). - -*squid-3.1.0.8_beta (17 Jun 2009) - - 17 Jun 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-3.1.0.8_beta-gentoo.patch, +squid-3.1.0.8_beta.ebuild: - Version bump. - - 17 Jun 2009; Christian Faulhammer <fauli@gentoo.org> squid-3.0.15.ebuild: - stable x86, bug 274405 - -*squid-3.0.16 (15 Jun 2009) - - 15 Jun 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-2-capability.patch, +files/squid-3.0.16-adapted-zph.patch, - +files/squid-3.0.16-cross-compile.patch, +files/squid-3.0.16-gentoo.patch, - +files/squid-3-capability.patch, squid-2.7.6-r1.ebuild, - squid-3.0.15.ebuild, +squid-3.0.16.ebuild, squid-3.1.0.7_beta.ebuild: - Remove ugly libcap hack (#270450). Version bump. - - 20 May 2009; nixnut <nixnut@gentoo.org> squid-3.0.14-r2.ebuild: - ppc stable #269096 - - 19 May 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.14-r2.ebuild: - arm/ia64/sparc stable stable wrt #269096 - - 14 May 2009; Markus Meier <maekke@gentoo.org> squid-3.0.14-r2.ebuild: - amd64/x86 stable, bug #269096 - - 11 May 2009; Brent Baude <ranger@gentoo.org> squid-3.0.14-r2.ebuild: - stable ppc64, bug 269096 - - 09 May 2009; Tobias Klausmann <klausman@gentoo.org> - squid-3.0.14-r2.ebuild: - Stable on alpha, bug #269096 - -*squid-3.0.15 (09 May 2009) - - 09 May 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0.15-adapted-zph.patch, - +files/squid-3.0.15-cross-compile.patch, +files/squid-3.0.15-gcc43.patch, - +files/squid-3.0.15-gentoo.patch, +files/squid-3.0.15-heimdal.patch, - -squid-3.0.14.ebuild, -squid-3.0.14-r1.ebuild, +squid-3.0.15.ebuild: - Version bump (#268808). - -*squid-3.0.14-r2 (02 May 2009) - - 02 May 2009; Alin Năstac <mrness@gentoo.org> +squid-3.0.14-r2.ebuild: - Fix encoding errors reported for some misconfigured sites (#267318). - -*squid-3.1.0.7_beta (26 Apr 2009) - - 26 Apr 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-3.1.0.7_beta-gentoo.patch, +squid-3.1.0.7_beta.ebuild: - Bump to latest beta version. - - 25 Apr 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.13.ebuild: - arm/ia64/sparc stable wrt #245681 - -*squid-3.0.14-r1 (25 Apr 2009) - - 25 Apr 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0.14-cross-compile.patch, +files/squid-3.0.14-gcc43.patch, - +files/squid-3.0.14-max-forwards.patch, -squid-2.7.6.ebuild, - +squid-3.0.14-r1.ebuild: - Fix assertion failure (#267109). Fix gcc-4.3 and cross compilation issues - (#266581). - - 22 Apr 2009; Markus Meier <maekke@gentoo.org> squid-2.7.6-r1: - amd64 stable, bug #263777 - - 22 Apr 2009; Jeroen Roovers <jer@gentoo.org> squid-2.7.6-r1, squid-3.0.13: - Stable for HPPA (bug #245681 and bug #263777 respectively). - -*squid-3.0.14 (15 Apr 2009) - - 15 Apr 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0.14-adapted-zph.patch, +files/squid-3.0.14-gentoo.patch, - +files/squid-3.0.14-heimdal.patch, +squid-3.0.14.ebuild: - Version bump (#266169). - - 15 Apr 2009; Markus Meier <maekke@gentoo.org> squid-3.0.13.ebuild: - amd64/x86 stable, bug #245681 - - 12 Apr 2009; Brent Baude <ranger@gentoo.org> squid-3.0.13.ebuild: - stable ppc64, bug 245681 - - 12 Apr 2009; Brent Baude <ranger@gentoo.org> squid-2.7.6-r1.ebuild: - stable ppc64, bug 263777 - - 11 Apr 2009; nixnut <nixnut@gentoo.org> squid-3.0.13.ebuild: - ppc stable #245681 - - 07 Apr 2009; Tobias Klausmann <klausman@gentoo.org> squid-3.0.13.ebuild: - Stable on alpha, bug #245681 - - 02 Apr 2009; Raúl Porcel <armin76@gentoo.org> squid-2.7.6-r1.ebuild: - alpha/ia64/sparc/x86 stable wrt #263777 - - 26 Mar 2009; Brent Baude <ranger@gentoo.org> squid-2.7.6-r1.ebuild: - stable ppc, bug 263777 - -*squid-2.7.6-r1 (06 Mar 2009) - - 06 Mar 2009; Alin Năstac <mrness@gentoo.org> - -files/squid-2.7.5-gentoo.patch, -files/squid-2.7.5-heimdal.patch, - files/squid-2.7.6-gentoo.patch, -files/squid-3.0.11-adapted-zph.patch, - -files/squid-3.0.11-gentoo.patch, -files/squid-3.0.11-heimdal.patch, - files/squid-3.0.13-gentoo.patch, -squid-2.7.5-r1.ebuild, - +squid-2.7.6-r1.ebuild, -squid-3.0.11.ebuild: - Remove -Werror from CFLAGS (#260931). Append negotiate to the --enable-auth - list (#259463). - - 25 Feb 2009; Markus Meier <maekke@gentoo.org> squid-2.7.6.ebuild: - amd64 stable, bug #257585 - - 20 Feb 2009; Raúl Porcel <armin76@gentoo.org> squid-3.0.13.ebuild: - Change to ~arm, as it just segfaults on uclibc - - 20 Feb 2009; Raúl Porcel <armin76@gentoo.org> squid-2.7.6.ebuild: - ia64/sparc/x86 stable wrt #257585 - - 19 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.7.6.ebuild: - ppc stable, bug #257585 - - 18 Feb 2009; Tobias Klausmann <klausman@gentoo.org> squid-2.7.6.ebuild: - Stable on alpha, bug #257585 - - 17 Feb 2009; Jeroen Roovers <jer@gentoo.org> squid-2.7.6.ebuild: - Stable for HPPA (bug #257585). - - 17 Feb 2009; Brent Baude <ranger@gentoo.org> squid-2.7.6.ebuild: - Marking squid-2.7.6 ppc64 for bug 257585 - -*squid-3.0.13 (16 Feb 2009) -*squid-2.7.6 (16 Feb 2009) - - 16 Feb 2009; Alin Năstac <mrness@gentoo.org> - +files/squid-2.7.6-gentoo.patch, +files/squid-2.7.6-heimdal.patch, - -files/squid-3.0.10-adapted-zph.patch, -files/squid-3.0.10-gentoo.patch, - -files/squid-3.0.10-heimdal.patch, +files/squid-3.0.13-adapted-zph.patch, - +files/squid-3.0.13-gentoo.patch, +files/squid-3.0.13-heimdal.patch, - +squid-2.7.6.ebuild, -squid-3.0.10-r1.ebuild, +squid-3.0.13.ebuild: - Version bumps wrt security bug #257585. - -*squid-3.0.11 (10 Jan 2009) - - 10 Jan 2009; Alin Năstac <mrness@gentoo.org> - -files/squid-2.7.4-charset.patch, -files/squid-2.7.4-gentoo.patch, - -files/squid-2.7.4-heimdal.patch, +files/squid-3.0.11-adapted-zph.patch, - +files/squid-3.0.11-gentoo.patch, +files/squid-3.0.11-heimdal.patch, - -squid-2.7.4-r2.ebuild, +squid-3.0.11.ebuild: - Version bump (#252365). - - 22 Dec 2008; Raúl Porcel <armin76@gentoo.org> squid-2.7.5-r1.ebuild: - ia64/sparc stable wrt #250928 - - 20 Dec 2008; nixnut <nixnut@gentoo.org> squid-2.7.5-r1.ebuild: - Stable on ppc wrt bug 250928 - - 17 Dec 2008; Markus Meier <maekke@gentoo.org> squid-2.7.5-r1.ebuild: - amd64/x86 stable, bug #250928 - - 16 Dec 2008; Brent Baude <ranger@gentoo.org> squid-2.7.5-r1.ebuild: - stable ppc64, bug 250928 - - 16 Dec 2008; Jeroen Roovers <jer@gentoo.org> squid-2.7.5-r1.ebuild: - Stable for HPPA (bug #250928). - - 15 Dec 2008; Tobias Klausmann <klausman@gentoo.org> squid-2.7.5-r1.ebuild: - Stable on alpha, bug #250928 - - 14 Dec 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0.10-adapted-zph.patch, -files/squid-3.0.10-zph.patch, - squid-3.0.10-r1.ebuild: - Adapt zph patch for fixing gcc-4.3 "suggest parentheses" error (#250007). - -*squid-3.0.10-r1 (30 Nov 2008) -*squid-2.7.5-r1 (30 Nov 2008) - - 30 Nov 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-2.7.3-gentoo.patch, -files/squid-3.0.9-gentoo.patch, - -files/squid-3.0.9-heimdal.patch, -files/squid-3.0.9-zph.patch, - files/squid.confd, files/squid.initd, files/squid.initd-logrotate, - metadata.xml, -squid-2.7.3.ebuild, squid-2.7.4-r2.ebuild, - -squid-2.7.5.ebuild, +squid-2.7.5-r1.ebuild, -squid-3.0.9.ebuild, - -squid-3.0.10.ebuild, +squid-3.0.10-r1.ebuild: - Remove obsolete versions. Remove qos USE flag. Add epoll and kqueue USE - flags (#247488). Add init script support for Kerberos keytab file (#242060). - - 13 Nov 2008; Brent Baude <ranger@gentoo.org> squid-2.7.4-r2.ebuild: - stable ppc64, bug 242386 - -*squid-3.0.10 (02 Nov 2008) - - 02 Nov 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-3.0.8-adapted-zph.patch, -files/squid-3.0.8-gentoo.patch, - +files/squid-3.0.10-gentoo.patch, +files/squid-3.0.10-heimdal.patch, - +files/squid-3.0.10-zph.patch, -squid-3.0.8.ebuild, +squid-3.0.10.ebuild: - Version bump (#244958). - - 27 Oct 2008; Jeroen Roovers <jer@gentoo.org> squid-2.7.4-r2.ebuild: - Stable for HPPA (bug #242386). - - 23 Oct 2008; Raúl Porcel <armin76@gentoo.org> squid-2.7.4-r2.ebuild: - alpha/ia64/sparc stable wrt #242386 - -*squid-2.7.5 (19 Oct 2008) - - 19 Oct 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.7.5-gentoo.patch, +files/squid-2.7.5-heimdal.patch, - -squid-2.7.4-r1.ebuild, +squid-2.7.5.ebuild: - Version bump (#242646). - - 18 Oct 2008; nixnut <nixnut@gentoo.org> squid-2.7.4-r2.ebuild: - Stable on ppc wrt bug 242386 - - 17 Oct 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.7.4-heimdal.patch, +files/squid-3.0.9-heimdal.patch, - squid-2.7.4-r2.ebuild, squid-3.0.9.ebuild: - Fix heimdal support (#242060). - - 16 Oct 2008; Markus Meier <maekke@gentoo.org> squid-2.7.4-r2.ebuild: - amd64/x86 stable, bug #242386 - - 16 Oct 2008; Alin Năstac <mrness@gentoo.org> squid-2.7.4-r2.ebuild, - squid-3.0.9.ebuild: - Add kerberos support (#242060). - -*squid-3.0.9 (14 Sep 2008) -*squid-2.7.4-r2 (14 Sep 2008) - - 14 Sep 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-3.0.7-adapted-zph.patch, -files/squid-3.0.7-gentoo.patch, - +files/squid-3.0.9-gentoo.patch, +files/squid-3.0.9-zph.patch, - +squid-2.7.4-r2.ebuild, -squid-3.0.7.ebuild, +squid-3.0.9.ebuild: - Version bump (#237560). Update zph patch (#236329). Add database backend - support(#234798). - - 12 Sep 2008; Raúl Porcel <armin76@gentoo.org> squid-2.7.4-r1.ebuild, - squid-3.0.8.ebuild: - Add ~arm wrt #193597 - - 23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - -*squid-2.7.4-r1 (15 Aug 2008) - - 15 Aug 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.19-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.19-gentoo.patch, -files/squid-2.6.19-qos.patch, - -files/squid-2.6.19-tcp_outg-x_fwd_for.patch, - -files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.20-gentoo.patch, -files/squid-2.6.20-lincapver.patch, - -files/squid-2.6.20-qos.patch, +files/squid-2.7.4-charset.patch, - -squid-2.6.19-r1.ebuild, -squid-2.6.20-r1.ebuild, -squid-2.7.4.ebuild, - +squid-2.7.4-r1.ebuild: - Remove obsolete versions. Fix conf file: replace UTF-8 German minus char - with its ASCII corespondent (#234528). - - 14 Aug 2008; nixnut <nixnut@gentoo.org> squid-2.7.3.ebuild: - Stable on ppc wrt bug 233650 - -*squid-2.7.4 (09 Aug 2008) - - 09 Aug 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.7.4-gentoo.patch, +squid-2.7.4.ebuild: - Version bump (#234282). - - 05 Aug 2008; Jeroen Roovers <jer@gentoo.org> squid-2.7.3.ebuild: - Stable for HPPA (bug #233650). - - 04 Aug 2008; Raúl Porcel <armin76@gentoo.org> squid-2.7.3.ebuild: - alpha/ia64/sparc/x86 stable wrt #233650 - - 02 Aug 2008; Markus Rothe <corsair@gentoo.org> squid-2.7.3.ebuild: - Stable on ppc64; bug #233650 - - 02 Aug 2008; Richard Freeman <rich0@gentoo.org> squid-2.7.3.ebuild: - amd64 stable - 233650 - -*squid-3.0.8 (01 Aug 2008) - - 01 Aug 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-2.7.2-gentoo.patch, -files/squid-3.0.5-gentoo.patch, - -files/squid-3.0.6-adapted-zph.patch, -files/squid-3.0.6-gentoo.patch, - -files/squid-3.0.6-lincapver.patch, +files/squid-3.0.8-adapted-zph.patch, - +files/squid-3.0.8-gentoo.patch, -squid-2.7.2.ebuild, -squid-3.0.5.ebuild, - -squid-3.0.6-r1.ebuild, -squid-3.0.6-r2.ebuild, +squid-3.0.8.ebuild: - Remove obsolete test versions. Version bump (#233001). - -*squid-3.0.7 (26 Jun 2008) -*squid-2.7.3 (26 Jun 2008) - - 26 Jun 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.7.3-gentoo.patch, +files/squid-3.0.7-adapted-zph.patch, - +files/squid-3.0.7-gentoo.patch, +squid-2.7.3.ebuild, +squid-3.0.7.ebuild: - Version bumps (#229565). - -*squid-3.0.6-r2 (22 Jun 2008) -*squid-2.7.2 (22 Jun 2008) - - 22 Jun 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.18-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.18-gentoo.patch, -files/squid-2.6.18-qos.patch, - +files/squid-2.7.2-gentoo.patch, -files/squid-3.0.4-gentoo.patch, - +files/squid-3.0.6-adapted-zph.patch, files/squid-3.0.6-gentoo.patch, - -squid-2.6.18.ebuild, -squid-2.6.20.ebuild, +squid-2.7.2.ebuild, - -squid-3.0.4-r1.ebuild, -squid-3.0.6.ebuild, +squid-3.0.6-r2.ebuild: - Remove obsolete versions. 2.7 version bump without qos and zero-penalty-hit - support (#224733). Add zero-penalty-hit patch to the 3.0 branch. - -*squid-3.0.6-r1 (28 May 2008) -*squid-2.6.20-r1 (28 May 2008) - - 28 May 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.20-lincapver.patch, +files/squid-3.0.6-lincapver.patch, - +squid-2.6.20-r1.ebuild, +squid-3.0.6-r1.ebuild: - Fix issues with the new linux-headers-2.6.25 (#223051). - -*squid-3.0.6 (25 May 2008) - - 25 May 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0.6-gentoo.patch, +squid-3.0.6.ebuild: - Version bump (#223041). - - 25 May 2008; Jeroen Roovers <jer@gentoo.org> squid-2.6.19-r1.ebuild: - Stable for HPPA (bug #223029). - - 25 May 2008; Markus Rothe <corsair@gentoo.org> squid-2.6.19-r1.ebuild: - Stable on ppc64; bug #223029 - - 24 May 2008; nixnut <nixnut@gentoo.org> squid-2.6.19-r1.ebuild: - Stable on ppc wrt bug 223029 - - 23 May 2008; Raúl Porcel <armin76@gentoo.org> squid-2.6.19-r1.ebuild: - alpha/ia64/sparc stable wrt #223029 - - 22 May 2008; Markus Meier <maekke@gentoo.org> squid-2.6.19-r1.ebuild: - amd64/x86 stable, bug #223029 - -*squid-3.0.5 (14 May 2008) -*squid-2.6.20 (14 May 2008) - - 14 May 2008; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.17-gentoo.patch, -files/squid-2.6.17-qos.patch, - +files/squid-2.6.20-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.20-gentoo.patch, +files/squid-2.6.20-qos.patch, - -files/squid-3.0.1-gentoo.patch, +files/squid-3.0.5-gentoo.patch, - -squid-2.6.17.ebuild, +squid-2.6.20.ebuild, -squid-3.0.1.ebuild, - +squid-3.0.5.ebuild: - Version bumps (#218968). - -*squid-3.0.4-r1 (14 Apr 2008) -*squid-2.6.19-r1 (14 Apr 2008) - - 14 Apr 2008; Alin Năstac <mrness@gentoo.org> files/squid.initd, - files/squid.initd-logrotate, -squid-2.6.19.ebuild, - +squid-2.6.19-r1.ebuild, -squid-3.0.4.ebuild, +squid-3.0.4-r1.ebuild: - Fix init script (#217455). - - 13 Apr 2008; Alin Năstac <mrness@gentoo.org> files/squid.initd, - files/squid.initd-logrotate: - Fix init script auto-initialization code for coss cache type (#217455). - - 12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.18.ebuild: - ppc stable, bug #216319 - - 12 Apr 2008; Jeroen Roovers <jer@gentoo.org> squid-2.6.18.ebuild: - Stable for HPPA (bug #216319). - - 12 Apr 2008; Raúl Porcel <armin76@gentoo.org> squid-2.6.18.ebuild: - alpha/ia64/sparc stable wrt security #216319 - - 12 Apr 2008; Markus Rothe <corsair@gentoo.org> squid-2.6.18.ebuild: - Stable on ppc64; bug #216319 - -*squid-3.0.4 (12 Apr 2008) -*squid-2.6.19 (12 Apr 2008) - - 12 Apr 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.19-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.19-gentoo.patch, +files/squid-2.6.19-qos.patch, - +files/squid-2.6.19-tcp_outg-x_fwd_for.patch, - +files/squid-3.0.4-gentoo.patch, +squid-2.6.19.ebuild, - +squid-3.0.4.ebuild: - Version bumps (#213874 and #213505). Fix QA notice (#212007). Add upstream - fix regarding tcp_outgoing_address acl to 2.6 version (#213913). - - 11 Apr 2008; Markus Meier <maekke@gentoo.org> squid-2.6.18.ebuild: - amd64/x86 stable, bug #216319 - -*squid-2.6.18 (10 Jan 2008) - - 10 Jan 2008; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.18-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.18-gentoo.patch, +files/squid-2.6.18-qos.patch, - +squid-2.6.18.ebuild: - Version bump (#205240). - -*squid-3.0.1 (20 Dec 2007) - - 20 Dec 2007; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.16-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.16-gentoo.patch, -files/squid-2.6.16-qos.patch, - +files/squid-3.0.1-gentoo.patch, -files/squid-3.0_rc1-gentoo.patch, - -squid-2.6.16.ebuild, -squid-3.0_rc1.ebuild, +squid-3.0.1.ebuild: - Remove obsolete versions. Version bump that fixes download resume (#197147). - - 06 Dec 2007; Steve Dibb <beandog@gentoo.org> squid-2.6.17.ebuild: - amd64 stable, bug 201209 - - 05 Dec 2007; Jeroen Roovers <jer@gentoo.org> squid-2.6.17.ebuild: - Stable for HPPA (bug #201209). - - 05 Dec 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.17.ebuild: - alpha/ia64/sparc stable wrt security #201209 - - 04 Dec 2007; Christian Faulhammer <opfer@gentoo.org> squid-2.6.17.ebuild: - stable x86, security bug 201209 - - 04 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.17.ebuild: - ppc stable, bug #201209 - - 04 Dec 2007; Markus Rothe <corsair@gentoo.org> squid-2.6.17.ebuild: - Stable on ppc64; bug #201209 - -*squid-2.6.17 (04 Dec 2007) - - 04 Dec 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.17-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.17-gentoo.patch, +files/squid-2.6.17-qos.patch, - +squid-2.6.17.ebuild: - Version bump (#201129, #201209). - - 15 Nov 2007; Alin Năstac <mrness@gentoo.org> squid-2.6.16.ebuild, - squid-3.0_rc1.ebuild: - Set SQUID_MAXFD through configure params instead seding autoconf.h (#199202). - - 04 Nov 2007; Alin Năstac <mrness@gentoo.org> squid-2.6.16.ebuild, - squid-3.0_rc1.ebuild: - Remove useless pkg_preinst function. - - 25 Oct 2007; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.13-gentoo.patch, -files/squid-2.6.13-qos.patch, - -files/squid-2.6.14-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.14-gentoo.patch, -files/squid-2.6.14-qos.patch, - -files/squid-3.0_pre7-gentoo.patch, -squid-2.6.13-r1.ebuild, - -squid-2.6.14.ebuild, -squid-3.0_pre7.ebuild, squid-3.0_rc1.ebuild: - Remove obsolete versions. Add enable-icap USE flag (#196691). - - 20 Oct 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.16.ebuild: - alpha/ia64 stable wrt #195932 - - 19 Oct 2007; nixnut <nixnut@gentoo.org> squid-2.6.16.ebuild: - Stable on ppc wrt bug 195932 - - 17 Oct 2007; Christian Birchinger <joker@gentoo.org> squid-2.6.16.ebuild: - Added sparc stable keyword - - 17 Oct 2007; Christoph Mende <angelos@gentoo.org> squid-2.6.16.ebuild: - Stable on amd64 wrt bug #195932 - - 16 Oct 2007; Markus Rothe <corsair@gentoo.org> squid-2.6.16.ebuild: - Stable on ppc64; bug #195932 - - 15 Oct 2007; Dawid Węgliński <cla@gentoo.org> squid-2.6.16.ebuild: - Stable on x86 (bug #195932) - - 15 Oct 2007; Jeroen Roovers <jer@gentoo.org> squid-2.6.16.ebuild: - Stable for HPPA (bug #195932). - -*squid-3.0_rc1 (15 Oct 2007) - - 15 Oct 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0_rc1-gentoo.patch, +squid-3.0_rc1.ebuild: - Version bump (#195617). - - 23 Sep 2007; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.12-gentoo.patch, files/squid.pam, -files/squid.pam.1, - -squid-2.6.12.ebuild, squid-2.6.13-r1.ebuild, squid-2.6.14.ebuild, - squid-2.6.16.ebuild, squid-3.0_pre7.ebuild: - Remove obsolete version (#182301). - -*squid-3.0_pre7 (09 Sep 2007) - - 09 Sep 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-3.0_pre7-gentoo.patch, +squid-3.0_pre7.ebuild: - Add development version. - -*squid-2.6.16 (08 Sep 2007) - - 08 Sep 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.16-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.16-gentoo.patch, +files/squid-2.6.16-qos.patch, - +squid-2.6.16.ebuild: - Version bump (#191456). - -*squid-2.6.14 (16 Aug 2007) - - 16 Aug 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.14-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.14-gentoo.patch, +files/squid-2.6.14-qos.patch, - -squid-2.6.13.ebuild, +squid-2.6.14.ebuild: - Version bump. - - 09 Jul 2007; Jeroen Roovers <jer@gentoo.org> squid-2.6.13-r1.ebuild: - Stable for HPPA (bug #182301). - - 06 Jul 2007; Lars Weiler <pylon@gentoo.org> squid-2.6.13-r1.ebuild: - Stable on ppc; bug #182301. - - 05 Jul 2007; Christoph Mende <angelos@gentoo.org> squid-2.6.13-r1.ebuild: - Stable on amd64 wrt bug #182301 - - 05 Jul 2007; Markus Rothe <corsair@gentoo.org> squid-2.6.13-r1.ebuild: - Stable on ppc64; bug #182301 - - 05 Jul 2007; Markus Rothe <corsair@gentoo.org> squid-2.6.13.ebuild: - Stable on ppc64; bug #182301 - - 02 Jul 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.13-r1.ebuild: - alpha/ia64/x86 stable wrt #182301 - - 02 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> - squid-2.6.13-r1.ebuild: - Stable on sparc wrt #182301 - - 02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> files/squid.pam.1: - (Remember to save before committing). - -*squid-2.6.13-r1 (02 Jul 2007) - - 02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> +files/squid.pam.1, - +squid-2.6.13-r1.ebuild: - Revision bump to fix the pam.d file. - - 01 Jul 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.13.ebuild: - alpha/ia64/x86 stable wrt #182301 - - 01 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.13.ebuild: - hppa stable, bug #182301 - - 01 Jul 2007; Lars Weiler <pylon@gentoo.org> squid-2.6.13.ebuild: - Stable on ppc; bug #182301. - - 01 Jul 2007; Peter Weller <welp@gentoo.org> squid-2.6.13.ebuild: - Stable on amd64 wrt bug 182301 - -*squid-2.6.13 (28 May 2007) - - 28 May 2007; Alin Năstac <mrness@gentoo.org> - -files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.9-gentoo.patch, - -files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch, - -files/squid-2.6.10-gentoo.patch, - +files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.13-gentoo.patch, +files/squid-2.6.13-qos.patch, - -squid-2.6.7.ebuild, -squid-2.6.9-r1.ebuild, -squid-2.6.10.ebuild, - +squid-2.6.13.ebuild: - Remove obsolete versions. Version bump (#180067). Add qos patch and USE flag - (#180067). - - 24 Apr 2007; Alexander Færøy <eroyf@gentoo.org> squid-2.6.12.ebuild: - Stable on MIPS - - 24 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> squid-2.6.12.ebuild: - Stable on alpha/ia64 wrt bug #171681. - - 24 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> squid-2.6.12.ebuild: - Stable on alpha wrt security bug #171681 - - 24 Mar 2007; Markus Rothe <corsair@gentoo.org> squid-2.6.12.ebuild: - Stable on ppc64; bug #171681 - - 23 Mar 2007; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.12.ebuild: - Stable on ppc wrt bug #171681. - - 23 Mar 2007; Jeroen Roovers <jer@gentoo.org> squid-2.6.12.ebuild: - Stable for HPPA (bug #171681). - - 22 Mar 2007; Steve Dibb <beandog@gentoo.org> ChangeLog: - amd64 stable, bug 171681 - - 21 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.6.12.ebuild: - Stable on sparc wrt security #171681 - - 21 Mar 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.12.ebuild: - x86 stable wrt security bug 171681 - -*squid-2.6.12 (21 Mar 2007) - - 21 Mar 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.12-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.12-gentoo.patch, +squid-2.6.12.ebuild: - Version bump, wrt security bug #171681. - -*squid-2.6.10 (10 Mar 2007) - - 10 Mar 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.10-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.10-gentoo.patch, files/squid.initd, - files/squid.initd-logrotate, +squid-2.6.10.ebuild: - Version bump (#169947). Remove bash-specific code from init script (#170093). - -*squid-2.6.9-r1 (25 Feb 2007) - - 25 Feb 2007; Alin Năstac <mrness@gentoo.org> - files/squid-2.6.9-gentoo.patch, files/squid.cron, -squid-2.6.9.ebuild, - +squid-2.6.9-r1.ebuild: - Restore the default cache_effective_group to none (#166950). Add samba USE - flag (#167712). Make squid.cron return 0 when pid file doesn't exist (#168075). - -*squid-2.6.9 (27 Jan 2007) - - 27 Jan 2007; Alin Năstac <mrness@gentoo.org> - +files/squid-2.6.9-ToS_Hit_ToS_Preserve.patch, - +files/squid-2.6.9-gentoo.patch, -squid-2.5.12.ebuild, - -squid-2.5.12-r1.ebuild, -squid-2.5.13.ebuild, -squid-2.5.14.ebuild, - -squid-2.6.4-r2.ebuild, -squid-2.6.5.ebuild, -squid-2.6.6-r2.ebuild, - +squid-2.6.9.ebuild: - Remove obsolete versions. Version bump (#163630). - - 21 Jan 2007; Alin Năstac <mrness@gentoo.org> squid-2.6.7.ebuild: - Stable on amd64 (#162364). - - 20 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> squid-2.6.7.ebuild: - Stable on MIPS; bug #162364 - - 19 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> squid-2.6.7.ebuild: - Stable on IA64; bug #162364 - - 18 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.7.ebuild: - Stable on ppc wrt bug #162364. - - 18 Jan 2007; René Nussbaumer <killerfox@gentoo.org> squid-2.6.7.ebuild: - Stable on hppa. See bug #162364. - - 18 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> squid-2.6.7.ebuild: - Stable on Alpha, bug 162364. - - 17 Jan 2007; Markus Rothe <corsair@gentoo.org> squid-2.6.7.ebuild: - Stable on ppc64; bug #162364 - - 16 Jan 2007; Jason Wever <weeve@gentoo.org> squid-2.6.7.ebuild: - Stable on SPARC wrt security bug #162364. - - 16 Jan 2007; Raúl Porcel <armin76@gentoo.org> squid-2.6.7.ebuild: - x86 stable wrt bug 162364 - -*squid-2.6.7 (16 Jan 2007) - - 16 Jan 2007; Alin Nastac <mrness@gentoo.org> -squid-2.6.6-r1.ebuild, - +squid-2.6.7.ebuild: - Version bump (#162301). - -*squid-2.6.6-r2 (08 Jan 2007) - - 08 Jan 2007; Alin Năstac <mrness@gentoo.org> +squid-2.6.6-r2.ebuild: - Detect if kernel supports CONFIG_EPOLL or not (#160637). - - 31 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> squid-2.6.5.ebuild: - Stable on Alpha, bug 157570. - -*squid-2.6.6-r1 (21 Dec 2006) - - 21 Dec 2006; Alin Năstac <mrness@gentoo.org> -squid-2.6.6.ebuild, - +squid-2.6.6-r1.ebuild: - Use econf (#158708). - -*squid-2.6.6 (19 Dec 2006) - - 19 Dec 2006; Alin Năstac <mrness@gentoo.org> -squid-2.6.3.ebuild, - +squid-2.6.6.ebuild: - Remove obsolete 2.6.x version. Version bump (#158554). - - 17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.6.5.ebuild: - Stable on ppc wrt bug #157570. - - 11 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.6.5.ebuild: - Stable on sparc wrt #157570 - - 09 Dec 2006; Markus Rothe <corsair@gentoo.org> squid-2.6.5.ebuild: - Stable on ppc64; bug #157570 - - 09 Dec 2006; Alin Năstac <mrness@gentoo.org> squid-2.6.5.ebuild: - Stable on x86. - - 03 Dec 2006; Markus Rothe <corsair@gentoo.org> squid-2.6.4-r2.ebuild: - Stable on ppc64 - - 25 Nov 2006; <blubb@gentoo.org> squid-2.6.4-r2.ebuild: - stable on amd64 - - 09 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.6.4-r2.ebuild: - Stable on sparc - -*squid-2.6.5 (08 Nov 2006) - - 08 Nov 2006; Alin Nastac <mrness@gentoo.org> squid-2.6.4-r2.ebuild, - +squid-2.6.5.ebuild: - Version bump (#154249). Mark version 2.6.4-r2 stable on x86. - -*squid-2.6.4-r2 (16 Oct 2006) - - 16 Oct 2006; Alin Nastac <mrness@gentoo.org> -squid-2.6.4-r1.ebuild, - +squid-2.6.4-r2.ebuild: - Remove /etc/squid/errors symlink (#151304). - -*squid-2.6.4-r1 (07 Oct 2006) - - 07 Oct 2006; Alin Nastac <mrness@gentoo.org> squid-2.6.3.ebuild, - -squid-2.6.4.ebuild, +squid-2.6.4-r1.ebuild: - Resurrect zero-penalty-hit USE flag (#150301). - -*squid-2.6.4 (05 Oct 2006) - - 05 Oct 2006; Alin Nastac <mrness@gentoo.org> +squid-2.6.4.ebuild: - Version bump (#150139). Remove --enable-truncate. - - 29 Sep 2006; Markus Rothe <corsair@gentoo.org> squid-2.6.3.ebuild: - Stable on ppc64 - - 28 Sep 2006; Simon Stelling <blubb@gentoo.org> squid-2.5.14.ebuild: - stable on amd64 - - 24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> squid-2.6.3.ebuild: - Stable on ppc. - - 21 Sep 2006; <blubb@gentoo.org> squid-2.6.3.ebuild: - stable on amd64 - - 21 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.6.3.ebuild: - Stable on sparc - - 21 Sep 2006; Alin Nastac <mrness@gentoo.org> -squid-2.6.1-r1.ebuild, - squid-2.6.3.ebuild: - Remove old test version. Mark stable on x86 and die in pkg_setup if - zero-penalty-hit USE flag is enabled. - - 20 Sep 2006; Alin Nastac <mrness@gentoo.org> files/squid.initd, - files/squid.initd-logrotate: - Fix format of message displayed on service stop (#148005). - - 05 Sep 2006; Joshua Kinard <kumba@gentoo.org> squid-2.5.14.ebuild: - Marked stable on mips. - -*squid-2.6.3 (19 Aug 2006) - - 19 Aug 2006; Alin Nastac <mrness@gentoo.org> +squid-2.6.3.ebuild: - Version bump (#144363). Enable use of epoll() only if kernel version is - 2.6.x (#143196). - - 16 Aug 2006; Markus Rothe <corsair@gentoo.org> squid-2.5.14.ebuild: - Stable on ppc64 - - 03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.5.14.ebuild: - Stable on sparc - - 19 Jul 2006; Alin Nastac <mrness@gentoo.org> squid-2.6.1-r1.ebuild: - Add sys-libs/db-4 dependency, required by session helper (#140993). - - 18 Jul 2006; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.14.ebuild: - Stable on ppc. - - 13 Jul 2006; Aron Griffis <agriffis@gentoo.org> squid-2.5.14.ebuild: - Mark 2.5.14 stable on ia64 - - 11 Jul 2006; Javier Villavicencio <the_paya@gentoo.org> - squid-2.5.14.ebuild, squid-2.6.1-r1.ebuild: - Fixed case of *BSD useflags. - -*squid-2.6.1-r1 (11 Jul 2006) - - 11 Jul 2006; Alin Nastac <mrness@gentoo.org> metadata.xml, - -squid-2.6.1.ebuild, +squid-2.6.1-r1.ebuild: - Add current upstream patches (#139962). - -*squid-2.6.1 (10 Jul 2006) - - 10 Jul 2006; Alin Nastac <mrness@gentoo.org> squid-2.5.14.ebuild, - +squid-2.6.1.ebuild: - Major version bump (#139154). Mark squid-2.5.14 stable on x86. - - 26 Jun 2006; Javier Villavicencio <the_paya@gentoo.org> - squid-2.5.14.ebuild: - Add ~x86-fbsd keyword. - -*squid-2.5.14 (19 Jun 2006) - - 19 Jun 2006; Alin Nastac <mrness@gentoo.org> +squid-2.5.14.ebuild: - Version bump. Add nis global USE flag; add pf-transparent and - ipf-transparent local USE flags (#134823). - - 25 May 2006; Guy Martin <gmsoft@gentoo.org> squid-2.5.13.ebuild: - Stable on hppa. - - 23 May 2006; Markus Rothe <corsair@gentoo.org> squid-2.5.13.ebuild: - Stable on ppc64 - - 30 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.5.13.ebuild: - ppc stable - - 27 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.5.13.ebuild: - Stable on sparc - - 27 Apr 2006; Alin Nastac <mrness@gentoo.org> squid-2.5.13.ebuild: - Stable on x86. - - 15 Apr 2006; Marcus D. Hanwell <cryos@gentoo.org> squid-2.5.12-r1.ebuild: - Marked stable on amd64. - - 15 Apr 2006; Guy Martin <gmsoft@gentoo.org> squid-2.5.12-r1.ebuild: - Stable on hppa. - -*squid-2.5.13 (25 Mar 2006) - - 25 Mar 2006; Alin Nastac <mrness@gentoo.org> -squid-2.5.11.ebuild, - +squid-2.5.13.ebuild: - Version bump. Update customlog and zero penalty hit patches. - - 19 Mar 2006; Markus Rothe <corsair@gentoo.org> squid-2.5.12-r1.ebuild: - Stable on ppc64 - - 10 Mar 2006; Aron Griffis <agriffis@gentoo.org> squid-2.5.12-r1.ebuild: - Mark 2.5.12-r1 stable on ia64 - - 10 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> - squid-2.5.12-r1.ebuild: - Stable on ppc. - - 07 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> - squid-2.5.12-r1.ebuild: - Stable on sparc - - 06 Mar 2006; Alin Nastac <mrness@gentoo.org> squid-2.5.12-r1.ebuild: - Stable on x86. - - 07 Feb 2006; Simon Stelling <blubb@gentoo.org> squid-2.5.12.ebuild: - stable on amd64 - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> squid-2.5.12.ebuild: - Mark 2.5.12 stable on alpha - -*squid-2.5.12-r1 (24 Jan 2006) - - 24 Jan 2006; Alin Nastac <mrness@gentoo.org> +squid-2.5.12-r1.ebuild: - Add upstream patches. Add warning about diskd performance (#119574). - - 18 Jan 2006; Alin Nastac <mrness@gentoo.org> files/squid.initd, - files/squid.initd-logrotate: - Display squid output on failure to initialize cache directories (#119215). - - 09 Jan 2006; Alin Nastac <mrness@gentoo.org> files/squid.initd, - files/squid.pam, -files/squid.pam-include, +files/squid.initd-logrotate, - +files/squid.logrotate, -files/squid-logrotate, -squid-2.5.10-r2.ebuild, - -squid-2.5.10-r4.ebuild, squid-2.5.11.ebuild, squid-2.5.12.ebuild: - Remove old versions. Add rotate functionality to init script (#118376). - - 08 Jan 2006; Stuart Longland <redhatter@gentoo.org> squid-2.5.12.ebuild: - Marked 2.5.12 stable on MIPS, and fixed the copyright header to keep repoman - happy. - - 31 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.12.ebuild: - Stable on hppa, ppc. - - 31 Dec 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.12.ebuild: - Stable on ppc64 - - 31 Dec 2005; Alin Nastac <mrness@gentoo.org> files/squid.initd: - Stop service correctly by calling squid -k shutdown instead using - start-stop-daemon. - - 28 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.5.12.ebuild: - Stable on sparc - - 28 Dec 2005; Alin Nastac <mrness@gentoo.org> squid-2.5.12.ebuild: - Keep log and cache directories between upgrades (#116890). Mark stable on x86. - - 25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> squid-2.5.12.ebuild: - Use bindnow-flags function instead of -Wl,-z,now. - -*squid-2.5.12 (23 Nov 2005) - - 23 Nov 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.12.ebuild: - Version bump (#111050). - - 23 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> squid-2.5.11.ebuild: - Removed the --disable-internal-dns directive on amd64, closes bug 110740. - - 23 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> squid-2.5.11.ebuild: - Stable on amd64, bug 109827. - - 21 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.11.ebuild: - Stable on alpha + ia64, bug 109827. - - 20 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.11.ebuild: - Stable on hppa, ppc. - - 19 Oct 2005; Jason Wever <weeve@gentoo.org> squid-2.5.11.ebuild: - Stable on SPARC wrt security bug #109827. - - 19 Oct 2005; Brent Baude <ranger@gentoo.org> squid-2.5.11.ebuild: - marking squid-2.5.11 ppc64 stable for security related bug 109827 - -*squid-2.5.11 (19 Oct 2005) - - 19 Oct 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.11.ebuild: - Version bump wrt security bug #109827, submitted as stable on x86. - - 04 Oct 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.10.ebuild, - squid-2.5.10-r2.ebuild, squid-2.5.10-r4.ebuild: - Remove obsolete version. Remove COPYING and COPYRIGHT from docs. - - 18 Sep 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.10-r4.ebuild: - Stable on ppc64 (bug #106104) - - 18 Sep 2005; Jason Wever <weeve@gentoo.org> squid-2.5.10-r4.ebuild: - Stable on SPARC wrt security bug #106104. - - 17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - squid-2.5.10-r4.ebuild: - Stable on hppa and ppc. - - 17 Sep 2005; Luis Medinas <metalgod@gentoo.org> squid-2.5.10-r4.ebuild: - Marked Stable on amd64. Fixes bug #106104. - - 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.10-r4.ebuild: - Mark 2.5.10-r4 stable on ia64 - - 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.10-r4.ebuild: - Mark 2.5.10-r4 stable on alpha - -*squid-2.5.10-r4 (16 Sep 2005) - - 16 Sep 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.10_rc3.ebuild, - -squid-2.5.10-r1.ebuild, -squid-2.5.10-r3.ebuild, +squid-2.5.10-r4.ebuild: - Add all current upstream patches for fixing security bug #106104. Remove - obsolete versions. - -*squid-2.5.10-r3 (10 Sep 2005) - - 10 Sep 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.10-r3.ebuild: - Fix follow-xff patch (#105468). - - 08 Sep 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.10-r2.ebuild: - Mark 2.5.10-r2 stable on ia64 - - 04 Sep 2005; Hardave Riar <hardave@gentoo.org> squid-2.5.10-r2.ebuild: - Stable on mips, bug #104603. - - 03 Sep 2005; Jason Wever <weeve@gentoo.org> squid-2.5.10-r2.ebuild: - Stable on SPARC wrt security bug #104603. - - 03 Sep 2005; <dang@gentoo.org> squid-2.5.10-r2.ebuild: - Marked stable on amd64 - - 03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - squid-2.5.10-r2.ebuild: - Stable on ppc. - - 03 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> squid-2.5.10-r2.ebuild: - stable on alpha, wrt bug #104603 - - 03 Sep 2005; Rene Nussbaumer <killerfox@gentoo.org> - squid-2.5.10-r2.ebuild: - Stable on hppa. - - 03 Sep 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.10-r2.ebuild: - Stable on ppc64 - -*squid-2.5.10-r2 (02 Sep 2005) - - 02 Sep 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.10-r2.ebuild: - Add all current upstream patches for fixing security bug #92254. - - 28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> squid-2.5.10.ebuild: - Stable on amd64. - - 25 Aug 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.10.ebuild: - stable on ia64 - -*squid-2.5.10-r1 (31 Jul 2005) - - 31 Jul 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.10-r1.ebuild: - Apply follow X-Forwarded-For patch, selected by follow-xff useflag (#100700). - - 25 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> squid-2.5.10.ebuild: - Stable on hppa. - - 20 Jul 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.10.ebuild: - Stable on ppc64 - - 20 Jul 2005; Alin Nastac <mrness@gentoo.org> squid-2.5.10_rc3.ebuild, - squid-2.5.10.ebuild: - Add creation of squid user/group (#99603). - - 19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.10.ebuild: - Stable on alpha. - - 18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.5.10.ebuild: - Stable on sparc - - 17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> squid-2.5.10.ebuild: - ppc stable - - 16 Jul 2005; Alin Nastac <mrness@gentoo.org> - -files/squid-2.5.9-gentoo.diff, +files/squid.cron, +files/squid.initd, - -files/squid.rc6, -files/squid-r1.cron, -squid-2.5.9.ebuild, - -squid-2.5.9-r3.ebuild, -squid-2.5.9-r4.ebuild, squid-2.5.10_rc3.ebuild, - squid-2.5.10.ebuild: - Remove obsolete versions. Mark version 2.5.10 stable on x86. - - 26 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> squid-2.5.9-r3.ebuild: - Stable on hppa. bug 89149 - - 08 Jun 2005; Stuart Longland <redhatter@gentoo.org> squid-2.5.10_rc3.ebuild: - Marking stable on mips. - - 29 May 2005; <solar@gentoo.org> squid-2.5.10_rc3.ebuild, - squid-2.5.9-r3.ebuild, squid-2.5.9-r4.ebuild, squid-2.5.9.ebuild: - - update squid to use libc expanded variable elibc_uclibc vs uclibc so USE=-* - works - -*squid-2.5.10 (19 May 2005) - - 19 May 2005; Alin Nastac <mrness@gentoo.org> - -files/squid-2.5.8-gentoo.diff, +files/squid.pam-include, - -squid-2.5.8.ebuild, -squid-2.5.8-r1.ebuild, +squid-2.5.10.ebuild: - Version bump with fixed openpam/amd64 compatibility (#93191). Add - post-install info message about how to make winbind authentication work. - Remove obsolete versions. - - 12 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> - squid-2.5.10_rc3.ebuild: - Stable on sparc wrt #92254 - - 12 May 2005; Bryan Østergaard <kloeri@gentoo.org> - squid-2.5.10_rc3.ebuild: - Stable on alpha + ia64, bug 92254. - - 12 May 2005; Michael Hanselmann <hansmi@gentoo.org> - squid-2.5.10_rc3.ebuild: - Stable on hppa. - - 12 May 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.10_rc3.ebuild: - stable on amd64 wrt #92254 - - 12 May 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.10_rc3.ebuild: - Stable on ppc64; bug #92254 - - 11 May 2005; Lars Weiler <pylon@gentoo.org> squid-2.5.10_rc3.ebuild: - Stable on ppc; bug #92254. - -*squid-2.5.10_rc3 (11 May 2005) - - 11 May 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.10_rc3.ebuild: - Version bumped for fixing security issue described in bug #92254. - Stable on x86. - -*squid-2.5.9-r4 (24 Apr 2005) - - 24 Apr 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.9-r4.ebuild: - Add current official patches. Disable lazy bindings on basic auth programs. - Add zero-penalty-hit flag (#89769). - - 22 Apr 2005; Alin Nastac <mrness@gentoo.org> : - Rename category & herd www-proxy to net-proxy - - 19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.9-r3.ebuild: - Stable on alpha and ia64, bug 89149. - -*squid-2.5.9-r3 (19 Apr 2005) - - 19 Apr 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.9-r2.ebuild, - +squid-2.5.9-r3.ebuild: - Replace 2.5.9-r2 version with 2.5.9-r3 for fixing broken 2GB patch. See bug - #89586 for more info. - - 17 Apr 2005; Jason Wever <weeve@gentoo.org> squid-2.5.9-r2.ebuild: - Stable on SPARC wrt security bug #89149. - - 17 Apr 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.9-r2.ebuild: - Stable on ppc64; bug #89149 - - 17 Apr 2005; Alin Nastac <mrness@gentoo.org> squid-2.5.9-r2.ebuild: - Stable on x86 - - 16 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.9-r2.ebuild: - Stable on ppc. - - 16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.9-r2.ebuild: - stable on amd64 wrt security bug #89149 - - 01 Apr 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.9.ebuild: - stable on ia64 - -*squid-2.5.9-r2 (28 Mar 2005) - - 28 Mar 2005; Alin Nastac <mrness@gentoo.org> -squid-2.5.9-r1.ebuild, - +squid-2.5.9-r2.ebuild: - Add customlog local USE flag which decides whether or not customlog patch is - applied (#85740). - - 13 Mar 2005; Hardave Riar <hardave@gentoo.org> squid-2.5.9.ebuild: - Stable on mips, bug #83955. - -*squid-2.5.9-r1 (06 Mar 2005) - - 06 Mar 2005; Alin Nastac <mrness@gentoo.org> +squid-2.5.9-r1.ebuild: - Add current official patches and fix minor inconsistency in squid.conf - comments (#84184). - - 05 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.9.ebuild: - Stable on alpha, bug 83955. - - 04 Mar 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.9.ebuild: - Stable on ppc64; bug #83955 - - 04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> squid-2.5.9.ebuild: - Stable on sparc wrt #83955 - - 03 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.9.ebuild: - stable on amd64 wrt to #83955 - - 03 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.9.ebuild: - Stable on ppc. - -*squid-2.5.9 (03 Mar 2005) - - 03 Mar 2005; Alin Nastac <mrness@gentoo.org> - +files/squid-2.5.9-gentoo.diff, +squid-2.5.9.ebuild: - Security bump (#83955). Turn off by default client IP disclosure (#83976). - - 28 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - squid-2.5.8-r1.ebuild: - Use correct compiler. - -*squid-2.5.8-r1 (23 Feb 2005) - - 23 Feb 2005; Alin Nastac <mrness@gentoo.org> - -files/squid-2.4.7-debian.diff, -files/squid-2.4.7-gentoo.diff, - -files/squid-2.5.3-gentoo.diff, -files/squid-2.5.5-ntml-auth-fix.patch, - -files/squid-2.5.6-ufs-no-valid-dir.patch, -files/squid-2.5.7-gentoo.diff, - +files/squid-logrotate, -squid-2.4.7.ebuild, -squid-2.5.5-r3.ebuild, - -squid-2.5.6-r3.ebuild, -squid-2.5.7-r6.ebuild, +squid-2.5.8-r1.ebuild: - Incorporate combined log patch (#76333). Add support for logrotate selected - by a new USE flag (#71658). Remove obsolete versions. - - 20 Feb 2005; Aron Griffis <agriffis@gentoo.org> squid-2.5.8.ebuild: - stable on ia64 #81997 - - 18 Feb 2005; Hardave Riar <hardave@gentoo.org> squid-2.5.8.ebuild: - Stable on mips, bug #81997 - - 17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.8.ebuild: - Stable on alpha, bug 81997. - - 16 Feb 2005; Jason Wever <weeve@gentoo.org> squid-2.5.8.ebuild: - Stable on sparc wrt security bug #81997. - - 16 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> squid-2.5.8.ebuild: - Stable on hppa and ppc. - - 16 Feb 2005; Markus Rothe <corsair@gentoo.org> squid-2.5.8.ebuild: - Stable on ppc64; bug #81997 - - 15 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> squid-2.5.8.ebuild: - stable on amd64. see #81997 - -*squid-2.5.8 (15 Feb 2005) - - 15 Feb 2005; Alin Nastac <mrness@gentoo.org> metadata.xml, - +files/squid-2.5.8-gentoo.diff, +squid-2.5.8.ebuild: - Security bump for bug #81997. - -*squid-2.5.7-r6 (09 Feb 2005) - - 09 Feb 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r5.ebuild, - +squid-2.5.7-r6.ebuild: - More patchset bumps - - 06 Feb 2005; Joshua Kinard <kumba@gentoo.org> squid-2.5.7-r5.ebuild: - Marked stable on mips. - -*squid-2.5.7-r5 (01 Feb 2005) - - 01 Feb 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r4.ebuild, - +squid-2.5.7-r5.ebuild: - Security bump for bug #80201 - -*squid-2.5.7-r4 (27 Jan 2005) - - 27 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r3.ebuild, - +squid-2.5.7-r4.ebuild: - Security bump bug #79495 - -*squid-2.5.7-r3 (21 Jan 2005) - - 21 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r2.ebuild, - +squid-2.5.7-r3.ebuild: - Security bump for bug #78776 - -*squid-2.5.7-r2 (14 Jan 2005) - - 14 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> -squid-2.5.7-r1.ebuild, - +squid-2.5.7-r2.ebuild: - Security bump for bug #77934 - -*squid-2.5.7-r1 (12 Jan 2005) - - 12 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> +squid-2.5.7-r1.ebuild, - -squid-2.5.7.ebuild: - Revision bump to get the patchset out there - - 12 Jan 2005; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: - Security patchset update see bug #77521 - - 30 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> - files/squid-2.5.7-gentoo.diff, files/squid.confd, files/squid.rc6, - squid-2.5.7.ebuild: - Changes to give squid a max of 8192 descriptors (default 1024). - - 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 12 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: - Adding underscores use flag to IUSE - - 10 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: - Security patchset update see bug #73908 - - 04 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> squid-2.5.7.ebuild: - Added more bug fix patches to the STABLE7 patchset. - - 04 Dec 2004; Andrew Bevitt <cyfred@gentoo.org> - -files/squid-2.5.3-gentoo.diff, files/squid-2.5.7-gentoo.diff, - -files/squid.cron, -squid-2.5.6-r2.ebuild, squid-2.5.6-r3.ebuild: - Fixing bug #68524 and removing a few old ebuilds. - - 17 Oct 2004; Hardave Riar <hardave@gentoo.org> squid-2.5.6-r2.ebuild: - Stable on mips, bug #61280. - -*squid-2.5.6-r3 (17 Oct 2004) - - 17 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; +squid-2.5.6-r3.ebuild, - squid-2.5.7.ebuild: - More patches for 2.5.STABLE6 and started the patchset for STABLE7, see bug - #57081 - -*squid-2.5.7 (17 Oct 2004) - - 17 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; - +files/squid-2.5.7-gentoo.diff, +squid-2.5.7.ebuild: - Version bump to STABLE7 + bug #67167 DoS fix - - 12 Oct 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.4.7.ebuild, - -squid-2.5.5-r2.ebuild, squid-2.5.5-r3.ebuild, -squid-2.5.6-r1.ebuild, - squid-2.5.6-r2.ebuild, -squid-2.5.6.ebuild: - added selinux to IUSE - - 26 Sep 2004; Tom Gall <tgall@gentoo.org> squid-2.5.6-r2.ebuild: - stable on ppc64, bug #61280 - - 14 Sep 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.6-r2.ebuild: - Stable on hppa. - - 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : - Fixed ChangeLog header. - - 01 Sep 2004; Travis Tilley <lv@gentoo.org> squid-2.5.6-r2.ebuild: - stable on amd64 - - 27 Aug 2004; Jason Wever <weeve@gentoo.org> squid-2.5.6-r2.ebuild: - Stable on sparc wrt security bug #61280. - - 27 Aug 2004; Martin Holzer <mholzer@gentoo.org> squid-2.5.6-r2.ebuild: - x86 stable - - 26 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.6-r2.ebuild: - Stable on alpha, bug 61280. - -*squid-2.5.6-r2 (23 Aug 2004) - - 23 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; +squid-2.5.6-r2.ebuild: - Security Update: NTML DoS Vunerability see bug #61280 - - 23 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.6-r1.ebuild: - Adding support for uclibc to 2.5 Stable 6 see #61175 - - 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.5-r3.ebuild: - Patches introduced for 2.5.5-r3 fix the sasl sedding done in the ebuilds, - removing. - -*squid-2.5.5-r3 (16 Aug 2004) - - 16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.4.7.ebuild, - +squid-2.5.5-r3.ebuild, +squid-2.5.6-r1.ebuild: - Updating patchsets for all versions, see bug #57081 for more - -*squid-2.4.7 (15 Aug 2004) - - 15 Aug 2004; Stuart Herbert <stuart@gentoo.org> +metadata.xml, - +files/squid-2.4.7-debian.diff, +files/squid-2.4.7-gentoo.diff, - +files/squid-2.5.3-gentoo.diff, +files/squid-2.5.5-ntml-auth-fix.patch, - +files/squid-2.5.6-ufs-no-valid-dir.patch, +files/squid-r1.cron, - +files/squid.confd, +files/squid.cron, +files/squid.pam, +files/squid.rc6, - +squid-2.4.7.ebuild, +squid-2.5.5-r2.ebuild, +squid-2.5.6.ebuild: - Moved from net-www/squid to www-proxy/squid. - - 18 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.6.ebuild: - Keyworded ~alpha. - - 16 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.6.ebuild: - SASL V 1/2 is now supported natively - - 15 Jul 2004; Tom Gall <tgall@gentoo.org> squid-2.5.5-r2.ebuild: - stable on ppc64, bug #55406 - - 15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -squid-2.5.3.ebuild, - -squid-2.5.4.ebuild, -squid-2.5.5-r1.ebuild, squid-2.5.5-r2.ebuild, - -squid-2.5.5.ebuild: - Removing old versions of 2.5. Marking -r2 amd64 stable. Closing bug #52977 - -*squid-2.5.6 (15 Jul 2004) - - 15 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; - +files/squid-2.5.6-ufs-no-valid-dir.patch, +squid-2.5.6.ebuild: - Squid 2.5 Stable 6; inital ebuild thanks to ali3nx, included patches from - squid-caches updates - - 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> squid-2.5.3.ebuild, - squid-2.5.4.ebuild, squid-2.5.5-r1.ebuild, squid-2.5.5-r2.ebuild, - squid-2.5.5.ebuild: - virtual/glibc -> virtual/libc - - 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> squid-2.4.7.ebuild, - squid-2.5.3.ebuild, squid-2.5.4.ebuild, squid-2.5.5-r1.ebuild, - squid-2.5.5-r2.ebuild, squid-2.5.5.ebuild: - QA - fix use invocation - - 24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org> - squid-2.5.5-r2.ebuild: - Marked ~amd64. amd64 needs --disable-internal-dns to run properly. - - 16 Jun 2004; Daniel Ostrowv<dostrow@gentoo.org> squid-2.5.5-r2.ebuild: - Stable on ppc. - - 15 Jun 2004; Brandon Hale <tseng@gentoo.org> squid-2.5.5-r2.ebuild: - Stable on x86. - - 12 Jun 2004; Jason Wever <weeve@gentoo.org> squid-2.5.5-r2.ebuild: - Stable on sparc wrt bug #53367. - - 12 Jun 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.5-r2.ebuild: - Marked stable on hppa. - - 12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> squid-2.5.5-r2.ebuild: - Stable on alpha, bug #53367. - -*squid-2.5.5-r2 (12 Jun 2004) - - 12 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; - +files/squid-2.5.5-ntml-auth-fix.patch, +squid-2.5.5-r2.ebuild: - Closing bugs #52977 and #53367, 53367 fixes an issue in NTLM Authentication, - where a buffer overflow is possible -- Please upgrade, see the bug for more - information - - 12 May 2004; Michael McCabe <randy@gentoo.org> squid-2.5.5-r1.ebuild: - Added s390 keywords - - 01 May 2004; Andrew Bevitt <cyfred@gentoo.org>; squid-2.5.5-r1.ebuild: - Adding support for underscores in the domain name; local use flag underscores. - Ebuild provides warning that bind (or equivelent) must support this or you - will get dns failures. - - 01 May 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml: - Taking over squid maintainers role - -*squid-2.5.5-r1 (01 May 2004) - - 01 May 2004; Bryan Østergaard <kloeri@gentoo.org> +files/squid-r1.cron, - +squid-2.5.5-r1.ebuild: - New cron script, close bug #30475. - - 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> squid-2.4.7.ebuild: - Add inherit eutils - - 31 Mar 2004; Joshua Brindle <method@gentoo.org> : - Added selinux policy deps, removed ppc64 as it had badindev and no changelog - entry - - 30 Mar 2004; <plasmaroo@gentoo.org> squid-2.5.5.ebuild: - Marked stable on X86 for GLSA release; bug #45273. - - 30 Mar 2004; Lars Weiler <pylon@gentoo.org> squid-2.5.5.ebuild: - Stable on ppc due to security bug #45273. - - 30 Mar 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.5.ebuild: - Marked stable on hppa. - - 21 Mar 2004; Aron Griffis <agriffis@gentoo.org> squid-2.5.5.ebuild: - Stable on alpha and ia64. - - 21 Mar 2004; Jason Wever <weeve@gentoo.org> squid-2.5.5.ebuild: - Marked stable on sparc wrt #45273. - -*squid-2.5.5 (18 Mar 2004) - - 18 Mar 2004; Donny Davies <woodchip@gentoo.org> squid-2.5.5.ebuild, - files/squid.rc6: - Version bump and add reload() to the rc-script, both thanks to - Wolfram Schlich <wschlich@gentoo.org>. - - 19 Feb 2004; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild: - Bug #41882; add 'export WANT_AUTOCONF=2.1'. - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> squid-2.5.4.ebuild: - stable on ia64 - - 21 Jan 2004; Guy Martin <gmsoft@gentoo.org> squid-2.5.4.ebuild : - Marked stable on hppae - - 10 Jan 2004; Aron Griffis <agriffis@gentoo.org> squid-2.5.4.ebuild: - stable on alpha - - 15 Dec 2003; <spider@gentoo.org> squid-2.4.7.ebuild, squid-2.5.3.ebuild, - squid-2.5.4.ebuild: - QA: fixing chown user.group to user:group, bug #35127 - - 05 Nov 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.4.ebuild: - Added sparc stable keyword - - 02 Nov 2003; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild: - Mark x86 stable, add metadata.xml. - -*squid-2.5.4 (18 Sep 2003) - - 18 Sep 2003; Donny Davies <woodchip@gentoo.org> squid-2.5.4.ebuild: - Version bump. Add --enable-ident-lookups, closing #24591. - - 10 Jul 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.3.ebuild: - Added sparc stable keyword - - 10 Jul 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.3.ebuild: - Added sparc stable keyword - - 03 Jul 2003; Brad Laue <brad@gentoo.org> squid-2.5.3.ebuild: - Mark 2.5.3 stable on x86. - - 10 Jun 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.2.ebuild: - Added sparc stable keyword - -*squid-2.5.3 (04 Jun 2003) - - 05 Jul 2003; Guy martin <gmsoft@gentoo.org> squid-2.5.3.ebuild : - Fixed the loop problem with glibc-2.3.1 on hppa . Marked stable for hppa. - - 04 Jun 2003; Donny Davies <woodchip@gentoo.org> Manifest, squid-2.5.3.ebuild, - files/squid-2.5.3-gentoo.diff: - Version bump. Re-diff patch. - -*squid-2.5.2 (27 Mar 2003) - - 04 Jun 2003; Brad Laue <brad@gentoo.org> Manifest, squid-2.5.2.ebuild, - Mark stable on x86. - - 27 Mar 2003; Donny Davies <woodchip@gentoo.org> squid-2.5.2.ebuild, - files/squid-2.5.2-gentoo.diff: - Bump to latest. Made new patch, clean some docs, fix cron snip install. - -*squid-2.5.1-r2 (31 Jan 2003) - - 30 Mar 2003; Christian Birchinger <joker@gentoo.org> squid-2.5.1-r2.ebuild: - Added sparc stable keyword - - 31 Jan 2003; Nick Hadaway <raker@gentoo.org> squid-2.5.1-r2.ebuild, - files/digest-squid-2.5.1-r2 : - Added logic so if sasl2 is installed, squid uses it. A couple - of sed statements are included to adjust incompatible code. - - 14 Dec 2002; Donny Davies <woodchip@gentoo.org> : #8738. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*squid-2.5.1-r1 (19 Nov 2002) - - 19 Nov 2002; Donny Davies <woodchip@gentoo.org> : Fix for #10865. - -*squid-2.5.1 (07 Nov 2002) - - 07 Sep 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release. - Major patch cleanup. Added USE ssl and sasl support. Fixed KEYWORDS. - Big authentication and helper modules reorganization. Make dealing with - the lame archive versioning scheme easier. Some general cleanups. - - 15 Sep 2002; Maik Schreiber <blizzy@gentoo.org> files/squid.rc6 : Removed - hard dependency on /var/cache/squid. - -*squid-2.4.7 (12 Jul 2002) - - 12 Jul 2002; Bruce A. Locke <blocke@shivan.org> : Version bump and added KEYWORDS. - -*squid-2.4.6-r1 (4 May 2002) - - 4 May 2002; Donny Davies <woodchip@gentoo.org> : Added LICENSE, SLOT, $Headers, - pam_stack aware pam.d/ file. - -*squid-2.4.6 (20 Mar 2002) - - 20 Mar 2002; Donny Davies <woodchip@gentoo.org> : Be sure to upgrade! This - version fixes some security glitches in older squids! Updated to latest available - release; fixed permissions on /usr/lib/squid/*_auth programs, made the initscript - stop() function more robust, grabbed Debian's latest patch which includes tweaking - SQUID_MAXFD (works this time ;) plus other fixes. We now install the error pages - for all available languages, defaulting to English. Simply change the errors symlink - in /etc/squid to whichever you prefer. Changed the cache location to /var/cache/squid; - sorry if this bothers anybody but it fits better here and matches /etc/passwd - properly now. If you're upgrading you could make /var/cache/squid a symlink to - /var/spool/squid, or move the subdirectories manually. Heads up :) - Changed some ./configure options; enabled cache-digests, disabled the pinger - and added two more auth-modules. Added ability to compile without debugging. - Removed the stale config file and the old rc5 initscript. Also removed the older - ebuilds; they had numerous bugs. Added a pam_stack aware pam config, for future - deployment. - - 8 Feb 2002; Donny Davies <woodchip@gentoo.org> files/squid.rc6 : - Squid can often take a long time to shutdown. Tried to make things a little more - friendly in that situation. diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest deleted file mode 100644 index 6801f53..0000000 --- a/net-proxy/squid/Manifest +++ /dev/null @@ -1,36 +0,0 @@ -AUX squid-2-heimdal.patch 776 SHA256 bd0083836321c596db3fc8749152bc77d5a4bd03070d33541b7b489af59e4c25 SHA512 78ac4e930dbf4296036fff9022572e455ed7999eddfcc0b13d34da74bc1c994665fbe30f2e3322f1efa31834a555ed1dce2b3327b4d97bfd03363ae03164d410 WHIRLPOOL f8a54ea5f52968958607df7ebd467b591fbc9189de5b03d1f871b534980858348929b25f3fc3a2fb2ec968655a73e9323f2fe79d2b0b43558669714edba7996b -AUX squid-2.7.9-gentoo.patch 13118 SHA256 981588dc2d599a2b49f550a1ae111e96515b437a03c8d0dccc6f96f078009d11 SHA512 358fb2e28fc7eb9cee573c05e1becee9ad9ce0cacde106f0809ca2e12ec6ca0a1d68eab81a34879d2ca7b05adcacb33502369266b3c9eed249f2506e0c55492d WHIRLPOOL b8c62251f4d1e54d50b301ac807e9bf08d6c777432795820f993b2a4f29be7491b60c13b3200a16f79280b8e2e410c2ca34a0a5820da8493fdcceea0e3b82e59 -AUX squid-3.1.15-gentoo.patch 10538 SHA256 75549600815236932f549e1c4e0286b6cbb4dc26a7e545abb96b7d29f0128ab3 SHA512 6e2a26e7cb99664046619f3d4cb9e87998b462f7de09d6fbf4a269ccf2da758d5caad35c0ec43c5c9c5a9eb8943ecf14a0cdb67fa2a117bc3be4d9a41a920451 WHIRLPOOL 5dfce88287693fd75902b58c7d7759bd083173e8e69bf4f7c725a196a8d4d1f92e5e3e98dc7c727f01d62f5e049fe2599f6f9e02eb92c13a8bf09f8c4387dbd7 -AUX squid-3.1.18-ecap.patch 1798 SHA256 576866c7fefa8c927ea029ecdcf90851ffa24fa528f2894d73667bd6a508ce63 SHA512 d5957f1898a0cfb072b19f2bf2e3ca0c6fdf9d8421ce907df173ac2948dede62c1cd738614b79c004c36dd1b7c1f7ef4a74d2962f9ab52c497d1d73ca16284cc WHIRLPOOL f58a4fdee3af2921908fd17621977b311fc4d3a25e04857a79971811ccda337a21ff5aa8f6e9d80588120d103356c988deb8c71250be7752d1c6e930da76c609 -AUX squid-3.2.1-gentoo.patch 4418 SHA256 41da185c1af04590525fc9144c14edd160522b878efc2e62e8a992a001ad38e0 SHA512 08ba6aac7de61aaae9a96c42801dbb8e414a2b8ec7bccd80afb1973f7c9949dacee4011e54d050c7ae46a06d2914ca8a42629af5707c6810b1547e3b66ccd5c0 WHIRLPOOL 2f8ba78840e46a3b8e780b653d8084f9c0e8b4d0793f4b06cb7faf9c6ae32b193de923b411c394278747ad9574cbf317f72f97467fbca386db4c4f1bd0f1ba50 -AUX squid-3.3.4-gentoo.patch 4358 SHA256 d52c1c89c81540dfd6c464f7c4245857fdd6cc9e45568a03d4f028fe5feb8bb0 SHA512 b1bfb0a1298e30ce30681b8bcaed292a883f8153e3df61861d1dfd691c5f4d5bc4651531ac69932fcbdc74c5896ed4495d54810203d4c0674ceb49b33454f297 WHIRLPOOL 3b98a43c1cc98d20f28dd5eb096344ff80ec5de1e4e17c4a3b8fb5d89044b6090466bfd3a7e24dfb975d9e02009af900372ee8c791991921def12820a191da97 -AUX squid-3.3.9-xml2.patch 4067 SHA256 6a79556fb255ce71768e97c5493ac5de3f48bdacfabf1cabed57fe44bf27b119 SHA512 05440724d169c15bd3177af0ca4739665e3c0c0915fd51c84c06ff22a02b5a94f062ac0e56f4859cda11a5a94ad2341abe3f69de0781f26da14a8d803964707f WHIRLPOOL dc0fc9c13254788ce323474bc3d5f915a9704f2a15cc9c111fca40794c488e46e14c2645f0c060a39d7c5c1354096f340ff1394f5fe2c58fab4779b60511bf96 -AUX squid.confd 540 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec SHA512 db9a9f2d476df279e1f2c9ec6bdec42d0c4cd9117c78e2ce5876855bd91add5c01bf06d34456e9146fe70374b118ae20a8e75bf07254aa335dd3190e11c72d23 WHIRLPOOL 55863f771bb4ffc39dd809e5233bbfce994a8e4345f84d264c427b7d5d571c998b0011b71f878df2ff4d7037da250e62296f9c962a8118532e25af9297471995 -AUX squid.confd-r1 493 SHA256 214a184495a3384eb452caef435256043bc51e35140a61b1f5fdff32603c8f7e SHA512 3f92645275e077bcf36e4cd2ccb56812540276d9456bc6f68268010aac57214f0d96b0aff74dc57cbc3446705a9fae8a5bb7a07304afeea45615ebf2cf2b7ab0 WHIRLPOOL 080cfb797ddb49f7c59463eaef0db8c3a6ec5e5da949884e9ccdf54d608b22fb81971aec21fab704c832c86a8c8e3d4795a7b09456c273d7c4bbb65692a68870 -AUX squid.cron 143 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f SHA512 cec563c20799ffea8b4fb418d5015d6dc437bd38c35e7150ed01bc298dab5214132e10f4e7b8176da1966e16a7f53f423c36e8419642cb16716f5c346c30d749 WHIRLPOOL 029c94d4e4826ee612c7dc12acc088e3100c9d1737baebb74b25b6e7ac2ba78d0bab9f744c12b5de4113c9727892c9a30dd17067409ac8da62afeee552de391e -AUX squid.initd 3331 SHA256 7a81926479941054358bce650c8c9d3f070a7b40c886e5ed3a337668997bc0ab SHA512 6b5157ed3f4db52db9064a5cfcf5ce3429caf38cefbe61955154f2b6371ade5916b278b61ed01ced51cbd11e283553f7c4bde09e97c261a75a6a1da9bb1cfeb1 WHIRLPOOL bc549677659f88280e9f424deb6cd84de9d564707b949e59d425680f2f2565c7579c6a27fe09794887eef8498d5522efcb2035b81e3bfd48e2f34073438cadd4 -AUX squid.initd-logrotate 3179 SHA256 3edb51b43218b8bdf5eee0f58f03d8a0fe5c470db1e81992c036649b1b1d5f85 SHA512 a63eaa48fb41dfaa280eae7655eec3f12ab6f9f0ebd9575ac85b1d243a5b21da0df796076a6264b2a1818c700aa50d61478dfcde46302bd32ed8d9be1ccf8299 WHIRLPOOL 27968fd84b67442b24e98d774a6f4038267e614203d42705ae85866c777ed1c71361e287bf8e4cdf0ca6672601b5bdf6817cf68470fdd28de7fb7137a842e98e -AUX squid.initd-logrotate-r1 3167 SHA256 cd245c5561a9ded59d71f1e73b3c97a56e4253325dec7054435b4d07d222e9a0 SHA512 818d875560f0b85920353af9ee2337c1109d14c34d623583708a44a53169889b864a281d03aa64ef1809b11852a619eca086b632aec8360750fa8ae8d7f22e99 WHIRLPOOL c15bf7f705f1c0f9d6a714ab97c73a2793d8a0e9a15cb2cc17e717f4729ea3cd892fd8969c5ba3afeff41586f424ded077aaef3958a64a2c14584a905061f4b7 -AUX squid.initd-logrotate-r3 3133 SHA256 02a7f23a30acce6a3090b324e8c70c0f966380364f839bb0e58935a9a6820b35 SHA512 7e96f4d523d10531b546fece23cb62f073de08181ff796e744190964d1d584400855fa4fb2ad43ed966d92de0c6826efdb19f24ab453ffd3b60e600543de34fa WHIRLPOOL a82b693268afec6149c2f61c4c2c28472f6190e0e6070805f23c380c20df1729e57e0a581fdbd657332f9bf772e27a2269f855d2240952b586cfcfe1476d1089 -AUX squid.initd-r1 3319 SHA256 f38e04ba1e295e9bbb537e353823c4bd738d206f4790d024e65aacfefbfe7abb SHA512 fc60c330dfebc2ff9f964b6475d8d00fcf69211384b605b68fef95daf5adc23c0d9fe1b72d858923449f7f024e8520bb7aa17d1ffa55e40f8de2726aa234125a WHIRLPOOL 27a43a425b67fb00a654b9bb71062aac63c7c4885bbd9493341043bb7147f8f7ac89ab79e015008f9da10b0a68f00b038d1ef932f7e0c350dfc9b3fc0fd9033e -AUX squid.initd-r3 3285 SHA256 9b16b1ab2d3d3411dfcd8ac76b13a0889503ca78e3c6123814801af7577537f3 SHA512 3ec1a924922dcaf6634eda6f18e7010c722294e446aeb997fe77f539bdd1a45c7aa0551a356d9e4b90419e815cc0a2d1fa119575cdff4d0477f9bc3f8c6b8aff WHIRLPOOL 3f8c1070ffe5114de7a50f0eda2ff6d5c814eafb63942b8a80e6fab27be6ee2364676227aed18995a4151e38d7a1f51398ca31a771682ba811bc4a73831f38ed -AUX squid.logrotate 103 SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 SHA512 d75a667c3ffa32fdd938ef40df8813a467d9f10b2363107bf915cb0c99834fbe8d0eb502a18a816875b67b0db1b27806ed3caf620c38516040cb644b225f5a55 WHIRLPOOL 1cbce1fb05d4661d26f80baeafad0d3a5de1108a21eb6519775b9be2c549d1ca1b85575b72941fd246e4e9fbdf466b302b767aa7ce002f990f6ca4a9844e1e41 -AUX squid.pam 315 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f SHA512 a73c98eef2d99bfd871c192195f3c815bff1cd4fa66b87ac185fde891e5cf5fb464fe0ce376c16ac68065c53726784229ad96c24835138244eee2ca2807887c3 WHIRLPOOL e8a6345c634694ce1e21fc4d69ea059d2da9f5d3b7ad34b4a49c570161cddab615fb4ed9e274397ddd4887e4b027aa90339bb8fbb5a71f3bdf506d70cefb99c1 -DIST squid-2.7.STABLE9.tar.gz 1789462 SHA256 d54ca048313c4b64609fcdf9f1934a70fc1702032a5f04073056d7491d3dd781 -DIST squid-3.1.15.tar.gz 3397495 SHA256 c56207691ec6ce19f7d19805b290b8f58c63c81e2070d7cd3a824a0b49509b2b -DIST squid-3.1.16.tar.gz 3399527 SHA256 87fb621b2dc51b753ecfedc3b2d537b6cbfa8f29b242aeb3c055c547ed80466d -DIST squid-3.1.18.tar.gz 3401300 SHA256 6a7122514d58c3077f2b43c928864be10753d8e2c8439133dacc9eba6c45e00d -DIST squid-3.1.19.tar.gz 3403110 SHA256 1a2ebfd832364ada4793532dcc59fb79588ee3819cb80b77d8f53858f0166e34 -DIST squid-3.2.1.tar.gz 4100448 SHA256 793ba5f04f3d3797b624fe061f8be9ededdc9f68cd39c1b58df78861ed4382f7 -DIST squid-3.2.2.tar.gz 4102323 SHA256 36828bb92f5f7cb4343b5d4ceebb654c6a1a1479e75a3514fa1a509495987916 -DIST squid-3.3.9.tar.gz 4226863 SHA256 0bbb10739bcd8d3ede982246990445ff9b84348b9c5a38021c5afbfd28d9b413 SHA512 26c91d20804bf35fe36f4efdb790ef7b589383e75e6e4656d5fee6b05dc1a48b7491b4ce4d3bc8acf7f4caab8c395a43eaa84f88cd41a1d2efad529504f2ddd4 WHIRLPOOL 2f4eeee0c8376fe0bb422deda81a33470b84e871385d34129b9801fb4a5111687694c7947a4b36cdbb0dd831d69f9be966cc36bc7d60a1f52b2025c3ccd8bbeb -EBUILD squid-2.7.9.ebuild 6175 SHA256 587b0f52d2fb973f2686d947893191acf3a1770d467cd8134091fa2c07f01f3d SHA512 7e372f23f286f76dc4d32a87c207fb63cc487b08184cb570eceb68c77c8228320b7d5106789848de0797aa0e36efa9f83429a9d01d7f2e2394a4826c25cc02c7 WHIRLPOOL c96d155cd38705e09f3515d73663da6617efe2857badd8d48b8ad402f1a4f61d4a261704ff5649746a2b1bd0f5aff25dde2de78eaa49576e759e0c3ca4f9c33a -EBUILD squid-3.1.15.ebuild 6621 SHA256 911d065d38544a59af7ce6f4299fc282fdf10aa4bd0869503b45b214fdf87bbc SHA512 22cc52dfb272d500c3eb37ef73ec2d021d5ffda2166252ae2c84f7586b26ec1205cb2ba66748ae037d002764c4d820c3a9d748cf3eeecd677d4fd2e831091640 WHIRLPOOL fadf129cec7b7f49e302fe82ad2ad9461da90670feb4beab8f961f08f9ddb019218326ffd5e56cfe019441c52b52fb4d0df59b74869cce39667b4c0ebcd908de -EBUILD squid-3.1.16.ebuild 6629 SHA256 2bc745da81ed998762d82deaae18addd6fb8011b44425860b89e721b1d2e6b21 SHA512 d6a7c8482f0e09dc154314281c24bbb8365c75c983f8b0d93ef65d8448c0a2fd664b1ac98ad467f05d77effbc3d9db2dc909b122d68ac561f6d45d9464db1b88 WHIRLPOOL daffd167ca401f42c03dee621bc8825a1d53b7f38e75ca2f16e59318b30b9b4dbdffa2b8b49d27a65b9cbb0302adfce592b0e049c0e9027897f17331f84d3900 -EBUILD squid-3.1.18.ebuild 6676 SHA256 3ab64d19f8b4f3189673cacef1a4420c4181748da78baca505956f11a537ce60 SHA512 de4067f10072d3f7f6e31a3a4d41e0050730bfeaf6414fca01af114535b04531aa293c5c7745783397d709a882be9062f0ac9407b0275d7ab2c360b3f5015cbd WHIRLPOOL 0425cd30cd74d43ec1ce2519fd85c5b073da0fb78189e6cec90bf8ad5f6493d795c991863217dbc7399848aad6ee2a1462fd989d1755462a187cfc6fa12c3f75 -EBUILD squid-3.1.19.ebuild 6747 SHA256 23d265d76271b39edc321aab98a6b110943a29487d1e2de3cacee1da912ff241 SHA512 536435a72117c5d5d643827b2cb3ace5b3ae84ede684a34c68b695fbb1938c1308b6e522dc99eb6fd0b0dd6c8c92e488d85838adf03f344fe36b9a90b9ae7998 WHIRLPOOL 50e78fecdbe8b1268ceec47d2d479845a425159abf8bc41413e74f11c3a867bc2af3b02f89980cc35be07b3fc3fad3f83a7a22617159309b1d23cf63de586fad -EBUILD squid-3.2.1.ebuild 7701 SHA256 bdca64f4790e313aaea63cc5217d866171eb92bd53ce7bbecbf104a90e97fa88 SHA512 9fecf47ae6629234bce133b77a9f2ff01f0966fd5d44d3f35fbf5dbf20f3587982a6ec5c8563566eaf3bde4a5138fa6df25a5a3d467c22ad073cefe473047373 WHIRLPOOL 97f1ccae1a9dea2216d8a7e8883ece61e25d2df9b02a950785cf2dbf681ae69e7675559aa3f97064cc87341be9fb135ecda98926ad9688a8ef915859f78ca12a -EBUILD squid-3.2.2.ebuild 7604 SHA256 c1944d31f379e32e95ea954bbe6f3a9cef6096e35bc04b197f2156e881191b6a SHA512 0b4b923b085ec87216394036e1758ea78f148361274e95a2ad142ca377f8c74288d507a66f27af62845c9aed90dec6b70cd7e1810389cc4636f2991827378f86 WHIRLPOOL 371442c26ebdb3ab06f5cfab7c4074c9718a235d033865ed74a4bc6f3159a94f3d85f397b2aac3bf4313890531ef1f32f4ac7b37be230c29e456e466c967e320 -EBUILD squid-3.3.9.ebuild 7991 SHA256 4692a7cd9d1b6ec9aab04be1296588bcc77618d0734a7e02d505428fadf612a1 SHA512 1122efcf1f0c507ec7f50f0d59e2c3bc882c28cce5bc2906fe850798f71b11a5c4e6e173013b62fe4e2d894190a67bce935e2fcd3e55dfbffd1cdacff35b064c WHIRLPOOL 767a7b4deccd4399ed6ca97f766530721d283cdae32779031cecbf8801ae46f4b874a37b0b6623ee5a7f48c8a7d8ffcac9e30f1c1638a54252f26a6704f70526 -MISC ChangeLog 71409 SHA256 69acc9c137d52de40f32ca87ee526a8ee648eedc1810b514d0d67a86932fb95a SHA512 77da22ad2f29f713fc77595e4fc61af82fb66d86c473711fffe03f0282106e8ae34c4a492a92cd5aad4bb6a9bdebf55a2c1595079a927914ae9d51bb81bb93b7 WHIRLPOOL aa9b7b6b57e690c8ea25d1ae366fcb72703032e5ba3bea5f2db8c3b633491856e17578ece1b7ed1a7f94cf6aedb35f0661fb57a0ec0af4eba6f987a3b8fb6c82 -MISC metadata.xml 1015 SHA256 06d8e8a7909b9140eb2e70193db754b84d864da260d6cdf9bde9fa58442ce34a SHA512 59474edefd493e948d94b7a20332d35028244d382fab9c3b9a2297f1fb7a1323af50d474f162554b39fc50230f04dabe8633fbeb6386e0a14d8e93623be5be1d WHIRLPOOL 5a5816a9789983a1cbcfa098e8d8bb37f5c723c7ec1ac3d4c146b85b4e963b0118aea4e3fa6781f197c9c4013ddc9263aa6266c489da323b0bb69f8c6c1f8bdf diff --git a/net-proxy/squid/files/squid-2-heimdal.patch b/net-proxy/squid/files/squid-2-heimdal.patch deleted file mode 100644 index 67500ae..0000000 --- a/net-proxy/squid/files/squid-2-heimdal.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am ---- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2007-05-14 23:36:29.000000000 +0000 -+++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2009-02-16 23:26:28.000000000 +0000 -@@ -18,10 +18,10 @@ - #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) - - # HEIMDAL --#KERBINC = -DHEIMDAL -I/usr/include/heimdal --#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken -+KERBINC = -DHEIMDAL -I/usr/include/heimdal -+KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken - - # MIT --KERBINC = --KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err -+#KERBINC = -+#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err - diff --git a/net-proxy/squid/files/squid-2.7.9-gentoo.patch b/net-proxy/squid/files/squid-2.7.9-gentoo.patch deleted file mode 100644 index 8a079a5..0000000 --- a/net-proxy/squid/files/squid-2.7.9-gentoo.patch +++ /dev/null @@ -1,319 +0,0 @@ -diff -Nru squid-2.7.STABLE9.orig/configure.in squid-2.7.STABLE9/configure.in ---- squid-2.7.STABLE9.orig/configure.in 2010-03-17 01:10:12.000000000 +0100 -+++ squid-2.7.STABLE9/configure.in 2010-08-07 06:48:37.000000000 +0200 -@@ -18,9 +18,9 @@ - PRESET_LDFLAGS="$LDFLAGS" - - dnl Set default LDFLAGS --if test -z "$LDFLAGS"; then -- LDFLAGS="-g" --fi -+dnl if test -z "$LDFLAGS"; then -+dnl LDFLAGS="-g" -+dnl fi - - dnl Check for GNU cc - AC_PROG_CC -diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/confload.c squid-2.7.STABLE9/helpers/basic_auth/MSNT/confload.c ---- squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 21:09:48.000000000 +0200 -+++ squid-2.7.STABLE9/helpers/basic_auth/MSNT/confload.c 2010-08-07 06:48:37.000000000 +0200 -@@ -24,7 +24,7 @@ - - /* Path to configuration file */ - #ifndef SYSCONFDIR --#define SYSCONFDIR "/usr/local/squid/etc" -+#define SYSCONFDIR "/etc/squid" - #endif - #define CONFIGFILE SYSCONFDIR "/msntauth.conf" - -diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.7.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-2.7.STABLE9.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 20:44:28.000000000 +0200 -+++ squid-2.7.STABLE9/helpers/basic_auth/MSNT/msntauth.conf.default 2010-08-07 06:48:37.000000000 +0200 -@@ -8,6 +8,6 @@ - server other_PDC other_BDC otherdomain - - # Denied and allowed users. Comment these if not needed. --#denyusers /usr/local/squid/etc/msntauth.denyusers --#allowusers /usr/local/squid/etc/msntauth.allowusers -+#denyusers /etc/squid/msntauth.denyusers -+#allowusers /etc/squid/msntauth.allowusers - -diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am squid-2.7.STABLE9/helpers/basic_auth/SMB/Makefile.am ---- squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 18:56:26.000000000 +0200 -+++ squid-2.7.STABLE9/helpers/basic_auth/SMB/Makefile.am 2010-08-07 06:48:37.000000000 +0200 -@@ -14,7 +14,7 @@ - ## FIXME: autoconf should test for the samba path. - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX=/usr/local/samba -+SAMBAPREFIX=/usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -Nru squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.7.STABLE9/helpers/basic_auth/SMB/smb_auth.sh ---- squid-2.7.STABLE9.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 00:36:46.000000000 +0100 -+++ squid-2.7.STABLE9/helpers/basic_auth/SMB/smb_auth.sh 2010-08-07 06:48:37.000000000 +0200 -@@ -24,7 +24,7 @@ - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ - addropt="" - fi - echo "Query address options: $addropt" --dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff -Nru squid-2.7.STABLE9.orig/helpers/external_acl/session/squid_session.8 squid-2.7.STABLE9/helpers/external_acl/session/squid_session.8 ---- squid-2.7.STABLE9.orig/helpers/external_acl/session/squid_session.8 2007-01-06 18:28:35.000000000 +0100 -+++ squid-2.7.STABLE9/helpers/external_acl/session/squid_session.8 2010-08-07 06:48:37.000000000 +0200 -@@ -35,7 +35,7 @@ - .P - Configuration example using the default automatic mode - .IP --external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session -+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session - .IP - acl session external session - .IP -diff -Nru squid-2.7.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-2.7.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-2.7.STABLE9.orig/helpers/external_acl/unix_group/squid_unix_group.8 2006-05-14 17:07:24.000000000 +0200 -+++ squid-2.7.STABLE9/helpers/external_acl/unix_group/squid_unix_group.8 2010-08-07 06:48:37.000000000 +0200 -@@ -27,7 +27,7 @@ - This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 - matches users in group2 or group3 - .IP --external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p -+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p - .IP - acl usergroup1 external unix_group group1 - .IP -diff -Nru squid-2.7.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/do.sh ---- squid-2.7.STABLE9.orig/helpers/negotiate_auth/squid_kerb_auth/do.sh 2007-06-25 00:23:18.000000000 +0200 -+++ squid-2.7.STABLE9/helpers/negotiate_auth/squid_kerb_auth/do.sh 2010-08-07 06:48:37.000000000 +0200 -@@ -7,7 +7,7 @@ - # - CC=gcc - #CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow -O2" --CFLAGS="-Wall -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2" -+CFLAGS="-Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wshadow -O2" - if [ "$1" = "HEIMDAL" ]; then - DEFINE="-DHEIMDAL -D__LITTLE_ENDIAN__" - INCLUDE="-I/usr/include/heimdal -Ispnegohelp" -diff -Nru squid-2.7.STABLE9.orig/src/access_log.c squid-2.7.STABLE9/src/access_log.c ---- squid-2.7.STABLE9.orig/src/access_log.c 2008-03-18 03:48:43.000000000 +0100 -+++ squid-2.7.STABLE9/src/access_log.c 2010-08-07 06:48:37.000000000 +0200 -@@ -1261,7 +1261,7 @@ - LogfileStatus = LOG_ENABLE; - } - #if HEADERS_LOG -- headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0); -+ headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0); - assert(NULL != headerslog); - #endif - #if FORW_VIA_DB -diff -Nru squid-2.7.STABLE9.orig/src/cf.data.pre squid-2.7.STABLE9/src/cf.data.pre ---- squid-2.7.STABLE9.orig/src/cf.data.pre 2009-11-09 23:38:57.000000000 +0100 -+++ squid-2.7.STABLE9/src/cf.data.pre 2010-08-07 06:48:37.000000000 +0200 -@@ -678,6 +678,8 @@ - acl Safe_ports port 488 # gss-http - acl Safe_ports port 591 # filemaker - acl Safe_ports port 777 # multiling http -+acl Safe_ports port 901 # SWAT -+acl purge method PURGE - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -711,6 +713,9 @@ - # Only allow cachemgr access from localhost - http_access allow manager localhost - http_access deny manager -+# Only allow purge requests from localhost -+http_access allow purge localhost -+http_access deny purge - # Deny requests to unknown ports - http_access deny !Safe_ports - # Deny CONNECT to other than SSL ports -@@ -728,6 +733,9 @@ - # from where browsing should be allowed - http_access allow localnet - -+# Allow the localhost to have access by default -+http_access allow localhost -+ - # And finally deny all other access to this proxy - http_access deny all - NOCOMMENT_END -@@ -3754,11 +3762,11 @@ - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster". -+ mail if the cache dies. The default is "root". - DOC_END - - NAME: mail_from -@@ -3787,12 +3795,12 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: squid - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real - UID/GID to the user specified below. The default is to change -- to UID to nobody. If you define cache_effective_user, but not -+ to UID to squid. If you define cache_effective_user, but not - cache_effective_group, Squid sets the GID to the effective - user's default group ID (taken from the password file) and - supplementary group list from the from groups membership of -@@ -4429,12 +4437,12 @@ - NAME: snmp_port - TYPE: ushort - LOC: Config.Port.snmp --DEFAULT: 3401 -+DEFAULT: 0 - IFDEF: SQUID_SNMP - DOC_START - Squid can now serve statistics and status information via SNMP. -- By default it listens to port 3401 on the machine. If you don't -- wish to use SNMP, set this to "0". -+ By default snmp_port is disabled. If you wish to use SNMP, -+ set this to "3401" (or any other number you like). - DOC_END - - NAME: snmp_access -@@ -4505,12 +4513,12 @@ - NAME: htcp_port - IFDEF: USE_HTCP - TYPE: ushort --DEFAULT: 4827 -+DEFAULT: 0 - LOC: Config.Port.htcp - DOC_START - The port number where Squid sends and receives HTCP queries to -- and from neighbor caches. Default is 4827. To disable use -- "0". -+ and from neighbor caches. To turn it on you want to set it to -+ 4827. By default it is set to "0" (disabled). - DOC_END - - NAME: log_icp_queries -@@ -5407,6 +5415,9 @@ - If you disable this, it will appear as - - X-Forwarded-For: unknown -+NOCOMMENT_START -+forwarded_for off -+NOCOMMENT_END - DOC_END - - NAME: cachemgr_passwd -diff -Nru squid-2.7.STABLE9.orig/src/client_side.c squid-2.7.STABLE9/src/client_side.c ---- squid-2.7.STABLE9.orig/src/client_side.c 2010-02-14 01:46:25.000000000 +0100 -+++ squid-2.7.STABLE9/src/client_side.c 2010-08-07 06:48:37.000000000 +0200 -@@ -4698,14 +4698,7 @@ - debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port); - } else { - if (do_debug(83, 4)) { -- /* Write out the SSL session details.. actually the call below, but -- * OpenSSL headers do strange typecasts confusing GCC.. */ -- /* PEM_write_SSL_SESSION(debug_log, SSL_get_session(ssl)); */ --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x00908000L -- PEM_ASN1_write((i2d_of_void *) i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); --#else - PEM_ASN1_write(i2d_SSL_SESSION, PEM_STRING_SSL_SESSION, debug_log, (char *) SSL_get_session(ssl), NULL, NULL, 0, NULL, NULL); --#endif - /* Note: This does not automatically fflush the log file.. */ - } - debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port); -diff -Nru squid-2.7.STABLE9.orig/src/defines.h squid-2.7.STABLE9/src/defines.h ---- squid-2.7.STABLE9.orig/src/defines.h 2009-06-26 00:49:28.000000000 +0200 -+++ squid-2.7.STABLE9/src/defines.h 2010-08-07 06:48:37.000000000 +0200 -@@ -259,7 +259,7 @@ - - /* were to look for errors if config path fails */ - #ifndef DEFAULT_SQUID_ERROR_DIR --#define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" -+#define DEFAULT_SQUID_ERROR_DIR "/usr/share/squid/errors/English" - #endif - - /* gb_type operations */ -diff -Nru squid-2.7.STABLE9.orig/src/main.c squid-2.7.STABLE9/src/main.c ---- squid-2.7.STABLE9.orig/src/main.c 2010-03-07 16:58:56.000000000 +0100 -+++ squid-2.7.STABLE9/src/main.c 2010-08-07 06:48:37.000000000 +0200 -@@ -376,6 +376,22 @@ - asnFreeMemory(); - } - -+#if USE_UNLINKD -+static int -+needUnlinkd(void) -+{ -+ int i; -+ int r = 0; -+ for (i = 0; i < Config.cacheSwap.n_configured; i++) { -+ if (strcmp(Config.cacheSwap.swapDirs[i].type, "ufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "aufs") == 0 || -+ strcmp(Config.cacheSwap.swapDirs[i].type, "diskd") == 0) -+ r++; -+ } -+ return r; -+} -+#endif -+ - static void - mainReconfigure(void) - { -@@ -614,7 +630,7 @@ - - if (!configured_once) { - #if USE_UNLINKD -- unlinkdInit(); -+ if (needUnlinkd()) unlinkdInit(); - #endif - urlInitialize(); - cachemgrInit(); -@@ -637,6 +653,9 @@ - #if USE_WCCPv2 - wccp2Init(); - #endif -+#if USE_UNLINKD -+ if (needUnlinkd()) unlinkdInit(); -+#endif - serverConnectionsOpen(); - neighbors_init(); - if (Config.chroot_dir) -diff -Nru squid-2.7.STABLE9.orig/src/Makefile.am squid-2.7.STABLE9/src/Makefile.am ---- squid-2.7.STABLE9.orig/src/Makefile.am 2010-03-14 21:25:55.000000000 +0100 -+++ squid-2.7.STABLE9/src/Makefile.am 2010-08-07 06:48:37.000000000 +0200 -@@ -339,13 +339,13 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid - DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/net-proxy/squid/files/squid-3.1.15-gentoo.patch b/net-proxy/squid/files/squid-3.1.15-gentoo.patch deleted file mode 100644 index 09c9600..0000000 --- a/net-proxy/squid/files/squid-3.1.15-gentoo.patch +++ /dev/null @@ -1,289 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 23922c0..f359a00 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,9 +16,9 @@ PRESET_CFLAGS="$CFLAGS" - PRESET_LDFLAGS="$LDFLAGS" - - dnl Set default LDFLAGS --if test -z "$LDFLAGS"; then -- LDFLAGS="-g" --fi -+dnl if test -z "$LDFLAGS"; then -+dnl LDFLAGS="-g" -+dnl fi - - dnl Check for GNU cc - AC_PROG_CC -diff --git a/helpers/basic_auth/MSNT/confload.c b/helpers/basic_auth/MSNT/confload.c -index e04365e..7241b3f 100644 ---- a/helpers/basic_auth/MSNT/confload.c -+++ b/helpers/basic_auth/MSNT/confload.c -@@ -27,7 +27,7 @@ - - /* Path to configuration file */ - #ifndef SYSCONFDIR --#define SYSCONFDIR "/usr/local/squid/etc" -+#define SYSCONFDIR "/etc/squid" - #endif - #define CONFIGFILE SYSCONFDIR "/msntauth.conf" - -diff --git a/helpers/basic_auth/MSNT/msntauth.conf.default b/helpers/basic_auth/MSNT/msntauth.conf.default -index 323bc1c..c3d7d21 100644 ---- a/helpers/basic_auth/MSNT/msntauth.conf.default -+++ b/helpers/basic_auth/MSNT/msntauth.conf.default -@@ -8,6 +8,6 @@ server my_PDC my_BDC my_NTdomain - server other_PDC other_BDC otherdomain - - # Denied and allowed users. Comment these if not needed. --#denyusers /usr/local/squid/etc/msntauth.denyusers --#allowusers /usr/local/squid/etc/msntauth.allowusers -+#denyusers /etc/squid/msntauth.denyusers -+#allowusers /etc/squid/msntauth.allowusers - -diff --git a/helpers/basic_auth/SMB/smb_auth.sh b/helpers/basic_auth/SMB/smb_auth.sh -index 2a1abb3..b3ebb7a 100755 ---- a/helpers/basic_auth/SMB/smb_auth.sh -+++ b/helpers/basic_auth/SMB/smb_auth.sh -@@ -24,7 +24,7 @@ read NMBCAST - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ else - addropt="" - fi - echo "Query address options: $addropt" --dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff --git a/helpers/external_acl/session/squid_session.8 b/helpers/external_acl/session/squid_session.8 -index 7808f41..d86e320 100644 ---- a/helpers/external_acl/session/squid_session.8 -+++ b/helpers/external_acl/session/squid_session.8 -@@ -35,7 +35,7 @@ the first request. - .P - Configuration example using the default automatic mode - .IP --external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session -+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session - .IP - acl session external session - .IP -diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8 -index 72aa1a3..cde5f20 100644 ---- a/helpers/external_acl/unix_group/squid_unix_group.8 -+++ b/helpers/external_acl/unix_group/squid_unix_group.8 -@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated) - This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 - matches users in group2 or group3 - .IP --external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p -+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p - .IP - acl usergroup1 external unix_group group1 - .IP -diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -index e78f61e..ca6c0c2 100644 ---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac -+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -@@ -17,6 +17,7 @@ dnl Process this file with autoconf to produce a configure script. - - AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com]) - AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) -+AM_MAINTAINER_MODE - AC_CONFIG_SRCDIR([squid_kerb_auth.c]) - - AC_PROG_CC -diff --git a/src/Makefile.am b/src/Makefile.am -index e1c0be4..423553e 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -639,7 +639,6 @@ BUILT_SOURCES = \ - - sysconf_DATA = \ - squid.conf.default \ -- squid.conf.documented \ - mime.conf.default - - data_DATA = \ -@@ -724,9 +724,9 @@ - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log - DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) --DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache --DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db -+DEFAULT_NETDB_FILE = $(localstatedir)/run//netdb.state -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid -+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` -@@ -802,13 +801,11 @@ install-data-local: install-sysconfDATA install-dataDATA - @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ - echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ - else \ -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ -+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ - fi -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ -- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ -- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ -+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ -+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \ - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \ - $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PID_FILE)` -diff --git a/src/cf.data.pre b/src/cf.data.pre -index b504918..56928c4 100644 ---- a/src/cf.data.pre -+++ b/src/cf.data.pre -@@ -768,6 +768,7 @@ acl Safe_ports port 280 # http-mgmt - acl Safe_ports port 488 # gss-http - acl Safe_ports port 591 # filemaker - acl Safe_ports port 777 # multiling http -+acl Safe_ports port 901 # SWAT - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -917,6 +918,9 @@ http_access deny CONNECT !SSL_ports - http_access allow localnet - http_access allow localhost - -+# Allow the localhost to have access by default -+http_access allow localhost -+ - # And finally deny all other access to this proxy - http_access deny all - NOCOMMENT_END -@@ -4138,11 +4142,11 @@ COMMENT_END - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster." -+ mail if the cache dies. The default is "root." - DOC_END - - NAME: mail_from -@@ -6456,7 +6460,7 @@ DOC_END - NAME: forwarded_for - COMMENT: on|off|transparent|truncate|delete - TYPE: string --DEFAULT: on -+DEFAULT: delete - LOC: opt_forwarded_for - DOC_START - If set to "on", Squid will append your client's IP address -diff --git a/src/debug.cc b/src/debug.cc -index 32813bf..6de334a 100644 ---- a/src/debug.cc -+++ b/src/debug.cc -@@ -452,7 +452,7 @@ _db_init(const char *logfile, const char *options) - #if HAVE_SYSLOG && defined(LOG_LOCAL4) - - if (Debug::log_syslog) -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); - - #endif /* HAVE_SYSLOG */ - -diff --git a/src/main.cc b/src/main.cc -index 941126d..71f3c3b 100644 ---- a/src/main.cc -+++ b/src/main.cc -@@ -1555,7 +1555,7 @@ watch_child(char *argv[]) - if (*(argv[0]) == '(') - return; - -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); - - if ((pid = fork()) < 0) - syslog(LOG_ALERT, "fork failed: %s", xstrerror()); -@@ -1599,7 +1599,7 @@ watch_child(char *argv[]) - - if ((pid = fork()) == 0) { - /* child */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); - prog = xstrdup(argv[0]); - argv[0] = xstrdup("(squid)"); - execvp(prog, argv); -@@ -1607,7 +1607,7 @@ watch_child(char *argv[]) - } - - /* parent */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); - - syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); - -commit e3f6cc6438869766751556f2d9747669b4c51fe1 -Author: Eray Aslan <eras@gentoo.org> -Date: Fri Apr 29 10:55:17 2011 +0000 - - Do not auto detect kerberos. - - No need for automagic dependencies. We already give the necessary flags - to the configure script. - -diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.ac b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -index e78f61e..dc739b2 100644 ---- a/helpers/negotiate_auth/squid_kerb_auth/configure.ac -+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.ac -@@ -279,40 +279,6 @@ AC_ARG_ENABLE(seam-64, - check_seam_64 - fi ]) - --dnl Define system default --if test "$enable_arg" = "no"; then -- dnl Autodetect system -- dnl Check krb5-config first -- AC_CHECK_PROG(ac_krb5_config,krb5-config,yes,no) -- case $sys in -- Linux) rpm -q heimdal-lib >/dev/null 2>&1 -- if test $? = 0 ; then -- check_heimdal -- else -- check_mit -- fi -- ;; -- AIX) lslpp -L krb5.client.rte >/dev/null 2>&1 -- if test $? = 0 ; then -- check_nas -- else -- check_mit -- fi -- ;; -- SunOS) pkginfo SUNWgss >/dev/null 2>&1 -- if test $? = 0 ; then -- check_seam -- else -- check_mit -- fi -- ;; -- FreeBSD) check_heimdal -- ;; -- *) check_mit -- ;; -- esac --fi -- - AC_C_BIGENDIAN - - AC_CHECK_HEADERS( \ diff --git a/net-proxy/squid/files/squid-3.1.18-ecap.patch b/net-proxy/squid/files/squid-3.1.18-ecap.patch deleted file mode 100644 index 41f716a..0000000 --- a/net-proxy/squid/files/squid-3.1.18-ecap.patch +++ /dev/null @@ -1,50 +0,0 @@ ------------------------------------------------------------- -revno: 10415 -revision-id: squid3@treenet.co.nz-20111206123135-sm3zauds1twjh9ls -parent: squid3@treenet.co.nz-20111203061825-aslncq2igkzd88hy -fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3440 -author: Joshua Root <josh+squid@root.id.au> -committer: Amos Jeffries <squid3@treenet.co.nz> -branch nick: SQUID_3_1 -timestamp: Tue 2011-12-06 05:31:35 -0700 -message: - Bug 3440: compile error in Adaptation ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3@treenet.co.nz-20111206123135-sm3zauds1twjh9ls -# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ -# /SQUID_3_1/ -# testament_sha1: 42421665894427e4edfaa3f8bfcee9a9a3ce9dab -# timestamp: 2011-12-06 12:33:05 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ -# /SQUID_3_1 -# base_revision_id: squid3@treenet.co.nz-20111203061825-\ -# aslncq2igkzd88hy -# -# Begin patch -=== modified file 'src/Store.h' ---- a/src/Store.h 2011-12-02 12:17:07 +0000 -+++ b/src/Store.h 2011-12-06 12:31:35 +0000 -@@ -191,7 +191,7 @@ - - #if USE_ADAPTATION - /// call back producer when more buffer space is available -- void deferProducer(const AsyncCall::Pointer &producer); -+ void deferProducer(AsyncCall::Pointer &producer); - /// calls back producer registered with deferProducer - void kickProducer(); - #endif - -=== modified file 'src/store.cc' ---- a/src/store.cc 2011-12-02 12:17:07 +0000 -+++ b/src/store.cc 2011-12-06 12:31:35 +0000 -@@ -368,7 +368,7 @@ - - #if USE_ADAPTATION - void --StoreEntry::deferProducer(const AsyncCall::Pointer &producer) -+StoreEntry::deferProducer(AsyncCall::Pointer &producer) - { - if (!deferredProducer) - deferredProducer = producer; - diff --git a/net-proxy/squid/files/squid.confd b/net-proxy/squid/files/squid.confd deleted file mode 100644 index 67956bf..0000000 --- a/net-proxy/squid/files/squid.confd +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.confd,v 1.3 2009/10/25 08:35:46 mrness Exp $ - -# Config file for /etc/init.d/squid - -SQUID_OPTS="-YC" - -# Max. number of filedescriptors to use. You can increase this on a busy -# cache to a maximum of (currently) 8192 filedescriptors. Default is 1024. -SQUID_MAXFD=1024 - -# Kerberos keytab file to use. This is required if you enable kerberos authentication. -SQUID_KEYTAB="" diff --git a/net-proxy/squid/files/squid.cron b/net-proxy/squid/files/squid.cron deleted file mode 100644 index 8726ddd..0000000 --- a/net-proxy/squid/files/squid.cron +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -if test -e /var/run/squid.pid ; then - test -n "$(cat /var/run/squid.pid|xargs ps -p|grep squid)" && \ - /usr/sbin/squid -k rotate -fi diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd deleted file mode 100644 index 78589b0..0000000 --- a/net-proxy/squid/files/squid.initd +++ /dev/null @@ -1,129 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.14 2011/10/23 18:45:39 polynomial-c Exp $ - -extra_started_commands="reload rotate" - -depend() { - use dns - need net -} - -upprocval() { - [ -f $1 ] || return 0 - if [ `cat $1` -lt $2 ]; then - echo $2 > $1 - fi -} - -# Try to increase the # of filedescriptors we can open. -maxfds() { - [ -n "$SQUID_MAXFD" ] || return - [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 - local minimal_file_max=$(($SQUID_MAXFD + 4096)) - upprocval /proc/sys/fs/file-max $minimal_file_max - if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then - upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max - fi - ulimit -n $SQUID_MAXFD -} - -checkconfig() { - if [ ! -f /etc/squid/${SVCNAME}.conf ]; then - eerror "You need to create /etc/squid/${SVCNAME}.conf first." - eerror "An example can be found in /etc/squid/squid.conf.default" - return 1 - fi - - local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) - [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid - if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then - eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" - eerror " /var/run/${SVCNAME}.pid" - eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" - eerror " in any other instance of squid." - return 1 - fi - - maxfds - - local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) - [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" - - local x - for x in $CACHE_SWAP ; do - if [ ! -e $x ] ; then - ebegin "Initializing cache directory ${x%/*}" - local ORIG_UMASK=$(umask) - umask 027 - - if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then - eend 1 - return 1 - fi - - local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" - if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then - umask $ORIG_UMASK - eend 1 - echo "$INIT_CACHE_RESPONSE" - return 1 - fi - - umask $ORIG_UMASK - eend 0 - break - fi - done - - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf - eend $? && sleep 1 -} - -stop() { - ebegin "Stopping ${SVCNAME}" - if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then - # Now we have to wait until squid has _really_ stopped. - sleep 1 - if [ -f /var/run/${SVCNAME}.pid ] ; then - einfon "Waiting for squid to shutdown ." - cnt=0 - while [ -f /var/run/${SVCNAME}.pid ] ; do - cnt=$(expr $cnt + 1) - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - break - fi - sleep 2 - echo -n "." - done - echo - fi - else - eerror "Squid shutdown failed, probably service is already down." - fi - eend 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf - eend $? -} - -rotate() { - service_started ${SVCNAME} || return 1 - ebegin "Rotating ${SVCNAME} logs" - /usr/sbin/squid -k rotate -f /etc/squid/${SVCNAME}.conf - eend $? -} diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate deleted file mode 100644 index 3c50121..0000000 --- a/net-proxy/squid/files/squid.initd-logrotate +++ /dev/null @@ -1,122 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.12 2012/01/02 20:05:25 polynomial-c Exp $ - -extra_started_commands="reload" - -depend() { - use dns - need net -} - -upprocval() { - [ -f $1 ] || return 0 - if [ `cat $1` -lt $2 ]; then - echo $2 > $1 - fi -} - -# Try to increase the # of filedescriptors we can open. -maxfds() { - [ -n "$SQUID_MAXFD" ] || return - [ $SQUID_MAXFD -le 8192 ] || SQUID_MAXFD=8192 - local minimal_file_max=$(($SQUID_MAXFD + 4096)) - upprocval /proc/sys/fs/file-max $minimal_file_max - if /usr/sbin/squid -v | grep -q "\--enable-epoll" ; then - upprocval /proc/sys/fs/epoll/max_user_watches $minimal_file_max - fi - ulimit -n $SQUID_MAXFD -} - -checkconfig() { - if [ ! -f /etc/squid/${SVCNAME}.conf ]; then - eerror "You need to create /etc/squid/${SVCNAME}.conf first." - eerror "An example can be found in /etc/squid/squid.conf.default" - return 1 - fi - - local PIDFILE=$(awk '/^[ \t]*pid_filename[ \t]+/ { print $2 }' < /etc/squid/${SVCNAME}.conf) - [ -z ${PIDFILE} ] && PIDFILE=/var/run/squid.pid - if [ /var/run/${SVCNAME}.pid != ${PIDFILE} ]; then - eerror "/etc/squid/${SVCNAME}.conf must set pid_filename to" - eerror " /var/run/${SVCNAME}.pid" - eerror "CAUTION: http_port, cache_dir and *_log parameters must be different than" - eerror " in any other instance of squid." - return 1 - fi - - maxfds - - local CACHE_SWAP=$(awk '/^[ \t]*cache_dir[ \t]+/ { if ($2 == "coss" ) printf "%s/stripe ", $3 ; else printf "%s/00 ", $3; }' < /etc/squid/${SVCNAME}.conf) - [ -z "$CACHE_SWAP" ] && CACHE_SWAP="/var/cache/squid/00" - - local x - for x in $CACHE_SWAP ; do - if [ ! -e $x ] ; then - ebegin "Initializing cache directory ${x%/*}" - local ORIG_UMASK=$(umask) - umask 027 - - if ! (mkdir -p ${x%/*} && chown squid ${x%/*}) ; then - eend 1 - return 1 - fi - - local INIT_CACHE_RESPONSE="$(/usr/sbin/squid -z -N -f /etc/squid/${SVCNAME}.conf 2>&1)" - if [ $? != 0 ] || echo "$INIT_CACHE_RESPONSE" | grep -q "erminated abnormally" ; then - umask $ORIG_UMASK - eend 1 - echo "$INIT_CACHE_RESPONSE" - return 1 - fi - - umask $ORIG_UMASK - eend 0 - break - fi - done - - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf - eend $? && sleep 1 -} - -stop() { - ebegin "Stopping ${SVCNAME}" - if /usr/sbin/squid -k shutdown -f /etc/squid/${SVCNAME}.conf ; then - # Now we have to wait until squid has _really_ stopped. - sleep 1 - if [ -f /var/run/${SVCNAME}.pid ] ; then - einfon "Waiting for squid to shutdown ." - cnt=0 - while [ -f /var/run/${SVCNAME}.pid ] ; do - cnt=$(expr $cnt + 1) - if [ $cnt -gt 60 ] ; then - # Waited 120 seconds now. Fail. - echo - eend 1 "Failed." - break - fi - sleep 2 - echo -n "." - done - echo - fi - else - eerror "Squid shutdown failed, probably service is already down." - fi - eend 0 -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - /usr/sbin/squid -k reconfigure -f /etc/squid/${SVCNAME}.conf - eend $? -} diff --git a/net-proxy/squid/files/squid.logrotate b/net-proxy/squid/files/squid.logrotate deleted file mode 100644 index 5bf2896..0000000 --- a/net-proxy/squid/files/squid.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/squid/*.log { - copytruncate - compress - notifempty - missingok - sharedscripts -} - diff --git a/net-proxy/squid/files/squid.pam b/net-proxy/squid/files/squid.pam deleted file mode 100644 index 5309b80..0000000 --- a/net-proxy/squid/files/squid.pam +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.pam,v 1.3 2007/09/23 09:23:41 mrness Exp $ -auth required pam_nologin.so -auth include system-auth -account include system-auth -password include system-auth -session optional pam_limits.so -session include system-auth diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml deleted file mode 100644 index 0a336bf..0000000 --- a/net-proxy/squid/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>net-proxy</herd> -<longdescription>A full-featured web proxy cache</longdescription> -<use> - <flag name='epoll'>Enables Linux epoll() support</flag> - <flag name='ecap'>Adds support for loadable content adaptation modules - (http://www.e-cap.org)</flag> - <flag name='icap-client'>Adds ICAP client support</flag> - <flag name='ipf-transparent'>Adds transparent proxy support for systems - using IP-Filter (only for *bsd)</flag> - <flag name='logrotate'>Use <pkg>app-admin/logrotate</pkg> for rotating - logs</flag> - <flag name='kqueue'>Enables *BSD kqueue() support</flag> - <flag name='pf-transparent'>Adds transparent proxy support for systems using - PF (only for *bsd)</flag> - <flag name='tproxy'>Enables real Transparent Proxy support for Linux Netfilter - TPROXY</flag> - <flag name='zero-penalty-hit'>Add Zero Penalty Hit patch - (http://zph.bratcheda.org)</flag> -</use> -</pkgmetadata> diff --git a/net-proxy/squid/squid-2.7.9.ebuild b/net-proxy/squid/squid-2.7.9.ebuild deleted file mode 100644 index 14b8e41..0000000 --- a/net-proxy/squid/squid-2.7.9.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-2.7.9.ebuild,v 1.7 2010/10/01 14:54:33 ranger Exp $ - -EAPI="2" - -inherit eutils pam toolchain-funcs autotools - -#lame archive versioning scheme.. -S_PMV="${PV%%.*}" -S_PV="${PV%.*}" -S_PL="${PV##*.}" -S_PL="${S_PL/_rc/-RC}" -S_PP="${PN}-${S_PV}.STABLE${S_PL}" - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v${S_PMV}/${S_PV}/${S_PP}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="caps pam ldap samba sasl kerberos nis ssl snmp selinux logrotate \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll tproxy" - -DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -RDEPEND="${DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -S="${WORKDIR}/${S_PP}" - -pkg_setup() { - if use tproxy && ! use caps; then - eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!" - eerror "Please enable caps USE flag and try again." - - die "invalid combination of USE flags" - fi - - if use zero-penalty-hit; then - ewarn "This version supports natively IP TOS/Priority mangling," - ewarn "but it does not support zph_preserve_miss_tos." - ewarn "If you need that, please use >=${CATEGORY}/${PN}-3 ." - fi - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - has_version app-crypt/mit-krb5 || epatch "${FILESDIR}"/${PN}-2-heimdal.patch - eautoreconf -} - -src_configure() { - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="SMB,${ntlm_helpers}" - - local negotiate_helpers= - use kerberos && local negotiate_helpers="squid_kerb_auth" - - local myconf="" - - # Support for uclibc #61175 - if use elibc_uclibc; then - myconf="${myconf} --enable-storeio=ufs,diskd,aufs,null" - myconf="${myconf} --disable-async-io" - else - myconf="${myconf} --enable-storeio=ufs,diskd,coss,aufs,null" - myconf="${myconf} --enable-async-io" - fi - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter - $(use_enable tproxy linux-tproxy) - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --datadir=/usr/share/squid \ - --enable-auth="basic,digest,ntlm,negotiate" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="password" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-ident-lookups \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-pthreads \ - --with-large-files \ - --enable-htcp \ - --enable-carp \ - --enable-follow-x-forwarded-for \ - --with-maxfd=8192 \ - $(use_with libcap) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - ${myconf} || die "econf failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/pam_auth - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - ewarn "Squid authentication helpers have been installed suid root." - ewarn "This allows shadow based authentication (see bug #52977 for more)." - echo - ewarn "Be careful what type of cache_dir you select!" - ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" - ewarn "when there isn't sufficient traffic to keep squid reasonably busy." - ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." - echo - ewarn "Squid can be configured to run in transparent mode like this:" - ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" -} diff --git a/net-proxy/squid/squid-3.1.15.ebuild b/net-proxy/squid/squid-3.1.15.ebuild deleted file mode 100644 index 96dffd2..0000000 --- a/net-proxy/squid/squid-3.1.15.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.15.ebuild,v 1.5 2011/09/03 13:22:40 armin76 Exp $ - -EAPI=4 - -inherit eutils pam toolchain-funcs autotools linux-info - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap icap-client \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll tproxy" - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - sys-apps/ed - test? ( dev-util/cppunit )" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -REQUIRED_USE="tproxy? ( caps )" - -pkg_pretend() { - if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then - eerror "coss store IO has been disabled by upstream due to stability issues!" - eerror "If you want to install this version, switch the store type to something else" - eerror "before attempting to install this version again." - - die "/etc/squid/squid.conf: cache_dir uses a disabled store type" - fi - - if use tproxy; then - echo - elog "Checking kernel configuration for full Tproxy4 support" - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" - linux-info_pkg_setup - echo - fi -} - -pkg_setup() { - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - eautoreconf -} - -src_configure() { - local myconf="" - - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - use radius && basic_modules="squid_radius_auth,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local digest_modules="password" - use ldap && digest_modules="ldap,${digest_modules}" - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" - - local negotiate_helpers= - if use kerberos; then - negotiate_helpers="squid_kerb_auth" - if has_version app-crypt/mit-krb5; then - myconf="--enable-mit --disable-heimdal" - elif has_version app-crypt/heimdal; then - myconf="--disable-mit --enable-heimdal" - fi - else - myconf="--disable-mit --disable-heimdal" - fi - - # coss support has been disabled - # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) - myconf="${myconf} --enable-storeio=ufs,diskd,aufs" - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter \ - $(use_enable tproxy linux-tproxy) \ - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --with-pidfile=/var/run/squid.pid \ - --datadir=/usr/share/squid \ - --with-logdir=/var/log/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="${digest_modules}" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - --disable-strict-error-checking \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(use_enable ecap) \ - $(use_enable zero-penalty-hit zph-qos) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - if use pam; then - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/pam_auth - fi - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - elog "Squid authentication helpers have been installed suid root." - elog "This allows shadow based authentication (see bug #52977 for more)." - echo - elog "Be careful what type of cache_dir you select!" - elog " 'diskd' is optimized for high levels of traffic, but it might seem slow" - elog "when there isn't sufficient traffic to keep squid reasonably busy." - elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'." -} diff --git a/net-proxy/squid/squid-3.1.16.ebuild b/net-proxy/squid/squid-3.1.16.ebuild deleted file mode 100644 index 2396e03..0000000 --- a/net-proxy/squid/squid-3.1.16.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.16.ebuild,v 1.7 2011/12/18 20:54:49 halcy0n Exp $ - -EAPI=4 - -inherit eutils pam toolchain-funcs autotools linux-info - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap icap-client \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll tproxy" - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - sys-apps/ed - test? ( dev-util/cppunit )" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -REQUIRED_USE="tproxy? ( caps )" - -pkg_pretend() { - if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then - eerror "coss store IO has been disabled by upstream due to stability issues!" - eerror "If you want to install this version, switch the store type to something else" - eerror "before attempting to install this version again." - - die "/etc/squid/squid.conf: cache_dir uses a disabled store type" - fi - - if use tproxy; then - echo - elog "Checking kernel configuration for full Tproxy4 support" - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" - linux-info_pkg_setup - echo - fi -} - -pkg_setup() { - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.15-gentoo.patch - eautoreconf -} - -src_configure() { - local myconf="" - - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - use radius && basic_modules="squid_radius_auth,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local digest_modules="password" - use ldap && digest_modules="ldap,${digest_modules}" - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" - - local negotiate_helpers= - if use kerberos; then - negotiate_helpers="squid_kerb_auth" - if has_version app-crypt/mit-krb5; then - myconf="--enable-mit --disable-heimdal" - elif has_version app-crypt/heimdal; then - myconf="--disable-mit --enable-heimdal" - fi - else - myconf="--disable-mit --disable-heimdal" - fi - - # coss support has been disabled - # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) - myconf="${myconf} --enable-storeio=ufs,diskd,aufs" - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter \ - $(use_enable tproxy linux-tproxy) \ - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --with-pidfile=/var/run/squid.pid \ - --datadir=/usr/share/squid \ - --with-logdir=/var/log/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="${digest_modules}" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - --disable-strict-error-checking \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(use_enable ecap) \ - $(use_enable zero-penalty-hit zph-qos) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - if use pam; then - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/pam_auth - fi - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - elog "Squid authentication helpers have been installed suid root." - elog "This allows shadow based authentication (see bug #52977 for more)." - echo - elog "Be careful what type of cache_dir you select!" - elog " 'diskd' is optimized for high levels of traffic, but it might seem slow" - elog "when there isn't sufficient traffic to keep squid reasonably busy." - elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'." -} diff --git a/net-proxy/squid/squid-3.1.18.ebuild b/net-proxy/squid/squid-3.1.18.ebuild deleted file mode 100644 index 8860c7b..0000000 --- a/net-proxy/squid/squid-3.1.18.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.18.ebuild,v 1.2 2011/12/29 17:35:31 jer Exp $ - -EAPI=4 - -inherit eutils pam toolchain-funcs autotools linux-info - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap icap-client \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll tproxy" - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - sys-apps/ed - test? ( dev-util/cppunit )" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -REQUIRED_USE="tproxy? ( caps )" - -pkg_pretend() { - if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then - eerror "coss store IO has been disabled by upstream due to stability issues!" - eerror "If you want to install this version, switch the store type to something else" - eerror "before attempting to install this version again." - - die "/etc/squid/squid.conf: cache_dir uses a disabled store type" - fi - - if use tproxy; then - echo - elog "Checking kernel configuration for full Tproxy4 support" - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" - linux-info_pkg_setup - echo - fi -} - -pkg_setup() { - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.1.15-gentoo.patch \ - "${FILESDIR}"/${PN}-3.1.18-ecap.patch - eautoreconf -} - -src_configure() { - local myconf="" - - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - use radius && basic_modules="squid_radius_auth,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local digest_modules="password" - use ldap && digest_modules="ldap,${digest_modules}" - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" - - local negotiate_helpers= - if use kerberos; then - negotiate_helpers="squid_kerb_auth" - if has_version app-crypt/mit-krb5; then - myconf="--enable-mit --disable-heimdal" - elif has_version app-crypt/heimdal; then - myconf="--disable-mit --enable-heimdal" - fi - else - myconf="--disable-mit --disable-heimdal" - fi - - # coss support has been disabled - # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) - myconf="${myconf} --enable-storeio=ufs,diskd,aufs" - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter \ - $(use_enable tproxy linux-tproxy) \ - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --with-pidfile=/var/run/squid.pid \ - --datadir=/usr/share/squid \ - --with-logdir=/var/log/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="${digest_modules}" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - --disable-strict-error-checking \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(use_enable ecap) \ - $(use_enable zero-penalty-hit zph-qos) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - if use pam; then - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/pam_auth - fi - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - elog "Squid authentication helpers have been installed suid root." - elog "This allows shadow based authentication (see bug #52977 for more)." - echo - elog "Be careful what type of cache_dir you select!" - elog " 'diskd' is optimized for high levels of traffic, but it might seem slow" - elog "when there isn't sufficient traffic to keep squid reasonably busy." - elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'." -} diff --git a/net-proxy/squid/squid-3.1.19.ebuild b/net-proxy/squid/squid-3.1.19.ebuild deleted file mode 100644 index dd5170d..0000000 --- a/net-proxy/squid/squid-3.1.19.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.19.ebuild,v 1.1 2012/03/09 15:40:32 eras Exp $ - -EAPI=4 - -inherit eutils pam toolchain-funcs autotools linux-info - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap icap-client \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll tproxy" - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( virtual/krb5 ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - sys-apps/ed - test? ( dev-util/cppunit )" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -REQUIRED_USE="tproxy? ( caps )" - -pkg_pretend() { - if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then - eerror "coss store IO has been disabled by upstream due to stability issues!" - eerror "If you want to install this version, switch the store type to something else" - eerror "before attempting to install this version again." - - die "${EPREFIX}/etc/squid/squid.conf: cache_dir uses a disabled store type" - fi - - if use tproxy; then - echo - elog "Checking kernel configuration for full Tproxy4 support" - local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_TPROXY ~NETFILTER_XT_MATCH_SOCKET ~NETFILTER_XT_TARGET_TPROXY" - linux-info_pkg_setup - echo - fi -} - -pkg_setup() { - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.1.15-gentoo.patch" - eautoreconf -} - -src_configure() { - local myconf="" - - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - use radius && basic_modules="squid_radius_auth,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local digest_modules="password" - use ldap && digest_modules="ldap,${digest_modules}" - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" - - local negotiate_helpers= - if use kerberos; then - negotiate_helpers="squid_kerb_auth" - if has_version app-crypt/mit-krb5; then - myconf="--enable-mit=${EPREFIX}/usr --disable-heimdal" - elif has_version app-crypt/heimdal; then - myconf="--disable-mit --enable-heimdal=${EPREFIX}/usr" - fi - else - myconf="--disable-mit --disable-heimdal" - fi - - # coss support has been disabled - # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) - myconf="${myconf} --enable-storeio=ufs,diskd,aufs" - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter \ - $(use_enable tproxy linux-tproxy) \ - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir="${EPREFIX}"/etc/squid \ - --libexecdir="${EPREFIX}"/usr/libexec/squid \ - --localstatedir="${EPREFIX}"/var \ - --with-pidfile="${EPREFIX}"/var/run/squid.pid \ - --datadir="${EPREFIX}"/usr/share/squid \ - --with-logdir="${EPREFIX}"/var/log/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="${digest_modules}" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - --disable-strict-error-checking \ - $(use_with caps libcap) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(use_enable ecap) \ - $(use_enable zero-penalty-hit zph-qos) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - if use pam; then - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/pam_auth - fi - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - elog "Squid authentication helpers have been installed suid root." - elog "This allows shadow based authentication (see bug #52977 for more)." - echo - elog "Be careful what type of cache_dir you select!" - elog " 'diskd' is optimized for high levels of traffic, but it might seem slow" - elog "when there isn't sufficient traffic to keep squid reasonably busy." - elog " If your traffic level is low to moderate, use 'aufs' or 'ufs'." -} diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog deleted file mode 100644 index 0835909..0000000 --- a/net-proxy/tsocks/ChangeLog +++ /dev/null @@ -1,185 +0,0 @@ -# ChangeLog for net-proxy/tsocks -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.36 2010/06/06 14:40:38 armin76 Exp $ - - 06 Jun 2010; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r5.ebuild: - arm stable wrt #300830 - - 17 Apr 2010; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r3.ebuild, - tsocks-1.8_beta5-r4.ebuild, tsocks-1.8_beta5-r5.ebuild: - Add ~arm wrt #300830 - - 19 Jul 2009; nixnut <nixnut@gentoo.org> tsocks-1.8_beta5-r5.ebuild: - ppc stable #274790 - - 06 Jul 2009; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r5.ebuild: - sparc stable wrt #274790 - - 04 Jul 2009; Brent Baude <ranger@gentoo.org> tsocks-1.8_beta5-r5.ebuild: - stable ppc64, bug 274790 - - 28 Jun 2009; Tobias Klausmann <klausman@gentoo.org> - tsocks-1.8_beta5-r5.ebuild: - Stable on alpha, bug #274790 - - 28 Jun 2009; Markus Meier <maekke@gentoo.org> tsocks-1.8_beta5-r5.ebuild: - amd64/x86 stable, bug #274790 - -*tsocks-1.8_beta5-r5 (20 Jun 2009) - - 20 Jun 2009; Alin Năstac <mrness@gentoo.org> - +files/tsocks-1.8_beta5-gentoo-r3.patch, +tsocks-1.8_beta5-r5.ebuild: - Link tsocks-saveme dinamically (#273339). Migrate to EAPI 2. - -*tsocks-1.8_beta5-r4 (18 Feb 2009) - - 18 Feb 2009; Alin Năstac <mrness@gentoo.org> - -files/tsocks-1.8_beta5-gentoo.patch, - +files/tsocks-1.8_beta5-gentoo-r2.patch, -tsocks-1.8_beta5-r2.ebuild, - +tsocks-1.8_beta5-r4.ebuild: - Fix LD_PRELOAD setup, thanks to Yuval Hager <yuval at avramzon dot net> - (#255960). - - 22 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml, - tsocks-1.8_beta5-r3.ebuild: - amd64 stable, bug #231690; add GLEP 56 USE flag desc from use.local.desc - - 21 Jul 2008; nixnut <nixnut@gentoo.org> tsocks-1.8_beta5-r3.ebuild: - Stable on ppc wrt bug 231690 - - 17 Jul 2008; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5-r3.ebuild: - Stable on ppc64; bug #231690 - - 17 Jul 2008; Raúl Porcel <armin76@gentoo.org> tsocks-1.8_beta5-r3.ebuild: - alpha/x86 stable wrt #231690 - - 16 Jul 2008; Friedrich Oslage <bluebird@gentoo.org> - tsocks-1.8_beta5-r3.ebuild: - Stable on sparc, bug #231690 - -*tsocks-1.8_beta5-r3 (13 Feb 2008) - - 13 Feb 2008; Alin Năstac <mrness@gentoo.org> - +files/tsocks-1.8_beta5-gentoo-r1.patch, +tsocks-1.8_beta5-r3.ebuild: - Link programs using user selected LDFLAGS (#209703). Fix library path in - tsocks script. - - 17 Jun 2007; Alin Năstac <mrness@gentoo.org> -tsocks-1.8_beta5.ebuild, - -tsocks-1.8_beta5-r1.ebuild: - Remove old revisions. - - 22 Apr 2007; Bryan Østergaard <kloeri@gentoo.org> - tsocks-1.8_beta5-r2.ebuild: - Stable on Alpha, bug 174160. - - 11 Apr 2007; Alin Năstac <mrness@gentoo.org> tsocks-1.8_beta5-r2.ebuild: - Stable on amd64. - - 01 Apr 2007; Michael Hanselmann <hansmi@gentoo.org> - tsocks-1.8_beta5-r2.ebuild: - Stable on ppc. - - 03 Dec 2006; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5-r2.ebuild: - Stable on ppc64 - - 07 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> - tsocks-1.8_beta5-r2.ebuild: - Stable on sparc - - 01 Nov 2006; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5-r2.ebuild: - Add SONAME to libtsocks. Stable on x86. - - 20 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> - tsocks-1.8_beta5-r1.ebuild: - Stable on sparc - - 29 Sep 2006; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5-r1.ebuild: - Stable on ppc64 - - 24 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> - tsocks-1.8_beta5-r1.ebuild: - Stable on ppc. - -*tsocks-1.8_beta5-r2 (22 Sep 2006) - - 22 Sep 2006; Alin Nastac <mrness@gentoo.org> - +files/tsocks-1.8_beta5-gentoo.patch, +tsocks-1.8_beta5-r2.ebuild: - Rename saveme and validateconf executables. Add tordns patch & local USE - flag (#148550). - - 20 Sep 2006; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5-r1.ebuild: - Stable on x86. - -*tsocks-1.8_beta5-r1 (16 Jul 2006) - - 16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> - +files/tsocks-1.8_beta5-bsd.patch, +tsocks-1.8_beta5-r1.ebuild: - Add tsocks with a little cleanup and patch for BSD compatibility (bug #140612). - - 04 Oct 2005; Alin Nastac <mrness@gentoo.org> -tsocks-1.8_beta4.ebuild, - tsocks-1.8_beta5.ebuild: - Remove obsolete version. Remove INSTALL from docs. - - 13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> - tsocks-1.8_beta5.ebuild: - Stable on ppc. - - 02 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> - tsocks-1.8_beta5.ebuild: - Stable on sparc - - 30 Jul 2005; Alin Nastac <mrness@gentoo.org> tsocks-1.8_beta5.ebuild: - Stable on x86. - - 20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> tsocks-1.8_beta5.ebuild: - Stable on amd64. - - 18 May 2005; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5.ebuild: - Stable on ppc64 - - 22 Apr 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml: - Move net-misc/tsocks to net-proxy/tsocks. Add metadata. - - 29 Mar 2005; Markus Rothe <corsair@gentoo.org> tsocks-1.8_beta5.ebuild: - Added ~ppc64 to KEYWORDS; bug #86993 - - 22 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> - tsocks-1.8_beta5.ebuild: - Multilib cleanup. - - 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tsocks-1.8_beta5.ebuild: - Stable on alpha. - -*tsocks-1.8_beta5 (22 Feb 2004) - - 22 Feb 2004; Mike Frysinger <vapier@gentoo.org> : - Version bump #42394 by Scott Jones. - - 07 Dec 2003; David Holm <dholm@gentoo.org> tsocks-1.8_beta4.ebuild: - Added to ~ppc. - - 21 Aug 2003; Will Woods <wwoods@gentoo.org> tsocks-1.8_beta4.ebuild: - Added ~alpha to KEYWORDS - - 12 Jun 2003; <msterret@gentoo.org> tsocks-1.8_beta4.ebuild: - add Header - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*tsocks-1.8_beta4 (10 Jun 2002) - - 11 Jul 2002; lamer <lamer@gentoo.org> tsocks-1.8beta4.ebuild : - Added "dobin validateconf saveme inspectsocks" to src_install - - 09 Jul 2002; phoen][x <phoenix@gentoo.org> tsocks-1.8beta4.ebuild : - Added KEYWORDS, SLOT. - - 10 Jun 2002; Ben Lutgens <lamer@gentoo.org> tsocks-1.8_beta4: Ebuild for - tsocks submitted to bugs.gentoo.org by a gentoo user *THANKS* - bardur-gta@odense.kollegienet.dk. It should be noted that as per the - install docs, this stuff gets installed to /lib. Mainly due to the fact - that it's often needed before /usr gets mounted. So the old - /etc/ld.so.preload trick won't work! diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest deleted file mode 100644 index 5b42cd4..0000000 --- a/net-proxy/tsocks/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX tsocks-1.8_beta5-bsd.patch 932 RMD160 d17f6927c4e18b25505139a9893c59afc39775aa SHA1 98b77ce698a8a9ad072f1c7275a3aeb8e2177f86 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d -AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 RMD160 2dffa4d10f82a2fd9adacebf987064d24f23aa42 SHA1 35ac9f759102cc7089b7b83757e2942e4d2d3c4a SHA256 5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca -DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 RMD160 5c77013987262331c9285e9d53738f9f7a3ecf45 SHA1 df0474aedd7ae9639053ec11968b10a68b4f82ed SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd -DIST tsocks-1.8beta5.tar.gz 83928 RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e SHA1 489f88c5df999ba21b27cdaa7836d9426d062aec SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 -EBUILD tsocks-1.8_beta5-r5.ebuild 1832 RMD160 d00457395adf5b52806487ab3846ee1ada51c8fd SHA1 09faed4d5544bbcf5c03ca8b8a4ac76a2cfd847c SHA256 10af15f4b10069842baf08c7c5cb56e225d8652e60d4e6aaa46e1d0439f17b98 -MISC ChangeLog 6304 RMD160 f7fd57a56b7e13a551b38b2741a8343677a4b7f9 SHA1 c3a160953e630155a57910c34f9aa263f5049b72 SHA256 abbecfa1bec9353cbe24bce0d91bdca34f07cbf417959326b2f68c755dd9674f -MISC metadata.xml 593 RMD160 31a381655437e3f21b9d4bd0982356eac43b79bf SHA1 8bd4c29f69a1ca1456fbb99523e46356eca2454c SHA256 08fa435f16b6ec09e7cfb979843b309354230db8986894227436699eb588a2d0 diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch deleted file mode 100644 index e003475..0000000 --- a/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: tsocks-1.8/configure.in -=================================================================== ---- tsocks-1.8.orig/configure.in -+++ tsocks-1.8/configure.in -@@ -122,7 +122,7 @@ LIBS= - - dnl Checks for libraries. - dnl Replace `main' with a function in -ldl: --AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required")) -+AC_CHECK_FUNC([dlsym], [], [AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))]) - - dnl If we're using gcc here define _GNU_SOURCE - AC_MSG_CHECKING("for RTLD_NEXT from dlfcn.h") -@@ -312,7 +312,7 @@ AC_DEFINE_UNQUOTED(CLOSE_SIGNATURE, [${P - dnl Find the correct poll prototype on this machine - AC_MSG_CHECKING(for correct poll prototype) - PROTO= --for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' -+for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 'struct pollfd ufds[[]], nfds_t nfds, int timeout' - do - if test "${PROTO}" = ""; then - AC_TRY_COMPILE([ diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch deleted file mode 100644 index 1c9dd18..0000000 --- a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in ---- tsocks-1.8.orig/Makefile.in 2002-03-16 11:12:40.000000000 +0100 -+++ tsocks-1.8/Makefile.in 2009-06-20 13:56:56.000000000 +0200 -@@ -28,6 +28,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - CFLAGS = @CFLAGS@ -+LDFLAGS = @LDFLAGS@ - INCLUDES = -I. - LIBS = @LIBS@ - SPECIALLIBS = @SPECIALLIBS@ -@@ -41,16 +42,16 @@ - all: ${TARGETS} - - ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o -- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS} - - ${INSPECT}: ${INSPECT}.c ${COMMON}.o -- ${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} - - ${SAVE}: ${SAVE}.c -- ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c - - ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o -- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} -+ ${SHCC} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} - ln -sf ${SHLIB} ${LIB_NAME}.so - - %.so: %.c -diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks ---- tsocks-1.8.orig/tsocks 2002-03-16 11:27:18.000000000 +0100 -+++ tsocks-1.8/tsocks 2009-06-20 13:56:38.000000000 +0200 -@@ -46,14 +46,14 @@ - on) - if [ -z "$LD_PRELOAD" ] - then -- export LD_PRELOAD="/usr/lib/libtsocks.so" -+ export LD_PRELOAD="/lib/libtsocks.so" - else -- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ -- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" -+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \ -+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD" - fi - ;; - off) -- export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'` -+ export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/lib\/libtsocks.so \?//'` - if [ -z "$LD_PRELOAD" ] - then - unset LD_PRELOAD -@@ -68,10 +68,10 @@ - *) - if [ -z "$LD_PRELOAD" ] - then -- export LD_PRELOAD="/usr/lib/libtsocks.so" -+ export LD_PRELOAD="/lib/libtsocks.so" - else -- echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \ -- export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD" -+ echo $LD_PRELOAD | grep -q "/lib/libtsocks\.so" || \ -+ export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD" - fi - - if [ $# = 0 ] -diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8 ---- tsocks-1.8.orig/tsocks.8 2002-03-16 11:20:51.000000000 +0100 -+++ tsocks-1.8/tsocks.8 2009-06-20 13:56:38.000000000 +0200 -@@ -127,8 +127,8 @@ - libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the - full path to the library in this file if you do this. If you get it wrong, - you will be UNABLE TO DO ANYTHING with the machine and will have to boot --it with a rescue disk and remove the file (or try the saveme program, see --the INSTALL file for more info). THIS IS A ***WARNING***, please be -+it with a rescue disk and remove the file (or try the tsocks-saveme program, -+simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be - careful. Also be sure the library is in the root filesystem as all hell - will break loose if the directory it is in is not available at boot time. - -diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5 ---- tsocks-1.8.orig/tsocks.conf.5 2002-05-18 04:13:08.000000000 +0200 -+++ tsocks-1.8/tsocks.conf.5 2009-06-20 13:56:38.000000000 +0200 -@@ -139,21 +139,20 @@ - the version that server supports. - - .TP --validateconf --validateconf can be used to verify the configuration file. It checks the format --of the file and also the contents for errors. Having read the file it dumps --the configuration to the screen in a formatted, readable manner. This can be --extremely useful in debugging problems. -- --validateconf can read a configuration file from a location other than the --location specified at compile time with the -f <filename> command line --option. -- --Normally validateconf simply dumps the configuration read to the screen (in --a nicely readable format), however it also has a useful 'test' mode. When --passed a hostname/ip on the command line like -t <hostname/ip>, validateconf --determines which of the SOCKS servers specified in the configuration file --would be used by tsocks to access the specified host. -+tsocks-validateconf -+tsocks-validateconf can be used to verify the configuration file. It checks -+the format of the file and also the contents for errors. Having read the file -+it dumps the configuration to the screen in a formatted, readable manner. -+This can be extremely useful in debugging problems. -+ -+tsocks-validateconf can read a configuration file from a location other than the -+location specified at compile time with the -f <filename> command line option. -+ -+Normally tsocks-validateconf simply dumps the configuration read to the screen -+(in a nicely readable format), however it also has a useful 'test' mode. When -+passed a hostname/ip on the command line like -t <hostname/ip>, -+tsocks-validateconf determines which of the SOCKS servers specified in the -+configuration file would be used by tsocks to access the specified host. - - .SH SEE ALSO - tsocks(8) -diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c ---- tsocks-1.8.orig/validateconf.c 2002-02-07 11:49:59.000000000 +0100 -+++ tsocks-1.8/validateconf.c 2009-06-20 13:56:38.000000000 +0200 -@@ -23,7 +23,7 @@ - */ - - /* Global configuration variables */ --char *progname = "validateconf"; /* Name for error msgs */ -+char *progname = "tsocks-validateconf"; /* Name for error msgs */ - - /* Header Files */ - #include <config.h> diff --git a/net-proxy/tsocks/metadata.xml b/net-proxy/tsocks/metadata.xml deleted file mode 100644 index f70a637..0000000 --- a/net-proxy/tsocks/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>net-proxy</herd> -<longdescription>tsocks' role is to allow non SOCKS aware applications (e.g telnet, ssh, ftp etc) to use SOCKS -without any modification. It does this by intercepting the calls that applications make to establish network connections -and negotating them through a SOCKS server as necessary.</longdescription> -<use> - <flag name='tordns'> - Apply tordns patch which allows transparent TORification of the DNS queries - </flag> -</use> -</pkgmetadata> diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild deleted file mode 100644 index c8f5a2c..0000000 --- a/net-proxy/tsocks/tsocks-1.8_beta5-r5.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/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild,v 1.8 2010/06/06 14:40:38 armin76 Exp $ - -EAPI="2" - -inherit multilib eutils autotools toolchain-funcs - -DESCRIPTION="Transparent SOCKS v4 proxying library" -HOMEPAGE="http://tsocks.sourceforge.net/" -SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz - tordns? ( mirror://gentoo/${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="tordns" - -S="${WORKDIR}/${P%%_*}" - -src_prepare() { - epatch "${FILESDIR}/${P}-gentoo-r3.patch" - epatch "${FILESDIR}/${P}-bsd.patch" - use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch" - eautoreconf -} - -src_configure() { - tc-export CC - - # NOTE: the docs say to install it into /lib. If you put it into - # /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't - # mounted in time :-( (Ben Lutgens) <lamer@gentoo.org> - econf \ - --with-conf=${EROOT}/etc/socks/tsocks.conf \ - --libdir=${EROOT}/$(get_libdir) || die "configure failed" -} - -src_compile() { - # Fix QA notice lack of SONAME - emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - newbin validateconf tsocks-validateconf - newbin saveme tsocks-saveme - dobin inspectsocks - insinto ${ER}/etc/socks - doins tsocks.conf.*.example - dodoc FAQ - use tordns && dodoc README* -} - -pkg_postinst() { - einfo "Make sure you create ${ER}/etc/socks/tsocks.conf from one of the examples in that directory" - einfo "The following executables have been renamed:" - einfo " ${ER}/usr/bin/saveme renamed to tsocks-saveme" - einfo " ${ER}/usr/bin/validateconf renamed to tsocks-validateconf" -} diff --git a/profiles/bootstrap/glibc/make.defaults b/profiles/bootstrap/glibc/make.defaults deleted file mode 100644 index 6d9b6b7..0000000 --- a/profiles/bootstrap/glibc/make.defaults +++ /dev/null @@ -1,4 +0,0 @@ -# Set correct PYTHONPATH for Portage, since our Python lives in -# $EPREFIX/tmp, bug #407573 - -PYTHONPATH=/opt/gentoo/usr/lib/portage/pym diff --git a/profiles/bootstrap/glibc/make.defaults.in b/profiles/bootstrap/glibc/make.defaults.in deleted file mode 100644 index 4ee3272..0000000 --- a/profiles/bootstrap/glibc/make.defaults.in +++ /dev/null @@ -1,4 +0,0 @@ -# Set correct PYTHONPATH for Portage, since our Python lives in -# $EPREFIX/tmp, bug #407573 - -PYTHONPATH=@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym diff --git a/profiles/bootstrap/glibc/parent b/profiles/bootstrap/glibc/parent deleted file mode 100644 index f3229c5..0000000 --- a/profiles/bootstrap/glibc/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/bootstrap/glibc/profile.bashrc b/profiles/bootstrap/glibc/profile.bashrc deleted file mode 100644 index 37d3907..0000000 --- a/profiles/bootstrap/glibc/profile.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# Hack for bash because curses is not always available (linux). -[[ ${PN} == "bash" ]] && EXTRA_ECONF="--without-curses" - -if [[ ${PN} == gcc ]]; then - CPPFLAGS="-I\"${EPREFIX}\"/usr/include" - local dlprefix=$(realpath ${EPREFIX}/lib/$(gcc -print-multi-os-directory)) - local libprefix=$(realpath ${EPREFIX}/usr/lib/$(gcc -print-multi-os-directory)) - LDFLAGS="-L\"${libprefix}\" -Wl,--dynamic-linker=\"$(echo ${dlprefix}/ld-linux*.so.*)\"" -fi diff --git a/profiles/bootstrap/make.defaults b/profiles/bootstrap/make.defaults deleted file mode 100644 index ecbd1e6..0000000 --- a/profiles/bootstrap/make.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# and we don't need to spam the user about news until after a --sync -# because the tools aren't available to read the news item yet anyway. - -FEATURES="${FEATURES} -news" - -# Disable the STALE warning because the snapshot frequently gets stale. -# DON'T REMOVE this one, stage3's tree check relies on this one - -PORTAGE_SYNC_STALE=0 diff --git a/profiles/bootstrap/package.use b/profiles/bootstrap/package.use deleted file mode 100644 index 45aa99c..0000000 --- a/profiles/bootstrap/package.use +++ /dev/null @@ -1,9 +0,0 @@ -# Most binary Linux distributions seem to fancy toolchains that do not -# do c++ support (need to install a separate package). Since we don't -# check for g++, just make sure binutils won't try to build gold -# (needs c++), it will get there once we built our own GCC with c++ -# support. For that reason we cannot globally mask cxx, because then -# GCC will be built without c++ support too. - -sys-devel/binutils -cxx -dev-libs/gmp -cxx diff --git a/profiles/bootstrap/parent b/profiles/bootstrap/parent deleted file mode 100644 index 291864c..0000000 --- a/profiles/bootstrap/parent +++ /dev/null @@ -1 +0,0 @@ -../default/linux/amd64/13.0/rap diff --git a/profiles/bootstrap/use.mask b/profiles/bootstrap/use.mask deleted file mode 100644 index 7edafc8..0000000 --- a/profiles/bootstrap/use.mask +++ /dev/null @@ -1,15 +0,0 @@ -# The default profiles (and IUSE defaults) introduce circular deps. By -# shoving this USE line here, we can ensure that the -# end-user always avoids circular deps while bootstrapping. - -berkdb -fortran -gdbm -git -nls -pcre -ssl -python -readline -acl - diff --git a/profiles/categories b/profiles/categories deleted file mode 100644 index 8bf81bb..0000000 --- a/profiles/categories +++ /dev/null @@ -1,4 +0,0 @@ -cross-armv5tel-softfloat-linux-gnueabi -cross-x86_64-pc-linux-gnu -sci-R -cross-armv7a-hardfloat-linux-gnueabi diff --git a/profiles/default/linux/arm/13.0/armv5te/rap/make.defaults b/profiles/default/linux/arm/13.0/armv5te/rap/make.defaults deleted file mode 100644 index 61ca581..0000000 --- a/profiles/default/linux/arm/13.0/armv5te/rap/make.defaults +++ /dev/null @@ -1,3 +0,0 @@ -# accept unstable keyword before RAP matures -# accept Prefix keyword to use Prefix overlay for transition -ACCEPT_KEYWORDS="~arm ~arm-linux" diff --git a/profiles/default/linux/arm/13.0/armv5te/rap/parent b/profiles/default/linux/arm/13.0/armv5te/rap/parent deleted file mode 100644 index a67a6e3..0000000 --- a/profiles/default/linux/arm/13.0/armv5te/rap/parent +++ /dev/null @@ -1,2 +0,0 @@ -gentoo_prefix:default/linux/arm/13.0/armv5te -../../../../../../features/rap diff --git a/profiles/default/linux/arm/13.0/armv7a/rap/make.defaults b/profiles/default/linux/arm/13.0/armv7a/rap/make.defaults deleted file mode 100644 index 61ca581..0000000 --- a/profiles/default/linux/arm/13.0/armv7a/rap/make.defaults +++ /dev/null @@ -1,3 +0,0 @@ -# accept unstable keyword before RAP matures -# accept Prefix keyword to use Prefix overlay for transition -ACCEPT_KEYWORDS="~arm ~arm-linux" diff --git a/profiles/default/linux/arm/13.0/armv7a/rap/parent b/profiles/default/linux/arm/13.0/armv7a/rap/parent deleted file mode 100644 index b105425..0000000 --- a/profiles/default/linux/arm/13.0/armv7a/rap/parent +++ /dev/null @@ -1,2 +0,0 @@ -gentoo_prefix:default/linux/arm/13.0/armv7a -../../../../../../features/rap diff --git a/profiles/eapi b/profiles/eapi deleted file mode 100644 index 7ed6ff8..0000000 --- a/profiles/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/features/rap/make.defaults b/profiles/features/rap/make.defaults deleted file mode 100644 index ed808e9..0000000 --- a/profiles/features/rap/make.defaults +++ /dev/null @@ -1,2 +0,0 @@ -# sandbox not prefixified yet. -FEATURES="-sandbox" diff --git a/profiles/features/rap/packages b/profiles/features/rap/packages deleted file mode 100644 index fd7c294..0000000 --- a/profiles/features/rap/packages +++ /dev/null @@ -1,19 +0,0 @@ -# kmod has not been prefixified --*virtual/modutils - -# shadow has not been prefixified --*virtual/shadow - -# don't need in rap --*virtual/dev-manager - -# permission is not handled by portage for normal users --*net-misc/iputils --*sys-apps/iproute2 - -# not a must --*sys-fs/e2fsprogs --*sys-apps/busybox - -# draws in baselayout-prefix --*virtual/service-manager diff --git a/profiles/features/rap/profile.bashrc b/profiles/features/rap/profile.bashrc deleted file mode 100644 index 5f7a4a4..0000000 --- a/profiles/features/rap/profile.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# use sysroot of toolchain to get include and library at compile time work -# Benda Xu <heroxbd@gentoo.org> (17 Jun, 2013) - -if [[ ${CATEGORY} == sys-devel ]] && [[ ${PN} == binutils || ${PN} == libtool ]] \ - && [[ ${EBUILD_PHASE} == unpack ]]; then - elog "append --with-sysroot=${EPREFIX} to configure for Prefix libc" - EXTRA_ECONF+="--with-sysroot=${EPREFIX}" -fi - diff --git a/profiles/features/rap/use.force b/profiles/features/rap/use.force deleted file mode 100644 index 193e6d8..0000000 --- a/profiles/features/rap/use.force +++ /dev/null @@ -1,5 +0,0 @@ -# force Prefix -prefix - -# force rap (Prefix with libc) -rap diff --git a/profiles/features/rap/use.mask b/profiles/features/rap/use.mask deleted file mode 100644 index 4c45f2d..0000000 --- a/profiles/features/rap/use.mask +++ /dev/null @@ -1,8 +0,0 @@ -# unmask prefix --prefix - -# sys-libs/gpm has not been prefixified -gpm - -# sys-libs/pam has not been prefixified -pam diff --git a/profiles/profiles.desc b/profiles/profiles.desc deleted file mode 100644 index a7d42e7..0000000 --- a/profiles/profiles.desc +++ /dev/null @@ -1 +0,0 @@ -x86 default/linux/x86/13.0/rap stable diff --git a/profiles/repo_name b/profiles/repo_name deleted file mode 100644 index 84678fa..0000000 --- a/profiles/repo_name +++ /dev/null @@ -1 +0,0 @@ -heroxbd diff --git a/sci-electronics/myhdl/Manifest b/sci-electronics/myhdl/Manifest deleted file mode 100644 index c60b66f..0000000 --- a/sci-electronics/myhdl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST myhdl-0.7.tar.gz 241770 RMD160 c525b21a86c9204ec7cf659709bc0e8fb2c7450b SHA1 4382444230297593f0a08ba8178c542b4ce1f19b SHA256 7d3e0e363a57e5ce86f73f515215c3038e67e0082ace120ce00878fa58f27368 -EBUILD myhdl-0.7.ebuild 568 RMD160 41c4e7374cd1ec9097a3112f59581b8e09103ce0 SHA1 2083e672c9bd6680dbce51cf5fb47b666656d340 SHA256 0780d1a696b86570e000541e5eebe2b95e3e826af04b490e367e135254761eed diff --git a/sci-electronics/myhdl/myhdl-0.7.ebuild b/sci-electronics/myhdl/myhdl-0.7.ebuild deleted file mode 100644 index 5c18475..0000000 --- a/sci-electronics/myhdl/myhdl-0.7.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" - -inherit distutils - -DESCRIPTION="MyHDL is a Python package for using Python as a hardware description and verification language." -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -RESTRICT="nomirror" -HOMEPAGE="http://www.myhdl.org/" -RDEPEND="virtual/python" -IUSE="" -SLOT="0" -KEYWORDS="~amd64 ~x86-linux" -LICENSE="LPGL-2.1" - -src_install() { - distutils_src_install - dodoc *.txt - cp -r doc/* example cosimulation ${D}/usr/share/doc/${PF} -} - diff --git a/sci-libs/igraph/Manifest b/sci-libs/igraph/Manifest deleted file mode 100644 index ada4e00..0000000 --- a/sci-libs/igraph/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST igraph-0.5.4.tar.gz 1741540 SHA1 e5f1a54ac1a9567127ebee838720b3ec38ad534a SHA256 0c7256849d4f63b12b240aedd4fc5be34a2888cce7dd7b4d91c02315585a063f -EBUILD igraph-0.5.4.ebuild 964 SHA1 928745f3d265cecb28e071120b0d8e45be3b718b SHA256 de9fd3656e43724d26bed2b8dde27b8c1182896f7803fae7cbb7d6229d73cac2 diff --git a/sci-libs/igraph/igraph-0.5.4.ebuild b/sci-libs/igraph/igraph-0.5.4.ebuild deleted file mode 100644 index cc44899..0000000 --- a/sci-libs/igraph/igraph-0.5.4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -DESCRIPTION="Library for creating and manipulating (un)directed graphs." -HOMEPAGE="http://igraph.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64-linux" -IUSE="+arpack +blas debug +gmp +graphml +lapack profile shell" - -DEPEND="sys-devel/libtool - graphml? ( dev-libs/libxml2 ) - gmp? ( dev-libs/gmp ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack ) - arpack? ( sci-libs/arpack )" -RDEPEND="${DEPEND}" - -src_configure() { - econf \ - $(use_enable graphml) \ - $(use_enable gmp) \ - $(use_enable shell) \ - $(use_enable profile profiling) \ - $(use_enable debug) \ - $(use_with blas external-blas) \ - $(use_with lapack external-lapack) \ - $(use_with arpack external-arpack) \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" -} diff --git a/sci-mathematics/jags/ChangeLog b/sci-mathematics/jags/ChangeLog deleted file mode 100644 index 2a40dc5..0000000 --- a/sci-mathematics/jags/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -# ChangeLog for sci-mathematics/jags -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/jags/ChangeLog,v 1.1 2011/02/12 11:50:38 tomka Exp $ - - 12 Feb 2011; Thomas Kahle <tomka@gentoo.org> +jags-2.2.0.ebuild, - +metadata.xml: - Imported from science overlay, fixes bug 317741. - -*jags-2.2.0 (04 Dec 2010) - - 04 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> +jags-2.2.0.ebuild, - +metadata.xml: - Initial import. Modififed ebuild from originally submitted by Xavier - Fernández i Marín, bug #317741 - diff --git a/sci-mathematics/jags/Manifest b/sci-mathematics/jags/Manifest deleted file mode 100644 index 355d80f..0000000 --- a/sci-mathematics/jags/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST JAGS-2.2.0.tar.gz 1621102 RMD160 a8c56a3922d890f27111fea4fc088b408153a7f7 SHA1 83d381619f552830e3a6312a70969b46520cc7fe SHA256 6615207cc19463c6398a8c5d02bfc0e3a659928d7da928396f95a63409addd04 -EBUILD jags-2.2.0.ebuild 851 RMD160 5fab71265ec44e1ecb16e51bad4ec6e5d36a65c8 SHA1 f4a5676e9f9b77e8bd93f5fa7d0815ca9b4117cc SHA256 2813bccd91ef3c809949fd7ecc7c1ca1e95695ae3b83cd0fc85a96c5ec5d249f -MISC ChangeLog 574 RMD160 e1028f3fd1c8dbe0c65702904e8ee4eb55c26d5e SHA1 c6f480e085368a743d085a2a194e879fbf197337 SHA256 f51404e55ad6759815f2230238f55d6cc4da251676493bcb58c0bce856150795 -MISC metadata.xml 670 RMD160 324b5487e94bbf8ab5673a9e1ab96fa732e72554 SHA1 162946a6d7276a5d7be5dff141be6a23d93125be SHA256 4c66821b30a3d7a28f5cce74ad3ead7999ace229fd66d3ebccb278a7d244300f diff --git a/sci-mathematics/jags/jags-2.2.0.ebuild b/sci-mathematics/jags/jags-2.2.0.ebuild deleted file mode 100644 index 249bab1..0000000 --- a/sci-mathematics/jags/jags-2.2.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/jags/jags-2.2.0.ebuild,v 1.1 2011/02/12 11:50:38 tomka Exp $ - -EAPI=2 -inherit autotools-utils - -MYP="JAGS-${PV}" - -DESCRIPTION="Just Another Gibbs Sampler for Bayesian MCMC simulation" -HOMEPAGE="http://www-fis.iarc.fr/~martyn/software/jags/" -SRC_URI="mirror://sourceforge/project/mcmc-jags/JAGS/2.x/Source/${MYP}.tar.gz" -LICENSE="GPL-2" -IUSE="" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND="virtual/blas - virtual/lapack" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S="${WORKDIR}/${MYP}" - -DOCS=(README NEWS TODO AUTHORS) - -src_configure() { - myeconfags=( - --with-blas="$(pkg-config --libs blas)" - --with-lapack="$(pkg-config --libs lapack)" - ) - autotools-utils_src_configure -} diff --git a/sci-mathematics/jags/metadata.xml b/sci-mathematics/jags/metadata.xml deleted file mode 100644 index cfbc499..0000000 --- a/sci-mathematics/jags/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci-mathematics</herd> -<longdescription lang="en"> - JAGS is Just Another Gibbs Sampler. It is a program for analysis of - Bayesian hierarchical models using Markov Chain Monte Carlo (MCMC) - simulation not wholly unlike BUGS. - JAGS was written with three aims in mind: - * To have an engine for the BUGS language that runs on Unix - * To be extensible, allowing users to write their own functions, - distributions and samplers. - * To be a plaftorm for experimentation with ideas in Bayesian modelling -</longdescription> -</pkgmetadata> diff --git a/sci-physics/geant-python/ChangeLog b/sci-physics/geant-python/ChangeLog deleted file mode 100644 index ed1d191..0000000 --- a/sci-physics/geant-python/ChangeLog +++ /dev/null @@ -1,22 +0,0 @@ -# ChangeLog for sci-physics/geant-python -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/ChangeLog,v 1.5 2012/05/21 04:54:59 heroxbd Exp $ - - 21 May 2012; Benda Xu <heroxbd@gentoo.org> - +files/geant-python-4.9.5-vis-fix.patch, geant-python-4.9.5.ebuild: - fix VisManager c++ signature mismatch, upstream http://bugzilla- - geant4.kek.jp/show_bug.cgi?id=1318 - - 20 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-python-4.9.5.ebuild - geant-python-4.9.5_p01.ebuild: - add version 4.9.5 for 4.9.5_p01 cannot function correctly, upstream bug - http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1317; add example USE flag. - -*geant-python-4.9.5_p01 (20 May 2012) - - 20 May 2012; Benda Xu <heroxbd@gentoo.org> - +files/geant-python-4.9.5-build.patch, - +files/geant-python-4.9.5-visverbose.patch, +geant-python-4.9.5_p01.ebuild, - +metadata.xml: - initial commit - diff --git a/sci-physics/geant-python/Manifest b/sci-physics/geant-python/Manifest deleted file mode 100644 index 5defda6..0000000 --- a/sci-physics/geant-python/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX geant-python-4.9.3-RunMan.patch 6895 RMD160 0e149dff2a85e1a2049203754baa89385cb248c4 SHA1 eca6838549a7a1630fe54898053e772adcd260f1 SHA256 4b1921ad2d29ba2cfaf277dfdc5cc2ffa685dbe2d8815a6a2a3754857de6c47e -AUX geant-python-4.9.3-VisAtt.patch 428 RMD160 3c5e556ffec340f09f2aa27b628f8b27e1fe5aee SHA1 6b4181dfce81f0ce11eb53e35126fedd298cd170 SHA256 1df0a75eecca6cf53a2ce283466127ee179d36e4622e1a426d3ace0ecfed5fd3 -AUX geant-python-4.9.3-build.patch 1144 RMD160 6b5de444a07769760b712579af222d810f21284d SHA1 fec1df65703157a7ba844ffd759e917a5e1d3f87 SHA256 b38ba49d6b85fa2bf0759710260b14fefb8e82aeb69491d038ae3b17da6cb781 -AUX geant-python-4.9.5-TrkMan.patch 578 RMD160 4e84ce2f7ce681d33b729eae4696cef88fc8f62c SHA1 489ca24d9de220215089e677602959f56255ff33 SHA256 8cd3213412da8388fb875fc0c3527a180c6977e1c2cdeaa9ca8a187a4da31ff4 -AUX geant-python-4.9.5-build.patch 1026 RMD160 2bf191ddf06e7ca29ae2f2bc4d40d533ad400979 SHA1 8c365c334a9958c52ad08a2daa9e6923bec1afa9 SHA256 ef3f725aa4165374c7b3d090af3e017e14850f409def6f8e466dcb198d7a7c7e -AUX geant-python-4.9.5-vis-fix.patch 1458 RMD160 4801f01c440b937ad51535cc9134ee143bf3b7a9 SHA1 e92ede558d390925b1ce2c8a2b02e264af8203db SHA256 4201223199e03199fd6d139e76224d365dded6013534d5655f1ada3c67159038 -AUX geant-python-4.9.5-visverbose.patch 557 RMD160 752266b165007dc61dfe3e6e21804dca63c59754 SHA1 e2691a1bd095741de558e61771b9b8992c77a2fb SHA256 0955cd39ce1f8e842e2804370359a4e367b14f4791a40fd653918c32884bed8a -DIST geant4.9.3.p02.tar.gz 20009687 RMD160 3fc3ce68965666670a2cf6e7dbe93c00b305fc30 SHA1 1728ea641ecb7ff50d2f44366add3a7569967839 SHA256 9fed501a6b0fed9050655633998acb942f7be430711e08f234dd748c23037a90 -DIST geant4.9.5.p01.tar.gz 28466803 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e -DIST geant4.9.5.tar.gz 28458437 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597 -EBUILD geant-python-4.9.3.ebuild 1823 RMD160 66d18e7c8a00d1896b7864b4a60405fb57015dcb SHA1 cec46b0705248b805c4c8ca77f56b21ff9381fee SHA256 6d437a0f44463353963b9347336bb20d832e11387152b9b6103a7f2a4c7ca890 -EBUILD geant-python-4.9.3_p02.ebuild 1820 RMD160 0ffc1c4d8bb259e010b5ac0c7c7b2e3791facc24 SHA1 5c044390d30abf7ea3534311578e71315934eff1 SHA256 b2f260c9727319e9183928e1d86548fedd8f0e4a47ef0723289727e16d06b621 -EBUILD geant-python-4.9.5.ebuild 1727 RMD160 a669074010e915033b144bbd77f34cd36fb3b6e9 SHA1 c06ead6a91266a2c4c9bf6bb453011cff85ffec7 SHA256 783e96853439e8c288458e61190b3c2d42e58e2b189f4b9635ec39b31723602e -EBUILD geant-python-4.9.5_p01.ebuild 2551 RMD160 9b2bc43172a66a8771e5a408ed5f7caa0d3e4a00 SHA1 dd4a008749652cc94eaa0802dc10880aceb31742 SHA256 ed802828d7ded1628c7f269d694089a36846ed7db4e924164428e96f5457df73 -MISC ChangeLog 936 RMD160 328cfe5496e2baa14e8b923095f2cd75b08ee9eb SHA1 f7b7e41cbee543fd8c0018f509d988510bcbf697 SHA256 706b342ebe984b01d30690ab87d6a111369b1bbddc928a1ab0eb455bd4766a28 -MISC metadata.xml 240 RMD160 efd4ab46b75a4f49cf759c1af44f74b7d952dfc2 SHA1 7180d1a98e53900396070713396ca66eebb913c4 SHA256 f3269ca94d60315f7e3ebf8aa24ed69d2d2c53473707c76586834f76e8ce27e3 diff --git a/sci-physics/geant-python/files/geant-python-4.9.3-RunMan.patch b/sci-physics/geant-python/files/geant-python-4.9.3-RunMan.patch deleted file mode 100644 index 6bfb875..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.3-RunMan.patch +++ /dev/null @@ -1,157 +0,0 @@ -backported from geant-4.9.5 for DumpRegion function footprint chnage ---- source/run/pyG4RunManager.cc 2006-06-30 00:35:12.000000000 +0900 -+++ source/run/pyG4RunManager.cc.new 2012-07-14 22:00:38.000000000 +0900 -@@ -23,14 +23,15 @@ - // * acceptance of all terms of the Geant4 Software license. * - // ******************************************************************** - // --// $Id: pyG4RunManager.cc,v 1.4 2006/06/29 15:35:12 gunter Exp $ --// $Name: geant4-09-03-patch-02 $ -+// $Id: pyG4RunManager.cc,v 1.6 2010-12-02 08:23:05 kmura Exp $ -+// $Name: not supported by cvs2svn $ - // ==================================================================== - // pyG4RunManager.cc - // - // 2005 Q - // ==================================================================== - #include <boost/python.hpp> -+#include "G4Version.hh" - #include "G4RunManager.hh" - #include "G4VUserDetectorConstruction.hh" - #include "G4VUserPhysicsList.hh" -@@ -72,13 +73,17 @@ void (G4RunManager::*f6_SetUserAction)(G - = &G4RunManager::SetUserAction; - - // DumpRegion -+#if G4VERSION_NUMBER >= 932 -+void (G4RunManager::*f1_DumpRegion)(const G4String&) const -+ = &G4RunManager::DumpRegion; -+#else - void (G4RunManager::*f1_DumpRegion)(G4String) const -- = &G4RunManager::DumpRegion; -+ = &G4RunManager::DumpRegion; -+#endif - void (G4RunManager::*f2_DumpRegion)(G4Region*) const - = &G4RunManager::DumpRegion; - --BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DumpRegion, -- DumpRegion, 0, 1); -+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DumpRegion, DumpRegion, 0, 1); - - // BeamOn() - BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_BeamOn, BeamOn, 1, 3); -@@ -87,8 +92,8 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f - BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_AbortRun, AbortRun, 0, 1); - - // DefineWorldVolume() --BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DefineWorldVolume, -- DefineWorldVolume, 1, 2); -+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(f_DefineWorldVolume, -+ DefineWorldVolume, 1, 2); - - }; - -@@ -102,18 +107,18 @@ void export_G4RunManager() - class_<G4RunManager>("G4RunManager", "run manager class") - // --- - .def("GetRunManager", &G4RunManager::GetRunManager, -- "Get an instance of G4RunManager", -- return_value_policy<reference_existing_object>()) -+ "Get an instance of G4RunManager", -+ return_value_policy<reference_existing_object>()) - .staticmethod("GetRunManager") - // --- - .def("SetVerboseLevel", &G4RunManager::SetVerboseLevel) - .def("GetVerboseLevel", &G4RunManager::GetVerboseLevel) - // --- - .def("Initialize", &G4RunManager::Initialize) -- .def("BeamOn", &G4RunManager::BeamOn, -- f_BeamOn((arg("n_event"), arg("macroFile")=0, -- arg("n_select")=-1), -- "Starts event loop.")) -+ .def("BeamOn", &G4RunManager::BeamOn, -+ f_BeamOn((arg("n_event"), arg("macroFile")=0, -+ arg("n_select")=-1), -+ "Starts event loop.")) - // --- - .def("SetUserInitialization", f1_SetUserInitialization) - .def("SetUserInitialization", f2_SetUserInitialization) -@@ -125,50 +130,58 @@ void export_G4RunManager() - .def("SetUserAction", f6_SetUserAction) - // --- - .def("GetUserDetectorConstruction", -- &G4RunManager::GetUserDetectorConstruction, -- return_internal_reference<>()) -+ &G4RunManager::GetUserDetectorConstruction, -+ return_internal_reference<>()) - .def("GetUserPhysicsList", -- &G4RunManager::GetUserPhysicsList, -- return_internal_reference<>()) -+ &G4RunManager::GetUserPhysicsList, -+ return_internal_reference<>()) - .def("GetUserPrimaryGeneratorAction", -- &G4RunManager::GetUserPrimaryGeneratorAction, -- return_internal_reference<>()) -+ &G4RunManager::GetUserPrimaryGeneratorAction, -+ return_internal_reference<>()) - .def("GetUserRunAction", &G4RunManager::GetUserRunAction, -- return_internal_reference<>()) -+ return_internal_reference<>()) - .def("GetUserEventAction", &G4RunManager::GetUserEventAction, -- return_internal_reference<>()) -+ return_internal_reference<>()) - .def("GetUserStackingAction", &G4RunManager::GetUserStackingAction, -- return_internal_reference<>()) -+ return_internal_reference<>()) - .def("GetUserTrackingAction", &G4RunManager::GetUserTrackingAction, -- return_internal_reference<>()) -+ return_internal_reference<>()) - .def("GetUserSteppingAction", &G4RunManager::GetUserSteppingAction, -- return_internal_reference<>()) -+ return_internal_reference<>()) - // --- - .def("AbortRun", &G4RunManager::AbortRun, -- f_AbortRun((arg("soft_abort")=false), -- "Abort run (event loop).")) -- .def("AbortEvent", &G4RunManager::AbortEvent) -- .def("GetVersionString", &G4RunManager::GetVersionString) -+ f_AbortRun((arg("soft_abort")=false), -+ "Abort run (event loop).")) -+ .def("AbortEvent", &G4RunManager::AbortEvent) - .def("DefineWorldVolume", &G4RunManager::DefineWorldVolume, -- f_DefineWorldVolume()) -+ f_DefineWorldVolume()) - .def("DumpRegion", f1_DumpRegion) - .def("DumpRegion", f2_DumpRegion, f_DumpRegion()) - .def("rndmSaveThisRun", &G4RunManager::rndmSaveThisRun) - .def("rndmSaveThisEvent", &G4RunManager::rndmSaveThisEvent) - .def("RestoreRandomNumberStatus", -- &G4RunManager::RestoreRandomNumberStatus) -+ &G4RunManager::RestoreRandomNumberStatus) - .def("SetRandomNumberStore", &G4RunManager::SetRandomNumberStore) - .def("GetRandomNumberStore", &G4RunManager::GetRandomNumberStore) - .def("SetRandomNumberStoreDir", &G4RunManager::SetRandomNumberStoreDir) -- .def("GetRandomNumberStoreDir", &G4RunManager::GetRandomNumberStoreDir) - .def("GeometryHasBeenModified", &G4RunManager::GeometryHasBeenModified) - .def("PhysicsHasBeenModified", &G4RunManager::PhysicsHasBeenModified) - .def("GetGeometryToBeOptimized",&G4RunManager::GetGeometryToBeOptimized) - .def("GetCurrentRun", &G4RunManager::GetCurrentRun, -- return_value_policy<reference_existing_object>()) -+ return_value_policy<reference_existing_object>()) - .def("GetCurrentEvent", &G4RunManager::GetCurrentEvent, -- return_value_policy<reference_existing_object>()) -+ return_value_policy<reference_existing_object>()) - .def("SetRunIDCounter", &G4RunManager::SetRunIDCounter) -+ -+#if G4VERSION_NUMBER >= 932 -+ .def("GetVersionString", &G4RunManager::GetVersionString, -+ return_value_policy<reference_existing_object>()) -+ .def("GetRandomNumberStoreDir", &G4RunManager::GetRandomNumberStoreDir, -+ return_internal_reference<>()) -+#else -+ .def("GetVersionString", &G4RunManager::GetVersionString) -+ .def("GetRandomNumberStoreDir", &G4RunManager::GetRandomNumberStoreDir) -+#endif - ; - - // reduced functionality... diff --git a/sci-physics/geant-python/files/geant-python-4.9.3-VisAtt.patch b/sci-physics/geant-python/files/geant-python-4.9.3-VisAtt.patch deleted file mode 100644 index 364e965..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.3-VisAtt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- source/graphics_reps/pyG4VisAttributes.cc 2009-12-19 02:23:08.000000000 +0900 -+++ source/graphics_reps/pyG4VisAttributes.cc.new 2012-07-12 12:04:50.000000000 +0900 -@@ -31,6 +31,7 @@ - // 2005 Q - // ==================================================================== - #include <boost/python.hpp> -+#include "G4AttDef.hh" - #include "G4VisAttributes.hh" - - using namespace boost::python; diff --git a/sci-physics/geant-python/files/geant-python-4.9.3-build.patch b/sci-physics/geant-python/files/geant-python-4.9.3-build.patch deleted file mode 100644 index aa927ec..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.3-build.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.old 2009-11-20 12:36:51.000000000 +0900 -+++ configure 2012-07-14 10:18:19.000000000 +0900 -@@ -3,12 +3,6 @@ - # ====================================================================== - # A configure script for Geant4Py - # ====================================================================== --export LANG=C -- --IFS=' -- ' --PATH=/bin:/usr/bin --export PATH - - # ====================================================================== - # testing the echo features -@@ -323,15 +317,18 @@ echo "lib${clhep_lib}.${shlib}" - - # --- - echo $ac_n "Checking for Python include dir (pyconfig.h) ... $ac_c" --# check version --set python python2.6 python2.5 python2.4 python2.3 python2.2 --for aincdir in $* --do -- if [ -d /usr/include/"$aincdir" ]; then -- python_incdir=/usr/include/$aincdir -- break -- fi --done -+ -+if [ ! -d "$python_incdir" ]; then -+ # check version -+ set python python2.6 python2.5 python2.4 python2.3 python2.2 -+ for aincdir in $* -+ do -+ if [ -d /usr/include/"$aincdir" ]; then -+ python_incdir=/usr/include/$aincdir -+ break -+ fi -+ done -+fi - - if [ ! -f "$python_incdir"/pyconfig.h ]; then - echo "no" diff --git a/sci-physics/geant-python/files/geant-python-4.9.5-TrkMan.patch b/sci-physics/geant-python/files/geant-python-4.9.5-TrkMan.patch deleted file mode 100644 index df03d21..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.5-TrkMan.patch +++ /dev/null @@ -1,12 +0,0 @@ -expose secondaries for debugging of scintillation. Not yet reported upstream. ---- source/tracking/pyG4TrackingManager.cc.old 2011-12-03 00:12:32.000000000 +0900 -+++ source/tracking/pyG4TrackingManager.cc 2012-07-12 14:19:30.000000000 +0900 -@@ -51,6 +51,8 @@ void export_G4TrackingManager() - .def("GetVerboseLevel", &G4TrackingManager::GetVerboseLevel) - .def("SetUserTrackInformation", - &G4TrackingManager::SetUserTrackInformation) -+ .def("GimmeSecondaries", &G4TrackingManager::GimmeSecondaries, -+ return_value_policy<return_by_value>()) - ; - } - diff --git a/sci-physics/geant-python/files/geant-python-4.9.5-build.patch b/sci-physics/geant-python/files/geant-python-4.9.5-build.patch deleted file mode 100644 index 94f5dd2..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.5-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -make configure respect --with-python-incdir -reported upstream at http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1316 -diff --git a/configure b/configure -index 2d755b1..3db111f 100755 ---- a/configure -+++ b/configure -@@ -330,18 +330,21 @@ echo "lib${clhep_lib}.${shlib}" - # --- - echo $ac_n "Checking for Python include dir (pyconfig.h) ... $ac_c" - # check version --if [ $with_python3 = 0 ]; then -- set python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 --else -- set python3.1 python3.0 -+if [ ! -d "$python_incdir" ] -+then -+ if [ $with_python3 = 0 ]; then -+ set python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 -+ else -+ set python3.1 python3.0 -+ fi -+ for aincdir in $* -+ do -+ if [ -d /usr/include/"$aincdir" ]; then -+ python_incdir=/usr/include/$aincdir -+ break -+ fi -+ done - fi --for aincdir in $* --do -- if [ -d /usr/include/"$aincdir" ]; then -- python_incdir=/usr/include/$aincdir -- break -- fi --done - - if [ ! -f "$python_incdir"/pyconfig.h ]; then - echo "no" diff --git a/sci-physics/geant-python/files/geant-python-4.9.5-vis-fix.patch b/sci-physics/geant-python/files/geant-python-4.9.5-vis-fix.patch deleted file mode 100644 index 1826764..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.5-vis-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -fix the C++ signature, upstream http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1318 -diff --git a/source/visualization/pyG4VisManager.cc b/source/visualization/pyG4VisManager.cc -index 33bb0d4..bbd9e0a 100644 ---- a/source/visualization/pyG4VisManager.cc -+++ b/source/visualization/pyG4VisManager.cc -@@ -39,7 +39,7 @@ using namespace boost::python; - // ==================================================================== - // wrappers - // ==================================================================== --class PyG4VisManager : public G4VisManager { -+struct PyG4VisManager : G4VisManager, wrapper<G4VisManager> { - public: - PyG4VisManager() { SetVerboseLevel(quiet); } - ~PyG4VisManager() { } -@@ -62,7 +62,7 @@ void (PyG4VisManager::*f1_SetVerboseLevel)(G4int) - = &PyG4VisManager::SetVerboseLevel; - void (PyG4VisManager::*f2_SetVerboseLevel)(const G4String&) - = &PyG4VisManager::SetVerboseLevel; -- void (PyG4VisManager::*f3_SetVerboseLevel)(G4VisManager::Verbosity) -+void (PyG4VisManager::*f3_SetVerboseLevel)(G4VisManager::Verbosity) - = &PyG4VisManager::SetVerboseLevel; - - } -@@ -87,6 +87,7 @@ void export_G4VisManager() - .def("SetVerboseLevel", f2_SetVerboseLevel) - .def("SetVerboseLevel", f3_SetVerboseLevel) - .def("GetVerbosity", &PyG4VisManager::GetVerbosity) -+ .staticmethod("GetVerbosity") - .def("Initialize", &PyG4VisManager::Initialize) - .def("RegisterGraphicsSystem", &PyG4VisManager::RegisterGraphicsSystem) - ; diff --git a/sci-physics/geant-python/files/geant-python-4.9.5-visverbose.patch b/sci-physics/geant-python/files/geant-python-4.9.5-visverbose.patch deleted file mode 100644 index 0508f28..0000000 --- a/sci-physics/geant-python/files/geant-python-4.9.5-visverbose.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/visualization/pyG4VisManager.cc b/source/visualization/pyG4VisManager.cc -index 33bb0d4..00f86a5 100644 ---- a/source/visualization/pyG4VisManager.cc -+++ b/source/visualization/pyG4VisManager.cc -@@ -41,7 +41,7 @@ using namespace boost::python; - // ==================================================================== - class PyG4VisManager : public G4VisManager { - public: -- PyG4VisManager() { SetVerboseLevel(quiet); } -+ PyG4VisManager() { SetVerboseLevel(all); } - ~PyG4VisManager() { } - - virtual void RegisterGraphicsSystems() { } diff --git a/sci-physics/geant-python/geant-python-4.9.3.ebuild b/sci-physics/geant-python/geant-python-4.9.3.ebuild deleted file mode 100644 index ab68958..0000000 --- a/sci-physics/geant-python/geant-python-4.9.3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5.ebuild,v 1.2 2012/05/21 04:49:12 heroxbd Exp $ - -EAPI=4 - -inherit python versionator - -MYP="geant$(replace_version_separator 3 .)" - -DESCRIPTION="this ebuild is only for geant4.9.3 on teena" -HOMEPAGE="http://geant4.cern.ch/" -# SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="geant4" -SLOT="0" -IUSE="examples" - -RDEPEND="=sci-physics/geant-${PV}* \ - dev-libs/boost[python]" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}/environments/g4py" - -src_unpack() { - mkdir -p "${S}" - cp -a ${G4INSTALL}/environments/g4py/* "${S}"/ -} - -src_prepare() { - # DISTDIR and python path patch - epatch "${FILESDIR}"/${P}-build.patch - - # fix the visManager wrapper - epatch "${FILESDIR}"/${PN}-4.9.5-vis-fix.patch - epatch "${FILESDIR}"/${P}-VisAtt.patch -} - -src_configure() { - case ${CHOST} in - x86_64-pc-linux-gnu) - ARG=linux64 - ;; - i?86-pc-linux-gnu) - ARG=linux - ;; - *) - die "platform unknown" - ;; - esac - - ./configure ${ARG} \ - --prefix="${EPREFIX}/usr" \ - --libdir="${ED}/$(python_get_sitedir)" \ - --with-g4-incdir="${G4INSTALL}/include/Geant4" \ - --with-g4-libdir="${G4INSTALL}/lib/Linux-g++" \ - --with-clhep-incdir="${EPREFIX}/usr/include" \ - --with-clhep-libdir="${EPREFIX}/usr/lib" \ - --with-python-incdir="${EPREFIX}$(python_get_includedir)" \ - --with-python-libdir="${EPREFIX}$(python_get_libdir)" \ - --with-boost-incdir="${EPREFIX}/usr/include" \ - --with-boost-libdir="${EPREFIX}/usr/lib" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${ED}" install - insinto /usr/share/doc/${PF} - dodoc 00README History AUTHORS - use examples && doins -r examples -} diff --git a/sci-physics/geant-python/geant-python-4.9.3_p02.ebuild b/sci-physics/geant-python/geant-python-4.9.3_p02.ebuild deleted file mode 100644 index e3db0eb..0000000 --- a/sci-physics/geant-python/geant-python-4.9.3_p02.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5.ebuild,v 1.2 2012/05/21 04:49:12 heroxbd Exp $ - -EAPI=4 - -inherit python versionator - -MYP="geant$(replace_version_separator 3 .)" - -DESCRIPTION="Python binding for geant" -HOMEPAGE="http://geant4.cern.ch/" -SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="geant4" -SLOT="0" -IUSE="examples" - -RDEPEND="=sci-physics/geant-${PV}* \ - dev-libs/boost[python]" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}/environments/g4py" - -src_prepare() { - # DISTDIR and python path patch - epatch "${FILESDIR}"/${PN}-4.9.3-build.patch - - # fix the visManager wrapper - epatch "${FILESDIR}"/${PN}-4.9.5-vis-fix.patch - - epatch "${FILESDIR}"/${PN}-4.9.5-TrkMan.patch - epatch "${FILESDIR}"/${PN}-4.9.3-VisAtt.patch - epatch "${FILESDIR}"/${PN}-4.9.3-RunMan.patch -} - -src_configure() { - case ${CHOST} in - x86_64-pc-linux-gnu) - ARG=linux64 - ;; - i?86-pc-linux-gnu) - ARG=linux - ;; - *) - die "platform unknown" - ;; - esac - - ./configure ${ARG} \ - --prefix="${EPREFIX}/usr" \ - --libdir="${ED}/$(python_get_sitedir)" \ - --with-g4-incdir="${EPREFIX}/usr/include/geant" \ - --with-g4-libdir="${EPREFIX}/usr/lib" \ - --with-clhep-incdir="${EPREFIX}/usr/include" \ - --with-clhep-libdir="${EPREFIX}/usr/lib" \ - --with-python-incdir="${EPREFIX}$(python_get_includedir)" \ - --with-python-libdir="${EPREFIX}$(python_get_libdir)" \ - --with-boost-incdir="${EPREFIX}/usr/include" \ - --with-boost-libdir="${EPREFIX}/usr/lib" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${ED}" install - insinto /usr/share/doc/${PF} - dodoc 00README History AUTHORS - use examples && doins -r examples -} diff --git a/sci-physics/geant-python/geant-python-4.9.5.ebuild b/sci-physics/geant-python/geant-python-4.9.5.ebuild deleted file mode 100644 index 7580ffc..0000000 --- a/sci-physics/geant-python/geant-python-4.9.5.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5.ebuild,v 1.2 2012/05/21 04:49:12 heroxbd Exp $ - -EAPI=4 - -inherit python versionator - -MYP="geant$(replace_version_separator 3 .)" - -DESCRIPTION="Python binding for geant" -HOMEPAGE="http://geant4.cern.ch/" -SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="geant4" -SLOT="0" -IUSE="examples" - -RDEPEND="=sci-physics/geant-${PV}* \ - dev-libs/boost[python]" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}/environments/g4py" - -src_prepare() { - # DISTDIR and python path patch - epatch "${FILESDIR}"/${PN}-4.9.5-build.patch - - # fix the visManager wrapper - epatch "${FILESDIR}"/${PN}-4.9.5-vis-fix.patch - - epatch "${FILESDIR}"/${PN}-4.9.5-TrkMan.patch -} - -src_configure() { - case ${CHOST} in - x86_64-pc-linux-gnu) - ARG=linux64 - ;; - i?86-pc-linux-gnu) - ARG=linux - ;; - *) - die "platform unknown" - ;; - esac - - ./configure ${ARG} \ - --prefix="${EPREFIX}/usr" \ - --libdir="${ED}/$(python_get_sitedir)" \ - --with-g4-incdir="${EPREFIX}/usr/include/Geant4" \ - --with-g4-libdir="${EPREFIX}/usr/lib" \ - --with-clhep-incdir="${EPREFIX}/usr/include" \ - --with-clhep-libdir="${EPREFIX}/usr/lib" \ - --with-python-incdir="${EPREFIX}$(python_get_includedir)" \ - --with-python-libdir="${EPREFIX}$(python_get_libdir)" \ - --with-boost-incdir="${EPREFIX}/usr/include" \ - --with-boost-libdir="${EPREFIX}/usr/lib" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${ED}" install - insinto /usr/share/doc/${PF} - dodoc 00README History AUTHORS - use examples && doins -r examples -} diff --git a/sci-physics/geant-python/geant-python-4.9.5_p01.ebuild b/sci-physics/geant-python/geant-python-4.9.5_p01.ebuild deleted file mode 100644 index 61b8f1c..0000000 --- a/sci-physics/geant-python/geant-python-4.9.5_p01.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant-python/geant-python-4.9.5_p01.ebuild,v 1.2 2012/05/20 16:48:17 heroxbd Exp $ - -EAPI=4 - -inherit python versionator - -MYP="geant$(replace_version_separator 3 .)" - -DESCRIPTION="Python binding for geant" -HOMEPAGE="http://geant4.cern.ch/" -SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="geant4" -SLOT="0" -IUSE="examples" - -RDEPEND="=sci-physics/geant-${PV}* \ - dev-libs/boost[python]" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}/environments/g4py" - -src_prepare() { - # DISTDIR and python path patch - epatch "${FILESDIR}"/${PN}-4.9.5-build.patch - - # set to the highest verbose for visManager - epatch "${FILESDIR}"/${PN}-4.9.5-visverbose.patch - - # let Geant4 module installed into python sitedir instead of default - sed -i "/G4PY_LIBDIR :=/cG4PY_LIBDIR := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \ - config/install.gmk || die "sed failed on config/install.gmk" - for mfile in source/python{3,}/GNUmakefile - do - sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/Geant4" \ - "${mfile}" || die "sed failed on ${mfile}" - done - - # let g4py module installed into python sitedir instead of default - sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \ - config/site-install.gmk || die "sed failed on config/site-install.gmk" - for mfile in {processes/emcalculator,utils/MCScore}/{python3/,}GNUmakefile python/GNUmakefile - do - sed -i "/install_dir :=/cinstall_dir := $\(DESTDIR\)$(python_get_sitedir)/g4py" \ - "site-modules/${mfile}" || die "sed failed on site-modules/${mfile}" - done -} - -src_configure() { - case ${CHOST} in - x86_64-pc-linux-gnu) - ARG=linux64 - ;; - i?86-pc-linux-gnu) - ARG=linux - ;; - *) - die "platform unknown" - ;; - esac - - ./configure ${ARG} \ - --prefix="${EPREFIX}/usr" \ - --with-g4-incdir="${EPREFIX}/usr/include/Geant4" \ - --with-g4-libdir="${EPREFIX}/usr/lib" \ - --with-clhep-incdir="${EPREFIX}/usr/include" \ - --with-clhep-libdir="${EPREFIX}/usr/lib" \ - --with-python-incdir="${EPREFIX}$(python_get_includedir)" \ - --with-python-libdir="${EPREFIX}$(python_get_libdir)" \ - --with-boost-incdir="${EPREFIX}/usr/include" \ - --with-boost-libdir="${EPREFIX}/usr/lib" \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${ED}" install - insinto /usr/share/doc/${PF} - dodoc 00README History AUTHORS - use examples && doins -r examples -} diff --git a/sci-physics/geant-python/metadata.xml b/sci-physics/geant-python/metadata.xml deleted file mode 100644 index c7e8266..0000000 --- a/sci-physics/geant-python/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> - <herd>sci-physics</herd> - <longdescription lang="en"> -Python binding to Geant 4. -</longdescription> -</pkgmetadata> diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog deleted file mode 100644 index 7ebdd24..0000000 --- a/sci-physics/geant/ChangeLog +++ /dev/null @@ -1,323 +0,0 @@ -# ChangeLog for sci-physics/geant -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.64 2012/06/16 13:08:36 ago Exp $ - - 16 Jun 2012; Agostino Sarubbo <ago@gentoo.org> geant-4.9.4_p03.ebuild: - Stable for amd64, wrt bug #420295 - - 20 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild, - geant-4.9.5_p01.ebuild: - I have massed up the keywords and Changelog with blind rsync with my overlay. - This is just a fix. - - 20 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5-r1.ebuild, - +files/geant-4.9.5_p01-scripts-only-dataenv.patch, - files/geant-4.9.5-scripts-only-dataenv.patch: - add back geant-4.9.5-r1.ebuild because geant-python cannot function correctly - with 4.9.5_p01, upstream http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1317 - -*geant-4.9.5_p01 (19 May 2012) - - 19 May 2012; Benda Xu <heroxbd@gentoo.org> +geant-4.9.5_p01.ebuild, - -geant-4.9.5-r1.ebuild, files/geant-4.9.4-zlib.patch, - files/geant-4.9.5-scripts-only-dataenv.patch: - version bump to 4.9.5_p01 - - 19 May 2012; Benda Xu <heroxbd@gentoo.org> geant-4.9.5-r1.ebuild: - delete the wrong sed phrase. - - 18 May 2012; Benda Xu <heroxbd@gentoo.org> - +files/geant-4.9.5-scripts-only-dataenv.patch, geant-4.9.5-r1.ebuild: - keyword amd64-linux and x86-linux; handle data dir via envd; fix clhep linking - - 16 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.5.ebuild, - geant-4.9.5-r1.ebuild: - Fix for openinventor to use SGI OpenInventor in portage instead of SoXt, bug - #408187 - -*geant-4.9.5-r1 (13 Mar 2012) - - 13 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> - files/geant-4.9.4-zlib.patch, +geant-4.9.5-r1.ebuild: - Fixed more zlib issues. The geant3 flag is now only for unit conversion (if - geant3 is needed, geant:3 has to be installed from user). The data is now - fetched (building needs network) to ease maintenance and set up the proper - env variables in the geant4*sh scripts. Removed a use dawn duplicate. Thanks - Marek Szuba for his suggestions (bug #407517 and bug #359673). Added a - message for backward compatibility (bug #360285) - -*geant-4.9.5 (18 Dec 2011) -*geant-4.9.4_p03 (18 Dec 2011) - - 18 Dec 2011; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.3_p02-r1.ebuild, -geant-4.9.4_p01.ebuild, +geant-4.9.4_p03.ebuild, - +files/geant-4.9.4-trajectory.patch, files/geant-4.9.4-zlib.patch, - +geant-4.9.5.ebuild: - Version bumps. Re-introduced some older flags and fixed linking of - zlib. Added patch for source trajectory example (bug #365171), thanks Matthias Nagl. - - 02 Aug 2011; Matt Turner <mattst88@gentoo.org> geant-4.9.2_p02.ebuild, - geant-4.9.3_p02-r1.ebuild: - Renamed x11-libs/Xaw3d to x11-libs/libXaw3d. - -*geant-3.21.14-r3 (21 Jul 2011) - - 21 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> - +geant-3.21.14-r3.ebuild: - New debian patch set. Switch to EAPI4 - - 28 Jun 2011; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild, - metadata.xml: - Fix sed on *FLAGS from : to |, EAPI bump - - 21 Jun 2011; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild: - Add dependency on virtual/fortran - - 21 Jun 2011; Justin Lecher <jlec@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild: - Added fortran-2.eclass support - - 07 Jun 2011; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4_p01.ebuild: - Drop HPPA keywording. - - 22 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> geant-4.9.4_p01.ebuild: - Proper CMake optional use bug #359437 thanks Rafal Lalik - -*geant-4.9.4_p01 (18 Mar 2011) - - 18 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.4.ebuild, - +geant-4.9.4_p01.ebuild: - Version bump. Unm Unmasking. - - 13 Feb 2011; Raúl Porcel <armin76@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p02-r1.ebuild, geant-4.9.4.ebuild: - Drop sparc keywords - - 07 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> geant-4.9.4.ebuild: - Fixed a forgotten flag, thanks Rafal Lalik bug #353740 - -*geant-4.9.4 (22 Jan 2011) - - 22 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.3_p02-r1.ebuild, files/geant-4.9.3-zlib.patch, +geant-4.9.4.ebuild, - +files/geant-4.9.4-datadir.patch, +files/geant-4.9.4-libdir.patch, - +files/geant-4.9.4-no-benchmarks.patch, +files/geant-4.9.4-no-examples.patch, - +files/geant-4.9.4-zlib.patch, metadata.xml: - Version bump, switched to cmake. Fixed Qt drivers bug #263450, bug #347279. - Removed G4WORKDIR bug #345855. - -*geant-4.9.3_p02-r1 (07 Nov 2010) - - 07 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> - -geant-4.9.3_p01.ebuild, -geant-4.9.3_p02.ebuild, - +geant-4.9.3_p02-r1.ebuild, +files/geant-4.9.3-respect_flags.patch: - Fix building with --as-needed wrt bug 344119, respect CXX. Drop old. - - 10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild, geant-4.9.3_p01.ebuild, geant-4.9.3_p02.ebuild: - Fix openmotif dependency. - -*geant-4.9.3_p02 (29 Sep 2010) - - 29 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org> - +geant-4.9.3_p02.ebuild: - Version bump - - 12 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2_p02.ebuild, -geant-4.9.3.ebuild, geant-4.9.3_p01.ebuild: - Change clhep dependency, clhep-2.1 api incompatible - -*geant-4.9.3_p01 (27 Apr 2010) - - 27 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> - +geant-4.9.3_p01.ebuild: - Version bump. Switched static flag to static-libs - -*geant-4.9.3 (08 Jan 2010) - - 08 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.2-r2.ebuild, +geant-4.9.3.ebuild, - +files/geant-4.9.3-zlib.patch: - Version bump, thanks Ben Bannier - - 26 Dec 2009; Raúl Porcel <armin76@gentoo.org> geant-4.9.2_p02.ebuild: - sparc stable wrt #294442 - - 10 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2_p02.ebuild: - Propagate compiler correctly, bug #296043 - - 07 Dec 2009; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild, - geant-4.9.2_p02.ebuild: - Stable for HPPA (bug #294442). - - 04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-3.21.14-r2.ebuild: - Re-changing to old style patching at least until patch-2.6 is not buggy - and masked - - 26 Nov 2009; Markus Meier <maekke@gentoo.org> geant-4.9.2_p02.ebuild: - amd64 stable, bug #294442 - - 26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-3.21.14-r2.ebuild: - Fixing patch application with more recent versions - - 26 Nov 2009; Christian Faulhammer <fauli@gentoo.org> - geant-4.9.2_p02.ebuild: - stable x86, bug 294442 - - 06 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> geant-4.9.2-r2.ebuild, - geant-4.9.2_p02.ebuild: - Removed alternative dependency on Qt metapackage - -*geant-4.9.2_p02 (23 Sep 2009) - - 23 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.1_p03.ebuild, -geant-4.9.2_p01.ebuild, +geant-4.9.2_p02.ebuild, - metadata.xml: - Version bump. Added aida USE flag, fixed Qt and GDML build options, - hopefully fixing examples compiling (bug #260102), thanks Matej and - Giovanni Fattori for their input - - 05 May 2009; Christian Faulhammer <fauli@gentoo.org> - geant-3.21.14-r2.ebuild, geant-4.9.2-r2.ebuild: - stable x86, bug 245875 - - 17 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> geant-3.21.14-r2: - Fixed some latex font generation and made ebuild consistent with other - cernlib ebuilds - - 23 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2-r2.ebuild: - Added building of opengl qt4 driver, thanks merkel@kph.uni-mainz.de (bug - #263450) for noticing - - 22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> geant-4.9.2-r2.ebuild: - amd64 stable, bug 245875 - - 22 Mar 2009; Jeremy Olexa <darkside@gentoo.org> geant-3.21.14-r2.ebuild: - amd64 stable, bug 245875 - -*geant-4.9.2_p01 (18 Mar 2009) - - 18 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-3.21.14-r2.ebuild, +geant-4.9.2_p01.ebuild: - Version bump (bug fixes only) - - 05 Mar 2009; Ferris McCormick <fmccor@gentoo.org> geant-4.9.2-r2.ebuild: - Sparc stable, although early. See Bug #245875 --- needed for gcc-4.3 (Bug - #245160). - - 05 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.2-r2.ebuild: - Fixed linking qt4 libraries, added G4WORKDIR to make it work on paludis - and a bit of ebuild cleaning - - 03 Mar 2009; Ferris McCormick <fmccor@gentoo.org> geant-3.21.14-r2.ebuild: - Sparc stable, part of Bug #245875. - -*geant-4.9.2-r2 (27 Feb 2009) - - 27 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> -geant-4.9.2.ebuild, - -geant-4.9.2-r1.ebuild, +geant-4.9.2-r2.ebuild: - Adding fixes from Benjamin Bannier to include linking when building - examples, and a syntax error caught by Matej Batic, see bug #260102 - -*geant-4.9.2-r1 (19 Jan 2009) - - 19 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> - +files/geant-4.9.2-zlib.patch, +geant-4.9.2-r1.ebuild: - Added a patch to avoid linking to G4zlib, closing bug #255017, thanks to - Benjamin Bannier for the hint - -*geant-4.9.2 (10 Jan 2009) - - 10 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> +geant-4.9.2.ebuild: - Version bump. Switched to EAPI=2, added qt4 support, updated data files, - updated minimum dependencies, and now propagate LDFLAGS. Closing bug #253769. - - 24 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> - -geant-4.9.1_p02.ebuild, geant-4.9.1_p03.ebuild: - Removed bundled zlib, closing bug #248423 - -*geant-4.9.1_p03 (23 Sep 2008) - - 23 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> - +geant-4.9.1_p03.ebuild: - Version bump. Closing bug #238132. - - 06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 17 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.1_p02.ebuild: - Fixed the make global step to not remove previous built granula libaries, - see bug #231314, thanks Benjamin Bannier. - - 15 Jul 2008; Ferris McCormick <fmccor@gentoo.org> geant-4.9.1_p02.ebuild: - Add ~sparc for testing and for sci-physics/root --- Bug #230716 which see - for comments. - - 15 Jul 2008; Ferris McCormick <fmccor@gentoo.org> geant-3.21.14-r2.ebuild: - Add ~sparc for testing, dependency required for Bug #230716. - - 15 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-4.9.1_p02.ebuild: - Marked ~hppa (bug #230716). - - 14 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild: - Marked ~hppa (bug #230716). - - 10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> - geant-4.9.1_p02.ebuild: - Fix some global libraries issues, see bug #231314, thanks Benjamin Bannier - for his patch. - - 06 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r1.ebuild: - Fix duplicate KEYWORDS definition. - - 06 Jul 2008; Jeroen Roovers <jer@gentoo.org> geant-3.21.14-r2.ebuild: - Fix duplicate KEYWORDS definition. - - 29 Jun 2008; Torsten Veller <tove@gentoo.org> geant-3.21.14-r1.ebuild, - geant-3.21.14-r2.ebuild: - Add missing die: || "..." -> || die "..." - - 27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> geant-3.21.14-r1.ebuild, - geant-3.21.14-r2.ebuild, geant-4.9.1_p02.ebuild: - Change dependency from virtual/motif to x11-libs/openmotif, bug 224749. - -*geant-4.9.1_p02 (06 Jun 2008) -*geant-3.21.14-r2 (06 Jun 2008) - - 06 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml, - -geant-3.21.14.ebuild, +geant-3.21.14-r2.ebuild, +geant-4.9.1_p02.ebuild: - Added major version bump for geant-4, slotted. Thanks much to Benjamin - Bennier for his work (bug #212221). Now geant-3 is also slotted, and got a - revision bump - -*geant-4.9.1_p02 (06 Jun 2008) -*geant-3.21.14-r2 (06 Jun 2008) - - 06 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml, - -geant-3.21.14.ebuild, +geant-3.21.14-r2.ebuild, +geant-4.9.1_p02.ebuild: - Added major version bump for geant-4, slotted. Thanks much to Benjamin - Bennier for his work (bug #212221). Now geant-3 is also slotted, and got a - revision bump - -*geant-3.21.14-r1 (11 Mar 2008) - - 11 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> - +geant-3.21.14-r1.ebuild: - New series of patches from Debian, more compatible with gfortran and better - tests. Much ebuild cleaning. - -*geant-3.21.14 (24 Aug 2007) - - 24 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml, - +geant-3.21.14.ebuild: - Initial import. - diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest deleted file mode 100644 index 7e17621..0000000 --- a/sci-physics/geant/Manifest +++ /dev/null @@ -1,41 +0,0 @@ -AUX geant-4.9.2-zlib.patch 239 RMD160 790953077b7fc59d1ce7c3ed98cdb3dcc3134705 SHA1 7a0552dab08873665b8668a21a8c52841c8e5ae2 SHA256 f5ceee577afeb719718cd23887f9c1eba322077dce1f3d89bc075bacd63e5573 -AUX geant-4.9.3-respect_flags.patch 3731 RMD160 b7ab40cbda0557639605bc9d8285a48af893f3c7 SHA1 88c4cdede3a86d1c41e589ece95a7fc6d74969dc SHA256 7b877a11325a9eb8bc208473622f03189a47b42d01e6fc53836f2aa70b282739 -AUX geant-4.9.3-zlib.patch 613 RMD160 192c6ac17d47eee4c9f116ceb96850e12390455a SHA1 070e01d43cb953e5bfbbefdbdbb5433ea583c54e SHA256 9b83cd998fa08c4312f0a56c1e72f7611217b1bde4b8553fd5e6735592b6cfc1 -AUX geant-4.9.4-datadir.patch 2203 RMD160 251419f9780cda5a7eb527201da9568af34da0f1 SHA1 761b40db8d3ad73fbf4f3004f902db64c668f576 SHA256 3c97d883732299ecb008d6c114d92556a937b93966ec21fb612809b03d0a95f8 -AUX geant-4.9.4-libdir.patch 1328 RMD160 518d42f5e9263828c3f90fdbde3d1d352d4b21a8 SHA1 8bd752545466909bee69adc89850f0529ed1a4ef SHA256 36f43915868ea87f2b80c9ea360b24726389a8839ef06323e58a08fdf5833338 -AUX geant-4.9.4-no-benchmarks.patch 370 RMD160 759b19161b950963a04cb6bd7b7dadb918c7fd08 SHA1 8c1bec8775809e5e4655269ee136f294204151c6 SHA256 5ff40079b5669335b1701831fba3922b525d2fdd594704750111d7eaea45b693 -AUX geant-4.9.4-no-examples.patch 486 RMD160 7ef349c41d31041af9b5edfd3e82c5fbcfbbae6a SHA1 314a826f5671edbc237e7a960d8c944af3463560 SHA256 4ae8e7bc5790b5cb207d440bd3c05e81196528517af2f32c0e3483ed41d12d99 -AUX geant-4.9.4-trajectory.patch 390 RMD160 4e654e0ff42c2c1b1c2320e2deb6f8ff0f3d45e6 SHA1 2adba855b88f7461d4dc14dfa4e958c97e90c682 SHA256 6e4c0b2a44960411132130d379f6c9a7f867a656e4851ac9b1fd584685ae204c -AUX geant-4.9.4-zlib.patch 1014 RMD160 bbafd66c1014a84cc8a7445a26f2314e4abb359f SHA1 f1c2ec1e8fa514f4dd2d22ec88d6217a24dc03b4 SHA256 fa7d09b2a481b9183f6f1518e2490458b616c41a90824e6d6a37ca08bddc06b5 -AUX geant-4.9.5-scripts-only-dataenv.patch 2046 RMD160 0ca3d69afc2fdf07ad0dfb0ed256434ba8b5ebde SHA1 1777776d7b7435a27aec9c97cc9f2da69c6f7802 SHA256 1b878d401e117337d0d6c6b65fea33716eb482d3ddc243fa19c705474274f12a -AUX geant-4.9.5_p01-scripts-only-dataenv.patch 2047 RMD160 6811e289da2f3b874f93ea9db7627f8baae995fb SHA1 f24fcb10cca91d866630fdc50172c046844af79a SHA256 db809c4866129cb9c9f2eabdf3e0decf25a3f97b8a4742a6de5b76ff3ce452f6 -DIST G4ABLA.3.0.tar.gz 54909 RMD160 5a032ee8e90d00f39b67114fe257ec47001f347b SHA1 5f38676f1650a508e49d35f9405ac96984388135 SHA256 ff0b77be6b36204eeeba71099f6b7530edd80b79eb015994535bc4334bc821eb -DIST G4EMLOW.6.19.tar.gz 14396144 RMD160 ba67b3f1ee215966adc99661a1db4a5bf09c5511 SHA1 f63e41a43a3d0c793a04dbb6cce0bdcfeedf6889 SHA256 8876defe74e4c1e9d6b58b2365a9b468ac8d996fb63fa1c6ba6240e0b185845f -DIST G4EMLOW.6.2.tar.gz 8389172 SHA256 1affbc66d8809db0c8e450ca83a0da744e7f5b8e912ec52e93b1f24b47cbd781 -DIST G4EMLOW.6.9.tar.gz 11203887 RMD160 8306a6af7ec41ec16790df2130b4f9b437bb7d9e SHA1 d4d026f96990d4ed15a6b550b1990ba335248965 SHA256 4b84114b62a6085f5955094437f5ca8383f758ecb3e23fbfa433012b8e10b962 -DIST G4NDL.3.13.tar.gz 57034762 RMD160 243b206170d996c7b562a86e388ff4d5f8d11764 SHA1 4acc412a2f29a7a8f84ac50aeb7331c8ed2889ae SHA256 e994b873032b3d1c0bcc2679275c43354d3e1cd5091da76c8fcd4826536f17a3 -DIST G4NDL.3.14.tar.gz 58794491 RMD160 8393b5e0301526ec747da133b6972c70b8c44210 SHA1 dc8b7a5fa0fcd06a85071c1b09730de6d04362d3 SHA256 08ff1d4fb0953f2502d88f76fb9db1d4314c975564731f11c9372d0ea992cafa -DIST G4NEUTRONXS.1.0.tar.gz 1186619 SHA256 577d28b7faa41caacb001a30384028cd5e3b7018755ab94a427ce0a7feeab365 -DIST G4PII.1.2.tar.gz 3387814 RMD160 6f7553941ce2130c7f463a2ec7613c801792ccfb SHA1 65e72c1507370c0cdbc2505bb02083e04fd5667c SHA256 80e680d7343ed051bcfffd910c682cfd66980cecd1c0bc435f06c6c740a6f99d -DIST G4PhotonEvaporation.2.1.tar.gz 7504003 SHA256 08ab657a060518c9b7aab03b17628cbb31585ee9512e0f2033f2fb0d7d9b2bc7 -DIST G4RadioactiveDecay.3.2.tar.gz 761070 RMD160 1f797977c0c66722f4b032ac546c26eaa8a9f14a SHA1 45e706e46a33e08b1706f069d15e8c2145f3410e SHA256 31dc70aa59cb86ef0dbaf96c639e0541b7569d4fc98f92064ecdc8bc4b9c839b -DIST G4RadioactiveDecay.3.3.tar.gz 732628 SHA256 7f421d6808422f9186a8a96fc1889a54af03c80a37b9f9d1d51ab359ea0264d1 -DIST PhotonEvaporation.2.0.tar.gz 7506068 RMD160 24d46b08b2ffeca5b3be186baffb650b99accc97 SHA1 df3b4994c7248da7a226c186be747c4b823d34fa SHA256 5aac0ce683ca23274a7736c8e8911d8cf32d2bf33aab33a9a23126664762d61d -DIST RealSurface.1.0.tar.gz 1257863 RMD160 030513fe340e0cccbfe0b9ae9acb3ba6b5291ebb SHA1 9b4bd95c647dc702458eeaf89ebf62c5885e2ece SHA256 3e2d2506600d2780ed903f1f2681962e208039329347c58ba1916740679020b1 -DIST geant321_3.21.14.dfsg-8.diff.gz 41909 RMD160 4edbe5d3dd93a78198fa2d2d83770c8b85eee4de SHA1 39f48c4263f543b74eee6095c11f5ade9798f253 SHA256 785277dab1e1d3e17d60c85f3826bc67bbd6de7e6a6d40ff7af901371c4d2ce1 -DIST geant321_3.21.14.dfsg-9.diff.gz 47589 RMD160 78561bba0c79a13d34f64c4594cf73019b3f8a0a SHA1 1622441f91e850e1918e6e686d2ae44b0348f243 SHA256 419bc2315e2692fe84b353d445cbae7af995d84a6a0290b7f9051ee041243d20 -DIST geant321_3.21.14.dfsg.orig.tar.gz 10922928 SHA256 186fe98a08ad1de39f68698a09a46e7c2f14c37b22f8f990257b0bd66215c5b4 -DIST geant4.9.2.p02.tar.gz 18822956 SHA256 4d19bb76bf956004481bc433bf4735780ccc6354d3dc53321d532fd283243078 -DIST geant4.9.3.p02.tar.gz 20009687 RMD160 3fc3ce68965666670a2cf6e7dbe93c00b305fc30 SHA1 1728ea641ecb7ff50d2f44366add3a7569967839 SHA256 9fed501a6b0fed9050655633998acb942f7be430711e08f234dd748c23037a90 -DIST geant4.9.4.p03.tar.gz 25241424 RMD160 af3a64517bac181366c3a680d3723fbe7edd3ebb SHA1 4d1f46471446c210a85edae8d4759803e55bea28 SHA256 5090ca5b506238f16ba2ae2176221a18b6fde06f91180850a109fae1006910c0 -DIST geant4.9.5.p01.tar.gz 28466803 SHA256 451f8c4a29bb0dc4b923d59d77535a657f0f8a30dc6c8ef639c8b1ebdb26a10e -DIST geant4.9.5.tar.gz 28458437 SHA256 b6b31752319805052fb765f89ca38a23fb299a0a5bf900daeacd1950d6c9a597 -EBUILD geant-3.21.14-r2.ebuild 1885 RMD160 2022b046c7f52a4687948387cd7a084e2b0d19e1 SHA1 ea5a80bb06da07183946a96db02e2d0158b24312 SHA256 6d410dc45b374c86bd34c3ca3eaa740fc5eb91dcb91df86497b6c906e4577d93 -EBUILD geant-3.21.14-r3.ebuild 1719 RMD160 7158c53cb2f0e1098fd5f6d5249029fffe35cf3a SHA1 10f67d4d0c17aab06ce4f50fa3f2393a792c426b SHA256 5bb8f71e86a5f5562f0aab9f86f14937e863dffd2b9e1bb502fd5ba9a120f1b9 -EBUILD geant-4.9.2_p02.ebuild 8145 RMD160 3d1a138202fe2e3151ad684c18cec0e7a4dccbfc SHA1 d813033ebcae3ef491aae7a9a794ef63a8813d8d SHA256 02920927f1eb081a9753f7ac9c8a282d036955750796bbbd6b007fa55f6c1e26 -EBUILD geant-4.9.3_p02.ebuild 8119 RMD160 818e90c10d2d403da1e42149d135e9393864c2da SHA1 1bef82b52713da6b85add2cd98ef9d18a4725b06 SHA256 e057b0bd6aa46df7b5299ffd2511c4f13bde4efc0761f90e8006f17b4395c886 -EBUILD geant-4.9.4_p03.ebuild 2392 RMD160 7bd5153614325bbf54c04a985da2e0562f7fa78a SHA1 9457c7f0a07fa76f33d3e2699aee703e3f4cc521 SHA256 2787a6dc246f3b047cd8d12c0287da3a51e7a5b153cf4f64f7984683fb7ca4c3 -EBUILD geant-4.9.5-r1.ebuild 3051 RMD160 1fb92013250a9f81b79c06fcc3bcdf7d2c3ed164 SHA1 ceaf06daf6e40d971712096ea62de7808a4f5d7f SHA256 d6f7e35a8b1e21333d1103918e5b2ce0c2b05cc48bd821c2104428694dcf2f08 -EBUILD geant-4.9.5_p01.ebuild 3045 RMD160 c3effd68c1be99dcf26e4183358e2e851b72e239 SHA1 424b1174dc4dc985caab7f864c9235754fac6e37 SHA256 0eb89ba5632b5025a27db108a66f2aa86fbc55577cf64ed33f1401f13a12a2d6 -MISC ChangeLog 12364 RMD160 4b3e24b5bfc1f654458644d1f64acf5ddebd5468 SHA1 bfd3c28e6ca815571dff31eae0cde2674860dfc6 SHA256 95a9bbeedebd53e60b294350d1cb41acfe8bf6cca5742f16089780a91aec146e -MISC metadata.xml 1569 RMD160 b4e64715d0d29b17b7fc46da45f4ebbff41fc380 SHA1 b30f9de8adea84a688b1343115afa304d5b0de4f SHA256 532c396760c97bbf207439e4f189679bbe02fda61d33446beeebc5f855b36f63 diff --git a/sci-physics/geant/files/geant-4.9.2-zlib.patch b/sci-physics/geant/files/geant-4.9.2-zlib.patch deleted file mode 100644 index 7b33733..0000000 --- a/sci-physics/geant/files/geant-4.9.2-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- config/binmake.gmk.orig 2009-01-19 16:37:42.177379773 +0000 -+++ config/binmake.gmk 2009-01-19 16:38:04.671541248 +0000 -@@ -258,7 +258,7 @@ - endif - endif - --ifdef G4LIB_USE_ZLIB -+ifdef G4LIB_BUILD_ZLIB - LDLIBS2 += -lG4zlib - endif - diff --git a/sci-physics/geant/files/geant-4.9.3-respect_flags.patch b/sci-physics/geant/files/geant-4.9.3-respect_flags.patch deleted file mode 100644 index 52a7caf..0000000 --- a/sci-physics/geant/files/geant-4.9.3-respect_flags.patch +++ /dev/null @@ -1,125 +0,0 @@ -Respect CXX, compiler flags -Fix build with --as-needed - -http://bugs.gentoo.org/show_bug.cgi?id=344119 - ---- config/sys/Linux-g++.gmk -+++ config/sys/Linux-g++.gmk -@@ -2,9 +2,7 @@ - # ------ GNU/LINUX ------ gcc 3.2 and higher - # - ifeq ($(G4SYSTEM),Linux-g++) -- CXX := g++ -- CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long -- CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe -+ CXXFLAGS += -ansi - # - # Uncomment the following options to activate Pentium4 chip specific - # floating-point operations on the SSE unit. It will allow for more stable -@@ -14,27 +12,16 @@ - # platforms. Will only run on Pentium4-based architectures ! - # - # CXXFLAGS += -march=pentium4 -mfpmath=sse -- ifdef G4OPTIMISE -- CXXFLAGS += -O2 -- FCFLAGS := -O2 -- CCFLAGS := -O2 -- else -- ifdef G4DEBUG -+ ifdef G4DEBUG - CXXFLAGS += -g -- FCFLAGS := -g -- CCFLAGS := -g -- endif -+ FCFLAGS += -g -+ CCFLAGS += -g - endif - ifdef G4PROFILE - CXXFLAGS += -pg - FCFLAGS += -pg - CCFLAGS += -pg - endif -- ifdef G4OPTDEBUG -- CXXFLAGS += -O2 -g -- FCFLAGS += -O2 -g -- CCFLAGS += -O2 -g -- endif - ifdef G4LIB_BUILD_SHARED - CXXFLAGS += -fPIC - FCFLAGS += -fPIC -@@ -42,7 +29,6 @@ - endif - G4RUNPATHOPTION := -Wl,-rpath - CC := gcc -- FC := gfortran - FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore - FCLIBS := -lg2c -lnsl - ECHO := /bin/echo -e -@@ -108,7 +94,7 @@ - endif - ifndef QTLIBPATH - QTLIBPATH := $(QTHOME)/lib -- QT_SEARCH_LIB := $(shell ls $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l ) -+ QT_SEARCH_LIB := $(shell ls $(QTLIBPATH)/qt$(QT_VERSION)/lib[q,Q]t* 2>/dev/null | wc -l ) - ifneq ($(QT_SEARCH_LIB),0) - QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION) - endif -@@ -140,13 +126,13 @@ - define build-granular-shared-lib - @libdir=`(cd $(@D);/bin/pwd)`; \ - cd $(G4TMPDIR); \ -- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o $(INTYLIBS); - endef - define build-global-shared-lib - @libdir=`(cd $(@D);/bin/pwd)`; \ - cd $(G4TMP)/$(G4SYSTEM); \ -- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \ -- $(foreach dir,$(SUBLIBS),$(dir)/*.o); -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \ -+ $(foreach dir,$(SUBLIBS),$(dir)/*.o) $(INTYLIBS); - endef - - endif ---- config/sys/Linux-icc.gmk -+++ config/sys/Linux-icc.gmk -@@ -3,17 +3,11 @@ - # - ifeq ($(G4SYSTEM),Linux-icc) - CXX := icc -- CXXFLAGS := -ansi -fp-model precise -no-gcc -w1 -- ifdef G4OPTIMISE -- CXXFLAGS += -O2 -- FCFLAGS := -O2 -- CCFLAGS := -O2 -- else -- ifdef G4DEBUG -- CXXFLAGS += -g -- FCFLAGS := -g -- CCFLAGS := -g -- endif -+ CXXFLAGS += -ansi -+ ifdef G4DEBUG -+ CXXFLAGS += -g -+ FCFLAGS += -g -+ CCFLAGS += -g - endif - ifdef G4PROFILE - CXXFLAGS += -qp -@@ -61,13 +55,13 @@ - define build-granular-shared-lib - @libdir=`(cd $(@D);/bin/pwd)`; \ - cd $(G4TMPDIR); \ -- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o $(INTYLIBS); - endef - define build-global-shared-lib - @libdir=`(cd $(@D);/bin/pwd)`; \ - cd $(G4TMP)/$(G4SYSTEM); \ -- $(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \ -- $(foreach dir,$(SUBLIBS),$(dir)/*.o); -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \ -+ $(foreach dir,$(SUBLIBS),$(dir)/*.o) $(INTYLIBS); - endef - - endif diff --git a/sci-physics/geant/files/geant-4.9.3-zlib.patch b/sci-physics/geant/files/geant-4.9.3-zlib.patch deleted file mode 100644 index f047abd..0000000 --- a/sci-physics/geant/files/geant-4.9.3-zlib.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- config/binmake.gmk.orig -+++ config/binmake.gmk -@@ -234,7 +234,7 @@ ifdef GLOBALLIBS - -lG4intercoms \ - -lG4global - -- ifdef G4LIB_USE_ZLIB -+ ifdef G4LIB_BUILD_ZLIB - LDLIBS2 += -lG4zlib - endif - - ---- config/architecture.gmk.orig 2011-01-16 00:22:05.976079082 +0000 -+++ config/architecture.gmk 2011-01-16 00:23:18.346082379 +0000 -@@ -214,8 +214,10 @@ - else - LDFLAGS += -L$(CLHEP_LIB_DIR) - LOADLIBS := -l$(CLHEP_LIB) -lm -- ifndef G4LIB_USE_ZLIB -- LOADLIBS += -lz -+ ifdef G4LIB_USE_ZLIB -+ ifndef G4LIB_BUILD_ZLIB -+ LOADLIBS += -lz -+ endif - endif - endif - diff --git a/sci-physics/geant/files/geant-4.9.4-datadir.patch b/sci-physics/geant/files/geant-4.9.4-datadir.patch deleted file mode 100644 index c691d90..0000000 --- a/sci-physics/geant/files/geant-4.9.4-datadir.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake.orig 2011-01-22 00:49:11.096082056 +0000 -+++ cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake 2011-01-22 00:53:04.746078920 +0000 -@@ -74,9 +74,9 @@ - # Construct backward compatible variables - # - set(G4SYSTEM "${GEANT4_SYSTEM}-${GEANT4_COMPILER}") --set(G4INSTALL ${GEANT4_DATADIR}/geant4-${geant4_VERSION}) -+set(G4INSTALL ${GEANT4_DATADIR}/geant4) - set(G4INCLUDE ${GEANT4_INCLUDEDIR}/geant4) --set(G4LIB ${GEANT4_LIBDIR}/geant4-${geant4_VERSION}) -+set(G4LIB ${GEANT4_LIBDIR}/geant4) - - message(STATUS "Geant4 backwards compatible variable G4SYSTEM : ${G4SYSTEM}") - message(STATUS "Geant4 backwards compatible variable G4INSTALL: ${G4INSTALL}") -@@ -125,7 +125,7 @@ - # Install targets - # toolchain - install(DIRECTORY config -- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION} -+ DESTINATION ${GEANT4_DATAROOTDIR}/geant4 - FILES_MATCHING PATTERN "*.gmk" - PATTERN "CVS" EXCLUDE - PATTERN "scripts/" EXCLUDE) -@@ -134,16 +134,16 @@ - install(FILES - ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.sh - ${CMAKE_BINARY_DIR}/outputs/runtime/geant4-${geant4_VERSION}.csh -- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION}/config -+ DESTINATION ${GEANT4_DATAROOTDIR}/geant4/config - PERMISSIONS - OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) - - # compatibility softlink to library directory -- install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})") -+ install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E make_directory \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)") - -- install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4-${geant4_VERSION})") -+ install(CODE "execute_process(COMMAND \${CMAKE_COMMAND} -E create_symlink .. ${GEANT4_SYSTEM}-${GEANT4_COMPILER} WORKING_DIRECTORY \$ENV{DESTDIR}${GEANT4_LIBDIR}/geant4)") - - endif() - diff --git a/sci-physics/geant/files/geant-4.9.4-libdir.patch b/sci-physics/geant/files/geant-4.9.4-libdir.patch deleted file mode 100644 index 8934f73..0000000 --- a/sci-physics/geant/files/geant-4.9.4-libdir.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- CMakeLists.txt.orig 2011-01-17 06:25:14.536078940 +0000 -+++ CMakeLists.txt 2011-01-21 23:50:53.406082074 +0000 -@@ -195,7 +195,7 @@ - set(GEANT4_PREFIX ${CMAKE_INSTALL_PREFIX}) - set(GEANT4_EXEC_PREFIX ${GEANT4_PREFIX}) - set(GEANT4_BINDIR ${GEANT4_EXEC_PREFIX}/bin) --set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib) -+set(GEANT4_LIBDIR ${GEANT4_PREFIX}/lib${LIB_SUFFIX}) - set(GEANT4_DATAROOTDIR ${GEANT4_PREFIX}/share) - set(GEANT4_DATADIR ${GEANT4_DATAROOTDIR}) - set(GEANT4_INCLUDEDIR ${GEANT4_PREFIX}/include) ---- cmake/Modules/Geant4MacroLibraryTargets.cmake.orig 2011-01-21 23:36:09.356079013 +0000 -+++ cmake/Modules/Geant4MacroLibraryTargets.cmake 2011-01-21 23:49:49.826082339 +0000 -@@ -35,8 +35,8 @@ - # NEEDS WORK TO REMOVE HARDCODED LIB/BIN DIR - install(TARGETS ${G4LIBTARGET_NAME} - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - endif() - - # -@@ -59,8 +59,8 @@ - - install(TARGETS ${G4LIBTARGET_NAME}-static - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) - endif() - ENDMACRO() - diff --git a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch b/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch deleted file mode 100644 index 8c9d477..0000000 --- a/sci-physics/geant/files/geant-4.9.4-no-benchmarks.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- source/geometry/CMakeLists.txt.orig 2011-01-17 05:09:38.046080303 +0000 -+++ source/geometry/CMakeLists.txt 2011-01-17 05:09:59.636215548 +0000 -@@ -12,7 +12,6 @@ - # - #------------------------------------------------------------------------------ - --add_subdirectory(benchmarks) - add_subdirectory(biasing) - add_subdirectory(divisions) - add_subdirectory(magneticfield) diff --git a/sci-physics/geant/files/geant-4.9.4-no-examples.patch b/sci-physics/geant/files/geant-4.9.4-no-examples.patch deleted file mode 100644 index 6db7b3f..0000000 --- a/sci-physics/geant/files/geant-4.9.4-no-examples.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- CMakeLists.txt.orig 2011-01-22 01:47:07.000000000 +0000 -+++ CMakeLists.txt 2011-01-22 02:00:58.676084146 +0000 -@@ -209,9 +209,9 @@ - # Install any extra files needed such as documentation and legacy Makefiles - # - # User example code --install(DIRECTORY examples -- DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION} -- PATTERN "CVS" EXCLUDE) -+#install(DIRECTORY examples -+# DESTINATION ${GEANT4_DATAROOTDIR}/geant4-${geant4_VERSION} -+# PATTERN "CVS" EXCLUDE) - - - # diff --git a/sci-physics/geant/files/geant-4.9.4-trajectory.patch b/sci-physics/geant/files/geant-4.9.4-trajectory.patch deleted file mode 100644 index df45ae2..0000000 --- a/sci-physics/geant/files/geant-4.9.4-trajectory.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2011-04-28 01:19:54.232041312 +0200 -+++ CMakeLists.txt 2011-04-28 01:15:11.434101391 +0200 -@@ -43,6 +43,8 @@ - set(${PROJECT_NAME}_VERSION_MINOR "4") - set(${PROJECT_NAME}_VERSION_PATCH "1") - -+add_definitions(-DG4_STORE_TRAJECTORY) -+ - #------------------------------------------------------------------------------ - # Set up path to internal set of CMake modules. - # diff --git a/sci-physics/geant/files/geant-4.9.4-zlib.patch b/sci-physics/geant/files/geant-4.9.4-zlib.patch deleted file mode 100644 index f042969..0000000 --- a/sci-physics/geant/files/geant-4.9.4-zlib.patch +++ /dev/null @@ -1,35 +0,0 @@ -force use of system zlib instead of bundled G4zlib ---- source/visualization/HepRep/sources.cmake.orig 2011-12-02 15:07:49.000000000 +0000 -+++ source/visualization/HepRep/sources.cmake 2011-12-18 06:21:22.000000000 +0000 -@@ -91,7 +91,7 @@ - G4specsolids - G4tracking - G4vis_management -- G4zlib -+ ${ZLIB_LIBRARIES} - GLOBAL_DEPENDENCIES - G4digits_hits - G4geometry -@@ -102,7 +102,7 @@ - G4modeling - G4tracking - G4vis_management -- G4zlib -+ ${ZLIB_LIBRARIES} - LINK_LIBRARIES - ) - ---- source/visualization/externals/gl2ps/sources.cmake.orig 2011-12-02 16:07:56.000000000 +0100 -+++ source/visualization/externals/gl2ps/sources.cmake 2012-03-09 14:09:26.965148002 +0100 -@@ -49,9 +49,9 @@ - G4OpenGL2PSAction.cc - gl2ps.cc - GRANULAR_DEPENDENCIES -- G4zlib -+ ${ZLIB_LIBRARIES} - GLOBAL_DEPENDENCIES -- G4zlib -+ ${ZLIB_LIBRARIES} - LINK_LIBRARIES - ${OPENGL_LIBRARIES} - ) diff --git a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch deleted file mode 100644 index db10e26..0000000 --- a/sci-physics/geant/files/geant-4.9.5-scripts-only-dataenv.patch +++ /dev/null @@ -1,56 +0,0 @@ -tweak Geant4ToolchainBackwardCompatibility.cmake to get the envvars we want. bug 409853 -diff --git a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake -index 41a88c4..e93b923 100644 ---- a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake -+++ b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake -@@ -678,15 +678,4 @@ foreach(_shell bourne;cshell) - @ONLY - ) - -- # Install it to the required location -- install(FILES -- ${PROJECT_BINARY_DIR}/InstallTreeFiles/${_scriptfullname} -- DESTINATION ${CMAKE_INSTALL_BINDIR} -- PERMISSIONS -- OWNER_READ OWNER_WRITE OWNER_EXECUTE -- GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- COMPONENT Runtime -- ) - endforeach() -- -diff --git a/cmake/Templates/geant4-env-skeleton.in b/cmake/Templates/geant4-env-skeleton.in -index ea8f104..db68b9c 100644 ---- a/cmake/Templates/geant4-env-skeleton.in -+++ b/cmake/Templates/geant4-env-skeleton.in -@@ -1,30 +1,3 @@ --#!@GEANT4_TC_SHELL_PROGRAM -- --#---------------------------------------------------------------------------- --# @GEANT4_TC_SHELL_FAMILY@ environment setup script for Geant4 @Geant4_VERSION@ --# --# This script will configure your environment so that any Geant4 supplied --# tools, libraries and data are available in your PATH, library paths etc. --# Data libraries will only be setup if they were installed as part of the --# Geant4 installation. --# --# Source this script to perform the setup. --# --# This script is autogenerated by CMake DO NOT EDIT --# -- --#---------------------------------------------------------------------------- --# Locate directory of self --# --@GEANT4_ENV_SELFLOCATE_COMMAND@ -- -- --#---------------------------------------------------------------------------- --# Setup binary and library paths... --# --@GEANT4_ENV_BINPATH_SETUP@ --@GEANT4_ENV_LIBPATH_SETUP@ -- - #---------------------------------------------------------------------------- - # Resource file paths - # Data Library Paths are only set if they were installed by CMake diff --git a/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch b/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch deleted file mode 100644 index 0eb839d..0000000 --- a/sci-physics/geant/files/geant-4.9.5_p01-scripts-only-dataenv.patch +++ /dev/null @@ -1,56 +0,0 @@ -tweak Geant4ToolchainBackwardCompatibility.cmake to get the envvars we want. bug 409853 -diff --git a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake -index 41a88c4..e93b923 100644 ---- a/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake -+++ b/cmake/Modules/Geant4ToolchainBackwardCompatibility.cmake -@@ -678,15 +678,4 @@ foreach(_shell bourne;cshell) - @ONLY - ) - -- # Install it to the required location -- install(FILES -- ${PROJECT_BINARY_DIR}/InstallTreeFiles/${_scriptfullname} -- DESTINATION ${CMAKE_INSTALL_BINDIR} -- PERMISSIONS -- OWNER_READ OWNER_WRITE OWNER_EXECUTE -- GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- COMPONENT Runtime -- ) - endforeach() -- -diff --git a/cmake/Templates/geant4-env-skeleton.in b/cmake/Templates/geant4-env-skeleton.in -index ea8f104..db68b9c 100644 ---- a/cmake/Templates/geant4-env-skeleton.in -+++ b/cmake/Templates/geant4-env-skeleton.in -@@ -1,30 +1,3 @@ --#!@GEANT4_TC_SHELL_PROGRAM@ -- --#---------------------------------------------------------------------------- --# @GEANT4_TC_SHELL_FAMILY@ environment setup script for Geant4 @Geant4_VERSION@ --# --# This script will configure your environment so that any Geant4 supplied --# tools, libraries and data are available in your PATH, library paths etc. --# Data libraries will only be setup if they were installed as part of the --# Geant4 installation. --# --# Source this script to perform the setup. --# --# This script is autogenerated by CMake DO NOT EDIT --# -- --#---------------------------------------------------------------------------- --# Locate directory of self --# --@GEANT4_ENV_SELFLOCATE_COMMAND@ -- -- --#---------------------------------------------------------------------------- --# Setup binary and library paths... --# --@GEANT4_ENV_BINPATH_SETUP@ --@GEANT4_ENV_LIBPATH_SETUP@ -- - #---------------------------------------------------------------------------- - # Resource file paths - # Data Library Paths are only set if they were installed by CMake diff --git a/sci-physics/geant/geant-3.21.14-r2.ebuild b/sci-physics/geant/geant-3.21.14-r2.ebuild deleted file mode 100644 index eeca20d..0000000 --- a/sci-physics/geant/geant-3.21.14-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r2.ebuild,v 1.20 2011/06/28 13:34:44 jlec Exp $ - -EAPI=2 - -inherit eutils fortran-2 - -DEB_PN=geant321 -DEB_PV=${PV}.dfsg -DEB_PR=8 -DEB_P=${DEB_PN}_${DEB_PV} - -DESCRIPTION="CERN's detector description and simulation Tool" -HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/index.html" -SRC_URI=" - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz" - -SLOT="3" -LICENSE="GPL-2 LGPL-2 BSD" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=" - dev-lang/cfortran - sci-physics/cernlib - sci-physics/paw - virtual/fortran - x11-libs/openmotif:0" -DEPEND="${RDEPEND} - virtual/latex-base - x11-misc/imake - x11-misc/makedepend" - -S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig" - -src_prepare() { - cd "${WORKDIR}" - sed -i -e 's:/tmp/dp.*/cern:cern:g' ${DEB_P}-${DEB_PR}.diff || die - epatch ${DEB_P}-${DEB_PR}.diff - cd "${S}" - cp debian/add-ons/Makefile . - export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck" - sed \ - -e 's:/usr/local:/usr:g' \ - -i Makefile || die "sed'ing the Makefile failed" - - einfo "Applying Debian patches" - emake -j1 patch || die "debian patch failed" - - # since we depend on cfortran, do not use the one from cernlib - rm -f src/include/cfortran/cfortran.h -} - -src_compile() { - # create local LaTeX cache directory - VARTEXFONTS="${T}"/fonts - emake -j1 cernlib-indep cernlib-arch || die "emake failed" -} - -src_test_() { - LD_LIBRARY_PATH="${S}"/shlib \ - emake -j1 cernlib-test || die "emake test failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - cd "${S}"/debian - dodoc changelog README.* deadpool.txt NEWS copyright || die "dodoc failed" - newdoc add-ons/README README.add-ons || die "newdoc failed" -} diff --git a/sci-physics/geant/geant-3.21.14-r3.ebuild b/sci-physics/geant/geant-3.21.14-r3.ebuild deleted file mode 100644 index 9441f5b..0000000 --- a/sci-physics/geant/geant-3.21.14-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-3.21.14-r3.ebuild,v 1.1 2011/07/21 16:50:54 bicatali Exp $ - -EAPI=4 -inherit eutils fortran-2 - -DEB_PN=geant321 -DEB_PV=${PV}.dfsg -DEB_PR=9 -DEB_P=${DEB_PN}_${DEB_PV} - -DESCRIPTION="CERN's detector description and simulation Tool" -HOMEPAGE="http://wwwasd.web.cern.ch/wwwasd/geant/" - -LICENSE="GPL-2 LGPL-2 BSD" -SRC_URI="mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}.orig.tar.gz - mirror://debian/pool/main/${DEB_PN:0:1}/${DEB_PN}/${DEB_P}-${DEB_PR}.diff.gz" - -KEYWORDS="~amd64 ~x86" -SLOT="3" -IUSE="" - -RDEPEND=">=x11-libs/openmotif-2.3:0 - virtual/fortran - dev-lang/cfortran - sci-physics/cernlib - sci-physics/paw" - -DEPEND="${RDEPEND} - virtual/latex-base - x11-misc/imake - x11-misc/makedepend" - -S="${WORKDIR}/${DEB_PN}-${DEB_PV}.orig" - -src_prepare() { - cd "${WORKDIR}" - sed -i -e 's:/tmp/dp.*/cern:cern:g' ${DEB_P}-${DEB_PR}.diff || die - epatch ${DEB_P}-${DEB_PR}.diff - cd "${S}" - cp debian/add-ons/Makefile . - export DEB_BUILD_OPTIONS="$(tc-getFC) nostrip nocheck" - sed -i \ - -e 's:/usr/local:/usr:g' \ - Makefile || die "sed'ing the Makefile failed" - - einfo "Applying Debian patches" - emake -j1 patch - - # since we depend on cfortran, do not use the one from cernlib - rm -f src/include/cfortran/cfortran.h -} - -src_compile() { - # create local LaTeX cache directory - VARTEXFONTS="${T}"/fonts - emake -j1 cernlib-indep cernlib-arch -} - -src_test_() { - LD_LIBRARY_PATH="${S}"/shlib emake -j1 cernlib-test -} - -src_install() { - emake DESTDIR="${D}" install - cd debian - dodoc changelog README.* deadpool.txt NEWS copyright - newdoc add-ons/README README.add-ons -} diff --git a/sci-physics/geant/geant-4.9.2_p02.ebuild b/sci-physics/geant/geant-4.9.2_p02.ebuild deleted file mode 100644 index f99b090..0000000 --- a/sci-physics/geant/geant-4.9.2_p02.ebuild +++ /dev/null @@ -1,264 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.2_p02.ebuild,v 1.16 2011/08/02 05:50:11 mattst88 Exp $ - -EAPI=2 - -inherit eutils fortran-2 toolchain-funcs versionator - -PV1=$(get_version_component_range 1 ${PV}) -PV2=$(get_version_component_range 2 ${PV}) -PV3=$(get_version_component_range 3 ${PV}) -MY_P=${PN}$(replace_version_separator 3 .) - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.cern.ch/" -SRC_COM="http://geant4.web.cern.ch/geant4/support/source" -SRC_URI="${SRC_COM}/${MY_P}.tar.gz" -GEANT4_DATA=" - G4NDL.3.13 - G4EMLOW.6.2 - G4RadioactiveDecay.3.2 - PhotonEvaporation.2.0 - G4ABLA.3.0" -for d in ${GEANT4_DATA}; do - SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )" -done - -LICENSE="geant4" -SLOT="4" -KEYWORDS="amd64 x86" -IUSE="aida athena +data dawn debug examples gdml geant3 global minimal +motif - +opengl openinventor qt4 +raytracerx static +vrml zlib" - -RDEPEND=" - virtual/fortran - <sci-physics/clhep-2.1 - motif? ( x11-libs/openmotif:0 ) - athena? ( x11-libs/libXaw ) - qt4? ( x11-libs/qt-gui:4 ) - openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 ) - raytracerx? ( - x11-libs/libX11 - x11-libs/libXmu ) - opengl? ( - virtual/opengl - athena? ( x11-libs/libXaw3d ) - qt4? ( x11-libs/qt-opengl:4 ) ) - gdml? ( dev-libs/xerces-c ) - geant3? ( sci-physics/geant:3 ) - dawn? ( media-gfx/dawn ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - fortran-2_pkg_setup - eval unset ${!G4*} -} - -src_prepare() { - # fix bad zlib dependency - epatch "${FILESDIR}"/${PN}-4.9.2-zlib.patch - - # propagate user's flags and compiler settings - sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die - sed -i \ - -e '/CXX.*:=.*g++/d' \ - -e '/FC.*:=.*gfortran/d' \ - -e 's/\(CXXFLAGS.*:=\).*/\1 -ansi/' \ - -e '/CXXFLAGS.*+=.*pipe/d' \ - -e "/CXXFLAGS.*=.*-O2/s|=.*|= ${CXXFLAGS}|" \ - -e "/FCFLAGS.*=.*-O2/s|=.*|= ${FCFLAGS}|" \ - -e "/CCFLAGS.*=.*-O2/s|=.*|= ${CFLAGS}|" \ - -e "s|-Wl,-soname|${LDFLAGS} -Wl,-soname|g" \ - -e "s/libq\*/lib\[q,Q\]t*/g" \ - config/sys/Linux*gmk || die "flag substitution failed" - sed -i \ - -e 's:g++:$(CXX):g' \ - config/*.gmk || die "sed for forced g++ failed" - - # fix forced lib directory - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4LIB):g' \ - config/binmake.gmk || die "sed binmake.gmk failed" - sed -i \ - -e '/$(G4LIB)\/$(G4SYSTEM)/d' \ - config/architecture.gmk || die "sed architecture.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/common.gmk || die "sed common.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/moc.gmk || die "sed moc.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - -e 's:$(G4BIN)/$(G4SYSTEM):$(G4TMP):g' \ - -e 's:$(G4TMP)/$(G4SYSTEM):$(G4TMP):g' \ - source/GNUmakefile || die "sed GNUmakefile failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/globlib.gmk || die "sed globlib.gmk failed" - - # work around a non defined fortran compiler - use geant3 && export FC=$(tc-getFC) - # don't worry about the g++ name of the file, we remove all specific - export G4SYSTEM=Linux-g++ -} - -src_configure() { - export GEANT4_DIR="/usr/share/${PN}${PV1}" - # where to put compiled libraries; - # we set env var G4LIB in src_install() - # to avoid confusing make - export GEANT4_LIBDIR=/usr/$(get_libdir)/${PN}${PV1} - export G4INSTALL="${S}" - export G4WORKDIR="${S}" - export G4INCLUDE="${D}/usr/include/${PN}" - export CLHEP_BASE_DIR=/usr - - # parse USE; just set flags of drivers to build, G4*_USE_* vars are set - # later automatically for G4*_BUILD_*_DRIVER - use minimal && export G4UI_NONE=y \ - && export G4VIS_NONE=y - - use motif && export G4UI_BUILD_XM_SESSION=y - use athena && export G4UI_BUILD_XAW_SESSION=y - if use qt4; then - export G4UI_BUILD_QT_SESSION=y - export QTLIBS="-L/usr/$(get_libdir)/qt4 -lQtCore -lQtGui" - export QTFLAGS="-I/usr/include/qt4 -I/usr/include/qt4/Qt" - use opengl && \ - export GLQTLIBS="${QTLIBS} -lQtOpenGL" - #export QTFLAGS="${QTFLAGS} -I/usr/include/qt4/QtOpenGL" - fi - use dawn && export G4VIS_BUILD_DAWN_DRIVER=y - use raytracerx && export G4VIS_BUILD_RAYTRACERX_DRIVER=y - use openinventor && export G4VIS_BUILD_OI_DRIVER=y - use opengl && export G4VIS_BUILD_OPENGLX_DRIVER=y - use opengl && use motif && export G4VIS_BUILD_OPENGLXM_DRIVER=y - use gdml && export G4LIB_BUILD_GDML=y - use geant3 && export G4LIB_BUILD_G3TOG4=y - use zlib && export G4LIB_USE_ZLIB=y - use vrml && export G4VIS_BUILD_VRML_DRIVER=y \ - && export G4VIS_BUILD_VRMLFILE_DRIVER=y - use aida && export G4ANALYSIS_USE=y - use data && export G4DATA="${GEANT4_DIR}/data" - use debug && export G4DEBUG=y || export G4OPTIMIZE=y - - # switch to see compiling flags - export CPPVERBOSE=y - - # if shared libs are built, the script will also build static libs - # with pic flags - # avoid that by building it twice and removing temporary objects - export G4LIB_BUILD_SHARED=y -} - -src_compile() { - cd "${S}/source/" - einfo "Building shared library" - emake || die "Building shared geant failed" - - if use global; then - export G4LIB_USE_GRANULAR=y - einfo "Building granular libraries" - emake global || die "Building global libraries failed" - emake || die "Rebuilding shared geant failed" - fi - - if use static; then - einfo "Building static libraries" - rm -rf tmp - export G4LIB_BUILD_STATIC=y ; unset G4LIB_BUILD_SHARED - emake || die "Building static geant failed" - fi -} - -g4_create_env_script() { - # we need to change some variables to the final values since we hide these - # from make during the compile - export G4INSTALL=${GEANT4_DIR} - export G4LIB=${GEANT4_LIBDIR} - export G4INCLUDE=${G4INCLUDE/${D}/} - export G4WORKDIR=\${HOME}/${PN}${PV1} - - local g4env=99${PN}${PV1} - cat <<-EOF > ${g4env} - LDPATH=${G4LIB} - CLHEP_BASE_DIR=${CLHEP_BASE_DIR} - EOF - - # detailed data file locations - if use data; then - G4LEVELGAMMADATA="${G4DATA}/$(basename ${WORKDIR}/PhotonEvaporation*)" - G4RADIOACTIVEDATA="${G4DATA}/$(basename ${WORKDIR}/RadioactiveDecay*)" - G4LEDATA="${G4DATA}/$(basename ${WORKDIR}/G4EMLOW*)" - G4ABLADATA="${G4DATA}/$(basename ${WORKDIR}/G4ABLA*)" - G4NEUTRONHPCROSSSECTIONS="${G4DATA}/$(basename ${WORKDIR}/G4NDL*)" - export G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA \ - G4ABLADATA G4NEUTRONHPCROSSSECTIONS - fi - - # read env variables defined upto now - printenv | grep ^G4 | uniq >> ${g4env} - # define env vars for capabilities we can build into user projects - printenv | uniq | \ - sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env} - doenvd ${g4env} || die "Installing environment scripts failed " -} - -src_install() { - # install headers via make since we want them in a single directory - cd "${S}/source/" - einfo "Installing Geant4 headers" - emake includes || die 'Installing headers failed' - cd "${S}" - - # but install libraries and Geant library tool manually - einfo "Installing Geant4 libraries" - insinto ${GEANT4_LIBDIR} - insopts -m0755 - doins tmp/*.so || die - doins tmp/libname.map || die - insopts -m0644 - if use static; then - doins tmp/*.a || die - fi - exeinto ${GEANT4_LIBDIR} - doexe tmp/liblist || die - - g4_create_env_script - - # configs - insinto ${GEANT4_DIR} - doins -r config || die - - # install data - if use data; then - einfo "Installing Geant4 data" - insinto ${G4DATA} - pushd "${WORKDIR}" > /dev/null - for d in ${GEANT4_DATA}; do - local p=${d/.} - doins -r *${p/G4} || die "installing data ${d} failed" - done - popd > /dev/null - fi - - # doc and examples - insinto /usr/share/doc/${PF} - local mypv="${PV1}.${PV2}.${PV3}" - doins ReleaseNotes/ReleaseNotes${mypv}.html - [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ - dodoc ReleaseNotes/Patch${mypv}-*.txt - - use examples && doins -r examples - # TODO: * momo with momo or java flag, and check java stuff -} - -pkg_postinst() { - elog "Geant4 projects are by default build in \$HOME/geant4." - elog "If you want to change, set \$G4WORKDIR to another directory." -} diff --git a/sci-physics/geant/geant-4.9.3_p02.ebuild b/sci-physics/geant/geant-4.9.3_p02.ebuild deleted file mode 100644 index 52b5345..0000000 --- a/sci-physics/geant/geant-4.9.3_p02.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/Attic/geant-4.9.3_p02.ebuild,v 1.3 2010/11/07 21:06:38 xarthisius dead $ - -EAPI=4 - -inherit eutils versionator toolchain-funcs - -PV1=$(get_version_component_range 1 ${PV}) -PV2=$(get_version_component_range 2 ${PV}) -PV3=$(get_version_component_range 3 ${PV}) -MY_P=${PN}$(replace_version_separator 3 .) - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.cern.ch/" - -SRC_COM="http://geant4.cern.ch/support/source" -SRC_URI="${SRC_COM}/${MY_P}.tar.gz" -GEANT4_DATA="G4NDL.3.13 - G4EMLOW.6.9 - G4RadioactiveDecay.3.2 - PhotonEvaporation.2.0 - G4ABLA.3.0 - RealSurface.1.0" -for d in ${GEANT4_DATA}; do - SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )" -done - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~hppa ~sparc ~x86" -IUSE="athena +data dawn debug examples gdml geant3 global minimal +motif - +opengl openinventor qt4 +raytracerx static-libs +vrml zlib" - -RDEPEND="<sci-physics/clhep-2.1 - motif? ( >=x11-libs/openmotif-2.3:0 ) - athena? ( x11-libs/libXaw ) - qt4? ( x11-libs/qt-gui:4 ) - openinventor? ( >=media-libs/openinventor-2.1.5.10-r3 ) - raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) - opengl? ( virtual/opengl - athena? ( x11-libs/Xaw3d ) - qt4? ( x11-libs/qt-opengl:4 ) ) - gdml? ( dev-libs/xerces-c ) - geant3? ( sci-physics/geant:3 ) - dawn? ( media-gfx/dawn ) - zlib? ( sys-libs/zlib )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - eval unset ${!G4*} -} - -src_prepare() { - # fix bad zlib dependency - epatch "${FILESDIR}"/${PN}-4.9.3-zlib.patch - - # propagate user's flags and compiler settings - sed -i -e 's/-o/$(LDFLAGS) -o/g' source/GNUmakefile || die - sed -i \ - -e '/CXX.*:=.*g++/d' \ - -e '/FC.*:=.*gfortran/d' \ - -e 's/\(CXXFLAGS.*:=\).*/\1 -ansi/' \ - -e '/CXXFLAGS.*+=.*pipe/d' \ - -e "/CXXFLAGS.*=.*-O2/s:=.*:= ${CXXFLAGS}:" \ - -e "/FCFLAGS.*=.*-O2/s:=.*:= ${FCFLAGS}:" \ - -e "/CCFLAGS.*=.*-O2/s:=.*:= ${CFLAGS}:" \ - -e "s:-Wl,-soname:${LDFLAGS} -Wl,-soname:g" \ - -e "s/libq\*/lib\[q,Q\]t*/g" \ - config/sys/Linux*gmk || die "flag substitution failed" - sed -i \ - -e 's:g++:$(CXX):g' \ - config/*.gmk || die "sed for forced g++ failed" - - # fix forced lib directory - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4LIB):g' \ - config/binmake.gmk || die "sed binmake.gmk failed" - sed -i \ - -e '/$(G4LIB)\/$(G4SYSTEM)/d' \ - config/architecture.gmk || die "sed architecture.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/common.gmk || die "sed common.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/moc.gmk || die "sed moc.gmk failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - -e 's:$(G4BIN)/$(G4SYSTEM):$(G4TMP):g' \ - -e 's:$(G4TMP)/$(G4SYSTEM):$(G4TMP):g' \ - source/GNUmakefile || die "sed GNUmakefile failed" - sed -i \ - -e 's:$(G4LIB)/$(G4SYSTEM):$(G4TMP):g' \ - config/globlib.gmk || die "sed globlib.gmk failed" - - # work around a non defined fortran compiler - use geant3 && export FC=$(tc-getFC) - # don't worry about the g++ name of the file, we remove all specific - export G4SYSTEM=Linux-g++ -} - -src_configure() { - export GEANT4_DIR="/usr/share/${PN}${PV1}" - # where to put compiled libraries; - # we set env var G4LIB in src_install() - # to avoid confusing make - export GEANT4_LIBDIR="/usr/$(get_libdir)" - export G4INSTALL="${S}" - export G4WORKDIR="${S}" - # don't use ${ED} here to preserve a slash after trimming ${D} - # in g4_create_env_script - export G4INCLUDE="${D}/${EPREFIX}/usr/include/${PN}" - export CLHEP_BASE_DIR="${EPREFIX}/usr" - - # parse USE; just set flags of drivers to build, G4*_USE_* vars are set - # later automatically for G4*_BUILD_*_DRIVER - use minimal && export G4UI_NONE=y \ - && export G4VIS_NONE=y - - use motif && export G4UI_BUILD_XM_SESSION=y - use athena && export G4UI_BUILD_XAW_SESSION=y - if use qt4; then - export G4UI_BUILD_QT_SESSION=y - export QTLIBS="-L${EPREFIX}/usr/$(get_libdir)/qt4 -lQtCore -lQtGui" - export QTFLAGS="-I${EPREFIX}/usr/include/qt4 -I${EPREFIX}/usr/include/qt4/Qt" - use opengl && \ - export GLQTLIBS="${QTLIBS} -lQtOpenGL" - #export QTFLAGS="${QTFLAGS} -I${EPREFIX}/usr/include/qt4/QtOpenGL" - fi - use dawn && export G4VIS_BUILD_DAWN_DRIVER=y - use raytracerx && export G4VIS_BUILD_RAYTRACERX_DRIVER=y - use openinventor && export G4VIS_BUILD_OI_DRIVER=y - use opengl && export G4VIS_BUILD_OPENGLX_DRIVER=y - use opengl && use motif && export G4VIS_BUILD_OPENGLXM_DRIVER=y - use gdml && export G4LIB_BUILD_GDML=y - use geant3 && export G4LIB_BUILD_G3TOG4=y - use zlib && export G4LIB_USE_ZLIB=y - use vrml && export G4VIS_BUILD_VRML_DRIVER=y \ - && export G4VIS_BUILD_VRMLFILE_DRIVER=y - use data && export G4DATA="${EPREFIX}/${GEANT4_DIR}/data" - use debug && export G4DEBUG=y || export G4OPTIMIZE=y - - # switch to see compiling flags - export CPPVERBOSE=y - - # if shared libs are built, the script will also build static libs - # with pic flags - # avoid that by building it twice and removing temporary objects - export G4LIB_BUILD_SHARED=y -} - -src_compile() { - cd "${S}/source/" - if use static-libs; then - einfo "Building static libraries" - rm -rf tmp - export G4LIB_BUILD_STATIC=y ; unset G4LIB_BUILD_SHARED - else - einfo "Building shared library" - fi - - if use global; then - einfo "Building global libraries" - emake global - else - emake - fi -} - -g4_create_env_script() { - # we need to change some variables to the final values since we hide these - # from make during the compile - export G4INSTALL="${EPREFIX}/${GEANT4_DIR}" - export G4LIB="${EPREFIX}/${GEANT4_LIBDIR}" - export G4INCLUDE=${G4INCLUDE/${D}/} # EPREFIX remains - export G4WORKDIR=\${HOME}/${PN}${PV1} - - local g4env=99${PN}${PV1} - cat <<-EOF > ${g4env} - LDPATH=${G4LIB} - CLHEP_BASE_DIR=${CLHEP_BASE_DIR} - EOF - - # detailed data file locations - if use data; then - G4LEVELGAMMADATA="${G4DATA}/$(basename ${WORKDIR}/PhotonEvaporation*)" - G4RADIOACTIVEDATA="${G4DATA}/$(basename ${WORKDIR}/RadioactiveDecay*)" - G4LEDATA="${G4DATA}/$(basename ${WORKDIR}/G4EMLOW*)" - G4ABLADATA="${G4DATA}/$(basename ${WORKDIR}/G4ABLA*)" - G4NEUTRONHPDATA="${G4DATA}/$(basename ${WORKDIR}/G4NDL*)" - G4REALSURFACEDATA="${G4DATA}/$(basename ${WORKDIR}/G4REALSURFACEDATA*)" - export G4LEVELGAMMADATA G4RADIOACTIVEDATA G4LEDATA \ - G4ABLADATA G4NEUTRONHPDATA G4REALSURFACEDATA - fi - - # read env variables defined upto now - printenv | grep ^G4 | uniq >> ${g4env} - # define env vars for capabilities we can build into user projects - printenv | uniq | \ - sed -n -e '/^G4/s:BUILD\(.*\)_DRIVER:USE\1:gp' >> ${g4env} - doenvd ${g4env} -} - -src_install() { - # install headers via make since we want them in a single directory - cd "${S}/source/" - einfo "Installing Geant4 headers" - emake includes - cd "${S}" - - # but install libraries and Geant library tool manually - einfo "Installing Geant4 libraries" - insinto ${GEANT4_LIBDIR} - insopts -m0755 - doins tmp/*.so - doins tmp/libname.map - insopts -m0644 - if use static-libs; then - doins tmp/*.a - fi - exeinto ${GEANT4_LIBDIR} - doexe tmp/liblist - - g4_create_env_script - - # configs - insinto ${GEANT4_DIR} - doins -r config - - # install data - if use data; then - einfo "Installing Geant4 data" - insinto "${G4DATA/${EPREFIX}/}" - pushd "${WORKDIR}" > /dev/null - for d in ${GEANT4_DATA}; do - local p=${d/.} - doins -r *${p/G4} - done - popd > /dev/null - fi - - # doc and examples - insinto /usr/share/doc/${PF} - local mypv="${PV1}.${PV2}.${PV3}" - doins ReleaseNotes/ReleaseNotes${mypv}.html - [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ - dodoc ReleaseNotes/Patch${mypv}-*.txt - - use examples && doins -r examples - # TODO: * momo with momo or java flag, and check java stuff -} - -pkg_postinst() { - elog "Geant4 projects are by default build in \$HOME/geant4." - elog "If you want to change, set \$G4WORKDIR to another directory." - - elog "To use Aida you have to explicitly set G4ANALYSIS_USE=y for" - elog "your environment." -} diff --git a/sci-physics/geant/geant-4.9.4_p03.ebuild b/sci-physics/geant/geant-4.9.4_p03.ebuild deleted file mode 100644 index e13221d..0000000 --- a/sci-physics/geant/geant-4.9.4_p03.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.4_p03.ebuild,v 1.2 2012/06/16 13:08:36 ago Exp $ - -EAPI=4 - -inherit cmake-utils eutils fortran-2 versionator - -PV1=$(get_version_component_range 1 ${PV}) -PV2=$(get_version_component_range 2 ${PV}) -PV3=$(get_version_component_range 3 ${PV}) -MYP=${PN}$(replace_version_separator 3 .) - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.cern.ch/" -SRC_COM="http://geant4.cern.ch/support/source" -SRC_URI="${SRC_COM}/${MYP}.tar.gz" -GEANT4_DATA=" - G4NDL.3.14 - G4EMLOW.6.19 - G4RadioactiveDecay.3.3 - G4NEUTRONXS.1.0 - G4PII.1.2 - G4PhotonEvaporation.2.1 - G4ABLA.3.0 - RealSurface.1.0" -for d in ${GEANT4_DATA}; do - SRC_URI="${SRC_URI} data? ( ${SRC_COM}/${d}.tar.gz )" -done - -LICENSE="geant4" -SLOT="4" -KEYWORDS="amd64 ~x86" -IUSE="+data dawn examples gdml geant3 granular qt4 static-libs vrml zlib" - -RDEPEND="virtual/fortran - >=sci-physics/clhep-2.1 - qt4? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) - gdml? ( dev-libs/xerces-c ) - geant3? ( sci-physics/geant:3 ) - dawn? ( media-gfx/dawn ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}" - -PATCHES=( "${FILESDIR}"/${PN}-4.9.4-{zlib,libdir,datadir,trajectory}.patch ) - -src_configure() { - mycmakeargs=( - $(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN) - $(cmake-utils_use gdml GEANT4_USE_GDML) - $(cmake-utils_use geant3 GEANT4_USE_GEANT3TOGEANT4) - $(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD) - $(cmake-utils_use vrml GEANT4_USE_NETWORKVRML) - $(cmake-utils_use qt4 GEANT4_USE_QT) - $(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB) - $(cmake-utils_use_build static-libs STATIC_LIBS) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - if use data; then - einfo "Installing Geant4 data" - insinto /usr/share/geant4/data - pushd "${WORKDIR}" > /dev/null - for d in ${GEANT4_DATA}; do - local p=${d/.} - doins -r *${p/G4} - done - popd > /dev/null - fi - - insinto /usr/share/doc/${PF} - local mypv="${PV1}.${PV2}.${PV3}" - doins ReleaseNotes/ReleaseNotes${mypv}.html - [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ - dodoc ReleaseNotes/Patch${mypv}-*.txt - use examples && doins -r examples -} - -pkg_postinst() { - elog "Users need to define the G4WORKDIR variable (\$HOME/geant4 is normally used)." -} diff --git a/sci-physics/geant/geant-4.9.5-r1.ebuild b/sci-physics/geant/geant-4.9.5-r1.ebuild deleted file mode 100644 index 020340b..0000000 --- a/sci-physics/geant/geant-4.9.5-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5-r1.ebuild,v 1.7 2012/05/20 16:46:58 heroxbd Exp $ - -EAPI=4 - -inherit cmake-utils eutils fortran-2 versionator - -PV1=$(get_version_component_range 1 ${PV}) -PV2=$(get_version_component_range 2 ${PV}) -PV3=$(get_version_component_range 3 ${PV}) -MYP=${PN}$(replace_version_separator 3 .) - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.cern.ch/" -SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor - raytracerx qt4 static-libs test vrml zlib" - -RDEPEND="virtual/fortran - >=sci-physics/clhep-2.1.1 - dawn? ( media-gfx/dawn ) - gdml? ( dev-libs/xerces-c ) - motif? ( x11-libs/openmotif:0 ) - opengl? ( virtual/opengl ) - openinventor? ( media-libs/openinventor ) - raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) - qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}" - -PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \ - "${FILESDIR}"/${PN}-4.9.5-scripts-only-dataenv.patch ) - -src_configure() { - mycmakeargs=( - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir) - $(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so") - $(cmake-utils_use data GEANT4_INSTALL_DATA) - $(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN) - $(cmake-utils_use gdml GEANT4_USE_GDML) - $(cmake-utils_use geant3 GEANT4_USE_G3TOG4) - $(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD) - $(cmake-utils_use motif GEANT4_USE_XM) - $(cmake-utils_use opengl GEANT4_USE_OPENGL_X11) - $(cmake-utils_use openinventor GEANT4_USE_INVENTOR) - $(cmake-utils_use qt4 GEANT4_USE_QT) - $(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11) - $(cmake-utils_use test GEANT4_ENABLE_TESTING) - $(cmake-utils_use vrml GEANT4_USE_NETWORKVRML) - $(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB) - $(cmake-utils_use_build static-libs STATIC_LIBS) - ) - cmake-utils_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i "s,-lG4clhep,-lCLHEP," config/binmake.gmk || die "sed failed" - - cmake-utils_src_install - insinto /usr/share/doc/${PF} - local mypv="${PV1}.${PV2}.${PV3}" - doins ReleaseNotes/ReleaseNotes${mypv}.html - [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ - dodoc ReleaseNotes/Patch${mypv}-*.txt - use examples && doins -r examples - if use data ; then - sed "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\); pwd\`,\1${EPREFIX}/usr\2," \ - "${CMAKE_BUILD_DIR}/InstallTreeFiles/geant4.sh" > 99geant - doenvd 99geant - fi -} - -pkg_postinst() { - elog "The following scripts are provided for backward compatibility:" - elog "$(ls -1 ${EROOT}usr/share/Geant4-${PV2}.${PV3}.*/geant4make/*sh)" -} diff --git a/sci-physics/geant/geant-4.9.5_p01.ebuild b/sci-physics/geant/geant-4.9.5_p01.ebuild deleted file mode 100644 index 0e7622f..0000000 --- a/sci-physics/geant/geant-4.9.5_p01.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.9.5_p01.ebuild,v 1.3 2012/05/20 16:46:58 heroxbd Exp $ - -EAPI=4 - -inherit cmake-utils eutils fortran-2 versionator - -PV1=$(get_version_component_range 1 ${PV}) -PV2=$(get_version_component_range 2 ${PV}) -PV3=$(get_version_component_range 3 ${PV}) -MYP=${PN}$(replace_version_separator 3 .) - -DESCRIPTION="Toolkit for simulation of passage of particles through matter" -HOMEPAGE="http://geant4.cern.ch/" -SRC_URI="http://geant4.cern.ch/support/source/${MYP}.tar.gz" - -LICENSE="geant4" -SLOT="4" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+data dawn examples gdml geant3 granular motif opengl openinventor - raytracerx qt4 static-libs test vrml zlib" - -RDEPEND="virtual/fortran - >=sci-physics/clhep-2.1.1 - dawn? ( media-gfx/dawn ) - gdml? ( dev-libs/xerces-c ) - motif? ( x11-libs/openmotif:0 ) - opengl? ( virtual/opengl ) - openinventor? ( media-libs/openinventor ) - raytracerx? ( x11-libs/libX11 x11-libs/libXmu ) - qt4? ( x11-libs/qt-gui:4 opengl? ( x11-libs/qt-opengl:4 ) ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MYP}" - -PATCHES=( "${FILESDIR}"/${PN}-4.9.4-zlib.patch \ - "${FILESDIR}"/${P}-scripts-only-dataenv.patch ) - -src_configure() { - mycmakeargs=( - -DGEANT4_USE_SYSTEM_CLHEP=ON - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir) - $(use openinventor && echo "-DINVENTOR_SOXT_LIBRARY=${EROOT}usr/$(get_libdir)/libInventorXt.so") - $(cmake-utils_use data GEANT4_INSTALL_DATA) - $(cmake-utils_use dawn GEANT4_USE_NETWORKDAWN) - $(cmake-utils_use gdml GEANT4_USE_GDML) - $(cmake-utils_use geant3 GEANT4_USE_G3TOG4) - $(cmake-utils_use granular GEANT4_BUILD_GRANULAR_BUILD) - $(cmake-utils_use motif GEANT4_USE_XM) - $(cmake-utils_use opengl GEANT4_USE_OPENGL_X11) - $(cmake-utils_use openinventor GEANT4_USE_INVENTOR) - $(cmake-utils_use qt4 GEANT4_USE_QT) - $(cmake-utils_use raytracerx GEANT4_USE_RAYTRACER_X11) - $(cmake-utils_use test GEANT4_ENABLE_TESTING) - $(cmake-utils_use vrml GEANT4_USE_NETWORKVRML) - $(cmake-utils_use zlib GEANT4_USE_SYSTEM_ZLIB) - $(cmake-utils_use_build static-libs STATIC_LIBS) - ) - cmake-utils_src_configure -} - -src_install() { - # adjust clhep linking flags for system clhep - # binmake.gmk is only useful for legacy build systems - sed -i "s,-lG4clhep,-lCLHEP," config/binmake.gmk || die "sed failed" - - cmake-utils_src_install - insinto /usr/share/doc/${PF} - local mypv="${PV1}.${PV2}.${PV3}" - doins ReleaseNotes/ReleaseNotes${mypv}.html - [[ -e ReleaseNotes/Patch${mypv}-1.txt ]] && \ - dodoc ReleaseNotes/Patch${mypv}-*.txt - use examples && doins -r examples - if use data ; then - sed "s,export \(G4.\+DATA=\"\).*\(/share/Geant.\+/data/.\+\); pwd\`,\1${EPREFIX}/usr\2," \ - "${CMAKE_BUILD_DIR}/InstallTreeFiles/geant4.sh" > 99geant - doenvd 99geant - fi -} - -pkg_postinst() { - elog "The following scripts are provided for backward compatibility:" - elog "$(ls -1 ${EROOT}usr/share/Geant4-${PV2}.${PV3}.*/geant4make/*sh)" -} diff --git a/sci-physics/geant/metadata.xml b/sci-physics/geant/metadata.xml deleted file mode 100644 index 7d3677c..0000000 --- a/sci-physics/geant/metadata.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>sci-physics</herd> - <longdescription lang="en"> - Geant simulates the passage of subatomic particles through matter, for - instance, particle detectors. Geant 3 simulations are performed by - linking Fortran code supplied by the user with the Geant libraries, - then running the resulting executable. This package includes gxint, - the script used to perform this linking step. - Geant 4 is a complete rewrite in C++ with addition of other modern - features and detectors. -</longdescription> - <use> - <flag name="athena">Enable the MIT Athena (<pkg>x11-libs/libXaw</pkg>) - widget set (default is Motif)</flag> - <flag name="data">Add a lot of standard physics data files for geant4</flag> - <flag name="dawn">Add support for <pkg>media-gfx/dawn</pkg> (3D postscript - rendering)</flag> - <flag name="gdml">Enable geometry markup language for xml</flag> - <flag name="geant3">Add compatibility for geant321 to geant4</flag> - <flag name="global">Produce a huge global library instead of small - ones</flag> - <flag name="granular">Produce many small libraries instead of global ones</flag> - <flag name="aida">Add support for Abstract Interfaces for Data Analysis </flag> - <flag name="openinventor">Add support for <pkg>media-libs/openinventor</pkg> - SGI toolkit</flag> - <flag name="raytracerx">Enable raytracing for physics events</flag> - <flag name="vrml">Enable output of geant4 in vrml formats</flag> - </use> -</pkgmetadata> diff --git a/sci-visualization/mayavi/ChangeLog b/sci-visualization/mayavi/ChangeLog deleted file mode 100644 index 0cf71ec..0000000 --- a/sci-visualization/mayavi/ChangeLog +++ /dev/null @@ -1,102 +0,0 @@ -# ChangeLog for sci-visualization/mayavi -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/ChangeLog,v 1.20 2011/02/01 19:05:53 bicatali Exp $ - - 01 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.4.1.ebuild, - metadata.xml: - Removed doc building because buggy. Now unzip the bundled docs and link in - proper directory, fixing bug #341753. Updated longdescription to reflect - mayavi2 - - 01 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -mayavi-1.5-r1.ebuild, -files/mayavi-1.5-tkinter_objects.patch: - Delete. - -*mayavi-3.4.1 (30 Jan 2011) - - 30 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -mayavi-3.4.0.ebuild, +mayavi-3.4.1.ebuild: - Version bump. - -*mayavi-3.4.0 (18 Oct 2010) - - 18 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -mayavi-3.3.2.ebuild, +mayavi-3.4.0.ebuild: - Version bump. - -*mayavi-3.3.2 (31 May 2010) - - 31 May 2010; Justin Lecher <jlec@gentoo.org> mayavi-1.5-r1.ebuild, - mayavi-3.3.0.ebuild, mayavi-3.3.1.ebuild, +mayavi-3.3.2.ebuild: - Version Bump, fixes incompatibility with vtk-5.6* #322117, fixes for - PYTHON ABI support #316255 - -*mayavi-3.3.1 (21 Mar 2010) - - 21 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> +mayavi-3.3.1.ebuild: - Version bump - - 15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.3.0.ebuild: - Added use dependencies for qt4 and wxwidgets - - 15 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> -mayavi-3.2.0.ebuild, - mayavi-3.3.0.ebuild: - Fixed building with new setuptools, bug #308213 - - 14 Sep 2009; Andrey Grozin <grozin@gentoo.org> mayavi-3.3.0.ebuild, - +files/mayavi-3.3.0-nodocs.patch: - Documentation generation requires X, so docs are cached on Gentoo mirrors. - Closing bug #284080. - -*mayavi-3.3.0 (06 Sep 2009) - - 06 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -mayavi-3.1.0.ebuild, +mayavi-3.3.0.ebuild: - Version bump. - - 12 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.2.0.ebuild: - Removed wxwindows flag, since it is mandatory even with qt - - 18 Jun 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.2.0.ebuild: - Forced wxwidgets dependency (bug #266799) and added X for PyQt4 (bug - #272180) - -*mayavi-3.2.0 (27 Mar 2009) - - 27 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.1.0.ebuild, - +mayavi-3.2.0.ebuild: - Version bump and fixed wxwindows dependencies - - 20 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-3.1.0.ebuild: - Introduce wxwindows and qt4 flags to enforce opengl, closing bug #261402 - - 25 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> -mayavi-1.5.ebuild, - mayavi-1.5-r1.ebuild: - Removed obsolete revision - -*mayavi-1.5-r1 (16 Jan 2009) - - 16 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> - +files/mayavi-1.5-tkinter_objects.patch, +mayavi-1.5-r1.ebuild: - Fix for tkinter object and typo, bug #255108, thanks Colin Macdonald - -*mayavi-3.1.0 (15 Jan 2009) - - 15 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> mayavi-1.5.ebuild, - +mayavi-3.1.0.ebuild: - New Enthought version for Mayavi2 - - 27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> mayavi-1.5.ebuild: - Switch to EAPI=2 with use dependencies - - 27 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org> mayavi-1.5.ebuild: - slotting 2->1 - -*mayavi-1.5 (24 Apr 2007) - - 24 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml, - +mayavi-1.5.ebuild: - Initial import. Closing bug #50464. Thanks to Colin Macdonald <cbm@sfu.ca>, - Simon-Nicolas Roth <simon.roth@videotron.ca> and others in the bug mentioned - for their work. - diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest deleted file mode 100644 index 140b40a..0000000 --- a/sci-visualization/mayavi/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST Mayavi-3.4.1.tar.gz 9343848 RMD160 669d9c90bcc9bd67a1bd7b90bbafd314b849c20c SHA1 b4bf2e03bcea73dfb32a5e1052ff2df0ea618ab6 SHA256 9eeb26f94fbfc7ca6694a3c82ff92a8fa310c127c2d538144da7d01193995aab -EBUILD mayavi-3.4.1.ebuild 2135 SHA1 3e93b2506d2c7e3f4dcb68befe38e201858035dd SHA256 b92f957c364b34b1592912c2ec88dffbad4bb226bbe46c7901104be95a64ea33 -MISC ChangeLog 3637 SHA1 d4fa77c789795646c6f0e805008c5d4518478510 SHA256 8a66ecd34fb3621b04bcdc06ecd80b0cb859593c4bd2f3ea28ea6f4149ea7663 -MISC metadata.xml 1186 SHA1 afdb72dc5dbeb4d1f4a66184ae63396fa9c91a1d SHA256 3a5aede8c69bc64e72dd87cd4ec524dafc8efd4cb825a45ce80d0cc15fdf0215 diff --git a/sci-visualization/mayavi/mayavi-3.4.1.ebuild b/sci-visualization/mayavi/mayavi-3.4.1.ebuild deleted file mode 100644 index ee9aaa1..0000000 --- a/sci-visualization/mayavi/mayavi-3.4.1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/mayavi/mayavi-3.4.1.ebuild,v 1.3 2011/02/01 19:05:53 bicatali Exp $ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit distutils eutils - -MY_PN="Mayavi" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="The Mayavi scientific data 3-dimensional visualizer" -HOMEPAGE="http://code.enthought.com/projects/mayavi/ http://pypi.python.org/pypi/Mayavi" -SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="2" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="doc examples qt4" - -RDEPEND=">=dev-python/apptools-3.4.1 - dev-python/configobj - >=dev-python/enthoughtbase-3.1.0 - >=dev-python/envisagecore-3.2.0 - >=dev-python/envisageplugins-3.2.0 - dev-python/ipython - dev-python/numpy - dev-python/setuptools - >=dev-python/traitsgui-3.6.0[qt4?,wxwidgets] - dev-python/wxpython:2.8[opengl] - >=sci-libs/vtk-5[python] - qt4? ( dev-python/PyQt4[X,opengl] )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" - -S="${WORKDIR}"/${MY_P} - -DOCS="docs/*.txt" -PYTHON_MODNAME="enthought" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_unpack() { - default - if use doc; then - cd "${S}"/docs - # building docs is buggy and requires X - # so use the bundled ones - unpack ./html.zip - rm -rf html/*/_sources - fi -} - -src_prepare() { - distutils_src_prepare - sed -i \ - -e "s/self.run_command('gen_docs')/pass/" \ - -e "s/self.run_command('build_docs')/pass/" \ - setup.py || die "sed setup.py failed" -} - -src_install() { - find -name "*LICENSE*.txt" -delete - distutils_src_install - - insinto /usr/share/doc/${PF} - if use doc; then - doins -r docs/html || die "Installation of documentation failed" - dosym /usr/share/doc/${PF}/html/mayavi \ - $(python_get_sitedir)/enthought/mayavi/html - dosym /usr/share/doc/${PF}/html/tvtk \ - $(python_get_sitedir)/enthought/tvtk/html - fi - - if use examples; then - doins -r examples || die "Installation of examples failed" - fi - - newicon enthought/mayavi/core/ui/images/m2.png mayavi2.png - make_desktop_entry mayavi2 "Mayavi2 2D/3D Scientific Visualization" mayavi2 -} diff --git a/sci-visualization/mayavi/metadata.xml b/sci-visualization/mayavi/metadata.xml deleted file mode 100644 index 54bc70e..0000000 --- a/sci-visualization/mayavi/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>sci</herd> -<longdescription lang="en"> - Mayavi2 is a general purpose, cross-platform tool for 3-D scientific - data visualization. Its features include: - * Visualization of scalar, vector and tensor data in 2 and 3 dimensions. - * Easy scriptability using Python. - * Easy extendibility via custom sources, modules, and data filters. - * Reading several file formats: VTK (legacy and XML), PLOT3D, etc. - * Saving of visualizations. - * Saving rendered visualization in a variety of image formats. - * Convenient functionality for rapid scientific plotting via mlab - - Mayavi2 has been designed with scriptability and extensibility in - mind. Mayavi2 provides a mayavi2 application which is usable by - itself. However, Mayavi2 may also be used as a plotting engine, in - scripts, like with matplotlib or gnuplot, as well as a library for - interactive visualizations in any other application. It may also be - used as an Envisage plug-in which allows it to be embedded in other - Envisage based applications natively. -</longdescription> -</pkgmetadata> diff --git a/scripts/bootstrap-rap.sh b/scripts/bootstrap-rap.sh deleted file mode 100755 index 30823d8..0000000 --- a/scripts/bootstrap-rap.sh +++ /dev/null @@ -1,2038 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2006-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Id: bootstrap-prefix.sh 61665 2013-08-01 07:31:22Z grobian $ - -trap 'exit 1' TERM KILL INT QUIT ABRT - -# some basic output functions -eerror() { echo "!!! $*" 1>&2; } -einfo() { echo "* $*"; } - -# prefer gtar over tar -[[ x$(type -t gtar) == "xfile" ]] \ - && TAR="gtar" \ - || TAR="tar" - -## Functions Start Here - -econf() { - ${CONFIG_SHELL} ./configure \ - --host=${CHOST} \ - --prefix="${ROOT}"/usr \ - --mandir="${ROOT}"/usr/share/man \ - --infodir="${ROOT}"/usr/share/info \ - --datadir="${ROOT}"/usr/share \ - --sysconfdir="${ROOT}"/etc \ - --localstatedir="${ROOT}"/var/lib \ - --build=${CHOST} \ - "$@" || return 1 -} - -efetch() { - if [[ ! -e ${DISTDIR}/${1##*/} ]] ; then - if [[ -z ${FETCH_COMMAND} ]] ; then - # Try to find a download manager, we only deal with wget, - # curl, FreeBSD's fetch and ftp. - if [[ x$(type -t wget) == "xfile" ]] ; then - FETCH_COMMAND="wget" - elif [[ x$(type -t ftp) == "xfile" ]] ; then - FETCH_COMMAND="ftp" - elif [[ x$(type -t curl) == "xfile" ]] ; then - einfo "WARNING: curl doesn't fail when downloading fails, please check its output carefully!" - FETCH_COMMAND="curl -L -O" - elif [[ x$(type -t fetch) == "xfile" ]] ; then - FETCH_COMMAND="fetch" - else - eerror "no suitable download manager found (need wget, curl, fetch or ftp)" - eerror "could not download ${1##*/}" - exit 1 - fi - fi - - mkdir -p "${DISTDIR}" >& /dev/null - einfo "Fetching ${1##*/}" - pushd "${DISTDIR}" > /dev/null - # try for mirrors first, then try given location - ${FETCH_COMMAND} "${GENTOO_MIRRORS}/distfiles/${1##*/}" - [[ ! -f ${1##*/} && ${1} != ${GENTOO_MIRRORS}/distfiles/${1##*/} ]] \ - && ${FETCH_COMMAND} "$1" - if [[ ! -f ${1##*/} ]] ; then - eerror "downloading ${1} failed!" - return 1 - fi - popd > /dev/null - fi - return 0 -} - -# template -# bootstrap_() { -# PV= -# A= -# einfo "Bootstrapping ${A%-*}" - -# efetch ${A} || return 1 - -# einfo "Unpacking ${A%-*}" -# export S="${PORTAGE_TMPDIR}/${PN}" -# rm -rf ${S} -# mkdir -p ${S} -# cd ${S} -# $TAR -zxf ${DISTDIR}/${A} || return 1 -# S=${S}/${PN}-${PV} -# cd ${S} - -# einfo "Compiling ${A%-*}" -# econf || return 1 -# $MAKE ${MAKEOPTS} || return 1 - -# einfo "Installing ${A%-*}" -# $MAKE install || return 1 - -# einfo "${A%-*} successfully bootstrapped" -# } - -set_profile() { - # switch profiles in used for different phases of stage3 - # Phase 1: bootstrap base system on glibc - # Phase 2: final - local profile - case $1 in - 1) profile="${PORTDIR_RAP}"/profiles/bootstrap/glibc ;; - 2) profile="${PORTDIR_RAP}"/profiles/$(sed 's,../,,' < "${PORTDIR_RAP}"/profiles/bootstrap/parent) ;; - esac - - rm -f ${ROOT}/etc/portage/make.profile - ln -s "${profile}" "${ROOT}"/etc/portage/make.profile - local file=make.defaults - [[ -e "${profile}"/${file}.in ]] && \ - sed "s,@GENTOO_PORTAGE_EPREFIX@,${ROOT},g" "${profile}"/${file}.in > "${profile}"/${file} - - einfo "Your profile is set to ${profile} at phase $1." -} - -bootstrap_setup() { - local profile="" - local keywords="" - local ldflags_make_defaults="" - local extra_make_globals="" - einfo "setting up some guessed defaults" - case ${CHOST} in - powerpc-apple-darwin7) - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.3" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - powerpc-apple-darwin[89]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/ppc" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - powerpc64-apple-darwin[89]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/ppc64" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - ;; - i*86-apple-darwin[89]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/x86" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - i*86-apple-darwin1[012]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/x86" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m32' -CXX='g++ -m32' -HOSTCC='gcc -m32' -" - ;; - x86_64-apple-darwin9|x86_64-apple-darwin1[012]) - rev=${CHOST##*darwin} - profile="${PORTDIR}/profiles/prefix/darwin/macos/10.$((rev - 4))/x64" - ldflags_make_defaults="LDFLAGS=\"-Wl,-search_paths_first -L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - ;; - i*86-pc-linux-gnu) - profile="../default/linux/x86/13.0/rap" - ;; - x86_64-pc-linux-gnu) - profile="../default/linux/amd64/13.0/rap" - ;; - ia64-pc-linux-gnu) - profile="${PORTDIR}/profiles/prefix/linux/ia64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - powerpc-unknown-linux-gnu) - profile="${PORTDIR}/profiles/prefix/linux/ppc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - powerpc64-unknown-linux-gnu) - profile="${PORTDIR}/profiles/prefix/linux/ppc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - armv7a-hardfloat-linux-gnueabi) - profile="../default/linux/arm/13.0/armv7a/rap" - ;; - armv5tel-softfloat-linux-gnueabi) - profile="../default/linux/arm/13.0/armv5te/rap" - ;; - sparc-sun-solaris2.9) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.9/sparc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - sparcv9-sun-solaris2.9) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.9/sparc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - i386-pc-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - sparc-sun-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/sparc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - sparcv9-sun-solaris2.10) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.10/sparc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - i386-pc-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - sparc-sun-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/sparc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - sparcv9-sun-solaris2.11) - profile="${PORTDIR}/profiles/prefix/sunos/solaris/5.11/sparc64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - extra_make_globals=" -CC='gcc -m64' -CXX='g++ -m64' -HOSTCC='gcc -m64' -" - # we need this, or binutils can't link, can't add it to -L, - # since then binutils breaks on finding an old libiberty.a - # from there instead of its own - cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ - ;; - powerpc-ibm-aix*) - profile="${PORTDIR}/profiles/prefix/aix/${CHOST#powerpc-ibm-aix}/ppc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - mips-sgi-irix*) - profile="${PORTDIR}/profiles/prefix/irix/${CHOST#mips-sgi-irix}/mips" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/lib -R${ROOT}/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib\"" - ;; - i586-pc-interix*) - profile="${PORTDIR}/profiles/prefix/windows/interix/${CHOST#i586-pc-interix}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - i586-pc-winnt*) - profile="${PORTDIR}/profiles/prefix/windows/winnt/${CHOST#i586-pc-winnt}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - i686-pc-cygwin*) - profile="${PORTDIR}/profiles/prefix/windows/cygwin/${CHOST#i686-pc-cygwin}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -L${ROOT}/lib -L${ROOT}/tmp/usr/lib\"" - ;; - hppa64*-hp-hpux11*) - profile="${PORTDIR}/profiles/prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib\"" - ;; - hppa2.0*-hp-hpux11*) - profile="${PORTDIR}/profiles/prefix/hpux/B.11${CHOST#hppa*-hpux11}/hppa2.0" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib\"" - ;; - ia64-hp-hpux11*) - profile="${PORTDIR}/profiles/prefix/hpux/B.11${CHOST#ia64-hp-hpux11}/ia64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -R${ROOT}/usr/lib -L${ROOT}/tmp/usr/lib -R${ROOT}/tmp/usr/lib -L/usr/local/lib -R/usr/local/lib\"" - ;; - i386-pc-freebsd*) - profile="${PORTDIR}/profiles/prefix/bsd/freebsd/${CHOST#i386-pc-freebsd}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-freebsd*) - profile="${PORTDIR}/profiles/prefix/bsd/freebsd/${CHOST#x86_64-pc-freebsd}/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - i386-pc-netbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/netbsd/${CHOST#i386-pc-netbsdelf}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - powerpc-unknown-openbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/openbsd/${CHOST#powerpc-unknown-openbsd}/ppc" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - i386-pc-openbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/openbsd/${CHOST#i386-pc-openbsd}/x86" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - x86_64-pc-openbsd*) - profile="${PORTDIR}/profiles/prefix/bsd/openbsd/${CHOST#x86_64-pc-openbsd}/x64" - ldflags_make_defaults="LDFLAGS=\"-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib -L${ROOT}/lib -Wl,-rpath=${ROOT}/lib -L${ROOT}/tmp/usr/lib -Wl,-rpath=${ROOT}/tmp/usr/lib\"" - ;; - *) - einfo "UNKNOWN ARCH: You need to set up a make.profile symlink to a" - einfo "profile in ${PORTDIR} for your CHOST ${CHOST}" - ;; - esac - - echo "${profile}" > "${PORTDIR_RAP}"/profiles/bootstrap/parent - - # REMOVE the following after migrating to gentoo-x86 base - echo "PORTDIR_OVERLAY=\"${PORTDIR_RAP}\"" >> "${ROOT}"/etc/portage/make.conf - - # don't inject rpath at all. - echo ">=sys-devel/binutils-config-3-r03.1" >> "${ROOT}"/etc/portage/package.mask -} - -do_tree() { - for x in etc{,/portage} {,usr/}{,s}bin usr/local var/tmp var/lib/portage var/log/portage var/db; - do - [[ -d ${ROOT}/${x} ]] || mkdir -p "${ROOT}/${x}" - done - if [[ ! -e ${PORTDIR}/.unpacked ]]; then - efetch "$1/$2" || return 1 - [[ -e ${PORTDIR} ]] || mkdir -p ${PORTDIR} - einfo "Unpacking, this may take a while" - bzip2 -dc ${DISTDIR}/$2 | $TAR -xf - -C ${PORTDIR%portage} || return 1 - touch ${PORTDIR}/.unpacked - fi -} - -bootstrap_tree() { - local PV="20130724" - if [[ -n ${LATEST_TREE_YES} ]]; then - do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2 - else - do_tree http://prefix.gentooexperimental.org/distfiles prefix-overlay-${PV}.tar.bz2 - fi - - # this is ugly, we have to put the temperory rap overlay somewhere - PORTDIR="${PORTDIR_RAP}" \ - do_tree http://dev.gentoo.org/~heroxbd rap-overlay.tar.bz2 -} - -bootstrap_latest_tree() { - # kept here for compatibility reasons - einfo "This function 'latest_tree' is deprecated and will be" - einfo "removed in the future, please set LATEST_TREE_YES=1 in the env" - LATEST_TREE_YES=1 bootstrap_tree -} - -bootstrap_startscript() { - local theshell=${SHELL##*/} - if [[ ${theshell} == "sh" ]] ; then - einfo "sh is a generic shell, using bash instead" - theshell="bash" - fi - if [[ ${theshell} == "csh" ]] ; then - einfo "csh is a prehistoric shell not available in Gentoo, switching to tcsh instead" - theshell="tcsh" - fi - einfo "Trying to emerge the shell you use, if necessary by running:" - einfo "emerge -u ${theshell}" - if ! emerge -u ${theshell} ; then - eerror "Your shell is not available in portage, hence we cannot" > /dev/stderr - eerror "automate starting your prefix, set SHELL and rerun this script" > /dev/stderr - return -1 - fi - einfo "Creating the Prefix start script (startprefix)" - # currently I think right into the prefix is the best location, as - # putting it in /bin or /usr/bin just hides it some more for the - # user - sed \ - -e "s|@GENTOO_PORTAGE_EPREFIX@|${ROOT}|g" \ - "${ROOT}"/usr/portage/scripts/startprefix.in \ - > "${ROOT}"/startprefix - chmod 755 "${ROOT}"/startprefix - einfo "To start Gentoo Prefix, run the script ${ROOT}/startprefix" - einfo "You can copy this file to a more convenient place if you like." - - # see if PATH is kept/respected - local minPATH="preamble:${BASH%/*}:postlude" - local theirPATH="$(echo 'echo "${PATH}"' | env LS_COLORS= PATH="${minPATH}" $SHELL -l 2>/dev/null | grep "preamble:.*:postlude")" - if [[ ${theirPATH} != *"preamble:"*":postlude"* ]] ; then - einfo "WARNING: your shell initialisation (.cshrc, .bashrc, .profile)" - einfo " seems to overwrite your PATH, this effectively kills" - einfo " your Prefix. Change this to only append to your PATH" - elif [[ ${theirPATH} != "preamble:"* ]] ; then - einfo "WARNING: your shell initialisation (.cshrc, .bashrc, .profile)" - einfo " seems to prepend to your PATH, this might kill your" - einfo " Prefix:" - einfo " ${theirPATH%%preamble:*}" - einfo " You better fix this, YOU HAVE BEEN WARNED!" - fi -} - -bootstrap_portage() { - # Set TESTING_PV in env if you want to test a new portage before bumping the - # STABLE_PV that is known to work. Intended for power users only. - ## It is critical that STABLE_PV is the lastest (non-masked) version that is - ## included in the snapshot for bootstrap_tree. - STABLE_PV="2.2.01.22124" - PV="${TESTING_PV:-${STABLE_PV}}" - A=prefix-portage-${PV}.tar.bz2 - einfo "Bootstrapping ${A%-*}" - - efetch ${DISTFILES_URL}/${A} || return 1 - - einfo "Unpacking ${A%-*}" - export S="${PORTAGE_TMPDIR}"/portage-${PV} - ptmp=${S} - rm -rf "${S}" >& /dev/null - mkdir -p "${S}" >& /dev/null - cd "${S}" - bzip2 -dc "${DISTDIR}/${A}" | $TAR -xf - || return 1 - S="${S}/prefix-portage-${PV}" - cd "${S}" - - # disable ipc - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ - return 1 - - # Portage checks for valid shebangs. These may (xz-utils) originate - # in CONFIG_SHELL (AIX), which originates in PORTAGE_BASH then. - # So we need to ensure portage's bash is valid as shebang too. - mkdir -p ${ROOT}/bin || return 1 - [[ -x ${ROOT}/bin/bash ]] || [[ ! -x ${ROOT}/tmp/bin/bash ]] || ln -s ${ROOT}/tmp/bin/bash ${ROOT}/bin/bash || return 1 - [[ -x ${ROOT}/bin/bash ]] || ln -s ${BASH} ${ROOT}/bin/bash || return 1 - export PORTAGE_BASH=${ROOT}/bin/bash - - einfo "Compiling ${A%-*}" - econf \ - --with-offset-prefix="${ROOT}" \ - --with-portage-user="`id -un`" \ - --with-portage-group="`id -gn`" \ - --mandir="${ROOT}/automatically-removed" \ - --with-extra-path="${ROOT}/tmp/bin:${ROOT}/tmp/usr/bin:/bin:/usr/bin:${PATH}" \ - || return 1 - $MAKE ${MAKEOPTS} || return 1 - - einfo "Installing ${A%-*}" - $MAKE install || return 1 - - bootstrap_setup - - cd "${ROOT}" - rm -Rf ${ptmp} >& /dev/null - - # Some people will skip the tree() step and hence var/log is not created - # As such, portage complains.. - [[ ! -d $ROOT/var/log ]] && mkdir ${ROOT}/var/log - - # during bootstrap_portage(), man pages are not compressed. This is - # problematic once you have a working prefix. So, remove them now. - rm -rf "${ROOT}/automatically-removed" - - # in Prefix the sed wrapper is deadly, so kill it - rm -f "${ROOT}"/usr/lib/portage/bin/ebuild-helpers/sed - - einfo "${A%-*} successfully bootstrapped" -} - -prep_gcc-apple() { - - GCC_PV=5341 - GCC_A="gcc-${GCC_PV}.tar.gz" - TAROPTS="-zxf" - - efetch ${GCC_APPLE_URL}/${GCC_A} || return 1 - -} - -prep_gcc-fsf() { - - GCC_PV=4.1.2 - GCC_A=gcc-${GCC_PV}.tar.bz2 - TAROPTS="-jxf" - - efetch ${GENTOO_MIRRORS}/distfiles/${GCC_A} || return 1 - -} - -bootstrap_gnu() { - local PN PV A S - PN=$1 - PV=$2 - - einfo "Bootstrapping ${PN}" - - for t in tar.gz tar.xz tar.bz2 tar ; do - A=${PN}-${PV}.${t} - - # save the user some useless downloading - if [[ ${t} == tar.gz ]] ; then - type -P gzip > /dev/null || continue - fi - if [[ ${t} == tar.xz ]] ; then - type -P xz > /dev/null || continue - fi - if [[ ${t} == tar.bz2 ]] ; then - type -P bzip2 > /dev/null || continue - fi - - URL=${GNU_URL}/${PN}/${A} - [[ ${PN} == gcc ]] && URL=${GNU_URL}/${PN}/${PN}-${PV}/${A} - efetch ${URL} || continue - - einfo "Unpacking ${A%-*}" - S="${PORTAGE_TMPDIR}/${PN}-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - if [[ ${t} == "tar.gz" ]] ; then - gzip -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue - elif [[ ${t} == "tar.xz" ]] ; then - xz -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue - elif [[ ${t} == "tar.bz2" ]] ; then - bzip2 -dc "${DISTDIR}"/${URL##*/} | $TAR -xf - || continue - elif [[ ${t} == "tar" ]] ; then - $TAR -xf "${DISTDIR}"/${A} || continue - else - einfo "unhandled extension: $t" - return 1 - fi - break - done - S="${S}"/${PN}-${PV} - [[ -d ${S} ]] || return 1 - cd "${S}" || return 1 - - local myconf="" - if [[ ${PN} == "grep" ]] ; then - # Solaris and OSX don't like it when --disable-nls is set, - # so just don't set it at all. - # Solaris 11 has a messed up prce installation. We don't need - # it anyway, so just disable it - myconf="${myconf} --disable-perl-regexp" - # Except interix really needs it for grep. - [[ $CHOST == *interix* ]] && myconf="${myconf} --disable-nls" - fi - - # AIX doesn't like --enable-nls in general during bootstrap - [[ $CHOST == *-aix* ]] && myconf="${myconf} --disable-nls" - # AIX 7.1 has fstatat(), but broken without APAR IV23716: - [[ $CHOST == *-aix7* ]] && export ac_cv_func_fstatat=no - - # NetBSD has strange openssl headers, which make wget fail. - [[ $CHOST == *-netbsd* ]] && myconf="${myconf} --disable-ntlm" - - # Darwin9 in particular doesn't compile when using system readline, - # but we don't need any groovy input at all, so just disable it - [[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline" - - # Don't do ACL stuff on Darwin, especially Darwin9 will make - # coreutils completely useless (install failing on everything) - # Don't try using gmp either, it may be that just the library is - # there, and if so, the buildsystem assumes the header exists too - [[ ${PN} == "coreutils" ]] && \ - myconf="${myconf} --disable-acl --without-gmp" - - [[ ${PN} == "gcc" ]] && myconf="${myconf} --disable-bootstrap --enable-languages=c\ - --disable-multilib" - - if [[ ${PN} == "coreutils" && ${CHOST} == *-interix* ]] ; then - # Interix doesn't have filesystem listing stuff, but that means all - # other utilities but df aren't useless at all, so don't die - sed -i -e '/^if test -z "$ac_list_mounted_fs"; then$/c\if test 1 = 0; then' configure - - # try to make id() not poll the entire domain before returning - export CFLAGS="${CFLAGS} -Dgetgrgid=getgrgid_nomembers -Dgetgrent=getgrent_nomembers -Dgetgrnam=getgrnam_nomembers" - - # Fix a compilation error due to a missing definition - sed -i -e '/^#include "fcntl-safer.h"$/a\#define ESTALE -1' lib/savewd.c - fi - - if [[ ${PN} == "tar" && ${CHOST} == *-hpux* ]] ; then - # Fix a compilation error due to a missing definition - export CPPFLAGS="${CPPFLAGS} -DCHAR_BIT=8" - fi - - # Gentoo Bug 400831, fails on Ubuntu with libssl-dev installed - [[ ${PN} == "wget" ]] && myconf="${myconf} --without-ssl" - - einfo "Compiling ${PN}" - econf ${myconf} || return 1 - if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then - ./build.sh || return 1 - else - $MAKE ${MAKEOPTS} || return 1 - fi - - einfo "Installing ${PN}" - if [[ ${PN} == "make" && $(type -t $MAKE) != "file" ]]; then - ./make install MAKE="${S}/make" || return 1 - else - $MAKE install || return 1 - fi - - cd "${ROOT}" - rm -Rf "${S}" - einfo "${PN}-${PV} successfully bootstrapped" -} - -bootstrap_python() { - PV=2.7.3 - A=python-${PV}-patched.tar.bz2 - - [[ ${CHOST} == *-aix* ]] && A=Python-${PV}.tar.bz2 # patched one breaks - - einfo "Bootstrapping ${A%-*}" - - # don't really want to put this on the mirror, since they are - # non-vanilla sources, bit specific for us - efetch ${DISTFILES_URL}/${A} || return 1 - - einfo "Unpacking ${A%%-*}" - export S="${PORTAGE_TMPDIR}/python-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - bzip2 -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - S="${S}"/Python-${PV} - cd "${S}" - - local myconf="" - - case $CHOST in - *-*-aix*) - # Python stubbornly insists on using cc_r to compile. We - # know better, so force it to listen to us - myconf="${myconf} --with-gcc=yes" - ;; - *-openbsd*) - CFLAGS="${CFLAGS} -D_BSD_SOURCE=1" - ;; - *-linux*) - # Bug 382263: make sure Python will know about the libdir in use for - # the current arch - libdir="-L/usr/lib/$(gcc -print-multi-os-directory)" - ;; - x86_64-*-solaris*|sparcv9-*-solaris*) - # Like above, make Python know where GCC's 64-bits - # libgcc_s.so is on Solaris - libdir="-L/usr/sfw/lib/64" - ;; - esac - - # python refuses to find the zlib headers that are built in the - # offset - export CPPFLAGS="-I$EPREFIX/tmp/usr/include" - export LDFLAGS="-L$EPREFIX/tmp/usr/lib" - # set correct flags for runtime for ELF platforms - case $CHOST in - *-*bsd*|*-linux*) - # GNU ld - export LDFLAGS="${LDFLAGS} -Wl,-rpath,$EPREFIX/tmp/usr/lib ${libdir}" - ;; - *-solaris*) - # Sun ld - export LDFLAGS="${LDFLAGS} -R$EPREFIX/tmp/usr/lib ${libdir}" - ;; - esac - - # if the user has a $HOME/.pydistutils.cfg file, the python - # installation is going to be screwed up, as reported by users, so - # just make sure Python won't find it - export HOME="${S}" - - export PYTHON_DISABLE_MODULES="bsddb bsddb185 bz2 crypt _ctypes_test _curses _curses_panel dbm _elementtree gdbm _locale nis pyexpat readline _sqlite3 _tkinter" - export PYTHON_DISABLE_SSL=1 - export OPT="${CFLAGS}" - - einfo "Compiling ${A%-*}" - econf \ - --disable-toolbox-glue \ - --disable-ipv6 \ - --disable-shared \ - ${myconf} || return 1 - $MAKE ${MAKEOPTS} || return 1 - - einfo "Installing ${A%-*}" - $MAKE -k install || echo "??? Python failed to install *sigh* continuing anyway" - cd "${ROOT}"/usr/bin - ln -sf python${PV%.*} python - cd "${ROOT}"/usr/lib - # messes up python emerges, and shouldn't be necessary for anything - # http://forums.gentoo.org/viewtopic-p-6890526.html - rm -f libpython${PV%.*}.a - - einfo "${A%-*} bootstrapped" -} - -bootstrap_zlib_core() { - # use 1.2.5 by default, current bootstrap guides - PV="${1:-1.2.5}" - A=zlib-${PV}.tar.gz - - einfo "Bootstrapping ${A%-*}" - - if ! efetch ${GENTOO_MIRRORS}/distfiles/${A} ; then - A=zlib-${PV}.tar.bz2 - efetch ${GENTOO_MIRRORS}/distfiles/${A} || return 1 - fi - - einfo "Unpacking ${A%%-*}" - export S="${PORTAGE_TMPDIR}/zlib-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - if [[ ${A} == *.tar.gz ]] ; then - gzip -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - else - bzip2 -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - fi - S="${S}"/zlib-${PV} - cd "${S}" - - if [[ ${CHOST} == x86_64-*-* || ${CHOST} == sparcv9-*-* ]] ; then - # 64-bits targets need zlib as library (not just to unpack), - # hence we need to make sure that we really bootstrap this - # 64-bits (in contrast to the tools which we don't care if they - # are 32-bits) - export CC="gcc -m64" - elif [[ ${CHOST} == i?86-*-* ]] ; then - # This is important for bootstraps which are 64-native, but we - # want 32-bits, such as most Linuxes, and more recent OSX. - # OS X Lion and up default to a 64-bits userland, so force the - # compiler to 32-bits code generation if requested here - export CC="gcc -m32" - fi - # 1.2.5 suffers from a concurrency problem - [[ ${PV} == 1.2.5 ]] && MAKEOPTS= - - einfo "Compiling ${A%-*}" - CHOST= ${CONFIG_SHELL} ./configure --prefix="${ROOT}"/usr || return 1 - $MAKE ${MAKEOPTS} || return 1 - - einfo "Installing ${A%-*}" - $MAKE install || return 1 - - # this lib causes issues when emerging python again on Solaris - # because the tmp lib path is in the library search path there - rm -Rf "${ROOT}"/usr/lib/libz*.a - - einfo "${A%-*} bootstrapped" -} - -bootstrap_zlib() { - bootstrap_zlib_core 1.2.8 || bootstrap_zlib_core 1.2.7 || \ - bootstrap_zlib_core 1.2.6 || bootstrap_zlib_core 1.2.5 -} - -bootstrap_gmp() { - bootstrap_gnu gmp 5.0.5 -} - -bootstrap_mpfr() { - export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib" - bootstrap_gnu mpfr 3.1.2 -} - -bootstrap_mpc() { - export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib" - bootstrap_gnu mpc 1.0.1 -} - -bootstrap_gcc() { - export CPPFLAGS="-I${ROOT}/usr/include" - export LDFLAGS="-L${ROOT}/usr/lib -Wl,-rpath=${ROOT}/usr/lib" - bootstrap_gnu gcc 4.7.3 -} - -bootstrap_sed() { - bootstrap_gnu sed 4.2.1 -} - -bootstrap_findutils() { - bootstrap_gnu findutils 4.5.10 || bootstrap_gnu findutils 4.2.33 -} - -bootstrap_wget() { - bootstrap_gnu wget 1.13.4 -} - -bootstrap_grep() { - # don't use 2.13, it contains a bug that bites, bug #425668 - # 2.9 is the last version provided as tar.gz (platforms without xz) - # 2.7 is necessary for Solaris/OpenIndiana (2.8, 2.9 fail to configure) - bootstrap_gnu grep 2.14 || bootstrap_gnu grep 2.12 || \ - bootstrap_gnu grep 2.9 || bootstrap_gnu grep 2.7 -} - -bootstrap_coreutils() { - # 8.12 for FreeBSD 9.1, bug #415439 - # 8.16 is the last version released as tar.gz - bootstrap_gnu coreutils 8.17 || bootstrap_gnu coreutils 8.16 || \ - bootstrap_gnu coreutils 8.12 -} - -bootstrap_tar() { - bootstrap_gnu tar 1.26 -} - -bootstrap_make() { - bootstrap_gnu make 3.82 -} - -bootstrap_patch() { - # 2.5.9 needed for OSX 10.6.x - bootstrap_gnu patch 2.7.1 || bootstrap_gnu patch 2.6.1 || \ - bootstrap_gnu patch 2.5.9 || bootstrap_gnu patch 2.5.4 -} - -bootstrap_gawk() { - bootstrap_gnu gawk 4.0.1 || bootstrap_gnu gawk 4.0.0 || \ - bootstrap_gnu gawk 3.1.8 -} - -bootstrap_binutils() { - bootstrap_gnu binutils 2.23 -} - -bootstrap_texinfo() { - bootstrap_gnu texinfo 4.8 -} - -bootstrap_bash() { - bootstrap_gnu bash 4.2 -} - -bootstrap_bison() { - bootstrap_gnu bison 2.6.2 || bootstrap_gnu bison 2.6.1 || \ - bootstrap_gnu bison 2.6 || bootstrap_gnu bison 2.5.1 || \ - bootstrap_gnu bison 2.4 -} - -bootstrap_m4() { - bootstrap_gnu m4 1.4.16 || bootstrap_gnu m4 1.4.15 -} - -bootstrap_gzip() { - bootstrap_gnu gzip 1.4 -} - -bootstrap_bzip2() { - local PN PV A S - PN=bzip2 - PV=1.0.6 - A=${PN}-${PV}.tar.gz - einfo "Bootstrapping ${A%-*}" - - efetch ${GENTOO_MIRRORS}/distfiles/${A} || return 1 - - einfo "Unpacking ${A%-*}" - S="${PORTAGE_TMPDIR}/${PN}-${PV}" - rm -rf "${S}" - mkdir -p "${S}" - cd "${S}" - gzip -dc "${DISTDIR}"/${A} | $TAR -xf - || return 1 - S="${S}"/${PN}-${PV} - cd "${S}" - - einfo "Compiling ${A%-*}" - $MAKE || return 1 - - einfo "Installing ${A%-*}" - $MAKE PREFIX="${ROOT}"/usr install || return 1 - - cd "${ROOT}" - rm -Rf "${S}" - einfo "${A%-*} successfully bootstrapped" -} - -bootstrap_stage1() { - if [[ ${ROOT} != */tmp ]] ; then - eerror "stage1 can only be used for paths that end in '/tmp'" - return 1 - fi - - # NOTE: stage1 compiles all tools (no libraries) in the native - # bits-size of the compiler, which needs not to match what we're - # bootstrapping for. This is no problem since they're just tools, - # for which it really doesn't matter how they run, as long AS they - # run. For libraries, this is different, since they are relied on - # by packages we emerge lateron. - # Changing this to compile the tools for the bits the bootstrap is - # for, is a BAD idea, since we're extremely fragile here, so - # whatever the native toolchain is here, is what in general works - # best. - - # run all bootstrap_* commands in a subshell since the targets - # frequently pollute the environment using exports which affect - # packages following (e.g. zlib builds 64-bits) - - # don't rely on $MAKE, if make == gmake packages that call 'make' fail - [[ $(make --version 2>&1) == *GNU* ]] || (bootstrap_make) || return 1 - type -P wget > /dev/null || (bootstrap_wget) || return 1 - [[ $(sed --version 2>&1) == *GNU* ]] || (bootstrap_sed) || return 1 - [[ $(m4 --version 2>&1) == *GNU*1.4.1?* ]] || (bootstrap_m4) || return 1 - [[ $(bison --version 2>&1) == *"(GNU Bison) 2."[345678]* ]] \ - || (bootstrap_bison) || return 1 - [[ $(uniq --version 2>&1) == *"(GNU coreutils) "[6789]* ]] \ - || (bootstrap_coreutils) || return 1 - [[ $(find --version 2>&1) == *GNU* ]] || (bootstrap_findutils) || return 1 - [[ $(tar --version 2>&1) == *GNU* ]] || (bootstrap_tar) || return 1 - [[ $(patch --version 2>&1) == *"GNU patch 2."7* ]] || (bootstrap_patch) || return 1 - [[ $(grep --version 2>&1) == *GNU* ]] || (bootstrap_grep) || return 1 - [[ $(awk --version < /dev/null 2>&1) == *GNU* ]] || bootstrap_gawk || return 1 - [[ $(bash --version 2>&1) == "GNU bash, version 4."[123456789]* ]] \ - || (bootstrap_bash) || return 1 - if type -P pkg-config > /dev/null ; then - # it IS possible to get here without installing anything in - # tmp/usr/bin, which makes the below fail to happen - mkdir -p "${ROOT}"/usr/bin/ - # hide an existing pkg-config for glib, which first checks - # pkg-config for libffi, and only then the LIBFFI_* vars - # this resolves nasty problems like bug #426302 - # note that an existing pkg-config can be ancient, which glib - # doesn't grok (e.g. Solaris 10) => error - { - echo "#!/bin/sh" - echo "exit 1" - } > "${ROOT}"/usr/bin/pkg-config - chmod 755 "${ROOT}"/usr/bin/pkg-config - fi - type -P bzip2 > /dev/null || (bootstrap_bzip2) || return 1 - # important to have our own (non-flawed one) since Python (from - # Portage) and binutils use it - - ls ${ROOT}/usr/lib/libz.* >/dev/null 2>&1 || (bootstrap_zlib) || return 1 - ls ${ROOT}/usr/lib/libgmp.* >/dev/null 2>&1 || (bootstrap_gmp) || return 1 - ls ${ROOT}/usr/lib/libmpfr.* >/dev/null 2>&1 || (bootstrap_mpfr) || return 1 - ls ${ROOT}/usr/lib/libmpc.* >/dev/null 2>&1 || (bootstrap_mpc) || return 1 - - # too vital to rely on a host-provided one - [[ -x ${ROOT}/usr/bin/python ]] || (bootstrap_python) || return 1 - - # glibc requies >=gcc-4.6 - [[ $(gcc --version 2>&1) == *'gcc ('*') 4.'[678]* ]] || (bootstrap_gcc) || return 1 - - einfo "stage1 successfully finished" -} - -bootstrap_stage2() { - if [[ ${ROOT} == */tmp ]] ; then - eerror "stage2 cannot be used for paths that end in '/tmp'" - return 1 - fi - - # checks itself if things need to be done still - bootstrap_tree || return 1 - [[ -e ${ROOT}/etc/make.globals ]] || bootstrap_portage || return 1 - - einfo "stage2 successfully finished" -} - -bootstrap_stage3() { - if [[ ${ROOT} == */tmp ]] ; then - eerror "stage3 cannot be used for paths that end in '/tmp'" - return 1 - fi - - if ! type -P emerge > /dev/null ; then - eerror "emerge not found, did you bootstrap stage1 and stage2?" - return 1 - fi - - # stage2 as set a profile, which defines CHOST, so unset any CHOST - # we've got here to avoid cross-compilation due to slight - # differences caused by our guessing vs. what the profile sets. - # This happens at least on 32-bits Darwin, with i386 and i686. - # https://bugs.gentoo.org/show_bug.cgi?id=433948 - local bootstrapCHOST=${CHOST} - unset CHOST - - # No longer support gen_usr_ldscript stuff in new bootstraps, this - # must be in line with what eventually ends up in make.conf, see the - # end of this function. We don't do this in bootstrap_setup() - # because in that case we'd also have to cater for getting this - # right with manual bootstraps. - export PREFIX_DISABLE_GEN_USR_LDSCRIPT=yes - - emerge_pkgs() { - local opts=$1 ; shift - local pkg vdb pvdb evdb premerge - for pkg in "$@"; do - vdb=${pkg} - if [[ ${vdb} == "="* ]] ; then - vdb=${vdb#=} - elif [[ ${vdb} == "<"* ]] ; then - vdb=${vdb#<} - vdb=${vdb%-r*} - vdb=${vdb%-*} - vdb=${vdb}-\* - else - vdb=${vdb}-\* - fi - for pvdb in ${ROOT}/var/db/pkg/${vdb%-*}-* ; do - if [[ -d ${pvdb} ]] ; then - evdb=${pvdb##*/} - if [[ ${pkg} == "="* ]] ; then - # exact match required (* should work here) - [[ ${evdb} == ${vdb##*/} ]] && break - else - vdb=${vdb%-*} - evdb=${evdb%-r*} - evdb=${evdb%_p*} - evdb=${evdb%-*} - [[ ${evdb} == ${vdb#*/} ]] && break - fi - fi - pvdb= - done - [[ -n ${pvdb} ]] && continue - # for a valid shebang, we have symlinked bin/bash already - [[ ${pkg} == *"app-shells/bash"* ]] && - premerge="FEATURES='${FEATURES} -collision-protect'" - eval ${premerge} 'emerge -v --oneshot ${opts} "${pkg}"' - [[ $? -eq 0 ]] || return 1 - done - } - - set_profile 1 - # --oneshot --nodeps - local pkgs=( - sys-apps/sed - "<app-shells/bash-4.2_p20" # higher versions require readline - app-arch/xz-utils - sys-apps/baselayout-prefix - sys-devel/m4 - sys-devel/flex - sys-devel/bison - sys-libs/zlib - dev-libs/gmp - dev-libs/mpfr - dev-libs/mpc - sys-kernel/linux-headers - sys-devel/gcc-config - sys-devel/binutils-config - sys-devel/binutils - ) - - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - echo 'int main() {}' > test-rpath.c - gcc -o test-rpath test-rpath.c - if readelf -d test-rpath | grep -q rpath; then - cat <<EOF - -Your present toolchain injects rpath into ELF, which causes glibc to -fail. Please disable this feature for the moment and try again. - -EOF - return 1; - fi - - if [[ ! -x "${ROOT}"/usr/bin/perl ]]; then - local perlLoc=$(type -P perl) - if [[ -n ${perlLoc} ]]; then - ln -sf "${perlLoc}" "${ROOT}"/usr/bin/perl - else - echo "We need perl at ${ROOT}/usr/bin/perl to compile glibc." - return 1 - fi - fi - - pkgs=( sys-libs/glibc ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # in gcc bootstrap stage 1, xgcc/cc1 and friends may be linked against libgcc_s.so of - # the old gcc, which cannot be found on new RAP. Append that directory to ld.so.conf - # so that our RAP dynamic linker can find it. This will be overwritten by env-update - # afterwards. - local oldGCC - # in case CHOST-gcc is different from gcc in PATH - oldGCC=$(type -P $(portageq envvar CHOST)-gcc) - [[ -n ${oldGCC} ]] || oldGCC=$(type -P gcc) - dirname $(${oldGCC} -print-libgcc-file-name) >> ${ROOT}/etc/ld.so.conf - ${ROOT}/usr/sbin/ldconfig - - pkgs=( sys-devel/gcc ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # we need pax-utils this early for OSX (before libiconv - gen_usr_ldscript) - # but also for perl, which uses scanelf/scanmacho to find compatible - # lib-dirs - # --oneshot - local pkgs=( - app-misc/pax-utils # see note above - sys-apps/coreutils - sys-apps/findutils - "<app-arch/tar-1.26-r1" # bug 406131 - sys-apps/grep - sys-apps/gawk - sys-devel/make - sys-libs/zlib - ) - emerge_pkgs "" "${pkgs[@]}" || return 1 - - # --oneshot --nodeps - local pkgs=( - sys-apps/file - app-admin/eselect - dev-util/pkgconf - ) - emerge_pkgs --nodeps "${pkgs[@]}" || return 1 - - # --oneshot - local pkgs=( - net-misc/wget - sys-apps/acl - ) - emerge_pkgs "" "${pkgs[@]}" || return 1 - - # for some yet unknown reason, libxml2 has a problem with zlib, but - # only during this stage, in the emerge -e system phase it is fine - # it boils down to zlib headers replacing gzopen with gzopen64, but - # no gzopen64 prototype being defined, due to libxml.h messing with - # FILE_OFFSET_BITS - # we can work around this by defining NO_LARGEFILE_SOURCE for libxml.h - # since we have the compiler emerged, it's no problem we wipe out - # the -I directions set by the profile - export CPPFLAGS="${CPPFLAGS} -DNO_LARGEFILE_SOURCE" - - # disable collision-protect to overwrite the bootstrapped portage - FEATURES="-collision-protect" emerge_pkgs "" "sys-apps/portage" || return 1 - - unset CPPFLAGS - - if [[ -d ${ROOT}/tmp/var/tmp ]] ; then - rm -Rf "${ROOT}"/tmp || return 1 - mkdir -p "${ROOT}"/tmp || return 1 - fi - - set_profile 2 - - # Portage should figure out itself what it needs to do, if anything - USE=-git emerge -u system || return 1 - - if [[ ! -f ${EPREFIX}/etc/portage/make.conf ]] ; then - { - echo 'USE="unicode nls"' - echo 'CFLAGS="${CFLAGS} -O2 -pipe"' - echo 'CXXFLAGS="${CFLAGS}"' - echo "MAKEOPTS=\"${MAKEOPTS}\"" - echo "# be careful with this one, don't just remove it!" - echo "PREFIX_DISABLE_GEN_USR_LDSCRIPT=yes" - } > "${EPREFIX}"/etc/portage/make.conf - fi - - einfo "stage3 successfully finished" -} - -bootstrap_interactive() { - cat <<"EOF" - - - . - .vir. d$b - .d$$$$$$b. .cd$$b. .d$$b. d$$$$$$$$$$$b .d$$b. .d$$b. - $$$$( )$$$b d$$$()$$$. d$$$$$$$b Q$$$$$$$P$$$P.$$$$$$$b. .$$$$$$$b. - Q$$$$$$$$$$B$$$$$$$$P" d$$$PQ$$$$b. $$$$. .$$$P' `$$$ .$$$P' `$$$ - "$$$$$$$P Q$$$$$$$b d$$$P Q$$$$b $$$$b $$$$b..d$$$ $$$$b..d$$$ - d$$$$$$P" "$$$$$$$$ Q$$$ Q$$$$ $$$$$ `Q$$$$$$$P `Q$$$$$$$P - $$$$$$$P `""""" "" "" Q$$$P "Q$$$P" "Q$$$P" - `Q$$P" """ - - Welcome to the Gentoo Prefix interactive installer! - - - I will attempt to install Gentoo Prefix on your system. To do so, I'll - ask you some questions first. After that, you'll have to practise - patience as your computer and I try to figure out a way to get a lot of - software packages compiled. If everything goes according to plan, - you'll end up with what we call "a Prefix install", but by that time, - I'll tell you more. - - -EOF - [[ ${TODO} == 'noninteractive' ]] && ans=yes || - read -p "Do you want me to start off now? [Yn] " ans - case "${ans}" in - [Yy][Ee][Ss]|[Yy]|"") - : ;; - *) - echo "Right. Aborting..." - exit 1 - ;; - esac - - echo - echo "It seems to me you are '${USER:-$(whoami 2> /dev/null)}' (${UID}), that looks cool to me." - - echo - echo "I'm going to check for some variables in your environment now:" - local flag dvar badflags= - for flag in \ - ASFLAGS \ - CFLAGS \ - CPPFLAGS \ - CXXFLAGS \ - DYLD_LIBRARY_PATH \ - GREP_OPTIONS \ - LDFLAGS \ - LD_LIBRARY_PATH \ - LIBPATH \ - PERL_MM_OPT \ - PKG_CONFIG_PATH \ - PYTHONPATH \ - ; do - # starting on purpose a shell here iso ${!flag} because I want - # to know if the shell initialisation files trigger this - # note that this code is so complex because it handles both - # C-shell as sh - dvar="echo \"((${flag}=\${${flag}}))\"" - dvar="$(echo "${dvar}" | env -i HOME=$HOME $SHELL -l 2>/dev/null)" - if [[ ${dvar} == *"((${flag}="?*"))" ]] ; then - badflags="${badflags} ${flag}" - dvar=${dvar#*((${flag}=} - dvar=${dvar%%))*} - echo " uh oh, ${flag}=${dvar} :(" - else - echo " it appears ${flag} is not set :)" - fi - # unset for the current environment - unset ${flag} - done - if [[ -n ${badflags} ]] ; then - cat << EOF - -Ahem, your shell environment contains some variables I'm allergic to: - ${badflags} -These flags can and will influence the way in which packages compile. -In fact, they have a long standing tradition to break things. I really -prefer to be on my own here. So please make sure you disable these -environment variables in your shell initialisation files. After you've -done that, you can run me again. -EOF - exit 1 - fi - echo - echo "I'm excited! Seems we can finally do something productive now." - - cat << EOF - -Ok, I'm going to do a little bit of guesswork here. Thing is, your -machine appears to be identified by CHOST=${CHOST}. -EOF - case "${CHOST}" in - powerpc*|ppc*|sparc*) - cat << EOF - -To me, it seems to be a big-endian machine. I told you before you need -patience, but with your machine, regardless how many CPUs you have, you -need some more. Context switches are just expensive, and guess what -fork/execs result in all the time. I'm going to make it even worse for -you, configure and make typically are fork/exec bombs. -I'm going to assume you're actually used to having patience with this -machine, which is good, because I really love a box like yours! -EOF - ;; - esac - - # the standard path we want to start with, override anything from - # the user on purpose - PATH="/usr/bin:/bin" - # don't exclude the path to bash if it isn't in a standard location - type -P bash > /dev/null || PATH="${BASH%/bash}:${PATH}" - case "${CHOST}" in - *-solaris*) - cat << EOF - -Ok, this is Solaris, or a derivative like OpenSolaris or OpenIndiana. -Sometimes, useful tools necessary at this stage are hidden. I'm going -to check if that's the case for your system too, and if so, add those -locations to your PATH. -EOF - # could do more "smart" CHOST deductions here, but brute - # force is most likely as quick, but simpler - [[ -d /usr/sfw/bin ]] \ - && PATH="${PATH}:/usr/sfw/bin" - [[ -d /usr/sfw/i386-sun-solaris${CHOST##*-solaris}/bin ]] \ - && PATH="${PATH}:/usr/sfw/i386-sun-solaris${CHOST##*-solaris}/bin" - [[ -d /usr/sfw/sparc-sun-solaris${CHOST##*-solaris}/bin ]] \ - && PATH="${PATH}:/usr/sfw/sparc-sun-solaris${CHOST##*-solaris}/bin" - # OpenIndiana 151a5 - [[ -d /usr/gnu/bin ]] && PATH="${PATH}:/usr/gnu/bin" - # SmartOS - [[ -d /opt/local/gcc47/bin ]] && PATH="${PATH}:/opt/local/gcc47/bin" - ;; - esac - - # TODO: should we better use cc here? or check both? - if ! type -P gcc > /dev/null ; then - case "${CHOST}" in - *-darwin*) - cat << EOF - -Uh oh... a Mac OS X system, but without compiler. You must have -forgotten to install Xcode tools. If your Mac didn't come with an -install DVD (pre Lion) you can find it in the Mac App Store, or download -the Xcode command line tools from Apple Developer Connection. If you -did get a CD/DVD with your Mac, there is a big chance you can find Xcode -on it, and install it right away. -Please do so, and try me again! -EOF - exit 1 - ;; - *-solaris2.[789]|*-solaris2.10) - cat << EOF - -Yikes! Your Solaris box doesn't come with gcc in /usr/sfw/blabla/bin? -What good is it to me then? I can't find a compiler! I'm afraid -you'll have to find a way to install the Sun FreeWare tools somehow, is -it on the Companion disc perhaps? -See me again when you figured it out. -EOF - exit 1 - ;; - *-solaris*) - SOLARIS_RELEASE=$(head -n1 /etc/release) - if [[ ${SOLARIS_RELEASE} == *"Oracle Solaris"* ]] ; then - cat << EOF -Seems like you have installed Oracle Solaris ${SOLARIS_RELEASE}. -I suppose you have solaris publisher set. If not, use: - pkg set-publisher -p http://pkg.oracle.com/solaris/release -You need to install some necessary packages: - pkg install developer/gcc-45 system/header -In the meanwhile, I'll wait here until you run me again, with a compiler. -EOF - else - cat << EOF - -Sigh. This is OpenSolaris or OpenIndiana? I can't tell the difference -without looking more closely. What I DO know, is that there is no -compiler, at least not where I was just looking, so how do we continue -from here, eh? I just think you didn't install one. I know it can be -tricky on OpenIndiana, for instance, so won't blame you. In case you're -on OpenIndiana, I'll help you a bit. Perform the following as -super-user: - pkg install developer/gnu system/library/math/header-math -In the meanwhile, I'll wait here until you run me again, with a compiler. -EOF - fi - exit 1 - ;; - *) - cat << EOF - -Well, well... let's make this painful situation as short as it can be: -you don't appear to have a compiler around for me to play with. -Since I like your PATH to be as minimal as possible, I threw away -everything you put in it, and started from scratch. Perhaps, the almost -impossible happened that I was wrong in doing so. -Ok, I'll give you a chance. You can now enter what you think is -necessary to add to PATH for me to find a compiler. I start off with -PATH=${PATH} and will add anything you give me here. -EOF - [[ ${TODO} == 'noninteractive' ]] && ans="" || - read -p "Where can I find your compiler? [] " ans - case "${ans}" in - "") - : ;; - *) - PATH="${PATH}:${ans}" - ;; - esac - if ! type -P gcc > /dev/null ; then - cat << EOF - -Are you sure you have a compiler? I didn't find one. I think you -better first go get one, then run me again. -EOF - exit 1 - else - echo - echo "Pfff, ok, it seems you were right. Can we move on now?" - fi - ;; - esac - else - echo - echo "Great! You appear to have a compiler in your PATH" - fi - - echo - local ncpu= - case "${CHOST}" in - *-darwin*) ncpu=$(/usr/sbin/sysctl -n hw.ncpu) ;; - *-freebsd*) ncpu=$(/sbin/sysctl -n hw.ncpu) ;; - *-solaris*) ncpu=$(/usr/sbin/psrinfo | wc -l) ;; - *-linux-gnu*) ncpu=$(cat /proc/cpuinfo | grep processor | wc -l) ;; - *-aix*) ncpu=$(/usr/sbin/bindprocessor -q | cut -d: -f2 | wc -w) ;; - *) ncpu=1 ;; - esac - # get rid of excess spaces (at least Solaris wc does) - ncpu=$((ncpu + 0)) - # Suggest usage of 100% to 60% of the available CPUs in the range - # from 1 to 14. We limit to no more than 8, since we easily flood - # the bus on those heavy-core systems and only slow down in that - # case anyway. - local tcpu=$((ncpu / 2 + 1)) - [[ ${tcpu} -gt 8 ]] && tcpu=8 - cat << EOF - -I did my utmost best, and found that you have ${ncpu} cpu cores. If -this looks wrong to you, you can happily ignore me. Based on the number -of cores you have, I came up with the idea of parallelising compilation -work where possible with ${tcpu} parallel make threads. If you have no -clue what this means, you should go with my excellent default I've -chosen below, really! -EOF - [[ ${TODO} == 'noninteractive' ]] && ans="" || - read -p "How many parallel make jobs do you want? [${tcpu}] " ans - case "${ans}" in - "") - MAKEOPTS="-j${tcpu}" - ;; - *) - if [[ ${ans} -le 0 ]] ; then - echo - echo "You should have entered a non-zero integer number, obviously..." - exit 1 - elif [[ ${ans} -gt ${tcpu} && ${tcpu} -ne 1 ]] ; then - if [[ ${ans} -gt ${ncpu} ]] ; then - cat << EOF - -Want to push it very hard? I already feel sorry for your poor box with -its mere ${ncpu} cpu cores. -EOF - elif [[ $((ans - tcpu)) -gt 1 ]] ; then - cat << EOF - -So you think you can stress your system a bit more than my extremely -well thought out formula suggested you? Hmmpf, I'll take it you know -what you're doing then. -EOF - sleep 1 - echo "(are you?)" - fi - MAKEOPTS="-j${ans}" - fi - ;; - esac - export MAKEOPTS - - #32/64 bits, multilib - local candomultilib=no - local t64 t32 - case "${CHOST}" in - *86*-darwin9|*86*-darwin1[012]) - # PPC/Darwin only works in 32-bits mode, so this is Intel - # only, and only starting from Leopard (10.5, darwin9) - candomultilib=yes - t64=x86_64-${CHOST#*-} - t32=i686-${CHOST#*-} - ;; - *-solaris*) - # Solaris is a true multilib system from as long as it does - # 64-bits, we only need to know if the CPU we use is capable - # of doing 64-bits mode - [[ $(/usr/bin/isainfo | tr ' ' '\n' | wc -l) -ge 2 ]] \ - && candomultilib=yes - if [[ ${CHOST} == sparc* ]] ; then - t64=sparcv9-${CHOST#*-} - t32=sparc-${CHOST#*-} - else - t64=x86_64-${CHOST#*-} - t32=i386-${CHOST#*-} - fi - ;; - # Even though multilib on Linux is often supported in some way, - # it's hardly ever installed by default (it seems) - # Since it's non-trivial to figure out if such system (binary - # packages can report to be multilib, but lack all necessary - # libs) is truely multilib capable, we don't bother here. The - # user can override if he/she is really convinced the system can - # do it. - esac - if [[ ${candomultilib} == yes ]] ; then - cat << EOF - -Your system appears to be a multilib system, that is in fact also -capable of doing multilib right here, right now. Multilib means -something like "being able to run multiple kinds of binaries". The most -interesting kind for you now is 32-bits versus 64-bits binaries. I can -create both a 32-bits as well as a 64-bits Prefix for you, but do you -actually know what I'm talking about here? If not, just accept the -default here. Honestly, you don't want to change it if you can't name -one advantage of 64-bits over 32-bits other than that 64 is a higher -number and when you buy a car or washing machine, you also always choose -the one with the highest number. -EOF - [[ ${TODO} == 'noninteractive' ]] && ans="" || - case "${CHOST}" in - x86_64-*|sparcv9-*) # others can't do multilib, so don't bother - # 64-bits native - read -p "How many bits do you want your Prefix to target? [64] " ans - ;; - *) - # 32-bits native - read -p "How many bits do you want your Prefix to target? [32] " ans - ;; - esac - case "${ans}" in - "") - : ;; - 32) - CHOST=${t32} - ;; - 64) - CHOST=${t64} - ;; - *) - cat << EOF - -${ans}? Yeah Right(tm)! You obviously don't know what you're talking -about, so I'll take the default instead. -EOF - ;; - esac - fi - export CHOST - - # choose EPREFIX, we do this last, since we have to actually write - # to the filesystem here to check that the EPREFIX is sane - cat << EOF - -Each and every Prefix has a home. That is, a place where everything is -supposed to be in. That place must be fully writable by you (duh), but -should also be able to hold some fair amount of data and preferably be -reasonably fast. In terms of space, I advise something around 2GiB -(it's less if you're lucky). I suggest a reasonably fast place because -we're going to compile a lot, and that generates a fair bit of IO. If -some networked filesystem like NFS is the only option for you, then -you're just going to have to wait a fair bit longer. -This place which is your Prefix' home, is often referred to by a -variable called EPREFIX. -EOF - while true ; do - if [[ -z ${EPREFIX} ]] ; then - # Make the default for Mac users a bit more "native feel" - [[ ${CHOST} == *-darwin* ]] \ - && EPREFIX=$HOME/Gentoo \ - || EPREFIX=$HOME/gentoo - fi - echo - [[ ${TODO} == 'noninteractive' ]] && ans=${ROOT} || - read -p "What do you want EPREFIX to be? [$EPREFIX] " ans - case "${ans}" in - "") - : ;; - /*) - EPREFIX=${ans} - ;; - *) - echo - echo "EPREFIX must be an absolute path!" - [[ ${TODO} == 'noninteractive' ]] && exit 1 - EPREFIX= - continue - ;; - esac - if [[ ! -d ${EPREFIX} ]] && ! mkdir -p "${EPREFIX}" ; then - echo - echo "It seems I cannot create ${EPREFIX}." - [[ ${TODO} == 'noninteractive' ]] && exit 1 - echo "I'll forgive you this time, try again." - EPREFIX= - continue - fi - if ! touch "${EPREFIX}"/.canihaswrite >& /dev/null ; then - echo - echo "I cannot write to ${EPREFIX}!" - [[ ${TODO} == 'noninteractive' ]] && exit 1 - echo "You want some fun, but without me? Try another location." - EPREFIX= - continue - fi - # don't really expect this one to fail - rm -f "${EPREFIX}"/.canihaswrite || exit 1 - # location seems ok - break; - done - export EPREFIX - export PATH="$EPREFIX/usr/bin:$EPREFIX/bin:$EPREFIX/tmp/usr/bin:$EPREFIX/tmp/bin:$PATH" - - cat << EOF - -OK! I'm going to give it a try, this is what I have collected sofar: - EPREFIX=${EPREFIX} - CHOST=${CHOST} - PATH=${PATH} - MAKEOPTS=${MAKEOPTS} - -I'm now going to make an awful lot of noise going through a sequence of -stages to make your box as groovy as I am myself, setting up your -Prefix. In short, I'm going to run stage1, stage2, stage3, followed by -emerge -e system. If any of these stages fail, both you and me are in -deep trouble. So let's hope that doesn't happen. -EOF - echo - [[ ${TODO} == 'noninteractive' ]] && ans="" || - read -p "Type here what you want to wish me [luck] " ans - if [[ -n ${ans} && ${ans} != "luck" ]] ; then - echo "Huh? You're not serious, are you?" - sleep 3 - fi - echo - - if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}/tmp" stage1 ; then - # stage 1 fail - cat << EOF - -I tried running - ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}/tmp" stage1 -but that failed :( I have no clue, really. Please find friendly folks -in #gentoo-prefix on irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, -or file a bug at bugs.gentoo.org under Gentoo/Alt, Prefix Support. -Sorry that I have failed you master. I shall now return to my humble cave. -EOF - exit 1 - fi - - if ! [[ -x ${EPREFIX}/usr/lib/portage/bin/emerge ]] && ! ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2 ; then - # stage 2 fail - cat << EOF - -Odd! Running - ${BASH} ${BASH_SOURCE[0]} "${EPREFIX}" stage2 -failed! :( I have no clue, really. Please find friendly folks in -#gentoo-prefix on irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or -file a bug at bugs.gentoo.org under Gentoo/Alt, Prefix Support. -I am defeated. I am of no use here any more. -EOF - exit 1 - fi - - # after stage1 and stage2 we should have a bash of our own, which - # is preferably over the host-provided one, because we know it can - # deal with the bash-constructs we use in stage3 and onwards - hash -r - - if ! bash ${BASH_SOURCE[0]} "${EPREFIX}" stage3 ; then - # stage 3 fail - hash -r # previous cat (tmp/usr/bin/cat) may have been removed - cat << EOF - -Hmmmm, I was already afraid of this to happen. Running - $(type -P bash) ${BASH_SOURCE[0]} "${EPREFIX}" stage3 -somewhere failed :( Details might be found in the build log: -EOF - for log in "${EPREFIX}"/var/tmp/portage/*/*/temp/build.log ; do - [[ -e ${log} ]] || continue - echo " ${log}" - done - [[ -e ${log} ]] || echo " (no build logs found?!?)" - cat << EOF -I have no clue, really. Please find friendly folks in #gentoo-prefix on -irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug -at bugs.gentoo.org under Gentoo/Alt, Prefix Support. This is most -inconvenient, and it crushed my ego. Sorry, I give up. -EOF - exit 1 - fi - hash -r # tmp/* stuff is removed in stage3 - - # Don't confuse Portage with a possibly slightly differing CHOST - unset CHOST - - if ! emerge -e system ; then - # emerge -e system fail - cat << EOF - -Oh yeah, I thought I was almost there, and then this! I did - emerge -e system -and it failed at some point :( Details might be found in the build log: -EOF - for log in "${EPREFIX}"/var/tmp/portage/*/*/temp/build.log ; do - [[ -e ${log} ]] || continue - echo " ${log}" - done - [[ -e ${log} ]] || echo " (no build logs found?!?)" - cat << EOF -I have no clue, really. Please find friendly folks in #gentoo-prefix on -irc.gentoo.org, gentoo-alt@lists.gentoo.org mailing list, or file a bug -at bugs.gentoo.org under Gentoo/Alt, Prefix Support. -You know, I got the feeling you just started to like me, but I guess -that's all gone now. I'll bother you no longer. -EOF - exit 1 - fi - - if ! bash ${BASH_SOURCE[0]} "${EPREFIX}" startscript ; then - # startscript fail? - cat << EOF - -Ok, let's be honest towards each other. If - $(type -P bash) ${BASH_SOURCE[0]} "${EPREFIX}" startscript -fails, then who cheated on who? Either you use an obscure shell, or -your PATH isn't really sane afterall. Despite, I can't really -congratulate you here, you basically made it to the end. -Please find friendly folks in #gentoo-prefix on irc.gentoo.org, -gentoo-alt@lists.gentoo.org mailing list, or file a bug at -bugs.gentoo.org under Gentoo/Alt, Prefix Support. -It's sad we have to leave each other this way. Just an inch away... -EOF - exit 1 - fi - - echo - cat << EOF - -Woah! Everything just worked! Now YOU should run - ${EPREFIX}/startprefix -and enjoy! Thanks for using me, it was a pleasure to work with you. -EOF -} - -## End Functions - -## some vars - -# We do not want stray $TMP, $TMPDIR or $TEMP settings -unset TMP TMPDIR TEMP - -# Try to guess the CHOST if not set. We currently only support guessing -# on a very sloppy base. -if [[ -z ${CHOST} ]]; then - if [[ x$(type -t uname) == "xfile" ]]; then - case `uname -s` in - Linux) - case `uname -m` in - ppc*) - CHOST="`uname -m | sed -e 's/^ppc/powerpc/'`-unknown-linux-gnu" - ;; - powerpc*) - CHOST="`uname -m`-unknown-linux-gnu" - ;; - armv7l) - CHOST=armv7a-hardfloat-linux-gnueabi - ;; - armv5te*) - CHOST=armv5tel-softfloat-linux-gnueabi - ;; - *) - CHOST="`uname -m`-pc-linux-gnu" - ;; - esac - ;; - Darwin) - rev="`uname -r | cut -d'.' -f 1`" - if [[ ${rev} -ge 11 ]] ; then - # Lion and up are 64-bits default (and 64-bits CPUs) - CHOST="x86_64-apple-darwin$rev" - else - CHOST="`uname -p`-apple-darwin$rev" - fi - ;; - SunOS) - case `uname -p` in - i386) - CHOST="i386-pc-solaris`uname -r | sed 's|5|2|'`" - ;; - sparc) - CHOST="sparc-sun-solaris`uname -r | sed 's|5|2|'`" - ;; - esac - ;; - AIX) - # GNU coreutils uname sucks, it doesn't know what - # processor it is using on AIX. We mimick GNU CHOST - # guessing here, instead of what IBM uses itself. - CHOST="`/usr/bin/uname -p`-ibm-aix`oslevel`" - ;; - IRIX|IRIX64) - CHOST="mips-sgi-irix`uname -r`" - ;; - Interix) - case `uname -m` in - x86) CHOST="i586-pc-interix`uname -r`" ;; - *) eerror "Can't deal with interix `uname -m` (yet)" - exit 1 - ;; - esac - ;; - CYGWIN*) - # http://www.cygwin.com/ml/cygwin/2009-02/msg00669.html - case `uname -r` in - 1.7*) - CHOST="`uname -m`-pc-cygwin1.7" - ;; - *) - CHOST="`uname -m`-pc-cygwin" - ;; - esac - ;; - HP-UX) - case `uname -m` in - ia64) HP_ARCH=ia64 ;; - 9000/[678][0-9][0-9]) - if [ ! -x /usr/bin/getconf ]; then - eerror "Need /usr/bin/getconf to determine cpu" - exit 1 - fi - # from config.guess - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - ;; - esac - uname_r=`uname -r` - if [ -z "${HP_ARCH}" ]; then - error "Cannot determine cpu/kernel type" - exit ; - fi - CHOST="${HP_ARCH}-hp-hpux${uname_r#B.}" - unset HP_ARCH uname_r - ;; - FreeBSD) - case `uname -p` in - i386) - CHOST="i386-pc-freebsd`uname -r | sed 's|-.*$||'`" - ;; - amd64) - CHOST="x86_64-pc-freebsd`uname -r | sed 's|-.*$||'`" - ;; - sparc64) - CHOST="sparc64-unknown-freebsd`uname -r | sed 's|-.*$||'`" - ;; - *) - eerror "Sorry, don't know about FreeBSD on `uname -p` yet" - exit 1 - ;; - esac - ;; - NetBSD) - case `uname -p` in - i386) - CHOST="`uname -p`-pc-netbsdelf`uname -r`" - ;; - *) - eerror "Sorry, don't know about NetBSD on `uname -p` yet" - exit 1 - ;; - esac - ;; - OpenBSD) - case `uname -m` in - macppc) - CHOST="powerpc-unknown-openbsd`uname -r`" - ;; - i386) - CHOST="i386-pc-openbsd`uname -r`" - ;; - amd64) - CHOST="x86_64-pc-openbsd`uname -r`" - ;; - *) - eerror "Sorry, don't know about OpenBSD on `uname -m` yet" - exit 1 - ;; - esac - ;; - *) - eerror "Nothing known about platform `uname -s`." - eerror "Please set CHOST appropriately for your system" - eerror "and rerun $0" - exit 1 - ;; - esac - fi -fi - -# Now based on the CHOST set some required variables. Doing it here -# allows for user set CHOST still to result in the appropriate variables -# being set. -case ${CHOST} in - *-*-solaris*) - if type -P gmake > /dev/null ; then - MAKE=gmake - else - MAKE=make - fi - ;; - *-sgi-irix*) - MAKE=gmake - ;; - *-aix*) - MAKE=make - # We do run in bash here, no? It is ways faster than /bin/sh. - : ${CONFIG_SHELL:=${BASH}} - ;; - *) - MAKE=make - ;; -esac - -# deal with a problem on OSX with Python's locales -case ${CHOST}:${LC_ALL}:${LANG} in - *-darwin*:UTF-8:*|*-darwin*:*:UTF-8) - eerror "Your LC_ALL and/or LANG is set to 'UTF-8'." - eerror "This setting is known to cause trouble with Python. Please run" - case ${SHELL} in - */tcsh|*/csh) - eerror " setenv LC_ALL en_US.UTF-8" - eerror " setenv LANG en_US.UTF-8" - eerror "and make it permanent by adding it to your ~/.${SHELL##*/}rc" - exit 1 - ;; - *) - eerror " export LC_ALL=en_US.UTF-8" - eerror " export LANG=en_US.UTF-8" - eerror "and make it permanent by adding it to your ~/.profile" - exit 1 - ;; - esac - ;; -esac - -# Just guessing a prefix is kind of scary. Hence, to make it a bit less -# scary, we force the user to give the prefix location here. This also -# makes the script a bit less dangerous as it will die when just run to -# "see what happens". -if [[ -n $1 && -z $2 ]] ; then - echo "usage: $0 [<prefix-path> <action>]" - echo - echo "Either you give no argument and I'll ask you interactively, or" - echo "you need to give both the path offset for your Gentoo prefixed" - echo "portage installation, and the action I should do there, e.g." - echo " $0 $HOME/prefix <action>" - echo - echo "See the source of this script for which actions exist." - echo - echo "$0: insufficient number of arguments" 1>&2 - exit 1 -elif [[ -z $1 ]] ; then - bootstrap_interactive - exit 0 -fi - -ROOT="$1" - -case $ROOT in - chost.guess) - # undocumented feature that sort of is our own config.guess, if - # CHOST was unset, it now contains the guessed CHOST - echo "$CHOST" - exit 0 - ;; - /*) ;; - *) - echo "Your path offset needs to be absolute!" 1>&2 - exit 1 - ;; -esac - -CXXFLAGS="${CXXFLAGS:-${CFLAGS}}" -PORTDIR=${PORTDIR:-"${ROOT}/usr/portage"} -PORTDIR_RAP=${PORTDIR_RAP:-"${ROOT}/usr/local/portage"} -DISTDIR=${DISTDIR:-"${PORTDIR}/distfiles"} -PORTAGE_TMPDIR=${ROOT}/var/tmp -DISTFILES_URL="http://dev.gentoo.org/~grobian/distfiles" -SNAPSHOT_URL="http://prefix.gentooexperimental.org/snapshots" -GNU_URL=${GNU_URL:="http://ftp.gnu.org/gnu"} -GENTOO_MIRRORS=${GENTOO_MIRRORS:="http://distfiles.gentoo.org"} -GCC_APPLE_URL="http://www.opensource.apple.com/darwinsource/tarballs/other" - -export MAKE CONFIG_SHELL - - -einfo "Bootstrapping Gentoo prefixed portage installation using" -einfo "host: ${CHOST}" -einfo "prefix: ${ROOT}" - -TODO=${2} -if [[ ${TODO} != "noninteractive" && $(type -t bootstrap_${TODO}) != "function" ]]; -then - eerror "bootstrap target ${TODO} unknown" - exit 1 -fi - -if [[ -n ${LD_LIBARY_PATH} || -n ${DYLD_LIBRARY_PATH} ]] ; then - eerror "EEEEEK! You have LD_LIBRARY_PATH or DYLD_LIBRARY_PATH set" - eerror "in your environment. This is a guarantee for TROUBLE." - eerror "Cowardly refusing to operate any further this way!" - exit 1 -fi - -if [[ -n ${PKG_CONFIG_PATH} ]] ; then - eerror "YUK! You have PKG_CONFIG_PATH set in your environment." - eerror "This is a guarantee for TROUBLE." - eerror "Cowardly refusing to operate any further this way!" - exit 1 -fi - -einfo "ready to bootstrap ${TODO}" -# bootstrap_interactive proceeds with guessed defaults when TODO=noninteractive -bootstrap_${TODO#non} || exit 1 diff --git a/sys-apps/debianutils/ChangeLog b/sys-apps/debianutils/ChangeLog deleted file mode 100644 index b81511f..0000000 --- a/sys-apps/debianutils/ChangeLog +++ /dev/null @@ -1,735 +0,0 @@ -# ChangeLog for sys-apps/debianutils -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/ChangeLog,v 1.169 2012/02/04 18:02:19 radhermit Exp $ - - 04 Feb 2012; Tim Harder <radhermit@gentoo.org> -debianutils-3.4.5.ebuild, - -debianutils-3.4.6.ebuild, -debianutils-4.ebuild, -debianutils-4.0.1.ebuild, - -debianutils-4.0.2.ebuild, -debianutils-4.0.3.ebuild, - -debianutils-4.0.4.ebuild: - Remove old. - -*debianutils-4.2.1 (04 Feb 2012) - - 04 Feb 2012; Tim Harder <radhermit@gentoo.org> +debianutils-4.2.1.ebuild: - Version bump. - -*debianutils-4.1 (05 Dec 2011) - - 05 Dec 2011; Tim Harder <radhermit@gentoo.org> +debianutils-4.1.ebuild: - Version bump. - -*debianutils-4.0.4 (05 Nov 2011) - - 05 Nov 2011; Tim Harder <radhermit@gentoo.org> +debianutils-4.0.4.ebuild: - Version bump. Update to EAPI 4. - -*debianutils-4.0.3 (10 Oct 2011) - - 10 Oct 2011; Tim Harder <radhermit@gentoo.org> +debianutils-4.0.3.ebuild: - Version bump. - -*debianutils-4.0.2 (13 Jun 2011) - - 13 Jun 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-4.0.2.ebuild: - Version bump. - -*debianutils-4.0.1 (31 May 2011) - - 31 May 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-4.0.1.ebuild: - Version bump. - -*debianutils-4 (19 May 2011) - - 19 May 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-4.ebuild: - Version bump. - -*debianutils-3.4.6 (18 May 2011) - - 18 May 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.6.ebuild: - Version bump. - -*debianutils-3.4.5 (13 May 2011) - - 13 May 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.5.ebuild: - Version bump. - - 10 May 2011; Jeroen Roovers <jer@gentoo.org> - -files/debianutils-3.2.1-no-bs-namespace.patch, -debianutils-3.2.3.ebuild, - -debianutils-3.3.ebuild, -debianutils-3.4.ebuild, -debianutils-3.4.1.ebuild, - -debianutils-3.4.2.ebuild, -debianutils-3.4.3-r1.ebuild: - Gone. - - 01 May 2011; Kacper Kowalik <xarthisius@gentoo.org> debianutils-3.4.4.ebuild: - ppc64 stable wrt #363025 - - 23 Apr 2011; Raúl Porcel <armin76@gentoo.org> debianutils-3.4.4.ebuild: - alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #363025 - - 14 Apr 2011; Brent Baude <ranger@gentoo.org> debianutils-3.4.4.ebuild: - stable ppc, bug 363025 - - 13 Apr 2011; Jeroen Roovers <jer@gentoo.org> debianutils-3.4.4.ebuild: - Stable for HPPA (bug #363025). - - 13 Apr 2011; Markos Chandras <hwoarang@gentoo.org> debianutils-3.4.4.ebuild: - Stable on amd64 wrt bug #363025 - -*debianutils-3.4.4 (15 Feb 2011) - - 15 Feb 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.4.ebuild: - Version bump. - -*debianutils-3.4.3-r1 (21 Jan 2011) - - 21 Jan 2011; Jeroen Roovers <jer@gentoo.org> -debianutils-3.4.3.ebuild, - +debianutils-3.4.3-r1.ebuild: - Install /etc/kernel/postinst.d thanks to László Szalma (bug #352326). - -*debianutils-3.4.3 (19 Jan 2011) - - 19 Jan 2011; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.3.ebuild: - Version bump. - - 15 Nov 2010; Jeroen Roovers <jer@gentoo.org> - files/debianutils-3.4.2-no-bs-namespace.patch: - Readd run-parts man page patch. - -*debianutils-3.4.2 (15 Nov 2010) - - 15 Nov 2010; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.2.ebuild, - +files/debianutils-3.4.2-no-bs-namespace.patch: - Version bump. Rework patch for 3.4.2 and explain why. - - 02 Oct 2010; Raúl Porcel <armin76@gentoo.org> debianutils-3.2.3.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #336693 - -*debianutils-3.4.1 (20 Sep 2010) - - 20 Sep 2010; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.1.ebuild: - Version bump. - - 14 Sep 2010; Jeroen Roovers <jer@gentoo.org> debianutils-3.2.3.ebuild: - Stable for HPPA (bug #336693). - - 12 Sep 2010; Joseph Jezak <josejx@gentoo.org> debianutils-3.2.3.ebuild: - Marked ppc/ppc64 stable for bug #336693. - - 12 Sep 2010; Markos Chandras <hwoarang@gentoo.org> - debianutils-3.2.3.ebuild: - Stable on amd64 wrt bug #336693 - - 12 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> - debianutils-3.2.3.ebuild: - x86 stable wrt bug #336693 - -*debianutils-3.4 (17 Jul 2010) - - 17 Jul 2010; Jeroen Roovers <jer@gentoo.org> +debianutils-3.4.ebuild: - Version bump. - -*debianutils-3.3 (01 Jul 2010) - - 01 Jul 2010; Jeroen Roovers <jer@gentoo.org> +debianutils-3.3.ebuild: - Version bump. - -*debianutils-3.2.3 (01 May 2010) - - 01 May 2010; Jeroen Roovers <jer@gentoo.org> +debianutils-3.2.3.ebuild: - Version bump. - -*debianutils-3.2.2 (16 Nov 2009) - - 16 Nov 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.2.2.ebuild: - Version bump. - - 14 Aug 2009; Jeroen Roovers <jer@gentoo.org> - -files/debianutils-2.16.2-palo.patch, - -files/debianutils-2.28.2-mkboot-quiet.patch, - -files/debianutils-2.28.2-no-bs-namespace.patch, - -debianutils-2.28.5.ebuild, -debianutils-2.29.ebuild, - -debianutils-2.30.ebuild, -debianutils-2.31.ebuild, - -debianutils-3.0.1.ebuild, -debianutils-3.0.2.ebuild, - -debianutils-3.1.ebuild, -debianutils-3.1.1.ebuild: - Remove old. - -*debianutils-3.2.1-r1 (11 Aug 2009) - - 11 Aug 2009; Jeroen Roovers <jer@gentoo.org> -debianutils-3.2.1.ebuild, - +debianutils-3.2.1-r1.ebuild, - +files/debianutils-3.2.1-no-bs-namespace.patch: - Redo the namespace patch. - -*debianutils-3.2.1 (11 Aug 2009) - - 11 Aug 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.2.1.ebuild: - Version bump. - - 13 Jul 2009; Joseph Jezak <josejx@gentoo.org> debianutils-3.1.3.ebuild: - Marked ppc stable for bug #273060. - -*debianutils-3.2 (05 Jul 2009) - - 05 Jul 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.2.ebuild: - Version bump. - - 24 Jun 2009; Raúl Porcel <armin76@gentoo.org> debianutils-3.1.3.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #273060 - - 19 Jun 2009; Brent Baude <ranger@gentoo.org> debianutils-3.1.3.ebuild: - stable ppc64, bug 273060 - - 16 Jun 2009; Tobias Klausmann <klausman@gentoo.org> - debianutils-3.1.3.ebuild: - Stable on alpha, bug #273060 - - 10 Jun 2009; Markus Meier <maekke@gentoo.org> debianutils-3.1.3.ebuild: - amd64/x86 stable, bug #273060 - - 09 Jun 2009; Jeroen Roovers <jer@gentoo.org> -debianutils-2.28.2.ebuild, - -debianutils-2.28.4.ebuild: - Remove old. - - 09 Jun 2009; Jeroen Roovers <jer@gentoo.org> debianutils-3.1.3.ebuild: - Stable for HPPA (bug #273060). - -*debianutils-3.1.3 (06 May 2009) - - 06 May 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.1.3.ebuild: - Version bump. - -*debianutils-3.1.1 (03 May 2009) - - 03 May 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.1.1.ebuild: - Version bump. - -*debianutils-3.1 (02 May 2009) - - 02 May 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.1.ebuild: - Version bump. - -*debianutils-3.0.2 (02 May 2009) - - 02 May 2009; Jeroen Roovers <jer@gentoo.org> debianutils-3.0.1.ebuild, - +debianutils-3.0.2.ebuild: - Version bump. Remove commented epatches. - -*debianutils-3.0.1 (01 May 2009) - - 01 May 2009; Jeroen Roovers <jer@gentoo.org> +debianutils-3.0.1.ebuild: - Version bump. - - 18 Mar 2009; Brent Baude <ranger@gentoo.org> debianutils-2.28.5.ebuild: - stable ppc, bug 260463 - -*debianutils-2.31 (14 Mar 2009) - - 14 Mar 2009; Mike Frysinger <vapier@gentoo.org> - +files/debianutils-2.31-no-bs-namespace.patch, +debianutils-2.31.ebuild: - Version bump #259496 by Raúl Porcel. - - 07 Mar 2009; Jeremy Olexa <darkside@gentoo.org> debianutils-2.28.5.ebuild: - amd64 stable, bug 260463 - - 27 Feb 2009; Brent Baude <ranger@gentoo.org> debianutils-2.28.5.ebuild: - stable ppc64, bug 260463 - - 08 Aug 2008; Jeroen Roovers <jer@gentoo.org> debianutils-2.28.2.ebuild, - debianutils-2.28.4.ebuild, debianutils-2.28.5.ebuild, - debianutils-2.29.ebuild, debianutils-2.30.ebuild: - Add SMAIL license (bug #176006). - -*debianutils-2.30 (08 Aug 2008) - - 08 Aug 2008; Jeroen Roovers <jer@gentoo.org> +debianutils-2.30.ebuild: - Version bump. - - 10 Jul 2008; Jeroen Roovers <jer@gentoo.org> debianutils-2.28.5.ebuild: - Stable for HPPA too. - -*debianutils-2.29 (19 Jun 2008) - - 19 Jun 2008; Mike Frysinger <vapier@gentoo.org> +debianutils-2.29.ebuild: - Version bumps #228015. - - 17 Jun 2008; Raúl Porcel <armin76@gentoo.org> debianutils-2.28.5.ebuild: - alpha/ia64/sparc/x86 stable - - 17 Jun 2008; Alexis Ballier <aballier@gentoo.org> - debianutils-2.28.5.ebuild: - keyword ~sparc-fbsd - - 16 Jun 2008; Alexis Ballier <aballier@gentoo.org> - debianutils-2.28.5.ebuild: - keyword ~x86-fbsd - - 16 Jun 2008; Alexis Ballier <aballier@gentoo.org> - debianutils-2.28.5.ebuild: - fix deps on fbsd wrt mktemp - - 16 Jun 2008; Alexis Ballier <aballier@gentoo.org> - debianutils-2.28.5.ebuild: - bind installkernel and mkboot to kernel_linux useflag as discussed on bug - #225759 - -*debianutils-2.28.5 (05 May 2008) - - 05 May 2008; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.28.5.ebuild: - Version bump #219496 by Conrad Kostecki. - -*debianutils-2.28.4 (13 Apr 2008) - - 13 Apr 2008; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.28.4.ebuild: - Version bump #217431 by Arfrever Frehtes Taifersar Arahesis. - - 16 Mar 2008; nixnut <nixnut@gentoo.org> debianutils-2.28.2.ebuild: - Stable on ppc wrt bug 213591 - - 07 Feb 2008; Samuli Suominen <drac@gentoo.org> debianutils-2.28.2.ebuild: - amd64 stable - - 05 Feb 2008; Markus Rothe <corsair@gentoo.org> debianutils-2.28.2.ebuild: - Stable on ppc64 - - 04 Feb 2008; Jeroen Roovers <jer@gentoo.org> debianutils-2.28.2.ebuild: - Stable for HPPA too. - - 04 Feb 2008; Mike Frysinger <vapier@gentoo.org> - +files/debianutils-2.28.2-mkboot-quiet.patch, debianutils-2.28.2.ebuild: - Send which error output to /dev/null. - - 23 Jan 2008; Mike Frysinger <vapier@gentoo.org> debianutils-2.25.ebuild, - debianutils-2.28.2.ebuild: - Pull in either mktemp or latest coreutils for the mktemp binary. - - 21 Jan 2008; Raúl Porcel <armin76@gentoo.org> debianutils-2.28.2.ebuild: - alpha/ia64/sparc/x86 stable - - 21 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org> - debianutils-2.25.ebuild: - ppc stable - -*debianutils-2.28.2 (21 Dec 2007) - - 21 Dec 2007; Doug Klima <cardoe@gentoo.org> - -files/debianutils-2.15-palo.patch, - +files/debianutils-2.28.2-no-bs-namespace.patch, - -debianutils-2.18.1.ebuild, -debianutils-2.21.ebuild, - -debianutils-2.22.1.ebuild, -debianutils-2.23.1.ebuild, - +debianutils-2.28.2.ebuild: - remove old versions. version bump for bug #194523 - - 21 Dec 2007; Doug Klima <cardoe@gentoo.org> debianutils-2.25.ebuild: - amd64 stable - - 01 Dec 2007; Markus Rothe <corsair@gentoo.org> debianutils-2.25.ebuild: - Stable on ppc64 - - 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> debianutils-2.25.ebuild: - Stable on mips. - - 08 Nov 2007; Jeroen Roovers <jer@gentoo.org> debianutils-2.25.ebuild: - Stable for HPPA too. - - 07 Nov 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.25.ebuild: - alpha/ia64/sparc/x86 stable - - 15 Oct 2007; Markus Rothe <corsair@gentoo.org> debianutils-2.23.1.ebuild: - Stable on ppc64 - - 01 Oct 2007; Christian Birchinger <joker@gentoo.org> - debianutils-2.23.1.ebuild: - Added sparc stable keyword - -*debianutils-2.25 (29 Sep 2007) - - 29 Sep 2007; Mike Frysinger <vapier@gentoo.org> +debianutils-2.25.ebuild: - Version bump #194005. - - 28 Sep 2007; Joshua Kinard <kumba@gentoo.org> debianutils-2.23.1.ebuild: - Stable on mips. - - 18 Sep 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.23.1.ebuild: - alpha/ia64/x86 stable - -*debianutils-2.23.1 (17 Aug 2007) - - 17 Aug 2007; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.23.1.ebuild: - Version bump. - - 13 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> - debianutils-2.22.1.ebuild: - Stable on sparc - - 12 Aug 2007; Tom Gall <tgall@gentoo.org> debianutils-2.22.1.ebuild: - stable on ppc64 - - 10 Aug 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.22.1.ebuild: - alpha/ia64/x86 stable - -*debianutils-2.22.1 (09 Jul 2007) - - 09 Jul 2007; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.22.1.ebuild: - Version bump #184629. - - 17 Jun 2007; Christoph Mende <angelos@gentoo.org> - debianutils-2.17.5.ebuild: - Stable on amd64 wrt bug 181258 - - 17 Jun 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.17.5.ebuild: - alpha stable wrt #182280 - - 17 Jun 2007; Markus Rothe <corsair@gentoo.org> debianutils-2.17.5.ebuild: - Stable on ppc64; bug #182280 - - 17 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org> - debianutils-2.17.5.ebuild: - ppc stable, bug #182280 - -*debianutils-2.21 (16 Jun 2007) - - 16 Jun 2007; Mike Frysinger <vapier@gentoo.org> +debianutils-2.21.ebuild: - Version bump #181905 by Raul Porcel. - - 23 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> - debianutils-2.17.5.ebuild: - Stable on sparc - -*debianutils-2.18.1 (16 May 2007) - - 16 May 2007; Roy Marples <uberlord@gentoo.org> +debianutils-2.18.1.ebuild: - New version, fixes #177576. - - 05 May 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.18.ebuild: - Back to ~arch - -*debianutils-2.18 (05 May 2007) - - 05 May 2007; Mike Frysinger <vapier@gentoo.org> +debianutils-2.18.ebuild: - Version bump #175706 by Raul Porcel. - - 24 Apr 2007; Alexander Færøy <eroyf@gentoo.org> - debianutils-2.17.5.ebuild: - Stable on MIPS. - - 23 Apr 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.17.5.ebuild: - ia64 + x86 stable - - 25 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> - debianutils-2.17.4.ebuild: - Stable on alpha wrt bug #169082 - - 18 Mar 2007; nixnut <nixnut@gentoo.org> debianutils-2.17.4.ebuild: - Stable on ppc wrt bug 169082 - - 17 Mar 2007; Steve Dibb <beandog@gentoo.org> debianutils-2.17.4.ebuild: - amd64 stable, bug 169082 - - 07 Mar 2007; Alexander H. Færøy <eroyf@gentoo.org> - debianutils-2.17.4.ebuild: - Stable on MIPS; bug #169082 - - 06 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> - debianutils-2.17.4.ebuild: - Stable on sparc wrt #169082 - - 06 Mar 2007; Markus Rothe <corsair@gentoo.org> debianutils-2.17.4.ebuild: - Stable on ppc64; bug #169082 - - 04 Mar 2007; Jeroen Roovers <jer@gentoo.org> debianutils-2.17.4.ebuild: - Stable for HPPA (bug #169082). - - 03 Mar 2007; Raúl Porcel <armin76@gentoo.org> debianutils-2.17.4.ebuild: - x86 stable wrt bug 169082 - -*debianutils-2.17.5 (03 Mar 2007) - - 03 Mar 2007; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.17.5.ebuild: - Version bump #168818 by teidakankan. - -*debianutils-2.17.4 (07 Dec 2006) - - 07 Dec 2006; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.17.4.ebuild: - Version bump. - -*debianutils-2.17.1 (15 Sep 2006) - - 15 Sep 2006; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.17.1.ebuild: - Version bump #147540 by Raul Porcel. - -*debianutils-2.16.2 (06 Jul 2006) - - 06 Jul 2006; Mike Frysinger <vapier@gentoo.org> - +files/debianutils-2.16.2-palo.patch, +debianutils-2.16.2.ebuild: - Version bump. - - 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> debianutils-2.15.ebuild: - Marked stable on mips. - - 22 Apr 2006; Fabian Groffen <grobian@gentoo.org> debianutils-2.15.ebuild: - Marked ppc-macos stable (bug #127975) - -*debianutils-2.15-r1 (15 Apr 2006) - - 15 Apr 2006; Jeroen Roovers <jer@gentoo.org> - +files/debianutils-2.15-palo.patch, +debianutils-2.15-r1.ebuild: - mkboot: fix the shebang, the notice about the -i option and the palo test/run - - 02 Apr 2006; Bryan Østergaard <kloeri@gentoo.org debianutils-2.15.ebuild: - Stable on alpha, bug 127975. - - 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> - debianutils-2.15.ebuild: - Drop ~x86-fbsd, was taken out of an overlay. - - 30 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> - debianutils-2.15.ebuild: - Stable on sparc wrt #127975 - - 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> - debianutils-2.15.ebuild: - Add ~x86-fbsd keyword. - - 30 Mar 2006; Chris White <chriswhite@gentoo.org> debianutils-2.15.ebuild: - debianutils-2.15 x86 stable bug #127975. - - 30 Mar 2006; Marcus D. Hanwell <cryos@gentoo.org> debianutils-2.15.ebuild: - Stable on amd64, bug 127975. - - 29 Mar 2006; Markus Rothe <corsair@gentoo.org> debianutils-2.15.ebuild: - Stable on ppc64; bug #127975 - - 29 Mar 2006; Luca Barbato <lu_zero@gentoo.org> debianutils-2.15.ebuild: - Marked ppc, see bug #127975 - -*debianutils-2.15 (03 Nov 2005) - - 03 Nov 2005; Mike Frysinger <vapier@gentoo.org> +debianutils-2.15.ebuild: - Version bump #111275 by Richard Hartmann. - - 16 Sep 2005; Aron Griffis <agriffis@gentoo.org> - debianutils-2.14.1-r1.ebuild: - Mark 2.14.1-r1 stable on alpha - - 03 Sep 2005; Markus Rothe <corsair@gentoo.org> - debianutils-2.14.1-r1.ebuild: - Stable on ppc64 - - 19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> - debianutils-2.14.1-r1.ebuild: - Stable on ppc. - - 16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> - debianutils-2.14.1-r1.ebuild: - Stable on sparc - -*debianutils-2.14.1-r1 (13 Jul 2005) - - 13 Jul 2005; Martin Schlemmer <azarah@gentoo.org> - +files/debianutils-2.14.1-no-bs-namespace.patch, - +debianutils-2.14.1-r1.ebuild: - Allow dots in the names, bug #95173. Patch by Kerin Millar. - -*debianutils-2.14.1 (02 Jul 2005) - - 02 Jul 2005; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.14.1.ebuild: - Version bump #92748 by Kerin Millar. - -*debianutils-2.13.2 (16 Jun 2005) - - 16 Jun 2005; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.13.2.ebuild: - Version bump. - -*debianutils-2.13.1-r1 (24 Mar 2005) - - 24 Mar 2005; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.13.1-r1.ebuild: - Version bump to fix install locations #86349 by Peter Gantner. - -*debianutils-2.13.1 (22 Mar 2005) - - 22 Mar 2005; Mike Frysinger <vapier@gentoo.org> - +debianutils-2.13.1.ebuild: - Version bump. - - 28 Nov 2004; Joseph Jezak <josejx@gentoo.org> - debianutils-1.16.7-r4.ebuild: - Had to remove coreutils from the ppc-macos dependancy list because we - still don't have a coreutils virtual and it got added back in. - - 12 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - debianutils-1.16.7-r4.ebuild: - keeping in stable, but made coreutils a !macos? dependency - Debianutils is needed for portage, but we haven't been able to create a - coreutils virtual yet. - - 22 Aug 2004; Michael Hanselmann <hansmi@gentoo.org> - debianutils-1.16.7-r4.ebuild: - Added to macos. Stable because it's a dependency for bleeding-edge - Portage-versions. - - 25 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> - debianutils-1.16.7-r4.ebuild: - inherit eutils for epatch - -*debianutils-1.16.7-r4 (10 Dec 2003) - - 10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r3.ebuild, debianutils-1.16.7-r4.ebuild, - files/debianutils-1.16.7-gentoo.patch: - mkboot queries portage for sys-boot/grub instead of sys-apps/grub, thanks to - max@gentoo.org in #gentoo-dev - - 09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild: - don't install the readlink manpage -- partially closes bug #32096 by Radek - Podgorny <radek@podgorny.cz> - - 26 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> - debianutils-1.16.7-r3.ebuild: - set ppc in keywords - - 25 Sep 2003; Martin Schlemmer <azarah@gentoo.org> - debianutils-1.16.7-r3.ebuild, files/debianutils-1.16.7-gentoo.patch: - Fix bug #25216 (use portageq and not qpkg to check if grub is installed), mark - stable as otherwise its been working fine for a long time. - - 19 Sep 2003; Christian Birchinger <joker@gentoo.org> - debianutils-1.16.7-r3.ebuild: - Added sparc stable keyword - - 17 Sep 2003; Jon Portnoy <avenj@gentoo.org> - debianutils-1.16.7-r3.ebuild : - ia64 keywords. - - 12 Sep 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r3.ebuild: - moved to stable x86 - - 27 Aug 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r3.ebuild: - hits stable, because coreutils-5.0 has hit stable. marked for all arches -- - the change between -r2 and -r3 is just the removal of readlink - - 27 Aug 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r2.ebuild, debianutils-1.16.7-r3.ebuild: - changed SRC_URI to point to our own mirrors. thanks to Alastair Tse - <liquidx@gentoo.org> for pointing that out in bug #26274 - - 03 Aug 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r3.ebuild: - added coreutils to dependency - -*debianutils-1.16.7-r3 (02 Aug 2003) - - 02 Aug 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r1.ebuild, debianutils-1.16.7-r2.ebuild, - debianutils-1.16.7-r3.ebuild: - removed old version, this version will hit stable, when coreutils-5.0 hits - stable -- removal of /bin/readlink from here, thanks to SpanKYzor in bug - #25600 - -*debianutils-1.16.7-r2 (19 May 2003) - - 06 Jul 2003; Guy Martin <gmsoft@gentoo.org> debianutils-1.16.7-r2.ebuild : - Marked stable on hppa. - - 06 Jul 2003; Joshua Kinard <kumba@gentoo.org> debianutils-1.16.7-r2.ebuild: - Changed ~mips to mips in KEYWORDS - - 24 Jun 2003; Aron Griffis <agriffis@gentoo.org> - debianutils-1.16.7-r2.ebuild: - Mark stable on alpha - - 22 Jun 2003; Joshua Kinard <kumba@gentoo.org> debianutils-1.16.7-r2.ebuild: - Changed ~sparc to sparc in KEYWORDS - - 19 May 2003; Martin Schlemmer <azarah@gentoo.org> - debianutils-1.16.7-r2.ebuild, files/debianutils-1.16.7-gcc33.patch: - Fix gcc-3.3 issue, bug #21211. - -*debianutils-1.16.7-r1 (03 Apr 2003) - - 12 Apr 2003; Seemant Kulleen <seemant@gentoo.org> Manifest, - debianutils-1.16.7-r1.ebuild: - SMAIL license removed, thanks to: Luke-Jr <Luke7Jr@yahoo.com> in bug #18948 - - 03 Apr 2003; Seemant Kulleen <seemant@gentoo.org> - debianutils-1.16.7-r1.ebuild, debianutils-1.16.7.ebuild, - debianutils-1.16.7.ebuild, files/debianutils-1.16.7-gentoo.patch: - Added patch for run-parts to ignore .keep files. Patch was submitted by: Jukka - Salmi <jukka-gentoo@2003.salmi.ch> in bug #18423. - -*debianutils-1.16.7 (26 Mar 2003) - - 26 Mar 2003; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.7.ebuild, - files/debianutils-1.16.7-gentoo.patch: - version bump - - 21 Feb 2003; Zach Welch <zwelch@gentoo.org> debianutils-1.16.3.ebuild : - Added arm to keywords. - - 07 Feb 2003; Guy Martin <gmsoft@gentoo.org> debianutils-1.16.3.ebuild : - Added hppa to keywords. - -*debianutils-1.16.3 (20 Dec 2002) - - 07 Mar 2003; Seemant Kulleen <seemant@gentoo.org> - files/debianutils-compress.patch: - added patch to use bzip2 instead of gzip for savelog - - 07 Mar 2003; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.3.ebuild: - use epatch - - 20 Dec 2002; Jan Seidel <tuxus@gentoo.org> : debianutils-1.13.3-r3.ebuild - Added mips to keywords - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*debianutils-1.16.3 (25 Sep 2002) - - 23 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - Removed bootcd USE flag and added IUSE - - 25 Sep 2002; Martin Schlemmer <azarah@gentoo.org> : - Version update. Add some of missing util. Add patch to make - installkernel and mkboot more Gentoo friendly. - -*debianutils-1.13.3-r3 (14 July 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> debianutils-1.13.3-r3.ebuild : - Added KEYWORDS, SLOT. - -*debianutils-1.16 (23 Mar 2002) - - 23 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - Removed bootcd USE flag and added IUSE - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> debianutils-1.16.ebuild : - Added KEYWORDS, SLOT. - - 23 Mar 2002; Seemant Kulleen <seemant@gentoo.org> debianutils-1.16.ebuild : - - Version update. With it came a change in the SRC_URI as well. Submitted by - Jim Nutt. - -*debianutils-1.13.3-r4 (1 Feb 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> debianutils-1.13.3-r4.ebuild : - Added KEYWORDS, SLOT. - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest deleted file mode 100644 index e3bae47..0000000 --- a/sys-apps/debianutils/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX debianutils-3.4.2-no-bs-namespace.patch 1168 RMD160 ae704433f305a83866da2057079e8eaa80504ea4 SHA1 103a3875c09e1f1143c5b1e908b234b69c7ac6db SHA256 a29ae4ad14e602cada73930b7abeb12b5b07027eed942f25a69678917fc0eb80 -DIST debianutils_4.2.1.tar.gz 198810 RMD160 b0ddf0f8101bcc12033f0bbf1763dbe966e68252 SHA1 429965b6235a30efc53264d316cef513f091745b SHA256 6359b273bee9b959d243d1490caa8f0f5ff8dc294690b1bdb5df755d6364be0f -EBUILD debianutils-4.2.1.ebuild 1026 RMD160 5febecaa50e41f04ae5ba8e90d5e41d5cba5dd12 SHA1 1e31f91674d2242de62bfc2caee0f375947aa5bb SHA256 bde42ad66352001d5c5e3ee6f8861901fb8c4179c72d0346932090180c74f544 -MISC ChangeLog 23523 RMD160 38b87600305058b4d7285921fec5010ec6fbd4ca SHA1 dd426ff01459458fe36315934578fb4777aeb1fa SHA256 a7d90d4693b69b9d3796d90e53050038fa10e5f4d4811cc4760872ccd264d626 -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-apps/debianutils/debianutils-4.2.1.ebuild b/sys-apps/debianutils/debianutils-4.2.1.ebuild deleted file mode 100644 index cfed42d..0000000 --- a/sys-apps/debianutils/debianutils-4.2.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-4.2.1.ebuild,v 1.1 2012/02/04 18:00:15 radhermit Exp $ - -EAPI=4 - -inherit eutils flag-o-matic - -DESCRIPTION="A selection of tools from Debian" -HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html" -SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="BSD GPL-2 SMAIL" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="kernel_linux static" - -PDEPEND="|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch -} - -src_configure() { - use static && append-ldflags -static - default -} - -src_install() { - into / - dobin tempfile run-parts - if use kernel_linux ; then - dosbin installkernel - fi - - into /usr - dosbin savelog - - doman tempfile.1 run-parts.8 savelog.8 - use kernel_linux && doman installkernel.8 - cd debian - dodoc changelog control - keepdir /etc/kernel/postinst.d -} diff --git a/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch b/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch deleted file mode 100644 index 94a84b8..0000000 --- a/sys-apps/debianutils/files/debianutils-3.4.2-no-bs-namespace.patch +++ /dev/null @@ -1,30 +0,0 @@ -Allow dots in the names, bug #95173. Patch by Kerin Millar. -Re-sourced for 3.4.2 - ---- a/run-parts.8 -+++ b/run-parts.8 -@@ -25,9 +25,10 @@ - .IR directory . - Other files and directories are silently ignored. - --If neither the \-\-lsbsysinit option nor the \-\-regex option is given --then the names must consist entirely of ASCII upper- and lower-case --letters, ASCII digits, ASCII underscores, and ASCII minus-hyphens. -+If neither the \-\-lsbsysinit option nor the \-\-regex option is given then the -+names must consist entirely of ASCII upper- and lower-case letters, ASCII -+digits, ASCII underscores, and ASCII minus-hyphens. However, the name must not -+begin with a period. - - If the \-\-lsbsysinit option is given, then the names must not end - in .dpkg\-old or .dpkg\-dist or .dpkg\-new or .dpkg\-tmp, and must ---- a/run-parts.c -+++ b/run-parts.c -@@ -501,7 +501,7 @@ - != 0) - pt_regex = &tradre; - -- } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-]+$", -+ } else if ( (err = regcomp(&classicalre, "^[a-zA-Z0-9_-][a-zA-Z0-9._-]+$", - REG_EXTENDED | REG_NOSUB)) != 0) - pt_regex = &classicalre; - diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml deleted file mode 100644 index 96a2d58..0000000 --- a/sys-apps/debianutils/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-apps/dtc/ChangeLog b/sys-apps/dtc/ChangeLog deleted file mode 100644 index 67b53ab..0000000 --- a/sys-apps/dtc/ChangeLog +++ /dev/null @@ -1,45 +0,0 @@ -# ChangeLog for sys-apps/dtc -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/ChangeLog,v 1.10 2011/10/17 21:39:35 vapier Exp $ - -*dtc-9999 (17 Oct 2011) - - 17 Oct 2011; Mike Frysinger <vapier@gentoo.org> +dtc-9999.ebuild: - Add a live git ebuild. - -*dtc-1.3.0 (15 Jun 2011) - - 15 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> +dtc-1.3.0.ebuild: - Version bump; remove -Werror and pre-defined CFLAGS; bump to EAPI=4; use - parallel make for tests as well. - - 05 Jan 2011; Markos Chandras <hwoarang@gentoo.org> dtc-1.2.0.ebuild: - Stable on amd64 wrt bug #346681 - - 25 Nov 2010; Christian Faulhammer <fauli@gentoo.org> dtc-1.2.0.ebuild: - stable x86, bug 346681 - -*dtc-1.2.0 (03 Nov 2010) - - 03 Nov 2010; Luca Barbato <lu_zero@gentoo.org> +dtc-1.2.0.ebuild: - Version Bump - - 06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> dtc-1.0.0.ebuild, - +files/dtc-1.0.0-Makefile.patch: - Respect environment flags wrt #241986 by Diego E. Pettenò. - - 20 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> dtc-1.0.0.ebuild: - Add ~amd64 wrt bug #209995 - - 13 Feb 2008; Dawid Węgliński <cla@gentoo.org> dtc-1.0.0.ebuild: - Add ~x86 keyword (bug #209995) - - 08 Jan 2008; Brent Baude <ranger@gentoo.org> dtc-1.0.0.ebuild: - Marking dtc-1.0.0 ppc and ppc64 stable to support the development PS3 profile - -*dtc-1.0.0 (07 Dec 2007) - - 07 Dec 2007; Luca Barbato <lu_zero@gentoo.org> +metadata.xml, - +dtc-1.0.0.ebuild: - First commit (imported from cell overlay) - diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest deleted file mode 100644 index c14e463..0000000 --- a/sys-apps/dtc/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -EBUILD dtc-9999.ebuild 1094 RMD160 37282810c64ebe53d10416c5b28d957e99310c09 SHA1 82609b3dae0eab477bc44c5c77f7c43a79271949 SHA256 c98422e352708aa17810727e1fb1c426b5eaa6238380cded7c360d4a360d7481 -MISC ChangeLog 1520 RMD160 872188ddf9b672c26ef37d65888c94a2b18c9874 SHA1 b13b27eb94316e7cf3f2564a9de2a285b1a9e0b2 SHA256 8b09e75ab14d95149a7969d480c99c38ff3b9f8faa4436991c599dda20602c22 -MISC metadata.xml 220 RMD160 8ebd847eafc75facd4d1a7681aa2010609e842d8 SHA1 266ab78ba4815dbf6bf6f4172c8a69f59bc39cab SHA256 847364a734851351edf36827cbb7333a71af6f3451f1ef472ad817b4a310115e diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild deleted file mode 100644 index 85d7d17..0000000 --- a/sys-apps/dtc/dtc-9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dtc/dtc-9999.ebuild,v 1.1 2011/10/17 21:39:35 vapier Exp $ - -EAPI="4" -MY_P="${PN}-v${PV}" - -inherit multilib toolchain-funcs -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.jdl.com/software/dtc.git" - inherit git-2 -else - SRC_URI="http://www.jdl.com/software/${MY_P}.tgz" - KEYWORDS="~x86-linux" -fi - -DESCRIPTION="Open Firmware device-trees compiler" -HOMEPAGE="http://git.jdl.com/gitweb/?p=dtc.git" - -LICENSE="GPL-2" -SLOT="0" -IUSE="static-libs" - -RDEPEND="" -DEPEND="sys-devel/flex - sys-devel/bison" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - sed -i \ - -e '/^CFLAGS =/s:=:+=:' \ - -e '/^CPPFLAGS =/s:=:+=:' \ - -e 's:-Werror::' \ - -e 's:-g -Os::' \ - -e '/^PREFIX =/s:=.*:= /usr:' \ - -e "/^LIBDIR =/s:=.*:= /usr/$(get_libdir):" \ - Makefile || die - tc-export AR CC - export V=1 -} - -src_test() { - emake check -} - -src_install() { - emake DESTDIR="${D}" install - use static-libs || find "${ED}" -name '*.a' -delete - dodoc Documentation/manual.txt -} diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml deleted file mode 100644 index ccba990..0000000 --- a/sys-apps/dtc/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> -<herd>ppc64</herd> -<maintainer> - <email>lu_zero@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog deleted file mode 100644 index 92470ee..0000000 --- a/sys-apps/lshw/ChangeLog +++ /dev/null @@ -1,349 +0,0 @@ -# ChangeLog for sys-apps/lshw -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.94 2011/03/30 11:10:39 angelos Exp $ - - 30 Mar 2011; Christoph Mende <angelos@gentoo.org> lshw-02.14b.ebuild: - Fix gtk+ slot deps - - 25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> lshw-02.15b.ebuild: - ppc64 stable wrt #356927 - - 19 Mar 2011; Raúl Porcel <armin76@gentoo.org> lshw-02.15b.ebuild: - ia64 stable wrt #356927 - - 13 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> lshw-02.15b.ebuild: - x86 stable wrt bug #356927 - - 12 Mar 2011; Tobias Klausmann <klausman@gentoo.org> lshw-02.15b.ebuild: - Stable on alpha, bug #356927 - - 06 Mar 2011; Michael Weber <xmw@gentoo.org> lshw-02.15b.ebuild: - arm/sparc stable (bug 356927) - - 04 Mar 2011; Brent Baude <ranger@gentoo.org> lshw-02.15b.ebuild: - stable ppc, bug 356927 - - 03 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> lshw-02.15b.ebuild: - Remove dev-util/pkgconfig from runtime depend. - - 03 Mar 2011; Mike Frysinger <vapier@gentoo.org> lshw-02.15b.ebuild: - Depend on pkgconfig #357015 by André Malo. - - 01 Mar 2011; Markos Chandras <hwoarang@gentoo.org> lshw-02.15b.ebuild: - Stable on amd64 wrt bug #356927 - - 01 Mar 2011; Tim Harder <radhermit@gentoo.org> lshw-02.15b.ebuild: - Add a slot dependency on gtk+:2. - -*lshw-02.15b (28 Oct 2010) - - 28 Oct 2010; Tim Harder <radhermit@gentoo.org> +lshw-02.15b.ebuild, - +files/lshw-02.15b-build.patch: - Version bump. Update to EAPI=3, add sqlite USE flag and dependency, use - src_prepare instead of src_unpack, and update build patch. - - 11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> lshw-02.14b.ebuild, - +files/lshw-02.14b-gcc45.patch: - Fix build w/ GCC 4.5. (bug #314201 by Bernd Buschinski) - - 04 Apr 2010; Raúl Porcel <armin76@gentoo.org> lshw-02.14b.ebuild: - alpha/ia64/sparc stable wrt #304881 - - 08 Mar 2010; Markus Meier <maekke@gentoo.org> lshw-02.14b.ebuild: - arm stable, bug #304881 - - 26 Feb 2010; Christian Faulhammer <fauli@gentoo.org> lshw-02.14b.ebuild: - stable x86, bug 304881 - - 16 Feb 2010; Steve Dibb <beandog@gentoo.org> lshw-02.14b.ebuild: - amd64 stable, bug 304881 - - 15 Feb 2010; Joseph Jezak <josejx@gentoo.org> lshw-02.14b.ebuild: - Marked ppc/ppc64 stable for bug #304881. - -*lshw-02.14b (07 Jun 2009) - - 07 Jun 2009; Mike Frysinger <vapier@gentoo.org> +lshw-02.14b.ebuild: - Version bump #273052 by Raúl Porcel. - - 14 Oct 2008; Brent Baude <ranger@gentoo.org> lshw-02.13b.ebuild: - stable ppc, bug 241642 - - 14 Oct 2008; Brent Baude <ranger@gentoo.org> lshw-02.13b.ebuild: - stable ppc64, bug 241642 - - 14 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org> lshw-02.13b.ebuild: - stable amd64, bug 241642 - - 13 Oct 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.13b.ebuild: - arm stable wrt #241642 - - 09 Jul 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.13b.ebuild: - alpha/ia64/sparc/x86 stable - -*lshw-02.13b (31 May 2008) - - 31 May 2008; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.13b-gcc43.patch, +lshw-02.13b.ebuild: - Version bump. - - 22 May 2008; <solar@gentoo.org> lshw-02.12.01b.ebuild: - - Keyworded ~arm - - 30 Apr 2008; Matti Bickel <mabi@gentoo.org> lshw-02.12.01b.ebuild: - ppc stable (bug #217783) - - 20 Apr 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.12.01b.ebuild: - sparc stable wrt #217783 - - 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> lshw-02.12.01b.ebuild: - Mark amd64 stable #217783 by Kerin Millar. - - 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.12.01b-alignment.patch, lshw-02.12.01b.ebuild: - Fix from upstream for alignment troubles on sparc #217783 by Friedrich Oslage. - - 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.12.01b-gcc43.patch, lshw-02.12.01b.ebuild: - Add fix from upstream for building with gcc-4.3 #213912 by Sergey Dryabzhinsky. - - 17 Apr 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.12.01b.ebuild: - ia64/x86 stable wrt #217783 - - 16 Apr 2008; Tobias Klausmann <klausman@gentoo.org> lshw-02.12.01b.ebuild: - Stable on alpha, bug #217783 - - 16 Apr 2008; Markus Rothe <corsair@gentoo.org> lshw-02.12.01b.ebuild: - Stable on ppc64; bug #217783 - -*lshw-02.12.01b (24 Dec 2007) - - 24 Dec 2007; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.12.01b-build.patch, +lshw-02.12.01b.ebuild: - Version bump #195824. - - 25 Nov 2007; Brent Baude <ranger@gentoo.org> lshw-02.11.01b.ebuild: - Marked lshw-02.11.01b ppc stable for bug 194114 - - 02 Nov 2007; Steve Dibb <beandog@gentoo.org> lshw-02.11.01b.ebuild: - Drop amd64 stable keyword - - 02 Nov 2007; Steve Dibb <beandog@gentoo.org> lshw-02.11.01b.ebuild: - amd64 stable, bug 194114 - - 01 Nov 2007; Ferris McCormick <fmccor@gentoo.org> lshw-02.11.01b.ebuild: - Sparc stable --- Bug #194114 --- I've had it installed for a while. - - 03 Oct 2007; <solar@gentoo.org> lshw-02.11.01b.ebuild: - keyworded ~ppc64 - - 25 Sep 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.11.01b.ebuild: - alpha/ia64/x86 stable - - 25 Aug 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.11.01b.ebuild: - Back to ~arch, went straight to stable - -*lshw-02.11.01b (25 Aug 2007) - - 25 Aug 2007; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.11.01b-build.patch, +lshw-02.11.01b.ebuild: - Version bump #188624 by Daniel Pielmeier. - - 14 May 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.10b.ebuild: - alpha stable wrt #166574 - - 22 Apr 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.10b.ebuild: - ia64 stable - - 26 Mar 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.09b.ebuild: - ia64 stable wrt bug 166574 - -*lshw-02.10b (24 Mar 2007) - - 24 Mar 2007; Mike Frysinger <vapier@gentoo.org> +lshw-02.10b.ebuild: - Version bump #170365 by Daniel Webert. - - 18 Feb 2007; nixnut <nixnut@gentoo.org> lshw-02.09b.ebuild: - Stable on ppc wrt bug 166574 - - 13 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.09b.ebuild: - Stable on sparc wrt #166574 - - 13 Feb 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.09b.ebuild: - x86 stable wrt bug 166574 - - 13 Feb 2007; Steve Dibb <beandog@gentoo.org> lshw-02.09b.ebuild: - amd64 stable, bug 166574 - - 03 Dec 2006; Tim Yamin <plasmaroo@gentoo.org> lshw-02.08.01b.ebuild: - Stable on IA64; bug #156269. - - 01 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> - lshw-02.08.01b.ebuild: - ppc stable, bug #156269 - - 28 Nov 2006; Christian Faulhammer <opfer@gentoo.org> - lshw-02.08.01b.ebuild: - stable x86, bug #156269 - - 27 Nov 2006; Steve Dibb <beandog@gentoo.org> lshw-02.08.01b.ebuild: - amd64 stable, bug 156269 - - 27 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.08.01b.ebuild: - Stable on sparc wrt #156269 - -*lshw-02.09b (27 Nov 2006) - - 27 Nov 2006; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.09b-cpuid-PIC.patch, +lshw-02.09b.ebuild: - Version bump #156268 by Daniel Webert. - - 25 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> lshw-02.06b.ebuild, - lshw-02.08.01b.ebuild: - Alpha + ~ia64 keywords. - -*lshw-02.08.01b (17 May 2006) - - 17 May 2006; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.08.01b-build.patch, +lshw-02.08.01b.ebuild: - Version bump #133540 by Daniel Webert. - - 27 Apr 2006; Daniel Gryniewicz <dang@gentoo.org> lshw-02.06b.ebuild: - Marked stable on amd64 per bug #131184 - - 26 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.06b.ebuild: - Stable on sparc wrt #131184 - - 25 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org> lshw-02.06b.ebuild: - ppc stable, bug #131184 - - 25 Apr 2006; Saleem Abdulrasool <compnerd@gentoo.org> lshw-02.06b.ebuild: - stable on x86 (bug #131184) - -*lshw-02.07b (25 Apr 2006) - - 25 Apr 2006; Mike Frysinger <vapier@gentoo.org> +lshw-02.07b.ebuild: - Version bump #130973 by Daniel Webert. - - 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> lshw-02.05.01b.ebuild: - Mark 02.05.01b stable on alpha - - 25 Nov 2005; Luis Medinas <metalgod@gentoo.org> lshw-02.05.01b.ebuild: - Stable on amd64. - - 11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> lshw-02.05.01b.ebuild: - Stable on ppc. - - 08 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.05.01b.ebuild: - Stable on sparc - -*lshw-02.06b (05 Nov 2005) - - 05 Nov 2005; Mike Frysinger <vapier@gentoo.org> - +files/lshw-02.06b-build.patch, +files/lshw-02.06b-cpuid-PIC.patch, - +lshw-02.06b.ebuild: - Version bump #111500 by Daniel Webert. - - 05 Nov 2005; Mark Loeser <halcy0n@gentoo.org> lshw-02.05.01b.ebuild: - Stable on x86; bug #111499 - - 03 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> lshw-02.05.01b.ebuild: - marked ~alpha, wrt bug #104130 - -*lshw-02.05.01b (22 Jul 2005) - - 22 Jul 2005; Mike Frysinger <vapier@gentoo.org> +lshw-02.05.01b.ebuild: - Version bump #99838 by Nunatak. - - 22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> lshw-02.03b.ebuild: - Stable on ppc. - - 02 May 2005; Jason Wever <weeve@gentoo.org> lshw-02.03b.ebuild: - Stable on SPARC. - -*lshw-02.04b (28 Apr 2005) - - 28 Apr 2005; Mike Frysinger <vapier@gentoo.org> +lshw-02.04b.ebuild: - Version bump #90727 by Daniel Webert. - -*lshw-02.03b (05 Feb 2005) - - 05 Feb 2005; MATSUU Takuto <matsuu@gentoo.org> +lshw-02.03b.ebuild: - Version bumped. - - 03 Feb 2005; <solar@gentoo.org> -lshw-01.08a.ebuild, lshw-02.00b.ebuild, - lshw-02.02b.ebuild: - - removing filter-flags -fPIC from ebuild now that the cpuid patch exists. - Removing broken lshw-01.08a - -*lshw-02.02b (22 Jan 2005) - - 22 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +lshw-02.02b.ebuild: - Version bumped. - - 03 Jan 2005; Mike Frysinger <vapier@gentoo.org> - +files/02.00b-cpuid-PIC.patch, lshw-02.00b.ebuild: - Add patch to enable PIC building #61947. - - 21 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/02.00b-dev.patch, - lshw-02.00b.ebuild: - Clean up ebuild and add patch to fix includes #75168 by lukenshiro@ngi.it. - -*lshw-02.00b (21 Dec 2004) - - 21 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> -lshw-01.06a.ebuild, - -lshw-01.07a.ebuild, lshw-01.08a.ebuild, +lshw-02.00b.ebuild: - Version bumped. - Removed old versions. - -*lshw-01.08a (06 Sep 2004) - - 06 Sep 2004; MATSUU Takuto <matsuu@gentoo.org> +lshw-01.08a.ebuild: - Version bumped. - -*lshw-01.07a (13 May 2004) - - 13 May 2004; <matsuu@gentoo.org> -lshw-01.00.ebuild, +lshw-01.07a.ebuild: - Version bumped. - - 12 May 2004; Alexander Gabert <pappy@gentoo.org> lshw-01.06a.ebuild: - removed hardened-gcc logic - - 25 Apr 2004; <matsuu@gentoo.org> -lshw-01.05a.ebuild, lshw-01.06a.ebuild: - Marked as stable. - -*lshw-01.06a (29 Feb 2004) - - 29 Feb 2004; <matsuu@gentoo.org> lshw-01.06a.ebuild: - Version bumped. - -*lshw-01.05a (05 Nov 2003) - - 05 Nov 2003; Martin Holzer <mholzer@gentoo.org> lshw-01.05a.ebuild: - Version bumped. - -*lshw-01.04 (04 Oct 2003) - - 04 Oct 2003; MATSUU Takuto <matsuu@gentoo.org> lshw-01.04.ebuild: - version bump. - - 21 Sep 2003; <solar@gentoo.org> lshw-01.03.ebuild: - cpuid.cc uses inline asm and can not be linked when position independent code - is desired. - -*lshw-01.03 (20 Aug 2003) - - 20 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> lshw-01.03.ebuild: - version bump. - -*lshw-01.02 (06 Aug 2003) - - 06 Aug 2003; Martin Holzer <mholzer@gentoo.org> lshw-01.02.ebuild: - Version bumped. closes #25925. - -*lshw-01.00 (15 Apr 2003) - - 15 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, lshw-01.00.ebuild: - Adding initial ebuild submitted by Marc Hildebrand - <marc.hildebrand@t-online.de> in #19200. - diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest deleted file mode 100644 index 1be58ce..0000000 --- a/sys-apps/lshw/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX lshw-02.15b-build.patch 3735 RMD160 1512c4bc7549c8847bc7beed3564caeaa3f9f9bf SHA1 8006e54aaf79235a2f7fcaba15d1f594dfaa6175 SHA256 1183485aa48e16a99b1a0d4aaa7c48a2d1f0056579334c78090eae2f35cd6a87 -DIST lshw-B.02.15.tar.gz 1384466 RMD160 565ea7849fc6ad4ba1368da560a0d1d2000d5b3e SHA1 488b5b014ac06c1d4448f0517f874bcb568c57c0 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6 -EBUILD lshw-02.15b.ebuild 1320 RMD160 2bc05c968b0096a1f35c8e2fc759f764e7a0fcc5 SHA1 5a8a5d777936c8415ffd794dfdf47252123cc503 SHA256 9d4cd3e314d518c5e90f677d0e762d51d35cdfda3019af136ed743317511b736 -MISC ChangeLog 11268 RMD160 426a6645eab4c5055a7ab935c25c151fa70b9a82 SHA1 1dc78ea348a1354a2fc325ba0d7b4e8a21843d3d SHA256 bb91441f118a07344ca37b758f360a31263c7c6baf7819f098c0f3e46c542f80 -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-apps/lshw/files/lshw-02.15b-build.patch b/sys-apps/lshw/files/lshw-02.15b-build.patch deleted file mode 100644 index b0ab9f8..0000000 --- a/sys-apps/lshw/files/lshw-02.15b-build.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -ur lshw-B.02.15.orig/src/core/Makefile lshw-B.02.15/src/core/Makefile ---- lshw-B.02.15.orig/src/core/Makefile 2010-10-05 02:34:27.000000000 -0700 -+++ lshw-B.02.15/src/core/Makefile 2010-10-27 22:52:25.417069825 -0700 -@@ -1,10 +1,10 @@ - PACKAGENAME?=lshw - --CXX=c++ -+CXX?=c++ - INCLUDES= - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" --CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) --LDFLAGS= -+CXXFLAGS ?= -g -+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) - LDSTATIC= - LIBS= - -diff -ur lshw-B.02.15.orig/src/gui/Makefile lshw-B.02.15/src/gui/Makefile ---- lshw-B.02.15.orig/src/gui/Makefile 2010-10-05 02:34:27.000000000 -0700 -+++ lshw-B.02.15/src/gui/Makefile 2010-10-27 22:54:54.870258929 -0700 -@@ -8,11 +8,11 @@ - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" - GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) - INCLUDES=-I../core $(GTKINCLUDES) --CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) -+CXXFLAGS ?= -g -+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) - CFLAGS=$(CXXFLAGS) $(DEFINES) - GTKLIBS=$(shell pkg-config gtk+-2.0 --libs) - LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS) --LDFLAGS= - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) - LDFLAGS+= -Wl,--as-needed - endif -@@ -39,7 +39,6 @@ - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) - - install: all -- $(STRIP) gtk-$(PACKAGENAME) - - clean: - rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak interface.c.bak interface.h.bak callbacks.c.bak callbacks.h.bak Makefile.bak -diff -ur lshw-B.02.15.orig/src/Makefile lshw-B.02.15/src/Makefile ---- lshw-B.02.15.orig/src/Makefile 2010-10-05 02:34:27.000000000 -0700 -+++ lshw-B.02.15/src/Makefile 2010-10-27 22:53:26.010552033 -0700 -@@ -21,11 +21,13 @@ - CXX?=c++ - INCLUDES=-I./core/ - DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" --CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) -+CXXFLAGS ?= -g -+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) - ifeq ($(SQLITE), 1) - CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) - endif --LDFLAGS=-L./core/ -g -+LDFLAGS ?= -g -+LDFLAGS += -L./core/ - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) - LDFLAGS+= -Wl,--as-needed - endif -@@ -48,18 +50,18 @@ - - .PHONY: core - core: -- +make -C core all -+ +$(MAKE) -C core all - - $(PACKAGENAME): core $(PACKAGENAME).o - $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) - - .PHONY: po - po: -- +make -C po all -+ +$(MAKE) -C po all - - .PHONY: gui - gui: core -- +make -C gui all -+ +$(MAKE) -C gui all - - .PHONY: nologo - nologo: -@@ -70,7 +72,6 @@ - - $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o - $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) -- $(STRIP) $@ - - .PHONY: compressed - compressed: $(PACKAGENAME)-compressed -@@ -93,14 +94,14 @@ - manuf.txt: - wget http://www.ethereal.com/distribution/manuf.txt - --install: all -+install: - $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) - $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR) - $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1 - $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1 - $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) - $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) -- make -C po install -+ $(MAKE) -C po install - - install-gui: gui - $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) -@@ -110,8 +111,8 @@ - - clean: - rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed -- make -C core clean -- make -C gui clean -+ $(MAKE) -C core clean -+ $(MAKE) -C gui clean - - .timestamp: - date --utc +%Y%m%d%H%M%S > $@ diff --git a/sys-apps/lshw/lshw-02.15b.ebuild b/sys-apps/lshw/lshw-02.15b.ebuild deleted file mode 100644 index 8b1c0c6..0000000 --- a/sys-apps/lshw/lshw-02.15b.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.15b.ebuild,v 1.11 2011/03/25 09:59:52 xarthisius Exp $ - -EAPI=3 -inherit flag-o-matic eutils toolchain-funcs - -MAJ_PV=${PV:0:${#PV}-1} -MIN_PVE=${PV:0-1} -MIN_PV=${MIN_PVE/b/B} - -MY_P="$PN-$MIN_PV.$MAJ_PV" -DESCRIPTION="Hardware Lister" -HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter" -SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="gtk sqlite static" - -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - sqlite? ( dev-db/sqlite:3 )" -DEPEND="${RDEPEND} - gtk? ( dev-util/pkgconfig ) - sqlite? ( dev-util/pkgconfig )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch -} - -src_compile() { - tc-export CC CXX AR - use static && append-ldflags -static - - local sqlite=0 - use sqlite && sqlite=1 - - emake PREFIX=$EPREFIX SQLITE=$sqlite || die "emake failed" - if use gtk ; then - emake gui || die "emake gui failed" - fi -} - -src_install() { - emake DESTDIR="${ED}" install || die "install failed" - dodoc README docs/* - if use gtk ; then - emake DESTDIR="${ED}" install-gui || die "install gui failed" - make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" - fi -} diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml deleted file mode 100644 index 96a2d58..0000000 --- a/sys-apps/lshw/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest deleted file mode 100644 index 8073174..0000000 --- a/sys-apps/portage/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5 -AUX portage-2.3.0-ldconfig-path.patch 1349 SHA256 f39a31df3beeedbe031b09a60a62dd0de65487aece21d3755d03de54acb09e0a SHA512 0443a5fc650b5115827091a363223ca769e59f023ce6fbe9f5c90f326c1468c31a6833494e084e95111c98da48992732f1f25ce40f9320e51e9b63b6fa773617 WHIRLPOOL 7378ad8de383670bfeb01564db760dcd122b34f268a73b108980f478cf11c500b366cc82e0069c4367fcfea0d32584544ce3df864d234ce14faf5897eb51d1ab -AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa -AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928 -DIST portage-2.3.0.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2 -DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe -EBUILD portage-2.3.0.ebuild 11517 SHA256 16b10e751c98dc45735697b50a4df638ccce75745f2a04004dbc5c0897d4b0ed SHA512 bc44fd3cdab534b513fc00a6c27a06f42a9448c53008a470c976f2b520b0f606ec14f532eeff1c3740abd520a09bf886b005ec427a730bfbd1086093b4b7a6c3 WHIRLPOOL 068f283095fbe0bc417fd2856cc30be867001708e8d9b8daaa3a1027995bc0a2ef2ab7a9fa6bcc3fb892628e597fb55e1bc5a3795d609650c5c98b1c30d56e91 -EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0 -MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166 diff --git a/sys-apps/portage/files/README.RESCUE b/sys-apps/portage/files/README.RESCUE deleted file mode 100644 index 70c494e..0000000 --- a/sys-apps/portage/files/README.RESCUE +++ /dev/null @@ -1,2 +0,0 @@ -Please see http://www.gentoo.org/proj/en/portage/doc/manually-fixing-portage.xml -for a recovery guide for a broken portage installation. diff --git a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch b/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch deleted file mode 100644 index 65fbd3e..0000000 --- a/sys-apps/portage/files/portage-2.3.0-ldconfig-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit dde7fb0919d40cc5585e8a603046e7098371ad69 -Author: Benda Xu <heroxbd@gentoo.org> -Date: Wed Dec 10 10:45:31 2014 +0900 - - let env-update call ldconfig if it exists - - In Prefix, let env-update call ldconfig if it exists. - - It does not affect prefix-rpath, and handles prefix-libc(RAP) correctly. - - Signed-off-by: Fabian Groffen <grobian@gentoo.org> - -diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py -index ace492c..5e732ad 100644 ---- a/pym/portage/util/env_update.py -+++ b/pym/portage/util/env_update.py -@@ -306,13 +306,15 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, - if not libdir_contents_changed: - makelinks = False - -- ldconfig = "/sbin/ldconfig" -+ ldconfig = eprefix + "/sbin/ldconfig" - if "CHOST" in settings and "CBUILD" in settings and \ - settings["CHOST"] != settings["CBUILD"]: - ldconfig = find_binary("%s-ldconfig" % settings["CHOST"]) -+ elif not (os.access(ldconfig, os.X_OK) and os.path.isfile(ldconfig)): -+ ldconfig = None - - # Only run ldconfig as needed -- if makelinks and ldconfig and not eprefix: -+ if makelinks and ldconfig: - # ldconfig has very different behaviour between FreeBSD and Linux - if ostype == "Linux" or ostype.lower().endswith("gnu"): - # We can't update links if we haven't cleaned other versions first, as diff --git a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch deleted file mode 100644 index f2fe0f0..0000000 --- a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch +++ /dev/null @@ -1,31 +0,0 @@ -When eprefix is defined, no host tools should be used. - -diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py -index 26e6123..c266c83 100644 ---- a/pym/portage/package/ebuild/doebuild.py -+++ b/pym/portage/package/ebuild/doebuild.py -@@ -205,11 +205,6 @@ def _doebuild_path(settings, eapi=None): - overrides = [x for x in settings.get( - "__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x] - -- prefixes = [] -- if eprefix: -- prefixes.append(eprefix) -- prefixes.append("/") -- - path = overrides - - if "xattr" in settings.features: -@@ -231,9 +226,9 @@ def _doebuild_path(settings, eapi=None): - path.append(os.path.join(x, "ebuild-helpers")) - path.extend(prerootpath) - -- for prefix in prefixes: -- for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"): -- path.append(os.path.join(prefix, x)) -+ prefix = eprefix if eprefix else "/" -+ for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"): -+ path.append(os.path.join(prefix, x)) - - path.extend(rootpath) - settings["PATH"] = ":".join(path) diff --git a/sys-apps/portage/files/portage-2.3.0_rc1.patch b/sys-apps/portage/files/portage-2.3.0_rc1.patch deleted file mode 100644 index 8464462..0000000 --- a/sys-apps/portage/files/portage-2.3.0_rc1.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9ba1bea5e24fe839ef5bd833c3974a55d5333bf1 Mon Sep 17 00:00:00 2001 -From: Brian Dolbec <dolsen@gentoo.org> -Date: Mon, 16 May 2016 02:45:45 -0700 -Subject: [PATCH] portage.const.py: Remove repoman from PORTAGE_PYM_PACKAGES - -Decca (in IRC) got a traceback due to the missing repoman install - -sysresccd / # emerge -e @system -Calculating dependencies... done! -Traceback (most recent call last): - File "/usr/lib/python-exec/python3.5/emerge", line 50, in <module> - retval = emerge_main() - File "/usr/lib64/python3.5/site-packages/_emerge/main.py", line 1185, in emerge_main - return run_action(emerge_config) - File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 3236, in run_action - emerge_config.args, spinner) - File "/usr/lib64/python3.5/site-packages/_emerge/actions.py", line 505, in action_build - retval = mergetask.merge() - File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 958, in merge - rval = self._handle_self_update() - File "/usr/lib64/python3.5/site-packages/_emerge/Scheduler.py", line 323, in _handle_self_update - _prepare_self_update(self.settings) - File "/usr/lib64/python3.5/site-packages/portage/package/ebuild/doebuild.py", line 2489, in _prepare_self_update - symlinks=True) - File "/usr/lib64/python3.5/site-packages/portage/__init__.py", line 259, in __call__ - rval = self._func(*wrapped_args, **wrapped_kwargs) - File "/usr/lib64/python3.5/shutil.py", line 303, in copytree - names = os.listdir(src) -FileNotFoundError: [Errno 2] No such file or directory: b'/usr/lib64/python3.5/site-packages/repoman' - -Dirkjan <djc> found repoman was still included in the PORTAGE_PYM_PACKAGES which -caused the traceback. ---- - pym/portage/const.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pym/portage/const.py b/pym/portage/const.py -index 814d7f4..179efce 100644 ---- a/pym/portage/const.py -+++ b/pym/portage/const.py -@@ -278,7 +278,7 @@ SUPPORTED_XPAK_EXTENSIONS = (".tbz2", ".xpak") - TIMESTAMP_FORMAT = "%a, %d %b %Y %H:%M:%S +0000" # to be used with time.gmtime() - - # Top-level names of Python packages installed by Portage. --PORTAGE_PYM_PACKAGES = ("_emerge", "portage", "repoman") -+PORTAGE_PYM_PACKAGES = ("_emerge", "portage") - - RETURNCODE_POSTINST_FAILURE = 5 - --- -2.8.2 - diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml deleted file mode 100644 index 4d95e14..0000000 --- a/sys-apps/portage/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <upstream> - <bugs-to>mailto:dev-portage@gentoo.org</bugs-to> - <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog> - <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc> - </upstream> - <maintainer type="project"> - <email>dev-portage@gentoo.org</email> - </maintainer> - <use> - <flag name="epydoc">Build html API documentation with epydoc.</flag> - <flag name="ipc">Use inter-process communication between portage and running ebuilds.</flag> - <flag name="pypy2_0">Use pypy-c2.0 as Python interpreter.</flag> - <flag name="python2">Use python2 as Python interpreter.</flag> - <flag name="python3">Use python3 as Python interpreter.</flag> - <flag name="xattr">Preserve extended attributes (filesystem-stored metadata) when installing files. Usually only required for hardened systems.</flag> - </use> -</pkgmetadata> diff --git a/sys-apps/portage/portage-2.3.0.ebuild b/sys-apps/portage/portage-2.3.0.ebuild deleted file mode 100644 index e4f475c..0000000 --- a/sys-apps/portage/portage-2.3.0.ebuild +++ /dev/null @@ -1,364 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_3 python3_4 python3_5 - python2_7 -) -PYTHON_REQ_USE='bzip2(+)' - -inherit distutils-r1 multilib - -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru selinux xattr" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -RDEPEND=" - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !<app-admin/logrotate-3.8.0" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - )" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - -SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage" - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -TARBALL_PV=${PV} -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" - -PATCHES=( "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch - "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch ) - -pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ - -i pym/portage/const.py || \ - die "Failed to patch portage.const.EPREFIX" - - einfo "Prefixing shebangs ..." - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ - die "sed failed" - fi - done < <(find . -type f -print0) - - einfo "Adjusting make.globals ..." - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adjusting repos.conf ..." - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -i cnf/repos.conf || die "sed failed" - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( install_docbook ) - use epydoc && targets+=( install_epydoc ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #if [[ $ROOT == / ]] ; then - ## Run some minimal tests as a sanity check. - #local test_runner=$(find "${ED}" -name runTests) - #if [[ -n $test_runner && -x $test_runner ]] ; then - #einfo "Running preinst sanity tests..." - #"$test_runner" || die "preinst sanity tests failed" - #fi - #fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.1.13" || \ - { - has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ - has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" - } ; then - USERPRIV_UPGRADE=true - USERSYNC_UPGRADE=true - REPOS_CONF_UPGRADE=true - REPOS_CONF_SYNC= - type -P portageq >/dev/null 2>&1 && \ - REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) - else - USERPRIV_UPGRADE=false - USERSYNC_UPGRADE=false - REPOS_CONF_UPGRADE=false - fi -} - -get_ownership() { - case ${USERLAND} in - BSD) - stat -f '%Su:%Sg' "${1}" - ;; - *) - stat -c '%U:%G' "${1}" - ;; - esac -} - -new_config_protect() { - # Generate a ._cfg file even if the target file - # does not exist, ensuring that the user will - # notice the config change. - local basename=${1##*/} - local dirname=${1%/*} - local i=0 - while true ; do - local filename=$( - echo -n "${dirname}/._cfg" - printf "%04d" ${i} - echo -n "_${basename}" - ) - [[ -e ${filename} ]] || break - (( i++ )) - done - echo "${filename}" -} - -pkg_postinst() { - - if ${REPOS_CONF_UPGRADE} ; then - einfo "Generating repos.conf" - local repo_name= - [[ -f ${PORTDIR}/profiles/repo_name ]] && \ - repo_name=$(< "${PORTDIR}/profiles/repo_name") - if [[ -z ${REPOS_CONF_SYNC} ]] ; then - REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") - REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } - fi - local sync_type= - [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git - - if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then - sync_type=cvs - REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} - fi - - cat <<-EOF > "${T}/repos.conf" - [DEFAULT] - main-repo = ${repo_name:-gentoo} - - [${repo_name:-gentoo}] - location = ${PORTDIR:-${EPREFIX}/usr/portage} - sync-type = ${sync_type:-rsync} - sync-uri = ${REPOS_CONF_SYNC} - EOF - - [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" - - local dest=${EROOT:-${ROOT}}etc/portage/repos.conf - if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then - dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf - fi - # Don't install the config update if the desired repos.conf directory - # and config file exist, since users may accept it blindly and break - # their config (bug #478726). - [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ - mv "${T}/repos.conf" "$(new_config_protect "${dest}")" - - if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then - einfo "Generating make.conf PORTDIR setting for backward compatibility" - for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do - [[ -e ${dest} ]] && break - done - [[ -d ${dest} ]] && dest=${dest}/portdir.conf - rm -rf "${T}/make.conf" - [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" - cat <<-EOF >> "${T}/make.conf" - - # Set PORTDIR for backward compatibility with various tools: - # gentoo-bashcomp - bug #478444 - # euse - bug #474574 - # euses and ufed - bug #478318 - PORTDIR="${EPREFIX}/usr/portage" - EOF - mkdir -p "${dest%/*}" - mv "${T}/make.conf" "$(new_config_protect "${dest}")" - fi - fi - - local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} - - if ${USERSYNC_UPGRADE} && \ - [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then - local ownership=$(get_ownership "${PORTDIR}") - if [[ -n ${ownership} ]] ; then - einfo "Adjusting PORTDIR permissions for usersync" - find "${PORTDIR}" -path "${distdir%/}" -prune -o \ - ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ - -exec chown "${ownership}" {} + - fi - fi - - # Do this last, since it could take a long time if there - # are lots of live sources, and the user may be tempted - # to kill emerge while it is running. - if ${USERPRIV_UPGRADE} && \ - [[ -d ${distdir} && -w ${distdir} ]] ; then - local ownership=$(get_ownership "${distdir}") - if [[ ${ownership#*:} == portage ]] ; then - einfo "Adjusting DISTDIR permissions for userpriv" - find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ - -exec chown -R portage:portage {} + - fi - fi - - einfo "" - einfo "This release of portage NO LONGER contains the repoman code base." - einfo "Repoman has its own ebuild and release package." - einfo "For repoman functionality please emerge app-portage/repoman" - einfo "Please report any bugs you may encounter." - einfo "" -} diff --git a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild b/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild deleted file mode 100644 index 51bca3f..0000000 --- a/sys-apps/portage/portage-2.3.0_rc1-r1.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( - pypy - python3_3 python3_4 python3_5 - python2_7 -) -PYTHON_REQ_USE='bzip2(+)' - -inherit distutils-r1 multilib - -DESCRIPTION="Portage is the package management and distribution system for Gentoo" -HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -SLOT="0" -IUSE="build doc epydoc +ipc linguas_ru selinux xattr" - -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" -# Require sandbox-2.2 for bug #288863. -# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's -# quite slow, so it's not considered in the dependencies as an alternative to -# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so -# for now, don't pull in xattr deps for other kernels. -# For whirlpool hash, require python[ssl] (bug #425046). -# For compgen, require bash[readline] (bug #445576). -RDEPEND=" - >=app-arch/tar-1.27 - dev-lang/python-exec:2 - !build? ( - >=sys-apps/sed-4.0.5 - app-shells/bash:0[readline] - >=app-admin/eselect-1.2 - ) - elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) - elibc_glibc? ( >=sys-apps/sandbox-2.2 ) - elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) - >=app-misc/pax-utils-0.1.17 - selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) - xattr? ( kernel_linux? ( - >=sys-apps/install-xattr-0.3 - $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ - python2_7 pypy) - ) ) - !<app-admin/logrotate-3.8.0" -PDEPEND=" - !build? ( - >=net-misc/rsync-2.6.4 - userland_GNU? ( >=sys-apps/coreutils-6.4 ) - )" -# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 -# NOTE: FEATURES=installsources requires debugedit and rsync - -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - -SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage" - -prefix_src_archives() { - local x y - for x in ${@}; do - for y in ${SRC_ARCHIVES}; do - echo ${y}/${x} - done - done -} - -TARBALL_PV=${PV} -SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 - $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" - -PATCHES=("${FILESDIR}/portage-2.3.0_rc1.patch" - "${FILESDIR}"/${PN}-2.2.28-distcc-eprefix.patch - "${FILESDIR}"/${PN}-2.3.0-scanelf-path.patch - "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch - "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch -) - -pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -python_prepare_all() { - distutils-r1_python_prepare_all - - if ! use ipc ; then - einfo "Disabling ipc..." - sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ - die "failed to patch AbstractEbuildProcess.py" - fi - - if use xattr && use kernel_linux ; then - einfo "Adding FEATURES=xattr to make.globals ..." - echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - if [[ -n ${EPREFIX} ]] ; then - einfo "Setting portage.const.EPREFIX ..." - sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ - -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ - -i pym/portage/const.py || \ - die "Failed to patch portage.const.EPREFIX" - - einfo "Prefixing shebangs ..." - while read -r -d $'\0' ; do - local shebang=$(head -n1 "$REPLY") - if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then - sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ - die "sed failed" - fi - done < <(find . -type f -print0) - - einfo "Adjusting make.globals ..." - sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ - -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ - -i cnf/make.globals || die "sed failed" - - einfo "Adjusting repos.conf ..." - sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ - -i cnf/repos.conf || die "sed failed" - - einfo "Adding FEATURES=force-prefix to make.globals ..." - echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ - || die "failed to append to make.globals" - fi - - cd "${S}/cnf" || die - if [ -f "make.conf.example.${ARCH}".diff ]; then - patch make.conf.example "make.conf.example.${ARCH}".diff || \ - die "Failed to patch make.conf.example" - else - eerror "" - eerror "Portage does not have an arch-specific configuration for this arch." - eerror "Please notify the arch maintainer about this issue. Using generic." - eerror "" - fi -} - -python_compile_all() { - local targets=() - use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) - - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi -} - -python_test() { - esetup.py test -} - -python_install() { - # Install sbin scripts to bindir for python-exec linking - # they will be relocated in pkg_preinst() - distutils-r1_python_install \ - --system-prefix="${EPREFIX}/usr" \ - --bindir="$(python_get_scriptdir)" \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ - --sbindir="$(python_get_scriptdir)" \ - --sysconfdir="${EPREFIX}/etc" \ - "${@}" -} - -python_install_all() { - distutils-r1_python_install_all - - local targets=() - use doc && targets+=( install_docbook ) - use epydoc && targets+=( install_epydoc ) - - # install docs - if [[ ${targets[@]} ]]; then - esetup.py "${targets[@]}" - fi - - # Due to distutils/python-exec limitations - # these must be installed to /usr/bin. - local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' - einfo "Moving admin scripts to the correct directory" - dodir /usr/sbin - for target in ${sbin_relocations}; do - einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" - done -} - -pkg_preinst() { - # comment out sanity test until it is fixed to work - # with the new PORTAGE_PYM_PATH - #if [[ $ROOT == / ]] ; then - ## Run some minimal tests as a sanity check. - #local test_runner=$(find "${ED}" -name runTests) - #if [[ -n $test_runner && -x $test_runner ]] ; then - #einfo "Running preinst sanity tests..." - #"$test_runner" || die "preinst sanity tests failed" - #fi - #fi - - # elog dir must exist to avoid logrotate error for bug #415911. - # This code runs in preinst in order to bypass the mapping of - # portage:portage to root:root which happens after src_install. - keepdir /var/log/portage/elog - # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} - fi - - if has_version "<${CATEGORY}/${PN}-2.1.13" || \ - { - has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ - has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" - } ; then - USERPRIV_UPGRADE=true - USERSYNC_UPGRADE=true - REPOS_CONF_UPGRADE=true - REPOS_CONF_SYNC= - type -P portageq >/dev/null 2>&1 && \ - REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) - else - USERPRIV_UPGRADE=false - USERSYNC_UPGRADE=false - REPOS_CONF_UPGRADE=false - fi -} - -get_ownership() { - case ${USERLAND} in - BSD) - stat -f '%Su:%Sg' "${1}" - ;; - *) - stat -c '%U:%G' "${1}" - ;; - esac -} - -new_config_protect() { - # Generate a ._cfg file even if the target file - # does not exist, ensuring that the user will - # notice the config change. - local basename=${1##*/} - local dirname=${1%/*} - local i=0 - while true ; do - local filename=$( - echo -n "${dirname}/._cfg" - printf "%04d" ${i} - echo -n "_${basename}" - ) - [[ -e ${filename} ]] || break - (( i++ )) - done - echo "${filename}" -} - -pkg_postinst() { - - if ${REPOS_CONF_UPGRADE} ; then - einfo "Generating repos.conf" - local repo_name= - [[ -f ${PORTDIR}/profiles/repo_name ]] && \ - repo_name=$(< "${PORTDIR}/profiles/repo_name") - if [[ -z ${REPOS_CONF_SYNC} ]] ; then - REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") - REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } - fi - local sync_type= - [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git - - if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then - sync_type=cvs - REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} - fi - - cat <<-EOF > "${T}/repos.conf" - [DEFAULT] - main-repo = ${repo_name:-gentoo} - - [${repo_name:-gentoo}] - location = ${PORTDIR:-${EPREFIX}/usr/portage} - sync-type = ${sync_type:-rsync} - sync-uri = ${REPOS_CONF_SYNC} - EOF - - [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" - - local dest=${EROOT:-${ROOT}}etc/portage/repos.conf - if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then - dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf - fi - # Don't install the config update if the desired repos.conf directory - # and config file exist, since users may accept it blindly and break - # their config (bug #478726). - [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ - mv "${T}/repos.conf" "$(new_config_protect "${dest}")" - - if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then - einfo "Generating make.conf PORTDIR setting for backward compatibility" - for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do - [[ -e ${dest} ]] && break - done - [[ -d ${dest} ]] && dest=${dest}/portdir.conf - rm -rf "${T}/make.conf" - [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" - cat <<-EOF >> "${T}/make.conf" - - # Set PORTDIR for backward compatibility with various tools: - # gentoo-bashcomp - bug #478444 - # euse - bug #474574 - # euses and ufed - bug #478318 - PORTDIR="${EPREFIX}/usr/portage" - EOF - mkdir -p "${dest%/*}" - mv "${T}/make.conf" "$(new_config_protect "${dest}")" - fi - fi - - local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} - - if ${USERSYNC_UPGRADE} && \ - [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then - local ownership=$(get_ownership "${PORTDIR}") - if [[ -n ${ownership} ]] ; then - einfo "Adjusting PORTDIR permissions for usersync" - find "${PORTDIR}" -path "${distdir%/}" -prune -o \ - ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ - -exec chown "${ownership}" {} + - fi - fi - - # Do this last, since it could take a long time if there - # are lots of live sources, and the user may be tempted - # to kill emerge while it is running. - if ${USERPRIV_UPGRADE} && \ - [[ -d ${distdir} && -w ${distdir} ]] ; then - local ownership=$(get_ownership "${distdir}") - if [[ ${ownership#*:} == portage ]] ; then - einfo "Adjusting DISTDIR permissions for userpriv" - find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ - -exec chown -R portage:portage {} + - fi - fi - - einfo "" - einfo "This release of portage NO LONGER contains the repoman code base." - einfo "Repoman has it's own ebuild and release package." - einfo "For repoman functionality please emerge app-portage/repoman" - einfo "Please report any bugs you may encounter." - einfo "" -} diff --git a/sys-apps/sandbox/ChangeLog b/sys-apps/sandbox/ChangeLog deleted file mode 100644 index 76303db..0000000 --- a/sys-apps/sandbox/ChangeLog +++ /dev/null @@ -1,689 +0,0 @@ -# ChangeLog for sys-apps/sandbox -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/ChangeLog,v 1.165 2012/07/06 19:53:10 vapier Exp $ - - 06 Jul 2012; Mike Frysinger <vapier@gentoo.org> - +files/sandbox-2.6-trace-hppa.patch, sandbox-2.6.ebuild: - Fix building of trace code for hppa #425062 by Jeroen Roovers. - -*sandbox-2.6 (03 Jul 2012) - - 03 Jul 2012; Mike Frysinger <vapier@gentoo.org> +sandbox-2.6.ebuild: - Various fixes, and x32 support. - - 24 Jun 2012; Mike Frysinger <vapier@gentoo.org> sandbox-2.5.ebuild: - Parallelize configure steps for multiple ABIs, and run tests in parallel. - - 30 Mar 2012; Alexis Ballier <aballier@gentoo.org> sandbox-1.6-r2.ebuild: - keyword -x86-fbsd for bug #374425, sandbox is broken of fbsd and this leaves - us with nothing. - - 05 Feb 2012; Mike Frysinger <vapier@gentoo.org> sandbox-1.6-r2.ebuild, - sandbox-2.3-r1.ebuild, sandbox-2.4.ebuild, sandbox-2.5.ebuild: - Move to new unpacker eclass. - - 02 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> sandbox-2.5.ebuild: - ppc/ppc64 stable wrt #389981 - - 03 Dec 2011; Raúl Porcel <armin76@gentoo.org> sandbox-2.5.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #389981 - - 13 Nov 2011; Markus Meier <maekke@gentoo.org> sandbox-2.5.ebuild: - arm stable, bug #389981 - - 11 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> sandbox-2.5.ebuild: - x86 stable wrt bug #389981 - - 10 Nov 2011; Jeroen Roovers <jer@gentoo.org> sandbox-2.5.ebuild: - Stable for HPPA (bug #389981). - - 10 Nov 2011; Tony Vroon <chainsaw@gentoo.org> sandbox-2.5.ebuild: - Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & - Elijah "Armageddon" El Lazkani in bug #389981. - - 10 May 2011; Jeremy Olexa <darkside@gentoo.org> sandbox-2.4.ebuild, - sandbox-2.5.ebuild: - Don't restore ownership while extracting, bug 366759 - -*sandbox-2.5 (14 Feb 2011) - - 14 Feb 2011; Mike Frysinger <vapier@gentoo.org> +sandbox-2.5.ebuild: - Version bump. - - 12 Feb 2011; Raúl Porcel <armin76@gentoo.org> sandbox-2.4.ebuild: - sparc stable wrt #348549 - - 02 Jan 2011; Mike Frysinger <vapier@gentoo.org> sandbox-2.4.ebuild: - Mark alpha/ia64/s390/sh stable #348549. - - 21 Dec 2010; Markus Meier <maekke@gentoo.org> sandbox-2.4.ebuild: - arm stable, bug #348549 - - 19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> sandbox-2.4.ebuild: - ppc64 stable wrt #348549 - - 14 Dec 2010; Markos Chandras <hwoarang@gentoo.org> sandbox-2.4.ebuild: - Stable on amd64 wrt bug #348549 - - 13 Dec 2010; Jeroen Roovers <jer@gentoo.org> sandbox-2.4.ebuild: - Stable for HPPA PPC (bug #348549). - - 13 Dec 2010; Jeroen Roovers <jer@gentoo.org> sandbox-2.4.ebuild: - Stable for HPPA (bug #348549). - - 12 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> sandbox-2.4.ebuild: - x86 stable wrt bug #348549 - - 30 Nov 2010; Michael Weber <xmw@gentoo.org> sandbox-2.3-r1.ebuild: - sparc stable (bug 338113) - -*sandbox-2.4 (24 Nov 2010) - - 24 Nov 2010; Mike Frysinger <vapier@gentoo.org> +sandbox-2.4.ebuild: - Fix hardened issues #339157 and flesh out *at func handling some more - #342983. - - 23 Nov 2010; Mike Frysinger <vapier@gentoo.org> sandbox-2.3-r1.ebuild: - Add back ~sparc since it has its ptrace disabled. - - 16 Oct 2010; Brent Baude <ranger@gentoo.org> sandbox-2.3-r1.ebuild: - stable ppc, bug 338113 - - 10 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> sandbox-2.3-r1.ebuild: - ppc64 stable wrt #338113 - - 10 Oct 2010; Raúl Porcel <armin76@gentoo.org> sandbox-2.3-r1.ebuild: - alpha/arm/ia64/m68k/s390/sh stable wrt #338113 - - 05 Oct 2010; Markus Meier <maekke@gentoo.org> sandbox-2.3-r1.ebuild: - x86 stable, bug #338113 - - 29 Sep 2010; Jeroen Roovers <jer@gentoo.org> sandbox-2.3-r1.ebuild: - Stable for HPPA (bug #338113). - - 24 Sep 2010; Markos Chandras <hwoarang@gentoo.org> sandbox-2.3-r1.ebuild: - Stable on amd64 wrt bug #338113 - -*sandbox-2.3-r1 (17 Aug 2010) - - 17 Aug 2010; Mike Frysinger <vapier@gentoo.org> +sandbox-2.3-r1.ebuild: - Fix sandbox.d config install #333131 by Hans Nieser. - -*sandbox-2.3 (17 Aug 2010) - - 17 Aug 2010; Mike Frysinger <vapier@gentoo.org> +sandbox-2.3.ebuild: - Version bump. Lots o fixes. - - 15 Aug 2010; Mike Frysinger <vapier@gentoo.org> sandbox-1.6-r2.ebuild, - sandbox-2.2.ebuild: - Manually decompress the lzma archive if host PM cannot #271543. - - 21 Nov 2009; Raúl Porcel <armin76@gentoo.org> sandbox-2.2.ebuild: - Mark 2.2 -sparc as it doesn't work very well, bug #293632 - -*sandbox-2.2 (26 Oct 2009) - - 26 Oct 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-2.2.ebuild: - Version bump (includes fixes for #202765 #288227 #288863 and SPARC - ptrace). - - 27 Sep 2009; Mike Frysinger <vapier@gentoo.org> sandbox-2.1.ebuild: - Fix new multilib code on non-multilib systems #286599 by Norman Yarvin. - - 25 Sep 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> - sandbox-2.1.ebuild: - Add multilib useflag for multilib building with ok from vapier - -*sandbox-2.1 (25 Aug 2009) - - 25 Aug 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-2.1.ebuild: - Version bump. - - 13 Aug 2009; Mike Frysinger <vapier@gentoo.org> - sandbox-1.2.18.1-r2.ebuild, sandbox-1.2.18.1-r3.ebuild, - sandbox-1.2.20_alpha2-r1.ebuild, sandbox-1.3.0.ebuild, - sandbox-1.3.1.ebuild, sandbox-1.3.2.ebuild, sandbox-1.3.3.ebuild, - sandbox-1.3.4.ebuild, sandbox-1.3.5.ebuild, sandbox-1.3.6.ebuild, - sandbox-1.3.7.ebuild, sandbox-1.3.8.ebuild, sandbox-1.3.9.ebuild, - sandbox-1.4.ebuild, sandbox-1.5.ebuild, sandbox-1.6.ebuild, - sandbox-1.6-r1.ebuild, sandbox-1.6-r2.ebuild, sandbox-1.7.ebuild, - sandbox-1.8.ebuild, sandbox-1.9.ebuild, sandbox-2.0.ebuild: - Drop duplicate eutils inherit #279607 by Justin Lecher. - -*sandbox-2.0 (04 Jun 2009) - - 04 Jun 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-2.0.ebuild: - Version bump to improve static tracing. - - 17 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> sandbox-1.7.ebuild, - sandbox-1.8.ebuild, sandbox-1.9.ebuild: - Remove x86-fbsd keyword for sandbox versions that are known incompatible - with FreeBSD. - - 26 Apr 2009; Brent Baude <ranger@gentoo.org> sandbox-1.6-r2.ebuild: - stable ppc, bug 265376 - - 20 Apr 2009; Raúl Porcel <armin76@gentoo.org> sandbox-1.6-r2.ebuild: - ia64 stable wrt #265376 - - 18 Apr 2009; Mike Frysinger <vapier@gentoo.org> sandbox-1.6-r2.ebuild, - sandbox-1.9.ebuild: - Force latest stable pax-utils as some people are lazy and dont upgrade - #265376 by Jerome Potts. - - 18 Apr 2009; Raúl Porcel <armin76@gentoo.org> sandbox-1.6-r2.ebuild: - arm/m68k/s390/sh stable wrt #265376 - - 15 Apr 2009; Markus Meier <maekke@gentoo.org> sandbox-1.6-r2.ebuild: - amd64/x86 stable, bug #265376 - - 13 Apr 2009; Jeroen Roovers <jer@gentoo.org> sandbox-1.6-r2.ebuild: - Stable for HPPA (bug #265376). - - 12 Apr 2009; Brent Baude <ranger@gentoo.org> sandbox-1.6-r2.ebuild: - stable ppc64, bug 265376 - - 12 Apr 2009; Tobias Klausmann <klausman@gentoo.org> sandbox-1.6-r2.ebuild: - Stable on alpha, bug #265376 - - 09 Apr 2009; Friedrich Oslage <bluebird@gentoo.org> sandbox-1.6-r2.ebuild: - Stable on sparc, bug #265376 - - 09 Apr 2009; Mike Frysinger <vapier@gentoo.org> sandbox-1.6-r2.ebuild, - sandbox-1.9.ebuild: - Make sure /etc/sandbox.d has 0755 perms #265376 by Friedrich Oslage. - -*sandbox-1.9 (09 Apr 2009) - - 09 Apr 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.9.ebuild: - Version bump. - -*sandbox-1.8 (05 Apr 2009) - - 05 Apr 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.8.ebuild: - Version bump to fix #263657 #264399 #264476 #264478 #264676. - -*sandbox-1.6-r2 (02 Apr 2009) - - 02 Apr 2009; Mike Frysinger <vapier@gentoo.org> - +files/sandbox-1.6-disable-pthread.patch, +sandbox-1.6-r2.ebuild: - Disable pthread locks to make 1.6 regression free #264476. - -*sandbox-1.6-r1 (31 Mar 2009) - - 31 Mar 2009; Mike Frysinger <vapier@gentoo.org> - +files/sandbox-1.6-disable-qa-static.patch, - +files/0001-libsandbox-handle-more-at-functions.patch, - +sandbox-1.6-r1.ebuild: - Backport a fix or two so we can stabilize this version. - -*sandbox-1.7 (31 Mar 2009) - - 31 Mar 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.7.ebuild: - Version bump. - -*sandbox-1.6 (12 Mar 2009) - - 12 Mar 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.6.ebuild: - Version bump. - -*sandbox-1.5 (11 Mar 2009) - - 11 Mar 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.5.ebuild: - Version bump. - -*sandbox-1.4 (08 Mar 2009) - - 08 Mar 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.4.ebuild: - Version bump. - -*sandbox-1.3.9 (05 Mar 2009) - - 05 Mar 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.9.ebuild: - Version bump. - -*sandbox-1.3.8 (20 Feb 2009) - - 20 Feb 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.8.ebuild: - Version bump. - -*sandbox-1.3.7 (14 Feb 2009) - - 14 Feb 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.7.ebuild: - Version bump - -*sandbox-1.3.6 (11 Feb 2009) - - 11 Feb 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.6.ebuild: - Version bump. - -*sandbox-1.3.5 (08 Feb 2009) - - 08 Feb 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.5.ebuild: - Version bump for regressions. - - 07 Feb 2009; Mike Frysinger <vapier@gentoo.org> - +files/0001-sandbox-fix-typo-in-struct-sandbox_info_t-decl.patch, - sandbox-1.3.4.ebuild: - Fix for hardened systems #258031. - -*sandbox-1.3.4 (07 Feb 2009) - - 07 Feb 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.4.ebuild: - Version bump. - - 29 Jan 2009; Javier Villavicencio <the_paya@gentoo.org> - sandbox-1.3.3.ebuild: - Keyword -sparc/x86-fbsd til next version bump, bug 256741. - -*sandbox-1.3.3 (28 Jan 2009) - - 28 Jan 2009; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.3.ebuild: - Version bump. - - 26 Dec 2008; Mike Frysinger <vapier@gentoo.org> sandbox-1.3.2.ebuild: - Add lzma-utils to DEPEND #252598 by Albert W. Hopkins. - -*sandbox-1.3.2 (23 Dec 2008) - - 23 Dec 2008; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.2.ebuild: - Fix some portability issues and more *at updates. - - 09 Dec 2008; Alexis Ballier <aballier@gentoo.org> sandbox-1.3.0.ebuild, - sandbox-1.3.1.ebuild: - Keyword -sparc/x86-fbsd versions that do not build there, lets keep with - the half broken but half working old version, bug #250366 - -*sandbox-1.3.1 (29 Nov 2008) - - 29 Nov 2008; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.1.ebuild: - Fix up #248254 and #248263. - -*sandbox-1.3.0 (16 Nov 2008) - - 16 Nov 2008; Mike Frysinger <vapier@gentoo.org> +sandbox-1.3.0.ebuild: - Version bump. - - 09 Nov 2008; Mike Frysinger <vapier@gentoo.org> - sandbox-1.2.20_alpha2-r1.ebuild: - Use EBUILD_DEATH_HOOKS #113780 by Petteri Räty. - - 09 Nov 2008; Mike Frysinger <vapier@gentoo.org> - +files/sandbox-1.2.20_alpha2-parallel.patch, - sandbox-1.2.20_alpha2-r1.ebuild: - Rewrite multilib handling and apply parallel build fix by Jose Luis Rivero - #190051 by David Pykee. - - 09 Nov 2008; Harald van Dijk <truedfx@gentoo.org> - sandbox-1.2.18.1-r3.ebuild, sandbox-1.2.20_alpha2-r1.ebuild: - Avoid bashism in configure script (#236868) - -*sandbox-1.2.18.1-r3 (27 Jun 2008) - - 27 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> - +files/sandbox-1.2.18.1-rtld-validation.patch, - +sandbox-1.2.18.1-r3.ebuild: - Fix for bug #206678. Variations of it have been running on infra boxes for - two months now, we seem to have traced it down to RTLD_NEXT not always - having a usable value under hardened on new libc. - -*sandbox-1.2.20_alpha2-r1 (04 Nov 2007) - - 04 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> - +sandbox-1.2.20_alpha2-r1.ebuild: - Fix the problem with GLIBC 2.7 even for the alpha version. - - 27 Oct 2007; Jose Luis Rivero <yoswink@gentoo.org> - sandbox-1.2.18.1-r2.ebuild: - Stable on alpha wrt #182361 - - 27 Oct 2007; Raúl Porcel <armin76@gentoo.org> sandbox-1.2.18.1-r2.ebuild: - ia64 stable wrt #182361 - - 26 Oct 2007; nixnut <nixnut@gentoo.org> sandbox-1.2.18.1-r2.ebuild: - Stable on ppc wrt bug 182361 - - 25 Oct 2007; Dawid Węgliński <cla@gentoo.org> - sandbox-1.2.18.1-r2.ebuild: - Stable on x86 (bug #182361) - - 25 Oct 2007; Daniel Gryniewicz <dang@gentoo.org> - sandbox-1.2.18.1-r2.ebuild: - Marked stable on amd64 for bug #182361 - - 25 Oct 2007; Markus Rothe <corsair@gentoo.org> sandbox-1.2.18.1-r2.ebuild: - Stable on ppc64; bug #182361 - - 25 Oct 2007; Christian Faulhammer <opfer@gentoo.org> - sandbox-1.2.18.1-r1.ebuild: - stable x86, bug 180985 - - 25 Oct 2007; Jeroen Roovers <jer@gentoo.org> sandbox-1.2.18.1-r2.ebuild: - Stable for SPARC (bug #182361). - - 25 Oct 2007; Jeroen Roovers <jer@gentoo.org> sandbox-1.2.18.1-r2.ebuild: - Stable for HPPA (bug #182361). Fixed quoting issues. - -*sandbox-1.2.18.1-r2 (23 Oct 2007) - - 23 Oct 2007; Mike Frysinger <vapier@gentoo.org> - +files/sandbox-1.2.18.1-open-cloexec.patch, +sandbox-1.2.18.1-r2.ebuild: - Work with new "e" fopen() flag in glibc-2.7 #196720. - -*sandbox-1.2.18.1-r1 (17 Oct 2007) - - 17 Oct 2007; Daniel Drake <dsd@gentoo.org> - +files/sandbox-1.2.18.1-open-normal-fail.patch, - +sandbox-1.2.18.1-r1.ebuild: - Allow open() on non-existent files to fail in the normal way without - violation. Fixes bug #135745. - - 15 Oct 2007; Markus Rothe <corsair@gentoo.org> sandbox-1.2.18.1.ebuild: - Stable on ppc64 - - 06 Jul 2007; Jose Luis Rivero <yoswink@gentoo.org> - sandbox-1.2.18.1.ebuild: - Stable on alpha. See bug #183673 - - 01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> sandbox-1.2.12.ebuild, - sandbox-1.2.16.ebuild, sandbox-1.2.17.ebuild, sandbox-1.2.18.ebuild, - sandbox-1.2.18.1.ebuild, sandbox-1.2.20_alpha1-r2.ebuild, - sandbox-1.2.20_alpha2.ebuild: - (QA) RESTRICT="multilib-pkg-force" -> EMULTILIB_PKG="true" - - 24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> sandbox-1.2.18.ebuild: - (QA) Don't use KEYWORDS="-*". bug #160519. - - 22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> - sandbox-1.2.20_alpha2.ebuild: - Add ~sparc-fbsd keyword. - - 04 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> - sandbox-1.2.20_alpha2.ebuild: - Add ~x86-fbsd keyword. - -*sandbox-1.2.20_alpha2 (11 Jul 2006) - - 11 Jul 2006; Martin Schlemmer <azarah@gentoo.org> - +sandbox-1.2.20_alpha2.ebuild: - New testing version. - - 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> sandbox-1.2.17.ebuild: - Marked stable on mips (even though it doesn't even work, best to keep up...) - -*sandbox-1.2.20_alpha1-r2 (08 Jul 2006) -*sandbox-1.2.20_alpha1-r1 (08 Jul 2006) - - 08 Jul 2006; Martin Schlemmer <azarah@gentoo.org> - +files/sandbox-1.2.20_alpha1-double-free.patch, - +sandbox-1.2.20_alpha1-r1.ebuild, +sandbox-1.2.20_alpha1-r2.ebuild: - More bugfixes. - -*sandbox-1.2.20_alpha1 (07 Jul 2006) - - 07 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +files/09sandbox, - +sandbox-1.2.20_alpha1.ebuild: - Testing release for feedback. Check package.mask for details. - - 20 May 2006; Bryan Østergaard <kloeri@gentoo.org> sandbox-1.2.17.ebuild: - Stable on ia64. - - 20 May 2006; Bryan Østergaard <kloeri@gentoo.org> sandbox-1.2.17.ebuild: - Stable on alpha. - -*sandbox-1.2.18.1 (19 May 2006) - - 19 May 2006; Martin Schlemmer <azarah@gentoo.org> - +sandbox-1.2.18.1.ebuild: - New bugfix release. - - 11 May 2006; Joshua Jackson <tsunam@gentoo.org> sandbox-1.2.17.ebuild: - stable x86; bug #132025 - - 10 May 2006; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.18.ebuild: - Mask 1.2.18 for now, as it have a double-free issue. - - 03 May 2006; Joseph Jezak <josejx@gentoo.org> sandbox-1.2.17.ebuild: - Marked ppc stable for bug #132025. - - 03 May 2006; Patrick McLean <chutzpah@gentoo.org> sandbox-1.2.17.ebuild: - Stable on amd64 (bug #132025) - - 03 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.17.ebuild: - Stable on hppa wrt #132025 - -*sandbox-1.2.18 (03 May 2006) - - 03 May 2006; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.18.ebuild: - New release. - - 03 May 2006; Markus Rothe <corsair@gentoo.org> sandbox-1.2.17.ebuild: - Stable on ppc64; bug #132025 - - 02 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.17.ebuild: - Stable on sparc wrt #132025 - - 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> sandbox-1.2.12.ebuild: - Marked stable on mips (doesn't actually work well, but we disable it in - profiles). - - 06 Feb 2006; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.17.ebuild: - Fix docs installation. - -*sandbox-1.2.17 (05 Dec 2005) - - 05 Dec 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.17.ebuild: - New release. - -*sandbox-1.2.16 (02 Dec 2005) - - 02 Dec 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.16.ebuild: - New release. - -*sandbox-1.2.15 (01 Dec 2005) - - 01 Dec 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.15.ebuild: - New release. - -*sandbox-1.2.14 (28 Nov 2005) - - 28 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.14.ebuild: - New release. - - 14 Nov 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.13.ebuild: - Simplify multilib building logic. Other cleanups. - - 13 Oct 2005; Martin Schlemmer <azarah@gentoo.org> sandbox-1.2.12.ebuild, - sandbox-1.2.13.ebuild: - Add workaround for bug #109036. - - 07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> - sandbox-1.2.9.ebuild, sandbox-1.2.10.ebuild, sandbox-1.2.11.ebuild, - sandbox-1.2.12.ebuild, sandbox-1.2.13.ebuild: - Some changes for amd64 2006.0. - -*sandbox-1.2.13 (12 Sep 2005) - - 12 Sep 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.13.ebuild: - New release. - - 30 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> sandbox-1.2.12.ebuild: - stable on alpha wrt bug #101433 - - 16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.12.ebuild: - Stable on sparc wrt #101433 - - 15 Aug 2005; Danny van Dyk <kugelfang@gentoo.org> sandbox-1.2.12.ebuild: - Marked stable on amd64. - - 15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> sandbox-1.2.12.ebuild: - Stable on ppc and hppa. - - 15 Aug 2005; Ian Leitch <port001@gentoo.org> sandbox-1.2.12.ebuild: - Stable on x86, #101433 - - 15 Aug 2005; Markus Rothe <corsair@gentoo.org> sandbox-1.2.12.ebuild: - Stable on ppc64 (bug #101433) - -*sandbox-1.2.12 (05 Aug 2005) - - 05 Aug 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.12.ebuild: - New release. - - 23 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> sandbox-1.2.11.ebuild: - Stable on sh. - - 22 Jul 2005; Jason Stubbs <jstubbs@gentoo.org> sandbox-1.2.11.ebuild: - Stable on mips per hardave's request. #96782 - - 21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> sandbox-1.2.11.ebuild: - Stable on hppa. bug #96782 - - 21 Jul 2005; Aron Griffis <agriffis@gentoo.org> sandbox-1.2.11.ebuild: - stable on alpha - - 21 Jul 2005; Aron Griffis <agriffis@gentoo.org> sandbox-1.2.11.ebuild: - stable on ia64 - - 21 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> sandbox-1.2.11.ebuild: - Marking stable on x86 for bug #96782. - - 21 Jul 2005; Joseph Jezak <josejx@gentoo.org> sandbox-1.2.11.ebuild: - Marked ppc stable for bug #96782. - - 20 Jul 2005; Markus Rothe <corsair@gentoo.org> sandbox-1.2.11.ebuild: - Stable on ppc64 (bug #96782) - - 20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.11.ebuild: - Stable on sparc wrt #96782 - - 20 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> sandbox-1.2.11.ebuild: - Marked stable on amd64. - - 18 Jul 2005; Guy Martin <gmsoft@gentoo.org> sandbox-1.2.10.ebuild: - Stable on hppa. - - 15 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> sandbox-1.2.10.ebuild: - Stable on alpha + ia64, bug 99019. - - 14 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> sandbox-1.2.10.ebuild: - Stable on sparc wrt #99019 - - 14 Jul 2005; Joseph Jezak <josejx@gentoo.org> sandbox-1.2.10.ebuild: - Marked ppc stable for bug #99019. - - 15 Jul 2005; Jason Stubbs <jstubbs@gentoo.org> sandbox-1.2.9.ebuild, - sandbox-1.2.10.ebuild, sandbox-1.2.11.ebuild: - Removed ppc-macos from keywords as sandbox does not work there yet. - -*sandbox-1.2.11 (14 Jul 2005) - - 14 Jul 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.11.ebuild: - New release. - - 14 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> - sandbox-1.2.10.ebuild: - Stable amd64. - - 12 Jul 2005; Markus Rothe <corsair@gentoo.org> sandbox-1.2.10.ebuild: - Stable on ppc64 - - 10 Jul 2005; Martin Schlemmer <azarah@gentoo.org> - +files/sandbox-1.2.9-uclibc-getcwd.patch, - +files/sandbox-1.2.10-uclibc-getcwd.patch, sandbox-1.2.9.ebuild, - sandbox-1.2.10.ebuild: - Add some fixes to the getcwd implementation, bug #98419. - - 05 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> - sandbox-1.2.9.ebuild: - Stable amd64 for 2005.1 - -*sandbox-1.2.10 (03 Jul 2005) - - 03 Jul 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.10.ebuild: - Update version. - -*sandbox-1.2.9 (09 Jun 2005) - - 09 Jun 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.9.ebuild: - Update version. - -*sandbox-1.2.8 (13 May 2005) - - 13 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.8.ebuild: - Cleanups and hopefully finally kill bug #91541. Fix bug #92478. - -*sandbox-1.2.7 (12 May 2005) - - 12 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.7.ebuild: - Lots of cleanups and fixes - see ChangeLog in /usr/share/doc. - -*sandbox-1.2.6 (10 May 2005) - - 10 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.6.ebuild: - Workaround for tsocks incompatability, bug #91541. - -*sandbox-1.2.5-r2 (09 May 2005) - - 09 May 2005; Jeremy Huddleston <eradicator@gentoo.org> - +sandbox-1.2.5-r2.ebuild: - On some versions of portage, CFLAGS_* do not survive across ebuild.sh - stages, so we must ensure the multilib setup always gets rerun for each - stage. - -*sandbox-1.2.5-r1 (06 May 2005) - - 06 May 2005; Jeremy Huddleston <eradicator@gentoo.org> - +sandbox-1.2.5-r1.ebuild: - Revbump to fix problems with amd64 2004.3's multilib. Cleaned up multilib - handling in general. 2004.3 amd64 users should have working 32bit sandbox - again. - - 04 May 2005; Mike Frysinger <vapier@gentoo.org> sandbox-1.2.5.ebuild: - Fix multilib building on amd64/2004.3 profiles. - -*sandbox-1.2.5 (04 May 2005) - - 04 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.5.ebuild: - General fixes. Fix for bug #91431. - -*sandbox-1.2.4 (03 May 2005) - - 03 May 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.4.ebuild: - Some speedups (bug #91040) and uclibc fixes. - -*sandbox-1.2.3 (29 Apr 2005) - - 29 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.3.ebuild: - Fixup libc detection. Fix bug or two. - -*sandbox-1.2.2 (28 Apr 2005) - - 28 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.2.ebuild: - Bug fixes for bug #90592. - -*sandbox-1.2.1-r3 (24 Apr 2005) - - 24 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org> - +sandbox-1.2.1-r3.ebuild: - Fix multilib. - -*sandbox-1.2.1 (24 Apr 2005) - 24 Apr 2005; Brian Harring <ferringb@gentoo.org> +sandbox-1.2.1-r2.ebuild: - Amd64 fix for 90135. - -*sandbox-1.2.1 (24 Apr 2005) - - 24 Apr 2005; Jason Stubbs <jstubbs@gentoo.org> +sandbox-1.2.1-r1.ebuild: - Added missing check_multilib function. - -*sandbox-1.2.1 (23 Apr 2005) - - 23 Apr 2005; Martin Schlemmer <azarah@gentoo.org> +sandbox-1.2.1.ebuild: - Fix for bug #90153. - -*sandbox-1.2 (Apr 23 2005) - - 23 Apr 2005; Brian Harring <ferringb@gentoo.org>; sandbox-1.2.ebuild - Initial import of cvs head sandbox code. Multilib portion of it - could stand testing. diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest deleted file mode 100644 index 5b23996..0000000 --- a/sys-apps/sandbox/Manifest +++ /dev/null @@ -1,33 +0,0 @@ -AUX 0001-libsandbox-handle-more-at-functions.patch 1473 SHA256 7681e867bb4dea26d165f9a066dca798519e2fd57b49c7b31c0c2fc254037523 SHA512 ec3655a6fd12347ffd454648428be16a02394f6dfd592075753bb794771a15824675f612ed22206b0e14665706aa24405f8d9aa94a099238344c1525803de72a WHIRLPOOL dc4918171f8501cdab072cb8dc953056bfcb24c1b4f78e683fb01902a7029d1aed4fd47f42e6e0d493bceacbed99535c2ef9bf4c4df57fdb6d789821b1479888 -AUX 09sandbox 37 SHA256 73e9e9d12ba54f1c649813ec86107924050528852c890a8ba1e2853796781bbe SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a WHIRLPOOL 80d55a34d3faf3314f2b9de2200d4b46a800128514be9e30eb59e5f03fb7a0a5197a9e5b5ab33d6b68d35bf83c86a1bd7ba734a33ccd382fe0af3b2c2a11d0bd -AUX sandbox-1.2.17-prefix.patch 8201 SHA256 344fe4dd9f217aba3216f9564cc96d2ff5986158397c1e0e9921b41f3daa6a83 SHA512 ef5fbd258b804a108d06557432f4ae0b7f629f2f82f2a57fb20b0c75112744294c8428c9b7f9cb011b0e8275829eca2578072dbd50a0ae379bb2f094569e2052 WHIRLPOOL 3ae92b2453d7faf87d52027777b1f226dfa7ca1aab2b766dae9e177b9c8c85026461d0ae6e9841342aa36adee1af68ca029b1ae1add73620d6af4512b4978a26 -AUX sandbox-1.2.18.1-open-cloexec.patch 492 SHA256 922cf7277af89bbfa03633f515beeb309b4bd53e9856504f714f7833821b54cf SHA512 f88bacd0a65b10fa9f08348e7f81215e307aac57deb702178c7f0a9ebc7b98d1211ebbfc00b987d0b876d2a24eace4379314c734115bfbc995331535c80b8b50 WHIRLPOOL 152c687a774f05111f8761440d509ea58bac972da6820d9de922e19c7707e9f3a7171f1d690686a9f1eedfdca5400466cba9cc9e934f47ee4d1947c6c0d3af34 -AUX sandbox-1.2.18.1-open-normal-fail.patch 3144 SHA256 9c3b6c4c5595b95f6a00fa9e94f72bbcb41cd5ba689a8a29ebf61c6024e73449 SHA512 3ac8d20efddf5d14bcef0f322e7b8cee31ddfbf68b649965a78c2e17c6535f270be7fe01e2b83379fa2a85455b9b37bd9750118fefe132be61fea52120252d9c WHIRLPOOL 318ccbd7c66ff4a7a4833371678f4567f2eea5a8aaa6f882d38bda4c566976e231f31520a780df4bcd2671d5e3cd612e4ab901f5ae96f446efeb9426a030c776 -AUX sandbox-1.2.18.1-rtld-validation.patch 1415 SHA256 821c22ce76c4a75ad4e5bde186744811bbf73de341c16c5890edfd8b20c95cf5 SHA512 54aee3a194b02c32bbd89caddddde0923494ffb47ddfeabb1ca42635946b7dc4b187f09c30a86cd052651dad1618e7e6cc19e715291e6eaf1a64e70c48f053ba WHIRLPOOL a71e9d0fa136a34c59e5095cf07cde56f70319977196f5c74482153dd4a72a9a443bee688dec77c9caa5ffafed4fd74e4ee2770d91d9936c8bb47c844225a7ee -AUX sandbox-1.2.20_alpha2-parallel.patch 259 SHA256 e14bf149853ae5d276a852b2aac66d0ec53ad9b0fc5babda61e112ca59a9b862 SHA512 9b7a3885d74b247502792277abfc342a5cfcc52358a2263b9f00852f7a1fb96708cac6800206900c8aa36d81a770b2b5576ef6390c39caed5588dd2faa318418 WHIRLPOOL c8e1365c70d4e56a5c6ca24ef1b5d3be41c1325b65afafb0a167704c28342271bc6f7f4a2051a59bdaf7b124bdaf3269a32f0b594a9b6e0d581bee9bd347515c -AUX sandbox-1.6-disable-pthread.patch 959 SHA256 c4fefddab05d440b3b1c2df766c5b2abd7c543cd2aa4cf1e61c0d3c3dd905f0c SHA512 3cbb244f7c8e77030dd2194770a2dcae7b052c302d9b4cb0549465ebfb18f719d93daefbd6d1cdee2a630fc077b04e83c5b7c7f72b667adb6b8e322dee6d7056 WHIRLPOOL 1c603db0b7d810715dc5461740103ac29061e1eace2459bfb59ed576f45f81aadb9883a1afedf0ddde51bcda56b23abd26936426fd2a6ae3becb7e0c6054fc9e -AUX sandbox-1.6-disable-qa-static.patch 332 SHA256 060afa33dcfb6836676dc0febd5bc272b66b55e3753f739b56664e9ebce0eb20 SHA512 8839d4e279be41f1ee118b897c7eae8fd4058e4b7ecc1b5872450c177e09b5eefe569964efc294bd6f3e4ea92a3b4ba9840852d2be8db14810cd4578640ca6c4 WHIRLPOOL 6730b53afc16033911527492b0bf14a35f0e4b0b7cf3d42b1af299e9caa4a82f5e424e514aec81720da53a497cbc31b4f3928fc85dc8b04f979b726dce5ff2d8 -AUX sandbox-1.9-setoptions.patch 634 SHA256 4d09691f682d232add061eeb4de61eadbf1586fd1b8f3c2351bbb08766d117a0 SHA512 4880541186d24dbf216601293f8c41e1bba1032f454f4e1bf8bc2e352dde0520e025f178b651e600a6ce4ce2b2afaa3a7741f8de7695e27fa09e14c07da95809 WHIRLPOOL 4e050fa85f4b7f8192df984849522ef267ad93a6e53bc0981ce46faa1a835924cea6c9682c9b0ec9e77c44072b1df679d7c0c807e6dc5b848a0a10dfe22a6195 -AUX sandbox-2.0-prefix.patch 1716 SHA256 29724ac6605bc6404d68e28a81d0303b0572d1990d8b37ca01b665b5b66f1ad2 SHA512 8b47e5ecc0367f25fa539be0ebe09844b2fb7e643ea21b6134b9c4cfe7c0b2b8f00c15da82e19cbdc7a2b98f48e92fe967d18e2579700738f01d778f99818dc8 WHIRLPOOL 3228316ffc48001011ed29862df9dd88724a63edeee29eb49a5ebbf28479ea38fb9258298fd2a413ad0c7cbc6e2f8dc69ad046ad386390eaa8391b4f06333b79 -AUX sandbox-2.0-setoptions.patch 517 SHA256 ce365c6ab54ab60ac539728b3419e28499512a2e3ced5de3bf0455c2c35d93d5 SHA512 5b80bcb3ffcf3cf105780b72a86af8260784e544dd71ff88b5e5c85d5f95558db64cc86454b9371b2069f2e644b3841fa0ad6df967eeb42ef168851a4690cf6e WHIRLPOOL c1f70a21f901aa1089455925cf0c434660506a5be8f952837428bb15fc91fb31b2d0b3cc83d78024001c2b8198b17fc23539485c4060715ea523c6cb4872a5ee -AUX sandbox-2.2-prefix.patch 881 SHA256 fa51c7876c7a95ff3a0fda5f84563d83720e011ec93fc8b5860a92a90f725afa SHA512 72095e1237a19918255aa94898e3871248d20df9f6d0fef22ecb29036b65dd508c23cb8d716d0afc1627c79a3afa09d1022b20ca8d22636229df9d791d5df6fc WHIRLPOOL dd5555c75e6b30c20f29c47ed267fd99b7faf924e0afdd8b5652008fa7ebdeeb298edc88067a29e596f8e6d2070768bc048813bb38dc410ddea4281ca9d49275 -AUX sandbox-2.6-check-empty-paths-at.patch 7454 SHA256 a48759a4d3e9a70713473b6fad59bdd750b5cd37e7d632c786205ff20004ae2c SHA512 5eba7915dedf57f44c37881e9c6b48db8733d1493779a33127d08bb9ea77056d788ec9ace72c13eb101f42f01c95309c7cebca6c76212a8c99a8655372c0b7d7 WHIRLPOOL 46eb3a8ef8f22030cd793f3b16adc190b5750019c0df83e161c6918f08555a8ad890c1425b03cbf7e53ebcd34a07a9dd9b594d0c0fe31834656ffce3d58fa284 -AUX sandbox-2.6-desktop.patch 875 SHA256 2eecf67790aeac210f9aa899a86f7664776ed65d9b55159e1b359162dfb9ff74 SHA512 b72ec7f414d19bf513dfb1aea10523fa5dc07a1375d8f08f664d204b64b23c891a79ca14987528c595936f441e1f595b366aabbc57313667c7639d73d089ed9a WHIRLPOOL 7f787b8be9b5712eb2b2a0cd2ff825df1045ebf1cc4e73a50f610e620d30752045690a5c28835465d0ab0c3c4a9eaf8b92a5c123cd741ad69dfedb31aa457fa0 -AUX sandbox-2.6-log-var.patch 2039 SHA256 f464a29cdd9de0c510277310f4febc8f96515ff2ff03fc92df1c75b9cbd75619 SHA512 cf6f900b4078eff5870b63b2bc7c81c5b00488e030d7e9ce3007693e9d1339ac6201ddacfaff552c6c9b99b6d32383229133c80190404b7e4fde06ad376b2050 WHIRLPOOL db99737a6567788194f7b37b12b92fcfb4c263df40f40aef9e0a3ef2b6a1523331313b791fffa2b26775b646795364ab1db1711eb4329cda3337df27aebfeffa -AUX sandbox-2.6-open-nofollow.patch 2027 SHA256 c8816ae4e1991f9941abd43ec4bfdbf4e99cf36ee90694f77ab88754c53785ce SHA512 dd5222f32a40def38c9719363a24c48d5b112e3560b44c5f32afc3daa0614fe9bc5cb68ca8ac69032cc8d6299f09b25d4d7c72e16892188b42768ffb28c19f07 WHIRLPOOL 03cb5fb9df04a8d7f92855c292a6c431d01d330fecae198f2c4b95d824454f10ce1ad66db1a9d54d1bef5f74989cf6debb2d98de28ee0c2c6a09c1a0752b5519 -AUX sandbox-2.6-prefix.patch 2945 SHA256 4d2d241a0e8a7f98d8bf9f2fa546b45ce3242155eb0be34397e1930452d29f6f SHA512 d0ec7ce9d3d0ec76691e027d769b355608bf8ef51b395338f41bbb22d46c4cc73516e22d1b9c28b336b5a1f6369b438599032cc8dbc3cfea66c7e77fdfdff47c WHIRLPOOL 388974a38cfbd382f69a209ec124021b669bf6ed8c85b1e2227bc89345e84f1c02de8105d93ecca2a0076dc10138633915fd58c40e192c53277c53a5e49eb54b -AUX sandbox-2.6-static-close-fd.patch 2945 SHA256 807eb4dc1ba6543c94a90a9a53bb89f42079ea20ed7c196f82d65f280e5de96a SHA512 e2f57c4d80816241f3ba4828c2b27c67d1d604b14b2d575888a978e5c4e8e47e60e3a609d81e59c615bc5b7cee6194cc362e255ae8508f632862a35180c30de8 WHIRLPOOL e08f60227fe954894d3a3a01297e9988f4d7722ea75ffbd2b0f3971d38c8ce00af230fcaecb1f53243a868d54f48bb680e2d547bbeb2ee3e5a11f8942d2084fd -AUX sandbox-2.6-trace-hppa.patch 850 SHA256 20688b2f33162f95af4af5e3c7d3700f2e7776e454b785ac1398f0870f84efa9 SHA512 fb7bf2202f960e952edc1e52fe4b6b085042158223d96b9baa899e871abcdef711ede3122c971120f55f71cc1aad71496a6079222dbaaa6c14b0c6f7ea182454 WHIRLPOOL 80f7fb529b912d19d81b9d71ee4a648db7b217583f2e8f2054cc666839030ea7d0112d69d52a2bf35c4d3549ffbd81dbd0cd39d5993bfabbb43bcb6a4455ade4 -DIST sandbox-1.6.tar.lzma 307014 SHA256 52cfd286da3d5d51f3b6e012e409e931b21e32b4f2f16ba5677e46328680f4f4 SHA512 f470599a67443fa107612fef1cc73b64b3146003ae21bb5ae5abd852c4c37aec93ac09be646fda9d55d4c3aeef0cf28a42fa675f2acbb53c1d903e400538ba4c WHIRLPOOL 7c7fbe57cc831d0eb7853476e264a85bb8113620948e761563a872d3d55fd3c0ff063332397199001ea9dcb8258f348b827f337b876b2a26f727f10abbc8f712 -DIST sandbox-2.3.tar.xz 344260 SHA256 8670f7508453c2fd300ca29ad2eb457691c3df01c4c22fa27d4a7c880fd291d5 SHA512 06ddaa6dc0822474c263650e95284af6cb69c60c9443b5caaf95af8140283f937d5594849064847fe3a4ad89b29b6ef6d6e909a9b85bb5d7fcf8b427d0e9c7e4 WHIRLPOOL 5d3f45a0bbb1aeffb8c83f8978bea65764aa438a5abcb50c66b5f66232d972bde84013694f6806fcc0026cd6d37420c69655d66ec5984a1c6f71a68dcfc95d11 -DIST sandbox-2.4.tar.xz 344664 SHA256 450599cb3052296d42f81a04dbbda82d220415fc2d16f5dc6e26b042d580fd3e SHA512 c0f8b789bcabd48e03a20a97c9daa82c48f264d7641ecfa51dff7a2d2c34be398cf1db6235eb0211bf0fa78b07bd6e633e06bc102904bf9dd8a95f9fde1ca615 WHIRLPOOL 22f0f55f6e638275781ab5afa29b1a7f5e7f3335a3d2ff37d9fcce0bf9284b271bf1d69b98bcd4b06fdb9ff1528d044f9fb111a58c2a1a5ce33cbe28c0cb869d -DIST sandbox-2.5.tar.xz 355680 SHA256 c0e98767fb70750d79591a6d08f81d5c2f13ce783bf94bd90677022e9103878a SHA512 7b870295bb78c1da5550b650a3983d93e503935a8e8452a29a5c6310cc2c2d569a898ea1534e2c670b4a3e5607504fac55f69da6878e0adc9c2c65a5476b4fb0 WHIRLPOOL 887d36638111b09d77674002c07ebad84c24bc4f645d9fb78e180a6c6e7407eb3fb6857877bc152e0cefb676f01df60b20857b8487ce28ff3e4438aef744fe53 -DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03 -EBUILD sandbox-1.6-r2.ebuild 2672 SHA256 a7a497c9ce58cb2d2162af3f9e1d1d757c1a4c6d57b4d5377fb87c589f2d3036 SHA512 0db86a82a84316495ef22ab9955789af2f9799948ea77c07808464cf7b7cd77140f66a937235f9a784472f541681fcbeb072105a5f0a53c493770e544ae0c511 WHIRLPOOL d1c4d10b1531b4ddb9a8f723014a3e58b1047c6aa981f806416fc95800c7adf00bf65588e4d37755590a8ce97d8f056fe86511a2bb32ad55cd79340352e713a7 -EBUILD sandbox-2.3-r1.ebuild 2713 SHA256 58eb10e050f4321b703d71cfdd8d83de61ab76e748046dde724e64ca21dc253f SHA512 2b054563f3bfa7998460af78e04c8a6ba2adf56180163dbd6af54d205bc25e37d02691c745a829a4470f1246e72522e7dd15c0c27fcae6948323dc620abea5c3 WHIRLPOOL ba54a9573f25e15d57a80f01c61ffe8aabb8a5f52183f85ccdf82d6c8732a6bb2c1985773d6cf4833284260060478c8e28d7d29149d3385520712b6140196590 -EBUILD sandbox-2.4.ebuild 2639 SHA256 d5b852481f07dbbf5b1f5f4761a4c16137aea8f4d8f047c27edd898cc713272e SHA512 5069787fae2e983e2af0155799792b1b6f0911e48c8a89d21fea6ae26a0cf1d08f54d34b2e3a8a0476d88f71aebc5af9da4c3151d07120c0503ffae7da9f12ac WHIRLPOOL b81f145e951fe19665eaab48450fb1fba0a97182f8a97c476048f0ee0df82ff0f36f99fa97101b9f360c66a0698c97a0b837ea855dadc07bce43e1e0f1a9f050 -EBUILD sandbox-2.5.ebuild 2880 SHA256 93a6a2d280b6aa7de27b051b3e656ffff0b903ed05e912f9c741b51083efd9be SHA512 960f9412e5c1fcc0debd53f4153b0bd001748442455a6e97e5880159d6ee7defa86baa01c8fa4f5978fccb4a60a0442d3c6e811bc91336ca1c0c8bae0d200250 WHIRLPOOL bc2787c9284651285f0c0b2458e644ccac6f34274227dd8eb4fc9246acd146f1430216b05963bffc007e3909703609ed4e6f40b45e56087ff3e7e40b42550507 -EBUILD sandbox-2.6-r1.ebuild 3140 SHA256 cfa830df1301600a9c35f4beca7af5ae8d4cf0a0d0e0e9dda22c3f7b85bf22c5 SHA512 f9947cb97329bb0fe567768e5e3d7617df0f0572c1edf0c230bb1dd6562f5d9850ea3677297fe0eca5ed9bba62dc9a49967b43140ce7d28928feb65ea268468b WHIRLPOOL a9ae16dffbef562e054cc01bb2cfda54dd59a7efa628d511332674413f0e2070333719781c8fe60f09eecce1b7ffccbb83ca44db9fffc7ea402dd45b87b6adec -EBUILD sandbox-2.6.ebuild 2970 SHA256 2afd4648e2cc4307bed2ea5c7e2d931bfd43f7f7701d42aa79b4e8f34ae6fe4a SHA512 44494b344830b87261f87a7a5c61fcaa2d230598a620aff1b846e59ecc1b9f25ad5a6430ec3710d9a4ddefa150428bda9d8f24ef31199d4007034402fd8cd658 WHIRLPOOL 9d6f02c395c28aeb520293f38079e4015d6750200196bebac894f6088537b8532e2655bfd8ac3426a5bedd02857964cfef8157f2310340ce90643c66e3fac36c -MISC ChangeLog 22966 SHA256 2b5ee0df6e4d4a7267e9b90acf607c3e21f24491044b930e2fc31d6c58683f3e SHA512 32acc2c923d0af305e379ef25c7229ffb2432da0024d6b2f24b7ad017cf9a93eb13d9d776f61058c070a77ed0436fd3c12f90be2a833d739c35a589ce87e9983 WHIRLPOOL 33bac5ef0161ece31c9fa5333142e70ce44eee0fde65468e7a03e0829eb7255350f4bced36eb4756e5bc12dde46c6b44170a7a4eae1bd90e042ede9b9fee2906 -MISC metadata.xml 316 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b SHA512 2b4ddea0bb5a40cac834a09b89624049b8561a4a4f648b4d5072c413d4eca78b5cc24859664fa746be36c8b60188e88f2ae38c2c5af30d91dc6273c0f85de278 WHIRLPOOL 64ed27fc7abb1b3b82621f6bb91f03d0070933d0423f9d323ac803354fc6acf2182df1dd85a083fa047d63561a5e92d44287ef4935a11a733244d4393edf8f6f diff --git a/sys-apps/sandbox/files/0001-libsandbox-handle-more-at-functions.patch b/sys-apps/sandbox/files/0001-libsandbox-handle-more-at-functions.patch deleted file mode 100644 index 09462b7..0000000 --- a/sys-apps/sandbox/files/0001-libsandbox-handle-more-at-functions.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 25425878243c5ca1ff21e6f479e585c60b943930 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 30 Mar 2009 19:56:29 -0400 -Subject: [PATCH] libsandbox: handle more *at functions - -Add some more *at functions to the main checking code. - -URL: http://bugs.gentoo.org/264320 -Signed-off-by: Mike Frysinger <vapier@gentoo.org> -Reported-by: Harald van Dijk <truedfx@gentoo.org> ---- - libsandbox/libsandbox.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c -index 88248af..c3f0b55 100644 ---- a/libsandbox/libsandbox.c -+++ b/libsandbox/libsandbox.c -@@ -681,15 +681,20 @@ static int check_access(sbcontext_t *sbcontext, int sb_nr, const char *func, - sb_nr == SB_NR_CREAT || - sb_nr == SB_NR_CREAT64 || - sb_nr == SB_NR_MKDIR || -+ sb_nr == SB_NR_MKDIRAT || - sb_nr == SB_NR_MKNOD || - sb_nr == SB_NR_MKNODAT || - sb_nr == SB_NR__XMKNOD || - sb_nr == SB_NR___XMKNOD || - sb_nr == SB_NR___XMKNODAT || - sb_nr == SB_NR_MKFIFO || -+ sb_nr == SB_NR_MKFIFOAT || - sb_nr == SB_NR_LINK || -+ sb_nr == SB_NR_LINKAT || - sb_nr == SB_NR_SYMLINK || -+ sb_nr == SB_NR_SYMLINKAT || - sb_nr == SB_NR_RENAME || -+ sb_nr == SB_NR_RENAMEAT || - sb_nr == SB_NR_LUTIMES || - sb_nr == SB_NR_UTIMENSAT || - sb_nr == SB_NR_UTIME || --- -1.6.2 - diff --git a/sys-apps/sandbox/files/09sandbox b/sys-apps/sandbox/files/09sandbox deleted file mode 100644 index 9181eb0..0000000 --- a/sys-apps/sandbox/files/09sandbox +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT_MASK="/etc/sandbox.d" diff --git a/sys-apps/sandbox/files/sandbox-1.2.17-prefix.patch b/sys-apps/sandbox/files/sandbox-1.2.17-prefix.patch deleted file mode 100644 index 9834855..0000000 --- a/sys-apps/sandbox/files/sandbox-1.2.17-prefix.patch +++ /dev/null @@ -1,209 +0,0 @@ -* Michael Haubenwallner <michael.haubenwallner@salomon.at> - Prefix awareness for sandbox - -diff -ruN sandbox-1.2.17.orig/configure.ac sandbox-1.2.17/configure.ac ---- sandbox-1.2.17.orig/configure.ac 2005-12-05 15:03:35.000000000 +0100 -+++ sandbox-1.2.17/configure.ac 2006-07-27 16:14:28.000000000 +0200 -@@ -156,5 +156,7 @@ - Makefile - scripts/Makefile - data/Makefile -+ data/sandbox.bashrc -+ data/sandbox.profile - src/Makefile - ]) -diff -ruN sandbox-1.2.17.orig/data/sandbox.bashrc sandbox-1.2.17/data/sandbox.bashrc ---- sandbox-1.2.17.orig/data/sandbox.bashrc 2005-12-01 00:14:28.000000000 +0100 -+++ sandbox-1.2.17/data/sandbox.bashrc 1970-01-01 01:00:00.000000000 +0100 -@@ -1,18 +0,0 @@ --# Copyright (C) 2001 Geert Bevin, Uwyn, http://www.uwyn.com --# Distributed under the terms of the GNU General Public License, v2 or later --# Author : Geert Bevin <gbevin@uwyn.com> --# $Header$ --source /etc/profile -- --if [[ -n ${LD_PRELOAD} && ${LD_PRELOAD} != *$SANDBOX_LIB* ]] ; then -- export LD_PRELOAD="${SANDBOX_LIB} ${LD_PRELOAD}" --elif [[ -z ${LD_PRELOAD} ]] ; then -- export LD_PRELOAD="${SANDBOX_LIB}" --fi -- --export BASH_ENV="${SANDBOX_BASHRC}" -- --alias make="make LD_PRELOAD=${LD_PRELOAD}" --alias su="su -c '/bin/bash -rcfile ${SANDBOX_BASHRC}'" -- --declare -r SANDBOX_ACTIVE -diff -ruN sandbox-1.2.17.orig/data/sandbox.bashrc.in sandbox-1.2.17/data/sandbox.bashrc.in ---- sandbox-1.2.17.orig/data/sandbox.bashrc.in 1970-01-01 01:00:00.000000000 +0100 -+++ sandbox-1.2.17/data/sandbox.bashrc.in 2006-07-27 16:13:40.000000000 +0200 -@@ -0,0 +1,17 @@ -+# Copyright (C) 2001 Geert Bevin, Uwyn, http://www.uwyn.com -+# Distributed under the terms of the GNU General Public License, v2 or later -+# Author : Geert Bevin <gbevin@uwyn.com> -+# $Header$ -+ -+if [[ -n ${LD_PRELOAD} && ${LD_PRELOAD} != *$SANDBOX_LIB* ]] ; then -+ export LD_PRELOAD="${SANDBOX_LIB} ${LD_PRELOAD}" -+elif [[ -z ${LD_PRELOAD} ]] ; then -+ export LD_PRELOAD="${SANDBOX_LIB}" -+fi -+ -+export BASH_ENV="${SANDBOX_BASHRC}" -+ -+alias make="make LD_PRELOAD=${LD_PRELOAD}" -+alias su="su -c '@CU_BASH@ -rcfile ${SANDBOX_PROFILE}'" -+ -+declare -r SANDBOX_ACTIVE -diff -ruN sandbox-1.2.17.orig/data/sandbox.profile.in sandbox-1.2.17/data/sandbox.profile.in ---- sandbox-1.2.17.orig/data/sandbox.profile.in 1970-01-01 01:00:00.000000000 +0100 -+++ sandbox-1.2.17/data/sandbox.profile.in 2006-07-27 16:12:05.000000000 +0200 -@@ -0,0 +1,7 @@ -+# Copyright (C) 2001 Michael Haubenwallner, Salomon Automation, http://www.salomon.at -+# Distributed under the terms of the GNU General Public License, v2 or later -+# Author : Michael Haubenwallner <michael.haubenwallner@salomon.at> -+# $Header$ -+ -+source @sysconfdir@/profile -+source "${SANDBOX_BASHRC}" -diff -ruN sandbox-1.2.17.orig/src/Makefile.am sandbox-1.2.17/src/Makefile.am ---- sandbox-1.2.17.orig/src/Makefile.am 2005-12-05 14:16:52.000000000 +0100 -+++ sandbox-1.2.17/src/Makefile.am 2006-07-27 16:12:05.000000000 +0200 -@@ -7,6 +7,7 @@ - -DPIC -fPIC -D_REENTRANT \ - -DLIBSANDBOX_PATH=\"$(libdir)\" \ - -DSANDBOX_BASHRC_PATH=\"$(pkgdatadir)\" \ -+ -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -I$(top_srcdir) -Wall - - LOCAL_INCLUDES = $(top_srcdir)/localdecls.h -diff -ruN sandbox-1.2.17.orig/src/sandbox.c sandbox-1.2.17/src/sandbox.c ---- sandbox-1.2.17.orig/src/sandbox.c 2005-12-05 14:15:45.000000000 +0100 -+++ sandbox-1.2.17/src/sandbox.c 2006-07-27 16:12:05.000000000 +0200 -@@ -33,6 +33,7 @@ - char sandbox_debug_log[SB_PATH_MAX]; - char sandbox_lib[SB_PATH_MAX]; - char sandbox_rc[SB_PATH_MAX]; -+ char sandbox_profile[SB_PATH_MAX]; - char work_dir[SB_PATH_MAX]; - char var_tmp_dir[SB_PATH_MAX]; - char tmp_dir[SB_PATH_MAX]; -@@ -81,6 +82,9 @@ - /* Generate sandbox bashrc path */ - get_sandbox_rc(sandbox_info->sandbox_rc); - -+ /* Generate sandbox bashprofile path */ -+ get_sandbox_profile(sandbox_info->sandbox_profile); -+ - /* Generate sandbox log full path */ - get_sandbox_log(sandbox_info->sandbox_log); - if (1 == exists(sandbox_info->sandbox_log)) { -@@ -278,6 +282,7 @@ - unsetenv(ENV_SANDBOX_ON); - unsetenv(ENV_SANDBOX_LIB); - unsetenv(ENV_SANDBOX_BASHRC); -+ unsetenv(ENV_SANDBOX_PROFILE); - unsetenv(ENV_SANDBOX_LOG); - unsetenv(ENV_SANDBOX_DEBUG_LOG); - -@@ -322,6 +327,7 @@ - sandbox_setenv(new_environ, ENV_SANDBOX_ON, "1"); - sandbox_setenv(new_environ, ENV_SANDBOX_LIB, sandbox_info->sandbox_lib); - sandbox_setenv(new_environ, ENV_SANDBOX_BASHRC, sandbox_info->sandbox_rc); -+ sandbox_setenv(new_environ, ENV_SANDBOX_PROFILE, sandbox_info->sandbox_profile); - sandbox_setenv(new_environ, ENV_SANDBOX_LOG, sandbox_info->sandbox_log); - sandbox_setenv(new_environ, ENV_SANDBOX_DEBUG_LOG, - sandbox_info->sandbox_debug_log); -@@ -458,6 +464,11 @@ - exit(EXIT_FAILURE); - } - -+ if (0 >= exists(sandbox_info.sandbox_profile)) { -+ perror("sandbox: Could not open the sandbox profile file"); -+ exit(EXIT_FAILURE); -+ } -+ - /* set up the required environment variables */ - if (print_debug) - printf("Setting up the required environment variables.\n"); -@@ -476,7 +487,7 @@ - argv_bash = (char **)malloc(6 * sizeof(char *)); - argv_bash[0] = strdup("/bin/bash"); - argv_bash[1] = strdup("-rcfile"); -- argv_bash[2] = strdup(sandbox_info.sandbox_rc); -+ argv_bash[2] = strdup(sandbox_info.sandbox_profile); - - if (argc < 2) - argv_bash[3] = NULL; -diff -ruN sandbox-1.2.17.orig/src/sandbox.h sandbox-1.2.17/src/sandbox.h ---- sandbox-1.2.17.orig/src/sandbox.h 2005-12-05 14:23:13.000000000 +0100 -+++ sandbox-1.2.17/src/sandbox.h 2006-07-27 16:12:05.000000000 +0200 -@@ -17,10 +17,11 @@ - #define LD_PRELOAD_FILE "/etc/ld.so.preload" - #define LIB_NAME "libsandbox.so" - #define BASHRC_NAME "sandbox.bashrc" -+#define BASHPROFILE_NAME "sandbox.profile" - #define TMPDIR "/tmp" --#define VAR_TMPDIR "/var/tmp" --#define PORTAGE_TMPDIR "/var/tmp/portage" --#define SANDBOX_LOG_LOCATION "/var/log/sandbox" -+#define VAR_TMPDIR LOCALSTATEDIR "/tmp" -+#define PORTAGE_TMPDIR VAR_TMPDIR "/portage" -+#define SANDBOX_LOG_LOCATION LOCALSTATEDIR "/log/sandbox" - #define LOG_FILE_PREFIX "/sandbox-" - #define DEBUG_LOG_FILE_PREFIX "/sandbox-debug-" - #define LOG_FILE_EXT ".log" -@@ -38,6 +39,7 @@ - - #define ENV_SANDBOX_LIB "SANDBOX_LIB" - #define ENV_SANDBOX_BASHRC "SANDBOX_BASHRC" -+#define ENV_SANDBOX_PROFILE "SANDBOX_PROFILE" - #define ENV_SANDBOX_LOG "SANDBOX_LOG" - #define ENV_SANDBOX_DEBUG_LOG "SANDBOX_DEBUG_LOG" - -diff -ruN sandbox-1.2.17.orig/src/sandbox_utils.c sandbox-1.2.17/src/sandbox_utils.c ---- sandbox-1.2.17.orig/src/sandbox_utils.c 2005-12-05 09:36:32.000000000 +0100 -+++ sandbox-1.2.17/src/sandbox_utils.c 2006-07-27 16:12:05.000000000 +0200 -@@ -42,6 +42,11 @@ - snprintf(path, SB_PATH_MAX, "%s/%s", SANDBOX_BASHRC_PATH, BASHRC_NAME); - } - -+void get_sandbox_profile(char *path) -+{ -+ snprintf(path, SB_PATH_MAX, "%s/%s", SANDBOX_BASHRC_PATH, BASHPROFILE_NAME); -+} -+ - void get_sandbox_log(char *path) - { - char *sandbox_log_env = NULL; ---- sandbox-1.2.17/data/Makefile.am.orig 2006-07-27 16:25:09.000000000 +0200 -+++ sandbox-1.2.17/data/Makefile.am 2006-07-27 16:25:18.000000000 +0200 -@@ -1,3 +1 @@ --dist_pkgdata_DATA = sandbox.bashrc -- --EXTRA_DIST = sandbox.bashrc -+dist_pkgdata_DATA = sandbox.bashrc sandbox.profile -diff -ru sandbox-1.2.17.orig/configure.ac sandbox-1.2.17/configure.ac ---- sandbox-1.2.17.orig/configure.ac 2005-12-05 15:03:35.000000000 +0100 -+++ sandbox-1.2.17/configure.ac 2006-07-21 13:12:39.000000000 +0200 -@@ -10,6 +10,8 @@ - AC_PROG_MAKE_SET - AC_PROG_AWK - AC_CHECK_PROGS([READELF], [readelf], [false]) -+AC_PATH_PROGS([CU_BASH], [bash], [/bin/bash]) -+AC_DEFINE_UNQUOTED([CU_BASH], ["${CU_BASH}"], [path to bash binary]) - - AC_ENABLE_SHARED - AC_DISABLE_STATIC -diff -ru sandbox-1.2.17.orig/src/sandbox.c sandbox-1.2.17/src/sandbox.c ---- sandbox-1.2.17.orig/src/sandbox.c 2005-12-05 14:15:45.000000000 +0100 -+++ sandbox-1.2.17/src/sandbox.c 2006-07-21 13:15:29.000000000 +0200 -@@ -474,7 +474,7 @@ - chdir(sandbox_info.work_dir); - - argv_bash = (char **)malloc(6 * sizeof(char *)); -- argv_bash[0] = strdup("/bin/bash"); -+ argv_bash[0] = strdup(CU_BASH); - argv_bash[1] = strdup("-rcfile"); - argv_bash[2] = strdup(sandbox_info.sandbox_rc); - diff --git a/sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch b/sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch deleted file mode 100644 index 806f1a3..0000000 --- a/sys-apps/sandbox/files/sandbox-1.2.18.1-open-cloexec.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/196720 - -mark the new "e" fopen() flag as safe - ---- sandbox-1.2.18.1/src/libsandbox.c -+++ sandbox-1.2.18.1/src/libsandbox.c -@@ -1595,7 +1595,7 @@ - { - if (*mode == 'r' && (0 == (strcmp(mode, "r")) || - /* The strspn accept args are known non-writable modifiers */ -- (strlen(++mode) == strspn(mode, "xbtmc")))) { -+ (strlen(++mode) == strspn(mode, "xbtmce")))) { - return before_syscall("open_rd", file); - } else { - return before_syscall("open_wr", file); diff --git a/sys-apps/sandbox/files/sandbox-1.2.18.1-open-normal-fail.patch b/sys-apps/sandbox/files/sandbox-1.2.18.1-open-normal-fail.patch deleted file mode 100644 index 49b57e4..0000000 --- a/sys-apps/sandbox/files/sandbox-1.2.18.1-open-normal-fail.patch +++ /dev/null @@ -1,99 +0,0 @@ -Patch from Kevin F. Quinn at https://bugs.gentoo.org/show_bug.cgi?id=135745 -Already applied in sandbox svn - -Makes sandboxed open() calls return the normal error conditions if the -file in question does not exist, without causing a sandbox violation. -This allows programs to use open() to test for file existance, regardless -of read-write flags. This is not revealing any further information about -the backing system because this data was already available through stat(). - -Index: src/libsandbox.c -=================================================================== ---- src/libsandbox.c.orig -+++ src/libsandbox.c -@@ -80,6 +80,9 @@ - #define FUNCTION_SANDBOX_SAFE_ACCESS(_func, _path, _flags) \ - ((0 == is_sandbox_on()) || (1 == before_syscall_access(_func, _path, _flags))) - -+#define FUNCTION_SANDBOX_FAIL_OPEN_INT(_func, _path, _flags) \ -+ ((0 == is_sandbox_on()) || (1 == before_syscall_open_int(_func, _path, _flags))) -+ - #define FUNCTION_SANDBOX_SAFE_OPEN_INT(_func, _path, _flags) \ - ((0 == is_sandbox_on()) || (1 == before_syscall_open_int(_func, _path, _flags))) - -@@ -388,6 +391,16 @@ static FILE * (*true_ ## _name) (const c - FILE *_name(const char *pathname, const char *mode) \ - { \ - FILE *result = NULL; \ -+ int my_errno = errno; \ -+ struct stat st; \ -+\ -+ if (mode!=NULL && mode[0]=='r') { \ -+ /* If we're trying to read, fail normally if file does not stat */\ -+ if (-1 == stat(pathname, &st)) { \ -+ return NULL; \ -+ } \ -+ } \ -+ errno = my_errno; \ - \ - if FUNCTION_SANDBOX_SAFE_OPEN_CHAR("fopen", pathname, mode) { \ - check_dlsym(_name); \ -@@ -561,12 +574,20 @@ int _name(const char *pathname, int flag - va_list ap; \ - int mode = 0; \ - int result = -1; \ -+ int my_errno = errno; \ -+ struct stat st; \ - \ - if (flags & O_CREAT) { \ - va_start(ap, flags); \ - mode = va_arg(ap, int); \ - va_end(ap); \ -+ } else { \ -+ /* If we're not trying to create, fail normally if file does not stat */\ -+ if (-1 == stat(pathname, &st)) { \ -+ return -1; \ -+ } \ - } \ -+ errno = my_errno; \ - \ - if FUNCTION_SANDBOX_SAFE_OPEN_INT("open", pathname, flags) { \ - check_dlsym(_name); \ -@@ -726,6 +747,16 @@ static FILE * (*true_ ## _name) (const c - FILE *_name(const char *pathname, const char *mode) \ - { \ - FILE *result = NULL; \ -+ int my_errno = errno; \ -+ struct stat64 st; \ -+\ -+ if (mode!=NULL && mode[0]=='r') { \ -+ /* If we're trying to read, fail normally if file does not stat */\ -+ if (-1 == stat64(pathname, &st)) { \ -+ return NULL; \ -+ } \ -+ } \ -+ errno = my_errno; \ - \ - if FUNCTION_SANDBOX_SAFE_OPEN_CHAR("fopen64", pathname, mode) { \ - check_dlsym(_name); \ -@@ -746,12 +777,20 @@ int _name(const char *pathname, int flag - va_list ap; \ - int mode = 0; \ - int result = -1; \ -+ int my_errno = errno; \ -+ struct stat64 st; \ - \ - if (flags & O_CREAT) { \ - va_start(ap, flags); \ - mode = va_arg(ap, int); \ - va_end(ap); \ -+ } else { \ -+ /* If we're not trying to create, fail normally if file does not stat */\ -+ if (-1 == stat64(pathname, &st)) { \ -+ return -1; \ -+ } \ - } \ -+ errno = my_errno; \ - \ - if FUNCTION_SANDBOX_SAFE_OPEN_INT("open64", pathname, flags) { \ - check_dlsym(_name); \ diff --git a/sys-apps/sandbox/files/sandbox-1.2.18.1-rtld-validation.patch b/sys-apps/sandbox/files/sandbox-1.2.18.1-rtld-validation.patch deleted file mode 100644 index 36e96f5..0000000 --- a/sys-apps/sandbox/files/sandbox-1.2.18.1-rtld-validation.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Robin H. Johnson <robbat2@gentoo.org> -Gentoo-Bug: 206678 -X-Gentoo-URL: http://bugs.gentoo.org/show_bug.cgi?id=206678 -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> - -Based on a previous revision by solar@gentoo.org. -It seems that on hardened systems, USE_RTLD_NEXT is not always usable, and this -trips up sandbox. - -diff -Nuar sandbox-1.2.18.1.orig/src/libsandbox.c sandbox-1.2.18.1/src/libsandbox.c ---- sandbox-1.2.18.1.orig/src/libsandbox.c 2008-06-27 16:15:53.000000000 +0000 -+++ sandbox-1.2.18.1/src/libsandbox.c 2008-06-27 16:20:26.000000000 +0000 -@@ -192,18 +192,24 @@ - { - void *symaddr = NULL; - -- if (NULL == libc_handle) { --#if !defined(USE_RTLD_NEXT) -+#if defined(USE_RTLD_NEXT) -+ libc_handle = RTLD_NEXT; -+#endif -+ -+ /* Checking for -1UL is significent on hardened! -+ * USE_RTLD_NEXT returns it as a sign of being unusable. -+ * However using !x or NULL checks does NOT pick it up! -+ */ -+#define INVALID_LIBC_HANDLE(x) (!x || NULL == x || -1UL == x) -+ if (INVALID_LIBC_HANDLE(libc_handle)) { - libc_handle = dlopen(LIBC_VERSION, RTLD_LAZY); -- if (!libc_handle) { -+ if (INVALID_LIBC_HANDLE(libc_handle)) { - fprintf(stderr, "libsandbox: Can't dlopen libc: %s\n", - dlerror()); - exit(EXIT_FAILURE); - } --#else -- libc_handle = RTLD_NEXT; --#endif - } -+#undef INVALID_LIBC_HANDLE - - if (NULL == symver) - symaddr = dlsym(libc_handle, symname); diff --git a/sys-apps/sandbox/files/sandbox-1.2.20_alpha2-parallel.patch b/sys-apps/sandbox/files/sandbox-1.2.20_alpha2-parallel.patch deleted file mode 100644 index cbf769f..0000000 --- a/sys-apps/sandbox/files/sandbox-1.2.20_alpha2-parallel.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://bugs.gentooorg/190051 - ---- libsandbox/Makefile.in -+++ libsandbox/Makefile.in -@@ -517,6 +517,7 @@ - - - libsandbox.c: libsandbox.map symbols.h -+wrappers.c: symbols.h - - libsandbox.map: $(SYMBOLS_FILE) $(GEN_VERSION_MAP_SCRIPT) - @echo "Generating $@"; \ diff --git a/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch b/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch deleted file mode 100644 index 490bc41..0000000 --- a/sys-apps/sandbox/files/sandbox-1.6-disable-pthread.patch +++ /dev/null @@ -1,37 +0,0 @@ -http://bugs.gentoo.org/263657 - -disable pthread locks ... this is how stable has always worked, so there -wont be any regressions ... - -diff --git a/libsandbox/libsandbox.c b/libsandbox/libsandbox.c -index 034d0e7..595d17f 100644 ---- a/libsandbox/libsandbox.c -+++ b/libsandbox/libsandbox.c -@@ -814,9 +814,6 @@ - return result; - } - --/* Need to protect the global sbcontext structure */ --static pthread_mutex_t sb_syscall_lock = PTHREAD_MUTEX_INITIALIZER; -- - bool before_syscall(int dirfd, int sb_nr, const char *func, const char *file, int flags) - { - int old_errno = errno; -@@ -843,8 +840,6 @@ - file = at_file_buf; - } - -- pthread_mutex_lock(&sb_syscall_lock); -- - if (!sb_init) { - init_context(&sbcontext); - sb_init = true; -@@ -885,8 +880,6 @@ - - result = check_syscall(&sbcontext, sb_nr, func, file, flags); - -- pthread_mutex_unlock(&sb_syscall_lock); -- - if (0 == result) { - if ((NULL != getenv(ENV_SANDBOX_PID)) && (is_env_on(ENV_SANDBOX_ABORT))) - diff --git a/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch b/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch deleted file mode 100644 index 754ef01..0000000 --- a/sys-apps/sandbox/files/sandbox-1.6-disable-qa-static.patch +++ /dev/null @@ -1,13 +0,0 @@ -sandbox-1.7 traces static apps so disable the qa notice as it just scares -users ... dont want scary stuff in stable! - ---- libsandbox/wrapper-funcs/__wrapper_exec.c -+++ libsandbox/wrapper-funcs/__wrapper_exec.c -@@ -221,7 +221,6 @@ - if (!FUNCTION_SANDBOX_SAFE(path)) - return result; - -- sb_check_exec(path, argv); - } - #endif - diff --git a/sys-apps/sandbox/files/sandbox-1.9-setoptions.patch b/sys-apps/sandbox/files/sandbox-1.9-setoptions.patch deleted file mode 100644 index 34e8722..0000000 --- a/sys-apps/sandbox/files/sandbox-1.9-setoptions.patch +++ /dev/null @@ -1,15 +0,0 @@ - Fix undefined PTRACE_SETOPTIONS error, patch by grobian - -diff --git a/libsandbox/trace.c b/libsandbox/trace.c -index 7c5ec17..eaf520f 100644 ---- a/libsandbox/trace.c -+++ b/libsandbox/trace.c -@@ -425,7 +425,7 @@ void trace_main(const char *filename, char *const argv[]) - SB_DEBUG("parent waiting for child (pid=%i) to signal", trace_pid); - while (!child_stopped) - sched_yield(); --#ifdef PTRACE_O_TRACESYSGOOD -+#if defined(PTRACE_O_TRACESYSGOOD) && defined(PTRACE_SETOPTIONS) - /* Not all kernel versions support this, so ignore return */ - ptrace(PTRACE_SETOPTIONS, trace_pid, NULL, (void *)PTRACE_O_TRACESYSGOOD); - #endif diff --git a/sys-apps/sandbox/files/sandbox-2.0-prefix.patch b/sys-apps/sandbox/files/sandbox-2.0-prefix.patch deleted file mode 100644 index 5e32912..0000000 --- a/sys-apps/sandbox/files/sandbox-2.0-prefix.patch +++ /dev/null @@ -1,37 +0,0 @@ -* heiko's way of getting this thing going -http://repo.or.cz/w/heikos-i-prolly-break-your-prefix-overlay.git?a=blob;f=sys-apps/sandbox/files/sandbox-2.0-prefix.patch;h=7b4f568679522682ba784853829a0f2b1272b21d;hb=HEAD - -diff --git a/libsbutil/get_sandbox_lib.c b/libsbutil/get_sandbox_lib.c -index b64a5ac..1cf4832 100644 ---- a/libsbutil/get_sandbox_lib.c -+++ b/libsbutil/get_sandbox_lib.c -@@ -22,6 +22,7 @@ - void get_sandbox_lib(char *path) - { - save_errno(); -+#ifndef GENTOO_PREFIX - strcpy(path, LIB_NAME); - if (strncmp("/usr/lib", LIBSANDBOX_PATH, 8)) { - void *hndl = dlopen(path, RTLD_LAZY); -@@ -30,5 +31,10 @@ void get_sandbox_lib(char *path) - else - dlclose(hndl); - } -+#else -+ /* Gentoo Prefix always needs the absolute path due to DT_R*PATH usage -+ * within dlopen(). */ -+ snprintf(path, SB_PATH_MAX, "%s/%s", LIBSANDBOX_PATH, LIB_NAME); -+#endif - restore_errno(); - } ---- a/etc/sandbox.d/00default.orig 2009-06-22 14:10:30.000000000 +0200 -+++ a/etc/sandbox.d/00default 2009-06-22 14:11:41.000000000 +0200 -@@ -14,7 +14,7 @@ - # Finally add current directory if interactive - SANDBOX_WRITE="${SANDBOX_WORKDIR}" - # Needed for configure tests --SANDBOX_WRITE="/usr/tmp/conftest:/usr/lib/conftest:/usr/lib32/conftest:/usr/lib64/conftest:/usr/tmp/cf:/usr/lib/cf:/usr/lib32/cf:/usr/lib64/cf" -+SANDBOX_WRITE="@GENTOO_PORTAGE_EPREFIX@/usr/tmp/conftest:@GENTOO_PORTAGE_EPREFIX@/usr/lib/conftest:@GENTOO_PORTAGE_EPREFIX@/usr/lib32/conftest:@GENTOO_PORTAGE_EPREFIX@/usr/lib64/conftest:@GENTOO_PORTAGE_EPREFIX@/usr/tmp/cf:@GENTOO_PORTAGE_EPREFIX@/usr/lib/cf:@GENTOO_PORTAGE_EPREFIX@/usr/lib32/cf:@GENTOO_PORTAGE_EPREFIX@/usr/lib64/cf" - - # Usually writes in /home should not cause violations - SANDBOX_PREDICT="${HOME}" diff --git a/sys-apps/sandbox/files/sandbox-2.0-setoptions.patch b/sys-apps/sandbox/files/sandbox-2.0-setoptions.patch deleted file mode 100644 index 9430dbb..0000000 --- a/sys-apps/sandbox/files/sandbox-2.0-setoptions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libsandbox/trace.c.old 2009-06-30 10:11:40.000000000 -0500 -+++ libsandbox/trace.c 2009-06-30 10:11:58.000000000 -0500 -@@ -476,7 +476,7 @@ - } else if (trace_pid) { - SB_DEBUG("parent waiting for child (pid=%i) to signal", trace_pid); - waitpid(trace_pid, NULL, 0); --#ifdef PTRACE_O_TRACESYSGOOD -+#if defined(PTRACE_SETOPTIONS) && defined(PTRACE_O_TRACESYSGOOD) - /* Not all kernel versions support this, so ignore return */ - ptrace(PTRACE_SETOPTIONS, trace_pid, NULL, (void *)PTRACE_O_TRACESYSGOOD); - #endif diff --git a/sys-apps/sandbox/files/sandbox-2.2-prefix.patch b/sys-apps/sandbox/files/sandbox-2.2-prefix.patch deleted file mode 100644 index 0cd5f3f..0000000 --- a/sys-apps/sandbox/files/sandbox-2.2-prefix.patch +++ /dev/null @@ -1,26 +0,0 @@ -* heiko's way of getting this thing going -http://repo.or.cz/w/heikos-i-prolly-break-your-prefix-overlay.git?a=blob;f=sys-apps/sandbox/files/sandbox-2.0-prefix.patch;h=7b4f568679522682ba784853829a0f2b1272b21d;hb=HEAD - -diff --git a/libsbutil/get_sandbox_lib.c b/libsbutil/get_sandbox_lib.c -index b64a5ac..1cf4832 100644 ---- a/libsbutil/get_sandbox_lib.c -+++ b/libsbutil/get_sandbox_lib.c -@@ -22,6 +22,7 @@ - void get_sandbox_lib(char *path) - { - save_errno(); -+#ifndef GENTOO_PREFIX - strcpy(path, LIB_NAME); - if (strncmp("/usr/lib", LIBSANDBOX_PATH, 8)) { - void *hndl = dlopen(path, RTLD_LAZY); -@@ -30,5 +31,10 @@ void get_sandbox_lib(char *path) - else - dlclose(hndl); - } -+#else -+ /* Gentoo Prefix always needs the absolute path due to DT_R*PATH usage -+ * within dlopen(). */ -+ snprintf(path, SB_PATH_MAX, "%s/%s", LIBSANDBOX_PATH, LIB_NAME); -+#endif - restore_errno(); - } diff --git a/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch b/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch deleted file mode 100755 index e4dc529..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch +++ /dev/null @@ -1,201 +0,0 @@ -From dd726dcc6a95355d0e0cc949018d9c8aefc89a02 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Dec 2012 19:41:49 -0500 -Subject: [PATCH 1/2] libsandbox: reject "" paths with *at funcs before - checking the dirfd - -When it comes to processing errors, an empty path is checked before -an invalid dirfd. Make sure sandbox matches that behavior for the -random testsuites out there that look for this. - -URL: https://bugs.gentoo.org/346929 -Reported-by: Marien Zwart <marienz@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/wrapper-funcs/__pre_check.c | 2 ++ - libsandbox/wrapper-funcs/mkdirat_pre_check.c | 17 +++++------------ - libsandbox/wrapper-funcs/openat_pre_check.c | 15 ++++----------- - libsandbox/wrapper-funcs/unlinkat_pre_check.c | 17 +++++------------ - libsandbox/wrappers.h | 2 ++ - tests/mkdirat-3.sh | 7 +++++++ - tests/mkdirat.at | 1 + - tests/openat-2.sh | 9 +++++++++ - tests/openat.at | 1 + - tests/unlinkat-4.sh | 7 +++++++ - tests/unlinkat.at | 1 + - 11 files changed, 44 insertions(+), 35 deletions(-) - create mode 100755 tests/mkdirat-3.sh - create mode 100755 tests/openat-2.sh - create mode 100755 tests/unlinkat-4.sh - -diff --git a/libsandbox/wrapper-funcs/__pre_check.c b/libsandbox/wrapper-funcs/__pre_check.c -index 2d5711f..28ad91f 100644 ---- a/libsandbox/wrapper-funcs/__pre_check.c -+++ b/libsandbox/wrapper-funcs/__pre_check.c -@@ -20,3 +20,5 @@ - #if SB_NR_UNLINK != SB_NR_UNDEF && SB_NR_UNLINKAT == SB_NR_UNDEF - # include "unlinkat_pre_check.c" - #endif -+ -+#include "__pre_at_check.c" -diff --git a/libsandbox/wrapper-funcs/mkdirat_pre_check.c b/libsandbox/wrapper-funcs/mkdirat_pre_check.c -index 77a65df..0b48d1f 100644 ---- a/libsandbox/wrapper-funcs/mkdirat_pre_check.c -+++ b/libsandbox/wrapper-funcs/mkdirat_pre_check.c -@@ -1,20 +1,13 @@ - bool sb_mkdirat_pre_check(const char *func, const char *pathname, int dirfd) - { - char canonic[SB_PATH_MAX]; -- char dirfd_path[SB_PATH_MAX]; - - save_errno(); - -- /* Expand the dirfd path first */ -- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) { -- case -1: -- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -- func, pathname, strerror(errno)); -- return false; -- case 0: -- pathname = dirfd_path; -- break; -- } -+ /* Check incoming args against common *at issues */ -+ char dirfd_path[SB_PATH_MAX]; -+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path))) -+ return false; - - /* Then break down any relative/symlink paths */ - if (-1 == canonicalize(pathname, canonic)) -diff --git a/libsandbox/wrapper-funcs/openat_pre_check.c b/libsandbox/wrapper-funcs/openat_pre_check.c -index 0127708..5fd5eaa 100644 ---- a/libsandbox/wrapper-funcs/openat_pre_check.c -+++ b/libsandbox/wrapper-funcs/openat_pre_check.c -@@ -15,17 +15,10 @@ bool sb_openat_pre_check(const char *func, const char *pathname, int dirfd, int - - save_errno(); - -- /* Expand the dirfd path first */ -+ /* Check incoming args against common *at issues */ - char dirfd_path[SB_PATH_MAX]; -- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) { -- case -1: -- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -- func, pathname, strerror(errno)); -- return false; -- case 0: -- pathname = dirfd_path; -- break; -- } -+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path))) -+ return false; - - /* Doesn't exist -> skip permission checks */ - struct stat st; -diff --git a/libsandbox/wrapper-funcs/unlinkat_pre_check.c b/libsandbox/wrapper-funcs/unlinkat_pre_check.c -index 9f5e7d7..c004d15 100644 ---- a/libsandbox/wrapper-funcs/unlinkat_pre_check.c -+++ b/libsandbox/wrapper-funcs/unlinkat_pre_check.c -@@ -1,20 +1,13 @@ - bool sb_unlinkat_pre_check(const char *func, const char *pathname, int dirfd) - { - char canonic[SB_PATH_MAX]; -- char dirfd_path[SB_PATH_MAX]; - - save_errno(); - -- /* Expand the dirfd path first */ -- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) { -- case -1: -- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -- func, pathname, strerror(errno)); -- return false; -- case 0: -- pathname = dirfd_path; -- break; -- } -+ /* Check incoming args against common *at issues */ -+ char dirfd_path[SB_PATH_MAX]; -+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path))) -+ return false; - - /* Then break down any relative/symlink paths */ - if (-1 == canonicalize(pathname, canonic)) -diff --git a/libsandbox/wrappers.h b/libsandbox/wrappers.h -index 5b97787..0aa58bb 100644 ---- a/libsandbox/wrappers.h -+++ b/libsandbox/wrappers.h -@@ -28,5 +28,7 @@ attribute_hidden bool sb_mkdirat_pre_check (const char *func, const char *pathn - attribute_hidden bool sb_openat_pre_check (const char *func, const char *pathname, int dirfd, int flags); - attribute_hidden bool sb_openat64_pre_check (const char *func, const char *pathname, int dirfd, int flags); - attribute_hidden bool sb_unlinkat_pre_check (const char *func, const char *pathname, int dirfd); -+attribute_hidden bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd, -+ char *dirfd_path, size_t dirfd_path_len); - - #endif --- -1.8.1.2 - -From 0b8a6d9773cc0e6d86bf1187f46817d5716698fe Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Dec 2012 19:41:49 -0500 -Subject: [PATCH 2/2] libsandbox: reject "" paths with *at funcs before - checking the dirfd [missing file] - -When it comes to processing errors, an empty path is checked before -an invalid dirfd. Make sure sandbox matches that behavior for the -random testsuites out there that look for this. - -Forgot to `git add` in the previous commit :/. - -URL: https://bugs.gentoo.org/346929 -Reported-by: Marien Zwart <marienz@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/wrapper-funcs/__pre_at_check.c | 34 +++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) - create mode 100644 libsandbox/wrapper-funcs/__pre_at_check.c - -diff --git a/libsandbox/wrapper-funcs/__pre_at_check.c b/libsandbox/wrapper-funcs/__pre_at_check.c -new file mode 100644 -index 0000000..f72c40c ---- /dev/null -+++ b/libsandbox/wrapper-funcs/__pre_at_check.c -@@ -0,0 +1,34 @@ -+/* -+ * common *at() pre-checks. -+ * -+ * Copyright 1999-2012 Gentoo Foundation -+ * Licensed under the GPL-2 -+ */ -+ -+/* We assume the parent has nested use with save/restore errno */ -+bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd, -+ char *dirfd_path, size_t dirfd_path_len) -+{ -+ /* the empty path name should fail with ENOENT before any dirfd -+ * checks get a chance to run #346929 -+ */ -+ if (*pathname && *pathname[0] == '\0') { -+ errno = ENOENT; -+ sb_debug_dyn("EARLY FAIL: %s(%s): %s\n", -+ func, *pathname, strerror(errno)); -+ return false; -+ } -+ -+ /* Expand the dirfd path first */ -+ switch (resolve_dirfd_path(dirfd, *pathname, dirfd_path, dirfd_path_len)) { -+ case -1: -+ sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n", -+ func, *pathname, strerror(errno)); -+ return false; -+ case 0: -+ *pathname = dirfd_path; -+ break; -+ } -+ -+ return true; -+} --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-desktop.patch b/sys-apps/sandbox/files/sandbox-2.6-desktop.patch deleted file mode 100755 index fbecb07..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-desktop.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 00044ab0c8aaaabf048b5ff0ec2da5b3d7d25752 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 17 Nov 2012 14:14:26 -0500 -Subject: [PATCH] sandbox.desktop: drop .svg from Icon field -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -URL: http://bugs.gentoo.org/443672 -Reported-by: Petteri Räty <betelgeuse@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - data/sandbox.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/sandbox.desktop b/data/sandbox.desktop -index 5b5b576..27a887e 100644 ---- a/data/sandbox.desktop -+++ b/data/sandbox.desktop -@@ -5,6 +5,6 @@ Type=Application - Comment=launch a sandboxed shell ... useful for debugging ebuilds - Exec=sandbox - TryExec=sandbox --Icon=sandbox.svg -+Icon=sandbox - Categories=Development; - Terminal=true --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-log-var.patch b/sys-apps/sandbox/files/sandbox-2.6-log-var.patch deleted file mode 100755 index bfea9e5..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-log-var.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 853b42c86432eefc6d4cfba86197fb37d446366d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 3 Mar 2013 05:34:09 -0500 -Subject: [PATCH] sandbox: accept SANDBOX_LOG vars whatever their values - -Commit 40abb498ca4a24495fe34e133379382ce8c3eaca subtly broke the sandbox -with portage. It changed how the sandbox log env var was accessed by -moving from getenv() to get_sandbox_log(). The latter has path checking -and will kick out values that contain a slash. That means every time a -new process starts, a new sandbox log path will be generated, and when a -program triggers a violation, it'll write to the new file. Meanwhile, -portage itself watches the original one which never gets updated. - -This code has been around forever w/out documentation, and I can't think -of a reason we need it. So punt it. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsbutil/get_sandbox_log.c | 14 +++++--------- - 1 file changed, 5 insertions(+), 9 deletions(-) - -diff --git a/libsbutil/get_sandbox_log.c b/libsbutil/get_sandbox_log.c -index a79b399..bdb4278 100644 ---- a/libsbutil/get_sandbox_log.c -+++ b/libsbutil/get_sandbox_log.c -@@ -21,17 +21,13 @@ static void _get_sb_log(char *path, const char *tmpdir, const char *env, const c - - sandbox_log_env = getenv(env); - -- if (sandbox_log_env && is_env_on(ENV_SANDBOX_TESTING)) { -- /* When testing, just use what the env says to */ -+ if (sandbox_log_env) { -+ /* If the env is viable, roll with it. We aren't really -+ * about people breaking the security of the sandbox by -+ * exporting SANDBOX_LOG=/dev/null. -+ */ - strncpy(path, sandbox_log_env, SB_PATH_MAX); - } else { -- /* THIS CHUNK BREAK THINGS BY DOING THIS: -- * SANDBOX_LOG=/tmp/sandbox-app-admin/superadduser-1.0.7-11063.log -- */ -- if ((NULL != sandbox_log_env) && -- (NULL != strchr(sandbox_log_env, '/'))) -- sandbox_log_env = NULL; -- - snprintf(path, SB_PATH_MAX, "%s%s%s%s%d%s", - SANDBOX_LOG_LOCATION, prefix, - (sandbox_log_env == NULL ? "" : sandbox_log_env), --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch b/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch deleted file mode 100755 index 0101ece..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 45fa8714a1d35e6555083d88a71851ada2aacac4 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Dec 2012 18:46:29 -0500 -Subject: [PATCH] libsandbox: handle open(O_NOFOLLOW) - -We don't check for O_NOFOLLOW in the open wrappers, so we end up -returning the wrong error when operating on broken symlinks. - -URL: https://bugs.gentoo.org/413441 -Reported-by: Marien Zwart <marienz@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/wrapper-funcs/__64_post.h | 1 + - libsandbox/wrapper-funcs/__64_pre.h | 1 + - libsandbox/wrapper-funcs/openat_pre_check.c | 2 +- - tests/open-2.sh | 10 ++++++++++ - tests/open.at | 1 + - 5 files changed, 14 insertions(+), 1 deletion(-) - create mode 100755 tests/open-2.sh - -diff --git a/libsandbox/wrapper-funcs/__64_post.h b/libsandbox/wrapper-funcs/__64_post.h -index 2fd2182..82d2a16 100644 ---- a/libsandbox/wrapper-funcs/__64_post.h -+++ b/libsandbox/wrapper-funcs/__64_post.h -@@ -1,3 +1,4 @@ - #undef SB64 - #undef stat -+#undef lstat - #undef off_t -diff --git a/libsandbox/wrapper-funcs/__64_pre.h b/libsandbox/wrapper-funcs/__64_pre.h -index 2132110..0b34b25 100644 ---- a/libsandbox/wrapper-funcs/__64_pre.h -+++ b/libsandbox/wrapper-funcs/__64_pre.h -@@ -1,3 +1,4 @@ - #define SB64 - #define stat stat64 -+#define lstat lstat64 - #define off_t off64_t -diff --git a/libsandbox/wrapper-funcs/openat_pre_check.c b/libsandbox/wrapper-funcs/openat_pre_check.c -index c827ee6..0127708 100644 ---- a/libsandbox/wrapper-funcs/openat_pre_check.c -+++ b/libsandbox/wrapper-funcs/openat_pre_check.c -@@ -29,7 +29,7 @@ bool sb_openat_pre_check(const char *func, const char *pathname, int dirfd, int - - /* Doesn't exist -> skip permission checks */ - struct stat st; -- if (-1 == stat(pathname, &st)) { -+ if (((flags & O_NOFOLLOW) ? lstat(pathname, &st) : stat(pathname, &st)) == -1) { - sb_debug_dyn("EARLY FAIL: %s(%s): %s\n", - func, pathname, strerror(errno)); - return false; --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-prefix.patch b/sys-apps/sandbox/files/sandbox-2.6-prefix.patch deleted file mode 100644 index d3861c0..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-prefix.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: sandbox-2.6/data/sandbox.bashrc -=================================================================== ---- sandbox-2.6.orig/data/sandbox.bashrc -+++ sandbox-2.6/data/sandbox.bashrc -@@ -10,7 +10,7 @@ fi - export BASH_ENV="${SANDBOX_BASHRC}" - - alias make="make LD_PRELOAD=${LD_PRELOAD}" --alias su="su -c '/bin/bash -rcfile ${SANDBOX_BASHRC}'" -+alias su="su -c '@GENTOO_PORTAGE_EPREFIX@/bin/bash -rcfile ${SANDBOX_BASHRC}'" - - declare -r SANDBOX_ACTIVE - -@@ -29,7 +29,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 - ( - [[ ${NOCOLOR} == "true" || ${NOCOLOR} == "yes" || ${NOCOLOR} == "1" ]] && \ - export RC_NOCOLOR="yes" -- source /etc/init.d/functions.sh -+ source @GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh - if [ $? -ne 0 ] ; then - einfo() { echo " INFO: $*"; } - ewarn() { echo " WARN: $*"; } -@@ -55,7 +55,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 - #sbs_pdir=$(portageq envvar PORTAGE_TMPDIR)/portage/ #portageq takes too long imo - if [[ -z ${PORTAGE_TMPDIR} ]] ; then - sbs_pdir=$( -- for f in /etc/{,portage/}make.globals /etc/{,portage/}make.conf ; do -+ for f in @GENTOO_PORTAGE_EPREFIX@/etc/{,portage/}make.globals @GENTOO_PORTAGE_EPREFIX@/etc/{,portage/}make.conf ; do - [[ -e ${f} ]] && source ${f} - done - echo $PORTAGE_TMPDIR -@@ -63,7 +63,7 @@ if [[ ${SANDBOX_INTRACTV} == "1" && -t 1 - else - sbs_pdir=${PORTAGE_TMPDIR} - fi -- : ${sbs_pdir:=/var/tmp} -+ : ${sbs_pdir:=@GENTOO_PORTAGE_EPREFIX@/var/tmp} - sbs_pdir=${sbs_pdir}/portage/ - - if [[ ${PWD:0:${#sbs_pdir}} == "${sbs_pdir}" ]] ; then -Index: sandbox-2.6/src/sandbox.c -=================================================================== ---- sandbox-2.6.orig/src/sandbox.c -+++ sandbox-2.6/src/sandbox.c -@@ -269,7 +269,7 @@ int main(int argc, char **argv) - goto oom_error; - - /* Setup bash argv */ -- str_list_add_item_copy(argv_bash, "/bin/bash", oom_error); -+ str_list_add_item_copy(argv_bash, "@GENTOO_PORTAGE_EPREFIX@/bin/bash", oom_error); - str_list_add_item_copy(argv_bash, "-rcfile", oom_error); - str_list_add_item_copy(argv_bash, sandbox_info.sandbox_rc, oom_error); - if (argc >= 2) { -Index: sandbox-2.6/libsbutil/sbutil.h -=================================================================== ---- sandbox-2.6.orig/libsbutil/sbutil.h -+++ sandbox-2.6/libsbutil/sbutil.h -@@ -22,9 +22,9 @@ - #define LD_PRELOAD_EQ "LD_PRELOAD=" - #define LIB_NAME "libsandbox.so" - #define BASHRC_NAME "sandbox.bashrc" --#define TMPDIR "/tmp" --#define PORTAGE_TMPDIR "/var/tmp/portage" --#define SANDBOX_LOG_LOCATION "/var/log/sandbox" -+#define TMPDIR "@GENTOO_PORTAGE_EPREFIX@/tmp" -+#define PORTAGE_TMPDIR "@GENTOO_PORTAGE_EPREFIX@/var/tmp/portage" -+#define SANDBOX_LOG_LOCATION "@GENTOO_PORTAGE_EPREFIX@/var/log/sandbox" - #define LOG_FILE_PREFIX "/sandbox-" - #define DEBUG_LOG_FILE_PREFIX "/sandbox-debug-" - #define LOG_FILE_EXT ".log" diff --git a/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch b/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch deleted file mode 100755 index 7fc0972..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch +++ /dev/null @@ -1,93 +0,0 @@ -From a3ff1534945c3898332b2481c9fd355dfbd56e1f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 23 Jun 2012 11:52:51 -0700 -Subject: [PATCH] libsandbox: clean up open file handles in parent tracing - process - -Currently, if a non-static app sets up a pipe (with cloexec enabled) and -executes a static app, the handle to that pipe is left open in the parent -process. This causes trouble when the parent is waiting for that to be -closed immediately. - -Since none of the fds in the forked parent process matter to us, we can -just go ahead and clean up all fds before we start tracing the child. - -URL: http://bugs.gentoo.org/364877 -Reported-by: Victor Stinner <victor.stinner@haypocalc.com> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/trace.c | 3 +- - libsbutil/sb_close.c | 26 +++++++++++- - libsbutil/sbutil.h | 1 + - tests/Makefile.am | 2 + - tests/pipe-fork_static_tst.c | 18 +++++++++ - tests/pipe-fork_tst.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ - tests/script-9.sh | 5 +++ - tests/script.at | 1 + - 8 files changed, 149 insertions(+), 2 deletions(-) - create mode 100644 tests/pipe-fork_static_tst.c - create mode 100644 tests/pipe-fork_tst.c - create mode 100755 tests/script-9.sh - -diff --git a/libsandbox/trace.c b/libsandbox/trace.c -index 32ad2d6..dfbab18 100644 ---- a/libsandbox/trace.c -+++ b/libsandbox/trace.c -@@ -504,8 +504,9 @@ void trace_main(const char *filename, char *const argv[]) - /* Not all kernel versions support this, so ignore return */ - ptrace(PTRACE_SETOPTIONS, trace_pid, NULL, (void *)PTRACE_O_TRACESYSGOOD); - #endif -+ sb_close_all_fds(); - trace_loop(); -- return; -+ sb_ebort("ISE: child should have quit, as should we\n"); - } - - sb_debug("child setting up ..."); -diff --git a/libsbutil/sb_close.c b/libsbutil/sb_close.c -index 17a4560..5379197 100644 ---- a/libsbutil/sb_close.c -+++ b/libsbutil/sb_close.c -@@ -29,3 +29,27 @@ int sb_close(int fd) - - return res; - } -+ -+/* Quickly close all the open fds (good for daemonization) */ -+void sb_close_all_fds(void) -+{ -+ DIR *dirp; -+ struct dirent *de; -+ int dfd, fd; -+ const char *fd_dir = sb_get_fd_dir(); -+ -+ dirp = opendir(fd_dir); -+ if (!dirp) -+ sb_ebort("could not process %s\n", fd_dir); -+ dfd = dirfd(dirp); -+ -+ while ((de = readdir(dirp)) != NULL) { -+ if (de->d_name[0] == '.') -+ continue; -+ fd = atoi(de->d_name); -+ if (fd != dfd) -+ close(fd); -+ } -+ -+ closedir(dirp); -+} -diff --git a/libsbutil/sbutil.h b/libsbutil/sbutil.h -index 02b88cb..479734b 100644 ---- a/libsbutil/sbutil.h -+++ b/libsbutil/sbutil.h -@@ -97,6 +97,7 @@ int sb_open(const char *path, int flags, mode_t mode); - size_t sb_read(int fd, void *buf, size_t count); - size_t sb_write(int fd, const void *buf, size_t count); - int sb_close(int fd); -+void sb_close_all_fds(void); - int sb_copy_file_to_fd(const char *file, int ofd); - - /* Reliable output */ --- -1.8.1.2 - diff --git a/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch b/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch deleted file mode 100644 index 7e73822..0000000 --- a/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7b01f6103a9baddaf0252e7f850a4cef91a48b67 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 6 Jul 2012 14:58:16 -0400 -Subject: [PATCH] libsandbox: fix hppa trace code - -URL: https://bugs.gentoo.org/425062 -Reported-by: Jeroen Roovers <jer@gentoo.org> -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libsandbox/trace/linux/hppa.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libsandbox/trace/linux/hppa.c b/libsandbox/trace/linux/hppa.c -index d23b0d1..5414354 100644 ---- a/libsandbox/trace/linux/hppa.c -+++ b/libsandbox/trace/linux/hppa.c -@@ -1,5 +1,5 @@ --#define trace_reg_sysnum (20 * 4) /* PT_GR20 */ --#define trace_reg_ret (28 * 4) /* PT_GR28 */ -+#define trace_reg_sysnum gr[20] -+#define trace_reg_ret gr[28] - - static unsigned long trace_arg(void *vregs, int num) - { --- -1.7.9.7 - diff --git a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml deleted file mode 100644 index 9e13eae..0000000 --- a/sys-apps/sandbox/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> - -<!-- portage lacks a herd. correct this when we have one. --> - -<maintainer> - <email>sandbox@gentoo.org</email> - <description>Sandbox Maintainers</description> -</maintainer> -</pkgmetadata> diff --git a/sys-apps/sandbox/sandbox-1.6-r2.ebuild b/sys-apps/sandbox/sandbox-1.6-r2.ebuild deleted file mode 100644 index 0ab72fc..0000000 --- a/sys-apps/sandbox/sandbox-1.6-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-1.6-r2.ebuild,v 1.17 2012/03/30 15:58:53 aballier Exp $ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.lzma - http://dev.gentoo.org/~vapier/dist/${P}.tar.lzma" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -src_unpack() { - unpacker_src_unpack - cd "${S}" - epatch "${FILESDIR}"/${P}-disable-qa-static.patch - epatch "${FILESDIR}"/${P}-disable-pthread.patch - epatch "${FILESDIR}"/0001-libsandbox-handle-more-at-functions.patch -} - -src_compile() { - filter-lfs-flags #90228 - - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die - einfo "Building sandbox for ABI=${ABI}..." - emake || die - done - ABI=${OABI} -} - -src_test() { - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Checking sandbox for ABI=${ABI}..." - emake check || die "make check failed for ${ABI}" - done - ABI=${OABI} -} - -src_install() { - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Installing sandbox for ABI=${ABI}..." - emake DESTDIR="${D}" install || die "make install failed for ${ABI}" - done - ABI=${OABI} - - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - use prefix || fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - use prefix || chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${EROOT}} - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.3-r1.ebuild b/sys-apps/sandbox/sandbox-2.3-r1.ebuild deleted file mode 100755 index ede162c..0000000 --- a/sys-apps/sandbox/sandbox-2.3-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.3-r1.ebuild,v 1.10 2012/02/05 04:50:08 vapier Exp $ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -src_compile() { - filter-lfs-flags #90228 - - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die - einfo "Building sandbox for ABI=${ABI}..." - emake || die - done - ABI=${OABI} -} - -src_test() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Checking sandbox for ABI=${ABI}..." - emake check || die "make check failed for ${ABI}" - done - ABI=${OABI} -} - -src_install() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Installing sandbox for ABI=${ABI}..." - emake DESTDIR="${D}" install || die "make install failed for ${ABI}" - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die - done - ABI=${OABI} - - doenvd "${FILESDIR}"/09sandbox - - # fix 00default install #333131 - rm "${D}"/etc/sandbox.d/*.in || die - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${D}"/var/log/sandbox - chmod 0770 "${D}"/var/log/sandbox - - local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${ROOT}} - find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.4.ebuild b/sys-apps/sandbox/sandbox-2.4.ebuild deleted file mode 100755 index b008ab3..0000000 --- a/sys-apps/sandbox/sandbox-2.4.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.4.ebuild,v 1.11 2012/02/05 04:50:08 vapier Exp $ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -src_compile() { - filter-lfs-flags #90228 - - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die - einfo "Building sandbox for ABI=${ABI}..." - emake || die - done - ABI=${OABI} -} - -src_test() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Checking sandbox for ABI=${ABI}..." - emake check || die "make check failed for ${ABI}" - done - ABI=${OABI} -} - -src_install() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Installing sandbox for ABI=${ABI}..." - emake DESTDIR="${D}" install || die "make install failed for ${ABI}" - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die - done - ABI=${OABI} - - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - chown root:portage "${D}"/var/log/sandbox - chmod 0770 "${D}"/var/log/sandbox - - local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${ROOT}} - find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${ROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.5.ebuild b/sys-apps/sandbox/sandbox-2.5.ebuild deleted file mode 100644 index cad9a5d..0000000 --- a/sys-apps/sandbox/sandbox-2.5.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.5.ebuild,v 1.10 2012/06/24 05:35:02 vapier Exp $ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing prefix - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -src_unpack() { - unpacker_src_unpack - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.2-prefix.patch -} - -sb_foreach_abi() { - # enable usage of absolute libpath in prefix - use prefix && append-flags -DGENTOO_PREFIX - - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Running $1 for ABI=${ABI}..." - "$@" - done - ABI=${OABI} -} - -sb_configure() { - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die -} - -sb_compile() { - emake || die -} - -src_compile() { - filter-lfs-flags #90228 - - # Run configures in parallel! - multijob_init - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - multijob_child_init sb_configure - done - ABI=${OABI} - multijob_finish - - sb_foreach_abi sb_compile -} - -sb_test() { - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die -} - -src_test() { - sb_foreach_abi sb_test -} - -sb_install() { - emake DESTDIR="${D}" install || die - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die -} - -src_install() { - sb_foreach_abi sb_install - - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - use prefix || fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - use prefix || chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${EROOT}} - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.6-r1.ebuild b/sys-apps/sandbox/sandbox-2.6-r1.ebuild deleted file mode 100755 index b61254b..0000000 --- a/sys-apps/sandbox/sandbox-2.6-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v 1.13 2013/09/05 09:54:16 vapier Exp $ - -EAPI=5 -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing prefix - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd -x86-fbsd" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -sb_foreach_abi() { - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Running $1 for ABI=${ABI}..." - "$@" - done - ABI=${OABI} -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-trace-hppa.patch #425062 - epatch "${FILESDIR}"/${P}-log-var.patch - epatch "${FILESDIR}"/${P}-static-close-fd.patch #364877 - epatch "${FILESDIR}"/${P}-desktop.patch #443672 - epatch "${FILESDIR}"/${P}-open-nofollow.patch #413441 - epatch "${FILESDIR}"/${P}-check-empty-paths-at.patch #346929 - epatch "${FILESDIR}"/${P}-prefix.patch - eprefixify data/sandbox.bashrc src/sandbox.c libsbutil/sbutil.h - epatch_user -} - -sb_configure() { - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} -} - -src_configure() { - filter-lfs-flags #90228 - - # Run configures in parallel! - multijob_init - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - multijob_child_init sb_configure - done - ABI=${OABI} - multijob_finish -} - -sb_compile() { - emake -} - -src_compile() { - sb_foreach_abi sb_compile -} - -sb_test() { - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" -} - -src_test() { - sb_foreach_abi sb_test -} - -sb_install() { - emake DESTDIR="${D}" install - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default -} - -src_install() { - sb_foreach_abi sb_install - - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${ROOT}} - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/sandbox/sandbox-2.6.ebuild b/sys-apps/sandbox/sandbox-2.6.ebuild deleted file mode 100644 index 7fa9050..0000000 --- a/sys-apps/sandbox/sandbox-2.6.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6.ebuild,v 1.2 2012/07/06 19:53:10 vapier Exp $ - -# -# don't monkey with this ebuild unless contacting portage devs. -# period. -# - -inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing prefix - -DESCRIPTION="sandbox'd LD_PRELOAD hack" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="multilib" - -DEPEND="app-arch/xz-utils - >=app-misc/pax-utils-0.1.19" #265376 -RDEPEND="" - -EMULTILIB_PKG="true" -has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice" - -sandbox_death_notice() { - ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:" - ewarn "FEATURES=-sandbox emerge sandbox" -} - -sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; } - -src_unpack() { - unpacker_src_unpack - cd "${S}" - epatch "${FILESDIR}"/${PN}-2.2-prefix.patch -} - -sb_foreach_abi() { - # enable usage of absolute libpath in prefix - use prefix && append-flags -DGENTOO_PREFIX - - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - cd "${WORKDIR}/build-${ABI}" - einfo "Running $1 for ABI=${ABI}..." - "$@" - done - ABI=${OABI} -} - -src_unpack() { - unpacker - cd "${S}" - epatch "${FILESDIR}"/${P}-trace-hppa.patch #425062 -} - -sb_configure() { - mkdir "${WORKDIR}/build-${ABI}" - cd "${WORKDIR}/build-${ABI}" - - use multilib && multilib_toolchain_setup ${ABI} - - einfo "Configuring sandbox for ABI=${ABI}..." - ECONF_SOURCE="../${P}/" \ - econf ${myconf} || die -} - -sb_compile() { - emake || die -} - -src_compile() { - filter-lfs-flags #90228 - - # Run configures in parallel! - multijob_init - local OABI=${ABI} - for ABI in $(sb_get_install_abis) ; do - multijob_child_init sb_configure - done - ABI=${OABI} - multijob_finish - - sb_foreach_abi sb_compile -} - -sb_test() { - emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die -} - -src_test() { - sb_foreach_abi sb_test -} - -sb_install() { - emake DESTDIR="${D}" install || die - insinto /etc/sandbox.d #333131 - doins etc/sandbox.d/00default || die -} - -src_install() { - sb_foreach_abi sb_install - - doenvd "${FILESDIR}"/09sandbox - - keepdir /var/log/sandbox - use prefix || fowners root:portage /var/log/sandbox - fperms 0770 /var/log/sandbox - - cd "${S}" - dodoc AUTHORS ChangeLog* NEWS README -} - -pkg_preinst() { - use prefix || chown root:portage "${ED}"/var/log/sandbox - chmod 0770 "${ED}"/var/log/sandbox - - local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*') - if [[ -n ${old} ]] ; then - elog "Removing old sandbox libraries for you:" - elog ${old//${EROOT}} - find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \; - fi -} - -pkg_postinst() { - chmod 0755 "${EROOT}"/etc/sandbox.d #265376 -} diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog deleted file mode 100644 index b0f026f..0000000 --- a/sys-apps/shadow/ChangeLog +++ /dev/null @@ -1,1354 +0,0 @@ -# ChangeLog for sys-apps/shadow -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.294 2014/07/13 17:52:55 vapier Exp $ - - 13 Jul 2014; Mike Frysinger <vapier@gentoo.org> files/securetty: - Allow root login via any serial device. - -*shadow-4.2.1 (16 Jun 2014) - - 16 Jun 2014; Mike Frysinger <vapier@gentoo.org> +shadow-4.2.1.ebuild: - Version bump. - - 18 Jan 2014; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Add arm64 love. - - 07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> - -shadow-4.1.4.2-r6.ebuild, -shadow-4.1.4.3.ebuild, -shadow-4.1.5.ebuild, - -shadow-4.1.5-r1.ebuild, -shadow-4.1.5-r2.ebuild, -shadow-4.1.5.1.ebuild, - shadow-4.1.5.1-r1.ebuild, -files/pam.d-include/system-auth-1.1, - -files/shadow-4.1.4.2-env-reset-keep-locale.patch, - -files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch, - -files/shadow-4.1.4.2-groupmod-pam-check.patch, - -files/shadow-4.1.4.2-su_no_sanitize_env.patch, - -files/shadow-4.1.4.3-dup-install-targets.patch, - -files/shadow-4.1.5-grremove.patch, - -files/shadow-4.1.5-nscd-ignore-exit-1.patch, - -files/shadow-4.1.5-nscd-newline-msg.patch, - -files/shadow-4.1.5-selinux-groupadd.patch, -files/shadow-4.1.5-stdarg.patch, - -files/login.defs, -files/login.pamd.3, -files/login_defs.awk, - -files/pam.d-include/login, -files/pam.d-include/other, - -files/pam.d-include/su, -files/pam.d-include/su-openpam, - -files/pam.d-include/system-auth: - Removed old versions and files. Converted remaining ebuild to EAPI-4. - - 15 Sep 2013; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Add ttymxc{2,3} #484834 by Steev Klimaszewski. - - 05 Sep 2013; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Mark m68k/s390/sh stable #454388. - - 03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for sparc, wrt bug #454388 - - 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for ia64, wrt bug #454388 - - 07 Jul 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for arm, wrt bug #454388 - - 06 Jul 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for alpha, wrt bug #454388 - - 04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for ppc64, wrt bug #454388 - - 01 Jul 2013; Jeroen Roovers <jer@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for HPPA (bug #454388). - - 30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for ppc, wrt bug #454388 - - 30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for x86, wrt bug #454388 - - 30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Stable for amd64, wrt bug #454388 - - 09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml: - Add upstream CPE tag (security info) from ChromiumOS. - - 12 Mar 2013; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild, - shadow-4.1.5-r1.ebuild, shadow-4.1.5-r2.ebuild, shadow-4.1.5.1.ebuild, - shadow-4.1.5.ebuild: - Drop epunt_cxx call as we no longer need it #460922 by Roman Žilka. - - 03 Mar 2013; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Drop /etc/pam.d/login sed since the file is in pambase now #458548 by Kobboi. - - 17 Feb 2013; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild: - Drop epunt_cxx as this no longer needs it. - -*shadow-4.1.5.1-r1 (24 Dec 2012) - - 24 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> - +shadow-4.1.5.1-r1.ebuild: - Fix pamd file for newusers (bug #448204 by Sergey Popov). - - 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild, - shadow-4.1.5-r1.ebuild, shadow-4.1.5-r2.ebuild, shadow-4.1.5.1.ebuild, - shadow-4.1.5.ebuild: - Drop has_version from older versions, and upgrade latest to EAPI=2 #426474 by - Ilya Gordeev. - - 17 Aug 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1.ebuild: - Call epatch_user for custom auth patches #431750. - -*shadow-4.1.5.1 (07 Jul 2012) - - 07 Jul 2012; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.5.1.ebuild: - Version bump #424844 by Samuli Suominen. - - 07 Jul 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild, - shadow-4.1.5.ebuild, shadow-4.1.5-r1.ebuild, shadow-4.1.5-r2.ebuild: - Fix building when rpc support is disabled #425052 by Dustin Polke. - - 31 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> shadow-4.1.5.ebuild, - shadow-4.1.5-r1.ebuild, shadow-4.1.5-r2.ebuild, metadata.xml: - Remove support for sys-auth/tcb which is being removed because of bugs: - #371167, #408647. Use sys-apps/hardened-shadow instead. - -*shadow-4.1.5-r2 (21 Apr 2012) - - 21 Apr 2012; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.5-r2.ebuild, - +files/shadow-4.1.5-grremove.patch, - +files/shadow-4.1.5-selinux-groupadd.patch: - Fix crash when calling userdel #405409 by Yuri Mamaev. Add patch for groupadd - on selinux #406819 by Amadeusz Sławiński. Depend on libsemanage when - USE=selinux #408173 by Markus Knetschke. - -*shadow-4.1.5-r1 (17 Apr 2012) - - 17 Apr 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> +shadow-4.1.5-r1.ebuild: - Version bump for new pambase. - - 26 Mar 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild, - shadow-4.1.5.ebuild: - Add a few more serial ports for arm devices. - - 16 Feb 2012; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.ebuild: - Use "-R <root>" option with grp{ck,conv} as it exists in this version. - -*shadow-4.1.5 (13 Feb 2012) - - 13 Feb 2012; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.5.ebuild, - +files/shadow-4.1.5-nscd-ignore-exit-1.patch, - +files/shadow-4.1.5-nscd-newline-msg.patch, +files/shadow-4.1.5-stdarg.patch, - metadata.xml: - Version bump. - - 31 Dec 2011; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild: - Add more arm consoles to securetty #396011 by Raúl Porcel. - - 16 Dec 2011; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.3.ebuild: - Enable ttySAC secure logins by default. - - 03 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> - shadow-4.1.4.2-r6.ebuild, shadow-4.1.4.3.ebuild, metadata.xml: - Drop unused local desc and useless blockers over non-existing packages. - - 14 Jul 2011; Mike Frysinger <vapier@gentoo.org> shadow-4.1.4.2-r6.ebuild, - shadow-4.1.4.3.ebuild: - Update SRC_URI #375107 by zino. - - 26 Feb 2011; Raúl Porcel <armin76@gentoo.org> shadow-4.1.4.3.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #355207 - - 20 Feb 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> - shadow-4.1.4.3.ebuild: - x86 stable wrt security bug #355207 - - 19 Feb 2011; Markus Meier <maekke@gentoo.org> shadow-4.1.4.3.ebuild: - arm stable, bug #355207 - - 18 Feb 2011; Jeroen Roovers <jer@gentoo.org> shadow-4.1.4.3.ebuild: - Stable for HPPA (bug #355207). - - 17 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> shadow-4.1.4.3.ebuild: - ppc/ppc64 stable wrt #355207 - - 17 Feb 2011; Markos Chandras <hwoarang@gentoo.org> shadow-4.1.4.3.ebuild: - Stable on amd64 wrt bug #355207 - -*shadow-4.1.4.3 (17 Feb 2011) - - 17 Feb 2011; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.3.ebuild, - +files/shadow-4.1.4.3-dup-install-targets.patch: - Version bump for security love #355207 by Paweł Hajdan jr. - - 30 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> - shadow-4.1.4.2-r6.ebuild: - ppc64 stable wrt #342015 - - 24 Oct 2010; Raúl Porcel <armin76@gentoo.org> shadow-4.1.4.2-r6.ebuild: - alpha/ia64/m68k/s390/sh/sparc stable wrt #342015 - - 24 Oct 2010; Brent Baude <ranger@gentoo.org> shadow-4.1.4.2-r6.ebuild: - stable ppc, bug 342015 - - 22 Oct 2010; Markos Chandras <hwoarang@gentoo.org> - shadow-4.1.4.2-r6.ebuild: - Stable on amd64 wrt bug #342015 - - 22 Oct 2010; Christian Faulhammer <fauli@gentoo.org> - shadow-4.1.4.2-r6.ebuild: - stable x86, bug 342015 - - 22 Oct 2010; Jeroen Roovers <jer@gentoo.org> shadow-4.1.4.2-r6.ebuild: - Stable for HPPA (bug #342015). - -*shadow-4.1.4.2-r6 (21 Oct 2010) - - 21 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org> - -shadow-4.1.4.2-r1.ebuild, -shadow-4.1.4.2-r2.ebuild, - -shadow-4.1.4.2-r3.ebuild, -shadow-4.1.4.2-r4.ebuild, - +shadow-4.1.4.2-r6.ebuild, -files/login.pamd, -files/login.pamd.1, - metadata.xml: - Add pam herd to the maintainers (for USE=pam); unbreak /etc/pam.d/login - that was dropped during the 4.0.18.2 → 4.1.0 bump; remove 4.1.4.2 - ebuilds with totally broken PAM support; remove two files that shouldn't - be used anymore. - - 10 Oct 2010; Raúl Porcel <armin76@gentoo.org> shadow-4.1.4.2-r5.ebuild: - alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #338591 - - 03 Oct 2010; Guy Martin <gmsoft@gentoo.org> shadow-4.1.4.2-r5.ebuild: - hppa stable wrt #338591 - - 01 Oct 2010; Brent Baude <ranger@gentoo.org> shadow-4.1.4.2-r5.ebuild: - Marking shadow-4.1.4.2-r5 ppc64 for bug 338591 - - 28 Sep 2010; Brent Baude <ranger@gentoo.org> shadow-4.1.4.2-r5.ebuild: - Marking shadow-4.1.4.2-r5 ppc for bug 338591 - - 26 Sep 2010; Markus Meier <maekke@gentoo.org> shadow-4.1.4.2-r5.ebuild: - x86 stable, bug #338591 - - 25 Sep 2010; Markos Chandras <hwoarang@gentoo.org> - shadow-4.1.4.2-r5.ebuild: - Stable on amd64 wrt bug #338591 - - 12 Sep 2010; Tobias Klausmann <klausman@gentoo.org> - shadow-4.1.4.2-r4.ebuild: - Stable on alpha, bug #327987 - - 06 Sep 2010; Brent Baude <ranger@gentoo.org> shadow-4.1.4.2-r2.ebuild: - Marking shadow-4.1.4.2-r2 ppc64 for bug 327987 - - 14 Aug 2010; Markus Meier <maekke@gentoo.org> shadow-4.1.4.2-r4.ebuild: - arm stable, bug #327987 - -*shadow-4.1.4.2-r5 (23 Jul 2010) - - 23 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> - +shadow-4.1.4.2-r5.ebuild, files/pam.d-include/passwd: - Add a new revision of shadow that should fix bug #275555. - - 13 Jul 2010; Jeroen Roovers <jer@gentoo.org> shadow-4.1.4.2-r4.ebuild: - Stable for HPPA PPC (bug #327987). - - 12 Jul 2010; Markos Chandras <hwoarang@gentoo.org> - shadow-4.1.4.2-r4.ebuild: - Stable on amd64 wrt bug #308047 - - 10 Jul 2010; Christian Faulhammer <fauli@gentoo.org> - shadow-4.1.4.2-r4.ebuild: - stable x86, bug 308047 - -*shadow-4.1.4.2-r4 (10 Jul 2010) - - 10 Jul 2010; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.2-r4.ebuild, - +files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch: - Fix /etc/gshadow reading #327605 by Dirk Sondermann. - - 03 Jul 2010; Christian Faulhammer <fauli@gentoo.org> - shadow-4.1.4.2-r3.ebuild: - stable x86, security bug 308047 - -*shadow-4.1.4.2-r3 (27 Jan 2010) - - 27 Jan 2010; Peter Volkov <pva@gentoo.org> +shadow-4.1.4.2-r3.ebuild, - +files/shadow-4.1.4.2-su_no_sanitize_env.patch: - Upstream patch: su should not sanitize_env(), bug #301957. - -*shadow-4.1.4.2-r2 (15 Jan 2010) - - 15 Jan 2010; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.2-r2.ebuild, - +files/shadow-4.1.4.2-groupmod-pam-check.patch: - Add fix from upstream for groupmod pam check #300790 by Esther Dalhuisen - and drop old adduser symlink #301027 by Vicente Olivert. - -*shadow-4.1.4.2-r1 (04 Dec 2009) - - 04 Dec 2009; Fabio Erculiani <lxnay@gentoo.org> -shadow-4.1.3.1.ebuild, - -shadow-4.1.4.1.ebuild, -shadow-4.1.4.2.ebuild, +shadow-4.1.4.2-r1.ebuild, - +files/shadow-4.1.4.2-env-reset-keep-locale.patch: - Fix invalid environment variables reset, close bug #283725, thanks to - myself for reporting, thanks to parafin for providing a working patch - -*shadow-4.1.4.2 (24 Jul 2009) - - 24 Jul 2009; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.2.ebuild: - Version bump. - -*shadow-4.1.4.1 (23 May 2009) - - 23 May 2009; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.1.ebuild: - Version bump. - -*shadow-4.1.4-r1 (18 May 2009) - - 18 May 2009; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4-r1.ebuild, - +files/shadow-4.1.4-login-non-pam-crash.patch: - Add fix from upstream for crash with non-pam/empty user #270213 by Ulrich - Müller. - -*shadow-4.1.4 (11 May 2009) - - 11 May 2009; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.4.ebuild: - Version bump. - -*shadow-4.1.3.1 (18 Apr 2009) - - 18 Apr 2009; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.3.1.ebuild: - Version bump. - -*shadow-4.1.3 (12 Apr 2009) - - 12 Apr 2009; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.1.3-dots-in-usernames.patch, +shadow-4.1.3.ebuild: - Version bump. - - 15 Mar 2009; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.1.2.2-id-types.patch, - +files/shadow-4.1.2.2-optional-nscd.patch, - +files/shadow-4.1.2.2-optional-utimes.patch, shadow-4.1.2.2.ebuild: - Add fixes from upstream to get building on uClibc again. - - 12 Mar 2009; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.1.2.2-l64a.patch, shadow-4.1.2.2.ebuild: - Fix building for uClibc #260001 by Jos van der Ende. - - 11 Feb 2009; Mike Frysinger <vapier@gentoo.org> - +files/4.1.2.2/shadow-svn-2298.patch, - +files/4.1.2.2/shadow-svn-2364.patch, shadow-4.1.2.2.ebuild: - Grab some fixes from upstream to fix building on uClibc systems #256784. - - 02 Feb 2009; Raúl Porcel <armin76@gentoo.org> shadow-4.1.2.2.ebuild: - ia64 stable wrt #251320 - - 01 Feb 2009; Tobias Scherbaum <dertobi123@gentoo.org> - shadow-4.1.2.2.ebuild: - ppc stable, bug #251320 - - 26 Jan 2009; Jeroen Roovers <jer@gentoo.org> shadow-4.1.2.2.ebuild: - Stable for HPPA (bug #25132). - - 26 Jan 2009; Ferris McCormick <fmccor@gentoo.org> shadow-4.1.2.2.ebuild: - Sparc stable, Security Bug #251320. - - 25 Jan 2009; Tobias Klausmann <klausman@gentoo.org> shadow-4.1.2.2.ebuild: - Stable on alpha, bug #251320 - - 25 Jan 2009; Brent Baude <ranger@gentoo.org> shadow-4.1.2.2.ebuild: - Marking shadow-4.1.2.2 ppc64 for bug 251320 - - 25 Jan 2009; Markus Meier <maekke@gentoo.org> shadow-4.1.2.2.ebuild: - amd64/x86 stable, bug #251320 - - 20 Dec 2008; Peter Volkov <pva@gentoo.org> shadow-4.1.2.2.ebuild: - ~mips rekeyworeded, bug #210769. - - 01 Dec 2008; Mike Frysinger <vapier@gentoo.org> shadow-4.1.2.1.ebuild, - shadow-4.1.2.2.ebuild: - Also run autoheader due to AC_CHECK_DECLS #249403. - - 30 Nov 2008; Mike Frysinger <vapier@gentoo.org> shadow-4.1.2.1.ebuild, - shadow-4.1.2.2.ebuild: - Only run eautoconf as openpam touches just configure #233286 by Sergey - Dryabzhinsky. - -*shadow-4.1.2.2 (23 Nov 2008) - - 23 Nov 2008; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.2.2.ebuild: - Version bump. - - 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> - files/shadow-4.1.1-audit.patch: - Fix patch with absolute paths. - - 23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 22 Jul 2008; Diego Pettenò <flameeyes@gentoo.org> - +files/shadow-4.1.2.1+openpam.patch, shadow-4.1.2.1.ebuild: - Add patch to build against OpenPAM, thanks to Seraphim Mellos in bug - #232586. - -*shadow-4.1.2.1 (28 Jun 2008) - - 28 Jun 2008; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.2.1.ebuild: - Version bump. - -*shadow-4.1.2-r1 (27 May 2008) - - 27 May 2008; Diego Pettenò <flameeyes@gentoo.org> - +files/login_defs_pam.sed, -shadow-4.1.2.ebuild, +shadow-4.1.2-r1.ebuild: - Fix bug #223631: upstream removed the note that the options don't apply to - PAM, so now list the unusable entries explicitly. - -*shadow-4.1.2 (25 May 2008) - - 25 May 2008; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.2.ebuild: - Version bump. - - 17 May 2008; nixnut <nixnut@gentoo.org> shadow-4.1.0-r1.ebuild: - Added ~ppc wrt bug 210769 - - 11 May 2008; Ulrich Mueller <ulm@gentoo.org> shadow-4.0.18.1-r1.ebuild, - shadow-4.0.18.2.ebuild, shadow-4.1.0.ebuild, shadow-4.1.0-r1.ebuild, - shadow-4.1.1.ebuild: - Fix dependency: app-admin/skey moved to sys-auth/skey. - - 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.1.1-audit.patch, shadow-4.1.1.ebuild: - Add fix from upstream for build failure with USE=audit #216291. - - 06 Apr 2008; Mike Frysinger <vapier@gentoo.org> shadow-4.1.1.ebuild: - Add support for USE=audit. - -*shadow-4.1.1 (05 Apr 2008) - - 05 Apr 2008; Mike Frysinger <vapier@gentoo.org> +shadow-4.1.1.ebuild: - Version bump. - - 31 Mar 2008; <ricmm@gentoo.org> shadow-4.0.18.1-r1.ebuild: - Drop to ~mips due to unstable deps - - 17 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> - shadow-4.1.0-r1.ebuild: - ~amd64 added back - - 12 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> - shadow-4.0.18.2.ebuild: - amd64 stable wrt bug #211252 - - 06 Mar 2008; Raúl Porcel <armin76@gentoo.org> shadow-4.1.0-r1.ebuild: - Add ~alpha/~ia64 wrt #210769 - - 05 Mar 2008; Ferris McCormick <fmccor@gentoo.org> shadow-4.1.0-r1.ebuild: - ~sparc for testing --- Bug #210769. - - 04 Mar 2008; Brent Baude <ranger@gentoo.org> shadow-4.1.0-r1.ebuild: - keyworded ~arch for ppc64, bug 210769 - - 04 Mar 2008; <cla@gentoo.org> shadow-4.1.0-r1.ebuild: - Marked ~x86 (bug #210769). Thanks to Michał Wołonkiewicz <volon@vp.pl> for - testing. - - 03 Mar 2008; Jeroen Roovers <jer@gentoo.org> shadow-4.1.0-r1.ebuild: - Marked ~hppa (bug #210769). - - 25 Feb 2008; Raúl Porcel <armin76@gentoo.org> shadow-4.0.18.2.ebuild: - alpha/ia64/sparc stable wrt #211252 - - 25 Feb 2008; Jeroen Roovers <jer@gentoo.org> shadow-4.0.18.2.ebuild: - Stable for HPPA (bug #211252). - - 24 Feb 2008; Markus Meier <maekke@gentoo.org> shadow-4.0.18.2.ebuild: - x86 stable, bug #211252 - - 24 Feb 2008; Brent Baude <ranger@gentoo.org> shadow-4.0.18.2.ebuild: - Marking shadow-4.0.18.2 ppc and ppc64 for bug 211252 - -*shadow-4.1.0-r1 (24 Feb 2008) - - 24 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> - -shadow-4.0.18.2-r2.ebuild, +shadow-4.1.0-r1.ebuild: - Port pambase to 4.1.0 version, and remove the version based off 4.0.18.2. - -*shadow-4.1.0 (24 Feb 2008) - - 24 Feb 2008; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.1.0-fix-useradd-usergroups.patch, +shadow-4.1.0.ebuild: - Version bump. - - 24 Feb 2008; Mike Frysinger <vapier@gentoo.org> - files/shadow-4.0.17-login.defs.patch, shadow-4.0.18.1-r1.ebuild, - shadow-4.0.18.2.ebuild, shadow-4.0.18.2-r2.ebuild: - Make sure we respect libdir for path to cracklib dicts. - - 20 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> - shadow-4.0.18.2-r2.ebuild: - Fix dependencies for pambase/pam. - -*shadow-4.0.18.2-r2 (19 Feb 2008) - - 19 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> files/login.pamd.3, - -shadow-4.0.18.2-r1.ebuild, +shadow-4.0.18.2-r2.ebuild: - Use system-local-login rather than system-login and depend on new pambase. - -*shadow-4.0.18.2-r1 (19 Feb 2008) - - 19 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> +files/login.pamd.3, - +shadow-4.0.18.2-r1.ebuild: - Add a new revision that uses the new system-login provided by pambase. - - 04 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> +files/login.pamd.2, - shadow-4.0.18.2.ebuild: - PAM support updates: change the dependency back to sys-libs/pam but ask for - at least version 0.99 (so that we know we have the proper pam_tally, and we - can drop some conditionals), OpenPAM wouldn't work for shadow for now. - Simplify the pam.d installation, without using the for loop and case - statement. Use the 'epam syntax' for the selinux conditional. Update the - options passed to pam_tally so that they don't throw warnings when used with - Linux-PAM 0.99. - -*shadow-4.0.18.2 (04 Nov 2007) - - 04 Nov 2007; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.18.2-useradd.patch, +shadow-4.0.18.2.ebuild: - Version bump. - - 05 Jul 2007; Brent Baude <ranger@gentoo.org> shadow-4.0.18.1-r1.ebuild: - Marking shadow-4.0.18.1-r1 ppc64 stable for bug 183886 - - 04 Jul 2007; Mike Doty <kingtaco@gentoo.org> shadow-4.0.18.1-r1.ebuild: - amd64 stable, bug 183886 - - 02 Jul 2007; Jeroen Roovers <jer@gentoo.org> shadow-4.0.18.1-r1.ebuild: - Stable for HPPA (bug #183886). - - 02 Jul 2007; Raúl Porcel <armin76@gentoo.org> shadow-4.0.18.1-r1.ebuild: - alpha/ia64/x86 stable wrt #183886 - - 02 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.18.1-r1.ebuild: - Stable on sparc wrt #183886 - - 02 Jul 2007; Lars Weiler <pylon@gentoo.org> shadow-4.0.18.1-r1.ebuild: - Stable on ppc; bug #183886. - - 01 Jul 2007; Joshua Kinard <kumba@gentoo.org> shadow-4.0.18.1-r1.ebuild: - Stable on mips, per #183886. - -*shadow-4.0.18.1-r1 (01 Jul 2007) - - 01 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> +files/login.pamd.1, - +shadow-4.0.18.1-r1.ebuild: - Revision bump with a fixed pam.d/login file that actually honours stuff like - pam_nologin. - - 23 Jun 2007; Daniel Drake <dsd@gentoo.org> shadow-4.0.18.1.ebuild: - Add GPL to license, as vipw is GPL-licensed (bug #175257) - - 26 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> - shadow-4.0.18.1.ebuild: - Added ttyPSC0 for PPC for EFIKA. Closing bug #158208. - - 23 Nov 2006; <blubb@gentoo.org> shadow-4.0.18.1.ebuild: - stable on amd64 - - 14 Nov 2006; Tom Gall <tgall@gentoo.org> shadow-4.0.18.1.ebuild: - stable on ppc64 bug154966 - - 14 Nov 2006; Matti Bickel <mabi@gentoo.org> shadow-4.0.18.1.ebuild: - Stable on ppc (bug #154966) - - 14 Nov 2006; Jeroen Roovers <jer@gentoo.org> shadow-4.0.18.1.ebuild: - Stable for HPPA (bug #154966). - - 13 Nov 2006; Andrej Kacian <ticho@gentoo.org> shadow-4.0.18.1.ebuild: - Stable on x86, bug #154966. - - 13 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.18.1.ebuild: - Stable on sparc wrt #154966 - - 05 Nov 2006; Mike Frysinger <vapier@gentoo.org> shadow-4.0.18.1.ebuild: - Block app-admin/nologin since shadow provides it as well #144541. - - 17 Oct 2006; Daniel Drake <dsd@gentoo.org> shadow-4.0.15-r2.ebuild, - shadow-4.0.16-r2.ebuild, shadow-4.0.17.ebuild, shadow-4.0.17-r1.ebuild, - shadow-4.0.18.1.ebuild: - Make cracklib support optional through USE flag - -*shadow-4.0.18.1 (04 Aug 2006) - - 04 Aug 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.18.1-useradd-usermod.patch, +shadow-4.0.18.1.ebuild: - Version bump. - - 18 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +files/login_defs.awk, - shadow-4.0.17-r1.ebuild: - Also comment the already commented options as not supported by pam. Fix - Mike's problem with running sed multiple times. - -*shadow-4.0.17-r1 (15 Jul 2006) - - 15 Jul 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.17-login.defs.patch, +shadow-4.0.17-r1.ebuild: - Merge handling of login.defs (fixing #140451 along the way) and cut out - old/dead code related to forced upgrading of config files. - - 15 Jul 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.17-no-local-getpass.patch, shadow-4.0.17.ebuild: - Fix by Ulrich Mueller for building with USE=skey #139966. - -*shadow-4.0.17 (11 Jul 2006) - - 11 Jul 2006; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.17.ebuild: - Version bump. - - 09 Jul 2006; Joshua Kinard <kumba@gentoo.org> shadow-4.0.15-r2.ebuild: - Marked stable on mips. - -*shadow-4.0.16-r2 (06 Jul 2006) - - 06 Jul 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.16-mail-creation.patch, +shadow-4.0.16-r2.ebuild: - Backport fix from upstream for mail spool creation #139346 by Wolfram Schlich. - -*shadow-4.0.16-r1 (04 Jul 2006) - - 04 Jul 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.16-check-opendir.patch, - +files/shadow-4.0.16-fix-useradd-usergroups.patch, - +shadow-4.0.16-r1.ebuild: - Fix useradd behavior when using -g #128715 by Max Lorenz and fix segfault in - userdel with -r and /dev/null #139148 by David Roussel. - - 10 Jun 2006; <roy@gentoo.org> shadow-4.0.14-r1.ebuild, - shadow-4.0.15-r2.ebuild, shadow-4.0.16.ebuild: - Move grpconv from baselayout to shadow where it belongs. - - 09 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: - Make the login.defs installed not throw warning about GETPASS_ASTERISKS, by - enabling it only skey. - -*shadow-4.0.16 (07 Jun 2006) - - 07 Jun 2006; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.16.ebuild: - Version bump. - - 03 Jun 2006; Rene Nussbaumer <killerfox@gentoo.org> - shadow-4.0.15-r2.ebuild: - Stable on hppa. See bug #133615. - - 31 May 2006; Thomas Cort <tcort@gentoo.org> shadow-4.0.15-r2.ebuild: - Stable on alpha wrt security Bug #133615. - - 30 May 2006; Markus Ullmann <jokey@gentoo.org> shadow-4.0.15-r2.ebuild: - Stable on arm wrt bug #133615 - - 30 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.15-r2.ebuild: - Stable on sparc wrt security #133615 - - 30 May 2006; Luca Barbato <lu_zero@gentoo.org> shadow-4.0.15-r2.ebuild: - Marked ppc - - 30 May 2006; Chris Gianelloni <wolf31o2@gentoo.org> - shadow-4.0.15-r2.ebuild: - Stable on amd64 and x86 wrt bug #133615. - - 30 May 2006; Markus Rothe <corsair@gentoo.org> shadow-4.0.15-r2.ebuild: - Stable on ppc64; bug #133615 - -*shadow-4.0.15-r2 (26 May 2006) - - 26 May 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.15-sanity-checks.patch, +shadow-4.0.15-r2.ebuild: - Patch from upstream to add some more sanity checks #133615 by Sune - Kloppenborg Jeppesen. - - 09 May 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.15-uclibc-missing-l64a.patch, shadow-4.0.15-r1.ebuild: - Last uClibc release still needs l64a() #132666 by solar. - -*shadow-4.0.15-r1 (07 May 2006) - - 07 May 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.15-no-default-MAIL.patch, +shadow-4.0.15-r1.ebuild: - Dont export MAIL if MAIL_CHECK_ENAB is disabled. - - 27 Apr 2006; Alec Warner <antarus@gentoo.org> - files/digest-shadow-4.0.7-r4, files/digest-shadow-4.0.11.1-r1, - files/digest-shadow-4.0.11.1-r2, files/digest-shadow-4.0.12, - files/digest-shadow-4.0.13, Manifest: - Fixing SHA256 digest, pass four - - 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> shadow-4.0.14-r1.ebuild: - Marked stable on mips. - - 26 Mar 2006; Bryan Østergaard <kloeri@gentoo.org shadow-4.0.14-r1.ebuild: - Stable on alpha, bug 125419. - -*shadow-4.0.15 (21 Mar 2006) - - 21 Mar 2006; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.15.ebuild: - Version bump. - -*shadow-4.0.14-r3 (17 Mar 2006) - - 17 Mar 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.14-userdel-group-remove.patch, +shadow-4.0.14-r3.ebuild: - Fix from upstream for bogus userdel warning #126432 by Gabriel Lavoie. - - 14 Mar 2006; Emanuele Giaquinta <exg@gentoo.org> shadow-4.0.14-r1.ebuild: - Stable on ppc; bug #125419 - - 13 Mar 2006; Joshua Jackson <tsunam@gentoo.org> shadow-4.0.14-r1.ebuild: - Stable on x86; bug #125419 - -*shadow-4.0.14-r2 (12 Mar 2006) - - 12 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> +files/login.defs, - +files/login.pamd, +shadow-4.0.14-r2.ebuild: - Merge pam-login back into shadow, as 4.x version was already being used; - this means that upgrade from 4.0.14-r1 requires to remove pam-login before. - - 11 Mar 2006; Mike Frysinger <vapier@gentoo.org> shadow-4.0.11.1-r1.ebuild, - shadow-4.0.11.1-r2.ebuild, shadow-4.0.12.ebuild, shadow-4.0.13.ebuild, - shadow-4.0.14-r1.ebuild: - The skey configure option is just plain skey now, not libskey, as noted by - Torsten Veller #125419. - - 09 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.14-r1.ebuild: - Stable on sparc wrt #125419 - - 09 Mar 2006; Luis Medinas <metalgod@gentoo.org> shadow-4.0.14-r1.ebuild: - Stable on amd64. Bug #125419. - - 08 Mar 2006; Markus Rothe <corsair@gentoo.org> shadow-4.0.14-r1.ebuild: - Stable on ppc64; bug #125419 - - 10 Jan 2006; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.13.ebuild, - shadow-4.0.14-r1.ebuild: - Fix libselinux version required. - -*shadow-4.0.14-r1 (10 Jan 2006) - - 10 Jan 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.14-su-cvs.patch, -shadow-4.0.14.ebuild, - +shadow-4.0.14-r1.ebuild: - Grab a fix from upstream cvs to fix `su -c boo` syntax #118342 by Wolfgang - Frisch. - -*shadow-4.0.14 (04 Jan 2006) - - 04 Jan 2006; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.14-nls-manpages.patch, - +files/shadow-4.0.14-su-fix-environment.patch, +shadow-4.0.14.ebuild: - Version bump. - - 25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> shadow-4.0.13.ebuild: - Use bindnow-flags function instead of -Wl,-z,now. - -*shadow-4.0.13 (10 Oct 2005) - - 10 Oct 2005; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.13-dots-in-usernames.patch, - +files/shadow-4.0.13-login.defs.patch, - +files/shadow-4.0.13-long-groupnames.patch, - +files/shadow-4.0.13-nonis.patch, - +files/shadow-4.0.13-su-fix-environment.patch, +shadow-4.0.13.ebuild: - Version bump. - - 24 Aug 2005; Martin Schlemmer <azarah@gentoo.org> - +files/shadow-4.0.12-gcc2.patch, shadow-4.0.12.ebuild: - Fix compiling with gcc-2.95.x - -*shadow-4.0.12 (23 Aug 2005) - - 23 Aug 2005; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.12-dots-in-usernames.patch, - +files/shadow-4.0.12-long-groupnames.patch, +shadow-4.0.12.ebuild: - Version bump. - - 09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> shadow-4.0.7-r3.ebuild: - Stable on mips. - -*shadow-4.0.11.1-r2 (04 Aug 2005) - - 04 Aug 2005; Martin Schlemmer <azarah@gentoo.org> - +files/shadow-4.0.11.1-su-fix-environment.patch, - +shadow-4.0.11.1-r2.ebuild: - Patch from upstream enables the new environment too early for PAM, causing - segfaults in some cases. - -*shadow-4.0.11.1-r1 (03 Aug 2005) - - 03 Aug 2005; Martin Schlemmer <azarah@gentoo.org> - +files/shadow-4.0.11.1-SUPATH.patch, - +files/shadow-4.0.11.1-ngettext.patch, - +files/shadow-4.0.11.1-uclibc-missing-l64a.patch, - +shadow-4.0.11.1-r1.ebuild: - Checked with upstream .. SUPATH and PATH valid again for PAM (bug #101047). - Fix building on UCLIBC. - -*shadow-4.0.11.1 (01 Aug 2005) - - 01 Aug 2005; Martin Schlemmer <azarah@gentoo.org> - +files/shadow-4.0.11.1-perms.patch, +shadow-4.0.11.1.ebuild: - Update version. Remove login.access, related manpages, etc for PAM enabled, - as its not used. - -*shadow-4.0.7-r4 (25 Jul 2005) - - 25 Jul 2005; <solar.@gentoo.org> +files/shadow-4.0.7-perms.patch, - shadow-4.0.10.ebuild, +shadow-4.0.7-r4.ebuild: - - added no /usr/bin suid option as local use flag nousuid for single user - systems - - 19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> shadow-4.0.7-r3.ebuild: - Stable on alpha. - - 10 Jul 2005; Joseph Jezak <josejx@gentoo.org> shadow-4.0.7-r3.ebuild: - Marked ppc stable. - - 10 Jul 2005; Daniel Ostrow <dostrow@gentoo.org> shadow-4.0.7-r3.ebuild: - Change check for ppc64 and securetty from tc-arch to tc-arch-kernel. - - 08 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> - shadow-4.0.7-r3.ebuild: - Stable on hppa. - - 08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.7-r3.ebuild: - Stable on sparc - - 08 Jul 2005; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.10.ebuild: - Add NSCD patches from 4.0.7-r3 as well. - -*shadow-4.0.7-r3 (08 Jul 2005) - - 08 Jul 2005; Martin Schlemmer <azarah@gentoo.org> - +files/shadow-4.0.7-nscd-EPIPE-failure.patch, - +files/shadow-4.0.7-nscd-socket-path.patch, shadow-4.0.7-r3.ebuild: - Fix EPIPE when nscd is used, bug #80413. - - 07 Jul 2005; Markus Rothe <corsair@gentoo.org> shadow-4.0.7-r2.ebuild: - Stable on ppc64 - - 07 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> shadow-4.0.7-r2.ebuild: - Stable on amd64 - -*shadow-4.0.10 (30 Jun 2005) - - 30 Jun 2005; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.10-dots-in-usernames.patch, - +files/shadow-4.0.10-fix-configure.patch, - +files/shadow-4.0.10-long-groupnames.patch, - +files/shadow-4.0.10-nls-manpages.patch, +files/shadow-4.0.10-nonis.patch, - +shadow-4.0.10.ebuild: - Version bump. - - 16 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> - files/pam.d/system-auth-1.1, files/pam.d-include/system-auth-1.1, - files/pam.d/login, files/pam.d/other, files/pam.d/passwd, - files/pam.d/shadow, files/pam.d/su, files/pam.d/system-auth: - Make all pam.d files use just the modules' filenames instead of full path to - fix multilib setups. - - 10 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/securetty: - Added vc/0 tty0 for uml. Blame rocket. - -*shadow-4.0.7-r2 (03 Jun 2005) - - 03 Jun 2005; Diego Pettenò <flameeyes@gentoo.org> - +files/pam.d-include/system-auth-1.1, +files/pam.d-include/login, - +files/pam.d-include/other, +files/pam.d-include/passwd, - +files/pam.d-include/shadow, +files/pam.d-include/su, - +files/pam.d-include/su-openpam, +files/pam.d-include/system-auth, - +shadow-4.0.7-r2.ebuild: - New revision depending on virtual/pam and using include syntax. Fixes - OpenPAM and AMD64 compatibility. - - 29 May 2005; <solar@gentoo.org> shadow-4.0.4.1-r4.ebuild: - - update sys-apps/shadow to use libc expanded variable elibc_uclibc vs uclibc - so USE=-* works - - 23 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/securetty: - Added hvc0 to securetty for ppc64 serial console. - - 22 Mar 2005; Martin Schlemmer <azarah@gentoo.org> - +files/shadow-4.0.7-lastlog.patch, shadow-4.0.7-r1.ebuild: - Fix last login logging for tty's - patch from upstream via - Robert Connolly <robert@linuxfromscratch.org>. - -*shadow-4.0.7-r1 (25 Feb 2005) - - 25 Feb 2005; Martin Schlemmer <azarah@gentoo.org> - files/pam.d/system-auth-1.1, +shadow-4.0.7-r1.ebuild: - No longer DEPEND on pam-login, but PDEPEND on pam-login-3.17 or later, as we - move the login pam.d file there. Remove the pam_console comments from - pam.d/system-auth-1.1, as it is needed in pam.d/login. Do not install other - and system-auth pam.d files if we have pam-0.78 or later. - - 10 Feb 2005; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.5-r3.ebuild: - Basically -r3 is the same as -r2, just with fix for the MAIL issue with su, - so mark stable for all that have -r2 stable. - -*shadow-4.0.7 (06 Feb 2005) - - 06 Feb 2005; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.7-iswheel.patch, +shadow-4.0.7.ebuild: - Version bump with wheel patch by Gregorio Guidi #80345. - -*shadow-4.0.6-r1 (11 Jan 2005) - - 11 Jan 2005; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.6-r1.ebuild: - Fix patch to nscd socket #74395 by Phil Pennock. - - 10 Jan 2005; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.6-dots-in-usernames.patch, - +files/shadow-4.0.6-long-groupnames.patch, shadow-4.0.6.ebuild: - Add patches to enable long group names #3485 and usernames with a . in them - #22920. - - 06 Jan 2005; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.6-manpages.patch, shadow-4.0.6.ebuild: - Add minor patch by Eric Brown to SEE ALSO in manpages #70880. - - 04 Jan 2005; Markus Rothe <corsair@gentoo.org> shadow-4.0.5-r3.ebuild: - Stable on ppc64 - - 02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 25 Nov 2004; <solar@gentoo.org> shadow-4.0.5-r2.ebuild, - shadow-4.0.5-r3.ebuild, shadow-4.0.6.ebuild: - Fix RDEPEND's for bug #67815 again - - 23 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5-r2.ebuild, - shadow-4.0.5-r3.ebuild, shadow-4.0.6.ebuild: - Update DEPENDs so that we either require pam-login or block it depending on - USE=pam #67815. - -*shadow-4.0.6 (11 Nov 2004) - - 11 Nov 2004; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.6-fix-configure.patch, +shadow-4.0.6.ebuild: - Version bump #70757 by Lindsay Jack. - -*shadow-4.0.5-r3 (07 Nov 2004) - - 07 Nov 2004; Martin Schlemmer <azarah@gentoo.org> : - Fix configure not detecting maildir, etc properly. Fix pam_env set variables - not being set. - - 07 Nov 2004; Joshua Kinard <kumba@gentoo.org> shadow-4.0.5-r2.ebuild: - Marked stable on mips. - -*shadow-4.0.5-r2 (03 Nov 2004) - - 03 Nov 2004; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.5-hack-X-envvars.patch, +shadow-4.0.5-r2.ebuild: - Restore DISPLAY/XAUTHORITY env passing hack for now #69925. - -*shadow-4.0.5-r1 (03 Nov 2004) - - 03 Nov 2004; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.5-remove-else.patch, +shadow-4.0.5-r1.ebuild, - shadow-4.0.5.ebuild: - Small security patch from upstream cvs #69212 and install more pam.d files - #69895. - - 02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> - shadow-4.0.5.ebuild: - Stable amd64. - - 02 Nov 2004; Markus Rothe <corsair@gentoo.org> shadow-4.0.5.ebuild: - Stable on ppc64, bug #69212 - - 02 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5.ebuild: - Mark arm/hppa/ia64/s390/x86 stable for security, fix duplicate manpage - install #69781, and block virtual/login when USE=-pam. - - 02 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.5.ebuild: - Stable on sparc wrt #69212 - - 02 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> shadow-4.0.5.ebuild: - Stable on alpha, bug 69212. - - 02 Nov 2004; Lars Weiler <pylon@gentoo.org> shadow-4.0.5.ebuild: - Stable on ppc. Bug #69212. - - 01 Nov 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.5.ebuild, - +files/shadow-4.0.5-skey.patch: - Add patch by Mark Wagner to fix skey support #69741 by Thomas Matthijs. - - 28 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r4.ebuild, - shadow-4.0.5.ebuild, +files/shadow-4.0.4.1-passwd-typo.patch: - Fix small glitch in passwd.1 #68150 by rob holland. - -*shadow-4.0.5 (28 Oct 2004) - - 28 Oct 2004; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.5-nls-manpages.patch, +shadow-4.0.5.ebuild: - Version bump #69212 by me. - - 16 Oct 2004; Mike Frysinger <vapier@gentoo.org> - +files/shadow-4.0.4.1-nls-manpages.patch: - Add a small patch I made to not install manpages if USE=-nls. - - 15 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.4.1-r4.ebuild: - Stable on sparc - - 10 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r3.ebuild, - shadow-4.0.4.1-r4.ebuild: - Move /usr/bin/passwd -> /bin/passwd to aid system recovery #64441. - - 09 Oct 2004; Mike Frysinger <vapier@gentoo.org> shadow-4.0.4.1-r4.ebuild: - Clean up the manpage fixes and change setuid perms to 4711 by default #47208. - -*shadow-4.0.4.1-r4 (07 Oct 2004) - - 07 Oct 2004; Mike Frysinger <vapier@gentoo.org> +shadow-4.0.4.1-r4.ebuild - +files/shadow-4.0.4.1-userdel-missing-brackets.patch: - Add patch to fix exit status while using pam #66687 by Scott Beck/Jason - Rhinelander. - - 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - shadow-4.0.4.1-r1.ebuild, shadow-4.0.4.1-r2.ebuild: - Masked shadow-4.0.4.1-r2.ebuild stable for ppc - - 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - shadow-4.0.4.1-r1.ebuild: - Masked shadow-4.0.4.1-r1.ebuild stable for ppc - - 18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> - shadow-4.0.4.1-r3.ebuild: - Stable on sparc - - 29 Jul 2004; Guy Martin <gmsoft@gentoo.org> shadow-4.0.4.1-r3.ebuild: - Stable on hppa. - - 12 Jul 2004; Tom Gall <tgall@gentoo.org> shadow-4.0.3-r10:ebuild: - stable on ppc64, add ttyS0 to ppc64 securetty, and add in - epatch for gcc 34 Ibug #47455 (bug #56273) - - 03 Jul 2004; Guy Martin <gmsoft@gentoo.org> shadow-4.0.4.1-r2.ebuild: - Marked stable on hppa. - -*shadow-4.0.4.1-r3 (03 Jul 2004) - - 03 Jul 2004; Chris PeBenito <pebenito@gentoo.org> - files/shadow-4.0.4.1-selinux.diff, +shadow-4.0.4.1-r3.ebuild: - Fix /etc/passwd labeling issue in SELinux patch caught by Petre Rodan in - #55781. Otherwise same as 4.0.4.1-r2. - - 03 Jul 2004; Joshua Kinard <kumba@gentoo.org> shadow-4.0.4.1-r2.ebuild: - Marked stable on mips. - - 29 Jun 2004; Aron Griffis <agriffis@gentoo.org> shadow-4.0.4.1-r2.ebuild: - stable on x86, alpha, ia64 - - 27 Jun 2004; Aron Griffis <agriffis@gentoo.org> shadow-4.0.3-r10.ebuild, - shadow-4.0.3-r9.ebuild, shadow-4.0.4.1-r1.ebuild, shadow-4.0.4.1.ebuild: - QA - fix use invocation - - 15 Jun 2004; <solar@gentoo.org> shadow-4.0.4.1-r2.ebuild, - files/shadow-4.0.4.1-nonis.patch: - added nonis patch and uclibc USE to allow shadow to be compiled under uclibc - envs - - 11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> shadow-4.0.4.1-r1.ebuild: - Stable on alpha. - -*shadow-4.0.4.1-r2 (28 May 2004) - - 28 May 2004; Aron Griffis <agriffis@gentoo.org> +shadow-4.0.4.1-r2.ebuild: - Remove libshadow and libmisc from the shadow package. They shouldn't be - installed; they're for package internal use only. Installing them breaks - packages that check for libshadow such as freeradius. See bug 37725 for more - information. Thanks to Hans W. Wurst for providing some good information in - that bug. - -*shadow-4.0.4.1-r1 (06 May 2004) - - 06 May 2004; Aron Griffis <agriffis@gentoo.org> +shadow-4.0.4.1-r1.ebuild, - shadow-4.0.4.1.ebuild: - Fix bug 35736: Use -fPIC when building on 64-bit systems so that other - packages which link shadow into their shared objects will build, for example - freeradius. Normally this is something to fix globally, but don't want to hurt - performance for other arches. - - 04 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.3-r10.ebuild, - shadow-4.0.4.1.ebuild: - hppa consoles added to securetty, sparc cleanup, for non-stable ebuilds - - 04 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> shadow-4.0.3-r9.ebuild: - hppa consoles added to securetty, sparc cleanup - - 22 Apr 2004; Travis Tilley <lv@gentoo.org> - +files/shadow-4.0.3-gcc34-xmalloc.patch, - +files/shadow-4.0.4.1-gcc34-xmalloc.patch, shadow-4.0.3-r9.ebuild, - shadow-4.0.4.1.ebuild: - fixes for compiling with gcc 3.4 - bug #47455 - - 29 Mar 2004; Jon Portnoy <avenj@gentoo.org> shadow-4.0.3-r9.ebuild, - shadow-4.0.3-r10.ebuild, shadow-4.0.4.1.ebuild : - Need nls in IUSE, referenced in DEPEND. Bug #44548. - - 16 Feb 2004; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r9.ebuild, - shadow-4.0.4.1.ebuild: - Fix sg, adduser and vigr symlinks (make them relative not absolute), bug - #41178. - - 23 Jan 2004; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.4.1.ebuild, - files/shadow-4.0.4.1-selinux.diff: - Update SELinux patch. - -*shadow-4.0.4.1 (22 Jan 2004) - - 22 Jan 2004; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.4.1.ebuild, - files/shadow-4.0.4.1-su-pam_open_session.patch, - files/shadow-4.0.4.1-useradd-manpage-update.patch: - Update version. - -*shadow-4.0.3-r10 (09 Jan 2004) - - 09 Jan 2004; Aron Griffis <agriffis@gentoo.org> shadow-4.0.3-r10.ebuild: - Enable building of shared objects. Thanks to Nico Baggus in bug 37725. - This also closes bug 37719 since freeradius should be able to build with - libshadow.so - - 15 Dec 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r9.ebuild: - Install the correct version of /etc/pam.d/system-auth, and do not install - system-auth-1.1. Do not force update anymore. - - 10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild: - don't install man 5 passwd either, man-pages again - - 10 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild: - don't install the getspnam manpage -- man-pages package handles that and does - it with a better version, to boot - - 09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild: - don't install the id man page, coreutils does that - -*shadow-4.0.3-r9 (06 Dec 2003) - - 06 Dec 2003; Seemant Kulleen <seemant@gentoo.org> shadow-4.0.3-r9.ebuild: - version bump to force /bin/groups to be on the system -- /bin/groups has been - removed from coreutils, and now only shadow will provide it. Note that - coreutils used to compile su and not install it. This behaviour was - changed in the bumped coreutils as well (not that that has any effect on - this, but thought I'd mention it anyway) - -*shadow-4.0.3-r8 (17 Nov 2003) - - 17 Nov 2003; Joshua Brindle <method@gentoo.org> shadow-4.0.3-r8.ebuild: - added optional pam support - - 28 Oct 2003; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.3-r7.ebuild, - files/shadow-4.0.3-selinux.diff: - Add new API SELinux patch - - 26 Sep 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r7.ebuild: - Mark stable. - - 26 Sep 2003; Martin Holzer <mholzer@gentoo.org> shadow-4.0.3-r3.ebuild, - shadow-4.0.3-r4.ebuild, shadow-4.0.3-r5.ebuild, shadow-4.0.3-r6.ebuild, - shadow-4.0.3-r7.ebuild: - Added nls? sys-devel/gettext. Closes #29236. - -*shadow-4.0.3-r7 (04 Aug 2003) - - 04 Aug 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r7.ebuild, - files/pam.d/system-auth-1.1: - Remove the 'nodelay' option from authentication (/etc/pam.d/system-auth), bug - #24081. - - 29 Jun 2003; Chris PeBenito <pebenito@gentoo.org> shadow-4.0.3-r6.ebuild: - Remove selinux stuff, as its no longer needed. Using pam-login again. - -*shadow-4.0.3-r6 (18 May 2003) - - 18 May 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r6.ebuild: - Get the fixed version that do not exclude selinux in as latest stable. - -*shadow-4.0.3-r5 (13 May 2003) - - 14 May 2003; Joshua Kinard <kumba@gentoo.org> shadow-4.0.3-r5.ebuild: - Added "gnuconfig" to inherit and "gnuconfig_update" to src_compile() - to make it detect mips systems correctly - - 13 May 2003; Daniel Ahlberg <aliz@gentoo.org> : - Security update. Added nodelay to second line of pam.d/system-auth. - -*shadow-4.0.3-r4 (23 Feb 2003) - - 24 Feb 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r4.ebuild : - Remove the patch again, as it could be a security risk. Users can use: - # sudo -u nobody ls - If they need to run commands as user with '/bin/false' as login ... - - 23 Feb 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r4.ebuild : - If su should not simulate a login shell, use '/bin/sh' as shell to enable - running of commands as user with /bin/false as shell, closing bug #15015. - - 21 Feb 2003; Zach Welch <zwelch@gentoo.org> shadow-4.0.3-r3.ebuild : - Added arm to keywords. - - 09 Feb 2003; Guy Martin <gmsoft@gentoo.org> shadow-4.0.3-r3.ebuild : - Added hppa to keywords. - - 19 Jan 2003; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r3.ebuild : - Patch the useradd manpage to be a bit more clear, closing bug #13203. - Thanks to Guy <guycad@mindspring.com>. - -*shadow-4.0.3-r3 (25 Dec 2002) - - 24 Mar 2003; Joshua Brindle <method@gentoo.org> shadow-4.0.3-r3.ebuild: - added pam.d files for selinux builds - - 23 Mar 2003; Joshua Brindle <method@gentoo.org> shadow-4.0.3-r3.ebuild: - added selinux support, thanks sindian - - 18 Jan 2003; Jan Seidel <tuxus@gentoo.org> : - Added mips to keywords - - 25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r3.ebuild : - Added /etc/default/useradd with default shell of /bin/bash, closing bug #5629. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : - Changed sparc ~sparc keywords. - - 03 Dec 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r2.ebuild : - Mark as stable. Update pam.d/su to use pam_filelist.so if uncommented. - This can be used as a type of /etc/suauth. Should close bug #4210. - - Fix an issue where /etc/pam.d/system-auth.new was still being installed. - -*shadow-4.0.3-r1 (20 Oct 2002) - - 20 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r2.ebuild : - Update the su-pam_open_session.patch, as the old one did not export - XAUTHORITY, or call pam_close_session(). - -*shadow-4.0.3-r1 (19 Oct 2002) - - 19 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3-r1.ebuild : - Get su to call pam_open_session(), and also set DISPLAY and XAUTHORITY, - else the session entries in /etc/pam.d/su never get executed, and - pam_xauth for one, is then never used. This should close bug #8831. - - 12 Oct 2002; Martin Schlemmer <azarah@gentoo.org> shadow-4.0.3.ebuild : - Fix bug #9031 (add /etc/default/ to fix useradd -D). - -*shadow-4.0.2-r4.ebuild (14 July 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.2-r4.ebuild : - Added KEYWORDS, SLOT. - -*shadow-4.0.1-r2.ebuild (14 July 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.1-r2.ebuild : - Added KEYWORDS, SLOT. - - 29 Jun 2002; M.Schlemmer <azarah@gentoo.org> - Update to use libtool.eclass. This fix the compile problems without - having custom $LIBS and $LDFLAGS. - -*shadow-4.0.2-r5 (28 Apr 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.2-r5.ebuild : - Added KEYWORDS. - - 28 Apr 2002; M.Schlemmer <azarah@gentoo.org> - Remove /etc/login.defs. - - 8 Apr 2002; M.Schlemmer <azarah@gentoo.org> - Removed /bin/login in favour of the one in util-linux, as the one - included here have a root exploit if pam_limits is in use. - - Libtoolized to fix .la files. Build is pretty broken if libtoolized, so had - to put a unortodox LIBS= and LDFLAGS= there. - -*shadow-4.0.3 (3 Apr 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-4.0.3.ebuild : - Added KEYWORDS. - - 3 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> - Added new shadow version, currently masked out until it's been - tested better. - -*shadow-4.0.2-r3 (3 Apr 2002) - - 3 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> - Cleaned up earlier fix to account for all possibilities, such as - binary packages, different ROOT's, and an already existing good - system-auth file. - -*shadow-4.0.2-r2 (3 Apr 2002) - - 3 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> - Fixed /etc/pam.d/system-auth to use pam_unix instead of pam_pwdb due - to security bug. - -*shadow-4.0.2-r1 (25 Mar 2002) - - 25 Mar 2002; M.Schlemmer <azarah@gentoo.org> - Fix the "libdir" in /usr/lib/libmisc.la. - -*shadow-20001016-r10 (12 Mar 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r10.ebuild : - Added KEYWORDS, SLOT. - - 12 Mar 2002; Seemant Kulleen <seemant@gentoo.org> - Added USE dependent nls compilation. - -*shadow-20001016-r9 (26 Feb 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r9.ebuild : - Added KEYWORDS, SLOT. - - 26 Feb 2002; T.Neidt <tod@gentoo.org> shadow-20001016-r9.ebuild, login.defs - Changed 'CREATE_HOME yes' to 'CREATE_HOME no' in login.defs. - CREATE_HOME is a RedHat'ism and is not supported by the stock shadow - package (see src/useradd.c). When CREATE_HOME is set to 'yes', - useradd generates a warning meassage. - - Bumped ebuild revision so login.defs will be updated by emerge updates. - - Note to users: 'useradd -m <user>' will create the home directory and - add any files in /etc/skel (see 'man useradd') - - -*shadow-20001016-r8 (25 Feb 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r8.ebuild : - Added KEYWORDS, SLOT. - - 25 Feb 2002; M.Schlemmer <azarah@gentoo.org> shadow-20001016-r8.ebuild - Added a 'rm -rf ${D}/usr/share/man/*' to Chris's man fix to clean the - Polish pages. Added the line for installing /etc/pam.d/chage again, which - should close bug #837. - -*shadow-20001016-r7 (20 Feb 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> shadow-20001016-r7.ebuild : - Added KEYWORDS, SLOT. - - 20 Feb 2002; Chris Houser <chouser@gentoo.org> shadow-20001016-r7.ebuild - files/digest-shadow-20001016-r7 ChangeLog : - - Changed man page installation. More man pages are now included, and all - should be in English (instead of the occasional Polish page). This closes - bug #594. - -*shadow-20001016-r6 (1 Feb 2002) - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest deleted file mode 100644 index 75577a4..0000000 --- a/sys-apps/shadow/Manifest +++ /dev/null @@ -1,27 +0,0 @@ -AUX default/useradd 96 SHA256 31aa2cbe4a34a9f7d4d134c1fecd007c9bbf4d40e19d0dcddbcd396f1853b490 SHA512 87b01ac88c2065392fa988871489d8403ef93341b4cfbadb4504f39a2a3396ddef756efc6378868d00627a58a1feb9612eb52a8135558a211a09c6a9ccf3404f WHIRLPOOL 9022a371e34e96a4c3193f24752979da27cdcd60aec1c8db1d2b427ab880b16917578ddcb4d8af02fd1d0eedc6b346cf43d7ae892e8580321e32e50f5498980b -AUX login.defs 6254 SHA256 b7bfd7b1c34ce3d35865b572abc69d278dea4eef4f349c26b238735547c4ac22 SHA512 7d21d6f72693e5485bde8bbf18a66b3aefef58fae057825fa84beeb548b78d7e12c00149d9c63a5fbdc32daaf1ee5bfa57f63b523b391562d4d2e81a6c06cf27 WHIRLPOOL 756549cd21f0101c861ece9194405a13a1fc4e7c3b9bae080103a3e1bb94b5073d90904d63c7c25fd2f02ef1c4a0d43b9eac4879adc0e1ad4ade4d2ee4532ab9 -AUX login.pamd.3 190 SHA256 1009e196b630dae5d1f40b1cc6ee42a38ecdb7c2cd4bfa40fb7114ee74e0bfd0 SHA512 7181fcdf5dc798230f482cd52827680839f054f79d67498bbdbc20d9926752d34858af37d0b5afc28be9ef5247ad884e027d6ccf29ea0f69ba75a6cdd80918f1 WHIRLPOOL 63012c9e4899f644e2f91fa31348d76718811035e42e5a94425a1e9689b8a67f92e11228b629ce70b9114a44ce4bdf54770fb6805aaacbc4beba4ab302589b24 -AUX login_defs.awk 738 SHA256 6ceb9e03c2f7df817f3162de48886c9c66a596cb2af98fbf523c93e26840113b SHA512 06a19785c55dd7b389342535c3dd9f56114eba54e27c415d921b8598f9862bad4c8d1b251bd0eb036ecefdf4124c444f30c504d7921d93dab3a0eaea03625f72 WHIRLPOOL 047cc78b7faf93b4508efa3f6238d2c013af4cffc920a7ffc0f0197d69cb301189f32ae2d74a9dceafea4999a33e0656dfd43aa4f791b5855e12a553e770ccde -AUX login_defs_pam.sed 479 SHA256 587239d5b1425c5766f10cea5352b325699fb35829d9375bda68bbfd74f1d839 SHA512 c4bda7776b5a0bdaa8e7e36c09fb005699cf8b1ef5b474021f7e95d98e62a39aebd354dcc8ad0c49316e8e5d0123429b893c3ff9e4024c18ac0e25b4ab4b45ed WHIRLPOOL a6c5ce16824dde56b4ae899cb9b8effc9b7d61133e88e262a22a5e0db080c85ead15d6d9a13c5583b6e55b368ffd890bf037a3957ce6071b370dd7fb50d63bf4 -AUX pam.d-include/login 245 SHA256 39bbe2ed696a22c7549a39a7cfd47c16e347e5af4fd71b8c01ec87fce59ba0a0 SHA512 87a503ed5df2c522cbf97dcb7f6c252fe9e6e4a4fd34e6641b5cbbaebd2ff4a4d861eeadb0196c7cb30717db8fa2194072500af2336f4b81d4bd87b106699c35 WHIRLPOOL 85a34f81ad9337d06c3162c4c897d8e20f26e9ad9eb399adf11e5eea4538d274ecd9498da37a4e374521d480eadcbcdf98b1991a79580af6e8bb1890f6e02f2f -AUX pam.d-include/other 142 SHA256 5e05df2743ec0021364b05f4bbe2e5a3a670abb5af845c3fa760731e5b7272ca SHA512 639db65a3f573e5d800790931ddac0f378a2d678338ff45068b9f5dda8aa9ebd858fed86c0c1e4f45c2ce3d04e3d8d4ec4ced57837a54e3c18e209711cfe2522 WHIRLPOOL ea34f5db2897fc506c63d0e0a2efc20d5f8c7b1f7353d1ab98c5becf8d0e73c1299a357114412376f17b42f43e0f1685810afe5dc86f42a400b86d7f9a314936 -AUX pam.d-include/passwd 144 SHA256 8c54d2e3aab50b2a8d3d36aa37f7d7bb32c15d9a3af9a10b7ec5b5ffcff9a5fb SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f WHIRLPOOL 879370adfb6a78c0acdeebf2c10a503d94925c34dceadb8677693f6c34e4e973f2584b221a9a81fdf23f084c430bbafa23a03440c1a95c798b58faedf4d412bd -AUX pam.d-include/shadow 152 SHA256 7fc1ccca85d2b1ac4dad9909792453c8d26e9aeab48c620d861a92b9355ac69f SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3 WHIRLPOOL 2b5282f983b5bf52c0311c2153dba2d12f6c07ae803d1723010bf4bbf4962d120aea026d32b1f3b062778da5222e7cb16dc39660e53b72173fba723a57b616de -AUX pam.d-include/su 1059 SHA256 63a6a6fb6194f4dff8fdd16214a563242a4ea6cb682f49af337378dfddaf2962 SHA512 c9535434437221fad058b9fad878da13f3a3d4fc9290e4a7366e6d4dab7e320ac40de297bcc874fbe83e50b5ea29c5aac39d7d250632f045d964150604381550 WHIRLPOOL 33283dee1e71ae36112c72d36852680291bab919158e8faab478f7fd32035732b2cf62d83df373fa06869d3c84f05b34477598e776f8e65a39dbc0ef8a2c3724 -AUX pam.d-include/su-openpam 249 SHA256 8d26b735b1b5aa598fc29a88a2d52eeed587210dd1dbd3180ef9bb440a3375b7 SHA512 242328ac89744a5178fdf904b4068d358e07a3ab69035ed586de05ae31a59a4d9929ae6e5f3aa0c60b61b22d8df8584aca47e3f682416979e89d4c7dbc76bdcd WHIRLPOOL 3f7e52c38abc07d9d289edc0b6b31ea8d5d84520e737f4e289e75c5df965eda424f0a4706bb3e5fd6e556b274a6472dc5ca90ba23d17f609ae1311b013b0aef7 -AUX pam.d-include/system-auth 380 SHA256 704c07b9bab8201d55d80970e5a086ea35d93d62969aeb27ee9ebef85a029ed9 SHA512 4a359425064711a4194cff517175f708c829e6f1ca24a77ce38eb10482a8ca5a7ac1f9e25ce301d1f0278963768483344d6caf0548685eb33019f8d4a7d4f847 WHIRLPOOL 8607d4d2a12ac3252902c5a5c592b07903e843a8ada2ed87bf589ab9ab358eef9734a5294862baa5558eef1381c5a77c4fd3e62b1bb9898232aab78f60fbe5d3 -AUX pam.d-include/system-auth-1.1 365 SHA256 e073f573c88515cf38fb22faa26ccf87d55d34e6d460d28ad25682958de4c13e SHA512 3633aff2be598a108d75bd5c2b92b399f0b244327be54ff29d498ef8f95107d0c39a62ffe983e19198d54540c36c028316b628081abf5e8f85cb946db41055c2 WHIRLPOOL 1cb61620c3fbc8ada4676b04d9e38da345f300e1115a13f81790decaa57d56d6d8ada8d1fa12c1857b0ea3591583cb9fa6f195237ebfa1e0ba48e667defa2c5f -AUX securetty 280 SHA256 8696cb3bf227aff9ffd7e0b08534854fe446135c04d4d117a6da95f771e8eec7 SHA512 45cef97f97fa8450e19d047c4dc3e84c023caa9d0778a0d229c30e51abff0a900a02d220618079dff9f097ff0b8d29cafd9f67bbf695699928eb31dd09e86df3 WHIRLPOOL 0d1edf1aaccd61eb6a0ebd0f5d5b0445bce35d93f5db7811d49a7f334bc91c115da22a031e40ee5c4789be22f10a716649184a95167e3a0f37b97a7446bedc5f -AUX shadow-4.1.3-dots-in-usernames.patch 302 SHA256 2299ffaec204d20e00d791bf5b982571c9261a74c7a7b865a9f7cad1cdcb43ba SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d WHIRLPOOL f0258b24f7731ab7b15a1fca391593c8bbd6bdf2ddad57af1d7960d05af49bc5b706039caa576646cb3d817d2d4ad8e89526b12fe046301c63c1518d01dcf173 -AUX shadow-4.1.5-grremove.patch 1664 SHA256 626536837e0cdc6903200de0d63b23c5a0d4a88f8d9b668e830a7035ab5f7e01 SHA512 a9d5bb16307fe40f50ee2e921bcf833220382d108f68ca1f973955bd77820e4987b435420bb0dbf8d9da5f6d7f52a1973bd566bf1868e5dacaa6635f69b3b934 WHIRLPOOL 8c20548471577ed5e1b6fe894af4b7dc4fac15c0dcb3cc02972343556d5113e8d9e8d97d1a91701df352f2dbd48c8a2416e1c70221e7cc5f9d913e85d41bd57e -AUX shadow-4.1.5-nscd-ignore-exit-1.patch 988 SHA256 b44d1706553f084b9949467c10be17661d8a01dda308f323ea14e406caf84347 SHA512 19c604b48c3a78086248f01307c425fc1265d3ed5ee13ac783ff885f6ea019d28918df6d570c927c5ce5a5f5e003ff089553db1964661f3fd0b70812f57bb324 WHIRLPOOL 2970ded35b1ceda3b103bb8b30b6bdff5741e325a935919c3178bf378e04f5e279b2c65b1096698843ca56320f80742c3713624abea19cb35b0232a089aa673e -AUX shadow-4.1.5-nscd-newline-msg.patch 1332 SHA256 37142316d0c06584801d65e902798108995d59f52eda8c76d322479a31c9cff1 SHA512 d1e155fcb82b5ce5531fa76385576feced1c9d520cd18a62d9af418a4403c72a7e47155e5535d3182a8f68f960188eadc211d1017e1df6637f0217398d8b7774 WHIRLPOOL 36b1550b3b41597bf302236f1bc8bda675e51c11797d03210ff1c8a61d1b4a27486cfb614997688ffd8f384a1d76a746d50c50ed17a1f4348d040093b402e961 -AUX shadow-4.1.5-selinux-groupadd.patch 703 SHA256 62cce19aa1c702bc099948e694166f19d057849a6fdde99ffea52a4e3e2dab99 SHA512 a9c258b3b316abe57e85c556edcd37a1cea18f9125273ca7c79c136fb256f6847d0d4c5a78155882900ce280c83aac6ba1f428c9b3aaa020d7cf35a13409ffb0 WHIRLPOOL 1c301b32f6bb5927fac5626a724446ac1a865234dda5021dbdb908607b2887a534c2499246ef355888b5d0c6fcf8111faa2fa5bb6c5b33eebb3132c916e6120a -AUX shadow-4.1.5-stdarg.patch 1137 SHA256 9280f8337651dc25f22f52acd8f4467b592d1f664bd35ce1f2f431335b1aef5b SHA512 aeda218afa859c9b121f54500be4bdf3676386448c04cffda3ec4aefc4b7fdd8b7e2b5e24545dad2d64fc7748cc68bdce337931d7313d608df0b153330f9912a WHIRLPOOL 42dd1686196f503950905d40728f8e74a75b64014e39cb5d3ed8aa379718a7c00893a1ef8834e8aa887807a4a08556464e0d2b65b79e2e7a0512d89e79e358db -AUX shadow-4.1.5.1-prefix.patch 44162 SHA256 034dd070a99bfac108fe270b061b95111c0cda09471235493689de8c104daf7f SHA512 a3839fb18d47d26465d1fd419de2a5e6da4cb3386e41870a6be82b738d2a3b4831e3abaf8e6700c72020a02307493acc6c26fb75f0f33aedf330ca4dfd884f6d WHIRLPOOL a5847f33ce06f6bdef16d80331f9c45a8dd65cc800a0c888c0f5c31189cd3e43d23dc24dff1a57858ce16ecbc02c1804b5f5387466edb21ee1aa70e86d962240 -AUX shadow-4.2.1-sysconfdir-2.patch 20781 SHA256 ac408f10cf2c959c3e138894e571224700c2708b9bec55e9eb244d4059aba3ab SHA512 60a9c25c094bd4375ddf3e26d2d3a5c77a2a2cd21a8169aa29f607fef6289d969f718de4086ad7152e172615012780a1616ef4e31964140954dd7af0f15f4388 WHIRLPOOL f42058b05524e58ef1654d52ad2074b41c1c4ae93aab81dd4f6c828503a600c86994e36d2c53db3d7efb64efae57703b264a2097c8647ad565a817fdfd27dc5c -AUX shadow-4.2.1-sysconfdir.patch 20667 SHA256 05e7173fbfa50b3da5ee718e7203d10b60fbe4cd1a1b256252001e011b0e0c8d SHA512 33402e118e6866b9301c34e10b85684e4f43c9a267b401fd8975d50c776bafae8da2bdc23ee87b88d4504924d0c5672e7f2c04d82dfae040994e05270a943145 WHIRLPOOL 8d06a268d354759d2ae714a8c041af263f0bc4f08ca99d30776fc9661d4ae916cacc9917ff300213d0b09fa9e29ef4b5811ac910cdc0c334bee0a83dfdb38ead -DIST shadow-4.2.1.tar.xz 1594536 SHA256 3b0893d1476766868cd88920f4f1231c4795652aa407569faff802bcda0f3d41 SHA512 7a14bf8e08126f0402e37b6e4c559615ced7cf829e39156d929ed05cd8813de48a77ff1f7f6fe707da04cf662a2e9e84c22d63d88dd1ed13f935fde594db95f0 WHIRLPOOL 032857f5fae8486cc3dd11303bfa7da55019000ce8ad7bac2f398f9f9764c8659e20a1547d05c5e4f366db749a52afb3083017faf14f6a72ee48345dcd1f86aa -EBUILD shadow-4.2.1.ebuild 5349 SHA256 82a0eb82137bbd1b3316f8b9543b6a7a607d26bb5cf6571f7021bf58e79e6778 SHA512 7907c8160984ba9eeb7d269eba35c96ddfd1129c35335a43faf688239acec3aebe32f4a13d5f5634ec357dcce794f798210aaabd29fabaea8ea8f15d05cf23a7 WHIRLPOOL 84bb21edbaf62e026de129feae0e81349d7a5a410ac2262b43b4802e6de8def27ebef5f53bc3db846b6f296997200d161f54968d4c98e56f636430590c8aacb4 -MISC ChangeLog 50196 SHA256 6281ee581649f1d02e7d07e29b031ec7c8645fd7a866fe006b93b2e8ae7d5a65 SHA512 87cfb456e7d894fdca943ba2f9c9129e1ef64a5fa6610bcbafe4fc80580705707c9c3aa1f9491c630661e6492ef95feca5e4876318e4b3c6b6189ab21c880a00 WHIRLPOOL ea680f0da93cd3cf44c0a181fc284b4c4534c8d39ccb48f769dd84724e26fe5618e95748d40768fb1d5ddac3a4297959eb228ecbc57ac6c03761f8b37039ec7a -MISC metadata.xml 374 SHA256 1675a5791603e79e431df63215162737553fa8018360b026739ac3284bca54b2 SHA512 0bb65b45fa94ddea89f7e0a879fd996b3f363b3e58eb6cbd71251fd79416667f103af4bac0c87f3ba240e0ce3f323c77ce7be9f6ea92c13d619ff8cef8797add WHIRLPOOL e7f4f5d975440fe71dbb35dee4394aa808fce7b5e58ac64d162418a47ed99cb002c7622563be4f6800967d6b8530d29dbd895e431c78f75a5cdf490b8c1afc45 diff --git a/sys-apps/shadow/files/default/useradd b/sys-apps/shadow/files/default/useradd deleted file mode 100644 index ae81dbb..0000000 --- a/sys-apps/shadow/files/default/useradd +++ /dev/null @@ -1,7 +0,0 @@ -# useradd defaults file -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel diff --git a/sys-apps/shadow/files/login.defs b/sys-apps/shadow/files/login.defs deleted file mode 100644 index 4aa7044..0000000 --- a/sys-apps/shadow/files/login.defs +++ /dev/null @@ -1,212 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# $Id: login.defs,v 1.6 2006/03/12 23:47:08 flameeyes Exp $ -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 022 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 100 -GID_MAX 60000 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 3 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# When prompting for password without echo, getpass() can optionally -# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' -# characters for each character typed. This feature is designed to -# confuse people looking over your shoulder when you enter a password :-). -# Also, the new getpass() accepts both Backspace (8) and Delete (127) -# keys to delete previous character (to cope with different terminal -# types), Control-U to delete all characters, and beeps when there are -# no more characters to delete, or too many characters entered. -# -# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - -# exactly one '*' displayed for each character typed. -# -# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, -# Delete, Control-U and beep continue to work as described above). -# -# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() -# without any new features. This is the default. -# -GETPASS_ASTERISKS 0 - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/sys-apps/shadow/files/login.pamd.3 b/sys-apps/shadow/files/login.pamd.3 deleted file mode 100644 index 13abd27..0000000 --- a/sys-apps/shadow/files/login.pamd.3 +++ /dev/null @@ -1,6 +0,0 @@ -auth required pam_securetty.so -auth include system-local-login - -account include system-local-login -password include system-local-login -session include system-local-login diff --git a/sys-apps/shadow/files/login_defs.awk b/sys-apps/shadow/files/login_defs.awk deleted file mode 100644 index 56087c6..0000000 --- a/sys-apps/shadow/files/login_defs.awk +++ /dev/null @@ -1,32 +0,0 @@ -# Fixes up login defs for PAM by commenting all non-PAM options and adding a -# comment that it is not supported with PAM. -# -# Call with lib/getdef.c and etc/login.defs as args in the root source directory -# of shadow, ie: -# -# gawk -f login_defs.awk lib/getdef.c etc/login.defs > login.defs.new -# - -(FILENAME == "lib/getdef.c") { - if ($2 == "USE_PAM") - start_printing = 1 - else if ($1 == "#endif") - nextfile - else if (start_printing == 1) - VARS[count++] = substr($1, 3, length($1) - 4) -} - -(FILENAME != "lib/getdef.c") { - print_line = 1 - for (x in VARS) { - regex = "(^|#)" VARS[x] - if ($0 ~ regex) { - print_line = 0 - printf("%s%s\t(NOT SUPPORTED WITH PAM)\n", - ($0 ~ /^#/) ? "" : "#", $0) - } - } - if (print_line) - print $0 -} - diff --git a/sys-apps/shadow/files/login_defs_pam.sed b/sys-apps/shadow/files/login_defs_pam.sed deleted file mode 100644 index ba308ba..0000000 --- a/sys-apps/shadow/files/login_defs_pam.sed +++ /dev/null @@ -1,24 +0,0 @@ -/^FAILLOG_ENAB/b comment -/^LASTLOG_ENAB/b comment -/^MAIL_CHECK_ENAB/b comment -/^OBSCURE_CHECKS_ENAB/b comment -/^PORTTIME_CHECKS_ENAB/b comment -/^QUOTAS_ENAB/b comment -/^MOTD_FILE/b comment -/^FTMP_FILE/b comment -/^NOLOGINS_FILE/b comment -/^ENV_HZ/b comment -/^PASS_MIN_LEN/b comment -/^SU_WHEEL_ONLY/b comment -/^CRACKLIB_DICTPATH/b comment -/^PASS_CHANGE_TRIES/b comment -/^PASS_ALWAYS_WARN/b comment -/^CHFN_AUTH/b comment -/^ENVIRON_FILE/b comment - -b exit - -: comment - s:^:#: - -: exit diff --git a/sys-apps/shadow/files/pam.d-include/login b/sys-apps/shadow/files/pam.d-include/login deleted file mode 100644 index 9d21677..0000000 --- a/sys-apps/shadow/files/pam.d-include/login +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth include system-auth -auth required pam_nologin.so - -account include system-auth - -password include system-auth - -session include system-auth -session optional pam_console.so diff --git a/sys-apps/shadow/files/pam.d-include/other b/sys-apps/shadow/files/pam.d-include/other deleted file mode 100644 index bb0b964..0000000 --- a/sys-apps/shadow/files/pam.d-include/other +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 - -auth required pam_deny.so - -account required pam_deny.so - -password required pam_deny.so - -session required pam_deny.so diff --git a/sys-apps/shadow/files/pam.d-include/passwd b/sys-apps/shadow/files/pam.d-include/passwd deleted file mode 100644 index 960b32e..0000000 --- a/sys-apps/shadow/files/pam.d-include/passwd +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so -auth include system-auth - -account include system-auth - -password include system-auth diff --git a/sys-apps/shadow/files/pam.d-include/shadow b/sys-apps/shadow/files/pam.d-include/shadow deleted file mode 100644 index 743b2f0..0000000 --- a/sys-apps/shadow/files/pam.d-include/shadow +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so -auth required pam_permit.so - -account include system-auth - -password required pam_permit.so diff --git a/sys-apps/shadow/files/pam.d-include/su b/sys-apps/shadow/files/pam.d-include/su deleted file mode 100644 index d15c7ed..0000000 --- a/sys-apps/shadow/files/pam.d-include/su +++ /dev/null @@ -1,32 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su -auth required pam_wheel.so use_uid - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sys-apps/shadow/files/pam.d-include/su-openpam b/sys-apps/shadow/files/pam.d-include/su-openpam deleted file mode 100644 index e9ec7d3..0000000 --- a/sys-apps/shadow/files/pam.d-include/su-openpam +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sys-apps/shadow/files/pam.d-include/system-auth b/sys-apps/shadow/files/pam.d-include/system-auth deleted file mode 100644 index b7c37af..0000000 --- a/sys-apps/shadow/files/pam.d-include/system-auth +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok nodelay -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sys-apps/shadow/files/pam.d-include/system-auth-1.1 deleted file mode 100644 index fe80483..0000000 --- a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sys-apps/shadow/files/securetty b/sys-apps/shadow/files/securetty deleted file mode 100644 index 55ce54d..0000000 --- a/sys-apps/shadow/files/securetty +++ /dev/null @@ -1,36 +0,0 @@ -# /etc/securetty: list of terminals on which root is allowed to login. -# See securetty(5) and login(1). -console - -vc/0 -vc/1 -vc/2 -vc/3 -vc/4 -vc/5 -vc/6 -vc/7 -vc/8 -vc/9 -vc/10 -vc/11 -vc/12 -tty0 -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty7 -tty8 -tty9 -tty10 -tty11 -tty12 - -tts/0 -ttyS0 -ttyS1 -ttyS2 -ttyS3 diff --git a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch deleted file mode 100644 index efcb33d..0000000 --- a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- shadow-4.1.3/libmisc/chkname.c -+++ shadow-4.1.3/libmisc/chkname.c -@@ -66,6 +66,7 @@ - ( ('0' <= *name) && ('9' >= *name) ) || - ('_' == *name) || - ('-' == *name) || -+ ('.' == *name) || - ( ('$' == *name) && ('\0' == *(name + 1)) ) - )) { - return false; diff --git a/sys-apps/shadow/files/shadow-4.1.5-grremove.patch b/sys-apps/shadow/files/shadow-4.1.5-grremove.patch deleted file mode 100644 index 96062ae..0000000 --- a/sys-apps/shadow/files/shadow-4.1.5-grremove.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/405409 - -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-February/009159.html -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-March/009196.html - ---- shadow-4.1.5/src/userdel.c -+++ shadow-4.1.5/src/userdel.c -@@ -333,22 +333,22 @@ static void remove_usergroup (void) - * We can remove this group, it is not the primary - * group of any remaining user. - */ -- if (gr_remove (grp->gr_name) == 0) { -+ if (gr_remove (user_name) == 0) { - fprintf (stderr, - _("%s: cannot remove entry '%s' from %s\n"), -- Prog, grp->gr_name, gr_dbname ()); -+ Prog, user_name, gr_dbname ()); - fail_exit (E_GRP_UPDATE); - } - - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting group", -- grp->gr_name, AUDIT_NO_ID, -+ user_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ user_name, user_name)); - - #ifdef SHADOWGRP - if (sgr_locate (user_name) != NULL) { -@@ -361,12 +361,12 @@ static void remove_usergroup (void) - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting shadow group", -- grp->gr_name, AUDIT_NO_ID, -+ user_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed shadow group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ user_name, user_name)); - - } - #endif /* SHADOWGRP */ diff --git a/sys-apps/shadow/files/shadow-4.1.5-nscd-ignore-exit-1.patch b/sys-apps/shadow/files/shadow-4.1.5-nscd-ignore-exit-1.patch deleted file mode 100644 index 49f75e0..0000000 --- a/sys-apps/shadow/files/shadow-4.1.5-nscd-ignore-exit-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 357ff92218a68f2ea74b9d08867c662571012bbe Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 12 Feb 2012 23:37:04 -0500 -Subject: [PATCH 3/3] nscd: ignore exit 1 code - -If nscd is installed but not in use, then running `nscd -i` will exit(1). -We shouldn't warn in this case since this is not abnormal behavior. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - lib/nscd.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/lib/nscd.c b/lib/nscd.c -index ea1dc55..7adb58f 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -39,6 +39,9 @@ int nscd_flush_cache (const char *service) - /* nscd is not installed, or it is installed but uses an - interpreter that is missing. Probably the former. */ - return 0; -+ } else if (code == 1) { -+ /* nscd is installed, but it isn't active. */ -+ return 0; - } else if (code != 0) { - (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), - Prog, code); --- -1.7.8.4 - diff --git a/sys-apps/shadow/files/shadow-4.1.5-nscd-newline-msg.patch b/sys-apps/shadow/files/shadow-4.1.5-nscd-newline-msg.patch deleted file mode 100644 index 2df107f..0000000 --- a/sys-apps/shadow/files/shadow-4.1.5-nscd-newline-msg.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 360351b9b99bba0a278923c4237d158cbd726df5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 12 Feb 2012 23:08:42 -0500 -Subject: [PATCH 1/3] nscd: add missing newline to warning msg - -Trying to run `passwd` without nscd running shows the messages: -... -Re-enter new password: -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: password changed. -... - -You can see the status message missing a newline, so add it. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - lib/nscd.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/nscd.c b/lib/nscd.c -index 227c205..ea1dc55 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -40,7 +40,7 @@ int nscd_flush_cache (const char *service) - interpreter that is missing. Probably the former. */ - return 0; - } else if (code != 0) { -- (void) fprintf (stderr, _("%s: nscd exited with status %d"), -+ (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), - Prog, code); - (void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); - return -1; --- -1.7.8.4 - diff --git a/sys-apps/shadow/files/shadow-4.1.5-selinux-groupadd.patch b/sys-apps/shadow/files/shadow-4.1.5-selinux-groupadd.patch deleted file mode 100644 index 5a95c0f..0000000 --- a/sys-apps/shadow/files/shadow-4.1.5-selinux-groupadd.patch +++ /dev/null @@ -1,32 +0,0 @@ -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-March/009205.html - -https://bugs.gentoo.org/406819 - ---- shadow-4.1.5/lib/commonio.c -+++ shadow-4.1.5/lib/commonio.c -@@ -977,6 +977,12 @@ int commonio_close (struct commonio_db * - - snprintf (buf, sizeof buf, "%s+", db->filename); - -+#ifdef WITH_SELINUX -+ if (set_selinux_file_context (buf) != 0) { -+ errors++; -+ } -+#endif -+ - db->fp = fopen_set_perms (buf, "w", &sb); - if (NULL == db->fp) { - goto fail; -@@ -1011,6 +1017,12 @@ int commonio_close (struct commonio_db * - goto fail; - } - -+#ifdef WITH_SELINUX -+ if (reset_selinux_file_context () != 0) { -+ goto fail; -+ } -+#endif -+ - nscd_need_reload = true; - goto success; - fail: diff --git a/sys-apps/shadow/files/shadow-4.1.5-stdarg.patch b/sys-apps/shadow/files/shadow-4.1.5-stdarg.patch deleted file mode 100644 index 4ed370c..0000000 --- a/sys-apps/shadow/files/shadow-4.1.5-stdarg.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 04d19a920ea0cf74f977006e3f8241bf77cbc16b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 12 Feb 2012 22:41:05 -0500 -Subject: [PATCH] copydir: include stdarg.h for va_* funcs - -Building on newer systems fails due to using stdargs but not including -the header file: - -copydir.c: In function 'error_acl': -copydir.c:126:2: warning: implicit declaration of function 'va_start' [-Wimplicit-function-declaration] -copydir.c:132:2: warning: implicit declaration of function 'va_end' [-Wimplicit-function-declaration] -... -libmisc/copydir.c:126: undefined reference to 'va_start' -libmisc/copydir.c:132: undefined reference to 'va_end' -... -make[2]: *** [useradd] Error 1 - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libmisc/copydir.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/libmisc/copydir.c b/libmisc/copydir.c -index 7cb5f56..c6cbe6b 100644 ---- a/libmisc/copydir.c -+++ b/libmisc/copydir.c -@@ -40,6 +40,7 @@ - #include <sys/time.h> - #include <fcntl.h> - #include <stdio.h> -+#include <stdarg.h> - #include "prototypes.h" - #include "defines.h" - #ifdef WITH_SELINUX --- -1.7.8.4 - diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-prefix.patch b/sys-apps/shadow/files/shadow-4.1.5.1-prefix.patch deleted file mode 100644 index 72fdb72..0000000 --- a/sys-apps/shadow/files/shadow-4.1.5.1-prefix.patch +++ /dev/null @@ -1,500 +0,0 @@ -Index: shadow-4.1.5.1/lib/Makefile.am -=================================================================== ---- shadow-4.1.5.1.orig/lib/Makefile.am -+++ shadow-4.1.5.1/lib/Makefile.am -@@ -57,6 +57,8 @@ if WITH_TCB - libshadow_la_SOURCES += tcbfuncs.c tcbfuncs.h - endif - -+libshadow_la_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' -+ - # These files are unneeded for some reason, listed in - # order of appearance: - # -Index: shadow-4.1.5.1/lib/Makefile.in -=================================================================== ---- shadow-4.1.5.1.orig/lib/Makefile.in -+++ shadow-4.1.5.1/lib/Makefile.in -@@ -1,9 +1,8 @@ --# Makefile.in generated by automake 1.11.5 from Makefile.am. -+# Makefile.in generated by automake 1.12.4 from Makefile.am. - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software --# Foundation, Inc. -+# Copyright (C) 1994-2012 Free Software Foundation, Inc. -+ - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -53,7 +52,8 @@ build_triplet = @build@ - host_triplet = @host@ - @WITH_TCB_TRUE@am__append_1 = tcbfuncs.c tcbfuncs.h - subdir = lib --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/depcomp - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -@@ -74,14 +74,23 @@ am__libshadow_la_SOURCES_DIST = commonio - sgetpwent.c sgetspent.c sgroupio.c sgroupio.h shadow.c \ - shadowio.c shadowio.h shadowmem.c spawn.c utent.c tcbfuncs.c \ - tcbfuncs.h --@WITH_TCB_TRUE@am__objects_1 = tcbfuncs.lo --am_libshadow_la_OBJECTS = commonio.lo encrypt.lo fields.lo fputsx.lo \ -- getdef.lo get_gid.lo getlong.lo get_pid.lo get_uid.lo \ -- getulong.lo groupio.lo groupmem.lo gshadow.lo lockpw.lo \ -- nscd.lo port.lo pwauth.lo pwio.lo pwmem.lo selinux.lo \ -- semanage.lo sgetgrent.lo sgetpwent.lo sgetspent.lo sgroupio.lo \ -- shadow.lo shadowio.lo shadowmem.lo spawn.lo utent.lo \ -- $(am__objects_1) -+@WITH_TCB_TRUE@am__objects_1 = libshadow_la-tcbfuncs.lo -+am_libshadow_la_OBJECTS = libshadow_la-commonio.lo \ -+ libshadow_la-encrypt.lo libshadow_la-fields.lo \ -+ libshadow_la-fputsx.lo libshadow_la-getdef.lo \ -+ libshadow_la-get_gid.lo libshadow_la-getlong.lo \ -+ libshadow_la-get_pid.lo libshadow_la-get_uid.lo \ -+ libshadow_la-getulong.lo libshadow_la-groupio.lo \ -+ libshadow_la-groupmem.lo libshadow_la-gshadow.lo \ -+ libshadow_la-lockpw.lo libshadow_la-nscd.lo \ -+ libshadow_la-port.lo libshadow_la-pwauth.lo \ -+ libshadow_la-pwio.lo libshadow_la-pwmem.lo \ -+ libshadow_la-selinux.lo libshadow_la-semanage.lo \ -+ libshadow_la-sgetgrent.lo libshadow_la-sgetpwent.lo \ -+ libshadow_la-sgetspent.lo libshadow_la-sgroupio.lo \ -+ libshadow_la-shadow.lo libshadow_la-shadowio.lo \ -+ libshadow_la-shadowmem.lo libshadow_la-spawn.lo \ -+ libshadow_la-utent.lo $(am__objects_1) - libshadow_la_OBJECTS = $(am_libshadow_la_OBJECTS) - libshadow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -268,6 +277,7 @@ libshadow_la_SOURCES = commonio.c common - pwio.h pwmem.c selinux.c semanage.c sgetgrent.c sgetpwent.c \ - sgetspent.c sgroupio.c sgroupio.h shadow.c shadowio.c \ - shadowio.h shadowmem.c spawn.c utent.c $(am__append_1) -+libshadow_la_CPPFLAGS = -DSYSCONFDIR='"$(sysconfdir)"' - - # These files are unneeded for some reason, listed in - # order of appearance: -@@ -314,12 +324,14 @@ $(am__aclocal_m4_deps): - - clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done -+ @list='$(noinst_LTLIBRARIES)'; \ -+ locs=`for p in $$list; do echo $$p; done | \ -+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ -+ sort -u`; \ -+ test -z "$$locs" || { \ -+ echo rm -f $${locs}; \ -+ rm -f $${locs}; \ -+ } - libshadow.la: $(libshadow_la_OBJECTS) $(libshadow_la_DEPENDENCIES) $(EXTRA_libshadow_la_DEPENDENCIES) - $(libshadow_la_LINK) $(libshadow_la_OBJECTS) $(libshadow_la_LIBADD) $(LIBS) - -@@ -329,37 +341,37 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commonio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encrypt.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fields.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fputsx.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_gid.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_pid.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_uid.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdef.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getlong.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getulong.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupmem.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gshadow.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockpw.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nscd.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/port.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwauth.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pwmem.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selinux.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/semanage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetgrent.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetpwent.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgetspent.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sgroupio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadow.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowio.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowmem.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tcbfuncs.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utent.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-commonio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-encrypt.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-fields.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-fputsx.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-get_gid.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-get_pid.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-get_uid.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-getdef.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-getlong.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-getulong.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-groupio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-groupmem.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-gshadow.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-lockpw.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-nscd.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-port.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-pwauth.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-pwio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-pwmem.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-selinux.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-semanage.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-sgetgrent.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-sgetpwent.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-sgetspent.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-sgroupio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-shadow.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-shadowio.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-shadowmem.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-spawn.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-tcbfuncs.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-utent.Plo@am__quote@ - - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@@ -382,6 +394,223 @@ distclean-compile: - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -+libshadow_la-commonio.lo: commonio.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-commonio.lo -MD -MP -MF $(DEPDIR)/libshadow_la-commonio.Tpo -c -o libshadow_la-commonio.lo `test -f 'commonio.c' || echo '$(srcdir)/'`commonio.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-commonio.Tpo $(DEPDIR)/libshadow_la-commonio.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='commonio.c' object='libshadow_la-commonio.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-commonio.lo `test -f 'commonio.c' || echo '$(srcdir)/'`commonio.c -+ -+libshadow_la-encrypt.lo: encrypt.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-encrypt.lo -MD -MP -MF $(DEPDIR)/libshadow_la-encrypt.Tpo -c -o libshadow_la-encrypt.lo `test -f 'encrypt.c' || echo '$(srcdir)/'`encrypt.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-encrypt.Tpo $(DEPDIR)/libshadow_la-encrypt.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='encrypt.c' object='libshadow_la-encrypt.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-encrypt.lo `test -f 'encrypt.c' || echo '$(srcdir)/'`encrypt.c -+ -+libshadow_la-fields.lo: fields.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-fields.lo -MD -MP -MF $(DEPDIR)/libshadow_la-fields.Tpo -c -o libshadow_la-fields.lo `test -f 'fields.c' || echo '$(srcdir)/'`fields.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-fields.Tpo $(DEPDIR)/libshadow_la-fields.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fields.c' object='libshadow_la-fields.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-fields.lo `test -f 'fields.c' || echo '$(srcdir)/'`fields.c -+ -+libshadow_la-fputsx.lo: fputsx.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-fputsx.lo -MD -MP -MF $(DEPDIR)/libshadow_la-fputsx.Tpo -c -o libshadow_la-fputsx.lo `test -f 'fputsx.c' || echo '$(srcdir)/'`fputsx.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-fputsx.Tpo $(DEPDIR)/libshadow_la-fputsx.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fputsx.c' object='libshadow_la-fputsx.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-fputsx.lo `test -f 'fputsx.c' || echo '$(srcdir)/'`fputsx.c -+ -+libshadow_la-getdef.lo: getdef.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-getdef.lo -MD -MP -MF $(DEPDIR)/libshadow_la-getdef.Tpo -c -o libshadow_la-getdef.lo `test -f 'getdef.c' || echo '$(srcdir)/'`getdef.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-getdef.Tpo $(DEPDIR)/libshadow_la-getdef.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getdef.c' object='libshadow_la-getdef.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-getdef.lo `test -f 'getdef.c' || echo '$(srcdir)/'`getdef.c -+ -+libshadow_la-get_gid.lo: get_gid.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-get_gid.lo -MD -MP -MF $(DEPDIR)/libshadow_la-get_gid.Tpo -c -o libshadow_la-get_gid.lo `test -f 'get_gid.c' || echo '$(srcdir)/'`get_gid.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-get_gid.Tpo $(DEPDIR)/libshadow_la-get_gid.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='get_gid.c' object='libshadow_la-get_gid.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-get_gid.lo `test -f 'get_gid.c' || echo '$(srcdir)/'`get_gid.c -+ -+libshadow_la-getlong.lo: getlong.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-getlong.lo -MD -MP -MF $(DEPDIR)/libshadow_la-getlong.Tpo -c -o libshadow_la-getlong.lo `test -f 'getlong.c' || echo '$(srcdir)/'`getlong.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-getlong.Tpo $(DEPDIR)/libshadow_la-getlong.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getlong.c' object='libshadow_la-getlong.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-getlong.lo `test -f 'getlong.c' || echo '$(srcdir)/'`getlong.c -+ -+libshadow_la-get_pid.lo: get_pid.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-get_pid.lo -MD -MP -MF $(DEPDIR)/libshadow_la-get_pid.Tpo -c -o libshadow_la-get_pid.lo `test -f 'get_pid.c' || echo '$(srcdir)/'`get_pid.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-get_pid.Tpo $(DEPDIR)/libshadow_la-get_pid.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='get_pid.c' object='libshadow_la-get_pid.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-get_pid.lo `test -f 'get_pid.c' || echo '$(srcdir)/'`get_pid.c -+ -+libshadow_la-get_uid.lo: get_uid.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-get_uid.lo -MD -MP -MF $(DEPDIR)/libshadow_la-get_uid.Tpo -c -o libshadow_la-get_uid.lo `test -f 'get_uid.c' || echo '$(srcdir)/'`get_uid.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-get_uid.Tpo $(DEPDIR)/libshadow_la-get_uid.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='get_uid.c' object='libshadow_la-get_uid.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-get_uid.lo `test -f 'get_uid.c' || echo '$(srcdir)/'`get_uid.c -+ -+libshadow_la-getulong.lo: getulong.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-getulong.lo -MD -MP -MF $(DEPDIR)/libshadow_la-getulong.Tpo -c -o libshadow_la-getulong.lo `test -f 'getulong.c' || echo '$(srcdir)/'`getulong.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-getulong.Tpo $(DEPDIR)/libshadow_la-getulong.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='getulong.c' object='libshadow_la-getulong.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-getulong.lo `test -f 'getulong.c' || echo '$(srcdir)/'`getulong.c -+ -+libshadow_la-groupio.lo: groupio.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-groupio.lo -MD -MP -MF $(DEPDIR)/libshadow_la-groupio.Tpo -c -o libshadow_la-groupio.lo `test -f 'groupio.c' || echo '$(srcdir)/'`groupio.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-groupio.Tpo $(DEPDIR)/libshadow_la-groupio.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='groupio.c' object='libshadow_la-groupio.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-groupio.lo `test -f 'groupio.c' || echo '$(srcdir)/'`groupio.c -+ -+libshadow_la-groupmem.lo: groupmem.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-groupmem.lo -MD -MP -MF $(DEPDIR)/libshadow_la-groupmem.Tpo -c -o libshadow_la-groupmem.lo `test -f 'groupmem.c' || echo '$(srcdir)/'`groupmem.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-groupmem.Tpo $(DEPDIR)/libshadow_la-groupmem.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='groupmem.c' object='libshadow_la-groupmem.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-groupmem.lo `test -f 'groupmem.c' || echo '$(srcdir)/'`groupmem.c -+ -+libshadow_la-gshadow.lo: gshadow.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-gshadow.lo -MD -MP -MF $(DEPDIR)/libshadow_la-gshadow.Tpo -c -o libshadow_la-gshadow.lo `test -f 'gshadow.c' || echo '$(srcdir)/'`gshadow.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-gshadow.Tpo $(DEPDIR)/libshadow_la-gshadow.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gshadow.c' object='libshadow_la-gshadow.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-gshadow.lo `test -f 'gshadow.c' || echo '$(srcdir)/'`gshadow.c -+ -+libshadow_la-lockpw.lo: lockpw.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-lockpw.lo -MD -MP -MF $(DEPDIR)/libshadow_la-lockpw.Tpo -c -o libshadow_la-lockpw.lo `test -f 'lockpw.c' || echo '$(srcdir)/'`lockpw.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-lockpw.Tpo $(DEPDIR)/libshadow_la-lockpw.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lockpw.c' object='libshadow_la-lockpw.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-lockpw.lo `test -f 'lockpw.c' || echo '$(srcdir)/'`lockpw.c -+ -+libshadow_la-nscd.lo: nscd.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-nscd.lo -MD -MP -MF $(DEPDIR)/libshadow_la-nscd.Tpo -c -o libshadow_la-nscd.lo `test -f 'nscd.c' || echo '$(srcdir)/'`nscd.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-nscd.Tpo $(DEPDIR)/libshadow_la-nscd.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='nscd.c' object='libshadow_la-nscd.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-nscd.lo `test -f 'nscd.c' || echo '$(srcdir)/'`nscd.c -+ -+libshadow_la-port.lo: port.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-port.lo -MD -MP -MF $(DEPDIR)/libshadow_la-port.Tpo -c -o libshadow_la-port.lo `test -f 'port.c' || echo '$(srcdir)/'`port.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-port.Tpo $(DEPDIR)/libshadow_la-port.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='port.c' object='libshadow_la-port.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-port.lo `test -f 'port.c' || echo '$(srcdir)/'`port.c -+ -+libshadow_la-pwauth.lo: pwauth.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-pwauth.lo -MD -MP -MF $(DEPDIR)/libshadow_la-pwauth.Tpo -c -o libshadow_la-pwauth.lo `test -f 'pwauth.c' || echo '$(srcdir)/'`pwauth.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-pwauth.Tpo $(DEPDIR)/libshadow_la-pwauth.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pwauth.c' object='libshadow_la-pwauth.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-pwauth.lo `test -f 'pwauth.c' || echo '$(srcdir)/'`pwauth.c -+ -+libshadow_la-pwio.lo: pwio.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-pwio.lo -MD -MP -MF $(DEPDIR)/libshadow_la-pwio.Tpo -c -o libshadow_la-pwio.lo `test -f 'pwio.c' || echo '$(srcdir)/'`pwio.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-pwio.Tpo $(DEPDIR)/libshadow_la-pwio.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pwio.c' object='libshadow_la-pwio.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-pwio.lo `test -f 'pwio.c' || echo '$(srcdir)/'`pwio.c -+ -+libshadow_la-pwmem.lo: pwmem.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-pwmem.lo -MD -MP -MF $(DEPDIR)/libshadow_la-pwmem.Tpo -c -o libshadow_la-pwmem.lo `test -f 'pwmem.c' || echo '$(srcdir)/'`pwmem.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-pwmem.Tpo $(DEPDIR)/libshadow_la-pwmem.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pwmem.c' object='libshadow_la-pwmem.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-pwmem.lo `test -f 'pwmem.c' || echo '$(srcdir)/'`pwmem.c -+ -+libshadow_la-selinux.lo: selinux.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-selinux.lo -MD -MP -MF $(DEPDIR)/libshadow_la-selinux.Tpo -c -o libshadow_la-selinux.lo `test -f 'selinux.c' || echo '$(srcdir)/'`selinux.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-selinux.Tpo $(DEPDIR)/libshadow_la-selinux.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='selinux.c' object='libshadow_la-selinux.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-selinux.lo `test -f 'selinux.c' || echo '$(srcdir)/'`selinux.c -+ -+libshadow_la-semanage.lo: semanage.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-semanage.lo -MD -MP -MF $(DEPDIR)/libshadow_la-semanage.Tpo -c -o libshadow_la-semanage.lo `test -f 'semanage.c' || echo '$(srcdir)/'`semanage.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-semanage.Tpo $(DEPDIR)/libshadow_la-semanage.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='semanage.c' object='libshadow_la-semanage.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-semanage.lo `test -f 'semanage.c' || echo '$(srcdir)/'`semanage.c -+ -+libshadow_la-sgetgrent.lo: sgetgrent.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-sgetgrent.lo -MD -MP -MF $(DEPDIR)/libshadow_la-sgetgrent.Tpo -c -o libshadow_la-sgetgrent.lo `test -f 'sgetgrent.c' || echo '$(srcdir)/'`sgetgrent.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-sgetgrent.Tpo $(DEPDIR)/libshadow_la-sgetgrent.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sgetgrent.c' object='libshadow_la-sgetgrent.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-sgetgrent.lo `test -f 'sgetgrent.c' || echo '$(srcdir)/'`sgetgrent.c -+ -+libshadow_la-sgetpwent.lo: sgetpwent.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-sgetpwent.lo -MD -MP -MF $(DEPDIR)/libshadow_la-sgetpwent.Tpo -c -o libshadow_la-sgetpwent.lo `test -f 'sgetpwent.c' || echo '$(srcdir)/'`sgetpwent.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-sgetpwent.Tpo $(DEPDIR)/libshadow_la-sgetpwent.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sgetpwent.c' object='libshadow_la-sgetpwent.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-sgetpwent.lo `test -f 'sgetpwent.c' || echo '$(srcdir)/'`sgetpwent.c -+ -+libshadow_la-sgetspent.lo: sgetspent.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-sgetspent.lo -MD -MP -MF $(DEPDIR)/libshadow_la-sgetspent.Tpo -c -o libshadow_la-sgetspent.lo `test -f 'sgetspent.c' || echo '$(srcdir)/'`sgetspent.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-sgetspent.Tpo $(DEPDIR)/libshadow_la-sgetspent.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sgetspent.c' object='libshadow_la-sgetspent.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-sgetspent.lo `test -f 'sgetspent.c' || echo '$(srcdir)/'`sgetspent.c -+ -+libshadow_la-sgroupio.lo: sgroupio.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-sgroupio.lo -MD -MP -MF $(DEPDIR)/libshadow_la-sgroupio.Tpo -c -o libshadow_la-sgroupio.lo `test -f 'sgroupio.c' || echo '$(srcdir)/'`sgroupio.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-sgroupio.Tpo $(DEPDIR)/libshadow_la-sgroupio.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sgroupio.c' object='libshadow_la-sgroupio.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-sgroupio.lo `test -f 'sgroupio.c' || echo '$(srcdir)/'`sgroupio.c -+ -+libshadow_la-shadow.lo: shadow.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-shadow.lo -MD -MP -MF $(DEPDIR)/libshadow_la-shadow.Tpo -c -o libshadow_la-shadow.lo `test -f 'shadow.c' || echo '$(srcdir)/'`shadow.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-shadow.Tpo $(DEPDIR)/libshadow_la-shadow.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shadow.c' object='libshadow_la-shadow.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-shadow.lo `test -f 'shadow.c' || echo '$(srcdir)/'`shadow.c -+ -+libshadow_la-shadowio.lo: shadowio.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-shadowio.lo -MD -MP -MF $(DEPDIR)/libshadow_la-shadowio.Tpo -c -o libshadow_la-shadowio.lo `test -f 'shadowio.c' || echo '$(srcdir)/'`shadowio.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-shadowio.Tpo $(DEPDIR)/libshadow_la-shadowio.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shadowio.c' object='libshadow_la-shadowio.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-shadowio.lo `test -f 'shadowio.c' || echo '$(srcdir)/'`shadowio.c -+ -+libshadow_la-shadowmem.lo: shadowmem.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-shadowmem.lo -MD -MP -MF $(DEPDIR)/libshadow_la-shadowmem.Tpo -c -o libshadow_la-shadowmem.lo `test -f 'shadowmem.c' || echo '$(srcdir)/'`shadowmem.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-shadowmem.Tpo $(DEPDIR)/libshadow_la-shadowmem.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shadowmem.c' object='libshadow_la-shadowmem.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-shadowmem.lo `test -f 'shadowmem.c' || echo '$(srcdir)/'`shadowmem.c -+ -+libshadow_la-spawn.lo: spawn.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-spawn.lo -MD -MP -MF $(DEPDIR)/libshadow_la-spawn.Tpo -c -o libshadow_la-spawn.lo `test -f 'spawn.c' || echo '$(srcdir)/'`spawn.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-spawn.Tpo $(DEPDIR)/libshadow_la-spawn.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='spawn.c' object='libshadow_la-spawn.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-spawn.lo `test -f 'spawn.c' || echo '$(srcdir)/'`spawn.c -+ -+libshadow_la-utent.lo: utent.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-utent.lo -MD -MP -MF $(DEPDIR)/libshadow_la-utent.Tpo -c -o libshadow_la-utent.lo `test -f 'utent.c' || echo '$(srcdir)/'`utent.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-utent.Tpo $(DEPDIR)/libshadow_la-utent.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utent.c' object='libshadow_la-utent.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-utent.lo `test -f 'utent.c' || echo '$(srcdir)/'`utent.c -+ -+libshadow_la-tcbfuncs.lo: tcbfuncs.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libshadow_la-tcbfuncs.lo -MD -MP -MF $(DEPDIR)/libshadow_la-tcbfuncs.Tpo -c -o libshadow_la-tcbfuncs.lo `test -f 'tcbfuncs.c' || echo '$(srcdir)/'`tcbfuncs.c -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libshadow_la-tcbfuncs.Tpo $(DEPDIR)/libshadow_la-tcbfuncs.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tcbfuncs.c' object='libshadow_la-tcbfuncs.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libshadow_la-tcbfuncs.lo `test -f 'tcbfuncs.c' || echo '$(srcdir)/'`tcbfuncs.c -+ - mostlyclean-libtool: - -rm -f *.lo - -@@ -437,6 +666,20 @@ GTAGS: - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -+cscopelist: $(HEADERS) $(SOURCES) $(LISP) -+ list='$(SOURCES) $(HEADERS) $(LISP)'; \ -+ case "$(srcdir)" in \ -+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ -+ *) sdir=$(subdir)/$(srcdir) ;; \ -+ esac; \ -+ for i in $$list; do \ -+ if test -f "$$i"; then \ -+ echo "$(subdir)/$$i"; \ -+ else \ -+ echo "$$sdir/$$i"; \ -+ fi; \ -+ done >> $(top_builddir)/cscope.files -+ - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -@@ -578,17 +821,18 @@ uninstall-am: - .MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-libtool clean-noinstLTLIBRARIES ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -- pdf pdf-am ps ps-am tags uninstall uninstall-am -+ clean-libtool clean-noinstLTLIBRARIES cscopelist ctags \ -+ distclean distclean-compile distclean-generic \ -+ distclean-libtool distclean-tags distdir dvi dvi-am html \ -+ html-am info info-am install install-am install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags uninstall uninstall-am - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -Index: shadow-4.1.5.1/lib/defines.h -=================================================================== ---- shadow-4.1.5.1.orig/lib/defines.h -+++ shadow-4.1.5.1/lib/defines.h -@@ -299,20 +299,20 @@ char *strchr (), *strrchr (), *strtok () - (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0') - - #ifndef PASSWD_FILE --#define PASSWD_FILE "/etc/passwd" -+#define PASSWD_FILE SYSCONFDIR "/passwd" - #endif - - #ifndef GROUP_FILE --#define GROUP_FILE "/etc/group" -+#define GROUP_FILE SYSCONFDIR "/group" - #endif - - #ifndef SHADOW_FILE --#define SHADOW_FILE "/etc/shadow" -+#define SHADOW_FILE SYSCONFDIR "/shadow" - #endif - - #ifdef SHADOWGRP - #ifndef SGROUP_FILE --#define SGROUP_FILE "/etc/gshadow" -+#define SGROUP_FILE SYSCONFDIR "/gshadow" - #endif - #endif - -Index: shadow-4.1.5.1/src/Makefile.am -=================================================================== ---- shadow-4.1.5.1.orig/src/Makefile.am -+++ shadow-4.1.5.1/src/Makefile.am -@@ -63,7 +63,7 @@ LDADD = $(INTLLIBS) \ - $(LIBTCB) \ - $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la --AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" - - if ACCT_TOOLS_SETUID - LIBPAM_SUID = $(LIBPAM) -Index: shadow-4.1.5.1/src/Makefile.in -=================================================================== ---- shadow-4.1.5.1.orig/src/Makefile.in -+++ shadow-4.1.5.1/src/Makefile.in -@@ -430,7 +430,7 @@ LDADD = $(INTLLIBS) \ - $(top_builddir)/libmisc/libmisc.a \ - $(top_builddir)/lib/libshadow.la - --AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -+AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" - @ACCT_TOOLS_SETUID_FALSE@LIBPAM_SUID = - @ACCT_TOOLS_SETUID_TRUE@LIBPAM_SUID = $(LIBPAM) - @USE_PAM_FALSE@LIBCRYPT_NOPAM = $(LIBCRYPT) diff --git a/sys-apps/shadow/files/shadow-4.2.1-sysconfdir-2.patch b/sys-apps/shadow/files/shadow-4.2.1-sysconfdir-2.patch deleted file mode 100644 index 6083138..0000000 --- a/sys-apps/shadow/files/shadow-4.2.1-sysconfdir-2.patch +++ /dev/null @@ -1,548 +0,0 @@ -From ea2788255a4ebc4e72d988b840ae0f59ada27ca1 Mon Sep 17 00:00:00 2001 -From: Benda Xu <heroxbd@gentoo.org> -Date: Tue, 9 Dec 2014 13:34:51 +0900 -Subject: [PATCH 2/2] Manage and override pathes in headers. - - * lib/getdef.c: move LOGINDEFS into lib/getdef.h - * lib/getdef.h: rename to .in - * configure.in: generate lib/getdef.h lib/port.h - * lib/gshadow_.h: move GSHADOW into lib/defines.h - * lib/port.h: override /etc with @sysconfdir@ - rename to .in - * src/chsh.c: move SHELLS_FILE into lib/defines.h - * src/login_nopam.c: move TABLE into lib/defines.h - and rename to ACCESS_TABLE - * src/logoutd.c: move HUP_MESG_FILE into lib/defines.h - * src/suauth.c: move SUAUTHFILE into lib/defines.h - * src/useradd.c: move SKEL_DIR, USER_DEFAULTS_FILE, - LASTLOG_FILE into defines.h ---- - configure.in | 2 ++ - lib/defines.h.in | 31 +++++++++++++++++++++++++++++++ - lib/getdef.c | 4 ---- - lib/{getdef.h => getdef.h.in} | 4 ++++ - lib/gshadow_.h | 2 +- - lib/{port.h => port.h.in} | 2 +- - src/chsh.c | 3 --- - src/login_nopam.c | 15 +++++---------- - src/logoutd.c | 4 ---- - src/suauth.c | 4 ---- - src/useradd.c | 13 ------------- - 11 files changed, 44 insertions(+), 40 deletions(-) - rename lib/{getdef.h => getdef.h.in} (97%) - rename lib/{port.h => port.h.in} (98%) - -Index: shadow-4.2.1/configure.in -=================================================================== ---- shadow-4.2.1.orig/configure.in -+++ shadow-4.2.1/configure.in -@@ -632,6 +632,8 @@ AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" - AC_CONFIG_FILES([ - Makefile - lib/defines.h -+ lib/getdef.h -+ lib/port.h - po/Makefile.in - doc/Makefile - man/Makefile -Index: shadow-4.2.1/lib/defines.h.in -=================================================================== ---- shadow-4.2.1.orig/lib/defines.h.in -+++ shadow-4.2.1/lib/defines.h.in -@@ -316,6 +316,37 @@ char *strchr (), *strrchr (), *strtok () - #endif - #endif - -+#ifndef SKEL_DIR -+#define SKEL_DIR "@sysconfdir@/skel" -+#endif -+#ifndef USER_DEFAULTS_FILE -+#define USER_DEFAULTS_FILE "@sysconfdir@/default/useradd" -+#define NEW_USER_FILE "@sysconfdir@/default/nuaddXXXXXX" -+#endif -+/* -+ * Needed for MkLinux DR1/2/2.1 - J. -+ */ -+#ifndef LASTLOG_FILE -+#define LASTLOG_FILE "@localstatedir@/log/lastlog" -+#endif -+ -+#ifndef HUP_MESG_FILE -+#define HUP_MESG_FILE "@sysconfdir@/logoutd.mesg" -+#endif -+ -+#ifndef SUAUTHFILE -+#define SUAUTHFILE "@sysconfdir@/suauth" -+#endif -+ -+ /* Path name of the access control file. */ -+#ifndef ACCESS_TABLE -+#define ACCESS_TABLE "@sysconfdir@/login.access" -+#endif -+ -+#ifndef SHELLS_FILE -+#define SHELLS_FILE "@sysconfdir@/shells" -+#endif -+ - #ifndef NULL - #define NULL ((void *) 0) - #endif -Index: shadow-4.2.1/lib/getdef.c -=================================================================== ---- shadow-4.2.1.orig/lib/getdef.c -+++ shadow-4.2.1/lib/getdef.c -@@ -138,10 +138,6 @@ static struct itemdef def_table[] = { - {NULL, NULL} - }; - --#ifndef LOGINDEFS --#define LOGINDEFS "/etc/login.defs" --#endif -- - static char def_fname[] = LOGINDEFS; /* login config defs file */ - static bool def_loaded = false; /* are defs already loaded? */ - -Index: shadow-4.2.1/lib/getdef.h -=================================================================== ---- shadow-4.2.1.orig/lib/getdef.h -+++ /dev/null -@@ -1,47 +0,0 @@ --/* -- * Copyright (c) 1991 - 1994, Julianne Frances Haugh -- * Copyright (c) 1996 - 2000, Marek Michałkiewicz -- * Copyright (c) 2002 - 2006, Tomasz Kłoczko -- * Copyright (c) 2008 , Nicolas François -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. The name of the copyright holders or contributors may not be used to -- * endorse or promote products derived from this software without -- * specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ --#ifndef _GETDEF_H --#define _GETDEF_H -- --/* getdef.c */ --extern bool getdef_bool (const char *); --extern long getdef_long (const char *, long); --extern int getdef_num (const char *, int); --extern unsigned long getdef_ulong (const char *, unsigned long); --extern unsigned int getdef_unum (const char *, unsigned int); --extern /*@observer@*/ /*@null@*/const char *getdef_str (const char *); --extern int putdef_str (const char *, const char *); -- --/* default UMASK value if not specified in /etc/login.defs */ --#define GETDEF_DEFAULT_UMASK 022 -- --#endif /* _GETDEF_H */ -Index: shadow-4.2.1/lib/getdef.h.in -=================================================================== ---- /dev/null -+++ shadow-4.2.1/lib/getdef.h.in -@@ -0,0 +1,51 @@ -+/* -+ * Copyright (c) 1991 - 1994, Julianne Frances Haugh -+ * Copyright (c) 1996 - 2000, Marek Michałkiewicz -+ * Copyright (c) 2002 - 2006, Tomasz Kłoczko -+ * Copyright (c) 2008 , Nicolas François -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the copyright holders or contributors may not be used to -+ * endorse or promote products derived from this software without -+ * specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+#ifndef _GETDEF_H -+#define _GETDEF_H -+ -+#ifndef LOGINDEFS -+#define LOGINDEFS "@sysconfdir@/login.defs" -+#endif -+ -+/* getdef.c */ -+extern bool getdef_bool (const char *); -+extern long getdef_long (const char *, long); -+extern int getdef_num (const char *, int); -+extern unsigned long getdef_ulong (const char *, unsigned long); -+extern unsigned int getdef_unum (const char *, unsigned int); -+extern /*@observer@*/ /*@null@*/const char *getdef_str (const char *); -+extern int putdef_str (const char *, const char *); -+ -+/* default UMASK value if not specified in /etc/login.defs */ -+#define GETDEF_DEFAULT_UMASK 022 -+ -+#endif /* _GETDEF_H */ -Index: shadow-4.2.1/lib/gshadow_.h -=================================================================== ---- shadow-4.2.1.orig/lib/gshadow_.h -+++ shadow-4.2.1/lib/gshadow_.h -@@ -71,5 +71,5 @@ void endsgent (); - int putsgent (); - #endif - --#define GSHADOW "/etc/gshadow" -+#define GSHADOW "@sysconfdir@/gshadow" - #endif /* ifndef _H_GSHADOW */ -Index: shadow-4.2.1/lib/port.h -=================================================================== ---- shadow-4.2.1.orig/lib/port.h -+++ /dev/null -@@ -1,83 +0,0 @@ --/* -- * Copyright (c) 1989 - 1991, Julianne Frances Haugh -- * Copyright (c) 1996 - 1997, Marek Michałkiewicz -- * Copyright (c) 2005 , Tomasz Kłoczko -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. The name of the copyright holders or contributors may not be used to -- * endorse or promote products derived from this software without -- * specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --/* -- * port.h - structure of /etc/porttime -- * -- * $Id$ -- * -- * Each entry in /etc/porttime consists of a TTY device -- * name or "*" to indicate all TTY devices, followed by -- * a list of 1 or more user IDs or "*" to indicate all -- * user names, followed by a list of zero or more valid -- * login times. Login time entries consist of zero or -- * more day names (Su, Mo, Tu, We, Th, Fr, Sa, Wk, Al) -- * followed by a pair of time values in HHMM format -- * separated by a "-". -- */ -- --/* -- * PORTS - Name of system port access time file. -- * PORT_IDS - Allowable number of IDs per entry. -- * PORT_TTY - Allowable number of TTYs per entry. -- * PORT_TIMES - Allowable number of time entries per entry. -- * PORT_DAY - Day of the week to a bit value (0 = Sunday). -- */ -- --#define PORTS "/etc/porttime" --#define PORT_IDS 64 --#define PORT_TTY 64 --#define PORT_TIMES 24 --#define PORT_DAY(day) (1<<(day)) -- --/* -- * pt_names - pointer to array of device names in /dev/ -- * pt_users - pointer to array of applicable user IDs. -- * pt_times - pointer to list of allowable time periods. -- */ -- --struct port { -- char **pt_names; -- char **pt_users; -- struct pt_time *pt_times; --}; -- --/* -- * t_days - bit array for each day of the week (0 = Sunday) -- * t_start - starting time for this entry -- * t_end - ending time for this entry -- */ -- --struct pt_time { -- short t_days; -- short t_start; -- short t_end; --}; -Index: shadow-4.2.1/lib/port.h.in -=================================================================== ---- /dev/null -+++ shadow-4.2.1/lib/port.h.in -@@ -0,0 +1,83 @@ -+/* -+ * Copyright (c) 1989 - 1991, Julianne Frances Haugh -+ * Copyright (c) 1996 - 1997, Marek Michałkiewicz -+ * Copyright (c) 2005 , Tomasz Kłoczko -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the copyright holders or contributors may not be used to -+ * endorse or promote products derived from this software without -+ * specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * port.h - structure of /etc/porttime -+ * -+ * $Id$ -+ * -+ * Each entry in /etc/porttime consists of a TTY device -+ * name or "*" to indicate all TTY devices, followed by -+ * a list of 1 or more user IDs or "*" to indicate all -+ * user names, followed by a list of zero or more valid -+ * login times. Login time entries consist of zero or -+ * more day names (Su, Mo, Tu, We, Th, Fr, Sa, Wk, Al) -+ * followed by a pair of time values in HHMM format -+ * separated by a "-". -+ */ -+ -+/* -+ * PORTS - Name of system port access time file. -+ * PORT_IDS - Allowable number of IDs per entry. -+ * PORT_TTY - Allowable number of TTYs per entry. -+ * PORT_TIMES - Allowable number of time entries per entry. -+ * PORT_DAY - Day of the week to a bit value (0 = Sunday). -+ */ -+ -+#define PORTS "@sysconfdir@/porttime" -+#define PORT_IDS 64 -+#define PORT_TTY 64 -+#define PORT_TIMES 24 -+#define PORT_DAY(day) (1<<(day)) -+ -+/* -+ * pt_names - pointer to array of device names in /dev/ -+ * pt_users - pointer to array of applicable user IDs. -+ * pt_times - pointer to list of allowable time periods. -+ */ -+ -+struct port { -+ char **pt_names; -+ char **pt_users; -+ struct pt_time *pt_times; -+}; -+ -+/* -+ * t_days - bit array for each day of the week (0 = Sunday) -+ * t_start - starting time for this entry -+ * t_end - ending time for this entry -+ */ -+ -+struct pt_time { -+ short t_days; -+ short t_start; -+ short t_end; -+}; -Index: shadow-4.2.1/src/chsh.c -=================================================================== ---- shadow-4.2.1.orig/src/chsh.c -+++ shadow-4.2.1/src/chsh.c -@@ -55,9 +55,6 @@ - /*@-exitarg@*/ - #include "exitcodes.h" - --#ifndef SHELLS_FILE --#define SHELLS_FILE "/etc/shells" --#endif - /* - * Global variables - */ -Index: shadow-4.2.1/src/login_nopam.c -=================================================================== ---- shadow-4.2.1.orig/src/login_nopam.c -+++ shadow-4.2.1/src/login_nopam.c -@@ -57,11 +57,6 @@ - #define MAXHOSTNAMELEN 256 - #endif - -- /* Path name of the access control file. */ --#ifndef TABLE --#define TABLE "/etc/login.access" --#endif -- - /* Delimiters for fields and for lists of users, ttys or hosts. */ - static char fs[] = ":"; /* field separator */ - static char sep[] = ", \t"; /* list-element separator */ -@@ -89,7 +84,7 @@ int login_access (const char *user, cons - * mandatory. The first field should be a "+" or "-" character. A - * non-existing table means no access control. - */ -- fp = fopen (TABLE, "r"); -+ fp = fopen (ACCESS_TABLE, "r"); - if (NULL != fp) { - int lineno = 0; /* for diagnostics */ - while ( !match -@@ -100,7 +95,7 @@ int login_access (const char *user, cons - if (line[end] != '\n') { - SYSLOG ((LOG_ERR, - "%s: line %d: missing newline or line too long", -- TABLE, lineno)); -+ ACCESS_TABLE, lineno)); - continue; - } - if (line[0] == '#') { -@@ -119,13 +114,13 @@ int login_access (const char *user, cons - || (strtok ((char *) 0, fs) != NULL)) { - SYSLOG ((LOG_ERR, - "%s: line %d: bad field count", -- TABLE, lineno)); -+ ACCESS_TABLE, lineno)); - continue; - } - if (perm[0] != '+' && perm[0] != '-') { - SYSLOG ((LOG_ERR, - "%s: line %d: bad first field", -- TABLE, lineno)); -+ ACCESS_TABLE, lineno)); - continue; - } - match = ( list_match (froms, from, from_match) -@@ -134,7 +129,7 @@ int login_access (const char *user, cons - (void) fclose (fp); - } else if (errno != ENOENT) { - int err = errno; -- SYSLOG ((LOG_ERR, "cannot open %s: %s", TABLE, strerror (err))); -+ SYSLOG ((LOG_ERR, "cannot open %s: %s", ACCESS_TABLE, strerror (err))); - } - return (!match || (line[0] == '+'))?1:0; - } -Index: shadow-4.2.1/src/logoutd.c -=================================================================== ---- shadow-4.2.1.orig/src/logoutd.c -+++ shadow-4.2.1/src/logoutd.c -@@ -49,10 +49,6 @@ const char *Prog; - #define DEFAULT_HUP_MESG _("login time exceeded\n\n") - #endif - --#ifndef HUP_MESG_FILE --#define HUP_MESG_FILE "/etc/logoutd.mesg" --#endif -- - /* local function prototypes */ - #ifdef USE_UTMPX - static int check_login (const struct utmpx *ut); -Index: shadow-4.2.1/src/suauth.c -=================================================================== ---- shadow-4.2.1.orig/src/suauth.c -+++ shadow-4.2.1/src/suauth.c -@@ -39,10 +39,6 @@ - #include "defines.h" - #include "prototypes.h" - --#ifndef SUAUTHFILE --#define SUAUTHFILE "/etc/suauth" --#endif -- - #define NOACTION 0 - #define NOPWORD 1 - #define DENY -1 -Index: shadow-4.2.1/src/useradd.c -=================================================================== ---- shadow-4.2.1.orig/src/useradd.c -+++ shadow-4.2.1/src/useradd.c -@@ -72,19 +72,6 @@ - #include "tcbfuncs.h" - #endif - --#ifndef SKEL_DIR --#define SKEL_DIR "/etc/skel" --#endif --#ifndef USER_DEFAULTS_FILE --#define USER_DEFAULTS_FILE "/etc/default/useradd" --#define NEW_USER_FILE "/etc/default/nuaddXXXXXX" --#endif --/* -- * Needed for MkLinux DR1/2/2.1 - J. -- */ --#ifndef LASTLOG_FILE --#define LASTLOG_FILE "/var/log/lastlog" --#endif - /* - * Global variables - */ -Index: shadow-4.2.1/configure -=================================================================== ---- shadow-4.2.1.orig/configure -+++ shadow-4.2.1/configure -@@ -18063,7 +18063,7 @@ else - fi - - --ac_config_files="$ac_config_files Makefile lib/defines.h po/Makefile.in doc/Makefile man/Makefile man/config.xml man/po/Makefile man/cs/Makefile man/da/Makefile man/de/Makefile man/es/Makefile man/fi/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile man/tr/Makefile man/zh_CN/Makefile man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" -+ac_config_files="$ac_config_files Makefile lib/defines.h lib/getdef.h lib/port.h po/Makefile.in doc/Makefile man/Makefile man/config.xml man/po/Makefile man/cs/Makefile man/da/Makefile man/de/Makefile man/es/Makefile man/fi/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile man/tr/Makefile man/zh_CN/Makefile man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -19124,6 +19124,8 @@ do - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "lib/defines.h") CONFIG_FILES="$CONFIG_FILES lib/defines.h" ;; -+ "lib/getdef.h") CONFIG_FILES="$CONFIG_FILES lib/getdef.h" ;; -+ "lib/port.h") CONFIG_FILES="$CONFIG_FILES lib/port.h" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; diff --git a/sys-apps/shadow/files/shadow-4.2.1-sysconfdir.patch b/sys-apps/shadow/files/shadow-4.2.1-sysconfdir.patch deleted file mode 100644 index 1214075..0000000 --- a/sys-apps/shadow/files/shadow-4.2.1-sysconfdir.patch +++ /dev/null @@ -1,824 +0,0 @@ -From 54775500160de242f2371da8defc3ca639a95e5c Mon Sep 17 00:00:00 2001 -From: Benda Xu <heroxbd@gentoo.org> -Date: Tue, 9 Dec 2014 12:47:31 +0900 -Subject: [PATCH 1/2] override /etc with @sysconfdir@. - ---- - configure.in | 1 + - lib/{defines.h => defines.h.in} | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - rename lib/{defines.h => defines.h.in} (98%) - -Index: shadow-4.2.1/configure -=================================================================== ---- shadow-4.2.1.orig/configure -+++ shadow-4.2.1/configure -@@ -18063,7 +18063,7 @@ else - fi - - --ac_config_files="$ac_config_files Makefile po/Makefile.in doc/Makefile man/Makefile man/config.xml man/po/Makefile man/cs/Makefile man/da/Makefile man/de/Makefile man/es/Makefile man/fi/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile man/tr/Makefile man/zh_CN/Makefile man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" -+ac_config_files="$ac_config_files Makefile lib/defines.h po/Makefile.in doc/Makefile man/Makefile man/config.xml man/po/Makefile man/cs/Makefile man/da/Makefile man/de/Makefile man/es/Makefile man/fi/Makefile man/fr/Makefile man/hu/Makefile man/id/Makefile man/it/Makefile man/ja/Makefile man/ko/Makefile man/pl/Makefile man/pt_BR/Makefile man/ru/Makefile man/sv/Makefile man/tr/Makefile man/zh_CN/Makefile man/zh_TW/Makefile libmisc/Makefile lib/Makefile src/Makefile contrib/Makefile etc/Makefile etc/pam.d/Makefile shadow.spec" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -19123,6 +19123,7 @@ do - "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "lib/defines.h") CONFIG_FILES="$CONFIG_FILES lib/defines.h" ;; - "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; -Index: shadow-4.2.1/configure.in -=================================================================== ---- shadow-4.2.1.orig/configure.in -+++ shadow-4.2.1/configure.in -@@ -631,6 +631,7 @@ AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" - - AC_CONFIG_FILES([ - Makefile -+ lib/defines.h - po/Makefile.in - doc/Makefile - man/Makefile -Index: shadow-4.2.1/lib/defines.h -=================================================================== ---- shadow-4.2.1.orig/lib/defines.h -+++ /dev/null -@@ -1,385 +0,0 @@ --/* $Id$ */ --/* some useful defines */ -- --#ifndef _DEFINES_H_ --#define _DEFINES_H_ -- --#if HAVE_STDBOOL_H --# include <stdbool.h> --#else --# if ! HAVE__BOOL --# ifdef __cplusplus --typedef bool _Bool; --# else --typedef unsigned char _Bool; --# endif --# endif --# define bool _Bool --# define false (0) --# define true (1) --# define __bool_true_false_are_defined 1 --#endif -- --#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) -- --/* Take care of NLS matters. */ --#ifdef S_SPLINT_S --extern char *setlocale(int categorie, const char *locale); --# define LC_ALL (6) --extern char * bindtextdomain (const char * domainname, const char * dirname); --extern char * textdomain (const char * domainname); --# define _(Text) Text --# define ngettext(Msgid1, Msgid2, N) \ -- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) --#else --#ifdef HAVE_LOCALE_H --# include <locale.h> --#else --# undef setlocale --# define setlocale(category, locale) (NULL) --# ifndef LC_ALL --# define LC_ALL 6 --# endif --#endif -- --#define gettext_noop(String) (String) --/* #define gettext_def(String) "#define String" */ -- --#ifdef ENABLE_NLS --# include <libintl.h> --# define _(Text) gettext (Text) --#else --# undef bindtextdomain --# define bindtextdomain(Domain, Directory) (NULL) --# undef textdomain --# define textdomain(Domain) (NULL) --# define _(Text) Text --# define ngettext(Msgid1, Msgid2, N) \ -- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) --#endif --#endif -- --#if STDC_HEADERS --# include <stdlib.h> --# include <string.h> --#else /* not STDC_HEADERS */ --# ifndef HAVE_STRCHR --# define strchr index --# define strrchr rindex --# endif --char *strchr (), *strrchr (), *strtok (); -- --# ifndef HAVE_MEMCPY --# define memcpy(d, s, n) bcopy((s), (d), (n)) --# endif --#endif /* not STDC_HEADERS */ -- --#if HAVE_ERRNO_H --# include <errno.h> --#endif -- --#include <sys/stat.h> --#include <sys/types.h> --#if HAVE_SYS_WAIT_H --# include <sys/wait.h> --#endif --#ifndef WEXITSTATUS --# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) --#endif --#ifndef WIFEXITED --# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) --#endif -- --#if HAVE_UNISTD_H --# include <unistd.h> --#endif -- --#if TIME_WITH_SYS_TIME --# include <sys/time.h> --# include <time.h> --#else /* not TIME_WITH_SYS_TIME */ --# if HAVE_SYS_TIME_H --# include <sys/time.h> --# else --# include <time.h> --# endif --#endif /* not TIME_WITH_SYS_TIME */ -- --#ifdef HAVE_MEMSET --# define memzero(ptr, size) memset((void *)(ptr), 0, (size)) --#else --# define memzero(ptr, size) bzero((char *)(ptr), (size)) --#endif --#define strzero(s) memzero(s, strlen(s)) /* warning: evaluates twice */ -- --#ifdef HAVE_DIRENT_H /* DIR_SYSV */ --# include <dirent.h> --# define DIRECT dirent --#else --# ifdef HAVE_SYS_NDIR_H /* DIR_XENIX */ --# include <sys/ndir.h> --# endif --# ifdef HAVE_SYS_DIR_H /* DIR_??? */ --# include <sys/dir.h> --# endif --# ifdef HAVE_NDIR_H /* DIR_BSD */ --# include <ndir.h> --# endif --# define DIRECT direct --#endif -- --/* -- * Possible cases: -- * - /usr/include/shadow.h exists and includes the shadow group stuff. -- * - /usr/include/shadow.h exists, but we use our own gshadow.h. -- */ --#include <shadow.h> --#if defined(SHADOWGRP) && !defined(GSHADOW) --#include "gshadow_.h" --#endif -- --#include <limits.h> -- --#ifndef NGROUPS_MAX --#ifdef NGROUPS --#define NGROUPS_MAX NGROUPS --#else --#define NGROUPS_MAX 64 --#endif --#endif -- --#ifdef USE_SYSLOG --#include <syslog.h> -- --#ifndef LOG_WARN --#define LOG_WARN LOG_WARNING --#endif -- --/* LOG_NOWAIT is deprecated */ --#ifndef LOG_NOWAIT --#define LOG_NOWAIT 0 --#endif -- --/* LOG_AUTH is deprecated, use LOG_AUTHPRIV instead */ --#ifndef LOG_AUTHPRIV --#define LOG_AUTHPRIV LOG_AUTH --#endif -- --/* cleaner than lots of #ifdefs everywhere - use this as follows: -- SYSLOG((LOG_CRIT, "user %s cracked root", user)); */ --#ifdef ENABLE_NLS --/* Temporarily set LC_TIME to "C" to avoid strange dates in syslog. -- This is a workaround for a more general syslog(d) design problem - -- syslogd should log the current system time for each event, and not -- trust the formatted time received from the unix domain (or worse, -- UDP) socket. -MM */ --/* Avoid translated PAM error messages: Set LC_ALL to "C". -- * --Nekral */ --#define SYSLOG(x) \ -- do { \ -- char *old_locale = setlocale (LC_ALL, NULL); \ -- char *saved_locale = NULL; \ -- if (NULL != old_locale) { \ -- saved_locale = strdup (old_locale); \ -- } \ -- if (NULL != saved_locale) { \ -- (void) setlocale (LC_ALL, "C"); \ -- } \ -- syslog x ; \ -- if (NULL != saved_locale) { \ -- (void) setlocale (LC_ALL, saved_locale); \ -- free (saved_locale); \ -- } \ -- } while (false) --#else /* !ENABLE_NLS */ --#define SYSLOG(x) syslog x --#endif /* !ENABLE_NLS */ -- --#else /* !USE_SYSLOG */ -- --#define SYSLOG(x) /* empty */ --#define openlog(a,b,c) /* empty */ --#define closelog() /* empty */ -- --#endif /* !USE_SYSLOG */ -- --/* The default syslog settings can now be changed here, -- in just one place. */ -- --#ifndef SYSLOG_OPTIONS --/* #define SYSLOG_OPTIONS (LOG_PID | LOG_CONS | LOG_NOWAIT) */ --#define SYSLOG_OPTIONS (LOG_PID) --#endif -- --#ifndef SYSLOG_FACILITY --#define SYSLOG_FACILITY LOG_AUTHPRIV --#endif -- --#define OPENLOG(progname) openlog(progname, SYSLOG_OPTIONS, SYSLOG_FACILITY) -- --#ifndef F_OK --# define F_OK 0 --# define X_OK 1 --# define W_OK 2 --# define R_OK 4 --#endif -- --#ifndef SEEK_SET --# define SEEK_SET 0 --# define SEEK_CUR 1 --# define SEEK_END 2 --#endif -- --#ifdef STAT_MACROS_BROKEN --# define S_ISDIR(x) ((x) & S_IFMT) == S_IFDIR) --# define S_ISREG(x) ((x) & S_IFMT) == S_IFREG) --# ifdef S_IFLNK --# define S_ISLNK(x) ((x) & S_IFMT) == S_IFLNK) --# endif --#endif -- --#ifndef S_ISLNK --#define S_ISLNK(x) (0) --#endif -- --#if HAVE_LCHOWN --#define LCHOWN lchown --#else --#define LCHOWN chown --#endif -- --#if HAVE_LSTAT --#define LSTAT lstat --#else --#define LSTAT stat --#endif -- --#if HAVE_TERMIOS_H --# include <termios.h> --# define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio) --# define GTTY(fd, termio) tcgetattr(fd, termio) --# define TERMIO struct termios --# define USE_TERMIOS --#else /* assumed HAVE_TERMIO_H */ --# include <sys/ioctl.h> --# include <termio.h> --# define STTY(fd, termio) ioctl(fd, TCSETA, termio) --# define GTTY(fd, termio) ioctl(fd, TCGETA, termio) --# define TEMRIO struct termio --# define USE_TERMIO --#endif -- --/* -- * Password aging constants -- * -- * DAY - seconds / day -- * WEEK - seconds / week -- * SCALE - seconds / aging unit -- */ -- --/* Solaris defines this in shadow.h */ --#ifndef DAY --#define DAY (24L*3600L) --#endif -- --#define WEEK (7*DAY) -- --#ifdef ITI_AGING --#define SCALE 1 --#else --#define SCALE DAY --#endif -- --/* Copy string pointed by B to array A with size checking. It was originally -- in lmain.c but is _very_ useful elsewhere. Some setuid root programs with -- very sloppy coding used to assume that BUFSIZ will always be enough... */ -- -- /* danger - side effects */ --#define STRFCPY(A,B) \ -- (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0') -- --#ifndef PASSWD_FILE --#define PASSWD_FILE "/etc/passwd" --#endif -- --#ifndef GROUP_FILE --#define GROUP_FILE "/etc/group" --#endif -- --#ifndef SHADOW_FILE --#define SHADOW_FILE "/etc/shadow" --#endif -- --#ifdef SHADOWGRP --#ifndef SGROUP_FILE --#define SGROUP_FILE "/etc/gshadow" --#endif --#endif -- --#ifndef NULL --#define NULL ((void *) 0) --#endif -- --#ifdef sun /* hacks for compiling on SunOS */ --# ifndef SOLARIS --extern int fputs (); --extern char *strdup (); --extern char *strerror (); --# endif --#endif -- --/* -- * string to use for the pw_passwd field in /etc/passwd when using -- * shadow passwords - most systems use "x" but there are a few -- * exceptions, so it can be changed here if necessary. --marekm -- */ --#ifndef SHADOW_PASSWD_STRING --#define SHADOW_PASSWD_STRING "x" --#endif -- --#define SHADOW_SP_FLAG_UNSET ((unsigned long int)-1) -- --#ifdef WITH_AUDIT --#ifdef __u8 /* in case we use pam < 0.80 */ --#undef __u8 --#endif --#ifdef __u32 --#undef __u32 --#endif -- --#include <libaudit.h> --#endif -- --/* To be used for verified unused parameters */ --#if defined(__GNUC__) && !defined(__STRICT_ANSI__) --# define unused __attribute__((unused)) --#else --# define unused --#endif -- --/* ! Arguments evaluated twice ! */ --#ifndef MIN --#define MIN(a,b) (((a) < (b)) ? (a) : (b)) --#endif --#ifndef MAX --#define MAX(x,y) (((x) > (y)) ? (x) : (y)) --#endif -- --/* Maximum length of usernames */ --#ifdef HAVE_UTMPX_H --# include <utmpx.h> --# define USER_NAME_MAX_LENGTH (sizeof (((struct utmpx *)NULL)->ut_user)) --#else --# include <utmp.h> --# ifdef HAVE_STRUCT_UTMP_UT_USER --# define USER_NAME_MAX_LENGTH (sizeof (((struct utmp *)NULL)->ut_user)) --# else --# ifdef HAVE_STRUCT_UTMP_UT_NAME --# define USER_NAME_MAX_LENGTH (sizeof (((struct utmp *)NULL)->ut_name)) --# else --# define USER_NAME_MAX_LENGTH 32 --# endif --# endif --#endif -- --#endif /* _DEFINES_H_ */ -Index: shadow-4.2.1/lib/defines.h.in -=================================================================== ---- /dev/null -+++ shadow-4.2.1/lib/defines.h.in -@@ -0,0 +1,385 @@ -+/* $Id$ */ -+/* some useful defines */ -+ -+#ifndef _DEFINES_H_ -+#define _DEFINES_H_ -+ -+#if HAVE_STDBOOL_H -+# include <stdbool.h> -+#else -+# if ! HAVE__BOOL -+# ifdef __cplusplus -+typedef bool _Bool; -+# else -+typedef unsigned char _Bool; -+# endif -+# endif -+# define bool _Bool -+# define false (0) -+# define true (1) -+# define __bool_true_false_are_defined 1 -+#endif -+ -+#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) -+ -+/* Take care of NLS matters. */ -+#ifdef S_SPLINT_S -+extern char *setlocale(int categorie, const char *locale); -+# define LC_ALL (6) -+extern char * bindtextdomain (const char * domainname, const char * dirname); -+extern char * textdomain (const char * domainname); -+# define _(Text) Text -+# define ngettext(Msgid1, Msgid2, N) \ -+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -+#else -+#ifdef HAVE_LOCALE_H -+# include <locale.h> -+#else -+# undef setlocale -+# define setlocale(category, locale) (NULL) -+# ifndef LC_ALL -+# define LC_ALL 6 -+# endif -+#endif -+ -+#define gettext_noop(String) (String) -+/* #define gettext_def(String) "#define String" */ -+ -+#ifdef ENABLE_NLS -+# include <libintl.h> -+# define _(Text) gettext (Text) -+#else -+# undef bindtextdomain -+# define bindtextdomain(Domain, Directory) (NULL) -+# undef textdomain -+# define textdomain(Domain) (NULL) -+# define _(Text) Text -+# define ngettext(Msgid1, Msgid2, N) \ -+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -+#endif -+#endif -+ -+#if STDC_HEADERS -+# include <stdlib.h> -+# include <string.h> -+#else /* not STDC_HEADERS */ -+# ifndef HAVE_STRCHR -+# define strchr index -+# define strrchr rindex -+# endif -+char *strchr (), *strrchr (), *strtok (); -+ -+# ifndef HAVE_MEMCPY -+# define memcpy(d, s, n) bcopy((s), (d), (n)) -+# endif -+#endif /* not STDC_HEADERS */ -+ -+#if HAVE_ERRNO_H -+# include <errno.h> -+#endif -+ -+#include <sys/stat.h> -+#include <sys/types.h> -+#if HAVE_SYS_WAIT_H -+# include <sys/wait.h> -+#endif -+#ifndef WEXITSTATUS -+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -+#endif -+#ifndef WIFEXITED -+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -+#endif -+ -+#if HAVE_UNISTD_H -+# include <unistd.h> -+#endif -+ -+#if TIME_WITH_SYS_TIME -+# include <sys/time.h> -+# include <time.h> -+#else /* not TIME_WITH_SYS_TIME */ -+# if HAVE_SYS_TIME_H -+# include <sys/time.h> -+# else -+# include <time.h> -+# endif -+#endif /* not TIME_WITH_SYS_TIME */ -+ -+#ifdef HAVE_MEMSET -+# define memzero(ptr, size) memset((void *)(ptr), 0, (size)) -+#else -+# define memzero(ptr, size) bzero((char *)(ptr), (size)) -+#endif -+#define strzero(s) memzero(s, strlen(s)) /* warning: evaluates twice */ -+ -+#ifdef HAVE_DIRENT_H /* DIR_SYSV */ -+# include <dirent.h> -+# define DIRECT dirent -+#else -+# ifdef HAVE_SYS_NDIR_H /* DIR_XENIX */ -+# include <sys/ndir.h> -+# endif -+# ifdef HAVE_SYS_DIR_H /* DIR_??? */ -+# include <sys/dir.h> -+# endif -+# ifdef HAVE_NDIR_H /* DIR_BSD */ -+# include <ndir.h> -+# endif -+# define DIRECT direct -+#endif -+ -+/* -+ * Possible cases: -+ * - /usr/include/shadow.h exists and includes the shadow group stuff. -+ * - /usr/include/shadow.h exists, but we use our own gshadow.h. -+ */ -+#include <shadow.h> -+#if defined(SHADOWGRP) && !defined(GSHADOW) -+#include "gshadow_.h" -+#endif -+ -+#include <limits.h> -+ -+#ifndef NGROUPS_MAX -+#ifdef NGROUPS -+#define NGROUPS_MAX NGROUPS -+#else -+#define NGROUPS_MAX 64 -+#endif -+#endif -+ -+#ifdef USE_SYSLOG -+#include <syslog.h> -+ -+#ifndef LOG_WARN -+#define LOG_WARN LOG_WARNING -+#endif -+ -+/* LOG_NOWAIT is deprecated */ -+#ifndef LOG_NOWAIT -+#define LOG_NOWAIT 0 -+#endif -+ -+/* LOG_AUTH is deprecated, use LOG_AUTHPRIV instead */ -+#ifndef LOG_AUTHPRIV -+#define LOG_AUTHPRIV LOG_AUTH -+#endif -+ -+/* cleaner than lots of #ifdefs everywhere - use this as follows: -+ SYSLOG((LOG_CRIT, "user %s cracked root", user)); */ -+#ifdef ENABLE_NLS -+/* Temporarily set LC_TIME to "C" to avoid strange dates in syslog. -+ This is a workaround for a more general syslog(d) design problem - -+ syslogd should log the current system time for each event, and not -+ trust the formatted time received from the unix domain (or worse, -+ UDP) socket. -MM */ -+/* Avoid translated PAM error messages: Set LC_ALL to "C". -+ * --Nekral */ -+#define SYSLOG(x) \ -+ do { \ -+ char *old_locale = setlocale (LC_ALL, NULL); \ -+ char *saved_locale = NULL; \ -+ if (NULL != old_locale) { \ -+ saved_locale = strdup (old_locale); \ -+ } \ -+ if (NULL != saved_locale) { \ -+ (void) setlocale (LC_ALL, "C"); \ -+ } \ -+ syslog x ; \ -+ if (NULL != saved_locale) { \ -+ (void) setlocale (LC_ALL, saved_locale); \ -+ free (saved_locale); \ -+ } \ -+ } while (false) -+#else /* !ENABLE_NLS */ -+#define SYSLOG(x) syslog x -+#endif /* !ENABLE_NLS */ -+ -+#else /* !USE_SYSLOG */ -+ -+#define SYSLOG(x) /* empty */ -+#define openlog(a,b,c) /* empty */ -+#define closelog() /* empty */ -+ -+#endif /* !USE_SYSLOG */ -+ -+/* The default syslog settings can now be changed here, -+ in just one place. */ -+ -+#ifndef SYSLOG_OPTIONS -+/* #define SYSLOG_OPTIONS (LOG_PID | LOG_CONS | LOG_NOWAIT) */ -+#define SYSLOG_OPTIONS (LOG_PID) -+#endif -+ -+#ifndef SYSLOG_FACILITY -+#define SYSLOG_FACILITY LOG_AUTHPRIV -+#endif -+ -+#define OPENLOG(progname) openlog(progname, SYSLOG_OPTIONS, SYSLOG_FACILITY) -+ -+#ifndef F_OK -+# define F_OK 0 -+# define X_OK 1 -+# define W_OK 2 -+# define R_OK 4 -+#endif -+ -+#ifndef SEEK_SET -+# define SEEK_SET 0 -+# define SEEK_CUR 1 -+# define SEEK_END 2 -+#endif -+ -+#ifdef STAT_MACROS_BROKEN -+# define S_ISDIR(x) ((x) & S_IFMT) == S_IFDIR) -+# define S_ISREG(x) ((x) & S_IFMT) == S_IFREG) -+# ifdef S_IFLNK -+# define S_ISLNK(x) ((x) & S_IFMT) == S_IFLNK) -+# endif -+#endif -+ -+#ifndef S_ISLNK -+#define S_ISLNK(x) (0) -+#endif -+ -+#if HAVE_LCHOWN -+#define LCHOWN lchown -+#else -+#define LCHOWN chown -+#endif -+ -+#if HAVE_LSTAT -+#define LSTAT lstat -+#else -+#define LSTAT stat -+#endif -+ -+#if HAVE_TERMIOS_H -+# include <termios.h> -+# define STTY(fd, termio) tcsetattr(fd, TCSANOW, termio) -+# define GTTY(fd, termio) tcgetattr(fd, termio) -+# define TERMIO struct termios -+# define USE_TERMIOS -+#else /* assumed HAVE_TERMIO_H */ -+# include <sys/ioctl.h> -+# include <termio.h> -+# define STTY(fd, termio) ioctl(fd, TCSETA, termio) -+# define GTTY(fd, termio) ioctl(fd, TCGETA, termio) -+# define TEMRIO struct termio -+# define USE_TERMIO -+#endif -+ -+/* -+ * Password aging constants -+ * -+ * DAY - seconds / day -+ * WEEK - seconds / week -+ * SCALE - seconds / aging unit -+ */ -+ -+/* Solaris defines this in shadow.h */ -+#ifndef DAY -+#define DAY (24L*3600L) -+#endif -+ -+#define WEEK (7*DAY) -+ -+#ifdef ITI_AGING -+#define SCALE 1 -+#else -+#define SCALE DAY -+#endif -+ -+/* Copy string pointed by B to array A with size checking. It was originally -+ in lmain.c but is _very_ useful elsewhere. Some setuid root programs with -+ very sloppy coding used to assume that BUFSIZ will always be enough... */ -+ -+ /* danger - side effects */ -+#define STRFCPY(A,B) \ -+ (strncpy((A), (B), sizeof(A) - 1), (A)[sizeof(A) - 1] = '\0') -+ -+#ifndef PASSWD_FILE -+#define PASSWD_FILE "@sysconfdir@/passwd" -+#endif -+ -+#ifndef GROUP_FILE -+#define GROUP_FILE "@sysconfdir@/group" -+#endif -+ -+#ifndef SHADOW_FILE -+#define SHADOW_FILE "@sysconfdir@/shadow" -+#endif -+ -+#ifdef SHADOWGRP -+#ifndef SGROUP_FILE -+#define SGROUP_FILE "@sysconfdir@/gshadow" -+#endif -+#endif -+ -+#ifndef NULL -+#define NULL ((void *) 0) -+#endif -+ -+#ifdef sun /* hacks for compiling on SunOS */ -+# ifndef SOLARIS -+extern int fputs (); -+extern char *strdup (); -+extern char *strerror (); -+# endif -+#endif -+ -+/* -+ * string to use for the pw_passwd field in /etc/passwd when using -+ * shadow passwords - most systems use "x" but there are a few -+ * exceptions, so it can be changed here if necessary. --marekm -+ */ -+#ifndef SHADOW_PASSWD_STRING -+#define SHADOW_PASSWD_STRING "x" -+#endif -+ -+#define SHADOW_SP_FLAG_UNSET ((unsigned long int)-1) -+ -+#ifdef WITH_AUDIT -+#ifdef __u8 /* in case we use pam < 0.80 */ -+#undef __u8 -+#endif -+#ifdef __u32 -+#undef __u32 -+#endif -+ -+#include <libaudit.h> -+#endif -+ -+/* To be used for verified unused parameters */ -+#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -+# define unused __attribute__((unused)) -+#else -+# define unused -+#endif -+ -+/* ! Arguments evaluated twice ! */ -+#ifndef MIN -+#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -+#endif -+#ifndef MAX -+#define MAX(x,y) (((x) > (y)) ? (x) : (y)) -+#endif -+ -+/* Maximum length of usernames */ -+#ifdef HAVE_UTMPX_H -+# include <utmpx.h> -+# define USER_NAME_MAX_LENGTH (sizeof (((struct utmpx *)NULL)->ut_user)) -+#else -+# include <utmp.h> -+# ifdef HAVE_STRUCT_UTMP_UT_USER -+# define USER_NAME_MAX_LENGTH (sizeof (((struct utmp *)NULL)->ut_user)) -+# else -+# ifdef HAVE_STRUCT_UTMP_UT_NAME -+# define USER_NAME_MAX_LENGTH (sizeof (((struct utmp *)NULL)->ut_name)) -+# else -+# define USER_NAME_MAX_LENGTH 32 -+# endif -+# endif -+#endif -+ -+#endif /* _DEFINES_H_ */ diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml deleted file mode 100644 index 5979227..0000000 --- a/sys-apps/shadow/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -<herd>pam</herd> <!-- only for USE=pam --> -<use> - <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:debian:shadow</remote-id> -</upstream> -</pkgmetadata> diff --git a/sys-apps/shadow/shadow-4.2.1.ebuild b/sys-apps/shadow/shadow-4.2.1.ebuild deleted file mode 100644 index 6bdef31..0000000 --- a/sys-apps/shadow/shadow-4.2.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.2.1.ebuild,v 1.1 2014/06/16 05:52:43 vapier Exp $ - -EAPI=4 - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.xz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey xattr" - -RDEPEND="acl? ( sys-apps/acl ) - audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( - >=sys-libs/libselinux-1.28 - sys-libs/libsemanage - ) - nls? ( virtual/libintl ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - app-arch/xz-utils - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20120417 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${PN}-4.2.1-sysconfdir.patch - epatch "${FILESDIR}"/${PN}-4.2.1-sysconfdir-2.patch - epatch_user - elibtoolize -} - -src_configure() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --without-tcb \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - $(use_with xattr attr) - has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052 -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${ED}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${ED}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttymxc2 ttymxc3 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${ED}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${ED}"/usr/bin/passwd "${ED}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}"/pam.d-include/shadow - - for x in chpasswd chgpasswd newusers; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} - done - - for x in chage chsh chfn \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${ED}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${ED}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - - # Remove pam.d files provided by pambase. - rm "${ED}"/etc/pam.d/{login,passwd,su} || die - fi - - # Remove manpages that are handled by other packages - find "${ED}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${EROOT}"/etc/pam.d/system-auth.new \ - "${EROOT}/etc/login.defs.new" -} - -pkg_postinst() { - # Enable shadow groups. - if [ ! -f "${EROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest deleted file mode 100644 index 5844dc9..0000000 --- a/sys-devel/binutils/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST binutils-2.26.tar.bz2 25543552 SHA256 c2ace41809542f5237afc7e3b8f32bb92bc7bc53c6232a84463c423b0714ecd9 SHA512 e77e1b8dbbcbaf9ac2fae95c4403615808af3be03b2e1d32448cd3a7d32c43273f8bcace3f2de84ec120a982879295673029da306e2885dbf5f990584932cfc7 WHIRLPOOL b467033fa1944f2f4f823e79a1624dffdcee20498636d6d807904bf13bf45cc3eb68308a1b97fa008bd2f303a38476480654dd61208f0e2d0e3db7008d217ef2 -EBUILD binutils-2.26.ebuild 296 SHA256 80d74ccab4fc12b2d65eba22b17d796c6982e2034caf70f52fd4d13a5859f21a SHA512 bd0d4c4a75c463bfea89e11195cd71b4b7157ae9cadb2ec862109b807591bcae2f93d813ac1010128028170cc0b1988198574a14c0d386ac459ff181c79a5d22 WHIRLPOOL dffc138ec292de22bfa6fcbbc92642519be8485bd22a31739fce81bd5da1afebcd7fcb40c5e254f7f42bea45933ab599c9815d691d06b682f8d126725268903e -MISC metadata.xml 556 SHA256 5190d488015dabc64517859b83c708e8c265c5c48aaf3304971649134ca04ad3 SHA512 9b4bc745ad1720c8234098add2fad18e7dd5d4936c9957fa0e66d5f8e61bcc05dfa915c443ed9bc3755f7f067447cc4021fa757437cb77591a2a8167f8482212 WHIRLPOOL 781fe35ac5ee4fbd87e1ca77866f702dc99c14a3d466282c92c99c488fdaf87b1e5dc32b02b320f285779bd2f1662a151104c72f3e249fce1e9211e2e0d547bd diff --git a/sys-devel/binutils/binutils-2.26.ebuild b/sys-devel/binutils/binutils-2.26.ebuild deleted file mode 100644 index 8479595..0000000 --- a/sys-devel/binutils/binutils-2.26.ebuild +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -PATCHVER="" -ELF2FLT_VER="" -inherit toolchain-binutils - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd" diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml deleted file mode 100644 index f6850d0..0000000 --- a/sys-devel/binutils/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> -<email>toolchain@gentoo.org</email> -<name>Gentoo Toolchain Project</name> -</maintainer> -<use> -<flag name="multislot">Allow for multiple versions of binutils to be emerged at once for same CTARGET</flag> -<flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag> -</use> -<upstream> -<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id> -</upstream> -</pkgmetadata> diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest deleted file mode 100644 index 14cece5..0000000 --- a/sys-devel/crossdev/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -EBUILD crossdev-99999999.ebuild 875 SHA256 ef7776507c1704cc083a0787f6e642ffdc44f664c4435d9cd0e3738810d02c39 SHA512 8d7c4b8ba34c822857dc9444147451d26b1b521f0db340e960a44c6e30c8a0524fc07739d553cd1045ba7f02c0d0c3e1050f5c806e33d2fb2a802deb0364df6d WHIRLPOOL af4f228657dd831de2d3e00269e4699f3f22080a65a28f430e66de5d7b78d960e7c003821501683f746570a28534aaeb7c99a86bbae4047b5423cc8b2ee5e448 -MISC metadata.xml 244 SHA256 5431488a9792fce5a4d11743e355abefa2c5016c9b542c2e53d87072d553a37f SHA512 4a33773e95965b86d3e2f934eec69d4f69e46f07015f4c61ca278e4dd248e98170952b683dccd06a672e2f582db6bc76a8abb1d38ecce98f4e33bbef6539d6c0 WHIRLPOOL 831226e1c2bab3af85242e42a117d3e660aa146c1e3a5ceef39f9bfd855b1402e902f7ae1504fc8e23a8b3bbb4871f6033326367f86da701034c5b52dd5fd29b diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild deleted file mode 100644 index 6434ff9..0000000 --- a/sys-devel/crossdev/crossdev-99999999.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-99999999.ebuild,v 1.5 2011/07/14 04:13:36 vapier Exp $ - -EAPI="3" - -if [[ ${PV} == "99999999" ]] ; then - EGIT_REPO_URI="https://github.com/heroxbd/crossdev.git" - inherit git-2 - SRC_URI="" - #KEYWORDS="" -else - SRC_URI="mirror://gentoo/${P}.tar.xz - http://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - KEYWORDS="~x86-linux" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="http://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=sys-apps/portage-2.1 - app-shells/bash - !sys-devel/crossdev-wrappers" -DEPEND="app-arch/xz-utils" - -src_install() { - emake install DESTDIR="${D}" || die - if [[ "${PV}" == "99999999" ]] ; then - dosed "s:@CDEVPV@:${EGIT_VERSION}:" /usr/bin/crossdev || die - fi -} diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml deleted file mode 100644 index 33d7123..0000000 --- a/sys-devel/crossdev/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>embedded</herd> -<herd>toolchain</herd> -<maintainer> -<email>vapier@gentoo.org</email> -</maintainer> -</pkgmetadata> diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest deleted file mode 100644 index d280716..0000000 --- a/sys-devel/gcc-config/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gcc-config-1.8_p20160608.tar.bz2 17446 SHA256 cef5de71a77d9cef4298ec42dd69b9694e53b07ed13a9dd674c5d5ff13fe2432 SHA512 ed3a1dd78a8123435b90283b708cc6141836be93d062606b4262d5c6aeb753efa0f549ac5b75556a1d193cc935e014c69418052cd6f6cab52d3597dcc2b05c12 WHIRLPOOL d3c510526ca76f7a634bafd3a553f017853e76046c16ca4887ffa7c327371e226d434c9c0472f04abf22c626cdc2975231ed182ca58cd59dcfa5ce06ff01a354 -EBUILD gcc-config-1.8_p20160608.ebuild 1250 SHA256 35b4558a113eac240214384680025c968cca540bdc900502eff3fd07ff7d3740 SHA512 f36b5be38b6b3f7fab66f724bf9fec7229d149d8ef2d80481062c17790d9301ca79d9ecca94d43e67b20ccd322186f6412ac89aff0905be3c510e540e2fad1ac WHIRLPOOL 69a0e8ed0f3d176ebb2f746d7132e007c6205b482afaf7a2fc7b7502495bcbf1119f19c3f8cc66ec136d3b4c725780fc50190978df0b3fbcdc93d4a369fbe201 -MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819 diff --git a/sys-devel/gcc-config/gcc-config-1.8_p20160608.ebuild b/sys-devel/gcc-config/gcc-config-1.8_p20160608.ebuild deleted file mode 100644 index b8e0e20..0000000 --- a/sys-devel/gcc-config/gcc-config-1.8_p20160608.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils unpacker toolchain-funcs multilib - -DESCRIPTION="utility to manage compilers" -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~heroxbd/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=sys-apps/gentoo-functions-0.10" -S="${WORKDIR}/gcc-config-master" - -src_compile() { - emake EPREFIX="${EPREFIX}" CC="$(tc-getCC)" -} - -src_install() { - emake \ - EPREFIX="${EPREFIX}" \ - DESTDIR="${D}" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - install -} - -pkg_postinst() { - # Scrub eselect-compiler remains - rm -f "${EROOT}"/etc/env.d/05compiler & - - # Make sure old versions dont exist #79062 - rm -f "${EROOT}"/usr/sbin/gcc-config & - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - rm -f "${EROOT}"/usr/include/g++{,-v3} & - - # Do we have a valid multi ver setup ? - local x - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do - gcc-config ${x} - done - - wait -} diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml deleted file mode 100644 index fb4199e..0000000 --- a/sys-devel/gcc-config/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>toolchain</herd> -</pkgmetadata> diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest deleted file mode 100644 index 3cd8fc6..0000000 --- a/sys-devel/llvm/Manifest +++ /dev/null @@ -1,87 +0,0 @@ -AUX cl-patches/0001-r600-Add-some-intrinsic-definitions.patch 2450 SHA256 b0a718800c8969e174f3a22e61c15a370376f477e031fe97fff6aaab152f9867 SHA512 d23f9645d3e3364b1e9ce522eb15022fd3f2a685741db88b117b409ee33a07344a8e9ba9d89dc3535e5289edf79c6beb7ff144659f4e725b1a8f2c4256f9aad0 WHIRLPOOL c549806dbe5309dc441b65c942de488c6afc8c511d060d5c1459a4f99b97a357acbec51ce51bd704e5e1e74437cd413755f15377ad6b96c235242bc370af096f -AUX cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch 1189 SHA256 172bbb3cb1214e61ee2684c133317bb997e94a34c91dae94d4848cbd0c216436 SHA512 cf711149c421b4258bc64b81018d0a9474d8b4e4128d0cc0cea788b54c93e9512397b2310db8a1834c3507b4d893d5743dbc53183ac0daca23da55601b976c16 WHIRLPOOL 8e6bd9f005a6a941c55d7c8d9b127826191944fab9e404f8ed958efd07017f5f9301273739f869a73f15fc2a79af9dc18687ff85403acf24e175a464838b3f2e -AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845 -AUX clang-3.3-gcc-header-path.patch 4309 SHA256 56e51c30b91f0ff264c27e332c5375672c035b8271a64860b9e940c918ebf7ac SHA512 568c82c34b56bd18e34122975a420f38ae9f190c9efec00383aa0802c1810297b1fef94a21093775ee20c4b30ad5800b4bbebd26e5cbc9358b11ce7b5165ac41 WHIRLPOOL 2ea6ba49110d6f0bb1f3c6f93f6788463cfcf67b19d9397a69ab4066d3fc1106d544bedc24668a5e515df561e992a7d59a27253a08fae02e622aad36962ace8f -AUX clang-3.3-gentoo-install.patch 2815 SHA256 76a3ce245b1fb9cc5d391934755d27e248bdcbb9581ab7931287e75bf626aad5 SHA512 8105461ff031a7dc00e2a8ca9939afb56525bdc065beff7bb06f22525cb6ecf6b8196a1e0ac11fa3895dc29b4f04c24f61c5492859f23785285517775f3d69b6 WHIRLPOOL dbb5fc2596bee19ec9fff0c14b4a9e087a6ba4e3af115da956c43772cf44f2f480a21f86b15ec3890d74cc3fa3b9cb4e3bdbee341677fb8e79a640b0a5c8f6fa -AUX clang-3.4-darwin_build_fix.patch 1876 SHA256 b2fe85911006affc8ac5fc68496c45845872cf4b37445910b8d10a5bfbe77fcc SHA512 54841b590e14b84f90b00ec782785181018196d076764e4048960d1321d18aac388e1220bdc70b10432dfb5fcad5a43af6c33124ec93df8bc3a724cceeee9260 WHIRLPOOL 8c1373a558619be095427d7986246524e5f7c1239ee706234debc2add1f03626d630a1e5216bdc7127f0b833eca791fae666765a27d394ecc55d394492f424ab -AUX clang-3.4-darwin_prefix-include-paths.patch 714 SHA256 a1e3f34d225e4b0503fa2bccb85e53e80f682a3171ec726629749f7fe7e725ed SHA512 00a364352cfeb6c18f825045af21c3de9d501403b416fba2380dff0e3bed957ec42cda35ca13b718fe3854c26264578ecf4beb295a374d5afcd620b87dc44cea WHIRLPOOL 816c6377c8a17dadf91380c19dbf337d1f5e71733da6f2e1f79714a2fbeee8f37ad6f0ad1bb449061771d317b8bada044fdfe22197f6c3de2ec2708c9cdaac09 -AUX clang-3.4-gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68 -AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd -AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f -AUX clang-3.6-fbsd-gcc49.patch 1016 SHA256 550862df82d47bd54e8adad7b8ee5bc8eaf14ed4bc100d09ba01d5416ac624b5 SHA512 4d9fcb9626774ea1a06494ee55efb5d6232a33874996a90fa29003ac53f9b9dad2885281a9f9bc15fdf0f0817c351cb6d8a4151e5f6ea12e28d383ded1429018 WHIRLPOOL c0140413a4944989efc5ef9c6ba33d10f43add5e1d8c7a8438cb04c18e764c3db26d65330d6a1570940a93cf4d43de6bb1f5a5640384faed3ea43abfa52b3d5d -AUX clang-3.6-gentoo-install.patch 1660 SHA256 74cce23945897ce2cfd3931b08695d534973e32a0d104ff942b2f5c500ec4ad7 SHA512 77e2a2dd82fd13292edced8c9bba911579f2b4984a64223e8c80f41b5605220f1433beb6f40e0746163d894d4405296e1f40584eb069f960866df97e6057b569 WHIRLPOOL 4784e8da4e04406a1261c9a539280c90936141b6061e567c70f9e4b566d45e0275b2513d66c03a5473fee6f434e0cf0242e7ac21eafe59a8c26c7c6bf7040876 -AUX clang-3.7-strip_doc_refs.patch 2213 SHA256 5b1e7cc9264d55d3c8213cbf4c6701ad01652da1159ba0bf620cbe7a3382cfdd SHA512 dbe382a64e01c148b6e33734c1b423148584a15037c651cc56691146a1419559006a605c9bfb4ae72d23702ea48f1f40903bd0faf95c1d0ac3c8bd68c4238cdf WHIRLPOOL 5c884f67413af976f1146a2705c1096a7425ca90d13686b9f71f2230447ebe1d1bd39a93e32ef01b4ec6178fbd199b05bcf8d0a6780637914f3bac86955409c3 -AUX clang-3.8-compiler-rt-fbsd.patch 1101 SHA256 1490f7343a7ba632057e7e38e5885b5f2a0c212243673bf06e0ffa5eeac69253 SHA512 f1c23ce15090e2c75f43796dbdb0fef113f55aa633aebf041ab894638221f13dea195409063db663033cfef8963793b2578e16c42b8237bc342107e6d73f22dc WHIRLPOOL bc8b078dca18c5b31abbd45b08b4e17383a007620f730a5331ab7e6dd5d937686d3875589375cfb7280d18e5d327c86fcf9e8cf82f25f91ffa1b9779e8822df5 -AUX clang-3.8-gcc4.9-search-path.patch 4800 SHA256 bc0d359d971811a1d4fdf4444e72987f7defcc5309af48f2410a410d6e781625 SHA512 8104fe788344718a68e65db5bdee1ba317c6fb9c0c5fab255b6987790e0c4ac6e24abbe10d6ac340176fa4b726cc38c3e8bd282fc993e2155fa96aa98a72e4be WHIRLPOOL b43138f34f3dff9a1841d6476abb312471dda5dfa58732a4cedcbe1a5df576aac5617d44e58202d32c8b11498a8cc1da1913487b866d18556bde93cc7566e7c5 -AUX cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch 1404 SHA256 c9692562264ee6a25c3a2f25c990fab763aee36014de3ef95aa1d35a89aa0c0b SHA512 41dfe489adc0a45e4ffd5961c973fe94934d542b1474bb2dba4320b75ed6ff22ce0ac4b590ff20e626ea7c14617c9703ce1fd4d8d6bf1bd3b26ab0adeea373f0 WHIRLPOOL a9d84dc513118cab6310ea46c7b2e67654c81cd3c783d5db8e9ea3657fc1658e80fe4663399d4e35f99294ea9a98fb422e9077a6c8b73a3a98bbc8b282d1e9ad -AUX cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch 954 SHA256 6518c1a1fdce0371aa1a9dab790c0999440e7971ab2613f6d348250ace9310d2 SHA512 e4721c13add5f65126a3d84b9b66ce7086f435c9d2a729edca7bfc3c6f185afb2b5422c7f5045c1a3a4f82c5e3d5616b647bfad9975bb73ecf228235f1d9f588 WHIRLPOOL f35f09b2d29de42dba9c28825af5feec562860f25206589b0a9dcd1daea27c317da1385bdaa5c562b2f4c0613071c3bc1fbfcddece97cd13debaddd14324d552 -AUX cmake/0004-cmake-Do-not-install-libgtest.patch 835 SHA256 ed1531681603507fc674babd1f117063dcceb856151c20fd967d667d0dd83f2d SHA512 156f3b56e1bfe17804d3543a109567dcc10bac7a77f440d97bb900cc61f1e7bfe195ea3cf97bffbae7b132ebe31ad9d1acf5aca462a4aa01575909971ffdcf06 WHIRLPOOL d8bdc2032cec631c89d77a8fd231a0c22eeb5f9c99b8fda1068fb0e9fc10c81dc2d1bc71e8254ebea6392cfe3700427879841f7a6fcca3cd4c72ec1f1cdd56b0 -AUX cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch 1689 SHA256 255e8cf326d5c7ba04cb24d3227cd9d53cc37de1c191c001a0b44973e916b366 SHA512 755ade61097cf2fbc0f480476d81f17f29a32346b108c93f7b918b606cc1d8b54b06d78fc4dddffdccfab9c7429e4be7232fb8f4a498d239a8524d48e545b102 WHIRLPOOL d03f81f0322e006211e706f4ac87b9a47de31d464017de10fff636a62418bb34835f641ec872b8d599611fb2e61847c71820f60ec186f5fb4444e2b73f687860 -AUX cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch 2251 SHA256 eb5c750e910b8088ec7e7fe2fa1cf367f4db738dbe681fa41c35e989db312c3b SHA512 6fc2a0a8d0b015c852f2ee2ca8038da0e64d7388f8909f52e871bcf0a25e8b5ac2a0a163411e83c24a71445a8e84d9ac9cc6acea543fd407ac8a46eb4ca13c0f WHIRLPOOL e193fe49bfe4657caa08deda88d8d5ec9270a9cbdeb9a08279efe9571a19ff2dbcd6e5eedb8ddc473a763ae60eebf7a38bc3366959569b78a9e15c46f2f4d360 -AUX cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch 1031 SHA256 a0da8be64c575ec5a353ee33c530569c754df65cf6df04e5abbc29bcda1fccca SHA512 1948de3e7fb38517e00909f285541bcf3d75cb9c51ce7a2dfb7485346dd3409200bf82081a3a83d7e6843fb4cdbac12395ac6b9049f45201c94fc0ffa09d1ad9 WHIRLPOOL 8282dace8d2ba9d111b57b68e0116e92cafe2c070cc82d52518c6a6b4be3dcd37882bb505fcb3b01817eb577261c4f7f1b152bb12def6be52ea9c1625a15c29a -AUX cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch 1106 SHA256 010816607be72e178c21f7b5b8fbe2e70697feb70c4d78e03b498672bff1cc5c SHA512 0081071254eebfa2f550b98290b661664c31ce5e28222d491d9f3522c4822878b50ba6f08c24e1a3f97cc9b1d437e76d50fb94939e37432d048e22825068936a WHIRLPOOL 38f09fcc2db0453974b76c12ca287718d778153496e6fe9237b92026bd6dcddf96dde69c5e406781c9da90fcb0de39327e1c4cb8ab847935e2626697e3acc9f7 -AUX cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch 884 SHA256 40978b278a93f26f21b1639d962cd75290051fe1a3e1ae52c3de98631e6b0b6c SHA512 10b8280ffa720b4de42bb95a7d504d1f11d386544614b1281575b4864749be659d6700cdbe3f2cbf5f85a4ff2dfeeda752955e37735214b8a1fd78e3e5b306e5 WHIRLPOOL 3a3a5cdb58a22fe311c62db4c73c058522ad027704e44a93b961f3f0ae11c9e230548cd860db4163eacbcb46b8e6580f9ad4c3db85cbca2d5495495076c2a37c -AUX cmake/llvm-3.7.0-lldb_tinfo.patch 457 SHA256 7347b1e266883cb3c287cef5e5070239519a91a6e11481fe81ba291dcba2dc7f SHA512 74ca80d75e366b9c940f5955cfe9fab22e5ab7ca574971159166b3e7b73eba59db7967db4955a951157eed2d67c2189ea1bd7faddab1878c6b8e206e65ecdc18 WHIRLPOOL a3da347ccdd9561ff9327c2025f5da063b5411ad2d12540ecf452d4af7e2c6f635e935cf70024f8c76874b2c1b2161c01be41970c9dbc6a52bb919ff8e5108df -AUX cmake/llvm-3.7.0-ocaml-build_doc.patch 470 SHA256 8b163cb18d7fc954f3d9c1b51470f1e94d6a5361a241736362af845976e9b025 SHA512 fb15a267d6b2febf87cd200d5b7e0f7c1371b6219398c49ad033f2b695b2a0a5c092b92ddee41a1831682f90b17af8c8bf01e261c99f18f654e007dd2198b5c5 WHIRLPOOL 31e772ff5574a5c05e598140586a4666824d5a294d09c721b8b20f15b9493182d90a8ea301959bb76f4280817928a1518e8223f018f93ca6ce125f4f7be941ee -AUX cmake/llvm-3.7.0-ocaml-multilib.patch 1883 SHA256 90a61205f73647d4dbf5eb7f8543d281a5fbc87e6742a60ac5ee2a5d384dff2d SHA512 74d09ad5d20f2306d669b2bf115f36fb8c9d9dd0888a9cd6e08bc6e55d47f1f742ff72c866d5c89bd065500c354745dc038df67838a7cf4bda6daf41d803f5af WHIRLPOOL 20be3b94ddd745f640a48eed3ba9ce8d91df44d4ee9820db824030e46dfaa44ab39107cfeb08a91f54898e7b85b1e4ffb912efd4f844b9b221c1ac3706d7f0ed -AUX cmake/llvm-3.8-allow_custom_cmake_build_types.patch 563 SHA256 e2e8b2bce270eb2bf5edfa67bcec9cbff114a9f4cacbaad8d66f998b5d8b9a2f SHA512 bd3e5ebd4be947f561da8d19ebf50a31d2dcfdb2ab0080fdcf514f02ea23d411643bf5556d1d788d7f53c71b6503f457e9f6a68c82f0650a86e4b0ddc4aaa9b9 WHIRLPOOL 65ce41d820b969a0596655fe6f7e55edcb4fd16972c4608c9c2ad7ae522d2c522009b2af430185c08a007a34908470e058dae5d1b084eac1c6db2ba39e0d08e1 -AUX cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch 1210 SHA256 ae5896f281c9e5e3ca00c962fee38cb6c95e3034f60a79a4befecc16c7bfee6f SHA512 b07b1b54fc8ad6141d6fd3335def6c70588dcbf90f81a538238cda70bb7c0acaae4d73f75c8d5f7c42b4c9c687ea2feebd3199606b22635a52a402e2fce4ce9b WHIRLPOOL 246f126c5c5d72e9698fa510f9d19930d860cca017b1588ece4cdbbbdf41d021f5d28fd2ef3b9653707f112a329d0b6eed6ce1b4630e84a2d9d539e3bf7fc628 -AUX compiler-rt-3.7-msan-fix.patch 4235 SHA256 c5adcf512970eed4b0dbcc4ab59277702e3c366d6474b994e1d4d4b649e725f0 SHA512 85ac871906d94bdff736e6c9be71f785da48dafa7bebb9bb60507742dfd59e1f9429aa5414ee913e38dcf1712d0cffc3d48dda78b794ce0b4417511b02d4d5e4 WHIRLPOOL 050abc3a808ad6eb90488516af837a82647053018f17738557d1864be0949a47f40f6b2d93bbebb18408e9e40b712d7c9fe67a3160faf65bc99822f2b141fafb -AUX llvm-2.6-commandguide-nops.patch 975 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649 SHA512 6842285e499b86581ca12fd94f5335e0dcd7afcaf0cdc5042ee8d84d0da6aba6659652eb639027bcad7caf77b0c994ac7e181a15bc609c4b3882e0f391c8cd33 WHIRLPOOL bf1212a8fd06214dba0916a73266842558bed740220d68e3447701ffeba1b3020ca4b4ab5c6d57772a60a6e09f153232f680b1e0b11cbd5d430bd9ef693d2926 -AUX llvm-2.7-nodoctargz.patch 1878 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd SHA512 3f9dd34437c6dba8246cdf5c8563889f805f3c8e579190c4f0fb06f72bf5aa112ecbfa18467a35eceaadcd470544f434f319f048cb58d6631170788b10fcc75b WHIRLPOOL 63182867bf8f0bd6ca1b7d97229fd13952526d59587192727348026e8a759f1c6b79db044760465e2424851fdbdf79e4122c5bb0285b505d20f151334063e8d1 -AUX llvm-2.8-alignof.patch 2522 SHA256 a9f7add4f4002bf9af438c0c4d1ca86875d6214a5044334325a60cdcbc8a3cdc SHA512 188bdf29b60ce0f83010ef33cd28c4cb710d238fe678be731ce1d099c7df5577f51162c95e06d996e9c90535ace41fecd3eff6570214a313fe165c0945c42832 WHIRLPOOL 65dd1cf8eb106af0516a5f302a08c51bfa884e35dd5efffbbcf97e1212a6b9356c6caea4472dce8e54a5a30dc5c6ba73be29e64b1b060e63a9ce7d816066ccea -AUX llvm-2.8-darwin8.patch 576 SHA256 6db04d9bb5fe65f8a92972988477328a7358e325abca32f30a716ff454d0fe21 SHA512 a7716ade819779bc2b8922cb6b072b85c0edef95cdc85b3b6dca18a51c7d4c48b4a8428341c2de85ac6fb0045849feada36f610a6e706eb80dfe64bb4e414d3f WHIRLPOOL 86dae6d234a8d93dd2714a9cd8ea45f7749cf1993d003da1c3a9a15cbc6e44603cd9b364a5095c5e7fb2df899d418bca29e1b50aad5ecc66829b944dff9d5488 -AUX llvm-2.9-Operator.h-c++0x.patch 2062 SHA256 1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7 SHA512 215214df015c87efa92f8896b9239e5d7385edae1f637bd837584f21a919b9be15f0608274242172c684905f080685e8de770fc16c54c42bed416e6c8e94d2de WHIRLPOOL df4a1ee6d150f95add3a6f33f5b9648dde89ace1012702e88ce5337748a0e1f826073b1b034def46e1971bc1fa5c1841d1dc2eafbf5b428803cd0d5f80c4594d -AUX llvm-2.9-gcc4.7.patch 542 SHA256 9472566d91344ce87e235c68e4e08786c493cddb3383f2bd2f0bd5a1ef153cf6 SHA512 6011f0cd56dffb068342b0f272898218a751f077a970cca34ceaf6e3b43b0c1e7440eed1a73b925e91d0ce0090beba4d8935496449e84609123388860f92d0a5 WHIRLPOOL 4d9a8154fb0f7e2cb1498e8fa010be6f586736180bd46fe54e9b148d1a0f7ce52e4772d17a7481e45490a12dc2c10f5e6a1a7b886914206a5d3102e174cf5240 -AUX llvm-2.9-nodoctargz.patch 1569 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84 SHA512 3a995897f25bfb97908bd8a379249a7b04dc0d8b64aef693272b87c88eff3494d5eac0a66c786e0cc1b8d4fc6b2c555ff8d09bbcd2e29c5e6f3bfbbdeba79044 WHIRLPOOL 254f121f0a5a1974600b1240074f9f8f9bfa760e5bf34f27697c27cf65646e412279b3c523dc3ee88305f73747881c20f60258dbd90bc6a2c380dcc3000ba329 -AUX llvm-3.0-PPCCompilationCallbackC_static.patch 1046 SHA256 f197920fb1ffbebeb2f43689619d637c5102bfc73295a8edb139cca46094ec5b SHA512 29a46adf9c2205475e2fd74ce15a3094b43905f28c484961ad81c78f54e3c4d56fb4005080db7e9671654738fa25901d5bbd1f0a6ae861a5e9b6d38053a6a65e WHIRLPOOL 8ba25aca05b21e2a8a6e25f5c07aa46175b03a4233e6fe102c619b7c60d5558d28e80dbc9c0892a1ecda1e2effd50211cc145c8389e644a27282cd108671e2a7 -AUX llvm-3.0-PPC_macro.patch 1825 SHA256 e56947d9744549ef6903238653c6569b5f91a1eb1bd84ec5d69d32ce5b20d6e4 SHA512 552a6a980cb2c05b6c6924d234efdcf375d12e72829a0372d3a4754d6bfa54f022d98e08b6f286d7dd496f2e74e4f6f9e5f81994a9d183cc39a4a01170b2c57e WHIRLPOOL f40fc9c6d75d7c05c66271c74011c320e302a0502970c38312cbf57a75f06a291900e62a09e3127d0dba7f0569a89d1e35225ca4e2e2b702063c0fb4f05878f6 -AUX llvm-3.0-gold_LTO_link.patch 442 SHA256 62dc70a1d1f581b7f768ca728dcca688a741e03e64566d5f38e02e33c6372ab8 SHA512 6daf346d5fb93cb9ed498164ef42c2c565e6e4e68bd820fed54f53afea4b1a580560836cf484e370a1566603d8799c0f359f589ea99b9d920bc587145391a65c WHIRLPOOL afc7dceed1de3db657f45ec58fb6befd9ec9e79e6c55dc3fcbc26e19c5e0b9d9c0980476a34e4dabf800465a6fe57897ddc4aa1b1a1d88a639126e262bedda62 -AUX llvm-3.0-ocaml_install.patch 664 SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694 SHA512 b13e26a979505df40519ec6fd859f46e3a0e8589ed29c8509ca5c737af1e94890fea2f7c7a0b95ef168dfc7993b52133d7205de228fc4b750fd84af1ee2735e8 WHIRLPOOL a5d455a5671ec1804a06849588c072c29718d5c8218c6ba4a6b7de0b7dac0ad3d37007ed8b39447545bdf917b4c8e5fa780477a28c6250b47692605be7239b02 -AUX llvm-3.0-set_soname.patch 522 SHA256 0f4fe63baa74a963929dc39359cccb6eb4fba73176d72d4a354ebf50e51318a5 SHA512 ddf1b5572d51b5af66d5d7ef28798b41a2991c1799ba091c9e6f3a64a6b1b8081d596096919c7c910ad5af0adc0c8ad02b23fba30eead994d724a334d2c9da9e WHIRLPOOL 51aa3f1dd35e085fa4d3fe700503cd348b9342ef1d7164ec3ef2627b8ed8df0764442779315720c6cd301e4c099722cf84b305717129a386fd2792751e0c20ed -AUX llvm-3.1-ExecutionEngine_tests_xfail_arm.patch 1357 SHA256 392a5e752623a9e019106943e7977f4ba96159e4d5f45208d99ebaa5ddc340a4 SHA512 088dbadb4d27fd9317f9df077527790a817c64eff0b3c27e24a09bb35c00e3138d85d6aaf65e7dc749a120efc639e6ac8c4fbe74af73f3f0e4664fc254273854 WHIRLPOOL dea2a2ee142803fc4cc598fd75351679d761acd9e2c5153428791e0f7548b0aec0d63066f1454987fa6bc712107a6390272cceb03580808408229f6051dcbbde -AUX llvm-3.1-docs-pod-markup-fixes.patch 819 SHA256 c15d4ec435b7b9e37157d0c766ceeeb9b1c650328acd1eee0e588b5272f9ace0 SHA512 b6d8dcdd2003060ab486a8cd4de7b36594641c15074f0642ed2db1f58cd4b55e327a5bfcd6344a7d987ee38f2b4f5ce79941f5658a6fbbcf851172991ef4b883 WHIRLPOOL c37650b8584698379efa5b76e2c02b4bfb30d086d5729754ea668ca8e7cf99a07d795bde132085a89cc926f966a97f68c0094313ed6d895040d429ccd7923fc1 -AUX llvm-3.1-fix_debug_line_info.patch 2620 SHA256 db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d SHA512 0b8bdde081dc7eddcc3556a0220f0a47565c6b95afb31560a835abe630d641c43e3acd0f0d0ba177809495f3208c17aa1a0fd267da3a34d71039c846b03253e8 WHIRLPOOL 47decb374e7109cee7eca7ccfcae5a2bd01a837d9daf6d201f20eb0d2ded14a66e737532c033ca128b049557cd0977dee811a4c54c15036e050d7383c586b5bd -AUX llvm-3.1-ivybridge_support.patch 405 SHA256 cc91a69be3d0f7f216a4d0484284fd054d4b0273f1c4dda7afcc005564867725 SHA512 7ec84a127eda4cbec0aaeb1e34f0606ff76e070bf1f3eb71334219b6a2e21299f30f157d022952e6f23c5e4180903239f5a4323f214041decd4ccc21f1a285d7 WHIRLPOOL 443c57305f1c9676e7191042c0ab7491a2a789433e32b5cc12050cece38eebe9ae62fd1d54200fbc32d2c7d22aedc7f6776fd250ae53e7d2afad0a325c1ba919 -AUX llvm-3.2-nodoctargz.patch 1761 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b SHA512 d12a8996d8a1160f7bad4ce3b3a9ddfb2d29d91fc160876c145f9241927b0cf4413f3b29bc2bf291f0421f61a512de8057e8f3d0029a8a09ba3f1d93582723b5 WHIRLPOOL be273271db8293829a63120cfc917711c99d8893cae6f95af2583def735131f629ee67b5a1515df007477f34abeaf5f2729d689eefdc61eb3aae6b1959971507 -AUX llvm-3.3-R600_debug.patch 909 SHA256 84ebe63a557e3734dc8ed4545f098e2496d815e6bf4a99dfcb65d649a23d2c1b SHA512 cd1b92c713edf895ab7a15494c6092e44082b40b9bb5b0fdfdc438e919456c7fcafab9a840adb165c191454948c0b42bc78ce2b4d2cfbdf371917b16351c6928 WHIRLPOOL 0f08c58c78c1d04b8e701b0b817956a37271115c1fc83ea8f0f54bf965fbc659e418abf7f429c2a29581351050346cb783f0aa9147757d4cfdfa24fd8b28d09e -AUX llvm-3.3-cmake-modulepath.patch 916 SHA256 9d0a00b543c4db58cc65bcf82bafd0aba4747c559f19fd96af1b52a3781f75d0 SHA512 610d1397d35e6502b4b7699399d41585724845f93dc88cfff8104318570b29ce25f99575298d3263440ba57859ed9792b1fed951ab4bd30ef5e1e1c3ec4898f9 WHIRLPOOL 808aa0c3b744c0c3c942cbede312ac8ec2af7404362e4bf8fd0d408e9ffaff90453787816575dcd6a1cacd406818aac5618b2bc5b5a2b4b3817a1025295f264f -AUX llvm-3.3-gentoo-install.patch 5321 SHA256 4f2e80f5567227e3539052a743ef0432f108d76e6fb9ba373dc51dbf159e0410 SHA512 90075d4bb5bdefb76bfb191dcb1b618de464434d9d084b2f99cc5034d33b112378f9aae1d289d30a2f8926132c17ea32ba1bf4049c3a61a418d37f903634b259 WHIRLPOOL 39b3ce4e937985483be7b4d19a37c0837b3c27f308f09fe8aee185b9fb43782b540f6b6be042b8f6dc4b5037be64284e2e233e65b3558e4b4eb1095a7d586a4f -AUX llvm-3.3-insecure-rpath.patch 881 SHA256 27d893e5f551d245f15c01a94df81dd9ad069c2a980cf6a8860fb429eb37a5d8 SHA512 f03d1f522d0153fcbef677bf85202a6ddff408362d9ebc3e4f9f21814b43d28b033b0efb3ee86f5c11a4ac3a91b8afc80d022bddcd839ba503b29cf946e40218 WHIRLPOOL cfca8d189f88c0e26b4c3091db6c4267a90307c5728e64ee3ca55272a884389e56ed186904d9d66b44b870792eaae049cf6e66ee38efaf757655a4be4a0cec6e -AUX llvm-3.3-r2-gentoo-install.patch 4043 SHA256 a8e24328888dc0459fb5c24e244c30baf7f8ec75875fc7293f9e1029d75fb1f2 SHA512 f829d9f8e0d5730a8221a8be9a1d87c7c79a09f498f00d5f9cb7d1172dcdcb2ba1b68b8b5454225dde230d642240d0f647439f34befa23b64156b2f7c2247027 WHIRLPOOL e937127359c474bb843cef34116d2ca8651c4d22ef7ebfc8cd2a22537e483cfdad7e78c1fc4a7d4bee92fa19995bdab9dc8b7cd96594f114ddc9a6af4604ac63 -AUX llvm-3.4-cmake-configparser.patch 1182 SHA256 b5d61e4882e301b361321c3bc69cdee6398b97bbb86ab3895879def6e18907bd SHA512 06e792016a6d7d091a5e15f8a13678e3e59e87bef591f9340ef427c820d0112cc22b7bc9ec57c7066da7f9bca3841a558bd98c71aa7df2aa2da75e53260a5347 WHIRLPOOL 8326541d632a6d4abf8d6444384932a395b6640d8b7f91c8ab29ae9acdd11922acd7652a9e211e5ad704016744d980d0087dbab30b09cab62e160ceed2236936 -AUX llvm-3.4-fix_varargs.patch 6427 SHA256 b764d5c8e2c25aa2634834522aed973ea6ef367d65eb7bed6fca19255af80f82 SHA512 cede7ea9aec7d27dd2ad4a41eb79cf566a03c9384a0fe1b07b52bc470d97a0a54735f5e09ee78cbf2323f28bb3f191e30a6f7454967975791cd70b96e09538d4 WHIRLPOOL a238ba38b5ea13ce7a2d96d4ca2853ff563988b439e4b8dbf99fb6789d46b260469190c7ffe11d5012ca2cb77a8c2be6a95722a3df2aed841938179b219cb6e0 -AUX llvm-3.4-gentoo-install.patch 3528 SHA256 fa2de6dd186091b255832a9b5cb654edddd4c4a16f0f138357c813a40aa9a75b SHA512 e946e1fd422f49d2e150bd641bac0ffe6ea6757b2e6119465090a3c7f5cf69e17c00221bcf67a7fcf29628d93463fb1c57d0d009ff7834151440d779f2d33484 WHIRLPOOL 171f167802ee289716232e16a2c507e3b8dc7913b40df29c55a815ff88596871a1a970c891b0e9b361186cada4d8898e65920d014b4e6eb2178cc207f61bf6da -AUX llvm-3.5-gcc-4.9.patch 1722 SHA256 c73f64311ff67534b581729b3ef0fecf452b86961c3b668ac2e6b50f1eff0bd2 SHA512 5ad0a742fca3eb9e08a183af9f90370baf85528bba6f3083d19592fe2a704950ca8c6bf9e930f9834255de3fc5832c49a06c9ca29a66e45928d9047abd9ad8ac WHIRLPOOL dac24fcb47d8b094ffa6b4403dbd7604901dd0f5ef6665a882380109584e4de815b2f277e05d44c05e1a3d22a7003075b2b2649f3f614f299b38bc6d594400ae -AUX llvm-3.5-gentoo-install.patch 3204 SHA256 0c97173613505ea92f0aa79d4e04e797f1917fdc33b34daee05752bb52336d53 SHA512 f60b04f1fc7798f7869f3d80e4c163086c398e01b81220d60ccff42be5899fa036d5ab95257933e89e4c5efd04267a09015917c6a617b86b82d7ab4f5d0de221 WHIRLPOOL 81ce5835b9eb1fe1b162f35d6e37762cc8d613e67c5791f078ecd0e354a87eb92e52452bd6e9a7f70953dabea99d197786e87ed64dc802223149b8e97d6de265 -AUX llvm-3.5.0-fix_LLVMExports_cmake.patch 1563 SHA256 924303a7fa7ee46276eb2984e3e2d9304873df1d63c0d878371cf98b4094aef0 SHA512 8e8c3ae2c8e2bac0d78a7f572ccfae9cfc30e52ffbfa953596c075cf6adc4e5881d2b80cad4d87bbf1de837d88352334bb51a331adc8d8db74354945c036637e WHIRLPOOL b525bbf3a7ade5906e9e35315af1ccb50c4392e1d104c516927a3ab9b627bc3d0fcf41bd0b77093f6743131f801d37d53d1065371e5c86eb4e7d538eb969b3a8 -AUX llvm-3.5.2-gcc-5.1.patch 516 SHA256 c964eecdfb0cbf4d2a59a553d7bdb3f16e70d8910e6aa7e9c768828ecbdfcea2 SHA512 dd12f9ad7b80625477c5af045cd16233a169c67f62bbc1fa1aaa8b0c975b585b447fcf0773e2fc4f83cc767967fd5fd3678527e447fef66841f40d98927ec4b3 WHIRLPOOL 628021a89d48b74d302199f75a827b89d8fa2ce6909ecba93f5dd64f584a6dc215a0b3cb6b46267d1fd7488594b3ca64de44a867905949e61ae5552cbb30fc82 -AUX llvm-3.6-gentoo-install.patch 3169 SHA256 318288e667623e22c441f7a1da8c3e27b3fff7426839a58a05e43dd0ac37d443 SHA512 9e13fd8606c6aa636d5e1cd3e32781fa4cae3266acf306f5c38f052a7520fc4b603022244b4502045d968c9ca28292539a17caa33b9b470353adfdbb8e159321 WHIRLPOOL 8f3b9b5150d2a29ba4f94a86235d12cf96c1a28ceb7f55fe7b90b3e5e074fe4883d449ac34cbe823ccc22f1ab8b3e2d05dadb39abaaac0a17e3870bbba1ea14e -AUX llvm-3.6.0-ocaml-ctypes-0.4.0.patch 1783 SHA256 3beb0718c10b57b125809d4de991b24d53618469119c652120802b584c7de184 SHA512 8c26e55939c82cca0f1ab9b276720e56cb8f22d1bfcffe228636d18feb3a51b62c408a1fed762d91430137eb231266df4038f88585428dd5d0af19de3749549e WHIRLPOOL be72dbe99b852cd85e1312f8c425e69a09b22ed6d3f5371e8b1ac9697cd2555195e0e36ae4b0d47fc4ee9d77ece883e4668e1c30da30c530bf7fdabfec827a8a -AUX llvm-3.7-lldb_python.patch 1278 SHA256 b6178aea3d2e364e6382b3eef62d45995e78e15e13f7811e93bab778d6974ff5 SHA512 b340fde309a9698766c54952b589ac18ace59b1e7e44c015e5f3c8ec54e66c948193faddad868a5d1df0a0d3e8746068a7b2260195bcac142552531e17eafa35 WHIRLPOOL cb88018ba02038bc0be2acb8dc54994487fdd338cc856194cccc3d70b2f79058759d8a92e8fdd958a1a73d10233bad6ab640dfec7e07fb1e14cc51f962d515b3 -AUX llvm-3.7-llvm-config.patch 4942 SHA256 46b185a44e87908ae8e2edfb07abb2a5e0aacaa56fa286ef5a4678353543ce58 SHA512 39fd04cb4de1b13110c7a3ed45ad7f97fa2a845551552ec69a53641a86c2c292784ef361cc61e314ce3e5f8e862d8b34a04d7e9c4c275834a3f5268c2628d7c7 WHIRLPOOL 18c05f521b946c25151922bd8642c5d6230c01643686ca6c16dff014c8a8b62bc11c13745b1eb97f1b39e92b364e2620e5efb1f20885d229a55d9a9afd189fad -AUX llvm-3.7-msan-fix.patch 3149 SHA256 e939e9403a0caf0cac3e08090ac6dcb872e0ee45cc8f68807d2425dba6ac8423 SHA512 9ab34a764921893af760e54a8513d57b8c6b64eb471c94970ed10d1b83eec458b537df47d30f79a0537ca5b024b9e1ce030f264f1aa8391792d64f06ed19cf8d WHIRLPOOL b198d77179795b0c56adfe3e21d92006579bec3145de880f62c012b95988026f5e5673cf94222b38928f9c88a63c7093c9b60c7ce23508eea727aad11aefad8a -AUX llvm-3.7-nodoctargz.patch 1903 SHA256 6364b822c82697b81bd37db63e059bad26c6e825bc47d894dffac5a3ff28098c SHA512 6fcad8138fb2ab19694bbc92e23c3b34579e5f15dc31b47dd4f0910325b9ec457913185eb78d8f68ae96fca6f48c3754a74de9b3185b25ae25efe41ec5d3348a WHIRLPOOL ce14af312aec1112e10bc213e4bc27f52d6a82aa0b08e3bcdd633795c5f073af2bb8f8e4f6386b22bc6709f654bd1df401303a475730a29f2aef8f9b4fc42342 -AUX llvm-3.7.1-llvm-config-0.patch 3555 SHA256 828b9144f03857b43307d2fe33856b7ec7a3986a9eaa0a2200400369b6184536 SHA512 944302abb7385d43e0b388accaadf7cc09cc1da1b66564c1c68c5ec7a49abc5b7f1683859efec083865410c52e76de7f4660c0564033a8ef4ee2cf9137c0ce32 WHIRLPOOL 4680991f1008c929ba8f34a5c778210641e45460200067e966d8633445afa6d7be41ebcd14dea415b9e20f3e95b6ac800bf0ed96dd8b293726c47d39b41b01b1 -AUX llvm-3.7.1-llvm-config-1.patch 17604 SHA256 6e93b92df89a94becd084479867e0251b13a272660bcf3571640b64ba60a7b3a SHA512 9c3072ac4bdb1fe5b4ae8715a52881d360657818e47a2c3f78cd3e88a73236603e2df7df88b26f36f25a97431b3e70a6c24ce457ba2fcf8f7177651f1245a482 WHIRLPOOL b701bdd7c45f5b4c3526af03fb27442ff33ef68def6d63822fdc8376edadc4280ae714a66f91cca237ce7a437b0738410b691c78922c4250a3c6a55a5746ebe0 -AUX llvm-3.7.1-llvm-config-2.patch 4918 SHA256 42a54aaf38fc24317bcc0e268b356320442eebe8a7f54c0179dcf6dabd1776fe SHA512 67adf538672cf5304ad9861605d3daeb77836d9326808fab9ce498969e202142315d6b260bcfb8b46ff714e3a100c6d9540a2761807159985045e9bb86c87540 WHIRLPOOL db7b60c8b5a19dc9b314faa32812198079257e31ddaf3bc781c14fc6a73a2956f0bf01803a99ef99a0ebb6e9038553b030861a6d7e247ab4c590c92553154c3c -AUX llvm-3.7.1-llvm-config-3.patch 1193 SHA256 8a9c8cb4199800a88419fc762c7c7e65e2dd2f519cfe4437def0005928c81eea SHA512 ea8670dd9327f75d6fcd5e5f06e2011899e57aa8cb04e00197ad5fcf79c3c5875736dcaa75a0f69664dd4381a7ae434af7eede71d36e1224596549fee5d9573d WHIRLPOOL 1718d5e671faefbba1192c891c1cddb87ac275e446d256637fc48e1275f54465a47e7cffb413bc348e437d2a659b9b9d607d71dc31ae62657a429f75cc058de1 -AUX llvm-3.8-lldb_six.patch 766 SHA256 fbd732d0f2a5fe0b2d0b5507525cff250efe868384cfd7c5a638586de8608b15 SHA512 5c3096eb168ac9a37d980d7253317de5c89abd78672e3afbe93a8b3f47a30aa87670f6b01e8a0480f930dd572fbb46bb6ad2c41e8bb11f2059db77aa229be8c2 WHIRLPOOL 5b02d5b6aacf1fa27a599a86cb35b771b855672bd2150baa3518e026a958e7e97b4e9ac04dd44c75b3de61057139aaec1315442127ad37d7f842c24cc454dd77 -AUX llvm-3.8-llvm-config.patch 4899 SHA256 2c3f1924652351c4e1f0eb59c560a94d333b2719ffe7e25891de9bd4efa203a6 SHA512 48e64847a7d767e67c3eb46342db5336bba96b9359becb0420f244a363968d9c5a856a46f9706c6475b8dcf50884f4257632faddd4ec6a66c8986cdb474ebdb5 WHIRLPOOL b5cb5d66f94c7167fa8d9f2fc7a4f9b41453fb282783200068710ebb3bc6bf9a8e7c892154f31bead88030e9880ad8a2986c93226b80aa17580e6aa7c720b73f -AUX llvm-3.8-soversion.patch 854 SHA256 faf88664d7adae8d1db834d177250279060c9e1dd59b47c3d2fae071d6b85b6c SHA512 201858f3ef2f14c98ed5647a1cfea76a455ef79482d32b7e191a11b28f3a3517f792b05e11655850245c5ac3d0c6fb0796a4f1dc5a2c72ddfc055b57f35c4538 WHIRLPOOL d817361a427b53c3daf8270a3cc9e202b3dc19b5937042ee4d68572b1fa3086c64b63d6255f2021c18cd927cf419374369ed21e980d6a200a07bcdb0fac965b5 -AUX llvm-3.9-llvm-config.patch 3160 SHA256 aaed834ab50d19a910e471415edc240e02da9029b0ab54f33bf1657770322fd3 SHA512 6d9dbba89425955f7f804b1042b131e9b221394a1422425e66e2f46b6249d8cb1a9d28210924d9ae9c054bc2808303abbec48a8b1d23a1419c793acbc366cf68 WHIRLPOOL cbcb0a32ded8bff3a7d44a559787319ba662b452401b52f707272ded101de4b132987d671d1208693a7e831576c7427adc5d7b45da4e33194ecb5b8268869eae -DIST cfe-3.7.1.src.tar.xz 9110616 SHA256 56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512 8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5 WHIRLPOOL ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b -DIST cfe-3.8.0.src.tar.xz 9627228 SHA256 04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9 SHA512 fef431d63f95a394d53e3857fb6a6bde7a7b27f40ef5111b4353bcb63ac26febec8a9eb84780187c49699ab099834f13f996f085d02c365676b3fa5bbcc03dcd WHIRLPOOL 10fd94f75f645318ed3436454ccffd570a88cafe35e870563b5f4d89c37b9bdbe282d8793301ca53db6774cc223b2ff7ab0af99293413cac3deefcf5150fcca3 -DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256 4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512 06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7 WHIRLPOOL 2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb -DIST clang-tools-extra-3.8.0.src.tar.xz 334072 SHA256 afbda810106a6e64444bc164b921be928af46829117c95b996f2678ce4cb1ec4 SHA512 f0e593a76df5485f403079bd2fbb4e51c3d1c3fc4e63e2c2910894e8f2a7c14b47265435f3c52f035fb3fe2f595812d0f9869235296157a39c071a23e6a8b178 WHIRLPOOL 4928669a3c019eebe0a98ee72e25ef70ddf3c1d29e6a4aa18e408276b2a870069460c39e0e8fbe960d8d56127bb6951433d1fd89015d192951004e527b065ec9 -DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223 -DIST compiler-rt-3.8.0.src.tar.xz 1270128 SHA256 c8d3387e55f229543dac1941769120f24dc50183150bf19d1b070d53d29d56b0 SHA512 21ba548b6b35a79aa291adba7f83db14c33855fa3cf376f2ad75bd22bb454501b74f0ea4f71bc03a864135862c800b101d3cd790e54e687c2a3459c64218b9c3 WHIRLPOOL 63ceb498fbc4083afda4f4aa12e44b8a6d2b58408edacd7d578d3cd6a63f0c1074e453b950fae4fee51690b3f79700e7752b6ceb3e6980c88541314993ce71a5 -DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a -DIST lldb-3.8.0.src.tar.xz 10929768 SHA256 e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35 SHA512 a491209ae12b0c7d938ebd94362396a50922326ed24ed11f71b1f19b61274a34a92d2bd46857b44081e7fa3e6d0a641d148bd4022f8edf71f80ff2aa7a55ebef WHIRLPOOL c498c22acab867419143745ce0212c70bdfc141dbae19ab53221908eba7961aae6a029cbad01b8409e6fbc187550141ed87f32366dd847ac57754891fbbc4049 -DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256 8597fa532464c6336aefbbef0b1ce452aaa98d474fa58108c6a6f57a9ccd6785 SHA512 ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643 WHIRLPOOL 743b339b0df7c52d270a5197e9e765dfd92d4b5acee94cf9d9d7713e1a75aa9d987b3f5adab0952e7267febf88b318d0f31cb45847e2b0b42c7c7373b2358358 -DIST llvm-3.7.1.src.tar.xz 14592544 SHA256 be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90 WHIRLPOOL 788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70 -DIST llvm-3.8.0-manpages.tar.bz2 37889 SHA256 4dda7f69f9412e0fb50d32631df34d6ea7f93c945c9a59cb050a99f1d2d0508b SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f WHIRLPOOL 9790a576fd4db798c2339bb4ea1dc973f1057177364770a104be7916998a1ad824e6b4eee296066ddd32eb5e6c57ffd5716457cecbd8ca9fe1b317d0d5ed2676 -DIST llvm-3.8.0.src.tar.xz 16580932 SHA256 555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46 SHA512 2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138 WHIRLPOOL f7219f3324080f22158b08eb23b5b545d303090d0bb8cde6ee971da829dd52837832a127792b153006568e0c7c0163c1095d1e258600f4359df347148e965b94 -EBUILD llvm-3.7.1-r1.ebuild 16167 SHA256 c7d895327deea82d9067a787823615bb3d4d169f938a68e0670caeae98f1ca7e SHA512 88bbcd62b02aa9a0039a94e28aa67980e62ce8f42d9e99627a3821a82ed9cd1bd7632bc28a2202473c91c051978fbc0cb5dbd107a7c5d520174e8483c2c58ca0 WHIRLPOOL 6bf31fc553129989eadb64dd391d1f60c023280bdc134bbd934d2a418827d677700b6ec847a41d61c85a5e58c9033558613351fd4c66baddab85e312acaebeac -EBUILD llvm-3.8.0-r3.ebuild 15991 SHA256 2f5a430b28a7888bb0188673bc62a42134522db33e50e8755d3db7c1efe01235 SHA512 4e0de371fbee12b3ab37276ca671a76790897c9c188e64e5a90c16c97400e6093aeaf099116a07ab3ce0acdfc3321077ef85a9ba734910103961970343cde329 WHIRLPOOL 8c2b6d2739d4d59313b83dcdfd79531f50ae2b487bbd1c69bba4e4bebd1c07be8215e9d6fc85d20fa363cd7b53bfabad1326d1a086c020d7117d33d97d78413d -MISC metadata.xml 2785 SHA256 7329cb36d95ea94ccabceb9d228eb77cb3186e53b360dc27717393338d4147fc SHA512 3acac76248322ac92fae2a4cde7fa113b356f43bafabd5bd99d6937b4f9a39f74676de65c17cd8df634b65052a0777f6336aed598ccc1dd17a97a564096ae9d5 WHIRLPOOL 87d38e5091fc1ea70282a637864a268a928acb40b3b4c962cca543a48adf78ad035f391bba4099983fa1384854052966bcf1d839bdfa72c9081f876d5478c800 diff --git a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch b/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch deleted file mode 100644 index 9d99c9c..0000000 --- a/sys-devel/llvm/files/cl-patches/0001-r600-Add-some-intrinsic-definitions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Tue, 13 Mar 2012 14:12:21 -0400 -Subject: [PATCH 1/2] r600: Add some intrinsic definitions - ---- - include/llvm/Intrinsics.td | 1 + - include/llvm/IntrinsicsR600.td | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 36 insertions(+), 0 deletions(-) - create mode 100644 include/llvm/IntrinsicsR600.td - -diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td -index 069f907..e90dd85 100644 ---- a/include/llvm/Intrinsics.td -+++ b/include/llvm/Intrinsics.td -@@ -441,3 +441,4 @@ include "llvm/IntrinsicsCellSPU.td" - include "llvm/IntrinsicsXCore.td" - include "llvm/IntrinsicsPTX.td" - include "llvm/IntrinsicsHexagon.td" -+include "llvm/IntrinsicsR600.td" -diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td -new file mode 100644 -index 0000000..789fecb ---- /dev/null -+++ b/include/llvm/IntrinsicsR600.td -@@ -0,0 +1,35 @@ -+//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===// -+// -+// The LLVM Compiler Infrastructure -+// -+// This file is distributed under the University of Illinois Open Source -+// License. See LICENSE.TXT for details. -+// -+//===----------------------------------------------------------------------===// -+// -+// This file defines all of the R600-specific intrinsics. -+// -+//===----------------------------------------------------------------------===// -+// -+// Authors: Tom Stellard <thomas.stellard@amd.com> -+// -+ -+let TargetPrefix = "r600" in { -+ -+class R600ReadPreloadRegisterIntrinsic<string name> -+ : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>, -+ GCCBuiltin<name>; -+ -+multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { -+ def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>; -+ def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>; -+ def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; -+} -+ -+defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_ngroups">; -+defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_tgid">; -+defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_tidig">; -+} // End TargetPrefix = "r600" --- -1.7.7.6 - diff --git a/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch b/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch deleted file mode 100644 index db176dd..0000000 --- a/sys-devel/llvm/files/cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 17667fa3450470f7c89fc2ba4631d908cf510749 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 14 Mar 2012 11:19:35 -0400 -Subject: [PATCH 2/2] r600: Add get_global_size and get_local_size intrinsics - ---- - include/llvm/IntrinsicsR600.td | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td -index 789fecb..0473acb 100644 ---- a/include/llvm/IntrinsicsR600.td -+++ b/include/llvm/IntrinsicsR600.td -@@ -26,6 +26,10 @@ multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> { - def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>; - } - -+defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_global_size">; -+defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz < -+ "__builtin_r600_read_local_size">; - defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz < - "__builtin_r600_read_ngroups">; - defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz < --- -1.7.7.6 - diff --git a/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch deleted file mode 100644 index 49f1085..0000000 --- a/sys-devel/llvm/files/clang-3.1-gentoo-runtime-gcc-detection-v3.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -upNr a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp ---- a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-24 03:32:31.593191000 -0400 -+++ b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-24 03:38:31.733163513 -0400 -@@ -1145,6 +1145,25 @@ Generic_GCC::GCCInstallationDetector::GC - Prefixes.push_back(D.InstalledDir + "/.."); - } - -+ llvm::OwningPtr<llvm::MemoryBuffer> File; -+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) { -+ if (!llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str(), File)) -+ { -+ bool Exists; -+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str(); -+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText; -+ if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists) -+ { -+ Version = GCCVersion::Parse(VersionText); -+ GCCInstallPath = GentooPath; -+ GCCParentLibPath = GCCInstallPath + "/../../.."; -+ GCCTriple.setTriple(CandidateTripleAliases[k]); -+ IsValid = true; -+ return; -+ } -+ } -+ } -+ - // Loop over the various components which exist and select the best GCC - // installation available. GCC installs are ranked by version number. - Version = GCCVersion::Parse("0.0.0"); diff --git a/sys-devel/llvm/files/clang-3.3-gcc-header-path.patch b/sys-devel/llvm/files/clang-3.3-gcc-header-path.patch deleted file mode 100644 index dc9a4f7..0000000 --- a/sys-devel/llvm/files/clang-3.3-gcc-header-path.patch +++ /dev/null @@ -1,90 +0,0 @@ -Backport handling of 'g++-vX.Y' header location. - -Fixes: https://bugs.gentoo.org/show_bug.cgi?id=487584 ---- - tools/clang/lib/Driver/ToolChains.cpp | 20 ++++++++++++-------- - tools/clang/lib/Driver/ToolChains.h | 3 +++ - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index 7c9e9c0..e38d42d 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -917,17 +917,19 @@ Darwin_Generic_GCC::ComputeEffectiveClangTriple(const ArgList &Args, - /// This is the primary means of forming GCCVersion objects. - /*static*/ - Generic_GCC::GCCVersion Linux::GCCVersion::Parse(StringRef VersionText) { -- const GCCVersion BadVersion = { VersionText.str(), -1, -1, -1, "" }; -+ const GCCVersion BadVersion = { VersionText.str(), -1, -1, -1, "", "", "" }; - std::pair<StringRef, StringRef> First = VersionText.split('.'); - std::pair<StringRef, StringRef> Second = First.second.split('.'); - -- GCCVersion GoodVersion = { VersionText.str(), -1, -1, -1, "" }; -+ GCCVersion GoodVersion = { VersionText.str(), -1, -1, -1, "", "", "" }; - if (First.first.getAsInteger(10, GoodVersion.Major) || - GoodVersion.Major < 0) - return BadVersion; -+ GoodVersion.MajorStr = First.first.str(); - if (Second.first.getAsInteger(10, GoodVersion.Minor) || - GoodVersion.Minor < 0) - return BadVersion; -+ GoodVersion.MinorStr = Second.first.str(); - - // First look for a number prefix and parse that if present. Otherwise just - // stash the entire patch string in the suffix, and leave the number -@@ -945,7 +947,7 @@ Generic_GCC::GCCVersion Linux::GCCVersion::Parse(StringRef VersionText) { - if (PatchText.slice(0, EndNumber).getAsInteger(10, GoodVersion.Patch) || - GoodVersion.Patch < 0) - return BadVersion; -- GoodVersion.PatchSuffix = PatchText.substr(EndNumber).str(); -+ GoodVersion.PatchSuffix = PatchText.substr(EndNumber); - } - } - -@@ -2590,11 +2592,11 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - // equivalent to '/usr/include/c++/X.Y' in almost all cases. - StringRef LibDir = GCCInstallation.getParentLibPath(); - StringRef InstallDir = GCCInstallation.getInstallPath(); -- StringRef Version = GCCInstallation.getVersion().Text; - StringRef TripleStr = GCCInstallation.getTriple().str(); -+ const GCCVersion &Version = GCCInstallation.getVersion(); - - if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", -- "/c++/" + Version.str(), -+ "/c++/" + Version.Text, - TripleStr, - GCCInstallation.getMultiarchSuffix(), - DriverArgs, CC1Args)) -@@ -2602,10 +2604,12 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - - const std::string IncludePathCandidates[] = { - // Gentoo is weird and places its headers inside the GCC install, so if the -- // first attempt to find the headers fails, try this pattern. -- InstallDir.str() + "/include/g++-v4", -+ // first attempt to find the headers fails, try these patterns. -+ InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." + -+ Version.MinorStr, -+ InstallDir.str() + "/include/g++-v" + Version.MajorStr, - // Android standalone toolchain has C++ headers in yet another place. -- LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.str(), -+ LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, - // Freescale SDK C++ headers are directly in <sysroot>/usr/include/c++, - // without a subdirectory corresponding to the gcc version. - LibDir.str() + "/../include/c++", -diff --git a/tools/clang/lib/Driver/ToolChains.h b/tools/clang/lib/Driver/ToolChains.h -index 3afd8dd..04cf467 100644 ---- a/tools/clang/lib/Driver/ToolChains.h -+++ b/tools/clang/lib/Driver/ToolChains.h -@@ -48,6 +48,9 @@ protected: - /// \brief The parsed major, minor, and patch numbers. - int Major, Minor, Patch; - -+ /// \brief The text of the parsed major, and major+minor versions. -+ std::string MajorStr, MinorStr; -+ - /// \brief Any textual suffix on the patch number. - std::string PatchSuffix; - --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/clang-3.3-gentoo-install.patch b/sys-devel/llvm/files/clang-3.3-gentoo-install.patch deleted file mode 100644 index 5519fbc..0000000 --- a/sys-devel/llvm/files/clang-3.3-gentoo-install.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1a539a8868070e49966c6b5f5e4b9f1257acd7dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Fri, 19 Jul 2013 10:23:57 +0200 -Subject: [PATCH] clang gentoo install - ---- - tools/clang/lib/Driver/Tools.cpp | 4 ++-- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index e014980..6e60513 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -219,7 +219,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ "-l:libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } -@@ -6177,7 +6177,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, - // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to -diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build -index 22d5289..dcb4822 100755 ---- a/tools/clang/tools/scan-build/scan-build -+++ b/tools/clang/tools/scan-build/scan-build -@@ -410,7 +410,7 @@ sub CopyFiles { - - my $Dir = shift; - -- my $JS = Cwd::realpath("$RealBin/sorttable.js"); -+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); - - DieDiag("Cannot find 'sorttable.js'.\n") - if (! -r $JS); -@@ -420,7 +420,7 @@ sub CopyFiles { - DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") - if (! -r "$Dir/sorttable.js"); - -- my $CSS = Cwd::realpath("$RealBin/scanview.css"); -+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); - - DieDiag("Cannot find 'scanview.css'.\n") - if (! -r $CSS); -diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view -index fb27da6..1f8ddb8 100755 ---- a/tools/clang/tools/scan-view/scan-view -+++ b/tools/clang/tools/scan-view/scan-view -@@ -54,7 +54,7 @@ def start_browser(port, options): - webbrowser.open(url) - - def run(port, options, root): -- import ScanView -+ from clang import ScanView - try: - print 'Starting scan-view at: http://%s:%d'%(options.host, - port) --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch b/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch deleted file mode 100644 index 113b04b..0000000 --- a/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch +++ /dev/null @@ -1,47 +0,0 @@ -Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get -"unable to interface with target machine" errors while building if we -attempt to. Disable those targets. - -Patch by Reza Jelveh from -https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch - ---- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk -+++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk -@@ -27,20 +27,20 @@ UniversalArchs := - # Soft-float version of the runtime. No floating-point instructions will be used - # and the ABI (out of necessity) passes floating values in normal registers: - # non-VFP variant of the AAPCS. --Configs += soft_static --UniversalArchs.soft_static := armv6m armv7m armv7em armv7 -+# Configs += soft_static -+# UniversalArchs.soft_static := armv6m armv7m armv7em armv7 - - # Hard-float version of the runtime. On ARM VFP instructions and registers are - # allowed, and floating point values get passed in them. VFP variant of the - # AAPCS. - Configs += hard_static --UniversalArchs.hard_static := armv7em armv7 i386 x86_64 -+UniversalArchs.hard_static := i386 x86_64 - --Configs += soft_pic --UniversalArchs.soft_pic := armv6m armv7m armv7em armv7 -+# Configs += soft_pic -+# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7 - - Configs += hard_pic --UniversalArchs.hard_pic := armv7em armv7 i386 x86_64 -+UniversalArchs.hard_pic := i386 x86_64 - - CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding - ---- a/tools/clang/runtime/compiler-rt/Makefile -+++ b/tools/clang/runtime/compiler-rt/Makefile -@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \ - profile_osx.a profile_ios.a \ - ubsan_osx.a - RuntimeLibrary.darwin_embedded.Configs := \ -- soft_static.a hard_static.a soft_pic.a hard_pic.a -+ hard_static.a hard_pic.a - - # Support building compiler-rt with relocatable SDKs. - # diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch deleted file mode 100644 index ed332f3..0000000 --- a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp -+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp -@@ -233,6 +233,7 @@ - case llvm::Triple::Bitrig: - break; - default: -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false); - // FIXME: temporary hack: hard-coded paths. - AddPath("/usr/local/include", System, false); - break; -@@ -505,6 +506,7 @@ - // Add the default framework include paths on Darwin. - if (HSOpts.UseStandardSystemIncludes) { - if (triple.isOSDarwin()) { -+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true); - AddPath("/System/Library/Frameworks", System, true); - AddPath("/Library/Frameworks", System, true); - } diff --git a/sys-devel/llvm/files/clang-3.4-gentoo-install.patch b/sys-devel/llvm/files/clang-3.4-gentoo-install.patch deleted file mode 100644 index 0a1d9eb..0000000 --- a/sys-devel/llvm/files/clang-3.4-gentoo-install.patch +++ /dev/null @@ -1,80 +0,0 @@ -From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 14 Jun 2014 19:35:33 +0200 -Subject: [PATCH] clang gentoo fixes - ---- - tools/clang/lib/Driver/Tools.cpp | 6 +++--- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index b013eb5..dbbcacb 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ "-l:libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } -@@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, - // forward. - if (D.IsUsingLTO(Args)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to -@@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, - // forward. - if (D.IsUsingLTO(Args)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to -diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build -index 0f119f6..58f78d9 100755 ---- a/tools/clang/tools/scan-build/scan-build -+++ b/tools/clang/tools/scan-build/scan-build -@@ -419,7 +419,7 @@ sub CopyFiles { - - my $Dir = shift; - -- my $JS = Cwd::realpath("$RealBin/sorttable.js"); -+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); - - DieDiag("Cannot find 'sorttable.js'.\n") - if (! -r $JS); -@@ -429,7 +429,7 @@ sub CopyFiles { - DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") - if (! -r "$Dir/sorttable.js"); - -- my $CSS = Cwd::realpath("$RealBin/scanview.css"); -+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); - - DieDiag("Cannot find 'scanview.css'.\n") - if (! -r $CSS); -diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view -index fb27da6..1f8ddb8 100755 ---- a/tools/clang/tools/scan-view/scan-view -+++ b/tools/clang/tools/scan-view/scan-view -@@ -54,7 +54,7 @@ def start_browser(port, options): - webbrowser.open(url) - - def run(port, options, root): -- import ScanView -+ from clang import ScanView - try: - print 'Starting scan-view at: http://%s:%d'%(options.host, - port) --- -2.0.0 - diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch b/sys-devel/llvm/files/clang-3.5-gentoo-install.patch deleted file mode 100644 index 5d4261d..0000000 --- a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- - tools/clang/lib/Driver/Tools.cpp | 2 +- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index 187ed38..55bcd99 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -@@ -1404,7 +1404,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to -diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build -index 0f119f6..58f78d9 100755 ---- a/tools/clang/tools/scan-build/scan-build -+++ b/tools/clang/tools/scan-build/scan-build -@@ -419,7 +419,7 @@ - - my $Dir = shift; - -- my $JS = Cwd::realpath("$RealBin/sorttable.js"); -+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); - - DieDiag("Cannot find 'sorttable.js'.\n") - if (! -r $JS); -@@ -429,7 +429,7 @@ - DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") - if (! -r "$Dir/sorttable.js"); - -- my $CSS = Cwd::realpath("$RealBin/scanview.css"); -+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); - - DieDiag("Cannot find 'scanview.css'.\n") - if (! -r $CSS); -diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view -index fb27da6..1f8ddb8 100755 ---- a/tools/clang/tools/scan-view/scan-view -+++ b/tools/clang/tools/scan-view/scan-view -@@ -54,7 +54,7 @@ def start_browser(port, options): - webbrowser.open(url) - - def run(port, options, root): -- import ScanView -+ from clang import ScanView - try: - print 'Starting scan-view at: http://%s:%d'%(options.host, - port) --- -1.8.4.4 - diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch deleted file mode 100644 index 1f81af0..0000000 --- a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 916572e1243633ddf913c8f32771a3a7f70fd853 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Fri, 5 Sep 2014 16:49:35 +0200 -Subject: [PATCH] Support obtaining active toolchain from gcc-config. - ---- - tools/clang/lib/Driver/ToolChains.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index b46f69d..2d4374d 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -1253,6 +1253,25 @@ Generic_GCC::GCCInstallationDetector::init( - Prefixes.push_back("/usr"); - } - -+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) { -+ llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File = -+ llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str()); -+ if (File) -+ { -+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str(); -+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText; -+ if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o")) -+ { -+ Version = GCCVersion::Parse(VersionText); -+ GCCInstallPath = GentooPath; -+ GCCParentLibPath = GCCInstallPath + "/../../.."; -+ GCCTriple.setTriple(CandidateTripleAliases[k]); -+ IsValid = true; -+ return; -+ } -+ } -+ } -+ - // Loop over the various components which exist and select the best GCC - // installation available. GCC installs are ranked by version number. - Version = GCCVersion::Parse("0.0.0"); --- -2.1.0 - diff --git a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch b/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch deleted file mode 100644 index 31f5fc2..0000000 --- a/sys-devel/llvm/files/clang-3.6-fbsd-gcc49.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build fails with using gcc-4.9 on Gentoo/FreeBSD -https://bugs.gentoo.org/show_bug.cgi?id=548444 - -diff --git a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp -index d6bd5c3..372f76f 100644 ---- a/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp -+++ b/llvm-3.6.0.src/tools/clang/lib/Driver/MSVCToolChain.cpp -@@ -22,6 +22,8 @@ - #include "llvm/Support/FileSystem.h" - #include "llvm/Support/Process.h" - -+#include <cstdio> -+ - // Include the necessary headers to interface with the Windows registry and - // environment. - #if defined(LLVM_ON_WIN32) -@@ -212,7 +214,7 @@ bool MSVCToolChain::getWindowsSDKDir(std::string &path, int &major, - "SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\$VERSION", - "InstallationFolder", path, &sdkVersion); - if (!sdkVersion.empty()) -- ::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor); -+ std::sscanf(sdkVersion.c_str(), "v%d.%d", &major, &minor); - return hasSDKDir && !path.empty(); - } - diff --git a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch b/sys-devel/llvm/files/clang-3.6-gentoo-install.patch deleted file mode 100644 index 6d76ba9..0000000 --- a/sys-devel/llvm/files/clang-3.6-gentoo-install.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- - tools/clang/lib/Driver/Tools.cpp | 2 +- - tools/clang/tools/scan-build/scan-build | 4 ++-- - tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index 187ed38..55bcd99 100644 ---- a/tools/clang/lib/Driver/Tools.cpp -+++ b/tools/clang/lib/Driver/Tools.cpp -diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build -index 0f119f6..58f78d9 100755 ---- a/tools/clang/tools/scan-build/scan-build -+++ b/tools/clang/tools/scan-build/scan-build -@@ -419,7 +419,7 @@ - - my $Dir = shift; - -- my $JS = Cwd::realpath("$RealBin/sorttable.js"); -+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); - - DieDiag("Cannot find 'sorttable.js'.\n") - if (! -r $JS); -@@ -429,7 +429,7 @@ - DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") - if (! -r "$Dir/sorttable.js"); - -- my $CSS = Cwd::realpath("$RealBin/scanview.css"); -+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); - - DieDiag("Cannot find 'scanview.css'.\n") - if (! -r $CSS); -diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view -index fb27da6..1f8ddb8 100755 ---- a/tools/clang/tools/scan-view/scan-view -+++ b/tools/clang/tools/scan-view/scan-view -@@ -54,7 +54,7 @@ def start_browser(port, options): - webbrowser.open(url) - - def run(port, options, root): -- import ScanView -+ from clang import ScanView - try: - print 'Starting scan-view at: http://%s:%d'%(options.host, - port) --- -1.8.4.4 - diff --git a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch b/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch deleted file mode 100644 index 9576b92..0000000 --- a/sys-devel/llvm/files/clang-3.7-strip_doc_refs.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- tools/clang/docs/AddressSanitizer.rst 2015-06-26 01:36:44.000000000 +0200 -+++ tools/clang/docs/AddressSanitizer.rst 2015-08-23 15:35:10.399174574 +0200 -@@ -198,7 +198,7 @@ - Some code should not be instrumented by AddressSanitizer. One may use the - function attribute ``__attribute__((no_sanitize("address")))`` - (which has deprecated synonyms --:ref:`no_sanitize_address <langext-address_sanitizer>` and -+`no_sanitize_address` and - `no_address_safety_analysis`) to disable instrumentation of a particular - function. This attribute may not be supported by other compilers, so we suggest - to use it together with ``__has_feature(address_sanitizer)``. ---- tools/clang/docs/MemorySanitizer.rst 2015-02-26 16:59:30.000000000 +0100 -+++ tools/clang/docs/MemorySanitizer.rst 2015-08-23 15:35:28.002200413 +0200 -@@ -82,7 +82,7 @@ - - Some code should not be checked by MemorySanitizer. - One may use the function attribute --:ref:`no_sanitize_memory <langext-memory_sanitizer>` -+`no_sanitize_memory` - to disable uninitialized checks in a particular function. - MemorySanitizer may still instrument such functions to avoid false positives. - This attribute may not be ---- tools/clang/docs/ThreadSanitizer.rst 2015-02-18 23:26:20.000000000 +0100 -+++ tools/clang/docs/ThreadSanitizer.rst 2015-08-23 15:34:53.918150364 +0200 -@@ -88,7 +88,7 @@ - - Some code should not be instrumented by ThreadSanitizer. - One may use the function attribute --:ref:`no_sanitize_thread <langext-thread_sanitizer>` -+`no_sanitize_thread` - to disable instrumentation of plain (non-atomic) loads/stores in a particular function. - ThreadSanitizer still instruments such functions to avoid false positives and - provide meaningful stack traces. -@@ -102,7 +102,7 @@ - ThreadSanitizer supports ``src`` and ``fun`` entity types in - :doc:`SanitizerSpecialCaseList`, that can be used to suppress data race reports in - the specified source files or functions. Unlike functions marked with --:ref:`no_sanitize_thread <langext-thread_sanitizer>` attribute, -+`no_sanitize_thread` attribute, - blacklisted functions are not instrumented at all. This can lead to false positives - due to missed synchronization via atomic operations and missed stack frames in reports. - diff --git a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch b/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch deleted file mode 100644 index 297620b..0000000 --- a/sys-devel/llvm/files/clang-3.8-compiler-rt-fbsd.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://llvm.org/bugs/show_bug.cgi?id=26651 -https://github.com/llvm-mirror/compiler-rt/commit/6606c7b50cbb4ec7eab4ecbebbbaaa049734bbd3 - -diff --git a/projects/compiler-rt/lib/tsan/CMakeLists.txt b/projects/compiler-rt/lib/tsan/CMakeLists.txt -index c185cfa..a151c6c 100644 ---- a/projects/compiler-rt/lib/tsan/CMakeLists.txt -+++ b/projects/compiler-rt/lib/tsan/CMakeLists.txt -@@ -192,7 +192,11 @@ endif() - add_dependencies(compiler-rt tsan) - - # Make sure that non-platform-specific files don't include any system headers. --if(COMPILER_RT_HAS_SYSROOT_FLAG) -+# FreeBSD does not install a number of Clang-provided headers for the compiler -+# in the base system due to incompatibilities between FreeBSD's and Clang's -+# versions. As a workaround do not use --sysroot=. on FreeBSD until this is -+# addressed. -+if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") - file(GLOB _tsan_generic_sources rtl/tsan*) - file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac* - rtl/tsan*linux*) diff --git a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch b/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch deleted file mode 100644 index bafe218..0000000 --- a/sys-devel/llvm/files/clang-3.8-gcc4.9-search-path.patch +++ /dev/null @@ -1,70 +0,0 @@ -From af4db76e059c1a3f4a7f437001051ccebc8a50fe Mon Sep 17 00:00:00 2001 -From: Chandler Carruth <chandlerc@gmail.com> -Date: Sun, 8 May 2016 07:59:56 +0000 -Subject: [PATCH] Teach header search about GCC 4.9 header search paths in - Gentoo, they now use the full GCC version in their weird suffix. - -git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@268874 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/Driver/ToolChains.cpp | 1 + - .../Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep | 0 - .../usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o | 0 - .../x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep | 0 - .../usr/x86_64-pc-linux-gnu/lib/.keep | 0 - test/Driver/linux-header-search.cpp | 15 +++++++++++++++ - 6 files changed, 16 insertions(+) - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep - create mode 100644 test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep - -diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp -index f905b5d..1bf17e4 100644 ---- a/tools/clang/lib/Driver/ToolChains.cpp -+++ b/tools/clang/lib/Driver/ToolChains.cpp -@@ -4134,6 +4134,7 @@ void Linux::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - const std::string LibStdCXXIncludePathCandidates[] = { - // Gentoo is weird and places its headers inside the GCC install, - // so if the first attempt to find the headers fails, try these patterns. -+ InstallDir.str() + "/include/g++-v" + Version.Text, - InstallDir.str() + "/include/g++-v" + Version.MajorStr + "." + - Version.MinorStr, - InstallDir.str() + "/include/g++-v" + Version.MajorStr, -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/include/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/crtbegin.o -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep b/tools/clang/test/Driver/Inputs/gentoo_linux_gcc_4.9.3_tree/usr/x86_64-pc-linux-gnu/lib/.keep -new file mode 100644 -index 0000000..e69de29 -diff --git a/tools/clang/test/Driver/linux-header-search.cpp b/tools/clang/test/Driver/linux-header-search.cpp -index 9568bde..5f6ac50 100644 ---- a/tools/clang/test/Driver/linux-header-search.cpp -+++ b/tools/clang/test/Driver/linux-header-search.cpp -@@ -285,6 +285,21 @@ - // CHECK-GENTOO-4-6-4: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include" - // CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/include" - // CHECK-GENTOO-4-6-4: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" -+// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ -+// RUN: -target x86_64-unknown-linux-gnu -stdlib=libstdc++ \ -+// RUN: --sysroot=%S/Inputs/gentoo_linux_gcc_4.9.3_tree \ -+// RUN: --gcc-toolchain="" \ -+// RUN: | FileCheck --check-prefix=CHECK-GENTOO-4-9-3 %s -+// CHECK-GENTOO-4-9-3: "{{.*}}clang{{.*}}" "-cc1" -+// CHECK-GENTOO-4-9-3: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]" -+// CHECK-GENTOO-4-9-3: "-isysroot" "[[SYSROOT:[^"]+]]" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/x86_64-pc-linux-gnu" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4.9.3/backward" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[SYSROOT]]/usr/local/include" -+// CHECK-GENTOO-4-9-3: "-internal-isystem" "[[RESOURCE_DIR]]{{/|\\\\}}include" -+// CHECK-GENTOO-4-9-3: "-internal-externc-isystem" "[[SYSROOT]]/include" -+// CHECK-GENTOO-4-9-3: "-internal-externc-isystem" "[[SYSROOT]]/usr/include" - // - // Check header search on Debian 6 / MIPS64 - // RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \ diff --git a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch b/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch deleted file mode 100644 index 3e57f0d..0000000 --- a/sys-devel/llvm/files/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2ec240a76253839cd1c5dc2e964f55698ae468fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 8 Jun 2015 06:43:00 +0200 -Subject: [PATCH 2/4] cmake: Support overriding Sphinx HTML doc install - directory - -Provide ${PROJECT}_INSTALL_HTML variables (e.g. LLVM_INSTALL_HTML) to -override Sphinx HTML doc install directory. - -Fixes: https://llvm.org/bugs/show_bug.cgi?id=23780 ---- - cmake/modules/AddSphinxTarget.cmake | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 045dc23..9c9c444 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -53,8 +53,12 @@ function (add_sphinx_target builder project) - DESTINATION share/man/man1) - - elseif (builder STREQUAL html) -- install(DIRECTORY "${SPHINX_BUILD_DIR}" -- DESTINATION "share/doc/${project}") -+ string(TOUPPER "${project}" project_upper) -+ set(${project_upper}_INSTALL_HTML "share/doc/${project}/html" -+ CACHE STRING "HTML documentation install directory for ${project}") -+ -+ install(DIRECTORY "${SPHINX_BUILD_DIR}/" -+ DESTINATION "${${project_upper}_INSTALL_HTML}") - else() - message(WARNING Installation of ${builder} not supported) - endif() --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch b/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch deleted file mode 100644 index b1c74c6..0000000 --- a/sys-devel/llvm/files/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4f7092ba05cccfeea7d26177d93f3d7a57d9bce2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 8 Jun 2015 14:29:03 +0200 -Subject: [PATCH 3/4] cmake: Add an ordering dep between HTML & man Sphinx - targets - -Add a dependency between HTML & manpage Sphinx targets to prevent two -instances of Sphinx from running in parallel, and therefore solves race -conditions reusing the same doctree directory. - -Fixes: https://llvm.org/bugs/show_bug.cgi?id=23781 ---- - docs/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt -index da27627..63309a6 100644 ---- a/docs/CMakeLists.txt -+++ b/docs/CMakeLists.txt -@@ -100,6 +100,9 @@ if (LLVM_ENABLE_SPHINX) - - if (${SPHINX_OUTPUT_MAN}) - add_sphinx_target(man llvm) -+ if (${SPHINX_OUTPUT_HTML}) -+ add_dependencies(docs-llvm-html docs-llvm-man) -+ endif() - endif() - - endif() --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch b/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch deleted file mode 100644 index 92ca2e4..0000000 --- a/sys-devel/llvm/files/cmake/0004-cmake-Do-not-install-libgtest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d9f80393cfd4e586242ac3efd4e6ba6b49ce39ae Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 11:58:52 +0200 -Subject: [PATCH 4/4] cmake: Do not install libgtest - -libgtest is an internal test dependency, and should not be installed to -the live system as a part of LLVM. ---- - utils/unittest/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt -index b34e22a..3fe5884 100644 ---- a/utils/unittest/CMakeLists.txt -+++ b/utils/unittest/CMakeLists.txt -@@ -41,6 +41,9 @@ if (PTHREAD_LIBRARY_PATH) - list(APPEND LIBS pthread) - endif() - -+# Delay building until the tests pull it in, and avoid installing it -+set(EXCLUDE_FROM_ALL ON) -+ - add_llvm_library(gtest - googletest/src/gtest-all.cc - --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch deleted file mode 100644 index 931eb56..0000000 --- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp -index fa7780f..e3a6c8f 100644 ---- a/tools/clang/lib/Driver/Driver.cpp -+++ b/tools/clang/lib/Driver/Driver.cpp -@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple, - if (ClangResourceDir != "") { - llvm::sys::path::append(P, ClangResourceDir); - } else { -- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); -- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang", -+ llvm::sys::path::append(P, "..", "lib", "clang", - CLANG_VERSION_STRING); - } - ResourceDir = P.str(); -diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp -index f078b37..0c514fc 100644 ---- a/tools/clang/lib/Frontend/CompilerInvocation.cpp -+++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp -@@ -1097,7 +1097,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0, - if (ClangResourceDir != "") - llvm::sys::path::append(P, ClangResourceDir); - else -- llvm::sys::path::append(P, "..", Twine("lib") + CLANG_LIBDIR_SUFFIX, -+ llvm::sys::path::append(P, "..", "lib", - "clang", CLANG_VERSION_STRING); - - return P.str(); -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 7de5fbe..49f439b 100644 ---- a/tools/clang/lib/Headers/CMakeLists.txt -+++ b/tools/clang/lib/Headers/CMakeLists.txt -@@ -100,4 +100,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION lib/clang/${CLANG_VERSION}/include) diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch deleted file mode 100644 index 904a72a..0000000 --- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b28503def986bcbc388a04be0d51cbe80bc59506 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 12:11:50 +0200 -Subject: [PATCH] Install clang runtime into /usr/lib (without suffix) - ---- - lib/Driver/Driver.cpp | 3 +-- - lib/Frontend/CompilerInvocation.cpp | 3 +-- - lib/Headers/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp -index a04a1f8..418d46a 100644 ---- a/tools/clang/lib/Driver/Driver.cpp -+++ b/tools/clang//lib/Driver/Driver.cpp -@@ -66,8 +66,7 @@ Driver::Driver(StringRef ClangExecutable, StringRef DefaultTargetTriple, - if (ClangResourceDir != "") { - llvm::sys::path::append(P, ClangResourceDir); - } else { -- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); -- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang", -+ llvm::sys::path::append(P, "..", "lib", "clang", - CLANG_VERSION_STRING); - } - ResourceDir = P.str(); -diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp -index 9485767..0b9ecbd 100644 ---- a/tools/clang/lib/Frontend/CompilerInvocation.cpp -+++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp -@@ -1053,8 +1053,7 @@ std::string CompilerInvocation::GetResourcesPath(const char *Argv0, - if (ClangResourceDir != "") { - llvm::sys::path::append(P, ClangResourceDir); - } else { -- StringRef ClangLibdirSuffix(CLANG_LIBDIR_SUFFIX); -- llvm::sys::path::append(P, "..", Twine("lib") + ClangLibdirSuffix, "clang", -+ llvm::sys::path::append(P, "..", "lib", "clang", - CLANG_VERSION_STRING); - } - -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index 29a738e..3769d23 100644 ---- a/tools/clang/lib/Headers/CMakeLists.txt -+++ b/tools/clang/lib/Headers/CMakeLists.txt -@@ -93,4 +93,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") - install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION lib/clang/${CLANG_VERSION}/include) --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch b/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch deleted file mode 100644 index 0b93deb..0000000 --- a/sys-devel/llvm/files/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d07632abe23d55eec2aae303a142a97765a77d32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 12:20:06 +0200 -Subject: [PATCH 2/2] cmake: Make CLANG_LIBDIR_SUFFIX overridable - -Make CLANG_LIBDIR_SUFFIX a cache variable so that it can be explicitly -overriden. It is used purely to find the LLVMgold.so plugin, so we want -to set it to native suffix. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 357286b..647f976 100644 ---- a/tools/clang/CMakeLists.txt -+++ b/tools/clang/CMakeLists.txt -@@ -203,7 +203,7 @@ set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING - "Vendor-specific uti.") - - # The libdir suffix must exactly match whatever LLVM's configuration used. --set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}") -+set(CLANG_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING "") - - set(CLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(CLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch b/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch deleted file mode 100644 index 9353800..0000000 --- a/sys-devel/llvm/files/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8bd62a681744d3c31a0837c0f84f99ea4987e017 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 9 Jun 2015 12:17:57 +0200 -Subject: [PATCH] cmake: Install compiler-rt into /usr/lib (without suffix) - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0d8a880..5ae98a9 100644 ---- a/projects/compiler-rt/CMakeLists.txt -+++ b/projects/compiler-rt/CMakeLists.txt -@@ -52,7 +52,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD) - # Setup the paths where compiler-rt runtimes and headers should be stored. - set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}) - set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) -- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}) -+ set(COMPILER_RT_INSTALL_PATH lib/clang/${CLANG_VERSION}) - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." - ${LLVM_INCLUDE_TESTS}) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" --- -2.4.3 - diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch deleted file mode 100644 index 943a840..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-compiler_rt_arm_march_flags.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake ---- llvm-3.7.0.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2015-07-30 06:28:50.000000000 +0200 -+++ llvm-3.7.0.src/projects/compiler-rt/cmake/config-ix.cmake 2015-10-27 17:10:47.365847079 +0100 -@@ -209,12 +209,6 @@ - test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") - test_target_arch(mips64 "" "-mips64r2" "-mabi=n64") - endif() -- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "arm") -- test_target_arch(arm "" "-march=armv7-a") -- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch32") -- test_target_arch(aarch32 "" "-march=armv8-a") -- elseif("${COMPILER_RT_TEST_TARGET_ARCH}" MATCHES "aarch64") -- test_target_arch(aarch64 "" "-march=armv8-a") - endif() - set(COMPILER_RT_OS_SUFFIX "") - endif() diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch deleted file mode 100644 index 626498c..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:13:53 247841 -+++ b/tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:14:01 247842 -@@ -141,6 +141,9 @@ - endif() - if (NOT LLDB_DISABLE_CURSES) - list(APPEND LLDB_SYSTEM_LIBS panel ncurses) -+ if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO) -+ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS}) -+ endif() - endif() - endif() - # On FreeBSD backtrace() is provided by libexecinfo, not libc. diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch deleted file mode 100644 index d53ce19..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt ---- llvm-3.7.0.src.orig/docs/CMakeLists.txt 2015-08-18 18:48:44.000000000 +0200 -+++ llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200 -@@ -115,7 +115,7 @@ - endif() - - list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml) --if( NOT uses_ocaml LESS 0 ) -+if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS ) - set(doc_targets - ocaml_llvm - ocaml_llvm_all_backends diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch deleted file mode 100644 index 024bad7..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- llvm-3.7.0rc3.src-orig/cmake/modules/AddOCaml.cmake 2015-06-08 05:22:22.000000000 +1000 -+++ llvm-3.7.0rc3.src/cmake/modules/AddOCaml.cmake 2015-08-30 19:22:37.216580808 +1000 -@@ -131,7 +131,7 @@ - if( APPLE ) - set(ocaml_rpath "@executable_path/../../lib") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../lib") -+ set(ocaml_rpath "\\$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -@@ -183,12 +183,12 @@ - endforeach() - - install(FILES ${install_files} -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) - install(FILES ${install_shlibs} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) - - foreach( install_file ${install_files} ${install_shlibs} ) - get_filename_component(filename "${install_file}" NAME) ---- llvm-3.7.0rc3.src-orig/bindings/ocaml/backends/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100 -+++ llvm-3.7.0rc3.src/bindings/ocaml/backends/CMakeLists.txt 2015-08-30 19:23:49.726583886 +1000 -@@ -23,5 +23,5 @@ - "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}") - - install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}" -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) - endforeach() ---- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100 -+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000 -@@ -8,4 +8,4 @@ - "${LLVM_LIBRARY_DIR}/ocaml/META.llvm") - - install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm" -- DESTINATION lib/ocaml) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm) diff --git a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch b/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch deleted file mode 100644 index e42c08a..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.8-allow_custom_cmake_build_types.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt 2015-08-12 20:04:55.397881480 +0200 -+++ b/CMakeLists.txt 2015-08-12 20:05:06.625741113 +0200 -@@ -152,11 +152,6 @@ - - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - --if (CMAKE_BUILD_TYPE AND -- NOT uppercase_CMAKE_BUILD_TYPE MATCHES "^(DEBUG|RELEASE|RELWITHDEBINFO|MINSIZEREL)$") -- message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") --endif() -- - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - - # They are used as destination of target generators. diff --git a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch b/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch deleted file mode 100644 index d82236e..0000000 --- a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake ---- llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake 2016-01-13 17:56:15.000000000 +0100 -+++ llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake 2016-01-27 19:43:21.265315207 +0100 -@@ -219,13 +219,6 @@ - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mips") - test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") - test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=n64") -- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm") -- test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") -- test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") -- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") -- test_target_arch(aarch32 "" "-march=armv8-a") -- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64") -- test_target_arch(aarch64 "" "-march=armv8-a") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm32") - test_target_arch(wasm32 "" "--target=wasm32-unknown-unknown") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm64") diff --git a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch b/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch deleted file mode 100644 index 3854a18..0000000 --- a/sys-devel/llvm/files/compiler-rt-3.7-msan-fix.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5dad120f9c9bc74c73edadb0467d8df81ae46066 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Wed, 5 Aug 2015 05:34:27 -0700 -Subject: [PATCH 08/13] Apply split-layout-compiler-rt.patch - -https://llvm.org/bugs/show_bug.cgi?id=24155 ---- - lib/msan/msan.h | 30 ++++++++++++++++++++---------- - lib/msan/msan_allocator.cc | 12 +++++++++++- - 2 files changed, 31 insertions(+), 11 deletions(-) - -diff --git a/lib/msan/msan.h b/lib/msan/msan.h -index cd8bc19..6251b38 100644 ---- a/lib/msan/msan.h -+++ b/lib/msan/msan.h -@@ -94,17 +94,27 @@ const MappingDesc kMemoryLayout[] = { - - #elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 - --// Requries PIE binary and ASLR enabled. --// Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000). --// Heap at 0x600000000000. -+// All of the following configurations are supported. -+// ASLR disabled: main executable and DSOs at 0x555550000000 -+// PIE and ASLR: main executable and DSOs at 0x7f0000000000 -+// non-PIE: main executable below 0x100000000, DSOs at 0x7f0000000000 -+// Heap at 0x700000000000. - const MappingDesc kMemoryLayout[] = { -- {0x000000000000ULL, 0x200000000000ULL, MappingDesc::INVALID, "invalid"}, -- {0x200000000000ULL, 0x400000000000ULL, MappingDesc::SHADOW, "shadow"}, -- {0x400000000000ULL, 0x600000000000ULL, MappingDesc::ORIGIN, "origin"}, -- {0x600000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app"}}; -- --#define MEM_TO_SHADOW(mem) (((uptr)(mem)) & ~0x400000000000ULL) --#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x200000000000ULL) -+ {0x000000000000ULL, 0x050000000000ULL, MappingDesc::APP, "app-1"}, -+ {0x050000000000ULL, 0x100000000000ULL, MappingDesc::SHADOW, "shadow-2"}, -+ {0x100000000000ULL, 0x150000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x150000000000ULL, 0x200000000000ULL, MappingDesc::ORIGIN, "origin-2"}, -+ {0x200000000000ULL, 0x300000000000ULL, MappingDesc::SHADOW, "shadow-3"}, -+ {0x300000000000ULL, 0x400000000000ULL, MappingDesc::ORIGIN, "origin-3"}, -+ {0x400000000000ULL, 0x500000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x500000000000ULL, 0x550000000000ULL, MappingDesc::SHADOW, "shadow-1"}, -+ {0x550000000000ULL, 0x600000000000ULL, MappingDesc::APP, "app-2"}, -+ {0x600000000000ULL, 0x650000000000ULL, MappingDesc::ORIGIN, "origin-1"}, -+ {0x650000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"}, -+ {0x700000000000ULL, 0x800000000000ULL, MappingDesc::APP, "app-3"}}; -+ -+#define MEM_TO_SHADOW(mem) (((uptr)(mem)) ^ 0x500000000000ULL) -+#define SHADOW_TO_ORIGIN(mem) (((uptr)(mem)) + 0x100000000000ULL) - - #else - #error "Unsupported platform" -diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc -index 6df3566..e588bf8 100644 ---- a/lib/msan/msan_allocator.cc -+++ b/lib/msan/msan_allocator.cc -@@ -49,7 +49,8 @@ struct MsanMapUnmapCallback { - typedef SizeClassAllocator32<0, SANITIZER_MMAP_RANGE_SIZE, sizeof(Metadata), - SizeClassMap, kRegionSizeLog, ByteMap, - MsanMapUnmapCallback> PrimaryAllocator; --#elif defined(__x86_64__) -+ -+#elif SANITIZER_FREEBSD && SANITIZER_WORDSIZE == 64 - static const uptr kAllocatorSpace = 0x600000000000ULL; - static const uptr kAllocatorSize = 0x80000000000; // 8T. - static const uptr kMetadataSize = sizeof(Metadata); -@@ -67,6 +68,15 @@ struct MsanMapUnmapCallback { - typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize, - DefaultSizeClassMap, - MsanMapUnmapCallback> PrimaryAllocator; -+#elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 -+ static const uptr kAllocatorSpace = 0x700000000000ULL; -+ static const uptr kAllocatorSize = 0x80000000000; // 8T. -+ static const uptr kMetadataSize = sizeof(Metadata); -+ static const uptr kMaxAllowedMallocSize = 8UL << 30; -+ -+ typedef SizeClassAllocator64<kAllocatorSpace, kAllocatorSize, kMetadataSize, -+ DefaultSizeClassMap, -+ MsanMapUnmapCallback> PrimaryAllocator; - #endif - typedef SizeClassAllocatorLocalCache<PrimaryAllocator> AllocatorCache; - typedef LargeMmapAllocator<MsanMapUnmapCallback> SecondaryAllocator; --- -2.6.4 - diff --git a/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch b/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch deleted file mode 100644 index 583fdf9..0000000 --- a/sys-devel/llvm/files/llvm-2.6-commandguide-nops.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- docs/CommandGuide/Makefile.orig 2009-10-26 16:54:33.000000000 +0100 -+++ docs/CommandGuide/Makefile 2009-10-26 17:32:03.000000000 +0100 -@@ -19,7 +19,7 @@ - DST_PS_DIR=ps/ - - # If we are in BUILD_FOR_WEBSITE mode, default to the all target. --all:: html man ps -+all:: html man - - clean: - rm -f pod2htm*.*~~ $(HTML) $(MAN) $(PS) -@@ -81,7 +81,7 @@ - MAN_DIR := $(PROJ_mandir)/man1 - PS_DIR := $(PROJ_docsdir)/ps - --install-local:: $(HTML) $(INSTALL_MANS) $(PS) -+install-local:: $(HTML) $(INSTALL_MANS) - $(Echo) Installing HTML CommandGuide Documentation - $(Verb) $(MKDIR) $(HTML_DIR) - $(Verb) $(DataInstall) $(HTML) $(HTML_DIR) -@@ -90,9 +90,6 @@ - $(Echo) Installing MAN CommandGuide Documentation - $(Verb) $(MKDIR) $(MAN_DIR) - $(Verb) $(DataInstall) $(INSTALL_MANS) $(MAN_DIR) -- $(Echo) Installing PS CommandGuide Documentation -- $(Verb) $(MKDIR) $(PS_DIR) -- $(Verb) $(DataInstall) $(PS) $(PS_DIR) - - uninstall-local:: - $(Echo) Uninstalling CommandGuide Documentation diff --git a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch deleted file mode 100644 index cce09eb..0000000 --- a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- docs/Makefile.orig 2010-04-26 15:00:58.000000000 +0200 -+++ docs/Makefile 2010-04-26 15:03:12.000000000 +0200 -@@ -46,13 +46,12 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: doxygen ocamldoc - --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - $(Echo) Installing HTML documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -64,12 +63,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -95,7 +93,6 @@ - install-ocamldoc: ocamldoc - $(Echo) Installing ocamldoc documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; -@@ -105,7 +102,6 @@ - $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* - $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc - $(Verb) $(GZIP) $(PROJ_OBJ_DIR)/ocamldoc.tar -- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ - - regen-ocamldoc: - $(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/files/llvm-2.8-alignof.patch b/sys-devel/llvm/files/llvm-2.8-alignof.patch deleted file mode 100644 index ae7f314..0000000 --- a/sys-devel/llvm/files/llvm-2.8-alignof.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: include/llvm/ADT/StringMap.h -=================================================================== ---- include/llvm/ADT/StringMap.h (révision 117773) -+++ include/llvm/ADT/StringMap.h (révision 117774) -@@ -167,7 +167,7 @@ - - unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+ - KeyLength+1; -- unsigned Alignment = alignof<StringMapEntry>(); -+ unsigned Alignment = alignOf<StringMapEntry>(); - - StringMapEntry *NewItem = - static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment)); -Index: include/llvm/Support/AlignOf.h -=================================================================== ---- include/llvm/Support/AlignOf.h (révision 117773) -+++ include/llvm/Support/AlignOf.h (révision 117774) -@@ -49,12 +49,12 @@ - - }; - --/// alignof - A templated function that returns the mininum alignment of -+/// alignOf - A templated function that returns the mininum alignment of - /// of a type. This provides no extra functionality beyond the AlignOf - /// class besides some cosmetic cleanliness. Example usage: --/// alignof<int>() returns the alignment of an int. -+/// alignOf<int>() returns the alignment of an int. - template <typename T> --static inline unsigned alignof() { return AlignOf<T>::Alignment; } -+static inline unsigned alignOf() { return AlignOf<T>::Alignment; } - - } // end namespace llvm - #endif -Index: include/llvm/Support/Allocator.h -=================================================================== ---- include/llvm/Support/Allocator.h (révision 117773) -+++ include/llvm/Support/Allocator.h (révision 117774) -@@ -201,7 +201,7 @@ - char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr : - (char *)Slab + Slab->Size; - for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { -- Ptr = Allocator.AlignPtr(Ptr, alignof<T>()); -+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>()); - if (Ptr + sizeof(T) <= End) - reinterpret_cast<T*>(Ptr)->~T(); - } -Index: include/llvm/CodeGen/SlotIndexes.h -=================================================================== ---- include/llvm/CodeGen/SlotIndexes.h (révision 117773) -+++ include/llvm/CodeGen/SlotIndexes.h (révision 117774) -@@ -393,7 +393,7 @@ - IndexListEntry *entry = - static_cast<IndexListEntry*>( - ileAllocator.Allocate(sizeof(IndexListEntry), -- alignof<IndexListEntry>())); -+ alignOf<IndexListEntry>())); - - new (entry) IndexListEntry(mi, index); - diff --git a/sys-devel/llvm/files/llvm-2.8-darwin8.patch b/sys-devel/llvm/files/llvm-2.8-darwin8.patch deleted file mode 100644 index 284ab47..0000000 --- a/sys-devel/llvm/files/llvm-2.8-darwin8.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid like in Makefile.rules -ld: -rpath can only be used when targeting Mac OS X 10.5 or later - ---- unittests/Makefile.unittest -+++ unittests/Makefile.unittest -@@ -37,7 +37,9 @@ - ifeq ($(ENABLE_SHARED), 1) - # Add the absolute path to the dynamic library. This is ok because - # we'll never install unittests. -+ifneq ($(DARWIN_MAJVERS),4) - LD.Flags += $(RPATH) -Wl,$(SharedLibDir) -+endif - # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most - # of the time. - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" diff --git a/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch b/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch deleted file mode 100644 index b95d7d7..0000000 --- a/sys-devel/llvm/files/llvm-2.9-Operator.h-c++0x.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006 -+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062 -@@ -186,28 +186,46 @@ - }; - - class AddOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> { -+ ~AddOperator(); // DO NOT IMPLEMENT -+}; - class SubOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> { -+ ~SubOperator(); // DO NOT IMPLEMENT -+}; - class MulOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> { -+ ~MulOperator(); // DO NOT IMPLEMENT -+}; - class ShlOperator -- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {}; -+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> { -+ ~ShlOperator(); // DO NOT IMPLEMENT -+}; - - - class SDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> { -+ ~SDivOperator(); // DO NOT IMPLEMENT -+}; - class UDivOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> { -+ ~UDivOperator(); // DO NOT IMPLEMENT -+}; - class AShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> { -+ ~AShrOperator(); // DO NOT IMPLEMENT -+}; - class LShrOperator -- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {}; -+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> { -+ ~LShrOperator(); // DO NOT IMPLEMENT -+}; - - - - class GEPOperator - : public ConcreteOperator<Operator, Instruction::GetElementPtr> { -+ ~GEPOperator(); // DO NOT IMPLEMENT -+ - enum { - IsInBounds = (1 << 0) - }; diff --git a/sys-devel/llvm/files/llvm-2.9-gcc4.7.patch b/sys-devel/llvm/files/llvm-2.9-gcc4.7.patch deleted file mode 100644 index a48ad96..0000000 --- a/sys-devel/llvm/files/llvm-2.9-gcc4.7.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - Intercept.cpp | 1 + - 1 file changed, 1 insertion(+) - ---- a/lib/ExecutionEngine/JIT/Intercept.cpp 2012-05-17 16:11:46.956180361 +0200 -+++ b/lib/ExecutionEngine/JIT/Intercept.cpp 2012-05-17 16:14:35.256184996 +0200 -@@ -52,6 +52,7 @@ - #include <sys/stat.h> - #endif - #include <fcntl.h> -+#include <unistd.h> - /* stat functions are redirecting to __xstat with a version number. On x86-64 - * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' - * available as an exported symbol, so we have to add it explicitly. diff --git a/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch deleted file mode 100644 index 9507817..0000000 --- a/sys-devel/llvm/files/llvm-2.9-nodoctargz.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- docs/Makefile.orig 2011-02-28 21:30:46.000000000 +0100 -+++ docs/Makefile 2011-02-28 21:35:22.000000000 +0100 -@@ -53,13 +53,12 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: $(generated_targets) - --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - $(Echo) Installing HTML documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -71,12 +70,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -102,7 +100,6 @@ - install-ocamldoc: ocamldoc - $(Echo) Installing ocamldoc documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; diff --git a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch b/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch deleted file mode 100644 index 04e4024..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=403519 -http://llvm.org/viewvc/llvm-project?view=rev&revision=153938 - ---- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp 2011/06/15 15:29:47 133059 -+++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp 2012/04/03 06:59:28 153938 -@@ -291,9 +291,10 @@ - } - #endif - --extern "C" void *PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -- unsigned *OrigCallAddrPlus4, -- bool is64Bit) { -+extern "C" { -+static void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -+ unsigned *OrigCallAddrPlus4, -+ bool is64Bit) { - // Adjust the pointer to the address of the call instruction in the stub - // emitted by emitFunctionStub, rather than the instruction after it. - unsigned *StubCallAddr = StubCallAddrPlus4 - 1; -@@ -337,6 +338,7 @@ - // stack after we restore all regs. - return Target; - } -+} - - - diff --git a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch b/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch deleted file mode 100644 index c485e9b..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPC_macro.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2011-07-25 23:24:55.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.h 2011-12-02 13:06:48.000000000 +0000 -@@ -34,6 +34,10 @@ - - } // End llvm namespace - -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - // Defines symbolic names for PowerPC registers. This defines a mapping from - // register name to register number. - // -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2011-07-26 00:24:13.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCPredicates.h 2011-12-02 13:06:48.000000000 +0000 -@@ -14,6 +14,10 @@ - #ifndef LLVM_TARGET_POWERPC_PPCPREDICATES_H - #define LLVM_TARGET_POWERPC_PPCPREDICATES_H - -+// Generated files will use "namespace PPC". To avoid symbol clash, -+// undefine PPC here. PPC may be predefined on some hosts. -+#undef PPC -+ - namespace llvm { - namespace PPC { - /// Predicate - These are "(BI << 5) | BO" for various predicates. -Index: llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h -=================================================================== ---- llvm-3.0-3.0.orig/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2011-07-25 19:53:23.000000000 +0000 -+++ llvm-3.0-3.0/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h 2011-12-02 16:21:23.000000000 +0000 -@@ -12,6 +12,8 @@ - - #include "llvm/MC/MCFixup.h" - -+#undef PPC -+ - namespace llvm { - namespace PPC { - enum Fixups { diff --git a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch deleted file mode 100644 index 031448d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/gold/Makefile 2011/11/23 03:03:21 145094 -+++ tools/gold/Makefile 2011/11/23 03:07:25 145095 -@@ -24,6 +24,6 @@ - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L$(SharedLibDir)/$(SharedPrefix) -lLTO - - include $(LEVEL)/Makefile.common diff --git a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch b/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch deleted file mode 100644 index 18f5cf6..0000000 --- a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=393023 -http://llvm.org/bugs/show_bug.cgi?id=11177 - -Index: llvm-3.0-3.0/bindings/ocaml/llvm/Makefile -=================================================================== ---- llvm-3.0-3.0.orig/bindings/ocaml/llvm/Makefile 2011-11-15 12:17:02.785987852 +0100 -+++ llvm-3.0-3.0/bindings/ocaml/llvm/Makefile 2011-11-15 12:20:12.661983615 +0100 -@@ -30,7 +30,7 @@ - $(OcamlDir)/META.llvm: META.llvm - $(Verb) $(CP) -f $< $@ - --install-meta:: $(ObjDir)/META.llvm -+install-meta:: $(ObjDir)/../META.llvm - $(Echo) "Install $(BuildMode) $(DestMETA)" - $(Verb) $(MKDIR) $(PROJ_libocamldir) - $(Verb) $(DataInstall) META.llvm "$(DestMETA)" diff --git a/sys-devel/llvm/files/llvm-3.0-set_soname.patch b/sys-devel/llvm/files/llvm-3.0-set_soname.patch deleted file mode 100644 index 69ba74d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - - ifeq ($(HOST_OS),Linux) diff --git a/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch b/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch deleted file mode 100644 index 05a20e6..0000000 --- a/sys-devel/llvm/files/llvm-3.1-ExecutionEngine_tests_xfail_arm.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur llvm-3.1.src/test/ExecutionEngine/2002-12-16-ArgTest.ll llvm.src/test/ExecutionEngine/2002-12-16-ArgTest.ll ---- llvm-3.1.src/test/ExecutionEngine/2002-12-16-ArgTest.ll 2012-04-12 22:13:57.000000000 +0200 -+++ llvm.src/test/ExecutionEngine/2002-12-16-ArgTest.ll 2012-10-08 15:06:30.000000000 +0200 -@@ -1,4 +1,5 @@ - ; RUN: %lli %s > /dev/null -+; XFAIL: arm - - @.LC0 = internal global [10 x i8] c"argc: %d\0A\00" ; <[10 x i8]*> [#uses=1] - -diff -Naur llvm-3.1.src/test/ExecutionEngine/test-fp-no-external-funcs.ll llvm.src/test/ExecutionEngine/test-fp-no-external-funcs.ll ---- llvm-3.1.src/test/ExecutionEngine/test-fp-no-external-funcs.ll 2012-04-12 22:13:57.000000000 +0200 -+++ llvm.src/test/ExecutionEngine/test-fp-no-external-funcs.ll 2012-10-08 15:06:30.000000000 +0200 -@@ -1,4 +1,5 @@ - ; RUN: %lli %s > /dev/null -+; XFAIL: arm - - define double @test(double* %DP, double %Arg) { - %D = load double* %DP ; <double> [#uses=1] -diff -Naur llvm-3.1.src/test/ExecutionEngine/test-fp.ll llvm.src/test/ExecutionEngine/test-fp.ll ---- llvm-3.1.src/test/ExecutionEngine/test-fp.ll 2012-04-12 22:13:57.000000000 +0200 -+++ llvm.src/test/ExecutionEngine/test-fp.ll 2012-10-08 15:06:30.000000000 +0200 -@@ -1,4 +1,5 @@ - ; RUN: %lli %s > /dev/null -+; XFAIL: arm - - define double @test(double* %DP, double %Arg) { - %D = load double* %DP ; <double> [#uses=1] diff --git a/sys-devel/llvm/files/llvm-3.1-docs-pod-markup-fixes.patch b/sys-devel/llvm/files/llvm-3.1-docs-pod-markup-fixes.patch deleted file mode 100644 index cd8a62a..0000000 --- a/sys-devel/llvm/files/llvm-3.1-docs-pod-markup-fixes.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- llvm-3.1.src/docs/CommandGuide/lit.pod~ 2012-03-27 03:01:14.000000000 +0900 -+++ llvm-3.1.src/docs/CommandGuide/lit.pod 2013-01-23 12:47:30.297510832 +0900 -@@ -386,8 +386,6 @@ - ******************** - PASS: D (4 of 4) - --=back -- - =head2 LIT EXAMPLE TESTS - - The B<lit> distribution contains several example implementations of test suites ---- llvm-3.1.src/docs/CommandGuide/llvm-cov.pod~ 2011-11-29 08:39:25.000000000 +0900 -+++ llvm-3.1.src/docs/CommandGuide/llvm-cov.pod 2013-01-23 13:44:32.184212441 +0900 -@@ -18,12 +18,12 @@ - - =over - --=item B<-gcno=filename] -+=item B<-gcno=filename> - - This option selects input description file generated by compiler while instrumenting - program. - --=item B<-gcda=filename] -+=item B<-gcda=filename> - - This option selects coverage data file generated by instrumented compiler. - diff --git a/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch b/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch deleted file mode 100644 index de2d46b..0000000 --- a/sys-devel/llvm/files/llvm-3.1-fix_debug_line_info.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 737fdba46f2b2b7d39bc728d15ea2334c44779e0 Mon Sep 17 00:00:00 2001 -From: Ben Longbons <b.r.longbons@gmail.com> -Date: Fri, 29 Jun 2012 12:58:34 -0700 -Subject: [PATCH] Revert "Patch to set is_stmt a little better for prologue - lines in a function." - -This meants that the debugger could find meaningful line information. - -This reverts commit 60b35f408bc3194e7ea4e96367c0b42dc5e7f850. ---- - lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 7 ++----- - test/DebugInfo/X86/ending-run.ll | 6 ++---- - 2 files changed, 4 insertions(+), 9 deletions(-) - -diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -index 3e79a6d..24aedfb 100644 ---- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp -@@ -1093,15 +1093,12 @@ void DwarfDebug::beginInstruction(const MachineInstr *MI) { - if (!MI->isDebugValue()) { - DebugLoc DL = MI->getDebugLoc(); - if (DL != PrevInstLoc && (!DL.isUnknown() || UnknownLocations)) { -- unsigned Flags = 0; -+ unsigned Flags = DWARF2_FLAG_IS_STMT; - PrevInstLoc = DL; - if (DL == PrologEndLoc) { - Flags |= DWARF2_FLAG_PROLOGUE_END; - PrologEndLoc = DebugLoc(); - } -- if (PrologEndLoc.isUnknown()) -- Flags |= DWARF2_FLAG_IS_STMT; -- - if (!DL.isUnknown()) { - const MDNode *Scope = DL.getScope(Asm->MF->getFunction()->getContext()); - recordSourceLine(DL.getLine(), DL.getCol(), Scope, Flags); -@@ -1382,7 +1379,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { - MF->getFunction()->getContext()); - recordSourceLine(FnStartDL.getLine(), FnStartDL.getCol(), - FnStartDL.getScope(MF->getFunction()->getContext()), -- 0); -+ DWARF2_FLAG_IS_STMT); - } - } - -diff --git a/test/DebugInfo/X86/ending-run.ll b/test/DebugInfo/X86/ending-run.ll -index 6935c47..0cd3de1 100644 ---- a/test/DebugInfo/X86/ending-run.ll -+++ b/test/DebugInfo/X86/ending-run.ll -@@ -1,11 +1,9 @@ - ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj - ; RUN: llvm-dwarfdump %t | FileCheck %s - --; Check that the line table starts at 7, not 4, but that the first --; statement isn't until line 8. -+; Check that the line table starts at 7, not 4. - --; CHECK-NOT: 0x0000000000000000 7 0 1 0 is_stmt --; CHECK: 0x0000000000000000 7 0 1 0 -+; CHECK: 0x0000000000000000 7 0 1 0 is_stmt - ; CHECK: 0x0000000000000004 8 18 1 0 is_stmt prologue_end - - define i32 @callee(i32 %x) nounwind uwtable ssp { --- -1.7.10 - diff --git a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch b/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch deleted file mode 100644 index a03ec42..0000000 --- a/sys-devel/llvm/files/llvm-3.1-ivybridge_support.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- llvm/trunk/lib/Support/Host.cpp 2012/04/23 22:22:46 155401 -+++ llvm/trunk/lib/Support/Host.cpp 2012/04/23 22:41:39 155402 -@@ -230,6 +230,10 @@ - case 45: - return "corei7-avx"; - -+ // Ivy Bridge: -+ case 58: -+ return "core-avx-i"; -+ - case 28: // Intel Atom processor. All processors are manufactured using - // the 45 nm process - return "atom"; diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch deleted file mode 100644 index 3a622b5..0000000 --- a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 -+++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 -@@ -52,11 +52,10 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: $(generated_targets) - --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - $(Echo) Installing HTML documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -68,12 +67,11 @@ - install-doxygen: doxygen - $(Echo) Installing doxygen documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -99,7 +97,6 @@ - install-ocamldoc: ocamldoc - $(Echo) Installing ocamldoc documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; -@@ -109,7 +106,6 @@ - $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* - $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc - $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar -- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ - - regen-ocamldoc: - $(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/files/llvm-3.3-R600_debug.patch b/sys-devel/llvm/files/llvm-3.3-R600_debug.patch deleted file mode 100644 index b104273..0000000 --- a/sys-devel/llvm/files/llvm-3.3-R600_debug.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fixes compilation of llvm-3.3 on gcc-4.6 and 4.7 when VIDEO_CARDS=radeon - -This issue is caused because although Q is a multiset the original code tries to get -a set iterator which can't be converted in a multiset one. - -The fix is as simple as just using a multiset iterator. - -Patch by Francisco Blas Izquierdo Riera (klondike) -Consider the changes in the Public Domain -https://bugs.gentoo.org/show_bug.cgi?id=474096 - ---- lib/Target/R600/R600MachineScheduler.cpp -+++ lib/Target/R600/R600MachineScheduler.cpp -@@ -290,7 +290,7 @@ - SUnit *R600SchedStrategy::PopInst(std::multiset<SUnit *, CompareSUnit> &Q) { - if (Q.empty()) - return NULL; -- for (std::set<SUnit *, CompareSUnit>::iterator It = Q.begin(), E = Q.end(); -+ for (std::multiset<SUnit *, CompareSUnit>::iterator It = Q.begin(), E = Q.end(); - It != E; ++It) { - SUnit *SU = *It; - InstructionsGroupCandidate.push_back(SU->getInstr()); diff --git a/sys-devel/llvm/files/llvm-3.3-cmake-modulepath.patch b/sys-devel/llvm/files/llvm-3.3-cmake-modulepath.patch deleted file mode 100644 index 754ae46..0000000 --- a/sys-devel/llvm/files/llvm-3.3-cmake-modulepath.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- cmake/modules/LLVMConfig.cmake.in.old 2013-12-30 14:40:54.888983600 +0100 -+++ cmake/modules/LLVMConfig.cmake.in 2013-12-30 14:44:15.448970509 +0100 -@@ -39,16 +39,10 @@ - set(LLVM_LIBRARY_DIRS ${LLVM_INSTALL_PREFIX}/lib) - set(LLVM_DEFINITIONS "-D__STDC_LIMIT_MACROS" "-D__STDC_CONSTANT_MACROS") - --# We try to include using the current setting of CMAKE_MODULE_PATH, --# which suppossedly was filled by the user with the directory where --# this file was installed: --include( LLVM-Config OPTIONAL RESULT_VARIABLE LLVMCONFIG_INCLUDED ) -- --# If failed, we assume that this is an un-installed build: --if( NOT LLVMCONFIG_INCLUDED ) -- set(CMAKE_MODULE_PATH -+# For some reasons without it it fails on Gentoo, see bug #496480 -+set(CMAKE_MODULE_PATH - ${CMAKE_MODULE_PATH} -- "@LLVM_SOURCE_DIR@/cmake/modules") -- include( LLVM-Config ) --endif() -+ "@LLVM_INSTALL_PREFIX@/share/llvm/cmake") -+ -+include(LLVM-Config) - diff --git a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch deleted file mode 100644 index e477be5..0000000 --- a/sys-devel/llvm/files/llvm-3.3-gentoo-install.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 378109dbae7e4772d9b096384904c638a6a34028 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Fri, 19 Jul 2013 10:10:52 +0200 -Subject: [PATCH 1/2] gentoo install fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 7 +++---- - tools/gold/Makefile | 2 +- - tools/llvm-config/BuildVariables.inc.in | 2 ++ - tools/llvm-config/Makefile | 4 ++++ - tools/llvm-config/llvm-config.cpp | 5 +++-- - utils/FileCheck/Makefile | 2 +- - 7 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index fd4f6ef..5634ecc 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) - endif - - PROJ_bindir := $(PROJ_prefix)/bin --PROJ_libdir := $(PROJ_prefix)/lib -+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR)/llvm - PROJ_datadir := $(PROJ_prefix)/share --PROJ_docsdir := $(PROJ_prefix)/docs/llvm --PROJ_etcdir := $(PROJ_prefix)/etc/llvm -+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ -+PROJ_etcdir := @EPREFIX@/etc/llvm - PROJ_includedir := $(PROJ_prefix)/include - PROJ_infodir := $(PROJ_prefix)/info - PROJ_mandir := $(PROJ_prefix)/share/man -diff --git a/Makefile.rules b/Makefile.rules -index f0c542b..db252f7 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -276,7 +276,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS),FreeBSD) - ifneq ($(HOST_OS),Darwin) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - endif - -@@ -639,7 +638,7 @@ endif - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS), Darwin) - ifdef TOOLNAME -- LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' -+ LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' $(RPATH) -Wl,'$(PROJ_libdir)' - ifdef EXAMPLE_TOOL - LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) - else -@@ -648,7 +647,7 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - endif - else - ifneq ($(DARWIN_MAJVERS),4) -- LD.Flags += $(RPATH) -Wl,@executable_path/../lib -+ LD.Flags += $(RPATH) -Wl,@executable_path/../lib -Wl,'$(PROJ_libdir)' - endif - ifeq ($(RC_XBS),YES) - TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX) -diff --git a/tools/gold/Makefile b/tools/gold/Makefile -index 496e31c..d36b340 100644 ---- a/tools/gold/Makefile -+++ b/tools/gold/Makefile -@@ -24,7 +24,7 @@ include $(LEVEL)/Makefile.config - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS += -I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --LDFLAGS += -L$(SharedLibDir)/$(SharedPrefix) -+LDFLAGS += -L$(PROJ_libdir) - - include $(LEVEL)/Makefile.common - -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index fe87afb..fd9f2c6 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -25,3 +25,5 @@ - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_RPATH "@LLVM_RPATH@" -+#define LLVM_LIBDIR "@LLVM_LIBDIR@" -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index b20b6bf..fc56781 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -55,6 +55,10 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir - >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ - >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_RPATH@/$(subst /,\/,$(RPATH))/' \ -+ >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ -+ >> temp.sed - $(Verb) $(SED) -f temp.sed < $< > $@ - $(Verb) $(RM) temp.sed - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 7edf5ec..4541c28 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -250,7 +250,7 @@ int main(int argc, char **argv) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib"; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR "/llvm"; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -@@ -277,7 +277,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--cxxflags") { - OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n'; - } else if (Arg == "--ldflags") { -- OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS -+ OS << "-L" << ActiveLibDir << ' ' -+ << LLVM_RPATH << " -Wl," << ActiveLibDir << ' ' << LLVM_LDFLAGS - << ' ' << LLVM_SYSTEM_LIBS << '\n'; - } else if (Arg == "--libs") { - PrintLibs = true; -diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile -index 268b7bc..e7674f9 100644 ---- a/utils/FileCheck/Makefile -+++ b/utils/FileCheck/Makefile -@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a - TOOL_NO_EXPORTS = 1 - - # Don't install this utility --NO_INSTALL = 1 -+#NO_INSTALL = 1 - - include $(LEVEL)/Makefile.common - --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch b/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch deleted file mode 100644 index 659f237..0000000 --- a/sys-devel/llvm/files/llvm-3.3-insecure-rpath.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d23d21bc76693dd2a43b5d76c68972ac01a055ba Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl> -Date: Sat, 20 Jul 2013 15:56:56 +0200 -Subject: [PATCH] Remove insecure RUNPATHs. - -LLVM seems to build fine without them, and they were removed for 3.4 -already. ---- - Makefile.rules | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile.rules b/Makefile.rules -index db252f7..a29481b 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -639,11 +639,6 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS), Darwin) - ifdef TOOLNAME - LD.Flags += $(RPATH) -Wl,'$(PROJ_libdir)' -- ifdef EXAMPLE_TOOL -- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) -- else -- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag) -- endif - endif - else - ifneq ($(DARWIN_MAJVERS),4) --- -1.8.3.2 - diff --git a/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch deleted file mode 100644 index c5bd8b8..0000000 --- a/sys-devel/llvm/files/llvm-3.3-r2-gentoo-install.patch +++ /dev/null @@ -1,117 +0,0 @@ -From a554809b6bdbe29b1f775c89104c1088300685ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 28 Dec 2013 10:30:28 +0100 -Subject: [PATCH] Update for gentoo install layout. - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 8 ++++---- - tools/llvm-config/BuildVariables.inc.in | 1 + - tools/llvm-config/Makefile | 2 ++ - tools/llvm-config/llvm-config.cpp | 2 +- - utils/FileCheck/Makefile | 2 +- - 6 files changed, 12 insertions(+), 9 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index fd4f6ef..b63786c 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) - endif - - PROJ_bindir := $(PROJ_prefix)/bin --PROJ_libdir := $(PROJ_prefix)/lib -+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) - PROJ_datadir := $(PROJ_prefix)/share --PROJ_docsdir := $(PROJ_prefix)/docs/llvm --PROJ_etcdir := $(PROJ_prefix)/etc/llvm -+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ -+PROJ_etcdir := @EPREFIX@/etc/llvm - PROJ_includedir := $(PROJ_prefix)/include - PROJ_infodir := $(PROJ_prefix)/info - PROJ_mandir := $(PROJ_prefix)/share/man -diff --git a/Makefile.rules b/Makefile.rules -index f0c542b..6cc19fd 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -276,7 +276,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS),FreeBSD) - ifneq ($(HOST_OS),Darwin) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - endif - -@@ -601,7 +601,7 @@ endif - ifdef SHARED_LIBRARY - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifneq ($(HOST_OS),Darwin) -- LD.Flags += $(RPATH) -Wl,'$$ORIGIN' -+ LD.Flags += - endif - endif - endif -@@ -641,9 +641,9 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW)) - ifdef TOOLNAME - LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib' - ifdef EXAMPLE_TOOL -- LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(DynamicFlag) -+ LD.Flags += $(DynamicFlag) - else -- LD.Flags += $(RPATH) -Wl,$(ToolDir) $(DynamicFlag) -+ LD.Flags += $(DynamicFlag) - endif - endif - else -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index fe87afb..908acd4 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -25,3 +25,4 @@ - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_LIBDIR "@LLVM_LIBDIR@" -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index b20b6bf..0aeba45 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir - >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ - >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ -+ >> temp.sed - $(Verb) $(SED) -f temp.sed < $< > $@ - $(Verb) $(RM) temp.sed - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 7edf5ec..c09b702 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -250,7 +250,7 @@ int main(int argc, char **argv) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib"; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile -index 268b7bc..e7674f9 100644 ---- a/utils/FileCheck/Makefile -+++ b/utils/FileCheck/Makefile -@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a - TOOL_NO_EXPORTS = 1 - - # Don't install this utility --NO_INSTALL = 1 -+#NO_INSTALL = 1 - - include $(LEVEL)/Makefile.common - --- -1.8.5.2 - diff --git a/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch b/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch deleted file mode 100644 index cda8bdc..0000000 --- a/sys-devel/llvm/files/llvm-3.4-cmake-configparser.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 773560acfad511769017e971991c0305dbc0323d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 11 Jun 2014 09:40:26 +0200 -Subject: [PATCH] Avoid using external configparser in favor of built-in - ConfigParser. - -We only support Python 2 anyway, and configparser-3.2 is known to break -the build. Since some packages actually force version 3.2, and we do not -to pull in extra dependencies, forcing built-in seems to be the best -option. - -Fixes: https://bugs.gentoo.org/show_bug.cgi?id=500856 ---- - utils/llvm-build/llvmbuild/componentinfo.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/utils/llvm-build/llvmbuild/componentinfo.py b/utils/llvm-build/llvmbuild/componentinfo.py -index eda3a48..c963ef1 100644 ---- a/utils/llvm-build/llvmbuild/componentinfo.py -+++ b/utils/llvm-build/llvmbuild/componentinfo.py -@@ -3,10 +3,7 @@ Descriptor objects for entities that are part of the LLVM project. - """ - - from __future__ import absolute_import --try: -- import configparser --except: -- import ConfigParser as configparser -+import ConfigParser as configparser - import sys - - from llvmbuild.util import * --- -2.0.0 - diff --git a/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch b/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch deleted file mode 100644 index 377c4da..0000000 --- a/sys-devel/llvm/files/llvm-3.4-fix_varargs.patch +++ /dev/null @@ -1,148 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=497298 -http://llvm.org/bugs/show_bug.cgi?id=18346 - -SVN revisions: -http://llvm.org/viewvc/llvm-project?view=revision&revision=197503 -http://llvm.org/viewvc/llvm-project?view=revision&revision=197505 -http://llvm.org/viewvc/llvm-project?view=revision&revision=197520 - -diff -Naur llvm-3.4.orig/lib/Target/X86/X86ISelLowering.cpp llvm-3.4/lib/Target/X86/X86ISelLowering.cpp ---- llvm-3.4.orig/lib/Target/X86/X86ISelLowering.cpp 2014-01-08 11:22:23.373060109 +0100 -+++ llvm-3.4/lib/Target/X86/X86ISelLowering.cpp 2014-01-08 11:23:58.517125907 +0100 -@@ -15226,9 +15226,15 @@ - MBB->addSuccessor(EndMBB); - } - -+ // Make sure the last operand is EFLAGS, which gets clobbered by the branch -+ // that was just emitted, but clearly shouldn't be "saved". -+ assert((MI->getNumOperands() <= 3 || -+ !MI->getOperand(MI->getNumOperands() - 1).isReg() || -+ MI->getOperand(MI->getNumOperands() - 1).getReg() == X86::EFLAGS) -+ && "Expected last argument to be EFLAGS"); - unsigned MOVOpc = Subtarget->hasFp256() ? X86::VMOVAPSmr : X86::MOVAPSmr; - // In the XMM save block, save all the XMM argument registers. -- for (int i = 3, e = MI->getNumOperands(); i != e; ++i) { -+ for (int i = 3, e = MI->getNumOperands() - 1; i != e; ++i) { - int64_t Offset = (i - 3) * 16 + VarArgsFPOffset; - MachineMemOperand *MMO = - F->getMachineMemOperand( -diff -Naur llvm-3.4.orig/lib/Target/X86/X86InstrCompiler.td llvm-3.4/lib/Target/X86/X86InstrCompiler.td ---- llvm-3.4.orig/lib/Target/X86/X86InstrCompiler.td 2014-01-08 11:22:23.374060109 +0100 -+++ llvm-3.4/lib/Target/X86/X86InstrCompiler.td 2014-01-08 11:23:39.654112857 +0100 -@@ -72,7 +72,7 @@ - - - // x86-64 va_start lowering magic. --let usesCustomInserter = 1 in { -+let usesCustomInserter = 1, Defs = [EFLAGS] in { - def VASTART_SAVE_XMM_REGS : I<0, Pseudo, - (outs), - (ins GR8:$al, -@@ -81,7 +81,8 @@ - "#VASTART_SAVE_XMM_REGS $al, $regsavefi, $offset", - [(X86vastart_save_xmm_regs GR8:$al, - imm:$regsavefi, -- imm:$offset)]>; -+ imm:$offset), -+ (implicit EFLAGS)]>; - - // The VAARG_64 pseudo-instruction takes the address of the va_list, - // and places the address of the next argument into a register. -diff -Naur llvm-3.4.orig/test/CodeGen/X86/vaargs.ll llvm-3.4/test/CodeGen/X86/vaargs.ll ---- llvm-3.4.orig/test/CodeGen/X86/vaargs.ll 1970-01-01 01:00:00.000000000 +0100 -+++ llvm-3.4/test/CodeGen/X86/vaargs.ll 2014-01-08 11:23:53.451122402 +0100 -@@ -0,0 +1,67 @@ -+; RUN: llc -mcpu=corei7-avx %s -o - | FileCheck %s --check-prefix=CHECK --check-prefix=NO-FLAGS -+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" -+target triple = "x86_64-apple-macosx10.9.0" -+ -+%struct.__va_list_tag = type { i32, i32, i8*, i8* } -+ -+; Check that vastart gets the right thing. -+define i32 @sum(i32 %count, ...) nounwind optsize ssp uwtable { -+; CHECK: testb %al, %al -+; CHECK-NEXT: je -+; CHECK-NEXT: ## BB#{{[0-9]+}}: -+; CHECK-NEXT: vmovaps %xmm0, 48(%rsp) -+; CHECK-NEXT: vmovaps %xmm1, 64(%rsp) -+; CHECK-NEXT: vmovaps %xmm2, 80(%rsp) -+; CHECK-NEXT: vmovaps %xmm3, 96(%rsp) -+; CHECK-NEXT: vmovaps %xmm4, 112(%rsp) -+; CHECK-NEXT: vmovaps %xmm5, 128(%rsp) -+; CHECK-NEXT: vmovaps %xmm6, 144(%rsp) -+; CHECK-NEXT: vmovaps %xmm7, 160(%rsp) -+ -+; Check that [EFLAGS] hasn't been pulled in. -+; NO-FLAGS-NOT: %flags -+ -+ %ap = alloca [1 x %struct.__va_list_tag], align 16 -+ %1 = bitcast [1 x %struct.__va_list_tag]* %ap to i8* -+ call void @llvm.va_start(i8* %1) -+ %2 = icmp sgt i32 %count, 0 -+ br i1 %2, label %.lr.ph, label %._crit_edge -+ -+.lr.ph: ; preds = %0 -+ %3 = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i64 0, i64 0, i32 0 -+ %4 = getelementptr inbounds [1 x %struct.__va_list_tag]* %ap, i64 0, i64 0, i32 2 -+ %.pre = load i32* %3, align 16 -+ br label %5 -+ -+; <label>:5 ; preds = %.lr.ph, %13 -+ %6 = phi i32 [ %.pre, %.lr.ph ], [ %14, %13 ] -+ %.01 = phi i32 [ %count, %.lr.ph ], [ %15, %13 ] -+ %7 = icmp ult i32 %6, 41 -+ br i1 %7, label %8, label %10 -+ -+; <label>:8 ; preds = %5 -+ %9 = add i32 %6, 8 -+ store i32 %9, i32* %3, align 16 -+ br label %13 -+ -+; <label>:10 ; preds = %5 -+ %11 = load i8** %4, align 8 -+ %12 = getelementptr i8* %11, i64 8 -+ store i8* %12, i8** %4, align 8 -+ br label %13 -+ -+; <label>:13 ; preds = %10, %8 -+ %14 = phi i32 [ %6, %10 ], [ %9, %8 ] -+ %15 = add nsw i32 %.01, 1 -+ %16 = icmp sgt i32 %15, 0 -+ br i1 %16, label %5, label %._crit_edge -+ -+._crit_edge: ; preds = %13, %0 -+ %.0.lcssa = phi i32 [ %count, %0 ], [ %15, %13 ] -+ call void @llvm.va_end(i8* %1) -+ ret i32 %.0.lcssa -+} -+ -+declare void @llvm.va_start(i8*) nounwind -+ -+declare void @llvm.va_end(i8*) nounwind -diff -Naur llvm-3.4.orig/test/CodeGen/X86/vastart-defs-eflags.ll llvm-3.4/test/CodeGen/X86/vastart-defs-eflags.ll ---- llvm-3.4.orig/test/CodeGen/X86/vastart-defs-eflags.ll 1970-01-01 01:00:00.000000000 +0100 -+++ llvm-3.4/test/CodeGen/X86/vastart-defs-eflags.ll 2014-01-08 11:23:39.654112857 +0100 -@@ -0,0 +1,23 @@ -+; RUN: llc %s -o - | FileCheck %s -+ -+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" -+target triple = "x86_64-apple-macosx10.10.0" -+ -+; Check that vastart handling doesn't get between testb and je for the branch. -+define i32 @check_flag(i32 %flags, ...) nounwind { -+entry: -+; CHECK: {{^}} testb $2, %bh -+; CHECK-NOT: test -+; CHECK: {{^}} je -+ %and = and i32 %flags, 512 -+ %tobool = icmp eq i32 %and, 0 -+ br i1 %tobool, label %if.end, label %if.then -+ -+if.then: ; preds = %entry -+ br label %if.end -+ -+if.end: ; preds = %entry, %if.then -+ %hasflag = phi i32 [ 1, %if.then ], [ 0, %entry ] -+ ret i32 %hasflag -+} -+ diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch deleted file mode 100644 index a2ba7de..0000000 --- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch +++ /dev/null @@ -1,96 +0,0 @@ -From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 19 Aug 2013 13:22:46 +0200 -Subject: [PATCH] gentoo install fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 6 +++--- - tools/llvm-config/BuildVariables.inc.in | 2 ++ - tools/llvm-config/Makefile | 4 ++++ - tools/llvm-config/llvm-config.cpp | 5 +++-- - utils/FileCheck/Makefile | 2 +- - 7 files changed, 17 insertions(+), 10 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index dcca45f..e75ae2e 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) - endif - - PROJ_bindir := $(PROJ_prefix)/bin --PROJ_libdir := $(PROJ_prefix)/lib -+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) - PROJ_datadir := $(PROJ_prefix)/share --PROJ_docsdir := $(PROJ_prefix)/docs/llvm --PROJ_etcdir := $(PROJ_prefix)/etc/llvm -+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ -+PROJ_etcdir := @EPREFIX@/etc/llvm - PROJ_includedir := $(PROJ_prefix)/include - PROJ_infodir := $(PROJ_prefix)/info - PROJ_mandir := $(PROJ_prefix)/share/man -diff --git a/Makefile.rules b/Makefile.rules -index e53598b..217f754 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - BuildMode := Release - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - - CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index fe87afb..fd9f2c6 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -25,3 +25,4 @@ - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_LIBDIR "@LLVM_LIBDIR@" -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index b20b6bf..fc56781 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir - >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ - >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ -+ >> temp.sed - $(Verb) $(SED) -f temp.sed < $< > $@ - $(Verb) $(RM) temp.sed - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 3924e2e..f439c60 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -250,7 +250,7 @@ int main(int argc, char **argv) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib"; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile -index 268b7bc..e7674f9 100644 ---- a/utils/FileCheck/Makefile -+++ b/utils/FileCheck/Makefile -@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a - TOOL_NO_EXPORTS = 1 - - # Don't install this utility --NO_INSTALL = 1 -+#NO_INSTALL = 1 - - include $(LEVEL)/Makefile.common - --- -1.8.4.2 - diff --git a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch b/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch deleted file mode 100644 index 7da657f..0000000 --- a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch +++ /dev/null @@ -1,43 +0,0 @@ -commit 080fb498017d17af2e4d7563608c7d8a848f20da -Author: Sanjoy Das <sanjoy at azulsystems.com> -Date: Thu Jun 19 15:38:02 2014 -0700 - - Fix the --enable-shared build. - - Currently a build configured with ./configure --enable-shared breaks - with an undefined "llvm::cl::parser<llvm::PassInfo - const*>::getOption(unsigned int) const" symbol when linking opt. This - body for this symbol gets emitted into Pass.o (along with the destructor - for PassNameParser), but gets linked into libLLVM-3.5svn.so with local - visibility, causing the link error. - - This fix uses the existing EXTERN_TEMPLATE machinery to force a globally - visible definition for the functions in parser<const PassInfo *> into - Pass.o. - -diff --git a/include/llvm/IR/LegacyPassNameParser.h b/include/llvm/IR/LegacyPassNameParser.h -index e2e4912..a07e3fd 100644 ---- a/include/llvm/IR/LegacyPassNameParser.h -+++ b/include/llvm/IR/LegacyPassNameParser.h -@@ -95,6 +95,8 @@ private: - } - }; - -+EXTERN_TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>); -+ - ///===----------------------------------------------------------------------===// - /// FilteredPassNameParser class - Make use of the pass registration - /// mechanism to automatically add a command line argument to opt for -diff --git a/lib/IR/Pass.cpp b/lib/IR/Pass.cpp -index 91d86ae..00ce223 100644 ---- a/lib/IR/Pass.cpp -+++ b/lib/IR/Pass.cpp -@@ -234,6 +234,8 @@ PassNameParser::~PassNameParser() { - // attempting to remove the registration listener is an error. - } - -+TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>); -+ - //===----------------------------------------------------------------------===// - // AnalysisUsage Class Implementation - // diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch deleted file mode 100644 index 7a8c9f7..0000000 --- a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch +++ /dev/null @@ -1,83 +0,0 @@ -From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 19 Aug 2013 13:22:46 +0200 -Subject: [PATCH] gentoo install fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 6 +++--- - tools/llvm-config/BuildVariables.inc.in | 2 ++ - tools/llvm-config/Makefile | 4 ++++ - tools/llvm-config/llvm-config.cpp | 5 +++-- - utils/FileCheck/Makefile | 2 +- - 7 files changed, 17 insertions(+), 10 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index dcca45f..e75ae2e 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) - endif - - PROJ_bindir := $(PROJ_prefix)/bin --PROJ_libdir := $(PROJ_prefix)/lib -+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) - PROJ_datadir := $(PROJ_prefix)/share --PROJ_docsdir := $(PROJ_prefix)/docs/llvm --PROJ_etcdir := $(PROJ_prefix)/etc/llvm -+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ -+PROJ_etcdir := @EPREFIX@/etc/llvm - PROJ_includedir := $(PROJ_prefix)/include - PROJ_infodir := $(PROJ_prefix)/info - PROJ_mandir := $(PROJ_prefix)/share/man -diff --git a/Makefile.rules b/Makefile.rules -index e53598b..217f754 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - BuildMode := Release - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - - CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index fe87afb..fd9f2c6 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -25,3 +25,4 @@ - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_LIBDIR "@LLVM_LIBDIR@" -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index b20b6bf..fc56781 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir - >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ - >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ -+ >> temp.sed - $(Verb) $(SED) -f temp.sed < $< > $@ - $(Verb) $(RM) temp.sed - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 3924e2e..f439c60 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -250,7 +250,7 @@ int main(int argc, char **argv) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib"; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - --- -1.8.4.2 - diff --git a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch b/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch deleted file mode 100644 index 9fbd7b7..0000000 --- a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: cmake/modules/Makefile -=================================================================== ---- cmake/modules/Makefile (revision 217451) -+++ cmake/modules/Makefile (working copy) -@@ -33,6 +33,16 @@ - LLVM_ENABLE_RTTI := 0 - endif - -+LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error)) -+ -+ifeq ($(LLVM_LIBS_TO_EXPORT),Error) -+$(error llvm-config --libs failed) -+endif -+ -+ifndef LLVM_LIBS_TO_EXPORT -+$(error LLVM_LIBS_TO_EXPORT cannot be empty) -+endif -+ - OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake - - $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) -@@ -45,7 +55,7 @@ - -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \ - -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ - -e 's/@LLVM_COMMON_DEPENDS@//' \ -- -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \ -+ -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \ - -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \ - -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \ - -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ -@@ -83,7 +93,7 @@ - $(Echo) 'Generating LLVM CMake target exports file' - $(Verb) ( \ - echo '# LLVM CMake target exports. Do not include directly.' && \ -- for lib in $(subst -l,,$(LLVMConfigLibs)); do \ -+ for lib in $(LLVM_LIBS_TO_EXPORT); do \ - echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ - echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \ - done && \ diff --git a/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch b/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch deleted file mode 100644 index 7cb2817..0000000 --- a/sys-devel/llvm/files/llvm-3.5.2-gcc-5.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: include/llvm/ADT/IntrusiveRefCntPtr.h -=================================================================== ---- include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218294) -+++ include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218295) -@@ -197,6 +197,9 @@ - private: - void retain() { if (Obj) IntrusiveRefCntPtrInfo<T>::retain(Obj); } - void release() { if (Obj) IntrusiveRefCntPtrInfo<T>::release(Obj); } -+ -+ template <typename X> -+ friend class IntrusiveRefCntPtr; - }; - - template<class T, class U> diff --git a/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch deleted file mode 100644 index c4d0db2..0000000 --- a/sys-devel/llvm/files/llvm-3.6-gentoo-install.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bb016afeba4d9e886e776565a508634a261111a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 31 Dec 2014 11:26:12 +0100 -Subject: [PATCH] gentoo build fixes - ---- - Makefile.config.in | 6 +++--- - Makefile.rules | 2 +- - tools/llvm-config/BuildVariables.inc.in | 1 + - tools/llvm-config/Makefile | 2 ++ - tools/llvm-config/llvm-config.cpp | 2 +- - 5 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/Makefile.config.in b/Makefile.config.in -index d34a2d5..a26cd08 100644 ---- a/Makefile.config.in -+++ b/Makefile.config.in -@@ -99,10 +99,10 @@ PROJ_internal_prefix := $(prefix) - endif - - PROJ_bindir := $(PROJ_prefix)/bin --PROJ_libdir := $(PROJ_prefix)/lib -+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) - PROJ_datadir := $(PROJ_prefix)/share --PROJ_docsdir := $(PROJ_prefix)/docs/llvm --PROJ_etcdir := $(PROJ_prefix)/etc/llvm -+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ -+PROJ_etcdir := @EPREFIX@/etc/llvm - PROJ_includedir := $(PROJ_prefix)/include - PROJ_infodir := $(PROJ_prefix)/info - PROJ_mandir := $(PROJ_prefix)/share/man -diff --git a/Makefile.rules b/Makefile.rules -index c8c971f..d1258b1 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -283,7 +283,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) - BuildMode := Release - # Don't use -fomit-frame-pointer on Darwin or FreeBSD. - ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) -- OmitFramePointer := -fomit-frame-pointer -+ OmitFramePointer := - endif - - CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 3f51f49..513ea89 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -26,3 +26,4 @@ - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_LIBDIR "@LLVM_LIBDIR@" -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index 1ff8b6f..5d73c6e 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -65,6 +65,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir - >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ - >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ -+ >> temp.sed - $(Verb) $(SED) -f temp.sed < $< > $@ - $(Verb) $(RM) temp.sed - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 224035a..57180ac 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -265,7 +265,7 @@ int main(int argc, char **argv) { - ActivePrefix = CurrentExecPrefix; - ActiveIncludeDir = ActivePrefix + "/include"; - ActiveBinDir = ActivePrefix + "/bin"; -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - --- -2.2.1 - diff --git a/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch b/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch deleted file mode 100644 index 154c9cc..0000000 --- a/sys-devel/llvm/files/llvm-3.6.0-ocaml-ctypes-0.4.0.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur llvm-3.6.0.src.orig/bindings/ocaml/executionengine/llvm_executionengine.ml llvm-3.6.0.src/bindings/ocaml/executionengine/llvm_executionengine.ml ---- llvm-3.6.0.src.orig/bindings/ocaml/executionengine/llvm_executionengine.ml 2015-03-17 11:49:27.274824345 +0100 -+++ llvm-3.6.0.src/bindings/ocaml/executionengine/llvm_executionengine.ml 2015-03-17 11:49:40.333829421 +0100 -@@ -43,11 +43,11 @@ - = "llvm_ee_run_static_dtors" - external data_layout : llexecutionengine -> Llvm_target.DataLayout.t - = "llvm_ee_get_data_layout" --external add_global_mapping_ : Llvm.llvalue -> int64 -> llexecutionengine -> unit -+external add_global_mapping_ : Llvm.llvalue -> nativeint -> llexecutionengine -> unit - = "llvm_ee_add_global_mapping" --external get_global_value_address_ : string -> llexecutionengine -> int64 -+external get_global_value_address_ : string -> llexecutionengine -> nativeint - = "llvm_ee_get_global_value_address" --external get_function_address_ : string -> llexecutionengine -> int64 -+external get_function_address_ : string -> llexecutionengine -> nativeint - = "llvm_ee_get_function_address" - - let add_global_mapping llval ptr ee = -@@ -55,14 +55,14 @@ - - let get_global_value_address name typ ee = - let vptr = get_global_value_address_ name ee in -- if Int64.to_int vptr <> 0 then -+ if Nativeint.to_int vptr <> 0 then - let open Ctypes in !@ (coerce (ptr void) (ptr typ) (ptr_of_raw_address vptr)) - else - raise (Error ("Value " ^ name ^ " not found")) - - let get_function_address name typ ee = - let fptr = get_function_address_ name ee in -- if Int64.to_int fptr <> 0 then -+ if Nativeint.to_int fptr <> 0 then - let open Ctypes in coerce (ptr void) typ (ptr_of_raw_address fptr) - else - raise (Error ("Function " ^ name ^ " not found")) diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch deleted file mode 100644 index 1a95827..0000000 --- a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py ---- llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-06-04 05:12:37.000000000 +0200 -+++ llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-10-11 19:19:54.074935710 +0200 -@@ -371,14 +371,14 @@ - strLibFileExtn = ".dylib"; - else: - strLibFileExtn = ".so"; -- strSrc = os.path.join("lib", "liblldb" + strLibFileExtn); -+ strSrc = os.path.join("GENTOO_LIBDIR", "liblldb" + strLibFileExtn); - -- if eOSType != utilsOsType.EnumOsType.Windows: -+# if eOSType != utilsOsType.EnumOsType.Windows: - # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is - # effective. -- bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") ); -- if not bOk: -- return (bOk, strErrMsg) -+# bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") ); -+# if not bOk: -+# return (bOk, strErrMsg) - - bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget ); - diff --git a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch b/sys-devel/llvm/files/llvm-3.7-llvm-config.patch deleted file mode 100644 index 932c92b..0000000 --- a/sys-devel/llvm/files/llvm-3.7-llvm-config.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 8a51e9673859eb3fb819f0d1dad5e2a60d1a3c0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed. - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 22 ++++++++++++++++------ - utils/llvm-build/llvmbuild/main.py | 4 +++- - 4 files changed, 27 insertions(+), 10 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index edbd8c9..9a801bd 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,12 +22,17 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") - configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 879b9ab..d2c43fa 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -323,10 +323,19 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } - } else { - usage(); - } -@@ -360,8 +369,9 @@ int main(int argc, char **argv) { - OS << ActiveLibDir << '/' << Lib; - } else if (PrintLibs) { - // If this is a typical library name, include it using -l. -- if (Lib.startswith("lib") && Lib.endswith(".a")) { -- OS << "-l" << Lib.slice(3, Lib.size()-2); -+ if (Lib.startswith("lib") && Lib.endswith(LTDL_SHLIB_EXT)) { -+ // sizeof counts trailing NUL -+ OS << "-l" << Lib.slice(3, Lib.size()-sizeof(LTDL_SHLIB_EXT)+1); - continue; - } - -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index 353741f..4ba5e91 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -393,6 +393,8 @@ subdirectories = %s - // - //===----------------------------------------------------------------------===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = '0' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - f.write(' { "%s", %s, %d, { %s } },\n' % ( - name, library_name_as_cstr, is_installed, - ', '.join('"%s"' % dep - --- -2.6.3 - diff --git a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch b/sys-devel/llvm/files/llvm-3.7-msan-fix.patch deleted file mode 100644 index e44baa8..0000000 --- a/sys-devel/llvm/files/llvm-3.7-msan-fix.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8b0f2fff6e080c053e4fd94d44a694768b8c156e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Wed, 5 Aug 2015 05:35:26 -0700 -Subject: [PATCH 78/84] Apply split-layout-llvm.patch - -https://llvm.org/bugs/show_bug.cgi?id=24155 ---- - lib/Transforms/Instrumentation/MemorySanitizer.cpp | 31 ++++++++++++++++------ - 1 file changed, 23 insertions(+), 8 deletions(-) - -diff --git a/lib/Transforms/Instrumentation/MemorySanitizer.cpp b/lib/Transforms/Instrumentation/MemorySanitizer.cpp -index 286a563..2ab8bfc 100644 ---- a/lib/Transforms/Instrumentation/MemorySanitizer.cpp -+++ b/lib/Transforms/Instrumentation/MemorySanitizer.cpp -@@ -194,6 +194,12 @@ static cl::opt<bool> ClCheckConstantShadow("msan-check-constant-shadow", - static const char *const kMsanModuleCtorName = "msan.module_ctor"; - static const char *const kMsanInitName = "__msan_init"; - -+static cl::opt<bool> ClSplitLayout( -+ "msan-split-layout", cl::desc( -+ "use experimental memory layout compatible with " -+ "non-pie and non-aslr execution"), -+ cl::Hidden, cl::init(true)); -+ - namespace { - - // Memory map parameters used in application-to-shadow address calculation. -@@ -228,6 +234,13 @@ static const MemoryMapParams Linux_X86_64_MemoryMapParams = { - 0x200000000000, // OriginBase - }; - -+static const MemoryMapParams Linux_X86_64_Split_MemoryMapParams = { -+ 0, // AndMask (not used) -+ 0x500000000000, // XorMask -+ 0, // ShadowBase (not used) -+ 0x100000000000, // OriginBase -+}; -+ - // mips64 Linux - static const MemoryMapParams Linux_MIPS64_MemoryMapParams = { - 0x004000000000, // AndMask -@@ -483,7 +496,8 @@ bool MemorySanitizer::doInitialization(Module &M) { - case Triple::Linux: - switch (TargetTriple.getArch()) { - case Triple::x86_64: -- MapParams = Linux_X86_MemoryMapParams.bits64; -+ MapParams = ClSplitLayout ? &Linux_X86_64_Split_MemoryMapParams -+ : Linux_X86_MemoryMapParams.bits64; - break; - case Triple::x86: - MapParams = Linux_X86_MemoryMapParams.bits32; -@@ -893,16 +907,17 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> { - /// - /// Offset = (Addr & ~AndMask) ^ XorMask - Value *getShadowPtrOffset(Value *Addr, IRBuilder<> &IRB) { -+ Value *OffsetLong = IRB.CreatePointerCast(Addr, MS.IntptrTy); -+ - uint64_t AndMask = MS.MapParams->AndMask; -- assert(AndMask != 0 && "AndMask shall be specified"); -- Value *OffsetLong = -- IRB.CreateAnd(IRB.CreatePointerCast(Addr, MS.IntptrTy), -- ConstantInt::get(MS.IntptrTy, ~AndMask)); -+ if (AndMask) -+ OffsetLong = -+ IRB.CreateAnd(OffsetLong, ConstantInt::get(MS.IntptrTy, ~AndMask)); - - uint64_t XorMask = MS.MapParams->XorMask; -- if (XorMask != 0) -- OffsetLong = IRB.CreateXor(OffsetLong, -- ConstantInt::get(MS.IntptrTy, XorMask)); -+ if (XorMask) -+ OffsetLong = -+ IRB.CreateXor(OffsetLong, ConstantInt::get(MS.IntptrTy, XorMask)); - return OffsetLong; - } - --- -2.6.4 - diff --git a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch deleted file mode 100644 index 8690523..0000000 --- a/sys-devel/llvm/files/llvm-3.7-nodoctargz.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 -+++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 -@@ -52,11 +52,10 @@ - # 'make generated BUILD_FOR_WEBSITE=1' - generated:: $(generated_targets) - --install-html: $(PROJ_OBJ_DIR)/html.tar.gz -+install-html: - $(Echo) Installing HTML documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html - $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) - - $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) - $(Echo) Packaging HTML documentation -@@ -68,12 +67,11 @@ - - install-doxygen: doxygen - $(Echo) Installing doxygen documentation -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/doxygen/html && \ - for DIR in $$($(FIND) . -type d); do \ - DESTSUB="$(DESTDIR)$(PROJ_docsdir)/html/doxygen/$$(echo $$DIR | cut -c 3-)"; \ - $(MKDIR) $$DESTSUB && \ - $(FIND) $$DIR -maxdepth 1 -type f -exec $(DataInstall) {} $$DESTSUB \; ; \ - if [ $$? != 0 ]; then exit 1; fi \ - done - --doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz -+doxygen: regendoc - - regendoc: - $(Echo) Building doxygen documentation -@@ -99,7 +97,6 @@ - install-ocamldoc: ocamldoc - $(Echo) Installing ocamldoc documentation - $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html -- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) - $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ - $(FIND) . -type f -exec \ - $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; -@@ -109,7 +106,6 @@ - $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* - $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc - $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar -- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ - - regen-ocamldoc: - $(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch deleted file mode 100644 index 87f9ff8..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-0.patch +++ /dev/null @@ -1,83 +0,0 @@ -From a59464503a7e059ddfd3fb4308753b692d03d996 Mon Sep 17 00:00:00 2001 -From: Tom Stellard <thomas.stellard@amd.com> -Date: Wed, 9 Sep 2015 16:39:30 +0000 -Subject: [PATCH 1/4] llvm-config: Add --build-system option - -Summary: -This can be used for distinguishing between cmake and autoconf builds. -Users may need this in order to handle inconsistencies between the -outputs of the two build systems. - -Reviewers: echristo, chandlerc, beanz - -Subscribers: llvm-commits - -Differential Revision: http://reviews.llvm.org/D11838 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@247159 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - tools/llvm-config/BuildVariables.inc.in | 1 + - tools/llvm-config/CMakeLists.txt | 2 ++ - tools/llvm-config/Makefile | 2 ++ - tools/llvm-config/llvm-config.cpp | 3 +++ - 4 files changed, 8 insertions(+) - -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 3f51f49..0f28fad 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -26,3 +26,4 @@ - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" -+#define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index edbd8c9..dd53460 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -24,6 +24,8 @@ set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+set(LLVM_BUILD_SYSTEM cmake) -+ - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) -diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile -index 1ff8b6f..c2b5e8f 100644 ---- a/tools/llvm-config/Makefile -+++ b/tools/llvm-config/Makefile -@@ -65,6 +65,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir - >> temp.sed - $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ - >> temp.sed -+ $(Verb) $(ECHO) 's/@LLVM_BUILD_SYSTEM@/autoconf/' \ -+ >> temp.sed - $(Verb) $(SED) -f temp.sed < $< > $@ - $(Verb) $(RM) temp.sed - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 879b9ab..4ce8f10 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -157,6 +157,7 @@ Options:\n\ - --host-target Target triple used to configure LLVM.\n\ - --build-mode Print build mode of LLVM tree (e.g. Debug or Release).\n\ - --assertion-mode Print assertion mode of LLVM tree (ON or OFF).\n\ -+ --build-system Print the build system used to build LLVM (autoconf or cmake).\n\ - Typical components:\n\ - all All LLVM libraries (default).\n\ - engine Either a native JIT or a bitcode interpreter.\n"; -@@ -323,6 +324,8 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -+ } else if (Arg == "--build-system") { -+ OS << LLVM_BUILD_SYSTEM << '\n'; - } else if (Arg == "--obj-root") { - OS << ActivePrefix << '\n'; - } else if (Arg == "--src-root") { --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch deleted file mode 100644 index 214a3bb..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-1.patch +++ /dev/null @@ -1,453 +0,0 @@ -From 55433193c56e6b2e0792c3ca1b0ef3881ab01138 Mon Sep 17 00:00:00 2001 -From: Richard Diamond <wichard@vitalitystudios.com> -Date: Mon, 9 Nov 2015 23:15:38 +0000 -Subject: [PATCH 2/4] Fix `llvm-config` to adapt to the install environment. - -Summary: -This patch does a couple of things: - - - Adds a new argument `--shared-mode` which accepts a list of components and prints whether or not the provided components need to be linked statically or shared. - - Fixes `--libnames` when CMake BUILD_SHARED_LIBS is used. - - Fixes `--libnames`, `--libs`, and `--libfiles` for dylib when static components aren't installed. - - Fixes `--libnames`, `--libs`, `--libfiles`, and `--components` to use LLVM_DYLIB_COMPONENTS as the component manifest for dylib linking. - - Uses the host platform's usual convention for filename extensions and such, instead of always defaulting to Unix-izms. - -Because I don't own a Mac, I am not able to test the Mac platform dependent stuff locally. If someone would be willing to run a build for me on their machine (unless there's a better option), I'd appreciate it. - -Reviewers: jfb, brad.king, whitequark, beanz - -Subscribers: beanz, jauhien, llvm-commits - -Differential Revision: http://reviews.llvm.org/D13198 - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@252532 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - bindings/ocaml/Makefile.ocaml | 2 + - tools/llvm-config/BuildVariables.inc.in | 3 + - tools/llvm-config/CMakeLists.txt | 5 + - tools/llvm-config/llvm-config.cpp | 265 +++++++++++++++++++++++++++++--- - 4 files changed, 253 insertions(+), 22 deletions(-) - -diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml -index 1f65a7b..22b96a2 100644 ---- a/bindings/ocaml/Makefile.ocaml -+++ b/bindings/ocaml/Makefile.ocaml -@@ -277,6 +277,8 @@ uninstall-local:: uninstall-deplibs - - build-deplibs: $(OutputLibs) - -+$(OcamlDir)/%.so: $(LibDir)/%.so -+ $(Verb) ln -sf $< $@ - $(OcamlDir)/%.a: $(LibDir)/%.a - $(Verb) ln -sf $< $@ - -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index 0f28fad..e384838 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -27,3 +27,6 @@ - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -+#define LLVM_ENABLE_DYLIB "@LLVM_BUILD_LLVM_DYLIB@" -+#define LLVM_ENABLE_SHARED "@LLVM_ENABLE_SHARED@" -+#define LLVM_DYLIB_COMPONENTS "@LLVM_DYLIB_COMPONENTS@" -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index dd53460..173f6dc 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -30,6 +30,11 @@ set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) - set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+if(BUILD_SHARED_LIBS) -+ set(LLVM_ENABLE_SHARED ON) -+else() -+ set(LLVM_ENABLE_SHARED OFF) -+endif() - string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") - configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 4ce8f10..51efbd8 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -30,6 +30,7 @@ - #include <cstdlib> - #include <set> - #include <vector> -+#include <unordered_set> - - using namespace llvm; - -@@ -51,12 +52,16 @@ using namespace llvm; - /// \param Name - The component to traverse. - /// \param ComponentMap - A prebuilt map of component names to descriptors. - /// \param VisitedComponents [in] [out] - The set of already visited components. --/// \param RequiredLibs [out] - The ordered list of required libraries. -+/// \param RequiredLibs [out] - The ordered list of required -+/// libraries. -+/// \param GetComponentNames - Get the component names instead of the -+/// library name. - static void VisitComponent(StringRef Name, - const StringMap<AvailableComponent*> &ComponentMap, - std::set<AvailableComponent*> &VisitedComponents, - std::vector<StringRef> &RequiredLibs, -- bool IncludeNonInstalled) { -+ bool IncludeNonInstalled, bool GetComponentNames, -+ const std::string *ActiveLibDir, bool *HasMissing) { - // Lookup the component. - AvailableComponent *AC = ComponentMap.lookup(Name); - assert(AC && "Invalid component name!"); -@@ -74,12 +79,22 @@ static void VisitComponent(StringRef Name, - // Otherwise, visit all the dependencies. - for (unsigned i = 0; AC->RequiredLibraries[i]; ++i) { - VisitComponent(AC->RequiredLibraries[i], ComponentMap, VisitedComponents, -- RequiredLibs, IncludeNonInstalled); -+ RequiredLibs, IncludeNonInstalled, GetComponentNames, -+ ActiveLibDir, HasMissing); -+ } -+ -+ if (GetComponentNames) { -+ RequiredLibs.push_back(Name); -+ return; - } - - // Add to the required library list. -- if (AC->Library) -+ if (AC->Library) { -+ if (!IncludeNonInstalled && HasMissing && !*HasMissing && ActiveLibDir) { -+ *HasMissing = !sys::fs::exists(*ActiveLibDir + "/" + AC->Library); -+ } - RequiredLibs.push_back(AC->Library); -+ } - } - - /// \brief Compute the list of required libraries for a given list of -@@ -91,9 +106,12 @@ static void VisitComponent(StringRef Name, - /// are required to link the given components. - /// \param IncludeNonInstalled - Whether non-installed components should be - /// reported. -+/// \param GetComponentNames - True if one would prefer the component names. - static void ComputeLibsForComponents(const std::vector<StringRef> &Components, - std::vector<StringRef> &RequiredLibs, -- bool IncludeNonInstalled) { -+ bool IncludeNonInstalled, bool GetComponentNames, -+ const std::string *ActiveLibDir, -+ bool *HasMissing) { - std::set<AvailableComponent*> VisitedComponents; - - // Build a map of component names to information. -@@ -116,7 +134,8 @@ static void ComputeLibsForComponents(const std::vector<StringRef> &Components, - } - - VisitComponent(ComponentLower, ComponentMap, VisitedComponents, -- RequiredLibs, IncludeNonInstalled); -+ RequiredLibs, IncludeNonInstalled, GetComponentNames, -+ ActiveLibDir, HasMissing); - } - - // The list is now ordered with leafs first, we want the libraries to printed -@@ -157,6 +176,7 @@ Options:\n\ - --host-target Target triple used to configure LLVM.\n\ - --build-mode Print build mode of LLVM tree (e.g. Debug or Release).\n\ - --assertion-mode Print assertion mode of LLVM tree (ON or OFF).\n\ -+ --shared-mode Print how the provided components can be collectively linked (`shared` or `static`).\n\ - --build-system Print the build system used to build LLVM (autoconf or cmake).\n\ - Typical components:\n\ - all All LLVM libraries (default).\n\ -@@ -172,10 +192,38 @@ std::string GetExecutablePath(const char *Argv0) { - return llvm::sys::fs::getMainExecutable(Argv0, P); - } - -+/// \brief Expand the semi-colon delimited LLVM_DYLIB_COMPONENTS into -+/// the full list of components. -+std::vector<StringRef> GetAllDyLibComponents(const bool IsInDevelopmentTree, -+ const bool GetComponentNames) { -+ std::vector<StringRef> DyLibComponents; -+ { -+ StringRef DyLibComponentsStr(LLVM_DYLIB_COMPONENTS); -+ size_t Offset = 0; -+ while (true) { -+ const size_t NextOffset = DyLibComponentsStr.find(';', Offset); -+ DyLibComponents.push_back(DyLibComponentsStr.substr(Offset, NextOffset)); -+ if (NextOffset == std::string::npos) { -+ break; -+ } -+ Offset = NextOffset + 1; -+ } -+ -+ assert(DyLibComponents.size() > 0); -+ } -+ -+ std::vector<StringRef> Components; -+ ComputeLibsForComponents(DyLibComponents, Components, -+ /*IncludeNonInstalled=*/IsInDevelopmentTree, -+ GetComponentNames, nullptr, nullptr); -+ -+ return std::move(Components); -+} -+ - int main(int argc, char **argv) { - std::vector<StringRef> Components; - bool PrintLibs = false, PrintLibNames = false, PrintLibFiles = false; -- bool PrintSystemLibs = false; -+ bool PrintSystemLibs = false, PrintSharedMode = false; - bool HasAnyOption = false; - - // llvm-config is designed to support being run both from a development tree -@@ -270,6 +318,108 @@ int main(int argc, char **argv) { - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -+ /// We only use `shared library` mode in cases where the static library form -+ /// of the components provided are not available; note however that this is -+ /// skipped if we're run from within the build dir. However, once installed, -+ /// we still need to provide correct output when the static archives are -+ /// removed or, as in the case of CMake's `BUILD_SHARED_LIBS`, never present -+ /// in the first place. This can't be done at configure/build time. -+ -+ StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, -+ StaticPrefix, StaticDir = "lib"; -+ const Triple HostTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); -+ if (HostTriple.isOSWindows()) { -+ SharedExt = "dll"; -+ SharedVersionedExt = PACKAGE_VERSION ".dll"; -+ StaticExt = "a"; -+ SharedDir = ActiveBinDir; -+ StaticDir = ActiveLibDir; -+ StaticPrefix = SharedPrefix = ""; -+ } else if (HostTriple.isOSDarwin()) { -+ SharedExt = "dylib"; -+ SharedVersionedExt = PACKAGE_VERSION ".dylib"; -+ StaticExt = "a"; -+ StaticDir = SharedDir = ActiveLibDir; -+ StaticPrefix = SharedPrefix = "lib"; -+ } else { -+ // default to the unix values: -+ SharedExt = "so"; -+ SharedVersionedExt = PACKAGE_VERSION ".so"; -+ StaticExt = "a"; -+ StaticDir = SharedDir = ActiveLibDir; -+ StaticPrefix = SharedPrefix = "lib"; -+ } -+ -+ const bool BuiltDyLib = (std::strcmp(LLVM_ENABLE_DYLIB, "ON") == 0); -+ -+ enum { CMake, AutoConf } ConfigTool; -+ if (std::strcmp(LLVM_BUILD_SYSTEM, "cmake") == 0) { -+ ConfigTool = CMake; -+ } else { -+ ConfigTool = AutoConf; -+ } -+ -+ /// CMake style shared libs, ie each component is in a shared library. -+ const bool BuiltSharedLibs = -+ (ConfigTool == CMake && std::strcmp(LLVM_ENABLE_SHARED, "ON") == 0); -+ -+ bool DyLibExists = false; -+ const std::string DyLibName = -+ (SharedPrefix + "LLVM-" + SharedVersionedExt).str(); -+ -+ if (BuiltDyLib) { -+ DyLibExists = sys::fs::exists(SharedDir + "/" + DyLibName); -+ } -+ -+ /// Get the component's library name without the lib prefix and the -+ /// extension. Returns true if Lib is in a recognized format. -+ auto GetComponentLibraryNameSlice = [&](const StringRef &Lib, -+ StringRef &Out) { -+ if (Lib.startswith("lib")) { -+ unsigned FromEnd; -+ if (Lib.endswith(StaticExt)) { -+ FromEnd = StaticExt.size() + 1; -+ } else if (Lib.endswith(SharedExt)) { -+ FromEnd = SharedExt.size() + 1; -+ } else { -+ FromEnd = 0; -+ } -+ -+ if (FromEnd != 0) { -+ Out = Lib.slice(3, Lib.size() - FromEnd); -+ return true; -+ } -+ } -+ -+ return false; -+ }; -+ /// Maps Unixizms to the host platform. -+ auto GetComponentLibraryFileName = [&](const StringRef &Lib, -+ const bool ForceShared) { -+ std::string LibFileName = Lib; -+ StringRef LibName; -+ if (GetComponentLibraryNameSlice(Lib, LibName)) { -+ if (BuiltSharedLibs || ForceShared) { -+ LibFileName = (SharedPrefix + LibName + "." + SharedExt).str(); -+ } else { -+ // default to static -+ LibFileName = (StaticPrefix + LibName + "." + StaticExt).str(); -+ } -+ } -+ -+ return LibFileName; -+ }; -+ /// Get the full path for a possibly shared component library. -+ auto GetComponentLibraryPath = [&](const StringRef &Name, -+ const bool ForceShared) { -+ auto LibFileName = GetComponentLibraryFileName(Name, ForceShared); -+ if (BuiltSharedLibs || ForceShared) { -+ return (SharedDir + "/" + LibFileName).str(); -+ } else { -+ return (StaticDir + "/" + LibFileName).str(); -+ } -+ }; -+ - raw_ostream &OS = outs(); - for (int i = 1; i != argc; ++i) { - StringRef Arg = argv[i]; -@@ -303,13 +453,33 @@ int main(int argc, char **argv) { - } else if (Arg == "--libfiles") { - PrintLibFiles = true; - } else if (Arg == "--components") { -+ /// If there are missing static archives and a dylib was -+ /// built, print LLVM_DYLIB_COMPONENTS instead of everything -+ /// in the manifest. -+ std::vector<StringRef> Components; - for (unsigned j = 0; j != array_lengthof(AvailableComponents); ++j) { - // Only include non-installed components when in a development tree. - if (!AvailableComponents[j].IsInstalled && !IsInDevelopmentTree) - continue; - -- OS << ' '; -- OS << AvailableComponents[j].Name; -+ Components.push_back(AvailableComponents[j].Name); -+ if (AvailableComponents[j].Library && !IsInDevelopmentTree) { -+ if (DyLibExists && -+ !sys::fs::exists(GetComponentLibraryPath( -+ AvailableComponents[j].Library, false))) { -+ Components = GetAllDyLibComponents(IsInDevelopmentTree, true); -+ std::sort(Components.begin(), Components.end()); -+ break; -+ } -+ } -+ } -+ -+ for (unsigned I = 0; I < Components.size(); ++I) { -+ if (I) { -+ OS << ' '; -+ } -+ -+ OS << Components[I]; - } - OS << '\n'; - } else if (Arg == "--targets-built") { -@@ -324,6 +494,8 @@ int main(int argc, char **argv) { - #else - OS << "ON\n"; - #endif -+ } else if (Arg == "--shared-mode") { -+ PrintSharedMode = true; - } else if (Arg == "--build-system") { - OS << LLVM_BUILD_SYSTEM << '\n'; - } else if (Arg == "--obj-root") { -@@ -341,35 +513,84 @@ int main(int argc, char **argv) { - if (!HasAnyOption) - usage(); - -- if (PrintLibs || PrintLibNames || PrintLibFiles || PrintSystemLibs) { -+ if (PrintLibs || PrintLibNames || PrintLibFiles || PrintSystemLibs || -+ PrintSharedMode) { -+ -+ if (PrintSharedMode && BuiltSharedLibs) { -+ OS << "shared\n"; -+ return 0; -+ } -+ - // If no components were specified, default to "all". - if (Components.empty()) - Components.push_back("all"); - - // Construct the list of all the required libraries. - std::vector<StringRef> RequiredLibs; -+ bool HasMissing = false; - ComputeLibsForComponents(Components, RequiredLibs, -- /*IncludeNonInstalled=*/IsInDevelopmentTree); -+ /*IncludeNonInstalled=*/IsInDevelopmentTree, false, -+ &ActiveLibDir, &HasMissing); -+ -+ if (PrintSharedMode) { -+ std::unordered_set<std::string> FullDyLibComponents; -+ std::vector<StringRef> DyLibComponents = -+ GetAllDyLibComponents(IsInDevelopmentTree, false); -+ -+ for (auto &Component : DyLibComponents) { -+ FullDyLibComponents.insert(Component); -+ } -+ DyLibComponents.clear(); -+ -+ for (auto &Lib : RequiredLibs) { -+ if (!FullDyLibComponents.count(Lib)) { -+ OS << "static\n"; -+ return 0; -+ } -+ } -+ FullDyLibComponents.clear(); -+ -+ if (HasMissing && DyLibExists) { -+ OS << "shared\n"; -+ return 0; -+ } else { -+ OS << "static\n"; -+ return 0; -+ } -+ } - - if (PrintLibs || PrintLibNames || PrintLibFiles) { -- for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) { -- StringRef Lib = RequiredLibs[i]; -- if (i) -- OS << ' '; - -+ auto PrintForLib = [&](const StringRef &Lib, const bool ForceShared) { - if (PrintLibNames) { -- OS << Lib; -+ OS << GetComponentLibraryFileName(Lib, ForceShared); - } else if (PrintLibFiles) { -- OS << ActiveLibDir << '/' << Lib; -+ OS << GetComponentLibraryPath(Lib, ForceShared); - } else if (PrintLibs) { - // If this is a typical library name, include it using -l. -- if (Lib.startswith("lib") && Lib.endswith(".a")) { -- OS << "-l" << Lib.slice(3, Lib.size()-2); -- continue; -+ StringRef LibName; -+ if (Lib.startswith("lib")) { -+ if (GetComponentLibraryNameSlice(Lib, LibName)) { -+ OS << "-l" << LibName; -+ } else { -+ OS << "-l:" << GetComponentLibraryFileName(Lib, ForceShared); -+ } -+ } else { -+ // Otherwise, print the full path. -+ OS << GetComponentLibraryPath(Lib, ForceShared); - } -+ } -+ }; -+ -+ if (HasMissing && DyLibExists) { -+ PrintForLib(DyLibName, true); -+ } else { -+ for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) { -+ StringRef Lib = RequiredLibs[i]; -+ if (i) -+ OS << ' '; - -- // Otherwise, print the full path. -- OS << ActiveLibDir << '/' << Lib; -+ PrintForLib(Lib, false); - } - } - OS << '\n'; --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch deleted file mode 100644 index 2895d38..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-2.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 4abc261d14c886c21d24f639293a60ce45c1dca3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH 3/4] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - utils/llvm-build/llvmbuild/main.py | 4 +++- - 3 files changed, 26 insertions(+), 9 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 173f6dc..013ea8c 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,14 +22,19 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - if(BUILD_SHARED_LIBS) - set(LLVM_ENABLE_SHARED ON) - else() -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 51efbd8..315e5e1 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -487,7 +487,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--host-target") { - OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; - } else if (Arg == "--build-mode") { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; - } else if (Arg == "--assertion-mode") { - #if defined(NDEBUG) - OS << "OFF\n"; -@@ -498,10 +499,19 @@ int main(int argc, char **argv) { - PrintSharedMode = true; - } else if (Arg == "--build-system") { - OS << LLVM_BUILD_SYSTEM << '\n'; -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } - } else { - usage(); - } -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index 353741f..4ba5e91 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -393,6 +393,8 @@ subdirectories = %s - // - //===----------------------------------------------------------------------===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = '0' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - f.write(' { "%s", %s, %d, { %s } },\n' % ( - name, library_name_as_cstr, is_installed, - ', '.join('"%s"' % dep --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch b/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch deleted file mode 100644 index 7a1547e..0000000 --- a/sys-devel/llvm/files/llvm-3.7.1-llvm-config-3.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9308d1858852bdc6f099025ca0482d7b3a32a9aa Mon Sep 17 00:00:00 2001 -From: NAKAMURA Takumi <geek4civic@gmail.com> -Date: Wed, 10 Feb 2016 01:12:55 +0000 -Subject: [PATCH 4/4] llvm-config: Quick fix for cross compilation. Don't be - confsed between host and target. It has been there since r252532. - -FIXME: The clause may use conditions of host compiler, not HOST_TRIPLE. - -git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@260343 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - tools/llvm-config/llvm-config.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 315e5e1..346c9d9 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -327,7 +327,7 @@ int main(int argc, char **argv) { - - StringRef SharedExt, SharedVersionedExt, SharedDir, SharedPrefix, StaticExt, - StaticPrefix, StaticDir = "lib"; -- const Triple HostTriple(Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE)); -+ const Triple HostTriple(Triple::normalize(LLVM_HOST_TRIPLE)); - if (HostTriple.isOSWindows()) { - SharedExt = "dll"; - SharedVersionedExt = PACKAGE_VERSION ".dll"; --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch b/sys-devel/llvm/files/llvm-3.8-lldb_six.patch deleted file mode 100644 index 324f2b8..0000000 --- a/sys-devel/llvm/files/llvm-3.8-lldb_six.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py ---- llvm-3.8.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-12-11 16:43:36.000000000 +0100 -+++ llvm-3.8.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2016-03-09 14:12:15.614483414 +0100 -@@ -720,9 +720,6 @@ - bOk, strMsg = create_symlinks(vDictArgs, strFrameworkPythonDir) - - if bOk: -- bOk, strMsg = copy_six(vDictArgs, strFrameworkPythonDir) -- -- if bOk: - bOk, strMsg = copy_lldbpy_file_to_lldb_pkg_dir(vDictArgs, - strFrameworkPythonDir, - strCfgBldDir) diff --git a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch b/sys-devel/llvm/files/llvm-3.8-llvm-config.patch deleted file mode 100644 index 3eace43..0000000 --- a/sys-devel/llvm/files/llvm-3.8-llvm-config.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5ed05738769643b7c652f798fa6c3aa30c7f0b2b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - utils/llvm-build/llvmbuild/main.py | 4 +++- - 3 files changed, 26 insertions(+), 9 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 83794bb..eba6f45 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -22,15 +22,20 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS) - set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) - set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) - set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") - set(LLVM_BUILD_SYSTEM cmake) - set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI}) - - # Use the C++ link flags, since they should be a superset of C link flags. - set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") - if(BUILD_SHARED_LIBS) - set(LLVM_ENABLE_SHARED ON) - else() -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 80f6279..5c65c57 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -484,7 +484,8 @@ int main(int argc, char **argv) { - } else if (Arg == "--host-target") { - OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n'; - } else if (Arg == "--build-mode") { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; - } else if (Arg == "--assertion-mode") { - #if defined(NDEBUG) - OS << "OFF\n"; -@@ -497,10 +498,19 @@ int main(int argc, char **argv) { - OS << LLVM_HAS_RTTI << '\n'; - } else if (Arg == "--shared-mode") { - PrintSharedMode = true; -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } - } else { - usage(); - } -diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py -index f2472f6..c89c77a 100644 ---- a/utils/llvm-build/llvmbuild/main.py -+++ b/utils/llvm-build/llvmbuild/main.py -@@ -393,6 +393,8 @@ subdirectories = %s - // - //===----------------------------------------------------------------------===// - -+#include "llvm/Config/config.h" -+ - """) - f.write('struct AvailableComponent {\n') - f.write(' /// The name of the component.\n') -@@ -413,7 +415,7 @@ subdirectories = %s - if library_name is None: - library_name_as_cstr = 'nullptr' - else: -- library_name_as_cstr = '"lib%s.a"' % library_name -+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name - if is_installed: - is_installed_as_cstr = 'true' - else: --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.8-soversion.patch b/sys-devel/llvm/files/llvm-3.8-soversion.patch deleted file mode 100644 index 1a30643..0000000 --- a/sys-devel/llvm/files/llvm-3.8-soversion.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3da7d5f7f928aa2aa5e7436b27908bb7e7eb3cc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 28 Mar 2016 22:21:19 +0200 -Subject: [PATCH] cmake: Restore SOVERSIONs on shared libraries - ---- - cmake/modules/AddLLVM.cmake | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index a829751..a7e0688 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -436,6 +436,11 @@ function(llvm_add_library name) - PREFIX "" - ) - endif() -+ -+ set_target_properties(${name} -+ PROPERTIES -+ SOVERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR} -+ VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX}) - endif() - - if(ARG_MODULE OR ARG_SHARED) --- -2.7.4 - diff --git a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch b/sys-devel/llvm/files/llvm-3.9-llvm-config.patch deleted file mode 100644 index d4363ad..0000000 --- a/sys-devel/llvm/files/llvm-3.9-llvm-config.patch +++ /dev/null @@ -1,68 +0,0 @@ -From af798c5a6e4b2c6c98cce89b5d6fc8d33f9345cf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 2 Dec 2015 16:04:56 +0100 -Subject: [PATCH 1/2] llvm-config: Clean up exported values, update for shared - linking - -Gentoo-specific fixup for llvm-config, including: -- wiping build-specific CFLAGS, CXXFLAGS, -- updating library suffixes for shared libs, -- wiping --system-libs for shared linking, -- banning --obj-root and --src-root due to no sources installed, -- making --build-mode return "Release" rather than "Gentoo". - -Thanks to Steven Newbury for the initial patch. - -Bug: https://bugs.gentoo.org/565358 -Bug: https://bugs.gentoo.org/501684 ---- - tools/llvm-config/CMakeLists.txt | 11 ++++++++--- - tools/llvm-config/llvm-config.cpp | 20 +++++++++++++++----- - 2 files changed, 23 insertions(+), 8 deletions(-) - -diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt -index 32d0f4c..6e99832 100644 ---- a/tools/llvm-config/CMakeLists.txt -+++ b/tools/llvm-config/CMakeLists.txt -@@ -29,2 +29,6 @@ set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ --set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") --set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}") -+# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler -+# specific flags will be set when we don't know what compiler will be used -+# with external project utilising llvm-config. C++ Standard is required. -+# TODO: figure out if we can remove -std=c++11 and move it to revdeps. -+set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -+set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") -@@ -39 +43,2 @@ set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) --set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) -+# We don't do static libs, so we don't need to supply any system-libs -+set(LLVM_SYSTEM_LIBS "") -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 94d426b..fb1bdfa 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -525 +525,2 @@ int main(int argc, char **argv) { -- OS << build_mode << '\n'; -+ // force Release since we force non-standard Gentoo build mode -+ OS << "Release" << '\n'; -@@ -540,4 +541,13 @@ int main(int argc, char **argv) { -- } else if (Arg == "--obj-root") { -- OS << ActivePrefix << '\n'; -- } else if (Arg == "--src-root") { -- OS << LLVM_SRC_ROOT << '\n'; -+ } else if (Arg == "--obj-root" || Arg == "--src-root") { -+ if (IsInDevelopmentTree) { -+ if (Arg == "--obj-root") { -+ OS << ActivePrefix << '\n'; -+ } else { -+ OS << LLVM_SRC_ROOT << '\n'; -+ } -+ } else { -+ // sources are not installed -+ llvm::errs() << "llvm-config: sources not installed, " -+ << Arg << " not available\n"; -+ exit(1); -+ } --- -2.7.4 - diff --git a/sys-devel/llvm/llvm-3.7.1-r1.ebuild b/sys-devel/llvm/llvm-3.7.1-r1.ebuild deleted file mode 100644 index 58b7c72..0000000 --- a/sys-devel/llvm/llvm-3.7.1-r1.ebuild +++ /dev/null @@ -1,553 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -PYTHON_COMPAT=( python2_7 ) - -inherit check-reqs cmake-utils eutils flag-o-matic multilib linux-info \ - multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="http://llvm.org/" -SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz - clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz - http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz - http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz ) - lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz ) - !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.7.0-manpages.tar.bz2 )" - -LICENSE="UoI-NCSA" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml - python +static-analyzer test xml video_cards_radeon - kernel_Darwin kernel_FreeBSD rap" - -COMMON_DEPEND=" - sys-libs/zlib:0= - clang? ( - python? ( ${PYTHON_DEPS} ) - static-analyzer? ( - dev-lang/perl:* - ${PYTHON_DEPS} - ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ) - gold? ( >=sys-devel/binutils-2.22:*[cxx] ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - ocaml? ( - >=dev-lang/ocaml-4.00.0:0= - dev-ml/findlib - dev-ml/ocaml-ctypes - !!<=sys-devel/llvm-3.7.0-r1[ocaml] )" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${COMMON_DEPEND} - dev-lang/perl - >=sys-devel/make-3.81 - >=sys-devel/flex-2.5.4 - >=sys-devel/bison-1.875d - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) - kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 ) - clang? ( xml? ( virtual/pkgconfig ) ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - lldb? ( dev-lang/swig ) - !!<dev-python/configparser-3.3.0.2 - ocaml? ( test? ( dev-ml/ounit ) ) - ${PYTHON_DEPS}" -RDEPEND="${COMMON_DEPEND} - clang? ( !<=sys-devel/clang-${PV}-r99 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )" - -# pypy gives me around 1700 unresolved tests due to open file limit -# being exceeded. probably GC does not close them fast enough. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - lldb? ( clang xml )" - -S=${WORKDIR}/${P/_}.src - -pkg_pretend() { - # in megs - # !clang !debug !multitarget -O2 400 - # !clang !debug multitarget -O2 550 - # clang !debug !multitarget -O2 950 - # clang !debug multitarget -O2 1200 - # !clang debug multitarget -O2 5G - # clang !debug multitarget -O0 -g 12G - # clang debug multitarget -O2 16G - # clang debug multitarget -O0 -g 14G - - local build_size=550 - use clang && build_size=1200 - - if use debug; then - ewarn "USE=debug is known to increase the size of package considerably" - ewarn "and cause the tests to fail." - ewarn - - (( build_size *= 14 )) - elif is-flagq '-g?(gdb)?([1-9])'; then - ewarn "The C++ compiler -g option is known to increase the size of the package" - ewarn "considerably. If you run out of space, please consider removing it." - ewarn - - (( build_size *= 10 )) - fi - - # Multiply by number of ABIs :). - local abis=( $(multilib_get_enabled_abis) ) - (( build_size *= ${#abis[@]} )) - - local CHECKREQS_DISK_BUILD=${build_size}M - check-reqs_pkg_pretend -} - -pkg_setup() { - pkg_pretend -} - -src_unpack() { - default - - if use clang; then - mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \ - || die "clang source directory move failed" - mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \ - || die "compiler-rt source directory move failed" - mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \ - || die "clang-tools-extra source directory move failed" - fi - - if use lldb; then - mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \ - || die "lldb source directory move failed" - fi -} - -src_prepare() { - # Make ocaml warnings non-fatal, bug #537308 - sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die - # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch - # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch - - # Make it possible to override Sphinx HTML install dirs - # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch - - # Prevent race conditions with parallel Sphinx runs - # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch - - # Prevent installing libgtest - # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch - - # Fix llvm-config for shared linking, sane flags and return values - # in order: - # - backported r247159 that adds --build-system (needed for later code) - # - backported r252532 that adds better shared linking support - # - our fixes - # - backported r260343 that fixes cross-compilation - # combination of backported upstream r252532 with our patch - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-0.patch - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-1.patch - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-2.patch - eapply "${FILESDIR}"/llvm-3.7.1-llvm-config-3.patch - - # Fix msan with newer kernels, #569894 - eapply "${FILESDIR}"/llvm-3.7-msan-fix.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - if use clang; then - # Automatically select active system GCC's libraries, bugs #406163 and #417913 - eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch - - eapply "${FILESDIR}"/clang-3.6-gentoo-install.patch - - eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch - eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp - - sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ - tools/clang/tools/scan-build/scan-build || die - - # Install clang runtime into /usr/lib/clang - # https://llvm.org/bugs/show_bug.cgi?id=23792 - eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch - eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch - - # Do not force -march flags on arm platforms - # https://bugs.gentoo.org/show_bug.cgi?id=562706 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-compiler_rt_arm_march_flags.patch - - # Make it possible to override CLANG_LIBDIR_SUFFIX - # (that is used only to find LLVMgold.so) - # https://llvm.org/bugs/show_bug.cgi?id=23793 - eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch - - pushd projects/compiler-rt >/dev/null || die - - # Fix msan with newer kernels, compiler-rt part, #569894 - eapply "${FILESDIR}"/compiler-rt-3.7-msan-fix.patch - - # Fix WX sections, bug #421527 - find lib/builtins -type f -name '*.S' -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} + || die - - popd >/dev/null || die - fi - - if use lldb; then - # Do not install dummy readline.so module from - # https://llvm.org/bugs/show_bug.cgi?id=18841 - sed -e 's/add_subdirectory(readline)/#&/' \ - -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die - - # Fix Python paths, bugs #562436 and #562438 - eapply "${FILESDIR}"/${PN}-3.7-lldb_python.patch - sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \ - -i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die - - # Fix build with ncurses[tinfo], #560474 - # http://llvm.org/viewvc/llvm-project?view=revision&revision=247842 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-lldb_tinfo.patch - fi - - # User patches - eapply_user - - if kernel_is -lt 2 6 32; then - # on RHEL5, linux/perf_event.h (needing kernel >=2.6.32) is not available. - # https://llvm.org/bugs/show_bug.cgi?id=17901 - elog "Removing compiler-rt on <linux-2.6.32..." - rm -r projects/compiler-rt || die "Removing compiler-rt failed." - fi - - python_setup - - # Native libdir is used to hold LLVMgold.so - NATIVE_LIBDIR=$(get_libdir) -} - -multilib_src_configure() { - local targets - if use multitarget; then - targets=all - else - targets='host;BPF;CppBackend' - use video_cards_radeon && targets+=';AMDGPU' - fi - - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_ENABLE_TIMESTAMPS=OFF - -DLLVM_TARGETS_TO_BUILD="${targets}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DWITH_POLLY=OFF # TODO - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - - -DHAVE_HISTEDIT_H=$(usex libedit) - ) - - use rap && mycmakeargs+=( -DDEFAULT_SYSROOT="${EPREFIX}" ) - - if use clang; then - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) - -DLLDB_DISABLE_CURSES=$(usex !ncurses) - -DLLDB_ENABLE_TERMINFO=$(usex ncurses) - ) - fi - - if ! multilib_is_native_abi || ! use ocaml; then - mycmakeargs+=( - -DOCAMLFIND=NO - ) - fi -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - -DLLVM_INSTALL_UTILS=ON - ) - - if use clang; then - mycmakeargs+=( - -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang" - ) - fi - - if use gold; then - mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_PYTHON=$(usex !python) - ) - fi - - else - if use clang; then - mycmakeargs+=( - # disable compiler-rt on non-native ABI because: - # 1. it fails to configure because of -m32 - # 2. it is shared between ABIs so no point building - # it multiple times - -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF - -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - if use lldb; then - mycmakeargs+=( - # only run swig on native abi - -DLLDB_DISABLE_PYTHON=ON - ) - fi - fi - - if use clang; then - mycmakeargs+=( - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}" - ) - - # -- not needed when compiler-rt is built with host compiler -- - # cmake passes host C*FLAGS to compiler-rt build - # which is performed using clang, so we need to filter out - # some flags clang does not support - # (if you know some more flags that don't work, let us know) - #filter-flags -msahf -frecord-gcc-switches - fi - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - # TODO: not sure why this target is not correctly called - multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - local test_targets=( check ) - # clang tests won't work on non-native ABI because we skip compiler-rt - multilib_is_native_abi && use clang && test_targets+=( check-clang ) - cmake-utils_src_make "${test_targets[@]}" -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/config.h - /usr/include/llvm/Config/llvm-config.h - ) - - if use clang; then - # note: magic applied in multilib_src_install()! - CLANG_VERSION=${PV%.*} - - MULTILIB_CHOST_TOOLS+=( - /usr/bin/clang - /usr/bin/clang++ - /usr/bin/clang-cl - /usr/bin/clang-${CLANG_VERSION} - /usr/bin/clang++-${CLANG_VERSION} - /usr/bin/clang-cl-${CLANG_VERSION} - ) - - MULTILIB_WRAPPED_HEADERS+=( - /usr/include/clang/Config/config.h - ) - fi - - multilib-minimal_src_install - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD && use clang; then - rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - cmake-utils_src_install - - if multilib_is_native_abi; then - # Install man pages. - use doc || doman "${WORKDIR}"/${PN}-3.7.0-manpages/*.1 - - # Symlink the gold plugin. - if use gold; then - dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins" - dosym "../../../../$(get_libdir)/LLVMgold.so" \ - "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so" - fi - fi - - # apply CHOST and CLANG_VERSION to clang executables - # they're statically linked so we don't have to worry about the lib - if use clang; then - local clang_tools=( clang clang++ clang-cl ) - local i - - # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y - # - clang++, clang-cl -> clang - # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y - # - clang, clang++, clang-cl -> clang*-X.Y - # so we need to fix the two tools - for i in "${clang_tools[@]:1}"; do - rm "${ED%/}/usr/bin/${i}" || die - dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}" - dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}" - done - - # now prepend ${CHOST} and let the multilib-build.eclass symlink it - if ! multilib_is_native_abi; then - # non-native? let's replace it with a simple wrapper - for i in "${clang_tools[@]}"; do - rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die - cat > "${T}"/wrapper.tmp <<-_EOF_ - #!${EPREFIX}/bin/sh - exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}" - _EOF_ - newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}" - done - fi - fi -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles - doins -r utils/vim/*/. - # some users may find it useful - dodoc utils/vim/vimrc - - if use clang; then - pushd tools/clang >/dev/null || die - - if use static-analyzer ; then - pushd tools/scan-build >/dev/null || die - - dobin ccc-analyzer scan-build - dosym ccc-analyzer /usr/bin/c++-analyzer - doman scan-build.1 - - insinto /usr/share/llvm - doins scanview.css sorttable.js - - popd >/dev/null || die - fi - - if use static-analyzer ; then - pushd tools/scan-view >/dev/null || die - - python_doscript scan-view - - touch __init__.py || die - python_moduleinto clang - python_domodule *.py Resources - - popd >/dev/null || die - fi - - if use python ; then - pushd bindings/python/clang >/dev/null || die - - python_moduleinto clang - python_domodule *.py - - popd >/dev/null || die - fi - - popd >/dev/null || die - - python_fix_shebang "${ED}" - if use lldb && use python; then - python_optimize - fi - fi -} - -pkg_postinst() { - if use clang && ! has_version sys-libs/libomp; then - elog "To enable OpenMP support in clang, install sys-libs/libomp." - fi -} diff --git a/sys-devel/llvm/llvm-3.8.0-r3.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild deleted file mode 100644 index 428bf9e..0000000 --- a/sys-devel/llvm/llvm-3.8.0-r3.ebuild +++ /dev/null @@ -1,543 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -PYTHON_COMPAT=( python2_7 ) - -inherit check-reqs cmake-utils eutils flag-o-matic multilib linux-info \ - multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="http://llvm.org/" -SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz - clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz - http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz - http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz ) - lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz ) - !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.8.0-manpages.tar.bz2 )" - -LICENSE="UoI-NCSA" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml - python +static-analyzer test xml video_cards_radeon - kernel_Darwin kernel_FreeBSD" - -COMMON_DEPEND=" - sys-libs/zlib:0= - clang? ( - python? ( ${PYTHON_DEPS} ) - static-analyzer? ( - dev-lang/perl:* - ${PYTHON_DEPS} - ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ) - gold? ( >=sys-devel/binutils-2.22:*[cxx] ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - lldb? ( dev-python/six[${PYTHON_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - ocaml? ( - >=dev-lang/ocaml-4.00.0:0= - dev-ml/findlib - dev-ml/ocaml-ctypes - !!<=sys-devel/llvm-3.7.0-r1[ocaml] )" -# configparser-3.2 breaks the build (3.3 or none at all are fine) -DEPEND="${COMMON_DEPEND} - dev-lang/perl - >=sys-devel/make-3.81 - >=sys-devel/flex-2.5.4 - >=sys-devel/bison-1.875d - || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 - ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) - ) - || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) - kernel_Darwin? ( <sys-libs/libcxx-${PV%_rc*}.9999 ) - clang? ( xml? ( virtual/pkgconfig ) ) - doc? ( dev-python/sphinx ) - gold? ( sys-libs/binutils-libs ) - libffi? ( virtual/pkgconfig ) - lldb? ( dev-lang/swig ) - !!<dev-python/configparser-3.3.0.2 - ocaml? ( test? ( dev-ml/ounit ) ) - ${PYTHON_DEPS}" -RDEPEND="${COMMON_DEPEND} - clang? ( !<=sys-devel/clang-${PV}-r99 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" -PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )" - -# pypy gives me around 1700 unresolved tests due to open file limit -# being exceeded. probably GC does not close them fast enough. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - lldb? ( clang xml )" - -S=${WORKDIR}/${P/_}.src - -pkg_pretend() { - # in megs - # !clang !debug !multitarget -O2 400 - # !clang !debug multitarget -O2 550 - # clang !debug !multitarget -O2 950 - # clang !debug multitarget -O2 1200 - # !clang debug multitarget -O2 5G - # clang !debug multitarget -O0 -g 12G - # clang debug multitarget -O2 16G - # clang debug multitarget -O0 -g 14G - - local build_size=550 - use clang && build_size=1200 - - if use debug; then - ewarn "USE=debug is known to increase the size of package considerably" - ewarn "and cause the tests to fail." - ewarn - - (( build_size *= 14 )) - elif is-flagq '-g?(gdb)?([1-9])'; then - ewarn "The C++ compiler -g option is known to increase the size of the package" - ewarn "considerably. If you run out of space, please consider removing it." - ewarn - - (( build_size *= 10 )) - fi - - # Multiply by number of ABIs :). - local abis=( $(multilib_get_enabled_abis) ) - (( build_size *= ${#abis[@]} )) - - local CHECKREQS_DISK_BUILD=${build_size}M - check-reqs_pkg_pretend -} - -pkg_setup() { - pkg_pretend -} - -src_unpack() { - default - - if use clang; then - mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \ - || die "clang source directory move failed" - mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \ - || die "compiler-rt source directory move failed" - mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \ - || die "clang-tools-extra source directory move failed" - fi - - if use lldb; then - mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \ - || die "lldb source directory move failed" - fi -} - -src_prepare() { - python_setup - - # Make ocaml warnings non-fatal, bug #537308 - sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die - # Fix libdir for ocaml bindings install, bug #559134 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch - # Do not build/install ocaml docs with USE=-doc, bug #562008 - eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch - - # Make it possible to override Sphinx HTML install dirs - # https://llvm.org/bugs/show_bug.cgi?id=23780 - eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch - - # Prevent race conditions with parallel Sphinx runs - # https://llvm.org/bugs/show_bug.cgi?id=23781 - eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch - - # Prevent installing libgtest - # https://llvm.org/bugs/show_bug.cgi?id=18341 - eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch - - # Allow custom cmake build types (like 'Gentoo') - eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch - - # Fix llvm-config for shared linking and sane flags - # https://bugs.gentoo.org/show_bug.cgi?id=565358 - eapply "${FILESDIR}"/llvm-3.8-llvm-config.patch - - # Restore SOVERSIONs for shared libraries - # https://bugs.gentoo.org/show_bug.cgi?id=578392 - eapply "${FILESDIR}"/llvm-3.8-soversion.patch - - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - # Workaround, can be compiled with gcc on Gentoo/FreeBSD, bug #578064 - use kernel_FreeBSD && tc-is-gcc && append-cppflags "-D_GLIBCXX_USE_C99" - - if use clang; then - # Automatically select active system GCC's libraries, bugs #406163 and #417913 - eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch - - # Support gcc4.9 search paths - # https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3 - eapply "${FILESDIR}"/clang-3.8-gcc4.9-search-path.patch - - eapply "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch - eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp - - sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ - tools/clang/tools/scan-build/bin/scan-build || die - - # Install clang runtime into /usr/lib/clang - # https://llvm.org/bugs/show_bug.cgi?id=23792 - eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch - eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch - - # Do not force -march flags on arm platforms - # https://bugs.gentoo.org/show_bug.cgi?id=562706 - eapply "${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch - - # Make it possible to override CLANG_LIBDIR_SUFFIX - # (that is used only to find LLVMgold.so) - # https://llvm.org/bugs/show_bug.cgi?id=23793 - eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch - - # Fix git-clang-format shebang, bug #562688 - python_fix_shebang tools/clang/tools/clang-format/git-clang-format - - # Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 - # https://llvm.org/bugs/show_bug.cgi?id=26651 - eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch - - pushd projects/compiler-rt >/dev/null || die - - # Fix WX sections, bug #421527 - find lib/builtins -type f -name '*.S' -exec sed \ - -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ - -i {} + || die - - popd >/dev/null || die - fi - - if use lldb; then - # Do not install dummy readline.so module from - # https://llvm.org/bugs/show_bug.cgi?id=18841 - sed -e 's/add_subdirectory(readline)/#&/' \ - -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die - # Do not install bundled six module - eapply "${FILESDIR}"/${PN}-3.8-lldb_six.patch - fi - - # User patches - eapply_user - - if kernel_is -lt 2 6 32; then - # on RHEL5, linux/perf_event.h (needing kernel >=2.6.32) is not available. - # https://llvm.org/bugs/show_bug.cgi?id=17901 - elog "Removing compiler-rt on <linux-2.6.32..." - rm -r projects/compiler-rt || die "Removing compiler-rt failed." - fi - - # Native libdir is used to hold LLVMgold.so - NATIVE_LIBDIR=$(get_libdir) -} - -multilib_src_configure() { - local targets - if use multitarget; then - targets=all - else - targets='host;BPF;CppBackend' - use video_cards_radeon && targets+=';AMDGPU' - fi - - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$(pkg-config --cflags-only-I libffi) - ffi_ldflags=$(pkg-config --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=ON - -DLLVM_ENABLE_TIMESTAMPS=OFF - -DLLVM_TARGETS_TO_BUILD="${targets}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DWITH_POLLY=OFF # TODO - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - - -DHAVE_HISTEDIT_H=$(usex libedit) - ) - - use prefix && mycmakeargs+=( -DDEFAULT_SYSROOT="${EPREFIX}" ) - - if use clang; then - mycmakeargs+=( - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) - -DLLDB_DISABLE_CURSES=$(usex !ncurses) - -DLLDB_ENABLE_TERMINFO=$(usex ncurses) - ) - fi - - if ! multilib_is_native_abi || ! use ocaml; then - mycmakeargs+=( - -DOCAMLFIND=NO - ) - fi -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - if multilib_is_native_abi; then - mycmakeargs+=( - -DLLVM_BUILD_DOCS=$(usex doc) - -DLLVM_ENABLE_SPHINX=$(usex doc) - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - -DLLVM_INSTALL_UTILS=ON - ) - - if use clang; then - mycmakeargs+=( - -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang" - ) - fi - - if use gold; then - mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if use lldb; then - mycmakeargs+=( - -DLLDB_DISABLE_PYTHON=$(usex !python) - ) - fi - - else - if use clang; then - mycmakeargs+=( - # disable compiler-rt on non-native ABI because: - # 1. it fails to configure because of -m32 - # 2. it is shared between ABIs so no point building - # it multiple times - -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF - -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - if use lldb; then - mycmakeargs+=( - # only run swig on native abi - -DLLDB_DISABLE_PYTHON=ON - ) - fi - fi - - if use clang; then - mycmakeargs+=( - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}" - ) - - # -- not needed when compiler-rt is built with host compiler -- - # cmake passes host C*FLAGS to compiler-rt build - # which is performed using clang, so we need to filter out - # some flags clang does not support - # (if you know some more flags that don't work, let us know) - #filter-flags -msahf -frecord-gcc-switches - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/llvm-tblgen" ]] \ - || die "/usr/bin/llvm-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen - ) - - if use clang; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - fi - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - # TODO: not sure why this target is not correctly called - multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - local test_targets=( check ) - # clang tests won't work on non-native ABI because we skip compiler-rt - multilib_is_native_abi && use clang && test_targets+=( check-clang ) - cmake-utils_src_make "${test_targets[@]}" -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/config.h - /usr/include/llvm/Config/llvm-config.h - ) - - if use clang; then - # note: magic applied in multilib_src_install()! - CLANG_VERSION=${PV%.*} - - MULTILIB_CHOST_TOOLS+=( - /usr/bin/clang - /usr/bin/clang++ - /usr/bin/clang-cl - /usr/bin/clang-${CLANG_VERSION} - /usr/bin/clang++-${CLANG_VERSION} - /usr/bin/clang-cl-${CLANG_VERSION} - ) - - MULTILIB_WRAPPED_HEADERS+=( - /usr/include/clang/Config/config.h - ) - fi - - multilib-minimal_src_install - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD && use clang; then - rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - cmake-utils_src_install - - if multilib_is_native_abi; then - # Install man pages. - use doc || doman "${WORKDIR}"/${PN}-3.8.0-manpages/*.1 - - # Symlink the gold plugin. - if use gold; then - dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins" - dosym "../../../../$(get_libdir)/LLVMgold.so" \ - "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so" - fi - fi - - # apply CHOST and CLANG_VERSION to clang executables - # they're statically linked so we don't have to worry about the lib - if use clang; then - local clang_tools=( clang clang++ clang-cl ) - local i - - # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y - # - clang++, clang-cl -> clang - # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y - # - clang, clang++, clang-cl -> clang*-X.Y - # so we need to fix the two tools - for i in "${clang_tools[@]:1}"; do - rm "${ED%/}/usr/bin/${i}" || die - dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}" - dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}" - done - - # now prepend ${CHOST} and let the multilib-build.eclass symlink it - if ! multilib_is_native_abi; then - # non-native? let's replace it with a simple wrapper - for i in "${clang_tools[@]}"; do - rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die - cat > "${T}"/wrapper.tmp <<-_EOF_ - #!${EPREFIX}/bin/sh - exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}" - _EOF_ - newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}" - done - fi - fi -} - -multilib_src_install_all() { - insinto /usr/share/vim/vimfiles - doins -r utils/vim/*/. - # some users may find it useful - dodoc utils/vim/vimrc - - if use clang; then - pushd tools/clang >/dev/null || die - - if use python ; then - pushd bindings/python/clang >/dev/null || die - - python_moduleinto clang - python_domodule *.py - - popd >/dev/null || die - fi - - popd >/dev/null || die - - python_fix_shebang "${ED}" - if use static-analyzer; then - python_optimize "${ED}"usr/share/scan-view - fi - fi -} - -pkg_postinst() { - if use clang && ! has_version 'sys-libs/libomp'; then - elog "To enable OpenMP support in clang, install sys-libs/libomp." - fi -} diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml deleted file mode 100644 index 6d78a05..0000000 --- a/sys-devel/llvm/metadata.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mgorny@gentoo.org</email> - <name>Michał Górny</name> - </maintainer> - <maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> - </maintainer> - <longdescription>Low Level Virtual Machine (LLVM) is: - 1. A compilation strategy designed to enable effective program optimization across the entire lifetime of a program. LLVM supports effective optimization at compile time, link-time (particularly interprocedural), run-time and offline (i.e., after software is installed), while remaining transparent to developers and maintaining compatibility with existing build scripts. - 2. A virtual instruction set - LLVM is a low-level object code representation that uses simple RISC-like instructions, but provides rich, language-independent, type information and dataflow (SSA) information about operands. This combination enables sophisticated transformations on object code, while remaining light-weight enough to be attached to the executable. This combination is key to allowing link-time, run-time, and offline transformations. - 3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures. - 4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription> - <use> - <flag name="clang">Build the clang C/C++ compiler</flag> - <flag name="cmake">Enable cmake support (experimental)</flag> - <flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag> - <flag name="gold">Build the gold linker plugin</flag> - <flag name="lldb">Build the lldb debugger</flag> - <flag name="multitarget">Build all host targets (default: host only)</flag> - <flag name="ncurses">Support querying terminal properties using ncurses' terminfo</flag> - <flag name="static-analyzer">Install the Clang static analyzer (requires USE=clang)</flag> - <flag name="udis86">Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag> - </use> -</pkgmetadata> diff --git a/sys-fs/posixovl/Manifest b/sys-fs/posixovl/Manifest deleted file mode 100644 index 6b709d5..0000000 --- a/sys-fs/posixovl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST posixovl-1.2.tar.xz 14980 SHA256 e936a06d06b65319c0efe5402597682b1ae86e6df15e60d00d1c562390207f75 SHA512 67ef4074993a286c79ffafb31feb99e57819e39e73bbef100a5de381368d88d3b179a24b5a49102e29d4c4fe8134ea04e7b13b07f366873586d9e83877963244 WHIRLPOOL 343394b50ba86b3691b9b148be684793246efde71da012368a8e0d70390d00c5d5c0470f700f5657b3dcecfe4b79cf0b62bb9bb784b5b7251e9c726d8ba8a908 -EBUILD posixovl-1.2.ebuild 637 SHA256 06756d46dd2e63dcc7214bcd68f52ae9c4aa13026391cad0fe0d238d4851f6fc SHA512 3bbbda88499e54144c0cb514e0f820d5a1c2adc5d8f4790fd1f49e68feee5c2ea1e7ea0f2397ab0aac94a37892439f9b6cd68061cbd1331fe6360cb73525962c WHIRLPOOL bba6f95eaa43c304f49b256530158185c67715987cbcc39099620f1e8a27bd22af6dd005f9ce13cabc47da1656b418f5fe8b2a4c740267968a8bc6adcc280e4e diff --git a/sys-fs/posixovl/posixovl-1.2.ebuild b/sys-fs/posixovl/posixovl-1.2.ebuild deleted file mode 100644 index e7ddcc6..0000000 --- a/sys-fs/posixovl/posixovl-1.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools flag-o-matic - -DESCRIPTION="A FUSE filesystem that provides POSIX functionality for filesystems that do not have such." -HOMEPAGE="http://sourceforge.net/projects/posixovl" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~x86" -SLOT=0 -IUSE="static" -RDEPEND=">=sys-fs/fuse-2.6.5 - sys-apps/attr" -DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" - -src_prepare () { - if use static; then - append-flags -static - # libfuse.a calls dlopen - append-libs dl - fi - - eautoreconf -} diff --git a/sys-fs/unionfs-fuse/ChangeLog b/sys-fs/unionfs-fuse/ChangeLog deleted file mode 100644 index 9c0fb57..0000000 --- a/sys-fs/unionfs-fuse/ChangeLog +++ /dev/null @@ -1,44 +0,0 @@ -# ChangeLog for sys-fs/unionfs-fuse -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/ChangeLog,v 1.9 2013/02/21 03:59:06 zmedico Exp $ - - 21 Feb 2013; Zac Medico <zmedico@gentoo.org> unionfs-fuse-0.26.ebuild: - Fix for prefix and add ~x86-linux keyword. - - 22 Sep 2012; Sebastian Pipping <sping@gentoo.org> unionfs-fuse-0.26.ebuild, - +files/unionfs-fuse-0.26-declare-chroot.patch, - +files/unionfs-fuse-0.26-link-pthread.patch: - Fix underlinking to pthreads with GCC 4.7 (bug #435822), mainly. Patches - forwarded to upstream. - - 14 Sep 2012; Sebastian Pipping <sping@gentoo.org> -unionfs-fuse-0.23.ebuild: - Remove 0.23 ebuilds since upstream now considers 0.23 to be severely broken - -*unionfs-fuse-0.26 (14 Sep 2012) - - 14 Sep 2012; Sebastian Pipping <sping@gentoo.org> +unionfs-fuse-0.26.ebuild: - Bump to 0.26, looks trivial - -*unionfs-fuse-0.25 (04 Feb 2012) - - 04 Feb 2012; Sebastian Pipping <sping@gentoo.org> +unionfs-fuse-0.25.ebuild: - Bump to 0.25 - -*unionfs-fuse-0.24 (21 May 2010) - - 21 May 2010; Sebastian Pipping <sping@gentoo.org> - +unionfs-fuse-0.24.ebuild: - Bump to 0.24 - - 18 Mar 2010; Sebastian Pipping <sping@gentoo.org> metadata.xml: - Put myself in as maintainer - - 17 Jan 2010; Alex Legler <a3li@gentoo.org> unionfs-fuse-0.23.ebuild: - Keyword ~amd64, bug 301207 by Martin Väth. - -*unionfs-fuse-0.23 (12 Jan 2010) - - 12 Jan 2010; Sebastian Pipping <sping@gentoo.org> - +unionfs-fuse-0.23.ebuild, +files/unionfs-fuse-0.23-makefile.patch, - +metadata.xml: - New package (fixes bug #143026) diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest deleted file mode 100644 index d13892f..0000000 --- a/sys-fs/unionfs-fuse/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX unionfs-fuse-0.23-makefile.patch 301 SHA256 006dbd58cf9bf017b11bea4a6dad3b45ac2636fd62c52d9fb03d71edc66300e5 SHA512 8b3f0e68a1f5a8b4bf0b238463934325095dcce36c0fe8f3a7df3f545883906aaa0cd3f73183ee9bcc6a6c9deae338e7c673421c8ffc8e367eb0e3c0e3c2341b WHIRLPOOL 3d0406ed3a654c111ac25ca37944118cfcf5d12265b6edcf1f3836171d7562dd921bd055f8e2e4396b5520a79b1a50eb581dfa470e3ef391141c826ec129aa44 -AUX unionfs-fuse-0.26-declare-chroot.patch 312 SHA256 402258decbba9057891eb25a6f75fd9c358113eccd3b1f9c32d18bedda123330 SHA512 103e082fbe0a65fb44838e530ee59644659deca1096d6125c20a7911eee2296bcca98ea8d14249d433337fd06ede4eac7d705029e6e70e2df35468998cf144ab WHIRLPOOL 8641cdc4032e2d7c03f39f389b6911e555a0a56eb21971a5d07b03fa02a6f4ca2126ab48255cba5761f8ffc723ac2c6ad054cd6561c056dc74c8e205c1e8a5f2 -AUX unionfs-fuse-0.26-link-pthread.patch 347 SHA256 32cb895e3fffa87c58efa5632dd6dfc07dd4a64b1b60942244bee3f58cc514bd SHA512 4f76f9221e1be47be2c4d405cfd1a326f1955697cfbc5932034e3d90e39c87375df86f7a38c740aa6a6b7fca96b141938a521b42c79a1da70d4ffc59c060e239 WHIRLPOOL c76e9cc7405c2112045601e5ff0897f55a540e13232af7d8634c57e808b6dd956b104e767861c35fd2847d8c7c70b803021b7e565cd8dbb3e4ced4c87203101a -DIST unionfs-fuse-0.24.tar.bz2 30381 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd WHIRLPOOL dc132086d9614895961dc8b498c435145b4390fc80331e0575ee8420faea0201325ab2394b9090d8f721c602ef1f93e150573b1b88b77ee4f7be4a262103b986 -DIST unionfs-fuse-0.25.tar.bz2 30674 SHA256 a33f0a8c4ec35108f173a7a96463222534c21b3a50c167a7c868fc5723347e8f -DIST unionfs-fuse-0.26.tar.xz 38600 SHA256 8d5c9dcb51ecb9a9b03890e16d17e37d602b0c1f23ed6a9ddec2b0f719c9f662 SHA512 07805a2ca90354ed0f8feac3ab0005cc4bba64200172e019f00eb50786776c94a6f976a7c383b17b30373e628838ef94cced510d475d557cafb1a2b309d058f0 WHIRLPOOL e4db99e1eae6ae3bfccaf047411b71642b28a1aeaa5ce922934536fac5034e5941ea6e29299908aa54600b699c1ebc7da6b3601f5acab395b0b08d53a29bd09f -EBUILD unionfs-fuse-0.24.ebuild 664 SHA256 02faccbdd247bce0f8c2aea70e0d1ccb01b811f295e334db61d77ad4750d2a80 SHA512 058f25779c546745d12763af4eba5b7beded390ab0d667ad54d4384bc10113a9edf4d73052591d7cdf134bed0d18ebca379981b87f44c40d8db6320f01fa265e WHIRLPOOL 3d666e38fcc0472095697589d29925e7237a9a2ce2a3f2ce23aea560934113daf2e7e5cc4a679c11ca03feb737263f9300130700f3c0f42b889cd72dbe708549 -EBUILD unionfs-fuse-0.25.ebuild 664 SHA256 5832fe234bbdbad6103bed7fd85a2dd0eaf754c86eea1bf88a2049ca4382d411 SHA512 494358b2950ac49c073e52acd59d5ffaa32f56b2f0caef1dd4b850770bf288e8ba6c47a049e2208166a460556ca22c1b6ea149624308ae205878bdd6c373a2dc WHIRLPOOL b563f03557f5ab0254a2d86758d93a277c99a365f0659c7c727c1c9368d30e5ceb2d7e5ad5b65e6f2b5e25a2203c9571fe8bd6acf58a3c3ca1b510f3d051547d -EBUILD unionfs-fuse-0.26.ebuild 820 SHA256 0748197a4617b5cb9f4ab5bd8956ee0e89b5f5ec88a4e09c912cef61a835a885 SHA512 64f22115bea5cce4fbca118cd5e2018e521d14ad6cd1dd857824292d6bbb5efe8779efee5e7f6d13db8e7f75c6191f426d3c748410403afd8f92eb2230b094e5 WHIRLPOOL 461246718cc9a31a4eabd148aa25b547985548756960db4b0d978f4998e65e0f0ba32a2524dbdb82c84f10281c6800aab0cd1ca00bc0bbd696e2e23d0937c263 -MISC ChangeLog 1590 SHA256 847c3677223623a84c555653e860d7c8139009c077a7a371a7fac25c38e8f400 SHA512 0697cf3d3fc801b47ace4bed834b57b63fd89b47d1469cf648cb1eeba9eb80be436f090c185f822ae68bd8d2585d0a13ca84736d79763817e0bc5ccfa8652bcb WHIRLPOOL 6faf77f5bb637b3c5983fc619540f5c9718c7699dce54fac6a73a3c124f79b2fc31fa71bea5d60672ef95d6b044b1de66e2c5a2d7fb049e169a4d8cae2b1e589 -MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364 diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.23-makefile.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.23-makefile.patch deleted file mode 100644 index 6f80808..0000000 --- a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.23-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile_BACKUP 2010-01-12 01:26:33.000000000 +0100 -+++ Makefile 2010-01-12 01:26:58.000000000 +0100 -@@ -7,10 +7,10 @@ - LIB = -lfuse -lpthread -lm - - build: -- make -C src/ -+ $(MAKE) -C src/ - - clean: -- make -C src/ clean -+ $(MAKE) -C src/ clean - - install: build - cp src/unionfs $(DESTDIR)/sbin/ diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch deleted file mode 100644 index e436f9f..0000000 --- a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- unionfs-fuse-0.26/src/unionfs.c 2012-09-22 22:24:05.090568485 +0200 -+++ unionfs-fuse-0.26/src/unionfs.c 2012-09-22 22:24:09.036519156 +0200 -@@ -13,6 +13,9 @@ - #ifdef linux - // For pread()/pwrite()/utimensat() - #define _XOPEN_SOURCE 700 -+ -+ // For chroot -+ #define _BSD_SOURCE - #endif - - #include <fuse.h> diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch deleted file mode 100644 index 9bed29f..0000000 --- a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile 2012-09-22 22:14:36.484677038 +0200 -+++ src/Makefile 2012-09-22 22:14:40.162631059 +0200 -@@ -5,7 +5,7 @@ - - LDFLAGS += - --LIB = $(shell pkg-config --libs fuse) -+LIB = $(shell pkg-config --libs fuse) -lpthread - - HASHTABLE_OBJ = hashtable.o hashtable_itr.o - UNIONFS_OBJ = unionfs.o stats.o opts.o debug.o findbranch.o readdir.o \ diff --git a/sys-fs/unionfs-fuse/metadata.xml b/sys-fs/unionfs-fuse/metadata.xml deleted file mode 100644 index 16bcc9f..0000000 --- a/sys-fs/unionfs-fuse/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> - <email>sping@gentoo.org</email> - <name>Sebastian Pipping</name> - </maintainer> -</pkgmetadata> diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild deleted file mode 100644 index 5cce212..0000000 --- a/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.24.ebuild,v 1.1 2010/05/21 16:54:29 sping Exp $ - -EAPI="2" - -DESCRIPTION="Self-syncing tree-merging file system based on FUSE" - -HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse" -SRC_URI="http://podgorny.cz/unionfs-fuse/releases/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-fs/fuse" -RDEPEND="${DEPEND}" - -src_install() { - dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed" - emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed" -} diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild deleted file mode 100644 index f6bfdbc..0000000 --- a/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.25.ebuild,v 1.1 2012/02/04 01:15:07 sping Exp $ - -EAPI="2" - -DESCRIPTION="Self-syncing tree-merging file system based on FUSE" - -HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse" -SRC_URI="http://podgorny.cz/unionfs-fuse/releases/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="sys-fs/fuse" -RDEPEND="${DEPEND}" - -src_install() { - dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed" - emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed" -} diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild deleted file mode 100644 index 011f16e..0000000 --- a/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild,v 1.4 2013/02/21 03:59:06 zmedico Exp $ - -EAPI="3" - -inherit eutils - -DESCRIPTION="Self-syncing tree-merging file system based on FUSE" - -HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse" -SRC_URI="http://podgorny.cz/unionfs-fuse/releases/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~x86-linux" -IUSE="" - -DEPEND="sys-fs/fuse" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-link-pthread.patch - epatch "${FILESDIR}"/${P}-declare-chroot.patch -} - -src_install() { - dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed" - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed" -} diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest deleted file mode 100644 index f319be2..0000000 --- a/sys-kernel/linux-headers/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX linux-2.6.28.10-unifdef-getline.patch 1770 SHA256 5a3c4f030e401dc344dee977e3afa7c19d325520b1e0111d2cba6b992d0e764b SHA512 034a8d8296697385a021ddc6d7c7faf465cda49dad9da62ab7121ecd44948de7354bb196a1fc50f7c53a1ed3df40fe2c0759d94660c392590813bcf81de4b46d WHIRLPOOL e5fb904958bea5c8dd0c2fd3b52956ee7d5fde9369c658ef936b7642849677a9bf7492e095175ddc160e59a5040f70abb00d8ae2c99bf1adabf99175ff5e0087 -DIST gentoo-headers-2.6.19.2-4.tar.bz2 8552 SHA256 62f3c00a384551e4bcdb0795dc512780e631aa2df3e9bd284a16ab95a7afac78 SHA512 f22eaed6237f1ab1cecffe516c5e042623c79e1d536b0ed897ccf50893de26a20c8f3f56102ed3e7c3864ca730974785e6dbf1050c7802ed2a4daff251acae7e WHIRLPOOL 41daf208c274b6da8dab42d77c16a72302e9ddfaad648db02ccdafcd43a5be4afe03e2983b9371e6c5d564c3aa2a5e10ff7ec55a5d88cf8dab059186f2a19137 -DIST gentoo-headers-base-2.6.19.2.tar.bz2 4324444 SHA256 c9e33b13e061fb063117ae6c690e90e4d0975d6c649dc214542bd78c31e2088e SHA512 72928ab8633dc2ef685faaa47ace246d2f59c411afcd723912cd6f0599c4fae7cbe86a1dfdf1119c053f79a4c90fc82d113b2a4d0e1b0b1150b7747994c2dd8d WHIRLPOOL ed0e957122b26a6a78f5c71f51a843869bfed20296d43c96f46bf0d07e7e8a91404aadff2bb93f80dc9baf5eeddfba714928eb6a8f1b18a4f926a65cd5716bbb -DIST linux-2.6.26.tar.xz 40704768 SHA256 c6f94b0c35c5e6e6a4fe031f9279661816e84e77f072c356867926e3dd354a81 SHA512 068356c1414de9228e8a677bf2d22fcab4f31408ff2e7ff0a53eca4ff3a47536570766a594cf6ed96ce1d1e78faae56ae0ef0909928ba3738657b3598358bc69 WHIRLPOOL b5c10fcda4c322140f7cafa4950416171111356595b1ae34e71d86b272dfd2f19e3e06c991872f1c7688a9da243fe5ff373ade1611ed9bffe146a63fee05f1f6 -EBUILD linux-headers-2.6.19.2-r2.ebuild 967 SHA256 8bff5751010778da8f2d559e0c21cea334cdd41f3344e790f424c00c961fcbe3 SHA512 2ab8cd98cc87acd5dab91abf3849675682736ac3f19a7b04443dd7075963318af38f692e9768b9600a822ddaaf964ae59651cc7628a55f14042b34b5580b1d23 WHIRLPOOL 647bb2450bb5f93fe0c32db2942d9e20503fa1766055cbe9710edcca064165dbf3cf27c3ab108697aaf8c60f1251b0d10d5f0c488733a4054514fc6bcfecf9af -EBUILD linux-headers-2.6.26.ebuild 466 SHA256 77c1b6654fd45757720e81d77040c794b2f85460528355a023f18149c2cf70bf SHA512 cc4ee96ce604f587a13b23a37065af7b06b1d30511eb7ce0f875b049eda01bae0e8f3e0f1b809205655adf2e2be81a051d54bdb09ebe0be721779a7734554c20 WHIRLPOOL 4b85b3addb866e301e9670bfc8dc498ffe5388f31de19e34109b81adb9afa799b4cb1593fd1037f41fc2cc3d1635c9760d5d526c2585f4c52a1743eb13dda8b3 diff --git a/sys-kernel/linux-headers/files/linux-2.6.28.10-unifdef-getline.patch b/sys-kernel/linux-headers/files/linux-2.6.28.10-unifdef-getline.patch deleted file mode 100644 index f4a4820..0000000 --- a/sys-kernel/linux-headers/files/linux-2.6.28.10-unifdef-getline.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d15bd1067b1fcb2b7250d22bc0c7c7fea0b759f7 Mon Sep 17 00:00:00 2001 -From: Justin P. Mattock <justinmattock@gmail.com> -Date: Sat, 7 Mar 2009 13:31:29 +0100 -Subject: [PATCH] kbuild: fix C libary confusion in unifdef.c due to getline() - -This fixes an error when compiling the kernel. - - CHK include/linux/version.h - HOSTCC scripts/unifdef -scripts/unifdef.c:209: error: conflicting types for 'getline' -/usr/include/stdio.h:651: note: previous declaration of 'getline' was here -make[1]: *** [scripts/unifdef] Error 1 -make: *** [__headers] Error 2 - -Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> -Cc: Frederic Weisbecker <fweisbec@gmail.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Sam Ravnborg <sam@ravnborg.org> ---- - scripts/unifdef.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/unifdef.c b/scripts/unifdef.c -index 552025e..05a31a6 100644 ---- a/scripts/unifdef.c -+++ b/scripts/unifdef.c -@@ -206,7 +206,7 @@ static void done(void); - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ process(void) - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ process(void) - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; --- -1.6.3.3 - diff --git a/sys-kernel/linux-headers/linux-headers-2.6.19.2-r2.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.19.2-r2.ebuild deleted file mode 100644 index be74e46..0000000 --- a/sys-kernel/linux-headers/linux-headers-2.6.19.2-r2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/Attic/linux-headers-2.6.19.2-r2.ebuild,v 1.7 2007/12/31 05:53:04 vapier dead $ - -ETYPE="headers" -H_SUPPORTEDARCH="alpha amd64 arm cris hppa m68k mips ia64 ppc ppc64 s390 sh sparc x86" -inherit kernel-2 -detect_version - -PATCH_VER="4" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.bz2" -[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.bz2" - -KEYWORDS="-* -alpha ~amd64 arm ~hppa ~ia64 m68k mips ~ppc ~ppc64 s390 sh sparc ~x86" - -DEPEND="dev-util/unifdef" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/linux-2.6.28.10-unifdef-getline.patch" - [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} -} - -src_test() { - make ARCH=$(tc-arch-kernel) headers_check || die -} diff --git a/sys-kernel/linux-headers/linux-headers-2.6.26.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.26.ebuild deleted file mode 100644 index 768bdca..0000000 --- a/sys-kernel/linux-headers/linux-headers-2.6.26.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/Attic/linux-headers-2.6.18.ebuild,v 1.1 2006/10/08 20:02:13 vapier Exp $ - -EAPI=5 -ETYPE="headers" -H_SUPPORTEDARCH="alpha amd64 arm hppa m68k ia64 ppc ppc64 s390 sh sparc x86" -inherit eutils multilib kernel-2 -detect_version - -SRC_URI="${KERNEL_URI}" -KEYWORDS="-*" - -DEPEND="dev-util/unifdef" -RDEPEND="" diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest deleted file mode 100644 index 0bcda41..0000000 --- a/sys-libs/glibc/Manifest +++ /dev/null @@ -1,71 +0,0 @@ -AUX 2.10/glibc-2.10-gentoo-chk_fail.c 9407 SHA256 7745c0f5d37b37959b43b41e39762fc35b877161bc5740d9d3e9a83021acbc0e SHA512 d1c51c573353b3b8ae6ab1bcc8c10eda5cad8b98fc7ab4848e4fbd8a8736174f3c3fd1b72dd80c72b1e54be78f1cae4dc1ab8130df25aa6d1495e5cbbaf3b9f6 WHIRLPOOL 32028ddeb422d89c0523fec994413e67c6afd9fcfdaf147d3d6a28bd02f8feabda9571ced4509253b7061a95bb2c16cecf94a4274671b33909ff545b1787f101 -AUX 2.10/glibc-2.10-hardened-configure-picdefault.patch 865 SHA256 b50b29f85d88011555bbcbe6046e6600be9344f2d78412b14aebdea515420774 SHA512 e0a09f77b209a72ab577fe1e62126609fdddedf3fba0eec749c4b506cdf793779b48390f055a3594892120f694291f8340c0b6f51862e94c03fd516897138be7 WHIRLPOOL d1b8e1536696350e0ed9eaf9a923daa7c004ef40ae94c1c3ba3d6cb293f1c19364cefbe8491089061124cbe26a9fded9f3d38d89f1bda56d408162e53702e8d4 -AUX 2.10/glibc-2.10-hardened-inittls-nosysenter.patch 8823 SHA256 dcf78c6524c222dbee907200a8878aff727e29d43a4962b977a16d85752e5c10 SHA512 0605b7964af87d1d6bdccea5c4d1bfe6267d4401b8bbf0c8bb689663e6bb3ef92eebad8be6c23ffdf6632a4d5e6098d8a403c3e84ffb21b5e87b5b1d1ec3512d WHIRLPOOL 635261b547883bbfbe23c802fcf97916dee823b367f96732ccecd7506dff004b87f2d36d97ed398510711330f3a53f039a14e226d20a681cc201a8c7a3450833 -AUX 2.10/glibc-2.10-hardened-ssp-compat.patch 4802 SHA256 bd6f0aa8eace0a935731749e101d5fe30210f9edb65f2f5ccd425cef581ddce4 SHA512 16fc6cbf366c3a0f476f28da8d4e465b1d894f68d33ebdb02de60d6b22bdc6341915d8529952fa4213b11c377302f18a63c462898fe0e4b13f5ec9e3ceda96c7 WHIRLPOOL 059e84269286b285261cc57846b34462524661fef3582396a6b301ee2dd156d2511c88f17f52679e4d5fd96ae0ed6673c8b75a32048e40efa87fad34da6cc066 -AUX 2.11/glibc-2.11-hardened-pie.patch 1492 SHA256 74277f76ace9cb6b408ef7c1d43a3604ae0d6c1af539055aeaeb542d2bfa2a46 SHA512 31ad12fdafc20f783bde32fa3cb477e18d19c5436309b0023284c3134f99c849b0281ea7815ae7509b96f1a88e9c24d52805044cd1c65a88a1a62eebc519a0e5 WHIRLPOOL cf3fe8c5e164623bf553487cf589f85eff28d1073e55a87ef14da716ce313bfaec0dadbf322f2e705c1d4f975458d9cbd6f2eca268a9dc5dce16e54305907aa7 -AUX 2.12/glibc-2.12-hardened-pie.patch 1542 SHA256 9d11da52900a4cfdaa9052476029cb1b4c8004dfaef3cf446f3b728035f75fbe SHA512 97abb62a72d95b07f546658846718755ed78286b11cb72b2cf6ebc809afb1e775ca860e3903f9936ee54761b6d6bb309e822957387900454dd3c66be35ba8148 WHIRLPOOL 4b9b95d1c6c6e02ba21ec43f382a1d932ed8be5ff548a828c3e9a1d945c44cb8435fd502f6c8becf6a2c19bd23c77ad003598b3b3b68b7bad5a5af79e92d6077 -AUX 2.15/glibc-2.15-localstatedir-backport.patch 412 SHA256 465bedaaf735a48825cd6433007abfb1e40c2ef8ddf94d12d452b486c70ce36b SHA512 76506a540d47ad7e76073c3b25bc46278a9e56e34e17d49caf9fffc0622646e8e0d6905fe7d00599db02f444420ed0b9d64d3d70df78446564b137fd65021e45 WHIRLPOOL f21fb6d6eb3555421f7d90b179a7a2745e7056316eacbf209066f01e742037fd283689c5a5f5a313666a2fb79d5ad0631dbada94d9c7eb958ee01217b605533a -AUX 2.16/glibc-2.16-hardened-pie.patch 1570 SHA256 9a8d8a8268605251782b1fba509cda090f39f56edc8a5497c7b4acfc428041f7 SHA512 1dff16b1ce4ba6246336d19fac21ea6e8d5710e138a23603fa6b79896d895834b6d28bb1948c83648120ca1d038805db7dd7138ba3e28e9071254d6320cdc092 WHIRLPOOL f96487ac4bd95a99e9e70204c686c3f19bb8238cfd4a9856b031be58ac23927886f228a8b4add14213e0489a204c51ebbeb8a376311305025116b8ae45fc90c2 -AUX 2.17/glibc-2.17-hardened-pie.patch 1784 SHA256 bba32e40c73aef20122b2825f31e5c3aa058b61feae4f32f336e1941f83f82d1 SHA512 9ecfe2b6c8c982a42786181d6507d5fa588a6868109065451f58a779848837bd5e69c32a24e43a186c2ff63a9784015c51487e342c87982ac074139e36c169fc WHIRLPOOL 1baffbef9e6d870ea2f2ae5be014b71020a213a1a11e9856fa207545867de444ed164cb926b2aac23471854eaaf72a87e38760702b32bfcfa639add8733d925e -AUX 2.17/glibc-2.17-runtime-prefix.patch 6695 SHA256 466198a1e2f92957017d3e550b806196de40a6cbf780320b3b11ac72459c19d8 SHA512 9adf787c8516ec86609bb2c1975d2d05c679199200732c141f4c8ae2724bc1b92a3981995f814542d2fed44662d7ccf560b0e9d904e27d68eafcfe3f55787a43 WHIRLPOOL 3bc2aab75168ad3a8b4b273577c3f0e71396a631f151974433187ecb3c73b0adc2ad15e9fd17334b9cb1332035c98937d302a03bc1afb3f66ff1d36d347d21f4 -AUX 2.17/glibc-2.17-shadow-prefix.patch 950 SHA256 36fa45e0e2642c6ce8809341b69e93d45d97d3b6c451a089198f7b90a5d0eb21 SHA512 3101b9814bcbd0443d309f3949024e753cb6101e84e9cbbae1502fb4c3f85c2fad041608ba69c966cb1da2cf64f5f2c0931c08db222933a2053394f7b0fabf9d WHIRLPOOL 5243b70d2d2e2d3c3c9b07eb2251bb5e78767e776c0491f91fc8499c3d807b44bdab384f7c81867373a577574999079791695eb65ed8c2da1ce5a79c8e60a5ef -AUX 2.17/locale-gen_prefix.patch 2704 SHA256 0807c8979b7a1a63b48d155417ff8ecc7e14773e928a0d1fe6c349a36fcdadef SHA512 d6b41b953713f7fe0ba14af6d045fc0e6b649f278da691ca5f021d95be5cdabfc87de399880cf988fec2b189fac22864d004ec8d159e59a2348b41945de1d5db WHIRLPOOL 3c7d6b4e789ae494cebea620ed64a6ba8dd401837914f4ead72c7b2d6af94538c9a28f65781db7e6ae0d21c7fac13c531b71147fdb5456ffd39ae1246b331069 -AUX 2.17/vdso-disable.patch 1136 SHA256 49006855c1ba3ae3d3aa5ed71787056dc64e993eec70a4bef05bcc9f4d824014 SHA512 6eeb6eae8b8c1777ebd18170a7651b9e95297125cfc3829786c4d02887cad4a5d768fc2950723d1d040d16d15d72491d7443a3c14ca9f20eb2adb1ba6d1649ca WHIRLPOOL 80367da491b958d0b7855d23d3225a5c17a3a7a1b1f9a54ebc093c53823a5ef1642b974b45e079aec0abff0476494368ed9afcaed83b87576ed8458b8348e41e -AUX 2.17/vdso.patch 697 SHA256 26f2089344709de9c1bdd2f974d02ff5d4c465f6ebebd5d1ac2cd72b732de201 SHA512 a303a6828ed001b16f2f5c3532890cff66a50259c2e2aa2843e992f2bed5e6141abc9e120afed25f2e1f30d77bc218c3940d680c3d73c227d2056370d5e6b806 WHIRLPOOL edcaa815b8f86e17d77f0582453a717fbbd848400bfdbd302730fec20a952a584ea8f5ba4f7175b25d84752bc895519d7baa55664073cae5037962b0c1825aa3 -AUX 2.19/glibc-2.19-configurable-paths.patch 81250 SHA256 ae15864d46cb4d5e061465249c9a9c4585961a312d61d6e9edbf8dd8a5dc8a22 SHA512 e9b4c4d48560fc4af41505996b40f3dd0023ba86a71182d965a5c0978f1ed6236311da5b990199e2916b9fc091ce374b2d346b03c133f2d8fcf7e6f07616a3fd WHIRLPOOL 67cf918f3f26b74cf34108806195465dbfe0a51b3c97a7ed19e398c093980dbb0bf5b9102f351cdd95acad58cb3b7c947a50efd593c6a161212afe2f4a9f8ac0 -AUX 2.19/glibc-2.19-hardened-configure-picdefault.patch 865 SHA256 feeb2ddc276e90f55d2fd358837e8d4922d3b2875cb8080b1d8e27e5da83a2d9 SHA512 d8e6fea72e240f1fde8a487958463140a84e8bd6bb5b176f8ce84a34df3137943db9016300884f3efdd4da130e342448e57ed0c0dc6eb2956d647286ce1d00ce WHIRLPOOL 3a5d2882b5fc1bea78c45409c848c94a260659e3ea1e28a5dc8818de8825e55453aa1cc97b86eef99c91b17bde9f2a6db1fd8ae03839f7029d93a71feaa4d4d0 -AUX 2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch 1360 SHA256 f0d8bb004f598375b61e67e1c215b15953c293038243207f2d85cbe9f10d093e SHA512 79876b12871b3e7693340bfdf99276ac0dfd6ff30bc977a9526af9e681fcbab2f25d3ac9e2b33f027c968b38a4b670237de54ffd08edc418423ecd82dddd1d67 WHIRLPOOL 5ca64dddf58a790cc5f6090ae48fc4bd4799a9aac4c67f6ef7d1fea9498208ffc38ee8167b6ec80dc97c4f723fcdfade8f573893f1b380aff04f6d0476d0d253 -AUX 2.19/glibc-2.19-vdso-disable.patch 1120 SHA256 20048700be532bd1b692471420f930951cc0be2d2c9eb2a95e895e9771a0e13c SHA512 8f52408e5acd96708e5376b3aee77d4851dbe98a7f4b2d2503d3ce5c0088bc93640023659d9e49c8c802ab33ad9f987630667bd5094e4b4aab2c48bb1183a84e WHIRLPOOL 67b6bc23ef1a90886f8860396d52b9004764f3ebefd1d48736c734db419d47402c01c9b746a16147a84b77b8510d243c63d76048c8b2a46daed8aa0acac73fe4 -AUX 2.20/glibc-2.20-configurable-paths.patch 116486 SHA256 d7fe27619225d6e2941e52bc3dd049bfffbed2cf633329ad4ae9a76150ce5f1a SHA512 e2998c66d7c84e6da8f9f24e3b710c8c62f0042a65c7af6f0a2f9cf303724d732aec753e6002ed265c95947f72534de6da9fb0681328c5f8cebbb8c8a60ac61a WHIRLPOOL 50e5984c09e76dd5ebd9172c2e560dc2ff721af23a9be0d1c24fc289af20a5a4e0bf278ec4ef878151bf1cde4d51f42d536aeefdde1f5c206d7942630c8f93a2 -AUX 2.20/glibc-2.20-gentoo-chk_fail.c 8978 SHA256 f9cc426b0fb21de1dc11bb36e43bca8e1b3114fe78f8b343f672a951a82c742e SHA512 5cb529ac9d18a315f25fd48a3a80a529924bee0588074c97e6df7dbe8568a67f786363c41da6300ea55818369e3609ed4315b2e2104f8a8b4f1266ba43076eda WHIRLPOOL 2d38c19a20226fc4687037b8bb19025065f039ddaa62466879ca98765c8899e64b147dd148565304419ed1a98fbe1f8403710b22c930b08a19bddba7e79b0f1d -AUX 2.20/glibc-2.20-gentoo-stack_chk_fail.c 55 SHA256 ec73e74297b5eade591bfb3a2999989e2a7aa80752140048ffa67349635f05e7 SHA512 4dfec1bd17007b826110dcb73d09331a58b7a892c87de55b94480b14c28686442c567725b610082813411cf9911e180835a400a54ea704fe80f81cfba966a989 WHIRLPOOL b2b338a50f7895c530a71a19e4582bd0116a0b9d13b2e1505f0566924557493849f93cefb2c0ad1719ef684321e145129e0f72cfc9aa85a44ea7ebf910e7304c -AUX 2.20/glibc-2.20-hardened-inittls-nosysenter.patch 9951 SHA256 992fb70b9b62674d94ef8938297a3f2591b3121495987d927f5a44c1d8788658 SHA512 a8302ee2963bd791be859233223b17cd154afbf04c13c046956bb1140d748272d7bcb3a6167ce8b61573ebcffe906dff064308374d2910656b8fad18480fe422 WHIRLPOOL b8753d6f1301650b91b5cf4f342de22010d819deb2bf4da27aac33d7540e15a140b8a7a4c5e111faba320873ed5784b22f6add29181fbaef14c3e9504b1b838f -AUX 2.20/glibc-2.20-vdso-disable.patch 725 SHA256 476d1198e990a0beb42a7350c52c34783de33d0364ab3e11d9b74a81e027977b SHA512 2c47efc06aa93eea18e6d407c2b1cfdaa80b374bdaf7ad257ca02857aab53d7a6ec46092872d3affff2ec800f6937012571115b8c83d116084c21f8130c4fdd6 WHIRLPOOL fb919be2a23f5a240817dc8540582915cb0e0497196237a7bcd891113738b81072e96f4af4668d0ebd05094c2983c411265267bbcfc2be96c5ff33f37fe7f936 -AUX 2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329 SHA256 b5cf51d1ff5479d09fbc82992f126ca4969006c90c3a2ae94ad586d4902d791b SHA512 939ec7da977837ef46aa8894f99ac06b3fccfc36dd672889b85ae8cbbfc9a963c5d0c031d776aa2feee29ddf8341b4cc7a50ea19b7c6f7e80df74eef5f1fd977 WHIRLPOOL 47d248ddba815a517aed9b7dbfa247bdedf293cb5adad8079be803ea4a682136f01b47fd3817a1696b3758c4631d1a25376bf58ef039998ace4a6b65807fe75e -AUX 2.5/glibc-2.5-gentoo-stack_chk_fail.c 9058 SHA256 067fba2a36d2630d50198c44395ef208cdf080508f1b716bd3d079f7b964e2df SHA512 2d404bec1e009d111b775fde620102b3d0ea7614d07ba31350940f2693e937e825acc43d1ab94bad2eecac61d47c696098327096dff8f08b4b7312d0873d71a6 WHIRLPOOL bb27ef90afb256d3822787b93574d4f4f5632995663e08b7201db17a4f38f6e2a8fd6368aaf699a808cd8f7acc346625b5607dcbf1e88f8b28dcc6d3dba92399 -AUX 2.5/glibc-2.5-hardened-configure-picdefault.patch 794 SHA256 0c0359f567e4ad2d3184618bf6ac7e6102b703eab6227c7e9a4ff4dcdeed2c91 SHA512 99caace6c3528db400f8039c3f5aa65a2d5088d9758894c8a49df2b5045226a4056972de2d162411617162edd9023b6c6f80d85509638b5d68a8d0cda40adafe WHIRLPOOL 1271cea2155149e789f1242759e516443c5cf152ae9612d91d2a25a727952684eb043fbcfb38186a31fc6a1568201de5ef40af45436b137453e0582f2f6facde -AUX 2.5/glibc-2.5-hardened-inittls-nosysenter.patch 9407 SHA256 2a912e82445815ae32744d990c59d8758ec74e482b856bd274c292848b9af1fd SHA512 6acdfad1c2395a8097500216df3aab7a96211e418b56eb07ad317c25049c30c4bd9538905f186eb6d5b9260d98423bf525ec005a283e385ba4a83e7425080b10 WHIRLPOOL a542db44162d1322b23c574e20f59c8df7a5c17ca26560a22f73da832ff1743c7f56915a7e43d5d13a6068b3b975521f6b33940309496ae62fa952cfc2cd23dd -AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 ff9cde8857c5da89faa4039e2a81748674fbeaaa49d85c378d80711d55f2b0c1 SHA512 bd026dba9df97d5a2a66c92feb8e004fcbaf69aaff489688990f9c0716e31d35654e2ad2b4f6ee8ea02259567f28a7d389cc5d43f0a77122c3f65a61fb4db112 WHIRLPOOL 888ca7bd8d4fe89961ee582bf96c141962b6702a92af663c7cb86d245f471f55b0817232744a7218dbf9d0f9eae9a8cc6a52843257c9353eef1332cf5c368e2e -AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f -AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2 WHIRLPOOL 9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057 -AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43 -AUX eblits/common.eblit 10934 SHA256 5e12fe093156b639b308212562a92cd68a7778272efdec9c2dbcf3c6f94406fc SHA512 d8bf175a3f88dd93bf338af9ca2edda88ba0e3b0be43f5110865da58911092c7920ffa210d82b579e402bfe29545c3376a6257ede04dc5ef27dee2318a7d452f WHIRLPOOL e7e97534c857f56c5a7821372d1209f757b89981ba6e2386aedb42acb60afd72e0f27181a5246eaf94716808551f14933c11d57b54c3308a3bbdb20c7316e346 -AUX eblits/pkg_postinst.eblit 971 SHA256 abcb925bb0730d1eae22bbcee7a4ba6523280390f410f38bfdf9eb44e0280000 SHA512 65e577c77a9a488c5e93ccd4afa325ab7e3904df594c13fda17136c8aa2748fa4e6d0102f4799b4ac9b8c3bea9920faadc4db356ece9929ee708bbfa9151dfc2 WHIRLPOOL fb3cdfb702b0ce616064f94321b9225a53b300f76d95495098b6c97eb3ab1650ea2d323eae169bb8d1fd8795134aacb5c54ba6927fe743b01f124aec416b15a0 -AUX eblits/pkg_preinst.eblit 2105 SHA256 aba79a4369067615bc48429ec371ae91ccfc793ddc72cc05862b705cf63c303f SHA512 993ac0b94bae95819bf11f2ba88820bdabdc41c4c63ed25f00adb16e9e965d4206b68d316faf329ab3870a3e810183662e12e554a0150829ed026567bf9829da WHIRLPOOL 01c511f6995fc5b8cd9bf564298ab6bf6609e660fce26dff23c36081ccb72b28fdd3ba0787384c11fd126a7db0f1a0744e9396c6225b0881b9d02ee52d6eaa42 -AUX eblits/pkg_pretend.eblit 4990 SHA256 219947e495090b640ec6229b028299edc3f06ee81a130211cf91803923ccf477 SHA512 cb27a05b798ec892576239d6146403f2430c9568faad410f42933610c83c60317bcd79198be4ff9b6c08f9e13b3e0ea897a9ddb8613ccc75975fa227e3c9e26d WHIRLPOOL 613f1920a3d8f51fc6274f73d72cc2be1f3df8b5f2d5af173d050142cbea8b52da4eabe50ba28192af2f2a62c259d512d466b33b303a16648cc82e6422904ba7 -AUX eblits/pkg_setup.eblit 275 SHA256 c5de97dc69d3508555ac579e14ead694a75edf4707c1749219677ebee88ca9ab SHA512 627740976e372842b09034b79f61f5cb5d8283f47c94cfe66b2aa1517c901df0bf3b456f1ba26a9ddc0aa0215190d0415ed4f881cc950d163d8203a0e6bba2a9 WHIRLPOOL 16ef3155b35671311443f4c231c1867d12731035aa603dedb6e86eabdc1501c67183474a26bb06048e12c19ac3bda054fdb8a107792a3dddb743b6dc7d447339 -AUX eblits/src_compile.eblit 598 SHA256 3b90a6f44d307b92cee36fdd91d412bdb9fcbab555e6c6bf8174c8e3f29137ca SHA512 ee216aa3bb13f75313d141459acb47523442addf12a6bb8d829ca40eda4f63324911a13ff0ae90fe6eed1fbe0058c89308a2205c5357a0e1897a89573fea2f51 WHIRLPOOL 3bfc5406e794ee9ee4005e97aa2d40a82d77de090c72767d6b43be6993048536b4f2442bf6864157d036e7ea3fce6ba6537a97cd2afee04c61f9e98e1adc3c00 -AUX eblits/src_configure.eblit 7909 SHA256 5947f6fe819d936e0e32484a6d3f49ad7aac5e5c89333251c5659fe998c6a083 SHA512 63ef84d95c47d5881db383c4c90be03434e1c1a87db673f562ead7e6edbf694a428cdc0cf69d312159797f70fc5ac74584d7a7087b314d92dc21e452d1d66477 WHIRLPOOL e5aa3b11ac35b05ea52b077ffe16f8c5fa144a5c70dcf086569a7b6bf2daf171d552dc4a72fee65b892297af1796e80247512e17c313c4c56b6f4b7351fe8ef3 -AUX eblits/src_install.eblit 7814 SHA256 8d64a4a031263dd7c3e7ba710a5dbe51fa7004b9795fefdab55f7db273f5e89f SHA512 fb9fc62103e1803509f5910b71eb28398258433762b930c93cccb7578756599739714c41077a2d0fd81c78e8fd14fd30b384a2c141d8df801507414531062551 WHIRLPOOL 4634ef7da02f35d461027a4d5bd27bd4e888805de0713b577ac47eb1161048f929e1c52e38fc4ad8da333a2198877b82962416edfb30bbaafb9055fb658a6226 -AUX eblits/src_prepare.eblit 2231 SHA256 02e28094bb57137d0f12031dc3ed75d022df711847904f428ffea2e0bc42b778 SHA512 967e831a0390c2fb328cb69a75489f3ecddf2a3aecd3d8b95e8ef36fdced3b0b15a320245cd1274e5bf78bc49a17a862fe4af26f610c3f864418c707e7d6150a WHIRLPOOL 4855e3979903daa6b4586d5bed08a1f7806c03b9873f4b51a0b6b73254bb40eb08cb0e6329992f663f98907e8d82f485ee7f49ee4f82fd52dbfe880f8dd1fe70 -AUX eblits/src_test.eblit 698 SHA256 96b044ef9a27c2591b2a440b45bd89989022d0b41c546ce4dcea58a631315bf4 SHA512 0a46dddf53ccbfaab3f85ba7d2e8f202b4d5be98052601686592eca0ec115de29d8cb1f324ba12dcb77f3a8d4bbb39032532042b8adf809a772ebcc845b1a152 WHIRLPOOL 42af8b97859789b52a5a0c100ba109d8c3dd47532ef3f0b764c95b7a61be9d293d99de25e601dacd840c0a4cc921740b5acc2a3567b5aa3ae8ac6f88430ccf04 -AUX eblits/src_unpack.eblit 3096 SHA256 f0934fe81278797a0625fde2518f5bdf8531c75443ed3dc6ba7d18aa751cb235 SHA512 6fb32f854920ac4c0df5d60d334f4b9376b05d9b2df7d1bfac979acc3d7c282846fcce36c9816558ee75db030c3551b95f2ff26e53ea166adf97a2ae5db55abf WHIRLPOOL cee004cf4967f0b073f56ef5bbc67e56981f109400622f70cfba51ce120115f4c25ee7696a5b9baf7b22080d01d038ea936d5c342d65b7331b3801510a509123 -AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc -AUX nscd.service 337 SHA256 de7bc9946309d34f0ab44aa22a4d3cf259fe91c57e8000d741cb09ecd3a6caa0 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea WHIRLPOOL f01d191971b0dc45f541c9ebaaa1a40f3497e2cc838cff6a20a7b1828d726c248abbd94322a5a5ff30c33ddb7d9086cd4d2ba3bdc1811fed59ff292ef3983a72 -AUX nscd.tmpfilesd 111 SHA256 f0f64c4612d2097173854d2ec2e94ecbf4b77c7a6e94d950874e37346aa90d72 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340 WHIRLPOOL cf1fed1a7e2ac1623a84f1cfa2062645afe3f791da2f4ace3859d12aa05df0e282b4c2e367a460015956ac2a8d01fee4cda84917a3adf2c38561dff200335270 -AUX nsswitch.conf 503 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d SHA512 c13714110f3ccc9a2270f51d0da9293ab19b9df368092d19b1a84d5051d888297bd9439a322eca1ea60d6d5e58952797d803a368a295f2db6d5e97e173907373 WHIRLPOOL 0d37755ba5928ff894c355b3fdcf7079f19c1cb7a4f3676634084da89c74d7175823a4659b8c66d8dc1395d086991857162822ddf977dbe8dff9a59bccab821e -DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 SHA256 34aec5a59bb4d0ecf908c62fd418461d0f3793238296897687305fd7a1f27299 SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269 WHIRLPOOL bbce19e7fe5c30faa55ddd4e29070f0d1fdfca3a04e8d68e0772260fa9be89ccde63ec92badb490209008df5fee6e53dfdeec4ae51857b90ba298a79315a199f -DIST glibc-2.15-patches-13.tar.bz2 154658 SHA256 59c11d8b70bc406f6bc7dd87509f1c5fa05998fb0dde8e1be530064e9dd24a53 SHA512 ceec0506e10cff25ec9acce3d4e3f174d56a7cbb00993cb8edbf532f303c48e3b2d5e965e4470f537dbed23d14a29bae4ac4c834b4c11fcd27d8e66d8500e4c6 WHIRLPOOL 9dadbcd8626df9938b6b215a0618cbc605405bf56bb143f25e029c0aa00d5d6ac75877c7b2fd2a2c22291f62587cf8011c30d32baafb5ed0dd2bb539895f1c54 -DIST glibc-2.15-patches-21.tar.bz2 110297 SHA256 5553c0a37c5c0a3abb303850fa9d2ad309e2f47c3f42806c2f1dd32a48affbfe SHA512 5255ef053a2c30f9cae583133094f41604385b9d6e653a0d6aab1d13d69e6c8cbf16fde712607ab0bac738944a0410ddc050dc231ad4ea7d3584271937b0b059 WHIRLPOOL d70249c6c3c3c0a4d02c3ebbf0309bd6b3da3962231c153c77be38d217e2f57e0eba88614e34f0f219f485ba8f8474586d0059cfc505e44f312396e6a753d441 -DIST glibc-2.15-patches-23.tar.bz2 118999 SHA256 11c38082635822eb7b12d538e3b9c38ee71f6a86be6cebb59f5f2c575be93830 SHA512 ff3792a0029ea24990fe2419579472bd02119ed6a2dab28e85089d232029be5f1c18c643bcb9d577dce78a7c682bb5eee1ed3644f086b5cf19230bcf37ce8a4b WHIRLPOOL 110ddb5989bf1b66a487c9ebae03a3e62ac22b7a28b4c70d142e1c56160bdd50b9f5fa6f4dc4a28cfb28d94281c582fcfc1f60df8ae2ef4e8a946b3b06d2b1b1 -DIST glibc-2.15.tar.xz 10280176 SHA256 321ec482abdc27b03244f7b345ee22dc431bc55daf9c000a4e7b040fbdbecb50 SHA512 fc8bc407cd9edfd79bd286d28c84e0b8224e1f57c1d318e73da098a9693257d78970178fd59f487f0321a079fcb772e8e78473fab52f091b2addb0a48fe8dcf7 WHIRLPOOL 061fc0c9915bd821dc31c2fea8e4f9a75b6c7ec0c935ea713d8c087408a8bf3c600179273438f3d9748fe40b946866b2f160e6da6fee4da51e549a30d0f0ebbc -DIST glibc-2.17-patches-7.tar.bz2 79288 SHA256 8000409d072571d2d5119d4dd538e3a3ea39213407e202ea10033bf6aed516af SHA512 c6de4d7754cec6e7a9e36d56eadc6605ba6fcfac116eb50553503738873659977beb935112d361620c35e7b15e86f845a49fd13269ffbf98c72f54dffade19f7 WHIRLPOOL 259e938e8f4ca6b7296db4982748429f00135f80cd03965da589e4318134aeddb5acdfa0f8f61871e46330a0c96eb8e734a3c2f50d564882ba37f13f722b78c5 -DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23 -DIST glibc-2.19-patches-3.tar.bz2 80664 SHA256 6fb03292e224199e0dd9ba7ee83aca723e1560f26831e85cdc6302b187c6de3c SHA512 d281d6a2757920124cf8a3f02b97e75192598b08d96ae48840df34c7ffdcb212952d171f233e6f12a429b19437d0a296212fe1f2eae164d6a1c6793cb3cb69f0 WHIRLPOOL 6f28a2d0dff42e8ad0e77859938e3093753f77f78821375777eebb2db5568bf1c56e8b8208f02280f23acb2dd26dc8a313fedd5b2c10755f1659e6d324a1dbc3 -DIST glibc-2.19.tar.xz 12083312 SHA256 2d3997f588401ea095a0b27227b1d50cdfdd416236f6567b564549d3b46ea2a2 SHA512 9e021fcb3afbb9ace2a0e37fded231a62de861bd766e29d47163a03182e37add718b7acc3963d1c525f9556773e842297725715acde48dcfbaab6e756af1a23d WHIRLPOOL 9581a3a23ebdd56bc559b56b95b7bcd21ca039546ec19c6c0e4e0738597542164fdb21ab1d1f36d5e73a205fb51f0974c7d497972615bce69ae002298f6475b6 -DIST glibc-2.20-patches-1.tar.bz2 78477 SHA256 b3b1c4022503dc433cc4969534f27ee019ab695aed8b722e914d7fb864db5606 SHA512 56e954f11610fa4f9fffc68bdad98114bed7592f5a4f8bd81a0306ee99311db8cb4dd4469a6f2a5a60ff4a9e6d172e49971d389f1b2911df7a408571737c1ee1 WHIRLPOOL 02aeda854ca220ed3b4fe41510d918a8fc4fb9e95a3761a3884e2d2d3c0a515c82e835d7a74e41dc0a20c865de120b60ea4e561cd3f25534568981c8084dce00 -DIST glibc-2.20-patches-3.tar.bz2 30916 SHA256 c10cc881a1ee587dcaaff234c8e05dcc6a6e4d4bbafcae21e6267616a20bb354 SHA512 cbbfccdf0ba0ad7fb740a557a246b647c020dd841aabd256c34bb8c5f4aac2ee0ed50e5f15ac28a161e294a9a3803560317bcf934cc938daa58111d7373b1b66 WHIRLPOOL 2889809da097e148bae7769316f7a744880fce0c1cd74ef16e45e343c5aa02f549ff6f9e13ac114cb061b914d3517151ab803af5683864ed09ebc72326561e64 -DIST glibc-2.20.tar.xz 12283992 SHA256 f84b6d42aecc288d593c397b0a3d02260a33ee686bce0c634eb9b32798f36ba5 SHA512 7a8eea8b71d3ccba766c3f304cab61055446d451ef063309476b26dc40d880562dc33b1b68fbedeedb4b55b84c26415b9202311aaa71ef8c141b6849a814d2fa WHIRLPOOL 042f74d75c62a655ae35348c9cd0bed0845ab199e37a76635eb74c04ed927b5eca77723c38d2dc46f12fca62c1004001887b43946a914b079ad22f6a9cc8daaa -DIST glibc-2.23-patches-4.tar.bz2 230533 SHA256 5b64a9b30778be79fac8a8c7e2ec7ebb077e136c85d79996ae3d725189d236a4 SHA512 af140a13bbc28070bfec26e041ce562b1cc091d312a82f385becb3ab87ee882d8ea10ac4ec6dcf86f154857527a3383782d46141016047338cebc7c393329cf3 WHIRLPOOL ca7be788c64428bd2bd6e41eee5345ff85dc9ee0987af55f60104a9f03e3019b8fa6a933ba785d3b1b27540c2485160d50499049985271227c07b094db649de3 -DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf WHIRLPOOL 7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71 -DIST glibc-ports-2.15.tar.xz 421820 SHA256 fcc271fcc3a808bf0f3aa1d144bc39b8d0d5f730aed6e206b883961515f0d1b9 SHA512 fc3c80a9a7ede0f35054e5be043fff4b967e6ef6678f42e617dd1dd498920edb4e4c785cf8e3cd97fc2914a35a892e0fd7e1aab24f0c3c8d207765a131bf3744 WHIRLPOOL a8a617eacb326615265832f86a7ef39678364b5b65d5c16d58680ec0debfbca6780018b7da9c1a86bdfffcde58aa1258b96ea4bd50b114901b522e62d48ae4a5 -EBUILD glibc-2.15-r1.ebuild 8143 SHA256 94c831d06eb6cd7c153db3267dfc7811739d90b8761751b384e85360f77e70bd SHA512 53d5b41729a282362d3447a45dd373c098e04cafddc81d7da0304b7ef56a4bf53058c4ea88763db48d3796345131f6b25cc56949770af1a628549d3e2b24af59 WHIRLPOOL 3f76b15a4db14db99afece549cd4c4982f1fbcefac313bbdf10127f10630da9c43f272ec85ee99afafeb3ab9afcf5f2eafd612386e152e3cfa08d360ca639115 -EBUILD glibc-2.15-r2.ebuild 7692 SHA256 1ee891da4bbb450ce16318877a9043773c34a7418eb49f7f684155e48ecc1b6b SHA512 4e0e5c7e85a514a0fed90a9e339eef8748e3a0f06211a93463db355b9b921337ead3f645a3fe8b99dbe2f12d1c03e2ffcad7e2dbe2909b5d97fa5486fe53215f WHIRLPOOL 84ab863b0f70cf8d40291a155f21c987e9b48dce005890e34e105bb3fed950d463f0b053fe2d7988a9b218dc3ccc9afb0c952845009b2e7e2569b28298f8e479 -EBUILD glibc-2.15-r3.ebuild 7764 SHA256 17540bbede72db02e113f556cd3c4a6873c45be1191bade644b5a78d2557c673 SHA512 b9f856356a1dad8f51a62610defce3984477e7f8265427c7e6d21c7868bb6756de4f66b16d3184fd51180155112339e33547a2348d55a2cf1059ccbdf68f0c3f WHIRLPOOL 9c36e9f55427b2cf0180db983446d572d63be309e64b42bbe3571105446f4eddaa815081faf79fe6fc639e3ddf3e3720f11e7af2e85ea19125ef561176eaeff5 -EBUILD glibc-2.17.ebuild 7668 SHA256 b6b7142b8fded3c848424eec002b0e9b15912fe03841d854377b827ea3975eb9 SHA512 0d5dafad92578139720403aa29e1406c366892cd7bdebbfa3fee8a1a4eed06009941d9a55f6f9e9f3ec035947e03d17137e6b9ecdb4061812b0254aa48d0d1a8 WHIRLPOOL 2fdb5ab665c6ac7297e2586644f121101ab84ae3a17ade1fff87be8a31e4d89096063ccb25ceadba53328a398d65240833cf2508b3fa20c42f1e4354a3f1f81d -EBUILD glibc-2.19-r1.ebuild 7397 SHA256 c96062bad2386baf72d3e31e9858eedc5a05980fbfe90b3bc618f7027d90c80b SHA512 df34e6de33e59afb49c4c6d98bf32ce47f21c54979b2db5e21bdad8357f9e2921ab5c80f9926aeeb4cc65f010ee8407bd078ae121adedb22e8d5e6431b8123ac WHIRLPOOL f74da4cd1fbd863928551144cef903093df3db95ca7db8da982a1eede571e5cbe123700ef8d81546754cfc29a9edccd58bd42ea1d51f8cfb76a35072fc96680a -EBUILD glibc-2.20-r1.ebuild 6612 SHA256 3e81059b8be24f6979db7e8b3ea8d4fb2f6d7fd924759cf286d7904981766e15 SHA512 b433eb6c7b9814d8c058a93bbda421bdee259abe96a3d16e2a607a03f60487412ff35ce1709150933e0cda72d26ef705c21a095f6c5643f77af903dfd368149b WHIRLPOOL 8ca83822eef18d98a27d4d023fe8907c459d1677465b2b742b093e20d474d566e6e60f3daecf54e8ed8028737b9a2545467a3226014842e0ebdd8ce4be2a7e7f -EBUILD glibc-2.20.ebuild 6558 SHA256 c0e61f3d6ac10da06640406c9f3f3bc5dd6bd99f97c1180d303a022b312f564a SHA512 d2d97b908a7d828118a3b4e441140048c6e2ffbdbd9c971e948fc9b419db4f8537719cf8e7b879dea79c08eaf38e7282273fc643b234c9a308b6edcd2ef8bff7 WHIRLPOOL c0339fd5329128593fe96b6488a423431d5b2cecc36c7ab989647c235d9cda7aabbb7c0ee86fc6de8ff7f044a03b11e36aa8f999b0d0f0157efe2e98d57c82be -EBUILD glibc-2.23-r2.ebuild 6766 SHA256 e79941f0cd770487f928d13d0eb49d4db74b8848eb79266d2c88df7d43484f52 SHA512 20ea0592fca50aaa9196e65e91faee3ac70ec46e0d7072b533a2e0ec96fa7b5f5a6f243284a669738c2ac169dadb57c5d78542c0238006d7b1c1cb938aad5966 WHIRLPOOL d9ee5832131aed3143e4ddbb1c4ac898367996a77bd1a12d3b23b3e61b5a2b2ff195d6403e817ebfb85d9f829eac1469e69f8d87a77039b5da17d16d2ac2d20b -EBUILD glibc-9999.ebuild 6619 SHA256 523f30d0bd4fb9aef983b7e62e57239d089251d0f3907b6dfb70a00cbc0c2e6c SHA512 2d875c8434720b700bfc99836870e625b7c3010178a4a501e435832e826e7008764878d1e4f88d9f568d21f97de56589bff7984b37d3e9840f19492585cfe16f WHIRLPOOL 7da4b26e63d4f79592891ebd1cf1fb915d40049e8feeb61d9c55f7af601bfe2b7f1a03b1aed51f95be0451c90e93992920949c92ccd2401a0c129b600f5afdb9 -MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c b/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c deleted file mode 100644 index 37711e8..0000000 --- a/sys-libs/glibc/files/2.10/glibc-2.10-gentoo-chk_fail.c +++ /dev/null @@ -1,315 +0,0 @@ -/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Copyright (C) 2006-2008 Gentoo Foundation Inc. - * License terms as above. - * - * Hardened Gentoo SSP and FORTIFY handler - * - * An SSP failure handler that does not use functions from the rest of - * glibc; it uses the INTERNAL_SYSCALL methods directly. This ensures - * no possibility of recursion into the handler. - * - * Direct all bug reports to http://bugs.gentoo.org/ - * - * Re-written from the glibc-2.3 Hardened Gentoo SSP handler - * by Kevin F. Quinn - <kevquinn[@]gentoo.org> - * - * The following people contributed to the glibc-2.3 Hardened - * Gentoo SSP and FORTIFY handler, from which this implementation draws much: - * - * Ned Ludd - <solar[@]gentoo.org> - * Alexander Gabert - <pappy[@]gentoo.org> - * The PaX Team - <pageexec[@]freemail.hu> - * Peter S. Mazinger - <ps.m[@]gmx.net> - * Yoann Vandoorselaere - <yoann[@]prelude-ids.org> - * Robert Connolly - <robert[@]linuxfromscratch.org> - * Cory Visi <cory[@]visi.name> - * Mike Frysinger <vapier[@]gentoo.org> - * Magnus Granberg <zorry[@]ume.nu> - */ - -#include <stdio.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> -#include <signal.h> - -#include <sys/types.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> -#include <bp-checks.h> - -#include <kernel-features.h> - -#include <alloca.h> -/* from sysdeps */ -#include <socketcall.h> -/* for the stuff in bits/socket.h */ -#include <sys/socket.h> -#include <sys/un.h> - -/* Sanity check on SYSCALL macro names - force compilation - * failure if the names used here do not exist - */ -#if !defined __NR_socketcall && !defined __NR_socket -# error Cannot do syscall socket or socketcall -#endif -#if !defined __NR_socketcall && !defined __NR_connect -# error Cannot do syscall connect or socketcall -#endif -#ifndef __NR_write -# error Cannot do syscall write -#endif -#ifndef __NR_close -# error Cannot do syscall close -#endif -#ifndef __NR_getpid -# error Cannot do syscall getpid -#endif -#ifndef __NR_kill -# error Cannot do syscall kill -#endif -#ifndef __NR_exit -# error Cannot do syscall exit -#endif -#ifdef SSP_SMASH_DUMPS_CORE -# define ENABLE_SSP_SMASH_DUMPS_CORE 1 -# if !defined _KERNEL_NSIG && !defined _NSIG -# error No _NSIG or _KERNEL_NSIG for rt_sigaction -# endif -# if !defined __NR_sigaction && !defined __NR_rt_sigaction -# error Cannot do syscall sigaction or rt_sigaction -# endif -/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size - * of the _kernel_ sigset_t which is not the same as the user sigset_t. - * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for - * some reason. - */ -# ifdef _KERNEL_NSIG -# define _SSP_NSIG _KERNEL_NSIG -# else -# define _SSP_NSIG _NSIG -# endif -#else -# define _SSP_NSIG 0 -# define ENABLE_SSP_SMASH_DUMPS_CORE 0 -#endif - -/* Define DO_SIGACTION - default to newer rt signal interface but - * fallback to old as needed. - */ -#ifdef __NR_rt_sigaction -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8) -#else -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(sigaction, 3, signum, act, oldact) -#endif - -/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */ -#if defined(__NR_socket) && defined(__NR_connect) -# define USE_OLD_SOCKETCALL 0 -#else -# define USE_OLD_SOCKETCALL 1 -#endif - -/* stub out the __NR_'s so we can let gcc optimize away dead code */ -#ifndef __NR_socketcall -# define __NR_socketcall 0 -#endif -#ifndef __NR_socket -# define __NR_socket 0 -#endif -#ifndef __NR_connect -# define __NR_connect 0 -#endif -#define DO_SOCKET(result, domain, type, protocol) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = domain; \ - socketargs[1] = type; \ - socketargs[2] = protocol; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \ - } else \ - result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \ - } while (0) -#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = sockfd; \ - socketargs[1] = (unsigned long int)serv_addr; \ - socketargs[2] = addrlen; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \ - } else \ - result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \ - } while (0) - -#ifndef _PATH_LOG -# define _PATH_LOG "/dev/log" -#endif - -static const char path_log[] = _PATH_LOG; - -/* For building glibc with SSP switched on, define __progname to a - * constant if building for the run-time loader, to avoid pulling - * in more of libc.so into ld.so - */ -#ifdef IS_IN_rtld -static char *__progname = "<rtld>"; -#else -extern char *__progname; -#endif - -/* Common handler code, used by chk_fail - * Inlined to ensure no self-references to the handler within itself. - * Data static to avoid putting more than necessary on the stack, - * to aid core debugging. - */ -__attribute__ ((__noreturn__ , __always_inline__)) -static inline void -__hardened_gentoo_chk_fail(char func[], int damaged) -{ -#define MESSAGE_BUFSIZ 256 - static pid_t pid; - static int plen, i; - static char message[MESSAGE_BUFSIZ]; - static const char msg_ssa[] = ": buffer overflow attack"; - static const char msg_inf[] = " in function "; - static const char msg_ssd[] = "*** buffer overflow detected ***: "; - static const char msg_terminated[] = " - terminated\n"; - static const char msg_report[] = "Report to http://bugs.gentoo.org/\n"; - static const char msg_unknown[] = "<unknown>"; - static int log_socket, connect_result; - static struct sockaddr_un sock; - static unsigned long int socketargs[4]; - - /* Build socket address - */ - sock.sun_family = AF_UNIX; - i = 0; - while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) { - sock.sun_path[i] = path_log[i]; - i++; - } - sock.sun_path[i] = '\0'; - - /* Try SOCK_DGRAM connection to syslog */ - connect_result = -1; - DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - if (connect_result == -1) { - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - /* Try SOCK_STREAM connection to syslog */ - DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - } - - /* Build message. Messages are generated both in the old style and new style, - * so that log watchers that are configured for the old-style message continue - * to work. - */ -#define strconcat(str) \ - {i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \ - {\ - message[plen+i]=str[i];\ - i++;\ - }\ - plen+=i;} - - /* R.Henderson post-gcc-4 style message */ - plen = 0; - strconcat(msg_ssd); - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - /* Dr. Etoh pre-gcc-4 style message */ - plen = 0; - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_ssa); - strconcat(msg_inf); - if (func != NULL) - strconcat(func) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - /* Direct reports to bugs.gentoo.org */ - plen=0; - strconcat(msg_report); - message[plen++]='\0'; - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - - /* Suicide */ - pid = INLINE_SYSCALL(getpid, 0); - - if (ENABLE_SSP_SMASH_DUMPS_CORE) { - static struct sigaction default_abort_act; - /* Remove any user-supplied handler for SIGABRT, before using it */ - default_abort_act.sa_handler = SIG_DFL; - default_abort_act.sa_sigaction = NULL; - __sigfillset(&default_abort_act.sa_mask); - default_abort_act.sa_flags = 0; - if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0) - INLINE_SYSCALL(kill, 2, pid, SIGABRT); - } - - /* Note; actions cannot be added to SIGKILL */ - INLINE_SYSCALL(kill, 2, pid, SIGKILL); - - /* In case the kill didn't work, exit anyway - * The loop prevents gcc thinking this routine returns - */ - while (1) - INLINE_SYSCALL(exit, 0); -} - -__attribute__ ((__noreturn__)) -void __chk_fail(void) -{ - __hardened_gentoo_chk_fail(NULL, 0); -} - diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch deleted file mode 100644 index e75ccc7..0000000 --- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-configure-picdefault.patch +++ /dev/null @@ -1,30 +0,0 @@ -Prevent default-fPIE from confusing configure into thinking -PIC code is default. This causes glibc to build both PIC and -non-PIC code as normal, which on the hardened compiler generates -PIC and PIE. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> -Fixed for glibc 2.10 by Magnus Granberg <zorry@ume.nu> - ---- configure.in -+++ configure.in -@@ -2145,7 +2145,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then - libc_cv_pic_default=no - fi - rm -f conftest.*]) ---- configure -+++ configure -@@ -7698,7 +7698,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then - libc_cv_pic_default=no - fi - rm -f conftest.* diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch deleted file mode 100644 index cb6d8e3..0000000 --- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-inittls-nosysenter.patch +++ /dev/null @@ -1,274 +0,0 @@ -When building glibc PIE (which is not something upstream support), -several modifications are necessary to the glibc build process. - -First, any syscalls in PIEs must be of the PIC variant, otherwise -textrels ensue. Then, any syscalls made before the initialisation -of the TLS will fail on i386, as the sysenter variant on i386 uses -the TLS, giving rise to a chicken-and-egg situation. This patch -defines a PIC syscall variant that doesn't use sysenter, even when the sysenter -version is normally used, and uses the non-sysenter version for the brk -syscall that is performed by the TLS initialisation. Further, the TLS -initialisation is moved in this case prior to the initialisation of -dl_osversion, as that requires further syscalls. - -csu/libc-start.c: Move initial TLS initialization to before the -initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined - -csu/libc-tls.c: Use the no-sysenter version of sbrk when -INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter -version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/brk.c: Define a no-sysenter version of brk if -INTERNAL_SYSCALL_NOSYSENTER is defined. - -sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER -Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> -Fixed for 2.10 by Magnus Granberg <zorry@ume.nu> - ---- csu/libc-start.c -+++ csu/libc-start.c -@@ -28,6 +28,7 @@ - extern int __libc_multiple_libcs; - - #include <tls.h> -+#include <sysdep.h> - #ifndef SHARED - # include <dl-osinfo.h> - extern void __pthread_initialize_minimal (void); -@@ -129,6 +130,11 @@ - # endif - _dl_aux_init (auxvec); - # endif -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ /* Do the initial TLS initialization before _dl_osversion, -+ since the latter uses the uname syscall. */ -+ __pthread_initialize_minimal (); -+# endif - # ifdef DL_SYSDEP_OSCHECK - if (!__libc_multiple_libcs) - { -@@ -138,10 +144,12 @@ - } - # endif - -+# ifndef INTERNAL_SYSCALL_NOSYSENTER - /* Initialize the thread library at least a bit since the libgcc - functions are using thread functions if these are available and - we need to setup errno. */ - __pthread_initialize_minimal (); -+# endif - - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); ---- csu/libc-tls.c -+++ csu/libc-tls.c -@@ -23,6 +23,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <sys/param.h> -+#include <sysdep.h> - - - #ifdef SHARED -@@ -29,6 +30,9 @@ - #error makefile bug, this file is for static only - #endif - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+extern void *__sbrk_nosysenter (intptr_t __delta); -+#endif - extern ElfW(Phdr) *_dl_phdr; - extern size_t _dl_phnum; - -@@ -141,14 +145,26 @@ - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with -- IE-model TLS. */ -+ IE-model TLS. -+ -+ Where the normal sbrk would use a syscall that needs the TLS (i386) -+ use the special non-sysenter version instead. */ - #if TLS_TCB_AT_TP - tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align); -+# else - tlsblock = __sbrk (tcb_offset + tcbsize + max_align); -+# endif - #elif TLS_DTV_AT_TP - tcb_offset = roundup (tcbsize, align ?: 1); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align -+ + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# else - tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# endif - tlsblock += TLS_PRE_TCB_SIZE; - #else - /* In case a model with a different layout for the TCB and DTV ---- misc/sbrk.c -+++ misc/sbrk.c -@@ -18,6 +18,7 @@ - #include <errno.h> - #include <stdint.h> - #include <unistd.h> -+#include <sysdep.h> - - /* Defined in brk.c. */ - extern void *__curbrk; -@@ -29,6 +30,35 @@ - /* Extend the process's data space by INCREMENT. - If INCREMENT is negative, shrink data space by - INCREMENT. - Return start of new space allocated, or -1 for errors. */ -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+extern int __brk_nosysenter (void *addr); -+void * -+__sbrk_nosysenter (intptr_t increment) -+{ -+ void *oldbrk; -+ -+ /* If this is not part of the dynamic library or the library is used -+ via dynamic loading in a statically linked program update -+ __curbrk from the kernel's brk value. That way two separate -+ instances of __brk and __sbrk can share the heap, returning -+ interleaved pieces of it. */ -+ if (__curbrk == NULL || __libc_multiple_libcs) -+ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ -+ return (void *) -1; -+ -+ if (increment == 0) -+ return __curbrk; -+ -+ oldbrk = __curbrk; -+ if (__brk_nosysenter (oldbrk + increment) < 0) -+ return (void *) -1; -+ -+ return oldbrk; -+} -+#endif - void * - __sbrk (intptr_t increment) - { ---- sysdeps/unix/sysv/linux/i386/brk.c -+++ sysdeps/unix/sysv/linux/i386/brk.c -@@ -31,6 +31,30 @@ - linker. */ - weak_alias (__curbrk, ___brk_addr) - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ * if the SYSENTER version requires the TLS (which it does on i386). -+ * Obviously using the TLS before it is initialised is broken. */ -+int -+__brk_nosysenter (void *addr) -+{ -+ void *__unbounded newbrk; -+ -+ INTERNAL_SYSCALL_DECL (err); -+ newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, -+ __ptrvalue (addr)); -+ -+ __curbrk = newbrk; -+ -+ if (newbrk < addr) -+ { -+ __set_errno (ENOMEM); -+ return -1; -+ } -+ -+ return 0; -+} -+#endif - int - __brk (void *addr) - { ---- sysdeps/unix/sysv/linux/i386/sysdep.h -+++ sysdeps/unix/sysv/linux/i386/sysdep.h -@@ -187,7 +187,7 @@ - /* The original calling convention for system calls on Linux/i386 is - to use int $0x80. */ - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET - # else - # define ENTER_KERNEL call *_dl_sysinfo -@@ -358,7 +358,7 @@ - possible to use more than four parameters. */ - #undef INTERNAL_SYSCALL - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ -@@ -384,6 +384,18 @@ - : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ - ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -+# define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \ -+ ({ \ -+ register unsigned int resultvar; \ -+ EXTRAVAR_##nr \ -+ asm volatile ( \ -+ LOADARGS_NOSYSENTER_##nr \ -+ "movl %1, %%eax\n\t" \ -+ "int $0x80\n\t" \ -+ RESTOREARGS_NOSYSENTER_##nr \ -+ : "=a" (resultvar) \ -+ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ -+ (int) resultvar; }) - # else - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ -@@ -447,12 +459,20 @@ - - #define LOADARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" - # define LOADARGS_5 \ - "movl %%ebx, %4\n\t" \ - "movl %3, %%ebx\n\t" -+# define LOADARGS_NOSYSENTER_1 \ -+ "bpushl .L__X'%k2, %k2\n\t" -+# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 -+# define LOADARGS_NOSYSENTER_3 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_4 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_5 \ -+ "movl %%ebx, %3\n\t" \ -+ "movl %2, %%ebx\n\t" - # else - # define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" -@@ -474,11 +495,18 @@ - - #define RESTOREARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define RESTOREARGS_1 \ - "bpopl .L__X'%k3, %k3\n\t" - # define RESTOREARGS_5 \ - "movl %4, %%ebx" -+# define RESTOREARGS_NOSYSENTER_1 \ -+ "bpopl .L__X'%k2, %k2\n\t" -+# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 -+# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_5 \ -+ "movl %3, %%ebx" - # else - # define RESTOREARGS_1 \ - "bpopl .L__X'%k2, %k2\n\t" diff --git a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-ssp-compat.patch b/sys-libs/glibc/files/2.10/glibc-2.10-hardened-ssp-compat.patch deleted file mode 100644 index a1c9eef..0000000 --- a/sys-libs/glibc/files/2.10/glibc-2.10-hardened-ssp-compat.patch +++ /dev/null @@ -1,168 +0,0 @@ -Add backwards compat support for gcc-3.x ssp ... older ssp versions -used __guard and __stack_smash_handler symbols while gcc-4.1 and newer -uses __stack_chk_guard and __stack_chk_fail. - ---- config.h.in -+++ config.h.in -@@ -42,6 +42,9 @@ - assembler instructions per line. Default is `;' */ - #undef ASM_LINE_SEP - -+/* Define if we want to enable support for old ssp symbols */ -+#undef ENABLE_OLD_SSP_COMPAT -+ - /* Define if not using ELF, but `.init' and `.fini' sections are available. */ - #undef HAVE_INITFINI - ---- configure -+++ configure -@@ -1378,6 +1378,9 @@ Optional Features: - --enable-kernel=VERSION compile for compatibility with kernel not older than - VERSION - --enable-all-warnings enable all useful warnings gcc can issue -+ --disable-old-ssp-compat -+ enable support for older ssp symbols -+ [default=no] - --enable-multi-arch enable single DSO with optimizations for multiple - architectures - --enable-experimental-malloc -@@ -6462,6 +6465,20 @@ fi - $as_echo "$libc_cv_ssp" >&6; } - - -+# Check whether --enable-old-ssp-compat or --disable-old-ssp-compat was given. -+if test "${enable_old_ssp_compat+set}" = set; then -+ enableval="$enable_old_ssp_compat" -+ enable_old_ssp_compat=$enableval -+else -+ enable_old_ssp_compat=no -+fi; -+if test "x$enable_old_ssp_compat" = "xyes"; then -+ cat >>confdefs.h <<\_ACEOF -+#define ENABLE_OLD_SSP_COMPAT 1 -+_ACEOF -+ -+fi -+ - { $as_echo "$as_me:$LINENO: checking for -fgnu89-inline" >&5 - $as_echo_n "checking for -fgnu89-inline... " >&6; } - if test "${libc_cv_gnu89_inline+set}" = set; then ---- configure.in -+++ configure.in -@@ -1641,6 +1641,15 @@ fi - rm -f conftest*]) - AC_SUBST(libc_cv_ssp) - -+AC_ARG_ENABLE([old-ssp-compat], -+ AC_HELP_STRING([--enable-old-ssp-compat], -+ [enable support for older ssp symbols @<:@default=no@:>@]), -+ [enable_old_ssp_compat=$enableval], -+ [enable_old_ssp_compat=no]) -+if test "x$enable_old_ssp_compat" = "xyes"; then -+ AC_DEFINE(ENABLE_OLD_SSP_COMPAT) -+fi -+ - AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl - cat > conftest.c <<EOF - int foo; ---- csu/libc-start.c -+++ csu/libc-start.c -@@ -37,6 +37,9 @@ extern void __pthread_initialize_minimal - uintptr_t __stack_chk_guard attribute_relro; - # endif - #endif -+#ifdef ENABLE_OLD_SSP_COMPAT -+uintptr_t __guard attribute_relro; -+#endif - - #ifdef HAVE_PTR_NTHREADS - /* We need atomic operations. */ -@@ -141,6 +145,9 @@ LIBC_START_MAIN (int (*main) (int, char - - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); -+#ifdef ENABLE_OLD_SSP_COMPAT -+ __guard = stack_chk_guard; -+#endif - # ifdef THREAD_SET_STACK_GUARD - THREAD_SET_STACK_GUARD (stack_chk_guard); - # else ---- csu/Versions -+++ csu/Versions -@@ -17,6 +17,12 @@ libc { - # New special glibc functions. - gnu_get_libc_release; gnu_get_libc_version; - } -+ GLIBC_2.3.2 { -+%ifdef ENABLE_OLD_SSP_COMPAT -+ # global objects and functions for the old propolice patch in gcc -+ __guard; -+%endif -+ } - GLIBC_PRIVATE { - %if HAVE___THREAD - # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol. ---- debug/Versions -+++ debug/Versions -@@ -10,6 +10,12 @@ libc { - # These are to support some gcc features. - __cyg_profile_func_enter; __cyg_profile_func_exit; - } -+%ifdef ENABLE_OLD_SSP_COMPAT -+ GLIBC_2.3.2 { -+ # backwards ssp compat support; alias to __stack_chk_fail -+ __stack_smash_handler; -+ } -+%endif - GLIBC_2.3.4 { - __chk_fail; - __memcpy_chk; __memmove_chk; __mempcpy_chk; __memset_chk; __stpcpy_chk; ---- elf/rtld.c -+++ elf/rtld.c -@@ -89,6 +89,9 @@ INTDEF(_dl_argv) - in thread local area. */ - uintptr_t __stack_chk_guard attribute_relro; - #endif -+#ifdef ENABLE_OLD_SSP_COMPAT -+uintptr_t __guard attribute_relro; -+#endif - - /* Only exported for architectures that don't store the pointer guard - value in thread local area. */ -@@ -1817,6 +1821,9 @@ ERROR: ld.so: object '%s' cannot be load - - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); -+#ifdef ENABLE_OLD_SSP_COMPAT -+ __guard = stack_chk_guard; -+#endif - #ifdef THREAD_SET_STACK_GUARD - THREAD_SET_STACK_GUARD (stack_chk_guard); - #else ---- elf/Versions -+++ elf/Versions -@@ -43,6 +43,12 @@ ld { - # runtime interface to TLS - __tls_get_addr; - } -+%ifdef ENABLE_OLD_SSP_COMPAT -+ GLIBC_2.3.2 { -+ # backwards ssp compat support -+ __guard; -+ } -+%endif - GLIBC_2.4 { - # stack canary - __stack_chk_guard; ---- Versions.def -+++ Versions.def -@@ -109,6 +109,9 @@ ld { - GLIBC_2.0 - GLIBC_2.1 - GLIBC_2.3 -+%ifdef ENABLE_OLD_SSP_COMPAT -+ GLIBC_2.3.2 -+%endif - GLIBC_2.4 - GLIBC_PRIVATE - } diff --git a/sys-libs/glibc/files/2.11/glibc-2.11-hardened-pie.patch b/sys-libs/glibc/files/2.11/glibc-2.11-hardened-pie.patch deleted file mode 100644 index df7292f..0000000 --- a/sys-libs/glibc/files/2.11/glibc-2.11-hardened-pie.patch +++ /dev/null @@ -1,40 +0,0 @@ -http://bugs.gentoo.org/292139 - -2009-11-08 Magnus Granberg <zorry@ume.nu> - - * Makeconfig (+link): Set to +link-pie. - (+link-static): Change $(static-start-installed-name) to - S$(static-start-installed-name). - (+prector): Set to +prectorS. - (+postctor): Set to +postctorS. - ---- libc/Makeconfig -+++ libc/Makeconfig -@@ -447,11 +447,12 @@ - $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) - endif -++link = $(+link-pie) - # Command for statically linking programs with the C library. - ifndef +link-static - +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \ - $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ -- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ - $(+preinit) $(+prector) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -549,11 +550,10 @@ - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) - +postinit = $(addprefix $(csu-objpfx),crtn.o) --+prector = `$(CC) --print-file-name=crtbegin.o` --+postctor = `$(CC) --print-file-name=crtend.o` --# Variants of the two previous definitions for linking PIE programs. - +prectorS = `$(CC) --print-file-name=crtbeginS.o` - +postctorS = `$(CC) --print-file-name=crtendS.o` -++prector = $(+prectorS) -++postctor = $(+postctorS) - +interp = $(addprefix $(elf-objpfx),interp.os) - endif - csu-objpfx = $(common-objpfx)csu/ diff --git a/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch b/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch deleted file mode 100644 index 3315171..0000000 --- a/sys-libs/glibc/files/2.12/glibc-2.12-hardened-pie.patch +++ /dev/null @@ -1,39 +0,0 @@ -2010-08-11 Magnus Granberg <zorry@ume.nu> - - #332331 - * Makeconfig (+link): Set to +link-pie. - (+link-static): Change $(static-start-installed-name) to - S$(static-start-installed-name). - (+prector): Set to +prectorS. - (+postctor): Set to +postctorS. - ---- libc/Makeconfig -+++ libc/Makeconfig -@@ -447,11 +447,12 @@ - $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) - endif -++link = $(+link-pie) - # Command for statically linking programs with the C library. - ifndef +link-static - +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \ - $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ -- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ - $(+preinit) $(+prector) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -549,11 +550,10 @@ - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) - +postinit = $(addprefix $(csu-objpfx),crtn.o) --+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o` --+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` --# Variants of the two previous definitions for linking PIE programs. - +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o` - +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o` -++prector = $(+prectorS) -++postctor = $(+postctorS) - +interp = $(addprefix $(elf-objpfx),interp.os) - endif - csu-objpfx = $(common-objpfx)csu/ diff --git a/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch b/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch deleted file mode 100644 index 5f8f15a..0000000 --- a/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: work/glibc-2.15/Makeconfig -=================================================================== ---- work.orig/glibc-2.15/Makeconfig -+++ work/glibc-2.15/Makeconfig -@@ -293,7 +293,7 @@ inst_sysconfdir = $(install_root)$(sysco - - # Directory for the database files and Makefile for nss_db. - ifndef vardbdir --vardbdir = /var/db -+vardbdir = $(prefix)/var/db - endif - inst_vardbdir = $(install_root)$(vardbdir) - diff --git a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch b/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch deleted file mode 100644 index a850a61..0000000 --- a/sys-libs/glibc/files/2.16/glibc-2.16-hardened-pie.patch +++ /dev/null @@ -1,39 +0,0 @@ -2012-11-11 Magnus Granberg <zorry@gentoo.org> - - #442712 - * Makeconfig (+link): Set to +link-pie. - (+link-static-before-libc): Change $(static-start-installed-name) to - S$(static-start-installed-name). - (+prector): Set to +prectorS. - (+postctor): Set to +postctorS. - ---- libc/Makeconfig -+++ libc/Makeconfig -@@ -447,11 +447,12 @@ - $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) - endif -++link = $(+link-pie) - # Command for statically linking programs with the C library. - ifndef +link-static - +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \ - $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ -- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ - $(+preinit) $(+prector) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -549,11 +550,10 @@ - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) - +postinit = $(addprefix $(csu-objpfx),crtn.o) --+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o` --+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` --# Variants of the two previous definitions for linking PIE programs. - +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o` - +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o` -++prector = $(+prectorS) -++postctor = $(+postctorS) - +interp = $(addprefix $(elf-objpfx),interp.os) - endif - csu-objpfx = $(common-objpfx)csu/ diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch b/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch deleted file mode 100644 index da4fb82..0000000 --- a/sys-libs/glibc/files/2.17/glibc-2.17-hardened-pie.patch +++ /dev/null @@ -1,42 +0,0 @@ -2012-11-11 Magnus Granberg <zorry@gentoo.org> - - #442712 - * Makeconfig (+link): Set to +link-pie. - (+link-static-before-libc): Change $(static-start-installed-name) to - S$(static-start-installed-name). - (+prector): Set to +prectorS. - (+postctor): Set to +postctorS. - ---- libc/Makeconfig -+++ libc/Makeconfig -@@ -447,11 +447,12 @@ - $(common-objpfx)libc% $(+postinit),$^) \ - $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) - endif -++link = $(+link-pie) - # Command for statically linking programs with the C library. - ifndef +link-static - +link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \ - $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ -- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ - $(+preinit) $(+prectorT) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -549,11 +550,10 @@ - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) - +postinit = $(addprefix $(csu-objpfx),crtn.o) --+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o` --+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` --# Variants of the two previous definitions for linking PIE programs. - +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o` - +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o` -++prector = $(+prectorS) -++postctor = $(+postctorS) - # Variants of the two previous definitions for statically linking programs. - +prectorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginT.o` - +postctorT = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` - +interp = $(addprefix $(elf-objpfx),interp.os) - endif - csu-objpfx = $(common-objpfx)csu/ diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch b/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch deleted file mode 100644 index 8fc683d..0000000 --- a/sys-libs/glibc/files/2.17/glibc-2.17-runtime-prefix.patch +++ /dev/null @@ -1,162 +0,0 @@ -Index: glibc-2.19/sysdeps/generic/paths.h -=================================================================== ---- glibc-2.19.orig/sysdeps/generic/paths.h -+++ glibc-2.19/sysdeps/generic/paths.h -@@ -33,43 +33,43 @@ - #define _PATHS_H_ - - /* Default search path. */ --#define _PATH_DEFPATH "/usr/bin:/bin" -+#define _PATH_DEFPATH "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin" - /* All standard utilities path. */ - #define _PATH_STDPATH \ -- "/usr/bin:/bin:/usr/sbin:/sbin" -+ "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin" - --#define _PATH_BSHELL "/bin/sh" -+#define _PATH_BSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/sh" - #define _PATH_CONSOLE "/dev/console" --#define _PATH_CSHELL "/bin/csh" --#define _PATH_DEVDB "/var/run/dev.db" -+#define _PATH_CSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/csh" -+#define _PATH_DEVDB "@GENTOO_PORTAGE_EPREFIX@/var/run/dev.db" - #define _PATH_DEVNULL "/dev/null" - #define _PATH_DRUM "/dev/drum" --#define _PATH_GSHADOW "/etc/gshadow" -+#define _PATH_GSHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/gshadow" - #define _PATH_KMEM "/dev/kmem" --#define _PATH_LASTLOG "/var/log/lastlog" -+#define _PATH_LASTLOG "@GENTOO_PORTAGE_EPREFIX@/var/log/lastlog" - #define _PATH_MAILDIR "/var/mail" --#define _PATH_MAN "/usr/share/man" -+#define _PATH_MAN "@GENTOO_PORTAGE_EPREFIX@/usr/share/man" - #define _PATH_MEM "/dev/mem" --#define _PATH_MNTTAB "/etc/fstab" --#define _PATH_MOUNTED "/var/run/mtab" --#define _PATH_NOLOGIN "/etc/nologin" --#define _PATH_PRESERVE "/var/lib" --#define _PATH_RWHODIR "/var/spool/rwho" --#define _PATH_SENDMAIL "/usr/sbin/sendmail" --#define _PATH_SHADOW "/etc/shadow" --#define _PATH_SHELLS "/etc/shells" -+#define _PATH_MNTTAB "@GENTOO_PORTAGE_EPREFIX@/etc/fstab" -+#define _PATH_MOUNTED "@GENTOO_PORTAGE_EPREFIX@/var/run/mtab" -+#define _PATH_NOLOGIN "@GENTOO_PORTAGE_EPREFIX@/etc/nologin" -+#define _PATH_PRESERVE "@GENTOO_PORTAGE_EPREFIX@/var/lib" -+#define _PATH_RWHODIR "@GENTOO_PORTAGE_EPREFIX@/var/spool/rwho" -+#define _PATH_SENDMAIL "@GENTOO_PORTAGE_EPREFIX@/usr/sbin/sendmail" -+#define _PATH_SHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/shadow" -+#define _PATH_SHELLS "@GENTOO_PORTAGE_EPREFIX@/etc/shells" - #define _PATH_TTY "/dev/tty" - #define _PATH_UNIX "/vmunix" --#define _PATH_UTMP "/var/run/utmp" --#define _PATH_UTMP_DB "/var/run/utmp.db" --#define _PATH_VI "/usr/bin/vi" -+#define _PATH_UTMP "@GENTOO_PORTAGE_EPREFIX@/var/run/utmp" -+#define _PATH_UTMP_DB "@GENTOO_PORTAGE_EPREFIX@/var/run/utmp.db" -+#define _PATH_VI "@GENTOO_PORTAGE_EPREFIX@/usr/bin/vi" - #define _PATH_WTMP "/var/log/wtmp" - - /* Provide trailing slash, since mostly used for building pathnames. */ - #define _PATH_DEV "/dev/" - #define _PATH_TMP "/tmp/" --#define _PATH_VARDB "/var/db/" --#define _PATH_VARRUN "/var/run/" -+#define _PATH_VARDB "@GENTOO_PORTAGE_EPREFIX@/var/db/" -+#define _PATH_VARRUN "@GENTOO_PORTAGE_EPREFIX@/var/run/" - #define _PATH_VARTMP "/var/tmp/" - - #endif /* !_PATHS_H_ */ -Index: glibc-2.19/sysdeps/unix/sysv/linux/paths.h -=================================================================== ---- glibc-2.19.orig/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.19/sysdeps/unix/sysv/linux/paths.h -@@ -33,43 +33,43 @@ - #define _PATHS_H_ - - /* Default search path. */ --#define _PATH_DEFPATH "/usr/bin:/bin" -+#define _PATH_DEFPATH "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin" - /* All standard utilities path. */ - #define _PATH_STDPATH \ -- "/usr/bin:/bin:/usr/sbin:/sbin" -+ "@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin" - --#define _PATH_BSHELL "/bin/sh" -+#define _PATH_BSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/sh" - #define _PATH_CONSOLE "/dev/console" --#define _PATH_CSHELL "/bin/csh" --#define _PATH_DEVDB "/var/run/dev.db" -+#define _PATH_CSHELL "@GENTOO_PORTAGE_EPREFIX@/bin/csh" -+#define _PATH_DEVDB "@GENTOO_PORTAGE_EPREFIX@/var/run/dev.db" - #define _PATH_DEVNULL "/dev/null" - #define _PATH_DRUM "/dev/drum" --#define _PATH_GSHADOW "/etc/gshadow" -+#define _PATH_GSHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/gshadow" - #define _PATH_KLOG "/proc/kmsg" - #define _PATH_KMEM "/dev/kmem" - #define _PATH_LASTLOG "/var/log/lastlog" - #define _PATH_MAILDIR "/var/mail" --#define _PATH_MAN "/usr/share/man" -+#define _PATH_MAN "@GENTOO_PORTAGE_EPREFIX@/usr/share/man" - #define _PATH_MEM "/dev/mem" --#define _PATH_MNTTAB "/etc/fstab" --#define _PATH_MOUNTED "/etc/mtab" --#define _PATH_NOLOGIN "/etc/nologin" --#define _PATH_PRESERVE "/var/lib" --#define _PATH_RWHODIR "/var/spool/rwho" --#define _PATH_SENDMAIL "/usr/sbin/sendmail" --#define _PATH_SHADOW "/etc/shadow" --#define _PATH_SHELLS "/etc/shells" -+#define _PATH_MNTTAB "@GENTOO_PORTAGE_EPREFIX@/etc/fstab" -+#define _PATH_MOUNTED "@GENTOO_PORTAGE_EPREFIX@/etc/mtab" -+#define _PATH_NOLOGIN "@GENTOO_PORTAGE_EPREFIX@/etc/nologin" -+#define _PATH_PRESERVE "@GENTOO_PORTAGE_EPREFIX@/var/lib" -+#define _PATH_RWHODIR "@GENTOO_PORTAGE_EPREFIX@/var/spool/rwho" -+#define _PATH_SENDMAIL "@GENTOO_PORTAGE_EPREFIX@/usr/sbin/sendmail" -+#define _PATH_SHADOW "@GENTOO_PORTAGE_EPREFIX@/etc/shadow" -+#define _PATH_SHELLS "@GENTOO_PORTAGE_EPREFIX@/etc/shells" - #define _PATH_TTY "/dev/tty" - #define _PATH_UNIX "/boot/vmlinux" --#define _PATH_UTMP "/var/run/utmp" --#define _PATH_VI "/usr/bin/vi" -+#define _PATH_UTMP "@GENTOO_PORTAGE_EPREFIX@/var/run/utmp" -+#define _PATH_VI "@GENTOO_PORTAGE_EPREFIX@/usr/bin/vi" - #define _PATH_WTMP "/var/log/wtmp" - - /* Provide trailing slash, since mostly used for building pathnames. */ - #define _PATH_DEV "/dev/" - #define _PATH_TMP "/tmp/" --#define _PATH_VARDB "/var/db/" --#define _PATH_VARRUN "/var/run/" -+#define _PATH_VARDB "@GENTOO_PORTAGE_EPREFIX@/var/db/" -+#define _PATH_VARRUN "@GENTOO_PORTAGE_EPREFIX@/var/run/" - #define _PATH_VARTMP "/var/tmp/" - - #endif /* !_PATHS_H_ */ -Index: glibc-2.19/sysdeps/posix/system.c -=================================================================== ---- glibc-2.19.orig/sysdeps/posix/system.c -+++ glibc-2.19/sysdeps/posix/system.c -@@ -26,7 +26,7 @@ - #include <sysdep-cancel.h> - - --#define SHELL_PATH "/bin/sh" /* Path of the shell. */ -+#define SHELL_PATH "@GENTOO_PORTAGE_EPREFIX@/bin/sh" /* Path of the shell. */ - #define SHELL_NAME "sh" /* Name to give it. */ - - -Index: glibc-2.19/libio/iopopen.c -=================================================================== ---- glibc-2.19.orig/libio/iopopen.c -+++ glibc-2.19/libio/iopopen.c -@@ -222,7 +222,7 @@ _IO_new_proc_open (fp, command, mode) - _IO_close (fd); - } - -- _IO_execl ("/bin/sh", "sh", "-c", command, (char *) 0); -+ _IO_execl ("@GENTOO_PORTAGE_EPREFIX@/bin/sh", "sh", "-c", command, (char *) 0); - _IO__exit (127); - } - _IO_close (child_end); diff --git a/sys-libs/glibc/files/2.17/glibc-2.17-shadow-prefix.patch b/sys-libs/glibc/files/2.17/glibc-2.17-shadow-prefix.patch deleted file mode 100644 index 0e3979c..0000000 --- a/sys-libs/glibc/files/2.17/glibc-2.17-shadow-prefix.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: shadow/Makefile -=================================================================== ---- shadow/Makefile.orig -+++ shadow/Makefile -@@ -20,6 +20,8 @@ - # - subdir := shadow - -+include ../Makeconfig -+ - headers = shadow.h - routines = getspent getspnam sgetspent fgetspent putspent \ - getspent_r getspnam_r sgetspent_r fgetspent_r \ -@@ -34,5 +36,6 @@ CFLAGS-fgetspent_r.c = -fexceptions $(li - CFLAGS-putspent.c = -fexceptions $(libio-mtsafe) - CFLAGS-getspnam.c = -fexceptions - CFLAGS-getspnam_r.c = -fexceptions -+CPPFLAGS-lckpwdf.c = -DSYSCONFDIR='"$(sysconfdir)"' - - include ../Rules -Index: shadow/lckpwdf.c -=================================================================== ---- shadow/lckpwdf.c.orig -+++ shadow/lckpwdf.c -@@ -29,7 +29,7 @@ - - - /* Name of the lock file. */ --#define PWD_LOCKFILE "/etc/.pwd.lock" -+#define PWD_LOCKFILE SYSCONFDIR "/.pwd.lock" - - /* How long to wait for getting the lock before returning with an - error. */ diff --git a/sys-libs/glibc/files/2.17/locale-gen_prefix.patch b/sys-libs/glibc/files/2.17/locale-gen_prefix.patch deleted file mode 100644 index f378605..0000000 --- a/sys-libs/glibc/files/2.17/locale-gen_prefix.patch +++ /dev/null @@ -1,77 +0,0 @@ -bug #473484 -Index: work/extra/locale/locale-gen -=================================================================== ---- work.orig/extra/locale/locale-gen -+++ work/extra/locale/locale-gen -@@ -8,7 +8,13 @@ unset POSIXLY_CORRECT IFS - umask 0022 - - argv0=${0##*/} --source /etc/init.d/functions.sh || { -+ -+EPREFIX="@GENTOO_PORTAGE_EPREFIX@" -+if [[ ${EPREFIX} == "@"GENTOO_PORTAGE_EPREFIX"@" ]] ; then -+ EPREFIX="" -+fi -+ -+source "${EPREFIX}"/etc/init.d/functions.sh || { - echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 - exit 1 - } -@@ -97,13 +103,14 @@ if [[ -n ${DESTDIR} ]] && [[ ${ROOT} != - eerror "DESTDIR and ROOT are mutually exclusive options" - exit 1 - fi --if [[ ${ROOT} != "/" ]] ; then -- einfo "Using locale.gen from ROOT ${ROOT}etc/" -+: ${EROOT:="${ROOT%/}${EPREFIX}/"} -+if [[ ${EROOT} != "/" ]] ; then -+ einfo "Using locale.gen from ROOT ${EROOT}etc/" - fi - if [[ -n ${DESTDIR} ]] ; then - einfo "Building locales in DESTDIR '${DESTDIR}'" - else -- DESTDIR=${ROOT} -+ DESTDIR=${EROOT} - fi - - # XXX: should fix this ... -@@ -112,7 +119,7 @@ if [[ ${ROOT} != "/" ]] ; then - exit 0 - fi - --: ${CONFIG:=${ROOT}etc/locale.gen} -+: ${CONFIG:=${EROOT}etc/locale.gen} - LOCALES=${DESTDIR}usr/share/i18n/locales - CHARMAPS=${DESTDIR}usr/share/i18n/charmaps - SUPPORTED=${DESTDIR}usr/share/i18n/SUPPORTED -@@ -150,7 +157,10 @@ fi - - # Extract the location of the locale dir on the fly as `localedef --help` has: - # locale path : /usr/lib64/locale:/usr/share/i18n --LOCALEDIR=${DESTDIR}$(LC_ALL="C" "${DESTDIR}"usr/bin/localedef --help | sed -n -e '/locale path/{s|.* : ||;s|:.*||;p}') -+# For long paths, the line may get wrapped into two, in which case space (' ') is replaced -+# by newline (\n). -+LOCALEDIR=$(LC_ALL="C" "${DESTDIR}"usr/bin/localedef --help | sed -n -r '/locale path/{N;s|.*:[ \n](.*):/.*|\1|;p}') -+LOCALEDIR="${DESTDIR}${LOCALEDIR#${EPREFIX}}" - if [[ $? -ne 0 ]] || [[ -z ${LOCALEDIR} ]] || [[ ${LOCALEDIR} != ${DESTDIR}/usr/lib*/locale ]] ; then - eerror "Unable to parse the output of your localedef utility." 1>&2 - eerror "File a bug about this issue and include the output of 'localedef --help'." 1>&2 -@@ -160,7 +170,7 @@ fi - - - if [[ ${QUIET} -eq 0 ]] && [[ -z ${JUST_LIST} ]] && \ -- [[ -e ${ROOT}etc/locales.build ]] -+ [[ -e ${EROOT}etc/locales.build ]] - then - ewarn "You should upgrade your /etc/locales.build to /etc/locale.gen" - ewarn "and then remove /etc/locales.build when you're done.\n" -@@ -280,7 +290,7 @@ generate_locale() { - -i "${input}" \ - -f "${charmap}" \ - -A "${ALIAS}" \ -- --prefix "${DESTDIR}" \ -+ --prefix "${DESTDIR%${EPREFIX}/}/" \ - "${locale}" 2>&1 - ret=$? - [[ -n ${output} ]] && eend ${ret} diff --git a/sys-libs/glibc/files/2.17/vdso-disable.patch b/sys-libs/glibc/files/2.17/vdso-disable.patch deleted file mode 100644 index 0354ae9..0000000 --- a/sys-libs/glibc/files/2.17/vdso-disable.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: work/glibc-2.17/elf/dl-support.c -=================================================================== ---- work.orig/glibc-2.17/elf/dl-support.c -+++ work/glibc-2.17/elf/dl-support.c -@@ -212,16 +212,6 @@ _dl_aux_init (ElfW(auxv_t) *av) - case AT_HWCAP: - GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val; - break; --#ifdef NEED_DL_SYSINFO -- case AT_SYSINFO: -- GL(dl_sysinfo) = av->a_un.a_val; -- break; --#endif --#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO -- case AT_SYSINFO_EHDR: -- GL(dl_sysinfo_dso) = (void *) av->a_un.a_val; -- break; --#endif - case AT_UID: - uid ^= av->a_un.a_val; - seen |= 1; -Index: work/glibc-2.17/elf/setup-vdso.h -=================================================================== ---- work.orig/glibc-2.17/elf/setup-vdso.h -+++ work/glibc-2.17/elf/setup-vdso.h -@@ -20,7 +20,7 @@ static inline void __attribute__ ((alway - setup_vdso (struct link_map *main_map __attribute__ ((unused)), - struct link_map ***first_preload __attribute__ ((unused))) - { --#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO -+#if 0 - if (GLRO(dl_sysinfo_dso) == NULL) - return; - diff --git a/sys-libs/glibc/files/2.17/vdso.patch b/sys-libs/glibc/files/2.17/vdso.patch deleted file mode 100644 index eb9a492..0000000 --- a/sys-libs/glibc/files/2.17/vdso.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c -=================================================================== ---- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c -+++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c -@@ -28,11 +28,7 @@ void *gettimeofday_ifunc (void) __asm__ - void * - gettimeofday_ifunc (void) - { -- PREPARE_VERSION (linux26, "LINUX_2.6", 61765110); -- -- /* If the vDSO is not available we fall back on the old vsyscall. */ -- return (_dl_vdso_vsym ("__vdso_gettimeofday", &linux26) -- ?: (void *) VSYSCALL_ADDR_vgettimeofday); -+ return (void *) VSYSCALL_ADDR_vgettimeofday; - } - asm (".type __gettimeofday, %gnu_indirect_function"); - diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-configurable-paths.patch b/sys-libs/glibc/files/2.19/glibc-2.19-configurable-paths.patch deleted file mode 100644 index 1cf906a..0000000 --- a/sys-libs/glibc/files/2.19/glibc-2.19-configurable-paths.patch +++ /dev/null @@ -1,2115 +0,0 @@ -Index: glibc-2.19/nis/Makefile -=================================================================== ---- glibc-2.19.orig/nis/Makefile -+++ glibc-2.19/nis/Makefile -@@ -58,6 +58,11 @@ libnsl-routines = yp_xdr ypclnt ypupdate - nis_clone_res nss-default - - libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) -+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' -+CPPFLAGS-compat-grp.c = $(SYSCONF-FLAGS) -+CPPFLAGS-compat-pwd.c = $(SYSCONF-FLAGS) -+CPPFLAGS-compat-spwd.c = $(SYSCONF-FLAGS) -+CPPFLAGS-compat-initgroups.c = $(SYSCONF-FLAGS) - libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes)) - - libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups \ -Index: glibc-2.19/nis/nss_compat/compat-grp.c -=================================================================== ---- glibc-2.19.orig/nis/nss_compat/compat-grp.c -+++ glibc-2.19/nis/nss_compat/compat-grp.c -@@ -120,7 +120,7 @@ internal_setgrent (ent_t *ent, int stayo - - if (ent->stream == NULL) - { -- ent->stream = fopen ("/etc/group", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/group", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.19/nis/nss_compat/compat-initgroups.c -=================================================================== ---- glibc-2.19.orig/nis/nss_compat/compat-initgroups.c -+++ glibc-2.19/nis/nss_compat/compat-initgroups.c -@@ -136,7 +136,7 @@ internal_setgrent (ent_t *ent) - else - ent->blacklist.current = 0; - -- ent->stream = fopen ("/etc/group", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/group", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.19/nis/nss_compat/compat-pwd.c -=================================================================== ---- glibc-2.19.orig/nis/nss_compat/compat-pwd.c -+++ glibc-2.19/nis/nss_compat/compat-pwd.c -@@ -235,7 +235,7 @@ internal_setpwent (ent_t *ent, int stayo - - if (ent->stream == NULL) - { -- ent->stream = fopen ("/etc/passwd", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/passwd", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.19/nis/nss_compat/compat-spwd.c -=================================================================== ---- glibc-2.19.orig/nis/nss_compat/compat-spwd.c -+++ glibc-2.19/nis/nss_compat/compat-spwd.c -@@ -191,7 +191,7 @@ internal_setspent (ent_t *ent, int stayo - - if (ent->stream == NULL) - { -- ent->stream = fopen ("/etc/shadow", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/shadow", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.19/nss/Makefile -=================================================================== ---- glibc-2.19.orig/nss/Makefile -+++ glibc-2.19/nss/Makefile -@@ -39,6 +39,8 @@ extra-objs += $(makedb-modules:=.o) - - tests = test-netdb tst-nss-test1 test-digits-dots - xtests = bug-erange -+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' -+CPPFLAGS-bug-erange.c = $(SYSCONF-FLAGS) - - include ../Makeconfig - -@@ -57,6 +59,8 @@ vpath %.c $(subdir-dirs) ../locale/progr - - libnss_files-routines := $(addprefix files-,$(databases)) \ - files-initgroups files-have_o_cloexec files-init -+CPPFLAGS-files-init.c = $(SYSCONF-FLAGS) -+CPPFLAGS-files-initgroups.c = $(SYSCONF-FLAGS) - - libnss_db-dbs := $(addprefix db-,\ - $(filter-out hosts network key alias,\ -@@ -102,7 +106,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf - - $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) - --$(inst_vardbdir)/Makefile: db-Makefile $(+force) -+$(inst_vardbdir)/Makefile: $(objpfx)db-Makefile $(+force) - $(do-install) - - CFLAGS-nss_test1.c = -DNOT_IN_libc=1 -Index: glibc-2.19/nss/bug-erange.c -=================================================================== ---- glibc-2.19.orig/nss/bug-erange.c -+++ glibc-2.19/nss/bug-erange.c -@@ -37,7 +37,7 @@ main (void) - { - printf ("gethostbyname_r failed: %s (errno: %m)\n", strerror (res)); - -- if (access ("/etc/resolv.conf", R_OK)) -+ if (access (SYSCONFDIR "/resolv.conf", R_OK)) - { - puts ("DNS probably not set up"); - return 0; -Index: glibc-2.19/nss/nss_files/files-init.c -=================================================================== ---- glibc-2.19.orig/nss/nss_files/files-init.c -+++ glibc-2.19/nss/nss_files/files-init.c -@@ -35,33 +35,33 @@ static union \ - } \ - } - --TF (pwd, "/etc/passwd"); --TF (grp, "/etc/group"); --TF (hst, "/etc/hosts"); --TF (resolv, "/etc/resolv.conf", .call_res_init = 1); --TF (serv, "/etc/services"); --TF (netgr, "/etc/netgroup"); -+TF (pwd, SYSCONFDIR "/passwd"); -+TF (grp, SYSCONFDIR "/group"); -+TF (hst, SYSCONFDIR "/hosts"); -+TF (resolv, SYSCONFDIR "/resolv.conf", .call_res_init = 1); -+TF (serv, SYSCONFDIR "/services"); -+TF (netgr, SYSCONFDIR "/netgroup"); - - - void - _nss_files_init (void (*cb) (size_t, struct traced_file *)) - { -- strcpy (pwd_traced_file.file.fname, "/etc/passwd"); -+ strcpy (pwd_traced_file.file.fname, SYSCONFDIR "/passwd"); - cb (pwddb, &pwd_traced_file.file); - -- strcpy (grp_traced_file.file.fname, "/etc/group"); -+ strcpy (grp_traced_file.file.fname, SYSCONFDIR "/group"); - cb (grpdb, &grp_traced_file.file); - -- strcpy (hst_traced_file.file.fname, "/etc/hosts"); -+ strcpy (hst_traced_file.file.fname, SYSCONFDIR "/hosts"); - cb (hstdb, &hst_traced_file.file); - -- strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf"); -+ strcpy (resolv_traced_file.file.fname, SYSCONFDIR "/resolv.conf"); - cb (hstdb, &resolv_traced_file.file); - -- strcpy (serv_traced_file.file.fname, "/etc/services"); -+ strcpy (serv_traced_file.file.fname, SYSCONFDIR "/services"); - cb (servdb, &serv_traced_file.file); - -- strcpy (netgr_traced_file.file.fname, "/etc/netgroup"); -+ strcpy (netgr_traced_file.file.fname, SYSCONFDIR "/netgroup"); - cb (netgrdb, &netgr_traced_file.file); - } - -Index: glibc-2.19/nss/nss_files/files-initgroups.c -=================================================================== ---- glibc-2.19.orig/nss/nss_files/files-initgroups.c -+++ glibc-2.19/nss/nss_files/files-initgroups.c -@@ -31,7 +31,7 @@ _nss_files_initgroups_dyn (const char *u - long int *size, gid_t **groupsp, long int limit, - int *errnop) - { -- FILE *stream = fopen ("/etc/group", "rce"); -+ FILE *stream = fopen (SYSCONFDIR "/group", "rce"); - if (stream == NULL) - { - *errnop = errno; -Index: glibc-2.19/nss/db-Makefile -=================================================================== ---- glibc-2.19.orig/nss/db-Makefile -+++ /dev/null -@@ -1,166 +0,0 @@ --# Makefile to (re-)generate db versions of system database files. --# Copyright (C) 1996-2014 Free Software Foundation, Inc. --# This file is part of the GNU C Library. --# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. --# -- --# The GNU C Library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Lesser General Public --# License as published by the Free Software Foundation; either --# version 2.1 of the License, or (at your option) any later version. -- --# The GNU C Library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Lesser General Public License for more details. -- --# You should have received a copy of the GNU Lesser General Public --# License along with the GNU C Library; if not, see --# <http://www.gnu.org/licenses/>. -- --DATABASES = $(wildcard /etc/passwd /etc/group /etc/ethers /etc/protocols \ -- /etc/rpc /etc/services /etc/shadow /etc/gshadow \ -- /etc/netgroup) -- --VAR_DB = /var/db -- --AWK = awk --MAKEDB = makedb --quiet -- --all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES))) -- -- --$(VAR_DB)/passwd.db: /etc/passwd -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$3; print }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/group.db: /etc/group -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$3; print; \ -- if ($$4 != "") { \ -- split($$4, grmems, ","); \ -- for (memidx in grmems) { \ -- mem=grmems[memidx]; \ -- if (members[mem] == "") \ -- members[mem]=$$3; \ -- else \ -- members[mem]=members[mem] "," $$3; \ -- } \ -- delete grmems; } } \ -- END { for (mem in members) \ -- printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/ethers.db: /etc/ethers -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) '/^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$2; print }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/protocols.db: /etc/protocols -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) '/^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$2; print; \ -- for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -- { printf ".%s ", $$i; print } }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/rpc.db: /etc/rpc -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) '/^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$2; print; \ -- for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -- { printf ".%s ", $$i; print } }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/services.db: /etc/services -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS="[ \t/]+" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { sub(/[ \t]*#.*$$/, "");\ -- printf ":%s/%s ", $$1, $$3; print; \ -- printf ":%s/ ", $$1; print; \ -- printf "=%s/%s ", $$2, $$3; print; \ -- printf "=%s/ ", $$2; print; \ -- for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \ -- { printf ":%s/%s ", $$i, $$3; print; \ -- printf ":%s/ ", $$i; print } }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/shadow.db: /etc/shadow -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -- (umask 077 && $(MAKEDB) -o $@ -) -- @echo "done." -- @if chgrp shadow $@ 2>/dev/null; then \ -- chmod g+r $@; \ -- else \ -- chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -- echo; \ -- echo "Warning: The shadow password database $@"; \ -- echo "has been set to be readable only by root. You may want"; \ -- echo "to make it readable by the \`shadow' group depending"; \ -- echo "on your configuration."; \ -- echo; \ -- fi -- --$(VAR_DB)/gshadow.db: /etc/gshadow -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -- (umask 077 && $(MAKEDB) -o $@ -) -- @echo "done." -- @if chgrp shadow $@ 2>/dev/null; then \ -- chmod g+r $@; \ -- else \ -- chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -- echo; \ -- echo "Warning: The shadow group database $@"; \ -- echo "has been set to be readable only by root. You may want"; \ -- echo "to make it readable by the \`shadow' group depending"; \ -- echo "on your configuration."; \ -- echo; \ -- fi -- --$(VAR_DB)/netgroup.db: /etc/netgroup -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { ini=1 } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \ -- else end=""; \ -- gsub(/[ \t]+/, " "); \ -- sub(/^[ \t]*/, ""); \ -- if (ini == 0) printf "%s%s", $$0, end; \ -- else printf ".%s %s%s", $$1, $$0, end; \ -- ini=end == "" ? 0 : 1; } \ -- END { if (ini==0) printf "\n" }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -Index: glibc-2.19/nss/db-Makefile.in -=================================================================== ---- /dev/null -+++ glibc-2.19/nss/db-Makefile.in -@@ -0,0 +1,173 @@ -+ -+# Makefile to (re-)generate db versions of system database files. -+# Copyright (C) 1996-2014 Free Software Foundation, Inc. -+# This file is part of the GNU C Library. -+# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+# -+ -+# The GNU C Library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2.1 of the License, or (at your option) any later version. -+ -+# The GNU C Library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+ -+# You should have received a copy of the GNU Lesser General Public -+# License along with the GNU C Library; if not, see -+# <http://www.gnu.org/licenses/>. -+ -+DATABASES = $(wildcard @libc_cv_sysconfdir@/passwd \ -+ @libc_cv_sysconfdir@/group \ -+ @libc_cv_sysconfdir@/ethers \ -+ @libc_cv_sysconfdir@/protocols \ -+ @libc_cv_sysconfdir@/rpc \ -+ @libc_cv_sysconfdir@/services \ -+ @libc_cv_sysconfdir@/shadow \ -+ @libc_cv_sysconfdir@/gshadow \ -+ @libc_cv_sysconfdir@/netgroup) -+ -+VAR_DB = /var/db -+ -+AWK = awk -+MAKEDB = makedb --quiet -+ -+all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES))) -+ -+ -+$(VAR_DB)/passwd.db: @libc_cv_sysconfdir@/passwd -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$3; print }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/group.db: @libc_cv_sysconfdir@/group -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$3; print; \ -+ if ($$4 != "") { \ -+ split($$4, grmems, ","); \ -+ for (memidx in grmems) { \ -+ mem=grmems[memidx]; \ -+ if (members[mem] == "") \ -+ members[mem]=$$3; \ -+ else \ -+ members[mem]=members[mem] "," $$3; \ -+ } \ -+ delete grmems; } } \ -+ END { for (mem in members) \ -+ printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/ethers.db: @libc_cv_sysconfdir@/ethers -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) '/^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$2; print }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/protocols.db: @libc_cv_sysconfdir@/protocols -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) '/^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$2; print; \ -+ for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -+ { printf ".%s ", $$i; print } }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/rpc.db: @libc_cv_sysconfdir@/rpc -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) '/^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$2; print; \ -+ for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -+ { printf ".%s ", $$i; print } }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/services.db: @libc_cv_sysconfdir@/services -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS="[ \t/]+" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { sub(/[ \t]*#.*$$/, "");\ -+ printf ":%s/%s ", $$1, $$3; print; \ -+ printf ":%s/ ", $$1; print; \ -+ printf "=%s/%s ", $$2, $$3; print; \ -+ printf "=%s/ ", $$2; print; \ -+ for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \ -+ { printf ":%s/%s ", $$i, $$3; print; \ -+ printf ":%s/ ", $$i; print } }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/shadow.db: @libc_cv_sysconfdir@/shadow -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -+ (umask 077 && $(MAKEDB) -o $@ -) -+ @echo "done." -+ @if chgrp shadow $@ 2>/dev/null; then \ -+ chmod g+r $@; \ -+ else \ -+ chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -+ echo; \ -+ echo "Warning: The shadow password database $@"; \ -+ echo "has been set to be readable only by root. You may want"; \ -+ echo "to make it readable by the \`shadow' group depending"; \ -+ echo "on your configuration."; \ -+ echo; \ -+ fi -+ -+$(VAR_DB)/gshadow.db: @libc_cv_sysconfdir@/gshadow -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -+ (umask 077 && $(MAKEDB) -o $@ -) -+ @echo "done." -+ @if chgrp shadow $@ 2>/dev/null; then \ -+ chmod g+r $@; \ -+ else \ -+ chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -+ echo; \ -+ echo "Warning: The shadow group database $@"; \ -+ echo "has been set to be readable only by root. You may want"; \ -+ echo "to make it readable by the \`shadow' group depending"; \ -+ echo "on your configuration."; \ -+ echo; \ -+ fi -+ -+$(VAR_DB)/netgroup.db: @libc_cv_sysconfdir@/netgroup -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { ini=1 } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \ -+ else end=""; \ -+ gsub(/[ \t]+/, " "); \ -+ sub(/^[ \t]*/, ""); \ -+ if (ini == 0) printf "%s%s", $$0, end; \ -+ else printf ".%s %s%s", $$1, $$0, end; \ -+ ini=end == "" ? 0 : 1; } \ -+ END { if (ini==0) printf "\n" }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -Index: glibc-2.19/resolv/netdb.h -=================================================================== ---- glibc-2.19.orig/resolv/netdb.h -+++ glibc-2.19/resolv/netdb.h -@@ -42,12 +42,12 @@ - #include <bits/netdb.h> - - /* Absolute file name for network data base files. */ --#define _PATH_HEQUIV "/etc/hosts.equiv" --#define _PATH_HOSTS "/etc/hosts" --#define _PATH_NETWORKS "/etc/networks" --#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" --#define _PATH_PROTOCOLS "/etc/protocols" --#define _PATH_SERVICES "/etc/services" -+#define _PATH_HEQUIV SYSCONFDIR "/hosts.equiv" -+#define _PATH_HOSTS SYSCONFDIR "/hosts" -+#define _PATH_NETWORKS SYSCONFDIR "/networks" -+#define _PATH_NSSWITCH_CONF SYSCONFDIR "/nsswitch.conf" -+#define _PATH_PROTOCOLS SYSCONFDIR "/protocols" -+#define _PATH_SERVICES SYSCONFDIR "/services" - - - __BEGIN_DECLS -Index: glibc-2.19/resolv/resolv.h -=================================================================== ---- glibc-2.19.orig/resolv/resolv.h -+++ /dev/null -@@ -1,389 +0,0 @@ --/* -- * Copyright (c) 1983, 1987, 1989 -- * The Regents of the University of California. All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- */ -- --/* -- * Portions Copyright (c) 1996-1999 by Internet Software Consortium. -- * -- * Permission to use, copy, modify, and distribute this software for any -- * purpose with or without fee is hereby granted, provided that the above -- * copyright notice and this permission notice appear in all copies. -- * -- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -- * SOFTWARE. -- */ -- --/* -- * @(#)resolv.h 8.1 (Berkeley) 6/2/93 -- * $BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $ -- */ -- --#ifndef _RESOLV_H_ -- --/* These headers are needed for types used in the `struct res_state' -- declaration. */ --#include <sys/types.h> --#include <netinet/in.h> -- --#ifndef __need_res_state --# define _RESOLV_H_ -- --# include <sys/param.h> --# include <sys/cdefs.h> --# include <stdio.h> --# include <arpa/nameser.h> --#endif -- --#ifndef __res_state_defined --# define __res_state_defined -- --typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error } -- res_sendhookact; -- --typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns, -- const u_char **__query, -- int *__querylen, -- u_char *__ans, -- int __anssiz, -- int *__resplen); -- --typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, -- const u_char *__query, -- int __querylen, -- u_char *__ans, -- int __anssiz, -- int *__resplen); -- --/* -- * Global defines and variables for resolver stub. -- */ --# define MAXNS 3 /* max # name servers we'll track */ --# define MAXDFLSRCH 3 /* # default domain levels to try */ --# define MAXDNSRCH 6 /* max # domains in search path */ --# define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ -- --# define RES_TIMEOUT 5 /* min. seconds between retries */ --# define MAXRESOLVSORT 10 /* number of net to sort on */ --# define RES_MAXNDOTS 15 /* should reflect bit field size */ --# define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ --# define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ --# define RES_DFLRETRY 2 /* Default #/tries. */ --# define RES_MAXTIME 65535 /* Infinity, in milliseconds. */ -- --struct __res_state { -- int retrans; /* retransmition time interval */ -- int retry; /* number of times to retransmit */ -- u_long options; /* option flags - see below. */ -- int nscount; /* number of name servers */ -- struct sockaddr_in -- nsaddr_list[MAXNS]; /* address of name server */ --# define nsaddr nsaddr_list[0] /* for backward compatibility */ -- u_short id; /* current message id */ -- /* 2 byte hole here. */ -- char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ -- char defdname[256]; /* default domain (deprecated) */ -- u_long pfcode; /* RES_PRF_ flags - see below. */ -- unsigned ndots:4; /* threshold for initial abs. query */ -- unsigned nsort:4; /* number of elements in sort_list[] */ -- unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */ -- unsigned unused:23; -- struct { -- struct in_addr addr; -- u_int32_t mask; -- } sort_list[MAXRESOLVSORT]; -- /* 4 byte hole here on 64-bit architectures. */ -- res_send_qhook qhook; /* query hook */ -- res_send_rhook rhook; /* response hook */ -- int res_h_errno; /* last one set for this context */ -- int _vcsock; /* PRIVATE: for res_send VC i/o */ -- u_int _flags; /* PRIVATE: see below */ -- /* 4 byte hole here on 64-bit architectures. */ -- union { -- char pad[52]; /* On an i386 this means 512b total. */ -- struct { -- u_int16_t nscount; -- u_int16_t nsmap[MAXNS]; -- int nssocks[MAXNS]; -- u_int16_t nscount6; -- u_int16_t nsinit; -- struct sockaddr_in6 *nsaddrs[MAXNS]; --#ifdef _LIBC -- unsigned long long int initstamp -- __attribute__((packed)); --#else -- unsigned int _initstamp[2]; --#endif -- } _ext; -- } _u; --}; -- --typedef struct __res_state *res_state; --# undef __need_res_state --#endif -- --#ifdef _RESOLV_H_ --/* -- * Revision information. This is the release date in YYYYMMDD format. -- * It can change every day so the right thing to do with it is use it -- * in preprocessor commands such as "#if (__RES > 19931104)". Do not -- * compare for equality; rather, use it to determine whether your resolver -- * is new enough to contain a certain feature. -- */ -- --#define __RES 19991006 -- --/* -- * Resolver configuration file. -- * Normally not present, but may contain the address of the -- * inital name server(s) to query and the domain search list. -- */ -- --#ifndef _PATH_RESCONF --#define _PATH_RESCONF "/etc/resolv.conf" --#endif -- --struct res_sym { -- int number; /* Identifying number, like T_MX */ -- char * name; /* Its symbolic name, like "MX" */ -- char * humanname; /* Its fun name, like "mail exchanger" */ --}; -- --/* -- * Resolver flags (used to be discrete per-module statics ints). -- */ --#define RES_F_VC 0x00000001 /* socket is TCP */ --#define RES_F_CONN 0x00000002 /* socket is connected */ --#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */ -- --/* res_findzonecut() options */ --#define RES_EXHAUSTIVE 0x00000001 /* always do all queries */ -- --/* -- * Resolver options (keep these in synch with res_debug.c, please) -- */ --#define RES_INIT 0x00000001 /* address initialized */ --#define RES_DEBUG 0x00000002 /* print debug messages */ --#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/ --#define RES_USEVC 0x00000008 /* use virtual circuit */ --#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */ --#define RES_IGNTC 0x00000020 /* ignore trucation errors */ --#define RES_RECURSE 0x00000040 /* recursion desired */ --#define RES_DEFNAMES 0x00000080 /* use default domain name */ --#define RES_STAYOPEN 0x00000100 /* Keep TCP socket open */ --#define RES_DNSRCH 0x00000200 /* search up local domain tree */ --#define RES_INSECURE1 0x00000400 /* type 1 security disabled */ --#define RES_INSECURE2 0x00000800 /* type 2 security disabled */ --#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ --#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ --#define RES_ROTATE 0x00004000 /* rotate ns list after each query */ --#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity (!IMPL) */ --#define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */ --#define RES_BLAST 0x00020000 /* blast all recursive servers */ --#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte -- strings */ --#define RES_NOIP6DOTINT 0x00080000 /* Do not use .ip6.int in IPv6 -- reverse lookup */ --#define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */ --#define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */ --#define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each -- request */ --#define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */ --#define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name -- as a TLD. */ -- --#define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) -- --/* -- * Resolver "pfcode" values. Used by dig. -- */ --#define RES_PRF_STATS 0x00000001 --#define RES_PRF_UPDATE 0x00000002 --#define RES_PRF_CLASS 0x00000004 --#define RES_PRF_CMD 0x00000008 --#define RES_PRF_QUES 0x00000010 --#define RES_PRF_ANS 0x00000020 --#define RES_PRF_AUTH 0x00000040 --#define RES_PRF_ADD 0x00000080 --#define RES_PRF_HEAD1 0x00000100 --#define RES_PRF_HEAD2 0x00000200 --#define RES_PRF_TTLID 0x00000400 --#define RES_PRF_HEADX 0x00000800 --#define RES_PRF_QUERY 0x00001000 --#define RES_PRF_REPLY 0x00002000 --#define RES_PRF_INIT 0x00004000 --/* 0x00008000 */ -- --/* Things involving an internal (static) resolver context. */ --__BEGIN_DECLS --extern struct __res_state *__res_state(void) __attribute__ ((__const__)); --__END_DECLS --#define _res (*__res_state()) -- --#ifndef __BIND_NOSTATIC --#define fp_nquery __fp_nquery --#define fp_query __fp_query --#define hostalias __hostalias --#define p_query __p_query --#define res_close __res_close --#define res_init __res_init --#define res_isourserver __res_isourserver --#define res_mkquery __res_mkquery --#define res_query __res_query --#define res_querydomain __res_querydomain --#define res_search __res_search --#define res_send __res_send -- --__BEGIN_DECLS --void fp_nquery (const u_char *, int, FILE *) __THROW; --void fp_query (const u_char *, FILE *) __THROW; --const char * hostalias (const char *) __THROW; --void p_query (const u_char *) __THROW; --void res_close (void) __THROW; --int res_init (void) __THROW; --int res_isourserver (const struct sockaddr_in *) __THROW; --int res_mkquery (int, const char *, int, int, const u_char *, -- int, const u_char *, u_char *, int) __THROW; --int res_query (const char *, int, int, u_char *, int) __THROW; --int res_querydomain (const char *, const char *, int, int, -- u_char *, int) __THROW; --int res_search (const char *, int, int, u_char *, int) __THROW; --int res_send (const u_char *, int, u_char *, int) __THROW; --__END_DECLS --#endif -- --#define b64_ntop __b64_ntop --#define b64_pton __b64_pton --#define dn_comp __dn_comp --#define dn_count_labels __dn_count_labels --#define dn_expand __dn_expand --#define dn_skipname __dn_skipname --#define fp_resstat __fp_resstat --#define loc_aton __loc_aton --#define loc_ntoa __loc_ntoa --#define p_cdname __p_cdname --#define p_cdnname __p_cdnname --#define p_class __p_class --#define p_fqname __p_fqname --#define p_fqnname __p_fqnname --#define p_option __p_option --#define p_secstodate __p_secstodate --#define p_section __p_section --#define p_time __p_time --#define p_type __p_type --#define p_rcode __p_rcode --#define putlong __putlong --#define putshort __putshort --#define res_dnok __res_dnok --#define res_hnok __res_hnok --#define res_hostalias __res_hostalias --#define res_mailok __res_mailok --#define res_nameinquery __res_nameinquery --#define res_nclose __res_nclose --#define res_ninit __res_ninit --#define res_nmkquery __res_nmkquery --#define res_npquery __res_npquery --#define res_nquery __res_nquery --#define res_nquerydomain __res_nquerydomain --#define res_nsearch __res_nsearch --#define res_nsend __res_nsend --#define res_nisourserver __res_nisourserver --#define res_ownok __res_ownok --#define res_queriesmatch __res_queriesmatch --#define res_randomid __res_randomid --#define sym_ntop __sym_ntop --#define sym_ntos __sym_ntos --#define sym_ston __sym_ston --__BEGIN_DECLS --int res_hnok (const char *) __THROW; --int res_ownok (const char *) __THROW; --int res_mailok (const char *) __THROW; --int res_dnok (const char *) __THROW; --int sym_ston (const struct res_sym *, const char *, int *) __THROW; --const char * sym_ntos (const struct res_sym *, int, int *) __THROW; --const char * sym_ntop (const struct res_sym *, int, int *) __THROW; --int b64_ntop (u_char const *, size_t, char *, size_t) __THROW; --int b64_pton (char const *, u_char *, size_t) __THROW; --int loc_aton (const char *__ascii, u_char *__binary) __THROW; --const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW; --int dn_skipname (const u_char *, const u_char *) __THROW; --void putlong (u_int32_t, u_char *) __THROW; --void putshort (u_int16_t, u_char *) __THROW; --const char * p_class (int) __THROW; --const char * p_time (u_int32_t) __THROW; --const char * p_type (int) __THROW; --const char * p_rcode (int) __THROW; --const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *) -- __THROW; --const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW; --const u_char * p_fqnname (const u_char *__cp, const u_char *__msg, -- int, char *, int) __THROW; --const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW; --const char * p_option (u_long __option) __THROW; --char * p_secstodate (u_long) __THROW; --int dn_count_labels (const char *) __THROW; --int dn_comp (const char *, u_char *, int, u_char **, u_char **) -- __THROW; --int dn_expand (const u_char *, const u_char *, const u_char *, -- char *, int) __THROW; --u_int res_randomid (void) __THROW; --int res_nameinquery (const char *, int, int, -- const u_char *, const u_char *) __THROW; --int res_queriesmatch (const u_char *, const u_char *, -- const u_char *, const u_char *) __THROW; --const char * p_section (int __section, int __opcode) __THROW; --/* Things involving a resolver context. */ --int res_ninit (res_state) __THROW; --int res_nisourserver (const res_state, -- const struct sockaddr_in *) __THROW; --void fp_resstat (const res_state, FILE *) __THROW; --void res_npquery (const res_state, const u_char *, int, FILE *) -- __THROW; --const char * res_hostalias (const res_state, const char *, char *, size_t) -- __THROW; --int res_nquery (res_state, const char *, int, int, u_char *, int) -- __THROW; --int res_nsearch (res_state, const char *, int, int, u_char *, int) -- __THROW; --int res_nquerydomain (res_state, const char *, const char *, int, -- int, u_char *, int) __THROW; --int res_nmkquery (res_state, int, const char *, int, int, -- const u_char *, int, const u_char *, u_char *, -- int) __THROW; --int res_nsend (res_state, const u_char *, int, u_char *, int) -- __THROW; --void res_nclose (res_state) __THROW; --__END_DECLS --#endif -- --#endif /* !_RESOLV_H_ */ -Index: glibc-2.19/shadow/Makefile -=================================================================== ---- glibc-2.19.orig/shadow/Makefile -+++ glibc-2.19/shadow/Makefile -@@ -34,5 +34,6 @@ CFLAGS-fgetspent_r.c = -fexceptions $(li - CFLAGS-putspent.c = -fexceptions $(libio-mtsafe) - CFLAGS-getspnam.c = -fexceptions - CFLAGS-getspnam_r.c = -fexceptions -+CPPFLAGS-lckpwdf.c = -DSYSCONFDIR='"$(sysconfdir)"' - - include ../Rules -Index: glibc-2.19/shadow/lckpwdf.c -=================================================================== ---- glibc-2.19.orig/shadow/lckpwdf.c -+++ glibc-2.19/shadow/lckpwdf.c -@@ -29,7 +29,7 @@ - - - /* Name of the lock file. */ --#define PWD_LOCKFILE "/etc/.pwd.lock" -+#define PWD_LOCKFILE SYSCONFDIR "/.pwd.lock" - - /* How long to wait for getting the lock before returning with an - error. */ -Index: glibc-2.19/configure.ac -=================================================================== ---- glibc-2.19.orig/configure.ac -+++ glibc-2.19/configure.ac -@@ -2173,7 +2173,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE " - AC_SUBST(VERSION) - AC_SUBST(RELEASE) - --AC_CONFIG_FILES([config.make Makefile]) -+AC_CONFIG_FILES([config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h]) - AC_CONFIG_COMMANDS([default],[[ - case $CONFIG_FILES in *config.make*) - echo "$config_vars" >> config.make;; -Index: glibc-2.19/resolv/netdb.h.in -=================================================================== ---- /dev/null -+++ glibc-2.19/resolv/netdb.h.in -@@ -0,0 +1,715 @@ -+ /* Copyright (C) 1996-2014 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+/* All data returned by the network data base library are supplied in -+ host order and returned in network order (suitable for use in -+ system calls). */ -+ -+#ifndef _NETDB_H -+#define _NETDB_H 1 -+ -+#include <features.h> -+ -+#include <netinet/in.h> -+#include <stdint.h> -+#ifdef __USE_MISC -+/* This is necessary to make this include file properly replace the -+ Sun version. */ -+# include <rpc/netdb.h> -+#endif -+ -+#ifdef __USE_GNU -+# define __need_sigevent_t -+# include <bits/siginfo.h> -+# define __need_timespec -+# include <time.h> -+#endif -+ -+#include <bits/netdb.h> -+ -+/* Absolute file name for network data base files. */ -+#define _PATH_HEQUIV "@libc_cv_sysconfdir@/hosts.equiv" -+#define _PATH_HOSTS "@libc_cv_sysconfdir@/hosts" -+#define _PATH_NETWORKS "@libc_cv_sysconfdir@/networks" -+#define _PATH_NSSWITCH_CONF "@libc_cv_sysconfdir@/nsswitch.conf" -+#define _PATH_PROTOCOLS "@libc_cv_sysconfdir@/protocols" -+#define _PATH_SERVICES "@libc_cv_sysconfdir@/services" -+ -+ -+__BEGIN_DECLS -+ -+#if defined __USE_MISC || !defined __USE_XOPEN2K8 -+/* Error status for non-reentrant lookup functions. -+ We use a macro to access always the thread-specific `h_errno' variable. */ -+# define h_errno (*__h_errno_location ()) -+ -+/* Function to get address of global `h_errno' variable. */ -+extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); -+ -+ -+/* Possible values left in `h_errno'. */ -+# define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found. */ -+# define TRY_AGAIN 2 /* Non-Authoritative Host not found, -+ or SERVERFAIL. */ -+# define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, -+ NOTIMP. */ -+# define NO_DATA 4 /* Valid name, no data record of requested -+ type. */ -+#endif -+#ifdef __USE_MISC -+# define NETDB_INTERNAL -1 /* See errno. */ -+# define NETDB_SUCCESS 0 /* No problem. */ -+# define NO_ADDRESS NO_DATA /* No address, look for MX record. */ -+#endif -+ -+#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED -+/* Highest reserved Internet port number. */ -+# define IPPORT_RESERVED 1024 -+#endif -+ -+#ifdef __USE_GNU -+/* Scope delimiter for getaddrinfo(), getnameinfo(). */ -+# define SCOPE_DELIMITER '%' -+#endif -+ -+#ifdef __USE_MISC -+/* Print error indicated by `h_errno' variable on standard error. STR -+ if non-null is printed before the error string. */ -+extern void herror (const char *__str) __THROW; -+ -+/* Return string associated with error ERR_NUM. */ -+extern const char *hstrerror (int __err_num) __THROW; -+#endif -+ -+ -+/* Description of data base entry for a single host. */ -+struct hostent -+{ -+ char *h_name; /* Official name of host. */ -+ char **h_aliases; /* Alias list. */ -+ int h_addrtype; /* Host address type. */ -+ int h_length; /* Length of address. */ -+ char **h_addr_list; /* List of addresses from name server. */ -+#ifdef __USE_MISC -+# define h_addr h_addr_list[0] /* Address, for backward compatibility.*/ -+#endif -+}; -+ -+/* Open host data base files and mark them as staying open even after -+ a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void sethostent (int __stay_open); -+ -+/* Close host data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endhostent (void); -+ -+/* Get next entry from host data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct hostent *gethostent (void); -+ -+/* Return entry from host data base which address match ADDR with -+ length LEN and type TYPE. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len, -+ int __type); -+ -+/* Return entry from host data base for host with NAME. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct hostent *gethostbyname (const char *__name); -+ -+#ifdef __USE_MISC -+/* Return entry from host data base for host with NAME. AF must be -+ set to the address type which is `AF_INET' for IPv4 or `AF_INET6' -+ for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern struct hostent *gethostbyname2 (const char *__name, int __af); -+ -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. The last -+ argument is a pointer to a variable which gets the value which -+ would be stored in the global variable `herrno' by the -+ non-reentrant functions. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int gethostent_r (struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len, -+ int __type, -+ struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int gethostbyname_r (const char *__restrict __name, -+ struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int gethostbyname2_r (const char *__restrict __name, int __af, -+ struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+#endif /* misc */ -+ -+ -+/* Open network data base files and mark them as staying open even -+ after a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void setnetent (int __stay_open); -+ -+/* Close network data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endnetent (void); -+ -+/* Get next entry from network data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct netent *getnetent (void); -+ -+/* Return entry from network data base which address match NET and -+ type TYPE. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct netent *getnetbyaddr (uint32_t __net, int __type); -+ -+/* Return entry from network data base for network with NAME. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct netent *getnetbyname (const char *__name); -+ -+#ifdef __USE_MISC -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. The last -+ argument is a pointer to a variable which gets the value which -+ would be stored in the global variable `herrno' by the -+ non-reentrant functions. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int getnetent_r (struct netent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct netent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int getnetbyaddr_r (uint32_t __net, int __type, -+ struct netent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct netent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int getnetbyname_r (const char *__restrict __name, -+ struct netent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct netent **__restrict __result, -+ int *__restrict __h_errnop); -+#endif /* misc */ -+ -+ -+/* Description of data base entry for a single service. */ -+struct servent -+{ -+ char *s_name; /* Official service name. */ -+ char **s_aliases; /* Alias list. */ -+ int s_port; /* Port number. */ -+ char *s_proto; /* Protocol to use. */ -+}; -+ -+/* Open service data base files and mark them as staying open even -+ after a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void setservent (int __stay_open); -+ -+/* Close service data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endservent (void); -+ -+/* Get next entry from service data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct servent *getservent (void); -+ -+/* Return entry from network data base for network with NAME and -+ protocol PROTO. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct servent *getservbyname (const char *__name, const char *__proto); -+ -+/* Return entry from service data base which matches port PORT and -+ protocol PROTO. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct servent *getservbyport (int __port, const char *__proto); -+ -+ -+#ifdef __USE_MISC -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int getservent_r (struct servent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct servent **__restrict __result); -+ -+extern int getservbyname_r (const char *__restrict __name, -+ const char *__restrict __proto, -+ struct servent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct servent **__restrict __result); -+ -+extern int getservbyport_r (int __port, const char *__restrict __proto, -+ struct servent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct servent **__restrict __result); -+#endif /* misc */ -+ -+ -+/* Description of data base entry for a single service. */ -+struct protoent -+{ -+ char *p_name; /* Official protocol name. */ -+ char **p_aliases; /* Alias list. */ -+ int p_proto; /* Protocol number. */ -+}; -+ -+/* Open protocol data base files and mark them as staying open even -+ after a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void setprotoent (int __stay_open); -+ -+/* Close protocol data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endprotoent (void); -+ -+/* Get next entry from protocol data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct protoent *getprotoent (void); -+ -+/* Return entry from protocol data base for network with NAME. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct protoent *getprotobyname (const char *__name); -+ -+/* Return entry from protocol data base which number is PROTO. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct protoent *getprotobynumber (int __proto); -+ -+ -+#ifdef __USE_MISC -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int getprotoent_r (struct protoent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct protoent **__restrict __result); -+ -+extern int getprotobyname_r (const char *__restrict __name, -+ struct protoent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct protoent **__restrict __result); -+ -+extern int getprotobynumber_r (int __proto, -+ struct protoent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct protoent **__restrict __result); -+ -+ -+/* Establish network group NETGROUP for enumeration. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int setnetgrent (const char *__netgroup); -+ -+/* Free all space allocated by previous `setnetgrent' call. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern void endnetgrent (void); -+ -+/* Get next member of netgroup established by last `setnetgrent' call -+ and return pointers to elements in HOSTP, USERP, and DOMAINP. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int getnetgrent (char **__restrict __hostp, -+ char **__restrict __userp, -+ char **__restrict __domainp); -+ -+ -+/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN). -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int innetgr (const char *__netgroup, const char *__host, -+ const char *__user, const char *__domain); -+ -+/* Reentrant version of `getnetgrent' where result is placed in BUFFER. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int getnetgrent_r (char **__restrict __hostp, -+ char **__restrict __userp, -+ char **__restrict __domainp, -+ char *__restrict __buffer, size_t __buflen); -+#endif /* misc */ -+ -+ -+#ifdef __USE_MISC -+/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD. -+ The local user is LOCUSER, on the remote machine the command is -+ executed as REMUSER. In *FD2P the descriptor to the socket for the -+ connection is returned. The caller must have the right to use a -+ reserved port. When the function returns *AHOST contains the -+ official host name. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rcmd (char **__restrict __ahost, unsigned short int __rport, -+ const char *__restrict __locuser, -+ const char *__restrict __remuser, -+ const char *__restrict __cmd, int *__restrict __fd2p); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport, -+ const char *__restrict __locuser, -+ const char *__restrict __remuser, -+ const char *__restrict __cmd, int *__restrict __fd2p, -+ sa_family_t __af); -+ -+/* Call `rexecd' at port RPORT on remote machine *AHOST to execute -+ CMD. The process runs at the remote machine using the ID of user -+ NAME whose cleartext password is PASSWD. In *FD2P the descriptor -+ to the socket for the connection is returned. When the function -+ returns *AHOST contains the official host name. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rexec (char **__restrict __ahost, int __rport, -+ const char *__restrict __name, -+ const char *__restrict __pass, -+ const char *__restrict __cmd, int *__restrict __fd2p); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rexec_af (char **__restrict __ahost, int __rport, -+ const char *__restrict __name, -+ const char *__restrict __pass, -+ const char *__restrict __cmd, int *__restrict __fd2p, -+ sa_family_t __af); -+ -+/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER. -+ If SUSER is not zero the user tries to become superuser. Return 0 if -+ it is possible. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int ruserok (const char *__rhost, int __suser, -+ const char *__remuser, const char *__locuser); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int ruserok_af (const char *__rhost, int __suser, -+ const char *__remuser, const char *__locuser, -+ sa_family_t __af); -+ -+/* Check whether user REMUSER on system indicated by IPv4 address -+ RADDR is allowed to login as LOCUSER. Non-IPv4 (e.g., IPv6) are -+ not supported. If SUSER is not zero the user tries to become -+ superuser. Return 0 if it is possible. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int iruserok (uint32_t __raddr, int __suser, -+ const char *__remuser, const char *__locuser); -+ -+/* This is the equivalent function where the pfamiliy if the address -+ pointed to by RADDR is determined by the value of AF. It therefore -+ can be used for IPv6 -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int iruserok_af (const void *__raddr, int __suser, -+ const char *__remuser, const char *__locuser, -+ sa_family_t __af); -+ -+/* Try to allocate reserved port, returning a descriptor for a socket opened -+ at this port or -1 if unsuccessful. The search for an available port -+ will start at ALPORT and continues with lower numbers. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rresvport (int *__alport); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rresvport_af (int *__alport, sa_family_t __af); -+#endif -+ -+ -+/* Extension from POSIX.1g. */ -+#ifdef __USE_POSIX -+/* Structure to contain information about address of a service provider. */ -+struct addrinfo -+{ -+ int ai_flags; /* Input flags. */ -+ int ai_family; /* Protocol family for socket. */ -+ int ai_socktype; /* Socket type. */ -+ int ai_protocol; /* Protocol for socket. */ -+ socklen_t ai_addrlen; /* Length of socket address. */ -+ struct sockaddr *ai_addr; /* Socket address for socket. */ -+ char *ai_canonname; /* Canonical name for service location. */ -+ struct addrinfo *ai_next; /* Pointer to next in list. */ -+}; -+ -+# ifdef __USE_GNU -+/* Structure used as control block for asynchronous lookup. */ -+struct gaicb -+{ -+ const char *ar_name; /* Name to look up. */ -+ const char *ar_service; /* Service name. */ -+ const struct addrinfo *ar_request; /* Additional request specification. */ -+ struct addrinfo *ar_result; /* Pointer to result. */ -+ /* The following are internal elements. */ -+ int __return; -+ int __glibc_reserved[5]; -+}; -+ -+/* Lookup mode. */ -+# define GAI_WAIT 0 -+# define GAI_NOWAIT 1 -+# endif -+ -+/* Possible values for `ai_flags' field in `addrinfo' structure. */ -+# define AI_PASSIVE 0x0001 /* Socket address is intended for `bind'. */ -+# define AI_CANONNAME 0x0002 /* Request for canonical name. */ -+# define AI_NUMERICHOST 0x0004 /* Don't use name resolution. */ -+# define AI_V4MAPPED 0x0008 /* IPv4 mapped addresses are acceptable. */ -+# define AI_ALL 0x0010 /* Return IPv4 mapped and IPv6 addresses. */ -+# define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose -+ returned address type.. */ -+# ifdef __USE_GNU -+# define AI_IDN 0x0040 /* IDN encode input (assuming it is encoded -+ in the current locale's character set) -+ before looking it up. */ -+# define AI_CANONIDN 0x0080 /* Translate canonical name from IDN format. */ -+# define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode -+ code points. */ -+# define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to -+ STD3 rules. */ -+# endif -+# define AI_NUMERICSERV 0x0400 /* Don't use name resolution. */ -+ -+/* Error values for `getaddrinfo' function. */ -+# define EAI_BADFLAGS -1 /* Invalid value for `ai_flags' field. */ -+# define EAI_NONAME -2 /* NAME or SERVICE is unknown. */ -+# define EAI_AGAIN -3 /* Temporary failure in name resolution. */ -+# define EAI_FAIL -4 /* Non-recoverable failure in name res. */ -+# define EAI_FAMILY -6 /* `ai_family' not supported. */ -+# define EAI_SOCKTYPE -7 /* `ai_socktype' not supported. */ -+# define EAI_SERVICE -8 /* SERVICE not supported for `ai_socktype'. */ -+# define EAI_MEMORY -10 /* Memory allocation failure. */ -+# define EAI_SYSTEM -11 /* System error returned in `errno'. */ -+# define EAI_OVERFLOW -12 /* Argument buffer overflow. */ -+# ifdef __USE_GNU -+# define EAI_NODATA -5 /* No address associated with NAME. */ -+# define EAI_ADDRFAMILY -9 /* Address family for NAME not supported. */ -+# define EAI_INPROGRESS -100 /* Processing request in progress. */ -+# define EAI_CANCELED -101 /* Request canceled. */ -+# define EAI_NOTCANCELED -102 /* Request not canceled. */ -+# define EAI_ALLDONE -103 /* All requests done. */ -+# define EAI_INTR -104 /* Interrupted by a signal. */ -+# define EAI_IDN_ENCODE -105 /* IDN encoding failed. */ -+# endif -+ -+# ifdef __USE_MISC -+# define NI_MAXHOST 1025 -+# define NI_MAXSERV 32 -+# endif -+ -+# define NI_NUMERICHOST 1 /* Don't try to look up hostname. */ -+# define NI_NUMERICSERV 2 /* Don't convert port number to name. */ -+# define NI_NOFQDN 4 /* Only return nodename portion. */ -+# define NI_NAMEREQD 8 /* Don't return numeric addresses. */ -+# define NI_DGRAM 16 /* Look up UDP service rather than TCP. */ -+# ifdef __USE_GNU -+# define NI_IDN 32 /* Convert name from IDN format. */ -+# define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode -+ code points. */ -+# define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to -+ STD3 rules. */ -+# endif -+ -+/* Translate name of a service location and/or a service name to set of -+ socket addresses. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern int getaddrinfo (const char *__restrict __name, -+ const char *__restrict __service, -+ const struct addrinfo *__restrict __req, -+ struct addrinfo **__restrict __pai); -+ -+/* Free `addrinfo' structure AI including associated storage. */ -+extern void freeaddrinfo (struct addrinfo *__ai) __THROW; -+ -+/* Convert error return from getaddrinfo() to a string. */ -+extern const char *gai_strerror (int __ecode) __THROW; -+ -+/* Translate a socket address to a location and service name. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern int getnameinfo (const struct sockaddr *__restrict __sa, -+ socklen_t __salen, char *__restrict __host, -+ socklen_t __hostlen, char *__restrict __serv, -+ socklen_t __servlen, int __flags); -+#endif /* POSIX */ -+ -+#ifdef __USE_GNU -+/* Enqueue ENT requests from the LIST. If MODE is GAI_WAIT wait until all -+ requests are handled. If WAIT is GAI_NOWAIT return immediately after -+ queueing the requests and signal completion according to SIG. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr], -+ int __ent, struct sigevent *__restrict __sig); -+ -+/* Suspend execution of the thread until at least one of the ENT requests -+ in LIST is handled. If TIMEOUT is not a null pointer it specifies the -+ longest time the function keeps waiting before returning with an error. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int gai_suspend (const struct gaicb *const __list[], int __ent, -+ const struct timespec *__timeout); -+ -+/* Get the error status of the request REQ. */ -+extern int gai_error (struct gaicb *__req) __THROW; -+ -+/* Cancel the requests associated with GAICBP. */ -+extern int gai_cancel (struct gaicb *__gaicbp) __THROW; -+#endif /* GNU */ -+ -+__END_DECLS -+ -+#endif /* netdb.h */ -Index: glibc-2.19/resolv/resolv.h.in -=================================================================== ---- /dev/null -+++ glibc-2.19/resolv/resolv.h.in -@@ -0,0 +1,389 @@ -+/* -+ * Copyright (c) 1983, 1987, 1989 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+/* -+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ */ -+ -+/* -+ * @(#)resolv.h 8.1 (Berkeley) 6/2/93 -+ * $BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $ -+ */ -+ -+#ifndef _RESOLV_H_ -+ -+/* These headers are needed for types used in the `struct res_state' -+ declaration. */ -+#include <sys/types.h> -+#include <netinet/in.h> -+ -+#ifndef __need_res_state -+# define _RESOLV_H_ -+ -+# include <sys/param.h> -+# include <sys/cdefs.h> -+# include <stdio.h> -+# include <arpa/nameser.h> -+#endif -+ -+#ifndef __res_state_defined -+# define __res_state_defined -+ -+typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error } -+ res_sendhookact; -+ -+typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns, -+ const u_char **__query, -+ int *__querylen, -+ u_char *__ans, -+ int __anssiz, -+ int *__resplen); -+ -+typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, -+ const u_char *__query, -+ int __querylen, -+ u_char *__ans, -+ int __anssiz, -+ int *__resplen); -+ -+/* -+ * Global defines and variables for resolver stub. -+ */ -+# define MAXNS 3 /* max # name servers we'll track */ -+# define MAXDFLSRCH 3 /* # default domain levels to try */ -+# define MAXDNSRCH 6 /* max # domains in search path */ -+# define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ -+ -+# define RES_TIMEOUT 5 /* min. seconds between retries */ -+# define MAXRESOLVSORT 10 /* number of net to sort on */ -+# define RES_MAXNDOTS 15 /* should reflect bit field size */ -+# define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ -+# define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ -+# define RES_DFLRETRY 2 /* Default #/tries. */ -+# define RES_MAXTIME 65535 /* Infinity, in milliseconds. */ -+ -+struct __res_state { -+ int retrans; /* retransmition time interval */ -+ int retry; /* number of times to retransmit */ -+ u_long options; /* option flags - see below. */ -+ int nscount; /* number of name servers */ -+ struct sockaddr_in -+ nsaddr_list[MAXNS]; /* address of name server */ -+# define nsaddr nsaddr_list[0] /* for backward compatibility */ -+ u_short id; /* current message id */ -+ /* 2 byte hole here. */ -+ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ -+ char defdname[256]; /* default domain (deprecated) */ -+ u_long pfcode; /* RES_PRF_ flags - see below. */ -+ unsigned ndots:4; /* threshold for initial abs. query */ -+ unsigned nsort:4; /* number of elements in sort_list[] */ -+ unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */ -+ unsigned unused:23; -+ struct { -+ struct in_addr addr; -+ u_int32_t mask; -+ } sort_list[MAXRESOLVSORT]; -+ /* 4 byte hole here on 64-bit architectures. */ -+ res_send_qhook qhook; /* query hook */ -+ res_send_rhook rhook; /* response hook */ -+ int res_h_errno; /* last one set for this context */ -+ int _vcsock; /* PRIVATE: for res_send VC i/o */ -+ u_int _flags; /* PRIVATE: see below */ -+ /* 4 byte hole here on 64-bit architectures. */ -+ union { -+ char pad[52]; /* On an i386 this means 512b total. */ -+ struct { -+ u_int16_t nscount; -+ u_int16_t nsmap[MAXNS]; -+ int nssocks[MAXNS]; -+ u_int16_t nscount6; -+ u_int16_t nsinit; -+ struct sockaddr_in6 *nsaddrs[MAXNS]; -+#ifdef _LIBC -+ unsigned long long int initstamp -+ __attribute__((packed)); -+#else -+ unsigned int _initstamp[2]; -+#endif -+ } _ext; -+ } _u; -+}; -+ -+typedef struct __res_state *res_state; -+# undef __need_res_state -+#endif -+ -+#ifdef _RESOLV_H_ -+/* -+ * Revision information. This is the release date in YYYYMMDD format. -+ * It can change every day so the right thing to do with it is use it -+ * in preprocessor commands such as "#if (__RES > 19931104)". Do not -+ * compare for equality; rather, use it to determine whether your resolver -+ * is new enough to contain a certain feature. -+ */ -+ -+#define __RES 19991006 -+ -+/* -+ * Resolver configuration file. -+ * Normally not present, but may contain the address of the -+ * inital name server(s) to query and the domain search list. -+ */ -+ -+#ifndef _PATH_RESCONF -+#define _PATH_RESCONF "@libc_cv_sysconfdir@/resolv.conf" -+#endif -+ -+struct res_sym { -+ int number; /* Identifying number, like T_MX */ -+ char * name; /* Its symbolic name, like "MX" */ -+ char * humanname; /* Its fun name, like "mail exchanger" */ -+}; -+ -+/* -+ * Resolver flags (used to be discrete per-module statics ints). -+ */ -+#define RES_F_VC 0x00000001 /* socket is TCP */ -+#define RES_F_CONN 0x00000002 /* socket is connected */ -+#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */ -+ -+/* res_findzonecut() options */ -+#define RES_EXHAUSTIVE 0x00000001 /* always do all queries */ -+ -+/* -+ * Resolver options (keep these in synch with res_debug.c, please) -+ */ -+#define RES_INIT 0x00000001 /* address initialized */ -+#define RES_DEBUG 0x00000002 /* print debug messages */ -+#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/ -+#define RES_USEVC 0x00000008 /* use virtual circuit */ -+#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */ -+#define RES_IGNTC 0x00000020 /* ignore trucation errors */ -+#define RES_RECURSE 0x00000040 /* recursion desired */ -+#define RES_DEFNAMES 0x00000080 /* use default domain name */ -+#define RES_STAYOPEN 0x00000100 /* Keep TCP socket open */ -+#define RES_DNSRCH 0x00000200 /* search up local domain tree */ -+#define RES_INSECURE1 0x00000400 /* type 1 security disabled */ -+#define RES_INSECURE2 0x00000800 /* type 2 security disabled */ -+#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ -+#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ -+#define RES_ROTATE 0x00004000 /* rotate ns list after each query */ -+#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity (!IMPL) */ -+#define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */ -+#define RES_BLAST 0x00020000 /* blast all recursive servers */ -+#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte -+ strings */ -+#define RES_NOIP6DOTINT 0x00080000 /* Do not use .ip6.int in IPv6 -+ reverse lookup */ -+#define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */ -+#define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */ -+#define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each -+ request */ -+#define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */ -+#define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name -+ as a TLD. */ -+ -+#define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) -+ -+/* -+ * Resolver "pfcode" values. Used by dig. -+ */ -+#define RES_PRF_STATS 0x00000001 -+#define RES_PRF_UPDATE 0x00000002 -+#define RES_PRF_CLASS 0x00000004 -+#define RES_PRF_CMD 0x00000008 -+#define RES_PRF_QUES 0x00000010 -+#define RES_PRF_ANS 0x00000020 -+#define RES_PRF_AUTH 0x00000040 -+#define RES_PRF_ADD 0x00000080 -+#define RES_PRF_HEAD1 0x00000100 -+#define RES_PRF_HEAD2 0x00000200 -+#define RES_PRF_TTLID 0x00000400 -+#define RES_PRF_HEADX 0x00000800 -+#define RES_PRF_QUERY 0x00001000 -+#define RES_PRF_REPLY 0x00002000 -+#define RES_PRF_INIT 0x00004000 -+/* 0x00008000 */ -+ -+/* Things involving an internal (static) resolver context. */ -+__BEGIN_DECLS -+extern struct __res_state *__res_state(void) __attribute__ ((__const__)); -+__END_DECLS -+#define _res (*__res_state()) -+ -+#ifndef __BIND_NOSTATIC -+#define fp_nquery __fp_nquery -+#define fp_query __fp_query -+#define hostalias __hostalias -+#define p_query __p_query -+#define res_close __res_close -+#define res_init __res_init -+#define res_isourserver __res_isourserver -+#define res_mkquery __res_mkquery -+#define res_query __res_query -+#define res_querydomain __res_querydomain -+#define res_search __res_search -+#define res_send __res_send -+ -+__BEGIN_DECLS -+void fp_nquery (const u_char *, int, FILE *) __THROW; -+void fp_query (const u_char *, FILE *) __THROW; -+const char * hostalias (const char *) __THROW; -+void p_query (const u_char *) __THROW; -+void res_close (void) __THROW; -+int res_init (void) __THROW; -+int res_isourserver (const struct sockaddr_in *) __THROW; -+int res_mkquery (int, const char *, int, int, const u_char *, -+ int, const u_char *, u_char *, int) __THROW; -+int res_query (const char *, int, int, u_char *, int) __THROW; -+int res_querydomain (const char *, const char *, int, int, -+ u_char *, int) __THROW; -+int res_search (const char *, int, int, u_char *, int) __THROW; -+int res_send (const u_char *, int, u_char *, int) __THROW; -+__END_DECLS -+#endif -+ -+#define b64_ntop __b64_ntop -+#define b64_pton __b64_pton -+#define dn_comp __dn_comp -+#define dn_count_labels __dn_count_labels -+#define dn_expand __dn_expand -+#define dn_skipname __dn_skipname -+#define fp_resstat __fp_resstat -+#define loc_aton __loc_aton -+#define loc_ntoa __loc_ntoa -+#define p_cdname __p_cdname -+#define p_cdnname __p_cdnname -+#define p_class __p_class -+#define p_fqname __p_fqname -+#define p_fqnname __p_fqnname -+#define p_option __p_option -+#define p_secstodate __p_secstodate -+#define p_section __p_section -+#define p_time __p_time -+#define p_type __p_type -+#define p_rcode __p_rcode -+#define putlong __putlong -+#define putshort __putshort -+#define res_dnok __res_dnok -+#define res_hnok __res_hnok -+#define res_hostalias __res_hostalias -+#define res_mailok __res_mailok -+#define res_nameinquery __res_nameinquery -+#define res_nclose __res_nclose -+#define res_ninit __res_ninit -+#define res_nmkquery __res_nmkquery -+#define res_npquery __res_npquery -+#define res_nquery __res_nquery -+#define res_nquerydomain __res_nquerydomain -+#define res_nsearch __res_nsearch -+#define res_nsend __res_nsend -+#define res_nisourserver __res_nisourserver -+#define res_ownok __res_ownok -+#define res_queriesmatch __res_queriesmatch -+#define res_randomid __res_randomid -+#define sym_ntop __sym_ntop -+#define sym_ntos __sym_ntos -+#define sym_ston __sym_ston -+__BEGIN_DECLS -+int res_hnok (const char *) __THROW; -+int res_ownok (const char *) __THROW; -+int res_mailok (const char *) __THROW; -+int res_dnok (const char *) __THROW; -+int sym_ston (const struct res_sym *, const char *, int *) __THROW; -+const char * sym_ntos (const struct res_sym *, int, int *) __THROW; -+const char * sym_ntop (const struct res_sym *, int, int *) __THROW; -+int b64_ntop (u_char const *, size_t, char *, size_t) __THROW; -+int b64_pton (char const *, u_char *, size_t) __THROW; -+int loc_aton (const char *__ascii, u_char *__binary) __THROW; -+const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW; -+int dn_skipname (const u_char *, const u_char *) __THROW; -+void putlong (u_int32_t, u_char *) __THROW; -+void putshort (u_int16_t, u_char *) __THROW; -+const char * p_class (int) __THROW; -+const char * p_time (u_int32_t) __THROW; -+const char * p_type (int) __THROW; -+const char * p_rcode (int) __THROW; -+const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *) -+ __THROW; -+const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW; -+const u_char * p_fqnname (const u_char *__cp, const u_char *__msg, -+ int, char *, int) __THROW; -+const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW; -+const char * p_option (u_long __option) __THROW; -+char * p_secstodate (u_long) __THROW; -+int dn_count_labels (const char *) __THROW; -+int dn_comp (const char *, u_char *, int, u_char **, u_char **) -+ __THROW; -+int dn_expand (const u_char *, const u_char *, const u_char *, -+ char *, int) __THROW; -+u_int res_randomid (void) __THROW; -+int res_nameinquery (const char *, int, int, -+ const u_char *, const u_char *) __THROW; -+int res_queriesmatch (const u_char *, const u_char *, -+ const u_char *, const u_char *) __THROW; -+const char * p_section (int __section, int __opcode) __THROW; -+/* Things involving a resolver context. */ -+int res_ninit (res_state) __THROW; -+int res_nisourserver (const res_state, -+ const struct sockaddr_in *) __THROW; -+void fp_resstat (const res_state, FILE *) __THROW; -+void res_npquery (const res_state, const u_char *, int, FILE *) -+ __THROW; -+const char * res_hostalias (const res_state, const char *, char *, size_t) -+ __THROW; -+int res_nquery (res_state, const char *, int, int, u_char *, int) -+ __THROW; -+int res_nsearch (res_state, const char *, int, int, u_char *, int) -+ __THROW; -+int res_nquerydomain (res_state, const char *, const char *, int, -+ int, u_char *, int) __THROW; -+int res_nmkquery (res_state, int, const char *, int, int, -+ const u_char *, int, const u_char *, u_char *, -+ int) __THROW; -+int res_nsend (res_state, const u_char *, int, u_char *, int) -+ __THROW; -+void res_nclose (res_state) __THROW; -+__END_DECLS -+#endif -+ -+#endif /* !_RESOLV_H_ */ -Index: glibc-2.19/configure -=================================================================== ---- glibc-2.19.orig/configure -+++ glibc-2.19/configure -@@ -7387,7 +7387,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE " - - - --ac_config_files="$ac_config_files config.make Makefile" -+ac_config_files="$ac_config_files config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h" - - ac_config_commands="$ac_config_commands default" - -@@ -8107,6 +8107,9 @@ do - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "nss/db-Makefile") CONFIG_FILES="$CONFIG_FILES nss/db-Makefile" ;; -+ "resolv/netdb.h") CONFIG_FILES="$CONFIG_FILES resolv/netdb.h" ;; -+ "resolv/resolv.h") CONFIG_FILES="$CONFIG_FILES resolv/resolv.h" ;; - "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch deleted file mode 100644 index 341d8c5..0000000 --- a/sys-libs/glibc/files/2.19/glibc-2.19-hardened-configure-picdefault.patch +++ /dev/null @@ -1,30 +0,0 @@ -Prevent default-fPIE from confusing configure into thinking -PIC code is default. This causes glibc to build both PIC and -non-PIC code as normal, which on the hardened compiler generates -PIC and PIE. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> -Fixed for glibc 2.19 by Magnus Granberg <zorry@ume.nu> - ---- configure.ac -+++ configure.ac -@@ -2145,7 +2145,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then - libc_cv_pic_default=no - fi - rm -f conftest.*]) ---- configure -+++ configure -@@ -7698,7 +7698,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then - libc_cv_pic_default=no - fi - rm -f conftest.* diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch b/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch deleted file mode 100644 index 72a616a..0000000 --- a/sys-libs/glibc/files/2.19/glibc-2.19-ia64-gcc-4.8-reloc-hack.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/503838 -http://gcc.gnu.org/PR60465 -https://sourceware.org/ml/libc-alpha/2015-12/msg00556.html -https://trofi.github.io/posts/189-glibc-on-ia64-or-how-relocations-bootstrap.html - -newer versions of gcc generate relocations in the elf_get_dynamic_info func -which glibc relies on to populate some info structs. those structs are then -used by ldso to process relocations in itself. glibc requires that there are -no relocations until that point (*after* elf_get_dynamic_info), so we end up -crashing during elf_get_dynamic_info because the relocation has not yet been -processed. - -this hack shuffles the code in a way that tricks gcc into not generating the -relocation. we need to figure out something better for upstream. - ---- a/elf/get-dynamic-info.h -+++ b/elf/get-dynamic-info.h -@@ -66,8 +66,12 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) - info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM - + DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn; - else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM) -- info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM -- + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn; -+ { -+ d_tag_utype i = -+ DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM -+ + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM; -+ info[i] = dyn; -+ } - ++dyn; - } - diff --git a/sys-libs/glibc/files/2.19/glibc-2.19-vdso-disable.patch b/sys-libs/glibc/files/2.19/glibc-2.19-vdso-disable.patch deleted file mode 100644 index 31ed0d4..0000000 --- a/sys-libs/glibc/files/2.19/glibc-2.19-vdso-disable.patch +++ /dev/null @@ -1,37 +0,0 @@ -Disable vdso for some buggy kernels -http://thread.gmane.org/gmane.comp.lib.glibc.user/1903 - -Index: glibc-2.19/elf/dl-support.c -=================================================================== ---- glibc-2.19.orig/elf/dl-support.c -+++ glibc-2.19/elf/dl-support.c -@@ -260,16 +260,6 @@ _dl_aux_init (ElfW(auxv_t) *av) - case AT_FPUCW: - GLRO(dl_fpu_control) = av->a_un.a_val; - break; --#ifdef NEED_DL_SYSINFO -- case AT_SYSINFO: -- GL(dl_sysinfo) = av->a_un.a_val; -- break; --#endif --#ifdef NEED_DL_SYSINFO_DSO -- case AT_SYSINFO_EHDR: -- GL(dl_sysinfo_dso) = (void *) av->a_un.a_val; -- break; --#endif - case AT_UID: - uid ^= av->a_un.a_val; - seen |= 1; -Index: glibc-2.19/elf/setup-vdso.h -=================================================================== ---- glibc-2.19.orig/elf/setup-vdso.h -+++ glibc-2.19/elf/setup-vdso.h -@@ -20,7 +20,7 @@ static inline void __attribute__ ((alway - setup_vdso (struct link_map *main_map __attribute__ ((unused)), - struct link_map ***first_preload __attribute__ ((unused))) - { --#ifdef NEED_DL_SYSINFO_DSO -+#if 0 - if (GLRO(dl_sysinfo_dso) == NULL) - return; - diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch b/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch deleted file mode 100644 index 1480595..0000000 --- a/sys-libs/glibc/files/2.20/glibc-2.20-configurable-paths.patch +++ /dev/null @@ -1,3012 +0,0 @@ -Index: glibc-2.20/nis/Makefile -=================================================================== ---- glibc-2.20.orig/nis/Makefile -+++ glibc-2.20/nis/Makefile -@@ -58,6 +58,11 @@ libnsl-routines = yp_xdr ypclnt ypupdate - nis_clone_res nss-default - - libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) -+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' -+CPPFLAGS-compat-grp.c = $(SYSCONF-FLAGS) -+CPPFLAGS-compat-pwd.c = $(SYSCONF-FLAGS) -+CPPFLAGS-compat-spwd.c = $(SYSCONF-FLAGS) -+CPPFLAGS-compat-initgroups.c = $(SYSCONF-FLAGS) - libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes)) - - libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups \ -Index: glibc-2.20/nis/nss_compat/compat-grp.c -=================================================================== ---- glibc-2.20.orig/nis/nss_compat/compat-grp.c -+++ glibc-2.20/nis/nss_compat/compat-grp.c -@@ -120,7 +120,7 @@ internal_setgrent (ent_t *ent, int stayo - - if (ent->stream == NULL) - { -- ent->stream = fopen ("/etc/group", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/group", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.20/nis/nss_compat/compat-initgroups.c -=================================================================== ---- glibc-2.20.orig/nis/nss_compat/compat-initgroups.c -+++ glibc-2.20/nis/nss_compat/compat-initgroups.c -@@ -136,7 +136,7 @@ internal_setgrent (ent_t *ent) - else - ent->blacklist.current = 0; - -- ent->stream = fopen ("/etc/group", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/group", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.20/nis/nss_compat/compat-pwd.c -=================================================================== ---- glibc-2.20.orig/nis/nss_compat/compat-pwd.c -+++ glibc-2.20/nis/nss_compat/compat-pwd.c -@@ -235,7 +235,7 @@ internal_setpwent (ent_t *ent, int stayo - - if (ent->stream == NULL) - { -- ent->stream = fopen ("/etc/passwd", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/passwd", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.20/nis/nss_compat/compat-spwd.c -=================================================================== ---- glibc-2.20.orig/nis/nss_compat/compat-spwd.c -+++ glibc-2.20/nis/nss_compat/compat-spwd.c -@@ -191,7 +191,7 @@ internal_setspent (ent_t *ent, int stayo - - if (ent->stream == NULL) - { -- ent->stream = fopen ("/etc/shadow", "rme"); -+ ent->stream = fopen (SYSCONFDIR "/shadow", "rme"); - - if (ent->stream == NULL) - status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL; -Index: glibc-2.20/nss/Makefile -=================================================================== ---- glibc-2.20.orig/nss/Makefile -+++ glibc-2.20/nss/Makefile -@@ -41,6 +41,8 @@ extra-objs += $(makedb-modules:=.o) - - tests = test-netdb tst-nss-test1 test-digits-dots - xtests = bug-erange -+SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' -+CPPFLAGS-bug-erange.c = $(SYSCONF-FLAGS) - - # Specify rules for the nss_* modules. We have some services. - services := files db -@@ -57,6 +59,8 @@ vpath %.c $(subdir-dirs) ../locale/progr - - libnss_files-routines := $(addprefix files-,$(databases)) \ - files-initgroups files-have_o_cloexec files-init -+CPPFLAGS-files-init.c = $(SYSCONF-FLAGS) -+CPPFLAGS-files-initgroups.c = $(SYSCONF-FLAGS) - - libnss_db-dbs := $(addprefix db-,\ - $(filter-out hosts network key alias,\ -@@ -102,7 +106,7 @@ $(libnss_db-dbs:%=$(objpfx)%.c): $(objpf - - $(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o) - --$(inst_vardbdir)/Makefile: db-Makefile $(+force) -+$(inst_vardbdir)/Makefile: $(objpfx)db-Makefile $(+force) - $(do-install) - - CFLAGS-nss_test1.c = -DNOT_IN_libc=1 -Index: glibc-2.20/nss/bug-erange.c -=================================================================== ---- glibc-2.20.orig/nss/bug-erange.c -+++ glibc-2.20/nss/bug-erange.c -@@ -37,7 +37,7 @@ main (void) - { - printf ("gethostbyname_r failed: %s (errno: %m)\n", strerror (res)); - -- if (access ("/etc/resolv.conf", R_OK)) -+ if (access (SYSCONFDIR "/resolv.conf", R_OK)) - { - puts ("DNS probably not set up"); - return 0; -Index: glibc-2.20/nss/nss_files/files-init.c -=================================================================== ---- glibc-2.20.orig/nss/nss_files/files-init.c -+++ glibc-2.20/nss/nss_files/files-init.c -@@ -35,33 +35,33 @@ static union \ - } \ - } - --TF (pwd, "/etc/passwd"); --TF (grp, "/etc/group"); --TF (hst, "/etc/hosts"); --TF (resolv, "/etc/resolv.conf", .call_res_init = 1); --TF (serv, "/etc/services"); --TF (netgr, "/etc/netgroup"); -+TF (pwd, SYSCONFDIR "/passwd"); -+TF (grp, SYSCONFDIR "/group"); -+TF (hst, SYSCONFDIR "/hosts"); -+TF (resolv, SYSCONFDIR "/resolv.conf", .call_res_init = 1); -+TF (serv, SYSCONFDIR "/services"); -+TF (netgr, SYSCONFDIR "/netgroup"); - - - void - _nss_files_init (void (*cb) (size_t, struct traced_file *)) - { -- strcpy (pwd_traced_file.file.fname, "/etc/passwd"); -+ strcpy (pwd_traced_file.file.fname, SYSCONFDIR "/passwd"); - cb (pwddb, &pwd_traced_file.file); - -- strcpy (grp_traced_file.file.fname, "/etc/group"); -+ strcpy (grp_traced_file.file.fname, SYSCONFDIR "/group"); - cb (grpdb, &grp_traced_file.file); - -- strcpy (hst_traced_file.file.fname, "/etc/hosts"); -+ strcpy (hst_traced_file.file.fname, SYSCONFDIR "/hosts"); - cb (hstdb, &hst_traced_file.file); - -- strcpy (resolv_traced_file.file.fname, "/etc/resolv.conf"); -+ strcpy (resolv_traced_file.file.fname, SYSCONFDIR "/resolv.conf"); - cb (hstdb, &resolv_traced_file.file); - -- strcpy (serv_traced_file.file.fname, "/etc/services"); -+ strcpy (serv_traced_file.file.fname, SYSCONFDIR "/services"); - cb (servdb, &serv_traced_file.file); - -- strcpy (netgr_traced_file.file.fname, "/etc/netgroup"); -+ strcpy (netgr_traced_file.file.fname, SYSCONFDIR "/netgroup"); - cb (netgrdb, &netgr_traced_file.file); - } - -Index: glibc-2.20/nss/nss_files/files-initgroups.c -=================================================================== ---- glibc-2.20.orig/nss/nss_files/files-initgroups.c -+++ glibc-2.20/nss/nss_files/files-initgroups.c -@@ -31,7 +31,7 @@ _nss_files_initgroups_dyn (const char *u - long int *size, gid_t **groupsp, long int limit, - int *errnop) - { -- FILE *stream = fopen ("/etc/group", "rce"); -+ FILE *stream = fopen (SYSCONFDIR "/group", "rce"); - if (stream == NULL) - { - *errnop = errno; -Index: glibc-2.20/nss/db-Makefile -=================================================================== ---- glibc-2.20.orig/nss/db-Makefile -+++ /dev/null -@@ -1,166 +0,0 @@ --# Makefile to (re-)generate db versions of system database files. --# Copyright (C) 1996-2014 Free Software Foundation, Inc. --# This file is part of the GNU C Library. --# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. --# -- --# The GNU C Library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Lesser General Public --# License as published by the Free Software Foundation; either --# version 2.1 of the License, or (at your option) any later version. -- --# The GNU C Library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Lesser General Public License for more details. -- --# You should have received a copy of the GNU Lesser General Public --# License along with the GNU C Library; if not, see --# <http://www.gnu.org/licenses/>. -- --DATABASES = $(wildcard /etc/passwd /etc/group /etc/ethers /etc/protocols \ -- /etc/rpc /etc/services /etc/shadow /etc/gshadow \ -- /etc/netgroup) -- --VAR_DB = /var/db -- --AWK = awk --MAKEDB = makedb --quiet -- --all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES))) -- -- --$(VAR_DB)/passwd.db: /etc/passwd -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$3; print }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/group.db: /etc/group -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$3; print; \ -- if ($$4 != "") { \ -- split($$4, grmems, ","); \ -- for (memidx in grmems) { \ -- mem=grmems[memidx]; \ -- if (members[mem] == "") \ -- members[mem]=$$3; \ -- else \ -- members[mem]=members[mem] "," $$3; \ -- } \ -- delete grmems; } } \ -- END { for (mem in members) \ -- printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/ethers.db: /etc/ethers -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) '/^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$2; print }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/protocols.db: /etc/protocols -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) '/^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$2; print; \ -- for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -- { printf ".%s ", $$i; print } }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/rpc.db: /etc/rpc -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) '/^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print; \ -- printf "=%s ", $$2; print; \ -- for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -- { printf ".%s ", $$i; print } }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/services.db: /etc/services -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS="[ \t/]+" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { sub(/[ \t]*#.*$$/, "");\ -- printf ":%s/%s ", $$1, $$3; print; \ -- printf ":%s/ ", $$1; print; \ -- printf "=%s/%s ", $$2, $$3; print; \ -- printf "=%s/ ", $$2; print; \ -- for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \ -- { printf ":%s/%s ", $$i, $$3; print; \ -- printf ":%s/ ", $$i; print } }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -- --$(VAR_DB)/shadow.db: /etc/shadow -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -- (umask 077 && $(MAKEDB) -o $@ -) -- @echo "done." -- @if chgrp shadow $@ 2>/dev/null; then \ -- chmod g+r $@; \ -- else \ -- chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -- echo; \ -- echo "Warning: The shadow password database $@"; \ -- echo "has been set to be readable only by root. You may want"; \ -- echo "to make it readable by the \`shadow' group depending"; \ -- echo "on your configuration."; \ -- echo; \ -- fi -- --$(VAR_DB)/gshadow.db: /etc/gshadow -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -- (umask 077 && $(MAKEDB) -o $@ -) -- @echo "done." -- @if chgrp shadow $@ 2>/dev/null; then \ -- chmod g+r $@; \ -- else \ -- chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -- echo; \ -- echo "Warning: The shadow group database $@"; \ -- echo "has been set to be readable only by root. You may want"; \ -- echo "to make it readable by the \`shadow' group depending"; \ -- echo "on your configuration."; \ -- echo; \ -- fi -- --$(VAR_DB)/netgroup.db: /etc/netgroup -- @echo -n "$(patsubst %.db,%,$(@F))... " -- @$(AWK) 'BEGIN { ini=1 } \ -- /^[ \t]*$$/ { next } \ -- /^[ \t]*#/ { next } \ -- /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \ -- else end=""; \ -- gsub(/[ \t]+/, " "); \ -- sub(/^[ \t]*/, ""); \ -- if (ini == 0) printf "%s%s", $$0, end; \ -- else printf ".%s %s%s", $$1, $$0, end; \ -- ini=end == "" ? 0 : 1; } \ -- END { if (ini==0) printf "\n" }' $^ | \ -- $(MAKEDB) -o $@ - -- @echo "done." -Index: glibc-2.20/nss/db-Makefile.in -=================================================================== ---- /dev/null -+++ glibc-2.20/nss/db-Makefile.in -@@ -0,0 +1,173 @@ -+ -+# Makefile to (re-)generate db versions of system database files. -+# Copyright (C) 1996-2014 Free Software Foundation, Inc. -+# This file is part of the GNU C Library. -+# Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. -+# -+ -+# The GNU C Library is free software; you can redistribute it and/or -+# modify it under the terms of the GNU Lesser General Public -+# License as published by the Free Software Foundation; either -+# version 2.1 of the License, or (at your option) any later version. -+ -+# The GNU C Library is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# Lesser General Public License for more details. -+ -+# You should have received a copy of the GNU Lesser General Public -+# License along with the GNU C Library; if not, see -+# <http://www.gnu.org/licenses/>. -+ -+DATABASES = $(wildcard @libc_cv_sysconfdir@/passwd \ -+ @libc_cv_sysconfdir@/group \ -+ @libc_cv_sysconfdir@/ethers \ -+ @libc_cv_sysconfdir@/protocols \ -+ @libc_cv_sysconfdir@/rpc \ -+ @libc_cv_sysconfdir@/services \ -+ @libc_cv_sysconfdir@/shadow \ -+ @libc_cv_sysconfdir@/gshadow \ -+ @libc_cv_sysconfdir@/netgroup) -+ -+VAR_DB = /var/db -+ -+AWK = awk -+MAKEDB = makedb --quiet -+ -+all: $(patsubst %,$(VAR_DB)/%.db,$(notdir $(DATABASES))) -+ -+ -+$(VAR_DB)/passwd.db: @libc_cv_sysconfdir@/passwd -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$3; print }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/group.db: @libc_cv_sysconfdir@/group -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$3; print; \ -+ if ($$4 != "") { \ -+ split($$4, grmems, ","); \ -+ for (memidx in grmems) { \ -+ mem=grmems[memidx]; \ -+ if (members[mem] == "") \ -+ members[mem]=$$3; \ -+ else \ -+ members[mem]=members[mem] "," $$3; \ -+ } \ -+ delete grmems; } } \ -+ END { for (mem in members) \ -+ printf ":%s %s %s\n", mem, mem, members[mem]; }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/ethers.db: @libc_cv_sysconfdir@/ethers -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) '/^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$2; print }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/protocols.db: @libc_cv_sysconfdir@/protocols -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) '/^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$2; print; \ -+ for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -+ { printf ".%s ", $$i; print } }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/rpc.db: @libc_cv_sysconfdir@/rpc -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) '/^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print; \ -+ printf "=%s ", $$2; print; \ -+ for (i = 3; i <= NF && !($$i ~ /^#/); ++i) \ -+ { printf ".%s ", $$i; print } }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/services.db: @libc_cv_sysconfdir@/services -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS="[ \t/]+" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { sub(/[ \t]*#.*$$/, "");\ -+ printf ":%s/%s ", $$1, $$3; print; \ -+ printf ":%s/ ", $$1; print; \ -+ printf "=%s/%s ", $$2, $$3; print; \ -+ printf "=%s/ ", $$2; print; \ -+ for (i = 4; i <= NF && !($$i ~ /^#/); ++i) \ -+ { printf ":%s/%s ", $$i, $$3; print; \ -+ printf ":%s/ ", $$i; print } }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -+ -+$(VAR_DB)/shadow.db: @libc_cv_sysconfdir@/shadow -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -+ (umask 077 && $(MAKEDB) -o $@ -) -+ @echo "done." -+ @if chgrp shadow $@ 2>/dev/null; then \ -+ chmod g+r $@; \ -+ else \ -+ chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -+ echo; \ -+ echo "Warning: The shadow password database $@"; \ -+ echo "has been set to be readable only by root. You may want"; \ -+ echo "to make it readable by the \`shadow' group depending"; \ -+ echo "on your configuration."; \ -+ echo; \ -+ fi -+ -+$(VAR_DB)/gshadow.db: @libc_cv_sysconfdir@/gshadow -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { FS=":"; OFS=":" } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { printf ".%s ", $$1; print }' $^ | \ -+ (umask 077 && $(MAKEDB) -o $@ -) -+ @echo "done." -+ @if chgrp shadow $@ 2>/dev/null; then \ -+ chmod g+r $@; \ -+ else \ -+ chown 0 $@; chgrp 0 $@; chmod 600 $@; \ -+ echo; \ -+ echo "Warning: The shadow group database $@"; \ -+ echo "has been set to be readable only by root. You may want"; \ -+ echo "to make it readable by the \`shadow' group depending"; \ -+ echo "on your configuration."; \ -+ echo; \ -+ fi -+ -+$(VAR_DB)/netgroup.db: @libc_cv_sysconfdir@/netgroup -+ @echo -n "$(patsubst %.db,%,$(@F))... " -+ @$(AWK) 'BEGIN { ini=1 } \ -+ /^[ \t]*$$/ { next } \ -+ /^[ \t]*#/ { next } \ -+ /^[^#]/ { if (sub(/[ \t]*\\$$/, " ") == 0) end="\n"; \ -+ else end=""; \ -+ gsub(/[ \t]+/, " "); \ -+ sub(/^[ \t]*/, ""); \ -+ if (ini == 0) printf "%s%s", $$0, end; \ -+ else printf ".%s %s%s", $$1, $$0, end; \ -+ ini=end == "" ? 0 : 1; } \ -+ END { if (ini==0) printf "\n" }' $^ | \ -+ $(MAKEDB) -o $@ - -+ @echo "done." -Index: glibc-2.20/resolv/netdb.h -=================================================================== ---- glibc-2.20.orig/resolv/netdb.h -+++ /dev/null -@@ -1,715 +0,0 @@ -- /* Copyright (C) 1996-2014 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- <http://www.gnu.org/licenses/>. */ -- --/* All data returned by the network data base library are supplied in -- host order and returned in network order (suitable for use in -- system calls). */ -- --#ifndef _NETDB_H --#define _NETDB_H 1 -- --#include <features.h> -- --#include <netinet/in.h> --#include <stdint.h> --#ifdef __USE_MISC --/* This is necessary to make this include file properly replace the -- Sun version. */ --# include <rpc/netdb.h> --#endif -- --#ifdef __USE_GNU --# define __need_sigevent_t --# include <bits/siginfo.h> --# define __need_timespec --# include <time.h> --#endif -- --#include <bits/netdb.h> -- --/* Absolute file name for network data base files. */ --#define _PATH_HEQUIV "/etc/hosts.equiv" --#define _PATH_HOSTS "/etc/hosts" --#define _PATH_NETWORKS "/etc/networks" --#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" --#define _PATH_PROTOCOLS "/etc/protocols" --#define _PATH_SERVICES "/etc/services" -- -- --__BEGIN_DECLS -- --#if defined __USE_MISC || !defined __USE_XOPEN2K8 --/* Error status for non-reentrant lookup functions. -- We use a macro to access always the thread-specific `h_errno' variable. */ --# define h_errno (*__h_errno_location ()) -- --/* Function to get address of global `h_errno' variable. */ --extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); -- -- --/* Possible values left in `h_errno'. */ --# define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found. */ --# define TRY_AGAIN 2 /* Non-Authoritative Host not found, -- or SERVERFAIL. */ --# define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, -- NOTIMP. */ --# define NO_DATA 4 /* Valid name, no data record of requested -- type. */ --#endif --#ifdef __USE_MISC --# define NETDB_INTERNAL -1 /* See errno. */ --# define NETDB_SUCCESS 0 /* No problem. */ --# define NO_ADDRESS NO_DATA /* No address, look for MX record. */ --#endif -- --#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED --/* Highest reserved Internet port number. */ --# define IPPORT_RESERVED 1024 --#endif -- --#ifdef __USE_GNU --/* Scope delimiter for getaddrinfo(), getnameinfo(). */ --# define SCOPE_DELIMITER '%' --#endif -- --#ifdef __USE_MISC --/* Print error indicated by `h_errno' variable on standard error. STR -- if non-null is printed before the error string. */ --extern void herror (const char *__str) __THROW; -- --/* Return string associated with error ERR_NUM. */ --extern const char *hstrerror (int __err_num) __THROW; --#endif -- -- --/* Description of data base entry for a single host. */ --struct hostent --{ -- char *h_name; /* Official name of host. */ -- char **h_aliases; /* Alias list. */ -- int h_addrtype; /* Host address type. */ -- int h_length; /* Length of address. */ -- char **h_addr_list; /* List of addresses from name server. */ --#ifdef __USE_MISC --# define h_addr h_addr_list[0] /* Address, for backward compatibility.*/ --#endif --}; -- --/* Open host data base files and mark them as staying open even after -- a later search if STAY_OPEN is non-zero. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void sethostent (int __stay_open); -- --/* Close host data base files and clear `stay open' flag. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void endhostent (void); -- --/* Get next entry from host data base file. Open data base if -- necessary. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct hostent *gethostent (void); -- --/* Return entry from host data base which address match ADDR with -- length LEN and type TYPE. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len, -- int __type); -- --/* Return entry from host data base for host with NAME. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct hostent *gethostbyname (const char *__name); -- --#ifdef __USE_MISC --/* Return entry from host data base for host with NAME. AF must be -- set to the address type which is `AF_INET' for IPv4 or `AF_INET6' -- for IPv6. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern struct hostent *gethostbyname2 (const char *__name, int __af); -- --/* Reentrant versions of the functions above. The additional -- arguments specify a buffer of BUFLEN starting at BUF. The last -- argument is a pointer to a variable which gets the value which -- would be stored in the global variable `herrno' by the -- non-reentrant functions. -- -- These functions are not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation they are cancellation points and -- therefore not marked with __THROW. */ --extern int gethostent_r (struct hostent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct hostent **__restrict __result, -- int *__restrict __h_errnop); -- --extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len, -- int __type, -- struct hostent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct hostent **__restrict __result, -- int *__restrict __h_errnop); -- --extern int gethostbyname_r (const char *__restrict __name, -- struct hostent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct hostent **__restrict __result, -- int *__restrict __h_errnop); -- --extern int gethostbyname2_r (const char *__restrict __name, int __af, -- struct hostent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct hostent **__restrict __result, -- int *__restrict __h_errnop); --#endif /* misc */ -- -- --/* Open network data base files and mark them as staying open even -- after a later search if STAY_OPEN is non-zero. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void setnetent (int __stay_open); -- --/* Close network data base files and clear `stay open' flag. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void endnetent (void); -- --/* Get next entry from network data base file. Open data base if -- necessary. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct netent *getnetent (void); -- --/* Return entry from network data base which address match NET and -- type TYPE. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct netent *getnetbyaddr (uint32_t __net, int __type); -- --/* Return entry from network data base for network with NAME. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct netent *getnetbyname (const char *__name); -- --#ifdef __USE_MISC --/* Reentrant versions of the functions above. The additional -- arguments specify a buffer of BUFLEN starting at BUF. The last -- argument is a pointer to a variable which gets the value which -- would be stored in the global variable `herrno' by the -- non-reentrant functions. -- -- These functions are not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation they are cancellation points and -- therefore not marked with __THROW. */ --extern int getnetent_r (struct netent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct netent **__restrict __result, -- int *__restrict __h_errnop); -- --extern int getnetbyaddr_r (uint32_t __net, int __type, -- struct netent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct netent **__restrict __result, -- int *__restrict __h_errnop); -- --extern int getnetbyname_r (const char *__restrict __name, -- struct netent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct netent **__restrict __result, -- int *__restrict __h_errnop); --#endif /* misc */ -- -- --/* Description of data base entry for a single service. */ --struct servent --{ -- char *s_name; /* Official service name. */ -- char **s_aliases; /* Alias list. */ -- int s_port; /* Port number. */ -- char *s_proto; /* Protocol to use. */ --}; -- --/* Open service data base files and mark them as staying open even -- after a later search if STAY_OPEN is non-zero. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void setservent (int __stay_open); -- --/* Close service data base files and clear `stay open' flag. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void endservent (void); -- --/* Get next entry from service data base file. Open data base if -- necessary. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct servent *getservent (void); -- --/* Return entry from network data base for network with NAME and -- protocol PROTO. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct servent *getservbyname (const char *__name, const char *__proto); -- --/* Return entry from service data base which matches port PORT and -- protocol PROTO. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct servent *getservbyport (int __port, const char *__proto); -- -- --#ifdef __USE_MISC --/* Reentrant versions of the functions above. The additional -- arguments specify a buffer of BUFLEN starting at BUF. -- -- These functions are not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation they are cancellation points and -- therefore not marked with __THROW. */ --extern int getservent_r (struct servent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct servent **__restrict __result); -- --extern int getservbyname_r (const char *__restrict __name, -- const char *__restrict __proto, -- struct servent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct servent **__restrict __result); -- --extern int getservbyport_r (int __port, const char *__restrict __proto, -- struct servent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct servent **__restrict __result); --#endif /* misc */ -- -- --/* Description of data base entry for a single service. */ --struct protoent --{ -- char *p_name; /* Official protocol name. */ -- char **p_aliases; /* Alias list. */ -- int p_proto; /* Protocol number. */ --}; -- --/* Open protocol data base files and mark them as staying open even -- after a later search if STAY_OPEN is non-zero. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void setprotoent (int __stay_open); -- --/* Close protocol data base files and clear `stay open' flag. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern void endprotoent (void); -- --/* Get next entry from protocol data base file. Open data base if -- necessary. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct protoent *getprotoent (void); -- --/* Return entry from protocol data base for network with NAME. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct protoent *getprotobyname (const char *__name); -- --/* Return entry from protocol data base which number is PROTO. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern struct protoent *getprotobynumber (int __proto); -- -- --#ifdef __USE_MISC --/* Reentrant versions of the functions above. The additional -- arguments specify a buffer of BUFLEN starting at BUF. -- -- These functions are not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation they are cancellation points and -- therefore not marked with __THROW. */ --extern int getprotoent_r (struct protoent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct protoent **__restrict __result); -- --extern int getprotobyname_r (const char *__restrict __name, -- struct protoent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct protoent **__restrict __result); -- --extern int getprotobynumber_r (int __proto, -- struct protoent *__restrict __result_buf, -- char *__restrict __buf, size_t __buflen, -- struct protoent **__restrict __result); -- -- --/* Establish network group NETGROUP for enumeration. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int setnetgrent (const char *__netgroup); -- --/* Free all space allocated by previous `setnetgrent' call. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern void endnetgrent (void); -- --/* Get next member of netgroup established by last `setnetgrent' call -- and return pointers to elements in HOSTP, USERP, and DOMAINP. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int getnetgrent (char **__restrict __hostp, -- char **__restrict __userp, -- char **__restrict __domainp); -- -- --/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN). -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int innetgr (const char *__netgroup, const char *__host, -- const char *__user, const char *__domain); -- --/* Reentrant version of `getnetgrent' where result is placed in BUFFER. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int getnetgrent_r (char **__restrict __hostp, -- char **__restrict __userp, -- char **__restrict __domainp, -- char *__restrict __buffer, size_t __buflen); --#endif /* misc */ -- -- --#ifdef __USE_MISC --/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD. -- The local user is LOCUSER, on the remote machine the command is -- executed as REMUSER. In *FD2P the descriptor to the socket for the -- connection is returned. The caller must have the right to use a -- reserved port. When the function returns *AHOST contains the -- official host name. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int rcmd (char **__restrict __ahost, unsigned short int __rport, -- const char *__restrict __locuser, -- const char *__restrict __remuser, -- const char *__restrict __cmd, int *__restrict __fd2p); -- --/* This is the equivalent function where the protocol can be selected -- and which therefore can be used for IPv6. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport, -- const char *__restrict __locuser, -- const char *__restrict __remuser, -- const char *__restrict __cmd, int *__restrict __fd2p, -- sa_family_t __af); -- --/* Call `rexecd' at port RPORT on remote machine *AHOST to execute -- CMD. The process runs at the remote machine using the ID of user -- NAME whose cleartext password is PASSWD. In *FD2P the descriptor -- to the socket for the connection is returned. When the function -- returns *AHOST contains the official host name. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int rexec (char **__restrict __ahost, int __rport, -- const char *__restrict __name, -- const char *__restrict __pass, -- const char *__restrict __cmd, int *__restrict __fd2p); -- --/* This is the equivalent function where the protocol can be selected -- and which therefore can be used for IPv6. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int rexec_af (char **__restrict __ahost, int __rport, -- const char *__restrict __name, -- const char *__restrict __pass, -- const char *__restrict __cmd, int *__restrict __fd2p, -- sa_family_t __af); -- --/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER. -- If SUSER is not zero the user tries to become superuser. Return 0 if -- it is possible. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int ruserok (const char *__rhost, int __suser, -- const char *__remuser, const char *__locuser); -- --/* This is the equivalent function where the protocol can be selected -- and which therefore can be used for IPv6. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int ruserok_af (const char *__rhost, int __suser, -- const char *__remuser, const char *__locuser, -- sa_family_t __af); -- --/* Check whether user REMUSER on system indicated by IPv4 address -- RADDR is allowed to login as LOCUSER. Non-IPv4 (e.g., IPv6) are -- not supported. If SUSER is not zero the user tries to become -- superuser. Return 0 if it is possible. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int iruserok (uint32_t __raddr, int __suser, -- const char *__remuser, const char *__locuser); -- --/* This is the equivalent function where the pfamiliy if the address -- pointed to by RADDR is determined by the value of AF. It therefore -- can be used for IPv6 -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int iruserok_af (const void *__raddr, int __suser, -- const char *__remuser, const char *__locuser, -- sa_family_t __af); -- --/* Try to allocate reserved port, returning a descriptor for a socket opened -- at this port or -1 if unsuccessful. The search for an available port -- will start at ALPORT and continues with lower numbers. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int rresvport (int *__alport); -- --/* This is the equivalent function where the protocol can be selected -- and which therefore can be used for IPv6. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int rresvport_af (int *__alport, sa_family_t __af); --#endif -- -- --/* Extension from POSIX.1g. */ --#ifdef __USE_POSIX --/* Structure to contain information about address of a service provider. */ --struct addrinfo --{ -- int ai_flags; /* Input flags. */ -- int ai_family; /* Protocol family for socket. */ -- int ai_socktype; /* Socket type. */ -- int ai_protocol; /* Protocol for socket. */ -- socklen_t ai_addrlen; /* Length of socket address. */ -- struct sockaddr *ai_addr; /* Socket address for socket. */ -- char *ai_canonname; /* Canonical name for service location. */ -- struct addrinfo *ai_next; /* Pointer to next in list. */ --}; -- --# ifdef __USE_GNU --/* Structure used as control block for asynchronous lookup. */ --struct gaicb --{ -- const char *ar_name; /* Name to look up. */ -- const char *ar_service; /* Service name. */ -- const struct addrinfo *ar_request; /* Additional request specification. */ -- struct addrinfo *ar_result; /* Pointer to result. */ -- /* The following are internal elements. */ -- int __return; -- int __glibc_reserved[5]; --}; -- --/* Lookup mode. */ --# define GAI_WAIT 0 --# define GAI_NOWAIT 1 --# endif -- --/* Possible values for `ai_flags' field in `addrinfo' structure. */ --# define AI_PASSIVE 0x0001 /* Socket address is intended for `bind'. */ --# define AI_CANONNAME 0x0002 /* Request for canonical name. */ --# define AI_NUMERICHOST 0x0004 /* Don't use name resolution. */ --# define AI_V4MAPPED 0x0008 /* IPv4 mapped addresses are acceptable. */ --# define AI_ALL 0x0010 /* Return IPv4 mapped and IPv6 addresses. */ --# define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose -- returned address type.. */ --# ifdef __USE_GNU --# define AI_IDN 0x0040 /* IDN encode input (assuming it is encoded -- in the current locale's character set) -- before looking it up. */ --# define AI_CANONIDN 0x0080 /* Translate canonical name from IDN format. */ --# define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode -- code points. */ --# define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to -- STD3 rules. */ --# endif --# define AI_NUMERICSERV 0x0400 /* Don't use name resolution. */ -- --/* Error values for `getaddrinfo' function. */ --# define EAI_BADFLAGS -1 /* Invalid value for `ai_flags' field. */ --# define EAI_NONAME -2 /* NAME or SERVICE is unknown. */ --# define EAI_AGAIN -3 /* Temporary failure in name resolution. */ --# define EAI_FAIL -4 /* Non-recoverable failure in name res. */ --# define EAI_FAMILY -6 /* `ai_family' not supported. */ --# define EAI_SOCKTYPE -7 /* `ai_socktype' not supported. */ --# define EAI_SERVICE -8 /* SERVICE not supported for `ai_socktype'. */ --# define EAI_MEMORY -10 /* Memory allocation failure. */ --# define EAI_SYSTEM -11 /* System error returned in `errno'. */ --# define EAI_OVERFLOW -12 /* Argument buffer overflow. */ --# ifdef __USE_GNU --# define EAI_NODATA -5 /* No address associated with NAME. */ --# define EAI_ADDRFAMILY -9 /* Address family for NAME not supported. */ --# define EAI_INPROGRESS -100 /* Processing request in progress. */ --# define EAI_CANCELED -101 /* Request canceled. */ --# define EAI_NOTCANCELED -102 /* Request not canceled. */ --# define EAI_ALLDONE -103 /* All requests done. */ --# define EAI_INTR -104 /* Interrupted by a signal. */ --# define EAI_IDN_ENCODE -105 /* IDN encoding failed. */ --# endif -- --# ifdef __USE_MISC --# define NI_MAXHOST 1025 --# define NI_MAXSERV 32 --# endif -- --# define NI_NUMERICHOST 1 /* Don't try to look up hostname. */ --# define NI_NUMERICSERV 2 /* Don't convert port number to name. */ --# define NI_NOFQDN 4 /* Only return nodename portion. */ --# define NI_NAMEREQD 8 /* Don't return numeric addresses. */ --# define NI_DGRAM 16 /* Look up UDP service rather than TCP. */ --# ifdef __USE_GNU --# define NI_IDN 32 /* Convert name from IDN format. */ --# define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode -- code points. */ --# define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to -- STD3 rules. */ --# endif -- --/* Translate name of a service location and/or a service name to set of -- socket addresses. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern int getaddrinfo (const char *__restrict __name, -- const char *__restrict __service, -- const struct addrinfo *__restrict __req, -- struct addrinfo **__restrict __pai); -- --/* Free `addrinfo' structure AI including associated storage. */ --extern void freeaddrinfo (struct addrinfo *__ai) __THROW; -- --/* Convert error return from getaddrinfo() to a string. */ --extern const char *gai_strerror (int __ecode) __THROW; -- --/* Translate a socket address to a location and service name. -- -- This function is a possible cancellation point and therefore not -- marked with __THROW. */ --extern int getnameinfo (const struct sockaddr *__restrict __sa, -- socklen_t __salen, char *__restrict __host, -- socklen_t __hostlen, char *__restrict __serv, -- socklen_t __servlen, int __flags); --#endif /* POSIX */ -- --#ifdef __USE_GNU --/* Enqueue ENT requests from the LIST. If MODE is GAI_WAIT wait until all -- requests are handled. If WAIT is GAI_NOWAIT return immediately after -- queueing the requests and signal completion according to SIG. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr], -- int __ent, struct sigevent *__restrict __sig); -- --/* Suspend execution of the thread until at least one of the ENT requests -- in LIST is handled. If TIMEOUT is not a null pointer it specifies the -- longest time the function keeps waiting before returning with an error. -- -- This function is not part of POSIX and therefore no official -- cancellation point. But due to similarity with an POSIX interface -- or due to the implementation it is a cancellation point and -- therefore not marked with __THROW. */ --extern int gai_suspend (const struct gaicb *const __list[], int __ent, -- const struct timespec *__timeout); -- --/* Get the error status of the request REQ. */ --extern int gai_error (struct gaicb *__req) __THROW; -- --/* Cancel the requests associated with GAICBP. */ --extern int gai_cancel (struct gaicb *__gaicbp) __THROW; --#endif /* GNU */ -- --__END_DECLS -- --#endif /* netdb.h */ -Index: glibc-2.20/resolv/resolv.h -=================================================================== ---- glibc-2.20.orig/resolv/resolv.h -+++ /dev/null -@@ -1,389 +0,0 @@ --/* -- * Copyright (c) 1983, 1987, 1989 -- * The Regents of the University of California. All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 4. Neither the name of the University nor the names of its contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- * SUCH DAMAGE. -- */ -- --/* -- * Portions Copyright (c) 1996-1999 by Internet Software Consortium. -- * -- * Permission to use, copy, modify, and distribute this software for any -- * purpose with or without fee is hereby granted, provided that the above -- * copyright notice and this permission notice appear in all copies. -- * -- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -- * SOFTWARE. -- */ -- --/* -- * @(#)resolv.h 8.1 (Berkeley) 6/2/93 -- * $BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $ -- */ -- --#ifndef _RESOLV_H_ -- --/* These headers are needed for types used in the `struct res_state' -- declaration. */ --#include <sys/types.h> --#include <netinet/in.h> -- --#ifndef __need_res_state --# define _RESOLV_H_ -- --# include <sys/param.h> --# include <sys/cdefs.h> --# include <stdio.h> --# include <arpa/nameser.h> --#endif -- --#ifndef __res_state_defined --# define __res_state_defined -- --typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error } -- res_sendhookact; -- --typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns, -- const u_char **__query, -- int *__querylen, -- u_char *__ans, -- int __anssiz, -- int *__resplen); -- --typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, -- const u_char *__query, -- int __querylen, -- u_char *__ans, -- int __anssiz, -- int *__resplen); -- --/* -- * Global defines and variables for resolver stub. -- */ --# define MAXNS 3 /* max # name servers we'll track */ --# define MAXDFLSRCH 3 /* # default domain levels to try */ --# define MAXDNSRCH 6 /* max # domains in search path */ --# define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ -- --# define RES_TIMEOUT 5 /* min. seconds between retries */ --# define MAXRESOLVSORT 10 /* number of net to sort on */ --# define RES_MAXNDOTS 15 /* should reflect bit field size */ --# define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ --# define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ --# define RES_DFLRETRY 2 /* Default #/tries. */ --# define RES_MAXTIME 65535 /* Infinity, in milliseconds. */ -- --struct __res_state { -- int retrans; /* retransmition time interval */ -- int retry; /* number of times to retransmit */ -- u_long options; /* option flags - see below. */ -- int nscount; /* number of name servers */ -- struct sockaddr_in -- nsaddr_list[MAXNS]; /* address of name server */ --# define nsaddr nsaddr_list[0] /* for backward compatibility */ -- u_short id; /* current message id */ -- /* 2 byte hole here. */ -- char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ -- char defdname[256]; /* default domain (deprecated) */ -- u_long pfcode; /* RES_PRF_ flags - see below. */ -- unsigned ndots:4; /* threshold for initial abs. query */ -- unsigned nsort:4; /* number of elements in sort_list[] */ -- unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */ -- unsigned unused:23; -- struct { -- struct in_addr addr; -- u_int32_t mask; -- } sort_list[MAXRESOLVSORT]; -- /* 4 byte hole here on 64-bit architectures. */ -- res_send_qhook qhook; /* query hook */ -- res_send_rhook rhook; /* response hook */ -- int res_h_errno; /* last one set for this context */ -- int _vcsock; /* PRIVATE: for res_send VC i/o */ -- u_int _flags; /* PRIVATE: see below */ -- /* 4 byte hole here on 64-bit architectures. */ -- union { -- char pad[52]; /* On an i386 this means 512b total. */ -- struct { -- u_int16_t nscount; -- u_int16_t nsmap[MAXNS]; -- int nssocks[MAXNS]; -- u_int16_t nscount6; -- u_int16_t nsinit; -- struct sockaddr_in6 *nsaddrs[MAXNS]; --#ifdef _LIBC -- unsigned long long int initstamp -- __attribute__((packed)); --#else -- unsigned int _initstamp[2]; --#endif -- } _ext; -- } _u; --}; -- --typedef struct __res_state *res_state; --# undef __need_res_state --#endif -- --#ifdef _RESOLV_H_ --/* -- * Revision information. This is the release date in YYYYMMDD format. -- * It can change every day so the right thing to do with it is use it -- * in preprocessor commands such as "#if (__RES > 19931104)". Do not -- * compare for equality; rather, use it to determine whether your resolver -- * is new enough to contain a certain feature. -- */ -- --#define __RES 19991006 -- --/* -- * Resolver configuration file. -- * Normally not present, but may contain the address of the -- * inital name server(s) to query and the domain search list. -- */ -- --#ifndef _PATH_RESCONF --#define _PATH_RESCONF "/etc/resolv.conf" --#endif -- --struct res_sym { -- int number; /* Identifying number, like T_MX */ -- char * name; /* Its symbolic name, like "MX" */ -- char * humanname; /* Its fun name, like "mail exchanger" */ --}; -- --/* -- * Resolver flags (used to be discrete per-module statics ints). -- */ --#define RES_F_VC 0x00000001 /* socket is TCP */ --#define RES_F_CONN 0x00000002 /* socket is connected */ --#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */ -- --/* res_findzonecut() options */ --#define RES_EXHAUSTIVE 0x00000001 /* always do all queries */ -- --/* -- * Resolver options (keep these in synch with res_debug.c, please) -- */ --#define RES_INIT 0x00000001 /* address initialized */ --#define RES_DEBUG 0x00000002 /* print debug messages */ --#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/ --#define RES_USEVC 0x00000008 /* use virtual circuit */ --#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */ --#define RES_IGNTC 0x00000020 /* ignore trucation errors */ --#define RES_RECURSE 0x00000040 /* recursion desired */ --#define RES_DEFNAMES 0x00000080 /* use default domain name */ --#define RES_STAYOPEN 0x00000100 /* Keep TCP socket open */ --#define RES_DNSRCH 0x00000200 /* search up local domain tree */ --#define RES_INSECURE1 0x00000400 /* type 1 security disabled */ --#define RES_INSECURE2 0x00000800 /* type 2 security disabled */ --#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ --#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ --#define RES_ROTATE 0x00004000 /* rotate ns list after each query */ --#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity (!IMPL) */ --#define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */ --#define RES_BLAST 0x00020000 /* blast all recursive servers */ --#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte -- strings */ --#define RES_NOIP6DOTINT 0x00080000 /* Do not use .ip6.int in IPv6 -- reverse lookup */ --#define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */ --#define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */ --#define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each -- request */ --#define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */ --#define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name -- as a TLD. */ -- --#define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) -- --/* -- * Resolver "pfcode" values. Used by dig. -- */ --#define RES_PRF_STATS 0x00000001 --#define RES_PRF_UPDATE 0x00000002 --#define RES_PRF_CLASS 0x00000004 --#define RES_PRF_CMD 0x00000008 --#define RES_PRF_QUES 0x00000010 --#define RES_PRF_ANS 0x00000020 --#define RES_PRF_AUTH 0x00000040 --#define RES_PRF_ADD 0x00000080 --#define RES_PRF_HEAD1 0x00000100 --#define RES_PRF_HEAD2 0x00000200 --#define RES_PRF_TTLID 0x00000400 --#define RES_PRF_HEADX 0x00000800 --#define RES_PRF_QUERY 0x00001000 --#define RES_PRF_REPLY 0x00002000 --#define RES_PRF_INIT 0x00004000 --/* 0x00008000 */ -- --/* Things involving an internal (static) resolver context. */ --__BEGIN_DECLS --extern struct __res_state *__res_state(void) __attribute__ ((__const__)); --__END_DECLS --#define _res (*__res_state()) -- --#ifndef __BIND_NOSTATIC --#define fp_nquery __fp_nquery --#define fp_query __fp_query --#define hostalias __hostalias --#define p_query __p_query --#define res_close __res_close --#define res_init __res_init --#define res_isourserver __res_isourserver --#define res_mkquery __res_mkquery --#define res_query __res_query --#define res_querydomain __res_querydomain --#define res_search __res_search --#define res_send __res_send -- --__BEGIN_DECLS --void fp_nquery (const u_char *, int, FILE *) __THROW; --void fp_query (const u_char *, FILE *) __THROW; --const char * hostalias (const char *) __THROW; --void p_query (const u_char *) __THROW; --void res_close (void) __THROW; --int res_init (void) __THROW; --int res_isourserver (const struct sockaddr_in *) __THROW; --int res_mkquery (int, const char *, int, int, const u_char *, -- int, const u_char *, u_char *, int) __THROW; --int res_query (const char *, int, int, u_char *, int) __THROW; --int res_querydomain (const char *, const char *, int, int, -- u_char *, int) __THROW; --int res_search (const char *, int, int, u_char *, int) __THROW; --int res_send (const u_char *, int, u_char *, int) __THROW; --__END_DECLS --#endif -- --#define b64_ntop __b64_ntop --#define b64_pton __b64_pton --#define dn_comp __dn_comp --#define dn_count_labels __dn_count_labels --#define dn_expand __dn_expand --#define dn_skipname __dn_skipname --#define fp_resstat __fp_resstat --#define loc_aton __loc_aton --#define loc_ntoa __loc_ntoa --#define p_cdname __p_cdname --#define p_cdnname __p_cdnname --#define p_class __p_class --#define p_fqname __p_fqname --#define p_fqnname __p_fqnname --#define p_option __p_option --#define p_secstodate __p_secstodate --#define p_section __p_section --#define p_time __p_time --#define p_type __p_type --#define p_rcode __p_rcode --#define putlong __putlong --#define putshort __putshort --#define res_dnok __res_dnok --#define res_hnok __res_hnok --#define res_hostalias __res_hostalias --#define res_mailok __res_mailok --#define res_nameinquery __res_nameinquery --#define res_nclose __res_nclose --#define res_ninit __res_ninit --#define res_nmkquery __res_nmkquery --#define res_npquery __res_npquery --#define res_nquery __res_nquery --#define res_nquerydomain __res_nquerydomain --#define res_nsearch __res_nsearch --#define res_nsend __res_nsend --#define res_nisourserver __res_nisourserver --#define res_ownok __res_ownok --#define res_queriesmatch __res_queriesmatch --#define res_randomid __res_randomid --#define sym_ntop __sym_ntop --#define sym_ntos __sym_ntos --#define sym_ston __sym_ston --__BEGIN_DECLS --int res_hnok (const char *) __THROW; --int res_ownok (const char *) __THROW; --int res_mailok (const char *) __THROW; --int res_dnok (const char *) __THROW; --int sym_ston (const struct res_sym *, const char *, int *) __THROW; --const char * sym_ntos (const struct res_sym *, int, int *) __THROW; --const char * sym_ntop (const struct res_sym *, int, int *) __THROW; --int b64_ntop (u_char const *, size_t, char *, size_t) __THROW; --int b64_pton (char const *, u_char *, size_t) __THROW; --int loc_aton (const char *__ascii, u_char *__binary) __THROW; --const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW; --int dn_skipname (const u_char *, const u_char *) __THROW; --void putlong (u_int32_t, u_char *) __THROW; --void putshort (u_int16_t, u_char *) __THROW; --const char * p_class (int) __THROW; --const char * p_time (u_int32_t) __THROW; --const char * p_type (int) __THROW; --const char * p_rcode (int) __THROW; --const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *) -- __THROW; --const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW; --const u_char * p_fqnname (const u_char *__cp, const u_char *__msg, -- int, char *, int) __THROW; --const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW; --const char * p_option (u_long __option) __THROW; --char * p_secstodate (u_long) __THROW; --int dn_count_labels (const char *) __THROW; --int dn_comp (const char *, u_char *, int, u_char **, u_char **) -- __THROW; --int dn_expand (const u_char *, const u_char *, const u_char *, -- char *, int) __THROW; --u_int res_randomid (void) __THROW; --int res_nameinquery (const char *, int, int, -- const u_char *, const u_char *) __THROW; --int res_queriesmatch (const u_char *, const u_char *, -- const u_char *, const u_char *) __THROW; --const char * p_section (int __section, int __opcode) __THROW; --/* Things involving a resolver context. */ --int res_ninit (res_state) __THROW; --int res_nisourserver (const res_state, -- const struct sockaddr_in *) __THROW; --void fp_resstat (const res_state, FILE *) __THROW; --void res_npquery (const res_state, const u_char *, int, FILE *) -- __THROW; --const char * res_hostalias (const res_state, const char *, char *, size_t) -- __THROW; --int res_nquery (res_state, const char *, int, int, u_char *, int) -- __THROW; --int res_nsearch (res_state, const char *, int, int, u_char *, int) -- __THROW; --int res_nquerydomain (res_state, const char *, const char *, int, -- int, u_char *, int) __THROW; --int res_nmkquery (res_state, int, const char *, int, int, -- const u_char *, int, const u_char *, u_char *, -- int) __THROW; --int res_nsend (res_state, const u_char *, int, u_char *, int) -- __THROW; --void res_nclose (res_state) __THROW; --__END_DECLS --#endif -- --#endif /* !_RESOLV_H_ */ -Index: glibc-2.20/shadow/Makefile -=================================================================== ---- glibc-2.20.orig/shadow/Makefile -+++ glibc-2.20/shadow/Makefile -@@ -36,5 +36,6 @@ CFLAGS-fgetspent_r.c = -fexceptions $(li - CFLAGS-putspent.c = -fexceptions $(libio-mtsafe) - CFLAGS-getspnam.c = -fexceptions - CFLAGS-getspnam_r.c = -fexceptions -+CPPFLAGS-lckpwdf.c = -DSYSCONFDIR='"$(sysconfdir)"' - - include ../Rules -Index: glibc-2.20/shadow/lckpwdf.c -=================================================================== ---- glibc-2.20.orig/shadow/lckpwdf.c -+++ glibc-2.20/shadow/lckpwdf.c -@@ -29,7 +29,7 @@ - - - /* Name of the lock file. */ --#define PWD_LOCKFILE "/etc/.pwd.lock" -+#define PWD_LOCKFILE SYSCONFDIR "/.pwd.lock" - - /* How long to wait for getting the lock before returning with an - error. */ -Index: glibc-2.20/configure.ac -=================================================================== ---- glibc-2.20.orig/configure.ac -+++ glibc-2.20/configure.ac -@@ -2038,7 +2038,8 @@ RELEASE=`sed -n -e 's/^#define RELEASE " - AC_SUBST(VERSION) - AC_SUBST(RELEASE) - --AC_CONFIG_FILES([config.make Makefile]) -+AC_CONFIG_FILES([config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h -+ sysdeps/generic/ldconfig.h]) - AC_CONFIG_COMMANDS([default],[[ - case $CONFIG_FILES in *config.make*) - echo "$config_vars" >> config.make;; -Index: glibc-2.20/resolv/netdb.h.in -=================================================================== ---- /dev/null -+++ glibc-2.20/resolv/netdb.h.in -@@ -0,0 +1,715 @@ -+ /* Copyright (C) 1996-2014 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+/* All data returned by the network data base library are supplied in -+ host order and returned in network order (suitable for use in -+ system calls). */ -+ -+#ifndef _NETDB_H -+#define _NETDB_H 1 -+ -+#include <features.h> -+ -+#include <netinet/in.h> -+#include <stdint.h> -+#ifdef __USE_MISC -+/* This is necessary to make this include file properly replace the -+ Sun version. */ -+# include <rpc/netdb.h> -+#endif -+ -+#ifdef __USE_GNU -+# define __need_sigevent_t -+# include <bits/siginfo.h> -+# define __need_timespec -+# include <time.h> -+#endif -+ -+#include <bits/netdb.h> -+ -+/* Absolute file name for network data base files. */ -+#define _PATH_HEQUIV "@libc_cv_sysconfdir@/hosts.equiv" -+#define _PATH_HOSTS "@libc_cv_sysconfdir@/hosts" -+#define _PATH_NETWORKS "@libc_cv_sysconfdir@/networks" -+#define _PATH_NSSWITCH_CONF "@libc_cv_sysconfdir@/nsswitch.conf" -+#define _PATH_PROTOCOLS "@libc_cv_sysconfdir@/protocols" -+#define _PATH_SERVICES "@libc_cv_sysconfdir@/services" -+ -+ -+__BEGIN_DECLS -+ -+#if defined __USE_MISC || !defined __USE_XOPEN2K8 -+/* Error status for non-reentrant lookup functions. -+ We use a macro to access always the thread-specific `h_errno' variable. */ -+# define h_errno (*__h_errno_location ()) -+ -+/* Function to get address of global `h_errno' variable. */ -+extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); -+ -+ -+/* Possible values left in `h_errno'. */ -+# define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found. */ -+# define TRY_AGAIN 2 /* Non-Authoritative Host not found, -+ or SERVERFAIL. */ -+# define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, -+ NOTIMP. */ -+# define NO_DATA 4 /* Valid name, no data record of requested -+ type. */ -+#endif -+#ifdef __USE_MISC -+# define NETDB_INTERNAL -1 /* See errno. */ -+# define NETDB_SUCCESS 0 /* No problem. */ -+# define NO_ADDRESS NO_DATA /* No address, look for MX record. */ -+#endif -+ -+#if defined __USE_XOPEN2K || defined __USE_XOPEN_EXTENDED -+/* Highest reserved Internet port number. */ -+# define IPPORT_RESERVED 1024 -+#endif -+ -+#ifdef __USE_GNU -+/* Scope delimiter for getaddrinfo(), getnameinfo(). */ -+# define SCOPE_DELIMITER '%' -+#endif -+ -+#ifdef __USE_MISC -+/* Print error indicated by `h_errno' variable on standard error. STR -+ if non-null is printed before the error string. */ -+extern void herror (const char *__str) __THROW; -+ -+/* Return string associated with error ERR_NUM. */ -+extern const char *hstrerror (int __err_num) __THROW; -+#endif -+ -+ -+/* Description of data base entry for a single host. */ -+struct hostent -+{ -+ char *h_name; /* Official name of host. */ -+ char **h_aliases; /* Alias list. */ -+ int h_addrtype; /* Host address type. */ -+ int h_length; /* Length of address. */ -+ char **h_addr_list; /* List of addresses from name server. */ -+#ifdef __USE_MISC -+# define h_addr h_addr_list[0] /* Address, for backward compatibility.*/ -+#endif -+}; -+ -+/* Open host data base files and mark them as staying open even after -+ a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void sethostent (int __stay_open); -+ -+/* Close host data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endhostent (void); -+ -+/* Get next entry from host data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct hostent *gethostent (void); -+ -+/* Return entry from host data base which address match ADDR with -+ length LEN and type TYPE. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct hostent *gethostbyaddr (const void *__addr, __socklen_t __len, -+ int __type); -+ -+/* Return entry from host data base for host with NAME. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct hostent *gethostbyname (const char *__name); -+ -+#ifdef __USE_MISC -+/* Return entry from host data base for host with NAME. AF must be -+ set to the address type which is `AF_INET' for IPv4 or `AF_INET6' -+ for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern struct hostent *gethostbyname2 (const char *__name, int __af); -+ -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. The last -+ argument is a pointer to a variable which gets the value which -+ would be stored in the global variable `herrno' by the -+ non-reentrant functions. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int gethostent_r (struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int gethostbyaddr_r (const void *__restrict __addr, __socklen_t __len, -+ int __type, -+ struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int gethostbyname_r (const char *__restrict __name, -+ struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int gethostbyname2_r (const char *__restrict __name, int __af, -+ struct hostent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct hostent **__restrict __result, -+ int *__restrict __h_errnop); -+#endif /* misc */ -+ -+ -+/* Open network data base files and mark them as staying open even -+ after a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void setnetent (int __stay_open); -+ -+/* Close network data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endnetent (void); -+ -+/* Get next entry from network data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct netent *getnetent (void); -+ -+/* Return entry from network data base which address match NET and -+ type TYPE. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct netent *getnetbyaddr (uint32_t __net, int __type); -+ -+/* Return entry from network data base for network with NAME. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct netent *getnetbyname (const char *__name); -+ -+#ifdef __USE_MISC -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. The last -+ argument is a pointer to a variable which gets the value which -+ would be stored in the global variable `herrno' by the -+ non-reentrant functions. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int getnetent_r (struct netent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct netent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int getnetbyaddr_r (uint32_t __net, int __type, -+ struct netent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct netent **__restrict __result, -+ int *__restrict __h_errnop); -+ -+extern int getnetbyname_r (const char *__restrict __name, -+ struct netent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct netent **__restrict __result, -+ int *__restrict __h_errnop); -+#endif /* misc */ -+ -+ -+/* Description of data base entry for a single service. */ -+struct servent -+{ -+ char *s_name; /* Official service name. */ -+ char **s_aliases; /* Alias list. */ -+ int s_port; /* Port number. */ -+ char *s_proto; /* Protocol to use. */ -+}; -+ -+/* Open service data base files and mark them as staying open even -+ after a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void setservent (int __stay_open); -+ -+/* Close service data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endservent (void); -+ -+/* Get next entry from service data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct servent *getservent (void); -+ -+/* Return entry from network data base for network with NAME and -+ protocol PROTO. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct servent *getservbyname (const char *__name, const char *__proto); -+ -+/* Return entry from service data base which matches port PORT and -+ protocol PROTO. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct servent *getservbyport (int __port, const char *__proto); -+ -+ -+#ifdef __USE_MISC -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int getservent_r (struct servent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct servent **__restrict __result); -+ -+extern int getservbyname_r (const char *__restrict __name, -+ const char *__restrict __proto, -+ struct servent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct servent **__restrict __result); -+ -+extern int getservbyport_r (int __port, const char *__restrict __proto, -+ struct servent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct servent **__restrict __result); -+#endif /* misc */ -+ -+ -+/* Description of data base entry for a single service. */ -+struct protoent -+{ -+ char *p_name; /* Official protocol name. */ -+ char **p_aliases; /* Alias list. */ -+ int p_proto; /* Protocol number. */ -+}; -+ -+/* Open protocol data base files and mark them as staying open even -+ after a later search if STAY_OPEN is non-zero. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void setprotoent (int __stay_open); -+ -+/* Close protocol data base files and clear `stay open' flag. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern void endprotoent (void); -+ -+/* Get next entry from protocol data base file. Open data base if -+ necessary. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct protoent *getprotoent (void); -+ -+/* Return entry from protocol data base for network with NAME. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct protoent *getprotobyname (const char *__name); -+ -+/* Return entry from protocol data base which number is PROTO. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern struct protoent *getprotobynumber (int __proto); -+ -+ -+#ifdef __USE_MISC -+/* Reentrant versions of the functions above. The additional -+ arguments specify a buffer of BUFLEN starting at BUF. -+ -+ These functions are not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation they are cancellation points and -+ therefore not marked with __THROW. */ -+extern int getprotoent_r (struct protoent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct protoent **__restrict __result); -+ -+extern int getprotobyname_r (const char *__restrict __name, -+ struct protoent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct protoent **__restrict __result); -+ -+extern int getprotobynumber_r (int __proto, -+ struct protoent *__restrict __result_buf, -+ char *__restrict __buf, size_t __buflen, -+ struct protoent **__restrict __result); -+ -+ -+/* Establish network group NETGROUP for enumeration. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int setnetgrent (const char *__netgroup); -+ -+/* Free all space allocated by previous `setnetgrent' call. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern void endnetgrent (void); -+ -+/* Get next member of netgroup established by last `setnetgrent' call -+ and return pointers to elements in HOSTP, USERP, and DOMAINP. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int getnetgrent (char **__restrict __hostp, -+ char **__restrict __userp, -+ char **__restrict __domainp); -+ -+ -+/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN). -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int innetgr (const char *__netgroup, const char *__host, -+ const char *__user, const char *__domain); -+ -+/* Reentrant version of `getnetgrent' where result is placed in BUFFER. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int getnetgrent_r (char **__restrict __hostp, -+ char **__restrict __userp, -+ char **__restrict __domainp, -+ char *__restrict __buffer, size_t __buflen); -+#endif /* misc */ -+ -+ -+#ifdef __USE_MISC -+/* Call `rshd' at port RPORT on remote machine *AHOST to execute CMD. -+ The local user is LOCUSER, on the remote machine the command is -+ executed as REMUSER. In *FD2P the descriptor to the socket for the -+ connection is returned. The caller must have the right to use a -+ reserved port. When the function returns *AHOST contains the -+ official host name. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rcmd (char **__restrict __ahost, unsigned short int __rport, -+ const char *__restrict __locuser, -+ const char *__restrict __remuser, -+ const char *__restrict __cmd, int *__restrict __fd2p); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rcmd_af (char **__restrict __ahost, unsigned short int __rport, -+ const char *__restrict __locuser, -+ const char *__restrict __remuser, -+ const char *__restrict __cmd, int *__restrict __fd2p, -+ sa_family_t __af); -+ -+/* Call `rexecd' at port RPORT on remote machine *AHOST to execute -+ CMD. The process runs at the remote machine using the ID of user -+ NAME whose cleartext password is PASSWD. In *FD2P the descriptor -+ to the socket for the connection is returned. When the function -+ returns *AHOST contains the official host name. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rexec (char **__restrict __ahost, int __rport, -+ const char *__restrict __name, -+ const char *__restrict __pass, -+ const char *__restrict __cmd, int *__restrict __fd2p); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rexec_af (char **__restrict __ahost, int __rport, -+ const char *__restrict __name, -+ const char *__restrict __pass, -+ const char *__restrict __cmd, int *__restrict __fd2p, -+ sa_family_t __af); -+ -+/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER. -+ If SUSER is not zero the user tries to become superuser. Return 0 if -+ it is possible. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int ruserok (const char *__rhost, int __suser, -+ const char *__remuser, const char *__locuser); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int ruserok_af (const char *__rhost, int __suser, -+ const char *__remuser, const char *__locuser, -+ sa_family_t __af); -+ -+/* Check whether user REMUSER on system indicated by IPv4 address -+ RADDR is allowed to login as LOCUSER. Non-IPv4 (e.g., IPv6) are -+ not supported. If SUSER is not zero the user tries to become -+ superuser. Return 0 if it is possible. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int iruserok (uint32_t __raddr, int __suser, -+ const char *__remuser, const char *__locuser); -+ -+/* This is the equivalent function where the pfamiliy if the address -+ pointed to by RADDR is determined by the value of AF. It therefore -+ can be used for IPv6 -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int iruserok_af (const void *__raddr, int __suser, -+ const char *__remuser, const char *__locuser, -+ sa_family_t __af); -+ -+/* Try to allocate reserved port, returning a descriptor for a socket opened -+ at this port or -1 if unsuccessful. The search for an available port -+ will start at ALPORT and continues with lower numbers. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rresvport (int *__alport); -+ -+/* This is the equivalent function where the protocol can be selected -+ and which therefore can be used for IPv6. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int rresvport_af (int *__alport, sa_family_t __af); -+#endif -+ -+ -+/* Extension from POSIX.1g. */ -+#ifdef __USE_POSIX -+/* Structure to contain information about address of a service provider. */ -+struct addrinfo -+{ -+ int ai_flags; /* Input flags. */ -+ int ai_family; /* Protocol family for socket. */ -+ int ai_socktype; /* Socket type. */ -+ int ai_protocol; /* Protocol for socket. */ -+ socklen_t ai_addrlen; /* Length of socket address. */ -+ struct sockaddr *ai_addr; /* Socket address for socket. */ -+ char *ai_canonname; /* Canonical name for service location. */ -+ struct addrinfo *ai_next; /* Pointer to next in list. */ -+}; -+ -+# ifdef __USE_GNU -+/* Structure used as control block for asynchronous lookup. */ -+struct gaicb -+{ -+ const char *ar_name; /* Name to look up. */ -+ const char *ar_service; /* Service name. */ -+ const struct addrinfo *ar_request; /* Additional request specification. */ -+ struct addrinfo *ar_result; /* Pointer to result. */ -+ /* The following are internal elements. */ -+ int __return; -+ int __glibc_reserved[5]; -+}; -+ -+/* Lookup mode. */ -+# define GAI_WAIT 0 -+# define GAI_NOWAIT 1 -+# endif -+ -+/* Possible values for `ai_flags' field in `addrinfo' structure. */ -+# define AI_PASSIVE 0x0001 /* Socket address is intended for `bind'. */ -+# define AI_CANONNAME 0x0002 /* Request for canonical name. */ -+# define AI_NUMERICHOST 0x0004 /* Don't use name resolution. */ -+# define AI_V4MAPPED 0x0008 /* IPv4 mapped addresses are acceptable. */ -+# define AI_ALL 0x0010 /* Return IPv4 mapped and IPv6 addresses. */ -+# define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose -+ returned address type.. */ -+# ifdef __USE_GNU -+# define AI_IDN 0x0040 /* IDN encode input (assuming it is encoded -+ in the current locale's character set) -+ before looking it up. */ -+# define AI_CANONIDN 0x0080 /* Translate canonical name from IDN format. */ -+# define AI_IDN_ALLOW_UNASSIGNED 0x0100 /* Don't reject unassigned Unicode -+ code points. */ -+# define AI_IDN_USE_STD3_ASCII_RULES 0x0200 /* Validate strings according to -+ STD3 rules. */ -+# endif -+# define AI_NUMERICSERV 0x0400 /* Don't use name resolution. */ -+ -+/* Error values for `getaddrinfo' function. */ -+# define EAI_BADFLAGS -1 /* Invalid value for `ai_flags' field. */ -+# define EAI_NONAME -2 /* NAME or SERVICE is unknown. */ -+# define EAI_AGAIN -3 /* Temporary failure in name resolution. */ -+# define EAI_FAIL -4 /* Non-recoverable failure in name res. */ -+# define EAI_FAMILY -6 /* `ai_family' not supported. */ -+# define EAI_SOCKTYPE -7 /* `ai_socktype' not supported. */ -+# define EAI_SERVICE -8 /* SERVICE not supported for `ai_socktype'. */ -+# define EAI_MEMORY -10 /* Memory allocation failure. */ -+# define EAI_SYSTEM -11 /* System error returned in `errno'. */ -+# define EAI_OVERFLOW -12 /* Argument buffer overflow. */ -+# ifdef __USE_GNU -+# define EAI_NODATA -5 /* No address associated with NAME. */ -+# define EAI_ADDRFAMILY -9 /* Address family for NAME not supported. */ -+# define EAI_INPROGRESS -100 /* Processing request in progress. */ -+# define EAI_CANCELED -101 /* Request canceled. */ -+# define EAI_NOTCANCELED -102 /* Request not canceled. */ -+# define EAI_ALLDONE -103 /* All requests done. */ -+# define EAI_INTR -104 /* Interrupted by a signal. */ -+# define EAI_IDN_ENCODE -105 /* IDN encoding failed. */ -+# endif -+ -+# ifdef __USE_MISC -+# define NI_MAXHOST 1025 -+# define NI_MAXSERV 32 -+# endif -+ -+# define NI_NUMERICHOST 1 /* Don't try to look up hostname. */ -+# define NI_NUMERICSERV 2 /* Don't convert port number to name. */ -+# define NI_NOFQDN 4 /* Only return nodename portion. */ -+# define NI_NAMEREQD 8 /* Don't return numeric addresses. */ -+# define NI_DGRAM 16 /* Look up UDP service rather than TCP. */ -+# ifdef __USE_GNU -+# define NI_IDN 32 /* Convert name from IDN format. */ -+# define NI_IDN_ALLOW_UNASSIGNED 64 /* Don't reject unassigned Unicode -+ code points. */ -+# define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to -+ STD3 rules. */ -+# endif -+ -+/* Translate name of a service location and/or a service name to set of -+ socket addresses. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern int getaddrinfo (const char *__restrict __name, -+ const char *__restrict __service, -+ const struct addrinfo *__restrict __req, -+ struct addrinfo **__restrict __pai); -+ -+/* Free `addrinfo' structure AI including associated storage. */ -+extern void freeaddrinfo (struct addrinfo *__ai) __THROW; -+ -+/* Convert error return from getaddrinfo() to a string. */ -+extern const char *gai_strerror (int __ecode) __THROW; -+ -+/* Translate a socket address to a location and service name. -+ -+ This function is a possible cancellation point and therefore not -+ marked with __THROW. */ -+extern int getnameinfo (const struct sockaddr *__restrict __sa, -+ socklen_t __salen, char *__restrict __host, -+ socklen_t __hostlen, char *__restrict __serv, -+ socklen_t __servlen, int __flags); -+#endif /* POSIX */ -+ -+#ifdef __USE_GNU -+/* Enqueue ENT requests from the LIST. If MODE is GAI_WAIT wait until all -+ requests are handled. If WAIT is GAI_NOWAIT return immediately after -+ queueing the requests and signal completion according to SIG. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int getaddrinfo_a (int __mode, struct gaicb *__list[__restrict_arr], -+ int __ent, struct sigevent *__restrict __sig); -+ -+/* Suspend execution of the thread until at least one of the ENT requests -+ in LIST is handled. If TIMEOUT is not a null pointer it specifies the -+ longest time the function keeps waiting before returning with an error. -+ -+ This function is not part of POSIX and therefore no official -+ cancellation point. But due to similarity with an POSIX interface -+ or due to the implementation it is a cancellation point and -+ therefore not marked with __THROW. */ -+extern int gai_suspend (const struct gaicb *const __list[], int __ent, -+ const struct timespec *__timeout); -+ -+/* Get the error status of the request REQ. */ -+extern int gai_error (struct gaicb *__req) __THROW; -+ -+/* Cancel the requests associated with GAICBP. */ -+extern int gai_cancel (struct gaicb *__gaicbp) __THROW; -+#endif /* GNU */ -+ -+__END_DECLS -+ -+#endif /* netdb.h */ -Index: glibc-2.20/resolv/resolv.h.in -=================================================================== ---- /dev/null -+++ glibc-2.20/resolv/resolv.h.in -@@ -0,0 +1,389 @@ -+/* -+ * Copyright (c) 1983, 1987, 1989 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+/* -+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium. -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS -+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES -+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE -+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -+ * SOFTWARE. -+ */ -+ -+/* -+ * @(#)resolv.h 8.1 (Berkeley) 6/2/93 -+ * $BINDId: resolv.h,v 8.31 2000/03/30 20:16:50 vixie Exp $ -+ */ -+ -+#ifndef _RESOLV_H_ -+ -+/* These headers are needed for types used in the `struct res_state' -+ declaration. */ -+#include <sys/types.h> -+#include <netinet/in.h> -+ -+#ifndef __need_res_state -+# define _RESOLV_H_ -+ -+# include <sys/param.h> -+# include <sys/cdefs.h> -+# include <stdio.h> -+# include <arpa/nameser.h> -+#endif -+ -+#ifndef __res_state_defined -+# define __res_state_defined -+ -+typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error } -+ res_sendhookact; -+ -+typedef res_sendhookact (*res_send_qhook) (struct sockaddr_in * const *__ns, -+ const u_char **__query, -+ int *__querylen, -+ u_char *__ans, -+ int __anssiz, -+ int *__resplen); -+ -+typedef res_sendhookact (*res_send_rhook) (const struct sockaddr_in *__ns, -+ const u_char *__query, -+ int __querylen, -+ u_char *__ans, -+ int __anssiz, -+ int *__resplen); -+ -+/* -+ * Global defines and variables for resolver stub. -+ */ -+# define MAXNS 3 /* max # name servers we'll track */ -+# define MAXDFLSRCH 3 /* # default domain levels to try */ -+# define MAXDNSRCH 6 /* max # domains in search path */ -+# define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */ -+ -+# define RES_TIMEOUT 5 /* min. seconds between retries */ -+# define MAXRESOLVSORT 10 /* number of net to sort on */ -+# define RES_MAXNDOTS 15 /* should reflect bit field size */ -+# define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */ -+# define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ -+# define RES_DFLRETRY 2 /* Default #/tries. */ -+# define RES_MAXTIME 65535 /* Infinity, in milliseconds. */ -+ -+struct __res_state { -+ int retrans; /* retransmition time interval */ -+ int retry; /* number of times to retransmit */ -+ u_long options; /* option flags - see below. */ -+ int nscount; /* number of name servers */ -+ struct sockaddr_in -+ nsaddr_list[MAXNS]; /* address of name server */ -+# define nsaddr nsaddr_list[0] /* for backward compatibility */ -+ u_short id; /* current message id */ -+ /* 2 byte hole here. */ -+ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ -+ char defdname[256]; /* default domain (deprecated) */ -+ u_long pfcode; /* RES_PRF_ flags - see below. */ -+ unsigned ndots:4; /* threshold for initial abs. query */ -+ unsigned nsort:4; /* number of elements in sort_list[] */ -+ unsigned ipv6_unavail:1; /* connecting to IPv6 server failed */ -+ unsigned unused:23; -+ struct { -+ struct in_addr addr; -+ u_int32_t mask; -+ } sort_list[MAXRESOLVSORT]; -+ /* 4 byte hole here on 64-bit architectures. */ -+ res_send_qhook qhook; /* query hook */ -+ res_send_rhook rhook; /* response hook */ -+ int res_h_errno; /* last one set for this context */ -+ int _vcsock; /* PRIVATE: for res_send VC i/o */ -+ u_int _flags; /* PRIVATE: see below */ -+ /* 4 byte hole here on 64-bit architectures. */ -+ union { -+ char pad[52]; /* On an i386 this means 512b total. */ -+ struct { -+ u_int16_t nscount; -+ u_int16_t nsmap[MAXNS]; -+ int nssocks[MAXNS]; -+ u_int16_t nscount6; -+ u_int16_t nsinit; -+ struct sockaddr_in6 *nsaddrs[MAXNS]; -+#ifdef _LIBC -+ unsigned long long int initstamp -+ __attribute__((packed)); -+#else -+ unsigned int _initstamp[2]; -+#endif -+ } _ext; -+ } _u; -+}; -+ -+typedef struct __res_state *res_state; -+# undef __need_res_state -+#endif -+ -+#ifdef _RESOLV_H_ -+/* -+ * Revision information. This is the release date in YYYYMMDD format. -+ * It can change every day so the right thing to do with it is use it -+ * in preprocessor commands such as "#if (__RES > 19931104)". Do not -+ * compare for equality; rather, use it to determine whether your resolver -+ * is new enough to contain a certain feature. -+ */ -+ -+#define __RES 19991006 -+ -+/* -+ * Resolver configuration file. -+ * Normally not present, but may contain the address of the -+ * inital name server(s) to query and the domain search list. -+ */ -+ -+#ifndef _PATH_RESCONF -+#define _PATH_RESCONF "@libc_cv_sysconfdir@/resolv.conf" -+#endif -+ -+struct res_sym { -+ int number; /* Identifying number, like T_MX */ -+ char * name; /* Its symbolic name, like "MX" */ -+ char * humanname; /* Its fun name, like "mail exchanger" */ -+}; -+ -+/* -+ * Resolver flags (used to be discrete per-module statics ints). -+ */ -+#define RES_F_VC 0x00000001 /* socket is TCP */ -+#define RES_F_CONN 0x00000002 /* socket is connected */ -+#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */ -+ -+/* res_findzonecut() options */ -+#define RES_EXHAUSTIVE 0x00000001 /* always do all queries */ -+ -+/* -+ * Resolver options (keep these in synch with res_debug.c, please) -+ */ -+#define RES_INIT 0x00000001 /* address initialized */ -+#define RES_DEBUG 0x00000002 /* print debug messages */ -+#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/ -+#define RES_USEVC 0x00000008 /* use virtual circuit */ -+#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */ -+#define RES_IGNTC 0x00000020 /* ignore trucation errors */ -+#define RES_RECURSE 0x00000040 /* recursion desired */ -+#define RES_DEFNAMES 0x00000080 /* use default domain name */ -+#define RES_STAYOPEN 0x00000100 /* Keep TCP socket open */ -+#define RES_DNSRCH 0x00000200 /* search up local domain tree */ -+#define RES_INSECURE1 0x00000400 /* type 1 security disabled */ -+#define RES_INSECURE2 0x00000800 /* type 2 security disabled */ -+#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ -+#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ -+#define RES_ROTATE 0x00004000 /* rotate ns list after each query */ -+#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity (!IMPL) */ -+#define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */ -+#define RES_BLAST 0x00020000 /* blast all recursive servers */ -+#define RES_USEBSTRING 0x00040000 /* IPv6 reverse lookup with byte -+ strings */ -+#define RES_NOIP6DOTINT 0x00080000 /* Do not use .ip6.int in IPv6 -+ reverse lookup */ -+#define RES_USE_EDNS0 0x00100000 /* Use EDNS0. */ -+#define RES_SNGLKUP 0x00200000 /* one outstanding request at a time */ -+#define RES_SNGLKUPREOP 0x00400000 /* -"-, but open new socket for each -+ request */ -+#define RES_USE_DNSSEC 0x00800000 /* use DNSSEC using OK bit in OPT */ -+#define RES_NOTLDQUERY 0x01000000 /* Do not look up unqualified name -+ as a TLD. */ -+ -+#define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) -+ -+/* -+ * Resolver "pfcode" values. Used by dig. -+ */ -+#define RES_PRF_STATS 0x00000001 -+#define RES_PRF_UPDATE 0x00000002 -+#define RES_PRF_CLASS 0x00000004 -+#define RES_PRF_CMD 0x00000008 -+#define RES_PRF_QUES 0x00000010 -+#define RES_PRF_ANS 0x00000020 -+#define RES_PRF_AUTH 0x00000040 -+#define RES_PRF_ADD 0x00000080 -+#define RES_PRF_HEAD1 0x00000100 -+#define RES_PRF_HEAD2 0x00000200 -+#define RES_PRF_TTLID 0x00000400 -+#define RES_PRF_HEADX 0x00000800 -+#define RES_PRF_QUERY 0x00001000 -+#define RES_PRF_REPLY 0x00002000 -+#define RES_PRF_INIT 0x00004000 -+/* 0x00008000 */ -+ -+/* Things involving an internal (static) resolver context. */ -+__BEGIN_DECLS -+extern struct __res_state *__res_state(void) __attribute__ ((__const__)); -+__END_DECLS -+#define _res (*__res_state()) -+ -+#ifndef __BIND_NOSTATIC -+#define fp_nquery __fp_nquery -+#define fp_query __fp_query -+#define hostalias __hostalias -+#define p_query __p_query -+#define res_close __res_close -+#define res_init __res_init -+#define res_isourserver __res_isourserver -+#define res_mkquery __res_mkquery -+#define res_query __res_query -+#define res_querydomain __res_querydomain -+#define res_search __res_search -+#define res_send __res_send -+ -+__BEGIN_DECLS -+void fp_nquery (const u_char *, int, FILE *) __THROW; -+void fp_query (const u_char *, FILE *) __THROW; -+const char * hostalias (const char *) __THROW; -+void p_query (const u_char *) __THROW; -+void res_close (void) __THROW; -+int res_init (void) __THROW; -+int res_isourserver (const struct sockaddr_in *) __THROW; -+int res_mkquery (int, const char *, int, int, const u_char *, -+ int, const u_char *, u_char *, int) __THROW; -+int res_query (const char *, int, int, u_char *, int) __THROW; -+int res_querydomain (const char *, const char *, int, int, -+ u_char *, int) __THROW; -+int res_search (const char *, int, int, u_char *, int) __THROW; -+int res_send (const u_char *, int, u_char *, int) __THROW; -+__END_DECLS -+#endif -+ -+#define b64_ntop __b64_ntop -+#define b64_pton __b64_pton -+#define dn_comp __dn_comp -+#define dn_count_labels __dn_count_labels -+#define dn_expand __dn_expand -+#define dn_skipname __dn_skipname -+#define fp_resstat __fp_resstat -+#define loc_aton __loc_aton -+#define loc_ntoa __loc_ntoa -+#define p_cdname __p_cdname -+#define p_cdnname __p_cdnname -+#define p_class __p_class -+#define p_fqname __p_fqname -+#define p_fqnname __p_fqnname -+#define p_option __p_option -+#define p_secstodate __p_secstodate -+#define p_section __p_section -+#define p_time __p_time -+#define p_type __p_type -+#define p_rcode __p_rcode -+#define putlong __putlong -+#define putshort __putshort -+#define res_dnok __res_dnok -+#define res_hnok __res_hnok -+#define res_hostalias __res_hostalias -+#define res_mailok __res_mailok -+#define res_nameinquery __res_nameinquery -+#define res_nclose __res_nclose -+#define res_ninit __res_ninit -+#define res_nmkquery __res_nmkquery -+#define res_npquery __res_npquery -+#define res_nquery __res_nquery -+#define res_nquerydomain __res_nquerydomain -+#define res_nsearch __res_nsearch -+#define res_nsend __res_nsend -+#define res_nisourserver __res_nisourserver -+#define res_ownok __res_ownok -+#define res_queriesmatch __res_queriesmatch -+#define res_randomid __res_randomid -+#define sym_ntop __sym_ntop -+#define sym_ntos __sym_ntos -+#define sym_ston __sym_ston -+__BEGIN_DECLS -+int res_hnok (const char *) __THROW; -+int res_ownok (const char *) __THROW; -+int res_mailok (const char *) __THROW; -+int res_dnok (const char *) __THROW; -+int sym_ston (const struct res_sym *, const char *, int *) __THROW; -+const char * sym_ntos (const struct res_sym *, int, int *) __THROW; -+const char * sym_ntop (const struct res_sym *, int, int *) __THROW; -+int b64_ntop (u_char const *, size_t, char *, size_t) __THROW; -+int b64_pton (char const *, u_char *, size_t) __THROW; -+int loc_aton (const char *__ascii, u_char *__binary) __THROW; -+const char * loc_ntoa (const u_char *__binary, char *__ascii) __THROW; -+int dn_skipname (const u_char *, const u_char *) __THROW; -+void putlong (u_int32_t, u_char *) __THROW; -+void putshort (u_int16_t, u_char *) __THROW; -+const char * p_class (int) __THROW; -+const char * p_time (u_int32_t) __THROW; -+const char * p_type (int) __THROW; -+const char * p_rcode (int) __THROW; -+const u_char * p_cdnname (const u_char *, const u_char *, int, FILE *) -+ __THROW; -+const u_char * p_cdname (const u_char *, const u_char *, FILE *) __THROW; -+const u_char * p_fqnname (const u_char *__cp, const u_char *__msg, -+ int, char *, int) __THROW; -+const u_char * p_fqname (const u_char *, const u_char *, FILE *) __THROW; -+const char * p_option (u_long __option) __THROW; -+char * p_secstodate (u_long) __THROW; -+int dn_count_labels (const char *) __THROW; -+int dn_comp (const char *, u_char *, int, u_char **, u_char **) -+ __THROW; -+int dn_expand (const u_char *, const u_char *, const u_char *, -+ char *, int) __THROW; -+u_int res_randomid (void) __THROW; -+int res_nameinquery (const char *, int, int, -+ const u_char *, const u_char *) __THROW; -+int res_queriesmatch (const u_char *, const u_char *, -+ const u_char *, const u_char *) __THROW; -+const char * p_section (int __section, int __opcode) __THROW; -+/* Things involving a resolver context. */ -+int res_ninit (res_state) __THROW; -+int res_nisourserver (const res_state, -+ const struct sockaddr_in *) __THROW; -+void fp_resstat (const res_state, FILE *) __THROW; -+void res_npquery (const res_state, const u_char *, int, FILE *) -+ __THROW; -+const char * res_hostalias (const res_state, const char *, char *, size_t) -+ __THROW; -+int res_nquery (res_state, const char *, int, int, u_char *, int) -+ __THROW; -+int res_nsearch (res_state, const char *, int, int, u_char *, int) -+ __THROW; -+int res_nquerydomain (res_state, const char *, const char *, int, -+ int, u_char *, int) __THROW; -+int res_nmkquery (res_state, int, const char *, int, int, -+ const u_char *, int, const u_char *, u_char *, -+ int) __THROW; -+int res_nsend (res_state, const u_char *, int, u_char *, int) -+ __THROW; -+void res_nclose (res_state) __THROW; -+__END_DECLS -+#endif -+ -+#endif /* !_RESOLV_H_ */ -Index: glibc-2.20/configure -=================================================================== ---- glibc-2.20.orig/configure -+++ glibc-2.20/configure -@@ -7177,7 +7177,7 @@ RELEASE=`sed -n -e 's/^#define RELEASE " - - - --ac_config_files="$ac_config_files config.make Makefile" -+ac_config_files="$ac_config_files config.make Makefile nss/db-Makefile resolv/netdb.h resolv/resolv.h sysdeps/generic/ldconfig.h" - - ac_config_commands="$ac_config_commands default" - -@@ -7897,6 +7897,10 @@ do - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "config.make") CONFIG_FILES="$CONFIG_FILES config.make" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "nss/db-Makefile") CONFIG_FILES="$CONFIG_FILES nss/db-Makefile" ;; -+ "resolv/netdb.h") CONFIG_FILES="$CONFIG_FILES resolv/netdb.h" ;; -+ "resolv/resolv.h") CONFIG_FILES="$CONFIG_FILES resolv/resolv.h" ;; -+ "sysdeps/generic/ldconfig.h") CONFIG_FILES="$CONFIG_FILES sysdeps/generic/ldconfig.h" ;; - "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -Index: glibc-2.20/sysdeps/generic/ldconfig.h -=================================================================== ---- glibc-2.20.orig/sysdeps/generic/ldconfig.h -+++ /dev/null -@@ -1,94 +0,0 @@ --/* Copyright (C) 1999-2014 Free Software Foundation, Inc. -- This file is part of the GNU C Library. -- Contributed by Andreas Jaeger <aj@suse.de>, 1999. -- -- The GNU C Library is free software; you can redistribute it and/or -- modify it under the terms of the GNU Lesser General Public -- License as published by the Free Software Foundation; either -- version 2.1 of the License, or (at your option) any later version. -- -- The GNU C Library is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public -- License along with the GNU C Library; if not, see -- <http://www.gnu.org/licenses/>. */ -- --#ifndef _LDCONFIG_H --#define _LDCONFIG_H -- --#include <stdint.h> -- --#define FLAG_ANY -1 --#define FLAG_TYPE_MASK 0x00ff --#define FLAG_LIBC4 0x0000 --#define FLAG_ELF 0x0001 --#define FLAG_ELF_LIBC5 0x0002 --#define FLAG_ELF_LIBC6 0x0003 --#define FLAG_REQUIRED_MASK 0xff00 --#define FLAG_SPARC_LIB64 0x0100 --#define FLAG_IA64_LIB64 0x0200 --#define FLAG_X8664_LIB64 0x0300 --#define FLAG_S390_LIB64 0x0400 --#define FLAG_POWERPC_LIB64 0x0500 --#define FLAG_MIPS64_LIBN32 0x0600 --#define FLAG_MIPS64_LIBN64 0x0700 --#define FLAG_X8664_LIBX32 0x0800 --#define FLAG_ARM_LIBHF 0x0900 --#define FLAG_AARCH64_LIB64 0x0a00 --#define FLAG_ARM_LIBSF 0x0b00 --#define FLAG_MIPS_LIB32_NAN2008 0x0c00 --#define FLAG_MIPS64_LIBN32_NAN2008 0x0d00 --#define FLAG_MIPS64_LIBN64_NAN2008 0x0e00 -- --/* Name of auxiliary cache. */ --#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" -- --/* Declared in cache.c. */ --extern void print_cache (const char *cache_name); -- --extern void init_cache (void); -- --extern void save_cache (const char *cache_name); -- --extern void add_to_cache (const char *path, const char *lib, int flags, -- unsigned int osversion, uint64_t hwcap); -- --extern void init_aux_cache (void); -- --extern void load_aux_cache (const char *aux_cache_name); -- --extern int search_aux_cache (struct stat64 *stat_buf, int *flags, -- unsigned int *osversion, char **soname); -- --extern void add_to_aux_cache (struct stat64 *stat_buf, int flags, -- unsigned int osversion, const char *soname); -- --extern void save_aux_cache (const char *aux_cache_name); -- --/* Declared in readlib.c. */ --extern int process_file (const char *real_file_name, const char *file_name, -- const char *lib, int *flag, unsigned int *osversion, -- char **soname, int is_link, struct stat64 *stat_buf); -- --extern char *implicit_soname (const char *lib, int flag); -- --/* Declared in readelflib.c. */ --extern int process_elf_file (const char *file_name, const char *lib, int *flag, -- unsigned int *osversion, char **soname, -- void *file_contents, size_t file_length); -- --/* Declared in chroot_canon.c. */ --extern char *chroot_canon (const char *chroot, const char *name); -- --/* Declared in ldconfig.c. */ --extern int opt_verbose; -- --extern int opt_format; -- --/* Prototypes for a few program-wide used functions. */ --#include <programs/xmalloc.h> -- --#endif /* ! _LDCONFIG_H */ -Index: glibc-2.20/sysdeps/generic/ldconfig.h.in -=================================================================== ---- /dev/null -+++ glibc-2.20/sysdeps/generic/ldconfig.h.in -@@ -0,0 +1,94 @@ -+/* Copyright (C) 1999-2014 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Andreas Jaeger <aj@suse.de>, 1999. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ -+#ifndef _LDCONFIG_H -+#define _LDCONFIG_H -+ -+#include <stdint.h> -+ -+#define FLAG_ANY -1 -+#define FLAG_TYPE_MASK 0x00ff -+#define FLAG_LIBC4 0x0000 -+#define FLAG_ELF 0x0001 -+#define FLAG_ELF_LIBC5 0x0002 -+#define FLAG_ELF_LIBC6 0x0003 -+#define FLAG_REQUIRED_MASK 0xff00 -+#define FLAG_SPARC_LIB64 0x0100 -+#define FLAG_IA64_LIB64 0x0200 -+#define FLAG_X8664_LIB64 0x0300 -+#define FLAG_S390_LIB64 0x0400 -+#define FLAG_POWERPC_LIB64 0x0500 -+#define FLAG_MIPS64_LIBN32 0x0600 -+#define FLAG_MIPS64_LIBN64 0x0700 -+#define FLAG_X8664_LIBX32 0x0800 -+#define FLAG_ARM_LIBHF 0x0900 -+#define FLAG_AARCH64_LIB64 0x0a00 -+#define FLAG_ARM_LIBSF 0x0b00 -+#define FLAG_MIPS_LIB32_NAN2008 0x0c00 -+#define FLAG_MIPS64_LIBN32_NAN2008 0x0d00 -+#define FLAG_MIPS64_LIBN64_NAN2008 0x0e00 -+ -+/* Name of auxiliary cache. */ -+#define _PATH_LDCONFIG_AUX_CACHE "@libc_cv_localstatedir@/cache/ldconfig/aux-cache" -+ -+/* Declared in cache.c. */ -+extern void print_cache (const char *cache_name); -+ -+extern void init_cache (void); -+ -+extern void save_cache (const char *cache_name); -+ -+extern void add_to_cache (const char *path, const char *lib, int flags, -+ unsigned int osversion, uint64_t hwcap); -+ -+extern void init_aux_cache (void); -+ -+extern void load_aux_cache (const char *aux_cache_name); -+ -+extern int search_aux_cache (struct stat64 *stat_buf, int *flags, -+ unsigned int *osversion, char **soname); -+ -+extern void add_to_aux_cache (struct stat64 *stat_buf, int flags, -+ unsigned int osversion, const char *soname); -+ -+extern void save_aux_cache (const char *aux_cache_name); -+ -+/* Declared in readlib.c. */ -+extern int process_file (const char *real_file_name, const char *file_name, -+ const char *lib, int *flag, unsigned int *osversion, -+ char **soname, int is_link, struct stat64 *stat_buf); -+ -+extern char *implicit_soname (const char *lib, int flag); -+ -+/* Declared in readelflib.c. */ -+extern int process_elf_file (const char *file_name, const char *lib, int *flag, -+ unsigned int *osversion, char **soname, -+ void *file_contents, size_t file_length); -+ -+/* Declared in chroot_canon.c. */ -+extern char *chroot_canon (const char *chroot, const char *name); -+ -+/* Declared in ldconfig.c. */ -+extern int opt_verbose; -+ -+extern int opt_format; -+ -+/* Prototypes for a few program-wide used functions. */ -+#include <programs/xmalloc.h> -+ -+#endif /* ! _LDCONFIG_H */ diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c b/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c deleted file mode 100644 index a8ab9d8..0000000 --- a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-chk_fail.c +++ /dev/null @@ -1,299 +0,0 @@ -/* Copyright (C) 2004-2014 Free Software Foundation, Inc. - Copyright (C) 2006-2014 Gentoo Foundation Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Hardened Gentoo SSP and FORTIFY handler - - A failure handler that does not use functions from the rest of glibc; - it uses the INTERNAL_SYSCALL methods directly. This helps ensure no - possibility of recursion into the handler. - - Direct all bug reports to http://bugs.gentoo.org/ - - People who have contributed significantly to the evolution of this file: - Ned Ludd - <solar[@]gentoo.org> - Alexander Gabert - <pappy[@]gentoo.org> - The PaX Team - <pageexec[@]freemail.hu> - Peter S. Mazinger - <ps.m[@]gmx.net> - Yoann Vandoorselaere - <yoann[@]prelude-ids.org> - Robert Connolly - <robert[@]linuxfromscratch.org> - Cory Visi <cory[@]visi.name> - Mike Frysinger <vapier[@]gentoo.org> - Magnus Granberg <zorry[@]gentoo.org> - Kevin F. Quinn - <kevquinn[@]gentoo.org> - */ - -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <signal.h> - -#include <sys/types.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> - -#include <kernel-features.h> - -#include <alloca.h> -/* from sysdeps */ -#include <socketcall.h> -/* for the stuff in bits/socket.h */ -#include <sys/socket.h> -#include <sys/un.h> - -/* Sanity check on SYSCALL macro names - force compilation - * failure if the names used here do not exist - */ -#if !defined __NR_socketcall && !defined __NR_socket -# error Cannot do syscall socket or socketcall -#endif -#if !defined __NR_socketcall && !defined __NR_connect -# error Cannot do syscall connect or socketcall -#endif -#ifndef __NR_write -# error Cannot do syscall write -#endif -#ifndef __NR_close -# error Cannot do syscall close -#endif -#ifndef __NR_getpid -# error Cannot do syscall getpid -#endif -#ifndef __NR_kill -# error Cannot do syscall kill -#endif -#ifndef __NR_exit -# error Cannot do syscall exit -#endif -#ifdef SSP_SMASH_DUMPS_CORE -# define ENABLE_SSP_SMASH_DUMPS_CORE 1 -# if !defined _KERNEL_NSIG && !defined _NSIG -# error No _NSIG or _KERNEL_NSIG for rt_sigaction -# endif -# if !defined __NR_sigaction && !defined __NR_rt_sigaction -# error Cannot do syscall sigaction or rt_sigaction -# endif -/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size - * of the _kernel_ sigset_t which is not the same as the user sigset_t. - * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for - * some reason. - */ -# ifdef _KERNEL_NSIG -# define _SSP_NSIG _KERNEL_NSIG -# else -# define _SSP_NSIG _NSIG -# endif -#else -# define _SSP_NSIG 0 -# define ENABLE_SSP_SMASH_DUMPS_CORE 0 -#endif - -/* Define DO_SIGACTION - default to newer rt signal interface but - * fallback to old as needed. - */ -#ifdef __NR_rt_sigaction -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8) -#else -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(sigaction, 3, signum, act, oldact) -#endif - -/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */ -#if defined(__NR_socket) && defined(__NR_connect) -# define USE_OLD_SOCKETCALL 0 -#else -# define USE_OLD_SOCKETCALL 1 -#endif - -/* stub out the __NR_'s so we can let gcc optimize away dead code */ -#ifndef __NR_socketcall -# define __NR_socketcall 0 -#endif -#ifndef __NR_socket -# define __NR_socket 0 -#endif -#ifndef __NR_connect -# define __NR_connect 0 -#endif -#define DO_SOCKET(result, domain, type, protocol) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = domain; \ - socketargs[1] = type; \ - socketargs[2] = protocol; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \ - } else \ - result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \ - } while (0) -#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = sockfd; \ - socketargs[1] = (unsigned long int)serv_addr; \ - socketargs[2] = addrlen; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \ - } else \ - result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \ - } while (0) - -#ifndef _PATH_LOG -# define _PATH_LOG "/dev/log" -#endif - -static const char path_log[] = _PATH_LOG; - -/* For building glibc with SSP switched on, define __progname to a - * constant if building for the run-time loader, to avoid pulling - * in more of libc.so into ld.so - */ -#ifdef IS_IN_rtld -static const char *__progname = "<ldso>"; -#else -extern const char *__progname; -#endif - -#ifdef GENTOO_SSP_HANDLER -# define ERROR_MSG "stack smashing" -#else -# define ERROR_MSG "buffer overflow" -#endif - -/* Common handler code, used by chk_fail - * Inlined to ensure no self-references to the handler within itself. - * Data static to avoid putting more than necessary on the stack, - * to aid core debugging. - */ -__attribute__ ((__noreturn__, __always_inline__)) -static inline void -__hardened_gentoo_fail(void) -{ -#define MESSAGE_BUFSIZ 512 - static pid_t pid; - static int plen, i, hlen; - static char message[MESSAGE_BUFSIZ]; - /* <11> is LOG_USER|LOG_ERR. A dummy date for loggers to skip over. */ - static const char msg_header[] = "<11>" __DATE__ " " __TIME__ " glibc-gentoo-hardened-check: "; - static const char msg_ssd[] = "*** " ERROR_MSG " detected ***: "; - static const char msg_terminated[] = " terminated; "; - static const char msg_report[] = "report to " REPORT_BUGS_TO "\n"; - static const char msg_unknown[] = "<unknown>"; - static int log_socket, connect_result; - static struct sockaddr_un sock; - static unsigned long int socketargs[4]; - - /* Build socket address */ - sock.sun_family = AF_UNIX; - i = 0; - while (path_log[i] != '\0' && i < sizeof(sock.sun_path) - 1) { - sock.sun_path[i] = path_log[i]; - ++i; - } - sock.sun_path[i] = '\0'; - - /* Try SOCK_DGRAM connection to syslog */ - connect_result = -1; - DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - if (connect_result == -1) { - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - /* Try SOCK_STREAM connection to syslog */ - DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - } - - /* Build message. Messages are generated both in the old style and new style, - * so that log watchers that are configured for the old-style message continue - * to work. - */ -#define strconcat(str) \ - ({ \ - i = 0; \ - while ((str[i] != '\0') && ((i + plen) < (MESSAGE_BUFSIZ - 1))) { \ - message[plen + i] = str[i]; \ - ++i; \ - } \ - plen += i; \ - }) - - /* Tersely log the failure */ - plen = 0; - strconcat(msg_header); - hlen = plen; - strconcat(msg_ssd); - if (__progname != NULL) - strconcat(__progname); - else - strconcat(msg_unknown); - strconcat(msg_terminated); - strconcat(msg_report); - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message + hlen, plen - hlen); - if (connect_result != -1) { - INLINE_SYSCALL(write, 3, log_socket, message, plen); - INLINE_SYSCALL(close, 1, log_socket); - } - - /* Time to kill self since we have no idea what is going on */ - pid = INLINE_SYSCALL(getpid, 0); - - if (ENABLE_SSP_SMASH_DUMPS_CORE) { - /* Remove any user-supplied handler for SIGABRT, before using it. */ -#if 0 - /* - * Note: Disabled because some programs catch & process their - * own crashes. We've already enabled this code path which - * means we want to let core dumps happen. - */ - static struct sigaction default_abort_act; - default_abort_act.sa_handler = SIG_DFL; - default_abort_act.sa_sigaction = NULL; - __sigfillset(&default_abort_act.sa_mask); - default_abort_act.sa_flags = 0; - if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0) -#endif - INLINE_SYSCALL(kill, 2, pid, SIGABRT); - } - - /* SIGKILL is only signal which cannot be caught */ - INLINE_SYSCALL(kill, 2, pid, SIGKILL); - - /* In case the kill didn't work, exit anyway. - * The loop prevents gcc thinking this routine returns. - */ - while (1) - INLINE_SYSCALL(exit, 1, 137); -} - -__attribute__ ((__noreturn__)) -#ifdef GENTOO_SSP_HANDLER -void __stack_chk_fail(void) -#else -void __chk_fail(void) -#endif -{ - __hardened_gentoo_fail(); -} diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c deleted file mode 100644 index 4a537bb..0000000 --- a/sys-libs/glibc/files/2.20/glibc-2.20-gentoo-stack_chk_fail.c +++ /dev/null @@ -1,2 +0,0 @@ -#define GENTOO_SSP_HANDLER -#include <debug/chk_fail.c> diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch deleted file mode 100644 index 35eabe9..0000000 --- a/sys-libs/glibc/files/2.20/glibc-2.20-hardened-inittls-nosysenter.patch +++ /dev/null @@ -1,306 +0,0 @@ -When building glibc PIE (which is not something upstream support), -several modifications are necessary to the glibc build process. - -First, any syscalls in PIEs must be of the PIC variant, otherwise -textrels ensue. Then, any syscalls made before the initialisation -of the TLS will fail on i386, as the sysenter variant on i386 uses -the TLS, giving rise to a chicken-and-egg situation. This patch -defines a PIC syscall variant that doesn't use sysenter, even when the sysenter -version is normally used, and uses the non-sysenter version for the brk -syscall that is performed by the TLS initialisation. Further, the TLS -initialisation is moved in this case prior to the initialisation of -dl_osversion, as that requires further syscalls. - -csu/libc-start.c: Move initial TLS initialization to before the -initialisation of dl_osversion, when INTERNAL_SYSCALL_PRE_TLS is defined - -csu/libc-tls.c: Use the no-sysenter version of sbrk when -INTERNAL_SYSCALL_PRE_TLS is defined. - -misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter -version of brk - if INTERNAL_SYSCALL_PRE_TLS is defined. - -misc/brk.c: Define a no-sysenter version of brk if -INTERNAL_SYSCALL_PRE_TLS is defined. - -sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_PRE_TLS -Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> -Fixed for 2.10 by Magnus Granberg <zorry@ume.nu> -Fixed for 2.18 by Magnus Granberg <zorry@gentoo.org> -Fixed for 2.20 by Francisco Blas Izquierdo Riera <klondike@gentoo.org> - ---- a/csu/libc-start.c -+++ b/csu/libc-start.c -@@ -28,6 +28,7 @@ - extern int __libc_multiple_libcs; - - #include <tls.h> -+#include <sysdep.h> - #ifndef SHARED - # include <dl-osinfo.h> - extern void __pthread_initialize_minimal (void); -@@ -170,6 +171,11 @@ LIBC_START_MAIN (int (*main) (int, char - } - } - -+# ifdef INTERNAL_SYSCALL_PRE_TLS -+ /* Do the initial TLS initialization before _dl_osversion, -+ since the latter uses the uname syscall. */ -+ __pthread_initialize_minimal (); -+# endif - # ifdef DL_SYSDEP_OSCHECK - if (!__libc_multiple_libcs) - { -@@ -138,10 +144,12 @@ - } - # endif - -+# ifndef INTERNAL_SYSCALL_PRE_TLS - /* Initialize the thread library at least a bit since the libgcc - functions are using thread functions if these are available and - we need to setup errno. */ - __pthread_initialize_minimal (); -+# endif - - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); ---- a/csu/libc-tls.c -+++ b/csu/libc-tls.c -@@ -22,12 +22,17 @@ - #include <unistd.h> - #include <stdio.h> - #include <sys/param.h> -+#include <sysdep.h> - - - #ifdef SHARED - #error makefile bug, this file is for static only - #endif - -+#ifdef INTERNAL_SYSCALL_PRE_TLS -+extern void *__sbrk_nosysenter (intptr_t __delta); -+#endif -+ - dtv_t _dl_static_dtv[2 + TLS_SLOTINFO_SURPLUS]; - - -@@ -139,20 +144,29 @@ __libc_setup_tls (size_t tcbsize, size_t - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with -- IE-model TLS. */ -+ IE-model TLS. -+ -+ Where the normal sbrk would use a syscall that needs the TLS (i386) -+ use the special non-sysenter version instead. */ -+#ifdef INTERNAL_SYSCALL_PRE_TLS -+# define __sbrk __sbrk_nosysenter -+#endif - #if TLS_TCB_AT_TP - tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); - tlsblock = __sbrk (tcb_offset + tcbsize + max_align); - #elif TLS_DTV_AT_TP - tcb_offset = roundup (tcbsize, align ?: 1); - tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); - tlsblock += TLS_PRE_TCB_SIZE; - #else - /* In case a model with a different layout for the TCB and DTV - is defined add another #elif here and in the following #ifs. */ - # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" - #endif -+#ifdef INTERNAL_SYSCALL_PRE_TLS -+# undef __sbrk -+#endif - - /* Align the TLS block. */ - tlsblock = (void *) (((uintptr_t) tlsblock + max_align - 1) ---- a/misc/sbrk.c -+++ b/misc/sbrk.c -@@ -18,6 +18,7 @@ - #include <errno.h> - #include <stdint.h> - #include <unistd.h> -+#include <sysdep.h> - - /* Defined in brk.c. */ - extern void *__curbrk; -@@ -29,6 +30,35 @@ - /* Extend the process's data space by INCREMENT. - If INCREMENT is negative, shrink data space by - INCREMENT. - Return start of new space allocated, or -1 for errors. */ -+#ifdef INTERNAL_SYSCALL_PRE_TLS -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+extern int __brk_nosysenter (void *addr); -+void * -+__sbrk_nosysenter (intptr_t increment) -+{ -+ void *oldbrk; -+ -+ /* If this is not part of the dynamic library or the library is used via -+ dynamic loading in a statically linked program update __curbrk from the -+ kernel's brk value. That way two separate instances of __brk and __sbrk -+ can share the heap, returning interleaved pieces of it. */ -+ if (__curbrk == NULL || __libc_multiple_libcs) -+ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ -+ return (void *) -1; -+ -+ if (increment == 0) -+ return __curbrk; -+ -+ oldbrk = __curbrk; -+ if (__brk_nosysenter (oldbrk + increment) < 0) -+ return (void *) -1; -+ -+ return oldbrk; -+} -+#endif -+ - void * - __sbrk (intptr_t increment) - { ---- a/sysdeps/unix/sysv/linux/i386/brk.c -+++ b/sysdeps/unix/sysv/linux/i386/brk.c -@@ -31,6 +31,30 @@ - linker. */ - weak_alias (__curbrk, ___brk_addr) - -+#ifdef INTERNAL_SYSCALL_PRE_TLS -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+int -+__brk_nosysenter (void *addr) -+{ -+ void *newbrk; -+ -+ INTERNAL_SYSCALL_DECL (err); -+ newbrk = (void *) INTERNAL_SYSCALL_PRE_TLS (brk, err, 1, addr); -+ -+ __curbrk = newbrk; -+ -+ if (newbrk < addr) -+ { -+ __set_errno (ENOMEM); -+ return -1; -+ } -+ -+ return 0; -+} -+#endif -+ - int - __brk (void *addr) - { ---- a/sysdeps/unix/sysv/linux/i386/sysdep.h -+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h -@@ -187,7 +187,7 @@ - /* The original calling convention for system calls on Linux/i386 is - to use int $0x80. */ - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# ifdef __PIC__ - # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET - # else - # define ENTER_KERNEL call *_dl_sysinfo -@@ -358,7 +358,7 @@ - possible to use more than four parameters. */ - #undef INTERNAL_SYSCALL - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# ifdef __PIC__ - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ -@@ -384,6 +384,18 @@ - : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ - ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -+# define INTERNAL_SYSCALL_PRE_TLS(name, err, nr, args...) \ -+ ({ \ -+ register unsigned int resultvar; \ -+ EXTRAVAR_##nr \ -+ asm volatile ( \ -+ LOADARGS_NOSYSENTER_##nr \ -+ "movl %1, %%eax\n\t" \ -+ "int $0x80\n\t" \ -+ RESTOREARGS_NOSYSENTER_##nr \ -+ : "=a" (resultvar) \ -+ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ -+ (int) resultvar; }) - # else - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ -@@ -447,12 +459,20 @@ - - #define LOADARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && defined __PIC__ - # define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" - # define LOADARGS_5 \ - "movl %%ebx, %4\n\t" \ - "movl %3, %%ebx\n\t" -+# define LOADARGS_NOSYSENTER_1 \ -+ "bpushl .L__X'%k2, %k2\n\t" -+# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 -+# define LOADARGS_NOSYSENTER_3 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_4 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_5 \ -+ "movl %%ebx, %3\n\t" \ -+ "movl %2, %%ebx\n\t" - # else - # define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" -@@ -474,11 +494,18 @@ - - #define RESTOREARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && defined __PIC__ - # define RESTOREARGS_1 \ - "bpopl .L__X'%k3, %k3\n\t" - # define RESTOREARGS_5 \ - "movl %4, %%ebx" -+# define RESTOREARGS_NOSYSENTER_1 \ -+ "bpopl .L__X'%k2, %k2\n\t" -+# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 -+# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_5 \ -+ "movl %3, %%ebx" - # else - # define RESTOREARGS_1 \ - "bpopl .L__X'%k2, %k2\n\t" ---- a/sysdeps/i386/nptl/tls.h -+++ b/sysdeps/i386/nptl/tls.h -@@ -189,6 +189,15 @@ - desc->vals[3] = 0x51; - } - -+/* We have no sysenter until the tls is initialized which is a -+ problem for PIC. Thus we need to do the right call depending -+ on the situation. */ -+#ifndef INTERNAL_SYSCALL_PRE_TLS -+# define TLS_INIT_SYSCALL INTERNAL_SYSCALL -+#else -+# define TLS_INIT_SYSCALL INTERNAL_SYSCALL_PRE_TLS -+#endif -+ - /* Code to initially initialize the thread pointer. This might need - special attention since 'errno' is not yet available and if the - operation can cause a failure 'errno' must not be touched. */ -@@ -209,7 +218,7 @@ - \ - /* Install the TLS. */ \ - INTERNAL_SYSCALL_DECL (err); \ -- _result = INTERNAL_SYSCALL (set_thread_area, err, 1, &_segdescr.desc); \ -+ _result = TLS_INIT_SYSCALL (set_thread_area, err, 1, &_segdescr.desc); \ - \ - if (_result == 0) \ - /* We know the index in the GDT, now load the segment register. \ diff --git a/sys-libs/glibc/files/2.20/glibc-2.20-vdso-disable.patch b/sys-libs/glibc/files/2.20/glibc-2.20-vdso-disable.patch deleted file mode 100644 index 2b2de6b..0000000 --- a/sys-libs/glibc/files/2.20/glibc-2.20-vdso-disable.patch +++ /dev/null @@ -1,20 +0,0 @@ -disable vdso loading in ELF handler unconditionally for some buggy kernel -like that shipped with RHEL(likely CentOS and SL) 5.6 - - https://bugzilla.redhat.com/show_bug.cgi?id=673616 - -Benda Xu <heroxbd@gentoo.org> (24 Nov, 2014) - -Index: work/glibc-2.20/sysdeps/unix/sysv/linux/dl-sysdep.h -=================================================================== ---- work.orig/glibc-2.20/sysdeps/unix/sysv/linux/dl-sysdep.h -+++ work/glibc-2.20/sysdeps/unix/sysv/linux/dl-sysdep.h -@@ -23,7 +23,7 @@ - machines, we should look at it for unwind information even if - we aren't making direct use of it. So enable this across the board. */ - --#define NEED_DL_SYSINFO_DSO 1 -+#define NEED_DL_SYSINFO_DSO 0 - - - #ifndef __ASSEMBLER__ diff --git a/sys-libs/glibc/files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch b/sys-libs/glibc/files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch deleted file mode 100644 index 7c4399f..0000000 --- a/sys-libs/glibc/files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -e - -# DP: Description: Fix localedef segfault when run under exec-shield, -# PaX or similar. (#231438, #198099) -# DP: Dpatch Author: James Troup <james@nocrew.org> -# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com> -# DP: Upstream status: Unknown -# DP: Status Details: Unknown -# DP: Date: 2004-03-16 - -if [ $# -ne 2 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;; - -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- glibc-2.3.3-net/locale/programs/3level.h 16 Jun 2003 07:19:09 -0000 1.1.1.5 -+++ glibc-2.3.3-redhat/locale/programs/3level.h 16 Jun 2003 09:32:40 -0000 1.4 -@@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, - } - } - } -+ -+/* GCC ATM seems to do a poor job with pointers to nested functions passed -+ to inlined functions. Help it a little bit with this hack. */ -+#define wchead_table_iterate(tp, fn) \ -+do \ -+ { \ -+ struct wchead_table *t = (tp); \ -+ uint32_t index1; \ -+ for (index1 = 0; index1 < t->level1_size; index1++) \ -+ { \ -+ uint32_t lookup1 = t->level1[index1]; \ -+ if (lookup1 != ((uint32_t) ~0)) \ -+ { \ -+ uint32_t lookup1_shifted = lookup1 << t->q; \ -+ uint32_t index2; \ -+ for (index2 = 0; index2 < (1 << t->q); index2++) \ -+ { \ -+ uint32_t lookup2 = t->level2[index2 + lookup1_shifted]; \ -+ if (lookup2 != ((uint32_t) ~0)) \ -+ { \ -+ uint32_t lookup2_shifted = lookup2 << t->p; \ -+ uint32_t index3; \ -+ for (index3 = 0; index3 < (1 << t->p); index3++) \ -+ { \ -+ struct element_t *lookup3 \ -+ = t->level3[index3 + lookup2_shifted]; \ -+ if (lookup3 != NULL) \ -+ fn ((((index1 << t->q) + index2) << t->p) + index3, \ -+ lookup3); \ -+ } \ -+ } \ -+ } \ -+ } \ -+ } \ -+ } while (0) -+ - #endif - - #ifndef NO_FINALIZE diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.5/glibc-2.5-gentoo-stack_chk_fail.c deleted file mode 100644 index e304440..0000000 --- a/sys-libs/glibc/files/2.5/glibc-2.5-gentoo-stack_chk_fail.c +++ /dev/null @@ -1,311 +0,0 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Copyright (C) 2006 Gentoo Foundation Inc. - * License terms as above. - * - * Hardened Gentoo SSP handler - * - * An SSP failure handler that does not use functions from the rest of - * glibc; it uses the INTERNAL_SYSCALL methods directly. This ensures - * no possibility of recursion into the handler. - * - * Direct all bug reports to http://bugs.gentoo.org/ - * - * Re-written from the glibc-2.3 Hardened Gentoo SSP handler - * by Kevin F. Quinn - <kevquinn[@]gentoo.org> - * - * The following people contributed to the glibc-2.3 Hardened - * Gentoo SSP handler, from which this implementation draws much: - * - * Ned Ludd - <solar[@]gentoo.org> - * Alexander Gabert - <pappy[@]gentoo.org> - * The PaX Team - <pageexec[@]freemail.hu> - * Peter S. Mazinger - <ps.m[@]gmx.net> - * Yoann Vandoorselaere - <yoann[@]prelude-ids.org> - * Robert Connolly - <robert[@]linuxfromscratch.org> - * Cory Visi <cory[@]visi.name> - * Mike Frysinger <vapier[@]gentoo.org> - */ - -#include <errno.h> -#include <stdlib.h> -#include <unistd.h> -#include <signal.h> - -#include <sys/types.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> -#include <bp-checks.h> - -#include <kernel-features.h> - -#include <alloca.h> -/* from sysdeps */ -#include <socketcall.h> -/* for the stuff in bits/socket.h */ -#include <sys/socket.h> -#include <sys/un.h> - - -/* Sanity check on SYSCALL macro names - force compilation - * failure if the names used here do not exist - */ -#if !defined __NR_socketcall && !defined __NR_socket -# error Cannot do syscall socket or socketcall -#endif -#if !defined __NR_socketcall && !defined __NR_connect -# error Cannot do syscall connect or socketcall -#endif -#ifndef __NR_write -# error Cannot do syscall write -#endif -#ifndef __NR_close -# error Cannot do syscall close -#endif -#ifndef __NR_getpid -# error Cannot do syscall getpid -#endif -#ifndef __NR_kill -# error Cannot do syscall kill -#endif -#ifndef __NR_exit -# error Cannot do syscall exit -#endif -#ifdef SSP_SMASH_DUMPS_CORE -# if !defined _KERNEL_NSIG && !defined _NSIG -# error No _NSIG or _KERNEL_NSIG for rt_sigaction -# endif -# if !defined __NR_sigation && !defined __NR_rt_sigaction -# error Cannot do syscall sigaction or rt_sigaction -# endif -#endif - - - -/* Define DO_SOCKET/DO_CONNECT macros to deal with socketcall vs socket/connect */ -#ifdef __NR_socketcall - -# define DO_SOCKET(result,domain,type,protocol) \ - {socketargs[0] = domain; \ - socketargs[1] = type; \ - socketargs[2] = protocol; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall,2,SOCKOP_socket,socketargs);} - -# define DO_CONNECT(result,sockfd,serv_addr,addrlen) \ - {socketargs[0] = sockfd; \ - socketargs[1] = (unsigned long int)serv_addr; \ - socketargs[2] = addrlen; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall,2,SOCKOP_connect,socketargs);} - -#else - -# define DO_SOCKET(result,domain,type,protocol) \ - {result = INLINE_SYSCALL(socket,3,domain,type,protocol);} - -# define DO_CONNECT(result,sockfd,serv_addr,addrlen) \ - {result = INLINE_SYSCALL(connect,3,sockfd,serv_addr,addrlen);} - -#endif -/* __NR_socketcall */ - - -#ifndef _PATH_LOG -# define _PATH_LOG "/dev/log" -#endif - -static const char path_log[]=_PATH_LOG; - -/* For building glibc with SSP switched on, define __progname to a - * constant if building for the run-time loader, to avoid pulling - * in more of libc.so into ld.so - */ -#ifdef IS_IN_rtld -static char *__progname = "<rtld>"; -#else -extern char *__progname; -#endif - - -/* Common handler code, used by stack_chk_fail and __stack_smash_handler - * Inlined to ensure no self-references to the handler within itself. - * Data static to avoid putting more than necessary on the stack, - * to aid core debugging. - */ -static inline void -__attribute__ ((__noreturn__ , __always_inline__)) -__hardened_gentoo_stack_chk_fail (char func[], int damaged) -{ -#define MESSAGE_BUFSIZ 256 - static pid_t pid; - static int plen, i; - static char message[MESSAGE_BUFSIZ]; - static const char msg_ssa[]=": stack smashing attack"; - static const char msg_inf[]=" in function "; - static const char msg_ssd[]="*** stack smashing detected ***: "; - static const char msg_terminated[]=" - terminated\n"; - static const char msg_report[]="Report to http://bugs.gentoo.org/\n"; - static const char msg_unknown[]="<unknown>"; -#ifdef SSP_SMASH_DUMPS_CORE - static struct sigaction default_abort_act; -#endif - static int log_socket, connect_result; - static struct sockaddr_un sock; -#ifdef __NR_socketcall - static unsigned long int socketargs[4]; -#endif - - /* Build socket address - */ - sock.sun_family = AF_UNIX; - i=0; - while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) - { - sock.sun_path[i]=path_log[i]; - i++; - } - sock.sun_path[i]='\0'; - - /* Try SOCK_DGRAM connection to syslog */ - connect_result=-1; - DO_SOCKET(log_socket,AF_UNIX,SOCK_DGRAM,0); - if (log_socket != -1) - DO_CONNECT(connect_result,log_socket,(&sock),(sizeof(sock))); - if (connect_result == -1) - { - if (log_socket != -1) - INLINE_SYSCALL(close,1,log_socket); - /* Try SOCK_STREAM connection to syslog */ - DO_SOCKET(log_socket,AF_UNIX,SOCK_STREAM,0); - if (log_socket != -1) - DO_CONNECT(connect_result,log_socket,(&sock),(sizeof(sock))); - } - - /* Build message. Messages are generated both in the old style and new style, - * so that log watchers that are configured for the old-style message continue - * to work. - */ -#define strconcat(str) \ - {i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \ - {\ - message[plen+i]=str[i];\ - i++;\ - }\ - plen+=i;} - - /* R.Henderson post-gcc-4 style message */ - plen=0; - strconcat(msg_ssd); - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write,3,STDERR_FILENO,message,plen); - if (connect_result != -1) - INLINE_SYSCALL(write,3,log_socket,message,plen); - - /* Dr. Etoh pre-gcc-4 style message */ - plen=0; - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_ssa); - strconcat(msg_inf); - if (func!=NULL) - strconcat(func) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write,3,STDERR_FILENO,message,plen); - if (connect_result != -1) - INLINE_SYSCALL(write,3,log_socket,message,plen); - - /* Direct reports to bugs.gentoo.org */ - plen=0; - strconcat(msg_report); - message[plen++]='\0'; - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write,3,STDERR_FILENO,message,plen); - if (connect_result != -1) - INLINE_SYSCALL(write,3,log_socket,message,plen); - - if (log_socket != -1) - INLINE_SYSCALL(close,1,log_socket); - - /* Suicide */ - pid=INLINE_SYSCALL(getpid,0); -#ifdef SSP_SMASH_DUMPS_CORE - /* Remove any user-supplied handler for SIGABRT, before using it */ - default_abort_act.sa_handler = SIG_DFL; - default_abort_act.sa_sigaction = NULL; - __sigfillset(&default_abort_act.sa_mask); - default_abort_act.sa_flags = 0; - /* sigaction doesn't exist on amd64; however rt_sigaction seems to - * exist everywhere. rt_sigaction has an extra parameter - the - * size of sigset_t. - */ -# ifdef __NR_sigation - if (INLINE_SYSCALL(sigaction,3,SIGABRT,&default_abort_act,NULL) == 0) -# else - /* Although rt_sigaction expects sizeof(sigset_t) - it expects the size - * of the _kernel_ sigset_t which is not the same as the user sigset_t. - * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for - * some reason. - */ -# ifdef _KERNEL_NSIG - if (INLINE_SYSCALL(rt_sigaction,4,SIGABRT,&default_abort_act,NULL,_KERNEL_NSIG/8) == 0) -# else - if (INLINE_SYSCALL(rt_sigaction,4,SIGABRT,&default_abort_act,NULL,_NSIG/8) == 0) -# endif -# endif - INLINE_SYSCALL(kill,2,pid,SIGABRT); -#endif - /* Note; actions cannot be added to SIGKILL */ - INLINE_SYSCALL(kill,2,pid,SIGKILL); - - /* In case the kill didn't work, exit anyway - * The loop prevents gcc thinking this routine returns - */ - while (1) INLINE_SYSCALL(exit,0); -} - -void -__attribute__ ((__noreturn__)) - __stack_chk_fail (void) -{ - __hardened_gentoo_stack_chk_fail(NULL,0); -} - -#ifdef ENABLE_OLD_SSP_COMPAT -void -__attribute__ ((__noreturn__)) -__stack_smash_handler(char func[], int damaged) -{ - __hardened_gentoo_stack_chk_fail(func,damaged); -} -#endif - diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-configure-picdefault.patch b/sys-libs/glibc/files/2.5/glibc-2.5-hardened-configure-picdefault.patch deleted file mode 100644 index 253a61b..0000000 --- a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-configure-picdefault.patch +++ /dev/null @@ -1,29 +0,0 @@ -Prevent default-fPIE from confusing configure into thinking -PIC code is default. This causes glibc to build both PIC and -non-PIC code as normal, which on the hardened compiler generates -PIC and PIE. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> - ---- configure.in -+++ configure.in -@@ -2145,7 +2145,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then - pic_default=no - fi - rm -f conftest.*]) ---- configure -+++ configure -@@ -7698,7 +7698,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then - pic_default=no - fi - rm -f conftest.* diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.5/glibc-2.5-hardened-inittls-nosysenter.patch deleted file mode 100644 index 420e6fd..0000000 --- a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-inittls-nosysenter.patch +++ /dev/null @@ -1,283 +0,0 @@ -When building glibc PIE (which is not something upstream support), -several modifications are necessary to the glibc build process. - -First, any syscalls in PIEs must be of the PIC variant, otherwise -textrels ensue. Then, any syscalls made before the initialisation -of the TLS will fail on i386, as the sysenter variant on i386 uses -the TLS, giving rise to a chicken-and-egg situation. This patch -defines a PIC syscall variant that doesn't use sysenter, even when the sysenter -version is normally used, and uses the non-sysenter version for the brk -syscall that is performed by the TLS initialisation. Further, the TLS -initialisation is moved in this case prior to the initialisation of -dl_osversion, as that requires further syscalls. - -csu/libc-start.c: Move initial TLS initialization to before the -initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined - -csu/libc-tls.c: Use the no-sysenter version of sbrk when -INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter -version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/brk.c: Define a no-sysenter version of brk if -INTERNAL_SYSCALL_NOSYSENTER is defined. - -sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER -Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> - ---- csu/libc-start.c.orig 2007-01-21 11:51:06.000000000 +0100 -+++ csu/libc-start.c 2007-01-21 11:55:57.000000000 +0100 -@@ -28,6 +28,7 @@ - extern int __libc_multiple_libcs; - - #include <tls.h> -+#include <sysdep.h> - #ifndef SHARED - # include <dl-osinfo.h> - extern void __pthread_initialize_minimal (void) -@@ -133,6 +134,14 @@ - # endif - _dl_aux_init (auxvec); - # endif -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ /* Do the initial TLS initialization before _dl_osversion, -+ since the latter uses the uname syscall. */ -+# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP -+ if (__pthread_initialize_minimal) -+# endif -+ __pthread_initialize_minimal (); -+# endif - # ifdef DL_SYSDEP_OSCHECK - if (!__libc_multiple_libcs) - { -@@ -142,15 +151,17 @@ - } - # endif - -+# ifndef INTERNAL_SYSCALL_NOSYSENTER - /* Initialize the thread library at least a bit since the libgcc - functions are using thread functions if these are available and - we need to setup errno. If there is no thread library and we - handle TLS the function is defined in the libc to initialized the - TLS handling. */ --# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP -+# if !(USE_TLS - 0) && !defined NONTLS_INIT_TP - if (__pthread_initialize_minimal) --# endif -+# endif - __pthread_initialize_minimal (); -+# endif - #endif - - # ifndef SHARED ---- csu/libc-tls.c.orig 2007-01-21 11:37:02.000000000 +0100 -+++ csu/libc-tls.c 2007-01-21 12:09:33.000000000 +0100 -@@ -23,6 +23,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <sys/param.h> -+#include <sysdep.h> - - - #ifdef SHARED -@@ -30,6 +31,9 @@ - #endif - - #ifdef USE_TLS -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+extern void *__sbrk_nosysenter (intptr_t __delta); -+# endif - extern ElfW(Phdr) *_dl_phdr; - extern size_t _dl_phnum; - -@@ -142,14 +146,26 @@ - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with -- IE-model TLS. */ -+ IE-model TLS. -+ -+ Where the normal sbrk would use a syscall that needs the TLS (i386) -+ use the special non-sysenter version instead. */ - # if TLS_TCB_AT_TP - tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align); -+# else - tlsblock = __sbrk (tcb_offset + tcbsize + max_align); -+# endif - # elif TLS_DTV_AT_TP - tcb_offset = roundup (tcbsize, align ?: 1); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align -+ + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# else - tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# endif - tlsblock += TLS_PRE_TCB_SIZE; - # else - /* In case a model with a different layout for the TCB and DTV ---- misc/sbrk.c.orig 2007-01-21 11:38:27.000000000 +0100 -+++ misc/sbrk.c 2007-01-21 12:07:29.000000000 +0100 -@@ -18,6 +18,7 @@ - - #include <unistd.h> - #include <errno.h> -+#include <sysdep.h> - - /* Defined in brk.c. */ - extern void *__curbrk; -@@ -29,6 +30,35 @@ - /* Extend the process's data space by INCREMENT. - If INCREMENT is negative, shrink data space by - INCREMENT. - Return start of new space allocated, or -1 for errors. */ -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+extern int __brk_nosysenter (void *addr); -+void * -+__sbrk_nosysenter (intptr_t increment) -+{ -+ void *oldbrk; -+ -+ /* If this is not part of the dynamic library or the library is used -+ via dynamic loading in a statically linked program update -+ __curbrk from the kernel's brk value. That way two separate -+ instances of __brk and __sbrk can share the heap, returning -+ interleaved pieces of it. */ -+ if (__curbrk == NULL || __libc_multiple_libcs) -+ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ -+ return (void *) -1; -+ -+ if (increment == 0) -+ return __curbrk; -+ -+ oldbrk = __curbrk; -+ if (__brk_nosysenter (oldbrk + increment) < 0) -+ return (void *) -1; -+ -+ return oldbrk; -+} -+#endif - void * - __sbrk (intptr_t increment) - { ---- sysdeps/unix/sysv/linux/i386/brk.c.orig 2007-01-21 11:39:16.000000000 +0100 -+++ sysdeps/unix/sysv/linux/i386/brk.c 2007-01-21 11:44:01.000000000 +0100 -@@ -31,6 +31,30 @@ - linker. */ - weak_alias (__curbrk, ___brk_addr) - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ * if the SYSENTER version requires the TLS (which it does on i386). -+ * Obviously using the TLS before it is initialised is broken. */ -+int -+__brk_nosysenter (void *addr) -+{ -+ void *__unbounded newbrk; -+ -+ INTERNAL_SYSCALL_DECL (err); -+ newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, -+ __ptrvalue (addr)); -+ -+ __curbrk = newbrk; -+ -+ if (newbrk < addr) -+ { -+ __set_errno (ENOMEM); -+ return -1; -+ } -+ -+ return 0; -+} -+#endif - int - __brk (void *addr) - { ---- sysdeps/unix/sysv/linux/i386/sysdep.h.orig 2007-01-21 13:08:00.000000000 +0100 -+++ sysdeps/unix/sysv/linux/i386/sysdep.h 2007-01-21 13:19:10.000000000 +0100 -@@ -187,7 +187,7 @@ - /* The original calling convention for system calls on Linux/i386 is - to use int $0x80. */ - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET - # else - # define ENTER_KERNEL call *_dl_sysinfo -@@ -358,7 +358,7 @@ - possible to use more than four parameters. */ - #undef INTERNAL_SYSCALL - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ -@@ -384,6 +384,18 @@ - : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ - ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -+# define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \ -+ ({ \ -+ register unsigned int resultvar; \ -+ EXTRAVAR_##nr \ -+ asm volatile ( \ -+ LOADARGS_NOSYSENTER_##nr \ -+ "movl %1, %%eax\n\t" \ -+ "int $0x80\n\t" \ -+ RESTOREARGS_NOSYSENTER_##nr \ -+ : "=a" (resultvar) \ -+ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ -+ (int) resultvar; }) - # else - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ -@@ -447,12 +459,20 @@ - - #define LOADARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" - # define LOADARGS_5 \ - "movl %%ebx, %4\n\t" \ - "movl %3, %%ebx\n\t" -+# define LOADARGS_NOSYSENTER_1 \ -+ "bpushl .L__X'%k2, %k2\n\t" -+# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 -+# define LOADARGS_NOSYSENTER_3 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_4 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_5 \ -+ "movl %%ebx, %3\n\t" \ -+ "movl %2, %%ebx\n\t" - # else - # define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" -@@ -474,11 +495,18 @@ - - #define RESTOREARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define RESTOREARGS_1 \ - "bpopl .L__X'%k3, %k3\n\t" - # define RESTOREARGS_5 \ - "movl %4, %%ebx" -+# define RESTOREARGS_NOSYSENTER_1 \ -+ "bpopl .L__X'%k2, %k2\n\t" -+# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 -+# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_5 \ -+ "movl %3, %%ebx" - # else - # define RESTOREARGS_1 \ - "bpopl .L__X'%k2, %k2\n\t" diff --git a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-pie.patch b/sys-libs/glibc/files/2.5/glibc-2.5-hardened-pie.patch deleted file mode 100644 index 46f3de4..0000000 --- a/sys-libs/glibc/files/2.5/glibc-2.5-hardened-pie.patch +++ /dev/null @@ -1,39 +0,0 @@ -Change link commands for glibc executables to build PIEs - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> - ---- Makeconfig -+++ Makeconfig -@@ -415,10 +415,10 @@ - - # Command for linking programs with the C library. - ifndef +link --+link = $(CC) -nostdlib -nostartfiles -o $@ \ -++link = $(CC) -nostdlib -nostartfiles -fPIE -pie -o $@ \ - $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ - $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ -- $(addprefix $(csu-objpfx),$(start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(start-installed-name)) \ - $(+preinit) $(+prector) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -429,7 +429,7 @@ - ifndef +link-static - +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \ - $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ -- $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ -+ $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ - $(+preinit) $(+prector) \ - $(filter-out $(addprefix $(csu-objpfx),start.o \ - $(start-installed-name))\ -@@ -528,8 +528,8 @@ - ifeq ($(elf),yes) - +preinit = $(addprefix $(csu-objpfx),crti.o) - +postinit = $(addprefix $(csu-objpfx),crtn.o) --+prector = `$(CC) --print-file-name=crtbegin.o` --+postctor = `$(CC) --print-file-name=crtend.o` -++prector = `$(CC) --print-file-name=crtbeginS.o` -++postctor = `$(CC) --print-file-name=crtendS.o` - +interp = $(addprefix $(elf-objpfx),interp.os) - endif - csu-objpfx = $(common-objpfx)csu/ diff --git a/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c b/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c deleted file mode 100644 index 217bf1a..0000000 --- a/sys-libs/glibc/files/2.6/glibc-2.6-gentoo-stack_chk_fail.c +++ /dev/null @@ -1,321 +0,0 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Copyright (C) 2006-2007 Gentoo Foundation Inc. - * License terms as above. - * - * Hardened Gentoo SSP handler - * - * An SSP failure handler that does not use functions from the rest of - * glibc; it uses the INTERNAL_SYSCALL methods directly. This ensures - * no possibility of recursion into the handler. - * - * Direct all bug reports to http://bugs.gentoo.org/ - * - * Re-written from the glibc-2.3 Hardened Gentoo SSP handler - * by Kevin F. Quinn - <kevquinn[@]gentoo.org> - * - * The following people contributed to the glibc-2.3 Hardened - * Gentoo SSP handler, from which this implementation draws much: - * - * Ned Ludd - <solar[@]gentoo.org> - * Alexander Gabert - <pappy[@]gentoo.org> - * The PaX Team - <pageexec[@]freemail.hu> - * Peter S. Mazinger - <ps.m[@]gmx.net> - * Yoann Vandoorselaere - <yoann[@]prelude-ids.org> - * Robert Connolly - <robert[@]linuxfromscratch.org> - * Cory Visi <cory[@]visi.name> - * Mike Frysinger <vapier[@]gentoo.org> - */ - -#include <errno.h> -#include <stdlib.h> -#include <unistd.h> -#include <signal.h> - -#include <sys/types.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> -#include <bp-checks.h> - -#include <kernel-features.h> - -#include <alloca.h> -/* from sysdeps */ -#include <socketcall.h> -/* for the stuff in bits/socket.h */ -#include <sys/socket.h> -#include <sys/un.h> - - -/* Sanity check on SYSCALL macro names - force compilation - * failure if the names used here do not exist - */ -#if !defined __NR_socketcall && !defined __NR_socket -# error Cannot do syscall socket or socketcall -#endif -#if !defined __NR_socketcall && !defined __NR_connect -# error Cannot do syscall connect or socketcall -#endif -#ifndef __NR_write -# error Cannot do syscall write -#endif -#ifndef __NR_close -# error Cannot do syscall close -#endif -#ifndef __NR_getpid -# error Cannot do syscall getpid -#endif -#ifndef __NR_kill -# error Cannot do syscall kill -#endif -#ifndef __NR_exit -# error Cannot do syscall exit -#endif -#ifdef SSP_SMASH_DUMPS_CORE -# define ENABLE_SSP_SMASH_DUMPS_CORE 1 -# if !defined _KERNEL_NSIG && !defined _NSIG -# error No _NSIG or _KERNEL_NSIG for rt_sigaction -# endif -# if !defined __NR_sigaction && !defined __NR_rt_sigaction -# error Cannot do syscall sigaction or rt_sigaction -# endif -/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size - * of the _kernel_ sigset_t which is not the same as the user sigset_t. - * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for - * some reason. - */ -# ifdef _KERNEL_NSIG -# define _SSP_NSIG _KERNEL_NSIG -# else -# define _SSP_NSIG _NSIG -# endif -#else -# define _SSP_NSIG 0 -# define ENABLE_SSP_SMASH_DUMPS_CORE 0 -#endif - -/* Define DO_SIGACTION - default to newer rt signal interface but - * fallback to old as needed. - */ -#ifdef __NR_rt_sigaction -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8) -#else -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(sigaction, 3, signum, act, oldact) -#endif - -/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */ -#if defined(__NR_socket) && defined(__NR_connect) -# define USE_OLD_SOCKETCALL 0 -#else -# define USE_OLD_SOCKETCALL 1 -#endif -/* stub out the __NR_'s so we can let gcc optimize away dead code */ -#ifndef __NR_socketcall -# define __NR_socketcall 0 -#endif -#ifndef __NR_socket -# define __NR_socket 0 -#endif -#ifndef __NR_connect -# define __NR_connect 0 -#endif -#define DO_SOCKET(result, domain, type, protocol) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = domain; \ - socketargs[1] = type; \ - socketargs[2] = protocol; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \ - } else \ - result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \ - } while (0) -#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = sockfd; \ - socketargs[1] = (unsigned long int)serv_addr; \ - socketargs[2] = addrlen; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \ - } else \ - result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \ - } while (0) - -#ifndef _PATH_LOG -# define _PATH_LOG "/dev/log" -#endif - -static const char path_log[] = _PATH_LOG; - -/* For building glibc with SSP switched on, define __progname to a - * constant if building for the run-time loader, to avoid pulling - * in more of libc.so into ld.so - */ -#ifdef IS_IN_rtld -static char *__progname = "<rtld>"; -#else -extern char *__progname; -#endif - - -/* Common handler code, used by stack_chk_fail and __stack_smash_handler - * Inlined to ensure no self-references to the handler within itself. - * Data static to avoid putting more than necessary on the stack, - * to aid core debugging. - */ -__attribute__ ((__noreturn__ , __always_inline__)) -static inline void -__hardened_gentoo_stack_chk_fail(char func[], int damaged) -{ -#define MESSAGE_BUFSIZ 256 - static pid_t pid; - static int plen, i; - static char message[MESSAGE_BUFSIZ]; - static const char msg_ssa[] = ": stack smashing attack"; - static const char msg_inf[] = " in function "; - static const char msg_ssd[] = "*** stack smashing detected ***: "; - static const char msg_terminated[] = " - terminated\n"; - static const char msg_report[] = "Report to http://bugs.gentoo.org/\n"; - static const char msg_unknown[] = "<unknown>"; - static int log_socket, connect_result; - static struct sockaddr_un sock; - static unsigned long int socketargs[4]; - - /* Build socket address - */ - sock.sun_family = AF_UNIX; - i = 0; - while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) { - sock.sun_path[i] = path_log[i]; - i++; - } - sock.sun_path[i] = '\0'; - - /* Try SOCK_DGRAM connection to syslog */ - connect_result = -1; - DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - if (connect_result == -1) { - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - /* Try SOCK_STREAM connection to syslog */ - DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - } - - /* Build message. Messages are generated both in the old style and new style, - * so that log watchers that are configured for the old-style message continue - * to work. - */ -#define strconcat(str) \ - {i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \ - {\ - message[plen+i]=str[i];\ - i++;\ - }\ - plen+=i;} - - /* R.Henderson post-gcc-4 style message */ - plen = 0; - strconcat(msg_ssd); - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - /* Dr. Etoh pre-gcc-4 style message */ - plen = 0; - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_ssa); - strconcat(msg_inf); - if (func != NULL) - strconcat(func) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - /* Direct reports to bugs.gentoo.org */ - plen=0; - strconcat(msg_report); - message[plen++]='\0'; - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - - /* Suicide */ - pid = INLINE_SYSCALL(getpid, 0); - - if (ENABLE_SSP_SMASH_DUMPS_CORE) { - static struct sigaction default_abort_act; - /* Remove any user-supplied handler for SIGABRT, before using it */ - default_abort_act.sa_handler = SIG_DFL; - default_abort_act.sa_sigaction = NULL; - __sigfillset(&default_abort_act.sa_mask); - default_abort_act.sa_flags = 0; - if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0) - INLINE_SYSCALL(kill, 2, pid, SIGABRT); - } - - /* Note; actions cannot be added to SIGKILL */ - INLINE_SYSCALL(kill, 2, pid, SIGKILL); - - /* In case the kill didn't work, exit anyway - * The loop prevents gcc thinking this routine returns - */ - while (1) - INLINE_SYSCALL(exit, 0); -} - -__attribute__ ((__noreturn__)) -void __stack_chk_fail(void) -{ - __hardened_gentoo_stack_chk_fail(NULL, 0); -} - -#ifdef ENABLE_OLD_SSP_COMPAT -__attribute__ ((__noreturn__)) -void __stack_smash_handler(char func[], int damaged) -{ - __hardened_gentoo_stack_chk_fail(func, damaged); -} -#endif diff --git a/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch deleted file mode 100644 index be8ca19..0000000 --- a/sys-libs/glibc/files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch +++ /dev/null @@ -1,273 +0,0 @@ -When building glibc PIE (which is not something upstream support), -several modifications are necessary to the glibc build process. - -First, any syscalls in PIEs must be of the PIC variant, otherwise -textrels ensue. Then, any syscalls made before the initialisation -of the TLS will fail on i386, as the sysenter variant on i386 uses -the TLS, giving rise to a chicken-and-egg situation. This patch -defines a PIC syscall variant that doesn't use sysenter, even when the sysenter -version is normally used, and uses the non-sysenter version for the brk -syscall that is performed by the TLS initialisation. Further, the TLS -initialisation is moved in this case prior to the initialisation of -dl_osversion, as that requires further syscalls. - -csu/libc-start.c: Move initial TLS initialization to before the -initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined - -csu/libc-tls.c: Use the no-sysenter version of sbrk when -INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter -version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/brk.c: Define a no-sysenter version of brk if -INTERNAL_SYSCALL_NOSYSENTER is defined. - -sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER -Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> - ---- csu/libc-start.c -+++ csu/libc-start.c -@@ -28,6 +28,7 @@ - extern int __libc_multiple_libcs; - - #include <tls.h> -+#include <sysdep.h> - #ifndef SHARED - # include <dl-osinfo.h> - extern void __pthread_initialize_minimal (void); -@@ -129,6 +130,11 @@ - # endif - _dl_aux_init (auxvec); - # endif -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ /* Do the initial TLS initialization before _dl_osversion, -+ since the latter uses the uname syscall. */ -+ __pthread_initialize_minimal (); -+# endif - # ifdef DL_SYSDEP_OSCHECK - if (!__libc_multiple_libcs) - { -@@ -138,10 +144,12 @@ - } - # endif - -+# ifndef INTERNAL_SYSCALL_NOSYSENTER - /* Initialize the thread library at least a bit since the libgcc - functions are using thread functions if these are available and - we need to setup errno. */ - __pthread_initialize_minimal (); -+# endif - #endif - - # ifndef SHARED ---- csu/libc-tls.c -+++ csu/libc-tls.c -@@ -23,6 +23,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <sys/param.h> -+#include <sysdep.h> - - - #ifdef SHARED -@@ -29,6 +30,9 @@ - #error makefile bug, this file is for static only - #endif - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+extern void *__sbrk_nosysenter (intptr_t __delta); -+#endif - extern ElfW(Phdr) *_dl_phdr; - extern size_t _dl_phnum; - -@@ -141,14 +145,26 @@ - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with -- IE-model TLS. */ -+ IE-model TLS. -+ -+ Where the normal sbrk would use a syscall that needs the TLS (i386) -+ use the special non-sysenter version instead. */ - #if TLS_TCB_AT_TP - tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align); -+# else - tlsblock = __sbrk (tcb_offset + tcbsize + max_align); -+# endif - #elif TLS_DTV_AT_TP - tcb_offset = roundup (tcbsize, align ?: 1); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align -+ + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# else - tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# endif - tlsblock += TLS_PRE_TCB_SIZE; - #else - /* In case a model with a different layout for the TCB and DTV ---- misc/sbrk.c -+++ misc/sbrk.c -@@ -18,6 +18,7 @@ - - #include <unistd.h> - #include <errno.h> -+#include <sysdep.h> - - /* Defined in brk.c. */ - extern void *__curbrk; -@@ -29,6 +30,35 @@ - /* Extend the process's data space by INCREMENT. - If INCREMENT is negative, shrink data space by - INCREMENT. - Return start of new space allocated, or -1 for errors. */ -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+extern int __brk_nosysenter (void *addr); -+void * -+__sbrk_nosysenter (intptr_t increment) -+{ -+ void *oldbrk; -+ -+ /* If this is not part of the dynamic library or the library is used -+ via dynamic loading in a statically linked program update -+ __curbrk from the kernel's brk value. That way two separate -+ instances of __brk and __sbrk can share the heap, returning -+ interleaved pieces of it. */ -+ if (__curbrk == NULL || __libc_multiple_libcs) -+ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ -+ return (void *) -1; -+ -+ if (increment == 0) -+ return __curbrk; -+ -+ oldbrk = __curbrk; -+ if (__brk_nosysenter (oldbrk + increment) < 0) -+ return (void *) -1; -+ -+ return oldbrk; -+} -+#endif - void * - __sbrk (intptr_t increment) - { ---- sysdeps/unix/sysv/linux/i386/brk.c -+++ sysdeps/unix/sysv/linux/i386/brk.c -@@ -31,6 +31,30 @@ - linker. */ - weak_alias (__curbrk, ___brk_addr) - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ * if the SYSENTER version requires the TLS (which it does on i386). -+ * Obviously using the TLS before it is initialised is broken. */ -+int -+__brk_nosysenter (void *addr) -+{ -+ void *__unbounded newbrk; -+ -+ INTERNAL_SYSCALL_DECL (err); -+ newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, -+ __ptrvalue (addr)); -+ -+ __curbrk = newbrk; -+ -+ if (newbrk < addr) -+ { -+ __set_errno (ENOMEM); -+ return -1; -+ } -+ -+ return 0; -+} -+#endif - int - __brk (void *addr) - { ---- sysdeps/unix/sysv/linux/i386/sysdep.h -+++ sysdeps/unix/sysv/linux/i386/sysdep.h -@@ -187,7 +187,7 @@ - /* The original calling convention for system calls on Linux/i386 is - to use int $0x80. */ - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET - # else - # define ENTER_KERNEL call *_dl_sysinfo -@@ -358,7 +358,7 @@ - possible to use more than four parameters. */ - #undef INTERNAL_SYSCALL - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ -@@ -384,6 +384,18 @@ - : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ - ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -+# define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \ -+ ({ \ -+ register unsigned int resultvar; \ -+ EXTRAVAR_##nr \ -+ asm volatile ( \ -+ LOADARGS_NOSYSENTER_##nr \ -+ "movl %1, %%eax\n\t" \ -+ "int $0x80\n\t" \ -+ RESTOREARGS_NOSYSENTER_##nr \ -+ : "=a" (resultvar) \ -+ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ -+ (int) resultvar; }) - # else - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ -@@ -447,12 +459,20 @@ - - #define LOADARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" - # define LOADARGS_5 \ - "movl %%ebx, %4\n\t" \ - "movl %3, %%ebx\n\t" -+# define LOADARGS_NOSYSENTER_1 \ -+ "bpushl .L__X'%k2, %k2\n\t" -+# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 -+# define LOADARGS_NOSYSENTER_3 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_4 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_5 \ -+ "movl %%ebx, %3\n\t" \ -+ "movl %2, %%ebx\n\t" - # else - # define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" -@@ -474,11 +495,18 @@ - - #define RESTOREARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define RESTOREARGS_1 \ - "bpopl .L__X'%k3, %k3\n\t" - # define RESTOREARGS_5 \ - "movl %4, %%ebx" -+# define RESTOREARGS_NOSYSENTER_1 \ -+ "bpopl .L__X'%k2, %k2\n\t" -+# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 -+# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_5 \ -+ "movl %3, %%ebx" - # else - # define RESTOREARGS_1 \ - "bpopl .L__X'%k2, %k2\n\t" diff --git a/sys-libs/glibc/files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch b/sys-libs/glibc/files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch deleted file mode 100644 index ecf57a9..0000000 --- a/sys-libs/glibc/files/2.7/glibc-2.7-hardened-inittls-nosysenter.patch +++ /dev/null @@ -1,273 +0,0 @@ -When building glibc PIE (which is not something upstream support), -several modifications are necessary to the glibc build process. - -First, any syscalls in PIEs must be of the PIC variant, otherwise -textrels ensue. Then, any syscalls made before the initialisation -of the TLS will fail on i386, as the sysenter variant on i386 uses -the TLS, giving rise to a chicken-and-egg situation. This patch -defines a PIC syscall variant that doesn't use sysenter, even when the sysenter -version is normally used, and uses the non-sysenter version for the brk -syscall that is performed by the TLS initialisation. Further, the TLS -initialisation is moved in this case prior to the initialisation of -dl_osversion, as that requires further syscalls. - -csu/libc-start.c: Move initial TLS initialization to before the -initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined - -csu/libc-tls.c: Use the no-sysenter version of sbrk when -INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter -version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/brk.c: Define a no-sysenter version of brk if -INTERNAL_SYSCALL_NOSYSENTER is defined. - -sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER -Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. - -Patch by Kevin F. Quinn <kevquinn@gentoo.org> - ---- csu/libc-start.c -+++ csu/libc-start.c -@@ -28,6 +28,7 @@ - extern int __libc_multiple_libcs; - - #include <tls.h> -+#include <sysdep.h> - #ifndef SHARED - # include <dl-osinfo.h> - extern void __pthread_initialize_minimal (void); -@@ -129,6 +130,11 @@ - # endif - _dl_aux_init (auxvec); - # endif -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ /* Do the initial TLS initialization before _dl_osversion, -+ since the latter uses the uname syscall. */ -+ __pthread_initialize_minimal (); -+# endif - # ifdef DL_SYSDEP_OSCHECK - if (!__libc_multiple_libcs) - { -@@ -138,10 +144,12 @@ - } - # endif - -+# ifndef INTERNAL_SYSCALL_NOSYSENTER - /* Initialize the thread library at least a bit since the libgcc - functions are using thread functions if these are available and - we need to setup errno. */ - __pthread_initialize_minimal (); -+# endif - - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); ---- csu/libc-tls.c -+++ csu/libc-tls.c -@@ -23,6 +23,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <sys/param.h> -+#include <sysdep.h> - - - #ifdef SHARED -@@ -29,6 +30,9 @@ - #error makefile bug, this file is for static only - #endif - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+extern void *__sbrk_nosysenter (intptr_t __delta); -+#endif - extern ElfW(Phdr) *_dl_phdr; - extern size_t _dl_phnum; - -@@ -141,14 +145,26 @@ - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with -- IE-model TLS. */ -+ IE-model TLS. -+ -+ Where the normal sbrk would use a syscall that needs the TLS (i386) -+ use the special non-sysenter version instead. */ - #if TLS_TCB_AT_TP - tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align); -+# else - tlsblock = __sbrk (tcb_offset + tcbsize + max_align); -+# endif - #elif TLS_DTV_AT_TP - tcb_offset = roundup (tcbsize, align ?: 1); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align -+ + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# else - tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# endif - tlsblock += TLS_PRE_TCB_SIZE; - #else - /* In case a model with a different layout for the TCB and DTV ---- misc/sbrk.c -+++ misc/sbrk.c -@@ -18,6 +18,7 @@ - - #include <unistd.h> - #include <errno.h> -+#include <sysdep.h> - - /* Defined in brk.c. */ - extern void *__curbrk; -@@ -29,6 +30,35 @@ - /* Extend the process's data space by INCREMENT. - If INCREMENT is negative, shrink data space by - INCREMENT. - Return start of new space allocated, or -1 for errors. */ -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+extern int __brk_nosysenter (void *addr); -+void * -+__sbrk_nosysenter (intptr_t increment) -+{ -+ void *oldbrk; -+ -+ /* If this is not part of the dynamic library or the library is used -+ via dynamic loading in a statically linked program update -+ __curbrk from the kernel's brk value. That way two separate -+ instances of __brk and __sbrk can share the heap, returning -+ interleaved pieces of it. */ -+ if (__curbrk == NULL || __libc_multiple_libcs) -+ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ -+ return (void *) -1; -+ -+ if (increment == 0) -+ return __curbrk; -+ -+ oldbrk = __curbrk; -+ if (__brk_nosysenter (oldbrk + increment) < 0) -+ return (void *) -1; -+ -+ return oldbrk; -+} -+#endif - void * - __sbrk (intptr_t increment) - { ---- sysdeps/unix/sysv/linux/i386/brk.c -+++ sysdeps/unix/sysv/linux/i386/brk.c -@@ -31,6 +31,30 @@ - linker. */ - weak_alias (__curbrk, ___brk_addr) - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ * if the SYSENTER version requires the TLS (which it does on i386). -+ * Obviously using the TLS before it is initialised is broken. */ -+int -+__brk_nosysenter (void *addr) -+{ -+ void *__unbounded newbrk; -+ -+ INTERNAL_SYSCALL_DECL (err); -+ newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, -+ __ptrvalue (addr)); -+ -+ __curbrk = newbrk; -+ -+ if (newbrk < addr) -+ { -+ __set_errno (ENOMEM); -+ return -1; -+ } -+ -+ return 0; -+} -+#endif - int - __brk (void *addr) - { ---- sysdeps/unix/sysv/linux/i386/sysdep.h -+++ sysdeps/unix/sysv/linux/i386/sysdep.h -@@ -187,7 +187,7 @@ - /* The original calling convention for system calls on Linux/i386 is - to use int $0x80. */ - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET - # else - # define ENTER_KERNEL call *_dl_sysinfo -@@ -358,7 +358,7 @@ - possible to use more than four parameters. */ - #undef INTERNAL_SYSCALL - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ -@@ -384,6 +384,18 @@ - : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ - ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -+# define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \ -+ ({ \ -+ register unsigned int resultvar; \ -+ EXTRAVAR_##nr \ -+ asm volatile ( \ -+ LOADARGS_NOSYSENTER_##nr \ -+ "movl %1, %%eax\n\t" \ -+ "int $0x80\n\t" \ -+ RESTOREARGS_NOSYSENTER_##nr \ -+ : "=a" (resultvar) \ -+ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ -+ (int) resultvar; }) - # else - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ -@@ -447,12 +459,20 @@ - - #define LOADARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" - # define LOADARGS_5 \ - "movl %%ebx, %4\n\t" \ - "movl %3, %%ebx\n\t" -+# define LOADARGS_NOSYSENTER_1 \ -+ "bpushl .L__X'%k2, %k2\n\t" -+# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 -+# define LOADARGS_NOSYSENTER_3 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_4 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_5 \ -+ "movl %%ebx, %3\n\t" \ -+ "movl %2, %%ebx\n\t" - # else - # define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" -@@ -474,11 +495,18 @@ - - #define RESTOREARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define RESTOREARGS_1 \ - "bpopl .L__X'%k3, %k3\n\t" - # define RESTOREARGS_5 \ - "movl %4, %%ebx" -+# define RESTOREARGS_NOSYSENTER_1 \ -+ "bpopl .L__X'%k2, %k2\n\t" -+# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 -+# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_5 \ -+ "movl %3, %%ebx" - # else - # define RESTOREARGS_1 \ - "bpopl .L__X'%k2, %k2\n\t" diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit deleted file mode 100644 index e56f10e..0000000 --- a/sys-libs/glibc/files/eblits/common.eblit +++ /dev/null @@ -1,380 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -alt_prefix() { - is_crosscompile && echo /usr/${CTARGET} -} - -if [[ ${EAPI:-0} == [012] ]] ; then - : ${ED:=${D}} - : ${EROOT:=${ROOT}} -fi -# This indirection is for binpkgs. #523332 -_nonfatal() { nonfatal "$@" ; } -if [[ ${EAPI:-0} == [0123] ]] ; then - nonfatal() { "$@" ; } - _nonfatal() { "$@" ; } -fi - -# We need to be able to set alternative headers for -# compiling for non-native platform -# Will also become useful for testing kernel-headers without screwing up -# the whole system. -# note: intentionally undocumented. -alt_headers() { - echo ${ALT_HEADERS:=$(alt_prefix)/usr/include} -} -alt_build_headers() { - if [[ -z ${ALT_BUILD_HEADERS} ]] ; then - ALT_BUILD_HEADERS="${EPREFIX}$(alt_headers)" - if tc-is-cross-compiler ; then - ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers) - if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then - local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h') - ALT_BUILD_HEADERS=${header_path%/linux/version.h} - fi - fi - fi - echo "${ALT_BUILD_HEADERS}" -} - -alt_libdir() { - echo $(alt_prefix)/$(get_libdir) -} -alt_usrlibdir() { - echo $(alt_prefix)/usr/$(get_libdir) -} - -builddir() { - echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1" -} - -setup_target_flags() { - # This largely mucks with compiler flags. None of which should matter - # when building up just the headers. - just_headers && return 0 - - case $(tc-arch) in - x86) - # -march needed for #185404 #199334 - # TODO: When creating the first glibc cross-compile, this test will - # always fail as it does a full link which in turn requires glibc. - # Probably also applies when changing multilib profile settings (e.g. - # enabling x86 when the profile was amd64-only previously). - # We could change main to _start and pass -nostdlib here so that we - # only test the gcc code compilation. Or we could do a compile and - # then look for the symbol via scanelf. - if ! glibc_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then - local t=${CTARGET_OPT:-${CTARGET}} - t=${t%%-*} - filter-flags '-march=*' - export CFLAGS="-march=${t} ${CFLAGS}" - einfo "Auto adding -march=${t} to CFLAGS #185404" - fi - ;; - amd64) - # -march needed for #185404 #199334 - # Note: This test only matters when the x86 ABI is enabled, so we could - # optimize a bit and elide it. - # TODO: See cross-compile issues listed above for x86. - if ! glibc_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then - local t=${CTARGET_OPT:-${CTARGET}} - t=${t%%-*} - # Normally the target is x86_64-xxx, so turn that into the -march that - # gcc actually accepts. #528708 - [[ ${t} == "x86_64" ]] && t="x86-64" - filter-flags '-march=*' - # ugly, ugly, ugly. ugly. - CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") - export CFLAGS_x86="${CFLAGS_x86} -march=${t}" - einfo "Auto adding -march=${t} to CFLAGS_x86 #185404" - fi - ;; - mips) - # The mips abi cannot support the GNU style hashes. #233233 - filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both - ;; - ppc) - append-flags "-freorder-blocks" - ;; - sparc) - # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. - filter-flags "-fcall-used-g7" - append-flags "-fcall-used-g6" - - # If the CHOST is the basic one (e.g. not sparcv9-xxx already), - # try to pick a better one so glibc can use cpu-specific .S files. - # We key off the CFLAGS to get a good value. Also need to handle - # version skew. - # We can't force users to set their CHOST to their exact machine - # as many of these are not recognized by config.sub/gcc and such :(. - # Note: If the mcpu values don't scale, we might try probing CPP defines. - # Note: Should we factor in -Wa,-AvXXX flags too ? Or -mvis/etc... ? - - local cpu - case ${CTARGET} in - sparc64-*) - case $(get-flag mcpu) in - niagara[234]) - if version_is_at_least 2.8 ; then - cpu="sparc64v2" - elif version_is_at_least 2.4 ; then - cpu="sparc64v" - elif version_is_at_least 2.2.3 ; then - cpu="sparc64b" - fi - ;; - niagara) - if version_is_at_least 2.4 ; then - cpu="sparc64v" - elif version_is_at_least 2.2.3 ; then - cpu="sparc64b" - fi - ;; - ultrasparc3) - cpu="sparc64b" - ;; - *) - # We need to force at least v9a because the base build doesn't - # work with just v9. - # https://sourceware.org/bugzilla/show_bug.cgi?id=19477 - [[ -z ${cpu} ]] && append-flags "-Wa,-xarch=v9a" - ;; - esac - ;; - sparc-*) - case $(get-flag mcpu) in - niagara[234]) - if version_is_at_least 2.8 ; then - cpu="sparcv9v2" - elif version_is_at_least 2.4 ; then - cpu="sparcv9v" - elif version_is_at_least 2.2.3 ; then - cpu="sparcv9b" - else - cpu="sparcv9" - fi - ;; - niagara) - if version_is_at_least 2.4 ; then - cpu="sparcv9v" - elif version_is_at_least 2.2.3 ; then - cpu="sparcv9b" - else - cpu="sparcv9" - fi - ;; - ultrasparc3) - cpu="sparcv9b" - ;; - v9|ultrasparc) - cpu="sparcv9" - ;; - v8|supersparc|hypersparc|leon|leon3) - cpu="sparcv8" - ;; - esac - ;; - esac - [[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}" - ;; - esac -} - -setup_flags() { - # Make sure host make.conf doesn't pollute us - if is_crosscompile || tc-is-cross-compiler ; then - CHOST=${CTARGET} strip-unsupported-flags - fi - - # Store our CFLAGS because it's changed depending on which CTARGET - # we are building when pulling glibc on a multilib profile - CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}} - CFLAGS=${CFLAGS_BASE} - CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}} - CXXFLAGS=${CXXFLAGS_BASE} - ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}} - ASFLAGS=${ASFLAGS_BASE} - - # Over-zealous CFLAGS can often cause problems. What may work for one - # person may not work for another. To avoid a large influx of bugs - # relating to failed builds, we strip most CFLAGS out to ensure as few - # problems as possible. - strip-flags - strip-unsupported-flags - filter-flags -m32 -m64 -mabi=* - - # Bug 492892. - filter-flags -frecord-gcc-switches - - unset CBUILD_OPT CTARGET_OPT - if use multilib ; then - CTARGET_OPT=$(get_abi_CTARGET) - [[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST) - fi - - setup_target_flags - - if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then - CBUILD_OPT=${CTARGET_OPT} - fi - - # Lock glibc at -O2 -- linuxthreads needs it and we want to be - # conservative here. -fno-strict-aliasing is to work around #155906 - filter-flags -O? - append-flags -O2 -fno-strict-aliasing - - # Can't build glibc itself with fortify code. Newer versions add - # this flag for us, so no need to do it manually. - version_is_at_least 2.16 ${PV} || append-cppflags -U_FORTIFY_SOURCE - - # building glibc with SSP is fraught with difficulty, especially - # due to __stack_chk_fail_local which would mean significant changes - # to the glibc build process. See bug #94325 #293721 - # Note we have to handle both user-given CFLAGS and gcc defaults via - # spec rules here. We can't simply add -fno-stack-protector as it gets - # added before user flags, and we can't just filter-flags because - # _filter_hardened doesn't support globs. - filter-flags -fstack-protector* - gcc-specs-ssp && append-flags $(test-flags -fno-stack-protector) - - if use hardened && gcc-specs-pie ; then - # Force PIC macro definition for all compilations since they're all - # either -fPIC or -fPIE with the default-PIE compiler. - append-cppflags -DPIC - else - # Don't build -fPIE without the default-PIE compiler and the - # hardened-pie patch - filter-flags -fPIE - fi -} - -want_nptl() { - [[ -z ${LT_VER} ]] && return 0 - want_tls || return 1 - use nptl || return 1 - - # Older versions of glibc had incomplete arch support for nptl. - # But if you're building those now, you can handle USE=nptl yourself. - return 0 -} - -want_linuxthreads() { - [[ -z ${LT_VER} ]] && return 1 - use linuxthreads -} - -want_tls() { - # Archs that can use TLS (Thread Local Storage) - case $(tc-arch) in - x86) - # requires i486 or better #106556 - [[ ${CTARGET} == i[4567]86* ]] && return 0 - return 1 - ;; - esac - - return 0 -} - -want__thread() { - want_tls || return 1 - - # For some reason --with-tls --with__thread is causing segfaults on sparc32. - [[ ${PROFILE_ARCH} == "sparc" ]] && return 1 - - [[ -n ${WANT__THREAD} ]] && return ${WANT__THREAD} - - # only test gcc -- cant test linking yet - tc-has-tls -c ${CTARGET} - WANT__THREAD=$? - - return ${WANT__THREAD} -} - -use_multiarch() { - # Make sure binutils is new enough to support indirect functions #336792 - # This funky sed supports gold and bfd linkers. - local bver nver - bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}') - case $(tc-arch ${CTARGET}) in - amd64|x86) nver="2.20" ;; - arm) nver="2.22" ;; - hppa) nver="2.23" ;; - ppc|ppc64) nver="2.20" ;; - # ifunc was added in 2.23, but glibc also needs machinemode which is in 2.24. - s390) nver="2.24" ;; - sparc) nver="2.21" ;; - *) return 1 ;; - esac - version_is_at_least ${nver} ${bver} -} - -# Setup toolchain variables that had historically -# been defined in the profiles for these archs. -setup_env() { - # silly users - unset LD_RUN_PATH - unset LD_ASSUME_KERNEL - - multilib_env ${CTARGET_OPT:-${CTARGET}} - if is_crosscompile || tc-is-cross-compiler ; then - if ! use multilib ; then - MULTILIB_ABIS=${DEFAULT_ABI} - else - MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}} - fi - - # If the user has CFLAGS_<CTARGET> in their make.conf, use that, - # and fall back on CFLAGS. - local VAR=CFLAGS_${CTARGET//[-.]/_} - CFLAGS=${!VAR-${CFLAGS}} - fi - - setup_flags - - export ABI=${ABI:-${DEFAULT_ABI:-default}} - - local VAR=CFLAGS_${ABI} - # We need to export CFLAGS with abi information in them because glibc's - # configure script checks CFLAGS for some targets (like mips). Keep - # around the original clean value to avoid appending multiple ABIs on - # top of each other. - : ${__GLIBC_CC:=$(tc-getCC ${CTARGET_OPT:-${CTARGET}})} - export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}" -} - -foreach_abi() { - setup_env - - local ret=0 - local abilist="" - if use multilib ; then - abilist=$(get_install_abis) - else - abilist=${DEFAULT_ABI} - fi - evar_push ABI - export ABI - for ABI in ${abilist:-default} ; do - setup_env - einfo "Running $1 for ABI ${ABI}" - $1 - : $(( ret |= $? )) - done - evar_pop - return ${ret} -} - -just_headers() { - is_crosscompile && use crosscompile_opts_headers-only -} - -glibc_banner() { - local b="Gentoo ${PVR}" - [[ -n ${SNAP_VER} ]] && b+=" snapshot ${SNAP_VER}" - [[ -n ${BRANCH_UPDATE} ]] && b+=" branch ${BRANCH_UPDATE}" - [[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" p${PATCH_VER}" - echo "${b}" -} diff --git a/sys-libs/glibc/files/eblits/pkg_postinst.eblit b/sys-libs/glibc/files/eblits/pkg_postinst.eblit deleted file mode 100644 index 8178fa1..0000000 --- a/sys-libs/glibc/files/eblits/pkg_postinst.eblit +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -eblit-glibc-pkg_postinst() { - # nothing to do if just installing headers - just_headers && return - - if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then - # Generate fastloading iconv module configuration file. - "${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}" - fi - - if ! is_crosscompile && [[ ${ROOT} == "/" ]] ; then - # Reload init ... if in a chroot or a diff init package, ignore - # errors from this step #253697 - /sbin/telinit U 2>/dev/null - - # if the host locales.gen contains no entries, we'll install everything - local locale_list="${EROOT}etc/locale.gen" - if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then - ewarn "Generating all locales; edit /etc/locale.gen to save time/space" - locale_list="${EROOT}usr/share/i18n/SUPPORTED" - fi - locale-gen -j $(makeopts_jobs) --config "${locale_list}" - fi -} diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit deleted file mode 100644 index f40f402..0000000 --- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# Simple test to make sure our new glibc isnt completely broken. -# Make sure we don't test with statically built binaries since -# they will fail. Also, skip if this glibc is a cross compiler. -# -# If coreutils is built with USE=multicall, some of these files -# will just be wrapper scripts, not actual ELFs we can test. -glibc_sanity_check() { - cd / #228809 - - # We enter ${ED} so to avoid trouble if the path contains - # special characters; for instance if the path contains the - # colon character (:), then the linker will try to split it - # and look for the libraries in an unexpected place. This can - # lead to unsafe code execution if the generated prefix is - # within a world-writable directory. - # (e.g. /var/tmp/portage:${HOSTNAME}) - pushd "${ED}"/$(get_libdir) >/dev/null - - local x striptest - for x in cal date env free ls true uname uptime ; do - x=$(type -p ${x}) - [[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue - striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue - case ${striptest} in - *"statically linked"*) continue;; - *"ASCII text"*) continue;; - esac - # We need to clear the locale settings as the upgrade might want - # incompatible locale data. This test is not for verifying that. - LC_ALL=C \ - ./ld-*.so --library-path . ${x} > /dev/null \ - || die "simple run test (${x}) failed" - done - - popd >/dev/null -} - -eblit-glibc-pkg_preinst() { - # nothing to do if just installing headers - just_headers && return - - # prepare /etc/ld.so.conf.d/ for files - mkdir -p "${EROOT}"/etc/ld.so.conf.d - - # Default /etc/hosts.conf:multi to on for systems with small dbs. - if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then - sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf - elog "Defaulting /etc/host.conf:multi to on" - fi - - [[ ${ROOT} != "/" ]] && return 0 - [[ -d ${ED}/$(get_libdir) ]] || return 0 - [[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check - - # For newer EAPIs, this was run in pkg_pretend. - if [[ ${EAPI:-0} == [0123] ]] ; then - check_devpts - fi -} diff --git a/sys-libs/glibc/files/eblits/pkg_pretend.eblit b/sys-libs/glibc/files/eblits/pkg_pretend.eblit deleted file mode 100644 index c900ccc..0000000 --- a/sys-libs/glibc/files/eblits/pkg_pretend.eblit +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -glibc_compile_test() { - local ret save_cflags=${CFLAGS} - CFLAGS+=" $1" - shift - - pushd "${T}" >/dev/null - - rm -f glibc-test* - printf '%b' "$*" > glibc-test.c - - _nonfatal emake -s glibc-test - ret=$? - - popd >/dev/null - - CFLAGS=${save_cflags} - return ${ret} -} - -glibc_run_test() { - local ret - - if [[ ${EMERGE_FROM} == "binary" ]] ; then - # ignore build failures when installing a binary package #324685 - glibc_compile_test "" "$@" 2>/dev/null || return 0 - else - if ! glibc_compile_test "" "$@" ; then - ewarn "Simple build failed ... assuming this is desired #324685" - return 0 - fi - fi - - pushd "${T}" >/dev/null - - ./glibc-test - ret=$? - rm -f glibc-test* - - popd >/dev/null - - return ${ret} -} - -check_devpts() { - # Make sure devpts is mounted correctly for use w/out setuid pt_chown. - - # If merely building the binary package, then there's nothing to verify. - [[ ${MERGE_TYPE} == "buildonly" ]] && return - - # Only sanity check when installing the native glibc. - [[ ${ROOT} != "/" ]] && return - - # Older versions always installed setuid, so no need to check. - in_iuse suid || return - - # If they're opting in to the old suid code, then no need to check. - use suid && return - - if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then - eerror "In order to use glibc with USE=-suid, you must make sure that" - eerror "you have devpts mounted at /dev/pts with the gid=5 option." - eerror "Openrc should do this for you, so you should check /etc/fstab" - eerror "and make sure you do not have any invalid settings there." - # Do not die on older kernels as devpts did not export these settings #489520. - if version_is_at_least 2.6.25 $(uname -r) ; then - die "mount & fix your /dev/pts settings" - fi - fi -} - -eblit-glibc-pkg_pretend() { - # For older EAPIs, this is run in pkg_preinst. - if [[ ${EAPI:-0} != [0123] ]] ; then - check_devpts - fi - - # prevent native builds from downgrading ... maybe update to allow people - # to change between diff -r versions ? (2.3.6-r4 -> 2.3.6-r2) - if [[ ${MERGE_TYPE} != "buildonly" ]] && \ - [[ ${ROOT} == "/" ]] && \ - [[ ${CBUILD} == ${CHOST} ]] && \ - [[ ${CHOST} == ${CTARGET} ]] ; then - if has_version '>'${CATEGORY}/${PF} ; then - eerror "Sanity check to keep you from breaking your system:" - eerror " Downgrading glibc is not supported and a sure way to destruction" - die "aborting to save your system" - fi - - if ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n' - then - eerror "Your patched vendor kernel is broken. You need to get an" - eerror "update from whoever is providing the kernel to you." - eerror "http://sourceware.org/bugzilla/show_bug.cgi?id=5227" - eerror "http://bugs.gentoo.org/262698" - die "keeping your system alive, say thank you" - fi - - if ! glibc_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' - then - eerror "Your old kernel is broken. You need to update it to" - eerror "a newer version as syscall(<bignum>) will break." - eerror "http://bugs.gentoo.org/279260" - die "keeping your system alive, say thank you" - fi - fi - - # users have had a chance to phase themselves, time to give em the boot - if [[ -e ${EROOT}/etc/locale.gen ]] && [[ -e ${EROOT}/etc/locales.build ]] ; then - eerror "You still haven't deleted ${EROOT}/etc/locales.build." - eerror "Do so now after making sure ${EROOT}/etc/locale.gen is kosher." - die "lazy upgrader detected" - fi - - if [[ ${CTARGET} == i386-* ]] ; then - eerror "i386 CHOSTs are no longer supported." - eerror "Chances are you don't actually want/need i386." - eerror "Please read http://www.gentoo.org/doc/en/change-chost.xml" - die "please fix your CHOST" - fi - - if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then - ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS." - ewarn "This will result in a 50% performance penalty when running with a 32bit" - ewarn "hypervisor, which is probably not what you want." - fi - - use hardened && ! gcc-specs-pie && \ - ewarn "PIE hardening not applied, as your compiler doesn't default to PIE" - - # Make sure host system is up to date #394453 - if has_version '<sys-libs/glibc-2.13' && \ - [[ -n $(scanelf -qys__guard -F'#s%F' "${EROOT}"/lib*/l*-*.so) ]] - then - ebegin "Scanning system for __guard to see if you need to rebuild first ..." - local files=$( - scanelf -qys__guard -F'#s%F' \ - "${EROOT}"/*bin/ \ - "${EROOT}"/lib* \ - "${EROOT}"/usr/*bin/ \ - "${EROOT}"/usr/lib* | \ - egrep -v \ - -e "^${EROOT}/lib.*/(libc|ld)-2.*.so$" \ - -e "^${EROOT}/sbin/(ldconfig|sln)$" - ) - [[ -z ${files} ]] - if ! eend $? ; then - eerror "Your system still has old SSP __guard symbols. You need to" - eerror "rebuild all the packages that provide these files first:" - eerror "${files}" - die "old __guard detected" - fi - fi -} diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit deleted file mode 100644 index 2aff258..0000000 --- a/sys-libs/glibc/files/eblits/pkg_setup.eblit +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -[[ ${EAPI:-0} == [0123] ]] && source "${FILESDIR}/eblits/pkg_pretend.eblit" - -eblit-glibc-pkg_setup() { - [[ ${EAPI:-0} == [0123] ]] && eblit-glibc-pkg_pretend -} diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit deleted file mode 100644 index 7a38b3e..0000000 --- a/sys-libs/glibc/files/eblits/src_compile.eblit +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -[[ ${EAPI:-0} == [01] ]] && source "${FILESDIR}/eblits/src_configure.eblit" - -toolchain-glibc_src_compile() { - local t - for t in linuxthreads nptl ; do - if want_${t} ; then - [[ ${EAPI:-0} == [01] ]] && glibc_do_configure ${t} - emake -C "$(builddir ${t})" || die "make ${t} for ${ABI} failed" - fi - done -} - -eblit-glibc-src_compile() { - if just_headers ; then - [[ ${EAPI:-0} == [01] ]] && toolchain-glibc_headers_configure - return - fi - - foreach_abi toolchain-glibc_src_compile -} diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit deleted file mode 100644 index 5f2fec0..0000000 --- a/sys-libs/glibc/files/eblits/src_configure.eblit +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -dump_toolchain_settings() { - echo - - einfo "$*" - - local v - for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC LD {AS,C,CPP,CXX,LD}FLAGS ; do - einfo " $(printf '%15s' ${v}:) ${!v}" - done - - # The glibc configure script doesn't properly use LDFLAGS all the time. - export CC="$(tc-getCC ${CTARGET}) ${LDFLAGS}" - einfo " $(printf '%15s' 'Manual CC:') ${CC}" - echo -} - -glibc_do_configure() { - # Glibc does not work with gold (for various reasons) #269274. - tc-ld-disable-gold - - dump_toolchain_settings "Configuring glibc for $1" - - local myconf=() - - # set addons - pushd "${S}" > /dev/null - local addons=$(echo */configure | sed \ - -e 's:/configure::g' \ - -e 's:\(linuxthreads\|nptl\|rtkaio\|glibc-compat\)\( \|$\)::g' \ - -e 's: \+$::' \ - -e 's! !,!g' \ - -e 's!^!,!' \ - -e '/^,\*$/d') - [[ -d ports ]] && addons+=",ports" - popd > /dev/null - - myconf+=( $(use_enable hardened stackguard-randomization) ) - if has_version '<sys-libs/glibc-2.13' ; then - myconf+=( --enable-old-ssp-compat ) - fi - - [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp ) - - if [[ $1 == "linuxthreads" ]] ; then - if want_tls ; then - myconf+=( --with-tls ) - - if ! want__thread || use glibc-compat20 || [[ ${LT_KER_VER} == 2.[02].* ]] ; then - myconf+=( --without-__thread ) - else - myconf+=( --with-__thread ) - fi - else - myconf+=( --without-tls --without-__thread ) - fi - - myconf+=( --disable-sanity-checks ) - addons="linuxthreads${addons}" - myconf+=( --enable-kernel=${LT_KER_VER} ) - elif [[ $1 == "nptl" ]] ; then - # Newer versions require nptl, so there is no addon for it. - version_is_at_least 2.20 || addons="nptl${addons}" - myconf+=( --enable-kernel=${NPTL_KERN_VER} ) - else - die "invalid pthread option" - fi - myconf+=( --enable-add-ons="${addons#,}" ) - - # Since SELinux support is only required for nscd, only enable it if: - # 1. USE selinux - # 2. only for the primary ABI on multilib systems - # 3. Not a crosscompile - if ! is_crosscompile && use selinux ; then - if use multilib ; then - if is_final_abi ; then - myconf+=( --with-selinux ) - else - myconf+=( --without-selinux ) - fi - else - myconf+=( --with-selinux ) - fi - else - myconf+=( --without-selinux ) - fi - - # Force a few tests where we always know the answer but - # configure is incapable of finding it. - if is_crosscompile ; then - export \ - libc_cv_c_cleanup=yes \ - libc_cv_forced_unwind=yes - fi - - myconf+=( - --without-cvs - --disable-werror - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - $(use_enable profile) - $(use_with gd) - --with-headers=$(alt_build_headers) - --libexecdir="${EPREFIX}/usr/$(get_libdir)/misc/glibc" - --with-bugurl=http://bugs.gentoo.org/ - --with-pkgversion="$(glibc_banner)" - $(use_multiarch || echo --disable-multi-arch) - $(in_iuse rpc && use_enable rpc obsolete-rpc || echo --enable-obsolete-rpc) - $(in_iuse systemtap && use_enable systemtap) - $(in_iuse nscd && use_enable nscd) - ${EXTRA_ECONF} - ) - - # We rely on sys-libs/timezone-data for timezone tools normally. - if version_is_at_least 2.23 ; then - myconf+=( $(use_enable vanilla timezone-tools) ) - fi - - # These libs don't have configure flags. - ac_cv_lib_audit_audit_log_user_avc_message=$(in_iuse audit && usex audit || echo no) - ac_cv_lib_cap_cap_init=$(in_iuse caps && usex caps || echo no) - - # There is no configure option for this and we need to export it - # since the glibc build will re-run configure on itself - export libc_cv_slibdir="${EPREFIX}/$(get_libdir)" - export libc_cv_rootsbindir="${EPREFIX}/sbin" - - # We take care of patching our binutils to use both hash styles, - # and many people like to force gnu hash style only, so disable - # this overriding check. #347761 - export libc_cv_hashstyle=no - - # Overtime, generating info pages can be painful. So disable this for - # versions older than the latest stable to avoid the issue (this ver - # should be updated from time to time). #464394 #465816 - if ! version_is_at_least 2.17 ; then - export ac_cv_prog_MAKEINFO=: - fi - - local builddir=$(builddir "$1") - mkdir -p "${builddir}" - cd "${builddir}" - ECONF_SOURCE="${S}" econf "${myconf[@]}" - - # ia64 static cross-compilers are a pita in so much that they - # can't produce static ELFs (as the libgcc.a is broken). so - # disable building of the programs for those targets if it - # doesn't work. - # XXX: We could turn this into a compiler test, but ia64 is - # the only one that matters, so this should be fine for now. - if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then - sed -i '1i+link-static = touch $@' config.make - fi - - # If we're trying to migrate between ABI sets, we need - # to lie and use a local copy of gcc. Like if the system - # is built with MULTILIB_ABIS="amd64 x86" but we want to - # add x32 to it, gcc/glibc don't yet support x32. - if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then - echo 'main(){}' > "${T}"/test.c - if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then - sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die - mkdir -p sunrpc - cp $(which rpcgen) sunrpc/cross-rpcgen || die - touch -t 202001010101 sunrpc/cross-rpcgen || die - fi - fi -} - -toolchain-glibc_headers_configure() { - export ABI=default - - local builddir=$(builddir "headers") - mkdir -p "${builddir}" - cd "${builddir}" - - # if we don't have a compiler yet, we cant really test it now ... - # hopefully they don't affect header geneation, so let's hope for - # the best here ... - local v vars=( - ac_cv_header_cpuid_h=yes - libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes - libc_cv_asm_cfi_directives=yes - libc_cv_broken_visibility_attribute=no - libc_cv_c_cleanup=yes - libc_cv_forced_unwind=yes - libc_cv_gcc___thread=yes - libc_cv_mlong_double_128=yes - libc_cv_mlong_double_128ibm=yes - libc_cv_ppc_machine=yes - libc_cv_ppc_rel16=yes - libc_cv_predef_{fortify_source,stack_protector}=no - libc_cv_visibility_attribute=yes - libc_cv_z_combreloc=yes - libc_cv_z_execstack=yes - libc_cv_z_initfirst=yes - libc_cv_z_nodelete=yes - libc_cv_z_nodlopen=yes - libc_cv_z_relro=yes - libc_mips_abi=${ABI} - libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard) - # These libs don't have configure flags. - ac_cv_lib_audit_audit_log_user_avc_message=no - ac_cv_lib_cap_cap_init=no - ) - einfo "Forcing cached settings:" - for v in "${vars[@]}" ; do - einfo " ${v}" - export ${v} - done - - # Blow away some random CC settings that screw things up. #550192 - if [[ -d ${S}/sysdeps/mips ]]; then - pushd "${S}"/sysdeps/mips >/dev/null - sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die - sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die - popd >/dev/null - fi - - local myconf=() - myconf+=( - --disable-sanity-checks - --enable-hacker-mode - --without-cvs - --disable-werror - --enable-bind-now - --build=${CBUILD_OPT:-${CBUILD}} - --host=${CTARGET_OPT:-${CTARGET}} - --with-headers=$(alt_build_headers) - ${EXTRA_ECONF} - ) - - local addons - [[ -d ${S}/ports ]] && addons+=",ports" - # Newer versions require nptl, so there is no addon for it. - version_is_at_least 2.20 || addons+=",nptl" - myconf+=( --enable-add-ons="${addons#,}" ) - - # Nothing is compiled here which would affect the headers for the target. - # So forcing CC/CFLAGS is sane. - CC="$(tc-getBUILD_CC)" \ - CFLAGS="-O1 -pipe" \ - CPPFLAGS="-U_FORTIFY_SOURCE" \ - LDFLAGS="" \ - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -toolchain-glibc_src_configure() { - if just_headers ; then - toolchain-glibc_headers_configure - else - want_linuxthreads && glibc_do_configure linuxthreads - want_nptl && glibc_do_configure nptl - fi -} - -eblit-glibc-src_configure() { - foreach_abi toolchain-glibc_src_configure -} diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit deleted file mode 100644 index a23173e..0000000 --- a/sys-libs/glibc/files/eblits/src_install.eblit +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -toolchain-glibc_src_install() { - local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl)) - cd "${builddir}" - - emake install_root="${D}$(alt_prefix)" install || die - - if want_linuxthreads && want_nptl ; then - einfo "Installing NPTL to $(alt_libdir)/tls/..." - cd "$(builddir nptl)" - dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl - - local l src_lib - for l in libc libm librt libpthread libthread_db ; do - # take care of shared lib first ... - l=${l}.so - if [[ -e ${l} ]] ; then - src_lib=${l} - else - src_lib=$(eval echo */${l}) - fi - cp -a ${src_lib} "${ED}"$(alt_libdir)/tls/${l} || die "copying nptl ${l}" - fperms a+rx $(alt_libdir)/tls/${l} - dosym ${l} $(alt_libdir)/tls/$(scanelf -qSF'%S#F' ${src_lib}) - - # then grab the linker script or the symlink ... - if [[ -L ${ED}$(alt_usrlibdir)/${l} ]] ; then - dosym $(alt_libdir)/tls/${l} $(alt_usrlibdir)/nptl/${l} - else - sed \ - -e "s:/${l}:/tls/${l}:g" \ - -e "s:/${l/%.so/_nonshared.a}:/nptl/${l/%.so/_nonshared.a}:g" \ - "${ED}"$(alt_usrlibdir)/${l} > "${ED}"$(alt_usrlibdir)/nptl/${l} - fi - - # then grab the static lib ... - src_lib=${src_lib/%.so/.a} - [[ ! -e ${src_lib} ]] && src_lib=${src_lib/%.a/_pic.a} - cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" - src_lib=${src_lib/%.a/_nonshared.a} - if [[ -e ${src_lib} ]] ; then - cp -a ${src_lib} "${ED}"$(alt_usrlibdir)/nptl/ || die "copying nptl ${src_lib}" - fi - done - - # use the nptl linker instead of the linuxthreads one as the linuxthreads - # one may lack TLS support and that can be really bad for business - cp -a elf/ld.so "${ED}"$(alt_libdir)/$(scanelf -qSF'%S#F' elf/ld.so) || die "copying nptl interp" - fi - - # We'll take care of the cache ourselves - rm -f "${ED}"/etc/ld.so.cache - - # Everything past this point just needs to be done once ... - is_final_abi || return 0 - - # Make sure the non-native interp can be found on multilib systems even - # if the main library set isn't installed into the right place. Maybe - # we should query the active gcc for info instead of hardcoding it ? - local i ldso_abi ldso_name - local ldso_abi_list=( - # x86 - amd64 /lib64/ld-linux-x86-64.so.2 - x32 /libx32/ld-linux-x32.so.2 - x86 /lib/ld-linux.so.2 - # mips - o32 /lib/ld.so.1 - n32 /lib32/ld.so.1 - n64 /lib64/ld.so.1 - # powerpc - ppc /lib/ld.so.1 - ppc64 /lib64/ld64.so.1 - # s390 - s390 /lib/ld.so.1 - s390x /lib/ld64.so.1 - # sparc - sparc32 /lib/ld-linux.so.2 - sparc64 /lib64/ld-linux.so.2 - ) - case $(tc-endian) in - little) - ldso_abi_list+=( - # arm - arm64 /lib/ld-linux-aarch64.so.1 - ) - ;; - big) - ldso_abi_list+=( - # arm - arm64 /lib/ld-linux-aarch64_be.so.1 - ) - ;; - esac - if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib - fi - for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do - ldso_abi=${ldso_abi_list[i]} - has ${ldso_abi} $(get_install_abis) || continue - - ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}" - if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then - dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name} - fi - done - - # With devpts under Linux mounted properly, we do not need the pt_chown - # binary to be setuid. This is because the default owners/perms will be - # exactly what we want. - if in_iuse suid && ! use suid ; then - find "${ED}" -name pt_chown -exec chmod -s {} + - fi - - ################################################################# - # EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY # - # Make sure we install some symlink hacks so that when we build - # a 2nd stage cross-compiler, gcc finds the target system - # headers correctly. See gcc/doc/gccinstall.info - if is_crosscompile ; then - # We need to make sure that /lib and /usr/lib always exists. - # gcc likes to use relative paths to get to its multilibs like - # /usr/lib/../lib64/. So while we don't install any files into - # /usr/lib/, we do need it to exist. - cd "${ED}"$(alt_libdir)/.. - [[ -e lib ]] || mkdir lib - cd "${ED}"$(alt_usrlibdir)/.. - [[ -e lib ]] || mkdir lib - - dosym usr/include $(alt_prefix)/sys-include - return 0 - fi - - # Files for Debian-style locale updating - dodir /usr/share/i18n - sed \ - -e "/^#/d" \ - -e "/SUPPORTED-LOCALES=/d" \ - -e "s: \\\\::g" -e "s:/: :g" \ - "${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \ - || die "generating /usr/share/i18n/SUPPORTED failed" - cd "${WORKDIR}"/extra/locale - dosbin locale-gen || die - doman *.[0-8] - insinto /etc - doins locale.gen || die - - # Make sure all the ABI's can find the locales and so we only - # have to generate one set - local a - keepdir /usr/$(get_libdir)/locale - for a in $(get_install_abis) ; do - if [[ ! -e ${ED}/usr/$(get_abi_LIBDIR ${a})/locale ]] ; then - dosym /usr/$(get_libdir)/locale /usr/$(get_abi_LIBDIR ${a})/locale - fi - done - - cd "${S}" - - # Install misc network config files - insinto /etc - doins nscd/nscd.conf posix/gai.conf nss/nsswitch.conf || die - doins "${WORKDIR}"/extra/etc/*.conf || die - - if ! in_iuse nscd || use nscd ; then - doinitd "${WORKDIR}"/extra/etc/nscd || die - - local nscd_args=( - -e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):" - ) - version_is_at_least 2.16 || nscd_args+=( -e 's: --foreground : :' ) - sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd - - # Newer versions of glibc include the nscd.service themselves. - # TODO: Drop the $FILESDIR copy once 2.19 goes stable. - if version_is_at_least 2.19 ; then - systemd_dounit nscd/nscd.service || die - systemd_newtmpfilesd nscd/nscd.tmpfiles nscd.conf || die - else - systemd_dounit "${FILESDIR}"/nscd.service || die - systemd_newtmpfilesd "${FILESDIR}"/nscd.tmpfilesd nscd.conf || die - fi - else - # Do this since extra/etc/*.conf above might have nscd.conf. - rm -f "${ED}"/etc/nscd.conf - fi - - echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc - doenvd "${T}"/00glibc || die - - for d in BUGS ChangeLog* CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do - [[ -s ${d} ]] && dodoc ${d} - done - - # Prevent overwriting of the /etc/localtime symlink. We'll handle the - # creation of the "factory" symlink in pkg_postinst(). - rm -f "${ED}"/etc/localtime -} - -toolchain-glibc_headers_install() { - local builddir=$(builddir "headers") - cd "${builddir}" - emake install_root="${D}$(alt_prefix)" install-headers || die - if ! version_is_at_least 2.16 ; then - insinto $(alt_headers)/bits - doins bits/stdio_lim.h || die - fi - insinto $(alt_headers)/gnu - doins "${S}"/include/gnu/stubs.h || die "doins include gnu" - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - dosym usr/include $(alt_prefix)/sys-include -} - -src_strip() { - # gdb is lame and requires some debugging information to remain in - # libpthread, so we need to strip it by hand. libthread_db makes no - # sense stripped as it is only used when debugging. - local pthread=$(has splitdebug ${FEATURES} && echo "libthread_db" || echo "lib{pthread,thread_db}") - env \ - -uRESTRICT \ - CHOST=${CTARGET} \ - STRIP_MASK="/*/{,tls/}${pthread}*" \ - prepallstrip - # if user has stripping enabled and does not have split debug turned on, - # then leave the debugging sections in libpthread. - if ! has nostrip ${FEATURES} && ! has splitdebug ${FEATURES} ; then - ${STRIP:-${CTARGET}-strip} --strip-debug "${ED}"/*/libpthread-*.so - fi -} - -eblit-glibc-src_install() { - if just_headers ; then - export ABI=default - toolchain-glibc_headers_install - return - fi - - foreach_abi toolchain-glibc_src_install - src_strip -} diff --git a/sys-libs/glibc/files/eblits/src_prepare.eblit b/sys-libs/glibc/files/eblits/src_prepare.eblit deleted file mode 100644 index 162cf53..0000000 --- a/sys-libs/glibc/files/eblits/src_prepare.eblit +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -eblit-glibc-src_prepare() { - # XXX: We should do the branchupdate, before extracting the manpages and - # infopages else it does not help much (mtimes change if there is a change - # to them with branchupdate) - if [[ -n ${BRANCH_UPDATE} ]] ; then - epatch "${DISTDIR}"/glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - - # Snapshot date patch - einfo "Patching version to display snapshot date ..." - sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h - fi - - # tag, glibc is it - if ! version_is_at_least 2.17 ; then - [[ -e csu/Banner ]] && die "need new banner location" - glibc_banner > csu/Banner - fi - if [[ -n ${PATCH_VER} ]] && ! use vanilla ; then - EPATCH_MULTI_MSG="Applying Gentoo Glibc Patchset ${RELEASE_VER}-${PATCH_VER} ..." \ - EPATCH_EXCLUDE=${GLIBC_PATCH_EXCLUDE} \ - EPATCH_SUFFIX="patch" \ - ARCH=$(tc-arch) \ - epatch "${WORKDIR}"/patches - fi - - if just_headers ; then - if [[ -e ports/sysdeps/mips/preconfigure ]] ; then - # mips peeps like to screw with us. if building headers, - # we don't have a real compiler, so we can't let them - # insert -mabi on us. - sed -i '/CPPFLAGS=.*-mabi/s|.*|:|' ports/sysdeps/mips/preconfigure || die - find ports/sysdeps/mips/ -name Makefile -exec sed -i '/^CC.*-mabi=/s:-mabi=.*:-D_MIPS_SZPTR=32:' {} + - fi - fi - - epatch_user - - gnuconfig_update - - # Glibc is stupid sometimes, and doesn't realize that with a - # static C-Only gcc, -lgcc_eh doesn't exist. - # http://sourceware.org/ml/libc-alpha/2003-09/msg00100.html - # http://sourceware.org/ml/libc-alpha/2005-02/msg00042.html - # But! Finally fixed in recent versions: - # http://sourceware.org/ml/libc-alpha/2012-05/msg01865.html - if ! version_is_at_least 2.16 ; then - echo 'int main(){}' > "${T}"/gcc_eh_test.c - if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then - sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh" - fi - fi - - cd "${WORKDIR}" - find . -type f '(' -size 0 -o -name "*.orig" ')' -delete - find . -name configure -exec touch {} + - - # Fix permissions on some of the scripts. - chmod u+x "${S}"/scripts/*.sh -} diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit deleted file mode 100644 index fc5b950..0000000 --- a/sys-libs/glibc/files/eblits/src_test.eblit +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -glibc_src_test() { - cd "$(builddir $1)" - nonfatal emake -j1 check && return 0 - einfo "make check failed - re-running with --keep-going to get the rest of the results" - nonfatal emake -j1 -k check - ewarn "make check failed for ${ABI}-${CTARGET}-$1" - return 1 -} - -toolchain-glibc_src_test() { - local ret=0 t - for t in linuxthreads nptl ; do - if want_${t} ; then - glibc_src_test ${t} - : $(( ret |= $? )) - fi - done - return ${ret} -} - -eblit-glibc-src_test() { - # Give tests more time to complete. - export TIMEOUTFACTOR=5 - - foreach_abi toolchain-glibc_src_test || die "tests failed" -} diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit deleted file mode 100644 index 8d4c740..0000000 --- a/sys-libs/glibc/files/eblits/src_unpack.eblit +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -[[ ${EAPI:-0} == [01] ]] && source "${FILESDIR}/eblits/src_prepare.eblit" - -int_to_KV() { - local version=$1 major minor micro - major=$((version / 65536)) - minor=$(((version % 65536) / 256)) - micro=$((version % 256)) - echo ${major}.${minor}.${micro} -} - -eend_KV() { - [[ $(KV_to_int $1) -ge $(KV_to_int $2) ]] - eend $? -} - -get_kheader_version() { - printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \ - $(tc-getCPP ${CTARGET}) -I "${EPREFIX}/$(alt_build_headers)" - | \ - tail -n 1 -} - -check_nptl_support() { - # don't care about the compiler here as we arent using it - just_headers && return - - local run_kv build_kv want_kv - run_kv=$(int_to_KV $(get_KV)) - build_kv=$(int_to_KV $(get_kheader_version)) - want_kv=${NPTL_KERN_VER} - - ebegin "Checking gcc for __thread support" - if ! eend $(want__thread ; echo $?) ; then - echo - eerror "Could not find a gcc that supports the __thread directive!" - eerror "Please update your binutils/gcc and try again." - die "No __thread support in gcc!" - fi - - if ! is_crosscompile && ! tc-is-cross-compiler ; then - # Building fails on an non-supporting kernel - ebegin "Checking kernel version (${run_kv} >= ${want_kv})" - if ! eend_KV ${run_kv} ${want_kv} ; then - echo - eerror "You need a kernel of at least ${want_kv} for NPTL support!" - die "Kernel version too low!" - fi - fi - - ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})" - if ! eend_KV ${build_kv} ${want_kv} ; then - echo - eerror "You need linux-headers of at least ${want_kv} for NPTL support!" - die "linux-headers version too low!" - fi -} - -unpack_pkg() { - local a=${PN} - [[ -n ${SNAP_VER} ]] && a="${a}-${RELEASE_VER}" - [[ -n $1 ]] && a="${a}-$1" - if [[ -n ${SNAP_VER} ]] ; then - a="${a}-${SNAP_VER}" - else - if [[ -n $2 ]] ; then - a="${a}-$2" - else - a="${a}-${RELEASE_VER}" - fi - fi - if has ${a}.tar.xz ${A} ; then - unpacker ${a}.tar.xz - else - unpack ${a}.tar.bz2 - fi - [[ -n $1 ]] && { mv ${a} $1 || die ; } -} - -toolchain-glibc_src_unpack() { - # Check NPTL support _before_ we unpack things to save some time - want_nptl && check_nptl_support - - if [[ -n ${EGIT_REPO_URIS} ]] ; then - local i d - for ((i=0; i<${#EGIT_REPO_URIS[@]}; ++i)) ; do - EGIT_REPO_URI=${EGIT_REPO_URIS[$i]} - EGIT_SOURCEDIR=${EGIT_SOURCEDIRS[$i]} - git-2_src_unpack - done - else - unpack_pkg - fi - - cd "${S}" - touch locale/C-translit.h #185476 #218003 - [[ -n ${LT_VER} ]] && unpack_pkg linuxthreads ${LT_VER} - [[ -n ${PORTS_VER} ]] && unpack_pkg ports ${PORTS_VER} - [[ -n ${LIBIDN_VER} ]] && unpack_pkg libidn - - if [[ -n ${PATCH_VER} ]] ; then - cd "${WORKDIR}" - unpack glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 - # pull out all the addons - local d - for d in extra/*/configure ; do - d=${d%/configure} - [[ -d ${S}/${d} ]] && die "${d} already exists in \${S}" - mv "${d}" "${S}" || die "moving ${d} failed" - done - fi -} - -eblit-glibc-src_unpack() { - setup_env - - toolchain-glibc_src_unpack - [[ ${EAPI:-0} == [01] ]] && cd "${S}" && eblit-glibc-src_prepare -} diff --git a/sys-libs/glibc/files/nscd b/sys-libs/glibc/files/nscd deleted file mode 100644 index b102de0..0000000 --- a/sys-libs/glibc/files/nscd +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.7 2007/02/23 12:09:39 uberlord Exp $ - -depend() { - use dns ldap net slapd -} - -checkconfig() { - if [ ! -d /var/run/nscd ] ; then - mkdir -p /var/run/nscd - chmod 755 /var/run/nscd - fi - if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then - echo "" - ewarn "nscd run dir is not world readable, you should reset the perms:" - ewarn "chmod 755 /var/run/nscd" - ewarn "chmod a+rw /var/run/nscd/socket" - echo "" - ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd" - echo "" - fi -} - -start() { - checkconfig - - ebegin "Starting Name Service Cache Daemon" - local secure=`while read curline ; do - table=${curline%:*} - entries=${curline##$table:} - table=${table%%[^a-z]*} - case $table in - passwd*|group*|hosts) - for entry in $entries ; do - case $entry in - nisplus*) - /usr/sbin/nscd_nischeck $table || \ - /echo "-S $table,yes" - ;; - esac - done - ;; - esac - done < /etc/nsswitch.conf` - local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)" - mkdir -p "$(dirname ${pidfile})" - save_options pidfile "${pidfile}" - start-stop-daemon --start --quiet \ - --exec /usr/sbin/nscd --pidfile "${pidfile}" \ - -- $secure - eend $? -} - -stop() { - local pidfile="$(get_options pidfile)" - [ -n "${pidfile}" ] && pidfile="--pidfile ${pidfile}" - ebegin "Shutting down Name Service Cache Daemon" - start-stop-daemon --stop --quiet --exec /usr/sbin/nscd ${pidfile} - eend $? -} - -# vim:ts=4 diff --git a/sys-libs/glibc/files/nscd.service b/sys-libs/glibc/files/nscd.service deleted file mode 100644 index 25a3b1d..0000000 --- a/sys-libs/glibc/files/nscd.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Name Service Cache Daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/nscd -F -ExecStop=/usr/sbin/nscd --shutdown -ExecReload=/usr/sbin/nscd -i passwd -ExecReload=/usr/sbin/nscd -i group -ExecReload=/usr/sbin/nscd -i hosts -ExecReload=/usr/sbin/nscd -i services -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/sys-libs/glibc/files/nscd.tmpfilesd b/sys-libs/glibc/files/nscd.tmpfilesd deleted file mode 100644 index 52edbba..0000000 --- a/sys-libs/glibc/files/nscd.tmpfilesd +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration to create /run/nscd directory -# Used as part of systemd's tmpfiles - -d /run/nscd 0755 root root diff --git a/sys-libs/glibc/files/nsswitch.conf b/sys-libs/glibc/files/nsswitch.conf deleted file mode 100644 index eb16961..0000000 --- a/sys-libs/glibc/files/nsswitch.conf +++ /dev/null @@ -1,24 +0,0 @@ -# /etc/nsswitch.conf: -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nsswitch.conf,v 1.1 2005/05/17 00:52:41 vapier Exp $ - -passwd: compat -shadow: compat -group: compat - -# passwd: db files nis -# shadow: db files nis -# group: db files nis - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files diff --git a/sys-libs/glibc/glibc-2.15-r1.ebuild b/sys-libs/glibc/glibc-2.15-r1.ebuild deleted file mode 100644 index 757f34d..0000000 --- a/sys-libs/glibc/glibc-2.15-r1.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r1.ebuild,v 1.17 2013/04/05 00:25:16 vapier Exp $ - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND inner-net" -KEYWORDS="~amd64 -hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -BRANCH_UPDATE="" -SNAP_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" ) - EGIT_SOURCEDIRS=( "${S}" "${S}/ports" ) - inherit git-2 - ;; -*_p*) - RELEASE_VER=${PV%_p*} - SNAP_VER=${PV#*_p} - ;; -*) - RELEASE_VER=${PV} - ;; -esac -LIBIDN_VER="" # it's integrated into the main tarball now -PATCH_VER="13" # Gentoo patchset -PORTS_VER=${RELEASE_VER} # version of glibc ports addon -LT_VER="" # version of linuxthreads addon -NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires -#LT_KERN_VER=${LT_KERN_VER:-"2.4.1"} # min kernel version linuxthreads requires - -IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only ${LT_VER:+glibc-compat20 nptl linuxthreads}" -[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils for as-needed -# arch: we need to make sure our binutils/gcc supports TLS -DEPEND=">=sys-devel/gcc-3.4.4 - arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) - x86? ( >=sys-devel/gcc-4.3 ) - amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) - ppc? ( >=sys-devel/gcc-4.1.0 ) - ppc64? ( >=sys-devel/gcc-4.1.0 ) - >=sys-devel/binutils-2.15.94 - ${LT_VER:+nptl? (} >=sys-kernel/linux-headers-${NPTL_KERN_VER} ${LT_VER:+)} - >=app-misc/pax-utils-0.1.10 - virtual/os-headers - !<sys-apps/sandbox-1.2.18.1-r2 - !<sys-apps/portage-2.1.2 - !<sys-devel/patch-2.6 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" -else - DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )" - RDEPEND="${RDEPEND} - vanilla? ( !sys-libs/timezone-data ) - !vanilla? ( sys-libs/timezone-data )" -fi - -SRC_URI=$( - upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 - } - gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} - } - - TARNAME=${PN} - if [[ -n ${SNAP_VER} ]] ; then - TARNAME="${PN}-${RELEASE_VER}" - [[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER} - upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2 - elif [[ -z ${EGIT_REPO_URIS} ]] ; then - upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz - fi - [[ -n ${LIBIDN_VER} ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2 - [[ -n ${PORTS_VER} ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz - [[ -n ${LT_VER} ]] && upstream_uris ${TARNAME}-linuxthreads-${LT_VER}.tar.bz2 - [[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - [[ -n ${PATCH_VER} ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 -) - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - GLIBC_PATCH_EXCLUDE+=" 1200_all_glibc-${PV}-x32.patch" -} - -eblit-src_unpack-post() { - if use hardened ; then - cd "${S}" - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch - - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ - debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ - debug/chk_fail.c || die - - if use debug ; then - # When using Hardened Gentoo stack handler, have smashes dump core for - # analysis - debug only, as core could be an information leak - # (paranoia). - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug stack handler" - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug fortify handler" - fi - - # Build nscd with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - nscd/Makefile \ - || die "Failed to ensure nscd builds with ssp-all" - fi -} - -eblit-pkg_preinst-post() { - if [[ ${CTARGET} == arm* ]] ; then - # Backwards compat support for renaming hardfp ldsos #417287 - local oldso='/lib/ld-linux.so.3' - local nldso='/lib/ld-linux-armhf.so.3' - if [[ -e ${D}${nldso} ]] ; then - if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then - ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." - ewarn "Please rebuild all packages using this old ldso as compat" - ewarn "support will be dropped in the future." - ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" - fi - fi - fi -} diff --git a/sys-libs/glibc/glibc-2.15-r2.ebuild b/sys-libs/glibc/glibc-2.15-r2.ebuild deleted file mode 100644 index 2d106b9..0000000 --- a/sys-libs/glibc/glibc-2.15-r2.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r2.ebuild,v 1.30 2013/04/05 00:25:16 vapier Exp $ - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND inner-net" -KEYWORDS="alpha amd64 arm -hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -BRANCH_UPDATE="" -SNAP_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" ) - EGIT_SOURCEDIRS=( "${S}" "${S}/ports" ) - inherit git-2 - ;; -*_p*) - RELEASE_VER=${PV%_p*} - SNAP_VER=${PV#*_p} - ;; -*) - RELEASE_VER=${PV} - ;; -esac -LIBIDN_VER="" # it's integrated into the main tarball now -PATCH_VER="21" # Gentoo patchset -PORTS_VER=${RELEASE_VER} # version of glibc ports addon -NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only" -[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils for as-needed -# arch: we need to make sure our binutils/gcc supports TLS -DEPEND=">=sys-devel/gcc-3.4.4 - arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) - x86? ( >=sys-devel/gcc-4.3 ) - amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) - ppc? ( >=sys-devel/gcc-4.1.0 ) - ppc64? ( >=sys-devel/gcc-4.1.0 ) - >=sys-devel/binutils-2.15.94 - >=app-misc/pax-utils-0.1.10 - virtual/os-headers - !<sys-apps/sandbox-1.2.18.1-r2 - !<sys-apps/portage-2.1.2 - !<sys-devel/patch-2.6 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" -else - DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )" - RDEPEND="${RDEPEND} - vanilla? ( !sys-libs/timezone-data ) - !vanilla? ( sys-libs/timezone-data )" -fi - -SRC_URI=$( - upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 - } - gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} - } - - TARNAME=${PN} - if [[ -n ${SNAP_VER} ]] ; then - TARNAME="${PN}-${RELEASE_VER}" - [[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER} - upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2 - elif [[ -z ${EGIT_REPO_URIS} ]] ; then - upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz - fi - [[ -n ${LIBIDN_VER} ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2 - [[ -n ${PORTS_VER} ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz - [[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - [[ -n ${PATCH_VER} ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 -) - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-post() { - if use hardened ; then - cd "${S}" - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch - - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ - debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ - debug/chk_fail.c || die - - if use debug ; then - # When using Hardened Gentoo stack handler, have smashes dump core for - # analysis - debug only, as core could be an information leak - # (paranoia). - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug stack handler" - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug fortify handler" - fi - - # Build nscd with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - nscd/Makefile \ - || die "Failed to ensure nscd builds with ssp-all" - fi -} - -eblit-pkg_preinst-post() { - if [[ ${CTARGET} == arm* ]] ; then - # Backwards compat support for renaming hardfp ldsos #417287 - local oldso='/lib/ld-linux.so.3' - local nldso='/lib/ld-linux-armhf.so.3' - if [[ -e ${D}${nldso} ]] ; then - if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then - ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." - ewarn "Please rebuild all packages using this old ldso as compat" - ewarn "support will be dropped in the future." - ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" - fi - fi - fi -} diff --git a/sys-libs/glibc/glibc-2.15-r3.ebuild b/sys-libs/glibc/glibc-2.15-r3.ebuild deleted file mode 100644 index fb2b257..0000000 --- a/sys-libs/glibc/glibc-2.15-r3.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.15-r3.ebuild,v 1.14 2013/05/09 04:41:16 vapier Exp $ - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND inner-net" -KEYWORDS="alpha amd64 arm -hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -BRANCH_UPDATE="" -SNAP_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS=( "git://sourceware.org/git/glibc.git" "git://sourceware.org/git/glibc-ports.git" ) - EGIT_SOURCEDIRS=( "${S}" "${S}/ports" ) - inherit git-2 - ;; -*_p*) - RELEASE_VER=${PV%_p*} - SNAP_VER=${PV#*_p} - ;; -*) - RELEASE_VER=${PV} - ;; -esac -LIBIDN_VER="" # it's integrated into the main tarball now -PATCH_VER="23" # Gentoo patchset -PORTS_VER=${RELEASE_VER} # version of glibc ports addon -NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.9"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib selinux profile vanilla crosscompile_opts_headers-only" -[[ -n ${RELEASE_VER} ]] && S=${WORKDIR}/glibc-${RELEASE_VER}${SNAP_VER:+-${SNAP_VER}} - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.9/2.6.20} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils for as-needed -# arch: we need to make sure our binutils/gcc supports TLS -DEPEND=">=sys-devel/gcc-3.4.4 - arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 ) - x86? ( >=sys-devel/gcc-4.3 ) - amd64? ( >=sys-devel/binutils-2.19 >=sys-devel/gcc-4.3 ) - ppc? ( >=sys-devel/gcc-4.1.0 ) - ppc64? ( >=sys-devel/gcc-4.1.0 ) - >=sys-devel/binutils-2.15.94 - >=app-misc/pax-utils-0.1.10 - virtual/os-headers - !<sys-apps/sandbox-1.2.18.1-r2 - !<sys-apps/portage-2.1.2 - !<sys-devel/patch-2.6 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND="${DEPEND} !crosscompile_opts_headers-only? ( ${CATEGORY}/gcc )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND="${DEPEND} ${CATEGORY}/linux-headers" -else - DEPEND="${DEPEND} !vanilla? ( >=sys-libs/timezone-data-2007c )" - RDEPEND="${RDEPEND} - vanilla? ( !sys-libs/timezone-data ) - !vanilla? ( sys-libs/timezone-data )" -fi - -SRC_URI=$( - upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 - } - gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} - } - - TARNAME=${PN} - if [[ -n ${SNAP_VER} ]] ; then - TARNAME="${PN}-${RELEASE_VER}" - [[ -n ${PORTS_VER} ]] && PORTS_VER=${SNAP_VER} - upstream_uris ${TARNAME}-${SNAP_VER}.tar.bz2 - elif [[ -z ${EGIT_REPO_URIS} ]] ; then - upstream_uris ${TARNAME}-${RELEASE_VER}.tar.xz - fi - [[ -n ${LIBIDN_VER} ]] && upstream_uris glibc-libidn-${LIBIDN_VER}.tar.bz2 - [[ -n ${PORTS_VER} ]] && upstream_uris ${TARNAME}-ports-${PORTS_VER}.tar.xz - [[ -n ${BRANCH_UPDATE} ]] && gentoo_uris glibc-${RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2 - [[ -n ${PATCH_VER} ]] && gentoo_uris glibc-${RELEASE_VER}-patches-${PATCH_VER}.tar.bz2 -) - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-post() { - epatch "${FILESDIR}"/2.15/glibc-2.15-localstatedir-backport.patch - - if use hardened ; then - cd "${S}" - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.12/glibc-2.12-hardened-pie.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch - - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ - debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ - debug/chk_fail.c || die - - if use debug ; then - # When using Hardened Gentoo stack handler, have smashes dump core for - # analysis - debug only, as core could be an information leak - # (paranoia). - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug stack handler" - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug fortify handler" - fi - - # Build nscd with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - nscd/Makefile \ - || die "Failed to ensure nscd builds with ssp-all" - fi -} - -eblit-pkg_preinst-post() { - if [[ ${CTARGET} == arm* ]] ; then - # Backwards compat support for renaming hardfp ldsos #417287 - local oldso='/lib/ld-linux.so.3' - local nldso='/lib/ld-linux-armhf.so.3' - if [[ -e ${D}${nldso} ]] ; then - if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then - ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." - ewarn "Please rebuild all packages using this old ldso as compat" - ewarn "support will be dropped in the future." - ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" - fi - fi - fi -} diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild deleted file mode 100644 index 40b2f6c..0000000 --- a/sys-libs/glibc/glibc-2.17.ebuild +++ /dev/null @@ -1,228 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.16 2013/06/27 12:19:41 jer Exp $ - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -PATCH_VER="7" # Gentoo patchset -NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.20 - >=${CATEGORY}/gcc-4.3 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.20 - >=sys-devel/gcc-4.3 - virtual/os-headers - !vanilla? ( >=sys-libs/timezone-data-2012c )" - RDEPEND+=" - vanilla? ( !sys-libs/timezone-data ) - !vanilla? ( sys-libs/timezone-data )" -fi - -SRC_URI=$( - upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 - } - gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} - } - - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - GLIBC_PATCH_EXCLUDE+=" 6600_mips_librt-mips.patch" #456912 -} - -eblit-src_unpack-post() { - if use hardened ; then - cd "${S}" - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch - - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ - debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ - debug/chk_fail.c || die - - if use debug ; then - # When using Hardened Gentoo stack handler, have smashes dump core for - # analysis - debug only, as core could be an information leak - # (paranoia). - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug stack handler" - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug fortify handler" - fi - - # Build nscd with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - nscd/Makefile \ - || die "Failed to ensure nscd builds with ssp-all" - fi - - # RHEL(likely CentOS and SL) 5.6 have kernels with vdso bug, - # https://bugzilla.redhat.com/show_bug.cgi?id=673616 - # we disable vdso loading in ELF handler, as suggest by Mike Frysinger - # http://article.gmane.org/gmane.comp.lib.glibc.user/1904 - # Benda Xu <heroxbd@gentoo.org> (3 Jul, 2013) - elog "Your kernel is known to have vdso bug, disabling this feature" - epatch "${FILESDIR}"/2.17/vdso-disable.patch - - epatch "${FILESDIR}"/2.17/locale-gen_prefix.patch - eprefixify "${WORKDIR}"/extra/locale/locale-gen - - cd "${S}" - epatch "${FILESDIR}"/2.17/glibc-2.17-runtime-prefix.patch - eprefixify glibc-compat/nss_{compat/compat-{grp,{,s}pwd},files/files-netgrp}.c \ - nis/nss_compat/compat-{grp,initgroups,{,s}pwd}.c \ - nss/{db-Makefile,{bug-erange,nss_files/files-init{,groups}}.c} \ - resolv/{netdb,resolv}.h sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} \ - libio/iopopen.c - epatch "${FILESDIR}"/${PV}/${P}-shadow-prefix.patch -} - -eblit-pkg_preinst-post() { - if [[ ${CTARGET} == arm* ]] ; then - # Backwards compat support for renaming hardfp ldsos #417287 - local oldso='/lib/ld-linux.so.3' - local nldso='/lib/ld-linux-armhf.so.3' - if [[ -e ${D}${nldso} ]] ; then - if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then - ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." - ewarn "Please rebuild all packages using this old ldso as compat" - ewarn "support will be dropped in the future." - ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" - fi - fi - fi -} diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild deleted file mode 100644 index 8758b70..0000000 --- a/sys-libs/glibc/glibc-2.19-r1.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19-r1.ebuild,v 1.11 2014/10/26 08:05:50 vapier Exp $ - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="3" # Gentoo patchset -NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only rap" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.20 - >=${CATEGORY}/gcc-4.3 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.20 - >=sys-devel/gcc-4.3 - virtual/os-headers - !vanilla? ( >=sys-libs/timezone-data-2012c )" - RDEPEND+=" - vanilla? ( !sys-libs/timezone-data ) - !vanilla? ( sys-libs/timezone-data )" -fi - -upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 -} -gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} -SRC_URI=$( - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 -} - -eblit-src_unpack-post() { - eprefixify extra/locale/locale-gen - - cd "${S}" - - if use hardened ; then - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch - epatch "${FILESDIR}"/2.19/glibc-2.19-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.18/glibc-2.18-hardened-inittls-nosysenter.patch - - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-stack_chk_fail.c \ - debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.18/glibc-2.18-gentoo-chk_fail.c \ - debug/chk_fail.c || die - - if use debug ; then - # When using Hardened Gentoo stack handler, have smashes dump core for - # analysis - debug only, as core could be an information leak - # (paranoia). - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug stack handler" - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug fortify handler" - fi - - # Build nscd with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - nscd/Makefile \ - || die "Failed to ensure nscd builds with ssp-all" - fi - - if use rap; then - if type -p lsb_release > lsb-loc; then - local lsb_id=$(lsb_release -i) - local lsb_rel=$(lsb_release -r) - fi - - if [[ ${lsb_id} == *CentOS ]] || [[ ${lsb_id} == *RedHat* ]]; then - if [[ ${lsb_rel} == *5.6 ]]; then - elog "Your kernel is known to have vdso bug, disabling this feature" - elog "https://bugzilla.redhat.com/show_bug.cgi?id=678613" - epatch "${FILESDIR}"/${PV}/${P}-vdso-disable.patch - fi - fi - fi -} - -eblit-pkg_preinst-post() { - if [[ ${CTARGET} == arm* ]] ; then - # Backwards compat support for renaming hardfp ldsos #417287 - local oldso='/lib/ld-linux.so.3' - local nldso='/lib/ld-linux-armhf.so.3' - if [[ -e ${D}${nldso} ]] ; then - if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then - ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." - ewarn "Please rebuild all packages using this old ldso as compat" - ewarn "support will be dropped in the future." - ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" - fi - fi - fi -} diff --git a/sys-libs/glibc/glibc-2.20-r1.ebuild b/sys-libs/glibc/glibc-2.20-r1.ebuild deleted file mode 100644 index 967d32c..0000000 --- a/sys-libs/glibc/glibc-2.20-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r1.ebuild,v 1.2 2014/12/31 08:22:30 vapier Exp $ - -EAPI="4" - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="3" # Gentoo patchset -: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only rap" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - sys-apps/gentoo-functions - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.24 - >=${CATEGORY}/gcc-4.4 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.24 - >=sys-devel/gcc-4.4 - virtual/os-headers" - RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" - PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" -fi - -upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 -} -gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~blueness/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} -SRC_URI=$( - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_prepare() { eblit-run src_prepare ; } -src_configure() { eblit-run src_configure ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 -} - -eblit-src_prepare-post() { - eprefixify extra/locale/locale-gen - - cd "${S}" - - if use hardened ; then - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch - epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch - - # We don't enable these for non-hardened as the output is very terse -- - # it only states that a crash happened. The default upstream behavior - # includes backtraces and symbols. - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die - - if use debug ; then - # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile || die - fi - - # Build various bits with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - */Makefile || die - fi - - if use rap; then - if type -p lsb_release > lsb-loc; then - local lsb_id=$(lsb_release -i) - local lsb_rel=$(lsb_release -r) - fi - - epatch "${FILESDIR}"/2.17/${PN}-2.17-runtime-prefix.patch - eprefixify sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} \ - libio/iopopen.c - epatch "${FILESDIR}"/${PV}/${P}-configurable-paths.patch - fi -} diff --git a/sys-libs/glibc/glibc-2.20.ebuild b/sys-libs/glibc/glibc-2.20.ebuild deleted file mode 100644 index 182bdff..0000000 --- a/sys-libs/glibc/glibc-2.20.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20.ebuild,v 1.6 2014/11/11 02:08:50 vapier Exp $ - -EAPI="4" - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="1" # Gentoo patchset -: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only rap" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.24 - >=${CATEGORY}/gcc-4.4 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.24 - >=sys-devel/gcc-4.4 - virtual/os-headers" - RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" - PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" -fi - -upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 -} -gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} -SRC_URI=$( - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_prepare() { eblit-run src_prepare ; } -src_configure() { eblit-run src_configure ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 -} - -eblit-src_prepare-post() { - eprefixify extra/locale/locale-gen - - cd "${S}" - - if use hardened ; then - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch - epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch - - # We don't enable these for non-hardened as the output is very terse -- - # it only states that a crash happened. The default upstream behavior - # includes backtraces and symbols. - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die - - if use debug ; then - # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile || die - fi - - # Build various bits with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - */Makefile || die - fi - - if use rap; then - if type -p lsb_release > lsb-loc; then - local lsb_id=$(lsb_release -i) - local lsb_rel=$(lsb_release -r) - fi - - epatch "${FILESDIR}"/2.17/${PN}-2.17-runtime-prefix.patch - eprefixify sysdeps/{{generic,unix/sysv/linux}/paths.h,posix/system.c} \ - libio/iopopen.c - epatch "${FILESDIR}"/${PV}/${P}-configurable-paths.patch - fi -} diff --git a/sys-libs/glibc/glibc-2.23-r2.ebuild b/sys-libs/glibc/glibc-2.23-r2.ebuild deleted file mode 100644 index 14b66ad..0000000 --- a/sys-libs/glibc/glibc-2.23-r2.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing prefix - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="https://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -GCC_BOOTSTRAP_VER="4.7.3-r1" -PATCH_VER="4" # Gentoo patchset -: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires - -IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -COMMON_DEPEND=" - nscd? ( selinux? ( - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap ) - ) ) - suid? ( caps? ( sys-libs/libcap ) ) - selinux? ( sys-libs/libselinux ) -" -DEPEND="${COMMON_DEPEND} - >=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2" -RDEPEND="${COMMON_DEPEND} - !sys-kernel/ps3-sources - sys-apps/gentoo-functions - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.24 - >=${CATEGORY}/gcc-4.7 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.24 - >=sys-devel/gcc-4.7 - virtual/os-headers" - RDEPEND+=" vanilla? ( !sys-libs/timezone-data )" - PDEPEND+=" !vanilla? ( sys-libs/timezone-data )" -fi - -upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 -} -gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/https://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} -} -SRC_URI=$( - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) -SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}" - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_prepare() { eblit-run src_prepare ; } -src_configure() { eblit-run src_configure ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in pretend setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-pre() { - [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 - # Bug 558636 we don't apply the pie works around for 2.22. It shoud have the support. #558636 - GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch" - GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch" - GLIBC_PATCH_EXCLUDE+=" 00_all_0009-sys-types.h-drop-sys-sysmacros.h-include.patch" -} - -eblit-src_prepare-post() { - eprefixify extra/locale/locale-gen - - cd "${S}" - - epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838 - - if use hardened ; then - # We don't enable these for non-hardened as the output is very terse -- - # it only states that a crash happened. The default upstream behavior - # includes backtraces and symbols. - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die - cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die - - if use debug ; then - # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested. - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile || die - fi - - # Build various bits with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - */Makefile || die - fi - - case $(gcc-fullversion) in - 4.8.[0-3]|4.9.0) - eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile" - eerror "glibc. See https://bugs.gentoo.org/547420 for details." - die "need to switch compilers #547420" - ;; - esac -} diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild deleted file mode 100644 index 9d19150..0000000 --- a/sys-libs/glibc/glibc-9999.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.21 2013/04/10 16:40:27 vapier Exp $ - -inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing - -DESCRIPTION="GNU libc6 (also called glibc2) C library" -HOMEPAGE="http://www.gnu.org/software/libc/libc.html" - -LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -#KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -RESTRICT="strip" # strip ourself #46186 -EMULTILIB_PKG="true" - -# Configuration variables -RELEASE_VER="" -case ${PV} in -9999*) - EGIT_REPO_URIS="git://sourceware.org/git/glibc.git" - EGIT_SOURCEDIRS="${S}" - inherit git-2 - ;; -*) - RELEASE_VER=${PV} - ;; -esac -PATCH_VER="" # Gentoo patchset -NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"} # min kernel version nptl requires - -IUSE="debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only" - -# Here's how the cross-compile logic breaks down ... -# CTARGET - machine that will target the binaries -# CHOST - machine that will host the binaries -# CBUILD - machine that will build the binaries -# If CTARGET != CHOST, it means you want a libc for cross-compiling. -# If CHOST != CBUILD, it means you want to cross-compile the libc. -# CBUILD = CHOST = CTARGET - native build/install -# CBUILD != (CHOST = CTARGET) - cross-compile a native build -# (CBUILD = CHOST) != CTARGET - libc for cross-compiler -# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler -# For install paths: -# CHOST = CTARGET - install into / -# CHOST != CTARGET - install into /usr/CTARGET/ - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY} == cross-* ]] ; then - export CTARGET=${CATEGORY#cross-} - fi -fi - -[[ ${CTARGET} == hppa* ]] && NPTL_KERN_VER=${NPTL_KERN_VER/2.6.16/2.6.20} - -is_crosscompile() { - [[ ${CHOST} != ${CTARGET} ]] -} - -# Why SLOT 2.2 you ask yourself while sippin your tea ? -# Everyone knows 2.2 > 0, duh. -SLOT="2.2" - -# General: We need a new-enough binutils/gcc to match upstream baseline. -# arch: we need to make sure our binutils/gcc supports TLS. -DEPEND=">=app-misc/pax-utils-0.1.10 - !<sys-apps/sandbox-1.6 - !<sys-apps/portage-2.1.2 - selinux? ( sys-libs/libselinux )" -RDEPEND="!sys-kernel/ps3-sources - selinux? ( sys-libs/libselinux ) - !sys-libs/nss-db" - -if [[ ${CATEGORY} == cross-* ]] ; then - DEPEND+=" !crosscompile_opts_headers-only? ( - >=${CATEGORY}/binutils-2.20 - >=${CATEGORY}/gcc-4.3 - )" - [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" -else - DEPEND+=" - >=sys-devel/binutils-2.20 - >=sys-devel/gcc-4.3 - virtual/os-headers - !vanilla? ( >=sys-libs/timezone-data-2012c )" - RDEPEND+=" - vanilla? ( !sys-libs/timezone-data ) - !vanilla? ( sys-libs/timezone-data )" -fi - -SRC_URI=$( - upstream_uris() { - echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1 - } - gentoo_uris() { - local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI" - devspace=${devspace//HTTP/http://dev.gentoo.org/} - echo mirror://gentoo/$1 ${devspace//URI/$1} - } - - [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz - [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2 -) - -# eblit-include [--skip] <function> [version] -eblit-include() { - local skipable=false - [[ $1 == "--skip" ]] && skipable=true && shift - [[ $1 == pkg_* ]] && skipable=true - - local e v func=$1 ver=$2 - [[ -z ${func} ]] && die "Usage: eblit-include <function> [version]" - for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do - e="${FILESDIR}/eblits/${func}${v}.eblit" - if [[ -e ${e} ]] ; then - source "${e}" - return 0 - fi - done - ${skipable} && return 0 - die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/" -} - -# eblit-run-maybe <function> -# run the specified function if it is defined -eblit-run-maybe() { - [[ $(type -t "$@") == "function" ]] && "$@" -} - -# eblit-run <function> [version] -# aka: src_unpack() { eblit-run src_unpack ; } -eblit-run() { - eblit-include --skip common "${*:2}" - eblit-include "$@" - eblit-run-maybe eblit-$1-pre - eblit-${PN}-$1 - eblit-run-maybe eblit-$1-post -} - -src_unpack() { eblit-run src_unpack ; } -src_compile() { eblit-run src_compile ; } -src_test() { eblit-run src_test ; } -src_install() { eblit-run src_install ; } - -# FILESDIR might not be available during binpkg install -for x in setup {pre,post}inst ; do - e="${FILESDIR}/eblits/pkg_${x}.eblit" - if [[ -e ${e} ]] ; then - . "${e}" - eval "pkg_${x}() { eblit-run pkg_${x} ; }" - fi -done - -eblit-src_unpack-post() { - if use hardened ; then - cd "${S}" - einfo "Patching to get working PIE binaries on PIE (hardened) platforms" - gcc-specs-pie && epatch "${FILESDIR}"/2.16/glibc-2.16-hardened-pie.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-configure-picdefault.patch - epatch "${FILESDIR}"/2.10/glibc-2.10-hardened-inittls-nosysenter.patch - - einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler" - cp -f "${FILESDIR}"/2.6/glibc-2.6-gentoo-stack_chk_fail.c \ - debug/stack_chk_fail.c || die - cp -f "${FILESDIR}"/2.10/glibc-2.10-gentoo-chk_fail.c \ - debug/chk_fail.c || die - - if use debug ; then - # When using Hardened Gentoo stack handler, have smashes dump core for - # analysis - debug only, as core could be an information leak - # (paranoia). - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug stack handler" - sed -i \ - -e '/^CFLAGS-backtrace.c/ iCFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \ - debug/Makefile \ - || die "Failed to modify debug/Makefile for debug fortify handler" - fi - - # Build nscd with ssp-all - sed -i \ - -e 's:-fstack-protector$:-fstack-protector-all:' \ - nscd/Makefile \ - || die "Failed to ensure nscd builds with ssp-all" - fi -} - -eblit-pkg_preinst-post() { - if [[ ${CTARGET} == arm* ]] ; then - # Backwards compat support for renaming hardfp ldsos #417287 - local oldso='/lib/ld-linux.so.3' - local nldso='/lib/ld-linux-armhf.so.3' - if [[ -e ${D}${nldso} ]] ; then - if scanelf -qRyi "${ROOT}$(alt_prefix)"/*bin/ | grep -s "^${oldso}" ; then - ewarn "Symlinking old ldso (${oldso}) to new ldso (${nldso})." - ewarn "Please rebuild all packages using this old ldso as compat" - ewarn "support will be dropped in the future." - ln -s "${nldso##*/}" "${D}$(alt_prefix)${oldso}" - fi - fi - fi -} diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml deleted file mode 100644 index f1f3fd9..0000000 --- a/sys-libs/glibc/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> -<herd>toolchain</herd> -<use> - <flag name='gd'>build memusage and memusagestat tools</flag> - <flag name='nscd'>Build, and enable support for, the Name Service Cache Daemon</flag> - <flag name='suid'>Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5</flag> - <flag name='systemtap'>enable systemtap static probe points</flag> -</use> -</pkgmetadata> diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest deleted file mode 100644 index b26f739..0000000 --- a/sys-libs/uclibc/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX uclibc-0.9.33_microblaze-any-endian.patch 995 RMD160 c705e4f0d34cfea0a174a917c9332318a7f48938 SHA1 9ea78b2d64aa7d0add78e950ea871deb74af93ed SHA256 36e725f050462ae79547360965425af5058ed1eb4a717cae18960df85759395b -DIST uClibc-0.9.33.tar.bz2 2827333 RMD160 ad42ad147f156ea0ebcdd6afb2e1830b5fd2b347 SHA1 89d5138d6eb785852bb3838f30edb424a711b45d SHA256 4aa4967132329a72e2cc9ea99718a06fe35453af2f53a941771237fe4822f7ad -EBUILD uclibc-0.9.33.ebuild 11592 RMD160 59db17067d853df2f5bd3476f35bf831ca81d46d SHA1 b40cb5aa8a665be89cead522b5ed325db014f04d SHA256 81c42f31df5168103595ee683d2d139e10fbf1a2f8974f35e43ee207fa7c7dcf diff --git a/sys-libs/uclibc/files/uclibc-0.9.33_microblaze-any-endian.patch b/sys-libs/uclibc/files/uclibc-0.9.33_microblaze-any-endian.patch deleted file mode 100644 index b90ec9a..0000000 --- a/sys-libs/uclibc/files/uclibc-0.9.33_microblaze-any-endian.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/extra/Configs/Config.microblaze b/extra/Configs/Config.microblaze -index 2dfd4a7..a97ddc3 100644 ---- a/extra/Configs/Config.microblaze -+++ b/extra/Configs/Config.microblaze -@@ -6,3 +6,8 @@ - config TARGET_ARCH - string - default "microblaze" -+ -+config FORCE_OPTIONS_FOR_ARCH -+ bool -+ default y -+ select ARCH_ANY_ENDIAN -diff --git a/libc/sysdeps/linux/microblaze/bits/endian.h b/libc/sysdeps/linux/microblaze/bits/endian.h -index 56fcd5d..6945ba5 100644 ---- a/libc/sysdeps/linux/microblaze/bits/endian.h -+++ b/libc/sysdeps/linux/microblaze/bits/endian.h -@@ -17,10 +17,9 @@ - # error "Never use <bits/endian.h> directly; include <endian.h> instead." - #endif - --/* Note: Toolchain supplies _BIG_ENDIAN or _LITTLE_ENDIAN */ --#if defined(_BIG_ENDIAN) -+#if defined(__ARCH_BIG_ENDIAN__) - # define __BYTE_ORDER __BIG_ENDIAN --#elif defined(_LITTLE_ENDIAN) -+#elif defined(__ARCH_LITTLE_ENDIAN__) - # define __BYTE_ORDER __LITTLE_ENDIAN - #else - # error "Endianness is unknown" diff --git a/sys-libs/uclibc/uclibc-0.9.33.ebuild b/sys-libs/uclibc/uclibc-0.9.33.ebuild deleted file mode 100644 index 77e3ed0..0000000 --- a/sys-libs/uclibc/uclibc-0.9.33.ebuild +++ /dev/null @@ -1,374 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30.1.ebuild,v 1.9 2011/04/20 18:10:38 ulm Exp $ - -#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" -#inherit subversion -inherit eutils flag-o-matic toolchain-funcs savedconfig - -export CBUILD=${CBUILD:-${CHOST}} -export CTARGET=${CTARGET:-${CHOST}} -if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} - fi -fi -# Handle the case where we want uclibc on glibc ... -if [[ ${CTARGET} == ${CHOST} ]] && [[ ${CHOST} != *-uclibc* ]] ; then - export UCLIBC_AND_GLIBC="sitting in a tree" - export CTARGET=${CHOST%%-*}-pc-linux-uclibc -fi - -SVN_VER="" -#PATCH_VER="1.0" -DESCRIPTION="C library for developing embedded Linux systems" -HOMEPAGE="http://www.uclibc.org/" -SRC_URI="http://uclibc.org/downloads/uClibc-${PV}.tar.bz2" - -[[ -z ${SVN_VER} ]] || \ - SRC_URI="${SRC_URI} mirror://gentoo/uClibc-${PV}-svn-update-${SVN_VER}.patch.bz2" -[[ -z ${PATCH_VER} ]] || \ - SRC_URI="${SRC_URI} mirror://gentoo/uClibc-${PV}-patches-${PATCH_VER}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86" -IUSE="build uclibc-compat debug hardened ssp ipv6 minimal wordexp crosscompile_opts_headers-only" -RESTRICT="strip" - -RDEPEND="" -if [[ -n $CTARGET && ${CTARGET} != ${CHOST} ]]; then - DEPEND="" - SLOT="${CTARGET}" -else - DEPEND="virtual/os-headers app-misc/pax-utils" - SLOT="0" -fi - -S=${WORKDIR}/uClibc-${PV} - -alt_build_kprefix() { - if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] \ - || [[ -n ${UCLIBC_AND_GLIBC} ]] - then - echo ${EPREFIX}/usr/include - else - echo ${EPREFIX}/usr/${CTARGET}/usr/include - fi -} - -just_headers() { - use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]] -} - -uclibc_endian() { - # XXX: this wont work for a toolchain which is bi-endian, but we - # dont have any such thing at the moment, so not a big deal - touch "${T}"/endian.s - $(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o - case $(file "${T}"/endian.o) in - *" MSB "*) echo "big";; - *" LSB "*) echo "little";; - *) echo "NFC";; - esac - rm -f "${T}"/endian.{s,o} -} - -pkg_setup() { - just_headers && return 0 - has_version ${CATEGORY}/uclibc || return 0 - [[ -n ${UCLIBC_AND_GLIBC} ]] && return 0 - [[ ${ROOT} != "/" ]] && return 0 - [[ ${CATEGORY} == cross-* ]] && return 0 - -} - -PIE_STABLE="arm mips ppc x86" - -CPU_ALPHA="" -CPU_AMD64="" -CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT}}" -CPU_IA64="" -CPU_M68K="" -CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32,64}} MIPS_{N64,O32,N32}_ABI" -CPU_PPC="" -CPU_SH="SH{2,3,4,5}" -CPU_SPARC="SPARC_V{7,8,9,9B}" -CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH" -IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}" - -check_cpu_opts() { - local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])" - [[ -z ${!cpu_var} ]] && return 0 - - if [[ -z ${UCLIBC_CPU} ]] ; then - ewarn "You really should consider setting UCLIBC_CPU" - ewarn "Otherwise, the build will be generic (read: slow)." - ewarn "Available CPU options:" - UCLIBC_CPU=$(eval echo ${!cpu_var}) - echo ${UCLIBC_CPU} - case ${CTARGET} in - mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";; - sh[2345]*) export UCLIBC_CPU="SH${CTARGET:2:1}";; - i[456]86*) export UCLIBC_CPU="${CTARGET:1:1}86";; - *) export UCLIBC_CPU=${UCLIBC_CPU%% *};; - esac - else - local cpu found=0 - for cpu in $(eval echo ${!cpu_var}) ; do - [[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break - done - if [[ ${found} -eq 0 ]] ; then - ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported" - ewarn "Valid choices:" - eval echo ${!cpu_var} - die "pick a supported cpu type" - fi - fi -} - -set_opt() { - sed -i -e "/^\# $1 is not set/d" -e "/^$1=.*/d" .config - echo "$1=$2" >> .config -} - -src_unpack() { - [[ -n ${ESVN_REPO_URI} ]] \ - && subversion_src_unpack \ - || unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}_microblaze-any-endian.patch - - check_cpu_opts - - echo - einfo "Runtime Prefix: /" - einfo "Devel Prefix: /usr" - einfo "Kernel Prefix: $(alt_build_kprefix)" - einfo "CBUILD: ${CBUILD}" - einfo "CHOST: ${CHOST}" - einfo "CTARGET: ${CTARGET}" - einfo "CPU: ${UCLIBC_CPU:-default}" - einfo "ENDIAN: $(uclibc_endian)" - echo - - ########## PATCHES ########## - - [[ -n ${SVN_VER} ]] && \ - epatch "${WORKDIR}"/uClibc-${PV}-cvs-update-${SVN_VER}.patch - - if [[ -n ${PATCH_VER} ]] ; then - unpack uClibc-${PV}-patches-${PATCH_VER}.tar.bz2 - EPATCH_SUFFIX="patch" - epatch "${WORKDIR}"/patch - fi - - sed -i 's:getline:get_line:' extra/scripts/unifdef.c #277186 - - ########## CPU SELECTION ########## - - local target config_target - case $(tc-arch) in - alpha) target="alpha"; config_target="no cpu-specific options";; - amd64) target="x86_64"; config_target="no cpu-specific options";; - arm) target="arm"; config_target="GENERIC_ARM";; - ia64) target="ia64"; config_target="no cpu-specific options";; - m68k) target="m68k"; config_target="no cpu-specific options";; - microblaze) target="microblaze"; config_target="no cpu-specific options";; - mips) target="mips"; config_target="MIPS_ISA_1";; - ppc) target="powerpc"; config_target="no cpu-specific options";; - sh) target="sh"; config_target="SH4";; - sparc) target="sparc"; config_target="no cpu-specific options";; - x86) target="i386"; config_target="GENERIC_386";; - *) die "$(tc-arch) lists no defaults :/";; - esac - sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \ - extra/Configs/Config.${target} - sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak - - ########## CONFIG SETUP ########## - - make ARCH=${target} defconfig >/dev/null || die "could not config" - - for def in DO{DEBUG{,_PT},ASSERTS} SUPPORT_LD_DEBUG{,_EARLY} UCLIBC_HAS_PROFILING; do - sed -i -e "s:${def}=y:# ${def} is not set:" .config - done - if use debug ; then - set_opt SUPPORT_LD_DEBUG y - set_opt DODEBUG y - fi - - sed -i -e '/ARCH_.*_ENDIAN/d' .config - set_opt "ARCH_WANTS_$(uclibc_endian | tr [a-z] [A-Z])_ENDIAN" y - - if [[ $(tc-is-softfloat) != "no" ]] ; then - set_opt UCLIBC_HAS_FPU n - fi - - if [[ ${CTARGET/eabi} != ${CTARGET} ]] ; then - set_opt CONFIG_ARM_OABI n - set_opt CONFIG_ARM_EABI y - fi - - local moredefs="COMPAT_ATEXIT" - local compat_sym=atexit - - # We need todo this for a few months. .30 is a major upgrade. - # Don't do it from cross-compiling case though - if ! use uclibc-compat ; then - if [[ -z ${UCLIBC_AND_GLIBC} ]] && [[ -z ${UCLIBC_SCANNED_COMPAT} ]] && \ - ! just_headers && [[ ${CHOST} == ${CTARGET} ]] ; then - local fnames="" - einfo "Doing a scanelf in paths for bins containing the ${compat_sym} symbol" - fnames=$(scanelf -pyqs${compat_sym} -F%F#s) - if [[ -z ${fnames} ]] ; then - einfo "This system is clean." - einfo "To prevent the scanning of files again in the future you can export UCLIBC_SCANNED_COMPAT=1" - moredefs="" - else - ewarn "You need to remerge the packages that contain the following files before you can remerge ${P} without USE=uclibc-compat enabled." - ewarn "qfile -Cq $(echo ${fnames}) | sort | uniq" - echo - ewarn "Leaving on ${moredefs}" - fi - else - moredefs="" - fi - fi - for def in ${moredefs} MALLOC_GLIBC_COMPAT DO_C99_MATH UCLIBC_HAS_{RPC,FULL_RPC,CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC,FTW} UCLIBC_HAS_REENTRANT_RPC UCLIBC_HAS_GNU_GLOB PTHREADS_DEBUG_SUPPORT UCLIBC_HAS_TZ_FILE_READ_MANY UCLIBC_HAS_FENV UCLIBC_SUSV3_LEGACY UCLIBC_SUSV3_LEGACY_MACROS UCLIBC_HAS_PROGRAM_INVOCATION_NAME ; do - set_opt "${def}" y - done - set_opt UCLIBC_HAS_CTYPE_UNSAFE n - set_opt UCLIBC_HAS_LOCALE n - - use ipv6 && set_opt UCLIBC_HAS_IPV6 y - - use wordexp && set_opt UCLIBC_HAS_WORDEXP y - - # we need to do it independently of hardened to get ssp.c built into libc - set_opt UCLIBC_HAS_SSP y - set_opt UCLIBC_HAS_SSP_COMPAT y - set_opt UCLIBC_HAS_ARC4RANDOM y - set_opt PROPOLICE_BLOCK_ABRT n - set_opt PROPOLICE_BLOCK_SEGV y - - # arm/mips do not emit PT_GNU_STACK, but if we enable this here - # it will be emitted as RWE, ppc has to be checked, x86 needs it - # this option should be used independently of hardened - if has $(tc-arch) x86 || has $(tc-arch) ppc; then - set_opt UCLIBC_BUILD_NOEXECSTACK y - else - set_opt UCLIBC_BUILD_NOEXECSTACK n - fi - set_opt UCLIBC_BUILD_RELRO y - if use hardened ; then - if has $(tc-arch) ${PIE_STABLE} ; then - set_opt UCLIBC_BUILD_PIE y - else - set_opt UCLIBC_BUILD_PIE n - fi - set_opt UCLIBC_BUILD_NOW y - use ssp && { - set_opt SSP_QUICK_CANARY n - set_opt UCLIBC_BUILD_SSP y - } - else - set_opt UCLIBC_BUILD_PIE n - set_opt SSP_QUICK_CANARY y - set_opt UCLIBC_BUILD_SSP n - set_opt UCLIBC_BUILD_NOW n - fi - - restore_config .config - - # setup build and run paths - local cross=${CTARGET}- - type -p ${cross}ar > /dev/null || cross="" - sed -i \ - -e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${cross}\":" \ - -e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \ - -e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \ - -e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \ - -e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \ - -e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \ - .config || die - - yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig" - - cp .config myconfig - - emake -s clean > /dev/null || die "could not clean" -} - -src_compile() { - cp myconfig .config - - emake headers || die "make headers failed" - just_headers && return 0 - - emake || die "make failed" - if [[ ${CTARGET} != ${CHOST} ]] ; then - emake -C utils hostutils || die "make hostutils failed" - elif [[ ${CHOST} == *-uclibc* ]] ; then - emake utils || die "make utils failed" - fi -} - -src_test() { - [[ ${CHOST} != ${CTARGET} ]] && return 0 - [[ ${CBUILD} != ${CHOST} ]] && return 0 - - # assert test fails on pax/grsec enabled kernels - normal - # vfork test fails in sandbox (both glibc/uclibc) - make UCLIBC_ONLY=1 check || die "test failed" -} - -src_install() { - local sysroot=${ED} - [[ ${CHOST} != ${CTARGET} ]] && sysroot="${sysroot}/usr/${CTARGET}" - - local target="install" - just_headers && target="install_headers" - emake DESTDIR="${sysroot}" ${target} || die "install failed" - - save_config .config - - # remove files coming from kernel-headers - rm -rf "${sysroot}"/usr/include/{linux,asm*} - - # Make sure we install the sys-include symlink so that when - # we build a 2nd stage cross-compiler, gcc finds the target - # system headers correctly. See gcc/doc/gccinstall.info - if [[ ${CTARGET} != ${CHOST} ]] ; then - dosym usr/include /usr/${CTARGET}/sys-include - if ! just_headers ; then - newbin utils/ldconfig.host ${CTARGET}-ldconfig || die - newbin utils/ldd.host ${CTARGET}-ldd || die - fi - return 0 - fi - - if [[ ${CHOST} == *-uclibc* ]] ; then - emake DESTDIR="${ED}" install_utils || die "install-utils failed" - dobin extra/scripts/getent - fi - - dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 -} - -pkg_postinst() { - [[ ${CTARGET} != ${CHOST} ]] && return 0 - [[ ${CHOST} != *-uclibc* ]] && return 0 - - if [[ ! -e ${EROOT}/etc/TZ ]] ; then - ewarn "Please remember to set your timezone in /etc/TZ" - [[ ! -d ${EROOT}/etc ]] && mkdir -p "${EROOT}"/etc - echo "UTC" > "${EROOT}"/etc/TZ - fi - [[ ${ROOT} != "/" ]] && return 0 - # update cache before reloading init - /sbin/ldconfig - # reload init ... - [[ -x /sbin/telinit ]] && /sbin/telinit U &> /dev/null -} diff --git a/sys-process/runit/ChangeLog b/sys-process/runit/ChangeLog deleted file mode 100644 index 17f30b9..0000000 --- a/sys-process/runit/ChangeLog +++ /dev/null @@ -1,128 +0,0 @@ -# ChangeLog for sys-process/runit -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/ChangeLog,v 1.34 2012/02/06 03:13:33 vapier Exp $ - - 06 Feb 2012; Mike Frysinger <vapier@gentoo.org> runit-2.1.1-r1.ebuild: - Don't run env-update in pkg_* funcs -- the PM does that. - -*runit-2.1.1-r1 (30 Nov 2011) - - 30 Nov 2011; Marc Schiffbauer <mschiff@gentoo.org> +runit-2.1.1-r1.ebuild: - Added rev 2.2.1-r1. Fixes #392453. - - 15 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> runit-2.1.1.ebuild: - QA: actually make runit build, since it was broken with a blind version bump. - -*runit-2.1.1 (15 Jun 2011) - - 15 Jun 2011; Jeroen Roovers <jer@gentoo.org> +runit-2.1.1.ebuild: - Version bump. - -*runit-2.0.0 (25 Dec 2008) - - 25 Dec 2008; Mike Frysinger <vapier@gentoo.org> +runit-2.0.0.ebuild: - Version bump #190983 by Daniel Pielmeier (billie). - - 14 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> runit-1.7.0.ebuild: - Set compiler and linker during src_compile rather than unpack. - - 12 May 2008; Markus Meier <maekke@gentoo.org> runit-1.7.0.ebuild: - amd64 stable, bug #216630 - - 14 Apr 2008; Jeroen Roovers <jer@gentoo.org> runit-1.7.0.ebuild: - Stable for HPPA (bug #216630). - - 12 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org> runit-1.7.0.ebuild: - ppc stable, bug #216630 - - 08 Apr 2008; Raúl Porcel <armin76@gentoo.org> runit-1.7.0.ebuild: - ia64/sparc/x86 stable wrt #216630 - - 07 Apr 2008; Tobias Klausmann <klausman@gentoo.org> runit-1.7.0.ebuild: - Stable on alpha, bug #216630 - - 07 Apr 2008; Brent Baude <ranger@gentoo.org> runit-1.7.0.ebuild: - stable ppc64, bug 216630 - -*runit-1.7.0 (25 Aug 2007) - - 25 Aug 2007; Mike Frysinger <vapier@gentoo.org> +runit-1.7.0.ebuild: - Version bump #180649 by Radek Podgorny. - - 03 Jul 2007; Raúl Porcel <armin76@gentoo.org> runit-1.5.0.ebuild: - alpha stable wrt #178046 - - 02 Jun 2007; Lars Weiler <pylon@gentoo.org> runit-1.5.0.ebuild: - Stable on ppc; bug #178046. - - 21 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> runit-1.5.0.ebuild: - Stable on sparc wrt #178046 - - 16 May 2007; Steve Dibb <beandog@gentoo.org> runit-1.5.0.ebuild: - amd64 stable, bug 178046 - - 15 May 2007; Jeroen Roovers <jer@gentoo.org> runit-1.5.0.ebuild: - Stable for HPPA (bug #178046). - - 13 May 2007; Raúl Porcel <armin76@gentoo.org> runit-1.5.0.ebuild: - ia64 + x86 stable wrt bug 178046 - - 13 May 2007; Markus Rothe <corsair@gentoo.org> runit-1.5.0.ebuild: - Stable on ppc64; bug #178046 - - 10 Apr 2007; Christian Faulhammer <opfer@gentoo.org> runit-1.3.0.ebuild: - stable amd64, bug 172203 - - 10 Apr 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog: - keyworded ~amd64, bug 172203 - - 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: - Regenerate digest in Manifest2 format. - - 23 May 2006; Markus Rothe <corsair@gentoo.org> runit-1.3.0.ebuild: - Stable on ppc64 - -*runit-1.5.0 (20 Apr 2006) - - 20 Apr 2006; Mike Frysinger <vapier@gentoo.org> +runit-1.5.0.ebuild: - Version bump #130519 by Radek Podgorny. - - 20 Apr 2006; Mike Frysinger <vapier@gentoo.org> +files/3-1.4, - runit-1.4.1.ebuild: - New initscript by Radek Podgorny #128918. - -*runit-1.4.1 (29 Mar 2006) - - 29 Mar 2006; Mike Frysinger <vapier@gentoo.org> +runit-1.4.1.ebuild: - Version bump #127877 by Radek Podgorny. - - 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> runit-1.3.0.ebuild: - Mark 1.3.0 stable on alpha - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> runit-1.3.0.ebuild: - Mark 1.3.0 stable on ia64 - - 30 Jan 2006; Ian Leitch <port001@gentoo.org> runit-1.3.0.ebuild: - Stable on x86 (bug #120415). - -*runit-1.3.3 (15 Jan 2006) - - 15 Jan 2006; Mike Frysinger <vapier@gentoo.org> +runit-1.3.3.ebuild: - Version bump #119069 by Torne Wuff. - -*runit-1.3.0 (26 Jul 2005) - - 26 Jul 2005; Caleb Tennis <caleb@gentoo.org> +runit-1.3.0.ebuild: - Version bump - bug #100343 - -*runit-1.0.5 (03 Mar 2005) - - 03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> +metadata.xml, +files/1, - +files/2, +files/3, +files/ctrlaltdel, +files/finish.getty, - +files/run.getty, +runit-1.0.5.ebuild: - Moved from sys-apps/runit to sys-process/runit. - -*runit-1.0.5 (09 Oct 2004) - - 09 Oct 2004; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by Torne Wuff #39160. diff --git a/sys-process/runit/Manifest b/sys-process/runit/Manifest deleted file mode 100644 index aae017d..0000000 --- a/sys-process/runit/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX 1 175 RMD160 ca7ea65b85ec58b1ff07d50db47807339bcb509a SHA1 f92044c4f90e0bd588860fe2b314b074d97a2fa7 SHA256 fd9520369851473556c038b55679dcb1eb1265d1220e8c3cf4aac2dfae4e6594 -AUX 2 551 RMD160 192302cd579520d2f92f4db6295db9d8cbd56303 SHA1 bfa2f2a1e7ce6ab92d76301f7afb99bca41ba830 SHA256 d0cb35c4ecdd5ef9179af22f24cb371eb8f1082ec1af7850237842bd49ccba0f -AUX 3 377 RMD160 41baaa2fcb680c9ed17fe8fbda4b640473240540 SHA1 d1a8fdeb5d39acf42b0bea4eac45d19feda929aa SHA256 3f3787de54ead7c2450f596acf022c9f255a8e6dc1e6ea7bb3a5fea20fa63ac2 -AUX 3-1.4 372 RMD160 b62d35af10c481df7f2f38fb892858f3ddc382bb SHA1 bcb7ec8c6cb3dfabad4cc25ad34c8f575ef8bcd1 SHA256 56b835cb329e71d14523038cd382ad92f77317a2c1bb75e9414bf468fa57f03b -AUX ctrlaltdel 189 RMD160 8f6f4f30c13fb541e3a32221300889d2cedf3ec2 SHA1 3ed4732e0f6e5096be7805421400242854a9d476 SHA256 84eff8b4bd83ebded1689404f5da22a442e82e7f9d5d8df61a1a3032f80b503c -AUX finish.getty 30 RMD160 0bb0f0c1a05a78ce33bb4f95b84d142896e6471c SHA1 922f54e452cdf2af32b29db0349bee7c68811962 SHA256 6c5db3570b4abbc2547ee7923c18879912f197b52883abb08586f529cccd5aa5 -AUX run.getty 44 RMD160 4659766d2f0d3128a23bc0beac2dfe92f368d723 SHA1 6a7a78bc77448d2e5d1187be1214caab8cda31c2 SHA256 3b4105965417490496352da0fa36d7e79e8ff27989ce7d33023251654d6c119e -DIST runit-1.7.0.tar.gz 101315 RMD160 418db787290586a003481f938f4fa01934b9f063 SHA1 a49810a0c8c77dfec19f7282ac9c82b129554243 SHA256 f6bcd04bb300710ba4ade3b6c64298cb3e22090a8866455491ad086243453984 -DIST runit-2.0.0.tar.gz 104373 RMD160 fc55f22462b5b05d991558adf99468777789671a SHA1 a48d8579478fbcef37c347c3aa986f23fe528241 SHA256 2eb22e37946e479249a0b0e1fb0fb4651cebfd3d88aa116a39c07a0ec253fe28 -DIST runit-2.1.1.tar.gz 109661 RMD160 60f3d3b377bc9741ca96d2e953f86461368d6d29 SHA1 8eee39639dcb79ba251ca4ab2c7cde38059f09c2 SHA256 ffcf2d27b32f59ac14f2d4b0772a3eb80d9342685a2042b7fbbc472c07cf2a2c -EBUILD runit-1.7.0.ebuild 1678 RMD160 03b1f0a8d49e43fbd4531a28caff6228cf4451d3 SHA1 db1f696053ae00a0671a2e00be4f644130289cec SHA256 51424de6fc338ef7e46440d67092b358f8cce4740edc9bd1cbdc2cb87cd4f6d8 -EBUILD runit-2.0.0.ebuild 1689 RMD160 0ae9e15e688aace1380bb960322b8460afda88e5 SHA1 cfbf889d3b1023c760bf020b9666cab35923949c SHA256 27a12b0806ab9f12aea923f533ae3fdea13307553d33ea44f07029cd1811cb34 -EBUILD runit-2.1.1-r1.ebuild 1984 RMD160 b33cdccfa69b3e8673397bdc81adae7b64eb7e90 SHA1 7b83e81c4bbbb68768843c0d711cc2b0a5ddfcf1 SHA256 1c19ee2dc595948edd39c55922fb33b332d46a625ee325ab0e018aea0ad4c04c -EBUILD runit-2.1.1.ebuild 1631 RMD160 7362cc7d9228873b3d4277e164240a503157676f SHA1 3970b9e06c63a8aad79ec8b18a183007775c8467 SHA256 5b576091105dad929813ba018f9f5908f47e5c541f8787b01f79764b58940065 -MISC ChangeLog 4269 RMD160 90a64e15c65b19c9c76e4baacc6708dd11a1c8f9 SHA1 37d1e18c3d21304169d7ab79712d44ff9f793c10 SHA256 71dccb6ad8c309909c7ecd8f0cac1926659479783b5153e90789b3a7ef7df91c -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-process/runit/files/1 b/sys-process/runit/files/1 deleted file mode 100644 index d6a5b4f..0000000 --- a/sys-process/runit/files/1 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# system one time tasks - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -RUNLEVEL=S /sbin/rc sysinit -RUNLEVEL=S /sbin/rc boot - -touch /etc/runit/stopit -chmod 0 /etc/runit/stopit diff --git a/sys-process/runit/files/2 b/sys-process/runit/files/2 deleted file mode 100644 index 233ad00..0000000 --- a/sys-process/runit/files/2 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -PATH=/command:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin - -exec env - PATH=$PATH \ -runsvdir /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................' diff --git a/sys-process/runit/files/3 b/sys-process/runit/files/3 deleted file mode 100644 index 182151e..0000000 --- a/sys-process/runit/files/3 +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -exec >/dev/console 2>&1 -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -echo 'Waiting for getties to stop...' -svwaitdown -xk -t10 /var/service/getty-* - -echo 'Waiting for services to stop...' -svwaitdown -xk -t300 /var/service/* - -echo 'Shutdown...' -test -x /etc/runit/reboot && LAST=6 || LAST=0 -test -x /etc/runit/reboot && RC=reboot || RC=shutdown -RUNLEVEL=$LAST /sbin/rc $RC - diff --git a/sys-process/runit/files/3-1.4 b/sys-process/runit/files/3-1.4 deleted file mode 100644 index f143f5f..0000000 --- a/sys-process/runit/files/3-1.4 +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -exec >/dev/console 2>&1 -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -echo 'Waiting for getties to stop...' -sv shutdown -w 10 /var/service/getty-* - -echo 'Waiting for services to stop...' -sv shutdown -w 300 /var/service/* - -echo 'Shutdown...' -test -x /etc/runit/reboot && LAST=6 || LAST=0 -test -x /etc/runit/reboot && RC=reboot || RC=shutdown -RUNLEVEL=$LAST /sbin/rc $RC diff --git a/sys-process/runit/files/ctrlaltdel b/sys-process/runit/files/ctrlaltdel deleted file mode 100644 index 6684457..0000000 --- a/sys-process/runit/files/ctrlaltdel +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin -MSG="System is going down in 14 seconds..." - -# echo 'disabled.' ; exit -touch /etc/runit/stopit -chmod 100 /etc/runit/stopit && echo "$MSG" | wall -/bin/sleep 14 diff --git a/sys-process/runit/files/finish.getty b/sys-process/runit/files/finish.getty deleted file mode 100644 index c3d440a..0000000 --- a/sys-process/runit/files/finish.getty +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec utmpset -w TTY diff --git a/sys-process/runit/files/run.getty b/sys-process/runit/files/run.getty deleted file mode 100644 index ab6f954..0000000 --- a/sys-process/runit/files/run.getty +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /sbin/agetty 38400 TTY linux diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml deleted file mode 100644 index 96a2d58..0000000 --- a/sys-process/runit/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> diff --git a/sys-process/runit/runit-1.7.0.ebuild b/sys-process/runit/runit-1.7.0.ebuild deleted file mode 100644 index ed425b0..0000000 --- a/sys-process/runit/runit-1.7.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-1.7.0.ebuild,v 1.9 2008/10/27 06:07:42 vapier Exp $ - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" -IUSE="static" - -DEPEND="" - -S=${WORKDIR}/admin/${P} - -src_unpack() { - unpack ${A} - cd "${S}" - - # we either build everything or nothing static - sed -i -e 's:-static: :' src/Makefile -} - -src_compile() { - cd src - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld - - emake || die "make failed" -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - - cd src - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin" - - cd "${S}" - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done -} diff --git a/sys-process/runit/runit-2.0.0.ebuild b/sys-process/runit/runit-2.0.0.ebuild deleted file mode 100644 index 99b7d50..0000000 --- a/sys-process/runit/runit-2.0.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.0.0.ebuild,v 1.1 2008/12/25 22:24:45 vapier Exp $ - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -DEPEND="" - -S=${WORKDIR}/admin/${P} - -src_unpack() { - unpack ${A} - cd "${S}" - - # we either build everything or nothing static - sed -i -e 's:-static: :' src/Makefile -} - -src_compile() { - cd src - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld - - emake || die "make failed" -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - - cd src - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin" - - cd "${S}" - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done -} diff --git a/sys-process/runit/runit-2.1.1-r1.ebuild b/sys-process/runit/runit-2.1.1-r1.ebuild deleted file mode 100644 index 571646b..0000000 --- a/sys-process/runit/runit-2.1.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1-r1.ebuild,v 1.2 2012/02/06 03:13:33 vapier Exp $ - -EAPI="3" - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -S=${WORKDIR}/admin/${P}/src - -src_prepare() { - # we either build everything or nothing static - sed -i -e 's:-static: :' Makefile -} - -src_configure() { - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - dosym ../etc/runit/2 /sbin/runsvdir-start - - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${ED}"/usr/bin/{runit-init,runit,utmpset} "${ED}"/sbin/ || die "dosbin" - - cd "${S}"/.. - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done - - # make sv command work - cd "${S}" - insinto /etc/env.d - cat <<-EOF > env.d - #/etc/env.d/20runit - SVDIR="/var/service/" - EOF - newins env.d 20runit -} - -pkg_postinst() { - ewarn "/etc/profile was updated. Please run:" - ewarn "source /etc/profile" - ewarn "to make 'sv' work correctly on your currently open shells" -} diff --git a/sys-process/runit/runit-2.1.1.ebuild b/sys-process/runit/runit-2.1.1.ebuild deleted file mode 100644 index e3c6915..0000000 --- a/sys-process/runit/runit-2.1.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/runit/runit-2.1.1.ebuild,v 1.2 2011/06/15 18:55:12 flameeyes Exp $ - -EAPI="3" - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="A UNIX init scheme with service supervision" -HOMEPAGE="http://smarden.org/runit/" -SRC_URI="http://smarden.org/runit/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static" - -S=${WORKDIR}/admin/${P}/src - -src_prepare() { - # we either build everything or nothing static - sed -i -e 's:-static: :' src/Makefile -} - -src_configure() { - use static && append-ldflags -static - - echo "$(tc-getCC) ${CFLAGS}" > conf-cc - echo "$(tc-getCC) ${LDFLAGS}" > conf-ld -} - -src_install() { - dodir /var - keepdir /etc/runit{,/runsvdir{,/default,/all}} - dosym default /etc/runit/runsvdir/current - dosym ../etc/runit/runsvdir/current /var/service - - dobin $(<../package/commands) || die "dobin" - dodir /sbin - mv "${D}"/usr/bin/{runit-init,runit,utmpset} "${D}"/sbin/ || die "dosbin" - - cd "${S}"/.. - dodoc package/{CHANGES,README,THANKS,TODO} - dohtml doc/*.html - doman man/*.[18] - - exeinto /etc/runit - doexe "${FILESDIR}"/{1,2,ctrlaltdel} || die - newexe "${FILESDIR}"/3-1.4 3 || die - for tty in tty1 tty2 tty3 tty4 tty5 tty6; do - exeinto /etc/runit/runsvdir/all/getty-$tty/ - for script in run finish; do - newexe "${FILESDIR}"/$script.getty $script - dosed "s:TTY:${tty}:g" /etc/runit/runsvdir/all/getty-$tty/$script - done - dosym ../all/getty-$tty /etc/runit/runsvdir/default/getty-$tty - done -} diff --git a/x11-base/xorg-drivers/ChangeLog b/x11-base/xorg-drivers/ChangeLog deleted file mode 100644 index 373e85e..0000000 --- a/x11-base/xorg-drivers/ChangeLog +++ /dev/null @@ -1,258 +0,0 @@ -# ChangeLog for x11-base/xorg-drivers -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/ChangeLog,v 1.68 2012/03/24 16:30:25 chithanh Exp $ - - 24 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.12.ebuild: - Allow some drivers back in after build fixes. - - 18 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.12.ebuild: - Update dependencies for drivers that fail to build against xorg-server-1.12. - -*xorg-drivers-1.12 (07 Mar 2012) - - 07 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - +xorg-drivers-1.12.ebuild: - Version bump. - - 03 Mar 2012; Brent Baude <ranger@gentoo.org> xorg-drivers-1.11.ebuild: - Marking xorg-drivers-1.11 ppc64 stable for bug 394393 - - 19 Feb 2012; Raúl Porcel <armin76@gentoo.org> xorg-drivers-1.11.ebuild: - alpha/ia64/sh/sparc stable wrt #394393 - - 15 Feb 2012; Brent Baude <ranger@gentoo.org> xorg-drivers-1.11.ebuild: - Marking xorg-drivers-1.11 ppc stable for bug 394393 - - 27 Dec 2011; Markus Meier <maekke@gentoo.org> xorg-drivers-1.11.ebuild: - x86 stable, bug #394393 - - 21 Dec 2011; Markus Meier <maekke@gentoo.org> xorg-drivers-1.11.ebuild: - arm stable, bug #394393 - - 20 Dec 2011; Jeroen Roovers <jer@gentoo.org> xorg-drivers-1.11.ebuild: - Stable for HPPA (bug #394393). - - 20 Dec 2011; Lars Wendler <polynomial-c@gentoo.org> xorg-drivers-1.10.ebuild: - Dropped input_devices_virtualbox from 1.10, too. (acked by chithead) - - 20 Dec 2011; Agostino Sarubbo <ago@gentoo.org> xorg-drivers-1.11.ebuild: - Stable for AMD64, wrt bug #394393 - - 14 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.10.ebuild, xorg-drivers-1.11.ebuild: - Allow stable drivers for 1.10, drop virtualbox from 1.11, bug #387121 - - 29 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.10.ebuild: - Restrict blockers to versions that don't compile with xorg-server-1.10. - - 20 Aug 2011; Jeroen Roovers <jer@gentoo.org> xorg-drivers-1.10.ebuild: - Stable for HPPA (bug #371857). - - 30 Jul 2011; Raúl Porcel <armin76@gentoo.org> xorg-drivers-1.10.ebuild: - alpha/ia64/sh/sparc stable wrt #371857 - - 29 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> xorg-drivers-1.10.ebuild: - ppc64 stable wrt #371857 - - 13 Jul 2011; Markus Meier <maekke@gentoo.org> xorg-drivers-1.10.ebuild: - x86 stable, bug #371857 - - 29 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.11.ebuild: - Allow xf86-input-{elographics,fpit,hyperpen,penmount,mutouch} back in. - - 28 Jun 2011; Brent Baude <ranger@gentoo.org> xorg-drivers-1.10.ebuild: - Marking xorg-drivers-1.10 ppc stable for bug 371857 - - 26 Jun 2011; Markus Meier <maekke@gentoo.org> xorg-drivers-1.10.ebuild: - arm stable, bug #371857 - - 23 Jun 2011; Markos Chandras <hwoarang@gentoo.org> xorg-drivers-1.10.ebuild: - Stable on amd64 wrt bug #372333 - -*xorg-drivers-1.11 (06 Jun 2011) - - 06 Jun 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.10.ebuild, +xorg-drivers-1.11.ebuild: - Update for non-working drivers, bug #366297, bug #368691, bug #369885. Bump - for next xorg-server release. - - 20 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.10.ebuild: - Allow xf86-input-joystick back in, bug #361649. Drop extra '!' - - 04 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.10.ebuild: - Block xf86-input-joystick until there is a 1.10 compatible release. - -*xorg-drivers-1.10 (30 Mar 2011) - - 30 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - +xorg-drivers-1.10.ebuild: - Bump to 1.10 - - 15 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.9.ebuild: - Add omapfb to VIDEO_CARDS - - 13 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.9.ebuild: - Unblock suncg and suntcx as requested by armin76. - - 14 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> - xorg-drivers-1.9.ebuild: - ppc stable wrt #344827, #354237 - - 14 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> xorg-drivers-1.7.ebuild, - xorg-drivers-1.9.ebuild: - Say goodbye to xgi video card. - - 12 Feb 2011; Raúl Porcel <armin76@gentoo.org> xorg-drivers-1.9.ebuild: - alpha/ia64/sh/sparc stable wrt #344827 - - 09 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> - -xorg-drivers-1.8.ebuild: - old - - 31 Dec 2010; Jeroen Roovers <jer@gentoo.org> xorg-drivers-1.9.ebuild: - Stable for HPPA (bug #344827). - - 29 Dec 2010; Markus Meier <maekke@gentoo.org> xorg-drivers-1.9.ebuild: - arm stable, bug #344827 - - 25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> - xorg-drivers-1.9.ebuild: - x86 stable, bug 344827 - - 23 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> xorg-drivers-1.9.ebuild: - amd64 stable wrt #344827 - - 19 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> xorg-drivers-1.9.ebuild: - ppc64 stable wrt #344827 - - 19 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> - xorg-drivers-1.7.ebuild, xorg-drivers-1.8.ebuild, xorg-drivers-1.9.ebuild: - Drop radeonhd. - -*xorg-drivers-1.9 (12 Sep 2010) - - 12 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - +xorg-drivers-1.9.ebuild: - Version bump. - - 11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> - -xorg-drivers-1.6.ebuild: - remove old - - 02 Aug 2010; Raúl Porcel <armin76@gentoo.org> xorg-drivers-1.7.ebuild: - alpha/ia64/sh/sparc stable wrt #308521 - - 14 Jul 2010; Fabio Erculiani <lxnay@gentoo.org> xorg-drivers-1.7.ebuild, - xorg-drivers-1.8.ebuild: - re-enable xf86-input-fpit, ABI issues have been fixed, not revbumping for - now, close bug #321175 - - 13 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.7.ebuild: - add nouveau as it is stable now - - 20 Jun 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.8.ebuild: - add elographics driver back as the new release works with X.org 1.8 - - 31 May 2010; Guy Martin <gmsoft@gentoo.org> xorg-drivers-1.7.ebuild: - hppa stable, #308521 - - 12 May 2010; Brent Baude <ranger@gentoo.org> xorg-drivers-1.7.ebuild: - Marking xorg-drivers-1.7 ppc64 stable for bug 308521 - - 18 Apr 2010; Markus Meier <maekke@gentoo.org> xorg-drivers-1.7.ebuild: - arm stable, bug #308521 - - 18 Apr 2010; <nixnut@gentoo.org> xorg-drivers-1.7.ebuild: - ppc stable #308521 - - 16 Apr 2010; Pacho Ramos <pacho@gentoo.org> xorg-drivers-1.7.ebuild: - amd64 stable, bug 308521 - - 13 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.8.ebuild: - now that mask is in place, add xf86-video-nouveau dependency, bug #309991 - -*xorg-drivers-1.8 (13 Apr 2010) - - 13 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> - +xorg-drivers-1.8.ebuild: - Version bump to 1.8 release. - - 10 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.7.ebuild: - drop unnecessary blocks - - 09 Apr 2010; Christian Faulhammer <fauli@gentoo.org> - xorg-drivers-1.7.ebuild: - stable x86, bug 308521 - - 03 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> - xorg-drivers-1.7.ebuild: - add back xf86-input-penmount - - 15 Dec 2009; Brent Baude <ranger@gentoo.org> xorg-drivers-1.6.ebuild: - Marking xorg-drivers-1.6 ppc64 stable for bug 294958 - - 15 Dec 2009; Raúl Porcel <armin76@gentoo.org> xorg-drivers-1.6.ebuild: - alpha/ia64/sh/sparc stable - - 13 Dec 2009; Rémi Cardona <remi@gentoo.org> xorg-drivers-1.6.ebuild, - xorg-drivers-1.7.ebuild: - clean up blockers - - 15 Nov 2009; Rémi Cardona <remi@gentoo.org> xorg-drivers-1.6.ebuild: - sync with overlay, imstt and vermilon are blocked, drop USE flags - - 15 Nov 2009; Rémi Cardona <remi@gentoo.org> xorg-drivers-1.7.ebuild: - sync with overlay, imstt and vermilon are blocked, drop USE flags - - 05 Nov 2009; Rémi Cardona <remi@gentoo.org> xorg-drivers-1.7.ebuild: - sync with overlay, use xf86-input-wacom instead of linuxwacom - - 02 Nov 2009; Rémi Cardona <remi@gentoo.org> xorg-drivers-1.7.ebuild: - block unmaintained input drivers: citron, elographics, fpit, hyperpen, - mutouch, penmount - - 01 Nov 2009; Mike Auty <ikelos@gentoo.org> xorg-drivers-1.7.ebuild: - Temporarily remove wacom support from xorg-drivers-1.7 until - xf86-input-wacom makes it to the main tree (see bug 290730). - - 26 Oct 2009; Jeroen Roovers <jer@gentoo.org> xorg-drivers-1.6.ebuild: - Stable for HPPA (bug #282290). - - 11 Oct 2009; nixnut <nixnut@gentoo.org> xorg-drivers-1.6.ebuild: - ppc stable #282290 - - 09 Oct 2009; Markus Meier <maekke@gentoo.org> xorg-drivers-1.6.ebuild: - arm stable, bug #282290 - - 05 Oct 2009; Christian Faulhammer <fauli@gentoo.org> - xorg-drivers-1.6.ebuild: - stable x86, bug 282290 - -*xorg-drivers-1.7 (02 Oct 2009) - - 02 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org> - +xorg-drivers-1.7.ebuild: - Bump packages for xorg-server-1.7. - - 30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> - xorg-drivers-1.6.ebuild: - amd64 stable wrt #282290 - -*xorg-drivers-1.6 (04 Sep 2009) - - 04 Sep 2009; Rémi Cardona <remi@gentoo.org> +xorg-drivers-1.6.ebuild, - +metadata.xml: - add xorg-drivers meta ebuild from the x11 overlay - diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest deleted file mode 100644 index ba83841..0000000 --- a/x11-base/xorg-drivers/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -EBUILD xorg-drivers-1.11.ebuild 5883 RMD160 9a89274c4593f7702aa3f0da8eb6cc8e4b79a057 SHA1 1128567c1b0ecc1578c251e2c1e1fbb307c9c656 SHA256 55cc5a40c666aa2c886cbf4118e1ba350cb93f2683cebc05a0070a6db8585e43 -EBUILD xorg-drivers-1.12.ebuild 5602 RMD160 b9bb46247368a433206223a73007642cc51e6628 SHA1 37034f038156bc9cba929e586952d036c76adf5b SHA256 2ff460d7a43766025252f7062a1bd1e5c5d3ff2176b17d8146df1814b795159a -MISC ChangeLog 9138 RMD160 2680580d4abf2d413424598a3cd7e9193f721b8a SHA1 48987997ce3ae06d49a8ea0aedb83aa22fd9ff16 SHA256 60fc14fafb86a7c0458761c0c3863c11471c413de3ab57077e84446514a3059d -MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc diff --git a/x11-base/xorg-drivers/metadata.xml b/x11-base/xorg-drivers/metadata.xml deleted file mode 100644 index 6cc3982..0000000 --- a/x11-base/xorg-drivers/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>x11</herd> -</pkgmetadata> diff --git a/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild deleted file mode 100644 index ef10e38..0000000 --- a/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.11.ebuild,v 1.3 2011/10/14 21:45:01 chithanh Exp $ - -EAPI=4 - -DESCRIPTION="Meta package containing deps on all xorg drivers" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64-linux ~x86-linux" - -IUSE_INPUT_DEVICES=" - input_devices_acecad - input_devices_aiptek - input_devices_elographics - input_devices_evdev - input_devices_fpit - input_devices_hyperpen - input_devices_joystick - input_devices_keyboard - input_devices_mouse - input_devices_mutouch - input_devices_penmount - input_devices_tslib - input_devices_vmmouse - input_devices_void - input_devices_synaptics - input_devices_wacom -" -IUSE_VIDEO_CARDS=" - video_cards_apm - video_cards_ark - video_cards_ast - video_cards_chips - video_cards_cirrus - video_cards_dummy - video_cards_epson - video_cards_fbdev - video_cards_geode - video_cards_glint - video_cards_i128 - video_cards_i740 - video_cards_intel - video_cards_impact - video_cards_mach64 - video_cards_mga - video_cards_neomagic - video_cards_newport - video_cards_nouveau - video_cards_nv - video_cards_omapfb - video_cards_qxl - video_cards_r128 - video_cards_radeon - video_cards_rendition - video_cards_s3 - video_cards_s3virge - video_cards_savage - video_cards_siliconmotion - video_cards_sis - video_cards_sisusb - video_cards_sunbw2 - video_cards_suncg14 - video_cards_suncg3 - video_cards_suncg6 - video_cards_sunffb - video_cards_sunleo - video_cards_suntcx - video_cards_tdfx - video_cards_tga - video_cards_trident - video_cards_tseng - video_cards_v4l - video_cards_vesa - video_cards_via - video_cards_virtualbox - video_cards_vmware - video_cards_voodoo - video_cards_fglrx - video_cards_nvidia -" - -IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" - -PDEPEND=" - input_devices_acecad? ( x11-drivers/xf86-input-acecad ) - input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) - input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_fpit? ( x11-drivers/xf86-input-fpit ) - input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) - input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) - input_devices_mouse? ( x11-drivers/xf86-input-mouse ) - input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) - input_devices_penmount? ( x11-drivers/xf86-input-penmount ) - input_devices_tslib? ( x11-drivers/xf86-input-tslib ) - input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) - input_devices_void? ( x11-drivers/xf86-input-void ) - input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) - input_devices_wacom? ( x11-drivers/xf86-input-wacom ) - - video_cards_apm? ( x11-drivers/xf86-video-apm ) - video_cards_ark? ( x11-drivers/xf86-video-ark ) - video_cards_ast? ( x11-drivers/xf86-video-ast ) - video_cards_chips? ( x11-drivers/xf86-video-chips ) - video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) - video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) - video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( x11-drivers/xf86-video-glint ) - video_cards_i128? ( x11-drivers/xf86-video-i128 ) - video_cards_i740? ( x11-drivers/xf86-video-i740 ) - video_cards_intel? ( x11-drivers/xf86-video-intel ) - video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) - video_cards_newport? ( x11-drivers/xf86-video-newport ) - video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) - video_cards_qxl? ( x11-drivers/xf86-video-qxl ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers ) - video_cards_fglrx? ( x11-drivers/ati-drivers ) - video_cards_r128? ( x11-drivers/xf86-video-r128 ) - video_cards_radeon? ( x11-drivers/xf86-video-ati ) - video_cards_rendition? ( x11-drivers/xf86-video-rendition ) - video_cards_s3? ( x11-drivers/xf86-video-s3 ) - video_cards_s3virge? ( x11-drivers/xf86-video-s3virge ) - video_cards_savage? ( x11-drivers/xf86-video-savage ) - video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) - video_cards_sis? ( x11-drivers/xf86-video-sis ) - video_cards_sisusb? ( x11-drivers/xf86-video-sisusb ) - video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) - video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) - video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) - video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) - video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) - video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) - video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) - video_cards_tga? ( x11-drivers/xf86-video-tga ) - video_cards_trident? ( x11-drivers/xf86-video-trident ) - video_cards_tseng? ( x11-drivers/xf86-video-tseng ) - video_cards_v4l? ( x11-drivers/xf86-video-v4l ) - video_cards_vesa? ( x11-drivers/xf86-video-vesa ) - video_cards_via? ( x11-drivers/xf86-video-openchrome ) - video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) - video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) - - !x11-drivers/xf86-input-citron - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-nsc - !x11-drivers/xf86-video-sunbw2 -" diff --git a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild deleted file mode 100644 index 953aa99..0000000 --- a/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.3 2012/03/24 16:30:25 chithanh Exp $ - -EAPI=4 - -DESCRIPTION="Meta package containing deps on all xorg drivers" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~amd64-linux" - -IUSE_INPUT_DEVICES=" - input_devices_acecad - input_devices_aiptek - input_devices_elographics - input_devices_evdev - input_devices_fpit - input_devices_hyperpen - input_devices_joystick - input_devices_keyboard - input_devices_mouse - input_devices_mutouch - input_devices_penmount - input_devices_tslib - input_devices_vmmouse - input_devices_void - input_devices_synaptics - input_devices_wacom -" -IUSE_VIDEO_CARDS=" - video_cards_ark - video_cards_ast - video_cards_cirrus - video_cards_dummy - video_cards_epson - video_cards_fbdev - video_cards_geode - video_cards_glint - video_cards_i128 - video_cards_i740 - video_cards_intel - video_cards_mach64 - video_cards_mga - video_cards_neomagic - video_cards_newport - video_cards_nouveau - video_cards_nv - video_cards_omapfb - video_cards_qxl - video_cards_r128 - video_cards_radeon - video_cards_s3 - video_cards_savage - video_cards_siliconmotion - video_cards_sis - video_cards_sunbw2 - video_cards_suncg14 - video_cards_suncg3 - video_cards_suncg6 - video_cards_sunffb - video_cards_sunleo - video_cards_suntcx - video_cards_tdfx - video_cards_tga - video_cards_trident - video_cards_v4l - video_cards_vesa - video_cards_via - video_cards_virtualbox - video_cards_vmware - video_cards_voodoo - video_cards_fglrx - video_cards_nvidia -" - -IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" - -PDEPEND=" - input_devices_acecad? ( x11-drivers/xf86-input-acecad ) - input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) - input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_fpit? ( x11-drivers/xf86-input-fpit ) - input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) - input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) - input_devices_mouse? ( x11-drivers/xf86-input-mouse ) - input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) - input_devices_penmount? ( x11-drivers/xf86-input-penmount ) - input_devices_tslib? ( x11-drivers/xf86-input-tslib ) - input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) - input_devices_void? ( x11-drivers/xf86-input-void ) - input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) - input_devices_wacom? ( x11-drivers/xf86-input-wacom ) - - video_cards_ark? ( x11-drivers/xf86-video-ark ) - video_cards_ast? ( x11-drivers/xf86-video-ast ) - video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) - video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) - video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( x11-drivers/xf86-video-glint ) - video_cards_i128? ( x11-drivers/xf86-video-i128 ) - video_cards_i740? ( x11-drivers/xf86-video-i740 ) - video_cards_intel? ( x11-drivers/xf86-video-intel ) - video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) - video_cards_newport? ( x11-drivers/xf86-video-newport ) - video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) - video_cards_qxl? ( x11-drivers/xf86-video-qxl ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers ) - video_cards_fglrx? ( x11-drivers/ati-drivers ) - video_cards_r128? ( x11-drivers/xf86-video-r128 ) - video_cards_radeon? ( x11-drivers/xf86-video-ati ) - video_cards_s3? ( x11-drivers/xf86-video-s3 ) - video_cards_savage? ( x11-drivers/xf86-video-savage ) - video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) - video_cards_sis? ( x11-drivers/xf86-video-sis ) - video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) - video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) - video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) - video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) - video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) - video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) - video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) - video_cards_tga? ( x11-drivers/xf86-video-tga ) - video_cards_trident? ( x11-drivers/xf86-video-trident ) - video_cards_v4l? ( x11-drivers/xf86-video-v4l ) - video_cards_vesa? ( x11-drivers/xf86-video-vesa ) - video_cards_via? ( x11-drivers/xf86-video-openchrome ) - video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) - video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) - - !x11-drivers/xf86-input-citron - !<=x11-drivers/xf86-video-apm-1.2.3 - !<=x11-drivers/xf86-video-chips-1.2.4 - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-nsc - !<=x11-drivers/xf86-video-rendition-4.2.4 - !<=x11-drivers/xf86-video-s3virge-1.10.4 - !<=x11-drivers/xf86-video-sisusb-0.9.4 - !x11-drivers/xf86-video-sunbw2 - !<=x11-drivers/xf86-video-tseng-1.2.4 -" diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest deleted file mode 100644 index 7f044f2..0000000 --- a/x11-misc/virtualgl/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST VirtualGL-2.2.tar.gz 3289168 RMD160 3363dfae67d898de89df7d7022d6d16198ef5555 SHA1 1290054c75ede558c09b93f1cdebbe8037d07363 SHA256 3d689df579a3d0ceeb42b65aaff3e85e0e42873b427e58e0c389194bda408695 -EBUILD virtualgl-2.2.ebuild 1886 RMD160 67d206d17c683112ef619c70e5d0550658cfd098 SHA1 5e9b6010df9f4f23e72bf83a4f8fea2b94c11312 SHA256 c0d0e0e00addcdaa21aeadbbdc6aa2ec3814ca64ac5ed1dd4e5cb2c1d71becc3 -MISC virtualgl-2.2.ebuild.old 1790 RMD160 098732daf81d3209c5faa418d773d1f840d64b62 SHA1 059576c11fb6dba5fdb84ed9ae7f9298b1c04b35 SHA256 2db64d672deea99fa5ea4534b9538aa50ff31e9c4a860ca447e730131f0c1b07 -MISC virtualgl-2.2.ebuild~ 1830 RMD160 71f96ba42c0c5fd20fd5a6e2a1cf5f042ba63551 SHA1 86456432d0fe79bf43b1a563c10314a564b7399f SHA256 5020a410ae3e479667a53cc217b8ac62b5f64a90402af4a9f526dbecfa57816a diff --git a/x11-misc/virtualgl/virtualgl-2.2.ebuild b/x11-misc/virtualgl/virtualgl-2.2.ebuild deleted file mode 100644 index 5556c88..0000000 --- a/x11-misc/virtualgl/virtualgl-2.2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# x11-misc/virtualgl - -EAPI="2" - -inherit flag-o-matic - -DESCRIPTION="Run OpenGL applications on remote display software with full 3D hardware acceleration" -HOMEPAGE="http://www.virtualgl.org/" -SRC_URI="mirror://sourceforge/${PN}/VirtualGL/${PV}/VirtualGL-${PV}.tar.gz" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1" -RESTRICT="mirror" - -IUSE="" -# IUSE="ssl" - -RDEPEND="media-libs/libjpeg-turbo[static-libs] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - media-libs/mesa" -# ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/vgl" - -src_prepare() { - # Change /usr/doc -> /usr/share/doc - sed -i -e 's:docdir=$(prefix):docdir=$(prefix)/share:' Makefile - - sed -ie 's,-L/usr,-L${EPREFIX}/usr,g' Makerules.linux - # Add zlib to ssl build (this should be conditional on dev-libs/openssl[+zlib]) -# has_version 'dev-libs/openssl[zlib]' || sed -i -e 's/-lcrypto -Wl,-Bdynamic/-lcrypto -Wl,-Bdynamic -lz/' Makerules.linux -} - -src_compile() { - # For some reason, it creates build-time symlinks to /usr/lib/gcc/ARCH/VERSION/{,32}/libstdc++.a - addpredict /usr/lib/gcc - append-ldflags -fpic,-Wall - append-flags -fpic -Wall - - emake LJTLIB=${EPREFIX}/usr/lib # $(use ssl && echo "USESSL=yes SSLINC=/usr/include/openssl SSLLIB=/usr/lib") - use amd64 && emake M32=yes LJTLIB=${EPREFIX}/usr/lib32 -} - -src_install() { - emake install $(use amd64 && echo LJTDIR=${EPREFIX}/usr || echo LJTLIB=${EPREFIX}/usr/lib) prefix="${ED}"/usr || die "installation failed" - dodoc BUILDING.txt - # /usr/bin/glxinfo conflicts with x11-misc/mesa-progs - # alternatively, we could rename this "vglxinfo" or something - rm "${D}/usr/bin/glxinfo" - - # (could set up vglusers group and/or run vglserver_config if reasonable defaults exist) -} diff --git a/x11-misc/virtualgl/virtualgl-2.2.ebuild.old b/x11-misc/virtualgl/virtualgl-2.2.ebuild.old deleted file mode 100644 index 0f54090..0000000 --- a/x11-misc/virtualgl/virtualgl-2.2.ebuild.old +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# x11-misc/virtualgl - -EAPI="2" - -inherit flag-o-matic - -DESCRIPTION="Run OpenGL applications on remote display software with full 3D hardware acceleration" -HOMEPAGE="http://www.virtualgl.org/" -SRC_URI="mirror://sourceforge/${PN}/VirtualGL/${PV}/VirtualGL-${PV}.tar.gz" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1" -RESTRICT="mirror" - -IUSE="" -# IUSE="ssl" - -RDEPEND="media-libs/libjpeg-turbo[static-libs] - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXau - media-libs/mesa" -# ssl? ( dev-libs/openssl )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/vgl" - -src_prepare() { - # Change /usr/doc -> /usr/share/doc - sed -i -e 's:docdir=$(prefix):docdir=$(prefix)/share:' Makefile - - # Add zlib to ssl build (this should be conditional on dev-libs/openssl[+zlib]) -# has_version 'dev-libs/openssl[zlib]' || sed -i -e 's/-lcrypto -Wl,-Bdynamic/-lcrypto -Wl,-Bdynamic -lz/' Makerules.linux -} - -src_compile() { - # For some reason, it creates build-time symlinks to /usr/lib/gcc/ARCH/VERSION/{,32}/libstdc++.a - addpredict /usr/lib/gcc - append-ldflags -fpic,-Wall - append-flags -fpic -Wall - - emake LJTLIB=/usr/lib # $(use ssl && echo "USESSL=yes SSLINC=/usr/include/openssl SSLLIB=/usr/lib") - use amd64 && emake M32=yes LJTLIB=/usr/lib32 -} - -src_install() { - emake install $(use amd64 && echo LJTDIR=/usr || echo LJTLIB=/usr/lib) prefix="${D}"/usr || die "installation failed" - dodoc BUILDING.txt - # /usr/bin/glxinfo conflicts with x11-misc/mesa-progs - # alternatively, we could rename this "vglxinfo" or something - rm "${D}/usr/bin/glxinfo" - - # (could set up vglusers group and/or run vglserver_config if reasonable defaults exist) -} diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest deleted file mode 100644 index fe57f99..0000000 --- a/x11-proto/inputproto/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST inputproto-2.1.99.3.tar.bz2 175331 RMD160 c4dd440c63f4823982633f15ae6ea2ebff307377 SHA1 726d63755aa2d72fbf548cd583c8aff29aae529a SHA256 547690b27c059aefa7b4e9f0ffc980cedde62009acced925faf816a86ff03483 -EBUILD inputproto-2.1.99.3.ebuild 621 RMD160 b110e5e6e9a8689552a48457286d5712013f00ca SHA1 5dcd63bbbe590661cc85ff6c1e8792bedac030b9 SHA256 b496cafb5976e047dd74dd18cacf018e2aba04d72a71c40110c3fa03d6ee2382 -MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 diff --git a/x11-proto/inputproto/inputproto-2.1.99.3.ebuild b/x11-proto/inputproto/inputproto-2.1.99.3.ebuild deleted file mode 100644 index df2e17f..0000000 --- a/x11-proto/inputproto/inputproto-2.1.99.3.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/inputproto/inputproto-2.0.2.ebuild,v 1.8 2011/08/20 15:55:01 jer Exp $ - -EAPI=4 -inherit xorg-2 - -DESCRIPTION="X.Org Input protocol headers" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} -!<x11-libs/libXi-1.2.99" diff --git a/x11-proto/inputproto/metadata.xml b/x11-proto/inputproto/metadata.xml deleted file mode 100644 index 01c4c00..0000000 --- a/x11-proto/inputproto/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>x11</herd> -</pkgmetadata> |