From f15db7bca239f527138352f7cce8aba8f26fd6fd Mon Sep 17 00:00:00 2001 From: root Date: Thu, 20 Jun 2013 02:07:14 +0400 Subject: [PATCH] Sync with portage [Thu Jun 20 02:07:12 MSK 2013]. --- app-editors/nano/nano-2.3.2.ebuild | 4 +- .../mc-4.8.8-segfault-unowned-temp-dir.patch | 22 + app-misc/mc/mc-4.8.8-r1.ebuild | 100 ++++ app-misc/vifm/vifm-0.7.5.ebuild | 6 +- app-office/lyx/lyx-2.0.6.ebuild | 4 +- app-text/zathura-cb/metadata.xml | 4 - app-text/zathura-djvu/metadata.xml | 4 - .../zathura-djvu/zathura-djvu-0.2.3.ebuild | 9 +- app-text/zathura-meta/metadata.xml | 4 - app-text/zathura-pdf-mupdf/metadata.xml | 4 - .../zathura-pdf-mupdf-0.2.3.ebuild | 9 +- .../zathura-pdf-mupdf-9999.ebuild | 9 +- app-text/zathura-pdf-poppler/metadata.xml | 4 - .../zathura-pdf-poppler-0.2.3.ebuild | 3 +- app-text/zathura-ps/metadata.xml | 4 - app-text/zathura-ps/zathura-ps-0.2.2.ebuild | 9 +- app-text/zathura/metadata.xml | 4 - dev-cpp/gtest/gtest-1.6.0-r2.ebuild | 4 +- dev-haskell/async/async-2.0.1.4.ebuild | 6 +- dev-libs/libclc/Manifest | 1 + .../libclc/libclc-0.0.1_pre20130524.ebuild | 49 ++ dev-libs/libclc/metadata.xml | 5 + dev-libs/nspr/Manifest | 7 - dev-libs/nspr/files/nspr-4.6.1-config.patch | 89 ---- .../files/nspr-4.8-pkgconfig-gentoo-2.patch | 126 ----- .../files/nspr-4.8-pkgconfig-gentoo-3.patch | 126 ----- .../nspr/files/nspr-4.8.3-aix-soname.patch | 43 -- dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch | 91 ---- dev-libs/nspr/nspr-4.8.8.ebuild | 105 ---- dev-libs/nspr/nspr-4.8.9.ebuild | 112 ----- dev-libs/nspr/nspr-4.9.1.ebuild | 107 ---- dev-libs/nspr/nspr-4.9.2-r1.ebuild | 109 ----- dev-libs/nspr/nspr-4.9.2.ebuild | 107 ---- dev-libs/nspr/nspr-4.9.4.ebuild | 109 ----- dev-libs/nspr/nspr-4.9.5-r1.ebuild | 109 ----- dev-libs/nspr/nspr-4.9.5-r2.ebuild | 95 ---- dev-libs/nspr/nspr-4.9.6.ebuild | 95 ---- dev-libs/nspr/nspr-4.9.ebuild | 108 ---- dev-libs/nss/Manifest | 13 - .../nss/files/nss-3.12.11-CVE-2011-3640.patch | 137 ------ .../nss/files/nss-3.12.4-solaris-gcc.patch | 33 -- .../nss/files/nss-3.12.5-gentoo-fixups.diff | 245 --------- .../nss/files/nss-3.13-gentoo-fixup.patch | 245 --------- .../nss/files/nss-3.13.1-solaris-gcc.patch | 33 -- dev-libs/nss/files/nss-3.13.5-x32.patch | 68 --- .../nss/files/nss-3.14.1-gentoo-fixups.patch | 243 --------- dev-libs/nss/files/nss-3.14.2-sqlite.patch | 21 - dev-libs/nss/nss-3.12.11-r1.ebuild | 214 -------- dev-libs/nss/nss-3.13.2.ebuild | 202 -------- dev-libs/nss/nss-3.13.3.ebuild | 206 -------- dev-libs/nss/nss-3.13.4.ebuild | 208 -------- dev-libs/nss/nss-3.13.5-r1.ebuild | 212 -------- dev-libs/nss/nss-3.13.5.ebuild | 210 -------- dev-libs/nss/nss-3.13.6.ebuild | 212 -------- dev-libs/nss/nss-3.14.1.ebuild | 271 ---------- dev-libs/nss/nss-3.14.2.ebuild | 272 ---------- dev-libs/nss/nss-3.14.ebuild | 212 -------- dev-tex/latex-beamer/Manifest | 2 +- media-libs/libvpx/libvpx-1.1.0.ebuild | 6 +- media-libs/mesa/Manifest | 1 + media-libs/mesa/mesa-9.2_pre20130619.ebuild | 463 ++++++++++++++++++ media-libs/mesa/metadata.xml | 1 + media-libs/schroedinger/Manifest | 2 +- .../schroedinger/schroedinger-1.0.11.ebuild | 4 +- media-libs/x264/x264-0.0.20120707.ebuild | 4 +- media-libs/x264/x264-0.0.20130506.ebuild | 9 +- media-libs/x264/x264-9999.ebuild | 9 +- media-libs/xvid/Manifest | 2 - .../xvid/files/xvid-1.2.2-noexecstack.patch | 457 ----------------- media-libs/xvid/xvid-1.2.2-r2.ebuild | 61 --- ...xvid-1.3.1.ebuild => xvid-1.3.2-r1.ebuild} | 44 +- .../gst-plugins-vp8-0.10.23-r1.ebuild | 4 +- .../gst-plugins-x264-0.10.19.ebuild | 4 +- .../gst-plugins-x264-1.0.5.ebuild | 4 +- media-sound/lame/lame-3.99.5-r1.ebuild | 82 ++++ .../x264-encoder-0.0.20130506.ebuild | 7 +- .../x264-encoder/x264-encoder-9999.ebuild | 7 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/app-misc/mc-4.8.8-r1 | 14 + metadata/md5-cache/app-misc/vifm-0.7.5 | 4 +- metadata/md5-cache/app-office/lyx-2.0.6 | 4 +- .../md5-cache/app-text/zathura-djvu-0.2.3 | 7 +- .../app-text/zathura-pdf-mupdf-0.2.3 | 7 +- .../md5-cache/app-text/zathura-pdf-mupdf-9999 | 7 +- metadata/md5-cache/app-text/zathura-ps-0.2.2 | 7 +- metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 | 4 +- metadata/md5-cache/dev-haskell/async-2.0.1.4 | 4 +- .../dev-libs/libclc-0.0.1_pre20130524 | 12 + metadata/md5-cache/dev-libs/nspr-4.8.8 | 11 - metadata/md5-cache/dev-libs/nspr-4.8.9 | 11 - metadata/md5-cache/dev-libs/nspr-4.9 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.1 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.2 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.2-r1 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.4 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.5-r1 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.5-r2 | 12 - metadata/md5-cache/dev-libs/nspr-4.9.6 | 12 - metadata/md5-cache/dev-libs/nss-3.12.11-r1 | 13 - metadata/md5-cache/dev-libs/nss-3.13.2 | 13 - metadata/md5-cache/dev-libs/nss-3.13.3 | 13 - metadata/md5-cache/dev-libs/nss-3.13.4 | 13 - metadata/md5-cache/dev-libs/nss-3.13.5 | 13 - metadata/md5-cache/dev-libs/nss-3.13.5-r1 | 13 - metadata/md5-cache/dev-libs/nss-3.13.6 | 13 - metadata/md5-cache/dev-libs/nss-3.14 | 13 - metadata/md5-cache/dev-libs/nss-3.14.1 | 13 - metadata/md5-cache/dev-libs/nss-3.14.2 | 13 - metadata/md5-cache/media-libs/libvpx-1.1.0 | 4 +- .../md5-cache/media-libs/mesa-9.2_pre20130619 | 14 + .../md5-cache/media-libs/schroedinger-1.0.11 | 4 +- .../md5-cache/media-libs/x264-0.0.20120707 | 4 +- .../md5-cache/media-libs/x264-0.0.20130506 | 6 +- metadata/md5-cache/media-libs/x264-9999 | 6 +- metadata/md5-cache/media-libs/xvid-1.2.2-r2 | 12 - metadata/md5-cache/media-libs/xvid-1.3.1 | 12 - metadata/md5-cache/media-libs/xvid-1.3.2-r1 | 13 + .../media-plugins/gst-plugins-vp8-0.10.23-r1 | 4 +- .../media-plugins/gst-plugins-x264-0.10.19 | 4 +- .../media-plugins/gst-plugins-x264-1.0.5 | 4 +- metadata/md5-cache/media-sound/lame-3.99.5-r1 | 13 + .../media-video/x264-encoder-0.0.20130506 | 8 +- .../md5-cache/media-video/x264-encoder-9999 | 8 +- metadata/md5-cache/sci-libs/scotch-6.0.0 | 2 +- .../md5-cache/sci-mathematics/octave-3.6.3 | 13 - .../md5-cache/sci-mathematics/octave-3.6.4 | 2 +- metadata/md5-cache/sys-apps/dbus-1.6.12 | 4 +- metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 | 4 +- metadata/md5-cache/sys-fs/lvm2-2.02.97 | 4 +- metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 | 4 +- metadata/md5-cache/sys-fs/lvm2-2.02.98 | 4 +- .../sys-kernel/linux-firmware-20130421 | 4 +- .../sys-kernel/linux-firmware-20130530 | 4 +- .../sys-kernel/linux-firmware-99999999 | 4 +- .../md5-cache/sys-libs/libmath++-0.0.4-r1 | 12 + metadata/md5-cache/virtual/opencl-0-r3 | 8 + metadata/md5-cache/x11-libs/libva-1.1.1 | 4 +- metadata/md5-cache/x11-libs/libva-9999 | 4 +- .../x11-libs/libva-intel-driver-1.0.20 | 8 +- .../x11-libs/libva-intel-driver-9999 | 8 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- profiles/arch/hppa/package.use.mask | 6 +- profiles/arch/hppa/use.mask | 19 +- .../bsd/fbsd/amd64/9.1/clang/make.defaults | 8 + .../fbsd/amd64/9.1/clang/package.use.force | 6 +- .../bsd/fbsd/amd64/9.1/clang/package.use.mask | 6 +- profiles/package.mask | 7 +- profiles/use.local.desc | 3 + sci-libs/scotch/scotch-6.0.0.ebuild | 8 +- sci-mathematics/octave/Manifest | 1 - .../octave/files/octave-3.6.3-rcond.patch | 210 -------- .../octave/files/octave-3.6.4-texinfo.patch | 72 ++- sci-mathematics/octave/octave-3.6.3.ebuild | 130 ----- sci-mathematics/octave/octave-3.6.4.ebuild | 5 +- sys-apps/dbus/dbus-1.6.12.ebuild | 4 +- sys-fs/lvm2/lvm2-2.02.95-r4.ebuild | 4 +- sys-fs/lvm2/lvm2-2.02.97-r1.ebuild | 4 +- sys-fs/lvm2/lvm2-2.02.97.ebuild | 4 +- sys-fs/lvm2/lvm2-2.02.98.ebuild | 4 +- .../linux-firmware-20130421.ebuild | 3 +- .../linux-firmware-20130530.ebuild | 3 +- .../linux-firmware-99999999.ebuild | 3 +- sys-libs/libmath++/Manifest | 2 +- sys-libs/libmath++/libmath++-0.0.4-r1.ebuild | 49 ++ virtual/opencl/opencl-0-r3.ebuild | 24 + .../libva-intel-driver-1.0.20.ebuild | 7 +- .../libva-intel-driver-9999.ebuild | 7 +- x11-libs/libva-intel-driver/metadata.xml | 3 + x11-libs/libva/libva-1.1.1.ebuild | 8 +- x11-libs/libva/libva-9999.ebuild | 8 +- x11-libs/libva/metadata.xml | 1 + 175 files changed, 1185 insertions(+), 6209 deletions(-) create mode 100644 app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch create mode 100644 app-misc/mc/mc-4.8.8-r1.ebuild create mode 100644 dev-libs/libclc/Manifest create mode 100644 dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild create mode 100644 dev-libs/libclc/metadata.xml delete mode 100644 dev-libs/nspr/files/nspr-4.6.1-config.patch delete mode 100644 dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch delete mode 100644 dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch delete mode 100644 dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch delete mode 100644 dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch delete mode 100644 dev-libs/nspr/nspr-4.8.8.ebuild delete mode 100644 dev-libs/nspr/nspr-4.8.9.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.1.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.2-r1.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.2.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.4.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.5-r1.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.5-r2.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.6.ebuild delete mode 100644 dev-libs/nspr/nspr-4.9.ebuild delete mode 100644 dev-libs/nss/files/nss-3.12.11-CVE-2011-3640.patch delete mode 100644 dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch delete mode 100644 dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff delete mode 100644 dev-libs/nss/files/nss-3.13-gentoo-fixup.patch delete mode 100644 dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch delete mode 100644 dev-libs/nss/files/nss-3.13.5-x32.patch delete mode 100644 dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch delete mode 100644 dev-libs/nss/files/nss-3.14.2-sqlite.patch delete mode 100644 dev-libs/nss/nss-3.12.11-r1.ebuild delete mode 100644 dev-libs/nss/nss-3.13.2.ebuild delete mode 100644 dev-libs/nss/nss-3.13.3.ebuild delete mode 100644 dev-libs/nss/nss-3.13.4.ebuild delete mode 100644 dev-libs/nss/nss-3.13.5-r1.ebuild delete mode 100644 dev-libs/nss/nss-3.13.5.ebuild delete mode 100644 dev-libs/nss/nss-3.13.6.ebuild delete mode 100644 dev-libs/nss/nss-3.14.1.ebuild delete mode 100644 dev-libs/nss/nss-3.14.2.ebuild delete mode 100644 dev-libs/nss/nss-3.14.ebuild create mode 100644 media-libs/mesa/mesa-9.2_pre20130619.ebuild delete mode 100644 media-libs/xvid/files/xvid-1.2.2-noexecstack.patch delete mode 100644 media-libs/xvid/xvid-1.2.2-r2.ebuild rename media-libs/xvid/{xvid-1.3.1.ebuild => xvid-1.3.2-r1.ebuild} (52%) create mode 100644 media-sound/lame/lame-3.99.5-r1.ebuild create mode 100644 metadata/md5-cache/app-misc/mc-4.8.8-r1 create mode 100644 metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.8.8 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.8.9 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.1 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.2 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.2-r1 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.4 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.5-r1 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.5-r2 delete mode 100644 metadata/md5-cache/dev-libs/nspr-4.9.6 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.12.11-r1 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.13.2 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.13.3 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.13.4 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.13.5 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.13.5-r1 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.13.6 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.14 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.14.1 delete mode 100644 metadata/md5-cache/dev-libs/nss-3.14.2 create mode 100644 metadata/md5-cache/media-libs/mesa-9.2_pre20130619 delete mode 100644 metadata/md5-cache/media-libs/xvid-1.2.2-r2 delete mode 100644 metadata/md5-cache/media-libs/xvid-1.3.1 create mode 100644 metadata/md5-cache/media-libs/xvid-1.3.2-r1 create mode 100644 metadata/md5-cache/media-sound/lame-3.99.5-r1 delete mode 100644 metadata/md5-cache/sci-mathematics/octave-3.6.3 create mode 100644 metadata/md5-cache/sys-libs/libmath++-0.0.4-r1 create mode 100644 metadata/md5-cache/virtual/opencl-0-r3 create mode 100644 profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults delete mode 100644 sci-mathematics/octave/files/octave-3.6.3-rcond.patch delete mode 100644 sci-mathematics/octave/octave-3.6.3.ebuild create mode 100644 sys-libs/libmath++/libmath++-0.0.4-r1.ebuild create mode 100644 virtual/opencl/opencl-0-r3.ebuild diff --git a/app-editors/nano/nano-2.3.2.ebuild b/app-editors/nano/nano-2.3.2.ebuild index 40f140eb2403..188a5d28f197 100644 --- a/app-editors/nano/nano-2.3.2.ebuild +++ b/app-editors/nano/nano-2.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.2.ebuild,v 1.5 2013/06/19 10:33:38 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.2.ebuild,v 1.6 2013/06/19 12:19:31 pinkbyte Exp $ EAPI="3" @@ -18,7 +18,7 @@ HOMEPAGE="http://www.nano-editor.org/ http://www.gentoo.org/doc/en/nano-basics-g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug justify +magic minimal ncurses nls slang spell unicode" RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?] diff --git a/app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch b/app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch new file mode 100644 index 000000000000..59c6661d9e02 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.8-segfault-unowned-temp-dir.patch @@ -0,0 +1,22 @@ +fix for mc/mcedit segfault when mc's tempdir doesn't belong to the correct user + +https://bugs.gentoo.org/show_bug.cgi?id=473244 +https://www.midnight-commander.org/ticket/3021 +--- src/main.c ++++ src/main.c +@@ -154,7 +154,4 @@ + + mc_global.share_data_dir = g_strdup (DATADIR); +- +- /* Set up temporary directory */ +- mc_tmpdir (); + } + +@@ -299,4 +296,7 @@ + vfs_setup_work_dir (); + ++ /* Set up temporary directory after VFS initialization */ ++ mc_tmpdir (); ++ + /* do this after vfs initialization due to mc_setctl() call in mc_setup_by_args() */ + if (!mc_setup_by_args (argc, argv, &error)) diff --git a/app-misc/mc/mc-4.8.8-r1.ebuild b/app-misc/mc/mc-4.8.8-r1.ebuild new file mode 100644 index 000000000000..48cec639c99a --- /dev/null +++ b/app-misc/mc/mc-4.8.8-r1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.8.8-r1.ebuild,v 1.1 2013/06/19 13:35:32 wired Exp $ + +EAPI=4 + +inherit eutils flag-o-matic + +MY_P=${P/_/-} + +DESCRIPTION="GNU Midnight Commander is a text based file manager" +HOMEPAGE="http://www.midnight-commander.org" +SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" + +REQUIRED_USE="spell? ( edit )" + +RDEPEND=">=dev-libs/glib-2.8:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + samba? ( net-fs/samba ) + sftp? ( net-libs/libssh2 ) + slang? ( >=sys-libs/slang-2 ) + !slang? ( sys-libs/ncurses ) + spell? ( app-text/aspell ) + X? ( x11-libs/libX11 + x11-libs/libICE + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( dev-libs/check ) + " + +[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs) + +src_prepare() { + [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh + + # bug #473244 + epatch "${FILESDIR}/${P}-segfault-unowned-temp-dir.patch" +} + +S=${WORKDIR}/${MY_P} + +src_configure() { + local myscreen=ncurses + use slang && myscreen=slang + [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" + + local homedir=".mc" + use xdg && homedir="XDG" + + econf \ + --disable-silent-rules \ + --disable-dependency-tracking \ + $(use_enable nls) \ + --enable-vfs \ + $(use_enable kernel_linux vfs-undelfs) \ + --enable-charset \ + $(use_with X x) \ + $(use_enable samba vfs-smb) \ + $(use_enable sftp vfs-sftp) \ + $(use_enable spell aspell) \ + $(use_with gpm gpm-mouse) \ + --with-screen=${myscreen} \ + $(use_with edit) \ + $(use_enable mclib) \ + $(use_enable test tests) \ + --with-homedir=${homedir} +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS README NEWS + + # fix bug #334383 + if use kernel_linux && [[ ${EUID} == 0 ]] ; then + fowners root:tty /usr/libexec/mc/cons.saver + fperms g+s /usr/libexec/mc/cons.saver + fi + + if ! use xdg ; then + sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ + -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die + fi +} + +pkg_postinst() { + elog "To enable exiting to latest working directory," + elog "put this into your ~/.bashrc:" + elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" +} diff --git a/app-misc/vifm/vifm-0.7.5.ebuild b/app-misc/vifm/vifm-0.7.5.ebuild index b5b9c1eae0e8..79c51bcb7e83 100644 --- a/app-misc/vifm/vifm-0.7.5.ebuild +++ b/app-misc/vifm/vifm-0.7.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.5.ebuild,v 1.1 2013/06/15 16:16:36 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/vifm/vifm-0.7.5.ebuild,v 1.2 2013/06/19 13:25:50 wired Exp $ EAPI=5 inherit base vim-doc @@ -56,6 +56,10 @@ src_install() { fi } +src_test() { + emake check +} + pkg_postinst() { if use vim; then update_vim_helptags diff --git a/app-office/lyx/lyx-2.0.6.ebuild b/app-office/lyx/lyx-2.0.6.ebuild index 4c63f9a247b2..213e3a13c348 100644 --- a/app-office/lyx/lyx-2.0.6.ebuild +++ b/app-office/lyx/lyx-2.0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.6.ebuild,v 1.1 2013/05/07 17:32:51 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.6.ebuild,v 1.2 2013/06/19 17:51:03 jer Exp $ EAPI=3 @@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant" LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW" diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml index ec9ce8a2e2ae..e21ab424480f 100644 --- a/app-text/zathura-cb/metadata.xml +++ b/app-text/zathura-cb/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml index ec9ce8a2e2ae..e21ab424480f 100644 --- a/app-text/zathura-djvu/metadata.xml +++ b/app-text/zathura-djvu/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild index d6953cefd37d..20e217afdbd1 100644 --- a/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild +++ b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild,v 1.1 2013/06/13 22:00:58 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild,v 1.2 2013/06/19 13:58:29 xmw Exp $ EAPI=5 @@ -13,18 +13,19 @@ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="cairo" +IUSE="" RDEPEND=">=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0 dev-libs/glib:2 - cairo? ( x11-libs/cairo )" + x11-libs/cairo:=" DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + #rendering failed w/o cairo myzathuraconf=( - WITH_CAIRO=$(usex cairo 1 0) + WITH_CAIRO=1 CC="$(tc-getCC)" LD="$(tc-getLD)" VERBOSE=1 diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml index 7eed528b5404..a02395352341 100644 --- a/app-text/zathura-meta/metadata.xml +++ b/app-text/zathura-meta/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml index ec9ce8a2e2ae..e21ab424480f 100644 --- a/app-text/zathura-pdf-mupdf/metadata.xml +++ b/app-text/zathura-pdf-mupdf/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.3.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.3.ebuild index 0fc9a65a5fd0..1f5a5ca479fc 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.3.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.3.ebuild,v 1.3 2013/06/13 22:16:32 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.2.3.ebuild,v 1.4 2013/06/19 14:22:58 xmw Exp $ EAPI=5 @@ -13,19 +13,20 @@ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cairo" +IUSE="" RDEPEND="!app-text/zathura-pdf-poppler >=app-text/mupdf-1.2:= =app-text/zathura-0.2.0 - cairo? ( x11-libs/cairo )" + x11-libs/cairo:=" DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + # does not render w/o cairo myzathuraconf=( - WITH_CAIRO=$(usex cairo 1 0) + WITH_CAIRO=1 CC="$(tc-getCC)" LD="$(tc-getLD)" VERBOSE=1 diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild index 1cd2a5113153..afe2bd891660 100644 --- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild +++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.2 2013/06/13 12:16:29 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild,v 1.3 2013/06/19 14:22:58 xmw Exp $ EAPI=5 @@ -14,7 +14,7 @@ EGIT_BRANCH="mupdf-git" LICENSE="ZLIB" SLOT="0" KEYWORDS="" -IUSE="cairo" +IUSE="" RDEPEND="!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= @@ -22,13 +22,14 @@ RDEPEND="!app-text/zathura-pdf-poppler media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg - cairo? ( x11-libs/cairo )" + x11-libs/cairo:=" DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + # does not render w/o cairo myzathuraconf=( - WITH_CAIRO=$(usex cairo 1 0) + WITH_CAIRO=1 CC="$(tc-getCC)" LD="$(tc-getLD)" VERBOSE=1 diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml index ec9ce8a2e2ae..e21ab424480f 100644 --- a/app-text/zathura-pdf-poppler/metadata.xml +++ b/app-text/zathura-pdf-poppler/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.3.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.3.ebuild index 68c569d330f2..b4d1f14057bd 100644 --- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.3.ebuild +++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.3.ebuild,v 1.2 2013/06/19 07:13:39 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.3.ebuild,v 1.3 2013/06/19 12:21:14 xmw Exp $ EAPI=5 @@ -22,6 +22,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + #cairo is non-optional #473378 myzathuraconf=( WITH_CAIRO=1 CC="$(tc-getCC)" diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml index ec9ce8a2e2ae..e21ab424480f 100644 --- a/app-text/zathura-ps/metadata.xml +++ b/app-text/zathura-ps/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild index 7aee77cd0fa1..a18b35d83b75 100644 --- a/app-text/zathura-ps/zathura-ps-0.2.2.ebuild +++ b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.2.ebuild,v 1.1 2013/06/13 21:54:15 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/zathura-ps/zathura-ps-0.2.2.ebuild,v 1.2 2013/06/19 14:03:54 xmw Exp $ EAPI=5 @@ -13,18 +13,19 @@ SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -IUSE="cairo" +IUSE="" RDEPEND=">=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0 dev-libs/glib:2 - cairo? ( x11-libs/cairo )" + x11-libs/cairo:=" DEPEND="${RDEPEND} virtual/pkgconfig" pkg_setup() { + #does not render w/o cairo myzathuraconf=( - WITH_CAIRO=$(usex cairo 1 0) + WITH_CAIRO=1 CC="$(tc-getCC)" LD="$(tc-getLD)" VERBOSE=1 diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml index ec9ce8a2e2ae..e21ab424480f 100644 --- a/app-text/zathura/metadata.xml +++ b/app-text/zathura/metadata.xml @@ -1,10 +1,6 @@ - - wired@gentoo.org - Alex Alexander - ssuominen@gentoo.org Samuli Suominen diff --git a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild index bf91bbb582da..b3d31c32077b 100644 --- a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild +++ b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.1 2013/04/06 07:45:16 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.2 2013/06/19 18:44:11 bicatali Exp $ EAPI="5" PYTHON_DEPEND="2" @@ -13,7 +13,7 @@ SRC_URI="http://googletest.googlecode.com/files/${P}.zip" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~ppc-macos" IUSE="examples static-libs" DEPEND="app-arch/unzip" diff --git a/dev-haskell/async/async-2.0.1.4.ebuild b/dev-haskell/async/async-2.0.1.4.ebuild index ad6aa2470895..9acf622f64f5 100644 --- a/dev-haskell/async/async-2.0.1.4.ebuild +++ b/dev-haskell/async/async-2.0.1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/async/async-2.0.1.4.ebuild,v 1.1 2012/11/18 12:56:20 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/async/async-2.0.1.4.ebuild,v 1.3 2013/06/19 20:03:30 zlogene Exp $ EAPI=5 @@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=">=dev-haskell/stm-2.2:=[profile?] diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest new file mode 100644 index 000000000000..ec72a7e707f6 --- /dev/null +++ b/dev-libs/libclc/Manifest @@ -0,0 +1 @@ +DIST libclc-0.0.1_pre20130524.tar.xz 19892 SHA256 bee14b0ab07d681df77130242cea177fc451d5feea0abe7e5ccaa27b6ef98b4c SHA512 035086b2eda58b7de131b532ad3e03b6a1f47e24155d60027e286bd49b7e18f0e8cbe554cce98986d41f88fddee0c33befd445c2c7085d455857da398ea11ddd WHIRLPOOL 4b80255fc5d4b22f09c16b700e2e9fe43b5ed23fde7829bed5653430a1c597612b214da801ca407d94b3bd7b38d285f8ced493f8b3299c9cc6ba93cddaa1492c diff --git a/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild b/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild new file mode 100644 index 000000000000..19ccccc4a6f0 --- /dev/null +++ b/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild,v 1.1 2013/06/19 15:22:29 chithanh Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) + +EGIT_REPO_URI="git://people.freedesktop.org/~tstellar/${PN}" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi + +inherit base python-any-r1 $GIT_ECLASS + +DESCRIPTION="OpenCL C library" +HOMEPAGE="http://libclc.llvm.org/ http://cgit.freedesktop.org/~tstellar/libclc/" + +if [[ $PV = 9999* ]]; then + SRC_URI="${SRC_PATCHES}" +else + SRC_URI="mirror://gentoo/${P}.tar.xz ${SRC_PATCHES}" +fi + +LICENSE="|| ( MIT BSD )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + >=sys-devel/clang-3.2 + >=sys-devel/llvm-3.2" +DEPEND="${RDEPEND}" + +src_unpack() { + if [[ $PV = 9999* ]]; then + git-2_src_unpack + else + default + mv ${PN}-*/ ${P} || die + fi +} + +src_configure() { + ./configure.py \ + --with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \ + --prefix="${EPREFIX}/usr" +} diff --git a/dev-libs/libclc/metadata.xml b/dev-libs/libclc/metadata.xml new file mode 100644 index 000000000000..01c4c004e735 --- /dev/null +++ b/dev-libs/libclc/metadata.xml @@ -0,0 +1,5 @@ + + + +x11 + diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index b610b720f078..948b9dd924f7 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -1,9 +1,2 @@ DIST nspr-4.10.tar.gz 1103862 SHA256 0cfbe561676b92e5af3ddc7ac77452014e3da8885da66baec811e7354138cc16 SHA512 80d511e3bdce9a1efc577acc1671f507bef3d6ca933705f67a7aba567ff7b981e9cde70c2da6fbde82852938b779baa0058c82f937d4ac3e672f6d8e7bdefe8b WHIRLPOOL 404af25a7856df10376a90d7618edd10297c5a1843d6db3e2e754b4066475ffcf4af024804b119e1a8479bbd748a6c142aa77fe27c02e5d3cd751bf449ab1182 -DIST nspr-4.8.8.tar.gz 1246068 SHA256 92f3f4ded2ee313e396c180d5445cc3c718ff347d86c06b7bf14a1b5e049d4c9 SHA512 26deadeb89b4ce161ea9bf04271ba7895c78cfab1fa4cd1c82b2d5f835381e4c26c9348b690e688c870c842d5465d45113f4dc44cf71ee35d0b64cdde21bcd51 WHIRLPOOL a205fe12cc4a7c3b03093ed3a7fad3e2b4fb04a2390faa69be8a8a046914f84ba7a5b643fd6c2f75b1259dcababc4ce2405f231f4c4184d464ddfc0de1c63c88 -DIST nspr-4.8.9.tar.gz 1235265 SHA256 ff43c7c819e72f03bb908e7652c5d5f59a5d31ee86c333e692650207103d1cce SHA512 78e2f444b92af0e931b81a2f0c517c3583010af3c5e5a556d881531289fcf0b2ec17dd623b307938605fbdd0a7d6e4e3e257b4151dc757a8b47a5b2f129081f2 WHIRLPOOL ab783b8c37d96c2a5b97b33b0180f7cfc1bf8da7ca7006e8e52d2d1f9b2f2334bedb1f50f8250eb6c56a099087da0de8e187ccc7ce722f8ea602b66a8d245094 -DIST nspr-4.9.1.tar.gz 1172951 SHA256 5b696b80a3254aa0e5c7f0614b6bb9b14c483df46af66c792993e3d853568d17 SHA512 b7613eb5f97d9d8d0254d454fb516a672664fbf46b34eb03cc51a9b3af11d8cbdc117691c068f8e64a8255aadfd28b2814eda53edcd97a643b26b94b5adec341 WHIRLPOOL 9df74a88ea050d0fb2ff8f8a38d703c2bd77f6ecc4c5e6fe09c240bf9f99266ba56083aed566ea2e0a1df7afdb090861dbe6b45725906af5979242f9b2a82161 -DIST nspr-4.9.2.tar.gz 1172193 SHA256 570206f125fc31b8589b31d3837c190ee2a75d4f3b8faec2cbedbeacc016e82c SHA512 1f1f35fc2b9ead7e3b4ef93a02f13c0bcccc314bf9cfad67e6ddb755aaf6ab411499b0b57b94b032e2c7ee21fc7c114ca447e24825b79611f720f88eb37bd348 WHIRLPOOL b50c87f8ba77601ea79282659b4781fe674925bc87bc130dd5acc056021b135769a0d5ed1b76e759c1dfbb0c7df9d6fb0d97d292f42c5d7c5db43233c2498f07 -DIST nspr-4.9.4.tar.gz 1160641 SHA256 749046c75be17f2f8b3874d288873d3355cedcb37abe7b6eb7b3bc374440d4a4 SHA512 5c1caf290bbe6cec7fddd40ae1eefbe54608a0f6fce908b1680513c50661dde40f4c1638ddca56b8a7125b20be6945aa2b4507fa0dde09e3e9eb0b08e90cfe2b WHIRLPOOL a9fd7a0c4b17240c746312cdab1495a5d5ebcabcc945a7c2f1a3df435db2d4e5e80e3086d20bd658a94c573abb916611327ad877430c9cd0282e8d192217d707 DIST nspr-4.9.5.tar.gz 1156396 SHA256 616ab65c849155c9ed0e5f502530a241cc9108e278275aa448b417ae632c7604 SHA512 cbe60e4c5265863fa3250d7c16a2727d3a4a8762d17bc63d044ec88d11758fe9f54f54c08e198db6278ee68c55edd88f7c4bc5db9bdc46bdea4e4cf9eb277f27 WHIRLPOOL d2792148805a99d1f2de919b57e48cfd03290b1f8faaec55d4374004574a578ed3fef110956fbb767a2f7f6d00cb9d594aa3a534e29df5790f3284c4fcea8b7b -DIST nspr-4.9.6.tar.gz 1163033 SHA256 7693fddd3c5cc15d53a50df53ab5dcdaa2eb58f5003302690559471744d6c6f9 SHA512 635abfbf982d073803a76dc413097b7ac38d415c395e4a018d024f4620903e494b08f6e659ce0dfab06dc73eb7979c92824701bb613f8519b151e686811d3300 WHIRLPOOL 989fe3602f28e5ec1e0b3e897006c94640963cef71f7ff922941d518f16d4d2fcf3cb490aa0be9b993b98e9d3543bab5e43e9f6303cd4e11790976ffcd1ee5de -DIST nspr-4.9.tar.gz 1218528 SHA256 ecc632bc578c125650999776673eeff952096afa6d151f6d91f6c3a93e1e716a SHA512 c0c18d06919a20f779b683d3ec24a82bcd48693e00f6aff4f66038c55e16305d050b83e1e6b7a4b3d0da5d1f1db699eb11ae111280989c60f5ea5c42420884d9 WHIRLPOOL 3d0be6f316368041b5cae7f00a273c33467f4b8ccc6e14d3a3728d5130a1cb625f44fda89cf9f80c092b70ea26a0958a7238f959e8d06263c5393edd835c7a31 diff --git a/dev-libs/nspr/files/nspr-4.6.1-config.patch b/dev-libs/nspr/files/nspr-4.6.1-config.patch deleted file mode 100644 index ffbbf1ad8141..000000000000 --- a/dev-libs/nspr/files/nspr-4.6.1-config.patch +++ /dev/null @@ -1,89 +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/Makefile.in.orig 2005-06-01 14:28:23.000000000 +0000 -+++ mozilla/nsprpub/config/Makefile.in 2006-01-15 04:13:42.000000000 +0000 -@@ -54,7 +54,7 @@ - # because it is included by every makefile. - DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config - --RELEASE_BINS = nspr-config -+RELEASE_BINS = nspr-config nspr.pc - - include $(topsrcdir)/config/config.mk - -@@ -139,6 +139,7 @@ - - export:: $(TARGETS) - rm -f $(dist_bindir)/nspr-config -+ rm -f $(dist_bindir)/nspr.pc - - ifdef WRAP_SYSTEM_INCLUDES - export:: ---- mozilla/nsprpub/config/nspr.pc.in.orig 1970-01-01 00:00:00.000000000 +0000 -+++ mozilla/nsprpub/config/nspr.pc.in 2006-01-15 04:12:23.000000000 +0000 -@@ -0,0 +1,10 @@ -+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} -lplds4 -lplc4 -lnspr4 @OS_LIBS@ -Wl,-R${libdir} -+Cflags: -I${includedir} ---- mozilla/nsprpub/configure.orig 2006-01-15 04:17:59.000000000 +0000 -+++ mozilla/nsprpub/configure 2006-01-15 04:21:35.000000000 +0000 -@@ -5899,6 +5899,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile ---- 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 diff --git a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch deleted file mode 100644 index 3309ae085feb..000000000000 --- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-2.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 -@@ -162,3 +162,4 @@ - 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 -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in ---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 -@@ -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 -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 -@@ -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 -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 -@@ -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 -+Cflags: -I${includedir} -+ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 -@@ -211,7 +211,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 -@@ -221,6 +221,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 -@@ -272,6 +275,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 -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure ---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 -@@ -6037,6 +6037,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in ---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 -@@ -2871,6 +2871,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/files/nspr-4.8-pkgconfig-gentoo-3.patch b/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch deleted file mode 100644 index 2525928db4ff..000000000000 --- a/dev-libs/nspr/files/nspr-4.8-pkgconfig-gentoo-3.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 -@@ -162,3 +162,4 @@ - 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 -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in ---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 -@@ -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 -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 -@@ -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 -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 -@@ -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 -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 -@@ -211,7 +211,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 -@@ -221,6 +221,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 -@@ -272,6 +275,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 -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure ---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 -@@ -6037,6 +6037,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in ---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 -@@ -2871,6 +2871,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/files/nspr-4.8.3-aix-soname.patch b/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch deleted file mode 100644 index 667e699c202e..000000000000 --- a/dev-libs/nspr/files/nspr-4.8.3-aix-soname.patch +++ /dev/null @@ -1,43 +0,0 @@ -NSPR does not set the soname on any platform yet: -https://bugzilla.mozilla.org/show_bug.cgi?id=452873 - -Supporting something like "soname" on AIX is tricky: -http://bugs.gentoo.org/show_bug.cgi?id=213277 - ---- mozilla/nsprpub/config/rules.mk.orig 2010-02-23 15:55:00 +0100 -+++ mozilla/nsprpub/config/rules.mk 2010-02-23 16:04:31 +0100 -@@ -132,14 +132,17 @@ - else - ifdef MKSHLIB - SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -+ifeq ($(OS_ARCH), AIX) -+IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(DLL_SUFFIX) -+endif - endif - endif - - endif - endif - - ifndef TARGETS --ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) -+ifeq (,$(filter-out WINNT WINCE OS2 AIX,$(OS_ARCH))) - TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) - ifndef BUILD_OPT - ifdef MSC_VER -@@ -327,6 +330,15 @@ - else - ifeq (,$(filter-out WIN95 WINCE,$(OS_TARGET))) - $(IMPORT_LIBRARY): $(SHARED_LIBRARY) -+else -+ifdef IMPORT_LIBRARY -+$(IMPORT_LIBRARY): $(SHARED_LIBRARY) -+ ( echo '#! $(notdir $(SHARED_LIBRARY))' \ -+ ; dump -Tv $(SHARED_LIBRARY) \ -+ | awk '{ if ($$4 == "EXP" && $$6 != "SECdef") { print $$8 } }' \ -+ | sort -u \ -+ ) > $@ -+endif - endif - endif - diff --git a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch b/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch deleted file mode 100644 index 68801418367a..000000000000 --- a/dev-libs/nspr/files/nspr-4.9.1-x32_v0.2.patch +++ /dev/null @@ -1,91 +0,0 @@ -# HG changeset patch -# Parent 6b1ef31834235cde5153f91a7443b29398b541d9 -# User Jory A. Pratt -Add initial support for x32 abi - -diff --git a/mozilla/nsprpub/pr/include/md/_linux.cfg b/mozilla/nsprpub/pr/include/md/_linux.cfg ---- a/mozilla/nsprpub/pr/include/md/_linux.cfg -+++ b/mozilla/nsprpub/pr/include/md/_linux.cfg -@@ -207,16 +207,63 @@ - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - - #elif defined(__x86_64__) - -+#ifdef __ILP32__ -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#else -+ - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN - #define IS_64 - - #define PR_BYTES_PER_BYTE 1 - #define PR_BYTES_PER_SHORT 2 - #define PR_BYTES_PER_INT 4 - #define PR_BYTES_PER_INT64 8 -@@ -251,16 +298,18 @@ - #define PR_ALIGN_OF_FLOAT 4 - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#endif -+ - #elif defined(__mc68000__) - - #undef IS_LITTLE_ENDIAN - #define IS_BIG_ENDIAN 1 - - #define PR_BYTES_PER_BYTE 1 - #define PR_BYTES_PER_SHORT 2 - #define PR_BYTES_PER_INT 4 diff --git a/dev-libs/nspr/nspr-4.8.8.ebuild b/dev-libs/nspr/nspr-4.8.8.ebuild deleted file mode 100644 index de1de71bdd92..000000000000 --- a/dev-libs/nspr/nspr-4.8.8.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.8.ebuild,v 1.5 2011/09/04 10:13:30 maekke Exp $ - -EAPI=3 - -inherit eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - mozilla/nsprpub/config/rules.mk -} - -src_configure() { - cd "${S}"/build - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in - ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; - ELFCLASS32*|POWERPC*|I386*|ARM*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - - ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} || 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 - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # create pkg-config file - insinto /usr/$(get_libdir)/pkgconfig/ - doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" - - # 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/nspr/nspr-4.8.9.ebuild b/dev-libs/nspr/nspr-4.8.9.ebuild deleted file mode 100644 index 98e879122ffb..000000000000 --- a/dev-libs/nspr/nspr-4.8.9.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.8.9.ebuild,v 1.9 2011/11/25 17:25:27 xarthisius Exp $ - -EAPI=3 - -inherit eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.8-pkgconfig-gentoo-3.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - mozilla/nsprpub/config/rules.mk - - if [[ ${CHOST} == *-darwin* ]] ; then - # Fix pkgconfig for Darwin (no RPATH stuff) - sed -i -e 's/-Wl,-R${\?libdir}\?//' \ - "${S}"/mozilla/nsprpub/config/nspr-config.in \ - "${S}"/mozilla/nsprpub/config/nspr.pc.in || die - fi -} - -src_configure() { - cd "${S}"/build - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in - ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; - ELFCLASS32*|POWERPC*|I386*|ARM*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - - ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} || 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 - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # create pkg-config file - insinto /usr/$(get_libdir)/pkgconfig/ - doins "${S}"/build/config/nspr.pc || die "failed to insall nspr pkg-config file" - - # 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/nspr/nspr-4.9.1.ebuild b/dev-libs/nspr/nspr-4.9.1.ebuild deleted file mode 100644 index ddfeaee8750e..000000000000 --- a/dev-libs/nspr/nspr-4.9.1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.1.ebuild,v 1.8 2013/01/16 21:09:30 polynomial-c Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in - ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; - ELFCLASS32*|POWERPC*|I386*|ARM*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} || die "econf failed" -} - -src_compile() { - cd "${S}"/build - if tc-is-cross-compiler; then - emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ - -C config nsinstall || die "failed to build" - mv config/{,native-}nsinstall - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk - rm config/nsinstall.o - fi - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" -} - -src_install () { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.2-r1.ebuild b/dev-libs/nspr/nspr-4.9.2-r1.ebuild deleted file mode 100644 index 361c9eb90c34..000000000000 --- a/dev-libs/nspr/nspr-4.9.2-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.2-r1.ebuild,v 1.3 2013/01/16 21:09:30 polynomial-c Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.2.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} || die "econf failed" -} - -src_compile() { - cd "${S}"/build - if tc-is-cross-compiler; then - emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \ - -C config nsinstall || die "failed to build" - mv config/{,native-}nsinstall - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk - rm config/nsinstall.o - fi - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "failed to build" -} - -src_install () { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.2.ebuild b/dev-libs/nspr/nspr-4.9.2.ebuild deleted file mode 100644 index 1e5c44948cc6..000000000000 --- a/dev-libs/nspr/nspr-4.9.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.2.ebuild,v 1.10 2013/01/16 21:09:30 polynomial-c Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - epatch "${FILESDIR}"/${PN}-4.9.1-x32_v0.2.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf="${myconf} --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} || die "econf failed" -} - -src_compile() { - cd "${S}"/build - if tc-is-cross-compiler; then - emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ - -C config nsinstall || die "failed to build" - mv config/{,native-}nsinstall - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk - rm config/nsinstall.o - fi - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" -} - -src_install () { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.4.ebuild b/dev-libs/nspr/nspr-4.9.4.ebuild deleted file mode 100644 index e0876fb161b3..000000000000 --- a/dev-libs/nspr/nspr-4.9.4.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.4.ebuild,v 1.13 2013/02/08 14:47:21 ago Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - # We use the standard BUILD_xxx but nspr uses HOST_xxx - tc-export_build_env BUILD_CC - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} - tc-export AR CC CXX RANLIB - [[ ${CBUILD} != ${CHOST} ]] \ - && export CROSS_COMPILE=1 \ - || unset CROSS_COMPILE - - local myconf - echo > "${T}"/test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - # Ancient autoconf needs help finding the right tools. - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \ - ac_cv_path_AR="${AR}" \ - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} -} - -src_compile() { - cd "${S}"/build - emake || die "failed to build" -} - -src_install () { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - einfo "removing static libraries as upstream has requested!" - rm -f *.a || die "failed to remove static libraries." - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.5-r1.ebuild b/dev-libs/nspr/nspr-4.9.5-r1.ebuild deleted file mode 100644 index a5b95299da7b..000000000000 --- a/dev-libs/nspr/nspr-4.9.5-r1.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.5-r1.ebuild,v 1.1 2013/03/12 01:53:37 anarchy Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - # We do not need to pass -L$libdir via nspr-config --libs - epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - # We use the standard BUILD_xxx but nspr uses HOST_xxx - tc-export_build_env BUILD_CC - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} - tc-export AR CC CXX RANLIB - [[ ${CBUILD} != ${CHOST} ]] \ - && export CROSS_COMPILE=1 \ - || unset CROSS_COMPILE - - local myconf - echo > "${T}"/test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - # Ancient autoconf needs help finding the right tools. - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \ - ac_cv_path_AR="${AR}" \ - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} -} - -src_compile() { - cd "${S}"/build - emake || die "failed to build" -} - -src_install() { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - einfo "removing static libraries as upstream has requested!" - rm -f *.a || die "failed to remove static libraries." - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.5-r2.ebuild b/dev-libs/nspr/nspr-4.9.5-r2.ebuild deleted file mode 100644 index b9b534fafbcc..000000000000 --- a/dev-libs/nspr/nspr-4.9.5-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.5-r2.ebuild,v 1.1 2013/03/12 15:16:23 vapier Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - # We do not need to pass -L$libdir via nspr-config --libs - epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - # We use the standard BUILD_xxx but nspr uses HOST_xxx - tc-export_build_env BUILD_CC - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} - tc-export AR CC CXX RANLIB - [[ ${CBUILD} != ${CHOST} ]] \ - && export CROSS_COMPILE=1 \ - || unset CROSS_COMPILE - - local myconf - echo > "${T}"/test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - # Ancient autoconf needs help finding the right tools. - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \ - ac_cv_path_AR="${AR}" \ - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} -} - -src_compile() { - cd "${S}"/build - emake || die "failed to build" -} - -src_install() { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - einfo "removing static libraries as upstream has requested!" - rm -f *.a || die "failed to remove static libraries." - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.6.ebuild b/dev-libs/nspr/nspr-4.9.6.ebuild deleted file mode 100644 index c57fc4a3ee2d..000000000000 --- a/dev-libs/nspr/nspr-4.9.6.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.6.ebuild,v 1.1 2013/03/29 01:24:59 anarchy Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - # We do not need to pass -L$libdir via nspr-config --libs - epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - # We use the standard BUILD_xxx but nspr uses HOST_xxx - tc-export_build_env BUILD_CC - export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS} - tc-export AR CC CXX RANLIB - [[ ${CBUILD} != ${CHOST} ]] \ - && export CROSS_COMPILE=1 \ - || unset CROSS_COMPILE - - local myconf - echo > "${T}"/test.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*|*64-bit*|*ppc64*|*x86_64*) myconf+=" --enable-64bit";; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - # Ancient autoconf needs help finding the right tools. - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" \ - ac_cv_path_AR="${AR}" \ - econf \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} -} - -src_compile() { - cd "${S}"/build - emake || die "failed to build" -} - -src_install() { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - einfo "removing static libraries as upstream has requested!" - rm -f *.a || die "failed to remove static libraries." - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nspr/nspr-4.9.ebuild b/dev-libs/nspr/nspr-4.9.ebuild deleted file mode 100644 index b7a3ccc88f1f..000000000000 --- a/dev-libs/nspr/nspr-4.9.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.9.ebuild,v 1.11 2013/01/06 18:14:51 armin76 Exp $ - -EAPI=3 -WANT_AUTOCONF="2.1" - -inherit autotools eutils multilib toolchain-funcs versionator - -MIN_PV="$(get_version_component_range 2)" - -DESCRIPTION="Netscape Portable Runtime" -HOMEPAGE="http://www.mozilla.org/projects/nspr/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="debug" - -src_prepare() { - mkdir build inst - epatch "${FILESDIR}"/${PN}-4.8-config.patch - epatch "${FILESDIR}"/${PN}-4.6.1-config-1.patch - epatch "${FILESDIR}"/${PN}-4.6.1-lang.patch - epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch - epatch "${FILESDIR}"/${PN}-4.9-pkgconfig-gentoo.patch - epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch - epatch "${FILESDIR}"/${PN}-4.7.4-solaris.patch - epatch "${FILESDIR}"/${PN}-4.8.3-aix-gcc.patch - # Patch needs updating - #epatch "${FILESDIR}"/${PN}-4.8.3-aix-soname.patch - epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch - epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch - - # We must run eautoconf to regenerate configure - cd "${S}"/mozilla/nsprpub - eautoconf - - # make sure it won't find Perl out of Prefix - sed -i -e "s/perl5//g" "${S}"/mozilla/nsprpub/configure || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - "${S}"/mozilla/nsprpub/config/rules.mk || die -} - -src_configure() { - cd "${S}"/build - - echo > "${T}"/test.c - $(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o - case $(scanelf -BF'%M' "${T}"/test.o)$(scanmacho -BF'%M' "${T}"/test.o) in - ELFCLASS64*|POWERPC64*|X86_64*) myconf="${myconf} --enable-64bit";; - ELFCLASS32*|POWERPC*|I386*|ARM*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)" - - LC_ALL="C" ECONF_SOURCE="../mozilla/nsprpub" econf \ - $(use_enable debug) \ - $(use_enable !debug optimize) \ - ${myconf} || die "econf failed" -} - -src_compile() { - cd "${S}"/build - if tc-is-cross-compiler; then - emake CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" \ - -C config nsinstall || die "failed to build" - mv config/{,native-}nsinstall - sed -s 's#/nsinstall$#/native-nsinstall#' -i config/autoconf.mk - rm config/nsinstall.o - fi - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "failed to build" -} - -src_install () { - # Their build system is royally confusing, as usual - MINOR_VERSION=${MIN_PV} # Used for .so version - cd "${S}"/build - emake DESTDIR="${D}" install || die "emake install failed" - - cd "${ED}"/usr/$(get_libdir) - for file in *.a; do - einfo "removing static libraries as upstream has requested!" - rm -f ${file} || die "failed to remove static libraries." - done - - local n= - # aix-soname.patch does this already - [[ ${CHOST} == *-aix* ]] || - 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." - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - # install nspr-config - dobin "${S}"/build/config/nspr-config || die "failed to install nspr-config" - - # Remove stupid files in /usr/bin - rm -f "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files" -} diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 37924526c516..e587ae8f0970 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,18 +1,5 @@ -DIST nss-3.12.11.tar.gz 5944840 SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16 SHA512 3ed1134c972cee9ac23a77adc4c38eeb0597d0734b13b561ec74480560eb77b259ebc9708e4ecd8cc1565bfb6ae9e471c7131dd26ca48e6b427284c3c005ec6a WHIRLPOOL e4cc92496e62c49dd89e2263848154aeadcaea22b51d227e4f8dc41c1e8f9e7922f8e0ff7b99dffde845780a6277696b83339c49eff903885e0cf0ba5f283443 -DIST nss-3.13.2-add_cacert_ca_certs-ported.patch 70938 SHA256 bd3e14436695c903279c2cf8982c8df0f20ab34cbe1a7f955aaf861f19a3bf25 SHA512 0b68f54fd5b7239cd05dd217b9fe0d64cb5942c2058f86990ddb65d4ea0c141bd750b79ebaa735c44bdea2798ce014228b6c9cc797d9c2cfd768c09ebe62e3e8 WHIRLPOOL 10b8756c211e6411a6483466518fe994c5732ae331d8b4f1bf0f4612496ee3072dcbb6c3b9f98d9744b01ed1ee681415eb3a8f83cb364926d6353a20fdb36e3f -DIST nss-3.13.2.tar.gz 6082528 SHA256 92eafdbb62e3071afe71beeaca94c9f33b0b8d11654cbf1797c84aa9f7c1c8e5 SHA512 017bb994257452304e6c42ecb7320221a41b2c83fe183e3172b4df93f65289c90083d361f417d9167981e9f6553a5fd59144a24b9cd72370747e371363243f49 WHIRLPOOL 84c0487f1fa99709db8991a7d24c78f1eaf2820909e789c24546b552a76dd665e9d5123e28b857e56bc5cf57d005dd0f8afbeda9aaede37cb25850259b13d9c6 -DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e SHA512 4b1e76326d8924a24189836c504c743954783d7cc4a60a55d5daf6d173a501e232f8e470bd64a92f9b0864c1d0bf7155107e161204e1082f33e1f6527a8d4d39 WHIRLPOOL 1a94f025a1bfdb9d0afce1f8d78c3a17a732384eb04e555c1752ad6a8dd185f334b77130ffce356d164028c9b54ff787d0fd3149b8622eb53084c298c0c0829c -DIST nss-3.13.3.tar.gz 6083507 SHA256 efa10f2c70da4bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587 SHA512 b4f963f97801bd03e98840e06fd448b3107a04c4cd62bcf03178b33d33c30337ffd7818535af745c254282b52d4b7a6a4b5b04b17da9ed0b170cdf72a165841c WHIRLPOOL 4351c87345466009949b53094550804b5889c94c7690408782acf91f179fe1872b1ba4b79661c4a481f0f2545246d6024c2b423648b69b79a133dce64eb9a93a DIST nss-3.13.3_pem.support 191571 SHA256 cb6cf7955203514b3c1210c9b32504b0d2f1c158fa9b5d2509ef0bb34b68374c SHA512 223026adbacf2f325f808210cc050f95cb65cb0fe8c6022109a42bd991fd576e2e96beb5ec8e185dbbd649f4bd4516bc0f7fc10401f47eda806ab2d63f0c23a3 WHIRLPOOL 78345665e54fe67f57bc09311567ad525f9a8dae7d17e600a9639fac820fcf9c64e9f4bacc5df3f90b90a224e374ac44e938962c5248189fe76dad7143bf3476 -DIST nss-3.13.4.tar.gz 6087584 SHA256 a552f56b03c0c716ba950c7eef971d87f717c02a4d9a75ee2fe84bd036830de5 SHA512 d39117239030b93e4e644ffaec6788f6b2d4ef604cb6232ca0146882e6d9315834e73804c1b67bf90e79c533104c856cc141a4153f7d946beb122ced0ce49173 WHIRLPOOL 67d5f4468543f4afe9734036acbfbde4c6dc21f7e2ef7c634001587d7f066af5db9cc544953fdfd500aa94ca89ec65ef117aa8b923a189dbbf80247e2b088bd1 -DIST nss-3.13.5.tar.gz 6087983 SHA256 ee8b995ebc971308a5bc8b50eb391cd925d6ee7c5e139d25018ee993e71b012a SHA512 8096390bbb8544ef1c3d5b8e3245b5bb618b4fa718e2fb8ab4c134f3e8b386c07146bbd60a16edd261b4c5014d29b6cf85118ad0e7e43b53ba3fd7c25a7c79b5 WHIRLPOOL 7aeae5506bbf7f118ea6139cde6444fbc2c3152ef41a606d690d04956692c88303779a52147c7bece5a4f943b271b887e9008e3802a8e367edbfb7a353246960 -DIST nss-3.13.6-add_spi+cacerts_ca_certs.patch 70095 SHA256 66779b7c64f0f71662f29f8127f78eac086b1415778872cdbfdf3017bacbca9f SHA512 3aaf7671a179e28f2bb80a9d9f753337e15ed46df97724a9517c58f436b4e835815b974de9344bb422326b0625de52e6444523b37f36d4bdcda0a05e9839ce4c WHIRLPOOL 48bd80ffef3ca7f007f02f654cb33e7887bd4b5ce91e5ef2b9c88ca888aeda5ce8d02f41c4ed38b553ade572256fbf84a42de87814c5e6b4252950bd2555a74a -DIST nss-3.13.6.tar.gz 6109538 SHA256 f7e90727e0ecc1c29de10da39a79bc9c53b814ccfbf40720e053b29c683d43a0 SHA512 45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d WHIRLPOOL 8172b4a29a513ed931d8b9c5b72270e448282ff7454ea8aea9fba23e667f8c76417861f3f716857ba05e38f0ee940fc21d86d7343e1ffc780a849c37929b94aa -DIST nss-3.14-add_spi+cacerts_ca_certs.patch 52742 SHA256 15ed527acdf49922fcfab624c8d796d908e65217f40887963bb2457c7e1585cd SHA512 60f1123d98ebd0f6f5d03f5f9accd77e4a2e287be576a1d339902ee5f6b5e3ddfb6e4c96260c4a1902e5b89fed5865c8f5fa721105868ef11c204e845f591a8c WHIRLPOOL 2dfa0738ab7b15493c3935a9d8297dc9734b8f12895373e58853c84c2257d4f0145a5600081da4d63e0f59341a8756d366fe1b5ce6214c54e91aabe2ef76f3e5 DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43 -DIST nss-3.14.1.tar.gz 5814063 SHA256 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5 SHA512 f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e WHIRLPOOL 8b292433ec764cfe857bd7cb25c216905b785c536176ece14571c9e7017a93c7a8562502645d71eed7da9f5cc52c65564c294a8a2b75ea43bda19049d6c393bb -DIST nss-3.14.2.tar.gz 6178419 SHA256 a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95 SHA512 65303f09ef09900512da8d19f7f35f50ef07926256bc5b548a665b5f2ea82bf02548bc8464e0f3723014f3f0f3d2e908faf9ef82b564be21adb7da7f5295e137 WHIRLPOOL 71063478b5083e7cad64e06e84fc8a713c45b85ce9d6f0ad1af16c38b5cbb89779fd35c93813644a8d0c0c1e729805b957c44b6b0f7acf60c8032ed0eb98b4a9 DIST nss-3.14.3.tar.gz 6189790 SHA256 d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0 SHA512 4e8d8517ffb6d03da274afe9a7c50e2f0a15ffdd83e63f29a445e7aee829a8b7e2fbc772695322bd6acee81c052811735b542978044996156cb52dd7e4c001ec WHIRLPOOL 1c1c341303c8c1a13a10b732ac27d5ac8f3245b220436848bdf3877fb1487dba71654908f58810d49869e5af2a86842c4638415b283114bae0f4fbfaee3c4b29 -DIST nss-3.14.tar.gz 6068755 SHA256 b01868959d50263265aacc5a09f9a9eefbbde5f35604c2977f9714696f1d3e2b SHA512 c5aba091fddcdd57a8cda879a90cf05eeacedf5d734be8eaaec9051aaa6c468b0c8b9816db3cb864859702f90f49fd37971eca98754763b778dcd5fb3d1f7358 WHIRLPOOL b795c55c4dcb7878c4e887b6dc52213d1c31e09ea969df0d8b642b1010b5900c8734de70287141be2ca93a77631b312e68e9e781689f158bb104c501882046ae DIST nss-3.15-pem-support-20130617.patch.xz 27800 SHA256 01885877f12b0460798760617c9b0a1f8ed05ad0130e924211bd73fc344535cc SHA512 ebf0633e1683b3b9efe340d1117e02f1ced7e8381c7e867fff77efc3c41df1a32f017b18816ae6a04b35b5006c83e557c47a13ae576f50a84f9770c321dfa34b WHIRLPOOL 88f5edc621ca7862dc2e433836e11caa60752dc8f95bc7f49bcf07cdd0b3d8f2d7642ee02b018b8429a3e358e252ecdf3de40a1b12fab1f0fa13ca360e02a53c DIST nss-3.15.tar.gz 6276213 SHA256 c139f331ddcff4d5485590ee1b4489d3731aa520d4f5d942e2e40bba1e23a3cd SHA512 a703bb6fb466bfdde84f112eabe44f2db0b938b9e34ff32143ad913cd7a8891748579eca8cdd10b2a6e5eaa062a0522af8f767ec4de706178efd172d3c5875a9 WHIRLPOOL 80e76f6e36b814f7338d695220250aa68bd5757a5f3294609d3812708c30f2a77c9bdfcd6eeace34473afe22e0b0bd75eb848c168ea4e3a6327203dd323b66bf diff --git a/dev-libs/nss/files/nss-3.12.11-CVE-2011-3640.patch b/dev-libs/nss/files/nss-3.12.11-CVE-2011-3640.patch deleted file mode 100644 index 717ef74fd453..000000000000 --- a/dev-libs/nss/files/nss-3.12.11-CVE-2011-3640.patch +++ /dev/null @@ -1,137 +0,0 @@ -Index: mozilla/security/nss/lib/softoken/sftkmod.c -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sftkmod.c,v ---- mozilla/security/nss/lib/softoken/sftkmod.c 15 Jan 2011 20:59:11 -0000 1.8 -+++ mozilla/security/nss/lib/softoken/sftkmod.c 2 Oct 2011 14:45:28 -0000 -@@ -179,15 +179,18 @@ char *sftk_getOldSecmodName(const char * - char *sep; - - sep = PORT_Strrchr(dirPath,*PATH_SEPARATOR); --#ifdef WINDOWS -+#ifdef _WIN32 - if (!sep) { -- sep = PORT_Strrchr(dirPath,'/'); -+ /* pkcs11i.h defines PATH_SEPARATOR as "/" for all platforms. */ -+ sep = PORT_Strrchr(dirPath,'\\'); - } - #endif - if (sep) { -- *(sep)=0; -+ *sep = 0; -+ file = PR_smprintf("%s"PATH_SEPARATOR"%s", dirPath, filename); -+ } else { -+ file = PR_smprintf("%s", filename); - } -- file= PR_smprintf("%s"PATH_SEPARATOR"%s", dirPath, filename); - PORT_Free(dirPath); - return file; - } -@@ -242,13 +245,18 @@ sftkdb_ReadSecmodDB(SDBType dbType, cons - char *paramsValue=NULL; - PRBool failed = PR_TRUE; - -- if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) { -+ if ((dbname != NULL) && -+ ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS))) { - return sftkdbCall_ReadSecmodDB(appName, filename, dbname, params, rw); - } - - moduleList = (char **) PORT_ZAlloc(useCount*sizeof(char **)); - if (moduleList == NULL) return NULL; - -+ if (dbname == NULL) { -+ goto return_default; -+ } -+ - /* do we really want to use streams here */ - fd = fopen(dbname, "r"); - if (fd == NULL) goto done; -@@ -405,7 +413,11 @@ sftkdb_ReadSecmodDB(SDBType dbType, cons - moduleString = NULL; - } - done: -- /* if we couldn't open a pkcs11 database, look for the old one */ -+ /* If we couldn't open a pkcs11 database, look for the old one. -+ * This is necessary to maintain the semantics of the transition from -+ * old to new DB's. If there is an old DB and not new DB, we will -+ * automatically use the old DB. If the DB was opened read/write, we -+ * create a new db and upgrade it from the old one. */ - if (fd == NULL) { - char *olddbname = sftk_getOldSecmodName(dbname,filename); - PRStatus status; -@@ -462,6 +474,8 @@ bail: - PR_smprintf_free(olddbname); - } - } -+ -+return_default: - - if (!moduleList[0]) { - char * newParams; -@@ -515,7 +529,8 @@ sftkdb_ReleaseSecmodDBData(SDBType dbTyp - const char *filename, const char *dbname, - char **moduleSpecList, PRBool rw) - { -- if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) { -+ if ((dbname != NULL) && -+ ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS))) { - return sftkdbCall_ReleaseSecmodDBData(appName, filename, dbname, - moduleSpecList, rw); - } -@@ -546,6 +561,10 @@ sftkdb_DeleteSecmodDB(SDBType dbType, co - PRBool skip = PR_FALSE; - PRBool found = PR_FALSE; - -+ if (dbname == NULL) { -+ return SECFailure; -+ } -+ - if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) { - return sftkdbCall_DeleteSecmodDB(appName, filename, dbname, args, rw); - } -@@ -669,6 +688,10 @@ sftkdb_AddSecmodDB(SDBType dbType, const - char *block = NULL; - PRBool libFound = PR_FALSE; - -+ if (dbname == NULL) { -+ return SECFailure; -+ } -+ - if ((dbType == SDB_LEGACY) || (dbType == SDB_MULTIACCESS)) { - return sftkdbCall_AddSecmodDB(appName, filename, dbname, module, rw); - } -Index: mozilla/security/nss/lib/softoken/sftkpars.c -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sftkpars.c,v ---- mozilla/security/nss/lib/softoken/sftkpars.c 18 Jun 2010 04:09:27 -0000 1.11 -+++ mozilla/security/nss/lib/softoken/sftkpars.c 2 Oct 2011 14:45:29 -0000 -@@ -607,6 +607,7 @@ sftk_getSecmodName(char *param, SDBType - char *value = NULL; - char *save_params = param; - const char *lconfigdir; -+ PRBool noModDB = PR_FALSE; - param = sftk_argStrip(param); - - -@@ -631,7 +632,10 @@ sftk_getSecmodName(char *param, SDBType - - if (sftk_argHasFlag("flags","noModDB",save_params)) { - /* there isn't a module db, don't load the legacy support */ -+ noModDB = PR_TRUE; - *dbType = SDB_SQL; -+ PORT_Free(*filename); -+ *filename = NULL; - *rw = PR_FALSE; - } - -@@ -640,7 +644,9 @@ sftk_getSecmodName(char *param, SDBType - secmodName="pkcs11.txt"; - } - -- if (lconfigdir) { -+ if (noModDB) { -+ value = NULL; -+ } else if (lconfigdir && lconfigdir[0] != '\0') { - value = PR_smprintf("%s" PATH_SEPARATOR "%s",lconfigdir,secmodName); - } else { - value = PR_smprintf("%s",secmodName); diff --git a/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch b/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch deleted file mode 100644 index f0a3310c3c81..000000000000 --- a/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- mozilla/security/coreconf/SunOS5.mk.orig 2009-10-02 10:51:26.617090950 +0200 -+++ mozilla/security/coreconf/SunOS5.mk 2009-10-02 10:53:39.756260510 +0200 -@@ -37,6 +37,9 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - -+NS_USE_GCC = 1 -+GCC_USE_GNU_LD = 1 -+ - # - # Temporary define for the Client; to be removed when binary release is used - # -@@ -104,7 +107,7 @@ - endif - endif - --INCLUDES += -I/usr/dt/include -I/usr/openwin/include -+#INCLUDES += -I/usr/dt/include -I/usr/openwin/include - - RANLIB = echo - CPU_ARCH = sparc -@@ -114,11 +117,6 @@ - NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) - - MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) --ifdef NS_USE_GCC --ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) -- GCC_USE_GNU_LD = 1 --endif --endif - ifdef MAPFILE - ifdef NS_USE_GCC - ifdef GCC_USE_GNU_LD diff --git a/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff b/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff deleted file mode 100644 index 79ac73cd8d37..000000000000 --- a/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff +++ /dev/null @@ -1,245 +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 <&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/files/nss-3.13-gentoo-fixup.patch b/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch deleted file mode 100644 index 42f26c616b6a..000000000000 --- a/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile ---- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ b/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 a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in ---- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/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 <&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 a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in ---- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/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 -+Cflags: -I${includedir} -+ -diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile ---- a/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 -+++ b/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 a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn ---- a/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -0500 -+++ b/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/files/nss-3.13.1-solaris-gcc.patch b/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch deleted file mode 100644 index b775bac257f5..000000000000 --- a/dev-libs/nss/files/nss-3.13.1-solaris-gcc.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- nss-3.13.1/mozilla/security/coreconf/SunOS5.mk -+++ nss-3.13.1/mozilla/security/coreconf/SunOS5.mk -@@ -37,6 +37,9 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - -+NS_USE_GCC = 1 -+GCC_USE_GNU_LD = 1 -+ - # Sun's WorkShop defines v8, v8plus and v9 architectures. - # gcc on Solaris defines v8 and v9 "cpus". - # gcc's v9 is equivalent to Workshop's v8plus. -@@ -95,7 +98,7 @@ - endif - endif - --INCLUDES += -I/usr/dt/include -I/usr/openwin/include -+#INCLUDES += -I/usr/dt/include -I/usr/openwin/include - - RANLIB = echo - CPU_ARCH = sparc -@@ -105,11 +108,6 @@ - NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS) - - MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH) --ifdef NS_USE_GCC --ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1))) -- GCC_USE_GNU_LD = 1 --endif --endif - ifdef MAPFILE - ifdef NS_USE_GCC - ifdef GCC_USE_GNU_LD diff --git a/dev-libs/nss/files/nss-3.13.5-x32.patch b/dev-libs/nss/files/nss-3.13.5-x32.patch deleted file mode 100644 index 1027cf0d3455..000000000000 --- a/dev-libs/nss/files/nss-3.13.5-x32.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -8urN a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk ---- a/mozilla/security/coreconf/Linux.mk 2012-06-22 07:55:45.228234872 -0500 -+++ b/mozilla/security/coreconf/Linux.mk 2012-06-22 07:56:30.171231815 -0500 -@@ -60,21 +60,28 @@ - else - ifeq ($(OS_TEST),alpha) - OS_REL_CFLAGS = -D_ALPHA_ - CPU_ARCH = alpha - else - ifeq ($(OS_TEST),x86_64) - ifeq ($(USE_64),1) - CPU_ARCH = x86_64 -+ ARCHFLAG = -m64 -+else -+ifeq ($(USE_x32),1) -+ OS_REL_CFLAGS = -Di386 -+ CPU_ARCH = x86 -+ ARCHFLAG = -mx32 - else - OS_REL_CFLAGS = -Di386 - CPU_ARCH = x86 - ARCHFLAG = -m32 - endif -+endif - else - ifeq ($(OS_TEST),sparc64) - CPU_ARCH = sparc - else - ifeq (,$(filter-out arm% sa110,$(OS_TEST))) - CPU_ARCH = arm - else - ifeq (,$(filter-out parisc%,$(OS_TEST))) -diff -8urN a/mozilla/security/nss/lib/freebl/Makefile b/mozilla/security/nss/lib/freebl/Makefile ---- a/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:55:45.441234854 -0500 -+++ b/mozilla/security/nss/lib/freebl/Makefile 2012-06-22 07:56:30.172231808 -0500 -@@ -210,22 +210,26 @@ - DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN - # DEFINES += -DMPI_AMD64_ADD - # comment the next two lines to turn off intel HW accelleration - DEFINES += -DUSE_HW_AES - ASFILES += intel-aes.s - MPI_SRCS += mpi_amd64.c mp_comba.c - endif - ifeq ($(CPU_ARCH),x86) -- ASFILES = mpi_x86.s -- DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -- DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -- DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN -- # The floating point ECC code doesn't work on Linux x86 (bug 311432). -- #ECL_USE_FP = 1 -+ ifeq ($(USE_x32),1) -+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN -+ else -+ ASFILES = mpi_x86.s -+ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -+ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN -+ # The floating point ECC code doesn't work on Linux x86 (bug 311432). -+ #ECL_USE_FP = 1 -+ endif - endif - ifeq ($(CPU_ARCH),arm) - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE - DEFINES += -DMP_USE_UINT_DIGIT - DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512 - MPI_SRCS += mpi_arm.c - endif - endif # Linux diff --git a/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch deleted file mode 100644 index 300da5d37b92..000000000000 --- a/dev-libs/nss/files/nss-3.14.1-gentoo-fixups.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/config/Makefile ---- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/Makefile 2012-12-15 07:27:20.650148987 -0600 -@@ -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 a/mozilla/security/nss/config/nss-config.in b/mozilla/security/nss/config/nss-config.in ---- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/nss-config.in 2012-12-15 07:27:20.651148959 -0600 -@@ -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 <&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 a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss/config/nss.pc.in ---- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ b/mozilla/security/nss/config/nss.pc.in 2012-12-15 07:27:20.651148959 -0600 -@@ -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 -+Cflags: -I${includedir} -+ -diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefile ---- a/mozilla/security/nss/Makefile 2012-11-13 19:14:07.000000000 -0600 -+++ b/mozilla/security/nss/Makefile 2012-12-15 07:27:57.235162137 -0600 -@@ -44,7 +44,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 - -@@ -106,12 +106,6 @@ - --with-dist-prefix='$(NSPR_PREFIX)' \ - --with-dist-includedir='$(NSPR_PREFIX)/include' - --build_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) -- --clobber_nspr: $(NSPR_CONFIG_STATUS) -- $(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber -- - build_dbm: - ifdef NSS_DISABLE_DBM - @echo "skipping the build of DBM" -diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/manifest.mn ---- a/mozilla/security/nss/manifest.mn 2012-03-20 09:46:49.000000000 -0500 -+++ b/mozilla/security/nss/manifest.mn 2012-12-15 07:27:20.652148933 -0600 -@@ -10,6 +10,6 @@ - - RELEASE = nss - --DIRS = lib cmd -+DIRS = lib cmd config diff --git a/dev-libs/nss/files/nss-3.14.2-sqlite.patch b/dev-libs/nss/files/nss-3.14.2-sqlite.patch deleted file mode 100644 index 461572fb1aa6..000000000000 --- a/dev-libs/nss/files/nss-3.14.2-sqlite.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=837799 - -Index: mozilla/security/nss/lib/softoken/sdb.c -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sdb.c,v -retrieving revision 1.30 -diff -u -u -r1.30 sdb.c ---- mozilla/security/nss/lib/softoken/sdb.c 16 Jan 2013 18:13:25 -0000 1.30 -+++ mozilla/security/nss/lib/softoken/sdb.c 4 Feb 2013 19:15:58 -0000 -@@ -254,6 +254,10 @@ - #error "sdb_getFallbackTempDir not implemented" - #endif - -+#ifndef SQLITE_FCNTL_TEMPFILENAME -+#define SQLITE_FCNTL_TEMPFILENAME 16 -+#endif -+ - static char * - sdb_getTempDir(sqlite3 *sqlDB) - { - diff --git a/dev-libs/nss/nss-3.12.11-r1.ebuild b/dev-libs/nss/nss-3.12.11-r1.ebuild deleted file mode 100644 index 19eb06844b73..000000000000 --- a/dev-libs/nss/nss-3.12.11-r1.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11-r1.ebuild,v 1.10 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.8.9" -RTM_NAME="NSS_${PV//./_}_RTM" -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5" - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - - # Fix for bug #388045 - epatch "${FILESDIR}/${P}-CVE-2011-3640.patch" - - cd "${S}"/mozilla/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}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - if [[ ${CHOST} == *-darwin* ]] ; then - # Fix pkgconfig for Darwin (no RPATH stuff) - sed -i -e 's/-Wl,-R${\?libdir}\?//' \ - "${S}"/mozilla/security/nss/config/nss-config.in \ - "${S}"/mozilla/security/nss/config/nss.pc.in || die - fi - - # Avoid install_name_tooling post install - sed -i -e "s:@executable_path:${EPREFIX}/usr/$(get_libdir):" \ - "${S}"/mozilla/security/coreconf/Darwin.mk \ - "${S}"/mozilla/security/nss/lib/freebl/config.mk || die - - epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools - # dirty hack - cd "${S}"/mozilla/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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - - cd "${S}"/mozilla/security/coreconf - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/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}$(get_libname) - 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}$(get_libname)" - # 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=12 - cd "${S}"/mozilla/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}"/mozilla/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}$(get_libname)") - 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$(get_libname 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 ELF libraries AFTER they are stripped. - [[ ${CHOST} != *-darwin* ]] && \ - generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir) -} - -pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) -} diff --git a/dev-libs/nss/nss-3.13.2.ebuild b/dev-libs/nss/nss-3.13.2.ebuild deleted file mode 100644 index 94e300281daa..000000000000 --- a/dev-libs/nss/nss-3.13.2.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.2.ebuild,v 1.3 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/nss-3.13.2-add_cacert_ca_certs-ported.patch" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/nss-3.13.2-add_cacert_ca_certs-ported.patch" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-libs/nss/nss-3.13.3.ebuild b/dev-libs/nss/nss-3.13.3.ebuild deleted file mode 100644 index 52691c2490f3..000000000000 --- a/dev-libs/nss/nss-3.13.3.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.3.ebuild,v 1.6 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/nss-3.13.3-add_spi+cacerts_ca_certs.patch" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-libs/nss/nss-3.13.4.ebuild b/dev-libs/nss/nss-3.13.4.ebuild deleted file mode 100644 index 75de8a2c4b7d..000000000000 --- a/dev-libs/nss/nss-3.13.4.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.4.ebuild,v 1.9 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig" -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/nss-3.13.3-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-libs/nss/nss-3.13.5-r1.ebuild b/dev-libs/nss/nss-3.13.5-r1.ebuild deleted file mode 100644 index 566f2116a132..000000000000 --- a/dev-libs/nss/nss-3.13.5-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.5-r1.ebuild,v 1.2 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9.1" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig - >=dev-libs/nspr-${NSPR_VER}" - -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.13.3-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - epatch "${FILESDIR}/${PN}-3.13.5-x32.patch" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) export USE_x32=1;; - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-libs/nss/nss-3.13.5.ebuild b/dev-libs/nss/nss-3.13.5.ebuild deleted file mode 100644 index f6f886a91e0f..000000000000 --- a/dev-libs/nss/nss-3.13.5.ebuild +++ /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/dev-libs/nss/nss-3.13.5.ebuild,v 1.8 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9.1" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig - >=dev-libs/nspr-${NSPR_VER}" - -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.13.3-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-libs/nss/nss-3.13.6.ebuild b/dev-libs/nss/nss-3.13.6.ebuild deleted file mode 100644 index 1efbb3616f4f..000000000000 --- a/dev-libs/nss/nss-3.13.6.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.13.6.ebuild,v 1.5 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9.2" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.6-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig - >=dev-libs/nspr-${NSPR_VER}" - -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.13.6-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - epatch "${FILESDIR}/${PN}-3.13.5-x32.patch" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) export USE_x32=1;; - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-libs/nss/nss-3.14.1.ebuild b/dev-libs/nss/nss-3.14.1.ebuild deleted file mode 100644 index 51cf874f0d3b..000000000000 --- a/dev-libs/nss/nss-3.14.1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.1.ebuild,v 1.13 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9.2" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig - >=dev-libs/nspr-${NSPR_VER}" - -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.14.1-gentoo-fixups.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - epatch "${FILESDIR}/${PN}-3.13.5-x32.patch" - - cd "${S}"/mozilla/security/coreconf || die - # hack nspr paths - echo 'INCLUDES += -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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # use host shlibsign if need be #436216 - if tc-is-cross-compiler ; then - sed -i \ - -e 's:"${2}"/shlibsign:shlibsign:' \ - "${S}"/mozilla/security/nss/cmd/shlibsign/sign.sh || die - fi - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -nssarch() { - # Most of the arches are the same as $ARCH - local t=${1:-${CHOST}} - case ${t} in - hppa*) echo "parisc";; - i?86*) echo "i686";; - x86_64*) echo "x86_64";; - *) tc-arch ${t};; - esac -} - -nssbits() { - echo > "${T}"/test.c || die - ${!1} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) echo USE_x32=1;; - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac -} - -src_compile() { - strip-flags - - tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG} - local makeargs=( - CC="${CC}" - AR="${AR} rc \$@" - RANLIB="${RANLIB}" - OPTIMIZER= - $(nssbits CC) - ) - - # Take care of nspr settings #436216 - append-cppflags $(${PKG_CONFIG} nspr --cflags) - append-ldflags $(${PKG_CONFIG} nspr --libs-only-L) - unset NSPR_INCLUDE_DIR - export NSPR_LIB_DIR=${T}/fake-dir - - # Do not let `uname` be used. - if use kernel_linux ; then - makeargs+=( - OS_TARGET=Linux - OS_RELEASE=2.6 - OS_TEST="$(nssarch)" - ) - fi - - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export XCFLAGS="${CFLAGS} ${CPPFLAGS}" - export FREEBL_NO_DEPEND=1 - export ASFLAGS="" - - local d - - # Build the host tools first. - LDFLAGS="${BUILD_LDFLAGS}" \ - XCFLAGS="${BUILD_CFLAGS}" \ - emake -j1 -C mozilla/security/coreconf \ - CC="${BUILD_CC}" \ - $(nssbits BUILD_CC) \ - || die - makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) - - # Then build the target tools. - for d in dbm nss ; do - emake -j1 "${makeargs[@]}" -C mozilla/security/${d} || die "${d} make failed" - done -} - -# 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 - local i - 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 - local i - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n file - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - local f 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - done - - # Prelink breaks the CHK files. We don't have any reliable way to run - # shlibsign after prelink. - local l 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # We must re-sign the libraries AFTER they are stripped. - local shlibsign="${EROOT}/usr/bin/shlibsign" - # See if we can execute it (cross-compiling & such). #436216 - "${shlibsign}" -h >&/dev/null - if [[ $? -gt 1 ]] ; then - shlibsign="shlibsign" - fi - generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) -} - -pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) -} diff --git a/dev-libs/nss/nss-3.14.2.ebuild b/dev-libs/nss/nss-3.14.2.ebuild deleted file mode 100644 index 40cc3b8e81d6..000000000000 --- a/dev-libs/nss/nss-3.14.2.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.2.ebuild,v 1.2 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9.5" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig - >=dev-libs/nspr-${NSPR_VER}" - -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.14.1-gentoo-fixups.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - epatch "${FILESDIR}/${PN}-3.14.2-x32.patch" - epatch "${FILESDIR}/${PN}-3.14.2-sqlite.patch" - - cd "${S}"/mozilla/security/coreconf || die - # hack nspr paths - echo 'INCLUDES += -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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch" - - # use host shlibsign if need be #436216 - if tc-is-cross-compiler ; then - sed -i \ - -e 's:"${2}"/shlibsign:shlibsign:' \ - "${S}"/mozilla/security/nss/cmd/shlibsign/sign.sh || die - fi - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -nssarch() { - # Most of the arches are the same as $ARCH - local t=${1:-${CHOST}} - case ${t} in - hppa*) echo "parisc";; - i?86*) echo "i686";; - x86_64*) echo "x86_64";; - *) tc-arch ${t};; - esac -} - -nssbits() { - echo > "${T}"/test.c || die - ${!1} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) echo USE_x32=1;; - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac -} - -src_compile() { - strip-flags - - tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG} - local makeargs=( - CC="${CC}" - AR="${AR} rc \$@" - RANLIB="${RANLIB}" - OPTIMIZER= - $(nssbits CC) - ) - - # Take care of nspr settings #436216 - append-cppflags $(${PKG_CONFIG} nspr --cflags) - append-ldflags $(${PKG_CONFIG} nspr --libs-only-L) - unset NSPR_INCLUDE_DIR - export NSPR_LIB_DIR=${T}/fake-dir - - # Do not let `uname` be used. - if use kernel_linux ; then - makeargs+=( - OS_TARGET=Linux - OS_RELEASE=2.6 - OS_TEST="$(nssarch)" - ) - fi - - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export XCFLAGS="${CFLAGS} ${CPPFLAGS}" - export FREEBL_NO_DEPEND=1 - export ASFLAGS="" - - local d - - # Build the host tools first. - LDFLAGS="${BUILD_LDFLAGS}" \ - XCFLAGS="${BUILD_CFLAGS}" \ - emake -j1 -C mozilla/security/coreconf \ - CC="${BUILD_CC}" \ - $(nssbits BUILD_CC) \ - || die - makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) - - # Then build the target tools. - for d in dbm nss ; do - emake -j1 "${makeargs[@]}" -C mozilla/security/${d} || die "${d} make failed" - done -} - -# 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 - local i - 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 - local i - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n file - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - done - - local f 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - done - - # Prelink breaks the CHK files. We don't have any reliable way to run - # shlibsign after prelink. - local l 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # We must re-sign the libraries AFTER they are stripped. - local shlibsign="${EROOT}/usr/bin/shlibsign" - # See if we can execute it (cross-compiling & such). #436216 - "${shlibsign}" -h >&/dev/null - if [[ $? -gt 1 ]] ; then - shlibsign="shlibsign" - fi - generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) -} - -pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) -} diff --git a/dev-libs/nss/nss-3.14.ebuild b/dev-libs/nss/nss-3.14.ebuild deleted file mode 100644 index 916f5e9fde04..000000000000 --- a/dev-libs/nss/nss-3.14.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.14.ebuild,v 1.11 2013/03/29 22:45:18 vapier Exp $ - -EAPI=3 -inherit eutils flag-o-matic multilib toolchain-funcs - -NSPR_VER="4.9.2" -RTM_NAME="NSS_${PV//./_}_RTM" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - http://dev.gentoo.org/~anarchy/patches/${PN}-3.14-add_spi+cacerts_ca_certs.patch - http://dev.gentoo.org/~anarchy/patches/${PN}-3.13.3_pem.support" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="utils" - -DEPEND="virtual/pkgconfig - >=dev-libs/nspr-${NSPR_VER}" - -RDEPEND=">=dev-libs/nspr-${NSPR_VER} - >=dev-db/sqlite-3.5 - sys-libs/zlib" - -src_setup() { - export LC_ALL="C" -} - -src_prepare() { - # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" - epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" - epatch "${DISTDIR}/${PN}-3.14-add_spi+cacerts_ca_certs.patch" - epatch "${DISTDIR}/${PN}-3.13.3_pem.support" - epatch "${FILESDIR}/${PN}-3.13.5-x32.patch" - - cd "${S}"/mozilla/security/coreconf || die - # 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 || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk || die - - # Ensure we stay multilib aware - sed -i -e "s:gentoo\/nss:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile || die "Failed to fix for multilib" - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - "${S}"/mozilla/security/nss/config/Makefile || die - - epatch "${FILESDIR}/nss-3.13.1-solaris-gcc.patch" - - # dirty hack - cd "${S}"/mozilla/security/nss || die - 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 -} - -src_compile() { - strip-flags - - echo > "${T}"/test.c || die - $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die - case $(file "${T}"/test.o) in - *32-bit*x86-64*) export USE_x32=1;; - *64-bit*|*ppc64*|*x86_64*) export USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; - esac - - 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 - export ASFLAGS="" - - cd "${S}"/mozilla/security/coreconf || die - emake -j1 CC="$(tc-getCC)" || die "coreconf make failed" - cd "${S}"/mozilla/security/dbm || die - emake -j1 CC="$(tc-getCC)" || die "dbm make failed" - cd "${S}"/mozilla/security/nss || die - 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=12 - cd "${S}"/mozilla/security/dist || die - - dodir /usr/$(get_libdir) || die - 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 || die - cp -L */bin/nss-config "${ED}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig || die - cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die - - # all the include files - insinto /usr/include/nss - doins public/nss/*.h || die - cd "${ED}"/usr/$(get_libdir) || die - local n= - for file in *$(get_libname); do - n=${file%$(get_libname)}$(get_libname ${MINOR_VERSION}) - mv ${file} ${n} || die - ln -s ${n} ${file} || die - if [[ ${CHOST} == *-darwin* ]]; then - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${n}" ${n} || die - fi - 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}"/mozilla/security/dist/*/bin/ || die - for f in ${nssutils}; do - dobin ${f} || die - 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" || die - unset libs liblist - doenvd "${T}/90nss" || die -} - -pkg_postinst() { - # 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) -} diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest index 239c2667adf0..6c171671d01f 100644 --- a/dev-tex/latex-beamer/Manifest +++ b/dev-tex/latex-beamer/Manifest @@ -1,2 +1,2 @@ DIST latex-beamer-3.26.zip 4344322 SHA256 c61f5b8dc02ef2584ddba707de49f8e58b2533350109154ef79d91f07cd83a8e SHA512 fc419e61943d3bdf6230d4d3822bc53322551f07394a9a703e0ffc82c942155a591776af7d0396559d20325c4211b09a363eb770cad002d0b292e7ba97e3d6de WHIRLPOOL 29d0fb6193458a497fe79b9ed79a55f41139f20f751c38bf48c6416e741b2fa32da4501c1ae4850f5b652bd9af8223beb61a13deae60442525aec1bba96a6cf3 -DIST latex-beamer-3.27.zip 3126232 SHA256 8af3383bd3090cdd69422f34db9358151243eddacb0020f8d7da0f8ccbfc5727 SHA512 709644282658ae0784b820f6843cdccf1786e194785bf8cc3cf96a153dd541ffd969b6830462bae4dbe011dcae7d96d7896bfb00d7aa1c1277dcd0130d43521c WHIRLPOOL 3e85981b7a7860c7ec81086249a46a88ae49109d8ade4226c3b27a95638c00948cad55f15c482b12d58813126e2ed4c0acb50f13702ddaec4242cd51346e5e71 +DIST latex-beamer-3.27.zip 4345327 SHA256 4899fbd783154c9ac2f8dd43f62da24b753ea09ef2637c74c80209ebf7fdad02 SHA512 435877b1c70ded101bbaea4fdd91c25a9ef75bf709113b834a4d8ecf890364d4f11e045cb62f307c50265ed0671934652262cc6dfcb32c9a01f4fdf91c7c72db WHIRLPOOL cc75ad9929ec0635ccd44396aa584c41cbcfc3c2e36298d7145c7164b902c9689e40d9353c83105b9ef492e025245f164444beaa3fd06f124c8145fa2bd39117 diff --git a/media-libs/libvpx/libvpx-1.1.0.ebuild b/media-libs/libvpx/libvpx-1.1.0.ebuild index 97a2c433f68e..433602a19607 100644 --- a/media-libs/libvpx/libvpx-1.1.0.ebuild +++ b/media-libs/libvpx/libvpx-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.26 2013/06/05 14:55:55 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.1.0.ebuild,v 1.27 2013/06/19 13:38:03 jer Exp $ EAPI=4 inherit multilib toolchain-funcs base flag-o-matic @@ -11,10 +11,10 @@ if [[ ${PV} == *9999* ]]; then KEYWORDS="" elif [[ ${PV} == *pre* ]]; then SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" else SRC_URI="http://webm.googlecode.com/files/${PN}-v${PV}.tar.bz2" - KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${PN}-v${PV}" fi diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index fa1de4d3c74d..73ec926cdbb4 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -16,3 +16,4 @@ DIST mesa-9.1-gentoo-patches-03.tar.bz2 2416 SHA256 0d149d6f414c3b632e6903a11aee DIST mesa-9.1-gentoo-patches-05.tar.bz2 3301 SHA256 975ff594dc1eb2aa46f8079b3bd3e2e34d08c47c6c76c66ece6c967c40278d63 SHA512 5f4393d09108d520130e7bc5e0513a73581b16682ad9826f7828a1aa052ca0f2841f9b1fcae43cc108f0ba6c54ae131504603f2e422ca3b71aceb337019a2256 WHIRLPOOL 6e640d2d660e9dd669497f378810c12913e64a2623a66a31e73cdf3e55a3d71c94a039f7e3c4ab8aaf23720ab85e7dbf7649cac7d64ab9cd5ff2f24840d31b02 DIST mesa-9.2_pre20130515.tar.xz 4880352 SHA256 bf563bbc93f03e4912268d403c040c4213f7ab4b4628198400d90f13dc84945c SHA512 a98c03fd3801dbfef1551821a9e837731dfce75158fd852d3ae8313dd5e38da3977b603d287e8128caa84518aec0a46104fd643338f60797572397177489fd85 WHIRLPOOL 7bbaba58fec30e55d050e7a7ea08a479d4ccc3befa6ca4bb2532134000eac45079fe5aae293b36c02d1ae5b7398fd6e0ad0cb3be759596c6321e76eae498b6b4 DIST mesa-9.2_pre20130528.tar.xz 4891152 SHA256 46f37afb32ed6c05bd624af830353b2288380e08499d30c09fd551e5df38c447 SHA512 d32385b09a59325c97eb92ce2d5c8413a45ee835aaf8134c18790d53fd679f303a52622629cc558a228f3fe1f19cd382dd97a524881a59ca03c2616c54b40886 WHIRLPOOL 91e8631ed85c85c2077920f9f6cb4befb809c5b246ea3f37966b29f0aedd408dbd7f2cb149262fbd415be6c5f8fd5e091b679d7e5dafb3e8991009301368af26 +DIST mesa-9.2_pre20130619.tar.xz 4997368 SHA256 8c67352d253bac00ba0e190960f50d7c9012111e03ed8d2bba4f0ce45b3a7552 SHA512 90ecb2b60424542546d8e61af8b433e918af518c4c460f51d287961e4178ebb0b46e16e035d9b2a6e50a3f3d3071b7125387694d41f50e09347a60e303b467c6 WHIRLPOOL 14b2d9f77de70e2cd7f26cc8d2a1160f244c709184c5987363fc2de18abf14b3bdf7a5b5e059c41e477b09b451ed60e0d4fd66fe3b15d42d536e73345b9a85c4 diff --git a/media-libs/mesa/mesa-9.2_pre20130619.ebuild b/media-libs/mesa/mesa-9.2_pre20130619.ebuild new file mode 100644 index 000000000000..30818ecd3c3f --- /dev/null +++ b/media-libs/mesa/mesa-9.2_pre20130619.ebuild @@ -0,0 +1,463 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.2_pre20130619.ebuild,v 1.1 2013/06/19 15:32:40 chithanh Exp $ + +EAPI=5 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit base autotools multilib flag-o-matic python-single-r1 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="mirror://gentoo/${P}.tar.xz + ${SRC_PATCHES}" +fi + +# The code is MIT/X11. +# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 +LICENSE="MIT SGI-B-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + +INTEL_CARDS="i915 i965 ilo intel" +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl + openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau + wayland xvmc xa xorg kernel_FreeBSD" + +REQUIRED_USE=" + llvm? ( gallium ) + openvg? ( egl gallium ) + opencl? ( gallium r600-llvm-compiler ) + gbm? ( shared-glapi ) + gles1? ( egl ) + gles2? ( egl ) + r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) + wayland? ( egl ) + xa? ( gallium ) + xorg? ( gallium ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( || ( classic gallium ) ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_ilo? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_radeon? ( || ( classic gallium ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vmware? ( gallium ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.45" +# keep correct libdrm and dri2proto dep +# keep blocks in rdepend for binpkg +RDEPEND=" + !=app-admin/eselect-opengl-1.2.7 + dev-libs/expat + gbm? ( virtual/udev ) + >=x11-libs/libX11-1.3.99.901 + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXxf86vm + >=x11-libs/libxcb-1.8.1 + opencl? ( + app-admin/eselect-opencl + dev-libs/libclc + ) + vdpau? ( >=x11-libs/libvdpau-0.4.1 ) + wayland? ( >=dev-libs/wayland-1.0.3 ) + xorg? ( + x11-base/xorg-server:= + x11-libs/libdrm[libkms] + ) + xvmc? ( >=x11-libs/libXvMC-1.0.6 ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,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} + llvm? ( + >=sys-devel/llvm-2.9 + r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) + video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) + ) + opencl? ( + >=sys-devel/llvm-3.3[video_cards_radeon] + >=sys-devel/clang-3.3 + >=sys-devel/gcc-4.6 + ) + ${PYTHON_DEPS} + dev-libs/libxml2[python,${PYTHON_USEDEP}] + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + >=x11-proto/dri2proto-2.6 + >=x11-proto/glproto-1.4.15-r1 + >=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() { + # workaround toc-issue wrt #386545 + use ppc64 && append-flags -mminimal-toc + + python-single-r1_pkg_setup +} + +src_unpack() { + default + [[ $PV = 9999* ]] && git-2_src_unpack + mv "${WORKDIR}"/${PN}-* "${WORKDIR}/${MY_P}" || die +} + +src_prepare() { + # apply patches + if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/patches" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + # relax the requirement that r300 must have llvm, bug 380303 + epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch + + # fix for hardened pax_kernel, bug 240956 + [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch + + # 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 + fi + + # Tests fail against python-3, bug #407887 + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die + + base_src_prepare + + eautoreconf +} + +src_configure() { + local myconf + + if use classic; then + # Configurable DRI drivers + driver_enable swrast + + # Intel code + driver_enable video_cards_i915 i915 + driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_r100 radeon + driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + driver_enable video_cards_radeon radeon r200 + fi + fi + + if use egl; then + myconf+=" + --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") + $(use_enable gallium gallium-egl) + " + fi + + if use gallium; then + myconf+=" + $(use_enable llvm gallium-llvm) + $(use_enable openvg) + $(use_enable r600-llvm-compiler) + $(use_enable vdpau) + $(use_enable xvmc) + " + gallium_enable swrast + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_i915 i915 + gallium_enable video_cards_ilo ilo + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + # opencl stuff + if use opencl; then + myconf+=" + $(use_enable opencl) + --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa" + --with-clang-libdir="${EPREFIX}/usr/$(get_libdir)" + " + fi + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if use pax_kernel; then + myconf+=" + $(use_enable x86 glx-rts) + " + fi + + # build fails with BSD indent, bug #428112 + use userland_GNU || export INDENT=cat + + econf \ + --enable-dri \ + --enable-glx \ + $(use_enable !bindist texture-float) \ + $(use_enable debug) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable nptl glx-tls) \ + $(use_enable osmesa) \ + $(use_enable !pic asm) \ + $(use_enable shared-glapi) \ + $(use_enable xa) \ + $(use_enable xorg) \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + PYTHON2="${PYTHON}" \ + ${myconf} +} + +src_install() { + base_src_install + + find "${ED}" -name '*.la' -exec rm -f {} + || die + + if use !bindist; then + dodoc docs/patents.txt + fi + + # Install config file for eselect mesa + insinto /usr/share/mesa + newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf + + # 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" + local x + local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/" + dodir ${gl_dir}/{lib,extensions,include/GL} + for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${ED}${gl_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}${gl_dir}"/include/GL \ + || die "Failed to move ${x}" + fi + done + for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do + if [ -d ${x} ]; then + mv -f "${x}" "${ED}${gl_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}" + 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 + if use opencl; then + ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" + local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" + dodir ${cl_dir}/{lib,include} + if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then + mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ + "${ED}"${cl_dir} + fi + if [ -f "${ED}/usr/include/CL/opencl.h" ]; then + mv -f "${ED}"/usr/include/CL \ + "${ED}"${cl_dir}/include + fi + eend $? + fi +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} + + # switch to xorg-x11 and back if necessary, bug #374647 comment 11 + OLD_IMPLEM="$(eselect opengl show)" + if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then + eselect opengl set ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} + fi + + # Select classic/gallium drivers + if use classic || use gallium; then + eselect mesa set --auto + fi + + # Switch to mesa opencl + if use opencl; then + eselect opencl set --use-old ${PN} + fi + + # warn about patent encumbered texture-float + if use !bindist; then + elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" + elog "enabled. Please see patents.txt for an explanation." + fi + + local using_radeon r_flag + for r_flag in ${RADEON_CARDS}; do + if use video_cards_${r_flag}; then + using_radeon=1 + break + fi + done + + if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then + elog "Note that in order to have full S3TC support, it is necessary to install" + elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" + elog "textures in some apps, and some others even require this to run." + 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-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index bbfeb8e79cb3..14515069c13e 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -13,6 +13,7 @@ Enable GLESv1 support. Enable GLESv2 support. Enable LLVM backend for Gallium3D. + Enable the Clover Gallium OpenCL state tracker. Enable the OpenVG 2D acceleration API for Gallium3D. Build the Mesa library for off-screen rendering. Enable if the user plans to run the package under a pax enabled hardened kernel diff --git a/media-libs/schroedinger/Manifest b/media-libs/schroedinger/Manifest index 8c26b7bdb01c..e0c927bb5efd 100644 --- a/media-libs/schroedinger/Manifest +++ b/media-libs/schroedinger/Manifest @@ -1,3 +1,3 @@ -DIST schroedinger-1.0.10.tar.gz 996489 SHA256 9a45c4f8d6197a641a9b06ab9b59ec02ad9986723fd855528a00ec3477a71964 +DIST schroedinger-1.0.10.tar.gz 996489 SHA256 9a45c4f8d6197a641a9b06ab9b59ec02ad9986723fd855528a00ec3477a71964 SHA512 732264bcf1a3d1005924d93534bb36f1473fcb94d288165b0184f2728029b2a496bbe9c06794e26a97a4f20516eda163b1e92768f4127670ff70af9b38f1ef19 WHIRLPOOL 80407d5020bcf964b4ae36fd48770d72e8aabaedd8029d41daf2b451aef9c9d737bfa4b015709ea3fbe6d70a435158a2dc0ed67ee1bedc0155ff2aaa691a788d DIST schroedinger-1.0.11.tar.gz 1019247 SHA256 1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912 SHA512 a39dd5360eb87a63379de71d91f48cde309ded91632c0ab8b1dc76b73591f7d0dfa7003c606d1b546d495b18c916aae905a9540b48dff7cbeb5b289e0f880438 WHIRLPOOL 118b37a61369423ce9c1f383ed7fedb24d619e63a5e61121a4468e15acb9adf502f7982c41ba3f867be23773f133c5b46fc0aa4638346bd7e5c293668c0291f8 DIST schroedinger-1.0.8.tar.gz 863436 SHA256 2a3cac3d561af744d1f7b0f2d00540153beb6ce5293de7f822cfc7e86c380d29 diff --git a/media-libs/schroedinger/schroedinger-1.0.11.ebuild b/media-libs/schroedinger/schroedinger-1.0.11.ebuild index 58488f82462d..c8d8b110fdb0 100644 --- a/media-libs/schroedinger/schroedinger-1.0.11.ebuild +++ b/media-libs/schroedinger/schroedinger-1.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11.ebuild,v 1.6 2013/05/03 14:14:05 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.11.ebuild,v 1.7 2013/06/19 13:29:12 jer Exp $ EAPI=4 inherit eutils autotools @@ -11,7 +11,7 @@ SRC_URI="http://www.diracvideo.org/download/${PN}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2 MIT MPL-1.1" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 hppa ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-lang/orc-0.4.16" diff --git a/media-libs/x264/x264-0.0.20120707.ebuild b/media-libs/x264/x264-0.0.20120707.ebuild index 24ab805aa1fa..edd8575b25e6 100644 --- a/media-libs/x264/x264-0.0.20120707.ebuild +++ b/media-libs/x264/x264-0.0.20120707.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.11 2013/04/16 20:41:17 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.12 2013/06/19 15:11:02 jer Exp $ EAPI=4 @@ -29,7 +29,7 @@ SLOT="0" if [ "${PV#9999}" != "${PV}" ]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" fi IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" diff --git a/media-libs/x264/x264-0.0.20130506.ebuild b/media-libs/x264/x264-0.0.20130506.ebuild index 153ada81602e..71099019ee53 100644 --- a/media-libs/x264/x264-0.0.20130506.ebuild +++ b/media-libs/x264/x264-0.0.20130506.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130506.ebuild,v 1.1 2013/06/18 23:01:48 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20130506.ebuild,v 1.2 2013/06/19 18:11:14 chutzpah Exp $ EAPI=5 @@ -27,11 +27,11 @@ else fi LICENSE="GPL-2" -IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" +IUSE="10bit custom-cflags +interlaced pic static-libs +threads" ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND=" - amd64? ( ${ASM_DEP} ) +DEPEND="amd64? ( ${ASM_DEP} ) + amd64-fbsd? ( ${ASM_DEP} ) x86? ( ${ASM_DEP} ) x86-fbsd? ( ${ASM_DEP} )" @@ -66,7 +66,6 @@ src_configure() { --enable-shared \ --host="${CHOST}" \ $(usex 10bit "--bit-depth=10" "") \ - $(usex debug "--enable-debug" "") \ $(usex interlaced "" "--disable-interlaced") \ $(usex static-libs "" "--enable-static") \ $(usex threads "" "--disable-thread") \ diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 2a27d253cb04..fb52bef450db 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.7 2013/06/18 23:01:48 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.8 2013/06/19 18:11:14 chutzpah Exp $ EAPI=5 @@ -27,11 +27,11 @@ else fi LICENSE="GPL-2" -IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" +IUSE="10bit custom-cflags +interlaced pic static-libs +threads" ASM_DEP=">=dev-lang/yasm-1.2.0" -DEPEND=" - amd64? ( ${ASM_DEP} ) +DEPEND="amd64? ( ${ASM_DEP} ) + amd64-fbsd? ( ${ASM_DEP} ) x86? ( ${ASM_DEP} ) x86-fbsd? ( ${ASM_DEP} )" @@ -66,7 +66,6 @@ src_configure() { --enable-shared \ --host="${CHOST}" \ $(usex 10bit "--bit-depth=10" "") \ - $(usex debug "--enable-debug" "") \ $(usex interlaced "" "--disable-interlaced") \ $(usex static-libs "" "--enable-static") \ $(usex threads "" "--disable-thread") \ diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest index 16757d1828a6..a2c1a1411aa2 100644 --- a/media-libs/xvid/Manifest +++ b/media-libs/xvid/Manifest @@ -1,3 +1 @@ -DIST xvidcore-1.2.2.tar.bz2 643344 SHA256 e42a602de489438b96f7f4742b68e9bed7efa7aee3570379bb2582b4290b6d11 SHA512 34e68f24c0f579daf7ed5b7d352ac515cb7b329467b4763fa4ccbe689f2defe97fd2f14e5e08d01e67438a12a53b94a8cd66040d380c36321a9874a88c09fc8f WHIRLPOOL d87db115a4bf0cbdbcbc9cc19f4a24abca3cdbb8c74614413941a39bc12c754472640ec05b8ea1fa09852d057b18a340873faeb5fd29a6428a9b1ac5e5eb316e -DIST xvidcore-1.3.1.tar.bz2 710007 SHA256 c51ae8449b04fd8c8d5e15546d5e7c022d72014df7849be2598b9dfa1c003d64 SHA512 85ecb22b52515023d192555da94c9c95f01fccf6898582b4036b601e39c8644d272d296265ded69b4051e7d5b5b176227c2ba0b15cef2ba9bc48471a076b3553 WHIRLPOOL b0cc4e958427ebd7452c569c548a5ead2c9367aaa58e12e512f90d623f7ff5083bd11c0341eafefc5bfa939f01f59267b8dfa3edeba801c5819744c46fc3cf8a DIST xvidcore-1.3.2.tar.bz2 697038 SHA256 d6c11334e1e771f9e4722eff454762325fd0989f6a4217abca296d6770160bf4 SHA512 0b7725314abc1dbe1f0ba4700393c391b8f98589300051ad7ebc5bdef7e87b20f19dcc88c37afbc1dfa117b6c8c1d5051b8f8d263c419e6965c5bc5f0201dc97 WHIRLPOOL c9e3f1a99544fe5b2394afc9adee3764565572b7b7fb46e2c92500d13851a8225b3e8b8e0db280a37aba72ff978e11a8c9f80d3a65b27f682087b1308f506dfa diff --git a/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch b/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch deleted file mode 100644 index aef52f33814e..000000000000 --- a/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch +++ /dev/null @@ -1,457 +0,0 @@ -diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm ---- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -126,8 +126,4 @@ calc_cbp_mmx: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm ---- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -116,8 +116,4 @@ calc_cbp_sse2: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm ---- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW - - MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm ---- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_ - - MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm ---- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -605,7 +605,4 @@ fdct_sse2_skal: - ENDFUNC - - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm ---- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -698,8 +698,4 @@ idct_3dne: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm ---- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -608,8 +608,4 @@ idct_xmm: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm ---- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -325,8 +325,4 @@ idct_sse2_dmitry: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm ---- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -514,8 +514,4 @@ MAKE_COLORSPACE rgba_to_yv12_mmx,0, 4 - MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1 - MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1 - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm ---- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0 - - MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1 - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm ---- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -341,7 +341,4 @@ MAKE_COLORSPACE yv12_to_uyvy_mmx,0, - MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1 - MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1 - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm ---- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/deintl_sse.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -131,7 +131,4 @@ xvid_deinterlace_sse: - ENDFUNC - - ;////////////////////////////////////////////////////////////////////// -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm ---- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41: - ENDFUNC - - ;////////////////////////////////////////////////////////////////////// -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm ---- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm ---- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm ---- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm ---- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm: - EPILOG - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm ---- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -114,7 +114,4 @@ image_brightness_mmx: - ENDFUNC - ;////////////////////////////////////////////////////////////////////// - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm ---- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -130,7 +130,4 @@ image_brightness_sse2: - ENDFUNC - ;////////////////////////////////////////////////////////////////////// - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm ---- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -1149,7 +1149,4 @@ ENDFUNC - %undef SRC_PTR - %undef DST_PTR - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm ---- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -985,8 +985,4 @@ ENDFUNC - - ; pfeewwww... Never Do That On Stage Again. :) - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm ---- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -216,8 +216,4 @@ sad8bi_3dn: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm ---- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm ---- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -731,8 +731,4 @@ sse8_8bit_mmx: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm ---- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -176,8 +176,4 @@ dev16_sse3: - MEAN16_SSE2_SSE3 lddqu - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm ---- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -436,8 +436,4 @@ sad16v_xmm: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc ---- xvidcore/src/nasm.inc.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/nasm.inc 2009-09-21 10:39:24.000000000 +0200 -@@ -189,3 +189,12 @@ BITS 32 - %endif - %endif - %endmacro -+ -+%macro NON_EXEC_STACK 0 -+%ifidn __OUTPUT_FORMAT__,elf -+section .note.GNU-stack noalloc noexec nowrite progbits -+%endif -+%ifidn __OUTPUT_FORMAT__,elf64 -+section .note.GNU-stack noalloc noexec nowrite progbits -+%endif -+%endmacro -diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm ---- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -273,6 +273,4 @@ consim_mmx: - ret - ENDFUNC - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -+NON_EXEC_STACK -diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm ---- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN - ret - ENDFUNC - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm ---- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm ---- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm ---- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm ---- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/utils/x86_asm/cpuid.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -240,7 +240,4 @@ ENDFUNC - %endif - - --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm ---- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -198,8 +198,4 @@ MBFieldTest_mmx: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm ---- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -465,8 +465,4 @@ transfer8x4_copy_3dne: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK -diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm ---- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 -+++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2009-09-21 10:39:24.000000000 +0200 -@@ -588,8 +588,4 @@ transfer8x4_copy_mmx: - ret - ENDFUNC - -- --%ifidn __OUTPUT_FORMAT__,elf --section ".note.GNU-stack" noalloc noexec nowrite progbits --%endif -- -+NON_EXEC_STACK diff --git a/media-libs/xvid/xvid-1.2.2-r2.ebuild b/media-libs/xvid/xvid-1.2.2-r2.ebuild deleted file mode 100644 index 006a631ff840..000000000000 --- a/media-libs/xvid/xvid-1.2.2-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.2.2-r2.ebuild,v 1.9 2010/10/30 15:48:30 ssuominen Exp $ - -EAPI=2 -inherit eutils multilib - -MY_PN=${PN}core -MY_P=${MY_PN}-${PV} - -DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution" -HOMEPAGE="http://www.xvid.org" -SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="examples pic" - -NASM=">=dev-lang/nasm-2.05.01" -YASM=">=dev-lang/yasm-0.8.0" - -DEPEND="amd64? ( || ( ${YASM} ${NASM} ) ) - x86? ( || ( ${YASM} ${NASM} ) ) - x86-fbsd? ( || ( ${YASM} ${NASM} ) )" -RDEPEND="" - -S=${WORKDIR}/${MY_PN}/build/generic - -src_prepare() { - cd "${WORKDIR}" - epatch "${FILESDIR}"/${P}-noexecstack.patch - - sed -i \ - -e '/^minimum_yasm_minor_version/s:=.*:=0:' \ - "${S}"/configure || die -} - -src_configure() { - local myconf - - if use pic; then - myconf="--disable-assembly" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO} - - local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*)) - dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so - dosym ${mylib} /usr/$(get_libdir)/${mylib%.?} - - if use examples; then - insinto /usr/share/${PN} - doins -r "${S}"/../../examples - fi -} diff --git a/media-libs/xvid/xvid-1.3.1.ebuild b/media-libs/xvid/xvid-1.3.2-r1.ebuild similarity index 52% rename from media-libs/xvid/xvid-1.3.1.ebuild rename to media-libs/xvid/xvid-1.3.2-r1.ebuild index 953a67697ee9..05eeb14c4721 100644 --- a/media-libs/xvid/xvid-1.3.1.ebuild +++ b/media-libs/xvid/xvid-1.3.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.1.ebuild,v 1.2 2011/04/25 14:20:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2-r1.ebuild,v 1.1 2013/06/19 15:51:41 aballier Exp $ -EAPI=2 -inherit flag-o-matic multilib +EAPI=5 +inherit flag-o-matic multilib multilib-minimal MY_PN=${PN}core MY_P=${MY_PN}-${PV} @@ -15,7 +15,7 @@ SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="examples pic" +IUSE="examples +threads pic" NASM=">=dev-lang/nasm-2" YASM=">=dev-lang/yasm-1" @@ -23,26 +23,46 @@ YASM=">=dev-lang/yasm-1" DEPEND="amd64? ( || ( ${YASM} ${NASM} ) ) x86? ( || ( ${YASM} ${NASM} ) ) x86-fbsd? ( || ( ${YASM} ${NASM} ) )" -RDEPEND="" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 )" S=${WORKDIR}/${MY_PN}/build/generic -src_configure() { +src_prepare() { + # make build verbose + sed \ + -e 's/@$(CC)/$(CC)/' \ + -e 's/@$(AS)/$(AS)/' \ + -e 's/@$(RM)/$(RM)/' \ + -e 's/@$(INSTALL)/$(INSTALL)/' \ + -e 's/@cd/cd/' \ + -i Makefile || die + # Since only the build system is in $S, this will only copy it but not the + # entire sources. + multilib_copy_sources +} + +multilib_src_configure() { use sparc && append-cflags -mno-vis #357149 local myconf - use pic && myconf="--disable-assembly" + if use pic || [[ ${ABI} == "x32" ]] ; then #421841 + myconf="--disable-assembly" + fi - econf ${myconf} + econf ${myconf} \ + $(use_enable threads pthread) } -src_install() { - emake DESTDIR="${D}" install || die - dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO} +multilib_src_install() { + emake DESTDIR="${D}" install local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*)) dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so dosym ${mylib} /usr/$(get_libdir)/${mylib%.?} +} + +multilib_src_install_all() { + dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO} if use examples; then insinto /usr/share/${PN} diff --git a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild index 9e0a0e4e3d65..db5cf1e72cb4 100644 --- a/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild +++ b/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild,v 1.7 2013/02/02 22:56:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vp8/gst-plugins-vp8-0.10.23-r1.ebuild,v 1.9 2013/06/19 13:39:01 jer Exp $ EAPI="5" inherit eutils gst-plugins-bad gst-plugins10 DESCRIPTION="GStreamer decoder for vpx video format" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd" IUSE="" RDEPEND="media-libs/libvpx" diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild index 9268de3a604a..a2813ab251a9 100644 --- a/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild +++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild,v 1.15 2013/03/31 17:31:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/gst-plugins-x264-0.10.19.ebuild,v 1.16 2013/06/19 13:43:13 jer Exp $ EAPI="5" inherit gst-plugins-ugly -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd" IUSE="" # 20111220 ensures us X264_BUILD >= 120 diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.0.5.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.0.5.ebuild index a33f39d41629..31d7dd252fe1 100644 --- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.0.5.ebuild +++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.0.5.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/gst-plugins-x264-1.0.5.ebuild,v 1.12 2013/02/23 19:20:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-x264/gst-plugins-x264-1.0.5.ebuild,v 1.13 2013/06/19 15:08:46 jer Exp $ EAPI="5" inherit gst-plugins-ugly -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd" IUSE="" # 20111220 ensures us X264_BUILD >= 120 diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild new file mode 100644 index 000000000000..7700e91199fc --- /dev/null +++ b/media-sound/lame/lame-3.99.5-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.99.5-r1.ebuild,v 1.1 2013/06/19 17:18:52 aballier Exp $ + +EAPI=5 + +inherit autotools eutils multilib-minimal + +DESCRIPTION="LAME Ain't an MP3 Encoder" +HOMEPAGE="http://lame.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://gentoo/${P}-automake-2.12.patch.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="debug mmx mp3rtp sndfile static-libs" + +# These deps are without MULTILIB_USEDEP and are correct since we only build +# libmp3lame for multilib and these deps apply to the lame frontend executable. +RDEPEND=">=sys-libs/ncurses-5.7-r7 + sndfile? ( >=media-libs/libsndfile-1.0.2 ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + mmx? ( dev-lang/nasm )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-3.96-ccc.patch \ + "${FILESDIR}"/${PN}-3.98-gtk-path.patch \ + "${FILESDIR}"/${PN}-3.99.5-tinfo.patch \ + "${WORKDIR}"/${P}-automake-2.12.patch + + mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm + + sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die + + use mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879 + + AT_M4DIR=. eautoreconf +} + +is_best_abi() { + local all_abis=( $(multilib_get_enabled_abis) ) + local best_abi="${all_abis[$(( ${#all_abis[@]} - 1 ))]}" + [ "${ABI}" = "${best_abi}" ] +} + +multilib_src_configure() { + local myconf + use mmx && myconf+="--enable-nasm" #361879 + + # Only build the frontend for the best ABI. + if is_best_abi ; then + myconf+=" $(use_enable mp3rtp)" + use sndfile && myconf+=" --with-fileio=sndfile" + else + myconf+=" --disable-frontend --disable-mp3rtp" + fi + + ECONF_SOURCE="${S}" econf \ + $(use_enable static-libs static) \ + $(use_enable debug debug norm) \ + --disable-mp3x \ + --enable-dynamic-frontends \ + ${myconf} +} + +multilib_src_install() { + emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install +} + +multilib_src_install_all() { + cd "${S}" + dobin misc/mlame + + dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE + dohtml misc/lameGUI.html Dll/LameDLLInterface.htm + + find "${ED}" -name '*.la' -exec rm -f {} + +} diff --git a/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild index 89bd45571fa3..d778d7fa75b8 100644 --- a/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild +++ b/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild,v 1.1 2013/06/18 23:02:45 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20130506.ebuild,v 1.2 2013/06/19 18:11:57 chutzpah Exp $ EAPI=5 @@ -23,12 +23,12 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="10bit avs custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads" +IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND="ffmpeg? ( virtual/ffmpeg ) - ~media-libs/x264-${PV}[10bit=,debug=,interlaced=,threads=] + ~media-libs/x264-${PV}[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 )" @@ -52,7 +52,6 @@ src_configure() { --host="${CHOST}" \ $(usex 10bit "--bit-depth=10" "") \ $(usex avs "" "--disable-avs") \ - $(usex debug "--enable-debug" "") \ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ $(usex ffmpegsource "" "--disable-ffms") \ $(usex interlaced "" "--disable-interlaced") \ diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild index ad6927e1b135..f00ad7df299d 100644 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.5 2013/06/18 23:02:45 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-9999.ebuild,v 1.6 2013/06/19 18:11:57 chutzpah Exp $ EAPI=5 @@ -23,12 +23,12 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="10bit avs custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads" +IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" REQUIRED_USE="ffmpegsource? ( ffmpeg )" RDEPEND="ffmpeg? ( virtual/ffmpeg ) - ~media-libs/x264-${PV}[10bit=,debug=,interlaced=,threads=] + ~media-libs/x264-${PV}[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 )" @@ -52,7 +52,6 @@ src_configure() { --host="${CHOST}" \ $(usex 10bit "--bit-depth=10" "") \ $(usex avs "" "--disable-avs") \ - $(usex debug "--enable-debug" "") \ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ $(usex ffmpegsource "" "--disable-ffms") \ $(usex interlaced "" "--disable-interlaced") \ diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 7075fc7fb3c7..2fbdacb08ac7 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Wed, 19 Jun 2013 12:36:55 +0000 +Wed, 19 Jun 2013 20:36:59 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 7075fc7fb3c7..2fbdacb08ac7 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Wed, 19 Jun 2013 12:36:55 +0000 +Wed, 19 Jun 2013 20:36:59 +0000 diff --git a/metadata/md5-cache/app-misc/mc-4.8.8-r1 b/metadata/md5-cache/app-misc/mc-4.8.8-r1 new file mode 100644 index 000000000000..4692726fa3b1 --- /dev/null +++ b/metadata/md5-cache/app-misc/mc-4.8.8-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) +DESCRIPTION=GNU Midnight Commander is a text based file manager +EAPI=4 +HOMEPAGE=http://www.midnight-commander.org +IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris +LICENSE=GPL-3 +RDEPEND=>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) +REQUIRED_USE=spell? ( edit ) +SLOT=0 +SRC_URI=http://www.midnight-commander.org/downloads/mc-4.8.8.tar.xz +_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=58090641617da2258bde122ead81ab3b diff --git a/metadata/md5-cache/app-misc/vifm-0.7.5 b/metadata/md5-cache/app-misc/vifm-0.7.5 index 7de9d4a83d8d..1a1d64a9a50f 100644 --- a/metadata/md5-cache/app-misc/vifm-0.7.5 +++ b/metadata/md5-cache/app-misc/vifm-0.7.5 @@ -1,4 +1,4 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare unpack +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack DEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) DESCRIPTION=Console file manager with vi(m)-like keybindings EAPI=5 @@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.7-r7 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+: SLOT=0 SRC_URI=mirror://sourceforge/vifm/vifm-0.7.5.tar.bz2 _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=c618c18ce8d4cc636dce49163ed4e3d1 +_md5_=12c5096cec49a0404c736957648b9eb1 diff --git a/metadata/md5-cache/app-office/lyx-2.0.6 b/metadata/md5-cache/app-office/lyx-2.0.6 index 778c5ada46ae..6aff5c1b1fe6 100644 --- a/metadata/md5-cache/app-office/lyx-2.0.6 +++ b/metadata/md5-cache/app-office/lyx-2.0.6 @@ -4,10 +4,10 @@ DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc. EAPI=3 HOMEPAGE=http://www.lyx.org/ IUSE=cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant linguas_ar linguas_ca linguas_cs linguas_de linguas_da linguas_el linguas_en linguas_es linguas_eu linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_ia linguas_id linguas_it linguas_ja linguas_nb linguas_nn linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW X -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos +KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos LICENSE=GPL-2 RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 >=dev-libs/boost-1.34 dev-texlive/texlive-fontsextra || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) cups? ( net-print/cups ) latex? ( app-text/texlive app-text/ghostscript-gpl app-text/noweb app-text/dvipng dev-tex/dvipost dev-tex/chktex app-text/ps2eps dev-texlive/texlive-latexextra dev-texlive/texlive-pictures dev-texlive/texlive-science dev-texlive/texlive-genericextra dev-texlive/texlive-fontsrecommended || ( dev-tex/latex2html dev-tex/tth dev-tex/hevea dev-tex/tex4ht ) ) html? ( dev-tex/html2latex ) rtf? ( dev-tex/latex2rtf app-text/unrtf dev-tex/html2latex ) linguas_he? ( dev-tex/culmus-latex ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) dia? ( app-office/dia ) subversion? ( =app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0 dev-libs/glib:2 cairo? ( x11-libs/cairo ) virtual/pkgconfig +DEPEND=>=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0 dev-libs/glib:2 x11-libs/cairo:= virtual/pkgconfig DESCRIPTION=DjVu plug-in for zathura EAPI=5 HOMEPAGE=http://pwmt.org/projects/zathura/ -IUSE=cairo KEYWORDS=~amd64 ~arm ~x86 LICENSE=ZLIB -RDEPEND=>=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0 dev-libs/glib:2 cairo? ( x11-libs/cairo ) +RDEPEND=>=app-text/djvu-3.5.24-r1 >=app-text/zathura-0.2.0 dev-libs/glib:2 x11-libs/cairo:= SLOT=0 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-0.2.3.tar.gz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=e23bf0250df3e9de436756a408d14b82 +_md5_=1196f83e8afcda61bc5a4c15e726bcc4 diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.2.3 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.2.3 index 935a69582f08..dda27b49c049 100644 --- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.2.3 +++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.2.3 @@ -1,13 +1,12 @@ DEFINED_PHASES=compile install setup -DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.2:= =app-text/zathura-0.2.0 cairo? ( x11-libs/cairo ) virtual/pkgconfig +DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.2:= =app-text/zathura-0.2.0 x11-libs/cairo:= virtual/pkgconfig DESCRIPTION=PDF plug-in for zathura EAPI=5 HOMEPAGE=http://pwmt.org/projects/zathura/ -IUSE=cairo KEYWORDS=~amd64 ~x86 LICENSE=ZLIB -RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.2:= =app-text/zathura-0.2.0 cairo? ( x11-libs/cairo ) +RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.2:= =app-text/zathura-0.2.0 x11-libs/cairo:= SLOT=0 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.2.3.tar.gz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=65e8886ccb3195883c87687b9dbea23c +_md5_=451dfafea6b89da69c8d5e5106b6d307 diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 index 3335d57f8ab9..4b82f88a0863 100644 --- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 +++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-9999 @@ -1,11 +1,10 @@ DEFINED_PHASES=compile install setup unpack -DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0 media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg cairo? ( x11-libs/cairo ) virtual/pkgconfig dev-vcs/git +DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0 media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:= virtual/pkgconfig dev-vcs/git DESCRIPTION=PDF plug-in for zathura EAPI=5 HOMEPAGE=http://pwmt.org/projects/zathura/ -IUSE=cairo LICENSE=ZLIB -RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0 media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg cairo? ( x11-libs/cairo ) +RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-9999:= >=app-text/zathura-0.2.0 media-libs/jbig2dec media-libs/openjpeg:2 virtual/jpeg x11-libs/cairo:= SLOT=0 _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=c3e3b52b2f5cf4601f16b9c25d498663 +_md5_=84e1e4c5b125c7a9ef0c113275bb9c83 diff --git a/metadata/md5-cache/app-text/zathura-ps-0.2.2 b/metadata/md5-cache/app-text/zathura-ps-0.2.2 index a193f20078a0..3dec7b520a78 100644 --- a/metadata/md5-cache/app-text/zathura-ps-0.2.2 +++ b/metadata/md5-cache/app-text/zathura-ps-0.2.2 @@ -1,13 +1,12 @@ DEFINED_PHASES=compile install setup -DEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0 dev-libs/glib:2 cairo? ( x11-libs/cairo ) virtual/pkgconfig +DEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0 dev-libs/glib:2 x11-libs/cairo:= virtual/pkgconfig DESCRIPTION=PostScript plug-in for zathura EAPI=5 HOMEPAGE=http://pwmt.org/projects/zathura/ -IUSE=cairo KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux LICENSE=ZLIB -RDEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0 dev-libs/glib:2 cairo? ( x11-libs/cairo ) +RDEPEND=>=app-text/libspectre-0.2.6 >=app-text/zathura-0.2.0 dev-libs/glib:2 x11-libs/cairo:= SLOT=0 SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.2.tar.gz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=32a5bb1697a91dbf911d9fd45fa62e90 +_md5_=121efc0a6c8d4cd5547352994ec03b10 diff --git a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 index 6498d9f41d3b..bcce9a47836f 100644 --- a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 +++ b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 @@ -4,10 +4,10 @@ DESCRIPTION=Google C++ Testing Framework EAPI=5 HOMEPAGE=http://code.google.com/p/googletest/ IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~ppc-macos LICENSE=BSD RDEPEND==dev-lang/python-2* SLOT=0 SRC_URI=http://googletest.googlecode.com/files/gtest-1.6.0.zip _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild 4f797e941786b6313d84053ae3e0ec96 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=b725a1cb18abd6ff783c130f76170715 +_md5_=2428204da073e53218fe7565e601fab6 diff --git a/metadata/md5-cache/dev-haskell/async-2.0.1.4 b/metadata/md5-cache/dev-haskell/async-2.0.1.4 index 0c1c589c3094..e198d0dd7f71 100644 --- a/metadata/md5-cache/dev-haskell/async-2.0.1.4 +++ b/metadata/md5-cache/dev-haskell/async-2.0.1.4 @@ -4,10 +4,10 @@ DESCRIPTION=Run IO operations asynchronously and wait for their results EAPI=5 HOMEPAGE=https://github.com/simonmar/async IUSE=doc hscolour profile test -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 LICENSE=BSD RDEPEND=>=dev-haskell/stm-2.2:=[profile?] =dev-lang/ghc-7.0.1:= SLOT=0/2.0.1.4 SRC_URI=mirror://hackage/packages/archive/async/2.0.1.4/async-2.0.1.4.tar.gz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 ghc-package 2d57c65a8826a1c4234d2de7f1b9f486 haskell-cabal 0fe5ac58a8b877fae07bb258b762852e multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=5df882bc180e6b2c45f4f479828c50d3 +_md5_=1a7e98cbfbe61b7b7e789d3cdec62494 diff --git a/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524 b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524 new file mode 100644 index 000000000000..cf5d19f3c6ef --- /dev/null +++ b/metadata/md5-cache/dev-libs/libclc-0.0.1_pre20130524 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare setup unpack +DEPEND=>=sys-devel/clang-3.2 >=sys-devel/llvm-3.2 +DESCRIPTION=OpenCL C library +EAPI=5 +HOMEPAGE=http://libclc.llvm.org/ http://cgit.freedesktop.org/~tstellar/libclc/ +KEYWORDS=~amd64 ~x86 +LICENSE=|| ( MIT BSD ) +RDEPEND=>=sys-devel/clang-3.2 >=sys-devel/llvm-3.2 +SLOT=0 +SRC_URI=mirror://gentoo/libclc-0.0.1_pre20130524.tar.xz +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 python-any-r1 7ed4a8181d62a098eaa6c8eeacf190c9 python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=a1782e885245ff584f0d4e96dcb97d2d diff --git a/metadata/md5-cache/dev-libs/nspr-4.8.8 b/metadata/md5-cache/dev-libs/nspr-4.8.8 deleted file mode 100644 index 56a37fb424ab..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.8.8 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=570e9c0ff6d9f763b48995c82d9f57ed diff --git a/metadata/md5-cache/dev-libs/nspr-4.8.9 b/metadata/md5-cache/dev-libs/nspr-4.8.9 deleted file mode 100644 index 2235ade03147..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.8.9 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.9/src/nspr-4.8.9.tar.gz -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=cd1df1553ddd8948291b6af01354e2c0 diff --git a/metadata/md5-cache/dev-libs/nspr-4.9 b/metadata/md5-cache/dev-libs/nspr-4.9 deleted file mode 100644 index f8fe26aa271d..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=632679d00a7e8fad608c31bbc0ac5892 diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.1 b/metadata/md5-cache/dev-libs/nspr-4.9.1 deleted file mode 100644 index f751386f36b0..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.1/src/nspr-4.9.1.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=f1e0d23767ae545662a78d3825312d0f diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.2 b/metadata/md5-cache/dev-libs/nspr-4.9.2 deleted file mode 100644 index 7c01878e8c0b..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=141acfed98e00faf680efdd83d312288 diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.2-r1 b/metadata/md5-cache/dev-libs/nspr-4.9.2-r1 deleted file mode 100644 index 86189a89c4d4..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.2-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.2/src/nspr-4.9.2.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=f09859a48a830f67dc7d31103c940a27 diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.4 b/metadata/md5-cache/dev-libs/nspr-4.9.4 deleted file mode 100644 index c291fa2cd890..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.4 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.4/src/nspr-4.9.4.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=033412d9d5db554a4125655561875d6d diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.5-r1 b/metadata/md5-cache/dev-libs/nspr-4.9.5-r1 deleted file mode 100644 index 6265004bfd8e..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.5-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.5/src/nspr-4.9.5.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=fff98fb1c4bc0a9e3f1f54f53efa76cd diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.5-r2 b/metadata/md5-cache/dev-libs/nspr-4.9.5-r2 deleted file mode 100644 index a74e91a03cf7..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.5-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.5/src/nspr-4.9.5.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=7bf9535bb640537745df3890f4fc99f3 diff --git a/metadata/md5-cache/dev-libs/nspr-4.9.6 b/metadata/md5-cache/dev-libs/nspr-4.9.6 deleted file mode 100644 index 800a53b2a608..000000000000 --- a/metadata/md5-cache/dev-libs/nspr-4.9.6 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=|| ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) =sys-devel/autoconf-2.1* sys-devel/libtool -DESCRIPTION=Netscape Portable Runtime -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/nspr/ -IUSE=debug -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9.6/src/nspr-4.9.6.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=6e30b6d3592055e2fde102a962d2dbf6 diff --git a/metadata/md5-cache/dev-libs/nss-3.12.11-r1 b/metadata/md5-cache/dev-libs/nss-3.12.11-r1 deleted file mode 100644 index e5e1af446d8a..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.12.11-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.8.9 >=dev-db/sqlite-3.5 -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_11_RTM/src/nss-3.12.11.tar.gz -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=36cfd92d2f9c08f143a1761e1cff9be4 diff --git a/metadata/md5-cache/dev-libs/nss-3.13.2 b/metadata/md5-cache/dev-libs/nss-3.13.2 deleted file mode 100644 index 17886b52aa0f..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.13.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_2_RTM/src/nss-3.13.2.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.2-add_cacert_ca_certs-ported.patch -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=8c4c29dbee09acf3798e6a1701b30521 diff --git a/metadata/md5-cache/dev-libs/nss-3.13.3 b/metadata/md5-cache/dev-libs/nss-3.13.3 deleted file mode 100644 index 68c82dffbadd..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.13.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-3.13.3.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=b56a19bda5a962ea384bc6a714a8112b diff --git a/metadata/md5-cache/dev-libs/nss-3.13.4 b/metadata/md5-cache/dev-libs/nss-3.13.4 deleted file mode 100644 index 07f67bf49bdd..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.13.4 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_4_RTM/src/nss-3.13.4.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=a607cb69a95ee4b02bb8acadbc4f42bb diff --git a/metadata/md5-cache/dev-libs/nss-3.13.5 b/metadata/md5-cache/dev-libs/nss-3.13.5 deleted file mode 100644 index 4789e37ad48a..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.13.5 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.1 -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9.1 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_5_RTM/src/nss-3.13.5.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=689f51a908eef88cebc90249e8db2d24 diff --git a/metadata/md5-cache/dev-libs/nss-3.13.5-r1 b/metadata/md5-cache/dev-libs/nss-3.13.5-r1 deleted file mode 100644 index 81ffd4db9b8e..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.13.5-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.1 -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9.1 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_5_RTM/src/nss-3.13.5.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.3-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=560cae7211ddf4c34a6dacc0bff529fb diff --git a/metadata/md5-cache/dev-libs/nss-3.13.6 b/metadata/md5-cache/dev-libs/nss-3.13.6 deleted file mode 100644 index f8a2620b6954..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.13.6 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.2 -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9.2 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_6_RTM/src/nss-3.13.6.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.13.6-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=a734d00572b04e4dd51e9ac46a838543 diff --git a/metadata/md5-cache/dev-libs/nss-3.14 b/metadata/md5-cache/dev-libs/nss-3.14 deleted file mode 100644 index 66b77bec3e15..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.14 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.2 -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9.2 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_RTM/src/nss-3.14.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.14-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=1843d5a3a063515c29e16219e0772d12 diff --git a/metadata/md5-cache/dev-libs/nss-3.14.1 b/metadata/md5-cache/dev-libs/nss-3.14.1 deleted file mode 100644 index 3dbba459f719..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.14.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.2 -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9.2 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_1_RTM/src/nss-3.14.1.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=9135314fc613b0b7c8412bf0813b2651 diff --git a/metadata/md5-cache/dev-libs/nss-3.14.2 b/metadata/md5-cache/dev-libs/nss-3.14.2 deleted file mode 100644 index 18abd231b9c9..000000000000 --- a/metadata/md5-cache/dev-libs/nss-3.14.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=virtual/pkgconfig >=dev-libs/nspr-4.9.5 -DESCRIPTION=Mozilla's Network Security Services library that implements PKI support -EAPI=3 -HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/ -IUSE=utils -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 ) -RDEPEND=>=dev-libs/nspr-4.9.5 >=dev-db/sqlite-3.5 sys-libs/zlib -SLOT=0 -SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_2_RTM/src/nss-3.14.2.tar.gz http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch http://dev.gentoo.org/~anarchy/patches/nss-3.13.3_pem.support -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=e051b2a40eff6d7818be4beb45f06729 diff --git a/metadata/md5-cache/media-libs/libvpx-1.1.0 b/metadata/md5-cache/media-libs/libvpx-1.1.0 index ec60b54dad89..5fef0d9e6f3d 100644 --- a/metadata/md5-cache/media-libs/libvpx-1.1.0 +++ b/metadata/md5-cache/media-libs/libvpx-1.1.0 @@ -4,10 +4,10 @@ DESCRIPTION=WebM VP8 Codec SDK EAPI=4 HOMEPAGE=http://www.webmproject.org IUSE=altivec debug doc mmx postproc sse sse2 sse3 ssse3 sse4_1 static-libs +threads -KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux LICENSE=BSD REQUIRED_USE=sse2? ( mmx ) SLOT=0 SRC_URI=http://webm.googlecode.com/files/libvpx-v1.1.0.tar.bz2 _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=a02e3d9067057c2b45942d9e9b8091e0 +_md5_=3720ab2abcbd32a6ce5a398700e93508 diff --git a/metadata/md5-cache/media-libs/mesa-9.2_pre20130619 b/metadata/md5-cache/media-libs/mesa-9.2_pre20130619 new file mode 100644 index 000000000000..49672ff0bdc4 --- /dev/null +++ b/metadata/md5-cache/media-libs/mesa-9.2_pre20130619 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst prepare setup unpack +DEPEND=!=app-admin/eselect-opengl-1.2.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 opencl? ( app-admin/eselect-opencl dev-libs/libclc ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.45[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) opencl? ( >=sys-devel/llvm-3.3[video_cards_radeon] >=sys-devel/clang-3.3 >=sys-devel/gcc-4.6 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=OpenGL-like graphic library for Linux +EAPI=5 +HOMEPAGE=http://mesa3d.sourceforge.net/ +IUSE=video_cards_i915 video_cards_i965 video_cards_ilo video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_nouveau video_cards_vmware bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau wayland xvmc xa xorg kernel_FreeBSD python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT SGI-B-2.0 +RDEPEND=!=app-admin/eselect-opengl-1.2.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 opencl? ( app-admin/eselect-opencl dev-libs/libclc ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:= x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.45[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_ilo? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.45[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.45[video_cards_radeon] ) +REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium r600-llvm-compiler ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) wayland? ( egl ) xa? ( gallium ) xorg? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_ilo? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium ) +SLOT=0 +SRC_URI=mirror://gentoo/mesa-9.2_pre20130619.tar.xz +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=3e5912960cff91912dc3118bc5320c76 diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.11 b/metadata/md5-cache/media-libs/schroedinger-1.0.11 index 6e0e68f74bf7..df753faa3e30 100644 --- a/metadata/md5-cache/media-libs/schroedinger-1.0.11 +++ b/metadata/md5-cache/media-libs/schroedinger-1.0.11 @@ -4,10 +4,10 @@ DESCRIPTION=C-based libraries for the Dirac video codec EAPI=4 HOMEPAGE=http://www.diracvideo.org/ IUSE=static-libs -KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris +KEYWORDS=~amd64 hppa ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris LICENSE=GPL-2 LGPL-2 MIT MPL-1.1 RDEPEND=>=dev-lang/orc-0.4.16 SLOT=0 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=41fae449fd7782edcb2e289c6b951f57 +_md5_=6a5b952cc296fb9f98f42ef796ac9f09 diff --git a/metadata/md5-cache/media-libs/x264-0.0.20120707 b/metadata/md5-cache/media-libs/x264-0.0.20120707 index b115e0d9c4fb..d400f6dea61b 100644 --- a/metadata/md5-cache/media-libs/x264-0.0.20120707 +++ b/metadata/md5-cache/media-libs/x264-0.0.20120707 @@ -4,9 +4,9 @@ DESCRIPTION=A free library for encoding X264/AVC streams EAPI=4 HOMEPAGE=http://www.videolan.org/developers/x264.html IUSE=10bit custom-cflags debug +interlaced pic static-libs +threads -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=GPL-2 SLOT=0 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120707-2245.tar.bz2 _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=785c7c4873b1d1518a789a451f92f109 +_md5_=32f676d29d4ea06a6ba76db2c0fd1520 diff --git a/metadata/md5-cache/media-libs/x264-0.0.20130506 b/metadata/md5-cache/media-libs/x264-0.0.20130506 index a88748f0fcff..04e4006f4eb7 100644 --- a/metadata/md5-cache/media-libs/x264-0.0.20130506 +++ b/metadata/md5-cache/media-libs/x264-0.0.20130506 @@ -1,12 +1,12 @@ DEFINED_PHASES=configure prepare -DEPEND=amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) +DEPEND=amd64? ( >=dev-lang/yasm-1.2.0 ) amd64-fbsd? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) DESCRIPTION=A free library for encoding X264/AVC streams EAPI=5 HOMEPAGE=http://www.videolan.org/developers/x264.html -IUSE=10bit custom-cflags debug +interlaced pic static-libs +threads +IUSE=10bit custom-cflags +interlaced pic static-libs +threads KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos LICENSE=GPL-2 SLOT=0/132 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20130506-2245.tar.bz2 _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=829d2a311bc38470c8f4145e85226bcf +_md5_=44a25a9ead1afd870e2fa8d008e06fad diff --git a/metadata/md5-cache/media-libs/x264-9999 b/metadata/md5-cache/media-libs/x264-9999 index 9807d18ef967..1f49a2d7e693 100644 --- a/metadata/md5-cache/media-libs/x264-9999 +++ b/metadata/md5-cache/media-libs/x264-9999 @@ -1,10 +1,10 @@ DEFINED_PHASES=configure prepare unpack -DEPEND=amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) dev-vcs/git +DEPEND=amd64? ( >=dev-lang/yasm-1.2.0 ) amd64-fbsd? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) dev-vcs/git DESCRIPTION=A free library for encoding X264/AVC streams EAPI=5 HOMEPAGE=http://www.videolan.org/developers/x264.html -IUSE=10bit custom-cflags debug +interlaced pic static-libs +threads +IUSE=10bit custom-cflags +interlaced pic static-libs +threads LICENSE=GPL-2 SLOT=0 _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=c1b31ebfbbf6092310df428d491abcae +_md5_=4993ca912dfcf18e13c724e621d2c7dc diff --git a/metadata/md5-cache/media-libs/xvid-1.2.2-r2 b/metadata/md5-cache/media-libs/xvid-1.2.2-r2 deleted file mode 100644 index 6773896055e5..000000000000 --- a/metadata/md5-cache/media-libs/xvid-1.2.2-r2 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=amd64? ( || ( >=dev-lang/yasm-0.8.0 >=dev-lang/nasm-2.05.01 ) ) x86? ( || ( >=dev-lang/yasm-0.8.0 >=dev-lang/nasm-2.05.01 ) ) x86-fbsd? ( || ( >=dev-lang/yasm-0.8.0 >=dev-lang/nasm-2.05.01 ) ) -DESCRIPTION=XviD, a high performance/quality MPEG-4 video de-/encoding solution -EAPI=2 -HOMEPAGE=http://www.xvid.org -IUSE=examples pic -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd -LICENSE=GPL-2 -SLOT=0 -SRC_URI=http://downloads.xvid.org/downloads/xvidcore-1.2.2.tar.bz2 -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=b69082b5b11c7fb8a67761dd31542e54 diff --git a/metadata/md5-cache/media-libs/xvid-1.3.1 b/metadata/md5-cache/media-libs/xvid-1.3.1 deleted file mode 100644 index 6cefebcb08eb..000000000000 --- a/metadata/md5-cache/media-libs/xvid-1.3.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=configure install -DEPEND=amd64? ( || ( >=dev-lang/yasm-1 >=dev-lang/nasm-2 ) ) x86? ( || ( >=dev-lang/yasm-1 >=dev-lang/nasm-2 ) ) x86-fbsd? ( || ( >=dev-lang/yasm-1 >=dev-lang/nasm-2 ) ) -DESCRIPTION=XviD, a high performance/quality MPEG-4 video de-/encoding solution -EAPI=2 -HOMEPAGE=http://www.xvid.org/ -IUSE=examples pic -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd -LICENSE=GPL-2 -SLOT=0 -SRC_URI=http://downloads.xvid.org/downloads/xvidcore-1.3.1.tar.bz2 -_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=ecff421c82acc55f7e9c93e6201d7513 diff --git a/metadata/md5-cache/media-libs/xvid-1.3.2-r1 b/metadata/md5-cache/media-libs/xvid-1.3.2-r1 new file mode 100644 index 000000000000..b3805c28ae71 --- /dev/null +++ b/metadata/md5-cache/media-libs/xvid-1.3.2-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=amd64? ( || ( >=dev-lang/yasm-1 >=dev-lang/nasm-2 ) ) x86? ( || ( >=dev-lang/yasm-1 >=dev-lang/nasm-2 ) ) x86-fbsd? ( || ( >=dev-lang/yasm-1 >=dev-lang/nasm-2 ) ) +DESCRIPTION=XviD, a high performance/quality MPEG-4 video de-/encoding solution +EAPI=5 +HOMEPAGE=http://www.xvid.org/ +IUSE=examples +threads pic abi_x86_32 abi_x86_64 abi_x86_x32 +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd +LICENSE=GPL-2 +RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 ) +SLOT=0 +SRC_URI=http://downloads.xvid.org/downloads/xvidcore-1.3.2.tar.bz2 +_eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multibuild 4f797e941786b6313d84053ae3e0ec96 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multilib-minimal 70d90bda3149c94f02fa594ff1657ec0 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=0cc6871838f3967d19138beee15325a3 diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r1 index f50a458adf0e..f71f7b5fc947 100644 --- a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r1 +++ b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r1 @@ -3,11 +3,11 @@ DEPEND=media-libs/libvpx >=sys-apps/sed-4 virtual/pkgconfig >=dev-libs/glib-2.6: DESCRIPTION=GStreamer decoder for vpx video format EAPI=5 HOMEPAGE=http://gstreamer.freedesktop.org/ -KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd +KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd LICENSE=GPL-2 RDEPEND=media-libs/libvpx >=dev-libs/glib-2.6:2 media-libs/gstreamer:0.10 >=media-libs/gst-plugins-bad-0.10.23:0.10 >=dev-libs/glib-2.6:2 media-libs/gstreamer:0.10 >=media-libs/gst-plugins-bad-0.10.23:0.10 RESTRICT=test SLOT=0.10 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 gst-plugins-bad c250fc5cfd38c387759418ebf5aee12b gst-plugins10 1874f0a455ad918b4f43e52e53972479 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=f3744e5beb8472bf676b620a38b4f4da +_md5_=4d9a20259b319f7dc8b1472634080bb9 diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19 b/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19 index 1dcdd20f2957..99682f649780 100644 --- a/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19 +++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19 @@ -3,11 +3,11 @@ DEPEND=>=media-libs/x264-0.0.20111220 >=sys-apps/sed-4 virtual/pkgconfig >=dev-l DESCRIPTION=plugin for gstreamer EAPI=5 HOMEPAGE=http://gstreamer.freedesktop.org/ -KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd LICENSE=GPL-2 RDEPEND=>=media-libs/x264-0.0.20111220 >=dev-libs/glib-2.6:2 media-libs/gstreamer:0.10 >=media-libs/gst-plugins-ugly-0.10.19:0.10 RESTRICT=test SLOT=0.10 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 gst-plugins-ugly 38386d6223cd1a0a60483db9cb177c31 gst-plugins10 1874f0a455ad918b4f43e52e53972479 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=de7a78c6b4e12d1594e10369c556b305 +_md5_=8f32a76c230d68ec8c0c7d2376ae8c49 diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.0.5 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.0.5 index eb11fbf7b6d2..c7f528675417 100644 --- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.0.5 +++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.0.5 @@ -3,11 +3,11 @@ DEPEND=>=media-libs/x264-0.0.20111220 >=sys-apps/sed-4 virtual/pkgconfig >=dev-l DESCRIPTION=plugin for gstreamer EAPI=5 HOMEPAGE=http://gstreamer.freedesktop.org/ -KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd +KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd LICENSE=GPL-2 RDEPEND=>=media-libs/x264-0.0.20111220 >=dev-libs/glib-2.6:2 media-libs/gstreamer:1.0 >=media-libs/gst-plugins-ugly-1.0.5:1.0 RESTRICT=test SLOT=1.0 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.0.5.tar.xz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 gst-plugins-ugly 38386d6223cd1a0a60483db9cb177c31 gst-plugins10 1874f0a455ad918b4f43e52e53972479 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=2cf0df9f624657c88b05da8d8c450d3b +_md5_=b6a368d9fe6b91091fa8f010017e54e1 diff --git a/metadata/md5-cache/media-sound/lame-3.99.5-r1 b/metadata/md5-cache/media-sound/lame-3.99.5-r1 new file mode 100644 index 000000000000..ce529182cb6f --- /dev/null +++ b/metadata/md5-cache/media-sound/lame-3.99.5-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 ) virtual/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=LAME Ain't an MP3 Encoder +EAPI=5 +HOMEPAGE=http://lame.sourceforge.net/ +IUSE=debug mmx mp3rtp sndfile static-libs abi_x86_32 abi_x86_64 abi_x86_x32 +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=LGPL-2.1 +RDEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 ) +SLOT=0 +SRC_URI=mirror://sourceforge/lame/lame-3.99.5.tar.gz mirror://gentoo/lame-3.99.5-automake-2.12.patch.gz +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild 4f797e941786b6313d84053ae3e0ec96 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multilib-minimal 70d90bda3149c94f02fa594ff1657ec0 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=018eec11993b5deb1052bc9239be60a4 diff --git a/metadata/md5-cache/media-video/x264-encoder-0.0.20130506 b/metadata/md5-cache/media-video/x264-encoder-0.0.20130506 index 366bc44a9aba..c2282e02eacb 100644 --- a/metadata/md5-cache/media-video/x264-encoder-0.0.20130506 +++ b/metadata/md5-cache/media-video/x264-encoder-0.0.20130506 @@ -1,14 +1,14 @@ DEFINED_PHASES=configure -DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20130506[10bit=,debug=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) virtual/pkgconfig +DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20130506[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) virtual/pkgconfig DESCRIPTION=A free commandline encoder for X264/AVC streams EAPI=5 HOMEPAGE=http://www.videolan.org/developers/x264.html -IUSE=10bit avs custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads +IUSE=10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd LICENSE=GPL-2 -RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20130506[10bit=,debug=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) +RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-0.0.20130506[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) REQUIRED_USE=ffmpegsource? ( ffmpeg ) SLOT=0 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20130506-2245.tar.bz2 _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=df4d1fd57968b10fbbf461eb48a546d5 +_md5_=2ccc2f330d58ca4051edf73ab706df3f diff --git a/metadata/md5-cache/media-video/x264-encoder-9999 b/metadata/md5-cache/media-video/x264-encoder-9999 index 080b8a10740a..9056859f78f4 100644 --- a/metadata/md5-cache/media-video/x264-encoder-9999 +++ b/metadata/md5-cache/media-video/x264-encoder-9999 @@ -1,12 +1,12 @@ DEFINED_PHASES=configure unpack -DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,debug=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) virtual/pkgconfig dev-vcs/git +DEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) amd64? ( >=dev-lang/yasm-1.2.0 ) x86? ( >=dev-lang/yasm-1.2.0 ) x86-fbsd? ( >=dev-lang/yasm-1.2.0 ) virtual/pkgconfig dev-vcs/git DESCRIPTION=A free commandline encoder for X264/AVC streams EAPI=5 HOMEPAGE=http://www.videolan.org/developers/x264.html -IUSE=10bit avs custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads +IUSE=10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads LICENSE=GPL-2 -RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,debug=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) +RDEPEND=ffmpeg? ( virtual/ffmpeg ) ~media-libs/x264-9999[10bit=,interlaced=,threads=] ffmpegsource? ( media-libs/ffmpegsource ) mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) REQUIRED_USE=ffmpegsource? ( ffmpeg ) SLOT=0 _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=c2926d5e39675065e6f09c53b05d586b +_md5_=f4c96c75dec10a967afcb422e6775c12 diff --git a/metadata/md5-cache/sci-libs/scotch-6.0.0 b/metadata/md5-cache/sci-libs/scotch-6.0.0 index b3a3448b54e4..d0255be153a2 100644 --- a/metadata/md5-cache/sci-libs/scotch-6.0.0 +++ b/metadata/md5-cache/sci-libs/scotch-6.0.0 @@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib mpi? ( virtual/mpi ) SLOT=0 SRC_URI=http://gforge.inria.fr/frs/download.php/31832/scotch_6.0.0_esmumps.tar.gz _eclasses_=eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=49b253b6e35b3424e7a6c800fe84726f +_md5_=9c02c610aaebbff7aecde354d253007b diff --git a/metadata/md5-cache/sci-mathematics/octave-3.6.3 b/metadata/md5-cache/sci-mathematics/octave-3.6.3 deleted file mode 100644 index 3e318f0997ae..000000000000 --- a/metadata/md5-cache/sci-mathematics/octave-3.6.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test -DEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran -DESCRIPTION=High-level interactive language for numerical computations -EAPI=4 -HOMEPAGE=http://www.octave.org/ -IUSE=curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib -KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux -LICENSE=GPL-3 -RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) virtual/fortran -SLOT=0 -SRC_URI=mirror://gnu/octave/octave-3.6.3.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils f31a0ec0d081047cbf9c0bbb4822d831 fortran-2 ea80967500d9deda5468aed13b0bfca8 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=1264d98a1dc17ff30157bc72099b281f diff --git a/metadata/md5-cache/sci-mathematics/octave-3.6.4 b/metadata/md5-cache/sci-mathematics/octave-3.6.4 index 14fa0ab34130..50412fb9b36a 100644 --- a/metadata/md5-cache/sci-mathematics/octave-3.6.4 +++ b/metadata/md5-cache/sci-mathematics/octave-3.6.4 @@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre sys-libs/ncurses virtual/lapac SLOT=0/3.6.4 SRC_URI=mirror://gnu/octave/octave-3.6.4.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils f31a0ec0d081047cbf9c0bbb4822d831 fortran-2 ea80967500d9deda5468aed13b0bfca8 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=8d5958fea4b33d3e0a9df2329857d40c +_md5_=741db678e8aacafb802f2439ea8e9e86 diff --git a/metadata/md5-cache/sys-apps/dbus-1.6.12 b/metadata/md5-cache/sys-apps/dbus-1.6.12 index 1c140fcf31c7..ad1ecdf1602e 100644 --- a/metadata/md5-cache/sys-apps/dbus-1.6.12 +++ b/metadata/md5-cache/sys-apps/dbus-1.6.12 @@ -4,10 +4,10 @@ DESCRIPTION=A message bus system, a simple way for applications to talk to each EAPI=5 HOMEPAGE=http://dbus.freedesktop.org/ IUSE=debug doc selinux static-libs systemd test X test -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux +KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux LICENSE=|| ( AFL-2.1 GPL-2 ) RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd ) X? ( x11-libs/libX11 x11-libs/libXt ) SLOT=0 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.12.tar.gz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-any-r1 7ed4a8181d62a098eaa6c8eeacf190c9 python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce systemd 3421a5715404244e4827acd1cf8ce654 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=f6715bb6153739c5b62557bd2d5eb75b +_md5_=c8d12849cd8f5cc115c2ef9e09b0a92c diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 index 6892f4852c89..26707c920814 100644 --- a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 +++ b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack -DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( udev? ( virtual/udev[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=User-land utilities for LVM2 (device-mapper) software. EAPI=3 HOMEPAGE=http://sources.redhat.com/lvm2/ @@ -10,4 +10,4 @@ RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-clus SLOT=0 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.95.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.95.tgz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=46aec5988a2b457fa67848eaa3e1e46b +_md5_=13c5d36344e71a8adbdf30086ff472ab diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.97 b/metadata/md5-cache/sys-fs/lvm2-2.02.97 index 4173868d7a86..5ca8ecc9386d 100644 --- a/metadata/md5-cache/sys-fs/lvm2-2.02.97 +++ b/metadata/md5-cache/sys-fs/lvm2-2.02.97 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack -DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( udev? ( virtual/udev[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=User-land utilities for LVM2 (device-mapper) software. EAPI=3 HOMEPAGE=http://sources.redhat.com/lvm2/ @@ -10,4 +10,4 @@ RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-clus SLOT=0 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.97.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.97.tgz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=1ed28df03e8183d01373dfb0de4ac7fe +_md5_=920fb9041e5a7a244b9cde24569a479a diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 b/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 index bc426ba12688..19d3ae435a7c 100644 --- a/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 +++ b/metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare setup test unpack -DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig +DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( udev? ( virtual/udev[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig DESCRIPTION=User-land utilities for LVM2 (device-mapper) software. EAPI=5 HOMEPAGE=http://sources.redhat.com/lvm2/ @@ -10,4 +10,4 @@ RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-clus SLOT=0 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.97.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.97.tgz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=c59a81a15b7678e2d4b361155d87a57b +_md5_=efd05ef01a060905c26c7a8cb31d745c diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.98 b/metadata/md5-cache/sys-fs/lvm2-2.02.98 index 8d2201a05b21..e65ae95c585e 100644 --- a/metadata/md5-cache/sys-fs/lvm2-2.02.98 +++ b/metadata/md5-cache/sys-fs/lvm2-2.02.98 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare setup test -DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig +DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( udev? ( virtual/udev[static-libs] ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig DESCRIPTION=User-land utilities for LVM2 (device-mapper) software. EAPI=5 HOMEPAGE=http://sources.redhat.com/lvm2/ @@ -10,4 +10,4 @@ RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-clus SLOT=0 SRC_URI=ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.98.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.98.tgz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=b8486753054ba4bf56410987d6d39efd +_md5_=8ba4899d3c16677b1e6d536b78360a97 diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20130421 b/metadata/md5-cache/sys-kernel/linux-firmware-20130421 index 31b02d8a86c3..37998444efe9 100644 --- a/metadata/md5-cache/sys-kernel/linux-firmware-20130421 +++ b/metadata/md5-cache/sys-kernel/linux-firmware-20130421 @@ -5,8 +5,8 @@ HOMEPAGE=http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git IUSE=savedconfig savedconfig KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist -RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=template based math library, written in C++, for symbolic and numeric calculus applications +EAPI=5 +HOMEPAGE=http://rm-rf.in/libmath%2B%2B/ +IUSE=doc static-libs +KEYWORDS=~amd64 ~ppc ~s390 ~x86 +LICENSE=GPL-2 +SLOT=1 +SRC_URI=http://upstream.rm-rf.in/libmath%2B%2B/libmath++-0.0.4.tar.gz +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils f31a0ec0d081047cbf9c0bbb4822d831 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=c32de0e168ffc0dc479c3d8d8df39d48 diff --git a/metadata/md5-cache/virtual/opencl-0-r3 b/metadata/md5-cache/virtual/opencl-0-r3 new file mode 100644 index 000000000000..61cd66116e2e --- /dev/null +++ b/metadata/md5-cache/virtual/opencl-0-r3 @@ -0,0 +1,8 @@ +DEFINED_PHASES=- +DESCRIPTION=Virtual for OpenCL implementations +EAPI=5 +IUSE=video_cards_fglrx video_cards_nvidia +KEYWORDS=~amd64 ~x86 +RDEPEND=app-admin/eselect-opencl || ( media-libs/mesa[opencl] video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 ) dev-util/intel-ocl-sdk ) +SLOT=0 +_md5_=d5db18eb8735aac8b7f5832235504c9d diff --git a/metadata/md5-cache/x11-libs/libva-1.1.1 b/metadata/md5-cache/x11-libs/libva-1.1.1 index 72b243e76e11..02dec28ade4e 100644 --- a/metadata/md5-cache/x11-libs/libva-1.1.1 +++ b/metadata/md5-cache/x11-libs/libva-1.1.1 @@ -3,7 +3,7 @@ DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libX DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=4 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=+drm egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=MIT PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) @@ -12,4 +12,4 @@ REQUIRED_USE=opengl? ( X ) SLOT=0 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.1.1.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=7fb522a962527cde0c943fb29d81673a +_md5_=4529816fdafda037280678fb099e337e diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999 index 5b1d90c8301a..5aa6054c1a36 100644 --- a/metadata/md5-cache/x11-libs/libva-9999 +++ b/metadata/md5-cache/x11-libs/libva-9999 @@ -3,11 +3,11 @@ DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libX DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=4 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=+drm egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx LICENSE=MIT PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) REQUIRED_USE=opengl? ( X ) SLOT=0 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 git-2 e92e09651292b1bef5656592364550f7 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=f12c9fd2014abda5622c0bb2cecfb703 +_md5_=230ae5fb03dbb00ddcc1428e5ff785ae diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20 index 55042aa8ad49..c102a111fb8a 100644 --- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20 +++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.0.20 @@ -1,13 +1,13 @@ DEFINED_PHASES=configure install prepare -DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?,drm?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=HW video decode support for Intel integrated graphics EAPI=3 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=wayland X +IUSE=+drm wayland X KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=MIT -RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) +RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?,drm?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) SLOT=0 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.0.20.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=0aadf8b3978a8d9f2175c5760c42cb00 +_md5_=f8f659766cd40f71b98a68e37e584c59 diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-driver-9999 index 49afef4a04e7..b7052121ab57 100644 --- a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 +++ b/metadata/md5-cache/x11-libs/libva-intel-driver-9999 @@ -1,11 +1,11 @@ DEFINED_PHASES=configure install prepare unpack -DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DEPEND=>=x11-libs/libva-1.1.0[X?,wayland?,drm?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git DESCRIPTION=HW video decode support for Intel integrated graphics EAPI=3 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=wayland X +IUSE=+drm wayland X LICENSE=MIT -RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) +RDEPEND=>=x11-libs/libva-1.1.0[X?,wayland?,drm?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 ) SLOT=0 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 git-2 e92e09651292b1bef5656592364550f7 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=611b05d36da986df5541c8a01c10b324 +_md5_=65248707be45640f7f437e1309211ddc diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 7f3efc419c53..32c18d0ff6d2 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Wed, 19 Jun 2013 12:36:57 +0000 +Wed, 19 Jun 2013 20:37:01 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 0ee6a141562a..ef5348076f88 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Wed Jun 19 12:36:54 UTC 2013 +Wed Jun 19 20:36:59 UTC 2013 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index f3de6c1e830b..da83482b1e95 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Wed, 19 Jun 2013 13:00:01 +0000 +Wed, 19 Jun 2013 21:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index d42eae6bc22d..6315d3229c44 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1371645301 Wed Jun 19 12:35:01 2013 UTC +1371674101 Wed Jun 19 20:35:01 2013 UTC diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 1e4c44a961c8..bb63bc01f5fd 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.124 2013/05/28 13:53:41 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/package.use.mask,v 1.125 2013/06/19 18:00:25 jer Exp $ # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to . @@ -39,10 +39,6 @@ app-portage/eix clang # media-libs/devil has not been fully tested on HPPA media-gfx/graphviz devil -# Jeroen Roovers (4 Jul 2012) -# media-gfx/mscgen does not work on HPPA (bug #419987). -dev-libs/libnl doc - # Jeroen Roovers (3 Jul 2012) # Mask USE=connman for net-libs/gupnp (bug #424225) net-libs/gupnp connman diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask index c40481e67076..c99dcbd241e0 100644 --- a/profiles/arch/hppa/use.mask +++ b/profiles/arch/hppa/use.mask @@ -1,7 +1,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.72 2013/05/27 15:18:55 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.73 2013/06/19 15:14:08 jer Exp $ # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to . +# Jeroen Roovers (19 Jun 2013) +# media-libs/x264 works +-x264 + # Samuli Suominen (12 Mar 2013) # NVIDIA Cg toolkit for binary drivers cg @@ -59,10 +63,6 @@ facedetect # No support for CUDA on HPPA cuda -# Jeroen Roovers (25 Mar 2011) -# webm needs yasm/libvpx -webm - # Samuli Suominen (25 Dec 2010) # This will need stable gnome-base/gvfs. thunar @@ -88,15 +88,6 @@ gnome-keyring # dependency (bug #324511) applet -# Jeroen Roovers (19 Jul 2010) -# New media-libs/schroedinger depends on dev-lang/orc -# which is not currently ready yet (bug #316553) -schroedinger - -# Jeroen Roovers (10 Jul 2010) -# libvpx is not ready for HPPA -vpx - # Jeroen Roovers (10 Jul 2010) # No known hardware support for video decoding vaapi diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults b/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults new file mode 100644 index 000000000000..29293024a58c --- /dev/null +++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults @@ -0,0 +1,8 @@ +# Copyright 1999-2013 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/make.defaults,v 1.1 2013/06/19 20:13:50 aballier Exp $ + +CFLAGS="-O2 -pipe" +CXXFLAGS="-stdlib=libc++ ${CFLAGS}" +FFLAGS="${CFLAGS}" +FCFLAGS="${CFLAGS}" diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force index a1386015ea51..79a0c2c3c2a4 100644 --- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force +++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force,v 1.3 2013/06/01 14:17:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.force,v 1.4 2013/06/19 13:00:27 aballier Exp $ # Force building libc++ over libcxxrt. sys-libs/libcxx libcxxrt @@ -9,3 +9,7 @@ sys-libs/libcxx libcxxrt # work. sys-libs/libcxxrt static-libs sys-libs/libcxx static-libs + +# Force openssl on curl since cmakes needs it and is in @system because of +# libcxx on this profile. Mask the other ssl providers. +net-misc/curl ssl curl_ssl_openssl diff --git a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask index 479eb9255a10..171daabda2da 100644 --- a/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask +++ b/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.3 2013/06/01 14:17:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/amd64/9.1/clang/package.use.mask,v 1.4 2013/06/19 13:00:27 aballier Exp $ # Build libcxxrt over libgcc_s since that is what clang defaults to. sys-libs/libcxxrt libunwind @@ -10,3 +10,7 @@ sys-libs/libcxxrt libunwind # https://bugs.gentoo.org/show_bug.cgi?id=427344 # http://llvm.org/bugs/show_bug.cgi?id=12299 sys-devel/binutils cxx + +# Force openssl on curl since cmakes needs it and is in @system because of +# libcxx on this profile. Mask the other ssl providers. +net-misc/curl curl_ssl_axtls curl_ssl_cyassl curl_ssl_gnutls curl_ssl_nss curl_ssl_polarssl diff --git a/profiles/package.mask b/profiles/package.mask index e2d9b097ec29..cd78505f9dca 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,6 +1,6 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14841 2013/06/19 05:12:52 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14844 2013/06/19 17:18:48 aballier Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -301,8 +301,9 @@ mail-client/postler =net-libs/nodejs-0.11* # Chí-Thanh Christopher Nguyễn (05 Apr 2013) -# Mask prerelease snapshot +# Mask new mesa packages until opencl support is reviewed =media-libs/mesa-9.2_pre* +=virtual/opencl-0-r3 # Ian Stakenvicius (05 Apr 2013) # @@ -525,6 +526,8 @@ app-text/cuneiform >=media-sound/twolame-0.3.13-r1 >=media-sound/wavpack-4.60.1-r1 >=media-sound/gsm-1.0.13-r1 +>=media-libs/xvid-1.3.2-r1 +>=media-sound/lame-3.99.5-r1 # Markos Chandras (13 Mar 2013) # Mask because breaking updates out of the blue is bad diff --git a/profiles/use.local.desc b/profiles/use.local.desc index c53ddf378862..d21a74418d03 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -3022,6 +3022,7 @@ media-libs/mesa:gles - Enable GLES (both v1 and v2) support. media-libs/mesa:gles1 - Enable GLESv1 support. media-libs/mesa:gles2 - Enable GLESv2 support. media-libs/mesa:llvm - Enable LLVM backend for Gallium3D. +media-libs/mesa:opencl - Enable the Clover Gallium OpenCL state tracker. media-libs/mesa:openvg - Enable the OpenVG 2D acceleration API for Gallium3D. media-libs/mesa:osmesa - Build the Mesa library for off-screen rendering. media-libs/mesa:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel @@ -6405,7 +6406,9 @@ x11-libs/libqxt:berkdb - Build the QxtBerkeley module x11-libs/libqxt:sql - Build the QxtSql module x11-libs/libqxt:web - Build the QxtWeb module x11-libs/libqxt:zeroconf - Build the QxtZeroconf module +x11-libs/libva:drm - Enables VA/DRM API support. x11-libs/libva:egl - Enables EGL support. +x11-libs/libva-intel-driver:drm - Enables VA/DRM API support. x11-libs/libwnck:tools - Install wnckprop-3 and wnck-urgency-monitor-3 command-line tools x11-libs/libxcb:xkb - Enable the XCB keyboard extension x11-libs/libxklavier:introspection - Use dev-libs/gobject-introspection for introspection diff --git a/sci-libs/scotch/scotch-6.0.0.ebuild b/sci-libs/scotch/scotch-6.0.0.ebuild index cff9c71fd7ff..b607f8098ba1 100644 --- a/sci-libs/scotch/scotch-6.0.0.ebuild +++ b/sci-libs/scotch/scotch-6.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild,v 1.2 2013/06/13 23:48:26 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-6.0.0.ebuild,v 1.3 2013/06/19 17:21:01 bicatali Exp $ EAPI=5 @@ -80,9 +80,9 @@ src_compile() { export LINK=mpicc static_to_shared lib/libptscotcherr.a static_to_shared lib/libptscotcherrexit.a - static_to_shared lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt - static_to_shared lib/libptesmumps.a -Llib -lptscotch - static_to_shared lib/libptscotchparmetis.a -Llib -lptscotch + static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt + static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch + static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch fi if use static-libs; then emake -C src clean diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 56cd1742ea73..14545da3e05f 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -1,3 +1,2 @@ DIST octave-3.4.3.tar.bz2 15085117 SHA256 94d119cc93a38465e9c00dd36b9cc063abbda7ae8cb39407cf88a2bddc9dc148 SHA512 11cb6d9ba32b468ee8fbf86b9e1de642eb22e0864b1eee68883e3e2336b109f1a8b1bb5d81a10961a5a64e467b7112247ac28f5b951f84c5eaa5a2beff31dfe2 WHIRLPOOL d61c344e834165ba4f0ac41ef9a4f218fd558ab564c4446ae5fcfa8d185b9f0c882cf08ac924a83309d70a1b175d9284c0d56b7d98b526e9c1a30ef5d4f24fca -DIST octave-3.6.3.tar.bz2 15602522 SHA256 e37d09550f1cb406745619a5602aa3e8a97d2fe056b5c770db9984e2fc162886 SHA512 27caf2061e32e3a50478441f7795953fbfa4d876277fa91f657d61811389c1ca96a1b956852c1957724dbc0f8a187189a537b4254f9b3b6ac8d3a4f897435de4 WHIRLPOOL a2433d957e7a97f9627f4a472f9c3ce59ba09ca1aac3d58db30e0e10bcfd3da1e123174943a7c4fb3594b843eed8d3b0c7ff33301a05a11561e4611a9295a4f3 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0 diff --git a/sci-mathematics/octave/files/octave-3.6.3-rcond.patch b/sci-mathematics/octave/files/octave-3.6.3-rcond.patch deleted file mode 100644 index 45dcecc07f00..000000000000 --- a/sci-mathematics/octave/files/octave-3.6.3-rcond.patch +++ /dev/null @@ -1,210 +0,0 @@ -Description: Fix rcond function - Use new copy of data for full factorization if positive definite cholesky - factorization fails. -Origin: upstream, http://hg.savannah.gnu.org/hgweb/octave/rev/197774b411ec -Bug: http://savannah.gnu.org/bugs/?37336 -Applied-Upstream: version, 3.6.4 -Last-Update: 2012-09-14 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/liboctave/CMatrix.cc b/liboctave/CMatrix.cc ---- a/liboctave/CMatrix.cc -+++ b/liboctave/CMatrix.cc -@@ -1786,13 +1786,15 @@ - else if (typ == MatrixType::Full || typ == MatrixType::Hermitian) - { - double anorm = -1.0; -- ComplexMatrix atmp = *this; -- Complex *tmp_data = atmp.fortran_vec (); - - if (typ == MatrixType::Hermitian) - { - octave_idx_type info = 0; - char job = 'L'; -+ -+ ComplexMatrix atmp = *this; -+ Complex *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum(). - row(static_cast(0)).max(); - -@@ -1829,6 +1831,9 @@ - { - octave_idx_type info = 0; - -+ ComplexMatrix atmp = *this; -+ Complex *tmp_data = atmp.fortran_vec (); -+ - Array ipvt (dim_vector (nr, 1)); - octave_idx_type *pipvt = ipvt.fortran_vec (); - -@@ -2098,8 +2103,10 @@ - { - info = 0; - char job = 'L'; -+ - ComplexMatrix atmp = *this; - Complex *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum().row(static_cast(0)).max(); - - F77_XFCN (zpotrf, ZPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, -diff --git a/liboctave/dMatrix.cc b/liboctave/dMatrix.cc ---- a/liboctave/dMatrix.cc -+++ b/liboctave/dMatrix.cc -@@ -1454,13 +1454,15 @@ - else if (typ == MatrixType::Full || typ == MatrixType::Hermitian) - { - double anorm = -1.0; -- Matrix atmp = *this; -- double *tmp_data = atmp.fortran_vec (); - - if (typ == MatrixType::Hermitian) - { - octave_idx_type info = 0; - char job = 'L'; -+ -+ Matrix atmp = *this; -+ double *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum(). - row(static_cast(0)).max(); - -@@ -1495,6 +1497,9 @@ - { - octave_idx_type info = 0; - -+ Matrix atmp = *this; -+ double *tmp_data = atmp.fortran_vec (); -+ - Array ipvt (dim_vector (nr, 1)); - octave_idx_type *pipvt = ipvt.fortran_vec (); - -@@ -1760,8 +1765,10 @@ - { - info = 0; - char job = 'L'; -+ - Matrix atmp = *this; - double *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum().row(static_cast(0)).max(); - - F77_XFCN (dpotrf, DPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, -@@ -1838,6 +1845,7 @@ - - Matrix atmp = *this; - double *tmp_data = atmp.fortran_vec (); -+ - if(anorm < 0.) - anorm = atmp.abs().sum().row(static_cast(0)).max(); - -diff --git a/liboctave/fCMatrix.cc b/liboctave/fCMatrix.cc ---- a/liboctave/fCMatrix.cc -+++ b/liboctave/fCMatrix.cc -@@ -1782,13 +1782,15 @@ - else if (typ == MatrixType::Full || typ == MatrixType::Hermitian) - { - float anorm = -1.0; -- FloatComplexMatrix atmp = *this; -- FloatComplex *tmp_data = atmp.fortran_vec (); - - if (typ == MatrixType::Hermitian) - { - octave_idx_type info = 0; - char job = 'L'; -+ -+ FloatComplexMatrix atmp = *this; -+ FloatComplex *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum(). - row(static_cast(0)).max(); - -@@ -1825,6 +1827,9 @@ - { - octave_idx_type info = 0; - -+ FloatComplexMatrix atmp = *this; -+ FloatComplex *tmp_data = atmp.fortran_vec (); -+ - Array ipvt (dim_vector (nr, 1)); - octave_idx_type *pipvt = ipvt.fortran_vec (); - -@@ -2094,8 +2099,10 @@ - { - info = 0; - char job = 'L'; -+ - FloatComplexMatrix atmp = *this; - FloatComplex *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum().row(static_cast(0)).max(); - - F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, -diff --git a/liboctave/fMatrix.cc b/liboctave/fMatrix.cc ---- a/liboctave/fMatrix.cc -+++ b/liboctave/fMatrix.cc -@@ -1454,13 +1454,15 @@ - else if (typ == MatrixType::Full || typ == MatrixType::Hermitian) - { - float anorm = -1.0; -- FloatMatrix atmp = *this; -- float *tmp_data = atmp.fortran_vec (); - - if (typ == MatrixType::Hermitian) - { - octave_idx_type info = 0; - char job = 'L'; -+ -+ FloatMatrix atmp = *this; -+ float *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum(). - row(static_cast(0)).max(); - -@@ -1495,6 +1497,9 @@ - { - octave_idx_type info = 0; - -+ FloatMatrix atmp = *this; -+ float *tmp_data = atmp.fortran_vec (); -+ - Array ipvt (dim_vector (nr, 1)); - octave_idx_type *pipvt = ipvt.fortran_vec (); - -@@ -1760,8 +1765,10 @@ - { - info = 0; - char job = 'L'; -+ - FloatMatrix atmp = *this; - float *tmp_data = atmp.fortran_vec (); -+ - anorm = atmp.abs().sum().row(static_cast(0)).max(); - - F77_XFCN (spotrf, SPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, -@@ -1838,6 +1845,7 @@ - - FloatMatrix atmp = *this; - float *tmp_data = atmp.fortran_vec (); -+ - if(anorm < 0.) - anorm = atmp.abs().sum().row(static_cast(0)).max(); - -diff --git a/src/DLD-FUNCTIONS/rcond.cc b/src/DLD-FUNCTIONS/rcond.cc ---- a/src/DLD-FUNCTIONS/rcond.cc -+++ b/src/DLD-FUNCTIONS/rcond.cc -@@ -93,4 +93,12 @@ - %!assert( rcond ([1 1; 2 1]), 1/9) - %!assert( rcond (magic (4)), 0, eps) - -+%!shared x, sx -+%! x = [-5.25, -2.25; -2.25, 1] * eps () + ones (2) / 2; -+%! sx = [-5.25, -2.25; -2.25, 1] * eps ("single") + ones (2) / 2; -+%!assert (rcond (x) < eps ()); -+%!assert (rcond (sx) < eps ('single')); -+%!assert (rcond (x*i) < eps ()); -+%!assert (rcond (sx*i) < eps ('single')); -+ - */ - diff --git a/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch b/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch index be67d23c98b9..67f876f7bc42 100644 --- a/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch +++ b/sci-mathematics/octave/files/octave-3.6.4-texinfo.patch @@ -1,6 +1,6 @@ -diff -ur octave-3.6.4-orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi ---- octave-3.6.4-orig/doc/interpreter/audio.texi 2013-02-21 21:37:50.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/audio.texi 2013-05-01 23:23:21.338665377 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpreter/audio.texi +--- octave-3.6.4.orig/doc/interpreter/audio.texi 2013-02-21 12:37:50.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/audio.texi 2013-06-19 08:52:43.259790240 -0700 @@ -146,18 +146,18 @@ Load the RIFF/WAVE sound file @var{filename}, and return the samples in vector @var{y}. If the file contains multichannel data, then @@ -28,9 +28,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/audio.texi octave-3.6.4/doc/interpret Return the number of samples (@var{n}) and channels (@var{ch}) instead of the audio data. @seealso{@ref{doc-wavwrite,,wavwrite}} -diff -ur octave-3.6.4-orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi ---- octave-3.6.4-orig/doc/interpreter/io.texi 2013-02-21 21:37:51.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/io.texi 2013-05-01 22:59:08.537582265 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/io.texi +--- octave-3.6.4.orig/doc/interpreter/io.texi 2013-02-21 12:37:51.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/io.texi 2013-06-19 08:52:43.259790240 -0700 @@ -1391,22 +1391,22 @@ for the file. Valid values for @var{arch} are: @@ -60,9 +60,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/io.texi octave-3.6.4/doc/interpreter/ Cray floating format. @end table -diff -ur octave-3.6.4-orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi ---- octave-3.6.4-orig/doc/interpreter/octave.texi 2013-02-21 21:19:23.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/octave.texi 2013-05-01 22:58:26.561420772 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpreter/octave.texi +--- octave-3.6.4.orig/doc/interpreter/octave.texi 2013-02-21 12:19:23.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/octave.texi 2013-06-19 08:52:43.259790240 -0700 @@ -129,7 +129,9 @@ @sp 2 @multitable @columnfractions 0.4 0.025 0.65 @@ -74,9 +74,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/octave.texi octave-3.6.4/doc/interpre @tab @c this is a spacer column @tab -diff -ur octave-3.6.4-orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi ---- octave-3.6.4-orig/doc/interpreter/plot.texi 2013-02-21 21:37:52.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/plot.texi 2013-05-01 23:07:36.586442176 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/plot.texi octave-3.6.4/doc/interpreter/plot.texi +--- octave-3.6.4.orig/doc/interpreter/plot.texi 2013-02-21 12:37:52.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/plot.texi 2013-06-19 08:52:43.260790204 -0700 @@ -2707,21 +2707,20 @@ Set the data aspect ratio of the current axes. The aspect ratio is a normalized 3-element vector representing the span of the x, y, and @@ -200,9 +200,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/plot.texi octave-3.6.4/doc/interprete Return a structure, @var{appdata}, whose fields correspond to the appdata properties. @end deftypefn -diff -ur octave-3.6.4-orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi ---- octave-3.6.4-orig/doc/interpreter/poly.texi 2013-02-21 21:37:52.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/poly.texi 2013-05-01 23:28:59.515000917 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/poly.texi octave-3.6.4/doc/interpreter/poly.texi +--- octave-3.6.4.orig/doc/interpreter/poly.texi 2013-02-21 12:37:52.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/poly.texi 2013-06-19 08:52:43.260790204 -0700 @@ -82,8 +82,8 @@ (@var{x}-@var{mu}(1))/@var{mu}(2). If @var{x} is a vector or matrix, the polynomial is evaluated for each of @@ -214,9 +214,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/poly.texi octave-3.6.4/doc/interprete @deftypefnx {Function File} {[@var{y}, @var{dy}] =} polyval (@var{p}, @var{x}, @var{s}, @var{mu}) In addition to evaluating the polynomial, the second output represents the prediction interval, @var{y} +/- @var{dy}, which -diff -ur octave-3.6.4-orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi ---- octave-3.6.4-orig/doc/interpreter/set.texi 2013-02-21 21:37:52.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/set.texi 2013-05-01 23:30:00.161810855 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter/set.texi +--- octave-3.6.4.orig/doc/interpreter/set.texi 2013-02-21 12:37:52.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/set.texi 2013-06-19 08:52:43.260790204 -0700 @@ -150,8 +150,9 @@ 3 4 @end group @@ -228,9 +228,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/set.texi octave-3.6.4/doc/interpreter Return index vectors @var{ia} and @var{ib} such that @code{a(ia)} and @code{b(ib)} are disjoint sets whose union is @var{c}. -diff -ur octave-3.6.4-orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi ---- octave-3.6.4-orig/doc/interpreter/signal.texi 2013-02-21 21:37:52.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/signal.texi 2013-05-01 23:31:41.111833440 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpreter/signal.texi +--- octave-3.6.4.orig/doc/interpreter/signal.texi 2013-02-21 12:37:52.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/signal.texi 2013-06-19 08:52:43.261790169 -0700 @@ -454,17 +454,17 @@ For fastest computation, @var{n} should factor into a small number of @@ -255,9 +255,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/signal.texi octave-3.6.4/doc/interpre Plot the pass band, stop band and phase response of @var{h} rather than returning them. @end deftypefn -diff -ur octave-3.6.4-orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi ---- octave-3.6.4-orig/doc/interpreter/strings.texi 2013-02-21 21:37:52.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/strings.texi 2013-05-01 22:27:29.646311770 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpreter/strings.texi +--- octave-3.6.4.orig/doc/interpreter/strings.texi 2013-02-21 12:37:52.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/strings.texi 2013-06-19 08:52:43.261790169 -0700 @@ -1136,7 +1136,7 @@ @item %s The word is parsed as a string. @@ -267,9 +267,9 @@ diff -ur octave-3.6.4-orig/doc/interpreter/strings.texi octave-3.6.4/doc/interpr @itemx %n The word is parsed as a number and converted to double. -diff -ur octave-3.6.4-orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi ---- octave-3.6.4-orig/doc/interpreter/system.texi 2013-02-21 21:37:52.000000000 +0100 -+++ octave-3.6.4/doc/interpreter/system.texi 2013-05-01 23:45:09.981978551 +0200 +diff -Nur octave-3.6.4.orig/doc/interpreter/system.texi octave-3.6.4/doc/interpreter/system.texi +--- octave-3.6.4.orig/doc/interpreter/system.texi 2013-02-21 12:37:52.000000000 -0800 ++++ octave-3.6.4/doc/interpreter/system.texi 2013-06-19 08:52:43.261790169 -0700 @@ -839,7 +839,7 @@ @deftypefnx {Function File} {} datetick (@var{axis}, @var{form}) @deftypefnx {Function File} {} datetick (@dots{}, "keeplimits") @@ -358,3 +358,21 @@ diff -ur octave-3.6.4-orig/doc/interpreter/system.texi octave-3.6.4/doc/interpre Check out a license for @var{feature}, returning 1 on success and 0 on failure. +diff -Nur octave-3.6.4.orig/doc/liboctave/liboctave.texi octave-3.6.4/doc/liboctave/liboctave.texi +--- octave-3.6.4.orig/doc/liboctave/liboctave.texi 2013-02-21 12:19:23.000000000 -0800 ++++ octave-3.6.4/doc/liboctave/liboctave.texi 2013-06-19 08:54:27.914379692 -0700 +@@ -80,10 +80,10 @@ + @end ifnottex + + @titlepage +-@title{Octave C++ Classes} +-@subtitle{Edition 1.0 for Octave version @value{VERSION}} +-@subtitle{September 1993} +-@author{John W. Eaton} ++@title@{Octave C++ Classes@} ++@subtitle@{Edition 1.0 for Octave version @value{VERSION}@} ++@subtitle@{September 1993@} ++@author@{John W. Eaton@} + @page + @vskip 0pt plus 1filll + Copyright @copyright{} 1996, 1997 John W. Eaton. diff --git a/sci-mathematics/octave/octave-3.6.3.ebuild b/sci-mathematics/octave/octave-3.6.3.ebuild deleted file mode 100644 index efbd05a5f5cd..000000000000 --- a/sci-mathematics/octave/octave-3.6.3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.3.ebuild,v 1.6 2013/01/11 21:44:11 bicatali Exp $ - -EAPI=4 - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils multilib toolchain-funcs fortran-2 - -DESCRIPTION="High-level interactive language for numerical computations" -LICENSE="GPL-3" -HOMEPAGE="http://www.octave.org/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" - -SLOT="0" -IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript - +qhull +qrupdate readline +sparse static-libs X zlib" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" - -RDEPEND=" - app-text/ghostscript-gpl - dev-libs/libpcre - sys-libs/ncurses - virtual/lapack - curl? ( net-misc/curl ) - fftw? ( sci-libs/fftw:3.0 ) - glpk? ( sci-mathematics/glpk ) - gnuplot? ( sci-visualization/gnuplot ) - hdf5? ( sci-libs/hdf5 ) - imagemagick? ( || ( - media-gfx/graphicsmagick[cxx] - media-gfx/imagemagick[cxx] ) ) - opengl? ( - media-libs/freetype:2 - media-libs/fontconfig - >=x11-libs/fltk-1.3:1[opengl] - virtual/glu ) - postscript? ( - app-text/epstool - media-gfx/pstoedit - media-gfx/transfig ) - qhull? ( media-libs/qhull ) - qrupdate? ( sci-libs/qrupdate ) - readline? ( sys-libs/readline ) - sparse? ( - sci-libs/arpack - sci-libs/camd - sci-libs/ccolamd - sci-libs/cholmod - sci-libs/colamd - sci-libs/cxsparse - sci-libs/umfpack ) - X? ( x11-libs/libX11 ) - zlib? ( sys-libs/zlib )" - -DEPEND="${RDEPEND} - doc? ( - virtual/latex-base - dev-texlive/texlive-genericrecommended - sys-apps/texinfo ) - dev-util/gperf - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help,texi}.patch - "${FILESDIR}"/${PN}-3.6.3-{rcond,legendtext}.patch -) - -src_prepare() { - # nasty prefix hack for fltk:1 linking - if use prefix && use opengl; then - sed -i \ - -e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \ - configure.ac - fi - autotools-utils_src_prepare -} - -src_configure() { - # occasional fail on install, force regeneration (bug #401189) - rm doc/interpreter/contributors.texi || die - - # unfortunate dependency on mpi from hdf5 (bug #302621) - use hdf5 && has_version sci-libs/hdf5[mpi] && \ - export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77 - - local myeconfargs=( - --localstatedir="${EPREFIX}/var/state/octave" - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" - --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" - $(use_enable doc docs) - $(use_enable readline) - $(use_with curl) - $(use_with fftw fftw3) - $(use_with fftw fftw3f) - $(use_with glpk) - $(use_with hdf5) - $(use_with opengl) - $(use_with qhull) - $(use_with qrupdate) - $(use_with sparse arpack) - $(use_with sparse umfpack) - $(use_with sparse colamd) - $(use_with sparse ccolamd) - $(use_with sparse cholmod) - $(use_with sparse cxsparse) - $(use_with X x) - $(use_with zlib z) - ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi - else - myeconfargs+=( "--without-magick" ) - fi - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - use doc && dodoc $(find doc -name \*.pdf) - [[ -e test/fntests.log ]] && dodoc test/fntests.log - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${P}" > 99octave - doenvd 99octave -} diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild index 7759c25fd2b8..626ac116c194 100644 --- a/sci-mathematics/octave/octave-3.6.4.ebuild +++ b/sci-mathematics/octave/octave-3.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.2 2013/05/22 04:27:11 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.4.ebuild,v 1.3 2013/06/19 16:17:15 bicatali Exp $ EAPI=5 @@ -91,6 +91,7 @@ src_configure() { --localstatedir="${EPREFIX}/var/state/octave" --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" + $(use_enable prefix rpath) $(use_enable doc docs) $(use_enable readline) $(use_with curl) @@ -126,6 +127,6 @@ src_install() { autotools-utils_src_install use doc && dodoc $(find doc -name \*.pdf) [[ -e test/fntests.log ]] && dodoc test/fntests.log - echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${P}" > 99octave + echo "LDPATH=${EROOT%/}/usr/$(get_libdir)/${P}" > 99octave doenvd 99octave } diff --git a/sys-apps/dbus/dbus-1.6.12.ebuild b/sys-apps/dbus/dbus-1.6.12.ebuild index fc70a2f56fad..b01a21513ab6 100644 --- a/sys-apps/dbus/dbus-1.6.12.ebuild +++ b/sys-apps/dbus/dbus-1.6.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.12.ebuild,v 1.1 2013/06/18 13:02:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.12.ebuild,v 1.2 2013/06/19 19:26:07 klausman Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -12,7 +12,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" LICENSE="|| ( AFL-2.1 GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="debug doc selinux static-libs systemd test X" RDEPEND=">=dev-libs/expat-2 diff --git a/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild index 66b23bc05fdc..a8d1651b46e8 100644 --- a/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild,v 1.3 2013/05/23 14:14:42 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild,v 1.4 2013/06/19 13:51:06 polynomial-c Exp $ EAPI=3 inherit eutils multilib toolchain-funcs autotools linux-info @@ -39,7 +39,7 @@ RDEPEND="${RDEPEND} DEPEND="${DEPEND_COMMON} virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 - static? ( virtual/udev[static-libs] )" + static? ( udev? ( virtual/udev[static-libs] ) )" S="${WORKDIR}/${PN/lvm/LVM}.${PV}" diff --git a/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild index d473ec06b18e..7ea1069d6a5d 100644 --- a/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild,v 1.14 2013/05/23 14:14:41 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild,v 1.15 2013/06/19 13:51:06 polynomial-c Exp $ EAPI=5 inherit eutils multilib toolchain-funcs autotools linux-info udev @@ -39,7 +39,7 @@ RDEPEND="${RDEPEND} DEPEND="${DEPEND_COMMON} virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 - static? ( virtual/udev[static-libs] )" + static? ( udev? ( virtual/udev[static-libs] ) )" S="${WORKDIR}/${PN/lvm/LVM}.${PV}" diff --git a/sys-fs/lvm2/lvm2-2.02.97.ebuild b/sys-fs/lvm2/lvm2-2.02.97.ebuild index d29cb80d0671..2033bc7bbb5d 100644 --- a/sys-fs/lvm2/lvm2-2.02.97.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.97.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97.ebuild,v 1.3 2013/05/23 14:14:42 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97.ebuild,v 1.4 2013/06/19 13:51:06 polynomial-c Exp $ EAPI=3 inherit eutils multilib toolchain-funcs autotools linux-info @@ -39,7 +39,7 @@ RDEPEND="${RDEPEND} DEPEND="${DEPEND_COMMON} virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 - static? ( virtual/udev[static-libs] )" + static? ( udev? ( virtual/udev[static-libs] ) )" S="${WORKDIR}/${PN/lvm/LVM}.${PV}" diff --git a/sys-fs/lvm2/lvm2-2.02.98.ebuild b/sys-fs/lvm2/lvm2-2.02.98.ebuild index c062a117d7e5..85f7c3ff7a91 100644 --- a/sys-fs/lvm2/lvm2-2.02.98.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.98.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.98.ebuild,v 1.4 2013/05/23 14:14:42 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.98.ebuild,v 1.5 2013/06/19 13:51:06 polynomial-c Exp $ EAPI=5 inherit eutils multilib toolchain-funcs autotools linux-info udev @@ -39,7 +39,7 @@ RDEPEND="${RDEPEND} DEPEND="${DEPEND_COMMON} virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 - static? ( virtual/udev[static-libs] )" + static? ( udev? ( virtual/udev[static-libs] ) )" S="${WORKDIR}/${PN/lvm/LVM}.${PV}" diff --git a/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild index c5419dfbbd94..9579e911cfc9 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild,v 1.4 2013/06/18 22:34:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild,v 1.5 2013/06/19 16:43:22 chithanh Exp $ EAPI=5 inherit savedconfig @@ -24,6 +24,7 @@ IUSE="savedconfig" DEPEND="" RDEPEND="!savedconfig? ( + !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] diff --git a/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild index 88df77ea420b..6b2e275b0f47 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild,v 1.1 2013/06/18 18:39:09 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild,v 1.2 2013/06/19 16:43:22 chithanh Exp $ EAPI=5 inherit savedconfig @@ -24,6 +24,7 @@ IUSE="savedconfig" DEPEND="" RDEPEND="!savedconfig? ( + !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild index 031fa029858f..e07230e0b9f0 100644 --- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.26 2013/05/14 21:06:31 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.27 2013/06/19 16:43:22 chithanh Exp $ EAPI=5 inherit savedconfig @@ -24,6 +24,7 @@ IUSE="savedconfig" DEPEND="" RDEPEND="!savedconfig? ( + !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] diff --git a/sys-libs/libmath++/Manifest b/sys-libs/libmath++/Manifest index 5befff6e2ee3..afcb0ff15492 100644 --- a/sys-libs/libmath++/Manifest +++ b/sys-libs/libmath++/Manifest @@ -1 +1 @@ -DIST libmath++-0.0.4.tar.gz 51107 RMD160 18bb19c1cbd209d2991988c75fe09c4aac83e6f2 SHA1 3b751d3c7ebc0e0ff5b5cf11895a4bcb4d7b0f4c SHA256 9bfeb340a1331d53b43fcd0f0c3aef0b985985ee9bfffac7c42eb57405db3414 +DIST libmath++-0.0.4.tar.gz 51107 SHA256 9bfeb340a1331d53b43fcd0f0c3aef0b985985ee9bfffac7c42eb57405db3414 SHA512 4ee86f365f9eb4f8a122beef430041b5133da1b780a595627ec43c53bb45a6b5a5836a1f2453d2c93f6771ff45683b1143a1d1432f3904ba5b6317c50f010bbc WHIRLPOOL 47c80adcfab7fd0599fde2a53d71c297dfa61bb7b19a4e9fd6c6d486c870aa28135b3b1be6a09836ac36fa4aef1f4ff37f81636cecffc562cfe10a0884f2ec76 diff --git a/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild b/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild new file mode 100644 index 000000000000..8c288456c7da --- /dev/null +++ b/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libmath++/libmath++-0.0.4-r1.ebuild,v 1.1 2013/06/19 17:03:28 pinkbyte Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=1 +inherit autotools-utils + +DESCRIPTION="template based math library, written in C++, for symbolic and numeric calculus applications" +HOMEPAGE="http://rm-rf.in/libmath%2B%2B/" +SRC_URI="http://upstream.rm-rf.in/libmath%2B%2B/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~amd64 ~ppc ~s390 ~x86" +IUSE="doc static-libs" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="" + +DOCS=( AUTHORS README TODO ) + +src_prepare() { + # Autotools 1.13 compatibility, bug #471950 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die 'sed on configure.in failed' + + autotools-utils_src_prepare +} + +src_compile() { + autotools-utils_src_compile + + if use doc; then + pushd "${AUTOTOOLS_BUILD_DIR}" >/dev/null + emake -C doc api-doc + popd >/dev/null + fi +} + +src_install() { + autotools-utils_src_install + + if use doc; then + pushd "${AUTOTOOLS_BUILD_DIR}" >/dev/null + dohtml -r doc/user-api/* + popd >/dev/null + fi +} diff --git a/virtual/opencl/opencl-0-r3.ebuild b/virtual/opencl/opencl-0-r3.ebuild new file mode 100644 index 000000000000..90c1d6259ab4 --- /dev/null +++ b/virtual/opencl/opencl-0-r3.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/opencl/opencl-0-r3.ebuild,v 1.1 2013/06/19 15:45:58 chithanh Exp $ + +EAPI=5 + +DESCRIPTION="Virtual for OpenCL implementations" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="~amd64 ~x86" +CARDS=( fglrx nvidia ) +IUSE="${CARDS[@]/#/video_cards_}" + +DEPEND="" +RDEPEND="app-admin/eselect-opencl + || ( + media-libs/mesa[opencl] + video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 ) + video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 ) + dev-util/intel-ocl-sdk + )" diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild index 83e70a0ba28f..e73c47e7ca2f 100644 --- a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild +++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild,v 1.1 2013/03/26 16:41:01 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20.ebuild,v 1.2 2013/06/19 19:44:17 aballier Exp $ EAPI="3" @@ -29,9 +29,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="wayland X" +IUSE="+drm wayland X" -RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?] +RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?,drm?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )" @@ -46,6 +46,7 @@ src_prepare() { src_configure() { econf \ --disable-silent-rules \ + $(use_enable drm) \ $(use_enable wayland) \ $(use_enable X x11) } diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild index 2743a6e9040d..3edd36933ec5 100644 --- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild +++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.7 2013/03/26 16:36:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.8 2013/06/19 19:44:17 aballier Exp $ EAPI="3" @@ -29,9 +29,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="wayland X" +IUSE="+drm wayland X" -RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?] +RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?,drm?] !=x11-libs/libdrm-2.4.23[video_cards_intel] wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )" @@ -46,6 +46,7 @@ src_prepare() { src_configure() { econf \ --disable-silent-rules \ + $(use_enable drm) \ $(use_enable wayland) \ $(use_enable X x11) } diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml index 2a14d850a680..0b0b079588e5 100644 --- a/x11-libs/libva-intel-driver/metadata.xml +++ b/x11-libs/libva-intel-driver/metadata.xml @@ -10,4 +10,7 @@ jkarlson@cc.hut.fi Emil Karlson + + Enables VA/DRM API support. + diff --git a/x11-libs/libva/libva-1.1.1.ebuild b/x11-libs/libva/libva-1.1.1.ebuild index ee80d4ee55cd..b5636ce450ee 100644 --- a/x11-libs/libva/libva-1.1.1.ebuild +++ b/x11-libs/libva/libva-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1.ebuild,v 1.1 2013/03/26 16:31:24 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1.ebuild,v 1.2 2013/06/19 19:34:54 aballier Exp $ EAPI=4 @@ -29,7 +29,8 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="egl opengl wayland X" +IUSE="+drm egl opengl wayland X" +REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx" for x in ${VIDEO_CARDS}; do @@ -67,7 +68,8 @@ src_configure() { $(use_enable opengl glx) \ $(use_enable X x11) \ $(use_enable wayland) \ - $(use_enable egl) + $(use_enable egl) \ + $(use_enable drm) } src_install() { diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild index 1da634bb31e2..bd5aa5e5255e 100644 --- a/x11-libs/libva/libva-9999.ebuild +++ b/x11-libs/libva/libva-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.14 2013/03/26 16:29:25 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.15 2013/06/19 19:34:54 aballier Exp $ EAPI=4 @@ -29,7 +29,8 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="egl opengl wayland X" +IUSE="+drm egl opengl wayland X" +REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx" for x in ${VIDEO_CARDS}; do @@ -67,7 +68,8 @@ src_configure() { $(use_enable opengl glx) \ $(use_enable X x11) \ $(use_enable wayland) \ - $(use_enable egl) + $(use_enable egl) \ + $(use_enable drm) } src_install() { diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml index af702ea29fbe..8aef4bbadb48 100644 --- a/x11-libs/libva/metadata.xml +++ b/x11-libs/libva/metadata.xml @@ -7,5 +7,6 @@ Enables EGL support. + Enables VA/DRM API support.