diff options
| author |   Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-03-18 12:12:13 +0100 |
|---|---|---|
| committer | Quentin Glidic <sardemff7+git@sardemff7.net> | 2017-03-18 12:12:13 +0100 |
| commit | eef5308e185f488733c6616f84ba37964317b126 (patch) | |
| tree | 14322ff213bff547a987d7c8754bae4b9beb215b /dev-libs | |
| parent | gursormake: Drop (diff) | |
| download | sardemff7-master.tar.gz sardemff7-master.tar.bz2 sardemff7-master.zip | |
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'dev-libs')
23 files changed, 0 insertions, 1631 deletions
diff --git a/dev-libs/ctpl/Manifest b/dev-libs/ctpl/Manifest deleted file mode 100644 index bf66f22..0000000 --- a/dev-libs/ctpl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -EBUILD ctpl-0.3.2.ebuild 638 RMD160 179de3a4b6cb1b491242cf85f0bfd8aaa64fc662 SHA1 d444d9efb365383b7350c10da6335a177d0ab9bf SHA256 fd7254fac91b97376b7b49bc4c4de0e5ae59a64f9ad5aa2777876a7af7c4399b -DIST ctpl-0.3.2.tar.gz 560262 RMD160 750be5503dd6811f099116582c866fae6aefc721 SHA1 49a835768fb151406439128d8616c1ca8712d759 SHA256 5e0cbcc2b0dfcbcb512acce988a0c00705759cec5ec68bfd8310605b67283f04 diff --git a/dev-libs/ctpl/ctpl-0.3.2.ebuild b/dev-libs/ctpl/ctpl-0.3.2.ebuild deleted file mode 100644 index d426fac..0000000 --- a/dev-libs/ctpl/ctpl-0.3.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v3 -# $Header: $ - -EAPI="3" - -inherit autotools - -DESCRIPTION="CTPL - C Template (Parser) Library" -HOMEPAGE="https://ctpl.tuxfamily.org" -SRC_URI="http://download.tuxfamily.org/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs" - -RDEPEND="dev-libs/glib" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die - find "${ED}" -name '*.la' -exec rm -f '{}' + || die - dodoc AUTHORS NEWS README -} diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog deleted file mode 100644 index a293e23..0000000 --- a/dev-libs/klibc/ChangeLog +++ /dev/null @@ -1,337 +0,0 @@ -# ChangeLog for dev-libs/klibc -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.72 2010/01/10 09:50:36 robbat2 Exp $ - - 10 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.12-r1.ebuild, - klibc-1.5.15.ebuild, klibc-1.5.15-r1.ebuild: - Bug #278957: use test instead of $FEATURES access. - - 25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org> klibc-1.5.8.ebuild, - klibc-1.5.11.ebuild, klibc-1.5.12.ebuild, klibc-1.5.12-r1.ebuild, - klibc-1.5.15.ebuild, klibc-1.5.15-r1.ebuild, - -files/klibc-1.5-nostrip.patch: - Remove 1 byte-sized patch (and ebuild reference to that). - -*klibc-1.5.15-r1 (16 Sep 2009) - - 16 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> - +klibc-1.5.15-r1.ebuild: - Bug #284957: Work for USE=savedconfig in progress. - - 15 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.15.ebuild: - Implement basic ARM support, thanks to the mv78100 board from Marvell. - -*klibc-1.5.15 (09 May 2009) - - 09 May 2009; Robin H. Johnson <robbat2@gentoo.org> +klibc-1.5.15.ebuild: - Bug 252880: version bump. 1.5.14 was broken, but 1.5.15 passes the - testsuite. - - 07 Nov 2008; Raúl Porcel <armin76@gentoo.org> klibc-1.5.12-r1.ebuild: - sparc/x86 stable wrt #238494 - - 01 Nov 2008; nixnut <nixnut@gentoo.org> klibc-1.5.12-r1.ebuild: - Stable on ppc wrt bug 238494 - - 01 Nov 2008; Jeremy Olexa <darkside@gentoo.org> klibc-1.5.12-r1.ebuild: - amd64 stable, bug 238494 - - 31 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.12-r1.ebuild: - Now with testing magic. - - 31 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.12-r1.ebuild: - Bug #242454 - be sure to check both locations for kernel sources. - - 06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - -*klibc-1.5.12-r1 (14 Jul 2008) - - 14 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> - +klibc-1.5.12-r1.ebuild: - Use 2.6.26, test with caution. - -*klibc-1.5.12 (14 Jul 2008) - - 14 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> +klibc-1.5.12.ebuild: - Version bump. - - 26 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> - -files/klibc-1.2.1-nostdinc-flags.patch, -files/klibc-1.2.4-kbuild.patch, - -files/klibc-1.4.7-nostdinc-flags.patch, -files/klibc-1.4.9-mips32.patch, - -files/klibc-1.4.13-resumelib.patch, -files/klibc-1.4.13-types.h.patch, - -klibc-1.2.1-r1.ebuild, -klibc-1.2.1-r2.ebuild, -klibc-1.4.12.ebuild, - -klibc-1.4.13.ebuild, -klibc-1.5.ebuild, -klibc-1.5.7.ebuild, - -klibc-1.5.7-r1.ebuild, -klibc-1.5.7-r2.ebuild: - Trim old ebuilds and patches. - -*klibc-1.5.11 (26 Jun 2008) - - 26 Jun 2008; Robin H. Johnson <robbat2@gentoo.org> - +files/klibc-1.5.11-klibcasmarch.patch, - +files/klibc-1.5.11-x86_64-io.h-return.diff, +klibc-1.5.11.ebuild: - Version bump per bug #217738, and also fix x86_64 io.h header per bug - #229525. - - 10 Mar 2008; Steve Dibb <beandog@gentoo.org> klibc-1.5.8.ebuild: - amd64 stable, bug 208131 - - 14 Feb 2008; nixnut <nixnut@gentoo.org> klibc-1.5.8.ebuild: - Stable on ppc wrt bug 208131 - - 13 Feb 2008; Dawid Węgliński <cla@gentoo.org> klibc-1.5.8.ebuild: - Stable on x86 (bug #208131) - -*klibc-1.5.8 (15 Jan 2008) - - 15 Jan 2008; Robin H. Johnson <robbat2@gentoo.org> - +files/klibc-1.5.7-strip-fix-dash-s.patch, +klibc-1.5.8.ebuild: - Version bump, and fix bug 201006. - - 21 Dec 2007; nixnut <nixnut@gentoo.org> klibc-1.5.7-r2.ebuild: - Stable on ppc wrt bug 195443 - -*klibc-1.5.7-r2 (14 Nov 2007) - - 14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> +klibc-1.5.7-r2.ebuild: - This revision fixes compiling of v86d (bug 198937) due to a missing patch, - and splashutils due to a broken asm symlink that was installed. - - 14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> klibc-1.5.7-r1.ebuild: - Bug #199048, we need to ignore KBUILD_OUTPUT. - -*klibc-1.5.7-r1 (12 Nov 2007) - - 12 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> - +files/klibc-1.5-klibcasmarch.patch, +klibc-1.5.7-r1.ebuild: - Bug #196521, some arches have a shared asm-ARCH directory in the kernel - sources, and klibc is not aware of this. - -*klibc-1.5.7 (12 Nov 2007) - - 12 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> - +files/klibc-1.5-nostrip.patch, +files/klibc-1.5-sigaction.patch, - +klibc-1.5.7.ebuild: - Bug #190113, add biarch support for ppc64-32ul et al. Redo of a lot of the - handling. - - 04 Nov 2007; Christian Heim <phreak@gentoo.org> metadata.xml: - Removing myself as the maintainer. - - 21 Oct 2007; Steve Dibb <beandog@gentoo.org> klibc-1.5.ebuild: - amd64 stable - - 14 Oct 2007; Mike Frysinger <vapier@gentoo.org> klibc-1.5.ebuild: - Add back in RESTRICT=strip for az. - - 11 Oct 2007; Christian Faulhammer <opfer@gentoo.org> klibc-1.5.ebuild: - stable x86, bug 195443 - - 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> klibc-1.1.ebuild, - klibc-1.2.1-r1.ebuild, klibc-1.2.1-r2.ebuild, klibc-1.4.12.ebuild, - klibc-1.4.13.ebuild: - (QA) RESTRICT clean up. - - 13 Jun 2007; Christian Heim <phreak@gentoo.org> klibc-1.5.ebuild: - Fixing cross compilation, thanks to Michal Januszewski in #181560. - -*klibc-1.5 (17 May 2007) - - 17 May 2007; Christian Heim <phreak@gentoo.org> +klibc-1.5.ebuild: - Version bump, finally at klibc-1.5. - - 13 May 2007; Christian Heim <phreak@gentoo.org> klibc-1.4.13.ebuild: - Really fix the permission problem (#178053) and also fix the sandbox - violation (#178208 - thanks to Roland Tapken, note to self: always use ${D} - in src_install). - - 12 May 2007; Christian Heim <phreak@gentoo.org> klibc-1.4.13.ebuild: - Fixing the permissions bug (#178053 - thanks to Tobias Sager <moixa at - gmx.ch>), hopefully fixing any further issues. - - 12 May 2007; Daniel Drake <dsd@gentoo.org> metadata.xml: - Move from kernel to kernel-misc herd - - 07 May 2007; Chris Gianelloni <wolf31o2@gentoo.org> klibc-1.4.13.ebuild: - Stable on amd64/ppc/x86 for splashutils. - - 10 Feb 2007; Christian Heim <phreak@gentoo.org> klibc-1.2.1-r2.ebuild: - Backporting the types.h fix from 1.4.33 to 1.2.1-r2, making current stable - work for kernel >=2.6.19. Quoting fixes. Backporting the QA_EXECSTACK stuff - from 1.4.33. - - 09 Feb 2007; Christian Heim <phreak@gentoo.org> - +files/klibc-1.4.13-types.h.patch, klibc-1.4.13.ebuild: - Quoting fixes, adding the -types.h patch suggested by Alon in #165472. - - 20 Jan 2007; Christian Heim <phreak@gentoo.org> - -files/klibc-1.1.16-mips-ldpaths.patch, -files/klibc-1.1.16-mips32.patch, - +files/klibc-1.4.13-resumelib.patch, metadata.xml, - -klibc-1.1.16-r1.ebuild, klibc-1.4.13.ebuild: - Remove klibc-1.1.16 (its slacking, no distfiles either upstream nor on - Gentoo mirrors), fixing compilation of 1.4.13 against 2.6.19 (#157618 - - thanks to Mike Benson <mike at kambe.com.au> and all the others), putting - dev-libs/klibc with the kernel herd. - - 03 Sep 2006; Michael Hanselmann <hansmi@gentoo.org> klibc-1.2.1-r2.ebuild: - Stable on ppc. - -*klibc-1.4.13 (27 Jul 2006) - - 27 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.4.13.ebuild: - Update version. - -*klibc-1.4.12 (25 Jul 2006) - - 25 Jul 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.4.12.ebuild: - Update version. - -*klibc-1.4.11 (19 Jul 2006) - - 19 Jul 2006; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.4.11-interp-flags.patch, +klibc-1.4.11.ebuild: - New testing release. - - 18 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> klibc-1.2.1-r2.ebuild: - Stable on amd64 wrt bug #139330. - - 16 Jul 2006; Joshua Jackson <tsunam@gentoo.org> klibc-1.2.1-r2.ebuild: - stable x86; bug #139330 - - 12 Jul 2006; Martin Schlemmer <azarah@gentoo.org> klibc-1.4.9.ebuild: - Add debug USE flag to just enable verbose output during build. - - 09 Jul 2006; Martin Schlemmer <azarah@gentoo.org> klibc-1.2.1-r2.ebuild, - klibc-1.4.9.ebuild: - Fix build issues on ppc, bug #130175. - -*klibc-1.4.9 (08 Jul 2006) - - 08 Jul 2006; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.4.8-dash-flags.patch, +files/klibc-1.4.9-mips32.patch, - +klibc-1.4.9.ebuild: - Update version. Try to do something about executable stack. Add mips n32 - patch again. Disable the stdinc patch as it seems to support - -fno-stack-protector. - -*klibc-1.4.8 (07 Jul 2006) - - 07 Jul 2006; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.4.7-nostdinc-flags.patch, +klibc-1.4.8.ebuild: - New release for testing. - -*klibc-1.2.1-r2 (07 Jul 2006) - - 07 Jul 2006; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.2.4-kbuild.patch, +klibc-1.2.1-r2.ebuild: - Fix building with KBUILD_OUTPUT set, bug #139330. Also fix manpage - installation path, bug #122173. Also multilib related fixes. - - 01 Jul 2006; Lars Weiler <pylon@gentoo.org> klibc-1.2.1-r1.ebuild: - Stable on ppc; bug #130175. - - 27 Apr 2006; Marien Zwart <marienz@gentoo.org> - files/digest-klibc-1.0.14-r1, files/digest-klibc-1.1, - files/digest-klibc-1.1.1, files/digest-klibc-1.1.16, - files/digest-klibc-1.1.16-r1, Manifest: - Fixing SHA256 digest, pass four - - 09 Feb 2006; Martin Schlemmer <azarah@gentoo.org> klibc-1.2.1-r1.ebuild: - Fix build logic for different KBUILD_OUT, bug #122173. Dash build still - fails with it set though, so need to wait for upstream to fix it. - -*klibc-1.2.1-r1 (07 Feb 2006) - - 07 Feb 2006; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.2.1-nostdinc-flags.patch, +klibc-1.2.1-r1.ebuild: - Export the NOSTDINC_FLAGS to ensure -nostdlib is passed, bug #120678. - -*klibc-1.2.1 (04 Feb 2006) - - 04 Feb 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.2.1.ebuild: - New release. - - 26 Jan 2006; Joshua Kinard <kumba@gentoo.org> - +files/klibc-1.1.16-mips-ldpaths.patch, +files/klibc-1.1.16-mips32.patch, - klibc-1.1.1.ebuild, klibc-1.1.16.ebuild, klibc-1.1.16-r1.ebuild: - Build fixes for mips - force 32bit build on mips64 systems if not using n32 - and fix a linker path bug for mips. - -*klibc-1.1.16-r1 (22 Jan 2006) - - 22 Jan 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.1.16-r1.ebuild: - Fix broken symlink creation. - - 21 Jan 2006; Lars Weiler <pylon@gentoo.org> klibc-1.1.16.ebuild: - Stable on ppc; bug #112742. - -*klibc-1.1.16 (20 Jan 2006) - - 20 Jan 2006; Martin Schlemmer <azarah@gentoo.org> +klibc-1.1.16.ebuild: - New version. - - 02 Jan 2006; Joshua Kinard <kumba@gentoo.org> klibc-1.1.ebuild: - Bump to stable for getdvhoff on mips. - -*klibc-1.1.1 (10 Nov 2005) - - 10 Nov 2005; Martin Schlemmer <azarah@gentoo.org> +klibc-1.1.1.ebuild: - New release. - - 18 Sep 2005; Joshua Kinard <kumba@gentoo.org> +files/klibc-1.1-mips32.patch, - klibc-1.1.ebuild: - Added a patch to allow klibc to build properly on mips systems w/ 64bit - kernel/32bit userland, and marked 1.1 ~mips. - -*klibc-1.1 (02 Sep 2005) - - 02 Sep 2005; Martin Schlemmer <azarah@gentoo.org> +klibc-1.1.ebuild: - New version. - -*klibc-1.0.14-r1 (26 Aug 2005) - - 26 Aug 2005; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.0.14-nostdlib.patch, +klibc-1.0.14-r1.ebuild: - Enable building on hardened systems, bug #103437. - - 29 Jun 2005; David Holm <dholm@gentoo.org> klibc-1.0.14.ebuild: - Added to ~ppc. - -*klibc-1.0.14 (28 Jun 2005) - - 28 Jun 2005; Martin Schlemmer <azarah@gentoo.org> +klibc-1.0.14.ebuild: - Update version. - -*klibc-1.0.8 (04 May 2005) - - 04 May 2005; Martin Schlemmer <azarah@gentoo.org> +klibc-1.0.8.ebuild: - Update version. Add KV_OUT_DIR support, bug #88072. - - 13 Mar 2005; Martin Schlemmer <azarah@gentoo.org> klibc-1.0.3.ebuild: - Add /usr/lib/klibc to PRELINK_PATH_MASK. - - 11 Mar 2005; Martin Schlemmer <azarah@gentoo.org> klibc-1.0.3.ebuild: - Fixup gunzip/zcat hardlinks of gzip becoming copies. Add perl to DEPEND and - RDEPEND, as its needed during build, and afterwards for klcc wrapper. Add - pkg_postinst() override for linux-mod eclass, as we do not install modules. - - 10 Mar 2005; Martin Schlemmer <azarah@gentoo.org> files/klibc.m4: - Update m4 macro. - -*klibc-1.0.3 (10 Mar 2005) - - 10 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +klibc-1.0.3.ebuild: - Update version. - - 10 Mar 2005; Martin Schlemmer <azarah@gentoo.org> - +files/klibc-1.0-makeklcc-empty-args.patch, klibc-1.0.ebuild: - Patch makeklcc.pl to not generate '' arrays if they are empty, else we get - the issue where '' is passed to ld, etc, and they fail with cannot find - file. - -*klibc-1.0 (09 Mar 2005) - - 09 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +metadata.xml, - +files/klibc.m4, +klibc-1.0.ebuild: - Initial version - diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest deleted file mode 100644 index 0c82f9a..0000000 --- a/dev-libs/klibc/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -MISC ChangeLog 12291 RMD160 615195ec36d1f35e63b9cb1efceb68ef48f775e2 SHA1 214528523fac5cacbbc469442e6a177a2fbb0c53 SHA256 1dae2ad70c56c6b7e4cc27c3560271295d6ba6b7e7e85e1fda414a0fcd6b5e49 -AUX klibc-1.1-mips32.patch 670 RMD160 ecab014d68b65837eb6088c21d95be0c23170cfc SHA1 68b24422a59e4479c636dfd4fcd56be06dc01db3 SHA256 42d127d2d5348b7856d33b7ffce986d49c7adbef82cf2bb34aa06a022fabad4c -AUX klibc-1.4.11-interp-flags.patch 494 RMD160 71081dc5eae8fff2adc43873f6b447f9b37a2432 SHA1 ecdea82ccbd77c63f8a65443fd64b65325869627 SHA256 ef8c05d059bc0185b8b68ea42e660fa13ddb55e9653b10fbfdabd77dea7abe2a -AUX klibc-1.5-klibcasmarch.patch 1109 RMD160 7c0b30335346b219db0f68427c76cf6113eabce2 SHA1 2524c67b74b42541a7c6f446ec5337768a292668 SHA256 7a84dacc12b93a58ac70dda11b977183c48ebc39fd101b0dbd0c16d3f0b5293e -AUX klibc-1.5-sigaction.patch 928 RMD160 00d04da5dfdf667d2ff46491212d98047adac925 SHA1 c996533744af2256c75fb7ab715a3942bf3c2768 SHA256 bd50f00b36fb4425c6921224bde5862c05fa6271c984bfadd94284cf3f5973e5 -AUX klibc-1.5.11-klibcasmarch.patch 1225 RMD160 bc339eaa902dcdb30e5487c0c0dbd9e22c5637ec SHA1 80cf59dd4f58745694b5b3088c4d72a9450a7547 SHA256 62ef197d4ed18e64fd64bd228849f9f73d2a4f9593ca0378f86fdba8e66c31f4 -AUX klibc-1.5.11-x86_64-io.h-return.diff 770 RMD160 cd44b54eabde1ff75967da37f2195875f7950c58 SHA1 ad20b47634e5069a599dff39e9ce1752537c2705 SHA256 f07c1d238626209693aea4e5fbb9accc5ae122ac603f4fb71fc4b58578d9cf8c -AUX klibc-1.5.7-strip-fix-dash-s.patch 420 RMD160 8dae7b8452fe5328c276fc192cad171d64cce245 SHA1 29acc727bd721259067e73399b6e6516ffdf95c0 SHA256 971cadc28aa362ff76ebfee8187bb6986afb4f3425b70b7200d1aa1c6fd746e7 -AUX klibc.m4 3619 RMD160 aee79c8296f375e3614fcf5d97b21ed9e043c719 SHA1 ebe92893215e7d7ec2e44af846c6ce83e7ef7f4b SHA256 02901ef2ca8b320d77b03fab4fa9bef809c11e2e418e7da00aa2c13c4a84dd44 -EBUILD klibc-9999.ebuild 6892 RMD160 1ab43e92631c605e0660bf8d539bef50b944b1c7 SHA1 edcd013bc95b5d48246f6a4ce548c7c950ce04d9 SHA256 f17614affd3093b7a88ebb8825776901b790c13446dad9180b0c286a57dc67c1 -DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6 diff --git a/dev-libs/klibc/files/klibc-1.1-mips32.patch b/dev-libs/klibc/files/klibc-1.1-mips32.patch deleted file mode 100644 index 8eaf5d1..0000000 --- a/dev-libs/klibc/files/klibc-1.1-mips32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp klibc-1.1.orig/MCONFIG klibc-1.1/MCONFIG ---- klibc-1.1.orig/MCONFIG 2005-09-20 02:16:17 -0400 -+++ klibc-1.1/MCONFIG 2005-09-20 02:16:57 -0400 -@@ -33,7 +33,7 @@ KRNLOBJ = $(SRCROOT)/linux - KLIBCVER = -D__KLIBC__=$(shell cut -d. -f1 < $(SRCROOT)/version) \ - -D__KLIBC_MINOR__=$(shell cut -d. -f2 < $(SRCROOT)/version) - --ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/) -+ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/ -e s/mips64/mips/) - CC = $(CROSS)gcc - LD = $(CROSS)ld - KLIBSRC = $(SRCROOT)/klibc diff --git a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch b/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch deleted file mode 100644 index a5bb917..0000000 --- a/dev-libs/klibc/files/klibc-1.4.11-interp-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/usr/klibc/Kbuild b/usr/klibc/Kbuild -index c2bfd2f..8066bda 100644 ---- a/usr/klibc/Kbuild -+++ b/usr/klibc/Kbuild -@@ -152,7 +152,7 @@ # build interp.o - targets += interp.o - - quiet_cmd_interp = BUILD $@ -- cmd_interp = $(KLIBCCC) $(klibccflags) -D__ASSEMBLY__ \ -+ cmd_interp = $(KLIBCCC) $(klibccflags) $(EXTRA_KLIBCAFLAGS) -D__ASSEMBLY__ \ - -DLIBDIR=\"$(SHLIBDIR)\" \ - -DSOHASH=\"$(SOLIBHASH)\" \ - -c -o $@ $< diff --git a/dev-libs/klibc/files/klibc-1.5-klibcasmarch.patch b/dev-libs/klibc/files/klibc-1.5-klibcasmarch.patch deleted file mode 100644 index 854d533..0000000 --- a/dev-libs/klibc/files/klibc-1.5-klibcasmarch.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100 -+++ b/scripts/Kbuild.install 2007-11-04 15:43:28.000000000 +0100 -@@ -84,6 +84,13 @@ - # 1) Create directories, install headers and man pages - # 2) Tell that we now install binaries - # 3) Install binaries by descending -+ -+# Arch specific definitions for klibc -+include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG -+ -+# include/asm-* architecture -+KLIBCASMARCH ?= $(KLIBCARCH) -+ - .PHONY: header footer descend - header: - $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" -@@ -95,7 +102,7 @@ - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin -- $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ -+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \ - mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \ - for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ - $(KLIBCKERNELOBJ)/include2 ; do \ diff --git a/dev-libs/klibc/files/klibc-1.5-sigaction.patch b/dev-libs/klibc/files/klibc-1.5-sigaction.patch deleted file mode 100644 index 59f4220..0000000 --- a/dev-libs/klibc/files/klibc-1.5-sigaction.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - usr/include/arch/ppc/klibc/archsignal.h | 6 ++++++ - usr/include/arch/sparc/klibc/archsignal.h | 7 ------- - 2 files changed, 6 insertions(+), 7 deletions(-) - ---- a/usr/include/arch/ppc/klibc/archsignal.h -+++ b/usr/include/arch/ppc/klibc/archsignal.h -@@ -8,7 +8,13 @@ - #ifndef _KLIBC_ARCHSIGNAL_H - #define _KLIBC_ARCHSIGNAL_H - -+#ifdef _SIGNAL_H -+#undef _SIGNAL_H - #include <asm/signal.h> -+#define _SIGNAL_H -+#else -+#include <asm/signal.h> -+#endif - /* No special stuff for this architecture */ - - #endif ---- a/usr/include/arch/sparc/klibc/archsignal.h -+++ b/usr/include/arch/sparc/klibc/archsignal.h -@@ -11,13 +11,6 @@ - #define __WANT_POSIX1B_SIGNALS__ - #include <asm/signal.h> - --struct sigaction { -- __sighandler_t sa_handler; -- unsigned long sa_flags; -- void (*sa_restorer)(void); /* Not used by Linux/SPARC */ -- sigset_t sa_mask; --}; -- - /* Not actually used by the kernel... */ - #define SA_RESTORER 0x80000000 - diff --git a/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch b/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch deleted file mode 100644 index 0404a66..0000000 --- a/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nuar --exclude '*.orig' --exclude '*.rej' klibc-1.5.11.orig/scripts/Kbuild.install klibc-1.5.11/scripts/Kbuild.install ---- klibc-1.5.11.orig/scripts/Kbuild.install 2008-06-15 17:28:23.000000000 -0700 -+++ klibc-1.5.11/scripts/Kbuild.install 2008-06-26 10:14:05.365949576 -0700 -@@ -84,6 +84,13 @@ - # 1) Create directories, install headers and man pages - # 2) Tell that we now install binaries - # 3) Install binaries by descending -+ -+# Arch specific definitions for klibc -+include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG -+ -+# include/asm-* architecture -+KLIBCASMARCH ?= $(KLIBCARCH) -+ - .PHONY: header footer descend - header: - $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" -@@ -95,7 +102,7 @@ - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin -- $(Q)set -e ; for d in linux asm asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ -+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \ - for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ - $(KLIBCKERNELOBJ)/include2 ; do \ - [ ! -d $$r/$$d ] && continue; \ diff --git a/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff b/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff deleted file mode 100644 index 8ed2fa0..0000000 --- a/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -Naur klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h klibc-1.5.8/usr/include/arch/x86_64/sys/io.h ---- klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h 2007-12-11 18:20:29.000000000 +0100 -+++ klibc-1.5.8/usr/include/arch/x86_64/sys/io.h 2008-06-26 12:04:22.760046895 +0200 -@@ -60,21 +60,21 @@ - { - unsigned char __v; - asm volatile ("inb %1,%0" : "=a" (__v) : "dN"(__p)); -- return v; -+ return __v; - } - - static __inline__ unsigned short inw(unsigned short __p) - { - unsigned short __v; - asm volatile ("inw %1,%0" : "=a" (__v) : "dN"(__p)); -- return v; -+ return __v; - } - - static __inline__ unsigned int inl(unsigned short __p) - { - unsigned int __v; - asm volatile ("inl %1,%0" : "=a" (__v) : "dN"(__p)); -- return v; -+ return __v; - } - - /* String I/O macros */ diff --git a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch b/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch deleted file mode 100644 index 94a0cae..0000000 --- a/dev-libs/klibc/files/klibc-1.5.7-strip-fix-dash-s.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp klibc-1.5.7-orig/klcc/klcc.in klibc-1.5.7/klcc/klcc.in ---- klibc-1.5.7-orig/klcc/klcc.in 2007-12-03 01:17:26.000000000 +0100 -+++ klibc-1.5.7/klcc/klcc.in 2007-12-03 01:18:39.000000000 +0100 -@@ -259,7 +259,7 @@ if ( $operation ne '' ) { - unlink(@rmobjs); - - if ( $strip && !$rv ) { -- $rv = mysystem($STRIP, @STRIPFLAGS, $output); -+ $rv = mysystem($STRIP, @STRIPFLAGS, $output || 'a.out'); - } - } - diff --git a/dev-libs/klibc/files/klibc.m4 b/dev-libs/klibc/files/klibc.m4 deleted file mode 100644 index 3892269..0000000 --- a/dev-libs/klibc/files/klibc.m4 +++ /dev/null @@ -1,94 +0,0 @@ -# klibc.m4 serial 99 -## Copyright (C) 1995-2003 Free Software Foundation, Inc. -## This file is free software, distributed under the terms of the GNU -## General Public License. As a special exception to the GNU General -## Public License, this file may be distributed as part of a program -## that contains a configuration script generated by Autoconf, under -## the same distribution terms as the rest of that program. -## -## This file can can be used in projects which are not available under -## the GNU General Public License or the GNU Library General Public -## License but which still want to provide support for the GNU gettext -## functionality. -## Please note that the actual code of the KLIBC Library is partly covered -## by the GNU Library General Public License, and party copyrighted by the -## Regents of The University of California, and the rest is covered by a -## MIT style license. - -# Authors: -# Martin Schlemmer <azarah@nosferatu.za.org>, 2005. - - -# AC_CHECK_KLIBC -# -------------- -# Check if the user wants KLIBC support enabled. If so, set KLIBC=yes and -# fill in KLIBC_PREFIX, KLIBC_BINDIR, KLIBC_SBINDIR, KLIBC_LIBDIR and -# KLIBC_INCLUDEDIR. CC is also set to the proper klcc executable. -# NOTE: This should be called before AC_PROG_CC, and before header, function -# or type checks. -AC_DEFUN([AC_CHECK_KLIBC], -[AC_BEFORE([$0], [AC_PROG_CC]) -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_ARG_ENABLE([klibc], - [AS_HELP_STRING([--enable-klibc], - [Enable linking to klibc [no]. You need at - least klibc-1.0 or later for this. Set KLCC - to the absolute file name of klcc if not in - the PATH])], - [KLIBC=$enableval], [KLIBC=no]) -AC_ARG_ENABLE([klibc-layout], - [AS_HELP_STRING([--enable-klibc-layout], - [Enable installing binaries, libraries and - headers into the klibc prefix [yes] ])], - [if test "X$KLIBC" != Xno; then - KLIBC_LAYOUT=$enableval - else - KLIBC_LAYOUT=no - fi], - [if test "X$KLIBC" != Xno; then - KLIBC_LAYOUT=yes - else - KLIBC_LAYOUT=no - fi]) - -if test "X$KLIBC" != Xno; then - # Basic cross compiling support. I do not think it is wise to use - # AC_CHECK_TOOL, because if we are cross compiling, we do not want - # just 'klcc' to be returned ... - if test "${host_alias}" != "${build_alias}"; then - AC_CHECK_PROGS([KLCC], [${host_alias}-klcc], [no]) - else - AC_CHECK_PROGS([KLCC], [klcc], [no]) - fi - if test "X$KLCC" = Xno; then - AC_MSG_ERROR([cannot find klibc frontend 'klcc'!]) - fi - - CC="$KLCC" - CFLAGS="-Os" - - KLIBC_KCROSS="$($KLCC -print-klibc-kcross 2>/dev/null)" - KLIBC_PREFIX="$($KLCC -print-klibc-prefix 2>/dev/null)" - KLIBC_BIN_DIR="$($KLCC -print-klibc-bindir 2>/dev/null)" - KLIBC_SBIN_DIR="${KLIBC_PREFIX}/${KLIBC_KCROSS}sbin" - KLIBC_LIB_DIR="$($KLCC -print-klibc-libdir 2>/dev/null)" - KLIBC_INCLUDE_DIR="$($KLCC -print-klibc-includedir 2>/dev/null)" - - if test "X$KLIBC_LAYOUT" != Xno; then - prefix="$KLIBC_PREFIX" - bindir="$KLIBC_BIN_DIR" - sbindir="$KLIBC_SBIN_DIR" - libdir="$KLIBC_LIB_DIR" - includedir="$KLIBC_INCLUDE_DIR" - fi - - # At least KLIBC_LIB_DIR should be valid, else klibc is too old or - # something went wrong - if test ! -d "$KLIBC_LIB_DIR"; then - AC_MSG_ERROR([your klibc installation is too old or not functional!]) - fi -fi - -AC_SUBST(KLIBC) -])# AC_CHECK_KLIBC - diff --git a/dev-libs/klibc/klibc-9999.ebuild b/dev-libs/klibc/klibc-9999.ebuild deleted file mode 100644 index d431979..0000000 --- a/dev-libs/klibc/klibc-9999.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -# Robin H. Johnson <robbat2@gentoo.org>, 12 Nov 2007: -# This still needs major work. -# But it is significently better than the previous version. -# In that it will now build on biarch systems, such as ppc64-32ul. - -# NOTES: -# ====== -# We need to bring in the kernel sources seperately -# Because they have to be configured in a way that differs from the copy in -# /usr/src/. The sys-kernel/linux-headers are too stripped down to use -# unfortunetly. -# This will be able to go away once the klibc author updates his code -# to build again the headers provided by the kernel's 'headers_install' target. - -EAPI="4" - -inherit eutils multilib toolchain-funcs git-2 - -EGIT_REPO_URI="git://git.kernel.org/pub/scm/libs/klibc/klibc.git" - -DESCRIPTION="A minimal libc subset for use with initramfs." -HOMEPAGE="http://www.zytor.com/mailman/listinfo/klibc" -KV_MAJOR="2" KV_MINOR="6" KV_SUB="39" -PKV_EXTRA="" -if [ -n "${PKV_EXTRA}" ]; then - PKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_SUB}+1))-${PKV_EXTRA}" - PATCH_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/patch-${PKV}.bz2" -fi -OKV="${KV_MAJOR}.${KV_MINOR}.${KV_SUB}" -KERNEL_URI=" - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2 - mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/testing/linux-${OKV}.tar.bz2" - -if use global-kernel; then - KS="/usr/src/linux" -else - SRC_URI=" - ${KERNEL_URI} - ${PATCH_URI} - " - KS="${WORKDIR}/linux-${OKV}" -fi - -LICENSE="|| ( GPL-2 LGPL-2 )" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="debug global-kernel" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND}" - -# Klibc has no PT_GNU_STACK support, so scanning for execstacks is moot -QA_EXECSTACK="*" -# Do not strip -RESTRICT="strip" - -kernel_asm_arch() { - a="${1:${ARCH}}" - case ${a} in - # Merged arches - x86|amd64) echo x86 ;; - ppc*) echo powerpc ;; - # Non-merged - alpha|arm|ia64|m68k|mips|sh|sparc*) echo ${1} ;; - *) die "TODO: Update the code for your asm-ARCH symlink" ;; - esac -} - -# For a given Gentoo ARCH, -# specify the kernel defconfig most relevant -kernel_defconfig() { - a="${1:${ARCH}}" - # most, but not all arches have a sanely named defconfig - case ${a} in - ppc64) echo ppc64_defconfig ;; - ppc) echo pmac32_defconfig ;; - sh*) die "TODO: Your arch is not supported by the klibc ebuild. Please suggest a defconfig in a bug." ;; - *) echo defconfig ;; - esac -} - -src_unpack() { - git-2_src_unpack - if ! use global-kernel; then - cd "${WORKDIR}" - unpack linux-${OKV}.tar.bz2 - [ -n "${PKV}" ] && EPATCH_OPTS="-d ${KS} -p1" epatch "${DISTDIR}"/patch-${PKV}.bz2 - fi -} - -src_prepare() { - ln -snf "${KS}" linux -} - -# klibc has it's own ideas of arches -# They reflect userspace strictly. -# This functions maps from a Gentoo ARCH, to an arch that klibc expects -# Look at klibc-${S}/usr/klibc/arch for a list of these arches -klibc_arch() { - a="${1:${ARCH}}" - case ${a} in - amd64) echo x86_64;; - x86) echo i386;; - *) echo ${a} ;; - esac -} - -src_compile() { - local myargs="all" - local myARCH="${ARCH}" myABI="${ABI}" - # TODO: For cross-compiling - # You should set ARCH and ABI here - CC="$(tc-getCC)" - HOSTCC="$(tc-getBUILD_CC)" - KLIBCARCH="$(klibc_arch ${ARCH})" - KLIBCASMARCH="$(kernel_asm_arch ${ARCH})" - libdir="$(get_libdir)" - # This should be the defconfig corresponding to your userspace! - # NOT your kernel. PPC64-32ul would choose 'ppc' for example. - defconfig=$(kernel_defconfig ${ARCH}) - unset ABI ARCH # Unset these, because they interfere - unset KBUILD_OUTPUT # we are using a private copy - - cd "${S}" - - use debug && myargs="${myargs} V=1" - use test && myargs="${myargs} test" - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ - HOSTCC="${HOSTCC}" CC="${CC}" \ - INSTALLDIR="/usr/${libdir}/klibc" \ - KLIBCARCH=${KLIBCARCH} \ - KLIBCASMARCH=${KLIBCASMARCH} \ - SHLIBDIR="/${libdir}" \ - libdir="/usr/${libdir}" \ - mandir="/usr/share/man" \ - T="${T}" \ - ${myargs} || die "Compile failed!" - - #SHLIBDIR="/${libdir}" \ - - ARCH="${myARCH}" ABI="${myABI}" -} - -src_install() { - local myargs - local myARCH="${ARCH}" myABI="${ABI}" - # TODO: For cross-compiling - # You should set ARCH and ABI here - CC="$(tc-getCC)" - HOSTCC="$(tc-getBUILD_CC)" - KLIBCARCH="$(klibc_arch ${ARCH})" - KLIBCASMARCH="$(kernel_asm_arch ${ARCH})" - libdir="$(get_libdir)" - # This should be the defconfig corresponding to your userspace! - # NOT your kernel. PPC64-32ul would choose 'ppc' for example. - defconfig=$(kernel_defconfig ${ARCH}) - - use debug && myargs="${myargs} V=1" - - local klibc_prefix - if tc-is-cross-compiler ; then - klibc_prefix=$("${S}/klcc/${KLIBCARCH}-klcc" -print-klibc-prefix) - else - klibc_prefix=$("${S}/klcc/klcc" -print-klibc-prefix) - fi - - unset ABI ARCH # Unset these, because they interfere - unset KBUILD_OUTPUT # we are using a private copy - - emake \ - EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \ - EXTRA_KLIBCLDFLAGS="-z,noexecstack" \ - HOSTCC="${HOSTCC}" CC="${CC}" \ - INSTALLDIR="/usr/${libdir}/klibc" \ - INSTALLROOT="${D}" \ - KLIBCARCH=${KLIBCARCH} \ - KLIBCASMARCH=${KLIBCASMARCH} \ - SHLIBDIR="/${libdir}" \ - libdir="/usr/${libdir}" \ - mandir="/usr/share/man" \ - ${myargs} \ - install || die "Install failed!" - - #SHLIBDIR="/${libdir}" \ - - # klibc doesn't support prelinking, so we need to mask it - cat > "${T}/70klibc" <<-EOF - PRELINK_PATH_MASK="/usr/${libdir}/klibc" - EOF - - doenvd "${T}"/70klibc - - # Fix the permissions (bug #178053) on /usr/${libdir}/klibc/include - # Actually I have no idea, why the includes have those weird-ass permissions - # on a particular system, might be due to inherited permissions from parent - # directory - find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX - - # Hardlinks becoming copies - for x in gunzip zcat ; do - rm -f "${D}/${klibc_prefix}/bin/${x}" - dosym gzip "${klibc_prefix}/bin/${x}" - done - - # Restore now, so we can use the tc- functions - ARCH="${myARCH}" ABI="${myABI}" - if ! tc-is-cross-compiler ; then - cd "${S}" - insinto /usr/share/aclocal - doins contrib/klibc.m4 - - dodoc README usr/klibc/CAVEATS - docinto kinit; dodoc usr/kinit/README - docinto gzip; dodoc usr/gzip/README - docinto zlib; dodoc usr/klibc/zlib/README - fi - - # Fix up the symlink - # Mainly for merged arches - linkname="${D}/usr/${libdir}/klibc/include/asm" - if [ -L "${linkname}" ] && [ ! -e "${linkname}" ] ; then - ln -snf asm-${KLIBCASMARCH} "${linkname}" - fi -} - -src_test() { - if ! tc-is-cross-compiler ; then - cd "${S}"/usr/klibc/tests - ALL_TESTS="$(ls *.c |sed 's,\.c$,,g')" - BROKEN_TESTS="idtest fcntl fnmatch testrand48" - failed=0 - for t in $ALL_TESTS ; do - if has $t $BROKEN_TESTS ; then - echo "=== $t SKIP" - else - echo -n "=== $t " - ./$t </dev/null >/dev/null - rc=$? - if [ $rc -eq 0 ]; then - echo PASS - else - echo FAIL - failed=1 - fi - fi - done - [ $failed -ne 0 ] && die "Some tests failed." - fi -} diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest deleted file mode 100644 index e200cfb..0000000 --- a/dev-libs/nspr/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX libs.patch 1990 RMD160 f8546cc5f5ff0144b8f527b00691baaaa2f51c31 SHA1 fa9b036e4b96a3f88b57818d01721ed4f6adca98 SHA256 d8589298735028e9899e767da382523d83331f2c358440beaccf34ca569567be -AUX nspr-4.6.1-config-1.patch 565 RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 SHA1 51f8e14107dc2edc951377991e9a7d08757d0f91 SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 -AUX nspr-4.7.0-prtime.patch 962 RMD160 a8c5598d07fb75550f946ec4105ade7128e4404e SHA1 aa731691e91691a66b6de0fdcf912f8e09a9b5a8 SHA256 b586ecb71bffa3b083a875d476792aa1f61a5126a9e6d5669c81034888d284a2 -AUX pkgconfig.patch 4163 RMD160 819ccb5a25eea74b5e8cca4bb51153561e6a32f3 SHA1 c537e724a98b59571e96dc82c30508d1086b55eb SHA256 2dc4474319af965486d5c32686806f25b90cc21d756f561a94fff06ec8471bcc -EBUILD nspr-9999.ebuild 1882 RMD160 4c471a603d6123d81ff729f8b94ff8a90851bcaa SHA1 b3b7b8d3febf386fe6d936594881f461c7838973 SHA256 5823acf46c8636118cb5394290db270831691598e66b3ee952fd3fd0eafced96 diff --git a/dev-libs/nspr/files/libs.patch b/dev-libs/nspr/files/libs.patch deleted file mode 100644 index 2266ee5..0000000 --- a/dev-libs/nspr/files/libs.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- mozilla/nsprpub/lib/libc/src/Makefile.in.orig 2005-06-01 14:28:26.000000000 +0000 -+++ mozilla/nsprpub/lib/libc/src/Makefile.in 2006-01-15 02:50:39.000000000 +0000 -@@ -112,6 +112,10 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_ARCH), Linux) -+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH),OS2) - MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def - GARBAGE += $(MAPFILE) ---- mozilla/nsprpub/lib/ds/Makefile.in.orig 2005-06-01 14:28:25.000000000 +0000 -+++ mozilla/nsprpub/lib/ds/Makefile.in 2006-01-15 02:52:30.000000000 +0000 -@@ -102,6 +102,10 @@ - MKSHLIB += -R '$$ORIGIN' - endif - -+ifeq ($(OS_ARCH), Linux) -+DSO_LDOPTS += -Wl,-R,'$$ORIGIN' -+endif -+ - ifeq ($(OS_ARCH),OS2) - MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def - GARBAGE += $(MAPFILE) ---- mozilla/nsprpub/pr/src/Makefile.in.orig 2005-06-01 14:28:27.000000000 +0000 -+++ mozilla/nsprpub/pr/src/Makefile.in 2006-01-15 03:29:36.000000000 +0000 -@@ -168,6 +168,7 @@ - else - OS_LIBS = -ldl - endif -+DSO_LDOPTS +=-Wl,-R,'$$ORIGIN' - endif - - ifeq ($(OS_ARCH),HP-UX) ---- mozilla/nsprpub/config/nspr-config.in.orig 2005-05-11 00:53:41.000000000 +0000 -+++ mozilla/nsprpub/config/nspr-config.in 2006-01-15 06:37:58.000000000 +0000 -@@ -122,7 +122,7 @@ - fi - - if test "$echo_libs" = "yes"; then -- libdirs=-L$libdir -+ libdirs="-Wl,-R$libdir -L$libdir" - if test -n "$lib_plds"; then - libdirs="$libdirs -lplds${major_version}" - fi ---- mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000 -+++ mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000 -@@ -3893,7 +3893,7 @@ - PR_MD_CSRCS=linux.c - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' - DSO_CFLAGS=-fPIC -- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)' - _OPTIMIZE_FLAGS=-O2 - _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that - # combo is not yet good at debugging inlined diff --git a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch deleted file mode 100644 index a7d5361..0000000 --- a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/nsprpub/configure.orig 2006-01-14 22:41:37.000000000 +0000 -+++ mozilla/nsprpub/configure 2006-01-14 22:49:14.000000000 +0000 -@@ -3893,7 +3893,7 @@ - PR_MD_CSRCS=linux.c - MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' - DSO_CFLAGS=-fPIC -- DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' -+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)' - _OPTIMIZE_FLAGS=-O2 - _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that - # combo is not yet good at debugging inlined diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch deleted file mode 100644 index af6dce6..0000000 --- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 -+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 -@@ -1536,7 +1536,7 @@ - case TT_EET: zone_offset = 2 * 60; break; - case TT_JST: zone_offset = 9 * 60; break; - default: -- PR_ASSERT (0); -+ return PR_FAILURE; - break; - } - } -@@ -1578,11 +1578,12 @@ - struct tm localTime; - time_t secs; - -- PR_ASSERT(result->tm_month > -1 && -+ if (!(result->tm_month > -1 && - result->tm_mday > 0 && - result->tm_hour > -1 && - result->tm_min > -1 && -- result->tm_sec > -1); -+ result->tm_sec > -1)) -+ return PR_FAILURE; - - /* - * To obtain time_t from a tm structure representing the local diff --git a/dev-libs/nspr/files/pkgconfig.patch b/dev-libs/nspr/files/pkgconfig.patch deleted file mode 100644 index 25ad5bd..0000000 --- a/dev-libs/nspr/files/pkgconfig.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -r 40ebe6af8a66 nsprpub/config/Makefile.in ---- a/nsprpub/config/Makefile.in Sat Apr 16 17:57:51 2011 +0200 -+++ b/nsprpub/config/Makefile.in Sat Apr 16 19:03:01 2011 +0200 -@@ -52,9 +52,10 @@ - - # autoconf.mk must be deleted last (from the top-level directory) - # because it is included by every makefile. --DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config -+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc - - RELEASE_BINS = nspr-config -+RELEASE_PC = nspr.pc - - include $(topsrcdir)/config/config.mk - -diff -r 40ebe6af8a66 nsprpub/config/config.mk ---- a/nsprpub/config/config.mk Sat Apr 16 17:57:51 2011 +0200 -+++ b/nsprpub/config/config.mk Sat Apr 16 19:03:01 2011 +0200 -@@ -175,6 +175,7 @@ - RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include - RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin - RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib -+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig - - # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including - # this file -diff -r 40ebe6af8a66 nsprpub/config/nspr-config.in ---- a/nsprpub/config/nspr-config.in Sat Apr 16 17:57:51 2011 +0200 -+++ b/nsprpub/config/nspr-config.in Sat Apr 16 19:03:01 2011 +0200 -@@ -92,13 +92,13 @@ - - # Set variables that may be dependent upon other variables - if test -z "$exec_prefix"; then -- exec_prefix=@exec_prefix@ -+ exec_prefix=`pkg-config --variable=exec_prefix nspr` - fi - if test -z "$includedir"; then -- includedir=@includedir@ -+ includedir=`pkg-config --variable=includedir nspr` - fi - if test -z "$libdir"; then -- libdir=@libdir@ -+ libdir=`pkg-config --variable=libdir nspr` - fi - - if test "$echo_prefix" = "yes"; then -diff -r 40ebe6af8a66 nsprpub/config/nspr.pc.in ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/nsprpub/config/nspr.pc.in Sat Apr 16 19:03:01 2011 +0200 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSPR -+Description: The Netscape Portable Runtime -+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ -+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir} -+Cflags: -I${includedir} -+ -diff -r 40ebe6af8a66 nsprpub/config/rules.mk ---- a/nsprpub/config/rules.mk Sat Apr 16 17:57:51 2011 +0200 -+++ b/nsprpub/config/rules.mk Sat Apr 16 19:03:01 2011 +0200 -@@ -207,7 +207,7 @@ - rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) - +$(LOOP_OVER_DIRS) - --install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) -+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) - ifdef RELEASE_BINS - $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) - endif -@@ -217,6 +217,9 @@ - ifdef RELEASE_LIBS - $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) - endif -+ifdef RELEASE_PC -+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ -+endif - +$(LOOP_OVER_DIRS) - - release:: export -@@ -252,6 +255,23 @@ - fi - cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) - endif -+ifdef RELEASE_PC -+ @echo "Copying pkg-config files to release directory" -+ @if test -z "$(BUILD_NUMBER)"; then \ -+ echo "BUILD_NUMBER must be defined"; \ -+ false; \ -+ else \ -+ true; \ -+ fi -+ @if test ! -d $(RELEASE_PC_DEST); then \ -+ rm -rf $(RELEASE_PC_DEST); \ -+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ -+ else \ -+ true; \ -+ fi -+ cp $(RELEASE_PC) $(RELEASE_PC_DEST) -+endif -+ - +$(LOOP_OVER_DIRS) - - alltags: -diff -r 40ebe6af8a66 nsprpub/configure.in ---- a/nsprpub/configure.in Sat Apr 16 17:57:51 2011 +0200 -+++ b/nsprpub/configure.in Sat Apr 16 19:03:01 2011 +0200 -@@ -3348,6 +3348,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+ config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -r 40ebe6af8a66 nsprpub/configure ---- a/nsprpub/configure Sat Apr 16 17:57:51 2011 +0200 -+++ b/nsprpub/configure Sat Apr 16 19:03:01 2011 +0200 -@@ -6676,6 +6676,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+ config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile diff --git a/dev-libs/nspr/nspr-9999.ebuild b/dev-libs/nspr/nspr-9999.ebuild deleted file mode 100644 index 7c395ee..0000000 --- a/dev-libs/nspr/nspr-9999.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -inherit mozilla-scm - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug static-libs" - -src_prepare() { - mkdir inst - #epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/libs.patch - epatch "${FILESDIR}"/pkgconfig.patch - sed -i -e 's/perl5//g' nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - nsprpub/config/rules.mk -} - -src_configure() { - cd "${S}"/build - - ECONF_SOURCE="../nsprpub" econf \ - $(use_enable amd64 64bit) \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - || die "econf failed" -} - -src_compile() { - cd "${S}"/build - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" -} - -src_install () { - # Their build system is royally confusing, as usual - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - if ! use static-libs; then - for file in *.a; do - rm -f ${file} || die "failed to remove static libraries." - done - fi - - local n= - MINOR_VERSION=$(sed -n -r -e 's|.*NSPR_[0-9]+_([0-9]+)(_[0-9]+)?.*|\1|p' "${S}"/nsprpub/TAG-INFO) - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die "failed to mv files around" - ln -s ${n} ${file} || die "failed to symlink files." - done - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} - -pkg_postinst() { - ewarn - ewarn "Please make sure you run revdep-rebuild after upgrade." - ewarn "This is *extremely* important to ensure your system nspr works properly." - ewarn -} diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest deleted file mode 100644 index 6700ee6..0000000 --- a/dev-libs/nss/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX fixup-warnings.patch 297 RMD160 5efdb10d8d6c5794914c259d3f63875cc539ebf5 SHA1 d6041a9a124728306c607531f90192d5ef5a433c SHA256 fa10039990cbca86908027036435e5d44afcc4c5c1470594dc76a7a16726e4e9 -AUX nss-config-pkgconfig.patch 6554 RMD160 ee74932d7a6a1d574cb9cdeec644774ede0332cd SHA1 06c51d85e6380d5279014d302eec2cf8bf58ec32 SHA256 33aefad7408ec14ff517dfb77fb8698e52b1400ff4f0d355881482bd24a78c0b -EBUILD nss-9999.ebuild 5786 RMD160 4f45685a649f8e885d4bb58113db9bbf48f84664 SHA1 f5acb19f1fe9055e8ad6a35548b74ab54925ec67 SHA256 984afbaeae764a220c24abfbee7f611bc991e984fcd9bafe796bbfd52174ce7b diff --git a/dev-libs/nss/files/fixup-warnings.patch b/dev-libs/nss/files/fixup-warnings.patch deleted file mode 100644 index 826124e..0000000 --- a/dev-libs/nss/files/fixup-warnings.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- nss-3.12.6b/mozilla/security/coreconf/Linux.mk-old 2010-02-11 12:43:26.000000000 -0600 -+++ nss-3.12.6b/mozilla/security/coreconf/Linux.mk 2010-02-14 09:13:53.962449644 -0600 -@@ -120,6 +120,7 @@ - ifdef MOZ_DEBUG_SYMBOLS - OPTIMIZER += -gstabs+ - endif -+OPTIMIZER += -fno-strict-aliasing - endif diff --git a/dev-libs/nss/files/nss-config-pkgconfig.patch b/dev-libs/nss/files/nss-config-pkgconfig.patch deleted file mode 100644 index 6a4c8b0..0000000 --- a/dev-libs/nss/files/nss-config-pkgconfig.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.5/mozilla/security/nss/config/Makefile ---- nss-3.12.5-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265 -0500 -@@ -0,0 +1,40 @@ -+CORE_DEPTH = ../.. -+DEPTH = ../.. -+ -+include $(CORE_DEPTH)/coreconf/config.mk -+ -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` -+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` -+PREFIX = /usr -+ -+all: export libs -+ -+export: -+ # Create the nss.pc file -+ mkdir -p $(DIST)/lib/pkgconfig -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@exec_prefix@,\$${prefix}," \ -+ -e "s,@libdir@,\$${prefix}/gentoo/nss," \ -+ -e "s,@includedir@,\$${prefix}/include/nss," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss.pc.in > nss.pc -+ chmod 0644 nss.pc -+ ln -sf ../../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig -+ -+ # Create the nss-config script -+ mkdir -p $(DIST)/bin -+ sed -e "s,@prefix@,$(PREFIX)," \ -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ -+ nss-config.in > nss-config -+ chmod 0755 nss-config -+ ln -sf ../../../../security/nss/config/nss-config $(DIST)/bin -+ -+libs: -+ -+dummy: all export libs -+ -diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-3.12.5/mozilla/security/nss/config/nss-config.in ---- nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.190638078 -0500 -@@ -0,0 +1,145 @@ -+#!/bin/sh -+ -+prefix=@prefix@ -+ -+major_version=@NSS_MAJOR_VERSION@ -+minor_version=@NSS_MINOR_VERSION@ -+patch_version=@NSS_PATCH_VERSION@ -+ -+usage() -+{ -+ cat <<EOF -+Usage: nss-config [OPTIONS] [LIBRARIES] -+Options: -+ [--prefix[=DIR]] -+ [--exec-prefix[=DIR]] -+ [--includedir[=DIR]] -+ [--libdir[=DIR]] -+ [--version] -+ [--libs] -+ [--cflags] -+Dynamic Libraries: -+ nss -+ ssl -+ smime -+ nssutil -+EOF -+ exit $1 -+} -+ -+if test $# -eq 0; then -+ usage 1 1>&2 -+fi -+ -+lib_ssl=yes -+lib_smime=yes -+lib_nss=yes -+lib_nssutil=yes -+ -+while test $# -gt 0; do -+ case "$1" in -+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -+ *) optarg= ;; -+ esac -+ -+ case $1 in -+ --prefix=*) -+ prefix=$optarg -+ ;; -+ --prefix) -+ echo_prefix=yes -+ ;; -+ --exec-prefix=*) -+ exec_prefix=$optarg -+ ;; -+ --exec-prefix) -+ echo_exec_prefix=yes -+ ;; -+ --includedir=*) -+ includedir=$optarg -+ ;; -+ --includedir) -+ echo_includedir=yes -+ ;; -+ --libdir=*) -+ libdir=$optarg -+ ;; -+ --libdir) -+ echo_libdir=yes -+ ;; -+ --version) -+ echo ${major_version}.${minor_version}.${patch_version} -+ ;; -+ --cflags) -+ echo_cflags=yes -+ ;; -+ --libs) -+ echo_libs=yes -+ ;; -+ ssl) -+ lib_ssl=yes -+ ;; -+ smime) -+ lib_smime=yes -+ ;; -+ nss) -+ lib_nss=yes -+ ;; -+ nssutil) -+ lib_nssutil=yes -+ ;; -+ *) -+ usage 1 1>&2 -+ ;; -+ esac -+ shift -+done -+ -+# Set variables that may be dependent upon other variables -+if test -z "$exec_prefix"; then -+ exec_prefix=`pkg-config --variable=exec_prefix nss` -+fi -+if test -z "$includedir"; then -+ includedir=`pkg-config --variable=includedir nss` -+fi -+if test -z "$libdir"; then -+ libdir=`pkg-config --variable=libdir nss` -+fi -+ -+if test "$echo_prefix" = "yes"; then -+ echo $prefix -+fi -+ -+if test "$echo_exec_prefix" = "yes"; then -+ echo $exec_prefix -+fi -+ -+if test "$echo_includedir" = "yes"; then -+ echo $includedir -+fi -+ -+if test "$echo_libdir" = "yes"; then -+ echo $libdir -+fi -+ -+if test "$echo_cflags" = "yes"; then -+ echo -I$includedir -+fi -+ -+if test "$echo_libs" = "yes"; then -+ libdirs="-Wl,-R$libdir -L$libdir" -+ if test -n "$lib_ssl"; then -+ libdirs="$libdirs -lssl${major_version}" -+ fi -+ if test -n "$lib_smime"; then -+ libdirs="$libdirs -lsmime${major_version}" -+ fi -+ if test -n "$lib_nss"; then -+ libdirs="$libdirs -lnss${major_version}" -+ fi -+ if test -n "$lib_nssutil"; then -+ libdirs="$libdirs -lnssutil${major_version}" -+ fi -+ echo $libdirs -+fi -+ -diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in nss-3.12.5/mozilla/security/nss/config/nss.pc.in ---- nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.653637310 -0500 -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSS -+Description: Network Security Services -+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ -+Requires: nspr >= 4.8 -+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} -+Cflags: -I${includedir} -+ -diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefile nss-3.12.5/mozilla/security/nss/Makefile ---- nss-3.12.5-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 -@@ -78,7 +78,7 @@ - # (7) Execute "local" rules. (OPTIONAL). # - ####################################################################### - --nss_build_all: build_coreconf build_nspr build_dbm all -+nss_build_all: build_coreconf build_dbm all - - nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber - -@@ -140,12 +140,6 @@ - --with-dist-prefix='$(NSPR_PREFIX)' \ - --with-dist-includedir='$(NSPR_PREFIX)/include' - --build_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber -- - build_dbm: - ifndef NSS_DISABLE_DBM - cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs -diff -urN nss-3.12.5-orig/mozilla/security/nss/manifest.mn nss-3.12.5/mozilla/security/nss/manifest.mn ---- nss-3.12.5-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 -+++ nss-3.12.5/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -0500 -@@ -42,6 +42,6 @@ - - RELEASE = nss - --DIRS = lib cmd -+DIRS = lib cmd config diff --git a/dev-libs/nss/nss-9999.ebuild b/dev-libs/nss/nss-9999.ebuild deleted file mode 100644 index 927fb82..0000000 --- a/dev-libs/nss/nss-9999.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -inherit mozilla-scm flag-o-matic - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="utils" - -DEPEND="" -RDEPEND="~dev-libs/nspr-9999 - >=dev-db/sqlite-3.5" - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/nss-config-pkgconfig.patch" - epatch "${FILESDIR}/fixup-warnings.patch" - - cd "${S}"/security/coreconf - # hack nspr paths - echo 'INCLUDES += -I'"${EPREFIX}"'/usr/include/nspr -I$(DIST)/include/dbm' \ - >> headers.mk || die "failed to append include" - - # modify install path - sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - - # Ensure we stay multilib aware - #sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - #sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - #"${S}"/security/nss/config/Makefile - - # dirty hack - cd "${S}"/security/nss - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ - lib/ssl/config.mk || die - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ - cmd/platlibs.mk || die - - ln -sf Linux2.6.mk "${S}"/security/coreconf/Linux3.0.mk -} - -src_configure() { - strip-flags - - use amd64 && export USE_64=1 - - export NSPR_INCLUDE_DIR=`nspr-config --includedir` - export NSPR_LIB_DIR=`nspr-config --libdir` - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export XCFLAGS="${CFLAGS}" - export FREEBL_NO_DEPEND=1 -} - -src_compile() { - cd "${S}"/security/coreconf - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/security/dbm - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/security/nss - emake -j1 CC="$(tc-getCC)" || die "nss make failed" -} - -# Altering these 3 libraries breaks the CHK verification. -# All of the following cause it to break: -# - stripping -# - prelink -# - ELF signing -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html -# Either we have to NOT strip them, or we have to forcibly resign after -# stripping. -#local_libdir="$(get_libdir)" -#export STRIP_MASK=" -# */${local_libdir}/libfreebl3.so* -# */${local_libdir}/libnssdbm3.so* -# */${local_libdir}/libsoftokn3.so*" - -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" - -generate_chk() { - local shlibsign="$1" - local libdir="$2" - einfo "Resigning core NSS libraries for FIPS validation" - shift 2 - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libname=lib${i}.so - local chkname=lib${i}.chk - "${shlibsign}" \ - -i "${libdir}"/${libname} \ - -o "${libdir}"/${chkname}.tmp \ - && mv -f \ - "${libdir}"/${chkname}.tmp \ - "${libdir}"/${chkname} \ - || die "Failed to sign ${libname}" - done -} - -cleanup_chk() { - local libdir="$1" - shift 1 - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libfname="${libdir}/lib${i}.so" - # If the major version has changed, then we have old chk files. - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ - && rm -f "${libfname}.chk" - done -} - -src_install () { - MINOR_VERSION=$(sed -n -r -e 's|.*NSS_[0-9]+_([0-9]+)_[0-9]+.*|\1|p' "${S}"/security/nss/TAG-INFO) - cd "${S}"/security/dist - - dodir /usr/$(get_libdir) - cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed" - # We generate these after stripping the libraries, else they don't match. - #cp -L */lib/*.chk "${ED}"/usr/$(get_libdir) || die "copying chk files failed" - cp -L */lib/libcrmf.a "${ED}"/usr/$(get_libdir) || die "copying libs failed" - - # Install nss-config and pkgconfig file - dodir /usr/bin - cp -L */bin/nss-config "${ED}"/usr/bin - dodir /usr/$(get_libdir)/pkgconfig - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h - cd "${ED}"/usr/$(get_libdir) - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} - ln -s ${n} ${file} - done - - local nssutils - # Always enabled because we need it for chk generation. - nssutils="shlibsign" - if use utils; then - # The tests we do not need to install. - #nssutils_test="bltest crmftest dbtest dertimetest - #fipstest remtest sdrtest" - nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert - cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit - nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode - pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt - symkeyutil tstclnt vfychain vfyserv" - fi - cd "${S}"/security/dist/*/bin/ - for f in $nssutils; do - dobin ${f} - done - - # Prelink breaks the CHK files. We don't have any reliable way to run - # shlibsign after prelink. - declare -a libs - for l in ${NSS_CHK_SIGN_LIBS} ; do - libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so") - done - OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}" - echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss" - unset libs liblist - doenvd "${T}/90nss" -} - -pkg_postinst() { - elog "We have reverted back to using upstreams soname." - elog "Please run revdep-rebuild --library libnss3.so.12 , this" - elog "will correct most issues. If you find a binary that does" - elog "not run please re-emerge package to ensure it properly" - elog " links after upgrade." - elog - # We must re-sign the libraries AFTER they are stripped. - generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir) -} - -pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) -} |