* [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/openssl/files/, net-libs/liblockfile/, net-misc/radvd/files/, ...
@ 2015-06-24 16:09 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2015-06-24 16:09 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 2237782 bytes --]
commit: 4b32c33ed06f4eaac1e01b22a53164885c628003
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 24 16:10:59 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 16:10:59 2015 +0000
URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=4b32c33e
Clear out the repo to discourage its use. See DEPRECATED.
app-crypt/shash/files/0.2.6-manpage-fixes.patch | 30 -
.../shash/files/shash-0.2.6-binary-files.patch | 34 -
.../shash/files/shash-0.2.6-missing-includes.patch | 27 -
app-crypt/shash/files/shash.bash-completion | 40 -
app-crypt/shash/metadata.xml | 10 -
app-crypt/shash/shash-0.2.6-r99.ebuild | 37 -
.../emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild | 365 ----
app-editors/emacs-vcs/files/emacs-vcs-musl.patch | 89 -
app-editors/emacs-vcs/metadata.xml | 46 -
app-editors/emacs/emacs-24.4-r99.ebuild | 348 ---
.../files/emacs-24.3-alloc-invalid-frees.patch | 58 -
app-editors/emacs/files/emacs-24.3-stderr.patch | 11 -
app-editors/emacs/files/emacs-24.4-configure.patch | 10 -
app-editors/emacs/files/emacs-24.4-lisp.patch | 10 -
.../emacs/files/emacs-24.4-preload-hack.patch | 11 -
app-editors/emacs/files/preload.c | 88 -
app-editors/emacs/metadata.xml | 46 -
app-emulation/qemu/files/65-kvm.rules | 1 -
app-emulation/qemu/files/bridge.conf | 14 -
app-emulation/qemu/files/qemu-1.5.3-openpty.patch | 12 -
app-emulation/qemu/files/qemu-1.7.0-cflags.patch | 11 -
app-emulation/qemu/files/qemu-1.7.0-ffsll.patch | 19 -
app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch | 12 -
.../files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch | 23 -
...signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch | 37 -
.../qemu/files/qemu-2.1.0-CVE-2014-5388.patch | 36 -
.../qemu/files/qemu-2.1.1-readlink-self.patch | 81 -
.../qemu/files/qemu-2.1.2-vnc-sanitize-bits.patch | 50 -
.../qemu/files/qemu-2.2.0-_sigev_un.patch | 12 -
.../qemu/files/qemu-2.2.1-CVE-2015-1779-1.patch | 241 ---
.../qemu/files/qemu-2.2.1-CVE-2015-1779-2.patch | 58 -
.../qemu/files/qemu-2.3.0-CVE-2015-3456.patch | 86 -
app-emulation/qemu/files/qemu-9999-cflags.patch | 13 -
.../qemu-9999-virtfs-proxy-helper-accept.patch | 30 -
app-emulation/qemu/files/qemu-binfmt.initd-r1 | 129 --
app-emulation/qemu/files/qemu-kvm-1.4 | 3 -
app-emulation/qemu/metadata.xml | 57 -
app-emulation/qemu/qemu-2.1.2-r99.ebuild | 600 ------
app-emulation/qemu/qemu-2.2.1-r99.ebuild | 610 ------
.../wine/files/wine-1.4_rc2-multilib-portage.patch | 40 -
app-emulation/wine/files/wine-1.5.19-file_h.patch | 12 -
.../wine/files/wine-1.5.19-getdents.patch | 12 -
app-emulation/wine/files/wine-1.5.26-winegcc.patch | 59 -
app-emulation/wine/files/wine-1.6-memset-O3.patch | 21 -
app-emulation/wine/files/wine-1.6.2-ipx.patch | 20 -
.../wine/files/wine-1.7.2-osmesa-check.patch | 38 -
app-emulation/wine/metadata.xml | 27 -
app-emulation/wine/wine-1.6.2-r99.ebuild | 443 ----
.../libreoffice-4.3.5.2-remove-bashisms.patch | 38 -
.../files/libreoffice-4.4-system-pyuno.patch | 44 -
...breoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch | 80 -
.../libreoffice-4.4.0.3-telepathy-build-fix.patch | 40 -
...reoffice-4.4.1.2-add-kde4-open-url-script.patch | 56 -
.../files/libreoffice-4.4.1.2-fix-includes.patch | 31 -
...ibreoffice-4.4.1.2-improve-KDE4FilePicker.patch | 192 --
.../files/libreoffice-4.4.1.2-linux-musl.patch | 68 -
.../libreoffice-4.4.1.2-musl-fix-execinfo.patch | 24 -
.../libreoffice/libreoffice-4.4.1.2-r99.ebuild | 619 ------
app-office/libreoffice/metadata.xml | 20 -
.../hunspell/files/hunspell-1.3-renameexes.patch | 135 --
.../hunspell/files/hunspell-1.3.2-static-lib.patch | 9 -
.../files/hunspell-1.3.3-multibyte-chars.patch | 59 -
.../hunspell/files/hunspell-9999-error_h.patch | 37 -
app-text/hunspell/hunspell-1.3.3-r99.ebuild | 89 -
app-text/hunspell/metadata.xml | 5 -
.../files/texlive-core-2012-pmx-sysdep.patch | 11 -
app-text/texlive-core/files/texmf-update2010 | 165 --
app-text/texlive-core/metadata.xml | 16 -
app-text/texlive-core/texlive-core-2012-r99.ebuild | 352 ---
.../files/ruby-1.9.3_p484-add-asm_ioctl_h.patch | 11 -
dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch | 11 -
dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch | 24 -
dev-lang/ruby/metadata.xml | 30 -
dev-lang/ruby/ruby-1.9.3_p484.ebuild | 220 --
dev-lang/ruby/ruby-2.0.0_p353.ebuild | 228 --
dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild | 61 -
dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild | 48 -
.../files/boehm-gc-7.2e-automake-1.13.patch | 13 -
dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch | 11 -
.../boehm-gc/files/boehm-gc-7.4.2-getcontext.patch | 12 -
dev-libs/boehm-gc/metadata.xml | 12 -
dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch | 20 -
dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch | 17 -
dev-libs/gmp/gmp-5.1.3-r99.ebuild | 120 --
dev-libs/gmp/metadata.xml | 8 -
.../libgamin-0.1.10-G_CONST_RETURN-removal.patch | 67 -
.../files/libgamin-0.1.10-armel-features.patch | 47 -
.../files/libgamin-0.1.10-compilewarnings.patch | 22 -
.../files/libgamin-0.1.10-crosscompile-fix.patch | 38 -
.../libgamin/files/libgamin-0.1.10-deadlock.patch | 65 -
...amin-0.1.10-disable_python_static_library.patch | 13 -
.../files/libgamin-0.1.10-fix-pthread-mutex.patch | 11 -
.../files/libgamin-0.1.10-noinst-lib.patch | 76 -
dev-libs/libgamin/libgamin-0.1.10-r99.ebuild | 142 --
dev-libs/libgamin/metadata.xml | 8 -
.../libxml2/files/libxml2-2.7.1-catalog_path.patch | 66 -
...2-2.8.0-xmlParseAttValueComplex-underflow.patch | 25 -
.../libxml2/files/libxml2-2.8.0_rc1-winnt.patch | 91 -
.../libxml2-2.9.0-disable_static_modules.patch | 21 -
.../libxml2-2.9.0-excessive-entity-expansion.patch | 156 --
.../files/libxml2-2.9.0-large-file-parse.patch | 56 -
.../files/libxml2-2.9.0-manual-python.patch | 45 -
dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch | 27 -
.../libxml2/files/libxml2-2.9.0-rand_seed.patch | 31 -
...bxml2-2.9.0-remove-redundant-pthread-defs.patch | 19 -
.../files/libxml2-2.9.0-streaming-validation.patch | 54 -
.../libxml2/files/libxml2-2.9.0-thread-alloc.patch | 65 -
.../files/libxml2-2.9.0-thread-portability.patch | 37 -
.../libxml2-2.9.1-compression-detection.patch | 126 --
.../libxml2-2.9.1-external-param-entities.patch | 39 -
.../files/libxml2-2.9.1-icu-pkgconfig.patch | 26 -
.../files/libxml2-2.9.1-missing-break.patch | 25 -
.../files/libxml2-2.9.1-non-ascii-cr-lf.patch | 168 --
.../libxml2/files/libxml2-2.9.1-python-2.6.patch | 32 -
dev-libs/libxml2/files/libxml2-2.9.1-python3.patch | 50 -
.../libxml2/files/libxml2-2.9.1-python3a.patch | 55 -
.../files/libxml2-2.9.1-xmllint-postvalid.patch | 32 -
.../files/libxml2-2.9.2-icu-pkgconfig.patch | 26 -
...bxml2-2.9.2-revert-missing-initialization.patch | 26 -
dev-libs/libxml2/libxml2-2.9.1-r999.ebuild | 214 --
dev-libs/libxml2/libxml2-2.9.2-r99.ebuild | 209 --
dev-libs/libxml2/metadata.xml | 8 -
.../files/nspr-4.10.6-no-getprotobyname_r.patch | 11 -
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 32 -
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 26 -
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 14 -
.../files/nspr-4.8.4-darwin-install_name.patch | 25 -
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 28 -
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 12 -
dev-libs/nspr/metadata.xml | 5 -
dev-libs/nspr/nspr-4.10.6-r99.ebuild | 112 -
dev-libs/nspr/nspr-4.10.7-r99.ebuild | 117 -
dev-libs/nspr/nspr-4.10.8-r99.ebuild | 117 -
dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch | 24 -
.../nss/files/nss-3.15-gentoo-fixup-warnings.patch | 10 -
dev-libs/nss/files/nss-3.15-gentoo-fixups.patch | 238 --
dev-libs/nss/files/nss-3.15.4-enable-pem.patch | 13 -
dev-libs/nss/files/nss-3.16-musl.patch | 13 -
dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch | 241 ---
dev-libs/nss/metadata.xml | 16 -
dev-libs/nss/nss-3.16-r99.ebuild | 271 ---
dev-libs/nss/nss-3.17.4-r99.ebuild | 322 ---
dev-libs/openssl/files/gentoo.config-1.0.1 | 160 --
.../openssl/files/openssl-1.0.0a-ldflags.patch | 29 -
.../openssl/files/openssl-1.0.0d-windres.patch | 76 -
.../openssl/files/openssl-1.0.0h-pkg-config.patch | 34 -
.../files/openssl-1.0.1-parallel-build.patch | 354 ---
dev-libs/openssl/files/openssl-1.0.1-x32.patch | 79 -
.../files/openssl-1.0.1c-force-termios.patch | 69 -
.../files/openssl-1.0.1e-s_client-verify.patch | 18 -
...enssl-1.0.1f-revert-alpha-perl-generation.patch | 84 -
dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch | 642 ------
.../files/openssl-1.0.1l-CVE-2015-0286.patch | 356 ---
dev-libs/openssl/metadata.xml | 13 -
dev-libs/openssl/openssl-1.0.1l-r99.ebuild | 261 ---
dev-scheme/guile/files/50guile-gentoo.el | 1 -
.../guile/files/guile-1.8.8-fix_guile-config.patch | 14 -
dev-scheme/guile/files/guile-1.8.8-gcc46.patch | 39 -
.../guile/files/guile-1.8.8-makeinfo-5.patch | 71 -
dev-scheme/guile/files/guile-1.8.8-os_dep.patch | 10 -
dev-scheme/guile/guile-1.8.8-r99.ebuild | 113 -
dev-scheme/guile/metadata.xml | 18 -
dev-tex/luatex/files/jmpbuf.patch | 21 -
dev-tex/luatex/files/kpathsea2012.patch | 28 -
dev-tex/luatex/files/poppler018.patch | 160 --
dev-tex/luatex/files/poppler020.patch | 75 -
dev-tex/luatex/files/poppler022.patch | 388 ----
.../luatex/files/remove-zlib-version-check.patch | 23 -
dev-tex/luatex/luatex-0.70.1-r99.ebuild | 121 --
dev-tex/luatex/metadata.xml | 10 -
dev-util/strace/files/strace-4.8-musl.patch | 168 --
dev-util/strace/metadata.xml | 10 -
dev-util/strace/strace-4.8-r99.ebuild | 49 -
dev-vcs/cvs/cvs-1.12.12-r99.ebuild | 86 -
dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch | 140 --
.../files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch | 34 -
dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch | 22 -
dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch | 12 -
dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch | 29 -
dev-vcs/cvs/files/cvs-1.12.12-openat.patch | 21 -
dev-vcs/cvs/files/cvs-1.12.12-regex.patch | 11 -
dev-vcs/cvs/files/cvs.pam-include-1.12.12 | 4 -
dev-vcs/cvs/files/cvspserver.xinetd.d | 14 -
dev-vcs/cvs/metadata.xml | 8 -
eclass/toolchain.eclass | 2262 --------------------
gnome-base/libgtop/files/libgtop-musl.patch | 27 -
gnome-base/libgtop/libgtop-2.28.5-r99.ebuild | 35 -
gnome-base/libgtop/libgtop-2.30.0-r99.ebuild | 34 -
gnome-base/libgtop/metadata.xml | 9 -
.../files/mailx-support-20030215-gentoo.patch | 66 -
.../mailx-support-20060102-add-sys_file_h.patch | 9 -
.../mailx-support-20060102-respect-ldflags.patch | 18 -
.../mailx-support-20060102-r99.ebuild | 39 -
mail-client/mailx-support/metadata.xml | 5 -
mail-mta/exim/exim-4.84-r99.ebuild | 513 -----
mail-mta/exim/files/auth_conf.sub | 25 -
mail-mta/exim/files/exim-4.14-tail.patch | 11 -
mail-mta/exim/files/exim-4.20-maildir.patch | 14 -
mail-mta/exim/files/exim-4.69-r1.27021.patch | 48 -
.../exim/files/exim-4.74-localscan_dlopen.patch | 262 ---
.../exim/files/exim-4.74-radius-db-ENV-clash.patch | 22 -
mail-mta/exim/files/exim-4.76-crosscompile.patch | 15 -
mail-mta/exim/files/exim-4.76-dsn.patch | 18 -
.../exim/files/exim-4.77-as-needed-ldflags.patch | 144 --
.../exim/files/exim-4.77-makefile-freebsd.patch | 48 -
.../exim/files/exim-4.80-spool-mail-group.patch | 27 -
.../exim/files/exim-4.82-makefile-freebsd.patch | 45 -
mail-mta/exim/files/exim-submission.socket | 10 -
mail-mta/exim/files/exim-submission_at.service | 11 -
mail-mta/exim/files/exim.confd | 5 -
mail-mta/exim/files/exim.logrotate | 9 -
mail-mta/exim/files/exim.rc8 | 30 -
mail-mta/exim/files/exim.rc9 | 46 -
mail-mta/exim/files/exim.service | 12 -
mail-mta/exim/files/exim.socket | 10 -
mail-mta/exim/files/exim_482_dsn_1_3.patch | 1212 -----------
mail-mta/exim/files/exim_at.service | 7 -
mail-mta/exim/metadata.xml | 50 -
.../sane-backends/files/niash_array_index.patch | 140 --
.../sane-backends-1.0.24-automagic_systemd.patch | 40 -
.../sane-backends-1.0.24-kodakaio_avahi.patch | 84 -
...ne-backends-1.0.24-saned_pidfile_location.patch | 11 -
.../sane-backends-1.0.24-systemd_pkgconfig.patch | 37 -
.../files/sane-backends-1.0.24-u_char.patch | 11 -
.../files/sane-backends-1.0.24-unused-cups.patch | 42 -
media-gfx/sane-backends/files/saned | 10 -
media-gfx/sane-backends/files/saned.confd | 2 -
media-gfx/sane-backends/files/saned.initd | 12 -
media-gfx/sane-backends/metadata.xml | 8 -
.../sane-backends/sane-backends-1.0.24-r99.ebuild | 329 ---
media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild | 79 -
.../alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch | 27 -
.../alsa-lib/files/alsa-lib-1.0.27.1-musl.patch | 24 -
.../alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch | 40 -
.../files/alsa-lib-1.0.27.2-portable-mutex.patch | 35 -
media-libs/alsa-lib/metadata.xml | 14 -
| 20 -
.../libmpdclient/libmpdclient-2.9-r99.ebuild | 38 -
media-libs/libmpdclient/metadata.xml | 9 -
.../libv4l/files/libv4l-1.0.0-configure.patch | 27 -
media-libs/libv4l/files/libv4l-1.0.0-off_t.patch | 11 -
media-libs/libv4l/libv4l-1.0.0-r99.ebuild | 66 -
media-libs/libv4l/metadata.xml | 28 -
media-libs/mesa/files/eselect-mesa.conf.8.1 | 38 -
media-libs/mesa/files/eselect-mesa.conf.9.2 | 39 -
media-libs/mesa/files/glx_ro_text_segm.patch | 28 -
media-libs/mesa/files/mesa-10-pthread.patch | 24 -
.../mesa-10.2-dont-require-llvm-for-r300.patch | 11 -
.../mesa/files/mesa-10.3.7-dont-use-clrsb.patch | 36 -
media-libs/mesa/files/mesa-9.1.6-fpclassify.patch | 11 -
media-libs/mesa/mesa-10.3.7-r1.ebuild | 538 -----
media-libs/mesa/metadata.xml | 29 -
media-libs/netpbm/files/make-tarball.sh | 50 -
media-libs/netpbm/files/netpbm-10.31-build.patch | 50 -
.../netpbm/files/netpbm-10.51.00-getline.patch | 145 --
.../files/netpbm-10.51.00-pnmconvol-nooffset.patch | 83 -
.../files/netpbm-10.51.00-ppmtompeg-free.patch | 35 -
.../files/netpbm-10.51.00-underlinking.patch | 16 -
media-libs/netpbm/metadata.xml | 8 -
media-libs/netpbm/netpbm-10.51.00-r99.ebuild | 178 --
media-sound/mpg123/files/mpg123-largefile.patch | 10 -
media-sound/mpg123/metadata.xml | 15 -
media-sound/mpg123/mpg123-1.15.4-r99.ebuild | 88 -
media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild | 305 ---
media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild | 375 ----
.../ffmpeg/files/dirac_arith_hardened.patch | 36 -
.../ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch | 10 -
media-video/ffmpeg/files/ladspadl.patch | 25 -
media-video/ffmpeg/metadata.xml | 43 -
metadata/layout.conf | 1 -
net-dialup/ppp/ChangeLog | 1306 -----------
net-dialup/ppp/files/README.mpls | 15 -
net-dialup/ppp/files/modules.ppp | 10 -
net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch | 44 -
net-dialup/ppp/files/ppp-2.4.7-musl.patch | 179 --
net-dialup/ppp/metadata.xml | 30 -
net-dialup/ppp/ppp-2.4.7-r99.ebuild | 226 --
net-firewall/iptables/files/ip6tables-1.4.13.confd | 19 -
.../iptables/files/iptables-1.4.13-r1.init | 130 --
net-firewall/iptables/files/iptables-1.4.13.confd | 19 -
.../iptables/files/iptables-1.4.20-musl.patch | 304 ---
.../iptables/files/iptables-1.4.21-musl.patch | 136 --
.../files/systemd/ip6tables-restore.service | 14 -
.../iptables/files/systemd/ip6tables-store.service | 11 -
.../iptables/files/systemd/ip6tables.service | 6 -
.../files/systemd/iptables-restore.service | 14 -
.../iptables/files/systemd/iptables-store.service | 11 -
.../iptables/files/systemd/iptables.service | 6 -
net-firewall/iptables/iptables-1.4.20-r99.ebuild | 93 -
net-firewall/iptables/iptables-1.4.21-r99.ebuild | 94 -
net-firewall/iptables/metadata.xml | 23 -
net-fs/cifs-utils/cifs-utils-6.1-r99.ebuild | 111 -
.../files/cifs-utils-6.1-hardcoded-path.patch | 44 -
.../cifs-utils/files/cifs-utils-6.1-paths.h.patch | 10 -
net-fs/cifs-utils/metadata.xml | 16 -
net-libs/liblockfile/files/Makefile.Darwin.in | 80 -
.../files/liblockfile-1.06-respectflags.patch | 18 -
.../files/liblockfile-1.09-no-ldconfig.patch | 20 -
.../files/liblockfile-orphan-file.patch | 19 -
net-libs/liblockfile/liblockfile-1.09-r99.ebuild | 49 -
net-libs/liblockfile/metadata.xml | 5 -
| 12 -
.../files/libnfsidmap-0.19-getgrouplist.patch | 115 -
| 22 -
net-libs/libnfsidmap/libnfsidmap-0.24-r99.ebuild | 48 -
net-libs/libnfsidmap/metadata.xml | 5 -
...rpcbynumber-and-getrpcbyname-if-those-are.patch | 85 -
| 40 -
.../libtirpc/files/0003-fix_cdefs_h_include.patch | 618 ------
net-libs/libtirpc/files/0004-fix_DECLS.patch | 1226 -----------
.../libtirpc/files/0005-fix_remaining_issues.patch | 14 -
.../libtirpc/files/0006-fix_queue_h_include.patch | 44 -
net-libs/libtirpc/files/0007-no-des.patch | 29 -
.../libtirpc/files/libtirpc-0.2.5-stdarg.patch | 29 -
net-libs/libtirpc/libtirpc-0.2.5-r99.ebuild | 74 -
net-libs/libtirpc/metadata.xml | 5 -
net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper | 33 -
.../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 10 -
.../files/webkit-gtk-1.6.1-darwin-quartz.patch | 67 -
.../files/webkit-gtk-2.2.4-unittests-build.patch | 103 -
.../files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch | 95 -
.../files/webkit-gtk-2.2.5-hppa-platform.patch | 20 -
.../files/webkit-gtk-2.2.5-ia64-malloc.patch | 20 -
.../files/webkit-gtk-2.2.5-ia64-platform.patch | 12 -
.../files/webkit-gtk-2.2.5-sparc64-build.patch | 23 -
.../webkit-gtk-2.2.6-musl-remove-execinfo.patch | 37 -
.../files/webkit-gtk-2.4.1-ia64-malloc.patch | 20 -
.../webkit-gtk-2.4.1-musl-remove-execinfo.patch | 37 -
net-libs/webkit-gtk/metadata.xml | 13 -
net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild | 271 ---
net-libs/webkit-gtk/webkit-gtk-2.4.1-r99.ebuild | 274 ---
net-libs/webkit-gtk/webkit-gtk-2.4.3-r99.ebuild | 274 ---
net-misc/dhcp/dhcp-4.3.1-r99.ebuild | 256 ---
net-misc/dhcp/dhcp-4.3.2-r99.ebuild | 256 ---
net-misc/dhcp/files/dhcp-3.0-fix-perms.patch | 15 -
net-misc/dhcp/files/dhcp-3.0-paranoia.patch | 207 --
.../dhcp/files/dhcp-3.0.3-dhclient-no-down.patch | 70 -
.../dhcp/files/dhcp-3.1.3-dhclient-no-down.patch | 77 -
net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch | 216 --
.../dhcp/files/dhcp-4.2.0-errwarn-message.patch | 31 -
.../dhcp/files/dhcp-4.2.2-bind-build-flags.patch | 14 -
net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch | 13 -
.../files/dhcp-4.2.2-bind-parallel-build.patch | 14 -
.../files/dhcp-4.2.2-dhclient-resolvconf.patch | 409 ----
.../files/dhcp-4.2.2-dhclient-stdin-conf.patch | 113 -
net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch | 46 -
.../dhcp/files/dhcp-4.2.4-always-accept-4.patch | 29 -
net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch | 72 -
.../dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch | 19 -
net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch | 15 -
.../files/dhcp-4.3.1-dhclient-resolvconf.patch | 411 ----
.../dhcp-4.3.2-fix-compilation-for-musl.patch | 44 -
net-misc/dhcp/files/dhcpd.conf2 | 28 -
net-misc/dhcp/files/dhcpd.init5 | 115 -
net-misc/dhcp/files/dhcpd.tmpfiles | 2 -
net-misc/dhcp/files/dhcpd4.service | 11 -
net-misc/dhcp/files/dhcpd6.service | 11 -
net-misc/dhcp/files/dhcrelay.conf | 16 -
net-misc/dhcp/files/dhcrelay.init3 | 34 -
net-misc/dhcp/files/dhcrelay4.service | 10 -
net-misc/dhcp/files/dhcrelay4.service.conf | 3 -
net-misc/dhcp/files/dhcrelay6.conf | 8 -
net-misc/dhcp/files/dhcrelay6.service | 10 -
net-misc/dhcp/files/dhcrelay6.service.conf | 6 -
net-misc/dhcp/metadata.xml | 14 -
.../files/021109-uclibc-no-ether_ntohost.patch | 24 -
.../iputils/files/iputils-20100418-makefile.patch | 35 -
.../files/iputils-20100418-printf-size.patch | 62 -
.../iputils/files/iputils-20100418-so_mark.patch | 22 -
.../files/iputils-20101006-owl-pingsock.diff | 224 --
.../files/iputils-20121221-add-bits_types_h.patch | 94 -
.../files/iputils-20121221-crypto-build.patch | 35 -
| 18 -
.../files/iputils-20121221-fix-init-elemnt.patch | 23 -
| 89 -
.../iputils/files/iputils-20121221-makefile.patch | 61 -
.../iputils/files/iputils-20121221-openssl.patch | 92 -
.../files/iputils-20121221-owl-pingsock.diff | 224 --
.../files/iputils-20121221-printf-size.patch | 64 -
...ls-20121221-remove-rdisc-glibc-assumption.patch | 30 -
net-misc/iputils/iputils-20121221-r99.ebuild | 109 -
net-misc/iputils/metadata.xml | 11 -
.../openssh/files/openssh-4.7_p1-GSSAPI-dns.patch | 127 --
.../files/openssh-6.3_p1-x509-hpn14v2-glue.patch | 51 -
.../openssh/files/openssh-6.4_p1-x509-glue.patch | 30 -
.../openssh-6.4p1-fix-typo-construct_utmpx.patch | 21 -
.../files/openssh-6.4p1-missing-sys_param_h.patch | 67 -
.../openssh-6.7_p1-openssl-ignore-status.patch | 17 -
.../files/openssh-6.7_p1-sctp-x509-glue.patch | 42 -
.../openssh-6.7_p1-sshd-gssapi-multihomed.patch | 162 --
.../openssh/files/openssh-6.7_p1-x509-glue.patch | 46 -
.../openssh/files/openssh-6.7p1-avoid-exit.patch | 441 ----
net-misc/openssh/files/sshd.confd | 21 -
net-misc/openssh/files/sshd.pam_include.2 | 4 -
net-misc/openssh/files/sshd.rc6.4 | 87 -
net-misc/openssh/files/sshd.service | 11 -
net-misc/openssh/files/sshd.socket | 10 -
net-misc/openssh/files/sshd_at.service | 8 -
net-misc/openssh/metadata.xml | 34 -
net-misc/openssh/openssh-6.7_p1-r99.ebuild | 330 ---
.../openvpn/files/2.3.6-disable-compression.patch | 18 -
net-misc/openvpn/files/2.3.6-musl-compat.patch | 14 -
net-misc/openvpn/files/2.3.6-null-cipher.patch | 46 -
net-misc/openvpn/files/65openvpn | 1 -
net-misc/openvpn/files/down.sh | 33 -
net-misc/openvpn/files/openvpn-2.1.conf | 18 -
net-misc/openvpn/files/openvpn-2.1.init | 133 --
net-misc/openvpn/files/openvpn.init | 63 -
net-misc/openvpn/files/openvpn.service | 12 -
net-misc/openvpn/files/openvpn.tmpfile | 1 -
net-misc/openvpn/files/up.sh | 100 -
net-misc/openvpn/metadata.xml | 22 -
net-misc/openvpn/openvpn-2.3.6-r99.ebuild | 137 --
net-misc/openvpn/openvpn-9999.ebuild | 126 --
net-misc/radvd/files/radvd-1.9.1.init | 71 -
.../radvd/files/radvd-2.10-musl-libc-fix.patch | 87 -
net-misc/radvd/files/radvd.conf | 11 -
net-misc/radvd/files/radvd.service | 15 -
net-misc/radvd/files/radvd.tmpfilesd | 1 -
net-misc/radvd/metadata.xml | 12 -
net-misc/radvd/radvd-2.10-r99.ebuild | 72 -
net-misc/radvd/radvd-2.11-r99.ebuild | 73 -
.../newsbeuter/files/newsbeuter-2.8-musl.patch | 43 -
net-news/newsbeuter/metadata.xml | 12 -
net-news/newsbeuter/newsbeuter-2.8-r99.ebuild | 59 -
net-wireless/bluez/bluez-5.23-r99.ebuild | 205 --
...-obexd-without-systemd-in-the-user-sessio.patch | 58 -
...erial.c-use-posix_openpt-instead-of-getpt.patch | 37 -
...-GLib-helper-function-to-manipulate-paths.patch | 38 -
...01-tools-Fix-compilation-errors-with-musl.patch | 189 --
...-Logitech-diNovo-Edge-keyboard-firmware-i.patch | 29 -
.../0002-autopair-Don-t-handle-the-iCade.patch | 47 -
.../0004-agent-Assert-possible-infinite-loop.patch | 25 -
net-wireless/bluez/files/bluetooth-init.d-r3 | 21 -
.../bluez/files/bluez-5.23-use-posix_openpt.patch | 20 -
net-wireless/bluez/files/bluez-plugdev.patch | 14 -
net-wireless/bluez/files/rfcomm-init.d-r2 | 35 -
net-wireless/bluez/metadata.xml | 21 -
net-wireless/crda/crda-1.1.2-r3.ebuild | 49 -
.../crda/files/crda-1.1.2-missing-include.patch | 10 -
net-wireless/crda/files/libnl31-support.diff | 60 -
net-wireless/crda/metadata.xml | 16 -
profiles/repo_name | 1 -
sys-apps/attr/attr-2.4.46-r99.ebuild | 55 -
sys-apps/attr/attr-2.4.47-r99.ebuild | 70 -
sys-apps/attr/files/attr-2.4.44-gettext.patch | 63 -
sys-apps/attr/files/attr-2.4.46-config-shell.patch | 53 -
.../attr/files/attr-2.4.46-generic-syscalls.patch | 180 --
.../attr/files/attr-2.4.46-ifdef_cplusplus.patch | 24 -
sys-apps/attr/metadata.xml | 5 -
sys-apps/busybox/busybox-1.21.0-r99.ebuild | 304 ---
sys-apps/busybox/busybox-1.22.1-r99.ebuild | 304 ---
sys-apps/busybox/busybox-1.23.0-r99.ebuild | 305 ---
sys-apps/busybox/busybox-1.23.1-r99.ebuild | 308 ---
sys-apps/busybox/busybox-1.23.2-r99.ebuild | 308 ---
sys-apps/busybox/files/busybox-1.19.0-bb.patch | 22 -
.../busybox/files/busybox-1.21.0-ifconfig.patch | 11 -
sys-apps/busybox/files/busybox-1.21.0-iplink.patch | 12 -
sys-apps/busybox/files/busybox-1.21.0-mdev.patch | 35 -
.../busybox/files/busybox-1.21.0-platform.patch | 24 -
sys-apps/busybox/files/busybox-1.21.0-xz.patch | 84 -
sys-apps/busybox/files/busybox-1.22.1-ash.patch | 11 -
sys-apps/busybox/files/busybox-1.22.1-date.patch | 30 -
sys-apps/busybox/files/busybox-1.22.1-iplink.patch | 19 -
sys-apps/busybox/files/ginit.c | 124 --
sys-apps/busybox/files/klogd.confd | 9 -
sys-apps/busybox/files/klogd.initd | 12 -
sys-apps/busybox/files/mdev-start.sh | 125 --
sys-apps/busybox/files/mdev.initd | 53 -
sys-apps/busybox/files/mdev.rc | 9 -
sys-apps/busybox/files/mdev.rc.1 | 98 -
sys-apps/busybox/files/mdev/dvbdev | 18 -
sys-apps/busybox/files/mdev/ide_links | 23 -
sys-apps/busybox/files/mdev/usbdev | 62 -
sys-apps/busybox/files/mdev/usbdisk_link | 34 -
sys-apps/busybox/files/ntpd.confd | 6 -
sys-apps/busybox/files/ntpd.initd | 13 -
sys-apps/busybox/files/syslogd.confd | 9 -
sys-apps/busybox/files/syslogd.initd | 13 -
sys-apps/busybox/files/watchdog.confd | 9 -
sys-apps/busybox/files/watchdog.initd | 8 -
sys-apps/busybox/metadata.xml | 13 -
.../files/findutils-4.4.2-gnulib-date-x32.patch | 26 -
.../files/findutils-4.4.2-gnulib-musl.patch | 18 -
.../findutils/files/findutils-4.4.2-selinux.diff | 464 ----
.../files/findutils-4.5.12-gnulib-musl.patch | 132 --
sys-apps/findutils/findutils-4.4.2-r99.ebuild | 55 -
sys-apps/findutils/findutils-4.5.12-r99.ebuild | 51 -
sys-apps/findutils/metadata.xml | 8 -
sys-apps/hdparm/files/hdparm-9.39-musl.patch | 50 -
sys-apps/hdparm/files/hdparm-9.45-musl.patch | 35 -
sys-apps/hdparm/files/hdparm-conf.d.3 | 26 -
sys-apps/hdparm/files/hdparm-init-8 | 61 -
sys-apps/hdparm/hdparm-9.39-r99.ebuild | 42 -
sys-apps/hdparm/hdparm-9.45-r99.ebuild | 42 -
sys-apps/hdparm/metadata.xml | 5 -
sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch | 48 -
.../iproute2/files/iproute2-3.1.0-no-ipv6.patch | 41 -
.../iproute2/files/iproute2-3.10.0-no-ipv6.patch | 41 -
sys-apps/iproute2/files/iproute2-3.19.0-musl.patch | 22 -
| 81 -
.../files/iproute2-3.8.0-old-mount-libc.patch | 38 -
.../files/iproute2-4.0.0-fix-build-with-musl.patch | 24 -
.../iproute2-4.0.0-tc-show-buffer-overflow.patch | 62 -
sys-apps/iproute2/iproute2-3.19.0-r99.ebuild | 126 --
sys-apps/iproute2/iproute2-3.8.0-r99.ebuild | 118 -
sys-apps/iproute2/iproute2-4.0.0-r99.ebuild | 126 --
sys-apps/iproute2/metadata.xml | 9 -
.../kbd-1.15.5-fix-struct_winsize-collision.patch | 11 -
sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch | 90 -
| 115 -
sys-apps/kbd/files/kbd-2.0.0-tests.patch | 31 -
| 147 --
sys-apps/kbd/kbd-1.15.5-r99.ebuild | 52 -
sys-apps/kbd/kbd-2.0.2-r99.ebuild | 64 -
sys-apps/kbd/metadata.xml | 5 -
.../files/keyutils-1.5.5-makefile-fixup.patch | 27 -
.../keyutils/files/keyutils-1.5.9-UINT_MAX.patch | 12 -
sys-apps/keyutils/keyutils-1.5.9-r99.ebuild | 83 -
sys-apps/keyutils/metadata.xml | 8 -
sys-apps/kmod/files/kmod-19-strndupa.patch | 23 -
sys-apps/kmod/files/kmod-static-nodes-r1 | 19 -
sys-apps/kmod/kmod-19-r99.ebuild | 192 --
sys-apps/kmod/metadata.xml | 11 -
sys-apps/ldconfig/files/ldconfig-0.1 | 141 --
sys-apps/ldconfig/ldconfig-0.1.ebuild | 34 -
sys-apps/ldconfig/metadata.xml | 8 -
| 93 -
sys-apps/net-tools/metadata.xml | 8 -
.../net-tools-1.60_p20120127084908-r99.ebuild | 99 -
.../net-tools-1.60_p20130513023548-r99.ebuild | 97 -
.../net-tools-1.60_p20141019041918-r99.ebuild | 97 -
sys-apps/pciutils/files/conf.d-pciparm | 28 -
sys-apps/pciutils/files/init.d-pciparm | 80 -
.../pciutils/files/pciutils-3.1.9-static-pc.patch | 13 -
sys-apps/pciutils/files/pciutils-3.2.0-io.patch | 14 -
sys-apps/pciutils/metadata.xml | 9 -
sys-apps/pciutils/pciutils-3.2.0.ebuild | 85 -
sys-apps/sandbox/files/09sandbox | 1 -
.../files/sandbox-2.6-check-empty-paths-at.patch | 201 --
sys-apps/sandbox/files/sandbox-2.6-desktop.patch | 30 -
.../sandbox-2.6-include-PROTECTED-symbols.patch | 12 -
sys-apps/sandbox/files/sandbox-2.6-log-var.patch | 51 -
sys-apps/sandbox/files/sandbox-2.6-musl.patch | 48 -
sys-apps/sandbox/files/sandbox-2.6-no-pch.patch | 29 -
.../sandbox/files/sandbox-2.6-open-nofollow.patch | 54 -
.../files/sandbox-2.6-static-close-fd.patch | 93 -
.../sandbox/files/sandbox-2.6-trace-hppa.patch | 27 -
sys-apps/sandbox/metadata.xml | 11 -
sys-apps/sandbox/sandbox-2.6-r999.ebuild | 138 --
sys-apps/shadow/files/default/useradd | 7 -
sys-apps/shadow/files/login.defs | 212 --
sys-apps/shadow/files/login.pamd.3 | 6 -
sys-apps/shadow/files/login_defs.awk | 32 -
sys-apps/shadow/files/login_defs_pam.sed | 24 -
sys-apps/shadow/files/pam.d-include/login | 12 -
sys-apps/shadow/files/pam.d-include/other | 9 -
sys-apps/shadow/files/pam.d-include/passwd | 8 -
sys-apps/shadow/files/pam.d-include/shadow | 8 -
sys-apps/shadow/files/pam.d-include/su | 32 -
sys-apps/shadow/files/pam.d-include/su-openpam | 14 -
sys-apps/shadow/files/pam.d-include/system-auth | 14 -
.../shadow/files/pam.d-include/system-auth-1.1 | 14 -
sys-apps/shadow/files/securetty | 33 -
.../files/shadow-4.1.3-dots-in-usernames.patch | 10 -
.../shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch | 12 -
...adow-4.1.5.1-fix-struct_in_addr-collision.patch | 12 -
.../files/shadow-4.1.5.1-include-sys-socket.patch | 13 -
sys-apps/shadow/metadata.xml | 12 -
sys-apps/shadow/shadow-4.1.5.1-r99.ebuild | 198 --
sys-apps/sysvinit/files/inittab-2.87 | 58 -
sys-apps/sysvinit/files/reboot.sh | 11 -
sys-apps/sysvinit/files/shutdown.sh | 13 -
sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch | 142 --
.../files/sysvinit-2.86-shutdown-single.patch | 36 -
.../sysvinit/files/sysvinit-2.88-makefile.patch | 60 -
sys-apps/sysvinit/files/sysvinit-2.88-musl.patch | 10 -
.../sysvinit/files/sysvinit-2.88-selinux.patch | 38 -
.../sysvinit/files/sysvinit-2.88-shutdown-h.patch | 65 -
sys-apps/sysvinit/metadata.xml | 5 -
sys-apps/sysvinit/sysvinit-2.88-r999.ebuild | 113 -
sys-apps/tcp-wrappers/files/hosts.allow.example | 17 -
| 295 ---
.../files/tcp-wrappers-7.6-redhat-bug11881.patch | 35 -
.../files/tcp-wrappers-7.6-remove-DECLS.patch | 19 -
.../files/tcp-wrappers-7.6.22-remove-DECLS.patch | 22 -
sys-apps/tcp-wrappers/metadata.xml | 11 -
sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild | 77 -
.../tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild | 99 -
sys-apps/util-linux/files/crypto-loop.confd | 9 -
sys-apps/util-linux/files/crypto-loop.initd | 70 -
sys-apps/util-linux/files/ttydefaults.h | 38 -
.../util-linux/files/util-linux-2.23.1-musl.patch | 110 -
.../files/util-linux-2.24-last-tests.patch | 86 -
.../files/util-linux-2.24-skip-last-tests.patch | 41 -
.../util-linux/files/util-linux-2.24.1-musl.patch | 30 -
.../files/util-linux-2.24.2-hexdump.patch | 40 -
.../files/util-linux-2.25-lscpu-pic.patch | 81 -
.../files/util-linux-2.25-remove__SWORD_TYPE.patch | 14 -
...util-linux-2.25.2-runuser-bash-completion.patch | 33 -
sys-apps/util-linux/metadata.xml | 19 -
sys-apps/util-linux/util-linux-2.24.1-r99.ebuild | 147 --
sys-apps/util-linux/util-linux-2.25-r99.ebuild | 176 --
sys-apps/util-linux/util-linux-2.25.2-r99.ebuild | 175 --
.../polkit-make-netgroup-support-optional.patch | 86 -
sys-auth/polkit/metadata.xml | 11 -
sys-auth/polkit/polkit-0.112-r99.ebuild | 123 --
sys-block/parted/files/parted-3.2-devmapper.patch | 60 -
.../parted/files/parted-3.2-fix-includes.patch | 10 -
.../parted/files/parted-3.2-po4a-mandir.patch | 11 -
sys-block/parted/metadata.xml | 17 -
sys-block/parted/parted-3.2-r99.ebuild | 57 -
sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild | 37 -
| 17 -
sys-boot/efibootmgr/metadata.xml | 20 -
sys-devel/gcc/files/awk/fixlafiles.awk | 314 ---
sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la | 335 ---
sys-devel/gcc/files/c89 | 20 -
sys-devel/gcc/files/c99 | 21 -
sys-devel/gcc/files/fix_libtool_files.sh | 68 -
.../gcc/files/gcc-4.7.3-musl-linker-path.patch | 61 -
.../files/gcc-4.7.3-powerpc-libc-stack-end.patch | 171 --
sys-devel/gcc/files/gcc-4.7.4-secure-plt.patch | 51 -
.../gcc-4.8.3-musl-fix-libc5-assumption.patch | 11 -
.../gcc/files/gcc-4.8.3-musl-linker-path.patch | 70 -
sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch | 12 -
sys-devel/gcc/files/gcc-4.8.3-secure-plt.patch | 43 -
sys-devel/gcc/files/gcc-configure-LANG.patch | 64 -
sys-devel/gcc/files/gcc-configure-texinfo.patch | 16 -
sys-devel/gcc/files/gcc-spec-env-r1.patch | 87 -
sys-devel/gcc/files/gcc-spec-env.patch | 42 -
sys-devel/gcc/files/mkinfodir | 233 --
sys-devel/gcc/gcc-4.7.4-r99.ebuild | 63 -
sys-devel/gcc/gcc-4.8.4-r99.ebuild | 64 -
sys-devel/gcc/metadata.xml | 27 -
sys-devel/gdb/files/gdb-7.4-linux-nat.patch | 32 -
.../gdb/files/gdb-7.5.1-amd64-linux-nat.patch | 11 -
.../gdb/files/gdb-7.6-linux-low-threaddb.patch | 34 -
sys-devel/gdb/gdb-7.7.1-r99.ebuild | 213 --
sys-devel/gdb/metadata.xml | 11 -
.../clang-3.4-darwin_prefix-include-paths.patch | 18 -
.../llvm/files/clang-3.5-gentoo-install.patch | 57 -
...clang-3.5-gentoo-runtime-gcc-detection-v3.patch | 42 -
sys-devel/llvm/files/llvm-3.2-nodoctargz.patch | 45 -
sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch | 43 -
sys-devel/llvm/files/llvm-3.5-gentoo-install.patch | 83 -
.../llvm/files/llvm-3.5-musl-clang-support.patch | 59 -
.../llvm/files/llvm-3.5-musl-compiler-rt.patch | 58 -
sys-devel/llvm/files/llvm-3.5-musl-fixes.patch | 77 -
sys-devel/llvm/files/llvm-3.5-musl-support.patch | 67 -
.../files/llvm-3.5.0-fix_LLVMExports_cmake.patch | 39 -
sys-devel/llvm/llvm-3.5.0-r99.ebuild | 531 -----
sys-devel/llvm/metadata.xml | 28 -
.../m4/files/m4-1.4.16-fix-test-readlink.patch | 11 -
sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch | 18 -
sys-devel/m4/files/m4-1.4.16-no-gets.patch | 24 -
sys-devel/m4/m4-1.4.16-r99.ebuild | 53 -
sys-devel/m4/metadata.xml | 5 -
sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild | 29 -
...tools-3.0.27-Fix-format-string-in-check.c.patch | 25 -
.../dosfstools-3.0.28-fix_build_with_musl.patch | 25 -
sys-fs/dosfstools/metadata.xml | 5 -
sys-fs/encfs/encfs-1.7.4-r99.ebuild | 44 -
sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch | 10 -
sys-fs/encfs/files/encfs-1.7.4-r68:69.patch | 31 -
sys-fs/encfs/metadata.xml | 11 -
sys-fs/fuse/files/fuse-2.9.3-includes.patch | 66 -
sys-fs/fuse/files/fuse-fbsd.init | 23 -
sys-fs/fuse/files/fuse.init | 35 -
sys-fs/fuse/fuse-2.9.3-r99.ebuild | 88 -
sys-fs/fuse/metadata.xml | 8 -
sys-fs/lvm2/files/clvmd.confd-2.02.39 | 9 -
sys-fs/lvm2/files/clvmd.rc-2.02.39 | 146 --
sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 | 1 -
sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 | 147 --
sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 | 111 -
sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 | 26 -
sys-fs/lvm2/files/dmtab | 12 -
sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 | 39 -
sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 | 46 -
sys-fs/lvm2/files/lvm.confd-2.02.28-r2 | 5 -
sys-fs/lvm2/files/lvm.rc-2.02.105-r2 | 97 -
sys-fs/lvm2/files/lvm.rc-2.02.95-r2 | 96 -
.../lvm2-2.02.100-selinux_and_udev_static.patch | 93 -
.../files/lvm2-2.02.106-pthread-pkgconfig.patch | 32 -
.../lvm2-2.02.107-static-pkgconfig-libs.patch | 104 -
.../lvm2/files/lvm2-2.02.108-example.conf.in.patch | 50 -
.../lvm2-2.02.108-static-pkgconfig-libs.patch | 104 -
.../files/lvm2-2.02.56-lvm2create_initrd.patch | 72 -
.../lvm2-2.02.63-always-make-static-libdm.patch | 42 -
sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch | 18 -
sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch | 15 -
.../lvm2-2.02.92-dynamic-static-ldflags.patch | 63 -
.../lvm2/files/lvm2-2.02.99-example.conf.in.patch | 47 -
sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch | 11 -
sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch | 111 -
sys-fs/lvm2/files/lvm2-musl-fixes.patch | 33 -
sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 | 13 -
sys-fs/lvm2/lvm2-2.02.110-r99.ebuild | 275 ---
sys-fs/lvm2/metadata.xml | 24 -
.../squashfs-tools-4.2-missing-includes.patch | 10 -
sys-fs/squashfs-tools/metadata.xml | 8 -
.../squashfs-tools/squashfs-tools-4.2-r99.ebuild | 59 -
.../squashfs-tools/squashfs-tools-4.3-r99.ebuild | 61 -
.../xfsdump/files/xfsdump-3.0.4-no-symlink.patch | 22 -
.../files/xfsdump-3.0.5-prompt-overflow.patch | 14 -
.../xfsdump/files/xfsdump-3.1.4-compat-musl.patch | 36 -
sys-fs/xfsdump/metadata.xml | 5 -
sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild | 45 -
sys-fs/xfsprogs/ChangeLog | 783 -------
.../files/xfsprogs-3.2.2-add-limits-h.patch | 10 -
.../files/xfsprogs-3.2.2-musl-compat.patch | 154 --
.../xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch | 108 -
sys-fs/xfsprogs/metadata.xml | 5 -
sys-fs/xfsprogs/xfsprogs-3.2.2-r99.ebuild | 100 -
...ecific-inclusion-of-sysinfo.h-in-kernel.h.patch | 12 -
...mpat.h-fix-some-issues-arising-from-in6.h.patch | 61 -
...t.h-prevent-redefinition-of-struct-ethhdr.patch | 39 -
| 57 -
| 8 -
sys-libs/efivar/efivar-0.15-r99.ebuild | 27 -
.../efivar/files/efivar-0.15-portability.patch | 29 -
sys-libs/efivar/metadata.xml | 14 -
sys-libs/gdbm/gdbm-1.11-r99.ebuild | 70 -
sys-libs/gdbm/metadata.xml | 9 -
.../libcap-ng-0.7.3-add-missing-unistd_h.patch | 11 -
sys-libs/libcap-ng/libcap-ng-0.7.3-r99.ebuild | 117 -
sys-libs/libcap-ng/libcap-ng-0.7.4-r99.ebuild | 93 -
sys-libs/libcap-ng/metadata.xml | 10 -
.../libutempter-remove-glibc-assumption.patch | 81 -
sys-libs/libutempter/libutempter-1.1.6-r99.ebuild | 72 -
sys-libs/libutempter/metadata.xml | 6 -
sys-libs/pam/files/pam-1.1.8-doc-install.patch | 142 --
sys-libs/pam/files/pam-1.1.8-fix-compat.patch | 21 -
sys-libs/pam/files/pam-1.1.8-innetgr.patch | 54 -
sys-libs/pam/metadata.xml | 32 -
sys-libs/pam/pam-1.1.8-r99.ebuild | 205 --
.../readline/files/readline-5.0-no_rpath.patch | 13 -
.../readline-5.2-no-ignore-shlib-errors.patch | 24 -
.../readline/files/readline-6.2-rlfe-tgoto.patch | 14 -
sys-libs/readline/metadata.xml | 5 -
sys-libs/readline/readline-6.2_p4-r99.ebuild | 110 -
sys-libs/readline/readline-6.2_p5-r99.ebuild | 154 --
.../files/talloc-remove-check-bsd-strtoll.patch | 24 -
sys-libs/talloc/metadata.xml | 12 -
sys-libs/talloc/talloc-2.0.8-r99.ebuild | 67 -
sys-libs/talloc/talloc-2.1.0-r99.ebuild | 67 -
.../tdb/files/tdb-remove-check-bsd-strtoll.patch | 25 -
sys-libs/tdb/metadata.xml | 9 -
sys-libs/tdb/tdb-1.2.11-r99.ebuild | 46 -
sys-libs/tdb/tdb-1.2.12-r99.ebuild | 44 -
sys-libs/tevent/files/add-py-file-0.9.14.patch | 32 -
sys-libs/tevent/files/add-py-file.patch | 32 -
.../files/tevent-remove-check-bsd-strtoll.patch | 24 -
sys-libs/tevent/files/tevent-version.patch | 27 -
sys-libs/tevent/metadata.xml | 9 -
sys-libs/tevent/tevent-0.9.19-r99.ebuild | 44 -
sys-libs/tevent/tevent-0.9.20-r99.ebuild | 44 -
sys-libs/tevent/tevent-0.9.21-r99.ebuild | 44 -
sys-process/cronie/cronie-1.4.12-r99.ebuild | 87 -
.../files/0001-add_limits_h_and_MAXNAMLEN.patch | 15 -
sys-process/cronie/files/cronie-1.2-cron.deny | 5 -
sys-process/cronie/files/cronie-1.3-crontab | 16 -
sys-process/cronie/files/cronie-1.3-initd | 14 -
sys-process/cronie/files/cronie-1.4.3-pamd | 9 -
sys-process/cronie/metadata.xml | 20 -
sys-process/lsof/files/lsof-4.85-arg.c.patch | 30 -
sys-process/lsof/files/lsof-4.85-cross.patch | 33 -
.../lsof-4.85-fix-missing-netinet_tcp_h.patch | 11 -
.../lsof/files/lsof-4.87-remove-glibc-check.patch | 15 -
sys-process/lsof/lsof-4.85-r99.ebuild | 81 -
sys-process/lsof/lsof-4.87-r99.ebuild | 98 -
sys-process/lsof/metadata.xml | 8 -
.../procps/files/procps-3.3.6-error_at_line.patch | 12 -
.../procps/files/procps-3.3.8-kill-neg-pid.patch | 46 -
.../procps/files/procps-3.3.8-no-GLOB_TILDE.patch | 12 -
.../procps/files/procps-3.3.8-no-error_h.patch | 54 -
.../procps/files/procps-3.3.9-configure.patch | 13 -
.../procps/files/procps-3.3.9-no-error_h.patch | 64 -
sys-process/procps/metadata.xml | 8 -
sys-process/procps/procps-3.3.10-r99.ebuild | 63 -
sys-process/procps/procps-3.3.8-r99.ebuild | 56 -
sys-process/procps/procps-3.3.9-r99.ebuild | 56 -
.../psmisc/files/psmisc-22.21-add-limits_h.patch | 11 -
sys-process/psmisc/metadata.xml | 5 -
sys-process/psmisc/psmisc-22.21-r99.ebuild | 56 -
www-client/firefox/files/1130164.patch | 68 -
www-client/firefox/files/1130175.patch | 33 -
www-client/firefox/files/1130710.patch | 57 -
www-client/firefox/files/basename.patch | 25 -
www-client/firefox/files/crashreporter.patch | 358 ----
.../files/firefox-35.0-gmp-clearkey-sprintf.patch | 10 -
www-client/firefox/files/fts.patch | 480 -----
www-client/firefox/files/gentoo-default-prefs.js-1 | 17 -
www-client/firefox/files/icon/firefox.desktop | 9 -
.../firefox/files/libstagefright-cdefs.patch | 21 -
www-client/firefox/files/profiler-gettid.patch | 51 -
www-client/firefox/files/sandbox-cdefs.patch | 21 -
www-client/firefox/files/sctp-36.patch | 52 -
www-client/firefox/files/sctp.patch | 58 -
www-client/firefox/files/sipcc.patch | 159 --
www-client/firefox/files/updater.patch | 42 -
www-client/firefox/files/xpcom-blocksize.patch | 22 -
www-client/firefox/firefox-37.0.1-r99.ebuild | 421 ----
www-client/firefox/metadata.xml | 26 -
.../0001-remove_rresvport_usage_on_musl.patch | 20 -
.../htdig/files/htdig-3.2.0_beta6-as-needed.patch | 61 -
www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch | 15 -
.../htdig/files/htdig-3.2.0_beta6-quoting.patch | 26 -
www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild | 68 -
www-misc/htdig/metadata.xml | 5 -
.../files/sessreg-1.0.8-missing_path_wtmpx.patch | 12 -
x11-apps/sessreg/metadata.xml | 5 -
x11-apps/sessreg/sessreg-1.0.8-r99.ebuild | 19 -
x11-base/xorg-server/files/xdm-setup.initd-1 | 14 -
x11-base/xorg-server/files/xdm.confd-4 | 10 -
x11-base/xorg-server/files/xdm.initd-10 | 226 --
x11-base/xorg-server/files/xdm.initd-11 | 231 --
.../files/xorg-server-1.12-cve-2013-4396.patch | 75 -
.../files/xorg-server-1.12-disable-acpi.patch | 11 -
.../files/xorg-server-1.12-ia64-fix_inx_outx.patch | 60 -
.../files/xorg-server-1.12-unloadsubmodule.patch | 53 -
.../files/xorg-server-1.14.3-musl.patch | 31 -
.../files/xorg-server-disable-acpi.patch | 31 -
x11-base/xorg-server/files/xorg-sets.conf | 6 -
x11-base/xorg-server/metadata.xml | 17 -
x11-base/xorg-server/xorg-server-1.14.3-r99.ebuild | 251 ---
x11-base/xorg-server/xorg-server-1.15.0-r99.ebuild | 254 ---
x11-base/xorg-server/xorg-server-1.15.2-r99.ebuild | 257 ---
x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild | 259 ---
.../files/libpciaccess-0.13.2-arm.patch | 11 -
.../files/libpciaccess-0.13.2-limits.patch | 10 -
.../libpciaccess/libpciaccess-0.13.2-r99.ebuild | 44 -
.../libpciaccess/libpciaccess-0.13.3-r99.ebuild | 40 -
x11-libs/libpciaccess/metadata.xml | 5 -
x11-misc/slim/files/Xsession-r3 | 158 --
x11-misc/slim/files/slim-1.3.5-arm.patch | 11 -
.../files/slim-1.3.5-disable-ck-for-systemd.patch | 122 --
.../files/slim-1.3.6-add-missing-libgen_h.patch | 11 -
x11-misc/slim/files/slim-1.3.6-config.diff | 77 -
x11-misc/slim/files/slim-1.3.6-drop-zlib.patch | 10 -
.../files/slim-1.3.6-fix-slimlock-nopam-v2.patch | 26 -
x11-misc/slim/files/slim-1.3.6-honour-cflags.patch | 14 -
.../files/slim-1.3.6-libslim-cmake-fixes.patch | 33 -
.../slim/files/slim-1.3.6-session-chooser.patch | 115 -
.../slim-1.3.6-strip-systemd-unit-install.patch | 13 -
.../slim/files/slim-1.3.6-systemd-session.patch | 29 -
x11-misc/slim/files/slim.logrotate | 9 -
x11-misc/slim/metadata.xml | 12 -
x11-misc/slim/slim-1.3.6-r99.ebuild | 123 --
850 files changed, 62410 deletions(-)
diff --git a/app-crypt/shash/files/0.2.6-manpage-fixes.patch b/app-crypt/shash/files/0.2.6-manpage-fixes.patch
deleted file mode 100644
index 0376e15..0000000
--- a/app-crypt/shash/files/0.2.6-manpage-fixes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -pruN shash-0.2.6/doc/shash.1 shash-0.2.6-r1/doc/shash.1
---- shash-0.2.6/doc/shash.1 2004-09-18 09:51:04.004647112 +0100
-+++ shash-0.2.6-r1/doc/shash.1 2004-09-18 09:57:26.062565480 +0100
-@@ -31,7 +31,7 @@ Because of this shash also supports HMAC
- a mechanism for message authentication using cryptographic hash functions.
- So shash can use a key with a hash algorithm to produce hashes that can only
- be verified with the key. This way you can securely check (i.e. you are sure
--that nobody can modify the mac, without beeing detected)
-+that nobody can modify the mac, without being detected)
- if files in a filesystem were altered.
-
- If the list of files and digests, that shash produces, is stored as
-@@ -72,7 +72,7 @@ Suppress some not critical warnings.
- .TP
- .B \-b
- Use binary mode. In unix environment, only difference between this and
--the normal mode is an asterix preceding the filename in the output.
-+the normal mode is an asterisk preceding the filename in the output.
- .TP
- .B \-c
- Check the checksum of all files listed in
-@@ -94,7 +94,7 @@ Enter the keyword via the command line.
- keyword instead of prompting for it. Keep in mind that someone
- may see the command you are executing and so your key.
- .TP
--.B \-c --config FILE
-+.B \-i --config FILE
- Use the specified configuration file. The default is .shashrc
- in your home directory. The format of the configuration
- file is the same as the parameters. An example file is:
diff --git a/app-crypt/shash/files/shash-0.2.6-binary-files.patch b/app-crypt/shash/files/shash-0.2.6-binary-files.patch
deleted file mode 100644
index 1eb0cba..0000000
--- a/app-crypt/shash/files/shash-0.2.6-binary-files.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- shash-0.2.6/src/shash.c
-+++ shash-0.2.6/src/shash.c
-@@ -631,11 +631,11 @@
-
- if (nosalt == FALSE && hmac == 1) {
- if (sscanf
-- (linebuf, "%s %s %s\n", hexbuffer, buffer,
-- buffer2) < 2) {
-+ (linebuf, "%s %s *%s\n", hexbuffer, buffer,
-+ buffer2) != 3) {
- if (sscanf
-- (linebuf, "%s %s *%s\n", hexbuffer,
-- buffer, buffer2) < 2)
-+ (linebuf, "%s %s %s\n", hexbuffer,
-+ buffer, buffer2) != 3)
- continue;
- }
-
-@@ -648,11 +648,11 @@
- key = pass2key(algorithm, keymode_buffer, &keylen, password, plen);
-
- } else {
-- if (sscanf(linebuf, "%s %s\n", buffer, buffer2) ==
-- 0) {
-+ if (sscanf(linebuf, "%s *%s\n", buffer, buffer2) !=
-+ 2) {
- if (sscanf
-- (linebuf, "%s *%s\n", buffer,
-- buffer2) == 0)
-+ (linebuf, "%s %s\n", buffer,
-+ buffer2) != 2)
- continue;
- }
-
diff --git a/app-crypt/shash/files/shash-0.2.6-missing-includes.patch b/app-crypt/shash/files/shash-0.2.6-missing-includes.patch
deleted file mode 100644
index 1d57934..0000000
--- a/app-crypt/shash/files/shash-0.2.6-missing-includes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/shash-0.2.6/src/errors.c
-+++ b/shash-0.2.6/src/errors.c
-@@ -1,4 +1,5 @@
- #include <defines.h>
-+#include <stdio.h>
-
- extern int quiet;
-
---- a/shash-0.2.6/src/random.c
-+++ b/shash-0.2.6/src/random.c
-@@ -18,6 +18,8 @@
- #define DEFINES_H
- #include <defines.h>
- #endif
-+#include <stdlib.h>
-+#include <stdio.h>
-
- #ifdef HAVE_DEV_RANDOM
-
---- a/shash-0.2.6/src/extra.c
-+++ b/shash-0.2.6/src/extra.c
-@@ -1,4 +1,5 @@
- #include <defines.h>
-+#include <strings.h>
-
- #ifdef HAVE_STAT
-
diff --git a/app-crypt/shash/files/shash.bash-completion b/app-crypt/shash/files/shash.bash-completion
deleted file mode 100644
index d57701f..0000000
--- a/app-crypt/shash/files/shash.bash-completion
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/files/shash.bash-completion,v 1.2 2006/10/13 15:00:13 swegener Exp $
-#
-# shash(1) completion.
-
-have shash &&
-_shash() {
- local cur prev
-
- COMPREPLY=()
- cur=${COMP_WORDS[COMP_CWORD]}
- prev=${COMP_WORDS[COMP_CWORD-1]}
-
- case "${prev}" in
- -c|--config)
- _filedir
- return 0 ;;
- -o|--keymode)
- COMPREPLY=( $( compgen -W "$( shash --listkeygen | tail -n +2 )" \
- -- ${cur} ) )
- return ;;
- -a|--algorithm)
- COMPREPLY=( $( compgen -W "$( shash --list )" \
- -- ${cur} ) )
- return ;;
- *)
- ;;
- esac
-
- COMPREPLY=( $( compgen -W '-V -q -m -d -c -b -t -o -i -a -l -k -h -v \
- -L \
- --verbose --quiet --nosalt --time --hmac --doublecheck \
- --check --binary --text --keymode --config --algorithm \
- --list --key --listkeygen --help --version --license' \
- -- ${cur} ) )
- _filedir
- return 0
-} &&
-complete -F _shash ${filenames} shash
diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml
deleted file mode 100644
index c6d4395..0000000
--- a/app-crypt/shash/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>swegener@gentoo.org</email>
- <name>Sven Wegener</name>
- <description>primary maintainer</description>
- </maintainer>
- <longdescription>shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files.</longdescription>
-</pkgmetadata>
diff --git a/app-crypt/shash/shash-0.2.6-r99.ebuild b/app-crypt/shash/shash-0.2.6-r99.ebuild
deleted file mode 100644
index 97cd443..0000000
--- a/app-crypt/shash/shash-0.2.6-r99.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6-r1.ebuild,v 1.25 2014/01/18 05:39:58 vapier Exp $
-
-inherit bash-completion eutils
-
-DESCRIPTION="Generate or check digests or MACs of files"
-HOMEPAGE="http://mcrypt.hellug.gr/shash/"
-SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="static"
-
-DEPEND=">=app-crypt/mhash-0.8.18-r1"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PV}-manpage-fixes.patch
- epatch "${FILESDIR}"/${P}-binary-files.patch
- epatch "${FILESDIR}"/${P}-missing-includes.patch
-}
-
-src_compile() {
- econf $(use_enable static static-link) || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "install failed"
- dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
- dobashcompletion "${FILESDIR}"/shash.bash-completion ${PN}
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild
deleted file mode 100644
index e67f48f..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r99.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild,v 1.3 2014/12/29 11:28:11 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
- EGIT_BRANCH="master"
- EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
- S="${EGIT_CHECKOUT_DIR}"
-else
- SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
- mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86"
- # FULL_VERSION keeps the full version number, which is needed in
- # order to determine some path information correctly for copy/move
- # operations later on
- FULL_VERSION="${PV%%_*}"
- #S="${WORKDIR}/emacs-${FULL_VERSION}"
- S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="25"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-eselect/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
- net-libs/liblockfile
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
- gfile? ( >=dev-libs/glib-2.28.6 )
- gnutls? ( net-libs/gnutls )
- gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- zlib? ( sys-libs/zlib )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-if [[ ${PV##*.} = 9999 ]]; then
- DEPEND="${DEPEND}
- sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-musl.patch
-
- if [[ ${PV##*.} = 9999 ]]; then
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
- configure.ac)
- [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
- einfo "Emacs branch: ${EGIT_BRANCH}"
- einfo "Commit: ${EGIT_VERSION}"
- einfo "Emacs version number: ${FULL_VERSION}"
- [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
- || die "Upstream version number changed to ${FULL_VERSION}"
- fi
-
- epatch_user
-
- # Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -pie #526948
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa; then
- use sound || ewarn \
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
- myconf+=" --with-sound=alsa"
- else
- myconf+=" --with-sound=$(usex sound oss)"
- fi
-
- if use X; then
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with gsettings)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- local f
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
- if [[ ${PV##*.} = 9999 ]]; then
- myconf+=" EGIT_BRANCH=${EGIT_BRANCH} EGIT_VERSION=${EGIT_VERSION}"
- fi
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-install \
- --with-file-notification=$(usev gfile || usev inotify || echo no) \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with gpm) \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
- || die "moving emacs man page failed"
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{appdata,applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS CONTRIBUTE
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
- strongly recommended that you use app-admin/emacs-updater to rebuild
- all byte-compiled elisp files of the installed Emacs packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
- it into /Applications by yourself."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- local pvr
- for pvr in ${REPLACING_VERSIONS}; do
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/files/emacs-vcs-musl.patch b/app-editors/emacs-vcs/files/emacs-vcs-musl.patch
deleted file mode 100644
index 95a2c26..0000000
--- a/app-editors/emacs-vcs/files/emacs-vcs-musl.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-http://www.openwall.com/lists/musl/2015/02/03/1
-
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/configure.ac
-+++ emacs/configure.ac
-@@ -2092,7 +2092,7 @@
-
- system_malloc=$emacs_cv_sanitize_address
-
--hybrid_malloc=
-+hybrid_malloc=yes
-
- case "$opsys" in
- ## darwin ld insists on the use of malloc routines in the System framework.
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/Makefile.in
-+++ emacs/src/Makefile.in
-@@ -373,6 +373,7 @@
- region-cache.o sound.o atimer.o \
- doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
- profiler.o decompress.o \
-+ sheap.o \
- $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
- $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
- obj = $(base_obj) $(NS_OBJC_OBJ)
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/gmalloc.c
-+++ emacs/src/gmalloc.c
-@@ -72,7 +72,7 @@
- #define free gfree
- #endif /* HYBRID_MALLOC */
-
--#ifdef CYGWIN
-+//#ifdef CYGWIN
- extern void *bss_sbrk (ptrdiff_t size);
- extern int bss_sbrk_did_unexec;
- extern char bss_sbrk_buffer[];
-@@ -80,7 +80,7 @@
- #define DUMPED bss_sbrk_did_unexec
- #define ALLOCATED_BEFORE_DUMPING(P) \
- ((P) < bss_sbrk_buffer_end && (P) >= (void *) bss_sbrk_buffer)
--#endif
-+//#endif
-
- #ifdef __cplusplus
- extern "C"
-@@ -1525,16 +1525,19 @@
- __default_morecore (ptrdiff_t increment)
- {
- void *result;
--#if defined (CYGWIN)
-+//#if defined (CYGWIN)
- if (!DUMPED)
- {
- return bss_sbrk (increment);
- }
--#endif
-+//#endif
-+#if 0
- result = (void *) __sbrk (increment);
- if (result == (void *) -1)
- return NULL;
- return result;
-+#endif
-+ return NULL;
- }
- /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/print.c
-+++ emacs/src/print.c
-@@ -755,7 +755,7 @@
- print_output_debug_flag = x;
- }
-
--#if defined (GNU_LINUX)
-+#if defined (GNU_LINUX) && defined (__GLIBC__)
-
- /* This functionality is not vitally important in general, so we rely on
- non-portable ability to use stderr as lvalue. */
---- emacs-4188e3cc2bc69e75d4387b369e72e89fecc46a86/src/unexelf.c
-+++ emacs/src/unexelf.c
-@@ -632,6 +632,9 @@
- off_t new_file_size;
- void *new_break;
-
-+ extern int bss_sbrk_did_unexec;
-+ bss_sbrk_did_unexec = 1;
-+
- /* Pointers to the base of the image of the two files. */
- caddr_t old_base, new_base;
-
-
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
deleted file mode 100644
index 88ecff5..0000000
--- a/app-editors/emacs-vcs/metadata.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
- GNU Emacs is an extensible, customizable text editor - and more. At its core
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
- with extensions to support text editing. The features of GNU Emacs include:
- * Content-sensitive editing modes, including syntax coloring, for a variety
- of file types including plain text, source code, and HTML.
- * Complete built-in documentation, including a tutorial for new users.
- * Full Unicode support for nearly all human languages and their scripts.
- * Highly customizable, using Emacs Lisp code or a graphical interface.
- * A large number of extensions that add other functionality, including a
- project planner, mail and news reader, debugger interface, calendar, and
- more. Many of these extensions are distributed with GNU Emacs; others are
- available separately.
-</longdescription>
-<use>
- <flag name='athena'>Enable the MIT Athena widget set
- (<pkg>x11-libs/libXaw</pkg>)</flag>
- <flag name='games'>Support shared score files for games</flag>
- <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
- font name</flag>
- <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
- notification</flag>
- <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
- system font name</flag>
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
- <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
- <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
- <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
- processing</flag>
- <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
- of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
- <flag name='source'>Install C source files and make them available for
- find-function</flag>
- <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
- preference to Emacs' own scrollbars</flag>
- <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
- This option has an effect only on architectures where "long" and
- "long long" types have different size.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-editors/emacs/emacs-24.4-r99.ebuild b/app-editors/emacs/emacs-24.4-r99.ebuild
deleted file mode 100644
index 472fb43..0000000
--- a/app-editors/emacs/emacs-24.4-r99.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r2.ebuild,v 1.1 2015/01/23 20:38:44 ulm Exp $
-
-EAPI=5
-
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
- http://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
- >=app-eselect/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
- net-libs/liblockfile
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- dbus? ( sys-apps/dbus )
- gfile? ( >=dev-libs/glib-2.28.6 )
- gnutls? ( net-libs/gnutls )
- gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
- selinux? ( sys-libs/libselinux )
- zlib? ( sys-libs/zlib )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gsettings? ( >=dev-libs/glib-2.28.6 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff )
- xpm? ( x11-libs/libXpm )
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-RDEPEND="${RDEPEND}
- !<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
- EPATCH_SUFFIX=patch epatch
-
- epatch "${FILESDIR}/${PN}-24.3-stderr.patch"
- epatch "${FILESDIR}/${PN}-24.3-alloc-invalid-frees.patch"
- epatch "${FILESDIR}/${PN}-24.4-configure.patch"
- epatch "${FILESDIR}/${PN}-24.4-preload-hack.patch"
- epatch "${FILESDIR}/${PN}-24.4-lisp.patch"
-
- epatch_user
-
- # Fix filename reference in redirected man page
- sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
- || die "unable to sed ctags.1"
-
- #AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
- strip-flags
- filter-flags -pie #526948
-
- if use sh; then
- replace-flags "-O[1-9]" -O0 #262359
- elif use ia64; then
- replace-flags "-O[2-9]" -O1 #325373
- else
- replace-flags "-O[3-9]" -O2
- fi
-
- local myconf
-
- if use alsa; then
- use sound || ewarn \
- "USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
- myconf+=" --with-sound=alsa"
- else
- myconf+=" --with-sound=$(usex sound oss)"
- fi
-
- if use X; then
- myconf+=" --with-x --without-ns"
- myconf+=" $(use_with gconf)"
- myconf+=" $(use_with gsettings)"
- myconf+=" $(use_with toolkit-scroll-bars)"
- myconf+=" $(use_with gif)"
- myconf+=" $(use_with jpeg)"
- myconf+=" $(use_with png)"
- myconf+=" $(use_with svg rsvg)"
- myconf+=" $(use_with tiff)"
- myconf+=" $(use_with xpm)"
- myconf+=" $(use_with imagemagick)"
-
- if use xft; then
- myconf+=" --with-xft"
- myconf+=" $(use_with m17n-lib libotf)"
- myconf+=" $(use_with m17n-lib m17n-flt)"
- else
- myconf+=" --without-xft"
- myconf+=" --without-libotf --without-m17n-flt"
- use m17n-lib && ewarn \
- "USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
- fi
-
- local f
- if use gtk; then
- einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- for f in motif Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"gtk\" is set."
- done
- elif use motif; then
- einfo "Configuring to build with Motif toolkit"
- myconf+=" --with-x-toolkit=motif"
- for f in Xaw3d athena; do
- use ${f} && ewarn \
- "USE flag \"${f}\" has no effect if \"motif\" is set."
- done
- elif use athena || use Xaw3d; then
- einfo "Configuring to build with Athena/Lucid toolkit"
- myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
- else
- einfo "Configuring to build with no toolkit"
- myconf+=" --with-x-toolkit=no"
- fi
- elif use aqua; then
- einfo "Configuring to build with Nextstep (Cocoa) support"
- myconf+=" --with-ns --disable-ns-self-contained"
- myconf+=" --without-x"
- else
- myconf+=" --without-x --without-ns"
- fi
-
- # Save version information in the Emacs binary. It will be available
- # in variable "system-configuration-options".
- myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-
- econf \
- --program-suffix="-${EMACS_SUFFIX}" \
- --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --localstatedir="${EPREFIX}"/var \
- --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
- --with-gameuser="${GAMES_USER_DED:-games}" \
- --without-compress-install \
- --with-file-notification=$(usev gfile || usev inotify || echo no) \
- $(use_enable acl) \
- $(use_with dbus) \
- $(use_with gnutls) \
- $(use_with gpm) \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with libxml2 xml2) \
- $(use_with selinux) \
- $(use_with wide-int) \
- $(use_with zlib) \
- ${myconf}
-}
-
-src_compile() {
- echo $S
- $(tc-getCC) -shared -fPIC -o preload.so "${FILESDIR}/preload.c" || die
-
- export SANDBOX_ON=0 # for the unbelievers, see Bug #131505
- emake
-}
-
-src_install () {
- emake DESTDIR="${D}" NO_BIN_LINK=t install
-
- mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
- || die "moving emacs executable failed"
- mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
- || die "moving emacs man page failed"
-
- # move info dir to avoid collisions with the dir file generated by portage
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
- || die "moving info dir failed"
- touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
- docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
- # avoid collision between slots, see bug #169033 e.g.
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
- rm -rf "${ED}"/var
-
- # remove unused <version>/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- if use gzip-el; then
- # compress .el files when a corresponding .elc exists
- find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
- -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
- assert "gzip .el failed"
- fi
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
- strongly recommended that you use app-admin/emacs-updater to rebuild
- all byte-compiled elisp files of the installed Emacs packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
- it into /Applications by yourself."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
-
- local pvr
- for pvr in ${REPLACING_VERSIONS}; do
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
- done
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/files/emacs-24.3-alloc-invalid-frees.patch b/app-editors/emacs/files/emacs-24.3-alloc-invalid-frees.patch
deleted file mode 100644
index 1638e5f..0000000
--- a/app-editors/emacs/files/emacs-24.3-alloc-invalid-frees.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From http://www.openwall.com/lists/musl/2015/02/03/1
-
---- emacs-24.3.orig/src/alloc.c
-+++ emacs-24.3/src/alloc.c
-@@ -47,6 +47,13 @@
-
- #include <verify.h>
-
-+static void *initial_brk;
-+__attribute__((__constructor__))
-+static void init()
-+{
-+ initial_brk = sbrk(0);
-+}
-+
- /* GC_CHECK_MARKED_OBJECTS means do sanity checks on allocated objects.
- Doable only if GC_MARK_STACK. */
- #if ! GC_MARK_STACK
-@@ -699,6 +706,14 @@
- {
- void *val;
-
-+ if (block && block < initial_brk) {
-+ size_t len = (char *)initial_brk - (char *)block;
-+ if (len > size) len = size;
-+ void *p = xmalloc(size);
-+ memcpy(p, block, len);
-+ return p;
-+ }
-+
- MALLOC_BLOCK_INPUT;
- /* We must call malloc explicitly when BLOCK is 0, since some
- reallocs don't do this. */
-@@ -720,6 +735,7 @@
- void
- xfree (void *block)
- {
-+ if (block < initial_brk) return;
- if (!block)
- return;
- MALLOC_BLOCK_INPUT;
-@@ -910,6 +926,7 @@
- static void
- lisp_free (void *block)
- {
-+ if (block < initial_brk) return;
- MALLOC_BLOCK_INPUT;
- free (block);
- #if GC_MARK_STACK && !defined GC_MALLOC_CHECK
-@@ -1117,6 +1134,8 @@
- {
- struct ablock *ablock = block;
- struct ablocks *abase = ABLOCK_ABASE (ablock);
-+
-+ if (block < initial_brk) return;
-
- MALLOC_BLOCK_INPUT;
- #if GC_MARK_STACK && !defined GC_MALLOC_CHECK
diff --git a/app-editors/emacs/files/emacs-24.3-stderr.patch b/app-editors/emacs/files/emacs-24.3-stderr.patch
deleted file mode 100644
index a3beb9f..0000000
--- a/app-editors/emacs/files/emacs-24.3-stderr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/emacs-24.3/src/print.c
-+++ b/emacs-24.3/src/print.c
-@@ -733,7 +733,7 @@
- print_output_debug_flag = x;
- }
-
--#if defined (GNU_LINUX)
-+#if 0
-
- /* This functionality is not vitally important in general, so we rely on
- non-portable ability to use stderr as lvalue. */
diff --git a/app-editors/emacs/files/emacs-24.4-configure.patch b/app-editors/emacs/files/emacs-24.4-configure.patch
deleted file mode 100644
index 8c63009..0000000
--- a/app-editors/emacs/files/emacs-24.4-configure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac 2015-02-03 20:27:53.649248696 -0100
-+++ b/configure.ac 2015-02-03 20:29:40.708910266 -0100
-@@ -2004,6 +2004,7 @@
- ## darwin ld insists on the use of malloc routines in the System framework.
- darwin|sol2-10) system_malloc=yes ;;
- esac
-+system_malloc=yes
-
- GMALLOC_OBJ=
- if test "${system_malloc}" = "yes"; then
diff --git a/app-editors/emacs/files/emacs-24.4-lisp.patch b/app-editors/emacs/files/emacs-24.4-lisp.patch
deleted file mode 100644
index bc8a3f7..0000000
--- a/app-editors/emacs/files/emacs-24.4-lisp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lisp.h 2015-02-03 20:42:39.233177373 -0100
-+++ b/src/lisp.h 2015-02-03 20:44:01.780145394 -0100
-@@ -270,6 +270,7 @@
- This can be used in #if, e.g., '#if VAL_MAX < UINTPTR_MAX' below. */
- #define VAL_MAX (EMACS_INT_MAX >> (GCTYPEBITS - 1))
-
-+#define USE_LSB_TAG 1
- /* Unless otherwise specified, use USE_LSB_TAG on systems where: */
- #ifndef USE_LSB_TAG
- /* 1. We know malloc returns a multiple of 8. */
diff --git a/app-editors/emacs/files/emacs-24.4-preload-hack.patch b/app-editors/emacs/files/emacs-24.4-preload-hack.patch
deleted file mode 100644
index 8bed0bd..0000000
--- a/app-editors/emacs/files/emacs-24.4-preload-hack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in 2014-05-26 16:50:55.000000000 -0100
-+++ b/src/Makefile.in 2015-02-03 20:25:11.915270649 -0100
-@@ -292,7 +292,7 @@
-
- GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
-
--RUN_TEMACS = ./temacs
-+RUN_TEMACS = LD_PRELOAD=../preload.so ./temacs
-
- ## Invoke ../nt/addsection for MinGW, ":" elsewhere.
- TEMACS_POST_LINK = @TEMACS_POST_LINK@
diff --git a/app-editors/emacs/files/preload.c b/app-editors/emacs/files/preload.c
deleted file mode 100644
index 65cdcef..0000000
--- a/app-editors/emacs/files/preload.c
+++ /dev/null
@@ -1,88 +0,0 @@
-// http://www.openwall.com/lists/musl/2015/02/03/1
-#include <pthread.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <unistd.h>
-#include <stdio.h>
-
-static void *(*real_malloc)(size_t);
-static void *initial_brk;
-
-static pthread_once_t once_control[1];
-static void once_func()
-{
- real_malloc = dlsym(RTLD_NEXT, "malloc");
- initial_brk = sbrk(0);
-}
-
-static int cmp(const void *a, const void *b)
-{
- void *aa = *(void **)a, *bb = *(void **)b;
- return aa < bb ? -1 : aa > bb ? 1 : 0;
-}
-
-void *malloc(size_t n)
-{
- size_t i, j, k;
- pthread_once(once_control, once_func);
- if (n < 100000 || n > (size_t)-1/2) {
- void *p;
- do p = real_malloc(n);
- while (p > sbrk(0) || (p && p < initial_brk));
- return p;
- }
- size_t cnt = n/16384;
- void **list = real_malloc(sizeof *list * cnt);
- if (!list) return 0;
- for (i=0; i<cnt; i++) list[i] = 0;
- for (i=0; i<cnt; i++) {
- list[i] = real_malloc(65536 - 2*sizeof(size_t));
- if (!list[i]) goto fail;
- if (i<cnt/4) continue;
- size_t base = 0;
- qsort(list, i+1, sizeof(void *), cmp);
- for (j=0; j<i; j++) {
- char *p = list[base];
- char *s = list[j];
- char *z = list[j+1];
- if (z-s > 65536) {
- base = j+1;
- continue;
- }
- if (z-p < n+64) {
- continue;
- }
- for (k=0; k<base; k++) free(list[k]);
- *(size_t *)(p-sizeof(size_t)) = z-p | 1;
- *(size_t *)(z-2*sizeof(size_t)) = z-p | 1;
- for (k=j+1; k<i+1; k++) free(list[k]);
- free(list);
- return p;
- }
- }
-fail:
- for (i=0; i<cnt; i++) free(list[i]);
- free(list);
- return 0;
-}
-
-void *calloc(size_t n, size_t m)
-{
- if ((size_t)-1/n <= m) n *= m;
- else n = (size_t)-1;
- void *p = malloc(n);
- if (p) memset(p, 0, n);
- return p;
-}
-
-void *realloc(void *p, size_t n)
-{
- void *q = malloc(n);
- if (!q) return 0;
- size_t l = *(size_t *)((char *)p - sizeof(size_t)) & -8;
- memcpy(q, p, l<n ? l : n);
- free(p);
- return q;
-}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
deleted file mode 100644
index 88ecff5..0000000
--- a/app-editors/emacs/metadata.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
- GNU Emacs is an extensible, customizable text editor - and more. At its core
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
- with extensions to support text editing. The features of GNU Emacs include:
- * Content-sensitive editing modes, including syntax coloring, for a variety
- of file types including plain text, source code, and HTML.
- * Complete built-in documentation, including a tutorial for new users.
- * Full Unicode support for nearly all human languages and their scripts.
- * Highly customizable, using Emacs Lisp code or a graphical interface.
- * A large number of extensions that add other functionality, including a
- project planner, mail and news reader, debugger interface, calendar, and
- more. Many of these extensions are distributed with GNU Emacs; others are
- available separately.
-</longdescription>
-<use>
- <flag name='athena'>Enable the MIT Athena widget set
- (<pkg>x11-libs/libXaw</pkg>)</flag>
- <flag name='games'>Support shared score files for games</flag>
- <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
- font name</flag>
- <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
- notification</flag>
- <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
- system font name</flag>
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
- <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
- <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
- <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
- processing</flag>
- <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
- of the internal Lisp implementations</flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
- <flag name='source'>Install C source files and make them available for
- find-function</flag>
- <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
- preference to Emacs' own scrollbars</flag>
- <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
- This option has an effect only on architectures where "long" and
- "long long" types have different size.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-emulation/qemu/files/65-kvm.rules b/app-emulation/qemu/files/65-kvm.rules
deleted file mode 100644
index c2f7317..0000000
--- a/app-emulation/qemu/files/65-kvm.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="kvm", GROUP="kvm", MODE="0660"
diff --git a/app-emulation/qemu/files/bridge.conf b/app-emulation/qemu/files/bridge.conf
deleted file mode 100644
index 2bde37e..0000000
--- a/app-emulation/qemu/files/bridge.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# This should have the following permissions: root:qemu 0640
-
-# allow br0
-# Uncommenting the above would allow users in the 'qemu' group
-# to add devices to 'br0'
-
-# allow virbr0
-# Uncommenting the above would allow users in the 'qemu' group
-# to add devices to 'virbr0'
-
-# include /etc/qemu/bob.conf
-# Uncommenting the above would allow users in the 'bob' group
-# to have permissions defined in it, iff it has the following
-# permissions: root:bob 0640
diff --git a/app-emulation/qemu/files/qemu-1.5.3-openpty.patch b/app-emulation/qemu/files/qemu-1.5.3-openpty.patch
deleted file mode 100644
index 5c71c5b..0000000
--- a/app-emulation/qemu/files/qemu-1.5.3-openpty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch taken from sabotage linux
---- qemu-1.7.0.org/util/qemu-openpty.c
-+++ qemu-1.7.0/util/qemu-openpty.c
-@@ -47,6 +47,8 @@
- #elif defined CONFIG_SOLARIS
- # include <termios.h>
- # include <stropts.h>
-+#else
-+# include <termios.h>
- #endif
-
- #ifdef __sun__
diff --git a/app-emulation/qemu/files/qemu-1.7.0-cflags.patch b/app-emulation/qemu/files/qemu-1.7.0-cflags.patch
deleted file mode 100644
index cd003f6..0000000
--- a/app-emulation/qemu/files/qemu-1.7.0-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -3131,8 +3131,6 @@ fi
- if test "$gcov" = "yes" ; then
- CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
- LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$debug" = "no" ; then
-- CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
- fi
-
-
diff --git a/app-emulation/qemu/files/qemu-1.7.0-ffsll.patch b/app-emulation/qemu/files/qemu-1.7.0-ffsll.patch
deleted file mode 100644
index 481bd72..0000000
--- a/app-emulation/qemu/files/qemu-1.7.0-ffsll.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-taken from sabotage linux
---- qemu-1.7.0.org/hw/virtio/vhost.c
-+++ qemu-1.7.0/hw/virtio/vhost.c
-@@ -22,6 +22,15 @@
- #include "exec/address-spaces.h"
- #include "hw/virtio/virtio-bus.h"
-
-+#ifndef HAVE_FFSLL
-+static int ffsll(long long i) {
-+ unsigned long long x = i & -i;
-+ if (x <= 0xffffffff) return ffs (i);
-+ else return 32 + ffs (i >> 32);
-+}
-+#endif
-+
-+
- static void vhost_dev_sync_region(struct vhost_dev *dev,
- MemoryRegionSection *section,
- uint64_t mfirst, uint64_t mlast,
diff --git a/app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch b/app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch
deleted file mode 100644
index 1d5d173..0000000
--- a/app-emulation/qemu/files/qemu-1.7.0-sigset_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-taken from sabotage linux
---- qemu-1.7.0.org/linux-user/syscall.c
-+++ qemu-1.7.0/linux-user/syscall.c
-@@ -400,7 +400,7 @@
- #endif
- #define __NR_sys_ppoll __NR_ppoll
- _syscall5(int, sys_ppoll, struct pollfd *, fds, nfds_t, nfds,
-- struct timespec *, timeout, const __sigset_t *, sigmask,
-+ struct timespec *, timeout, const sigset_t *, sigmask,
- size_t, sigsetsize)
- #endif
-
diff --git a/app-emulation/qemu/files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch b/app-emulation/qemu/files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch
deleted file mode 100644
index fb5ad59..0000000
--- a/app-emulation/qemu/files/qemu-2.0.0-F_SHLCK-and-F_EXLCK.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Copied from Alpine Linux
-
-This patch was not upstreamed to qemu as those should probably be
-defined in musl libc.
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index c8989b6..00ed747 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -114,6 +114,13 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
-
- #include "qemu.h"
-
-+#ifndef F_SHLCK
-+#define F_SHLCK 8
-+#endif
-+#ifndef F_EXLCK
-+#define F_EXLCK 4
-+#endif
-+
- #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
- CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
-
diff --git a/app-emulation/qemu/files/qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch b/app-emulation/qemu/files/qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
deleted file mode 100644
index 7ea1dba..0000000
--- a/app-emulation/qemu/files/qemu-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3e231fa7a2dc66e2ef06ac44f4f719b08fc0c67e Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 29 Apr 2014 15:51:31 +0200
-Subject: [PATCH 6/6] linux-user/signal.c: define __SIGRTMIN/MAX for non-GNU
- platforms
-
-The __SIGRTMIN and __SIGRTMAX are glibc internals and are not available
-on all platforms, so we define those if they are missing.
-
-This is needed for musl libc.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- linux-user/signal.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/linux-user/signal.c b/linux-user/signal.c
-index 7d6246f..6019dbb 100644
---- a/linux-user/signal.c
-+++ b/linux-user/signal.c
-@@ -32,6 +32,13 @@
-
- //#define DEBUG_SIGNAL
-
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN 32
-+#endif
-+#ifndef __SIGRTMAX
-+#define __SIGRTMAX (NSIG-1)
-+#endif
-+
- static struct target_sigaltstack target_sigaltstack_used = {
- .ss_sp = 0,
- .ss_size = 0,
---
-1.9.2
-
diff --git a/app-emulation/qemu/files/qemu-2.1.0-CVE-2014-5388.patch b/app-emulation/qemu/files/qemu-2.1.0-CVE-2014-5388.patch
deleted file mode 100644
index 26a012b..0000000
--- a/app-emulation/qemu/files/qemu-2.1.0-CVE-2014-5388.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/520688
-
-From fa365d7cd11185237471823a5a33d36765454e16 Mon Sep 17 00:00:00 2001
-From: Gonglei <arei.gonglei@huawei.com>
-Date: Wed, 20 Aug 2014 13:52:30 +0800
-Subject: [PATCH] pcihp: fix possible array out of bounds
-
-Prevent out-of-bounds array access on
-acpi_pcihp_pci_status.
-
-Signed-off-by: Gonglei <arei.gonglei@huawei.com>
-Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
----
- hw/acpi/pcihp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
-index fae663a..34dedf1 100644
---- a/hw/acpi/pcihp.c
-+++ b/hw/acpi/pcihp.c
-@@ -231,7 +231,7 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size)
- uint32_t val = 0;
- int bsel = s->hotplug_select;
-
-- if (bsel < 0 || bsel > ACPI_PCIHP_MAX_HOTPLUG_BUS) {
-+ if (bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) {
- return 0;
- }
-
---
-2.0.0
-
diff --git a/app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch b/app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch
deleted file mode 100644
index 451a968..0000000
--- a/app-emulation/qemu/files/qemu-2.1.1-readlink-self.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-fix already in upstream
-
-From f17f4989fa193fa8279474c5462289a3cfe69aea Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 8 Aug 2014 09:40:25 +0900
-Subject: [PATCH] linux-user: fix readlink handling with magic exe symlink
-
-The current code always returns the length of the path when it should
-be returning the number of bytes it wrote to the output string.
-
-Further, readlink is not supposed to append a NUL byte, but the current
-snprintf logic will always do just that.
-
-Even further, if you pass in a length of 0, you're suppoesd to get back
-an error (EINVAL), but the current logic just returns 0.
-
-Further still, if there was an error reading the symlink, we should not
-go ahead and try to read the target buffer as it is garbage.
-
-Simple test for the first two issues:
-$ cat test.c
-int main() {
- char buf[50];
- size_t len;
- for (len = 0; len < 10; ++len) {
- memset(buf, '!', sizeof(buf));
- ssize_t ret = readlink("/proc/self/exe", buf, len);
- buf[20] = '\0';
- printf("readlink(/proc/self/exe, {%s}, %zu) = %zi\n", buf, len, ret);
- }
- return 0;
-}
-
-Now compare the output of the native:
-$ gcc test.c -o /tmp/x
-$ /tmp/x
-$ strace /tmp/x
-
-With what qemu does:
-$ armv7a-cros-linux-gnueabi-gcc test.c -o /tmp/x -static
-$ qemu-arm /tmp/x
-$ qemu-arm -strace /tmp/x
-
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
-Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
----
- linux-user/syscall.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index fccf9f0..7c108ab 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6636,11 +6636,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
- p2 = lock_user(VERIFY_WRITE, arg2, arg3, 0);
- if (!p || !p2) {
- ret = -TARGET_EFAULT;
-+ } else if (!arg3) {
-+ /* Short circuit this for the magic exe check. */
-+ ret = -TARGET_EINVAL;
- } else if (is_proc_myself((const char *)p, "exe")) {
- char real[PATH_MAX], *temp;
- temp = realpath(exec_path, real);
-- ret = temp == NULL ? get_errno(-1) : strlen(real) ;
-- snprintf((char *)p2, arg3, "%s", real);
-+ /* Return value is # of bytes that we wrote to the buffer. */
-+ if (temp == NULL) {
-+ ret = get_errno(-1);
-+ } else {
-+ /* Don't worry about sign mismatch as earlier mapping
-+ * logic would have thrown a bad address error. */
-+ ret = MIN(strlen(real), arg3);
-+ /* We cannot NUL terminate the string. */
-+ memcpy(p2, real, ret);
-+ }
- } else {
- ret = get_errno(readlink(path(p), p2, arg3));
- }
---
-2.0.0
-
diff --git a/app-emulation/qemu/files/qemu-2.1.2-vnc-sanitize-bits.patch b/app-emulation/qemu/files/qemu-2.1.2-vnc-sanitize-bits.patch
deleted file mode 100644
index 34f136f..0000000
--- a/app-emulation/qemu/files/qemu-2.1.2-vnc-sanitize-bits.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://bugs.gentoo.org/527088
-
-From e6908bfe8e07f2b452e78e677da1b45b1c0f6829 Mon Sep 17 00:00:00 2001
-From: Petr Matousek <pmatouse@redhat.com>
-Date: Mon, 27 Oct 2014 12:41:44 +0100
-Subject: [PATCH] vnc: sanitize bits_per_pixel from the client
-
-bits_per_pixel that are less than 8 could result in accessing
-non-initialized buffers later in the code due to the expectation
-that bytes_per_pixel value that is used to initialize these buffers is
-never zero.
-
-To fix this check that bits_per_pixel from the client is one of the
-values that the rfb protocol specification allows.
-
-This is CVE-2014-7815.
-
-Signed-off-by: Petr Matousek <pmatouse@redhat.com>
-
-[ kraxel: apply codestyle fix ]
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
- ui/vnc.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/ui/vnc.c b/ui/vnc.c
-index 0fe6eff..8bca597 100644
---- a/ui/vnc.c
-+++ b/ui/vnc.c
-@@ -2026,6 +2026,16 @@ static void set_pixel_format(VncState *vs,
- return;
- }
-
-+ switch (bits_per_pixel) {
-+ case 8:
-+ case 16:
-+ case 32:
-+ break;
-+ default:
-+ vnc_client_error(vs);
-+ return;
-+ }
-+
- vs->client_pf.rmax = red_max;
- vs->client_pf.rbits = hweight_long(red_max);
- vs->client_pf.rshift = red_shift;
---
-2.1.2
-
diff --git a/app-emulation/qemu/files/qemu-2.2.0-_sigev_un.patch b/app-emulation/qemu/files/qemu-2.2.0-_sigev_un.patch
deleted file mode 100644
index 5827c2e..0000000
--- a/app-emulation/qemu/files/qemu-2.2.0-_sigev_un.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/qemu-2.2.0/linux-user/syscall.c b/qemu-2.2.0/linux-user/syscall.c
---- a/qemu-2.2.0/linux-user/syscall.c 2014-12-09 15:45:43.000000000 -0100
-+++ b/qemu-2.2.0/linux-user/syscall.c 2015-03-16 19:09:49.050386155 -0100
-@@ -5033,7 +5033,7 @@
- host_sevp->sigev_signo =
- target_to_host_signal(tswap32(target_sevp->sigev_signo));
- host_sevp->sigev_notify = tswap32(target_sevp->sigev_notify);
-- host_sevp->_sigev_un._tid = tswap32(target_sevp->_sigev_un._tid);
-+ ((int*)(&host_sevp->sigev_notify))[1] = tswap32(target_sevp->_sigev_un._tid);
-
- unlock_user_struct(target_sevp, target_addr, 1);
- return 0;
diff --git a/app-emulation/qemu/files/qemu-2.2.1-CVE-2015-1779-1.patch b/app-emulation/qemu/files/qemu-2.2.1-CVE-2015-1779-1.patch
deleted file mode 100644
index 35ef8fd..0000000
--- a/app-emulation/qemu/files/qemu-2.2.1-CVE-2015-1779-1.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-From a2bebfd6e09d285aa793cae3fb0fc3a39a9fee6e Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Mon, 23 Mar 2015 22:58:21 +0000
-Subject: [PATCH] CVE-2015-1779: incrementally decode websocket frames
-
-The logic for decoding websocket frames wants to fully
-decode the frame header and payload, before allowing the
-VNC server to see any of the payload data. There is no
-size limit on websocket payloads, so this allows a
-malicious network client to consume 2^64 bytes in memory
-in QEMU. It can trigger this denial of service before
-the VNC server even performs any authentication.
-
-The fix is to decode the header, and then incrementally
-decode the payload data as it is needed. With this fix
-the websocket decoder will allow at most 4k of data to
-be buffered before decoding and processing payload.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-
-[ kraxel: fix frequent spurious disconnects, suggested by Peter Maydell ]
-
- @@ -361,7 +361,7 @@ int vncws_decode_frame_payload(Buffer *input,
- - *payload_size = input->offset;
- + *payload_size = *payload_remain;
-
-[ kraxel: fix 32bit build ]
-
- @@ -306,7 +306,7 @@ struct VncState
- - uint64_t ws_payload_remain;
- + size_t ws_payload_remain;
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
- ui/vnc-ws.c | 105 ++++++++++++++++++++++++++++++++++++++++--------------------
- ui/vnc-ws.h | 9 ++++--
- ui/vnc.h | 2 ++
- 3 files changed, 80 insertions(+), 36 deletions(-)
-
-diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
-index 85dbb7e..0b7de4e 100644
---- a/ui/vnc-ws.c
-+++ b/ui/vnc-ws.c
-@@ -107,7 +107,7 @@ long vnc_client_read_ws(VncState *vs)
- {
- int ret, err;
- uint8_t *payload;
-- size_t payload_size, frame_size;
-+ size_t payload_size, header_size;
- VNC_DEBUG("Read websocket %p size %zd offset %zd\n", vs->ws_input.buffer,
- vs->ws_input.capacity, vs->ws_input.offset);
- buffer_reserve(&vs->ws_input, 4096);
-@@ -117,18 +117,39 @@ long vnc_client_read_ws(VncState *vs)
- }
- vs->ws_input.offset += ret;
-
-- /* make sure that nothing is left in the ws_input buffer */
-+ ret = 0;
-+ /* consume as much of ws_input buffer as possible */
- do {
-- err = vncws_decode_frame(&vs->ws_input, &payload,
-- &payload_size, &frame_size);
-- if (err <= 0) {
-- return err;
-+ if (vs->ws_payload_remain == 0) {
-+ err = vncws_decode_frame_header(&vs->ws_input,
-+ &header_size,
-+ &vs->ws_payload_remain,
-+ &vs->ws_payload_mask);
-+ if (err <= 0) {
-+ return err;
-+ }
-+
-+ buffer_advance(&vs->ws_input, header_size);
- }
-+ if (vs->ws_payload_remain != 0) {
-+ err = vncws_decode_frame_payload(&vs->ws_input,
-+ &vs->ws_payload_remain,
-+ &vs->ws_payload_mask,
-+ &payload,
-+ &payload_size);
-+ if (err < 0) {
-+ return err;
-+ }
-+ if (err == 0) {
-+ return ret;
-+ }
-+ ret += err;
-
-- buffer_reserve(&vs->input, payload_size);
-- buffer_append(&vs->input, payload, payload_size);
-+ buffer_reserve(&vs->input, payload_size);
-+ buffer_append(&vs->input, payload, payload_size);
-
-- buffer_advance(&vs->ws_input, frame_size);
-+ buffer_advance(&vs->ws_input, payload_size);
-+ }
- } while (vs->ws_input.offset > 0);
-
- return ret;
-@@ -265,15 +286,14 @@ void vncws_encode_frame(Buffer *output, const void *payload,
- buffer_append(output, payload, payload_size);
- }
-
--int vncws_decode_frame(Buffer *input, uint8_t **payload,
-- size_t *payload_size, size_t *frame_size)
-+int vncws_decode_frame_header(Buffer *input,
-+ size_t *header_size,
-+ size_t *payload_remain,
-+ WsMask *payload_mask)
- {
- unsigned char opcode = 0, fin = 0, has_mask = 0;
-- size_t header_size = 0;
-- uint32_t *payload32;
-+ size_t payload_len;
- WsHeader *header = (WsHeader *)input->buffer;
-- WsMask mask;
-- int i;
-
- if (input->offset < WS_HEAD_MIN_LEN + 4) {
- /* header not complete */
-@@ -283,7 +303,7 @@ int vncws_decode_frame(Buffer *input, uint8_t **payload,
- fin = (header->b0 & 0x80) >> 7;
- opcode = header->b0 & 0x0f;
- has_mask = (header->b1 & 0x80) >> 7;
-- *payload_size = header->b1 & 0x7f;
-+ payload_len = header->b1 & 0x7f;
-
- if (opcode == WS_OPCODE_CLOSE) {
- /* disconnect */
-@@ -300,40 +320,57 @@ int vncws_decode_frame(Buffer *input, uint8_t **payload,
- return -2;
- }
-
-- if (*payload_size < 126) {
-- header_size = 6;
-- mask = header->u.m;
-- } else if (*payload_size == 126 && input->offset >= 8) {
-- *payload_size = be16_to_cpu(header->u.s16.l16);
-- header_size = 8;
-- mask = header->u.s16.m16;
-- } else if (*payload_size == 127 && input->offset >= 14) {
-- *payload_size = be64_to_cpu(header->u.s64.l64);
-- header_size = 14;
-- mask = header->u.s64.m64;
-+ if (payload_len < 126) {
-+ *payload_remain = payload_len;
-+ *header_size = 6;
-+ *payload_mask = header->u.m;
-+ } else if (payload_len == 126 && input->offset >= 8) {
-+ *payload_remain = be16_to_cpu(header->u.s16.l16);
-+ *header_size = 8;
-+ *payload_mask = header->u.s16.m16;
-+ } else if (payload_len == 127 && input->offset >= 14) {
-+ *payload_remain = be64_to_cpu(header->u.s64.l64);
-+ *header_size = 14;
-+ *payload_mask = header->u.s64.m64;
- } else {
- /* header not complete */
- return 0;
- }
-
-- *frame_size = header_size + *payload_size;
-+ return 1;
-+}
-+
-+int vncws_decode_frame_payload(Buffer *input,
-+ size_t *payload_remain, WsMask *payload_mask,
-+ uint8_t **payload, size_t *payload_size)
-+{
-+ size_t i;
-+ uint32_t *payload32;
-
-- if (input->offset < *frame_size) {
-- /* frame not complete */
-+ *payload = input->buffer;
-+ /* If we aren't at the end of the payload, then drop
-+ * off the last bytes, so we're always multiple of 4
-+ * for purpose of unmasking, except at end of payload
-+ */
-+ if (input->offset < *payload_remain) {
-+ *payload_size = input->offset - (input->offset % 4);
-+ } else {
-+ *payload_size = *payload_remain;
-+ }
-+ if (*payload_size == 0) {
- return 0;
- }
--
-- *payload = input->buffer + header_size;
-+ *payload_remain -= *payload_size;
-
- /* unmask frame */
- /* process 1 frame (32 bit op) */
- payload32 = (uint32_t *)(*payload);
- for (i = 0; i < *payload_size / 4; i++) {
-- payload32[i] ^= mask.u;
-+ payload32[i] ^= payload_mask->u;
- }
- /* process the remaining bytes (if any) */
- for (i *= 4; i < *payload_size; i++) {
-- (*payload)[i] ^= mask.c[i % 4];
-+ (*payload)[i] ^= payload_mask->c[i % 4];
- }
-
- return 1;
-diff --git a/ui/vnc-ws.h b/ui/vnc-ws.h
-index ef229b7..14d4230 100644
---- a/ui/vnc-ws.h
-+++ b/ui/vnc-ws.h
-@@ -83,7 +83,12 @@ long vnc_client_read_ws(VncState *vs);
- void vncws_process_handshake(VncState *vs, uint8_t *line, size_t size);
- void vncws_encode_frame(Buffer *output, const void *payload,
- const size_t payload_size);
--int vncws_decode_frame(Buffer *input, uint8_t **payload,
-- size_t *payload_size, size_t *frame_size);
-+int vncws_decode_frame_header(Buffer *input,
-+ size_t *header_size,
-+ size_t *payload_remain,
-+ WsMask *payload_mask);
-+int vncws_decode_frame_payload(Buffer *input,
-+ size_t *payload_remain, WsMask *payload_mask,
-+ uint8_t **payload, size_t *payload_size);
-
- #endif /* __QEMU_UI_VNC_WS_H */
-diff --git a/ui/vnc.h b/ui/vnc.h
-index e19ac39..3f7c6a9 100644
---- a/ui/vnc.h
-+++ b/ui/vnc.h
-@@ -306,6 +306,8 @@ struct VncState
- #ifdef CONFIG_VNC_WS
- Buffer ws_input;
- Buffer ws_output;
-+ size_t ws_payload_remain;
-+ WsMask ws_payload_mask;
- #endif
- /* current output mode information */
- VncWritePixels *write_pixels;
---
-2.3.5
-
diff --git a/app-emulation/qemu/files/qemu-2.2.1-CVE-2015-1779-2.patch b/app-emulation/qemu/files/qemu-2.2.1-CVE-2015-1779-2.patch
deleted file mode 100644
index c7a8c8b..0000000
--- a/app-emulation/qemu/files/qemu-2.2.1-CVE-2015-1779-2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2cdb5e142fb93e875fa53c52864ef5eb8d5d8b41 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Mon, 23 Mar 2015 22:58:22 +0000
-Subject: [PATCH] CVE-2015-1779: limit size of HTTP headers from websockets
- clients
-
-The VNC server websockets decoder will read and buffer data from
-websockets clients until it sees the end of the HTTP headers,
-as indicated by \r\n\r\n. In theory this allows a malicious to
-trick QEMU into consuming an arbitrary amount of RAM. In practice,
-because QEMU runs g_strstr_len() across the buffered header data,
-it will spend increasingly long burning CPU time searching for
-the substring match and less & less time reading data. So while
-this does cause arbitrary memory growth, the bigger problem is
-that QEMU will be burning 100% of available CPU time.
-
-A novnc websockets client typically sends headers of around
-512 bytes in length. As such it is reasonable to place a 4096
-byte limit on the amount of data buffered while searching for
-the end of HTTP headers.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
----
- ui/vnc-ws.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
-index 0b7de4e..62eb97f 100644
---- a/ui/vnc-ws.c
-+++ b/ui/vnc-ws.c
-@@ -81,8 +81,11 @@ void vncws_handshake_read(void *opaque)
- VncState *vs = opaque;
- uint8_t *handshake_end;
- long ret;
-- buffer_reserve(&vs->ws_input, 4096);
-- ret = vnc_client_read_buf(vs, buffer_end(&vs->ws_input), 4096);
-+ /* Typical HTTP headers from novnc are 512 bytes, so limiting
-+ * total header size to 4096 is easily enough. */
-+ size_t want = 4096 - vs->ws_input.offset;
-+ buffer_reserve(&vs->ws_input, want);
-+ ret = vnc_client_read_buf(vs, buffer_end(&vs->ws_input), want);
-
- if (!ret) {
- if (vs->csock == -1) {
-@@ -99,6 +102,9 @@ void vncws_handshake_read(void *opaque)
- vncws_process_handshake(vs, vs->ws_input.buffer, vs->ws_input.offset);
- buffer_advance(&vs->ws_input, handshake_end - vs->ws_input.buffer +
- strlen(WS_HANDSHAKE_END));
-+ } else if (vs->ws_input.offset >= 4096) {
-+ VNC_DEBUG("End of headers not found in first 4096 bytes\n");
-+ vnc_client_error(vs);
- }
- }
-
---
-2.3.5
-
diff --git a/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-3456.patch b/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-3456.patch
deleted file mode 100644
index 87697d0..0000000
--- a/app-emulation/qemu/files/qemu-2.3.0-CVE-2015-3456.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://bugs.gentoo.org/549404
-
-From e907746266721f305d67bc0718795fedee2e824c Mon Sep 17 00:00:00 2001
-From: Petr Matousek <pmatouse@redhat.com>
-Date: Wed, 6 May 2015 09:48:59 +0200
-Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated buffer
-
-During processing of certain commands such as FD_CMD_READ_ID and
-FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could
-get out of bounds leading to memory corruption with values coming
-from the guest.
-
-Fix this by making sure that the index is always bounded by the
-allocated memory.
-
-This is CVE-2015-3456.
-
-Signed-off-by: Petr Matousek <pmatouse@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
-Signed-off-by: John Snow <jsnow@redhat.com>
----
- hw/block/fdc.c | 17 +++++++++++------
- 1 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/hw/block/fdc.c b/hw/block/fdc.c
-index f72a392..d8a8edd 100644
---- a/hw/block/fdc.c
-+++ b/hw/block/fdc.c
-@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
- {
- FDrive *cur_drv;
- uint32_t retval = 0;
-- int pos;
-+ uint32_t pos;
-
- cur_drv = get_cur_drv(fdctrl);
- fdctrl->dsr &= ~FD_DSR_PWRDOWN;
-@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
- return 0;
- }
- pos = fdctrl->data_pos;
-+ pos %= FD_SECTOR_LEN;
- if (fdctrl->msr & FD_MSR_NONDMA) {
-- pos %= FD_SECTOR_LEN;
- if (pos == 0) {
- if (fdctrl->data_pos != 0)
- if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
-@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction)
- static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction)
- {
- FDrive *cur_drv = get_cur_drv(fdctrl);
-+ uint32_t pos;
-
-- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
-+ pos = fdctrl->data_pos - 1;
-+ pos %= FD_SECTOR_LEN;
-+ if (fdctrl->fifo[pos] & 0x80) {
- /* Command parameters done */
-- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
-+ if (fdctrl->fifo[pos] & 0x40) {
- fdctrl->fifo[0] = fdctrl->fifo[1];
- fdctrl->fifo[2] = 0;
- fdctrl->fifo[3] = 0;
-@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256];
- static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
- {
- FDrive *cur_drv;
-- int pos;
-+ uint32_t pos;
-
- /* Reset mode */
- if (!(fdctrl->dor & FD_DOR_nRESET)) {
-@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
- }
-
- FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
-- fdctrl->fifo[fdctrl->data_pos++] = value;
-+ pos = fdctrl->data_pos++;
-+ pos %= FD_SECTOR_LEN;
-+ fdctrl->fifo[pos] = value;
- if (fdctrl->data_pos == fdctrl->data_len) {
- /* We now have all parameters
- * and will be able to treat the command
---
-1.7.0.4
-
diff --git a/app-emulation/qemu/files/qemu-9999-cflags.patch b/app-emulation/qemu/files/qemu-9999-cflags.patch
deleted file mode 100644
index 08a6c9f..0000000
--- a/app-emulation/qemu/files/qemu-9999-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 82f6e71..7e19aaf 100755
---- a/configure
-+++ b/configure
-@@ -3131,8 +3131,6 @@ fi
- if test "$gcov" = "yes" ; then
- CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
- LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
--elif test "$debug" = "no" ; then
-- CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
- fi
-
-
diff --git a/app-emulation/qemu/files/qemu-9999-virtfs-proxy-helper-accept.patch b/app-emulation/qemu/files/qemu-9999-virtfs-proxy-helper-accept.patch
deleted file mode 100644
index f8a5249..0000000
--- a/app-emulation/qemu/files/qemu-9999-virtfs-proxy-helper-accept.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c5970614489e385e69667f1f323421442a7a46c0 Mon Sep 17 00:00:00 2001
-From: Tim Comer <comer0@gmail.com>
-Date: Sat, 19 Apr 2014 12:51:42 -0400
-Subject: [PATCH] virtfs-proxy-helper: fix call to accept
-
-The current code calls accept() without initializing the size parameter
-which means the accept call might write too much to the stack.
-
-URL: https://bugs.gentoo.org/486714
-Signed-off-by: Tim Comer <comer0@gmail.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- fsdev/virtfs-proxy-helper.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
-index bfecb87..cd291d3 100644
---- a/fsdev/virtfs-proxy-helper.c
-+++ b/fsdev/virtfs-proxy-helper.c
-@@ -760,6 +760,7 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid)
- return -1;
- }
-
-+ size = sizeof(qemu);
- client = accept(sock, (struct sockaddr *)&qemu, &size);
- if (client < 0) {
- do_perror("accept");
---
-1.9.2
-
diff --git a/app-emulation/qemu/files/qemu-binfmt.initd-r1 b/app-emulation/qemu/files/qemu-binfmt.initd-r1
deleted file mode 100644
index 4b1dba5..0000000
--- a/app-emulation/qemu/files/qemu-binfmt.initd-r1
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd-r1,v 1.3 2013/02/17 22:05:22 vapier Exp $
-
-# enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel
-
-depend() {
- after procfs
-}
-
-start() {
- ebegin "Registering qemu-user binaries"
-
- if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
- modprobe -q binfmt_misc
- fi
-
- if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
- eend $? "You need support for 'misc binaries' in your kernel!" || return
- fi
-
- if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then
- mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc >/dev/null 2>&1
- eend $? || return
- fi
-
- # probe cpu type
- cpu=`uname -m`
- case "$cpu" in
- i386|i486|i586|i686|i86pc|BePC|x86_64)
- cpu="i386"
- ;;
- m68k)
- cpu="m68k"
- ;;
- mips*)
- cpu="mips"
- ;;
- "Power Macintosh"|ppc|ppc64)
- cpu="ppc"
- ;;
- armv[4-9]*)
- cpu="arm"
- ;;
- sparc*)
- cpu="sparc"
- ;;
- esac
-
- # register the interpreter for each cpu except for the native one
- if [ $cpu != "i386" -a -x "/usr/bin/qemu-i386" ] ; then
- echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register
- echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "alpha" -a -x "/usr/bin/qemu-alpha" ] ; then
- echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "arm" -a -x "/usr/bin/qemu-arm" ] ; then
- echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\x00\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "arm" -a -x "/usr/bin/qemu-armeb" ] ; then
- echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "sparc" -a -x "/usr/bin/qemu-sparc" ] ; then
- echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "ppc" -a -x "/usr/bin/qemu-ppc" ] ; then
- echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "m68k" -a -x "/usr/bin/qemu-m68k" ] ; then
- echo 'Please check cpu value and header information for m68k!'
- echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips" ] ; then
- # FIXME: We could use the other endianness on a MIPS host.
- echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsel" ] ; then
- echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32" ] ; then
- echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "mips" -a -x "/usr/bin/qemu-mipsn32el" ] ; then
- echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64" ] ; then
- echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "mips" -a -x "/usr/bin/qemu-mips64el" ] ; then
- echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4" ] ; then
- echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "sh" -a -x "/usr/bin/qemu-sh4eb" ] ; then
- echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:P' > /proc/sys/fs/binfmt_misc/register
- fi
- if [ $cpu != "s390x" -a -x "/usr/local/bin/qemu-s390x" ] ; then
- echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:P' > /proc/sys/fs/binfmt_misc/register
- fi
- eend $?
-}
-
-stop() {
- ebegin "Unregistering qemu-user binaries"
- local arches
-
- arches="${arches} i386 i486"
- arches="${arches} alpha"
- arches="${arches} arm armeb"
- arches="${arches} sparc"
- arches="${arches} ppc"
- arches="${arches} m68k"
- arches="${arches} mips mipsel mipsn32 mipsn32el mips64 mips64el"
- arches="${arches} sh4 sh4eb"
- arches="${arches} s390x"
-
- for a in ${arches}; do
- if [ -f /proc/sys/fs/binfmt_misc/$a ] ; then
- echo '-1' > /proc/sys/fs/binfmt_misc/$a
- fi
- done
-
- eend $?
-}
-
-# vim: ts=4 :
diff --git a/app-emulation/qemu/files/qemu-kvm-1.4 b/app-emulation/qemu/files/qemu-kvm-1.4
deleted file mode 100644
index 08da00b..0000000
--- a/app-emulation/qemu/files/qemu-kvm-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/qemu-system-x86_64 -machine accel=kvm "$@"
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
deleted file mode 100644
index 87667db..0000000
--- a/app-emulation/qemu/metadata.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>qemu</herd>
- <maintainer>
- <email>cardoe@gentoo.org</email>
- <name>Doug Goldstein</name>
- </maintainer>
- <use>
- <flag name='accessibility'>Adds support for braille displays using brltty</flag>
- <flag name='aio'>Enables support for Linux's Async IO</flag>
- <flag name='alsa'>Enable alsa output for sound emulation</flag>
- <flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
- <flag name='fdt'>Enables firmware device tree support</flag>
- <flag name='glusterfs'>Enables GlusterFS cluster fileystem via
- <pkg>sys-cluster/glusterfs</pkg></flag>
- <flag name='iscsi'>Enable direct iSCSI support via
- <pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
- block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag>
- <flag name='ncurses'>Enable the ncurses-based console</flag>
- <flag name='nfs'>Enable NFS support</flag>
- <flag name='numa'>Enable NUMA support</flag>
- <flag name='pin-upstream-blobs'>Pin the versions of BIOS firmware to the version included in the upstream release.
- This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
- When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>
- <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
- <flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
- <flag name='sdl'>Enable the SDL-based console</flag>
- <flag name='seccomp'>Utilize <pkg>sys-libs/libseccomp</pkg> to enable kernel filtering of system calls to prevent malicious guests from doing damage.</flag>
- <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
- <flag name='ssh'>Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
- <flag name='static-softmmu'>Builds the Software MMU (system) targets as static binaries</flag>
- <flag name='static-user'>Build the User targets as static binaries</flag>
- <flag name='static'>Enables both 'static-softmmu' and 'static-user'</flag>
- <flag name='snappy'>Enable support for snappy compression</flag>
- <flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
- <flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
- <flag name='tls'>Enable TLS support for the VNC console server.
- For 1.4 and newer this also enables WebSocket support.
- For 2.0 and newer this also enables disk quorum support.</flag>
- <flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
- <flag name='png'>Enable png image support for the VNC console server</flag>
- <flag name='usb'>Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
- <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
- devices to another machine over TCP</flag>
- <flag name='uuid'>Enable UUID support in the vdi block driver</flag>
- <flag name='vde'>Enable VDE-based networking</flag>
- <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
- <flag name='virtfs'>Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
- <flag name='xattr'>Add support for getting and setting POSIX extended attributes, through
- <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
- </flag>
- <flag name='xen'>Enables support for Xen backends</flag>
- <flag name='xfs'>Support xfsctl() notification and syncing for XFS backed
- virtual disks.</flag>
- </use>
-</pkgmetadata>
diff --git a/app-emulation/qemu/qemu-2.1.2-r99.ebuild b/app-emulation/qemu/qemu-2.1.2-r99.ebuild
deleted file mode 100644
index 4a1c813..0000000
--- a/app-emulation/qemu/qemu-2.1.2-r99.ebuild
+++ /dev/null
@@ -1,600 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.2-r1.ebuild,v 1.4 2014/11/08 18:09:33 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo pax-utils
-
-BACKPORTS=
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.qemu.org/qemu.git"
- inherit git-2
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
- ${BACKPORTS:+
- http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
-gtk infiniband iscsi +jpeg \
-kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
-+png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
-static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
-mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
-x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-use_targets="
- $(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
- $(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-"
-IUSE+=" ${use_targets}"
-
-# Require at least one softmmu or user target.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="|| ( ${use_targets} )
- ${PYTHON_REQUIRED_USE}
- qemu_softmmu_targets_arm? ( fdt )
- qemu_softmmu_targets_microblaze? ( fdt )
- qemu_softmmu_targets_ppc? ( fdt )
- qemu_softmmu_targets_ppc64? ( fdt )
- static? ( static-softmmu static-user )
- static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
- virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected). This is because qemu supports using the C library's API
-# when available rather than always using the extranl library.
-COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- xattr? ( sys-apps/attr[static-libs(+)] )"
-SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- aio? ( dev-libs/libaio[static-libs(+)] )
- caps? ( sys-libs/libcap-ng[static-libs(+)] )
- curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
- infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
- jpeg? ( virtual/jpeg[static-libs(+)] )
- lzo? ( dev-libs/lzo:2[static-libs(+)] )
- ncurses? ( sys-libs/ncurses[static-libs(+)] )
- nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- png? ( media-libs/libpng[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
- sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- snappy? ( app-arch/snappy[static-libs(+)] )
- spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
- ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
- tls? ( net-libs/gnutls[static-libs(+)] )
- usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
- uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
- vde? ( net-misc/vde[static-libs(+)] )
- xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
-X86_FIRMWARE_DEPEND="
- >=sys-firmware/ipxe-1.0.0_p20130624
- pin-upstream-blobs? (
- ~sys-firmware/seabios-1.7.5
- ~sys-firmware/sgabios-0.1_pre8
- ~sys-firmware/vgabios-0.7a
- )
- !pin-upstream-blobs? (
- sys-firmware/seabios
- sys-firmware/sgabios
- sys-firmware/vgabios
- )"
-CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
- !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
- qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
- accessibility? ( app-accessibility/brltty )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bluetooth? ( net-wireless/bluez )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/vte:2.90
- )
- iscsi? ( net-libs/libiscsi )
- opengl? ( virtual/opengl )
- pulseaudio? ( media-sound/pulseaudio )
- python? ( ${PYTHON_DEPS} )
- sdl? ( media-libs/libsdl[X] )
- smartcard? ( dev-libs/nss !app-emulation/libcacard )
- spice? ( >=app-emulation/spice-protocol-0.12.3 )
- systemtap? ( dev-util/systemtap )
- usbredir? ( >=sys-apps/usbredir-0.6 )
- virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools )"
-DEPEND="${CDEPEND}
- dev-lang/perl
- =dev-lang/python-2*
- sys-apps/texinfo
- virtual/pkgconfig
- kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- gtk? ( nls? ( sys-devel/gettext ) )
- static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
- static-user? ( ${USER_LIB_DEPEND} )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-qemu )
-"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
- usr/share/qemu/s390-ccw.img
- usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-or32
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
- use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
- use qemu_softmmu_targets_s390x; then
- return 0
- fi
-
- return 1
-}
-
-pkg_pretend() {
- if use kernel_linux && kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- elif use kernel_linux; then
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- else
- CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
- ERROR_KVM="You must enable KVM in your kernel to continue"
- ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
- ERROR_KVM_AMD+=" your kernel configuration."
- ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
- ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
- ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
- ERROR_TUN+=" into your kernel or loaded as a module to use the"
- ERROR_TUN+=" virtual network device if using -net tap."
- ERROR_BRIDGE="You will also need support for 802.1d"
- ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
- use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
- ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
- ERROR_VHOST_NET+=" support"
-
- if use amd64 || use x86 || use amd64-linux || use x86-linux; then
- CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
- fi
-
- use python && CONFIG_CHECK+=" ~DEBUG_FS"
- ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
- # Now do the actual checks setup above
- check_extra_config
- fi
- fi
-
- if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
- eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
- eerror "instances are still pointing to it. Please update your"
- eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
- eerror "and the right system binary (e.g. qemu-system-x86_64)."
- die "update your virt configs to not use qemu-kvm"
- fi
-}
-
-pkg_setup() {
- enewgroup kvm 78
-}
-
-src_prepare() {
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i -r \
- -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target || die
-
- # Cheap hack to disable gettext .mo generation.
- use nls || rm -f po/*.po
-
- epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
- epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
- epatch "${FILESDIR}"/${PN}-2.1.2-vnc-sanitize-bits.patch #527088
- epatch "${FILESDIR}"/${PN}-2.0.0-F_SHLCK-and-F_EXLCK.patch #for musl
- epatch "${FILESDIR}"/${PN}-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch #for musl
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- # Fix ld and objcopy being called directly
- tc-export AR LD OBJCOPY
-
- # Verbose builds
- MAKEOPTS+=" V=1"
-
- epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- local buildtype=$1
- local builddir=$2
- local static_flag="static-${buildtype}"
-
- # audio options
- local audio_opts="oss"
- use alsa && audio_opts="alsa,${audio_opts}"
- use sdl && audio_opts="sdl,${audio_opts}"
- use pulseaudio && audio_opts="pa,${audio_opts}"
-
- local conf_opts=(
- --prefix=/usr
- --sysconfdir=/etc
- --libdir=/usr/$(get_libdir)
- --docdir=/usr/share/doc/${PF}/html
- --disable-bsd-user
- --disable-guest-agent
- --disable-strip
- --disable-werror
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- $(use_enable debug debug-info)
- $(use_enable debug debug-tcg)
- --enable-docs
- $(use_enable tci tcg-interpreter)
- $(use_enable xattr attr)
- )
-
- # Disable options not used by user targets as the default configure
- # options will autoprobe and try to link in a bunch of unused junk.
- conf_softmmu() {
- if [[ ${buildtype} == "user" ]] ; then
- echo "--disable-${2:-$1}"
- else
- use_enable "$@"
- fi
- }
- conf_opts+=(
- $(conf_softmmu accessibility brlapi)
- $(conf_softmmu aio linux-aio)
- $(conf_softmmu bluetooth bluez)
- $(conf_softmmu caps cap-ng)
- $(conf_softmmu curl)
- $(conf_softmmu fdt)
- $(conf_softmmu glusterfs)
- $(conf_softmmu gtk)
- $(conf_softmmu infiniband rdma)
- $(conf_softmmu iscsi libiscsi)
- $(conf_softmmu jpeg vnc-jpeg)
- $(conf_softmmu kernel_linux kvm)
- $(conf_softmmu lzo)
- $(conf_softmmu ncurses curses)
- $(conf_softmmu nfs libnfs)
- $(conf_softmmu numa)
- $(conf_softmmu opengl glx)
- $(conf_softmmu png vnc-png)
- $(conf_softmmu rbd)
- $(conf_softmmu sasl vnc-sasl)
- $(conf_softmmu sdl)
- $(conf_softmmu seccomp)
- $(conf_softmmu smartcard smartcard-nss)
- $(conf_softmmu snappy)
- $(conf_softmmu spice)
- $(conf_softmmu ssh libssh2)
- $(conf_softmmu tls quorum)
- $(conf_softmmu tls vnc-tls)
- $(conf_softmmu tls vnc-ws)
- $(conf_softmmu usb libusb)
- $(conf_softmmu usbredir usb-redir)
- $(conf_softmmu uuid)
- $(conf_softmmu vde)
- $(conf_softmmu vhost-net)
- $(conf_softmmu virtfs)
- $(conf_softmmu vnc)
- $(conf_softmmu xen)
- $(conf_softmmu xen xen-pci-passthrough)
- $(conf_softmmu xfs xfsctl)
- )
-
- case ${buildtype} in
- user)
- conf_opts+=(
- --enable-linux-user
- --disable-system
- --target-list="${user_targets}"
- --disable-blobs
- --disable-tools
- )
- ;;
- softmmu)
- conf_opts+=(
- --disable-linux-user
- --enable-system
- --target-list="${softmmu_targets}"
- --with-system-pixman
- --audio-drv-list="${audio_opts}"
- )
- use gtk && conf_opts+=( --with-gtkabi=3.0 )
- ;;
- esac
-
- # Add support for SystemTAP
- use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
- # We always want to attempt to build with PIE support as it results
- # in a more secure binary. But it doesn't work with static or if
- # the current GCC doesn't have PIE support.
- if use ${static_flag}; then
- conf_opts+=( --static --disable-pie )
- else
- gcc-specs-pie && conf_opts+=( --enable-pie )
- fi
-
- einfo "./configure ${conf_opts[*]}"
- cd "${builddir}"
- ../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
- local target
-
- python_export_best
-
- softmmu_targets= softmmu_bins=()
- user_targets= user_bins=()
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- if use "qemu_softmmu_targets_${target}"; then
- softmmu_targets+=",${target}-softmmu"
- softmmu_bins+=( "qemu-system-${target}" )
- fi
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- if use "qemu_user_targets_${target}"; then
- user_targets+=",${target}-linux-user"
- user_bins+=( "qemu-${target}" )
- fi
- done
-
- [[ -n ${softmmu_targets} ]] && \
- einfo "Building the following softmmu targets: ${softmmu_targets}"
-
- [[ -n ${user_targets} ]] && \
- einfo "Building the following user targets: ${user_targets}"
-
- if [[ -n ${softmmu_targets} ]]; then
- mkdir "${S}/softmmu-build"
- qemu_src_configure "softmmu" "${S}/softmmu-build"
- fi
-
- if [[ -n ${user_targets} ]]; then
- mkdir "${S}/user-build"
- qemu_src_configure "user" "${S}/user-build"
- fi
-}
-
-src_compile() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- default
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- default
- fi
-}
-
-src_test() {
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- pax-mark m */qemu-system-* #515550
- emake -j1 check
- emake -j1 check-report.html
- fi
-}
-
-qemu_python_install() {
- python_domodule "${S}/scripts/qmp/qmp.py"
-
- python_doscript "${S}/scripts/kvm/kvm_stat"
- python_doscript "${S}/scripts/kvm/vmxcap"
- python_doscript "${S}/scripts/qmp/qmp-shell"
- python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-src_install() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- emake DESTDIR="${ED}" install
-
- # Install binfmt handler init script for user targets
- newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- emake DESTDIR="${ED}" install
-
- # This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dohtml check-report.html
-
- if use kernel_linux; then
- udev_dorules "${FILESDIR}"/65-kvm.rules
- fi
-
- if use python; then
- python_foreach_impl qemu_python_install
- fi
- fi
-
- # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
- pushd "${ED}"/usr/bin >/dev/null
- pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
- popd >/dev/null
-
- # Install config file example for qemu-bridge-helper
- insinto "/etc/qemu"
- doins "${FILESDIR}/bridge.conf"
-
- # Remove the docdir placed qmp-commands.txt
- mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
-
- cd "${S}"
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
- dodoc docs/qmp/*.txt
-
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${ED}/usr/share/qemu/bios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
- fi
-
- # Remove vgabios since we're using the vgabios packaged one
- if [[ -n ${softmmu_targets} ]]; then
- rm "${ED}/usr/share/qemu/vgabios.bin"
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-
- # Remove sgabios since we're using the sgabios packaged one
- rm "${ED}/usr/share/qemu/sgabios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
- fi
-
- # Remove iPXE since we're using the iPXE packaged one
- rm "${ED}"/usr/share/qemu/pxe-*.rom
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
- fi
-
- qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- if qemu_support_kvm; then
- readme.gentoo_print_elog
- ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
- ewarn "save states has been removed starting with the 1.6.2 release"
- ewarn
- ewarn "It is recommended that you migrate any VMs that may be running"
- ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
- ewarn "any saved states with a newer qemu."
- ewarn
- ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-
- if use x86 || use amd64; then
- ewarn
- ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
- ewarn "installed. In order to use kvm acceleration, pass the flag"
- ewarn "-enable-kvm when running your system target."
- fi
- fi
-
- fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
- if use virtfs && [ -n "${softmmu_targets}" ]; then
- local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
- fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
- fi
-}
-
-pkg_info() {
- echo "Using:"
- echo " $(best_version app-emulation/spice-protocol)"
- echo " $(best_version sys-firmware/ipxe)"
- echo " $(best_version sys-firmware/seabios)"
- if has_version sys-firmware/seabios[binary]; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/qemu/qemu-2.2.1-r99.ebuild b/app-emulation/qemu/qemu-2.2.1-r99.ebuild
deleted file mode 100644
index 5b8baf1..0000000
--- a/app-emulation/qemu/qemu-2.2.1-r99.ebuild
+++ /dev/null
@@ -1,610 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild,v 1.3 2015/05/14 07:09:58 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo pax-utils
-
-BACKPORTS=
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.qemu.org/qemu.git"
- inherit git-2
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
- ${BACKPORTS:+
- http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
- KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
-gtk infiniband iscsi +jpeg \
-kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
-+png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
-static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
-mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
-x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-use_targets="
- $(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
- $(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-"
-IUSE+=" ${use_targets}"
-
-# Require at least one softmmu or user target.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="|| ( ${use_targets} )
- ${PYTHON_REQUIRED_USE}
- qemu_softmmu_targets_arm? ( fdt )
- qemu_softmmu_targets_microblaze? ( fdt )
- qemu_softmmu_targets_ppc? ( fdt )
- qemu_softmmu_targets_ppc64? ( fdt )
- static? ( static-softmmu static-user )
- static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
- virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected). This is because qemu supports using the C library's API
-# when available rather than always using the extranl library.
-COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- xattr? ( sys-apps/attr[static-libs(+)] )"
-SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- aio? ( dev-libs/libaio[static-libs(+)] )
- caps? ( sys-libs/libcap-ng[static-libs(+)] )
- curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
- infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
- jpeg? ( virtual/jpeg:=[static-libs(+)] )
- lzo? ( dev-libs/lzo:2[static-libs(+)] )
- ncurses? ( sys-libs/ncurses[static-libs(+)] )
- nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- png? ( media-libs/libpng:0=[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
- sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- snappy? ( app-arch/snappy[static-libs(+)] )
- spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
- ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
- tls? ( net-libs/gnutls[static-libs(+)] )
- usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
- uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
- vde? ( net-misc/vde[static-libs(+)] )
- xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
-X86_FIRMWARE_DEPEND="
- >=sys-firmware/ipxe-1.0.0_p20130624
- pin-upstream-blobs? (
- ~sys-firmware/seabios-1.7.5
- ~sys-firmware/sgabios-0.1_pre8
- ~sys-firmware/vgabios-0.7a
- )
- !pin-upstream-blobs? (
- sys-firmware/seabios
- sys-firmware/sgabios
- sys-firmware/vgabios
- )"
-CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
- !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
- qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
- accessibility? ( app-accessibility/brltty )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bluetooth? ( net-wireless/bluez )
- gtk? (
- x11-libs/gtk+:3
- x11-libs/vte:2.90
- )
- iscsi? ( net-libs/libiscsi )
- opengl? ( virtual/opengl )
- pulseaudio? ( media-sound/pulseaudio )
- python? ( ${PYTHON_DEPS} )
- sdl? ( media-libs/libsdl[X] )
- smartcard? ( dev-libs/nss !app-emulation/libcacard )
- spice? ( >=app-emulation/spice-protocol-0.12.3 )
- systemtap? ( dev-util/systemtap )
- usbredir? ( >=sys-apps/usbredir-0.6 )
- virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools )"
-DEPEND="${CDEPEND}
- dev-lang/perl
- =dev-lang/python-2*
- sys-apps/texinfo
- virtual/pkgconfig
- kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- gtk? ( nls? ( sys-devel/gettext ) )
- static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
- static-user? ( ${USER_LIB_DEPEND} )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-qemu )
-"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
- usr/share/qemu/s390-ccw.img
- usr/share/qemu/u-boot.e500
-"
-
-QA_WX_LOAD="usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-or32
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
- use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
- use qemu_softmmu_targets_s390x; then
- return 0
- fi
-
- return 1
-}
-
-pkg_pretend() {
- if use kernel_linux && kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- elif use kernel_linux; then
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- else
- CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
- ERROR_KVM="You must enable KVM in your kernel to continue"
- ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
- ERROR_KVM_AMD+=" your kernel configuration."
- ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
- ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
- ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
- ERROR_TUN+=" into your kernel or loaded as a module to use the"
- ERROR_TUN+=" virtual network device if using -net tap."
- ERROR_BRIDGE="You will also need support for 802.1d"
- ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
- use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
- ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
- ERROR_VHOST_NET+=" support"
-
- if use amd64 || use x86 || use amd64-linux || use x86-linux; then
- CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
- fi
-
- use python && CONFIG_CHECK+=" ~DEBUG_FS"
- ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
- # Now do the actual checks setup above
- check_extra_config
- fi
- fi
-
- if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
- eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
- eerror "instances are still pointing to it. Please update your"
- eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
- eerror "and the right system binary (e.g. qemu-system-x86_64)."
- die "update your virt configs to not use qemu-kvm"
- fi
-}
-
-pkg_setup() {
- enewgroup kvm 78
- python_setup
-}
-
-src_prepare() {
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i -r \
- -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target || die
-
- # Cheap hack to disable gettext .mo generation.
- use nls || rm -f po/*.po
-
- epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
- epatch "${FILESDIR}"/${P}-CVE-2015-1779-1.patch #544328
- epatch "${FILESDIR}"/${P}-CVE-2015-1779-2.patch #544328
- epatch "${FILESDIR}"/${PN}-2.3.0-CVE-2015-3456.patch #549404
-
- # Patching for musl
- epatch "${FILESDIR}"/${PN}-2.0.0-F_SHLCK-and-F_EXLCK.patch
- epatch "${FILESDIR}"/${PN}-2.0.0-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
- epatch "${FILESDIR}"/${PN}-2.2.0-_sigev_un.patch
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- # Fix ld and objcopy being called directly
- tc-export AR LD OBJCOPY
-
- # Verbose builds
- MAKEOPTS+=" V=1"
-
- epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- local buildtype=$1
- local builddir=$2
- local static_flag="static-${buildtype}"
-
- # audio options
- local audio_opts="oss"
- use alsa && audio_opts="alsa,${audio_opts}"
- use sdl && audio_opts="sdl,${audio_opts}"
- use pulseaudio && audio_opts="pa,${audio_opts}"
-
- local conf_opts=(
- --prefix=/usr
- --sysconfdir=/etc
- --libdir=/usr/$(get_libdir)
- --docdir=/usr/share/doc/${PF}/html
- --disable-bsd-user
- --disable-guest-agent
- --disable-strip
- --disable-werror
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- $(use_enable debug debug-info)
- $(use_enable debug debug-tcg)
- --enable-docs
- $(use_enable tci tcg-interpreter)
- $(use_enable xattr attr)
- )
-
- # Disable options not used by user targets as the default configure
- # options will autoprobe and try to link in a bunch of unused junk.
- conf_softmmu() {
- if [[ ${buildtype} == "user" ]] ; then
- echo "--disable-${2:-$1}"
- else
- use_enable "$@"
- fi
- }
- conf_opts+=(
- $(conf_softmmu accessibility brlapi)
- $(conf_softmmu aio linux-aio)
- $(conf_softmmu bluetooth bluez)
- $(conf_softmmu caps cap-ng)
- $(conf_softmmu curl)
- $(conf_softmmu fdt)
- $(conf_softmmu glusterfs)
- $(conf_softmmu gtk)
- $(conf_softmmu infiniband rdma)
- $(conf_softmmu iscsi libiscsi)
- $(conf_softmmu jpeg vnc-jpeg)
- $(conf_softmmu kernel_linux kvm)
- $(conf_softmmu lzo)
- $(conf_softmmu ncurses curses)
- $(conf_softmmu nfs libnfs)
- $(conf_softmmu numa)
- $(conf_softmmu opengl glx)
- $(conf_softmmu png vnc-png)
- $(conf_softmmu rbd)
- $(conf_softmmu sasl vnc-sasl)
- $(conf_softmmu sdl)
- $(conf_softmmu seccomp)
- $(conf_softmmu smartcard smartcard-nss)
- $(conf_softmmu snappy)
- $(conf_softmmu spice)
- $(conf_softmmu ssh libssh2)
- $(conf_softmmu tls quorum)
- $(conf_softmmu tls vnc-tls)
- $(conf_softmmu tls vnc-ws)
- $(conf_softmmu usb libusb)
- $(conf_softmmu usbredir usb-redir)
- $(conf_softmmu uuid)
- $(conf_softmmu vde)
- $(conf_softmmu vhost-net)
- $(conf_softmmu virtfs)
- $(conf_softmmu vnc)
- $(conf_softmmu xen)
- $(conf_softmmu xen xen-pci-passthrough)
- $(conf_softmmu xfs xfsctl)
- )
-
- case ${buildtype} in
- user)
- conf_opts+=(
- --enable-linux-user
- --disable-system
- --target-list="${user_targets}"
- --disable-blobs
- --disable-tools
- )
- ;;
- softmmu)
- conf_opts+=(
- --disable-linux-user
- --enable-system
- --target-list="${softmmu_targets}"
- --with-system-pixman
- --audio-drv-list="${audio_opts}"
- )
- use gtk && conf_opts+=( --with-gtkabi=3.0 )
- ;;
- esac
-
- # Add support for SystemTAP
- use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
- # We always want to attempt to build with PIE support as it results
- # in a more secure binary. But it doesn't work with static or if
- # the current GCC doesn't have PIE support.
- if use ${static_flag}; then
- conf_opts+=( --static --disable-pie )
- else
- gcc-specs-pie && conf_opts+=( --enable-pie )
- fi
-
- einfo "../configure ${conf_opts[*]}"
- cd "${builddir}"
- ../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
- local target
-
- python_export_best
-
- softmmu_targets= softmmu_bins=()
- user_targets= user_bins=()
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- if use "qemu_softmmu_targets_${target}"; then
- softmmu_targets+=",${target}-softmmu"
- softmmu_bins+=( "qemu-system-${target}" )
- fi
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- if use "qemu_user_targets_${target}"; then
- user_targets+=",${target}-linux-user"
- user_bins+=( "qemu-${target}" )
- fi
- done
-
- [[ -n ${softmmu_targets} ]] && \
- einfo "Building the following softmmu targets: ${softmmu_targets}"
-
- [[ -n ${user_targets} ]] && \
- einfo "Building the following user targets: ${user_targets}"
-
- if [[ -n ${softmmu_targets} ]]; then
- mkdir "${S}/softmmu-build"
- qemu_src_configure "softmmu" "${S}/softmmu-build"
- fi
-
- if [[ -n ${user_targets} ]]; then
- mkdir "${S}/user-build"
- qemu_src_configure "user" "${S}/user-build"
- fi
-}
-
-src_compile() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- default
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- default
- fi
-}
-
-src_test() {
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- pax-mark m */qemu-system-* #515550
- emake -j1 check
- emake -j1 check-report.html
- fi
-}
-
-qemu_python_install() {
- python_domodule "${S}/scripts/qmp/qmp.py"
-
- python_doscript "${S}/scripts/kvm/kvm_stat"
- python_doscript "${S}/scripts/kvm/vmxcap"
- python_doscript "${S}/scripts/qmp/qmp-shell"
- python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-src_install() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- emake DESTDIR="${ED}" install
-
- # Install binfmt handler init script for user targets
- newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- emake DESTDIR="${ED}" install
-
- # This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dohtml check-report.html
-
- if use kernel_linux; then
- udev_dorules "${FILESDIR}"/65-kvm.rules
- fi
-
- if use python; then
- python_foreach_impl qemu_python_install
- fi
- fi
-
- # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
- pushd "${ED}"/usr/bin >/dev/null
- pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
- popd >/dev/null
-
- # Install config file example for qemu-bridge-helper
- insinto "/etc/qemu"
- doins "${FILESDIR}/bridge.conf"
-
- # Remove the docdir placed qmp-commands.txt
- mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
-
- cd "${S}"
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
- dodoc docs/qmp/*.txt
-
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${ED}/usr/share/qemu/bios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
- fi
-
- # Remove vgabios since we're using the vgabios packaged one
- if [[ -n ${softmmu_targets} ]]; then
- rm "${ED}/usr/share/qemu/vgabios.bin"
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-
- # Remove sgabios since we're using the sgabios packaged one
- rm "${ED}/usr/share/qemu/sgabios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
- fi
-
- # Remove iPXE since we're using the iPXE packaged one
- rm "${ED}"/usr/share/qemu/pxe-*.rom
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
- fi
-
- qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- if qemu_support_kvm; then
- readme.gentoo_print_elog
- ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
- ewarn "save states has been removed starting with the 1.6.2 release"
- ewarn
- ewarn "It is recommended that you migrate any VMs that may be running"
- ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
- ewarn "any saved states with a newer qemu."
- ewarn
- ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-
- if use x86 || use amd64; then
- ewarn
- ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
- ewarn "installed. In order to use kvm acceleration, pass the flag"
- ewarn "-enable-kvm when running your system target."
- fi
- fi
-
- if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
- udev_reload
- fi
-
- fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
- if use virtfs && [ -n "${softmmu_targets}" ]; then
- local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
- fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
- fi
-}
-
-pkg_info() {
- echo "Using:"
- echo " $(best_version app-emulation/spice-protocol)"
- echo " $(best_version sys-firmware/ipxe)"
- echo " $(best_version sys-firmware/seabios)"
- if has_version sys-firmware/seabios[binary]; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch b/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
deleted file mode 100644
index be6ffc5..0000000
--- a/app-emulation/wine/files/wine-1.4_rc2-multilib-portage.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=395615
-
-Explicitly add the required -m32/m64 to *FLAGS; this overrides any
-arch-specific -m* flags that may have been appended by multilib-portage.
-
-Even though -m32/m64 is now added to *FLAGS, -m32/m64 still has to be
-explicitly added to CC and CXX due to wine's build system. For example,
-winegcc saves the build-time value of CC and uses it at runtime.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,12 +133,18 @@
- then
- CC="$CC -m64"
- CXX="$CXX -m64"
-+ CFLAGS="$CFLAGS -m64"
-+ LDFLAGS="$LDFLAGS -m64"
-+ CXXFLAGS="$CXXFLAGS -m64"
- host_cpu="x86_64"
- notice_platform="64-bit "
- AC_SUBST(TARGETFLAGS,"-m64")
- else
- CC="$CC -m32"
- CXX="$CXX -m32"
-+ CFLAGS="$CFLAGS -m32"
-+ LDFLAGS="$LDFLAGS -m32"
-+ CXXFLAGS="$CXXFLAGS -m32"
- host_cpu="i386"
- notice_platform="32-bit "
- AC_SUBST(TARGETFLAGS,"-m32")
-@@ -150,6 +156,9 @@
- then
- CC="$CC -m32"
- CXX="$CXX -m32"
-+ CFLAGS="$CFLAGS -m32"
-+ LDFLAGS="$LDFLAGS -m32"
-+ CXXFLAGS="$CXXFLAGS -m32"
- AC_MSG_CHECKING([whether $CC works])
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]),
- [AC_MSG_RESULT([no])
diff --git a/app-emulation/wine/files/wine-1.5.19-file_h.patch b/app-emulation/wine/files/wine-1.5.19-file_h.patch
deleted file mode 100644
index aa2aca4..0000000
--- a/app-emulation/wine/files/wine-1.5.19-file_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-taken from sabotage linux
---- wine-1.5.19/server/file.h 2012-12-07 19:17:32.000000000 +0000
-+++ wine-1.5.19.patched/server/file.h 2012-12-19 03:29:07.092000002 +0000
-@@ -22,7 +22,7 @@
- #define __WINE_SERVER_FILE_H
-
- #include "object.h"
--
-+#include <fcntl.h>
- struct fd;
- struct mapping;
- struct async_queue;
diff --git a/app-emulation/wine/files/wine-1.5.19-getdents.patch b/app-emulation/wine/files/wine-1.5.19-getdents.patch
deleted file mode 100644
index b1b5dad..0000000
--- a/app-emulation/wine/files/wine-1.5.19-getdents.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-taken from sabotage linux
---- wine-1.5.19/dlls/ntdll/directory.c 2012-12-07 19:17:32.000000000 +0000
-+++ wine-1.5.19.patched/dlls/ntdll/directory.c 2012-12-19 04:47:29.148000002 +0000
-@@ -119,7 +119,7 @@
- char d_name[256];
- } KERNEL_DIRENT64;
-
--static inline int getdents64( int fd, char *de, unsigned int size )
-+static inline int BUG_getdents64( int fd, char *de, unsigned int size )
- {
- return syscall( SYS_getdents64, fd, de, size );
- }
diff --git a/app-emulation/wine/files/wine-1.5.26-winegcc.patch b/app-emulation/wine/files/wine-1.5.26-winegcc.patch
deleted file mode 100644
index 2045e34..0000000
--- a/app-emulation/wine/files/wine-1.5.26-winegcc.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://bugs.gentoo.org/260726
-
-diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
-index 16b4165..5c77267 100644
---- a/tools/winebuild/main.c
-+++ b/tools/winebuild/main.c
-@@ -48,10 +48,13 @@ int link_ext_symbols = 0;
- int force_pointer_size = 0;
- int unwind_tables = 0;
-
-+#undef FORCE_POINTER_SIZE
- #ifdef __i386__
- enum target_cpu target_cpu = CPU_x86;
-+#define FORCE_POINTER_SIZE
- #elif defined(__x86_64__)
- enum target_cpu target_cpu = CPU_x86_64;
-+#define FORCE_POINTER_SIZE
- #elif defined(__powerpc__)
- enum target_cpu target_cpu = CPU_POWERPC;
- #elif defined(__arm__)
-@@ -611,6 +614,10 @@ int main(int argc, char **argv)
- signal( SIGTERM, exit_on_signal );
- signal( SIGINT, exit_on_signal );
-
-+#ifdef FORCE_POINTER_SIZE
-+ force_pointer_size = sizeof(size_t);
-+#endif
-+
- output_file = stdout;
- argv = parse_options( argc, argv, spec );
-
-diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
-index 06aa200..c44d2e3 100644
---- a/tools/winegcc/winegcc.c
-+++ b/tools/winegcc/winegcc.c
-@@ -213,10 +213,13 @@ struct options
- strarray* files;
- };
-
-+#undef FORCE_POINTER_SIZE
- #ifdef __i386__
- static const enum target_cpu build_cpu = CPU_x86;
-+#define FORCE_POINTER_SIZE
- #elif defined(__x86_64__)
- static const enum target_cpu build_cpu = CPU_x86_64;
-+#define FORCE_POINTER_SIZE
- #elif defined(__powerpc__)
- static const enum target_cpu build_cpu = CPU_POWERPC;
- #elif defined(__arm__)
-@@ -1258,6 +1261,9 @@ int main(int argc, char **argv)
- opts.linker_args = strarray_alloc();
- opts.compiler_args = strarray_alloc();
- opts.winebuild_args = strarray_alloc();
-+#ifdef FORCE_POINTER_SIZE
-+ opts.force_pointer_size = sizeof(size_t);
-+#endif
-
- /* determine the processor type */
- if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp;
diff --git a/app-emulation/wine/files/wine-1.6-memset-O3.patch b/app-emulation/wine/files/wine-1.6-memset-O3.patch
deleted file mode 100644
index 75372f8..0000000
--- a/app-emulation/wine/files/wine-1.6-memset-O3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Avoid "undefined reference to `memset'" error when building with
-USE=custom-cflags and -O3 in CFLAGS with gcc-4.8.
-
-See:
-
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56888
-http://bugs.winehq.org/show_bug.cgi?id=33521
-https://bugs.gentoo.org/show_bug.cgi?id=480508
-
-diff --git a/configure.ac b/configure.ac
-index d8033cf..fe7cc7d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1767,6 +1767,7 @@ then
-
- dnl Check for some compiler flags
- WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
-+ WINE_TRY_CFLAGS([-fno-tree-loop-distribute-patterns])
- WINE_TRY_CFLAGS([-fno-strict-aliasing])
- dnl clang needs to be told to fail on unknown options
- saved_CFLAGS=$CFLAGS
diff --git a/app-emulation/wine/files/wine-1.6.2-ipx.patch b/app-emulation/wine/files/wine-1.6.2-ipx.patch
deleted file mode 100644
index 9b515b4..0000000
--- a/app-emulation/wine/files/wine-1.6.2-ipx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/wine-1.6.2/dlls/ws2_32/socket.c
-+++ b/wine-1.6.2/dlls/ws2_32/socket.c
-@@ -2835,7 +2835,7 @@
- return SOCKET_ERROR;
- } /* end switch(optname) */
- }/* end case WS_SOL_SOCKET */
--#ifdef HAS_IPX
-+#if 0
- case NSPROTO_IPX:
- {
- struct WS_sockaddr_ipx addr;
-@@ -4372,7 +4372,7 @@
- }
- break; /* case WS_SOL_SOCKET */
-
--#ifdef HAS_IPX
-+#if 0
- case NSPROTO_IPX:
- switch(optname)
- {
diff --git a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch b/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch
deleted file mode 100644
index e20ea2c..0000000
--- a/app-emulation/wine/files/wine-1.7.2-osmesa-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b7eb1ff48dd1210aa3e1002afc503d5df75d50b9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 7 Aug 2012 01:29:01 -0400
-Subject: [PATCH] Do not check for libGL symbols when checking libOSMesa
-
-If mesa had been built with shared glapi, glAccum is not available in
-libOSMesa without explicitly linking to libGL. In addition, in
-mesa-8.0.x and earlier, libOSMesa needs to be explicitly linked to
-libglapi if mesa was built with shared glapi, see
-https://bugs.gentoo.org/show_bug.cgi?id=399813
-And in mesa-8.1.x, libOSMesa in addition needs libdl, libpthread, and
-libstdc++, see https://bugs.gentoo.org/show_bug.cgi?id=431832
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 66b4dd6..0303d87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1213,7 +1213,13 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
-
- if test "x$with_osmesa" != "xno"
- then
-- WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+ if test "x$ac_cv_lib_soname_OSMesa" = "x"; then
-+ osmesa_save_CC=$CC
-+ CC=$CXX
-+ WINE_CHECK_SONAME(OSMesa,OSMesaCreateContext,,,[-lglapi -lpthread -ldl $X_LIBS $XLIB -lm $X_EXTRA_LIBS])
-+ CC=$osmesa_save_CC
-+ fi
- WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"],
- [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
- fi
---
-1.8.3.2
-
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
deleted file mode 100644
index 86bc416..0000000
--- a/app-emulation/wine/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>wine</herd>
-<longdescription>
-Wine is an Open Source implementation of the Windows API on top of X and Unix.
-
-Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
-</longdescription>
-<use>
- <flag name='capi'>Enable ISDN support via CAPI</flag>
- <flag name='custom-cflags'>Bypass strip-flags; use at your own peril</flag>
- <flag name='dos'>Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
- <flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
- <flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
- <flag name='opencl'>Enable OpenCL support</flag>
- <flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
- <flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
- <flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
- <flag name='realtime'>Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
- <flag name='run-exes'>Use Wine to open and run .EXE and .MSI files</flag>
- <flag name='samba'>Add support for NTLM auth. see
- http://wiki.winehq.org/NtlmAuthSetupGuide and
- http://wiki.winehq.org/NtlmSigningAndSealing</flag>
- <flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/app-emulation/wine/wine-1.6.2-r99.ebuild b/app-emulation/wine/wine-1.6.2-r99.ebuild
deleted file mode 100644
index ea68ee2..0000000
--- a/app-emulation/wine/wine-1.6.2-r99.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.6.2.ebuild,v 1.3 2014/03/12 05:16:55 phajdan.jr Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools-multilib eutils fdo-mime flag-o-matic gnome2-utils l10n multilib pax-utils toolchain-funcs virtualx
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
- inherit git-2
- SRC_URI=""
- #KEYWORDS=""
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
- KEYWORDS="-* x86"
- S=${WORKDIR}/${MY_P}
-fi
-
-GV="2.21"
-MV="0.0.8"
-PULSE_PATCHES="winepulse-patches-1.7.8"
-WINE_GENTOO="wine-gentoo-2013.06.24"
-DESCRIPTION="Free implementation of Windows(tm) on Unix"
-HOMEPAGE="http://www.winehq.org/"
-SRC_URI="${SRC_URI}
- gecko? (
- abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
- abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
- )
- mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
- pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
- http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa oss +perl +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- test? ( abi_x86_32 )
- elibc_glibc? ( threads )
- mono? ( abi_x86_32 )
- osmesa? ( opengl )" #286560
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-NATIVE_DEPEND="
- truetype? ( >=media-libs/freetype-2.0.0 )
- capi? ( net-dialup/capi4k-utils )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- udisks? ( sys-apps/dbus )
- fontconfig? ( media-libs/fontconfig:= )
- gphoto2? ( media-libs/libgphoto2:= )
- openal? ( media-libs/openal:= )
- gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
- X? (
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXi
- x11-libs/libXxf86vm
- )
- xinerama? ( x11-libs/libXinerama )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups:= )
- opencl? ( virtual/opencl )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- gsm? ( media-sound/gsm:= )
- jpeg? ( virtual/jpeg:0= )
- ldap? ( net-nds/openldap:= )
- lcms? ( media-libs/lcms:2= )
- mp3? ( >=media-sound/mpg123-1.5.0 )
- nls? ( sys-devel/gettext )
- odbc? ( dev-db/unixODBC:= )
- osmesa? ( media-libs/mesa[osmesa] )
- pulseaudio? ( media-sound/pulseaudio )
- xml? ( dev-libs/libxml2 dev-libs/libxslt )
- scanner? ( media-gfx/sane-backends:= )
- ssl? ( net-libs/gnutls:= )
- png? ( media-libs/libpng:0= )
- v4l? ( media-libs/libv4l )
- xcomposite? ( x11-libs/libXcomposite )"
-
-COMMON_DEPEND="
- !amd64? ( ${NATIVE_DEPEND} )
- amd64? (
- abi_x86_64? ( ${NATIVE_DEPEND} )
- abi_x86_32? (
- truetype? ( || (
- >=app-emulation/emul-linux-x86-xlibs-2.1[development]
- >=media-libs/freetype-2.0.0[abi_x86_32]
- ) )
- ncurses? ( || (
- app-emulation/emul-linux-x86-baselibs[development]
- sys-libs/ncurses[abi_x86_32]
- ) )
- udisks? ( || (
- >=app-emulation/emul-linux-x86-baselibs-20130224[development]
- sys-apps/dbus[abi_x86_32]
- ) )
- fontconfig? ( || (
- app-emulation/emul-linux-x86-xlibs[development]
- media-libs/fontconfig[abi_x86_32]
- ) )
- gphoto2? (
- app-emulation/emul-linux-x86-medialibs[development]
- )
- openal? ( || (
- app-emulation/emul-linux-x86-sdl[development]
- media-libs/openal[abi_x86_32]
- ) )
- gstreamer? (
- app-emulation/emul-linux-x86-gstplugins
- app-emulation/emul-linux-x86-medialibs[development]
- )
- X? ( || (
- app-emulation/emul-linux-x86-xlibs[development]
- (
- x11-libs/libXcursor[abi_x86_32]
- x11-libs/libXext[abi_x86_32]
- x11-libs/libXrandr[abi_x86_32]
- x11-libs/libXi[abi_x86_32]
- x11-libs/libXxf86vm[abi_x86_32]
- )
- ) )
- xinerama? ( || (
- app-emulation/emul-linux-x86-xlibs[development]
- x11-libs/libXinerama[abi_x86_32]
- ) )
- alsa? ( || (
- app-emulation/emul-linux-x86-soundlibs[alsa,development]
- media-libs/alsa-lib[abi_x86_32]
- ) )
- cups? ( app-emulation/emul-linux-x86-baselibs )
- opencl? ( virtual/opencl[abi_x86_32] )
- opengl? ( || (
- app-emulation/emul-linux-x86-opengl[development]
- (
- virtual/glu[abi_x86_32]
- virtual/opengl[abi_x86_32]
- )
- ) )
- gsm? ( || (
- app-emulation/emul-linux-x86-soundlibs[development]
- media-sound/gsm[abi_x86_32]
- ) )
- jpeg? ( || (
- app-emulation/emul-linux-x86-baselibs[development]
- virtual/jpeg:0[abi_x86_32]
- ) )
- ldap? ( app-emulation/emul-linux-x86-baselibs[development] )
- lcms? ( || (
- app-emulation/emul-linux-x86-baselibs[development]
- media-libs/lcms:2[abi_x86_32]
- ) )
- mp3? ( || (
- app-emulation/emul-linux-x86-soundlibs[development]
- >=media-sound/mpg123-1.5.0[abi_x86_32]
- ) )
- nls? ( || (
- app-emulation/emul-linux-x86-baselibs[development]
- sys-devel/gettext[abi_x86_32]
- ) )
- odbc? ( app-emulation/emul-linux-x86-db[development] )
- osmesa? ( || (
- >=app-emulation/emul-linux-x86-opengl-20121028[development]
- media-libs/mesa[osmesa,abi_x86_32]
- ) )
- pulseaudio? ( || (
- app-emulation/emul-linux-x86-soundlibs[development]
- >=media-sound/pulseaudio-4.0-r1[abi_x86_32]
- ) )
- xml? ( || (
- >=app-emulation/emul-linux-x86-baselibs-20130224[development]
- (
- dev-libs/libxml2[abi_x86_32]
- dev-libs/libxslt[abi_x86_32]
- )
- ) )
- scanner? ( app-emulation/emul-linux-x86-medialibs[development] )
- ssl? ( app-emulation/emul-linux-x86-baselibs[development] )
- png? ( || (
- app-emulation/emul-linux-x86-baselibs[development]
- media-libs/libpng:0[abi_x86_32]
- ) )
- v4l? ( || (
- app-emulation/emul-linux-x86-medialibs[development]
- media-libs/libv4l[abi_x86_32]
- ) )
- xcomposite? ( || (
- app-emulation/emul-linux-x86-xlibs[development]
- x11-libs/libXcomposite[abi_x86_32]
- ) )
- )
- )"
-
-RDEPEND="${COMMON_DEPEND}
- dos? ( games-emulation/dosbox )
- perl? ( dev-lang/perl dev-perl/XML-Simple )
- samba? ( >=net-fs/samba-3.0.25 )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )
- pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
-
-DEPEND="${COMMON_DEPEND}
- amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
- X? (
- x11-proto/inputproto
- x11-proto/xextproto
- x11-proto/xf86vidmodeproto
- )
- xinerama? ( x11-proto/xineramaproto )
- prelink? ( sys-devel/prelink )
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- sys-devel/flex"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
- eerror "You need gcc-4.4+ to build 64-bit wine"
- eerror
- return 1
- fi
-
- if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-}
-
-pkg_setup() {
- wine_build_environment_check || die
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- else
- unpack ${MY_P}.tar.bz2
- fi
-
- use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
- unpack "${WINE_GENTOO}.tar.bz2"
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
- local md5="$(md5sum server/protocol.def)"
- local PATCHES=(
- "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
- "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
- "${FILESDIR}"/${PN}-1.7.2-osmesa-check.patch #429386
- "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
- "${FILESDIR}"/${PN}-1.5.19-getdents.patch #for musl
- "${FILESDIR}"/${PN}-1.5.19-file_h.patch #for musl
- "${FILESDIR}"/${PN}-1.6.2-ipx.patch #for musl
- )
- use pulseaudio && PATCHES+=(
- "../${PULSE_PATCHES}"/*.patch #421365
- )
-
- autotools-utils_src_prepare
-
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' tools/wine.desktop || die #117785
- fi
-
- # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
-}
-
-do_configure() {
- local myeconfargs=( "${myeconfargs[@]}" )
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myeconfargs+=( --enable-win64 )
- else
- myeconfargs+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- append-cppflags -DNETDB_INTERNAL=-1
-
- local myeconfargs=( # common
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with ldap)
- $(use_with mp3 mpg123)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with png)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with v4l)
- $(use_with X x)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- use pulseaudio && myeconfargs+=( --with-pulse )
-
- if use amd64 && use abi_x86_32; then
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
- fi
-
- multilib_parallel_foreach_abi do_configure
-}
-
-src_compile() {
- autotools-multilib_src_compile depend
- autotools-multilib_src_compile all
-}
-
-src_test() {
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- multilib_toolchain_setup x86
- local BUILD_DIR="${S}-${ABI}"
- cd "${BUILD_DIR}" || die
- WINEPREFIX="${T}/.wine-${ABI}" Xemake test
-}
-
-src_install() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS=( "${DOCS[@]}" ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
- autotools-multilib_src_install
-
- emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
- if use gecko ; then
- insinto /usr/share/wine/gecko
- use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
- use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
- fi
- if use mono ; then
- insinto /usr/share/wine/mono
- doins "${DISTDIR}"/wine-mono-${MV}.msi
- fi
- if ! use perl ; then
- rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
- fi
-
- use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym /usr/bin/wine{64,} # 404331
- dosym /usr/bin/wine{64,}-preloader
- fi
-
- # respect LINGUAS when installing man pages, #469418
- for l in de fr pl; do
- use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
- done
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
deleted file mode 100644
index 370b4aa..0000000
--- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
-Date: Sun, 4 Jan 2015 15:33:35 +0100
-Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
- sh=dash users
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Original patch by Rémi Cardona <remi@gentoo.org>
-
-Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
-Reviewed-on: https://gerrit.libreoffice.org/13731
-Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-Tested-by: Caolán McNamara <caolanm@redhat.com>
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8aa33d0..5dbe640 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11483,9 +11483,8 @@ test_font_map()
- FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
-
- TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
-- while true ; do
-+ while test "$#" -ge 1 ; do
- MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
-- test -n "$MAPPING" || break
- TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
- done
- if test $TESTEXPR
---
-2.3.0
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
deleted file mode 100644
index 1cf8e19..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4-system-pyuno.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index a259bf6..672fa23 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
- exit 1;
- fi
-
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index 4ff2606..6a05eed 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -16,8 +16,12 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
-+import os
- import sys
-
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
- import pyuno
-
- try:
-diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
-index 99d3b03..704edab 100755
---- a/pyuno/source/officehelper.py
-+++ b/pyuno/source/officehelper.py
-@@ -44,7 +44,7 @@ def bootstrap():
- if "UNO_PATH" in os.environ:
- sOffice = os.environ["UNO_PATH"]
- else:
-- sOffice = "" # lets hope for the best
-+ sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
- sOffice = os.path.join(sOffice, "soffice")
- if platform.startswith("win"):
- sOffice += ".exe"
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
deleted file mode 100644
index 0f39688..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-gcc-4.9-Os-link-failure.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0e4b1d2127957459b79f41a96f1fa0061d399b3b Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Sat, 14 Feb 2015 00:17:06 +0100
-Subject: tdf#78174: toolkit: work around GCC 4.9 -Os link failure
-
-A build with gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1) for 32-bit x86
-fails because of these undefined symbols:
-
-> nm --demangle workdir/CxxObject/svx/source/fmcomp/fmgridif.o | grep
- \\bWindowListenerMultiplexer::acquire
- U non-virtual thunk to WindowListenerMultiplexer::acquire()
-
-They should probably be generated inline. Work around by out-lining the
-definition of the methods.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
-
-Change-Id: I318f7c39bdf1243be385bc6dc0a47862b22e92c5
-(cherry picked from commit 6b3aa0fe4094e87290bd33a30bd6cd99ee78ce38)
-Reviewed-on: https://gerrit.libreoffice.org/14509
-Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-
-diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
-index e048e75..b212dff 100644
---- a/include/toolkit/helper/macros.hxx
-+++ b/include/toolkit/helper/macros.hxx
-@@ -112,8 +112,8 @@ class ClassName : public ListenerMultiplexerBase, public InterfaceName \
- public: \
- ClassName( ::cppu::OWeakObject& rSource ); \
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
-- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \
-- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \
-+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+ void SAL_CALL release() throw() SAL_OVERRIDE; \
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
-@@ -124,8 +124,8 @@ class TOOLKIT_DLLPUBLIC ClassName : public ListenerMultiplexerBase, public Inter
- public: \
- ClassName( ::cppu::OWeakObject& rSource ); \
- ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; \
-- void SAL_CALL acquire() throw() SAL_OVERRIDE { ListenerMultiplexerBase::acquire(); } \
-- void SAL_CALL release() throw() SAL_OVERRIDE { ListenerMultiplexerBase::release(); } \
-+ void SAL_CALL acquire() throw() SAL_OVERRIDE; \
-+ void SAL_CALL release() throw() SAL_OVERRIDE; \
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-
-@@ -140,6 +140,8 @@ ClassName::ClassName( ::cppu::OWeakObject& rSource ) \
- : ListenerMultiplexerBase( rSource ) \
- { \
- } \
-+void SAL_CALL ClassName::acquire() throw() { ListenerMultiplexerBase::acquire(); } \
-+void SAL_CALL ClassName::release() throw() { ListenerMultiplexerBase::release(); } \
- ::com::sun::star::uno::Any ClassName::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
- { \
- ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, \
-diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
-index 797fad2..b109c5f 100644
---- a/toolkit/source/helper/listenermultiplexer.cxx
-+++ b/toolkit/source/helper/listenermultiplexer.cxx
-@@ -47,6 +47,15 @@ EventListenerMultiplexer::EventListenerMultiplexer( ::cppu::OWeakObject& rSource
- {
- }
-
-+void SAL_CALL EventListenerMultiplexer::acquire() throw ()
-+{
-+ return ListenerMultiplexerBase::acquire();
-+}
-+void SAL_CALL EventListenerMultiplexer::release() throw ()
-+{
-+ return ListenerMultiplexerBase::release();
-+}
-+
- // ::com::sun::star::uno::XInterface
- ::com::sun::star::uno::Any EventListenerMultiplexer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception)
- {
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
deleted file mode 100644
index 2833385..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sun, 11 Jan 2015 13:08:37 +0100
-Subject: OSL_ENSURE was not declared in this scope
-
-Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
-
-diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
-index 86986fc..df4a63f 100644
---- a/tubes/source/conference.cxx
-+++ b/tubes/source/conference.cxx
-@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
-
- void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
- {
-- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
-+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
- if (mpChannel)
- g_object_unref( mpChannel);
- if (mpAccount)
-@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
- {
- INFO_LOGGER( "TeleConference::offerTube");
-
-- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
-+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
- if (!mpChannel)
- return false;
-
-@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
- {
- INFO_LOGGER( "TeleConference::setTube");
-
-- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
-+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
-
- pImpl->mpTube = pTube;
-
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
deleted file mode 100644
index d4c4d28..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <glogow@fbihome.de>
-Date: Wed, 26 Nov 2014 13:35:42 +0100
-Subject: Add kde4-open-url script
-
-Adds a KDE4 specific URL processing script.
-
-Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4
-
-diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
-index c5e4978..162bcc5 100644
---- a/shell/Package_scripts_kde.mk
-+++ b/shell/Package_scripts_kde.mk
-@@ -9,6 +9,12 @@
-
- $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-
-+ifeq ($(ENABLE_KDE),TRUE)
- $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-+endif
-+
-+ifeq ($(ENABLE_KDE4),TRUE)
-+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
-+endif
-
- # vim: set shiftwidth=4 tabstop=4 noexpandtab:
-diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh
-new file mode 100755
-index 0000000..e5b8125
---- /dev/null
-+++ b/shell/source/unix/misc/kde4-open-url.sh
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+# This file incorporates work covered by the following license notice:
-+#
-+# Licensed to the Apache Software Foundation (ASF) under one or more
-+# contributor license agreements. See the NOTICE file distributed
-+# with this work for additional information regarding copyright
-+# ownership. The ASF licenses this file to you under the Apache
-+# License, Version 2.0 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-+#
-+
-+# use kde-open or xdg-open if available, falling back to our own open-url
-+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
-+exit 0
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch
deleted file mode 100644
index b1f1b44..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-fix-includes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:46.879497689 -0200
-+++ libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:55.482831474 -0200
-@@ -32,6 +32,7 @@
- #include <list>
-
- #include <time.h>
-+#include <sys/time.h>
-
- #define VIRTUAL_DESKTOP_WIDTH 1024
- #define VIRTUAL_DESKTOP_HEIGHT 768
---- libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:22.822959064 -0200
-+++ libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:48.312960404 -0200
-@@ -18,6 +18,7 @@
- */
-
- #include "cairotextrender.hxx"
-+#include "generic/glyphcache.hxx"
-
- #include <basegfx/polygon/b2dpolypolygon.hxx>
- #include <vcl/settings.hxx>
---- libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:36.590056362 -0200
-+++ libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:46.030056456 -0200
-@@ -22,7 +22,7 @@
- #include <dbus/dbus.h>
- #include <errno.h>
- #include <fcntl.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/socket.h>
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/rfcomm.h>
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
deleted file mode 100644
index 61e036e..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles"
-
-
-diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
---- b/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
-
- #include "generic/geninst.h"
-
-+#include "svids.hrc"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -109,7 +111,6 @@
-
- KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& )
- : KDE4FilePicker_Base(_helperMutex)
-- , _resMgr( ResMgr::CreateResMgr("fps_office") )
- , allowRemoteUrls( false )
- {
- _extraControls = new QWidget();
-@@ -128,8 +129,7 @@
- #endif
-
- setMultiSelectionMode( false );
-- //default mode
-- _dialog->setOperationMode(KFileDialog::Opening);
-+ _dialog->setConfirmOverwrite( true );
-
- // XExecutableDialog functions
- connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +202,6 @@
- SalYieldMutexReleaser aReleaser;
- return Q_EMIT cleanupProxySignal();
- }
-- delete _resMgr;
- delete _dialog;
- }
-
-@@ -524,6 +523,24 @@
- return toOUString(label);
- }
-
-+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
-+{
-+ QString aResString;
-+
-+ if( aRedId < 0 )
-+ return aResString;
-+
-+ try
-+ {
-+ aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
-+ }
-+ catch(...)
-+ {
-+ }
-+
-+ return aResString.replace('~', '&');
-+}
-+
- void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
- {
- QWidget* widget = 0;
-@@ -532,37 +549,37 @@
- switch (controlId)
- {
- case CHECKBOX_AUTOEXTENSION:
-- resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
-+ resId = STR_FPICKER_AUTO_EXTENSION;
- break;
- case CHECKBOX_PASSWORD:
-- resId = STR_SVT_FILEPICKER_PASSWORD;
-+ resId = STR_FPICKER_PASSWORD;
- break;
- case CHECKBOX_FILTEROPTIONS:
-- resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
-+ resId = STR_FPICKER_FILTER_OPTIONS;
- break;
- case CHECKBOX_READONLY:
-- resId = STR_SVT_FILEPICKER_READONLY;
-+ resId = STR_FPICKER_READONLY;
- break;
- case CHECKBOX_LINK:
-- resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
-+ resId = STR_FPICKER_INSERT_AS_LINK;
- break;
- case CHECKBOX_PREVIEW:
-- resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
-+ resId = STR_FPICKER_SHOW_PREVIEW;
- break;
- case CHECKBOX_SELECTION:
-- resId = STR_SVT_FILEPICKER_SELECTION;
-+ resId = STR_FPICKER_SELECTION;
- break;
- case PUSHBUTTON_PLAY:
-- resId = STR_SVT_FILEPICKER_PLAY;
-+ resId = STR_FPICKER_PLAY;
- break;
- case LISTBOX_VERSION:
-- resId = STR_SVT_FILEPICKER_VERSION;
-+ resId = STR_FPICKER_VERSION;
- break;
- case LISTBOX_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_TEMPLATES;
-+ resId = STR_FPICKER_TEMPLATES;
- break;
- case LISTBOX_IMAGE_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
-+ resId = STR_FPICKER_IMAGE_TEMPLATE;
- break;
- case LISTBOX_VERSION_LABEL:
- case LISTBOX_TEMPLATE_LABEL:
-@@ -581,16 +598,7 @@
- case CHECKBOX_PREVIEW:
- case CHECKBOX_SELECTION:
- {
-- QString label;
--
-- if (_resMgr && resId != -1)
-- {
-- OUString s(ResId(resId, *_resMgr).toString());
-- label = toQString(s);
-- label.replace("~", "&");
-- }
--
-- widget = new QCheckBox(label, _extraControls);
-+ widget = new QCheckBox(getResString(resId), _extraControls);
-
- // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
- // code, but the checkbox is hidden and ignored
-@@ -719,8 +727,22 @@
- 1 );
- }
-
-- _dialog->setOperationMode(operationMode);
-- _dialog->setConfirmOverwrite(true);
-+ _dialog->setOperationMode( operationMode );
-+
-+ sal_Int16 resId = -1;
-+ switch (_dialog->operationMode())
-+ {
-+ case KFileDialog::Opening:
-+ resId = STR_FPICKER_OPEN;
-+ break;
-+ case KFileDialog::Saving:
-+ resId = STR_FPICKER_SAVE;
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ _dialog->setCaption(getResString(resId));
- }
-
- void SAL_CALL KDE4FilePicker::cancel()
-only in patch2:
-unchanged:
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@ class KFileDialog;
- class QWidget;
- class QLayout;
-
--class ResMgr;
--
- typedef ::cppu::WeakComponentImplHelper5
- < ::com::sun::star::ui::dialogs::XFilePicker2
- , ::com::sun::star::ui::dialogs::XFilePicker3
-@@ -61,8 +59,6 @@ protected:
-
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
-
-- ResMgr *_resMgr;
--
- //the dialog to display
- KFileDialog* _dialog;
-
-@@ -225,6 +221,8 @@ private:
- //add a custom control widget to the file dialog
- void addCustomControl(sal_Int16 controlId);
-
-+ QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
- void cleanupProxy();
- void checkProtocol();
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch
deleted file mode 100644
index 5c8ab52..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-linux-musl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- libreoffice-4.4.0.3/configure.ac.orig 2015-01-22 22:05:28.000000000 -0200
-+++ libreoffice-4.4.0.3/configure.ac 2015-02-02 20:11:20.639411153 -0200
-@@ -569,7 +569,7 @@
- fi
- ;;
-
--linux-gnu*|k*bsd*-gnu*)
-+linux-gnu*|linux-musl*|k*bsd*-gnu*)
- test_gtk=yes
- build_gstreamer_1_0=yes
- build_gstreamer_0_10=yes
-@@ -4058,7 +4058,7 @@
- esac
- ;;
-
--linux-gnu*)
-+linux-gnu*|linux-musl*)
- COM=GCC
- GUIBASE=unx
- OS=LINUX
-@@ -6967,7 +6967,7 @@
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
- ;;
-
-- linux-gnu*)
-+ linux-gnu*|linux-musl*)
- JAVAINC="-I$JAVA_HOME/include"
- JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -9429,21 +9429,6 @@
- fi
- AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
-
--dnl ***************************************
--dnl testing libc version for Linux...
--dnl ***************************************
--if test "$_os" = "Linux"; then
-- AC_MSG_CHECKING([whether libc is >= 2.1.1])
-- exec 6>/dev/null # no output
-- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
-- exec 6>&1 # output on again
-- if test "$HAVE_LIBC"; then
-- AC_MSG_RESULT([yes])
-- else
-- AC_MSG_ERROR([no, upgrade libc])
-- fi
--fi
--
- dnl =========================================
- dnl Check for the Windows SDK.
- dnl =========================================
-@@ -12741,7 +12726,7 @@
-
- case "$host_os" in
-
-- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
-+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
- if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
- pathmunge "$JAVA_HOME/bin" "after"
- fi
-@@ -12789,7 +12774,6 @@
- esac
-
- pathmunge "$SRC_ROOT/solenv/bin" "before"
-- pathmunge "." "before"
- fi
-
- AC_SUBST(LO_PATH)
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-musl-fix-execinfo.patch
deleted file mode 100644
index 01fca6f..0000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-musl-fix-execinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h
---- a/sal/osl/unx/backtrace.h 2015-01-22 22:05:28.000000000 -0200
-+++ b/sal/osl/unx/backtrace.h 2015-02-02 17:06:27.765494731 -0200
-@@ -47,7 +47,7 @@
-
- #endif /* defined SOLARIS || FREEBSD || NETBSD || OPENBSD */
-
--#if defined (LINUX)
-+#if defined (LINUX) && defined (__GLIBC__)
- #include <execinfo.h>
- #endif
-
-diff -ru sal.orig/osl/unx/signal.cxx sal/osl/unx/signal.cxx
---- a/sal/osl/unx/signal.cxx 2015-01-22 22:05:28.000000000 -0200
-+++ b/sal/osl/unx/signal.cxx 2015-02-02 17:06:53.495496086 -0200
-@@ -36,7 +36,7 @@
-
- #endif /* MACOSX */
-
--#ifdef LINUX
-+#if defined (LINUX) && defined (__GLIBC__)
- #include <execinfo.h>
- #include <link.h>
- #define INCLUDE_BACKTRACE
diff --git a/app-office/libreoffice/libreoffice-4.4.1.2-r99.ebuild b/app-office/libreoffice/libreoffice-4.4.1.2-r99.ebuild
deleted file mode 100644
index cbf69a7..0000000
--- a/app-office/libreoffice/libreoffice-4.4.1.2-r99.ebuild
+++ /dev/null
@@ -1,619 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.4.1.2.ebuild,v 1.6 2015/04/11 20:43:16 dilfridge Exp $
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
- http://dev-builds.libreoffice.org/pre-releases/src
- http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
- http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-ADDONS_URI="http://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite"
-HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
- for i in ${DEV_URI}; do
- for mod in ${MODULES}; do
- if [[ ${mod} == core ]]; then
- SRC_URI+=" ${i}/${P}.tar.xz"
- else
- SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
- fi
- done
- unset mod
- done
- unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
- IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.3.2-r3
- app-text/mythes
- >=app-text/libabw-0.1.0
- >=app-text/libexttextcat-3.2
- >=app-text/libebook-0.1.1
- >=app-text/libetonyek-0.1.1
- app-text/liblangtag
- >=app-text/libmspub-0.1.0
- >=app-text/libmwaw-0.3.4
- >=app-text/libodfgen-0.1.0
- app-text/libwpd:0.10[tools]
- app-text/libwpg:0.3
- >=app-text/libwps-0.3.0
- >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
- >=dev-cpp/clucene-2.3.3.4-r2
- =dev-cpp/libcmis-0.5*
- dev-db/unixODBC
- >=dev-libs/boost-1.55:=
- dev-libs/expat
- >=dev-libs/hyphen-2.7.1
- >=dev-libs/icu-4.8.1.1:=
- >=dev-libs/liborcus-0.7.0
- >=dev-libs/librevenge-0.0.1
- >=dev-libs/nspr-4.8.8
- >=dev-libs/nss-3.12.9
- >=dev-lang/perl-5.0
- >=dev-libs/openssl-1.0.0d:0
- >=dev-libs/redland-1.0.16
- media-gfx/graphite2
- >=media-libs/fontconfig-2.8.0
- media-libs/freetype:2
- >=media-libs/glew-1.10
- >=media-libs/harfbuzz-0.9.18:=[icu(+)]
- media-libs/lcms:2
- >=media-libs/libpng-1.4:0=
- >=media-libs/libcdr-0.1.0
- >=media-libs/libfreehand-0.1.0
- media-libs/libpagemaker
- >=media-libs/libvisio-0.1.0
- >=net-misc/curl-7.21.4
- net-libs/neon
- net-nds/openldap
- sci-mathematics/lpsolve
- virtual/jpeg:0
- >=x11-libs/cairo-1.10.0[X]
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/glu
- virtual/opengl
- bluetooth? ( net-wireless/bluez )
- coinmp? ( sci-libs/coinor-mp )
- collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
- cups? ( net-print/cups )
- dbus? ( >=dev-libs/dbus-glib-0.92 )
- eds? ( gnome-extra/evolution-data-server )
- firebird? ( >=dev-db/firebird-2.5 )
- gltf? ( media-libs/libgltf )
- gnome? ( gnome-base/gconf:2 )
- gtk? (
- x11-libs/gdk-pixbuf[X]
- >=x11-libs/gtk+-2.24:2
- )
- gtk3? ( >=x11-libs/gtk+-3.2:3 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
- libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
- libreoffice_extensions_wiki-publisher? (
- dev-java/commons-codec:0
- dev-java/commons-httpclient:3
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/tomcat-servlet-api:3.0
- )
- mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
- postgres? ( >=dev-db/postgresql-9.0[kerberos] )
- telepathy? (
- dev-libs/glib:2
- >=net-libs/telepathy-glib-0.18.0
- >=x11-libs/gtk+-2.24:2
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
- !app-office/libreoffice-bin
- !app-office/libreoffice-bin-debug
- !<app-office/openoffice-bin-3.4.0-r1
- !app-office/openoffice
- media-fonts/libertine
- media-fonts/liberation-fonts
- media-fonts/urw-fonts
- java? ( >=virtual/jre-1.6 )
- kde? ( || ( $(add_kdeapps_dep kioclient) $(add_kdebase_dep kioclient) ) )
- vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
- PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
- # Translations are not reliable on live ebuilds
- # rather force people to use english only.
- PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-# after everything upstream is under gbuild
-# as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/libatomic_ops-7.2d
- >=dev-libs/libxml2-2.7.8
- dev-libs/libxslt
- dev-perl/Archive-Zip
- dev-util/cppunit
- >=dev-util/gperf-3
- dev-util/intltool
- >=dev-util/mdds-0.10.3:=
- media-libs/glm
- net-misc/npapi-sdk
- >=sys-apps/findutils-4.4.2
- sys-devel/bison
- sys-apps/coreutils
- sys-devel/flex
- sys-devel/gettext
- >=sys-devel/make-3.82
- sys-devel/ucpp
- sys-libs/zlib
- virtual/pkgconfig
- x11-libs/libXt
- x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
- java? (
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.7
- )
- odk? ( >=app-doc/doxygen-1.8.4 )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- # not upstreamable stuff
- "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
- # from 4.4 branch
- "${FILESDIR}/${PN}-4.4.0.3-gcc-4.9-Os-link-failure.patch" # bug 538348
-
- # from master branch
- "${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
- "${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
- "${FILESDIR}/${PN}-4.4.1.2-improve-KDE4FilePicker.patch"
- "${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
- "${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
- "${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch"
- "${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch"
-)
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( dbus )
- collada? ( gltf )
- gnome? ( gtk )
- eds? ( gnome )
- telepathy? ( gtk )
- libreoffice_extensions_nlpsolver? ( java )
- libreoffice_extensions_scripting-beanshell? ( java )
- libreoffice_extensions_scripting-javascript? ( java )
- libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
- local pgslot
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- check-reqs_pkg_pretend
-
- if [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
- ; then
- eerror "Compilation with gcc older than 4.6 is not supported"
- die "Too old gcc found."
- fi
- fi
-
- # Ensure pg version but we have to be sure the pg is installed (first
- # install on clean system)
- if use postgres && has_version dev-db/postgresql; then
- pgslot=$(postgresql-config show)
- if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
- eerror " postgresql-config set 9.0"
- die "PostgreSQL slot is not set to 9.0 or higher."
- fi
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- kde4-base_pkg_setup
- python-single-r1_pkg_setup
-
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
- local mod mod2 dest tmplfile tmplname mypv
-
- [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
- use branding && unpack "${BRANDING}"
-
- if [[ ${PV} != *9999* ]]; then
- unpack "${P}.tar.xz"
- for mod in ${MODULES}; do
- [[ ${mod} == core ]] && continue
- unpack "${PN}-${mod}-${PV}.tar.xz"
- done
- else
- for mod in ${MODULES}; do
- mypv=${PV/.9999}
- [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
- [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
- EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
- git-r3_src_unpack
- if [[ ${mod} != core ]]; then
- mod2=${mod}
- # mapping does not match on help
- [[ ${mod} == help ]] && mod2="helpcontent2"
- mkdir -p "${S}/${mod2}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
- rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
- fi
- done
- unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
- fi
-}
-
-src_prepare() {
- # optimization flags
- export GMAKE_OPTIONS="${MAKEOPTS}"
- # System python 2.7 enablement:
- export PYTHON_CFLAGS=$(python_get_CFLAGS)
- export PYTHON_LIBS=$(python_get_LIBS)
-
- if use collada; then
- export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
- export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
- fi
-
- # patchset
- if [[ -n ${PATCHSET} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- base_src_prepare
-
- AT_M4DIR="m4" eautoreconf
- # hack in the autogen.sh
- touch autogen.lastrun
-
- # system pyuno mess
- sed \
- -e "s:%eprefix%:${EPREFIX}:g" \
- -e "s:%libdir%:$(get_libdir):g" \
- -i pyuno/source/module/uno.py \
- -i pyuno/source/officehelper.py || die
- # sed in the tests
- sed -i \
- -e 's#all : build unitcheck#all : build#g' \
- solenv/gbuild/Module.mk || die
- sed -i \
- -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
- -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
- Makefile.in || die
-
- if use branding; then
- # hack...
- mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
- fi
-}
-
-src_configure() {
- local java_opts
- local internal_libs
- local lo_ext
- local ext_opts
-
- # sane: just sane.h header that is used for scan in writer, not
- # linked or anything else, worthless to depend on
- # vigra: just uses templates from there
- # it is serious pain in the ass for packaging
- # should be replaced by boost::gil if someone interested
- internal_libs+="
- --without-system-sane
- --without-system-vigra
- "
-
- # libreoffice extensions handling
- for lo_xt in ${LO_EXTS}; do
- if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
- else
- ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
- fi
- done
-
- if use java; then
- # hsqldb: system one is too new
- java_opts="
- --without-junit
- --without-system-hsqldb
- --with-ant-home="${ANT_HOME}"
- --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
- "
-
- use libreoffice_extensions_scripting-beanshell && \
- java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
-
- use libreoffice_extensions_scripting-javascript && \
- java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
-
- if use libreoffice_extensions_wiki-publisher; then
- java_opts+="
- --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
- --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
- --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
- --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
- --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
- "
- fi
- fi
-
- # system headers/libs/...: enforce using system packages
- # --enable-cairo: ensure that cairo is always required
- # --enable-graphite: disabling causes build breakages
- # --enable-*-link: link to the library rather than just dlopen on runtime
- # --enable-release-build: build the libreoffice as release
- # --disable-fetch-external: prevent dowloading during compile phase
- # --disable-gnome-vfs: old gnome virtual fs support
- # --disable-kdeab: kde3 adressbook
- # --disable-kde: kde3 support
- # --disable-systray: quickstarter does not actually work at all so do not
- # promote it
- # --enable-extension-integration: enable any extension integration support
- # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
- # --disable-report-builder: too much java packages pulled in without pkgs
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
- --with-system-headers \
- --with-system-libs \
- --with-system-jars \
- --with-system-dicts \
- --enable-cairo-canvas \
- --enable-graphite \
- --enable-largefile \
- --enable-mergelibs \
- --enable-neon \
- --enable-python=system \
- --enable-randr \
- --enable-randr-link \
- --enable-release-build \
- --disable-hardlink-deliver \
- --disable-ccache \
- --disable-crashdump \
- --disable-dependency-tracking \
- --disable-epm \
- --disable-fetch-external \
- --disable-gnome-vfs \
- --disable-gstreamer-0-10 \
- --disable-report-builder \
- --disable-kdeab \
- --disable-kde \
- --disable-online-update \
- --disable-systray \
- --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
- --with-build-version="Gentoo official package" \
- --enable-extension-integration \
- --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
- --with-external-tar="${DISTDIR}" \
- --with-lang="" \
- --with-parallelism=$(makeopts_jobs) \
- --with-system-ucpp \
- --with-vendor="Gentoo Foundation" \
- --with-x \
- --without-fonts \
- --without-myspell-dicts \
- --without-help \
- --with-helppack-integration \
- --without-sun-templates \
- $(use_enable bluetooth sdremote-bluetooth) \
- $(use_enable coinmp) \
- $(use_enable collada) \
- $(use_enable cups) \
- $(use_enable debug) \
- $(use_enable dbus) \
- $(use_enable eds evolution2) \
- $(use_enable firebird firebird-sdbc) \
- $(use_enable gltf) \
- $(use_enable gnome gconf) \
- $(use_enable gnome gio) \
- $(use_enable gnome lockdown) \
- $(use_enable gstreamer gstreamer-1-0) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable kde kde4) \
- $(use_enable mysql ext-mariadb-connector) \
- $(use_enable odk) \
- $(use_enable postgres postgresql-sdbc) \
- $(use_enable telepathy) \
- $(use_enable vlc) \
- $(use_with coinmp system-coinmp) \
- $(use_with collada system-opencollada) \
- $(use_with gltf system-libgltf) \
- $(use_with java) \
- $(use_with mysql system-mysql-cppconn) \
- $(use_with odk doxygen) \
- ${internal_libs} \
- ${java_opts} \
- ${ext_opts}
-}
-
-src_compile() {
- # more and more LO stuff tries to use OpenGL, including tests during build
- # bug 501508, bug 540624, bug 545974 and probably more
- addpredict /dev/dri
- addpredict /dev/ati
- addpredict /dev/nvidiactl
-
- # hack for offlinehelp, this needs fixing upstream at some point
- # it is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- (
- grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
- source "${T}/config_host.mk" 2&> /dev/null
-
- local path="${WORKDIR}/helpcontent2/source/auxiliary/"
- mkdir -p "${path}" || die
-
- echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
- perl "${S}/helpcontent2/helpers/create_ilst.pl" \
- -dir=icon-themes/galaxy/res/helpimg \
- > "${path}/helpimg.ilst"
- [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
- )
-
- local target
- use test && target="build" || target="build-nocheck"
-
- # this is not a proper make script
- make ${target} || die
-}
-
-src_test() {
- make unitcheck || die
- make slowcheck || die
-}
-
-src_install() {
- # This is not Makefile so no buildserver
- make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
- # Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
- bashcomp_alias \
- libreoffice \
- unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"/etc/ || die
-
- if use branding; then
- insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
- fi
-
- # Hack for offlinehelp, this needs fixing upstream at some point.
- # It is broken because we send --without-help
- # https://bugs.freedesktop.org/show_bug.cgi?id=46506
- insinto /usr/$(get_libdir)/libreoffice/help
- doins xmlhelp/util/*.xsl
-
- # Remove desktop files for support to old installs that can't parse mime
- rm -rf "${ED}"/usr/share/mimelnk/
-
- # FIXME: Hack add missing file
- insinto /usr/$(get_libdir)/${PN}/program
- doins "${S}"/instdir/program/libsaxlo.so
-
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
- # Cache updates - all handled by kde eclass for all environments
- kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- use java || \
- ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
- kde4-base_pkg_postrm
-}
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
deleted file mode 100644
index 757568b..0000000
--- a/app-office/libreoffice/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>openoffice</herd>
- <longdescription>LibreOffice is a fork of OpenOffice.org.
-This ebuild allows you to compile it yourself. Unfortunately this
-compilation can take up to a day depending on the speed of your
-computer. It will however make a snappier openoffice than the binary
-version</longdescription>
- <use>
- <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
- <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
- <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
- <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
- <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
- <flag name="odk">Build the Office Development Kit</flag>
- <flag name="telepathy">Enable document colaboration features using telepathy communication framework.</flag>
- <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
- </use>
-</pkgmetadata>
diff --git a/app-text/hunspell/files/hunspell-1.3-renameexes.patch b/app-text/hunspell/files/hunspell-1.3-renameexes.patch
deleted file mode 100644
index 70c5b74..0000000
--- a/app-text/hunspell/files/hunspell-1.3-renameexes.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-=== modified file 'src/tools/Makefile.am'
---- src/tools/Makefile.am 2011-05-24 15:55:29 +0000
-+++ src/tools/Makefile.am 2011-05-24 15:58:36 +0000
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
-
- INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
-
-@@ -6,8 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.3.la
-
--munch_SOURCES=munch.c munch.h
--unmunch_SOURCES=unmunch.c unmunch.h
-+hunspell_munch_SOURCES=munch.c munch.h
-+hunspell_unmunch_SOURCES=unmunch.c unmunch.h
-
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.3.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- ../hunspell/libhunspell-1.3.la @CURSESLIB@ @READLINELIB@
-
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.3.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.3.la
-
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
-
- noinst_PROGRAMS=example
-
-
-=== modified file 'src/tools/chmorph.cxx'
---- src/tools/chmorph.cxx 2011-05-24 15:55:29 +0000
-+++ src/tools/chmorph.cxx 2011-05-24 16:00:54 +0000
-@@ -19,11 +19,11 @@
- for (int i = 1; i < 6; i++)
- if (!argv[i]) {
- fprintf(stderr,
-- "chmorph - change affixes by morphological analysis and generation\n"
-- "correct syntax is:\nchmorph affix_file "
-+ "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+ "correct syntax is:\nhunspell-chmorph affix_file "
- "dictionary_file file_to_convert STRING1 STRING2\n"
- "STRINGS may be arbitrary parts of the morphological descriptions\n"
-- "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+ "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
- " (convert informal Hungarian second person texts to formal third person texts)\n");
- exit(1);
- }
-
-=== modified file 'src/tools/example.cxx'
---- src/tools/example.cxx 2011-05-24 15:55:29 +0000
-+++ src/tools/example.cxx 2011-05-24 15:55:37 +0000
-@@ -17,8 +17,8 @@
- /* first parse the command line options */
-
- if (argc < 4) {
-- fprintf(stderr,"example (now it works with more dictionary files):\n");
-- fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
-+ fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n");
-+ fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
- exit(1);
- }
-
-
-=== modified file 'src/tools/munch.c'
---- src/tools/munch.c 2011-05-24 15:55:29 +0000
-+++ src/tools/munch.c 2011-05-24 15:55:37 +0000
-@@ -42,14 +42,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"munch word_list_file affix_file\n");
-+ fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"munch word_list_file affix_file\n");
-+ fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
- exit(1);
- }
-
-
-=== modified file 'src/tools/unmunch.c'
---- src/tools/unmunch.c 2011-05-24 15:55:29 +0000
-+++ src/tools/unmunch.c 2011-05-24 15:55:37 +0000
-@@ -39,14 +39,14 @@
- wf = mystrdup(argv[1]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"unmunch dic_file affix_file\n");
-+ fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
- if (argv[2]) {
- af = mystrdup(argv[2]);
- } else {
- fprintf(stderr,"correct syntax is:\n");
-- fprintf(stderr,"unmunch dic_file affix_file\n");
-+ fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
- exit(1);
- }
-
-
-=== modified file 'tests/test.sh'
---- tests/test.sh 2011-05-24 15:55:29 +0000
-+++ tests/test.sh 2011-05-24 15:55:37 +0000
-@@ -34,7 +34,7 @@
- shopt -s expand_aliases
-
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
--alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
-+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
-
- if [ "$VALGRIND" != "" ]; then
- rm -f $TEMPDIR/test.pid*
-@@ -43,7 +43,7 @@
- fi
-
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
-- alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
-+ alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
- fi
-
- # Tests good words
-
diff --git a/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch b/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch
deleted file mode 100644
index b6cc923..0000000
--- a/app-text/hunspell/files/hunspell-1.3.2-static-lib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN hunspell-1.3.2.old/src/parsers/Makefile.am hunspell-1.3.2/src/parsers/Makefile.am
---- hunspell-1.3.2.old/src/parsers/Makefile.am 2011-09-15 11:50:40.251441126 +0200
-+++ hunspell-1.3.2/src/parsers/Makefile.am 2011-09-17 06:06:50.469615528 +0200
-@@ -1,4 +1,4 @@
--lib_LIBRARIES=libparsers.a
-+noinst_LIBRARIES=libparsers.a
- libparsers_a_SOURCES=firstparser.cxx htmlparser.cxx \
- latexparser.cxx manparser.cxx \
- textparser.cxx
diff --git a/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch b/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
deleted file mode 100644
index 848bc8f..0000000
--- a/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7781#31
-https://bugs.gentoo.org/518740
-
---- src/tools/hunspell.cxx
-+++ src/tools/hunspell.cxx
-@@ -710,13 +748,22 @@ if (pos >= 0) {
- fflush(stdout);
- } else {
- char ** wlst = NULL;
-- int ns = pMS[d]->suggest(&wlst, token);
-+ int byte_offset = parser->get_tokenpos() + pos;
-+ int char_offset = 0;
-+ if (strcmp(io_enc, "UTF-8") == 0) {
-+ for (int i = 0; i < byte_offset; i++) {
-+ if ((buf[i] & 0xc0) != 0x80)
-+ char_offset++;
-+ }
-+ } else {
-+ char_offset = byte_offset;
-+ }
-+ int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
- if (ns == 0) {
-- fprintf(stdout,"# %s %d", token,
-- parser->get_tokenpos() + pos);
-+ fprintf(stdout,"# %s %d", token, char_offset);
- } else {
- fprintf(stdout,"& %s %d %d: ", token, ns,
-- parser->get_tokenpos() + pos);
-+ char_offset);
- fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], io_enc));
- }
- for (int j = 1; j < ns; j++) {
-@@ -745,13 +792,23 @@ if (pos >= 0) {
- if (root) free(root);
- } else {
- char ** wlst = NULL;
-+ int byte_offset = parser->get_tokenpos() + pos;
-+ int char_offset = 0;
-+ if (strcmp(io_enc, "UTF-8") == 0) {
-+ for (int i = 0; i < byte_offset; i++) {
-+ if ((buf[i] & 0xc0) != 0x80)
-+ char_offset++;
-+ }
-+ } else {
-+ char_offset = byte_offset;
-+ }
- int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
- if (ns == 0) {
- fprintf(stdout,"# %s %d", chenc(token, io_enc, ui_enc),
-- parser->get_tokenpos() + pos);
-+ char_offset);
- } else {
- fprintf(stdout,"& %s %d %d: ", chenc(token, io_enc, ui_enc), ns,
-- parser->get_tokenpos() + pos);
-+ char_offset);
- fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], ui_enc));
- }
- for (int j = 1; j < ns; j++) {
-
diff --git a/app-text/hunspell/files/hunspell-9999-error_h.patch b/app-text/hunspell/files/hunspell-9999-error_h.patch
deleted file mode 100644
index 9e1208f..0000000
--- a/app-text/hunspell/files/hunspell-9999-error_h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://sourceforge.net/p/hunspell/bugs/264/
-
-diff --git a/src/tools/munch.c b/src/tools/munch.c
-index 52e7c51..dd42fed 100644
---- a/src/tools/munch.c
-+++ b/src/tools/munch.c
-@@ -10,8 +10,10 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <limits.h>
--#if defined(__linux__) && !defined(__ANDROID__)
-+#if HAVE_ERROR_H
- #include <error.h>
-+#endif
-+#if defined(__linux__) && !defined(__ANDROID__)
- #include <errno.h>
- #include <sys/mman.h>
- #endif
-diff --git a/src/tools/unmunch.c b/src/tools/unmunch.c
-index c1d07a8..53915f5 100644
---- a/src/tools/unmunch.c
-+++ b/src/tools/unmunch.c
-@@ -11,8 +11,10 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#if defined(__linux__) && !defined(__ANDROID__)
-+#if HAVE_ERROR_H
- #include <error.h>
-+#endif
-+#if defined(__linux__) && !defined(__ANDROID__)
- #include <errno.h>
- #include <sys/mman.h>
- #endif
---
-2.0.5
-
diff --git a/app-text/hunspell/hunspell-1.3.3-r99.ebuild b/app-text/hunspell/hunspell-1.3.3-r99.ebuild
deleted file mode 100644
index 86989d1..0000000
--- a/app-text/hunspell/hunspell-1.3.3-r99.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.3.3.ebuild,v 1.4 2014/12/02 20:49:12 maekke Exp $
-
-EAPI=5
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- ncurses? ( sys-libs/ncurses )
- readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-# describe properly mi
-LANGS="af bg ca cs cy da de el en eo es et fo fr ga gl he hr hu ia id is it km
-ku lt lv mk ms nb nl nn pl pt pt_BR ro ru sk sl sq sv sw tn uk zu"
-
-DICT_DEP="app-dicts/myspell-en"
-for lang in ${LANGS}; do
- if [[ ${lang} == de ]] ; then
- DICT_DEP+=" linguas_de? (
- || (
- app-dicts/myspell-de
- app-dicts/myspell-de-alt
- )
- )"
- else
- DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
- fi
- IUSE+=" linguas_${lang}"
-done
-PDEPEND="${DICT_DEP}"
-
-unset lang LANGS DICT_DEP
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
- AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
- AUTHORS.myspell README.myspell license.myspell
-)
-
-src_prepare() {
- # Upstream package creates some executables which names are too generic
- # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
- # It modifies a Makefile.am file, hence eautoreconf.
- epatch "${FILESDIR}"/${PN}-1.3-renameexes.patch \
- "${FILESDIR}"/${PN}-1.3.3-multibyte-chars.patch
-
- epatch "${FILESDIR}"/${PN}-9999-error_h.patch
-
- eautoreconf
-}
-
-src_configure() {
- # missing somehow, and I am too lazy to fix it properly
- [[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
- # I wanted to put the include files in /usr/include/hunspell.
- # You can do that, libreoffice can find them anywhere, just
- # ping me when you do so ; -- scarabeus
- econf \
- $(use_enable nls) \
- $(use_with ncurses ui) \
- $(use_with readline readline) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- prune_libtool_files --all
-
- #342449
- pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
- ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
- popd >/dev/null
-}
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
deleted file mode 100644
index 4538a68..0000000
--- a/app-text/hunspell/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/app-text/texlive-core/files/texlive-core-2012-pmx-sysdep.patch b/app-text/texlive-core/files/texlive-core-2012-pmx-sysdep.patch
deleted file mode 100644
index b42c6b8..0000000
--- a/app-text/texlive-core/files/texlive-core-2012-pmx-sysdep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/sysdep1.h
-+++ b/texlive-20120701-source/utils/pmx/pmx-2.6.18/libf2c/sysdep1.h
-@@ -10,7 +10,7 @@
-
- #ifdef __linux__
- #define USE_LARGEFILE
--#define OFF_T __off64_t
-+#define OFF_T off64_t
- #endif
-
- #ifdef _AIX43
diff --git a/app-text/texlive-core/files/texmf-update2010 b/app-text/texlive-core/files/texmf-update2010
deleted file mode 100644
index a877823..0000000
--- a/app-text/texlive-core/files/texmf-update2010
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/bin/bash
-#
-# Utility to update Gentoo TeXLive distribution configuration files
-#
-
-echo "Configuring TeXLive ..."
-
-PATH=/bin:/usr/bin
-
-# Fix for all those with altered umask for root
-umask 022
-
-# Make sure we have a correct environment, bug #30432
-# The list of env. vars is taken from the INSTALL file
-for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
- DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
- MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
- OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
- T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
- TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
- TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
- VFFONTS XDVIFONTS XDVIVFS ; do
-
- if [ "${!texvar}" ]; then
- if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
- export ${texvar}="${!texvar}:"
- fi
- fi
-done
-
-if [ "$TEXINPUTS" ]; then
- if $(echo ${TEXINPUTS} | grep '/usr/share/texmf' &>/dev/null) ; then
- export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/usr/share/texmf/*:\?||g')
- elif $(echo ${TEXINPUTS} | grep '/var/lib/texmf' &>/dev/null) ; then
- export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/var/lib/texmf/*:\?||g')
- fi
-fi
-
-MKTEMP_COMMAND="mktemp -t tmp.XXXXXXXXXX"
-DIFF_COMMAND="cmp -s"
-TEMP_FILE="`${MKTEMP_COMMAND}`"
-
-if [ -z "${TEMP_FILE}" ]; then
- exit
-fi
-
-# check whether config files for fmtutil and updmap have changed
-STATUS_FMTUTIL="0"
-STATUS_UPDMAP="0"
-
-if [ -d /etc/texmf/texmf.d ]; then
- echo "Generating /etc/texmf/web2c/texmf.cnf from /etc/texmf/texmf.d ..."
- cat /etc/texmf/texmf.d/*.cnf > "/etc/texmf/web2c/texmf.cnf"
-fi
-
-if [ -d /etc/texmf/fmtutil.d ]; then
- echo "Generating /etc/texmf/web2c/fmtutil.cnf from /etc/texmf/fmtutil.d ..."
- if [ -f /etc/texmf/web2c/fmtutil.cnf ]; then
- cp -f /etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
- else
- touch ${TEMP_FILE}
- fi
- cat /etc/texmf/fmtutil.d/*.cnf > "/etc/texmf/web2c/fmtutil.cnf"
- ${DIFF_COMMAND} /etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-else
-# if no regeneration took place:
-# always regenerate the formats to be on the safe side
- STATUS_FMTUTIL="${STATUS_FMTUTIL}3"
-fi
-
-if [ -d /etc/texmf/updmap.d ]; then
- if [ -f /etc/texmf/web2c/updmap.cfg ]; then
- cp -f /etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
- else
- touch ${TEMP_FILE}
- fi
- echo "Generating /etc/texmf/web2c/updmap.cfg from /etc/texmf/updmap.d ..."
- cat /etc/texmf/updmap.d/*.cfg > "/etc/texmf/web2c/updmap.cfg"
- ${DIFF_COMMAND} /etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
- STATUS_UPDMAP="${STATUS_UPDMAP}$?"
-else
-# if no regeneration could be done:
-# always regenerate the maps to be on the safe side
- STATUS_UPDMAP="${STATUS_UPDMAP}3"
-fi
-
-echo "Generating ls-R files"
-mktexlsr &>/dev/null
-
-# Generate language.dat file, from texlive install-pkg.sh
-X=`kpsewhich language.dat`
-Z=`dirname $X`
-if [ -n "$X" -a -f "$Z/language.dat" -a -f "$Z/language.us" ] ; then
- echo "Generating language.dat file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.dat" "${TEMP_FILE}"
-
- cat "$Z/language.us" > "$Z/language.dat"
- for i in /etc/texmf/language.dat.d/language.*.dat; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.dat"
- done
-
- ${DIFF_COMMAND} "$Z/language.dat" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-# Generate language.def file.
-if [ -n "$X" -a -f "$Z/language.def" -a -f "$Z/language.us.def" ] ; then
- echo "Generating language.def file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.def" "${TEMP_FILE}"
-
- cat "$Z/language.us.def" > "$Z/language.def"
- for i in /etc/texmf/language.def.d/language.*.def; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.def"
- done
- cat << EOF >> "$Z/language.def"
-%%% No changes may be made beyond this point.
-
-\uselanguage {USenglish} %%% This MUST be the last line of the file.
-EOF
-
- ${DIFF_COMMAND} "$Z/language.def" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-# Generate language.dat.lua file.
-if [ -n "$X" -a -f "$Z/language.dat.lua" -a -f "$Z/language.us.lua" ] ; then
- echo "Generating language.dat.lua file"
-
- # Save the old one, we will check if it has changed
- cp -f "$Z/language.dat.lua" "${TEMP_FILE}"
-
- cat "$Z/language.us.lua" > "$Z/language.dat.lua"
- for i in /etc/texmf/language.dat.lua.d/language.*.dat.lua; do
- [ -f "$i" ] && cat "$i" >> "$Z/language.dat.lua"
- done
- printf "}\n" >> "$Z/language.dat.lua"
-
- ${DIFF_COMMAND} "$Z/language.dat.lua" "${TEMP_FILE}"
- STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
-fi
-
-if [ "${STATUS_FMTUTIL}" -ne 0 ] ; then
- echo "Generating format files ..."
- fmtutil-sys --all &>/dev/null
-else
- echo "Skipping format files, since they are unchanged"
-fi
-
-if [ "${STATUS_UPDMAP}" -ne 0 ] ; then
- echo "Generating font maps..."
- updmap-sys &>/dev/null
-else
- echo "Skipping font maps, since they are unchanged"
-fi
-
-rm -f ${TEMP_FILE}
-
-echo
-echo "Use 'texconfig font ro'(rw) to disable (enable) font generation for users"
-echo
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
deleted file mode 100644
index 68edcb8..0000000
--- a/app-text/texlive-core/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>tex</herd>
- <maintainer>
- <email>aballier@gentoo.org</email>
- <name>Alexis Ballier</name>
- </maintainer>
- <longdescription lang="en">
- TeXLive core binaries
- </longdescription>
- <use>
- <flag name='xetex'>Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
- </use>
-</pkgmetadata>
-
diff --git a/app-text/texlive-core/texlive-core-2012-r99.ebuild b/app-text/texlive-core/texlive-core-2012-r99.ebuild
deleted file mode 100644
index 0d3c0dd..0000000
--- a/app-text/texlive-core/texlive-core-2012-r99.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2012-r1.ebuild,v 1.17 2013/05/30 16:32:17 aballier Exp $
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="39"
-TL_SOURCE_VERSION=20120701
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-# mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
- a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
- dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
- hyphenex installfont lacheck latex2man latexfileversion latexpand
- listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
- pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
- texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
- typeoutfileinfo web collection-binextra
- "
-TL_CORE_BINEXTRA_DOC_MODULES="
- a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
- ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
- dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
- latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
- match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
- pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
- texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
- texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
- typeoutfileinfo web.doc
- "
-TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
- SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="cjk X doc source tk xetex"
-
-MODULAR_X_DEPEND="X? (
- x11-libs/libXmu
- x11-libs/libXp
- x11-libs/libXpm
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXaw
- x11-libs/libXfont
- )"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
- !app-text/ptex
- !app-text/tetex
- !<app-text/texlive-2007
- !app-text/xetex
- !<dev-texlive/texlive-basic-2009
- !<dev-texlive/texlive-metapost-2011
- !app-text/dvibook
- sys-libs/zlib
- >=media-libs/libpng-1.2.43-r2:0=
- >=app-text/poppler-0.12.3-r3:=
- xetex? (
- app-text/teckit
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/silgraphite
- )
- >=dev-libs/kpathsea-6.1.0_p20120701
- cjk? ( >=dev-libs/ptexenc-1.2.0_p20120701 )"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- sys-apps/ed
- sys-devel/flex
- app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
- >=app-text/ps2pkm-1.5_p20120701
- >=app-text/dvipsk-5.992_p20120701
- >=dev-tex/bibtexu-3.71_p20120701
- virtual/perl-Getopt-Long
- xetex? ( >=app-text/xdvipdfmx-0.7.8_p20120701 )
- tk? ( dev-perl/perl-tk )"
-
-# texdoc needs luatex.
-PDEPEND=">=dev-tex/luatex-0.70"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die "failed to create build dir"
-}
-
-src_prepare() {
- mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
- cd "${B}"
- #EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
- epatch "${FILESDIR}"/${PN}-2012-pmx-sysdep.patch
-
- elibtoolize
-}
-
-src_configure() {
- # It fails on alpha without this
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Bug #265232 and bug #414271:
- if use hppa; then
- append-cppflags "-DU_IS_BIG_ENDIAN=1"
- fi
-
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #242430
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
- tc-export CC CXX AR RANLIB
- ECONF_SOURCE="${B}" \
- econf -C \
- --bindir=/usr/bin \
- --datadir="${S}" \
- --with-system-freetype2 \
- --with-freetype2-include=/usr/include \
- --with-system-zlib \
- --with-system-libpng \
- --with-system-xpdf \
- --with-system-poppler \
- --with-system-teckit \
- --with-teckit-includes=/usr/include/teckit \
- --with-system-graphite \
- --with-system-kpathsea \
- --with-system-icu \
- --with-system-ptexenc \
- --without-texinfo \
- --disable-dialog \
- --disable-multiplatform \
- --enable-epsfwin \
- --enable-mftalkwin \
- --enable-regiswin \
- --enable-tektronixwin \
- --enable-unitermwin \
- --with-ps=gs \
- --disable-psutils \
- --disable-t1utils \
- --enable-ipc \
- --disable-biber \
- --disable-bibtexu \
- --disable-dvipng \
- --disable-dvipsk \
- --disable-dvipdfmx \
- --disable-chktex \
- --disable-lcdf-typetools \
- --disable-pdfopen \
- --disable-ps2eps \
- --disable-ps2pkm \
- --disable-detex \
- --disable-ttf2pk \
- --disable-tex4htk \
- --disable-cjkutils \
- --disable-xdvik \
- --disable-xindy \
- --disable-luatex \
- --disable-dvi2tty \
- --disable-dvisvgm \
- --disable-vlna \
- --disable-xdvipdfmx \
- --enable-shared \
- --disable-native-texlive-build \
- --disable-largefile \
- $(use_enable xetex) \
- $(use_enable cjk ptex) \
- $(use_enable cjk eptex) \
- $(use_enable cjk uptex) \
- $(use_enable cjk euptex) \
- $(use_enable cjk mendexk) \
- $(use_enable cjk makejvf) \
- $(use_with X x)
-}
-
-src_compile() {
- emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
-
- cd "${B}"
- # Mimic updmap --syncwithtrees to enable only fonts installed
- # Code copied from updmap script
- for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
- texlive-common_is_file_present_in_texmf "$i" || echo "$i"
- done > "${T}/updmap_update"
- {
- sed 's@/@\\/@g; s@^@/^MixedMap[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- sed 's@/@\\/@g; s@^@/^Map[ ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
- } > "${T}/updmap_update2"
- sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" > "${T}/updmap_update3"\
- && cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
-}
-
-src_test() {
- ewarn "Due to modular layout of texlive ebuilds,"
- ewarn "It would not make much sense to use tests into the ebuild"
- ewarn "And tests would fail anyway"
- ewarn "Alternatively you can try to compile any tex file"
- ewarn "Tex warnings should be considered as errors and reported"
- ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
-}
-
-src_install() {
- dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
- emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
- cd "${B}"
- dodir /usr/share # just in case
- cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
- cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
-
- newsbin "${FILESDIR}/texmf-update2010" texmf-update
-
- # When X is disabled mf-nowin doesn't exist but some scripts expect it to
- # exist. Instead, it is called mf, so we symlink it to please everything.
- use X || dosym mf /usr/bin/mf-nowin
-
- docinto texk
- cd "${B}/texk"
- dodoc ChangeLog README || die "failed to install texk docs"
-
- docinto dviljk
- cd "${B}/texk/dviljk"
- dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
- docinto makeindexk
- cd "${B}/texk/makeindexk"
- dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
- docinto web2c
- cd "${B}/texk/web2c"
- dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
- use doc || rm -rf "${D}/usr/share/texmf/doc"
- use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
-
- dodir /etc/env.d
- echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
- # populate /etc/texmf
- keepdir /etc/texmf/web2c
-
- # take care of updmap.cfg and language.d files
- keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
- mv "${D}${TEXMF_PATH}/web2c/updmap.cfg" "${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
- # Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
- # by texmf-update
- rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
- # Remove bundled and invalid updmap.cfg
- rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
-
- texlive-common_handle_config_files
-
- keepdir /usr/share/texmf-site
-
- # the virtex symlink is not installed
- # The links has to be relative, since the targets
- # is not present at this stage and MacOS doesn't
- # like non-existing targets
- dosym tex /usr/bin/virtex
- dosym pdftex /usr/bin/pdfvirtex
-
- # Remove texdoctk if we don't want it
- if ! use tk ; then
- rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
- fi
-
- # Rename mpost to leave room for mplib
- mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
- dosym "mpost-${P}" /usr/bin/mpost
-
- # Ditto for pdftex
- mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
- dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_preinst() {
- # Remove stray files to keep the upgrade path sane
- if has_version =app-text/texlive-core-2007* ; then
- for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
- for j in log fmt ; do
- local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
- if [ -f "${file}" ] ; then
- elog "Removing stray ${file} from TeXLive 2007 install."
- rm -f "${file}"
- fi
- done
- done
- for j in base log ; do
- local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
- if [ -f "${file}" ] ; then
- elog "Removing stray ${file} from TeXLive 2007 install."
- rm -f "${file}"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- etexmf-update
-
- elog
- elog "If you have configuration files in /etc/texmf to merge,"
- elog "please update them and run /usr/sbin/texmf-update."
- elog
- ewarn "If you are migrating from an older TeX distribution"
- ewarn "Please make sure you have read:"
- ewarn "http://www.gentoo.org/proj/en/tex/texlive-migration-guide.xml"
- ewarn "in order to avoid possible problems"
- elog
- elog "TeXLive has been split in various ebuilds. If you are missing a"
- elog "package to process your TeX documents, you can install"
- elog "dev-tex/texmfind to easily search for them."
- elog
-}
diff --git a/dev-lang/ruby/files/ruby-1.9.3_p484-add-asm_ioctl_h.patch b/dev-lang/ruby/files/ruby-1.9.3_p484-add-asm_ioctl_h.patch
deleted file mode 100644
index a15fe99..0000000
--- a/dev-lang/ruby/files/ruby-1.9.3_p484-add-asm_ioctl_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar ruby-1.9.3-p484.orig/io.c ruby-1.9.3-p484/io.c
---- ruby-1.9.3-p484.orig/io.c 2013-10-31 14:03:20.000000000 +0000
-+++ ruby-1.9.3-p484/io.c 2014-02-23 13:43:42.508302443 +0000
-@@ -17,6 +17,7 @@
- #include "internal.h"
- #include <ctype.h>
- #include <errno.h>
-+#include <asm/ioctl.h>
-
- #define free(x) xfree(x)
-
diff --git a/dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch b/dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch
deleted file mode 100644
index 9fef9e8..0000000
--- a/dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar ruby-2.0.0-p353.orig/io.c ruby-2.0.0-p353/io.c
---- ruby-2.0.0-p353.orig/io.c 2013-10-04 17:30:50.000000000 +0000
-+++ ruby-2.0.0-p353/io.c 2014-02-23 13:22:06.038406133 +0000
-@@ -19,6 +19,7 @@
- #include "id.h"
- #include <ctype.h>
- #include <errno.h>
-+#include <asm/ioctl.h>
- #include "ruby_atomic.h"
-
- #define free(x) xfree(x)
diff --git a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch b/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
deleted file mode 100644
index 47ecb2f..0000000
--- a/dev-lang/ruby/files/ruby-uclibc-isnan-isinf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur ruby-2.0.0-p247.orig/missing/isinf.c ruby-2.0.0-p247/missing/isinf.c
---- ruby-2.0.0-p247.orig/missing/isinf.c 2011-05-15 07:55:52.000000000 -0400
-+++ ruby-2.0.0-p247/missing/isinf.c 2013-09-09 15:28:47.750452951 -0400
-@@ -52,6 +52,8 @@
- static double one (void) { return 1.0; }
- static double inf (void) { return one() / zero(); }
-
-+#undef isinf
-+
- int
- isinf(double n)
- {
-diff -Naur ruby-2.0.0-p247.orig/missing/isnan.c ruby-2.0.0-p247/missing/isnan.c
---- ruby-2.0.0-p247.orig/missing/isnan.c 2010-07-28 04:12:01.000000000 -0400
-+++ ruby-2.0.0-p247/missing/isnan.c 2013-09-09 15:28:32.791451837 -0400
-@@ -4,6 +4,8 @@
-
- static int double_ne(double n1, double n2);
-
-+#undef isnan
-+
- int
- isnan(double n)
- {
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
deleted file mode 100644
index e46ab14..0000000
--- a/dev-lang/ruby/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>ruby</herd>
- <use>
- <flag name='rubytests'>
- Install ruby tests that can only be run after ruby is installed
- </flag>
-
- <flag name='readline'>
- Use the <pkg>sys-libs/readline</pkg> library to provide the
- readline extension, used for instance by the irb tool. This flag
- is meaningful only if the libedit USE flag is disabled.
-
- If neither libedit nor readline USE flags are enabled, the
- readline extension will not be built (and irb will lose line
- editing functionality).
- </flag>
-
- <flag name='yaml'>
- Use the <pkg>dev-libs/libyaml</pkg> library to build the psych
- extension, available since Ruby 1.9.2_rc2, in alternative to the
- bundled syck-based parser.
- </flag>
-
- <flag name='rdoc'>
- Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
- </flag>
- </use>
-</pkgmetadata>
diff --git a/dev-lang/ruby/ruby-1.9.3_p484.ebuild b/dev-lang/ruby/ruby-1.9.3_p484.ebuild
deleted file mode 100644
index d860a04..0000000
--- a/dev-lang/ruby/ruby-1.9.3_p484.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p484.ebuild,v 1.12 2014/01/26 09:27:14 jlec Exp $
-
-EAPI=4
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.9.3 still uses 1.9.1
-RUBYVERSION=1.9.1
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
- http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline +yaml" #libedit
-
-# libedit support is removed everywhere because of this upstream bug:
-# http://redmine.ruby-lang.org/issues/show/3698
-
-RDEPEND="
- berkdb? ( sys-libs/db )
- gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? (
- <dev-lang/tcl-8.6[threads]
- <dev-lang/tk-8.6[threads]
- )
- ncurses? ( sys-libs/ncurses )
- readline? ( sys-libs/readline )
- yaml? ( dev-libs/libyaml )
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20100402
- !<dev-ruby/rdoc-3.9.4
- !<dev-ruby/rubygems-1.8.10-r1"
-# libedit? ( dev-libs/libedit )
-# !libedit? ( readline? ( sys-libs/readline ) )
-
-DEPEND="${RDEPEND}"
-PDEPEND="
- >=dev-ruby/rubygems-1.8.10-r1[ruby_targets_ruby19]
- rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- epatch "${FILESDIR}"/${P}-add-asm_ioctl_h.patch
- einfo "Unbundling gems..."
- cd "$S"
- rm -r \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- ext/json \
- bin/gem || die "removal failed"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-# if use libedit; then
-# einfo "Using libedit to provide readline extension"
-# myconf="${myconf} --enable-libedit --with-readline"
-# elif use readline; then
-# einfo "Using readline to provide readline extension"
-# myconf="${myconf} --with-readline"
-# else
-# myconf="${myconf} --without-readline"
-# fi
- myconf="${myconf} $(use_with readline)"
-
- INSTALL="${EPREFIX}/usr/bin/install -c" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --enable-shared \
- --enable-pthread \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- $(use_with berkdb dbm) \
- $(use_with gdbm) \
- $(use_with ssl openssl) \
- $(use_with tk) \
- $(use_with ncurses curses) \
- $(use_with yaml psych) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* ToDo || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(18|19|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.0.0_p353.ebuild b/dev-lang/ruby/ruby-2.0.0_p353.ebuild
deleted file mode 100644
index abdcc8e..0000000
--- a/dev-lang/ruby/ruby-2.0.0_p353.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p353.ebuild,v 1.6 2013/12/15 17:44:01 ago Exp $
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.0.0
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.0/${MY_P}.tar.bz2
- http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
- berkdb? ( sys-libs/db )
- gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl )
- socks5? ( >=net-proxy/dante-1.1.13 )
- tk? ( dev-lang/tk[threads] )
- ncurses? ( sys-libs/ncurses )
- readline? ( sys-libs/readline )
- dev-libs/libyaml
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20100402
- !<dev-ruby/rdoc-3.9.4
- !<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
- >=dev-ruby/rubygems-2.0.2[ruby_targets_ruby20]
- >=dev-ruby/json-1.7.7[ruby_targets_ruby20]
- >=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
- rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- epatch "${FILESDIR}"/${PN}-uclibc-isnan-isinf.patch
- epatch "${FILESDIR}"/${PN}-add-asm_ioctl_h.patch
-
- # We can no longer unbundle all of rake because rubygems now depends
- # on this. We leave the actual rake code around to bootstrap
- # rubygems, but remove the bits that would cause a file collision.
- einfo "Unbundling gems..."
- cd "$S"
- rm -r \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- bin/gem || die "removal failed"
-
- # Fix a hardcoded lib path in configure script
- sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
- configure.in || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-# if use libedit; then
-# einfo "Using libedit to provide readline extension"
-# myconf="${myconf} --enable-libedit --with-readline"
-# elif use readline; then
-# einfo "Using readline to provide readline extension"
-# myconf="${myconf} --with-readline"
-# else
-# myconf="${myconf} --without-readline"
-# fi
- myconf="${myconf} $(use_with readline)"
-
- INSTALL="${EPREFIX}/usr/bin/install -c" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --enable-shared \
- --enable-pthread \
- --enable-psych \
- --disable-rpath \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- $(use_with berkdb dbm) \
- $(use_with gdbm) \
- $(use_with ssl openssl) \
- $(use_with tk) \
- $(use_with ncurses curses) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
- elog "than root, and you must place them into a writeable directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check tests"
- fi
-}
-
-src_install() {
- # Remove the remaining bundled gems. We do this late in the process
- # since they are used during the build to e.g. create the
- # documentation.
- rm -rf ext/json || die
-
- # Ruby is involved in the install process, we don't want interference here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
- LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
- if use doc; then
- make DESTDIR="${D}" install-doc || die "make install-doc failed"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
- "/usr/$(get_libdir)/libruby$(get_libname ${PV%.*})"
- dosym "libruby${MY_SUFFIX}$(get_libname ${PV%_*})" \
- "/usr/$(get_libdir)/libruby$(get_libname ${PV%_*})"
-
- dodoc ChangeLog NEWS doc/NEWS* README* || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(18|19|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild b/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
deleted file mode 100644
index a9c1e83..0000000
--- a/dev-libs/boehm-gc/boehm-gc-7.2e-r99.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2e.ebuild,v 1.9 2014/01/18 20:05:46 ago Exp $
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic
-
-MY_P="gc-${PV/_/}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
-SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="cxx static-libs threads"
-
-DEPEND=">=dev-libs/libatomic_ops-7.2
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P/e}"
-
-src_prepare() {
- rm -r libatomic_ops || die
-
- append-cppflags -DNO_GETCONTEXT
-
- epatch "${FILESDIR}"/${P}-automake-1.13.patch
- epatch "${FILESDIR}"/${PN}-7.2e-os_dep.patch
- eautoreconf
-}
-
-src_configure() {
- local config=(
- --with-libatomic-ops
- $(use_enable cxx cplusplus)
- $(use_enable static-libs static)
- $(use threads || echo --disable-threads)
- )
- econf "${config[@]}"
-}
-
-src_install() {
- default
-
- rm -r "${ED}"/usr/share/gc || die
-
- # dist_noinst_HEADERS
- insinto /usr/include/gc
- doins include/{cord.h,ec.h,javaxfc.h}
- insinto /usr/include/gc/private
- doins include/private/*.h
-
- dodoc README.QUICK doc/README{.environment,.linux,.macros} doc/barrett_diagram
- dohtml doc/*.html
- newman doc/gc.man GC_malloc.1
-
- use static-libs || prune_libtool_files #457872
-}
diff --git a/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild b/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild
deleted file mode 100644
index b46deba..0000000
--- a/dev-libs/boehm-gc/boehm-gc-7.4.2-r99.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.4.2.ebuild,v 1.4 2015/02/21 12:19:01 ago Exp $
-
-EAPI=5
-
-inherit eutils
-
-MY_P="gc-${PV}"
-
-DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
-HOMEPAGE="http://www.hboehm.info/gc/"
-SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
-
-LICENSE="boehm-gc"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="cxx static-libs threads"
-
-DEPEND=">=dev-libs/libatomic_ops-7.4
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-7.2e-os_dep.patch
- epatch "${FILESDIR}"/${PN}-7.4.2-getcontext.patch
-}
-
-src_configure() {
- local config=(
- --with-libatomic-ops
- $(use_enable cxx cplusplus)
- $(use_enable static-libs static)
- $(use threads || echo --disable-threads)
- )
- econf "${config[@]}"
-}
-
-src_install() {
- default
- use static-libs || prune_libtool_files
-
- rm -r "${ED}"/usr/share/gc || die
- dodoc README.QUICK doc/README{.environment,.linux,.macros}
- dohtml doc/*.html
- newman doc/gc.man GC_malloc.1
-}
diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch b/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch
deleted file mode 100644
index e987c42..0000000
--- a/dev-libs/boehm-gc/files/boehm-gc-7.2e-automake-1.13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ee6693d..d258252 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,7 +26,7 @@ AC_PREREQ(2.64)
- AC_REVISION($Revision: 1.1 $)
- GC_SET_VERSION
- AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])
--AM_CONFIG_HEADER([include/private/config.h])
-+AC_CONFIG_HEADER([include/private/config.h])
- AM_MAINTAINER_MODE
-
- AC_SUBST(PACKAGE)
diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch b/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch
deleted file mode 100644
index 602cfef..0000000
--- a/dev-libs/boehm-gc/files/boehm-gc-7.2e-os_dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-taken from sabotage linux
---- gc-7.2.org/os_dep.c 2013-01-03 17:13:21.878000003 +0000
-+++ gc-7.2/os_dep.c 2013-01-04 07:57:17.766000002 +0000
-@@ -26,6 +26,7 @@
- # define __KERNEL__
- # include <asm/signal.h>
- # undef __KERNEL__
-+# elif 1
- # else
- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */
diff --git a/dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch b/dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch
deleted file mode 100644
index d694b84..0000000
--- a/dev-libs/boehm-gc/files/boehm-gc-7.4.2-getcontext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/gc-7.4.2/mach_dep.c b/gc-7.4.2/mach_dep.c
---- a/gc-7.4.2/mach_dep.c 2014-06-03 08:08:02.000000000 -0200
-+++ b/gc-7.4.2/mach_dep.c 2015-04-10 10:54:48.500634001 -0200
-@@ -218,7 +218,7 @@
-
- # if defined(HAVE_PUSH_REGS)
- GC_push_regs();
--# elif defined(UNIX_LIKE) && !defined(NO_GETCONTEXT)
-+# elif 0
- /* Older versions of Darwin seem to lack getcontext(). */
- /* ARM and MIPS Linux often doesn't support a real */
- /* getcontext(). */
diff --git a/dev-libs/boehm-gc/metadata.xml b/dev-libs/boehm-gc/metadata.xml
deleted file mode 100644
index 89de980..0000000
--- a/dev-libs/boehm-gc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>sera@gentoo.org</email>
- <name>Ralph Sennhauser</name>
- </maintainer>
- <maintainer>
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
deleted file mode 100644
index 093bec1..0000000
--- a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fixed executable stack
-
-http://bugs.gentoo.org/115038
-
---- gmp-4.1.4/configure
-+++ gmp-4.1.4/configure
-@@ -21689,6 +21689,13 @@
- fi
- echo "')" >> $gmp_configm4
- echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
-+# Gentoo hack
-+case $host_os in
-+ *linux*)
-+ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
-+ echo '.previous' >> $gmp_configm4
-+ ;;
-+esac
-
- # Create Makefiles
- # FIXME: Upcoming version of autoconf/automake may not like broken lines.
diff --git a/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch b/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch
deleted file mode 100644
index 7fe6752..0000000
--- a/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make it work with secure_plt
-diff -ru a/gmp-5.1.3/mpn/powerpc32/elf.m4 b/gmp-5.1.3/mpn/powerpc32/elf.m4
---- a/gmp-5.1.3/mpn/powerpc32/elf.m4
-+++ b/gmp-5.1.3/mpn/powerpc32/elf.m4
-@@ -41,8 +41,10 @@
- m4_assert_numargs(2)
- `ifdef(`PIC',`
- mflr r0
-- bl _GLOBAL_OFFSET_TABLE_@local-4
-- mflr $1
-+ bcl 20, 31, 1f
-+1: mflr $1
-+ addis $1, $1, (_GLOBAL_OFFSET_TABLE_-1b)@ha
-+ addi $1, $1, (_GLOBAL_OFFSET_TABLE_-1b)@l
- mtlr r0
- lwz $1, $2@got($1)
- ',`
diff --git a/dev-libs/gmp/gmp-5.1.3-r99.ebuild b/dev-libs/gmp/gmp-5.1.3-r99.ebuild
deleted file mode 100644
index 5620a88..0000000
--- a/dev-libs/gmp/gmp-5.1.3-r99.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.19 2014/05/14 14:41:58 ago Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
- ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
- doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
- app-arch/xz-utils"
-RDEPEND="abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r1
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-src_prepare() {
- [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
- epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-
- epatch "${FILESDIR}"/${PN}-5.1.3-secure-plt.patch
-
- # note: we cannot run autotools here as gcc depends on this package
- elibtoolize
-
- # GMP uses the "ABI" env var during configure as does Gentoo (econf).
- # So, to avoid patching the source constantly, wrap things up.
- mv configure configure.wrapped || die
- cat <<-\EOF > configure
- #!/bin/sh
- exec env ABI="$GMPABI" "$0.wrapped" "$@"
- EOF
- chmod a+rx configure
-}
-
-multilib_src_configure() {
- # Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
- # http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
- if [[ ${CHOST} == hppa2.0-* ]] ; then
- export GMPABI="1.0"
- fi
-
- # ABI mappings (needs all architectures supported)
- case ${ABI} in
- 32|x86) GMPABI=32;;
- 64|amd64|n64) GMPABI=64;;
- [onx]32) GMPABI=${ABI};;
- esac
- export GMPABI
-
- tc-export CC
- ECONF_SOURCE="${S}" econf \
- --localstatedir=/var/state/gmp \
- --enable-shared \
- $(use_enable cxx) \
- $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
- emake
-
- if use pgo ; then
- emake -j1 -C tune tuneup
- ebegin "Trying to generate tuned data"
- ./tune/tuneup | tee gmp.mparam.h.new
- if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
- mv gmp.mparam.h.new gmp-mparam.h || die
- emake clean
- emake
- fi
- fi
-}
-
-multilib_src_test() {
- emake check
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- # should be a standalone lib
- rm -f "${D}"/usr/$(get_libdir)/libgmp.la
- # this requires libgmp
- local la="${D}/usr/$(get_libdir)/libgmpxx.la"
- use static-libs \
- && sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
- || rm -f "${la}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}
diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
deleted file mode 100644
index b419bd1..0000000
--- a/dev-libs/gmp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>toolchain</herd>
-<use>
- <flag name='pgo'>after building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch b/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch
deleted file mode 100644
index 087312f..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001
-From: Maciej Piechotka <uzytkownik2@gmail.com>
-Date: Tue, 13 Sep 2011 09:47:05 +0200
-Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN
-
----
- server/gam_node.c | 2 +-
- server/gam_node.h | 2 +-
- server/gam_subscription.c | 2 +-
- server/gam_subscription.h | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/server/gam_node.c b/server/gam_node.c
-index 02358ba..d0302d2 100644
---- a/server/gam_node.c
-+++ b/server/gam_node.c
-@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
- * it has finished with the string. If it must keep it longer, it
- * should makes its own copy. The returned string must not be freed.
- */
--G_CONST_RETURN char *
-+const char *
- gam_node_get_path(GamNode * node)
- {
- g_assert(node);
-diff --git a/server/gam_node.h b/server/gam_node.h
-index 02c8692..83349a8 100644
---- a/server/gam_node.h
-+++ b/server/gam_node.h
-@@ -58,7 +58,7 @@ gboolean gam_node_is_dir (GamNode *node);
- void gam_node_set_is_dir (GamNode *node,
- gboolean is_dir);
-
--G_CONST_RETURN char *gam_node_get_path (GamNode *node);
-+const char *gam_node_get_path (GamNode *node);
-
- GList *gam_node_get_subscriptions (GamNode *node);
-
-diff --git a/server/gam_subscription.c b/server/gam_subscription.c
-index dfa3273..4675b34 100644
---- a/server/gam_subscription.c
-+++ b/server/gam_subscription.c
-@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
- * @param sub the GamSubscription
- * @returns The path being monitored. It should not be freed.
- */
--G_CONST_RETURN char *
-+const char *
- gam_subscription_get_path(GamSubscription * sub)
- {
- if (sub == NULL)
-diff --git a/server/gam_subscription.h b/server/gam_subscription.h
-index d894fbe..e6b4e15 100644
---- a/server/gam_subscription.h
-+++ b/server/gam_subscription.h
-@@ -21,7 +21,7 @@ int gam_subscription_pathlen (GamSubscription *sub);
-
- int gam_subscription_get_reqno (GamSubscription *sub);
-
--G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
-+const char *gam_subscription_get_path (GamSubscription *sub);
-
- GamListener *gam_subscription_get_listener (GamSubscription *sub);
-
---
-1.7.6.1
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch b/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch
deleted file mode 100644
index fdfcbd7..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001
-From: Sebastian Dröge <slomo@debian.org>
-Date: Tue, 15 Dec 2009 12:24:25 +0000
-Subject: Bug 588338 - Enable linux specific features on armel
-
----
-diff --git a/configure.in b/configure.in
-index b0bbaec..e4b684e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -176,7 +176,7 @@ fi
-
- dnl check what OS we're on
- #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu)
--if test x$target_os = xlinux-gnu; then
-+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then
- AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
- fi
-
-@@ -223,7 +223,7 @@ fi
- dnl check if inotify backend is enabled
- AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue)
-
--if test x$os = xlinux-gnu; then
-+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then
- AC_ARG_ENABLE(dnotify,
- AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
- [dnotify="${enableval}"], [dnotify=true])
-@@ -297,10 +297,12 @@ else
- fi
-
- dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
--if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then
-- if test "${CC}" = "gcc" ; then
-- echo Use weak symbols !
-- THREAD_LIBS=
-+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then
-+ if test x$WITH_THREADS = x1 ; then
-+ if test "${CC}" = "gcc" ; then
-+ echo Use weak symbols !
-+ THREAD_LIBS=
-+ fi
- fi
- fi
- AC_SUBST(THREAD_LIBS)
---
-cgit v0.9.0.2
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch b/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch
deleted file mode 100644
index d3e0931..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gamin-0.1.9/lib/gam_error.h.1 2007-08-15 01:09:13.000000000 +0200
-+++ gamin-0.1.9/lib/gam_error.h 2007-08-15 01:09:27.000000000 +0200
-@@ -47,6 +47,9 @@
-
- int gam_errno(void);
-
-+void gam_error_init(void);
-+void gam_error_check(void);
-+
- #ifdef GAM_DEBUG_ENABLED
-
- #ifdef GAMIN_DEBUG_API
-@@ -70,9 +73,6 @@
- const char* format, ...);
- #define GAM_DEBUG if (gam_debug_active) gam_debug
-
--void gam_error_init(void);
--void gam_error_check(void);
--
- #else
- /*
- * no debug, redefine the macro empty content
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch
deleted file mode 100644
index ce3a15b..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.in.orig 2009-04-26 23:00:43.445135823 +0300
-+++ configure.in 2009-04-26 23:25:04.042489243 +0300
-@@ -389,8 +389,7 @@
-
- AC_MSG_CHECKING(abstract socket namespace)
- AC_LANG_PUSH(C)
--AC_RUN_IFELSE([AC_LANG_PROGRAM(
--[[
-+AC_TRY_RUN([
- #include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -398,8 +397,8 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <errno.h>
--]],
--[[
-+
-+int main() {
- int listen_fd;
- struct sockaddr_un addr;
-
-@@ -424,9 +423,11 @@
- }
- else
- exit (0);
--]])],
-- [have_abstract_sockets=yes],
-- [have_abstract_sockets=no])
-+}
-+],
-+have_abstract_sockets=yes,
-+have_abstract_sockets=no,
-+have_abstract_sockets=no)
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch b/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch
deleted file mode 100644
index 9f2b2a5..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi@mageia.org>
-Date: Wed, 4 Jan 2012 00:23:55 +0200
-Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
-
-ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
-However, ih_sub_cancel() locks it again, and locking GMutex recursively
-causes undefined behaviour.
-
-Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
-is its only user. Also make the function static so that it won't
-accidentally get used by other files without locking (inotify-helper.h
-is an internal server header).
-
-This should fix the intermittent deadlocks I've been experiencing
-causing KDE applications to no longer start, and probably also
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
----
- server/inotify-helper.c | 7 ++-----
- server/inotify-helper.h | 1 -
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/server/inotify-helper.c b/server/inotify-helper.c
-index d77203e..0789fa4 100644
---- a/server/inotify-helper.c
-+++ b/server/inotify-helper.c
-@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
-
- /**
- * Cancels a subscription which was being monitored.
-+ * inotify_lock must be held when calling.
- */
--gboolean
-+static gboolean
- ih_sub_cancel (ih_sub_t * sub)
- {
-- G_LOCK(inotify_lock);
--
--
- if (!sub->cancelled)
- {
- IH_W("cancelling %s\n", sub->pathname);
-@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
- sub_list = g_list_remove (sub_list, sub);
- }
-
-- G_UNLOCK(inotify_lock);
- return TRUE;
- }
-
-diff --git a/server/inotify-helper.h b/server/inotify-helper.h
-index 5d3b6d0..d36b5fd 100644
---- a/server/inotify-helper.h
-+++ b/server/inotify-helper.h
-@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
- found_callback_t fcb);
- gboolean ih_running (void);
- gboolean ih_sub_add (ih_sub_t *sub);
--gboolean ih_sub_cancel (ih_sub_t *sub);
-
- /* Return FALSE from 'f' if the subscription should be cancelled */
- void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
---
-1.7.7.2
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch b/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
deleted file mode 100644
index 562fc07..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- python/Makefile.am
-+++ python/Makefile.am
-@@ -10,8 +10,9 @@
- python_LTLIBRARIES = _gamin.la
-
- _gamin_la_SOURCES = gamin.c
-+_gamin_la_CFLAGS = -shared
- _gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
--_gamin_la_LDFLAGS = -module -avoid-version
-+_gamin_la_LDFLAGS = -module -avoid-version -shared
-
- python_PYTHON = gamin.py
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch b/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch
deleted file mode 100644
index c8c5b00..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-fix-pthread-mutex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gamin-0.1.10.orig/libgamin/gam_data.c
-+++ gamin-0.1.10/libgamin/gam_data.c
-@@ -470,7 +470,7 @@
- }
- if (is_threaded > 0) {
- pthread_mutexattr_init(&attr);
--#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP)
-+#if defined(linux) && defined(PTHREAD_MUTEX_RECURSIVE_NP)
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- #else
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch b/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch
deleted file mode 100644
index 1f2fcff..0000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e68aacc084d65fd0780991265444061b24422bd0 Mon Sep 17 00:00:00 2001
-From: Remi Cardona <remi@gentoo.org>
-Date: Mon, 20 Oct 2008 19:17:36 +0200
-Subject: [PATCH] make libgamin_shared a "noinst" libtool helper lib
-
----
- lib/Makefile.am | 4 ++--
- libgamin/Makefile.am | 15 ++-------------
- server/Makefile.am | 2 +-
- 3 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 3e2289c..af2152a 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -7,9 +7,9 @@ if GAMIN_DEBUG
- INCLUDES += -DGAM_DEBUG_ENABLED
- endif
-
--lib_LIBRARIES = libgamin_shared.a
-+noinst_LTLIBRARIES = libgamin_shared.la
-
--libgamin_shared_a_SOURCES = \
-+libgamin_shared_la_SOURCES = \
- gam_event.c \
- gam_event.h \
- gam_error.c \
-diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am
-index 35aa740..14fc06b 100644
---- a/libgamin/Makefile.am
-+++ b/libgamin/Makefile.am
-@@ -25,19 +25,9 @@ libgamin_1_la_SOURCES = \
- gam_data.h \
- gam_fork.c \
- gam_fork.h \
-- gam_protocol.h \
-- gam_error.c \
-- gam_event.c
-+ gam_protocol.h
-
--gam_error.c: $(top_srcdir)/lib/gam_error.c
-- @(cp $(top_srcdir)/lib/gam_error.c gam_error.c)
--
--gam_event.c: $(top_srcdir)/lib/gam_event.c
-- @(cp $(top_srcdir)/lib/gam_event.c gam_event.c)
--
--CLEANFILES=gam_error.c gam_event.c
--
--libgamin_1_la_LIBADD =
-+libgamin_1_la_LIBADD = $(top_builddir)/lib/libgamin_shared.la
-
- libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \
- -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@
-@@ -54,6 +44,5 @@ noinst_PROGRAMS= gamin
-
- gamin_SOURCES = gamin.c
- gamin_LDFLAGS =
--gamin_DEPENDENCIES = $(DEPS) libgamin-1.la
- gamin_LDADD= $(LDADDS) libgamin-1.la
-
-diff --git a/server/Makefile.am b/server/Makefile.am
-index 37aed8b..6aa5e02 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -80,7 +80,7 @@ endif
-
- gam_server_LDFLAGS =
- gam_server_DEPENDENCIES = $(DEPS)
--gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.a $(LDADDS) $(DAEMON_LIBS)
-+gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.la $(LDADDS) $(DAEMON_LIBS)
-
- if ENABLE_HURD_MACH_NOTIFY
- gam_server_LDADD += -lports -lthreads
---
-1.6.0.2
-
diff --git a/dev-libs/libgamin/libgamin-0.1.10-r99.ebuild b/dev-libs/libgamin/libgamin-0.1.10-r99.ebuild
deleted file mode 100644
index 176ddde..0000000
--- a/dev-libs/libgamin/libgamin-0.1.10-r99.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r5.ebuild,v 1.12 2014/12/06 16:40:07 ago Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-GNOME_ORG_MODULE="gamin"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils flag-o-matic libtool python-r1 gnome.org multilib-minimal
-
-DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
-SRC_URI="${SRC_URI}
- mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
- http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
- http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="debug kernel_linux python static-libs"
-
-RESTRICT="test" # needs gam-server
-
-RDEPEND="!app-admin/fam
- !<app-admin/gamin-0.1.10"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- mv "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
- # Fix QA warnings, bug #257281, upstream #466791
- epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
-
- if [[ ${CHOST} != *-solaris* ]] ; then
- # Fix compile warnings; bug #188923
- epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
- else
- # (Open)Solaris necessary patches (changes configure.in), unfortunately
- # conflicts with freebsd patch and breaks some linux installs so it must
- # only be applied if on solaris.
- epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2
- fi
-
- # Fix collision problem due to intermediate library, upstream bug #530635
- epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch
-
- # Fix compilation with latest glib, bug #382783
- epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
-
- # Fix crosscompilation issues, bug #267604
- epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
-
- # Enable linux specific features on armel, upstream bug #588338
- epatch "${FILESDIR}/${P}-armel-features.patch"
-
- # Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
- epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
-
- # Drop DEPRECATED flags
- sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
-
- # Build only shared version of Python module.
- epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
-
- # Fix build on musl
- epatch "${FILESDIR}"/${PN}-0.1.10-fix-pthread-mutex.patch
-
- sed -i \
- -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
- -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
- configure.in || die #466962
-
- # autoconf is required as the user-cflags patch modifies configure.in
- # however, elibtoolize is also required, so when the above patch is
- # removed, replace the following call with a call to elibtoolize
- AT_M4DIR="${WORKDIR}" eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=(
- $(use_enable static-libs static)
- --disable-debug
- --disable-server
- $(use_enable kernel_linux inotify)
- $(use_enable debug debug-api)
- --without-python
- )
- local ECONF_SOURCE=${S}
-
- econf "${myconf[@]}"
- if multilib_is_native_abi && use python; then
- python_configure() {
- mkdir -p "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
- econf "${myconf[@]}" --with-python
- }
-
- python_parallel_foreach_impl python_configure
- fi
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi && use python; then
- local native_builddir=${BUILD_DIR}
-
- python_compile() {
- emake -C "${BUILD_DIR}"/python \
- VPATH="${native_builddir}/python:${S}/python" \
- _gamin_la_LIBADD="${native_builddir}/libgamin/libgamin-1.la"
- }
-
- python_foreach_impl python_compile
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use python; then
- local native_builddir=${BUILD_DIR}
-
- python_install() {
- emake -C "${BUILD_DIR}"/python \
- DESTDIR="${D}" install \
- VPATH="${native_builddir}/python:${S}/python"
- }
-
- python_foreach_impl python_install
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
- dohtml doc/*
-
- prune_libtool_files --all
-}
diff --git a/dev-libs/libgamin/metadata.xml b/dev-libs/libgamin/metadata.xml
deleted file mode 100644
index 8c86806..0000000
--- a/dev-libs/libgamin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
-<email>freedesktop-bugs@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch b/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch
deleted file mode 100644
index 25ea478..0000000
--- a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- catalog.c
-+++ catalog.c
-@@ -68,10 +68,10 @@
- #define XML_URN_PUBID "urn:publicid:"
- #define XML_CATAL_BREAK ((xmlChar *) -1)
- #ifndef XML_XML_DEFAULT_CATALOG
--#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
-+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"
- #endif
- #ifndef XML_SGML_DEFAULT_CATALOG
--#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog"
-+#define XML_SGML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog"
- #endif
-
- #if defined(_WIN32) && defined(_MSC_VER)
-@@ -76,7 +76,7 @@
-
- #if defined(_WIN32) && defined(_MSC_VER)
- #undef XML_XML_DEFAULT_CATALOG
--static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog";
-+static char XML_XML_DEFAULT_CATALOG[256] = "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog";
- #if defined(_WIN32_WCE)
- /* Windows CE don't have a A variant */
- #define GetModuleHandleA GetModuleHandle
---- xmlcatalog.c
-+++ xmlcatalog.c
-@@ -43,7 +43,7 @@
-
-
- #ifndef XML_SGML_DEFAULT_CATALOG
--#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog"
-+#define XML_SGML_DEFAULT_CATALOG "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog"
- #endif
-
- /************************************************************************
---- runtest.c
-+++ runtest.c
-@@ -2747,7 +2747,7 @@
- */
- static int
- uripMatch(const char * URI) {
-- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog")))
-+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog")))
- return(0);
- /* Verify we received the escaped URL */
- if (strcmp(urip_rcvsURLs[urip_current], URI))
-@@ -2766,7 +2766,7 @@
- */
- static void *
- uripOpen(const char * URI) {
-- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog")))
-+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog")))
- return(NULL);
- /* Verify we received the escaped URL */
- if (strcmp(urip_rcvsURLs[urip_current], URI))
---- xmllint.c
-+++ xmllint.c
-@@ -103,7 +103,7 @@
- #endif
-
- #ifndef XML_XML_DEFAULT_CATALOG
--#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog"
-+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"
- #endif
-
- typedef enum {
diff --git a/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch b/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch
deleted file mode 100644
index be9cfee..0000000
--- a/dev-libs/libxml2/files/libxml2-2.8.0-xmlParseAttValueComplex-underflow.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a36fbe3b3e001a8a840b5c1fdd81cefc9947f0d Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Mon, 29 Oct 2012 10:39:55 +0800
-Subject: [PATCH] Fix potential out of bound access
-
----
- parser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index 0d8d7f2..bd634e9 100644
---- a/parser.c
-+++ b/parser.c
-@@ -4076,7 +4076,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int *attlen, int normalize) {
- goto error;
-
- if ((in_space) && (normalize)) {
-- while (buf[len - 1] == 0x20) len--;
-+ while ((len > 0) && (buf[len - 1] == 0x20)) len--;
- }
- buf[len] = 0;
- if (RAW == '<') {
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch b/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch
deleted file mode 100644
index cce3ecb..0000000
--- a/dev-libs/libxml2/files/libxml2-2.8.0_rc1-winnt.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 168e20836fe9614dd2dd4b42006c17a783f11c48 Mon Sep 17 00:00:00 2001
-From: Markus Duft <mduft@gentoo.org>
-Date: Thu, 20 Nov 2008 11:04:33 -0500
-Subject: [PATCH] Fix for ~x86-winnt
-
-[Alexandre Rostovtsev <tetromino@gentoo.org>: port to 2.8.0-rc1]
----
- dict.c | 2 +-
- include/wsockcompat.h | 2 +-
- nanohttp.c | 2 +-
- xmlIO.c | 4 ++++
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/dict.c b/dict.c
-index 3579f64..71e7bc6 100644
---- a/dict.c
-+++ b/dict.c
-@@ -47,7 +47,7 @@
- #else
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
--#elif defined(WIN32)
-+#elif defined(WIN32) || defined (__PARITY__)
- typedef unsigned __int32 uint32_t;
- #endif
- #endif
-diff --git a/include/wsockcompat.h b/include/wsockcompat.h
-index c762a64..1ed822b 100644
---- a/include/wsockcompat.h
-+++ b/include/wsockcompat.h
-@@ -27,7 +27,7 @@
- #endif
- #endif
-
--#if defined( __MINGW32__ ) || defined( _MSC_VER )
-+#if defined( __MINGW32__ ) || defined( _MSC_VER ) || defined(__PARITY__)
- /* Include <errno.h> here to ensure that it doesn't get included later
- * (e.g. by iconv.h) and overwrites the definition of EWOULDBLOCK. */
- #include <errno.h>
-diff --git a/nanohttp.c b/nanohttp.c
-index 2437fed..dbe97a7 100644
---- a/nanohttp.c
-+++ b/nanohttp.c
-@@ -74,7 +74,7 @@
- #define XML_SOCKLEN_T unsigned int
- #endif
-
--#if defined(__MINGW32__) || defined(_WIN32_WCE)
-+#if defined(__MINGW32__) || defined(_WIN32_WCE) || defined(__PARITY__)
- #ifndef _WINSOCKAPI_
- #define _WINSOCKAPI_
- #endif
-diff --git a/xmlIO.c b/xmlIO.c
-index 73a995d..99562f6 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -47,6 +47,7 @@
- #include <winnls.h> /* for CP_UTF8 */
- #endif
-
-+#ifndef __PARITY__
- /* Figure a portable way to know if a file is a directory. */
- #ifndef HAVE_STAT
- # ifdef HAVE__STAT
-@@ -82,6 +83,7 @@
- # endif
- # endif
- #endif
-+#endif /* __PARITY__ */
-
- #include <libxml/xmlmemory.h>
- #include <libxml/parser.h>
-@@ -657,6 +659,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
- {
- #ifdef HAVE_STAT
- int retval = -1;
-+#ifndef __PARITY__
- wchar_t *wPath;
-
- wPath = __xmlIOWin32UTF8ToWChar(path);
-@@ -665,6 +668,7 @@ xmlWrapStatUtf8(const char *path,struct stat *info)
- retval = _wstat(wPath,info);
- xmlFree(wPath);
- }
-+#endif
- /* maybe path in native encoding */
- if(retval < 0)
- retval = stat(path,info);
---
-1.7.8.6
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch b/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch
deleted file mode 100644
index a7a8215..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-disable_static_modules.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 4a8b5d5..b976893 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -19,13 +19,14 @@ if WITH_PYTHON
- AM_CPPFLAGS = \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
-- -I$(PYTHON_INCLUDES)
-+ -I$(PYTHON_INCLUDES) \
-+ -shared
-
- python_LTLIBRARIES = libxml2mod.la
-
- libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
- libxml2mod_la_LIBADD = $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) -lpython$(PYTHON_VERSION)
--libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
-+libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -shared
-
- BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch b/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch
deleted file mode 100644
index d7ff539..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-excessive-entity-expansion.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 23f05e0c33987d6605387b300c4be5da2120a7ab Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 19 Feb 2013 10:21:49 +0800
-Subject: [PATCH] Detect excessive entities expansion upon replacement
-
-If entities expansion in the XML parser is asked for,
-it is possble to craft relatively small input document leading
-to excessive on-the-fly content generation.
-This patch accounts for those replacement and stop parsing
-after a given threshold. it can be bypassed as usual with the
-HUGE parser option.
----
- include/libxml/parser.h | 1 +
- parser.c | 44 ++++++++++++++++++++++++++++++++++++++------
- parserInternals.c | 2 ++
- 3 files changed, 41 insertions(+), 6 deletions(-)
-
-diff --git a/include/libxml/parser.h b/include/libxml/parser.h
-index e1346e4..3f5730d 100644
---- a/include/libxml/parser.h
-+++ b/include/libxml/parser.h
-@@ -310,6 +310,7 @@ struct _xmlParserCtxt {
- xmlParserNodeInfo *nodeInfoTab; /* array of nodeInfos */
-
- int input_id; /* we need to label inputs */
-+ unsigned long sizeentcopy; /* volume of entity copy */
- };
-
- /**
-diff --git a/parser.c b/parser.c
-index 91f8c90..ddf3b5b 100644
---- a/parser.c
-+++ b/parser.c
-@@ -122,7 +122,7 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL, const xmlChar *ID,
- */
- static int
- xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
-- xmlEntityPtr ent)
-+ xmlEntityPtr ent, size_t replacement)
- {
- size_t consumed = 0;
-
-@@ -130,7 +130,24 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
- return (0);
- if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
- return (1);
-- if (size != 0) {
-+ if (replacement != 0) {
-+ if (replacement < XML_MAX_TEXT_LENGTH)
-+ return(0);
-+
-+ /*
-+ * If the volume of entity copy reaches 10 times the
-+ * amount of parsed data and over the large text threshold
-+ * then that's very likely to be an abuse.
-+ */
-+ if (ctxt->input != NULL) {
-+ consumed = ctxt->input->consumed +
-+ (ctxt->input->cur - ctxt->input->base);
-+ }
-+ consumed += ctxt->sizeentities;
-+
-+ if (replacement < XML_PARSER_NON_LINEAR * consumed)
-+ return(0);
-+ } else if (size != 0) {
- /*
- * Do the check based on the replacement size of the entity
- */
-@@ -176,7 +193,6 @@ xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
- */
- return (0);
- }
--
- xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
- return (1);
- }
-@@ -2743,7 +2759,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- while (*current != 0) { /* non input consuming loop */
- buffer[nbchars++] = *current++;
- if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-- if (xmlParserEntityCheck(ctxt, nbchars, ent))
-+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
- goto int_error;
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- }
-@@ -2785,7 +2801,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- while (*current != 0) { /* non input consuming loop */
- buffer[nbchars++] = *current++;
- if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-- if (xmlParserEntityCheck(ctxt, nbchars, ent))
-+ if (xmlParserEntityCheck(ctxt, nbchars, ent, 0))
- goto int_error;
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- }
-@@ -7203,7 +7219,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- xmlFreeNodeList(list);
- return;
- }
-- if (xmlParserEntityCheck(ctxt, 0, ent)) {
-+ if (xmlParserEntityCheck(ctxt, 0, ent, 0)) {
- xmlFreeNodeList(list);
- return;
- }
-@@ -7361,6 +7377,13 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- xmlNodePtr nw = NULL, cur, firstChild = NULL;
-
- /*
-+ * We are copying here, make sure there is no abuse
-+ */
-+ ctxt->sizeentcopy += ent->length;
-+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
-+ return;
-+
-+ /*
- * when operating on a reader, the entities definitions
- * are always owning the entities subtree.
- if (ctxt->parseMode == XML_PARSE_READER)
-@@ -7400,6 +7423,14 @@ xmlParseReference(xmlParserCtxtPtr ctxt) {
- } else if ((list == NULL) || (ctxt->inputNr > 0)) {
- xmlNodePtr nw = NULL, cur, next, last,
- firstChild = NULL;
-+
-+ /*
-+ * We are copying here, make sure there is no abuse
-+ */
-+ ctxt->sizeentcopy += ent->length;
-+ if (xmlParserEntityCheck(ctxt, 0, ent, ctxt->sizeentcopy))
-+ return;
-+
- /*
- * Copy the entity child list and make it the new
- * entity child list. The goal is to make sure any
-@@ -14767,6 +14798,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
- ctxt->catalogs = NULL;
- ctxt->nbentities = 0;
- ctxt->sizeentities = 0;
-+ ctxt->sizeentcopy = 0;
- xmlInitNodeInfoSeq(&ctxt->node_seq);
-
- if (ctxt->attsDefault != NULL) {
-diff --git a/parserInternals.c b/parserInternals.c
-index 02032d5..f8a7041 100644
---- a/parserInternals.c
-+++ b/parserInternals.c
-@@ -1719,6 +1719,8 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
- ctxt->charset = XML_CHAR_ENCODING_UTF8;
- ctxt->catalogs = NULL;
- ctxt->nbentities = 0;
-+ ctxt->sizeentities = 0;
-+ ctxt->sizeentcopy = 0;
- ctxt->input_id = 1;
- xmlInitNodeInfoSeq(&ctxt->node_seq);
- return(0);
---
-1.8.1.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch b/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch
deleted file mode 100644
index 61de4d6..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-large-file-parse.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 153cf15905cf4ec080612ada6703757d10caba1e Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 26 Oct 2012 13:50:47 +0800
-Subject: [PATCH] Fix large parse of file from memory
-
-https://bugzilla.redhat.com/show_bug.cgi?id=862969
-The new code trying to detect excessive input lookup would
-just get wrong sometimes in the case of very large file parsed
-directly from memory.
----
- libxml.h | 2 ++
- parser.c | 1 +
- xmlIO.c | 2 +-
- 3 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libxml.h b/libxml.h
-index efe285b..7558b5f 100644
---- a/libxml.h
-+++ b/libxml.h
-@@ -91,6 +91,8 @@ void __xmlGlobalInitMutexDestroy(void);
- int __xmlRandom(void);
- #endif
-
-+int xmlNop(void);
-+
- #ifdef IN_LIBXML
- #ifdef __GNUC__
- #ifdef PIC
-diff --git a/parser.c b/parser.c
-index 43f53d9..0d8d7f2 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2025,6 +2025,7 @@ static void xmlSHRINK (xmlParserCtxtPtr ctxt) {
- static void xmlGROW (xmlParserCtxtPtr ctxt) {
- if ((((ctxt->input->end - ctxt->input->cur) > XML_MAX_LOOKUP_LIMIT) ||
- ((ctxt->input->cur - ctxt->input->base) > XML_MAX_LOOKUP_LIMIT)) &&
-+ ((ctxt->input->buf) && (ctxt->input->buf->readcallback != xmlNop)) &&
- ((ctxt->options & XML_PARSE_HUGE) == 0)) {
- xmlFatalErr(ctxt, XML_ERR_INTERNAL_ERROR, "Huge input lookup");
- ctxt->instate = XML_PARSER_EOF;
-diff --git a/xmlIO.c b/xmlIO.c
-index f8f438b..44254e4 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -800,7 +800,7 @@ xmlCheckFilename (const char *path)
- return 1;
- }
-
--static int
-+int
- xmlNop(void) {
- return(0);
- }
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch b/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
deleted file mode 100644
index 2ebb4f0..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-manual-python.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2a74d41325c9e8043a2beec8b957ddf66f57cfd5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 18 Dec 2012 02:09:14 -0500
-Subject: [PATCH] build/test/install python bindings manually
-
-To support building for multiple python ABIs, we want to skip checks for
-python in configure, and build/test/install python bindings manually.
----
- configure.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 3d5f48b..b467c51 100644
---- a/configure.in
-+++ b/configure.in
-@@ -748,7 +748,7 @@ PYTHON_INCLUDES=
- PYTHON_SITE_PACKAGES=
- PYTHON_TESTS=
- pythondir=
--if test "$with_python" != "no" ; then
-+if false ; then
- if test -x "$with_python/bin/python"
- then
- echo Found python in $with_python/bin/python
-@@ -823,7 +823,7 @@ if test "$with_python" != "no" ; then
- else
- PYTHON=
- fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
-+AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no")
- if test "$PYTHON_INCLUDES" != ""
- then
- PYTHON_SUBDIR=python
-@@ -1429,7 +1429,7 @@ else
- echo "Enabled Schemas/Relax-NG support"
- WITH_SCHEMAS=1
- TEST_SCHEMAS="Schemastests Relaxtests"
-- if test "$PYTHON_INCLUDES" != "" ; then
-+ if test "$with_python" != "no" ; then
- PYTHON_TESTS="$PYTHON_TESTS RelaxNGPythonTests SchemasPythonTests"
- fi
- with_regexps=yes
---
-1.8.0.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch b/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch
deleted file mode 100644
index 994363f..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-nsclean.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 711b15d545713b3a34a51ce8163d1162533647c9 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 25 Oct 2012 19:23:26 +0800
-Subject: [PATCH] Fix a bug in the nsclean option of the parser
-
-Raised as a side effect of:
-https://bugzilla.gnome.org/show_bug.cgi?id=663844
----
- parser.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index 19f1217..43f53d9 100644
---- a/parser.c
-+++ b/parser.c
-@@ -1540,7 +1540,7 @@ nsPush(xmlParserCtxtPtr ctxt, const xmlChar *prefix, const xmlChar *URL)
- {
- if (ctxt->options & XML_PARSE_NSCLEAN) {
- int i;
-- for (i = 0;i < ctxt->nsNr;i += 2) {
-+ for (i = ctxt->nsNr - 2;i >= 0;i -= 2) {
- if (ctxt->nsTab[i] == prefix) {
- /* in scope */
- if (ctxt->nsTab[i + 1] == URL)
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch b/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch
deleted file mode 100644
index 7798a2c..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-rand_seed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e7715a5963afebfb027120db6914926ec9a7373d Mon Sep 17 00:00:00 2001
-From: Wouter Van Rooy <rooywo@vasco.com>
-Date: Fri, 14 Sep 2012 14:39:42 +0800
-Subject: [PATCH] rand_seed should be static in dict.c
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=683933
-rand_seed should be a static variable in dict.c
-
-We ran into a problem with another library that exports rand_seed as a
-function. Combined with 2.7.8 this was not a problem but later versions
-have this problem.
----
- dict.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dict.c b/dict.c
-index 9935a25..164c7f2 100644
---- a/dict.c
-+++ b/dict.c
-@@ -143,7 +143,7 @@ static int xmlDictInitialized = 0;
- /*
- * Internal data for random function, protected by xmlDictMutex
- */
--unsigned int rand_seed = 0;
-+static unsigned int rand_seed = 0;
- #endif
- #endif
-
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-remove-redundant-pthread-defs.patch b/dev-libs/libxml2/files/libxml2-2.9.0-remove-redundant-pthread-defs.patch
deleted file mode 100644
index f02f650..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-remove-redundant-pthread-defs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur libxml2-2.9.0.orig/threads.c libxml2-2.9.0/threads.c
---- libxml2-2.9.0.orig/threads.c 2013-07-06 19:58:28.098680769 +0000
-+++ libxml2-2.9.0/threads.c 2013-07-06 21:40:17.672022393 +0000
-@@ -47,6 +47,7 @@
- #ifdef HAVE_PTHREAD_H
-
- static int libxml_is_threaded = -1;
-+#if 0
- #ifdef __GNUC__
- #ifdef linux
- #if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 3)
-@@ -90,6 +91,7 @@
- #endif
- #endif /* linux */
- #endif /* __GNUC__ */
-+#endif
- #endif /* HAVE_PTHREAD_H */
-
- /*
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch b/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch
deleted file mode 100644
index 5fa2d6f..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-streaming-validation.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 6c91aa384f48ff6d406553a6dd47fd556c1ef2e6 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 25 Oct 2012 15:33:59 +0800
-Subject: [PATCH] Fix a regression in 2.9.0 breaking validation while
- streaming
-
-https://bugzilla.gnome.org/show_bug.cgi?id=684774
-with help from Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
----
- SAX2.c | 2 +-
- parser.c | 7 +++++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/SAX2.c b/SAX2.c
-index a24abc8..3eea39a 100644
---- a/SAX2.c
-+++ b/SAX2.c
-@@ -2202,7 +2202,7 @@ xmlSAX2StartElementNs(void *ctx,
- (ctxt->myDoc->intSubset->elements == NULL) &&
- (ctxt->myDoc->intSubset->attributes == NULL) &&
- (ctxt->myDoc->intSubset->entities == NULL)))) {
-- xmlErrValid(ctxt, XML_ERR_NO_DTD,
-+ xmlErrValid(ctxt, XML_DTD_NO_DTD,
- "Validation failed: no DTD found !", NULL, NULL);
- ctxt->validate = 0;
- }
-diff --git a/parser.c b/parser.c
-index 28b0d80..19f1217 100644
---- a/parser.c
-+++ b/parser.c
-@@ -11633,7 +11633,7 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
- "PP: Parsing internal subset\n");
- #endif
- ctxt->inSubset = 1;
-- ctxt->progressive = 1;
-+ ctxt->progressive = 0;
- ctxt->checkIndex = 0;
- xmlParseDocTypeDecl(ctxt);
- if (RAW == '[') {
-@@ -12219,7 +12219,10 @@ xmldecl_done:
- }
- ctxt->instate = XML_PARSER_EOF;
- }
-- return((xmlParserErrors) ctxt->errNo);
-+ if (ctxt->wellFormed == 0)
-+ return((xmlParserErrors) ctxt->errNo);
-+ else
-+ return(0);
- }
-
- /************************************************************************
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
deleted file mode 100644
index 2d0d5f7..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-alloc.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 0ad948ede2b5060a144c72e4e27c38d24a272ef4 Mon Sep 17 00:00:00 2001
-From: Tim Starling <tstarling@wikimedia.org>
-Date: Mon, 29 Oct 2012 13:41:55 +1100
-Subject: [PATCH] Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h
-
-Otherwise, direct calls to xmlFree() etc. from the application will
-use a different set of allocation functions to what was used to allocate
-the memory internally.
----
- configure.in | 4 +++-
- include/libxml/xmlversion.h.in | 9 +++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 6da057c..245c033 100644
---- a/configure.in
-+++ b/configure.in
-@@ -954,6 +954,7 @@ WITH_THREADS=0
- THREAD_CFLAGS=""
- TEST_THREADS=""
- THREADS_W32=""
-+WITH_THREAD_ALLOC=0
-
- if test "$with_threads" = "no" ; then
- echo Disabling multithreaded support
-@@ -1017,7 +1018,7 @@ else
- fi
- fi
- if test "$with_thread_alloc" = "yes" -a "$WITH_THREADS" = "1" ; then
-- THREAD_CFLAGS="$THREAD_CFLAGS -DLIBXML_THREAD_ALLOC_ENABLED"
-+ WITH_THREAD_ALLOC=1
- fi
-
- AC_SUBST(THREAD_LIBS)
-@@ -1025,6 +1026,7 @@ AC_SUBST(BASE_THREAD_LIBS)
- AC_SUBST(WITH_THREADS)
- AC_SUBST(THREAD_CFLAGS)
- AC_SUBST(TEST_THREADS)
-+AC_SUBST(WITH_THREAD_ALLOC)
- AM_CONDITIONAL([THREADS_W32],[test -n "$THREADS_W32"])
-
- dnl
-diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
-index c98e7ca..00a836f 100644
---- a/include/libxml/xmlversion.h.in
-+++ b/include/libxml/xmlversion.h.in
-@@ -98,6 +98,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
- #endif
-
- /**
-+ * LIBXML_THREAD_ALLOC_ENABLED:
-+ *
-+ * Whether the allocation hooks are per-thread
-+ */
-+#if @WITH_THREAD_ALLOC@
-+#define LIBXML_THREAD_ALLOC_ENABLED
-+#endif
-+
-+/**
- * LIBXML_TREE_ENABLED:
- *
- * Whether the DOM like tree manipulation API support is configured in
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch b/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch
deleted file mode 100644
index a85d612..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.0-thread-portability.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f6cfbd1d38d0634a2ddcb9a0a13e1b5a2195a5e Mon Sep 17 00:00:00 2001
-From: Friedrich Haubensak <hsk@fli-leibniz.de>
-Date: Wed, 12 Sep 2012 17:34:53 +0200
-Subject: [PATCH] Fix a thread portability problem
-
-cannot compile libxml2-2.9.0 using studio 12.1 compiler on solaris 10
-
-I.M.O. structure initializer (as PTHREAD_ONCE_INIT) cannot be used in
-a structure assignment anyway
----
- threads.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/threads.c b/threads.c
-index f206149..7e85a26 100644
---- a/threads.c
-+++ b/threads.c
-@@ -146,6 +146,7 @@ struct _xmlRMutex {
- static pthread_key_t globalkey;
- static pthread_t mainthread;
- static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-+static pthread_once_t once_control_init = PTHREAD_ONCE_INIT;
- static pthread_mutex_t global_init_lock = PTHREAD_MUTEX_INITIALIZER;
- #elif defined HAVE_WIN32_THREADS
- #if defined(HAVE_COMPILER_TLS)
-@@ -915,7 +916,7 @@ xmlCleanupThreads(void)
- #ifdef HAVE_PTHREAD_H
- if ((libxml_is_threaded) && (pthread_key_delete != NULL))
- pthread_key_delete(globalkey);
-- once_control = PTHREAD_ONCE_INIT;
-+ once_control = once_control_init;
- #elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
- if (globalkey != TLS_OUT_OF_INDEXES) {
- xmlGlobalStateCleanupHelperParams *p;
---
-1.8.0
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch b/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
deleted file mode 100644
index 16ea5c1..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-compression-detection.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 63588f476f2dc89d4c6ef70a474d7230fbf4d45e Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 10 May 2013 14:01:46 +0800
-Subject: [PATCH] Fix a regression in xmlGetDocCompressMode()
-
-The switch to xzlib had for consequence that the compression
-level of the input was not gathered anymore in ctxt->input->buf,
-then the parser compression flags was left to -1 and propagated
-to the resulting document.
-Fix the I/O layer to get compression detection in xzlib,
-then carry it in the input buffer and the resulting document
-
- This should fix
- https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=3456
----
- parser.c | 4 ++++
- xmlIO.c | 17 +++++++++++++++++
- xzlib.c | 25 +++++++++++++++++++++++++
- xzlib.h | 1 +
- 4 files changed, 47 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 1d478c3..4a442bb 100644
---- a/parser.c
-+++ b/parser.c
-@@ -10681,6 +10681,10 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
- ctxt->sax->startDocument(ctxt->userData);
- if (ctxt->instate == XML_PARSER_EOF)
- return(-1);
-+ if ((ctxt->myDoc != NULL) && (ctxt->input != NULL) &&
-+ (ctxt->input->buf != NULL) && (ctxt->input->buf->compressed >= 0)) {
-+ ctxt->myDoc->compression = ctxt->input->buf->compressed;
-+ }
-
- /*
- * The Misc part of the Prolog
-diff --git a/xmlIO.c b/xmlIO.c
-index 847cb7e..fc4e111 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2669,6 +2669,12 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #endif
- }
- #endif
-+#ifdef HAVE_LZMA_H
-+ if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) &&
-+ (strcmp(URI, "-") != 0)) {
-+ ret->compressed = __libxml2_xzcompressed(context);
-+ }
-+#endif
- }
- else
- xmlInputCallbackTable[i].closecallback (context);
-@@ -3325,6 +3331,17 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) {
- if (res < 0) {
- return(-1);
- }
-+
-+ /*
-+ * try to establish compressed status of input if not done already
-+ */
-+ if (in->compressed == -1) {
-+#ifdef HAVE_LZMA_H
-+ if (in->readcallback == xmlXzfileRead)
-+ in->compressed = __libxml2_xzcompressed(in->context);
-+#endif
-+ }
-+
- len = res;
- if (in->encoder != NULL) {
- unsigned int use;
-diff --git a/xzlib.c b/xzlib.c
-index 928bd17..150e803 100644
---- a/xzlib.c
-+++ b/xzlib.c
-@@ -182,12 +182,37 @@ xz_open(const char *path, int fd, const char *mode ATTRIBUTE_UNUSED)
- return (xzFile) state;
- }
-
-+static int
-+xz_compressed(xzFile f) {
-+ xz_statep state;
-+
-+ if (f == NULL)
-+ return(-1);
-+ state = (xz_statep) f;
-+ if (state->init <= 0)
-+ return(-1);
-+
-+ switch (state->how) {
-+ case COPY:
-+ return(0);
-+ case GZIP:
-+ case LZMA:
-+ return(1);
-+ }
-+ return(-1);
-+}
-+
- xzFile
- __libxml2_xzopen(const char *path, const char *mode)
- {
- return xz_open(path, -1, mode);
- }
-
-+int
-+__libxml2_xzcompressed(xzFile f) {
-+ return xz_compressed(f);
-+}
-+
- xzFile
- __libxml2_xzdopen(int fd, const char *mode)
- {
-diff --git a/xzlib.h b/xzlib.h
-index 43c75e1..29ba55e 100644
---- a/xzlib.h
-+++ b/xzlib.h
-@@ -15,4 +15,5 @@ xzFile __libxml2_xzopen(const char *path, const char *mode);
- xzFile __libxml2_xzdopen(int fd, const char *mode);
- int __libxml2_xzread(xzFile file, void *buf, unsigned len);
- int __libxml2_xzclose(xzFile file);
-+int __libxml2_xzcompressed(xzFile f);
- #endif /* LIBXML2_XZLIB_H */
---
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch b/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
deleted file mode 100644
index 81f692f..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-external-param-entities.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9cd1c3cfbd32655d60572c0a413e017260c854df Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Tue, 22 Apr 2014 15:30:56 +0800
-Subject: [PATCH] Do not fetch external parameter entities
-
-Unless explicitely asked for when validating or replacing entities
-with their value. Problem pointed out by Daniel Berrange <berrange@redhat.com>
----
- parser.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/parser.c b/parser.c
-index 9347ac9..c0dea05 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2598,6 +2598,20 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
- xmlCharEncoding enc;
-
- /*
-+ * Note: external parsed entities will not be loaded, it is
-+ * not required for a non-validating parser, unless the
-+ * option of validating, or substituting entities were
-+ * given. Doing so is far more secure as the parser will
-+ * only process data coming from the document entity by
-+ * default.
-+ */
-+ if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
-+ ((ctxt->options & XML_PARSE_NOENT) == 0) &&
-+ ((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
-+ (ctxt->validate == 0))
-+ return;
-+
-+ /*
- * handle the extra spaces added before and after
- * c.f. http://www.w3.org/TR/REC-xml#as-PE
- * this is done independently.
---
-1.9.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
deleted file mode 100644
index ab33038..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-icu-pkgconfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 7374564..13c8d4e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
- AC_SUBST(WITH_ICONV)
-
- WITH_ICU=0
--ICU_LIBS=""
- if test "$with_icu" != "yes" ; then
- echo Disabling ICU support
- else
-- ICU_CONFIG=icu-config
-- if ${ICU_CONFIG} --cflags >/dev/null 2>&1
-- then
-- ICU_LIBS=`${ICU_CONFIG} --ldflags`
-- WITH_ICU=1
-- echo Enabling ICU support
-- else
-- AC_MSG_ERROR([libicu config program icu-config not found])
-- fi
-+ PKG_CHECK_MODULES(ICU, icu-i18n)
-+ WITH_ICU=1
- fi
- AC_SUBST(WITH_ICU)
- AC_SUBST(ICU_LIBS)
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch b/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
deleted file mode 100644
index 5766532..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-missing-break.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10ec19ab0a49936ca8ca0d6962d24d3f889960a5 Mon Sep 17 00:00:00 2001
-From: dcb <dcb314@hotmail.com>
-Date: Thu, 2 May 2013 16:11:46 +0800
-Subject: [PATCH] Fix missing break on last() function for attributes
-
-pointed out by cppcheck
----
- python/libxml.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/python/libxml.c b/python/libxml.c
-index 03cfb9f..3338b83 100644
---- a/python/libxml.c
-+++ b/python/libxml.c
-@@ -2683,6 +2683,7 @@ libxml_last(ATTRIBUTE_UNUSED PyObject * self, PyObject * args)
- xmlAttrPtr attr = (xmlAttrPtr) cur;
-
- res = attr->last;
-+ break;
- }
- default:
- res = NULL;
---
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch b/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
deleted file mode 100644
index 51a92ad..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-non-ascii-cr-lf.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From dcc19503193c71596278a252064a8ce66331b3cd Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Wed, 22 May 2013 22:56:45 +0200
-Subject: [PATCH] Fix a parsing bug on non-ascii element and CR/LF usage
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698550
-
-Somehow the behaviour of the internal parser routine changed
-slightly when encountering CR/LF, which led to a bug when
-parsing document with non-ascii Names
----
- parser.c | 6 +++++-
- result/japancrlf.xml | 4 ++++
- result/japancrlf.xml.rde | 7 +++++++
- result/japancrlf.xml.rdr | 7 +++++++
- result/japancrlf.xml.sax | 11 +++++++++++
- result/japancrlf.xml.sax2 | 11 +++++++++++
- result/noent/japancrlf.xml | 4 ++++
- test/japancrlf.xml | 6 ++++++
- 8 files changed, 55 insertions(+), 1 deletion(-)
- create mode 100644 result/japancrlf.xml
- create mode 100644 result/japancrlf.xml.rde
- create mode 100644 result/japancrlf.xml.rdr
- create mode 100644 result/japancrlf.xml.sax
- create mode 100644 result/japancrlf.xml.sax2
- create mode 100644 result/noent/japancrlf.xml
- create mode 100644 test/japancrlf.xml
-
-diff --git a/parser.c b/parser.c
-index 4a442bb..4739add 100644
---- a/parser.c
-+++ b/parser.c
-@@ -3404,6 +3404,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- int len = 0, l;
- int c;
- int count = 0;
-+ const xmlChar *end; /* needed because CUR_CHAR() can move cur on \r\n */
-
- #ifdef DEBUG
- nbParseNCNameComplex++;
-@@ -3413,6 +3414,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- * Handler for more complex cases
- */
- GROW;
-+ end = ctxt->input->cur;
- c = CUR_CHAR(l);
- if ((c == ' ') || (c == '>') || (c == '/') || /* accelerators */
- (!xmlIsNameStartChar(ctxt, c) || (c == ':'))) {
-@@ -3434,12 +3436,14 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- }
- len += l;
- NEXTL(l);
-+ end = ctxt->input->cur;
- c = CUR_CHAR(l);
- if (c == 0) {
- count = 0;
- GROW;
- if (ctxt->instate == XML_PARSER_EOF)
- return(NULL);
-+ end = ctxt->input->cur;
- c = CUR_CHAR(l);
- }
- }
-@@ -3448,7 +3452,7 @@ xmlParseNCNameComplex(xmlParserCtxtPtr ctxt) {
- xmlFatalErr(ctxt, XML_ERR_NAME_TOO_LONG, "NCName");
- return(NULL);
- }
-- return(xmlDictLookup(ctxt->dict, ctxt->input->cur - len, len));
-+ return(xmlDictLookup(ctxt->dict, end - len, len));
- }
-
- /**
-diff --git a/result/japancrlf.xml b/result/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
---- /dev/null
-+++ b/result/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+ <c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/result/japancrlf.xml.rde b/result/japancrlf.xml.rde
-new file mode 100644
-index 0000000..0bc5af7
---- /dev/null
-+++ b/result/japancrlf.xml.rde
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1
-+
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.rdr b/result/japancrlf.xml.rdr
-new file mode 100644
-index 0000000..0bc5af7
---- /dev/null
-+++ b/result/japancrlf.xml.rdr
-@@ -0,0 +1,7 @@
-+0 1 入力メッセージ 0 0
-+1 14 #text 0 1
-+
-+1 1 c8c:Ele 1 0
-+1 14 #text 0 1
-+
-+0 15 入力メッセージ 0 0
-diff --git a/result/japancrlf.xml.sax b/result/japancrlf.xml.sax
-new file mode 100644
-index 0000000..c3bbdc6
---- /dev/null
-+++ b/result/japancrlf.xml.sax
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElement(入力メッセージ, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+ , 2)
-+SAX.startElement(c8c:Ele, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endElement(c8c:Ele)
-+SAX.characters(
-+, 1)
-+SAX.endElement(入力メッセージ)
-+SAX.endDocument()
-diff --git a/result/japancrlf.xml.sax2 b/result/japancrlf.xml.sax2
-new file mode 100644
-index 0000000..878eae4
---- /dev/null
-+++ b/result/japancrlf.xml.sax2
-@@ -0,0 +1,11 @@
-+SAX.setDocumentLocator()
-+SAX.startDocument()
-+SAX.startElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.characters(
-+ , 2)
-+SAX.startElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 1, xmlns:c8c='http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826', 0, 0)
-+SAX.endElementNs(Ele, c8c, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.characters(
-+, 1)
-+SAX.endElementNs(入力メッセージ, NULL, 'http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826')
-+SAX.endDocument()
-diff --git a/result/noent/japancrlf.xml b/result/noent/japancrlf.xml
-new file mode 100644
-index 0000000..60b307c
---- /dev/null
-+++ b/result/noent/japancrlf.xml
-@@ -0,0 +1,4 @@
-+<?xml version="1.0"?>
-+<入力メッセージ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+ <c8c:Ele xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"/>
-+</入力メッセージ>
-diff --git a/test/japancrlf.xml b/test/japancrlf.xml
-new file mode 100644
-index 0000000..480cb2d
---- /dev/null
-+++ b/test/japancrlf.xml
-@@ -0,0 +1,6 @@
-+<入力メッセージ
-+ xmlns="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826">
-+ <c8c:Ele
-+ xmlns:c8c="http://schemas.cordys.com/webapps/1.0/bpm/c8c8b82a-0ac0-3d19-01e2-bda74af9b826"
-+ />
-+</入力メッセージ>
-\ No newline at end of file
---
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
deleted file mode 100644
index c79709d..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python-2.6.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 722923bc9b788f028e4221c77138fc66735a3113 Mon Sep 17 00:00:00 2001
-From: Petr Sumbera <petr.sumbera@oracle.com>
-Date: Fri, 3 May 2013 22:25:38 +0800
-Subject: [PATCH] Fix for compilation with python 2.6.8
-
-Remap PyCapsule to PyCObject based on the macro being available
-instead of using the python version
----
- python/libxml_wrap.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/libxml_wrap.h b/python/libxml_wrap.h
-index a9b9739..53a0618 100644
---- a/python/libxml_wrap.h
-+++ b/python/libxml_wrap.h
-@@ -34,11 +34,11 @@
- #define PyBytes_AsString PyString_AsString
- #define PyBytes_AS_STRING PyString_AS_STRING
- #define PyBytes_GET_SIZE PyString_GET_SIZE
--
-+#endif
-+#ifndef PyCapsule_New
- #define PyCapsule_New PyCObject_FromVoidPtrAndDesc
- #define PyCapsule_CheckExact PyCObject_Check
- #define PyCapsule_GetPointer(o, n) PyCObject_GetDesc((o))
--
- #endif
- #endif
-
---
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
deleted file mode 100644
index 5c4e83d..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 927faac6113b625a9a3423eef8f144fc7d9a8547 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 10 Jul 2013 23:00:54 -0400
-Subject: [PATCH] python: fix drv_libxml2.py for python3 compatibility
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703979
----
- python/drv_libxml2.py | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index e43fb1d..c9075e6 100644
---- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -34,12 +34,20 @@ TODO
-
- """
-
--__author__ = u"Stéphane Bidoul <sbi@skynet.be>"
-+__author__ = "Stéphane Bidoul <sbi@skynet.be>"
- __version__ = "0.3"
-
-+import sys
- import codecs
--from types import StringType, UnicodeType
--StringTypes = (StringType,UnicodeType)
-+
-+if sys.version < "3":
-+ __author__ = codecs.unicode_escape_decode(__author__)[0]
-+
-+ from types import StringType, UnicodeType
-+ StringTypes = (StringType,UnicodeType)
-+
-+else:
-+ StringTypes = (str)
-
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -65,7 +73,7 @@ def _d(s):
-
- try:
- import libxml2
--except ImportError, e:
-+except ImportError as e:
- raise SAXReaderNotAvailable("libxml2 not available: " \
- "import error was: %s" % e)
-
---
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch b/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
deleted file mode 100644
index d07a1e2..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-python3a.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6dd7775f3506741093890d99f09c242e0b34b55f Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail..com>
-Date: Fri, 12 Jul 2013 11:18:11 +0800
-Subject: [PATCH] Another round of fixes for older versions of Python
-
----
- python/drv_libxml2.py | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/python/drv_libxml2.py b/python/drv_libxml2.py
-index c9075e6..c2ec3e2 100644
---- a/python/drv_libxml2.py
-+++ b/python/drv_libxml2.py
-@@ -40,14 +40,12 @@ __version__ = "0.3"
- import sys
- import codecs
-
--if sys.version < "3":
-+if sys.version_info[0] < 3:
- __author__ = codecs.unicode_escape_decode(__author__)[0]
-
-- from types import StringType, UnicodeType
-- StringTypes = (StringType,UnicodeType)
--
-+ StringTypes = (str, unicode)
- else:
-- StringTypes = (str)
-+ StringTypes = str
-
- from xml.sax._exceptions import *
- from xml.sax import xmlreader, saxutils
-@@ -73,9 +71,9 @@ def _d(s):
-
- try:
- import libxml2
--except ImportError as e:
-+except ImportError:
- raise SAXReaderNotAvailable("libxml2 not available: " \
-- "import error was: %s" % e)
-+ "import error was: %s" % sys.exc_info()[1])
-
- class Locator(xmlreader.Locator):
- """SAX Locator adapter for libxml2.xmlTextReaderLocator"""
-@@ -142,7 +140,7 @@ class LibXml2Reader(xmlreader.XMLReader):
- self.__parsing = 1
- try:
- # prepare source and create reader
-- if type(source) in StringTypes:
-+ if isinstance(source, StringTypes):
- reader = libxml2.newTextReaderFilename(source)
- else:
- source = saxutils.prepare_input_source(source)
---
-1.8.3.2
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
deleted file mode 100644
index 7ce2f3b..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 16 May 2014 22:46:00 -0400
-Subject: [PATCH] xmllint: a posteriori validation needs to load exernal
- entities
-
-For https://bugzilla.gnome.org/show_bug.cgi?id=730290
----
- xmllint.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/xmllint.c b/xmllint.c
-index 9d46ac5..b142b3b 100644
---- a/xmllint.c
-+++ b/xmllint.c
-@@ -3530,7 +3530,12 @@ main(int argc, char **argv) {
- xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
- if (noent != 0) xmlSubstituteEntitiesDefault(1);
- #ifdef LIBXML_VALID_ENABLED
-- if (valid != 0) xmlDoValidityCheckingDefaultValue = 1;
-+ /* If we will validate only a posteriori, ensure that entities get loaded,
-+ * but suppress validation messages during initial parsing */
-+ if (postvalid != 0 && valid == 0)
-+ options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
-+ else if (valid != 0)
-+ xmlDoValidityCheckingDefaultValue = 1;
- #endif /* LIBXML_VALID_ENABLED */
- if ((htmlout) && (!nowrap)) {
- xmlGenericError(xmlGenericErrorContext,
---
-1.9.3
-
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch b/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch
deleted file mode 100644
index 7a84fac..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.2-icu-pkgconfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 7374564..13c8d4e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1444,19 +1444,11 @@ XML_LIBTOOLLIBS="libxml2.la"
- AC_SUBST(WITH_ICONV)
-
- WITH_ICU=0
--ICU_LIBS=""
- if test "$with_icu" != "yes" ; then
- echo Disabling ICU support
- else
-- ICU_CONFIG=icu-config
-- if ${ICU_CONFIG} --cflags >/dev/null 2>&1
-- then
-- ICU_LIBS=`${ICU_CONFIG} --ldflags`
-- WITH_ICU=1
-- echo Enabling ICU support
-- else
-- AC_MSG_ERROR([libicu config program icu-config not found])
-- fi
-+ PKG_CHECK_MODULES(ICU, icu-i18n)
-+ WITH_ICU=1
- fi
- AC_SUBST(WITH_ICU)
- AC_SUBST(ICU_LIBS)
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch b/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch
deleted file mode 100644
index d98b382..0000000
--- a/dev-libs/libxml2/files/libxml2-2.9.2-revert-missing-initialization.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f65128f38289d77ff322d63aef2858cc0a819c34 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Fri, 17 Oct 2014 17:13:41 +0800
-Subject: Revert "Missing initialization for the catalog module"
-
-This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7.
-As this break xmlcatalog command
-https://bugzilla.redhat.com/show_bug.cgi?id=1153753
-
-diff --git a/parser.c b/parser.c
-index 1d93967..67c9dfd 100644
---- a/parser.c
-+++ b/parser.c
-@@ -14830,9 +14830,6 @@ xmlInitParser(void) {
- #ifdef LIBXML_XPATH_ENABLED
- xmlXPathInit();
- #endif
--#ifdef LIBXML_CATALOG_ENABLED
-- xmlInitializeCatalog();
--#endif
- xmlParserInitialized = 1;
- #ifdef LIBXML_THREAD_ENABLED
- }
---
-cgit v0.10.1
-
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r999.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r999.ebuild
deleted file mode 100644
index fa34575..0000000
--- a/dev-libs/libxml2/libxml2-2.9.1-r999.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild,v 1.12 2014/06/24 19:59:48 vapier Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
- test? (
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
- http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig
- hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-src_unpack() {
- # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked
- unpack ${P/_rc/-rc}.tar.gz
- cd "${S}"
-
- if use test; then
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \
- "${DISTDIR}/${XSTS_TARBALL_2}" \
- "${S}"/xstc/ \
- || die "Failed to install test tarballs"
- unpack ${XMLCONF_TARBALL}
- fi
-}
-
-src_prepare() {
- DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
- # Patches needed for prefix support
- epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
- epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-# epunt_cxx # if we don't eautoreconf
-
- # Important patches from 2.9.2
- epatch "${FILESDIR}/${P}-missing-break.patch" \
- "${FILESDIR}/${P}-python-2.6.patch" \
- "${FILESDIR}/${P}-compression-detection.patch" \
- "${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
- "${FILESDIR}/${PN}-2.9.1-python3.patch" \
- "${FILESDIR}/${PN}-2.9.1-python3a.patch"
-
- # Security fixes from 2.9.2
- epatch "${FILESDIR}/${P}-external-param-entities.patch"
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=730290
- epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
-
- # Please do not remove, as else we get references to PORTAGE_TMPDIR
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
- # We now need to run eautoreconf at the end to prevent maintainer mode.
-# elibtoolize
-
- # Use pkgconfig to find icu to properly support multilib
- epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
-
- epatch "${FILESDIR}/${PN}-2.9.0-remove-redundant-pthread-defs.patch"
- eautoreconf
-}
-
-multilib_src_configure() {
- # filter seemingly problematic CFLAGS (#26320)
- filter-flags -fprefetch-loop-arrays -funroll-loops
-
- # USE zlib support breaks gnome2
- # (libgnomeprint for instance fails to compile with
- # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
- # The meaning of the 'debug' USE flag does not apply to the --with-debug
- # switch (enabling the libxml2 debug module). See bug #100898.
-
- # --with-mem-debug causes unusual segmentation faults (bug #105120).
-
- libxml2_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-html-subdir=${PF}/html \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_with debug run-debug) \
- $(use_with icu) \
- $(use_with lzma) \
- $(use_enable ipv6) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with readline) \
- $(multilib_native_use_with readline history) \
- "$@"
- }
-
- libxml2_py_configure() {
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
- run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
- }
-
- libxml2_configure --without-python # build python bindings separately
-
- if multilib_is_native_abi && use python; then
- python_parallel_foreach_impl libxml2_py_configure
- fi
-}
-
-multilib_src_compile() {
- default
- if multilib_is_native_abi && use python; then
- local native_builddir=${BUILD_DIR}
- python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
- fi
-}
-
-multilib_src_test() {
- default
- multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" \
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
- if multilib_is_native_abi && use python; then
- python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
- python_foreach_impl python_optimize
- fi
-}
-
-multilib_src_install_all() {
- # on windows, xmllint is installed by interix libxml2 in parent prefix.
- # this is the version to use. the native winnt version does not support
- # symlinks, which makes repoman fail if the portage tree is linked in
- # from another location (which is my default). -- mduft
- if [[ ${CHOST} == *-winnt* ]]; then
- rm -rf "${ED}"/usr/bin/xmllint
- rm -rf "${ED}"/usr/bin/xmlcatalog
- fi
-
- rm -rf "${ED}"/usr/share/doc/${P}
- einstalldocs
-
- if ! use python; then
- rm -rf "${ED}"/usr/share/doc/${PF}/python
- rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
- fi
-
- if ! use examples; then
- rm -rf "${ED}/usr/share/doc/${PF}/examples"
- rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
- fi
-
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
- if [[ "${ROOT}" != "/" ]]; then
- elog "Skipping XML catalog creation for stage building (bug #208887)."
- else
- # need an XML catalog, so no-one writes to a non-existent one
- CATALOG="${EROOT}etc/xml/catalog"
-
- # we dont want to clobber an existing catalog though,
- # only ensure that one is there
- # <obz@gentoo.org>
- if [[ ! -e ${CATALOG} ]]; then
- [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
- einfo "Created XML catalog in ${CATALOG}"
- fi
- fi
-}
-
-libxml2_py_emake() {
- pushd "${BUILD_DIR}/python" > /dev/null || die
- emake "$@"
- popd > /dev/null
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r99.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r99.ebuild
deleted file mode 100644
index 99b89f0..0000000
--- a/dev-libs/libxml2/libxml2-2.9.2-r99.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.2.ebuild,v 1.1 2014/10/18 08:23:48 pacho Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="debug examples icu ipv6 lzma python readline static-libs test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20080827.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
- test? (
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
- http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
-
-COMMON_DEPEND="
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:= )
-"
-RDEPEND="${COMMON_DEPEND}
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig
- hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
-"
-
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/xml2-config
-)
-
-src_unpack() {
- # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked
- unpack ${P/_rc/-rc}.tar.gz
- cd "${S}"
-
- if use test; then
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \
- "${DISTDIR}/${XSTS_TARBALL_2}" \
- "${S}"/xstc/ \
- || die "Failed to install test tarballs"
- unpack ${XMLCONF_TARBALL}
- fi
-}
-
-src_prepare() {
- DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
-
- # Patches needed for prefix support
- epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
- epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
-
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
-
-# epunt_cxx # if we don't eautoreconf
-
- # Important patches from master
- epatch \
- "${FILESDIR}/${PN}-2.9.2-revert-missing-initialization.patch"
-
- # Please do not remove, as else we get references to PORTAGE_TMPDIR
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
- # We now need to run eautoreconf at the end to prevent maintainer mode.
-# elibtoolize
-
- # Use pkgconfig to find icu to properly support multilib, upstream bug #738751
- epatch "${FILESDIR}/${PN}-2.9.2-icu-pkgconfig.patch"
-
- epatch "${FILESDIR}/${PN}-2.9.0-remove-redundant-pthread-defs.patch"
- eautoreconf
-}
-
-multilib_src_configure() {
- # filter seemingly problematic CFLAGS (#26320)
- filter-flags -fprefetch-loop-arrays -funroll-loops
-
- # USE zlib support breaks gnome2
- # (libgnomeprint for instance fails to compile with
- # fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
- # The meaning of the 'debug' USE flag does not apply to the --with-debug
- # switch (enabling the libxml2 debug module). See bug #100898.
-
- # --with-mem-debug causes unusual segmentation faults (bug #105120).
-
- libxml2_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-html-subdir=${PF}/html \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_with debug run-debug) \
- $(use_with icu) \
- $(use_with lzma) \
- $(use_enable ipv6) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with readline) \
- $(multilib_native_use_with readline history) \
- "$@"
- }
-
- libxml2_py_configure() {
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
- run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
- }
-
- libxml2_configure --without-python # build python bindings separately
-
- if multilib_is_native_abi && use python; then
- python_parallel_foreach_impl libxml2_py_configure
- fi
-}
-
-multilib_src_compile() {
- default
- if multilib_is_native_abi && use python; then
- local native_builddir=${BUILD_DIR}
- python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
- fi
-}
-
-multilib_src_test() {
- default
- multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" \
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
-
- if multilib_is_native_abi && use python; then
- python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
- python_foreach_impl python_optimize
- fi
-}
-
-multilib_src_install_all() {
- # on windows, xmllint is installed by interix libxml2 in parent prefix.
- # this is the version to use. the native winnt version does not support
- # symlinks, which makes repoman fail if the portage tree is linked in
- # from another location (which is my default). -- mduft
- if [[ ${CHOST} == *-winnt* ]]; then
- rm -rf "${ED}"/usr/bin/xmllint
- rm -rf "${ED}"/usr/bin/xmlcatalog
- fi
-
- rm -rf "${ED}"/usr/share/doc/${P}
- einstalldocs
-
- if ! use python; then
- rm -rf "${ED}"/usr/share/doc/${PF}/python
- rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
- fi
-
- if ! use examples; then
- rm -rf "${ED}/usr/share/doc/${PF}/examples"
- rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
- fi
-
- prune_libtool_files --modules
-}
-
-pkg_postinst() {
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
- if [[ "${ROOT}" != "/" ]]; then
- elog "Skipping XML catalog creation for stage building (bug #208887)."
- else
- # need an XML catalog, so no-one writes to a non-existent one
- CATALOG="${EROOT}etc/xml/catalog"
-
- # we dont want to clobber an existing catalog though,
- # only ensure that one is there
- # <obz@gentoo.org>
- if [[ ! -e ${CATALOG} ]]; then
- [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
- einfo "Created XML catalog in ${CATALOG}"
- fi
- fi
-}
-
-libxml2_py_emake() {
- pushd "${BUILD_DIR}/python" > /dev/null || die
- emake "$@"
- popd > /dev/null
-}
diff --git a/dev-libs/libxml2/metadata.xml b/dev-libs/libxml2/metadata.xml
deleted file mode 100644
index 1c0594f..0000000
--- a/dev-libs/libxml2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnome</herd>
-<upstream>
- <remote-id type="cpe">cpe:/a:xmlsoft:libxml2</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-libs/nspr/files/nspr-4.10.6-no-getprotobyname_r.patch b/dev-libs/nspr/files/nspr-4.10.6-no-getprotobyname_r.patch
deleted file mode 100644
index 40f38a5..0000000
--- a/dev-libs/nspr/files/nspr-4.10.6-no-getprotobyname_r.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/nspr-4.10.6/nspr/pr/src/misc/prnetdb.c 2014-06-05 23:42:08.000000000 -0200
-+++ b/nspr-4.10.6/nspr/pr/src/misc/prnetdb.c 2014-07-29 19:02:42.037638550 -0200
-@@ -65,8 +65,6 @@
- || (defined(LINUX) && defined(_REENTRANT) \
- && !(defined(__GLIBC__) && __GLIBC__ >= 2) \
- && !defined(ANDROID))
--#define _PR_HAVE_GETPROTO_R
--#define _PR_HAVE_GETPROTO_R_POINTER
- #endif
-
- #if defined(OSF1) \
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
deleted file mode 100644
index 3ae8052..0000000
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* drop Solaris linker stuff
-
---- nspr-4.7.4/mozilla/nsprpub/configure.in
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in
-@@ -1988,26 +1988,14 @@
- CPU_ARCH=`uname -p`
- MDCPUCFG_H=_solaris.cfg
- PR_MD_CSRCS=solaris.c
-- LD=/usr/ccs/bin/ld
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- RESOLVE_LINK_SYMBOLS=1
-- case "${OS_RELEASE}" in
-- 5.8|5.9)
-- ;;
-- *)
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
-- USE_B_DIRECT=1
-- ;;
-- esac
- if test -n "$GNU_CC"; then
- DSO_CFLAGS=-fPIC
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
- GCC_USE_GNU_LD=1
- fi
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
-- if test -n "$USE_B_DIRECT"; then
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
-- fi
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
- else
- DSO_CFLAGS=-KPIC
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
deleted file mode 100644
index ac509ef..0000000
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200
-+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200
-@@ -1536,7 +1536,7 @@
- case TT_EET: zone_offset = 2 * 60; break;
- case TT_JST: zone_offset = 9 * 60; break;
- default:
-- PR_ASSERT (0);
-+ return PR_FAILURE;
- break;
- }
- }
-@@ -1578,11 +1578,12 @@
- struct tm localTime;
- time_t secs;
-
-- PR_ASSERT(result->tm_month > -1 &&
-+ if (!(result->tm_month > -1 &&
- result->tm_mday > 0 &&
- result->tm_hour > -1 &&
- result->tm_min > -1 &&
-- result->tm_sec > -1);
-+ result->tm_sec > -1))
-+ return PR_FAILURE;
-
- /*
- * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
deleted file mode 100644
index 5d9e810..0000000
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Same magic as haubi did for glib compilation, which works again here
-resolving a linker problem on Solaris with GNU ld. Bug #222625
-
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2008-06-22 22:24:56.671065000 +0200
-+++ mozilla/nsprpub/pr/src/Makefile.in 2008-06-23 14:38:52.320417000 +0200
-@@ -95,7 +95,7 @@
- endif
-
- ifdef USE_PTHREADS
--OS_LIBS = -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc
-+OS_LIBS = -pthread ${LIBRT} -lsocket -lnsl -ldl -lc
- else
- ifdef LOCAL_THREADS_ONLY
- OS_LIBS = -lsocket -lnsl -ldl -lc
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
deleted file mode 100644
index 1258b60..0000000
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use @executable_path, it messed up linking against nspr from e.g.
-nss.
-
---- mozilla/nsprpub/configure.in
-+++ mozilla/nsprpub/configure.in
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
---- mozilla/nsprpub/configure
-+++ mozilla/nsprpub/configure
-@@ -1007,7 +1007,7 @@
- ;;
- esac
- DSO_CFLAGS=-fPIC
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$@ -headerpad_max_install_names'
- _OPTIMIZE_FLAGS=-O2
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
- STRIP="$STRIP -x -S"
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
deleted file mode 100644
index dd3b132..0000000
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use CFLAGS when linking. Some flags can add functionality to generated
-code that requires extra libs to be linked in (eg. libgomp when using
-autoparallelization). Other flags are required when building and linking
-(eg. -flto).
-
-https://bugs.gentoo.org/365975
-
---- a/mozilla/nsprpub/config/autoconf.mk.in
-+++ b/mozilla/nsprpub/config/autoconf.mk.in
-@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@
- DLLFLAGS = @DLLFLAGS@
- EXEFLAGS = @EXEFLAGS@
- OPTIMIZER = @OPTIMIZER@
-+LD_CFLAGS = @CFLAGS@
-
- PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
- PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
---- a/mozilla/nsprpub/config/config.mk
-+++ b/mozilla/nsprpub/config/config.mk
-@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-
--LDFLAGS = $(OS_LDFLAGS)
-+LDFLAGS = $(LD_CFLAGS) $(OS_LDFLAGS)
-
- # Enable profile-guided optimization
- ifdef MOZ_PROFILE_GENERATE
diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
deleted file mode 100644
index d4f9a7e..0000000
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in
---- a/mozilla/nsprpub/config/nspr-config.in 2012-03-06 07:13:39.000000000 -0600
-+++ b/mozilla/nsprpub/config/nspr-config.in 2013-02-16 20:53:53.893489345 -0600
-@@ -126,7 +126,7 @@
- fi
-
- if test "$echo_libs" = "yes"; then
-- libdirs=-L$libdir
-+ libdirs=""
- if test -n "$lib_plds"; then
- libdirs="$libdirs -lplds${major_version}"
- fi
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
deleted file mode 100644
index 74d9257..0000000
--- a/dev-libs/nspr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mozilla</herd>
-</pkgmetadata>
diff --git a/dev-libs/nspr/nspr-4.10.6-r99.ebuild b/dev-libs/nspr/nspr-4.10.6-r99.ebuild
deleted file mode 100644
index 1f485a3..0000000
--- a/dev-libs/nspr/nspr-4.10.6-r99.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.4 2014/06/19 03:15:41 tetromino Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-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="amd64 arm ~mips ~ppc ~x86"
-IUSE="debug"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.10.6-solaris.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
-
- epatch "${FILESDIR}"/${PN}-4.10.6-no-getprotobyname_r.patch
-
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # 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=()
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- default) # no abi actually set, fall back to old check
- einfo "Running a short build test to determine 64bit'ness"
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) myconf+=( --enable-x32 );;
- *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 ;;
- *) ;;
- esac
-
- # Ancient autoconf needs help finding the right tools.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die "failed to cleanup unneeded files"
-}
diff --git a/dev-libs/nspr/nspr-4.10.7-r99.ebuild b/dev-libs/nspr/nspr-4.10.7-r99.ebuild
deleted file mode 100644
index ed0bb52..0000000
--- a/dev-libs/nspr/nspr-4.10.7-r99.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.7-r1.ebuild,v 1.3 2014/12/10 19:34:49 ago Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-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="amd64 arm ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.10.6-solaris.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
-
- epatch "${FILESDIR}"/${PN}-4.10.6-no-getprotobyname_r.patch
-
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # 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=()
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- default) # no abi actually set, fall back to old check
- einfo "Running a short build test to determine 64bit'ness"
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) myconf+=( --enable-x32 );;
- *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 ;;
- *) ;;
- esac
-
- # Ancient autoconf needs help finding the right tools.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die
-
- # This is used only to generate prerr.c and prerr.h at build time.
- # No other projects use it, and we don't want to depend on perl.
- # Talked to upstream and they agreed w/punting.
- rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nspr/nspr-4.10.8-r99.ebuild b/dev-libs/nspr/nspr-4.10.8-r99.ebuild
deleted file mode 100644
index ed0bb52..0000000
--- a/dev-libs/nspr/nspr-4.10.8-r99.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.7-r1.ebuild,v 1.3 2014/12/10 19:34:49 ago Exp $
-
-EAPI=5
-WANT_AUTOCONF="2.5"
-
-inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
-
-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="amd64 arm ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nspr-config
-)
-
-src_prepare() {
- cd "${S}"/nspr || die
- epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
- epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
- epatch "${FILESDIR}"/${PN}-4.10.6-solaris.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
-
- epatch "${FILESDIR}"/${PN}-4.10.6-no-getprotobyname_r.patch
-
- # We must run eautoconf to regenerate configure
- eautoconf
-
- # make sure it won't find Perl out of Prefix
- sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- "${S}"/nspr/config/rules.mk || die
-}
-
-multilib_src_configure() {
- # 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=()
-
- # The configure has some fancy --enable-{{n,x}32,64bit} switches
- # that trigger some code conditional to platform & arch. This really
- # matters for the few common arches (x86, ppc) but we pass a little
- # more of them to be future-proof.
-
- # use ABI first, this will work for most cases
- case "${ABI}" in
- alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
- n32) myconf+=( --enable-n32 );;
- x32) myconf+=( --enable-x32 );;
- s390x|*64) myconf+=( --enable-64bit );;
- default) # no abi actually set, fall back to old check
- einfo "Running a short build test to determine 64bit'ness"
- echo > "${T}"/test.c || die
- ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
- case $(file "${T}"/test.o) in
- *32-bit*x86-64*) myconf+=( --enable-x32 );;
- *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 ;;
- *) ;;
- esac
-
- # Ancient autoconf needs help finding the right tools.
- LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
- ac_cv_path_AR="${AR}" \
- econf \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_enable debug) \
- $(use_enable !debug optimize) \
- "${myconf[@]}"
-}
-
-multilib_src_install() {
- # Their build system is royally confusing, as usual
- MINOR_VERSION=${MIN_PV} # Used for .so version
- emake DESTDIR="${D}" install
-
- einfo "removing static libraries as upstream has requested!"
- rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
-
- # install nspr-config
- dobin config/nspr-config
-
- # Remove stupid files in /usr/bin
- rm "${ED}"/usr/bin/prerr.properties || die
-
- # This is used only to generate prerr.c and prerr.h at build time.
- # No other projects use it, and we don't want to depend on perl.
- # Talked to upstream and they agreed w/punting.
- rm "${ED}"/usr/bin/compile-et.pl || die
-}
diff --git a/dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch b/dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch
deleted file mode 100644
index a23725d..0000000
--- a/dev-libs/nss/files/nss-3.14.2-solaris-gcc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- nss-3.14.2/mozilla/security/coreconf/SunOS5.mk
-+++ nss-3.14.2/mozilla/security/coreconf/SunOS5.mk
-@@ -5,6 +5,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.
-@@ -71,11 +74,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.15-gentoo-fixup-warnings.patch b/dev-libs/nss/files/nss-3.15-gentoo-fixup-warnings.patch
deleted file mode 100644
index 3ce2c0e..0000000
--- a/dev-libs/nss/files/nss-3.15-gentoo-fixup-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nss-3.15/nss/coreconf/Linux.mk
-+++ nss-3.15/nss/coreconf/Linux.mk
-@@ -116,6 +116,7 @@
- OPTIMIZER += -gdwarf-2
- endif
- endif
-+OPTIMIZER += -fno-strict-aliasing
- endif
-
-
diff --git a/dev-libs/nss/files/nss-3.15-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.15-gentoo-fixups.patch
deleted file mode 100644
index 9314d5f..0000000
--- a/dev-libs/nss/files/nss-3.15-gentoo-fixups.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- nss/config/Makefile
-+++ nss/config/Makefile
-@@ -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}/lib64," \
-+ -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 ../../../../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 ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
---- nss/config/nss-config.in
-+++ nss/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+ nssutil
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs=""
-+ 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
-+
---- nss/config/nss.pc.in
-+++ nss/config/nss.pc.in
-@@ -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: -lssl3 -lsmime3 -lnss3 -lnssutil3
-+Cflags: -I${includedir}
-+
---- nss/Makefile
-+++ nss/Makefile
-@@ -44,7 +44,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all
-+nss_build_all: all
-
- nss_clean_all: clobber_nspr clobber
-
-@@ -103,12 +103,6 @@
- --with-dist-prefix='$(NSPR_PREFIX)' \
- --with-dist-includedir='$(NSPR_PREFIX)/include'
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- $(MAKE) -C $(CORE_DEPTH)/doc
-
---- nss/manifest.mn
-+++ nss/manifest.mn
-@@ -10,4 +10,4 @@
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd
-+DIRS = coreconf lib cmd config
diff --git a/dev-libs/nss/files/nss-3.15.4-enable-pem.patch b/dev-libs/nss/files/nss-3.15.4-enable-pem.patch
deleted file mode 100644
index 8e61024..0000000
--- a/dev-libs/nss/files/nss-3.15.4-enable-pem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patches taken from http://pkgs.fedoraproject.org/cgit/nss.git/
-
---- nss/lib/ckfw/manifest.mn.libpem
-+++ nss/lib/ckfw/manifest.mn
-@@ -5,7 +5,7 @@
-
- CORE_DEPTH = ../..
-
--DIRS = builtins
-+DIRS = builtins pem
-
- PRIVATE_EXPORTS = \
- ck.h \
diff --git a/dev-libs/nss/files/nss-3.16-musl.patch b/dev-libs/nss/files/nss-3.16-musl.patch
deleted file mode 100644
index 4dde4ae..0000000
--- a/dev-libs/nss/files/nss-3.16-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/nss-3.16/nss/lib/dbm/config/config.mk
-+++ b/nss-3.16/nss/lib/dbm/config/config.mk
-@@ -25,10 +25,6 @@
- DEFINES += -DHAVE_SNPRINTF
- endif
-
--ifeq (,$(filter-out IRIX Linux,$(OS_TARGET)))
--DEFINES += -DHAVE_SYS_CDEFS_H
--endif
--
- ifeq (,$(filter-out DGUX NCR ReliantUNIX SCO_SV SCOOS UNIXWARE,$(OS_TARGET)))
- DEFINES += -DHAVE_SYS_BYTEORDER_H
- endif
diff --git a/dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch b/dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch
deleted file mode 100644
index 26b488a..0000000
--- a/dev-libs/nss/files/nss-3.17.1-gentoo-fixups.patch
+++ /dev/null
@@ -1,241 +0,0 @@
---- nss-3.17.1/nss/config/Makefile
-+++ nss-3.17.1/nss/config/Makefile
-@@ -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}/lib64," \
-+ -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 ../../../../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 ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
---- nss-3.17.1/nss/config/nss-config.in
-+++ nss-3.17.1/nss/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+ nssutil
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ nssutil)
-+ lib_nssutil=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs=""
-+ 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
-+
---- nss-3.17.1/nss/config/nss.pc.in
-+++ nss-3.17.1/nss/config/nss.pc.in
-@@ -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: -lssl3 -lsmime3 -lnss3 -lnssutil3
-+Cflags: -I${includedir}
-+
---- nss-3.17.1/nss/Makefile
-+++ nss-3.17.1/nss/Makefile
-@@ -44,7 +44,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_nspr all
-+nss_build_all: all
-
- nss_clean_all: clobber_nspr clobber
-
-@@ -109,12 +109,6 @@
- --with-dist-prefix='$(NSPR_PREFIX)' \
- --with-dist-includedir='$(NSPR_PREFIX)/include'
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- $(MAKE) -C $(CORE_DEPTH)/doc
-
---- nss-3.17.1/nss/manifest.mn
-+++ nss-3.17.1/nss/manifest.mn
-@@ -10,7 +10,7 @@
-
- RELEASE = nss
-
--DIRS = coreconf lib cmd
-+DIRS = coreconf lib cmd config
-
- ifdef NSS_BUILD_GTESTS
- DIRS += external_tests
diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
deleted file mode 100644
index 36dc831..0000000
--- a/dev-libs/nss/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mozilla</herd>
-<use>
- <flag name='cacert'>
- Include root certs from CAcert (http://http://www.cacert.org/) and
- Software in the Public Interest (http://www.spi-inc.org/)
- </flag>
- <flag name='nss-pem'>Add support for libnsspem</flag>
- <flag name='utils'>Install utilities included with the library</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:mozilla:nss</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-libs/nss/nss-3.16-r99.ebuild b/dev-libs/nss/nss-3.16-r99.ebuild
deleted file mode 100644
index 0446b33..0000000
--- a/dev-libs/nss/nss-3.16-r99.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.13 2014/07/24 10:58:18 polynomial-c Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-NSPR_VER="4.10"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="3ade37c5c4ca5a6094e3f4b2e4591405db1867dd"
-PEM_P="${PN}-pem-${PEM_GIT_REV}"
-
-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
- cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
- nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+cacert +nss-pem utils"
-
-DEPEND="virtual/pkgconfig
- >=dev-libs/nspr-${NSPR_VER}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}
- >=dev-db/sqlite-3.5
- sys-libs/zlib"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_setup() {
- export LC_ALL="C"
-}
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- # Custom changes for gentoo
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixups.patch"
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
- epatch "${FILESDIR}/${PN}-3.16-musl.patch"
- use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
- use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
- epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
- cd coreconf
- # 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
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" "${S}"/config/Makefile
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- "${S}"/config/Makefile
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- "${S}"/cmd/shlibsign/sign.sh
- fi
-
- # dirty hack
- cd "${S}"
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
- lib/ssl/config.mk
- sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
- cmd/platlibs.mk
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- echo > "${T}"/test.c || die
- ${!cc} ${!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)
- )
-
- # 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 coreconf \
- CC="${BUILD_CC}" \
- $(nssbits BUILD_)
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- emake -j1 "${makeargs[@]}" -C ${d}
- 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() {
- cd "${S}"/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
-
- 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}"/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.
- local l libs=() liblist
- for l in ${NSS_CHK_SIGN_LIBS} ; do
- libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
- done
- liblist=$(printf '%s:' "${libs[@]}")
- echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss"
- doenvd "${T}/90nss"
-}
-
-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.17.4-r99.ebuild b/dev-libs/nss/nss-3.17.4-r99.ebuild
deleted file mode 100644
index 7b76db2..0000000
--- a/dev-libs/nss/nss-3.17.4-r99.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.17.4.ebuild,v 1.3 2015/03/26 11:36:48 ago Exp $
-
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.10.6-r1"
-RTM_NAME="NSS_${PV//./_}_RTM"
-# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
-PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
-PEM_P="${PN}-pem-${PEM_GIT_REV}"
-
-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
- cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
- nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+cacert +nss-pem utils"
-
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/nss-config
-)
-
-src_unpack() {
- unpack ${A}
- if use nss-pem ; then
- mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
- fi
-}
-
-src_prepare() {
- # Custom changes for gentoo
- epatch "${FILESDIR}/${PN}-3.17.1-gentoo-fixups.patch"
- epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
- use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
- use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
- epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
- epatch "${FILESDIR}/nss-3.16-musl.patch"
-
- pushd coreconf >/dev/null || die
- # hack nspr paths
- echo 'INCLUDES += -I$(DIST)/include/dbm' \
- >> headers.mk || die "failed to append include"
-
- # modify install path
- sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
- -i source.mk || die
-
- # Respect LDFLAGS
- sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
- popd >/dev/null || die
-
- # Fix pkgconfig file for Prefix
- sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
- config/Makefile || die
-
- # use host shlibsign if need be #436216
- if tc-is-cross-compiler ; then
- sed -i \
- -e 's:"${2}"/shlibsign:shlibsign:' \
- cmd/shlibsign/sign.sh || die
- fi
-
- # dirty hack
- 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
-
- multilib_copy_sources
-
- strip-flags
-}
-
-multilib_src_configure() {
- # Ensure we stay multilib aware
- sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
- # Most of the arches are the same as $ARCH
- local t=${1:-${CHOST}}
- case ${t} in
- aarch64*)echo "aarch64";;
- hppa*) echo "parisc";;
- i?86*) echo "i686";;
- x86_64*) echo "x86_64";;
- *) tc-arch ${t};;
- esac
-}
-
-nssbits() {
- local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
- if [[ ${1} == BUILD_ ]]; then
- cc=$(tc-getBUILD_CC)
- else
- cc=$(tc-getCC)
- fi
- echo > "${T}"/test.c || die
- ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
- case $(file "${T}/${1}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 ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
- esac
-}
-
-multilib_src_compile() {
- # use ABI to determine bit'ness, or fallback if unset
- local buildbits mybits
- case "${ABI}" in
- n32) mybits="USE_N32=1";;
- x32) mybits="USE_X32=1";;
- s390x|*64) mybits="USE_64=1";;
- ${DEFAULT_ABI})
- einfo "Running compilation test to determine bit'ness"
- mybits=$(nssbits)
- ;;
- esac
- # bitness of host may differ from target
- if tc-is-cross-compiler; then
- buildbits=$(nssbits BUILD_)
- fi
-
- local makeargs=(
- CC="$(tc-getCC)"
- AR="$(tc-getAR) rc \$@"
- RANLIB="$(tc-getRANLIB)"
- OPTIMIZER=
- ${mybits}
- )
-
- # Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
- unset NSPR_INCLUDE_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 FREEBL_NO_DEPEND=1
- export ASFLAGS=""
-
- local d
-
- # Build the host tools first.
- LDFLAGS="${BUILD_LDFLAGS}" \
- XCFLAGS="${BUILD_CFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 -C coreconf \
- CC="$(tc-getBUILD_CC)" \
- ${buildbits:-${mybits}}
- makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
- # Then build the target tools.
- for d in . lib/dbm ; do
- CPPFLAGS="${myCPPFLAGS}" \
- XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
- NSPR_LIB_DIR="${T}/fakedir" \
- emake -j1 "${makeargs[@]}" -C ${d}
- 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
-}
-
-multilib_src_install() {
- pushd dist >/dev/null || die
-
- dodir /usr/$(get_libdir)
- cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
- cp -L -t "${ED}"/usr/$(get_libdir) */lib/{libcrmf,libfreebl}.a || die "copying libs failed"
-
- # Install nss-config and pkgconfig file
- dodir /usr/bin
- cp -L */bin/nss-config "${ED}"/usr/bin || die
- dodir /usr/$(get_libdir)/pkgconfig
- cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
- # create an nss-softokn.pc from nss.pc for libfreebl and some private headers
- # bug 517266
- sed -e 's#Libs:#Libs: -lfreebl#' \
- -e 's#Cflags:#Cflags: -I${includedir}/private#' \
- */lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
- || die "could not create nss-softokn.pc"
-
- # all the include files
- insinto /usr/include/nss
- doins public/nss/*.h
- insinto /usr/include/nss/private
- doins private/nss/{blapi,alghmac}.h
-
- popd >/dev/null || die
-
- local f nssutils
- # Always enabled because we need it for chk generation.
- nssutils="shlibsign"
-
- if multilib_is_native_abi ; then
- 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
- pushd dist/*/bin >/dev/null || die
- for f in ${nssutils}; do
- dobin ${f}
- done
- popd >/dev/null || die
- fi
-
- # Prelink breaks the CHK files. We don't have any reliable way to run
- # shlibsign after prelink.
- local l libs=() liblist
- for l in ${NSS_CHK_SIGN_LIBS} ; do
- libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
- done
- liblist=$(printf '%s:' "${libs[@]}")
- echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
- doenvd "${T}/90nss-${ABI}"
-}
-
-pkg_postinst() {
- multilib_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)
- }
-
- multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
- multilib_pkg_postrm() {
- cleanup_chk "${EROOT}"/usr/$(get_libdir)
- }
-
- multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/openssl/files/gentoo.config-1.0.1 b/dev-libs/openssl/files/gentoo.config-1.0.1
deleted file mode 100755
index bbc1aa9..0000000
--- a/dev-libs/openssl/files/gentoo.config-1.0.1
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.1,v 1.1 2013/05/21 17:53:19 vapier Exp $
-#
-# Openssl doesn't play along nicely with cross-compiling
-# like autotools based projects, so let's teach it new tricks.
-#
-# Review the bundled 'config' script to see why kind of targets
-# we can pass to the 'Configure' script.
-
-
-# Testing routines
-if [[ $1 == "test" ]] ; then
- for c in \
- "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \
- "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \
- "x86_64-pc-linux-gnu |linux-x86_64" \
- "alpha-linux-gnu |linux-alpha-gcc" \
- "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \
- "i686-pc-linux-gnu |linux-elf" \
- "whatever-gentoo-freebsdX.Y |BSD-generic32" \
- "i686-gentoo-freebsdX.Y |BSD-x86-elf" \
- "sparc64-alpha-freebsdX.Y |BSD-sparc64" \
- "ia64-gentoo-freebsd5.99234 |BSD-ia64" \
- "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \
- "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \
- "powerpc-gentOO-linux-uclibc |linux-ppc" \
- "powerpc64-unk-linux-gnu |linux-ppc64" \
- "x86_64-apple-darwinX |darwin64-x86_64-cc" \
- "powerpc64-apple-darwinX |darwin64-ppc-cc" \
- "i686-apple-darwinX |darwin-i386-cc" \
- "i386-apple-darwinX |darwin-i386-cc" \
- "powerpc-apple-darwinX |darwin-ppc-cc" \
- "i586-pc-winnt |winnt-parity" \
- "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \
- "s390x-linux-gnu |linux64-s390x" \
- ;do
- CHOST=${c/|*}
- ret_want=${c/*|}
- ret_got=$(CHOST=${CHOST} "$0")
-
- if [[ ${ret_want} == "${ret_got}" ]] ; then
- echo "PASS: ${CHOST}"
- else
- echo "FAIL: ${CHOST}"
- echo -e "\twanted: ${ret_want}"
- echo -e "\twe got: ${ret_got}"
- fi
- done
- exit 0
-fi
-[[ -z ${CHOST} && -n $1 ]] && CHOST=$1
-
-
-# Detect the operating system
-case ${CHOST} in
- *-aix*) system="aix";;
- *-darwin*) system="darwin";;
- *-freebsd*) system="BSD";;
- *-hpux*) system="hpux";;
- *-linux*) system="linux";;
- *-solaris*) system="solaris";;
- *-winnt*) system="winnt";;
- x86_64-*-mingw*) system="mingw64";;
- *mingw*) system="mingw";;
- *) exit 0;;
-esac
-
-
-# Compiler munging
-compiler="gcc"
-if [[ ${CC} == "ccc" ]] ; then
- compiler=${CC}
-fi
-
-
-# Detect target arch
-machine=""
-chost_machine=${CHOST%%-*}
-case ${system} in
-linux)
- case ${chost_machine}:${ABI} in
- alphaev56*|\
- alphaev[678]*)machine=alpha+bwx-${compiler};;
- alpha*) machine=alpha-${compiler};;
- armv[4-9]*b*) machine="armv4 -DB_ENDIAN";;
- armv[4-9]*) machine="armv4 -DL_ENDIAN";;
- arm*b*) machine="generic32 -DB_ENDIAN";;
- arm*) machine="generic32 -DL_ENDIAN";;
- avr*) machine="generic32 -DL_ENDIAN";;
- bfin*) machine="generic32 -DL_ENDIAN";;
- # hppa64*) machine=parisc64;;
- hppa*) machine="generic32 -DB_ENDIAN";;
- i[0-9]86*|\
- x86_64*:x86) machine=elf;;
- ia64*) machine=ia64;;
- m68*) machine="generic32 -DB_ENDIAN";;
- mips*el*) machine="generic32 -DL_ENDIAN";;
- mips*) machine="generic32 -DB_ENDIAN";;
- powerpc64*) machine=ppc64;;
- powerpc*) machine=ppc;;
- # sh64*) machine=elf;;
- sh*b*) machine="generic32 -DB_ENDIAN";;
- sh*) machine="generic32 -DL_ENDIAN";;
- sparc*v7*) machine="generic32 -DB_ENDIAN";;
- sparc64*) machine=sparcv9;;
- sparc*) machine=sparcv8;;
- s390x*) machine=s390x system=linux64;;
- s390*) machine="generic32 -DB_ENDIAN";;
- x86_64*:x32) machine=x32;;
- x86_64*) machine=x86_64;;
- esac
- ;;
-BSD)
- case ${chost_machine} in
- alpha*) machine=generic64;;
- i[6-9]86*) machine=x86-elf;;
- ia64*) machine=ia64;;
- sparc64*) machine=sparc64;;
- x86_64*) machine=x86_64;;
- *) machine=generic32;;
- esac
- ;;
-aix)
- machine=${compiler}
- ;;
-darwin)
- case ${chost_machine} in
- powerpc64) machine=ppc-cc; system=${system}64;;
- powerpc) machine=ppc-cc;;
- i?86*) machine=i386-cc;;
- x86_64) machine=x86_64-cc; system=${system}64;;
- esac
- ;;
-hpux)
- case ${chost_machine} in
- ia64) machine=ia64-${compiler} ;;
- esac
- ;;
-solaris)
- case ${chost_machine} in
- i386) machine=x86-${compiler} ;;
- x86_64*) machine=x86_64-${compiler}; system=${system}64;;
- sparcv9*) machine=sparcv9-${compiler}; system=${system}64;;
- sparc*) machine=sparcv8-${compiler};;
- esac
- ;;
-winnt)
- machine=parity
- ;;
-mingw*)
- # special case ... no xxx-yyy style name
- echo ${system}
- ;;
-esac
-
-
-# If we have something, show it
-[[ -n ${machine} ]] && echo ${system}-${machine}
diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
deleted file mode 100644
index 7ba3984..0000000
--- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/181438
-http://bugs.gentoo.org/327421
-https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest
-
-make sure we respect LDFLAGS
-
-also make sure we don't add useless -rpath flags to the system libdir
-
---- Makefile.org
-+++ Makefile.org
-@@ -189,6 +189,7 @@
- MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \
- DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \
- MAKEDEPPROG='$(MAKEDEPPROG)' \
-+ LDFLAGS='${LDFLAGS}' \
- SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \
- KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \
- ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \
---- Makefile.shared
-+++ Makefile.shared
-@@ -153,7 +153,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/dev-libs/openssl/files/openssl-1.0.0d-windres.patch b/dev-libs/openssl/files/openssl-1.0.0d-windres.patch
deleted file mode 100644
index 0b360d2..0000000
--- a/dev-libs/openssl/files/openssl-1.0.0d-windres.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-URL: http://rt.openssl.org/Ticket/Display.html?id=2558&user=guest&pass=guest
-Subject: make windres controllable via build env var settings
-
-atm, the windres code in openssl is only usable via the cross-compile prefix
-option unlike all the other build tools. so add support for the standard $RC
-/ $WINDRES env vars as well.
-
-Index: Configure
-===================================================================
-RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v
-retrieving revision 1.621.2.40
-diff -u -p -r1.621.2.40 Configure
---- Configure 30 Nov 2010 22:19:26 -0000 1.621.2.40
-+++ Configure 4 Jul 2011 23:12:32 -0000
-@@ -1094,6 +1094,7 @@ my $shared_extension = $fields[$idx_shar
- my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
- my $ar = $ENV{'AR'} || "ar";
- my $arflags = $fields[$idx_arflags];
-+my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres";
- my $multilib = $fields[$idx_multilib];
-
- # if $prefix/lib$multilib is not an existing directory, then
-@@ -1511,12 +1512,14 @@ while (<IN>)
- s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/;
- s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/;
- s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/;
-+ s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/;
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc";
- }
- else {
- s/^CC=.*$/CC= $cc/;
- s/^AR=\s*ar/AR= $ar/;
- s/^RANLIB=.*/RANLIB= $ranlib/;
-+ s/^WINDRES=.*/WINDRES= $windres/;
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
- }
- s/^CFLAG=.*$/CFLAG= $cflags/;
-Index: Makefile.org
-===================================================================
-RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v
-retrieving revision 1.295.2.10
-diff -u -p -r1.295.2.10 Makefile.org
---- Makefile.org 27 Jan 2010 16:06:58 -0000 1.295.2.10
-+++ Makefile.org 4 Jul 2011 23:13:08 -0000
-@@ -66,6 +66,7 @@ EXE_EXT=
- ARFLAGS=
- AR=ar $(ARFLAGS) r
- RANLIB= ranlib
-+WINDRES= windres
- NM= nm
- PERL= perl
- TAR= tar
-@@ -180,6 +181,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESS
- CC='$(CC)' CFLAG='$(CFLAG)' \
- AS='$(CC)' ASFLAG='$(CFLAG) -c' \
- AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
-+ WINDRES='$(WINDRES)' \
- CROSS_COMPILE='$(CROSS_COMPILE)' \
- PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \
- SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \
-Index: Makefile.shared
-===================================================================
-RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v
-retrieving revision 1.72.2.4
-diff -u -p -r1.72.2.4 Makefile.shared
---- Makefile.shared 21 Aug 2010 11:36:49 -0000 1.72.2.4
-+++ Makefile.shared 4 Jul 2011 23:13:52 -0000
-@@ -293,7 +293,7 @@ link_a.cygwin:
- fi; \
- dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
- $(PERL) util/mkrc.pl $$dll_name | \
-- $(CROSS_COMPILE)windres -o rc.o; \
-+ $(WINDRES) -o rc.o; \
- extras="$$extras rc.o"; \
- ALLSYMSFLAGS='-Wl,--whole-archive'; \
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
diff --git a/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch b/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch
deleted file mode 100644
index 66fd822..0000000
--- a/dev-libs/openssl/files/openssl-1.0.0h-pkg-config.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://rt.openssl.org/Ticket/Display.html?id=3332&user=guest&pass=guest
-
-depend on other pc files rather than encoding library info directly in
-every pkg-config file
-
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -335,11 +335,11 @@ libssl.pc: Makefile
- echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
- echo 'includedir=$${prefix}/include'; \
- echo ''; \
-- echo 'Name: OpenSSL'; \
-+ echo 'Name: OpenSSL-libssl'; \
- echo 'Description: Secure Sockets Layer and cryptography libraries'; \
- echo 'Version: '$(VERSION); \
-- echo 'Requires: '; \
-- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-+ echo 'Requires.private: libcrypto'; \
-+ echo 'Libs: -L$${libdir} -lssl'; \
- echo 'Libs.private: $(EX_LIBS)'; \
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
-
-@@ -352,10 +353,7 @@ openssl.pc: Makefile
- echo 'Name: OpenSSL'; \
- echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
- echo 'Version: '$(VERSION); \
-- echo 'Requires: '; \
-- echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-- echo 'Libs.private: $(EX_LIBS)'; \
-- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
-+ echo 'Requires: libssl libcrypto' ) > openssl.pc
-
- Makefile: Makefile.org Configure config
- @echo "Makefile is older than Makefile.org, Configure or config."
diff --git a/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch
deleted file mode 100644
index 19f859a..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1-parallel-build.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-http://rt.openssl.org/Ticket/Display.html?id=2084
-
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -247,17 +247,17 @@
- build_libs: build_crypto build_ssl build_engines
-
- build_crypto:
-- @dir=crypto; target=all; $(BUILD_ONE_CMD)
-+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
--build_ssl:
-+build_ssl: build_crypto
-- @dir=ssl; target=all; $(BUILD_ONE_CMD)
-+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
--build_engines:
-+build_engines: build_crypto
-- @dir=engines; target=all; $(BUILD_ONE_CMD)
-+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
--build_apps:
-+build_apps: build_libs
-- @dir=apps; target=all; $(BUILD_ONE_CMD)
-+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
--build_tests:
-+build_tests: build_libs
-- @dir=test; target=all; $(BUILD_ONE_CMD)
-+ +@dir=test; target=all; $(BUILD_ONE_CMD)
--build_tools:
-+build_tools: build_libs
-- @dir=tools; target=all; $(BUILD_ONE_CMD)
-+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
-
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -497,9 +497,9 @@
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: install_docs install_sw
-
--install_sw:
-+install_dirs:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -508,6 +508,13 @@
- $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
- $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
- $(INSTALL_PREFIX)$(OPENSSLDIR)/private
-+ @$(PERL) $(TOP)/util/mkdir-p.pl \
-+ $(INSTALL_PREFIX)$(MANDIR)/man1 \
-+ $(INSTALL_PREFIX)$(MANDIR)/man3 \
-+ $(INSTALL_PREFIX)$(MANDIR)/man5 \
-+ $(INSTALL_PREFIX)$(MANDIR)/man7
-+
-+install_sw: install_dirs
- @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
- do \
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-@@ -511,7 +511,7 @@
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- done;
-- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- do \
- if [ -f "$$i" ]; then \
-@@ -593,12 +600,7 @@
- done; \
- done
-
--install_docs:
-- @$(PERL) $(TOP)/util/mkdir-p.pl \
-- $(INSTALL_PREFIX)$(MANDIR)/man1 \
-- $(INSTALL_PREFIX)$(MANDIR)/man3 \
-- $(INSTALL_PREFIX)$(MANDIR)/man5 \
-- $(INSTALL_PREFIX)$(MANDIR)/man7
-+install_docs: install_dirs
- @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
- here="`pwd`"; \
- filecase=; \
---- a/Makefile.shared
-+++ b/Makefile.shared
-@@ -105,6 +105,7 @@ LINK_SO= \
- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
- LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
- LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
- $${SHAREDCMD} $${SHAREDFLAGS} \
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +124,7 @@ SYMLINK_SO= \
- done; \
- fi; \
- if [ -n "$$SHLIB_SOVER" ]; then \
-+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
- ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
- ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
- fi; \
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -85,11 +85,11 @@
- @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-
- subdirs:
-- @target=all; $(RECURSIVE_MAKE)
-+ +@target=all; $(RECURSIVE_MAKE)
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-- @target=files; $(RECURSIVE_MAKE)
-+ +@target=files; $(RECURSIVE_MAKE)
-
- links:
- @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib: $(LIB)
- @touch lib
--$(LIB): $(LIBOBJ)
-+$(LIB): $(LIBOBJ) | subdirs
- $(AR) $(LIB) $(LIBOBJ)
- $(RANLIB) $(LIB) || echo Never mind.
-
-@@ -110,7 +110,7 @@
- fi
-
- libs:
-- @target=lib; $(RECURSIVE_MAKE)
-+ +@target=lib; $(RECURSIVE_MAKE)
-
- install:
- @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -119,7 +119,7 @@
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- done;
-- @target=install; $(RECURSIVE_MAKE)
-+ +@target=install; $(RECURSIVE_MAKE)
-
- lint:
- @target=lint; $(RECURSIVE_MAKE)
---- a/engines/Makefile
-+++ b/engines/Makefile
-@@ -72,7 +72,7 @@
-
- all: lib subdirs
-
--lib: $(LIBOBJ)
-+lib: $(LIBOBJ) | subdirs
- @if [ -n "$(SHARED_LIBS)" ]; then \
- set -e; \
- for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
-
- subdirs:
- echo $(EDIRS)
-- @target=all; $(RECURSIVE_MAKE)
-+ +@target=all; $(RECURSIVE_MAKE)
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
- done; \
- fi
-- @target=install; $(RECURSIVE_MAKE)
-+ +@target=install; $(RECURSIVE_MAKE)
-
- tags:
- ctags $(SRC)
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -123,7 +123,7 @@
- tags:
- ctags $(SRC)
-
--tests: exe apps $(TESTS)
-+tests: exe $(TESTS)
-
- apps:
- @(cd ..; $(MAKE) DIRS=apps all)
-@@ -365,109 +365,109 @@
- link_app.$${shlib_target}
-
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
-- @target=$(RSATEST); $(BUILD_CMD)
-+ +@target=$(RSATEST); $(BUILD_CMD)
-
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
-- @target=$(BNTEST); $(BUILD_CMD)
-+ +@target=$(BNTEST); $(BUILD_CMD)
-
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
-- @target=$(ECTEST); $(BUILD_CMD)
-+ +@target=$(ECTEST); $(BUILD_CMD)
-
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
-- @target=$(EXPTEST); $(BUILD_CMD)
-+ +@target=$(EXPTEST); $(BUILD_CMD)
-
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
-- @target=$(IDEATEST); $(BUILD_CMD)
-+ +@target=$(IDEATEST); $(BUILD_CMD)
-
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
-- @target=$(MD2TEST); $(BUILD_CMD)
-+ +@target=$(MD2TEST); $(BUILD_CMD)
-
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
-- @target=$(SHATEST); $(BUILD_CMD)
-+ +@target=$(SHATEST); $(BUILD_CMD)
-
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
-- @target=$(SHA1TEST); $(BUILD_CMD)
-+ +@target=$(SHA1TEST); $(BUILD_CMD)
-
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
-- @target=$(SHA256TEST); $(BUILD_CMD)
-+ +@target=$(SHA256TEST); $(BUILD_CMD)
-
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
-- @target=$(SHA512TEST); $(BUILD_CMD)
-+ +@target=$(SHA512TEST); $(BUILD_CMD)
-
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
-- @target=$(RMDTEST); $(BUILD_CMD)
-+ +@target=$(RMDTEST); $(BUILD_CMD)
-
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
-- @target=$(MDC2TEST); $(BUILD_CMD)
-+ +@target=$(MDC2TEST); $(BUILD_CMD)
-
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
-- @target=$(MD4TEST); $(BUILD_CMD)
-+ +@target=$(MD4TEST); $(BUILD_CMD)
-
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
-- @target=$(MD5TEST); $(BUILD_CMD)
-+ +@target=$(MD5TEST); $(BUILD_CMD)
-
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
-- @target=$(HMACTEST); $(BUILD_CMD)
-+ +@target=$(HMACTEST); $(BUILD_CMD)
-
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
-- @target=$(WPTEST); $(BUILD_CMD)
-+ +@target=$(WPTEST); $(BUILD_CMD)
-
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
-- @target=$(RC2TEST); $(BUILD_CMD)
-+ +@target=$(RC2TEST); $(BUILD_CMD)
-
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
-- @target=$(BFTEST); $(BUILD_CMD)
-+ +@target=$(BFTEST); $(BUILD_CMD)
-
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
-- @target=$(CASTTEST); $(BUILD_CMD)
-+ +@target=$(CASTTEST); $(BUILD_CMD)
-
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
-- @target=$(RC4TEST); $(BUILD_CMD)
-+ +@target=$(RC4TEST); $(BUILD_CMD)
-
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
-- @target=$(RC5TEST); $(BUILD_CMD)
-+ +@target=$(RC5TEST); $(BUILD_CMD)
-
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
-- @target=$(DESTEST); $(BUILD_CMD)
-+ +@target=$(DESTEST); $(BUILD_CMD)
-
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
-- @target=$(RANDTEST); $(BUILD_CMD)
-+ +@target=$(RANDTEST); $(BUILD_CMD)
-
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
-- @target=$(DHTEST); $(BUILD_CMD)
-+ +@target=$(DHTEST); $(BUILD_CMD)
-
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
-- @target=$(DSATEST); $(BUILD_CMD)
-+ +@target=$(DSATEST); $(BUILD_CMD)
-
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
-- @target=$(METHTEST); $(BUILD_CMD)
-+ +@target=$(METHTEST); $(BUILD_CMD)
-
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
-
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
-- @target=$(ENGINETEST); $(BUILD_CMD)
-+ +@target=$(ENGINETEST); $(BUILD_CMD)
-
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
-- @target=$(EVPTEST); $(BUILD_CMD)
-+ +@target=$(EVPTEST); $(BUILD_CMD)
-
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
-- @target=$(ECDSATEST); $(BUILD_CMD)
-+ +@target=$(ECDSATEST); $(BUILD_CMD)
-
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
-- @target=$(ECDHTEST); $(BUILD_CMD)
-+ +@target=$(ECDHTEST); $(BUILD_CMD)
-
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
-- @target=$(IGETEST); $(BUILD_CMD)
-+ +@target=$(IGETEST); $(BUILD_CMD)
-
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
-- @target=$(JPAKETEST); $(BUILD_CMD)
-+ +@target=$(JPAKETEST); $(BUILD_CMD)
-
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
-- @target=$(ASN1TEST); $(BUILD_CMD)
-+ +@target=$(ASN1TEST); $(BUILD_CMD)
-
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
-- @target=$(SRPTEST); $(BUILD_CMD)
-+ +@target=$(SRPTEST); $(BUILD_CMD)
-
- #$(AESTEST).o: $(AESTEST).c
- # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -480,7 +480,7 @@
- # fi
-
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
-- @target=dummytest; $(BUILD_CMD)
-+ +@target=dummytest; $(BUILD_CMD)
-
- # DO NOT DELETE THIS LINE -- make depend depends on it.
-
---- a/crypto/objects/Makefile
-+++ b/crypto/objects/Makefile
-@@ -44,11 +44,11 @@ obj_dat.h: obj_dat.pl obj_mac.h
- # objects.pl both reads and writes obj_mac.num
- obj_mac.h: objects.pl objects.txt obj_mac.num
- $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h
-- @sleep 1; touch obj_mac.h; sleep 1
-
--obj_xref.h: objxref.pl obj_xref.txt obj_mac.num
-+# This doesn't really need obj_mac.h, but since that rule reads & writes
-+# obj_mac.num, we can't run in parallel with it.
-+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h
- $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h
-- @sleep 1; touch obj_xref.h; sleep 1
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
diff --git a/dev-libs/openssl/files/openssl-1.0.1-x32.patch b/dev-libs/openssl/files/openssl-1.0.1-x32.patch
deleted file mode 100644
index 5106cb6..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1-x32.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=51bfed2e26fc13a66e8b5710aa2ce1d7a04af721
-
-UpstreamStatus: Pending
-
-Received from H J Liu @ Intel
-Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
-
-ported the patch to the 1.0.0e version
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
-Index: openssl-1.0.0e/Configure
-===================================================================
---- openssl-1.0.0e.orig/Configure
-+++ openssl-1.0.0e/Configure
-@@ -393,6 +393,7 @@ my %table=(
- "debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "dist", "cc:-O::(unknown)::::::",
-
- # Basic configs that should work on any (32 and less bit) box
-Index: openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
-===================================================================
---- openssl-1.0.0e.orig/crypto/bn/asm/x86_64-gcc.c
-+++ openssl-1.0.0e/crypto/bn/asm/x86_64-gcc.c
-@@ -55,7 +55,7 @@
- * machine.
- */
-
--#ifdef _WIN64
-+#if defined _WIN64 || !defined __LP64__
- #define BN_ULONG unsigned long long
- #else
- #define BN_ULONG unsigned long
-@@ -192,9 +192,9 @@ BN_ULONG bn_add_words (BN_ULONG *rp, con
- asm (
- " subq %2,%2 \n"
- ".p2align 4 \n"
-- "1: movq (%4,%2,8),%0 \n"
-- " adcq (%5,%2,8),%0 \n"
-- " movq %0,(%3,%2,8) \n"
-+ "1: movq (%q4,%2,8),%0 \n"
-+ " adcq (%q5,%2,8),%0 \n"
-+ " movq %0,(%q3,%2,8) \n"
- " leaq 1(%2),%2 \n"
- " loop 1b \n"
- " sbbq %0,%0 \n"
-@@ -215,9 +215,9 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, con
- asm (
- " subq %2,%2 \n"
- ".p2align 4 \n"
-- "1: movq (%4,%2,8),%0 \n"
-- " sbbq (%5,%2,8),%0 \n"
-- " movq %0,(%3,%2,8) \n"
-+ "1: movq (%q4,%2,8),%0 \n"
-+ " sbbq (%q5,%2,8),%0 \n"
-+ " movq %0,(%q3,%2,8) \n"
- " leaq 1(%2),%2 \n"
- " loop 1b \n"
- " sbbq %0,%0 \n"
-Index: openssl-1.0.0e/crypto/bn/bn.h
-===================================================================
---- openssl-1.0.0e.orig/crypto/bn/bn.h
-+++ openssl-1.0.0e/crypto/bn/bn.h
-@@ -172,6 +172,13 @@ extern "C" {
- # endif
- #endif
-
-+/* Address type. */
-+#ifdef _WIN64
-+#define BN_ADDR unsigned long long
-+#else
-+#define BN_ADDR unsigned long
-+#endif
-+
- /* assuming long is 64bit - this is the DEC Alpha
- * unsigned long long is only 64 bits :-(, don't define
- * BN_LLONG for the DEC Alpha */
diff --git a/dev-libs/openssl/files/openssl-1.0.1c-force-termios.patch b/dev-libs/openssl/files/openssl-1.0.1c-force-termios.patch
deleted file mode 100644
index 7951953..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1c-force-termios.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Nuar openssl-1.0.1c.orig/crypto/ui/ui_openssl.c openssl-1.0.1c/crypto/ui/ui_openssl.c
---- openssl-1.0.1c.orig/crypto/ui/ui_openssl.c 2012-02-11 23:38:49.000000000 +0000
-+++ openssl-1.0.1c/crypto/ui/ui_openssl.c 2013-07-06 14:40:50.642615149 +0000
-@@ -178,65 +178,11 @@
- * TERMIO, TERMIOS, VMS, MSDOS and SGTTY
- */
-
--#if defined(__sgi) && !defined(TERMIOS)
--# define TERMIOS
--# undef TERMIO
--# undef SGTTY
--#endif
--
--#if defined(linux) && !defined(TERMIO)
--# undef TERMIOS
--# define TERMIO
--# undef SGTTY
--#endif
--
--#ifdef _LIBC
--# undef TERMIOS
--# define TERMIO
--# undef SGTTY
--#endif
--
--#if !defined(TERMIO) && !defined(TERMIOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && !defined(MAC_OS_GUSI_SOURCE)
--# undef TERMIOS
--# undef TERMIO
--# define SGTTY
--#endif
--
--#if defined(OPENSSL_SYS_VXWORKS)
--#undef TERMIOS
--#undef TERMIO
--#undef SGTTY
--#endif
--
--#if defined(OPENSSL_SYS_NETWARE)
--#undef TERMIOS
--#undef TERMIO
--#undef SGTTY
--#endif
--
--#ifdef TERMIOS
- # include <termios.h>
- # define TTY_STRUCT struct termios
- # define TTY_FLAGS c_lflag
- # define TTY_get(tty,data) tcgetattr(tty,data)
- # define TTY_set(tty,data) tcsetattr(tty,TCSANOW,data)
--#endif
--
--#ifdef TERMIO
--# include <termio.h>
--# define TTY_STRUCT struct termio
--# define TTY_FLAGS c_lflag
--# define TTY_get(tty,data) ioctl(tty,TCGETA,data)
--# define TTY_set(tty,data) ioctl(tty,TCSETA,data)
--#endif
--
--#ifdef SGTTY
--# include <sgtty.h>
--# define TTY_STRUCT struct sgttyb
--# define TTY_FLAGS sg_flags
--# define TTY_get(tty,data) ioctl(tty,TIOCGETP,data)
--# define TTY_set(tty,data) ioctl(tty,TIOCSETP,data)
--#endif
-
- #if !defined(_LIBC) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && !defined(OPENSSL_SYS_SUNOS)
- # include <sys/ioctl.h>
diff --git a/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch b/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch
deleted file mode 100644
index 03e4f59..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/472584
-http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest
-
-fix verification handling in s_client. when loading paths, make sure
-we properly fallback to setting the default paths.
-
---- a/apps/s_client.c
-+++ b/apps/s_client.c
-@@ -899,7 +899,7 @@
- if (!set_cert_key_stuff(ctx,cert,key))
- goto end;
-
-- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
-+ if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
- (!SSL_CTX_set_default_verify_paths(ctx)))
- {
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */
-
diff --git a/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch b/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch
deleted file mode 100644
index 1a942d2..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1f-revert-alpha-perl-generation.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://bugs.gentoo.org/499086
-https://rt.openssl.org/Ticket/Display.html?id=3333&user=guest&pass=guest
-
-when gcc is given a .s file and told to preprocess it, it outputs nothing
-
-From a2976461784ce463fc7f336cd0dce607d21c2fad Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 25 Jan 2014 05:44:47 -0500
-Subject: [PATCH] Revert "Make Makefiles OSF-make-friendly."
-
-This reverts commit d1cf23ac86c05b22b8780e2c03b67230564d2d34.
----
- crypto/Makefile | 4 +---
- crypto/bn/Makefile | 4 +---
- crypto/evp/Makefile | 2 +-
- crypto/modes/Makefile | 5 +----
- crypto/sha/Makefile | 4 +---
- util/shlib_wrap.sh | 6 +-----
- 6 files changed, 6 insertions(+), 19 deletions(-)
-
-diff --git a/crypto/Makefile b/crypto/Makefile
-index b253f50..1de9d5f 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -86,9 +86,7 @@ ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@
- ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
- pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
- alphacpuid.s: alphacpuid.pl
-- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
-- $(PERL) alphacpuid.pl > $$preproc && \
-- $(CC) -E $$preproc > $@ && rm $$preproc)
-+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
-
- subdirs:
- @target=all; $(RECURSIVE_MAKE)
-diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
-index b62b676..6c03363 100644
---- a/crypto/bn/Makefile
-+++ b/crypto/bn/Makefile
-@@ -136,9 +136,7 @@ ppc-mont.s: asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
- ppc64-mont.s: asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
-
- alpha-mont.s: asm/alpha-mont.pl
-- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
-- $(PERL) asm/alpha-mont.pl > $$preproc && \
-- $(CC) -E $$preproc > $@ && rm $$preproc)
-+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
-
- # GNU make "catch all"
- %-mont.S: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@
-diff --git a/crypto/modes/Makefile b/crypto/modes/Makefile
-index ce0dcd6..88ac65e 100644
---- a/crypto/modes/Makefile
-+++ b/crypto/modes/Makefile
-@@ -55,10 +55,7 @@ aesni-gcm-x86_64.s: asm/aesni-gcm-x86_64.pl
- ghash-sparcv9.s: asm/ghash-sparcv9.pl
- $(PERL) asm/ghash-sparcv9.pl $@ $(CFLAGS)
- ghash-alpha.s: asm/ghash-alpha.pl
-- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
-- $(PERL) asm/ghash-alpha.pl > $$preproc && \
-- $(CC) -E $$preproc > $@ && rm $$preproc)
--
-+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
- ghash-parisc.s: asm/ghash-parisc.pl
- $(PERL) asm/ghash-parisc.pl $(PERLASM_SCHEME) $@
-
-diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile
-index 64eab6c..63fba69 100644
---- a/crypto/sha/Makefile
-+++ b/crypto/sha/Makefile
-@@ -60,9 +60,7 @@ sha256-armv4.S: asm/sha256-armv4.pl
- $(PERL) $< $(PERLASM_SCHEME) $@
-
- sha1-alpha.s: asm/sha1-alpha.pl
-- (preproc=/tmp/$$$$.$@; trap "rm $$preproc" INT; \
-- $(PERL) asm/sha1-alpha.pl > $$preproc && \
-- $(CC) -E $$preproc > $@ && rm $$preproc)
-+ $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
-
- # Solaris make has to be explicitly told
- sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
---
-1.8.5.3
-
diff --git a/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch
deleted file mode 100644
index 10c1ba2..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch
+++ /dev/null
@@ -1,642 +0,0 @@
-http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest
-
-Forward ported from openssl-1.0.1e-ipv6.patch
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-
---- openssl-1.0.1h/apps/s_apps.h
-+++ openssl-1.0.1h/apps/s_apps.h
-@@ -148,7 +148,7 @@
- #define PORT_STR "4433"
- #define PROTOCOL "tcp"
-
--int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
-+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6);
- #ifdef HEADER_X509_H
- int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
- #endif
-@@ -156,7 +156,7 @@
- int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
- int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key);
- #endif
--int init_client(int *sock, char *server, int port, int type);
-+int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6);
- int should_retry(int i);
- int extract_port(char *str, short *port_ptr);
- int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
---- openssl-1.0.1h/apps/s_client.c
-+++ openssl-1.0.1h/apps/s_client.c
-@@ -285,6 +285,10 @@
- {
- BIO_printf(bio_err,"usage: s_client args\n");
- BIO_printf(bio_err,"\n");
-+ BIO_printf(bio_err," -4 - use IPv4 only\n");
-+#if OPENSSL_USE_IPV6
-+ BIO_printf(bio_err," -6 - use IPv6 only\n");
-+#endif
- BIO_printf(bio_err," -host host - use -connect instead\n");
- BIO_printf(bio_err," -port port - use -connect instead\n");
- BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
-@@ -568,6 +572,7 @@
- int sbuf_len,sbuf_off;
- fd_set readfds,writefds;
- short port=PORT;
-+ int use_ipv4, use_ipv6;
- int full_log=1;
- char *host=SSL_HOST_NAME;
- char *cert_file=NULL,*key_file=NULL;
-@@ -613,7 +618,11 @@
- #endif
- char *sess_in = NULL;
- char *sess_out = NULL;
-- struct sockaddr peer;
-+#if OPENSSL_USE_IPV6
-+ struct sockaddr_storage peer;
-+#else
-+ struct sockaddr_in peer;
-+#endif
- int peerlen = sizeof(peer);
- int enable_timeouts = 0 ;
- long socket_mtu = 0;
-@@ -628,6 +637,12 @@
-
- meth=SSLv23_client_method();
-
-+ use_ipv4 = 1;
-+#if OPENSSL_USE_IPV6
-+ use_ipv6 = 1;
-+#else
-+ use_ipv6 = 0;
-+#endif
- apps_startup();
- c_Pause=0;
- c_quiet=0;
-@@ -949,6 +964,18 @@
- jpake_secret = *++argv;
- }
- #endif
-+ else if (strcmp(*argv,"-4") == 0)
-+ {
-+ use_ipv4 = 1;
-+ use_ipv6 = 0;
-+ }
-+#if OPENSSL_USE_IPV6
-+ else if (strcmp(*argv,"-6") == 0)
-+ {
-+ use_ipv4 = 0;
-+ use_ipv6 = 1;
-+ }
-+#endif
- #ifndef OPENSSL_NO_SRTP
- else if (strcmp(*argv,"-use_srtp") == 0)
- {
-@@ -1260,7 +1287,7 @@
-
- re_start:
-
-- if (init_client(&s,host,port,socket_type) == 0)
-+ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0)
- {
- BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
- SHUTDOWN(s);
-@@ -1286,7 +1313,7 @@
- {
-
- sbio=BIO_new_dgram(s,BIO_NOCLOSE);
-- if (getsockname(s, &peer, (void *)&peerlen) < 0)
-+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0)
- {
- BIO_printf(bio_err, "getsockname:errno=%d\n",
- get_last_socket_error());
---- openssl-1.0.1h/apps/s_server.c
-+++ openssl-1.0.1h/apps/s_server.c
-@@ -560,6 +560,10 @@
- BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
- # endif
- #endif
-+ BIO_printf(bio_err," -4 - use IPv4 only\n");
-+#if OPENSSL_USE_IPV6
-+ BIO_printf(bio_err," -6 - use IPv6 only\n");
-+#endif
- BIO_printf(bio_err," -keymatexport label - Export keying material using label\n");
- BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n");
- }
-@@ -947,6 +951,7 @@
- int state=0;
- const SSL_METHOD *meth=NULL;
- int socket_type=SOCK_STREAM;
-+ int use_ipv4, use_ipv6;
- ENGINE *e=NULL;
- char *inrand=NULL;
- int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM;
-@@ -975,6 +980,12 @@
- #endif
- meth=SSLv23_server_method();
-
-+ use_ipv4 = 1;
-+#if OPENSSL_USE_IPV6
-+ use_ipv6 = 1;
-+#else
-+ use_ipv6 = 0;
-+#endif
- local_argc=argc;
- local_argv=argv;
-
-@@ -1323,6 +1334,18 @@
- jpake_secret = *(++argv);
- }
- #endif
-+ else if (strcmp(*argv,"-4") == 0)
-+ {
-+ use_ipv4 = 1;
-+ use_ipv6 = 0;
-+ }
-+#if OPENSSL_USE_IPV6
-+ else if (strcmp(*argv,"-6") == 0)
-+ {
-+ use_ipv4 = 0;
-+ use_ipv6 = 1;
-+ }
-+#endif
- #ifndef OPENSSL_NO_SRTP
- else if (strcmp(*argv,"-use_srtp") == 0)
- {
-@@ -1881,9 +1904,9 @@
- BIO_printf(bio_s_out,"ACCEPT\n");
- (void)BIO_flush(bio_s_out);
- if (www)
-- do_server(port,socket_type,&accept_socket,www_body, context);
-+ do_server(port,socket_type,&accept_socket,www_body, context, use_ipv4, use_ipv6);
- else
-- do_server(port,socket_type,&accept_socket,sv_body, context);
-+ do_server(port,socket_type,&accept_socket,sv_body, context, use_ipv4, use_ipv6);
- print_stats(bio_s_out,ctx);
- ret=0;
- end:
---- openssl-1.0.1h/apps/s_socket.c
-+++ openssl-1.0.1h/apps/s_socket.c
-@@ -97,16 +97,16 @@
- #include "netdb.h"
- #endif
-
--static struct hostent *GetHostByName(char *name);
-+static struct hostent *GetHostByName(char *name, int domain);
- #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
- static void ssl_sock_cleanup(void);
- #endif
- static int ssl_sock_init(void);
--static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
--static int init_server(int *sock, int port, int type);
--static int init_server_long(int *sock, int port,char *ip, int type);
-+static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain);
-+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6);
-+static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6);
- static int do_accept(int acc_sock, int *sock, char **host);
--static int host_ip(char *str, unsigned char ip[4]);
-+static int host_ip(char *str, unsigned char *ip, int domain);
-
- #ifdef OPENSSL_SYS_WIN16
- #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
-@@ -234,38 +234,68 @@
- return(1);
- }
-
--int init_client(int *sock, char *host, int port, int type)
-+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6)
- {
-+#if OPENSSL_USE_IPV6
-+ unsigned char ip[16];
-+#else
- unsigned char ip[4];
-+#endif
-
-- memset(ip, '\0', sizeof ip);
-- if (!host_ip(host,&(ip[0])))
-- return 0;
-- return init_client_ip(sock,ip,port,type);
-- }
--
--static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
-- {
-- unsigned long addr;
-+ if (use_ipv4)
-+ if (host_ip(host,ip,AF_INET))
-+ return(init_client_ip(sock,ip,port,type,AF_INET));
-+#if OPENSSL_USE_IPV6
-+ if (use_ipv6)
-+ if (host_ip(host,ip,AF_INET6))
-+ return(init_client_ip(sock,ip,port,type,AF_INET6));
-+#endif
-+ return 0;
-+ }
-+
-+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain)
-+ {
-+#if OPENSSL_USE_IPV6
-+ struct sockaddr_storage them;
-+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them;
-+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them;
-+#else
- struct sockaddr_in them;
-+ struct sockaddr_in *them_in = &them;
-+#endif
-+ socklen_t addr_len;
- int s,i;
-
- if (!ssl_sock_init()) return(0);
-
- memset((char *)&them,0,sizeof(them));
-- them.sin_family=AF_INET;
-- them.sin_port=htons((unsigned short)port);
-- addr=(unsigned long)
-- ((unsigned long)ip[0]<<24L)|
-- ((unsigned long)ip[1]<<16L)|
-- ((unsigned long)ip[2]<< 8L)|
-- ((unsigned long)ip[3]);
-- them.sin_addr.s_addr=htonl(addr);
-+ if (domain == AF_INET)
-+ {
-+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
-+ them_in->sin_family=AF_INET;
-+ them_in->sin_port=htons((unsigned short)port);
-+#ifndef BIT_FIELD_LIMITS
-+ memcpy(&them_in->sin_addr.s_addr, ip, 4);
-+#else
-+ memcpy(&them_in->sin_addr, ip, 4);
-+#endif
-+ }
-+ else
-+#if OPENSSL_USE_IPV6
-+ {
-+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
-+ them_in6->sin6_family=AF_INET6;
-+ them_in6->sin6_port=htons((unsigned short)port);
-+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr));
-+ }
-+#else
-+ return(0);
-+#endif
-
- if (type == SOCK_STREAM)
-- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
- else /* ( type == SOCK_DGRAM) */
-- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
-+ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP);
-
- if (s == INVALID_SOCKET) { perror("socket"); return(0); }
-
-@@ -277,29 +307,27 @@
- if (i < 0) { closesocket(s); perror("keepalive"); return(0); }
- }
- #endif
--
-- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1)
-+ if (connect(s,(struct sockaddr *)&them,addr_len) == -1)
- { closesocket(s); perror("connect"); return(0); }
- *sock=s;
- return(1);
- }
-
--int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
-+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int use_ipv4, int use_ipv6)
- {
- int sock;
- char *name = NULL;
- int accept_socket = 0;
- int i;
-
-- if (!init_server(&accept_socket,port,type)) return(0);
--
-+ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0);
- if (ret != NULL)
- {
- *ret=accept_socket;
- /* return(1);*/
- }
-- for (;;)
-- {
-+ for (;;)
-+ {
- if (type==SOCK_STREAM)
- {
- if (do_accept(accept_socket,&sock,&name) == 0)
-@@ -322,41 +350,88 @@
- }
- }
-
--static int init_server_long(int *sock, int port, char *ip, int type)
-+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6)
- {
- int ret=0;
-+ int domain;
-+#if OPENSSL_USE_IPV6
-+ struct sockaddr_storage server;
-+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server;
-+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server;
-+#else
- struct sockaddr_in server;
-+ struct sockaddr_in *server_in = &server;
-+#endif
-+ socklen_t addr_len;
- int s= -1;
-
-+ if (!use_ipv4 && !use_ipv6)
-+ goto err;
-+#if OPENSSL_USE_IPV6
-+ /* we are fine here */
-+#else
-+ if (use_ipv6)
-+ goto err;
-+#endif
- if (!ssl_sock_init()) return(0);
-
-- memset((char *)&server,0,sizeof(server));
-- server.sin_family=AF_INET;
-- server.sin_port=htons((unsigned short)port);
-- if (ip == NULL)
-- server.sin_addr.s_addr=INADDR_ANY;
-- else
--/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
--#ifndef BIT_FIELD_LIMITS
-- memcpy(&server.sin_addr.s_addr,ip,4);
-+#if OPENSSL_USE_IPV6
-+ domain = use_ipv6 ? AF_INET6 : AF_INET;
- #else
-- memcpy(&server.sin_addr,ip,4);
-+ domain = AF_INET;
- #endif
--
-- if (type == SOCK_STREAM)
-- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
-- else /* type == SOCK_DGRAM */
-- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
-+ if (type == SOCK_STREAM)
-+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL);
-+ else /* type == SOCK_DGRAM */
-+ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP);
-
- if (s == INVALID_SOCKET) goto err;
- #if defined SOL_SOCKET && defined SO_REUSEADDR
-+ {
-+ int j = 1;
-+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-+ (void *) &j, sizeof j);
-+ }
-+#endif
-+#if OPENSSL_USE_IPV6
-+ if ((use_ipv4 == 0) && (use_ipv6 == 1))
-+ {
-+ const int on = 1;
-+
-+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
-+ (const void *) &on, sizeof(int));
-+ }
-+#endif
-+ if (domain == AF_INET)
-+ {
-+ addr_len = (socklen_t)sizeof(struct sockaddr_in);
-+ memset(server_in, 0, sizeof(struct sockaddr_in));
-+ server_in->sin_family=AF_INET;
-+ server_in->sin_port = htons((unsigned short)port);
-+ if (ip == NULL)
-+ server_in->sin_addr.s_addr = htonl(INADDR_ANY);
-+ else
-+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
-+#ifndef BIT_FIELD_LIMITS
-+ memcpy(&server_in->sin_addr.s_addr, ip, 4);
-+#else
-+ memcpy(&server_in->sin_addr, ip, 4);
-+#endif
-+ }
-+#if OPENSSL_USE_IPV6
-+ else
- {
-- int j = 1;
-- setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-- (void *) &j, sizeof j);
-+ addr_len = (socklen_t)sizeof(struct sockaddr_in6);
-+ memset(server_in6, 0, sizeof(struct sockaddr_in6));
-+ server_in6->sin6_family = AF_INET6;
-+ server_in6->sin6_port = htons((unsigned short)port);
-+ if (ip == NULL)
-+ server_in6->sin6_addr = in6addr_any;
-+ else
-+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr));
- }
- #endif
-- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
-+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1)
- {
- #ifndef OPENSSL_SYS_WINDOWS
- perror("bind");
-@@ -375,16 +450,23 @@
- return(ret);
- }
-
--static int init_server(int *sock, int port, int type)
-+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6)
- {
-- return(init_server_long(sock, port, NULL, type));
-+ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6));
- }
-
- static int do_accept(int acc_sock, int *sock, char **host)
- {
- int ret;
- struct hostent *h1,*h2;
-- static struct sockaddr_in from;
-+#if OPENSSL_USE_IPV6
-+ struct sockaddr_storage from;
-+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from;
-+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from;
-+#else
-+ struct sockaddr_in from;
-+ struct sockaddr_in *from_in = &from;
-+#endif
- int len;
- /* struct linger ling; */
-
-@@ -431,13 +513,23 @@
- */
-
- if (host == NULL) goto end;
-+#if OPENSSL_USE_IPV6
-+ if (from.ss_family == AF_INET)
-+#else
-+ if (from.sin_family == AF_INET)
-+#endif
- #ifndef BIT_FIELD_LIMITS
-- /* I should use WSAAsyncGetHostByName() under windows */
-- h1=gethostbyaddr((char *)&from.sin_addr.s_addr,
-- sizeof(from.sin_addr.s_addr),AF_INET);
-+ /* I should use WSAAsyncGetHostByName() under windows */
-+ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr,
-+ sizeof(from_in->sin_addr.s_addr), AF_INET);
- #else
-- h1=gethostbyaddr((char *)&from.sin_addr,
-- sizeof(struct in_addr),AF_INET);
-+ h1=gethostbyaddr((char *)&from_in->sin_addr,
-+ sizeof(struct in_addr), AF_INET);
-+#endif
-+#if OPENSSL_USE_IPV6
-+ else
-+ h1=gethostbyaddr((char *)&from_in6->sin6_addr,
-+ sizeof(struct in6_addr), AF_INET6);
- #endif
- if (h1 == NULL)
- {
-@@ -455,16 +547,25 @@
- }
- BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1);
-
-- h2=GetHostByName(*host);
-+#if OPENSSL_USE_IPV6
-+ h2=GetHostByName(*host, from.ss_family);
-+#else
-+ h2=GetHostByName(*host, from.sin_family);
-+#endif
-+
- if (h2 == NULL)
- {
- BIO_printf(bio_err,"gethostbyname failure\n");
- closesocket(ret);
- return(0);
- }
-- if (h2->h_addrtype != AF_INET)
-+#if OPENSSL_USE_IPV6
-+ if (h2->h_addrtype != from.ss_family)
-+#else
-+ if (h2->h_addrtype != from.sin_family)
-+#endif
- {
-- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
-+ BIO_printf(bio_err,"gethostbyname addr address is not correct\n");
- closesocket(ret);
- return(0);
- }
-@@ -480,7 +581,7 @@
- char *h,*p;
-
- h=str;
-- p=strchr(str,':');
-+ p=strrchr(str,':');
- if (p == NULL)
- {
- BIO_printf(bio_err,"no port defined\n");
-@@ -488,7 +589,7 @@
- }
- *(p++)='\0';
-
-- if ((ip != NULL) && !host_ip(str,ip))
-+ if ((ip != NULL) && !host_ip(str,ip,AF_INET))
- goto err;
- if (host_ptr != NULL) *host_ptr=h;
-
-@@ -499,48 +600,58 @@
- return(0);
- }
-
--static int host_ip(char *str, unsigned char ip[4])
-+static int host_ip(char *str, unsigned char *ip, int domain)
- {
-- unsigned int in[4];
-+ unsigned int in[4];
-+ unsigned long l;
- int i;
-
-- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
-+ if ((domain == AF_INET) &&
-+ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4))
- {
-+
- for (i=0; i<4; i++)
- if (in[i] > 255)
- {
- BIO_printf(bio_err,"invalid IP address\n");
- goto err;
- }
-- ip[0]=in[0];
-- ip[1]=in[1];
-- ip[2]=in[2];
-- ip[3]=in[3];
-- }
-+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]);
-+ memcpy(ip, &l, 4);
-+ return 1;
-+ }
-+#if OPENSSL_USE_IPV6
-+ else if ((domain == AF_INET6) &&
-+ (inet_pton(AF_INET6, str, ip) == 1))
-+ return 1;
-+#endif
- else
- { /* do a gethostbyname */
- struct hostent *he;
-
- if (!ssl_sock_init()) return(0);
-
-- he=GetHostByName(str);
-+ he=GetHostByName(str,domain);
- if (he == NULL)
- {
- BIO_printf(bio_err,"gethostbyname failure\n");
- goto err;
- }
- /* cast to short because of win16 winsock definition */
-- if ((short)he->h_addrtype != AF_INET)
-+ if ((short)he->h_addrtype != domain)
- {
-- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n");
-+ BIO_printf(bio_err,"gethostbyname addr family is not correct\n");
- return(0);
- }
-- ip[0]=he->h_addr_list[0][0];
-- ip[1]=he->h_addr_list[0][1];
-- ip[2]=he->h_addr_list[0][2];
-- ip[3]=he->h_addr_list[0][3];
-+ if (domain == AF_INET)
-+ memset(ip, 0, 4);
-+#if OPENSSL_USE_IPV6
-+ else
-+ memset(ip, 0, 16);
-+#endif
-+ memcpy(ip, he->h_addr_list[0], he->h_length);
-+ return 1;
- }
-- return(1);
- err:
- return(0);
- }
-@@ -577,7 +688,7 @@
- static unsigned long ghbn_hits=0L;
- static unsigned long ghbn_miss=0L;
-
--static struct hostent *GetHostByName(char *name)
-+static struct hostent *GetHostByName(char *name, int domain)
- {
- struct hostent *ret;
- int i,lowi=0;
-@@ -592,14 +703,20 @@
- }
- if (ghbn_cache[i].order > 0)
- {
-- if (strncmp(name,ghbn_cache[i].name,128) == 0)
-+ if ((strncmp(name,ghbn_cache[i].name,128) == 0) &&
-+ (ghbn_cache[i].ent.h_addrtype == domain))
- break;
- }
- }
- if (i == GHBN_NUM) /* no hit*/
- {
- ghbn_miss++;
-- ret=gethostbyname(name);
-+ if (domain == AF_INET)
-+ ret=gethostbyname(name);
-+#if OPENSSL_USE_IPV6
-+ else
-+ ret=gethostbyname2(name, AF_INET6);
-+#endif
- if (ret == NULL) return(NULL);
- /* else add to cache */
- if(strlen(name) < sizeof ghbn_cache[0].name)
diff --git a/dev-libs/openssl/files/openssl-1.0.1l-CVE-2015-0286.patch b/dev-libs/openssl/files/openssl-1.0.1l-CVE-2015-0286.patch
deleted file mode 100644
index 811f573..0000000
--- a/dev-libs/openssl/files/openssl-1.0.1l-CVE-2015-0286.patch
+++ /dev/null
@@ -1,356 +0,0 @@
---- openssl-1.0.1l/crypto/asn1/a_type.c
-+++ openssl-1.0.1l/crypto/asn1/a_type.c
-@@ -124,6 +124,9 @@
- case V_ASN1_OBJECT:
- result = OBJ_cmp(a->value.object, b->value.object);
- break;
-+ case V_ASN1_BOOLEAN:
-+ result = a->value.boolean - b->value.boolean;
-+ break;
- case V_ASN1_NULL:
- result = 0; /* They do not have content. */
- break;
---- openssl-1.0.1l/crypto/asn1/tasn_dec.c
-+++ openssl-1.0.1l/crypto/asn1/tasn_dec.c
-@@ -130,11 +130,17 @@
- {
- ASN1_TLC c;
- ASN1_VALUE *ptmpval = NULL;
-- if (!pval)
-- pval = &ptmpval;
- asn1_tlc_clear_nc(&c);
-- if (ASN1_item_ex_d2i(pval, in, len, it, -1, 0, 0, &c) > 0)
-- return *pval;
-+ if (pval && *pval && it->itype == ASN1_ITYPE_PRIMITIVE)
-+ ptmpval = *pval;
-+ if (ASN1_item_ex_d2i(&ptmpval, in, len, it, -1, 0, 0, &c) > 0) {
-+ if (pval && it->itype != ASN1_ITYPE_PRIMITIVE) {
-+ if (*pval)
-+ ASN1_item_free(*pval, it);
-+ *pval = ptmpval;
-+ }
-+ return ptmpval;
-+ }
- return NULL;
- }
-
-@@ -311,9 +317,16 @@
- if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
- goto auxerr;
-
-- /* Allocate structure */
-- if (!*pval && !ASN1_item_ex_new(pval, it))
-- {
-+ if (*pval) {
-+ /* Free up and zero CHOICE value if initialised */
-+ i = asn1_get_choice_selector(pval, it);
-+ if ((i >= 0) && (i < it->tcount)) {
-+ tt = it->templates + i;
-+ pchptr = asn1_get_field_ptr(pval, tt);
-+ ASN1_template_free(pchptr, tt);
-+ asn1_set_choice_selector(pval, -1, it);
-+ }
-+ } else if (!ASN1_item_ex_new(pval, it)) {
- ASN1err(ASN1_F_ASN1_ITEM_EX_D2I,
- ERR_R_NESTED_ASN1_ERROR);
- goto err;
-@@ -407,6 +420,17 @@
- if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))
- goto auxerr;
-
-+ /* Free up and zero any ADB found */
-+ for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) {
-+ if (tt->flags & ASN1_TFLG_ADB_MASK) {
-+ const ASN1_TEMPLATE *seqtt;
-+ ASN1_VALUE **pseqval;
-+ seqtt = asn1_do_adb(pval, tt, 1);
-+ pseqval = asn1_get_field_ptr(pval, seqtt);
-+ ASN1_template_free(pseqval, seqtt);
-+ }
-+ }
-+
- /* Get each field entry */
- for (i = 0, tt = it->templates; i < it->tcount; i++, tt++)
- {
---- openssl-1.0.1l/crypto/pkcs7/pk7_doit.c
-+++ openssl-1.0.1l/crypto/pkcs7/pk7_doit.c
-@@ -272,6 +272,25 @@
- PKCS7_RECIP_INFO *ri=NULL;
- ASN1_OCTET_STRING *os=NULL;
-
-+ if (p7 == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER);
-+ return NULL;
-+ }
-+ /*
-+ * The content field in the PKCS7 ContentInfo is optional, but that really
-+ * only applies to inner content (precisely, detached signatures).
-+ *
-+ * When reading content, missing outer content is therefore treated as an
-+ * error.
-+ *
-+ * When creating content, PKCS7_content_new() must be called before
-+ * calling this method, so a NULL p7->d is always an error.
-+ */
-+ if (p7->d.ptr == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT);
-+ return NULL;
-+ }
-+
- i=OBJ_obj2nid(p7->type);
- p7->state=PKCS7_S_HEADER;
-
-@@ -433,6 +452,16 @@
- unsigned char *ek = NULL, *tkey = NULL;
- int eklen = 0, tkeylen = 0;
-
-+ if (p7 == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER);
-+ return NULL;
-+ }
-+
-+ if (p7->d.ptr == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT);
-+ return NULL;
-+ }
-+
- i=OBJ_obj2nid(p7->type);
- p7->state=PKCS7_S_HEADER;
-
-@@ -752,6 +781,16 @@
- STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL;
- ASN1_OCTET_STRING *os=NULL;
-
-+ if (p7 == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER);
-+ return 0;
-+ }
-+
-+ if (p7->d.ptr == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT);
-+ return 0;
-+ }
-+
- EVP_MD_CTX_init(&ctx_tmp);
- i=OBJ_obj2nid(p7->type);
- p7->state=PKCS7_S_HEADER;
-@@ -796,6 +835,7 @@
- /* If detached data then the content is excluded */
- if(PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) {
- M_ASN1_OCTET_STRING_free(os);
-+ os = NULL;
- p7->d.sign->contents->d.data = NULL;
- }
- break;
-@@ -806,6 +846,7 @@
- if(PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
- {
- M_ASN1_OCTET_STRING_free(os);
-+ os = NULL;
- p7->d.digest->contents->d.data = NULL;
- }
- break;
-@@ -878,24 +919,31 @@
- M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
- }
-
-- if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF))
-- {
-+ if (!PKCS7_is_detached(p7)) {
-+ /*
-+ * NOTE(emilia): I think we only reach os == NULL here because detached
-+ * digested data support is broken.
-+ */
-+ if (os == NULL)
-+ goto err;
-+ if (!(os->flags & ASN1_STRING_FLAG_NDEF)) {
- char *cont;
- long contlen;
-- btmp=BIO_find_type(bio,BIO_TYPE_MEM);
-- if (btmp == NULL)
-- {
-- PKCS7err(PKCS7_F_PKCS7_DATAFINAL,PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-- goto err;
-- }
-+ btmp = BIO_find_type(bio, BIO_TYPE_MEM);
-+ if (btmp == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO);
-+ goto err;
-+ }
- contlen = BIO_get_mem_data(btmp, &cont);
-- /* Mark the BIO read only then we can use its copy of the data
-+ /*
-+ * Mark the BIO read only then we can use its copy of the data
- * instead of making an extra copy.
- */
- BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY);
- BIO_set_mem_eof_return(btmp, 0);
- ASN1_STRING_set0(os, (unsigned char *)cont, contlen);
-- }
-+ }
-+ }
- ret=1;
- err:
- EVP_MD_CTX_cleanup(&ctx_tmp);
-@@ -971,6 +1019,16 @@
- STACK_OF(X509) *cert;
- X509 *x509;
-
-+ if (p7 == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER);
-+ return 0;
-+ }
-+
-+ if (p7->d.ptr == NULL) {
-+ PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT);
-+ return 0;
-+ }
-+
- if (PKCS7_type_is_signed(p7))
- {
- cert=p7->d.sign->cert;
---- openssl-1.0.1l/crypto/pkcs7/pk7_lib.c
-+++ openssl-1.0.1l/crypto/pkcs7/pk7_lib.c
-@@ -71,6 +71,7 @@
-
- switch (cmd)
- {
-+ /* NOTE(emilia): does not support detached digested data. */
- case PKCS7_OP_SET_DETACHED_SIGNATURE:
- if (nid == NID_pkcs7_signed)
- {
-@@ -459,6 +460,8 @@
-
- STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7)
- {
-+ if (p7 == NULL || p7->d.ptr == NULL)
-+ return NULL;
- if (PKCS7_type_is_signed(p7))
- {
- return(p7->d.sign->signer_info);
---- openssl-1.0.1l/doc/crypto/d2i_X509.pod
-+++ openssl-1.0.1l/doc/crypto/d2i_X509.pod
-@@ -199,6 +199,12 @@
- persist if they are not present in the new one. As a result the use
- of this "reuse" behaviour is strongly discouraged.
-
-+Current versions of OpenSSL will not modify B<*px> if an error occurs.
-+If parsing succeeds then B<*px> is freed (if it is not NULL) and then
-+set to the value of the newly decoded structure. As a result B<*px>
-+B<must not> be allocated on the stack or an attempt will be made to
-+free an invalid pointer.
-+
- i2d_X509() will not return an error in many versions of OpenSSL,
- if mandatory fields are not initialized due to a programming error
- then the encoded structure may contain invalid data or omit the
-@@ -210,7 +216,9 @@
-
- d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B<X509> structure
- or B<NULL> if an error occurs. The error code that can be obtained by
--L<ERR_get_error(3)|ERR_get_error(3)>.
-+L<ERR_get_error(3)|ERR_get_error(3)>. If the "reuse" capability has been used
-+with a valid X509 structure being passed in via B<px> then the object is not
-+modified in the event of error.
-
- i2d_X509() returns the number of bytes successfully encoded or a negative
- value if an error occurs. The error code can be obtained by
---- openssl-1.0.1l/ssl/s2_lib.c
-+++ openssl-1.0.1l/ssl/s2_lib.c
-@@ -488,7 +488,7 @@
-
- OPENSSL_assert(s->session->master_key_length >= 0
- && s->session->master_key_length
-- < (int)sizeof(s->session->master_key));
-+ <= (int)sizeof(s->session->master_key));
- EVP_DigestUpdate(&ctx,s->session->master_key,s->session->master_key_length);
- EVP_DigestUpdate(&ctx,&c,1);
- c++;
---- openssl-1.0.1l/ssl/s2_srvr.c
-+++ openssl-1.0.1l/ssl/s2_srvr.c
-@@ -454,10 +454,6 @@
- SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_NO_PRIVATEKEY);
- return(-1);
- }
-- i=ssl_rsa_private_decrypt(s->cert,s->s2->tmp.enc,
-- &(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]),
-- (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING);
--
- is_export=SSL_C_IS_EXPORT(s->session->cipher);
-
- if (!ssl_cipher_get_evp(s->session,&c,&md,NULL,NULL,NULL))
-@@ -475,21 +471,59 @@
- else
- ek=5;
-
-+ /*
-+ * The format of the CLIENT-MASTER-KEY message is
-+ * 1 byte message type
-+ * 3 bytes cipher
-+ * 2-byte clear key length (stored in s->s2->tmp.clear)
-+ * 2-byte encrypted key length (stored in s->s2->tmp.enc)
-+ * 2-byte key args length (IV etc)
-+ * clear key
-+ * encrypted key
-+ * key args
-+ *
-+ * If the cipher is an export cipher, then the encrypted key bytes
-+ * are a fixed portion of the total key (5 or 8 bytes). The size of
-+ * this portion is in |ek|. If the cipher is not an export cipher,
-+ * then the entire key material is encrypted (i.e., clear key length
-+ * must be zero).
-+ */
-+ if ((!is_export && s->s2->tmp.clear != 0) ||
-+ (is_export && s->s2->tmp.clear + ek != EVP_CIPHER_key_length(c))) {
-+ ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR);
-+ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH);
-+ return -1;
-+ }
-+ /*
-+ * The encrypted blob must decrypt to the encrypted portion of the key.
-+ * Decryption can't be expanding, so if we don't have enough encrypted
-+ * bytes to fit the key in the buffer, stop now.
-+ */
-+ if ((is_export && s->s2->tmp.enc < ek) ||
-+ (!is_export && s->s2->tmp.enc < EVP_CIPHER_key_length(c))) {
-+ ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR);
-+ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT);
-+ return -1;
-+ }
-+
-+ i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc,
-+ &(p[s->s2->tmp.clear]),
-+ &(p[s->s2->tmp.clear]),
-+ (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING :
-+ RSA_PKCS1_PADDING);
-+
- /* bad decrypt */
- #if 1
- /* If a bad decrypt, continue with protocol but with a
- * random master secret (Bleichenbacher attack) */
-- if ((i < 0) ||
-- ((!is_export && (i != EVP_CIPHER_key_length(c)))
-- || (is_export && ((i != ek) || (s->s2->tmp.clear+(unsigned int)i !=
-- (unsigned int)EVP_CIPHER_key_length(c))))))
-- {
-+ if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c))
-+ || (is_export && i != ek))) {
- ERR_clear_error();
- if (is_export)
- i=ek;
- else
- i=EVP_CIPHER_key_length(c);
-- if (RAND_pseudo_bytes(p,i) <= 0)
-+ if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0)
- return 0;
- }
- #else
-@@ -513,7 +547,8 @@
- }
- #endif
-
-- if (is_export) i+=s->s2->tmp.clear;
-+ if (is_export)
-+ i = EVP_CIPHER_key_length(c);
-
- if (i > SSL_MAX_MASTER_KEY_LENGTH)
- {
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
deleted file mode 100644
index 84ddb51..0000000
--- a/dev-libs/openssl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='bindist'>Disable EC/RC5 algorithms (as they seem to be patented)</flag>
- <flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
- <flag name='tls-heartbeat'>Enable the Heartbeat Extension in TLS and DTLS</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-libs/openssl/openssl-1.0.1l-r99.ebuild b/dev-libs/openssl/openssl-1.0.1l-r99.ebuild
deleted file mode 100644
index aca6816..0000000
--- a/dev-libs/openssl/openssl-1.0.1l-r99.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1l-r1.ebuild,v 1.5 2015/03/19 18:03:39 vapier Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
-
-REV="1.7"
-DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-HOMEPAGE="http://www.openssl.org/"
-SRC_URI="mirror://openssl/source/${P}.tar.gz
- http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
-
-LICENSE="openssl"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="bindist gmp kerberos rfc3779 cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
-RESTRICT="!bindist? ( bindist )"
-
-# The blocks are temporary just to make sure people upgrade to a
-# version that lack runtime version checking. We'll drop them in
-# the future.
-RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
- kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140406-r3
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- !<net-misc/openssh-5.9_p1-r4
- !<net-libs/neon-0.29.6-r1"
-DEPEND="${RDEPEND}
- sys-apps/diffutils
- >=dev-lang/perl-5
- test? ( sys-devel/bc )"
-PDEPEND="app-misc/ca-certificates"
-
-src_unpack() {
- unpack ${P}.tar.gz
- SSL_CNF_DIR="/etc/ssl"
- sed \
- -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
- -e "s:SSL_CMD=/usr:SSL_CMD=${EPREFIX}/usr:" \
- "${DISTDIR}"/${PN}-c_rehash.sh.${REV} \
- > "${WORKDIR}"/c_rehash || die #416717
-}
-
-MULTILIB_WRAPPED_HEADERS=(
- usr/include/openssl/opensslconf.h
-)
-
-src_prepare() {
- # Make sure we only ever touch Makefile.org and avoid patching a file
- # that gets blown away anyways by the Configure script in src_configure
- rm -f Makefile
-
- if ! use vanilla ; then
- epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
- epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
- epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
- epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
- epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
- epatch "${FILESDIR}"/${PN}-1.0.1h-ipv6.patch
- epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584
- epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086
- epatch "${FILESDIR}"/${PN}-1.0.1l-CVE-2015-0286.patch #543552
- epatch "${FILESDIR}"/${PN}-1.0.1c-force-termios.patch
- epatch_user #332661
- fi
-
- # disable fips in the build
- # make sure the man pages are suffixed #302165
- # don't bother building man pages if they're disabled
- sed -i \
- -e '/DIRS/s: fips : :g' \
- -e '/^MANSUFFIX/s:=.*:=ssl:' \
- -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
- -e $(has noman FEATURES \
- && echo '/^install:/s:install_docs::' \
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
- Makefile.org \
- || die
- # show the actual commands in the log
- sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
-
- # since we're forcing $(CC) as makedep anyway, just fix
- # the conditional as always-on
- # helps clang (#417795), and versioned gcc (#499818)
- sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
-
- # quiet out unknown driver argument warnings since openssl
- # doesn't have well-split CFLAGS and we're making it even worse
- # and 'make depend' uses -Werror for added fun (#417795 again)
- [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
- # allow openssl to be cross-compiled
- cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
- chmod a+rx gentoo.config
-
- append-flags -fno-strict-aliasing
- append-flags $(test-flags-CC -Wa,--noexecstack)
-
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
- # The config script does stupid stuff to prompt the user. Kill it.
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
- ./config --test-sanity || die "I AM NOT SANE"
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- unset APPS #197996
- unset SCRIPTS #312551
- unset CROSS_COMPILE #311473
-
- tc-export CC AR RANLIB RC
-
- # Clean out patent-or-otherwise-encumbered code
- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
- # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
-
- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
- echoit() { echo "$@" ; "$@" ; }
-
- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
- # See if our toolchain supports __uint128_t. If so, it's 64bit
- # friendly and can use the nicely optimized code paths. #460790
- local ec_nistp_64_gcc_128
- # Disable it for now though #469976
- #if ! use bindist ; then
- # echo "__uint128_t i;" > "${T}"/128.c
- # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
- # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
- # fi
- #fi
-
- local sslout=$(./gentoo.config)
- einfo "Use configuration ${sslout:-(openssl knows best)}"
- local config="Configure"
- [[ -z ${sslout} ]] && config="config"
-
- echoit \
- ./${config} \
- ${sslout} \
- $(use cpu_flags_x86_sse2 || echo "no-sse2") \
- enable-camellia \
- $(use_ssl !bindist ec) \
- ${ec_nistp_64_gcc_128} \
- enable-idea \
- enable-mdc2 \
- $(use_ssl !bindist rc5) \
- enable-tlsext \
- $(use_ssl gmp gmp -lgmp) \
- $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
- $(use_ssl rfc3779) \
- $(use_ssl tls-heartbeat heartbeats) \
- $(use_ssl zlib) \
- --prefix="${EPREFIX}"/usr \
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \
- --libdir=$(get_libdir) \
- shared threads \
- || die
-
- # Clean out hardcoded flags that openssl uses
- local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
- -e 's:^CFLAG=::' \
- -e 's:-fomit-frame-pointer ::g' \
- -e 's:-O[0-9] ::g' \
- -e 's:-march=[-a-z0-9]* ::g' \
- -e 's:-mcpu=[-a-z0-9]* ::g' \
- -e 's:-m[a-z0-9]* ::g' \
- )
- sed -i \
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
- Makefile || die
-}
-
-multilib_src_compile() {
- # depend is needed to use $confopts; it also doesn't matter
- # that it's -j1 as the code itself serializes subdirs
- emake -j1 depend
- emake all
- # rehash is needed to prep the certs/ dir; do this
- # separately to avoid parallel build issues.
- emake rehash
-}
-
-multilib_src_test() {
- emake -j1 test
-}
-
-multilib_src_install() {
- emake INSTALL_PREFIX="${D}" install
-}
-
-multilib_src_install_all() {
- dobin "${WORKDIR}"/c_rehash #333117
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
- dohtml -r doc/*
- use rfc3779 && dodoc engines/ccgost/README.gost
-
- # This is crappy in that the static archives are still built even
- # when USE=static-libs. But this is due to a failing in the openssl
- # build system: the static archives are built as PIC all the time.
- # Only way around this would be to manually configure+compile openssl
- # twice; once with shared lib support enabled and once without.
- use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
-
- # create the certs directory
- dodir ${SSL_CNF_DIR}/certs
- cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
- rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
-
- # Namespace openssl programs to prevent conflicts with other man pages
- cd "${ED}"/usr/share/man
- local m d s
- for m in $(find . -type f | xargs grep -L '#include') ; do
- d=${m%/*} ; d=${d#./} ; m=${m##*/}
- [[ ${m} == openssl.1* ]] && continue
- [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
- mv ${d}/{,ssl-}${m}
- # fix up references to renamed man pages
- sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
- ln -s ssl-${m} ${d}/openssl-${m}
- # locate any symlinks that point to this man page ... we assume
- # that any broken links are due to the above renaming
- for s in $(find -L ${d} -type l) ; do
- s=${s##*/}
- rm -f ${d}/${s}
- ln -s ssl-${m} ${d}/ssl-${s}
- ln -s ssl-${s} ${d}/openssl-${s}
- done
- done
- [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
- dodir /etc/sandbox.d #254521
- echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
- diropts -m0700
- keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_preinst() {
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0
- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
-
-pkg_postinst() {
- ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
- c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
- eend $?
-
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0
- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-}
diff --git a/dev-scheme/guile/files/50guile-gentoo.el b/dev-scheme/guile/files/50guile-gentoo.el
deleted file mode 100644
index 431f7e9..0000000
--- a/dev-scheme/guile/files/50guile-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
diff --git a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch b/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
deleted file mode 100644
index 2b04426..0000000
--- a/dev-scheme/guile/files/guile-1.8.8-fix_guile-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN 1/configure.in 2/configure.in
---- 1/configure.in 2010-12-13 17:24:39.000000000 +0000
-+++ 2/configure.in 2011-04-29 11:53:39.000000000 +0000
-@@ -1522,8 +1522,8 @@
- #######################################################################
-
- dnl Tell guile-config what flags guile users should compile and link with.
--GUILE_LIBS="$LDFLAGS $LIBS"
--GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS"
-+GUILE_LIBS="$LIBS"
-+GUILE_CFLAGS="$PTHREAD_CFLAGS"
- AC_SUBST(GUILE_LIBS)
- AC_SUBST(GUILE_CFLAGS)
-
diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc46.patch b/dev-scheme/guile/files/guile-1.8.8-gcc46.patch
deleted file mode 100644
index b06a0e5..0000000
--- a/dev-scheme/guile/files/guile-1.8.8-gcc46.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Backported upstream patch to fix SIGSEGV with gcc-4.6
-
-http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94
-https://bugs.gentoo.org/show_bug.cgi?id=424475
---- a/configure.in
-+++ b/configure.in
-@@ -1199,23 +1199,20 @@
- AC_RUN_IFELSE([AC_LANG_SOURCE(
- [AC_INCLUDES_DEFAULT
- int
--find_stack_direction ()
-+find_stack_direction (int *addr, int depth)
- {
-- static char *addr = 0;
-- auto char dummy;
-- if (addr == 0)
-- {
-- addr = &dummy;
-- return find_stack_direction ();
-- }
-- else
-- return (&dummy > addr) ? 1 : -1;
-+ int dir, dummy = 0;
-+ if (! addr)
-+ addr = &dummy;
-+ *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
-+ dir = depth ? find_stack_direction (addr, depth - 1) : 0;
-+ return dir + dummy;
- }
-
- int
--main ()
-+main (int argc, char **argv)
- {
-- return find_stack_direction () < 0;
-+ return find_stack_direction (0, argc + !argv + 20) < 0;
- }])],
- [SCM_I_GSC_STACK_GROWS_UP=1],
- [],
diff --git a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch b/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
deleted file mode 100644
index 9f3a02c..0000000
--- a/dev-scheme/guile/files/guile-1.8.8-makeinfo-5.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 937da0f2604ea208ec56517c5a41e582f316a246 Mon Sep 17 00:00:00 2001
-From: Cyprien Nicolas <cyp@fulax.fr>
-Date: Thu, 18 Apr 2013 23:45:23 +0200
-Subject: [PATCH] Fix texinfo files for makeinfo-5.1
-
----
- doc/ref/api-options.texi | 2 +-
- doc/ref/api-utility.texi | 2 +-
- doc/ref/fdl.texi | 2 +-
- doc/ref/gh.texi | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/doc/ref/api-options.texi b/doc/ref/api-options.texi
-index 7b7a6e0..6ce7291 100644
---- a/doc/ref/api-options.texi
-+++ b/doc/ref/api-options.texi
-@@ -377,9 +377,9 @@ configure @emph{reading}, @emph{printing}, @emph{debugging} or
- * User level options interfaces::
- * Reader options::
- * Printing options::
--* Debugger options::
- * Evaluator options::
- * Evaluator trap options::
-+* Debugger options::
- * Examples of option use::
- @end menu
-
-diff --git a/doc/ref/api-utility.texi b/doc/ref/api-utility.texi
-index 4a90212..9a4f3cc 100644
---- a/doc/ref/api-utility.texi
-+++ b/doc/ref/api-utility.texi
-@@ -657,7 +657,7 @@ Return 1 if @var{x} is a Scheme-level hook, 0 otherwise.
- @end deftypefn
-
-
--@subsubsection Handling Scheme-level hooks from C code
-+@subsubheading Handling Scheme-level hooks from C code
-
- Here is an example of how to handle Scheme-level hooks from C code using
- the above functions.
-diff --git a/doc/ref/fdl.texi b/doc/ref/fdl.texi
-index 17fe148..4866055 100644
---- a/doc/ref/fdl.texi
-+++ b/doc/ref/fdl.texi
-@@ -408,7 +408,7 @@ as a draft) by the Free Software Foundation.
- @end enumerate
-
- @page
--@appendixsubsec ADDENDUM: How to use this License for your documents
-+@appendixsec ADDENDUM: How to use this License for your documents
-
- To use this License in a document you have written, include a copy of
- the License in the document and put the following copyright and
-diff --git a/doc/ref/gh.texi b/doc/ref/gh.texi
-index 95dfd92..bbd3af1 100644
---- a/doc/ref/gh.texi
-+++ b/doc/ref/gh.texi
-@@ -995,8 +995,8 @@ These correspond to the Scheme @code{(cons a b)} and @code{(list l0 l1
-
- @deftypefun SCM gh_car (SCM @var{obj})
- @deftypefunx SCM gh_cdr (SCM @var{obj})
--@dots{}
--
-+@deftypefunx SCM gh_c[ad][ad]r (SCM @var{obj})
-+@deftypefunx SCM gh_c[ad][ad][ad]r (SCM @var{obj})
- @deftypefunx SCM gh_c[ad][ad][ad][ad]r (SCM @var{obj})
- These correspond to the Scheme @code{(caadar ls)} procedures etc @dots{}
- @end deftypefun
---
-1.8.2.1
-
diff --git a/dev-scheme/guile/files/guile-1.8.8-os_dep.patch b/dev-scheme/guile/files/guile-1.8.8-os_dep.patch
deleted file mode 100644
index 9fab8da..0000000
--- a/dev-scheme/guile/files/guile-1.8.8-os_dep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/guile-1.8.8/libguile/gc_os_dep.c
-+++ b/guile-1.8.8/libguile/gc_os_dep.c
-@@ -1472,6 +1472,7 @@
- /* has the right declaration for glibc 2.1. */
- # include <sigcontext.h>
- # endif /* 0 == __GLIBC_MINOR__ */
-+# elif 1
- # else /* not 2 <= __GLIBC__ */
- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */
- /* one. Check LINUX_VERSION_CODE to see which we should reference. */
diff --git a/dev-scheme/guile/guile-1.8.8-r99.ebuild b/dev-scheme/guile/guile-1.8.8-r99.ebuild
deleted file mode 100644
index abfa46e..0000000
--- a/dev-scheme/guile/guile-1.8.8-r99.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile/guile-1.8.8-r1.ebuild,v 1.16 2013/04/24 22:53:08 pchrist Exp $
-
-EAPI=3
-inherit eutils autotools flag-o-matic elisp-common
-
-DESCRIPTION="Scheme interpreter"
-HOMEPAGE="http://www.gnu.org/software/guile/"
-SRC_URI="mirror://gnu/guile/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
-RESTRICT="!regex? ( test )"
-
-DEPEND="
- >=dev-libs/gmp-4.1
- >=sys-devel/libtool-1.5.6
- sys-devel/gettext
- emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
-# but there are lots of collisions. Most in /usr/share/libguile. Therefore
-# I'm slotting this in the same slot as guile-1.6* for now.
-SLOT="12"
-MAJOR="1.8"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
- "${FILESDIR}/${P}-gcc46.patch" \
- "${FILESDIR}/${P}-os_dep.patch" \
- "${FILESDIR}/${P}-makeinfo-5.patch"
- sed \
- -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
- -e "/AM_PROG_CC_STDC/d" \
- -i guile-readline/configure.in
- eautoreconf
-}
-
-src_configure() {
- # see bug #178499
- filter-flags -ftree-vectorize
-
- #will fail for me if posix is disabled or without modules -- hkBst
- econf \
- --disable-error-on-warning \
- --disable-static \
- --enable-posix \
- $(use_enable networking) \
- $(use_enable regex) \
- $(use deprecated || use_enable discouraged) \
- $(use_enable deprecated) \
- $(use_enable emacs elisp) \
- $(use_enable nls) \
- --disable-rpath \
- $(use_enable debug-freelist) \
- $(use_enable debug-malloc) \
- $(use_enable debug guile-debug) \
- $(use_with threads) \
- --with-modules \
- EMACS=no
-}
-
-src_compile() {
- emake || die "make failed"
-
- # Above we have disabled the build system's Emacs support;
- # for USE=emacs we compile (and install) the files manually
- if use emacs; then
- cd emacs
- elisp-compile *.el || die
- fi
-}
-
-src_install() {
- einstall || die "install failed"
-
- dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
-
- # texmacs needs this, closing bug #23493
- dodir /etc/env.d
- echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
-
- # necessary for registering slib, see bug 206896
- keepdir /usr/share/guile/site
-
- if use emacs; then
- elisp-install ${PN} emacs/*.{el,elc} || die
- elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
- fi
-}
-
-pkg_postinst() {
- [ "${EROOT}" == "/" ] && pkg_config
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
-
-pkg_config() {
- if has_version dev-scheme/slib; then
- einfo "Registering slib with guile"
- install_slib_for_guile
- fi
-}
-
-_pkg_prerm() {
- rm -f "${EROOT}"/usr/share/guile/site/slibcat
-}
diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
deleted file mode 100644
index a3d993d..0000000
--- a/dev-scheme/guile/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>scheme</herd>
- <longdescription lang="en">
-Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
- </longdescription>
- <use>
- <flag name='debug-freelist'>Include garbage collector freelist debugging
- code</flag>
- <flag name='debug-malloc'>Include malloc debugging code</flag>
- <flag name='deprecated'>Enable deprecated features</flag>
- <flag name='discouraged'> (implied by deprecated) enable merely discouraged
- features</flag>
- <flag name='networking'>Include networking interfaces</flag>
- <flag name='regex'> Include regular expression interfaces</flag>
- </use>
-</pkgmetadata>
diff --git a/dev-tex/luatex/files/jmpbuf.patch b/dev-tex/luatex/files/jmpbuf.patch
deleted file mode 100644
index ec8a41b..0000000
--- a/dev-tex/luatex/files/jmpbuf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua51/lcoco.c
-+++ b/luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua51/lcoco.c
-@@ -340,14 +340,14 @@
-
- #elif defined(__arm__) || defined(__ARM__)
-
--#if __GLIBC__ == 2 || defined(__UCLIBC__) /* arm-linux-glibc2 */
-+#if 1
- #ifndef __JMP_BUF_SP
- #define __JMP_BUF_SP ((sizeof(__jmp_buf)/sizeof(int))-2)
- #endif
- #define COCO_PATCHCTX(coco, buf, func, stack, a0) \
-- buf->__jmpbuf[__JMP_BUF_SP+1] = (int)(func); /* pc */ \
-- buf->__jmpbuf[__JMP_BUF_SP] = (int)(stack); /* sp */ \
-- buf->__jmpbuf[__JMP_BUF_SP-1] = 0; /* fp */ \
-+ ((__jmp_buf *)buf)[__JMP_BUF_SP+1] = (int)(func); /* pc */ \
-+ ((__jmp_buf *)buf)[__JMP_BUF_SP] = (int)(stack); /* sp */ \
-+ ((__jmp_buf *)buf)[__JMP_BUF_SP-1] = 0; /* fp */ \
- stack[0] = (size_t)(a0);
- #define COCO_STACKADJUST 2
- #define COCO_MAIN_PARAM int _a, int _b, int _c, int _d, lua_State *L
diff --git a/dev-tex/luatex/files/kpathsea2012.patch b/dev-tex/luatex/files/kpathsea2012.patch
deleted file mode 100644
index 80c356d..0000000
--- a/dev-tex/luatex/files/kpathsea2012.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From TeX Live svn rev 23421.
-Remove unnecessary headers. Fixes build with kpathsea from TeX Live 2012.
-
-
-Index: source/texk/web2c/luatexdir/luatex.c
-===================================================================
---- source/texk/web2c/luatexdir/luatex.c (revision 23420)
-+++ source/texk/web2c/luatexdir/luatex.c (revision 23421)
-@@ -32,7 +32,6 @@
- #include <kpathsea/readable.h>
- #include <kpathsea/variable.h>
- #include <kpathsea/absolute.h>
--#include <kpathsea/recorder.h>
- #ifdef WIN32
- #include <kpathsea/concatn.h>
- #endif
-Index: source/texk/web2c/lib/texmfmp.c
-===================================================================
---- source/texk/web2c/lib/texmfmp.c (revision 23420)
-+++ source/texk/web2c/lib/texmfmp.c (revision 23421)
-@@ -17,7 +17,6 @@
- #include <kpathsea/readable.h>
- #include <kpathsea/variable.h>
- #include <kpathsea/absolute.h>
--#include <kpathsea/recorder.h>
- #ifdef WIN32
- #include <kpathsea/concatn.h>
- #endif
diff --git a/dev-tex/luatex/files/poppler018.patch b/dev-tex/luatex/files/poppler018.patch
deleted file mode 100644
index d212538..0000000
--- a/dev-tex/luatex/files/poppler018.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-by Martin von Gagern
-https://bugs.gentoo.org/show_bug.cgi?id=384875
-http://thread.gmane.org/gmane.comp.tex.luatex/2630
-
---- luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
-+++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
-@@ -89,7 +89,6 @@ new_poppler_userdata(AnnotBorder);
- new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
--new_poppler_userdata(EmbFile);
- new_poppler_userdata(Dict);
- //new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
-@@ -393,7 +392,7 @@ static int m_Annot__gc(lua_State * L)
- printf("\n===== Annot GC ===== uin=<%p>\n", uin);
- #endif
- if (uin->atype == ALLOC_LEPDF)
-- delete(Annot *) uin->d;
-+ ((Annot *) uin->d)->decRefCnt();
- return 0;
- }
-
-@@ -408,34 +407,6 @@ static const struct luaL_Reg Annot_m[] =
- };
-
- //**********************************************************************
--// AnnotBorderStyle
--
--m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth);
--
--m_poppler__tostring(AnnotBorderStyle);
--
--static int m_Annots__gc(lua_State * L)
--{
-- udstruct *uin;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Annots);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
--#ifdef DEBUG
-- printf("\n===== Annots GC ===== uin=<%p>\n", uin);
--#endif
-- if (uin->atype == ALLOC_LEPDF)
-- delete(Annots *) uin->d;
-- return 0;
--}
--
--static const struct luaL_Reg AnnotBorderStyle_m[] = {
-- {"getWidth", m_AnnotBorderStyle_getWidth},
-- {"__tostring", m_AnnotBorderStyle__tostring},
-- {"__gc", m_Annots__gc},
-- {NULL, NULL} // sentinel
--};
--
--//**********************************************************************
- // Annots
-
- m_poppler_get_INT(Annots, getNumAnnots);
-@@ -683,31 +654,6 @@ static int m_Catalog_findDest(lua_State
-
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
--
--static int m_Catalog_embeddedFile(lua_State * L)
--{
-- EmbFile *ef;
-- int i, len;
-- udstruct *uin, *uout;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Catalog);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
-- i = luaL_checkint(L, 2);
-- len = ((Catalog *) uin->d)->numEmbeddedFiles();
-- if (i > 0 && i <= len) {
-- ef = ((Catalog *) uin->d)->embeddedFile(i - 1);
-- if (ef != NULL) {
-- uout = new_EmbFile_userdata(L);
-- uout->d = ef;
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-- } else
-- lua_pushnil(L);
-- } else
-- lua_pushnil(L);
-- return 1;
--}
--
- m_poppler_get_INT(Catalog, numJS);
-
- static int m_Catalog_getJS(lua_State * L)
-@@ -749,7 +695,6 @@ static const struct luaL_Reg Catalog_m[]
- {"findDest", m_Catalog_findDest},
- {"getDests", m_Catalog_getDests},
- {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles},
-- {"embeddedFile", m_Catalog_embeddedFile},
- {"numJS", m_Catalog_numJS},
- {"getJS", m_Catalog_getJS},
- {"getOutline", m_Catalog_getOutline},
-@@ -759,49 +704,6 @@ static const struct luaL_Reg Catalog_m[]
- };
-
- //**********************************************************************
--// EmbFile
--
--m_poppler_get_GOOSTRING(EmbFile, name);
--m_poppler_get_GOOSTRING(EmbFile, description);
--m_poppler_get_INT(EmbFile, size);
--m_poppler_get_GOOSTRING(EmbFile, modDate);
--m_poppler_get_GOOSTRING(EmbFile, createDate);
--m_poppler_get_GOOSTRING(EmbFile, checksum);
--m_poppler_get_GOOSTRING(EmbFile, mimeType);
--
--static int m_EmbFile_streamObject(lua_State * L)
--{
-- udstruct *uin, *uout;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_EmbFile);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
-- uout = new_Object_userdata(L);
-- uout->d = new Object(); // automatic init to type "none"
-- ((EmbFile *) uin->d)->streamObject().copy((Object *) uout->d);
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-- return 1;
--}
--
--m_poppler_get_BOOL(EmbFile, isOk);
--
--m_poppler__tostring(EmbFile);
--
--static const struct luaL_Reg EmbFile_m[] = {
-- {"name", m_EmbFile_name},
-- {"description", m_EmbFile_description},
-- {"size", m_EmbFile_size},
-- {"modDate", m_EmbFile_modDate},
-- {"createDate", m_EmbFile_createDate},
-- {"checksum", m_EmbFile_checksum},
-- {"mimeType", m_EmbFile_mimeType},
-- {"streamObject", m_EmbFile_streamObject},
-- {"isOk", m_EmbFile_isOk},
-- {"__tostring", m_EmbFile__tostring},
-- {NULL, NULL} // sentinel
--};
--
--//**********************************************************************
- // Dict
-
- static int m_Dict_incRef(lua_State * L)
-@@ -2683,11 +2585,9 @@ int luaopen_epdf(lua_State * L)
- {
- register_meta(Annot);
- // TODO register_meta(AnnotBorder);
-- register_meta(AnnotBorderStyle);
- register_meta(Annots);
- register_meta(Array);
- register_meta(Catalog);
-- register_meta(EmbFile);
- register_meta(Dict);
- register_meta(GooString);
- register_meta(LinkDest);
diff --git a/dev-tex/luatex/files/poppler020.patch b/dev-tex/luatex/files/poppler020.patch
deleted file mode 100644
index d3db830..0000000
--- a/dev-tex/luatex/files/poppler020.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=416545
-build with poppler-0.20 by Rafał Mużyło
-
---- source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 16:23:53.000000000 +0200
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc 2012-05-18 17:43:12.959843483 +0200
-@@ -151,7 +151,7 @@ static int l_new_Annot(lua_State * L)
- pdfdoc_changed_error(L);
- uout = new_Annot_userdata(L);
- uout->d =
-- new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
-+ new Annot(udict->pd->doc, (Dict *) udict->d,
- (Object *) uref->d);
- uout->atype = ALLOC_LEPDF;
- uout->pc = uxref->pc;
-@@ -173,7 +173,7 @@ static int l_new_Annots(lua_State * L)
- pdfdoc_changed_error(L);
- uout = new_Annots_userdata(L);
- uout->d =
-- new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
-+ new Annots(uannotsobj->pd->doc,
- (Object *) uannotsobj->d);
- uout->atype = ALLOC_LEPDF;
- uout->pc = uxref->pc;
-@@ -363,7 +363,7 @@ static int m_##type##__tostring(lua_Stat
- // Annot
-
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearance);
-+m_poppler_get_OBJECT(Annot, getAppearanceResDict);
- m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
-
- static int m_Annot_match(lua_State * L)
-@@ -398,7 +398,7 @@ static int m_Annot__gc(lua_State * L)
-
- static const struct luaL_Reg Annot_m[] = {
- {"isOk", m_Annot_isOk},
-- {"getAppearance", m_Annot_getAppearance},
-+ {"getAppearanceResDict", m_Annot_getAppearanceResDict},
- {"getBorder", m_Annot_getBorder},
- {"match", m_Annot_match},
- {"__tostring", m_Annot__tostring},
-@@ -1249,7 +1249,7 @@ static int m_Object_getType(lua_State *
-
- static int m_Object_getTypeName(lua_State * L)
- {
-- char *s;
-+ const char *s;
- udstruct *uin;
- uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -1936,7 +1936,7 @@ static int m_Page_getLinks(lua_State * L
- if ((uin->pd != NULL && uin->pd->pc != uin->pc)
- || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
- pdfdoc_changed_error(L);
-- links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
-+ links = ((Page *) uin->d)->getLinks();
- if (links != NULL) {
- uout = new_Links_userdata(L);
- uout->d = links;
-@@ -2531,7 +2531,6 @@ m_poppler_get_INT(XRef, getNumObjects);
- m_poppler_get_INT(XRef, getRootNum);
- m_poppler_get_INT(XRef, getRootGen);
- // getStreamEnd
--m_poppler_get_INT(XRef, getSize);
- // getEntry
- m_poppler_get_poppler(XRef, Object, getTrailerDict);
-
-@@ -2558,7 +2557,6 @@ static const struct luaL_Reg XRef_m[] =
- {"getRootNum", m_XRef_getRootNum},
- {"getRootGen", m_XRef_getRootGen},
- //
-- {"getSize", m_XRef_getSize},
- {"getTrailerDict", m_XRef_getTrailerDict},
- {"__tostring", m_XRef__tostring},
- {NULL, NULL} // sentinel
diff --git a/dev-tex/luatex/files/poppler022.patch b/dev-tex/luatex/files/poppler022.patch
deleted file mode 100644
index 223cbcb..0000000
--- a/dev-tex/luatex/files/poppler022.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-Patch updating lepdflib.cc to upstream revision 4415, which basically removes
-part of the exported interface and thereby circumvents the changes in
-poppler-0.20 -> 0.22. Experimental, rebased on our existing Gentoo patches
-poppler-0.18.patch and poppler-0.20.patch. Here to solve bug 449538.
-
-diff -ruN luatex-beta-0.70.1.gentoo/source/texk/web2c/luatexdir/lua/lepdflib.cc
-luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- luatex-beta-0.70.1.gentoo/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:31:22.000000000 +0100
-+++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:47:24.000000000 +0100
-@@ -1,7 +1,7 @@
- /* lepdflib.cc
-
-- Copyright 2009-2011 Taco Hoekwater <taco@luatex.org>
-- Copyright 2009-2011 Hartmut Henkel <hartmut@luatex.org>
-+ Copyright 2009-2012 Taco Hoekwater <taco@luatex.org>
-+ Copyright 2009-2012 Hartmut Henkel <hartmut@luatex.org>
-
- This file is part of LuaTeX.
-
-@@ -49,15 +49,13 @@
- //**********************************************************************
-
- #define M_Annot "Annot"
--#define M_AnnotBorder "AnnotBorder"
--#define M_AnnotBorderStyle "AnnotBorderStyle"
- #define M_Annots "Annots"
- #define M_Array "Array"
- #define M_Catalog "Catalog"
--#define M_EmbFile "EmbFile"
- #define M_Dict "Dict"
- #define M_GooString "GooString"
- #define M_LinkDest "LinkDest"
-+#define M_Link "Link"
- #define M_Links "Links"
- #define M_Object "Object"
- #define M_Page "Page"
-@@ -65,8 +63,8 @@
- #define M_PDFRectangle "PDFRectangle"
- #define M_Ref "Ref"
- #define M_Stream "Stream"
--#define M_XRef "XRef"
- #define M_XRefEntry "XRefEntry"
-+#define M_XRef "XRef"
-
- //**********************************************************************
-
-@@ -84,13 +82,9 @@
- new_poppler_userdata(PDFDoc);
-
- new_poppler_userdata(Annot);
--new_poppler_userdata(AnnotBorder);
--//new_poppler_userdata(AnnotBorderStyle);
--new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
- new_poppler_userdata(Dict);
--//new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
- new_poppler_userdata(Links);
- new_poppler_userdata(Object);
-@@ -99,7 +93,6 @@
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
- new_poppler_userdata(XRef);
--//new_poppler_userdata(XRefEntry);
-
- //**********************************************************************
-
-@@ -134,53 +127,6 @@
- return 1; // doc path
- }
-
--static int l_new_Annot(lua_State * L)
--{
-- udstruct *uxref, *udict, *ucatalog, *uref, *uout;
-- uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-- udict = (udstruct *) luaL_checkudata(L, 2, M_Dict);
-- ucatalog = (udstruct *) luaL_checkudata(L, 3, M_Catalog);
-- uref = (udstruct *) luaL_checkudata(L, 4, M_Ref);
-- if (uxref->pd != ucatalog->pd || uxref->pd != udict->pd
-- || uxref->pd != uref->pd)
-- pdfdoc_differs_error(L);
-- if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc) ||
-- (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc) ||
-- (udict->pd != NULL && udict->pd->pc != udict->pc) ||
-- (uref->pd != NULL && uref->pd->pc != uref->pc))
-- pdfdoc_changed_error(L);
-- uout = new_Annot_userdata(L);
-- uout->d =
-- new Annot(udict->pd->doc, (Dict *) udict->d,
-- (Object *) uref->d);
-- uout->atype = ALLOC_LEPDF;
-- uout->pc = uxref->pc;
-- uout->pd = uxref->pd;
-- return 1;
--}
--
--static int l_new_Annots(lua_State * L)
--{
-- udstruct *uxref, *ucatalog, *uannotsobj, *uout;
-- uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-- ucatalog = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
-- uannotsobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
-- if (uxref->pd != ucatalog->pd || uxref->pd != uannotsobj->pd)
-- pdfdoc_differs_error(L);
-- if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc)
-- || (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc)
-- || (uannotsobj->pd != NULL && uannotsobj->pd->pc != uannotsobj->pc))
-- pdfdoc_changed_error(L);
-- uout = new_Annots_userdata(L);
-- uout->d =
-- new Annots(uannotsobj->pd->doc,
-- (Object *) uannotsobj->d);
-- uout->atype = ALLOC_LEPDF;
-- uout->pc = uxref->pc;
-- uout->pd = uxref->pd;
-- return 1;
--}
--
- static int l_new_Array(lua_State * L)
- {
- udstruct *uxref, *uout;
-@@ -235,8 +181,6 @@
-
- static const struct luaL_Reg epdflib[] = {
- {"open", l_open_PDFDoc},
-- {"Annot", l_new_Annot},
-- {"Annots", l_new_Annots},
- {"Array", l_new_Array},
- {"Dict", l_new_Dict},
- {"Object", l_new_Object},
-@@ -359,12 +303,26 @@
- return 1; \
- }
-
-+#define m_poppler_check_string(in, function) \
-+static int m_##in##_##function(lua_State * L) \
-+{ \
-+ const char *s; \
-+ udstruct *uin; \
-+ uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
-+ if (uin->pd != NULL && uin->pd->pc != uin->pc) \
-+ pdfdoc_changed_error(L); \
-+ s = luaL_checkstring(L, 2); \
-+ if (((in *) uin->d)->function((char *) s)) \
-+ lua_pushboolean(L, 1); \
-+ else \
-+ lua_pushboolean(L, 0); \
-+ return 1; \
-+}
-+
- //**********************************************************************
- // Annot
-
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearanceResDict);
--m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
-
- static int m_Annot_match(lua_State * L)
- {
-@@ -398,8 +356,6 @@
-
- static const struct luaL_Reg Annot_m[] = {
- {"isOk", m_Annot_isOk},
-- {"getAppearanceResDict", m_Annot_getAppearanceResDict},
-- {"getBorder", m_Annot_getBorder},
- {"match", m_Annot_match},
- {"__tostring", m_Annot__tostring},
- {"__gc", m_Annot__gc},
-@@ -654,6 +610,7 @@
-
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
-+
- m_poppler_get_INT(Catalog, numJS);
-
- static int m_Catalog_getJS(lua_State * L)
-@@ -770,20 +727,7 @@
- return 0;
- }
-
--static int m_Dict_is(lua_State * L)
--{
-- const char *s;
-- udstruct *uin;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
-- if (uin->pd != NULL && uin->pd->pc != uin->pc)
-- pdfdoc_changed_error(L);
-- s = luaL_checkstring(L, 2);
-- if (((Dict *) uin->d)->is((char *) s))
-- lua_pushboolean(L, 1);
-- else
-- lua_pushboolean(L, 0);
-- return 1;
--}
-+m_poppler_check_string(Dict, is);
-
- static int m_Dict_lookup(lua_State * L)
- {
-@@ -894,6 +838,8 @@
- return 1;
- }
-
-+m_poppler_check_string(Dict, hasKey);
-+
- m_poppler__tostring(Dict);
-
- static const struct luaL_Reg Dict_m[] = {
-@@ -910,6 +856,7 @@
- {"getKey", m_Dict_getKey},
- {"getVal", m_Dict_getVal},
- {"getValNF", m_Dict_getValNF},
-+ {"hasKey", m_Dict_hasKey},
- {"__tostring", m_Dict__tostring},
- {NULL, NULL} // sentinel
- };
-@@ -1017,9 +964,13 @@
- //**********************************************************************
- // Links
-
-+m_poppler_get_INT(Links, getNumLinks);
-+
- m_poppler__tostring(Links);
-
- static const struct luaL_Reg Links_m[] = {
-+ {"getNumLinks", m_Links_getNumLinks},
-+ //{"getLink", m_Links_getLink},
- {"__tostring", m_Links__tostring},
- {NULL, NULL} // sentinel
- };
-@@ -1925,28 +1876,6 @@
- m_poppler_get_poppler(Page, Dict, getResourceDict);
- m_poppler_get_OBJECT(Page, getAnnots);
-
--static int m_Page_getLinks(lua_State * L)
--{
-- Links *links;
-- udstruct *uin, *ucat, *uout;
-- uin = (udstruct *) luaL_checkudata(L, 1, M_Page);
-- ucat = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
-- if (uin->pd != NULL && ucat->pd != NULL && uin->pd != ucat->pd)
-- pdfdoc_differs_error(L);
-- if ((uin->pd != NULL && uin->pd->pc != uin->pc)
-- || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
-- pdfdoc_changed_error(L);
-- links = ((Page *) uin->d)->getLinks();
-- if (links != NULL) {
-- uout = new_Links_userdata(L);
-- uout->d = links;
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-- } else
-- lua_pushnil(L);
-- return 1;
--}
--
- m_poppler_get_OBJECT(Page, getContents);
-
- m_poppler__tostring(Page);
-@@ -1973,7 +1902,6 @@
- {"getSeparationInfo", m_Page_getSeparationInfo},
- {"getResourceDict", m_Page_getResourceDict},
- {"getAnnots", m_Page_getAnnots},
-- {"getLinks", m_Page_getLinks},
- {"getContents", m_Page_getContents},
- {"__tostring", m_Page__tostring},
- {NULL, NULL} // sentinel
-@@ -2158,19 +2086,23 @@
-
- static int m_PDFDoc_getLinks(lua_State * L)
- {
-- int i;
-+ int i, pages;
- Links *links;
- udstruct *uin, *uout;
- uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
- if (uin->pd != NULL && uin->pd->pc != uin->pc)
- pdfdoc_changed_error(L);
- i = luaL_checkint(L, 2);
-- links = ((PdfDocument *) uin->d)->doc->getLinks(i);
-- if (links != NULL) {
-- uout = new_Links_userdata(L);
-- uout->d = links;
-- uout->pc = uin->pc;
-- uout->pd = uin->pd;
-+ pages = ((PdfDocument *) uin->d)->doc->getNumPages();
-+ if (i > 0 && i <= pages) {
-+ links = ((PdfDocument *) uin->d)->doc->getLinks(i);
-+ if (links != NULL) {
-+ uout = new_Links_userdata(L);
-+ uout->d = links;
-+ uout->pc = uin->pc;
-+ uout->pd = uin->pd;
-+ } else
-+ lua_pushnil(L);
- } else
- lua_pushnil(L);
- return 1;
-@@ -2249,6 +2181,8 @@
- m_PDFDoc_INT(getPDFMajorVersion);
- m_PDFDoc_INT(getPDFMinorVersion);
-
-+m_poppler__tostring(PDFDoc);
-+
- static int m_PDFDoc__gc(lua_State * L)
- {
- udstruct *uin;
-@@ -2292,6 +2226,7 @@
- {"getDocInfoNF", m_PDFDoc_getDocInfoNF},
- {"getPDFMajorVersion", m_PDFDoc_getPDFMajorVersion},
- {"getPDFMinorVersion", m_PDFDoc_getPDFMinorVersion},
-+ {"__tostring", m_PDFDoc__tostring},
- {"__gc", m_PDFDoc__gc}, // finalizer
- {NULL, NULL} // sentinel
- };
-@@ -2437,11 +2372,6 @@
- "Flate", "JBIG2", "JPX", "Weird", NULL
- };
-
--#if 0
--static const char *StreamColorSpaceModeNames[] =
-- { "CSNone", "CSDeviceGray", "CSDeviceRGB", "CSDeviceCMYK", NULL };
--#endif
--
- m_poppler_get_INT(Stream, getKind);
-
- static int m_Stream_getKindName(lua_State * L)
-@@ -2527,11 +2457,26 @@
- m_poppler_get_OBJECT(XRef, getDocInfo);
- m_poppler_get_OBJECT(XRef, getDocInfoNF);
- m_poppler_get_INT(XRef, getNumObjects);
--// getLastXRefPos
- m_poppler_get_INT(XRef, getRootNum);
- m_poppler_get_INT(XRef, getRootGen);
- // getStreamEnd
--// getEntry
-+
-+static int m_XRef_getNumEntry(lua_State * L)
-+{
-+ int i, offset;
-+ udstruct *uin;
-+ uin = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-+ if (uin->pd != NULL && uin->pd->pc != uin->pc)
-+ pdfdoc_changed_error(L);
-+ offset = luaL_checkint(L, 2);
-+ i = ((XRef *) uin->d)->getNumEntry(offset);
-+ if (i >= 0)
-+ lua_pushinteger(L, i);
-+ else
-+ lua_pushnil(L);
-+ return 1;
-+}
-+
- m_poppler_get_poppler(XRef, Object, getTrailerDict);
-
- m_poppler__tostring(XRef);
-@@ -2553,10 +2498,10 @@
- {"getDocInfo", m_XRef_getDocInfo},
- {"getDocInfoNF", m_XRef_getDocInfoNF},
- {"getNumObjects", m_XRef_getNumObjects},
-- //
- {"getRootNum", m_XRef_getRootNum},
- {"getRootGen", m_XRef_getRootGen},
-- //
-+ // {"getStreamEnd", m_XRef_getStreamEnd},
-+ {"getNumEntry", m_XRef_getNumEntry},
- {"getTrailerDict", m_XRef_getTrailerDict},
- {"__tostring", m_XRef__tostring},
- {NULL, NULL} // sentinel
-@@ -2565,7 +2510,10 @@
- //**********************************************************************
- // XRefEntry
-
-+m_poppler__tostring(XRefEntry);
-+
- static const struct luaL_Reg XRefEntry_m[] = {
-+ {"__tostring", m_XRefEntry__tostring},
- {NULL, NULL} // sentinel
- };
-
-@@ -2582,7 +2530,6 @@
- int luaopen_epdf(lua_State * L)
- {
- register_meta(Annot);
-- // TODO register_meta(AnnotBorder);
- register_meta(Annots);
- register_meta(Array);
- register_meta(Catalog);
diff --git a/dev-tex/luatex/files/remove-zlib-version-check.patch b/dev-tex/luatex/files/remove-zlib-version-check.patch
deleted file mode 100644
index 9850850..0000000
--- a/dev-tex/luatex/files/remove-zlib-version-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Let soname dictate the ABI and do not check for minor/micro which requires
-needless rebuilds after every zlib update. By Ulrich Müller.
-
-https://bugs.gentoo.org/show_bug.cgi?id=310487
-http://www.ntg.nl/pipermail/dev-luatex/2012-July/004534.html
-
---- luatex-beta-0.70.1-orig/source/texk/web2c/luatexdir/luazlib/lzlib.c
-+++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/luazlib/lzlib.c
-@@ -549,14 +549,6 @@
-
- /* ====================================================================== */
-
-- /* make sure header and library version are consistent */
-- const char* version = zlibVersion();
-- if (strncmp(version, ZLIB_VERSION, 5))
-- {
-- lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
-- lua_error(L);
-- }
--
- /* create new metatable for zlib compression structures */
- luaL_newmetatable(L, ZSTREAMMETA);
- lua_pushliteral(L, "__index");
diff --git a/dev-tex/luatex/luatex-0.70.1-r99.ebuild b/dev-tex/luatex/luatex-0.70.1-r99.ebuild
deleted file mode 100644
index ae45473..0000000
--- a/dev-tex/luatex/luatex-0.70.1-r99.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/luatex/luatex-0.70.1-r2.ebuild,v 1.12 2013/08/14 11:24:49 patrick Exp $
-
-EAPI=5
-
-inherit libtool eutils texlive-common
-
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language."
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${PV}.tar.bz2
- http://foundry.supelec.fr/gf/download/frsrelease/392/1732/${PN}-beta-${PV}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
- >=media-libs/libpng-1.4
- app-text/poppler:=[xpdf-headers(+)]
- sys-libs/zlib
- >=dev-libs/kpathsea-6.0.1_p20110627"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-beta-${PV}/source"
-PRELIBS="libs/obsdcompat"
-#texk/kpathsea"
-#kpathsea_extraconf="--disable-shared --disable-largefile"
-
-src_prepare() {
- has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
- has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
- has_version '>=app-text/poppler-0.22.0:0' && epatch "${FILESDIR}/poppler022.patch"
- epatch "${FILESDIR}/kpathsea2012.patch" \
- "${FILESDIR}/remove-zlib-version-check.patch" \
- "${FILESDIR}/jmpbuf.patch"
- S="${S}/build-aux" elibtoolize --shallow
-}
-
-src_configure() {
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #244619
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
-
- local myconf
- myconf=""
- #has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
-
- cd "${S}/texk/web2c"
- econf \
- --disable-cxx-runtime-hack \
- --disable-all-pkgs \
- --disable-mp \
- --disable-ptex \
- --disable-tex \
- --disable-mf \
- --disable-largefile \
- --disable-ipc \
- --disable-shared \
- --enable-luatex \
- --enable-dump-share \
- --without-mf-x-toolkit \
- --without-x \
- --with-system-kpathsea \
- --with-kpathsea-includes="${EPREFIX}"/usr/include \
- --with-system-gd \
- --with-system-libpng \
- --with-system-teckit \
- --with-system-zlib \
- --with-system-t1lib \
- --with-system-xpdf \
- --with-system-poppler \
- --with-system-zziplib \
- --disable-multiplatform
-
- for i in ${PRELIBS} ; do
- einfo "Configuring $i"
- local j=$(basename $i)_extraconf
- local myconf
- eval myconf=\${$j}
- cd "${S}/${i}"
- econf ${myconf}
- done
-}
-
-src_compile() {
- texk/web2c/luatexdir/getluatexsvnversion.sh || die
- for i in ${PRELIBS} ; do
- cd "${S}/${i}"
- emake || die "failed to build ${i}"
- done
- cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
- emake luatex || die "failed to build luatex"
-}
-
-src_install() {
- cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
- emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
- install-exec-am || die
-
- dodoc "${WORKDIR}/${PN}-beta-${PV}/README" || die
- doman "${WORKDIR}/texmf/doc/man/man1/"*.1 || die
- if use doc ; then
- dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf || die
- dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf || die
- fi
-}
-
-pkg_postinst() {
- if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
- elog "Note that this package does not install many files, mainly just the"
- elog "${PN} executable, which needs other files in order to be"
- elog "useful. Please consider installing a recent TeX distribution such as"
- elog "TeX Live 2008 or later to take advantage of the full power of"
- elog "${PN} ."
- fi
- efmtutil-sys
-}
diff --git a/dev-tex/luatex/metadata.xml b/dev-tex/luatex/metadata.xml
deleted file mode 100644
index 1d2fc95..0000000
--- a/dev-tex/luatex/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>tex</herd>
-<longdescription lang="en">
-An experimental pdfTeX extension that is to eventually
-become its successor. It is developed by a subset of the
-current pdfTeX team.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/strace/files/strace-4.8-musl.patch b/dev-util/strace/files/strace-4.8-musl.patch
deleted file mode 100644
index ac9cf56..0000000
--- a/dev-util/strace/files/strace-4.8-musl.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-taken from sabotage linux
-diff -ru strace-4.8.orig/defs.h strace-4.8/defs.h
---- strace-4.8.orig/defs.h 2013-05-14 14:10:42.000000000 +0000
-+++ strace-4.8/defs.h 2013-09-20 14:30:38.785856744 +0000
-@@ -155,7 +155,7 @@
- || defined(METAG) \
- || defined(TILE) \
- || defined(XTENSA) \
-- ) && defined(__GLIBC__)
-+ ) && defined(__linux__)
- # include <sys/ptrace.h>
- #else
- /* Work around awkward prototype in ptrace.h. */
-@@ -222,7 +222,7 @@
- # define PTRACE_EVENT_EXIT 6
- #endif
-
--#if !defined(__GLIBC__)
-+#if !defined(__GLIBC__) && !defined(PTRACE_PEEKUSER)
- # define PTRACE_PEEKUSER PTRACE_PEEKUSR
- # define PTRACE_POKEUSER PTRACE_POKEUSR
- #endif
-diff -ru strace-4.8.orig/desc.c strace-4.8/desc.c
---- strace-4.8.orig/desc.c 2013-05-01 22:39:10.000000000 +0000
-+++ strace-4.8/desc.c 2013-09-20 14:30:38.795856744 +0000
-@@ -299,7 +299,7 @@
- #ifdef X32
- tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len);
- #else
-- tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
-+ tprintf(", start=%ld, len=%ld", (long) fl.l_start, (long) fl.l_len);
- #endif
- if (getlk)
- tprintf(", pid=%lu}", (unsigned long) fl.l_pid);
-diff -ru strace-4.8.orig/file.c strace-4.8/file.c
---- strace-4.8.orig/file.c 2013-05-06 18:23:01.000000000 +0000
-+++ strace-4.8/file.c 2013-09-20 14:30:38.795856744 +0000
-@@ -632,7 +632,7 @@
- return 0;
- }
-
--#if _LFS64_LARGEFILE
-+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T
- int
- sys_truncate64(struct tcb *tcp)
- {
-@@ -654,7 +654,7 @@
- return 0;
- }
-
--#if _LFS64_LARGEFILE
-+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T
- int
- sys_ftruncate64(struct tcb *tcp)
- {
-@@ -2322,7 +2322,7 @@
- return 0;
- }
-
--#if _LFS64_LARGEFILE
-+#if defined _LFS64_LARGEFILE || defined HAVE_LONG_LONG_OFF_T
- int
- sys_getdents64(struct tcb *tcp)
- {
-diff -ru strace-4.8.orig/net.c strace-4.8/net.c
---- strace-4.8.orig/net.c 2013-05-17 22:20:02.000000000 +0000
-+++ strace-4.8/net.c 2013-09-20 14:30:38.805856744 +0000
-@@ -95,12 +95,14 @@
- #endif
-
- /* Under Linux these are enums so we can't test for them with ifdef. */
-+#if !defined(IPPROTO_MAX)
- #define IPPROTO_EGP IPPROTO_EGP
- #define IPPROTO_PUP IPPROTO_PUP
- #define IPPROTO_IDP IPPROTO_IDP
- #define IPPROTO_IGMP IPPROTO_IGMP
- #define IPPROTO_RAW IPPROTO_RAW
- #define IPPROTO_MAX IPPROTO_MAX
-+#endif
-
- static const struct xlat domains[] = {
- #ifdef PF_UNSPEC
-diff -ru strace-4.8.orig/process.c strace-4.8/process.c
---- strace-4.8.orig/process.c 2013-05-17 22:22:19.000000000 +0000
-+++ strace-4.8/process.c 2013-09-20 14:30:38.805856744 +0000
-@@ -2857,7 +2857,7 @@
- if (umove(tcp, tcp->u_arg[2], &p) < 0)
- tprintf(", %#lx", tcp->u_arg[2]);
- else
-- tprintf(", { %d }", p.__sched_priority);
-+ tprintf(", { %d }", p.sched_priority);
- }
- return 0;
- }
-@@ -2872,7 +2872,7 @@
- if (umove(tcp, tcp->u_arg[1], &p) < 0)
- tprintf("%#lx", tcp->u_arg[1]);
- else
-- tprintf("{ %d }", p.__sched_priority);
-+ tprintf("{ %d }", p.sched_priority);
- }
- return 0;
- }
-@@ -2885,7 +2885,7 @@
- if (umove(tcp, tcp->u_arg[1], &p) < 0)
- tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
- else
-- tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority);
-+ tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
- }
- return 0;
- }
-diff -ru strace-4.8.orig/signal.c strace-4.8/signal.c
---- strace-4.8.orig/signal.c 2013-05-23 13:41:23.000000000 +0000
-+++ strace-4.8/signal.c 2013-09-20 14:30:38.815856744 +0000
-@@ -59,6 +59,7 @@
- #ifdef IA64
- # include <asm/ptrace_offsets.h>
- #endif
-+#include <asm/ptrace.h>
-
- #if defined(SPARC) || defined(SPARC64) || defined(MIPS)
- typedef struct {
-diff -ru strace-4.8.orig/strace.c strace-4.8/strace.c
---- strace-4.8.orig/strace.c 2013-05-28 21:49:16.000000000 +0000
-+++ strace-4.8/strace.c 2013-09-20 14:30:38.815856744 +0000
-@@ -506,7 +506,7 @@
- perror_msg_and_die("dup2");
- close(fds[0]);
- }
-- execl(_PATH_BSHELL, "sh", "-c", command, NULL);
-+ execl(_PATH_BSHELL, "sh", "-c", command, (void*) 0);
- perror_msg_and_die("Can't execute '%s'", _PATH_BSHELL);
- }
-
-diff -ru strace-4.8.orig/syscall.c strace-4.8/syscall.c
---- strace-4.8.orig/syscall.c 2013-05-14 14:10:42.000000000 +0000
-+++ strace-4.8/syscall.c 2013-09-20 14:30:38.825856744 +0000
-@@ -72,13 +72,7 @@
- # include <elf.h>
- #endif
-
--#if defined(AARCH64)
--# include <asm/ptrace.h>
--#endif
--
--#if defined(XTENSA)
--# include <asm/ptrace.h>
--#endif
-+#include <asm/ptrace.h>
-
- #ifndef ERESTARTSYS
- # define ERESTARTSYS 512
-diff -ru strace-4.8.orig/time.c strace-4.8/time.c
---- strace-4.8.orig/time.c 2012-05-01 21:17:51.000000000 +0000
-+++ strace-4.8/time.c 2013-09-20 14:32:49.165856719 +0000
-@@ -774,7 +774,11 @@
- /* _pad[0] is the _tid field which might not be
- present in the userlevel definition of the
- struct. */
-+#if defined(__GLIBC__)
- tprintf("{%d}", sev._sigev_un._pad[0]);
-+#else
-+ tprintf("{%d}", (int) sev.__pad[0]);
-+#endif
- else if (sev.sigev_notify == SIGEV_THREAD)
- tprintf("{%p, %p}", sev.sigev_notify_function,
- sev.sigev_notify_attributes);
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
deleted file mode 100644
index 3134acb..0000000
--- a/dev-util/strace/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <use>
- <flag name="aio">
- Enable <pkg>dev-libs/libaio</pkg> support for tracing Asynchronous I/O operations
- </flag>
- </use>
-</pkgmetadata>
diff --git a/dev-util/strace/strace-4.8-r99.ebuild b/dev-util/strace/strace-4.8-r99.ebuild
deleted file mode 100644
index 2d1c745..0000000
--- a/dev-util/strace/strace-4.8-r99.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.8.ebuild,v 1.5 2014/02/20 13:36:59 jer Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://strace.git.sourceforge.net/gitroot/strace/strace"
- inherit git-2 autotools
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="http://sourceforge.net/projects/strace/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio +perl static"
-
-# strace only uses the header from libaio to decode structs
-DEPEND="aio? ( >=dev-libs/libaio-0.3.106 )
- sys-kernel/linux-headers"
-RDEPEND=""
-
-src_prepare() {
- if epatch_user || [[ ! -e configure ]] ; then
- # git generation
- eautoreconf
- [[ ! -e CREDITS ]] && cp CREDITS{.in,}
- fi
-
- epatch ${FILESDIR}/${P}-musl.patch
- export ac_cv_have_long_long_off_t=yes
-
- filter-lfs-flags # configure handles this sanely
- use static && append-ldflags -static
-
- export ac_cv_header_libaio_h=$(usex aio)
-}
-
-src_install() {
- default
- use perl || rm "${ED}"/usr/bin/strace-graph
- dodoc CREDITS
-}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r99.ebuild b/dev-vcs/cvs/cvs-1.12.12-r99.ebuild
deleted file mode 100644
index 955a67a..0000000
--- a/dev-vcs/cvs/cvs-1.12.12-r99.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs/cvs-1.12.12-r6.ebuild,v 1.4 2014/01/19 10:30:16 vapier Exp $
-
-inherit eutils pam toolchain-funcs
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="http://www.nongnu.org/cvs/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
- doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
- mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
- mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-
-IUSE="crypt doc kerberos nls pam server"
-
-DEPEND=">=sys-libs/zlib-1.1.4
- kerberos? ( virtual/krb5 )
- pam? ( virtual/pam )"
-
-src_unpack() {
- unpack ${P}.tar.bz2
- use doc && unpack cederqvist-${PV}.html.tar.bz2
- EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-cvsbug-tmpfix.patch
- epatch "${FILESDIR}"/${P}-openat.patch
- EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${P}-block-requests.patch
- cd "${S}"
- epatch "${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
- epatch "${FILESDIR}"/${P}-install-sh.patch
- epatch "${FILESDIR}"/${P}-regex.patch
- epatch "${FILESDIR}"/${P}-mktime-x32.patch # 395641
- use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
-}
-
-src_compile() {
- if tc-is-cross-compiler ; then
- # Sane defaults when cross-compiling (as these tests want to
- # try and execute code).
- export cvs_cv_func_printf_ptr="yes"
- fi
- econf \
- --with-external-zlib \
- --with-tmpdir=/tmp \
- $(use_enable crypt encryption) \
- $(use_with kerberos gssapi) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable server) \
- || die
- emake || die "emake failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver || die "newins failed"
-
- dodoc BUGS ChangeLog* DEVEL* FAQ HACKING \
- MINOR* NEWS PROJECTS README* TESTS TODO
-
- # Not installed into emacs site-lisp because it clobbers the normal C
- # indentations.
- dodoc cvs-format.el || die "dodoc failed"
-
- use server && newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
-
- if use doc; then
- dodoc "${DISTDIR}"/cederqvist-${PV}.pdf
- dodoc "${DISTDIR}"/cederqvist-${PV}.ps
- tar xjf "${DISTDIR}"/cederqvist-${PV}.html.tar.bz2
- dohtml -r cederqvist-${PV}.html/*
- cd "${D}"/usr/share/doc/${PF}/html/
- ln -s cvs.html index.html
- fi
-
- newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-}
-
-src_test() {
- einfo "FEATURES=\"maketest\" has been disabled for dev-vcs/cvs"
-}
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch b/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch
deleted file mode 100644
index 9c9b49d..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-block-requests.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-Author: Robin H. Johnson <robbat2@gentoo.org>
-Date: 2006-08-09
-
-This patch allows a CVS server to deny usage of specific commands, based on
-input in the environment.
-
-Just set the CVS_BLOCK_REQUESTS env var with all of the commands you want,
-seperated by spaces. Eg:
-CVS_BLOCK_REQUESTS="Gzip-stream gzip-file-contents"
-would block ALL usage of compression.
-
-Please see the array 'struct request requests[]' in src/server.c for a full
-list of commands.
-
-Please note that if you block any commands marked as RQ_ESSENTIAL, CVS clients
-may fail! (This includes 'ci'!).
-
-See the companion cvs-custom.c for a wrapper that can enforce the environment variable for pserver setups.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' -U 10 cvs-1.12.12.orig/src/server.c cvs-1.12.12/src/server.c
---- cvs-1.12.12.orig/src/server.c 2005-04-14 14:13:29.000000000 +0000
-+++ cvs-1.12.12/src/server.c 2006-08-09 01:40:44.000000000 +0000
-@@ -5836,43 +5836,90 @@
- #undef REQ_LINE
- };
- #endif /* SERVER_SUPPORT or CLIENT_SUPPORT */
-
-
-
- #ifdef SERVER_SUPPORT
- /*
- * This server request is not ignored by the secondary.
- */
-+
-+/* Hack by Robin H. Johnson <robbat2@gentoo.org>.
-+ * Allow the server ENV to specify what request types are to be ignored.
-+ */
-+
-+static char blocked_requests[BUFSIZ] = " ";
-+
-+static void build_blocked_requests() {
-+ char *tmp = getenv("CVS_BLOCK_REQUESTS");
-+
-+ if (tmp != NULL && strlen(tmp) > 0) {
-+ // move to our custom buffer
-+ strncat(blocked_requests, tmp, sizeof(blocked_requests)-strlen(blocked_requests));
-+ //add a space on the end as well for searching
-+ strncat(blocked_requests, " ", sizeof(blocked_requests)-strlen(blocked_requests));
-+ }
-+
-+ // now blocked_requests contains the list of every request that we do not
-+ // want to serve
-+}
-+
-+// returns 0 if we should serve this request
-+// use as if(checker(FOO)) continue;
-+static int serve_valid_requests_checker(char *reqname) {
-+ char needle[BUFSIZ] = " ";
-+ char *tmp;
-+
-+ if(!blocked_requests || strlen(blocked_requests) < 2)
-+ return 0;
-+
-+ // we want to look for ' 'reqname' '
-+ snprintf(needle, sizeof(needle), " %s ", reqname);
-+
-+ // now do the search
-+ tmp = strstr(blocked_requests, needle);
-+
-+ if (tmp != NULL)
-+ return 1;
-+
-+ return 0;
-+
-+}
-+
- static void
- serve_valid_requests (char *arg)
- {
- struct request *rq;
-
- /* Since this is processed in the first pass, don't reprocess it in the
- * second.
- *
- * We still print errors since new errors could have been generated in the
- * second pass.
- */
- if (print_pending_error ()
- #ifdef PROXY_SUPPORT
- || reprocessing
- #endif /* PROXY_SUPPORT */
- )
- return;
-+
-+ build_blocked_requests();
-
- buf_output0 (buf_to_net, "Valid-requests");
- for (rq = requests; rq->name != NULL; rq++)
- {
- if (rq->func != NULL)
- {
-+ if(serve_valid_requests_checker(rq->name))
-+ continue;
- buf_append_char (buf_to_net, ' ');
- buf_output0 (buf_to_net, rq->name);
- }
- }
- buf_output0 (buf_to_net, "\nok\n");
-
- /* The client is waiting for the list of valid requests, so we
- must send the output now. */
- buf_flush (buf_to_net, 1);
- }
-@@ -6353,20 +6400,24 @@
- cmd += len;
- else if (cmd[len] == ' ')
- cmd += len + 1;
- else
- /*
- * The first len characters match, but it's a different
- * command. e.g. the command is "cooperate" but we matched
- * "co".
- */
- continue;
-+ // Ignore commands that we are supposed to ignore.
-+ if(serve_valid_requests_checker(rq->name))
-+ continue;
-+
-
- if (!(rq->flags & RQ_ROOTLESS)
- && current_parsed_root == NULL)
- {
- /* For commands which change the way in which data
- is sent and received, for example Gzip-stream,
- this does the wrong thing. Since the client
- assumes that everything is being compressed,
- unconditionally, there is no way to give this
- error to the client without turning on
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
deleted file mode 100644
index d7d6e6b..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-cvs-gnulib-vasnprintf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/213833
-
-commit 913c09becd9df89dbd9b9f386e7f35c240d5efe8
-Author: Bruno Haible <bruno@clisp.org>
-Date: Fri Oct 19 01:50:42 2007 +0200
-
- Don't use %n on glibc >= 2.3 systems.
-
-diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
-index f563823..5d818aa 100644
---- a/lib/vasnprintf.c
-+++ b/lib/vasnprintf.c
-@@ -3385,9 +3385,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- *p = dp->conversion;
- #if USE_SNPRINTF
-+# if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))
- p[1] = '%';
- p[2] = 'n';
- p[3] = '\0';
-+# else
-+ /* On glibc2 systems from glibc >= 2.3 - probably also older
-+ ones - we know that snprintf's returns value conforms to
-+ ISO C 99: the gl_SNPRINTF_DIRECTIVE_N test passes.
-+ Therefore we can avoid using %n in this situation.
-+ On glibc2 systems from 2004-10-18 or newer, the use of %n
-+ in format strings in writable memory may crash the program
-+ (if compiled with _FORTIFY_SOURCE=2), so we should avoid it
-+ in this situation. */
-+ p[1] = '\0';
-+# endif
- #else
- p[1] = '\0';
- #endif
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch b/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch
deleted file mode 100644
index fcd4431..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-cvsbug-tmpfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cvs-1.12.12/src/cvsbug.in
-===================================================================
---- cvs-1.12.12.orig/src/cvsbug.in
-+++ cvs-1.12.12/src/cvsbug.in
-@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
- /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
- cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
- ORIGINATOR="`cat $TEMP`"
-- rm -f $TEMP
-+ > $TEMP
- fi
- fi
-
- if [ "$ORIGINATOR" = "" ]; then
- grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
- ORIGINATOR="`cat $TEMP`"
-- rm -f $TEMP
-+ > $TEMP
- fi
-
- if [ -n "$ORGANIZATION" ]; then
-
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch b/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch
deleted file mode 100644
index 825c0ee..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-install-sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/build-aux/install-sh b/build-aux/install-sh
---- a/build-aux/install-sh 2006-03-25 20:04:46 +0000
-+++ b/build-aux/install-sh 2007-09-14 10:53:29 +0100
-@@ -246,7 +246,7 @@
- fi
-
- if test -n "$dir_arg"; then
-- $doit $mkdircmd "$dst" \
-+ { test -d "$dst" || $doit $mkdircmd -p "$dst"; } \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch
deleted file mode 100644
index 948fa4d..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-mktime-x32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-back port changes from upstream gnulib to make this work on x32
-
-https://bugs.gentoo.org/395641
-
---- cvs-1.12.12/lib/mktime.c
-+++ cvs-1.12.12/lib/mktime.c
-@@ -115,6 +115,13 @@
- #define TM_YEAR_BASE 1900
- verify (base_year_is_a_multiple_of_100, TM_YEAR_BASE % 100 == 0);
-
-+#if INT_MAX <= LONG_MAX / 2
-+typedef long int long_int;
-+#else
-+typedef long long int long_int;
-+#endif
-+verify (long_int_is_wide_enough, INT_MAX == INT_MAX * (long_int) 2 / 2);
-+
- /* Return 1 if YEAR + TM_YEAR_BASE is a leap year. */
- static inline int
- leapyear (long int year)
-@@ -167,8 +174,6 @@
- int year0, int yday0, int hour0, int min0, int sec0)
- {
- verify (C99_integer_division, -1 / 2 == 0);
-- verify (long_int_year_and_yday_are_wide_enough,
-- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
-
- /* Compute intervening leap days correctly even if year is negative.
- Take care to avoid integer overflow here. */
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch b/dev-vcs/cvs/files/cvs-1.12.12-openat.patch
deleted file mode 100644
index fdb406a..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-openat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cvs-1.12.12/lib/openat.c
-===================================================================
---- cvs-1.12.12.orig/lib/openat.c
-+++ cvs-1.12.12/lib/openat.c
-@@ -55,9 +55,13 @@ rpl_openat (int fd, char const *filename
- va_list arg;
- va_start (arg, flags);
-
-- /* Assume that mode_t is passed compatibly with mode_t's type
-- after argument promotion. */
-- mode = va_arg (arg, mode_t);
-+ /* If mode_t is narrower than int, use the promoted type (int),
-+ not mode_t. Use sizeof to guess whether mode_t is nerrower;
-+ we don't know of any practical counterexamples. */
-+ if (sizeof (mode_t) < sizeof (int))
-+ mode = va_arg (arg, int);
-+ else
-+ mode = va_arg (arg, mode_t);
-
- va_end (arg);
- }
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-regex.patch b/dev-vcs/cvs/files/cvs-1.12.12-regex.patch
deleted file mode 100644
index 4e69953..0000000
--- a/dev-vcs/cvs/files/cvs-1.12.12-regex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cvs-1.12.12/lib/regex.c
-+++ b/cvs-1.12.12/lib/regex.c
-@@ -8184,7 +8184,7 @@
- if (msg_size > errbuf_size)
- {
- #if defined HAVE_MEMPCPY || defined _LIBC
-- *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
-+ *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
- #else
- memcpy (errbuf, msg, errbuf_size - 1);
- errbuf[errbuf_size - 1] = 0;
diff --git a/dev-vcs/cvs/files/cvs.pam-include-1.12.12 b/dev-vcs/cvs/files/cvs.pam-include-1.12.12
deleted file mode 100644
index f401ec0..0000000
--- a/dev-vcs/cvs/files/cvs.pam-include-1.12.12
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth include system-auth
-account include system-auth
-session include system-auth
diff --git a/dev-vcs/cvs/files/cvspserver.xinetd.d b/dev-vcs/cvs/files/cvspserver.xinetd.d
deleted file mode 100644
index 0f2edb0..0000000
--- a/dev-vcs/cvs/files/cvspserver.xinetd.d
+++ /dev/null
@@ -1,14 +0,0 @@
-service cvspserver
-{
- disable = yes
- socket_type = stream
- wait = no
- user = root
- log_type = FILE /var/log/cvspserver
- protocol = tcp
- env = HOME=/var/cvsroot
- log_on_failure += USERID
- port = 2401
- server = /usr/bin/cvs
- server_args = -f --allow-root=/var/cvsroot pserver
-}
diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml
deleted file mode 100644
index 4432750..0000000
--- a/dev-vcs/cvs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>cvs-utils</herd>
- <use>
- <flag name="server">Enable server support</flag>
- </use>
-</pkgmetadata>
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
deleted file mode 100644
index f6e451a..0000000
--- a/eclass/toolchain.eclass
+++ /dev/null
@@ -1,2262 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.635 2014/08/05 01:41:01 floppym Exp $
-
-# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
-
-DESCRIPTION="The GNU Compiler Collection"
-HOMEPAGE="http://gcc.gnu.org/"
-RESTRICT="strip" # cross-compilers need controlled stripping
-
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator
-
-if [[ ${PV} == *_pre9999* ]] ; then
- EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
- # naming style:
- # gcc-4.7.1_pre9999 -> gcc-4_7-branch
- # Note that the micro version is required or lots of stuff will break.
- # To checkout master set gcc_LIVE_BRANCH="master" in the ebuild before
- # inheriting this eclass.
- EGIT_BRANCH="${PN}-${PV%.?_pre9999}-branch"
- EGIT_BRANCH=${EGIT_BRANCH//./_}
- inherit git-2
-fi
-
-FEATURES=${FEATURES/multilib-strict/}
-
-EXPORTED_FUNCTIONS="pkg_setup src_unpack src_compile src_test src_install pkg_postinst pkg_postrm"
-case ${EAPI:-0} in
- 0|1) ;;
- 2|3) EXPORTED_FUNCTIONS+=" src_prepare src_configure" ;;
- 4*|5*) EXPORTED_FUNCTIONS+=" pkg_pretend src_prepare src_configure" ;;
- *) die "I don't speak EAPI ${EAPI}."
-esac
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-#---->> globals <<----
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} = ${CHOST} ]] ; then
- if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
- export CTARGET=${CATEGORY/cross-}
- fi
-fi
-: ${TARGET_ABI:=${ABI}}
-: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}}
-: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}}
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-# General purpose version check. Without a second arg matches up to minor version (x.x.x)
-tc_version_is_at_least() {
- version_is_at_least "$1" "${2:-${GCC_RELEASE_VER}}"
-}
-
-# General purpose version range check
-# Note that it matches up to but NOT including the second version
-tc_version_is_between() {
- tc_version_is_at_least "${1}" && ! tc_version_is_at_least "${2}"
-}
-
-GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
-GCC_PVR=${GCC_PV}
-[[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR}
-GCC_RELEASE_VER=$(get_version_component_range 1-3 ${GCC_PV})
-GCC_BRANCH_VER=$(get_version_component_range 1-2 ${GCC_PV})
-GCCMAJOR=$(get_version_component_range 1 ${GCC_PV})
-GCCMINOR=$(get_version_component_range 2 ${GCC_PV})
-GCCMICRO=$(get_version_component_range 3 ${GCC_PV})
-[[ ${BRANCH_UPDATE-notset} == "notset" ]] && \
- BRANCH_UPDATE=$(get_version_component_range 4 ${GCC_PV})
-
-# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex.
-# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)?
-GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(replace_version_separator 3 '-' ${GCC_PV})}
-
-# Pre-release support
-if [[ ${GCC_PV} == *_pre* ]] ; then
- PRERELEASE=${GCC_PV/_pre/-}
-elif [[ ${GCC_PV} == *_alpha* ]] ; then
- SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_alpha}
-elif [[ ${GCC_PV} == *_beta* ]] ; then
- SNAPSHOT=${GCC_BRANCH_VER}-${GCC_PV##*_beta}
-elif [[ ${GCC_PV} == *_rc* ]] ; then
- SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
-fi
-
-if [[ ${SNAPSHOT} == 5.0-* ]] ; then
- # The gcc-5 release has dropped the .0 for some reason.
- SNAPSHOT=${SNAPSHOT/5.0/5}
-fi
-
-export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}
-
-PREFIX=${TOOLCHAIN_PREFIX:-/usr}
-
-if tc_version_is_at_least 3.4.0 ; then
- LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
-else
- LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
-fi
-INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
-
-if is_crosscompile ; then
- BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CHOST}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
-else
- BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}}
-fi
-
-DATAPATH=${TOOLCHAIN_DATAPATH:-${PREFIX}/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}}
-
-# Dont install in /usr/include/g++-v3/, but in gcc internal directory.
-# We will handle /usr/include/g++-v3/ with gcc-config ...
-STDCXX_INCDIR=${TOOLCHAIN_STDCXX_INCDIR:-${LIBPATH}/include/g++-v${GCC_BRANCH_VER/\.*/}}
-
-#---->> LICENSE+SLOT+IUSE logic <<----
-
-if tc_version_is_at_least 4.6 ; then
- LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+"
-elif tc_version_is_at_least 4.4 ; then
- LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2+"
-elif tc_version_is_at_least 4.3 ; then
- LICENSE="GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-elif tc_version_is_at_least 4.2 ; then
- LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ libgcc libstdc++ ) FDL-1.2+"
-elif tc_version_is_at_least 3.3 ; then
- LICENSE="GPL-2+ LGPL-2.1+ FDL-1.2+"
-else
- LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-fi
-
-IUSE="multislot regression-test vanilla"
-IUSE_DEF=( nls nptl )
-
-if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
- IUSE+=" altivec"
- IUSE_DEF+=( cxx fortran )
- [[ -n ${PIE_VER} ]] && IUSE+=" nopie"
- [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
- [[ -n ${D_VER} ]] && IUSE+=" d"
- [[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
- tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
- tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
- tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
- tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
- tc_version_is_at_least 4.2 && IUSE_DEF+=( openmp )
- tc_version_is_at_least 4.3 && IUSE+=" fixed-point"
- tc_version_is_at_least 4.6 && IUSE+=" graphite"
- tc_version_is_at_least 4.7 && IUSE+=" go"
- tc_version_is_at_least 4.8 && IUSE_DEF+=( sanitize )
-fi
-
-[[ ${EAPI:-0} != 0 ]] && IUSE_DEF=( "${IUSE_DEF[@]/#/+}" )
-IUSE+=" ${IUSE_DEF[*]}"
-
-# Support upgrade paths here or people get pissed
-if ! tc_version_is_at_least 4.7 || use multislot ; then
- SLOT="${GCC_CONFIG_VER}"
-else
- SLOT="${GCC_BRANCH_VER}"
-fi
-
-#---->> DEPEND <<----
-
-RDEPEND="sys-libs/zlib
- nls? ( virtual/libintl )"
-
-tc_version_is_at_least 3 && RDEPEND+=" virtual/libiconv"
-
-if tc_version_is_at_least 4 ; then
- GMP_MPFR_DEPS=">=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2"
- if tc_version_is_at_least 4.3 ; then
- RDEPEND+=" ${GMP_MPFR_DEPS}"
- elif in_iuse fortran ; then
- RDEPEND+=" fortran? ( ${GMP_MPFR_DEPS} )"
- fi
-fi
-
-tc_version_is_at_least 4.5 && RDEPEND+=" >=dev-libs/mpc-0.8.1"
-
-if in_iuse graphite ; then
- if tc_version_is_at_least 4.8 ; then
- RDEPEND+="
- graphite? (
- >=dev-libs/cloog-0.18.0
- >=dev-libs/isl-0.11.1
- )"
- else
- RDEPEND+="
- graphite? (
- >=dev-libs/cloog-ppl-0.15.10
- >=dev-libs/ppl-0.11
- )"
- fi
-fi
-
-DEPEND="${RDEPEND}
- >=sys-devel/bison-1.875
- >=sys-devel/flex-2.5.4
- nls? ( sys-devel/gettext )
- regression-test? (
- >=dev-util/dejagnu-1.4.4
- >=sys-devel/autogen-5.5.4
- )"
-
-if in_iuse gcj ; then
- GCJ_DEPS=">=media-libs/libart_lgpl-2.1"
- GCJ_GTK_DEPS="
- x11-libs/libXt
- x11-libs/libX11
- x11-libs/libXtst
- x11-proto/xproto
- x11-proto/xextproto
- =x11-libs/gtk+-2*
- virtual/pkgconfig
- amd64? ( multilib? (
- app-emulation/emul-linux-x86-gtklibs
- app-emulation/emul-linux-x86-xlibs
- ) )
- "
- tc_version_is_at_least 3.4 && GCJ_GTK_DEPS+=" x11-libs/pango"
- tc_version_is_at_least 4.2 && GCJ_DEPS+=" app-arch/zip app-arch/unzip"
- DEPEND+=" gcj? ( awt? ( ${GCJ_GTK_DEPS} ) ${GCJ_DEPS} )"
-fi
-
-PDEPEND=">=sys-devel/gcc-config-1.7"
-
-#---->> S + SRC_URI essentials <<----
-
-# Set the source directory depending on whether we're using
-# a prerelease, snapshot, or release tarball.
-S=$(
- if [[ -n ${PRERELEASE} ]] ; then
- echo ${WORKDIR}/gcc-${PRERELEASE}
- elif [[ -n ${SNAPSHOT} ]] ; then
- echo ${WORKDIR}/gcc-${SNAPSHOT}
- else
- echo ${WORKDIR}/gcc-${GCC_RELEASE_VER}
- fi
-)
-
-gentoo_urls() {
- local devspace="HTTP~vapier/dist/URI HTTP~rhill/dist/URI
- HTTP~halcy0n/patches/URI HTTP~zorry/patches/gcc/URI"
- devspace=${devspace//HTTP/http:\/\/dev.gentoo.org\/}
- echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-
-# This function handles the basics of setting the SRC_URI for a gcc ebuild.
-# To use, set SRC_URI with:
-#
-# SRC_URI="$(get_gcc_src_uri)"
-#
-# Other than the variables normally set by portage, this function's behavior
-# can be altered by setting the following:
-#
-# SNAPSHOT
-# If set, this variable signals that we should be using a snapshot of
-# gcc. It is expected to be in the format "YYYY-MM-DD". Note that if
-# the ebuild has a _pre suffix, this variable is ignored and the
-# prerelease tarball is used instead.
-#
-# BRANCH_UPDATE
-# If set, this variable signals that we should be using the main
-# release tarball (determined by ebuild version) and applying a
-# CVS branch update patch against it. The location of this branch
-# update patch is assumed to be in ${GENTOO_TOOLCHAIN_BASE_URI}.
-# Just like with SNAPSHOT, this variable is ignored if the ebuild
-# has a _pre suffix.
-#
-# PATCH_VER
-# PATCH_GCC_VER
-# This should be set to the version of the gentoo patch tarball.
-# The resulting filename of this tarball will be:
-# gcc-${PATCH_GCC_VER:-${GCC_RELEASE_VER}}-patches-${PATCH_VER}.tar.bz2
-#
-# PIE_VER
-# PIE_GCC_VER
-# These variables control patching in various updates for the logic
-# controlling Position Independant Executables. PIE_VER is expected
-# to be the version of this patch, and PIE_GCC_VER the gcc version of
-# the patch:
-# An example:
-# PIE_VER="8.7.6.5"
-# PIE_GCC_VER="3.4.0"
-# The resulting filename of this tarball will be:
-# gcc-${PIE_GCC_VER:-${GCC_RELEASE_VER}}-piepatches-v${PIE_VER}.tar.bz2
-#
-# SPECS_VER
-# SPECS_GCC_VER
-# This is for the minispecs files included in the hardened gcc-4.x
-# The specs files for hardenedno*, vanilla and for building the "specs" file.
-# SPECS_VER is expected to be the version of this patch, SPECS_GCC_VER
-# the gcc version of the patch.
-# An example:
-# SPECS_VER="8.7.6.5"
-# SPECS_GCC_VER="3.4.0"
-# The resulting filename of this tarball will be:
-# gcc-${SPECS_GCC_VER:-${GCC_RELEASE_VER}}-specs-${SPECS_VER}.tar.bz2
-#
-# HTB_VER
-# HTB_GCC_VER
-# These variables control whether or not an ebuild supports Herman
-# ten Brugge's bounds-checking patches. If you want to use a patch
-# for an older gcc version with a new gcc, make sure you set
-# HTB_GCC_VER to that version of gcc.
-get_gcc_src_uri() {
- export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
- export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
- export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
- export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
- export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
-
- # Set where to download gcc itself depending on whether we're using a
- # prerelease, snapshot, or release tarball.
- if [[ ${PV} == *9999* ]] ; then
- # Nothing to do w/git snapshots.
- :
- elif [[ -n ${PRERELEASE} ]] ; then
- GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
- elif [[ -n ${SNAPSHOT} ]] ; then
- GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
- else
- GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
- # we want all branch updates to be against the main release
- [[ -n ${BRANCH_UPDATE} ]] && \
- GCC_SRC_URI+=" $(gentoo_urls gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2)"
- fi
-
- [[ -n ${UCLIBC_VER} ]] && \
- GCC_SRC_URI+=" $(gentoo_urls gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2)"
- [[ -n ${PATCH_VER} ]] && \
- GCC_SRC_URI+=" $(gentoo_urls gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2)"
-
- # strawberry pie, Cappuccino and a Gauloises (it's a good thing)
- [[ -n ${PIE_VER} ]] && \
- PIE_CORE=${PIE_CORE:-gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2} && \
- GCC_SRC_URI+=" $(gentoo_urls ${PIE_CORE})"
-
- # gcc minispec for the hardened gcc 4 compiler
- [[ -n ${SPECS_VER} ]] && \
- GCC_SRC_URI+=" $(gentoo_urls gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2)"
-
- # gcc bounds checking patch
- if [[ -n ${HTB_VER} ]] ; then
- local HTBFILE="bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
- GCC_SRC_URI+="
- boundschecking? (
- mirror://sourceforge/boundschecking/${HTBFILE}
- $(gentoo_urls ${HTBFILE})
- )"
- fi
-
- [[ -n ${D_VER} ]] && \
- GCC_SRC_URI+=" d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
-
- if in_iuse gcj ; then
- if tc_version_is_at_least 4.5 ; then
- GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
- elif tc_version_is_at_least 4.3 ; then
- GCC_SRC_URI+=" gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
- fi
- fi
-
- echo "${GCC_SRC_URI}"
-}
-
-SRC_URI=$(get_gcc_src_uri)
-
-#---->> pkg_pretend <<----
-
-toolchain_pkg_pretend() {
- if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] &&
- [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]] ; then
- die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it" \
- "in your make.conf if you want to use this version."
- fi
-
- [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && \
- die "Sorry, this version does not support uClibc"
-
- if ! use_if_iuse cxx ; then
- use_if_iuse go && ewarn 'Go requires a C++ compiler, disabled due to USE="-cxx"'
- use_if_iuse objc++ && ewarn 'Obj-C++ requires a C++ compiler, disabled due to USE="-cxx"'
- use_if_iuse gcj && ewarn 'GCJ requires a C++ compiler, disabled due to USE="-cxx"'
- fi
-
- want_minispecs
-}
-
-#---->> pkg_setup <<----
-
-toolchain_pkg_setup() {
- case "${EAPI:-0}" in
- 0|1|2|3) toolchain_pkg_pretend ;;
- esac
-
- # we dont want to use the installed compiler's specs to build gcc
- unset GCC_SPECS
- unset LANGUAGES #265283
-}
-
-#---->> src_unpack <<----
-
-toolchain_src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
- else
- gcc_quick_unpack
- fi
-
- case ${EAPI:-0} in
- 0|1) toolchain_src_prepare ;;
- esac
-}
-
-gcc_quick_unpack() {
- pushd "${WORKDIR}" > /dev/null
- export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
- export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
- export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
- export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
- export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
-
- if [[ -n ${GCC_A_FAKEIT} ]] ; then
- unpack ${GCC_A_FAKEIT}
- elif [[ -n ${PRERELEASE} ]] ; then
- unpack gcc-${PRERELEASE}.tar.bz2
- elif [[ -n ${SNAPSHOT} ]] ; then
- unpack gcc-${SNAPSHOT}.tar.bz2
- elif [[ ${PV} != *9999* ]] ; then
- unpack gcc-${GCC_RELEASE_VER}.tar.bz2
- # We want branch updates to be against a release tarball
- if [[ -n ${BRANCH_UPDATE} ]] ; then
- pushd "${S}" > /dev/null
- epatch "${DISTDIR}"/gcc-${GCC_RELEASE_VER}-branch-update-${BRANCH_UPDATE}.patch.bz2
- popd > /dev/null
- fi
- fi
-
- if [[ -n ${D_VER} ]] && use d ; then
- pushd "${S}"/gcc > /dev/null
- unpack gdc-${D_VER}-src.tar.bz2
- cd ..
- ebegin "Adding support for the D language"
- ./gcc/d/setup-gcc.sh >& "${T}"/dgcc.log
- if ! eend $? ; then
- eerror "The D GCC package failed to apply"
- eerror "Please include this log file when posting a bug report:"
- eerror " ${T}/dgcc.log"
- die "failed to include the D language"
- fi
- popd > /dev/null
- fi
-
- [[ -n ${PATCH_VER} ]] && \
- unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2
-
- [[ -n ${UCLIBC_VER} ]] && \
- unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2
-
- if want_pie ; then
- if [[ -n ${PIE_CORE} ]] ; then
- unpack ${PIE_CORE}
- else
- unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
- fi
- [[ -n ${SPECS_VER} ]] && \
- unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2
- fi
-
- use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
-
- popd > /dev/null
-}
-
-#---->> src_prepare <<----
-
-toolchain_src_prepare() {
- export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
- cd "${S}"
-
- if ! use vanilla ; then
- if [[ -n ${PATCH_VER} ]] ; then
- guess_patch_type_in_dir "${WORKDIR}"/patch
- EPATCH_MULTI_MSG="Applying Gentoo patches ..." \
- epatch "${WORKDIR}"/patch
- BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION} p${PATCH_VER}"
- fi
- if [[ -n ${UCLIBC_VER} ]] ; then
- guess_patch_type_in_dir "${WORKDIR}"/uclibc
- EPATCH_MULTI_MSG="Applying uClibc patches ..." \
- epatch "${WORKDIR}"/uclibc
- fi
- fi
- do_gcc_HTB_patches
- do_gcc_PIE_patches
- epatch_user
-
- if ( tc_version_is_at_least 4.8.2 || use hardened ) && ! use vanilla ; then
- make_gcc_hard
- fi
-
- # install the libstdc++ python into the right location
- # http://gcc.gnu.org/PR51368
- if tc_version_is_between 4.5 4.7 ; then
- sed -i \
- '/^pythondir =/s:=.*:= $(datadir)/python:' \
- "${S}"/libstdc++-v3/python/Makefile.in || die
- fi
-
- # make sure the pkg config files install into multilib dirs.
- # since we configure with just one --libdir, we can't use that
- # (as gcc itself takes care of building multilibs). #435728
- find "${S}" -name Makefile.in \
- -exec sed -i '/^pkgconfigdir/s:=.*:=$(toolexeclibdir)/pkgconfig:' {} +
-
- # No idea when this first started being fixed, but let's go with 4.3.x for now
- if ! tc_version_is_at_least 4.3 ; then
- fix_files=""
- for x in contrib/test_summary libstdc++-v3/scripts/check_survey.in ; do
- [[ -e ${x} ]] && fix_files="${fix_files} ${x}"
- done
- ht_fix_file ${fix_files} */configure *.sh */Makefile.in
- fi
-
- setup_multilib_osdirnames
- gcc_version_patch
-
- if tc_version_is_at_least 4.1 ; then
- if [[ -n ${SNAPSHOT} || -n ${PRERELEASE} ]] ; then
- # BASE-VER must be a three-digit version number
- # followed by an optional -pre string
- # eg. 4.5.1, 4.6.2-pre20120213, 4.7.0-pre9999
- # If BASE-VER differs from ${PV/_/-} then libraries get installed in
- # the wrong directory.
- echo ${PV/_/-} > "${S}"/gcc/BASE-VER
- fi
- fi
-
- # >= gcc-4.3 doesn't bundle ecj.jar, so copy it
- if tc_version_is_at_least 4.3 && use gcj ; then
- if tc_version_is_at_least 4.5 ; then
- einfo "Copying ecj-4.5.jar"
- cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
- else
- einfo "Copying ecj-4.3.jar"
- cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
- fi
- fi
-
- # disable --as-needed from being compiled into gcc specs
- # natively when using a gcc version < 3.4.4
- # http://gcc.gnu.org/PR14992
- if ! tc_version_is_at_least 3.4.4 ; then
- sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g "${S}"/gcc/config.in
- fi
-
- # In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names
- # in line with gcc-4.
- if tc_version_is_between 3.3 4.0 ; then
- do_gcc_rename_java_bins
- fi
-
- # Prevent libffi from being installed
- if tc_version_is_between 3.0 4.8 ; then
- sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die
- sed -i -e 's/\(install-data-am:\).*/\1/' "${S}"/libffi/include/Makefile.in || die
- fi
-
- # Fixup libtool to correctly generate .la files with portage
- elibtoolize --portage --shallow --no-uclibc
-
- gnuconfig_update
-
- # update configure files
- local f
- einfo "Fixing misc issues in configure files"
- for f in $(grep -l 'autoconf version 2.13' $(find "${S}" -name configure)) ; do
- ebegin " Updating ${f/${S}\/} [LANG]"
- patch "${f}" "${GCC_FILESDIR}"/gcc-configure-LANG.patch >& "${T}"/configure-patch.log \
- || eerror "Please file a bug about this"
- eend $?
- done
- sed -i 's|A-Za-z0-9|[:alnum:]|g' "${S}"/gcc/*.awk #215828
-
- # Prevent new texinfo from breaking old versions (see #198182, #464008)
- tc_version_is_at_least 4.1 && epatch "${GCC_FILESDIR}"/gcc-configure-texinfo.patch
-
- if [[ -x contrib/gcc_update ]] ; then
- einfo "Touching generated files"
- ./contrib/gcc_update --touch | \
- while read f ; do
- einfo " ${f%%...}"
- done
- fi
-}
-
-guess_patch_type_in_dir() {
- [[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \
- && EPATCH_SUFFIX="patch.bz2" \
- || EPATCH_SUFFIX="patch"
-}
-
-do_gcc_HTB_patches() {
- use_if_iuse boundschecking || return 0
-
- # modify the bounds checking patch with a regression patch
- epatch "${WORKDIR}/bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch"
- BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, HTB-${HTB_GCC_VER}-${HTB_VER}"
-}
-
-do_gcc_PIE_patches() {
- want_pie || return 0
- use vanilla && return 0
-
- if tc_version_is_at_least 4.3.2 ; then
- guess_patch_type_in_dir "${WORKDIR}"/piepatch/
- EPATCH_MULTI_MSG="Applying pie patches ..." \
- epatch "${WORKDIR}"/piepatch/
- else
- guess_patch_type_in_dir "${WORKDIR}"/piepatch/upstream
-
- # corrects startfile/endfile selection and shared/static/pie flag usage
- EPATCH_MULTI_MSG="Applying upstream pie patches ..." \
- epatch "${WORKDIR}"/piepatch/upstream
- # adds non-default pie support (rs6000)
- EPATCH_MULTI_MSG="Applying non-default pie patches ..." \
- epatch "${WORKDIR}"/piepatch/nondef
- # adds default pie support (rs6000 too) if DEFAULT_PIE[_SSP] is defined
- EPATCH_MULTI_MSG="Applying default pie patches ..." \
- epatch "${WORKDIR}"/piepatch/def
- fi
-
- BRANDING_GCC_PKGVERSION="${BRANDING_GCC_PKGVERSION}, pie-${PIE_VER}"
-}
-
-# configure to build with the hardened GCC specs as the default
-make_gcc_hard() {
- # we want to be able to control the pie patch logic via something other
- # than ALL_CFLAGS...
- sed -e '/^ALL_CFLAGS/iHARD_CFLAGS = ' \
- -e 's|^ALL_CFLAGS = |ALL_CFLAGS = $(HARD_CFLAGS) |' \
- -i "${S}"/gcc/Makefile.in
- # Need to add HARD_CFLAGS to ALL_CXXFLAGS on >= 4.7
- if tc_version_is_at_least 4.7 ; then
- sed -e '/^ALL_CXXFLAGS/iHARD_CFLAGS = ' \
- -e 's|^ALL_CXXFLAGS = |ALL_CXXFLAGS = $(HARD_CFLAGS) |' \
- -i "${S}"/gcc/Makefile.in
- fi
-
- # defaults to enable for all toolchains
- local gcc_hard_flags=""
- if use hardened ; then
- if hardened_gcc_works ; then
- einfo "Updating gcc to use automatic PIE + SSP building ..."
- gcc_hard_flags+=" -DEFAULT_PIE_SSP"
- elif hardened_gcc_works pie ; then
- einfo "Updating gcc to use automatic PIE building ..."
- ewarn "SSP has not been enabled by default"
- gcc_hard_flags+=" -DEFAULT_PIE"
- elif hardened_gcc_works ssp ; then
- einfo "Updating gcc to use automatic SSP building ..."
- ewarn "PIE has not been enabled by default"
- gcc_hard_flags+=" -DEFAULT_SSP"
- else
- # do nothing if hardened is't supported, but don't die either
- ewarn "hardened is not supported for this arch in this gcc version"
- return 0
- fi
- # rebrand to make bug reports easier
- BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened}
- else
- if hardened_gcc_works ssp ; then
- einfo "Updating gcc to use automatic SSP building ..."
- gcc_hard_flags+=" -DEFAULT_SSP"
- fi
- fi
-
- sed -i \
- -e "/^HARD_CFLAGS = /s|=|= ${gcc_hard_flags} |" \
- "${S}"/gcc/Makefile.in || die
-
-}
-
-# This is a historical wart. The original Gentoo/amd64 port used:
-# lib32 - 32bit binaries (x86)
-# lib64 - 64bit binaries (x86_64)
-# lib - "native" binaries (a symlink to lib64)
-# Most other distros use the logic (including mainline gcc):
-# lib - 32bit binaries (x86)
-# lib64 - 64bit binaries (x86_64)
-# Over time, Gentoo is migrating to the latter form.
-#
-# Unfortunately, due to distros picking the lib32 behavior, newer gcc
-# versions will dynamically detect whether to use lib or lib32 for its
-# 32bit multilib. So, to keep the automagic from getting things wrong
-# while people are transitioning from the old style to the new style,
-# we always set the MULTILIB_OSDIRNAMES var for relevant targets.
-setup_multilib_osdirnames() {
- is_multilib || return 0
-
- local config
- local libdirs="../lib64 ../lib32"
-
- # this only makes sense for some Linux targets
- case ${CTARGET} in
- x86_64*-linux*) config="i386" ;;
- powerpc64*-linux*) config="rs6000" ;;
- sparc64*-linux*) config="sparc" ;;
- s390x*-linux*) config="s390" ;;
- *) return 0 ;;
- esac
- config+="/t-linux64"
-
- local sed_args=()
- if tc_version_is_at_least 4.6 ; then
- sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' )
- fi
- if [[ ${SYMLINK_LIB} == "yes" ]] ; then
- einfo "updating multilib directories to be: ${libdirs}"
- if tc_version_is_at_least 4.6.4 || tc_version_is_at_least 4.7 ; then
- sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' )
- else
- sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" )
- fi
- else
- einfo "using upstream multilib; disabling lib32 autodetection"
- sed_args+=( -r -e 's:[$][(]if.*,(.*)[)]:\1:' )
- fi
- sed -i "${sed_args[@]}" "${S}"/gcc/config/${config} || die
-}
-
-gcc_version_patch() {
- # gcc-4.3+ has configure flags (whoo!)
- tc_version_is_at_least 4.3 && return 0
-
- local version_string=${GCC_CONFIG_VER}
- [[ -n ${BRANCH_UPDATE} ]] && version_string+=" ${BRANCH_UPDATE}"
-
- einfo "patching gcc version: ${version_string} (${BRANDING_GCC_PKGVERSION})"
-
- local gcc_sed=( -e 's:gcc\.gnu\.org/bugs\.html:bugs\.gentoo\.org/:' )
- if grep -qs VERSUFFIX "${S}"/gcc/version.c ; then
- gcc_sed+=( -e "/VERSUFFIX \"\"/s:\"\":\" (${BRANDING_GCC_PKGVERSION})\":" )
- else
- version_string="${version_string} (${BRANDING_GCC_PKGVERSION})"
- gcc_sed+=( -e "/const char version_string\[\] = /s:= \".*\":= \"${version_string}\":" )
- fi
- sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die
-}
-
-do_gcc_rename_java_bins() {
- # bug #139918 - conflict between gcc and java-config-2 for ownership of
- # /usr/bin/rmi{c,registry}. Done with mv & sed rather than a patch
- # because patches would be large (thanks to the rename of man files),
- # and it's clear from the sed invocations that all that changes is the
- # rmi{c,registry} names to grmi{c,registry} names.
- # Kevin F. Quinn 2006-07-12
- einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
- # 1) Move the man files if present (missing prior to gcc-3.4)
- for manfile in rmic rmiregistry ; do
- [[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
- mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1
- done
- # 2) Fixup references in the docs if present (mission prior to gcc-3.4)
- for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do
- [[ -f ${S}/${jfile} ]] || continue
- sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
- die "Failed to fixup file ${jfile} for rename to grmiregistry"
- sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} ||
- die "Failed to fixup file ${jfile} for rename to grmic"
- done
- # 3) Fixup Makefiles to build the changed executable names
- # These are present in all 3.x versions, and are the important bit
- # to get gcc to build with the new names.
- for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do
- sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} ||
- die "Failed to fixup file ${jfile} for rename to grmiregistry"
- # Careful with rmic on these files; it's also the name of a directory
- # which should be left unchanged. Replace occurrences of 'rmic$',
- # 'rmic_' and 'rmic '.
- sed -i -e 's:rmic\([$_ ]\):grmic\1:g' "${S}"/${jfile} ||
- die "Failed to fixup file ${jfile} for rename to grmic"
- done
-}
-
-#---->> src_configure <<----
-
-toolchain_src_configure() {
- downgrade_arch_flags
- gcc_do_filter_flags
-
- einfo "CFLAGS=\"${CFLAGS}\""
- einfo "CXXFLAGS=\"${CXXFLAGS}\""
- einfo "LDFLAGS=\"${LDFLAGS}\""
-
- # Force internal zip based jar script to avoid random
- # issues with 3rd party jar implementations. #384291
- export JAR=no
-
- # For hardened gcc 4.3 piepatchset to build the hardened specs
- # file (build.specs) to use when building gcc.
- if ! tc_version_is_at_least 4.4 && want_minispecs ; then
- setup_minispecs_gcc_build_specs
- fi
-
- local confgcc=( --host=${CHOST} )
-
- if is_crosscompile || tc-is-cross-compiler ; then
- # Straight from the GCC install doc:
- # "GCC has code to correctly determine the correct value for target
- # for nearly all native systems. Therefore, we highly recommend you
- # not provide a configure target when configuring a native compiler."
- confgcc+=( --target=${CTARGET} )
- fi
- [[ -n ${CBUILD} ]] && confgcc+=( --build=${CBUILD} )
-
- confgcc+=(
- --prefix="${PREFIX}"
- --bindir="${BINPATH}"
- --includedir="${INCLUDEPATH}"
- --datadir="${DATAPATH}"
- --mandir="${DATAPATH}/man"
- --infodir="${DATAPATH}/info"
- --with-gxx-include-dir="${STDCXX_INCDIR}"
- )
-
- # Stick the python scripts in their own slotted directory (bug #279252)
- #
- # --with-python-dir=DIR
- # Specifies where to install the Python modules used for aot-compile. DIR
- # should not include the prefix used in installation. For example, if the
- # Python modules are to be installed in /usr/lib/python2.5/site-packages,
- # then --with-python-dir=/lib/python2.5/site-packages should be passed.
- #
- # This should translate into "/share/gcc-data/${CTARGET}/${GCC_CONFIG_VER}/python"
- if tc_version_is_at_least 4.4 ; then
- confgcc+=( --with-python-dir=${DATAPATH/$PREFIX/}/python )
- fi
-
- ### language options
-
- local GCC_LANG="c"
- is_cxx && GCC_LANG+=",c++"
- is_d && GCC_LANG+=",d"
- is_gcj && GCC_LANG+=",java"
- is_go && GCC_LANG+=",go"
- if is_objc || is_objcxx ; then
- GCC_LANG+=",objc"
- if tc_version_is_at_least 4 ; then
- use objc-gc && confgcc+=( --enable-objc-gc )
- fi
- is_objcxx && GCC_LANG+=",obj-c++"
- fi
-
- # fortran support just got sillier! the lang value can be f77 for
- # fortran77, f95 for fortran95, or just plain old fortran for the
- # currently supported standard depending on gcc version.
- is_fortran && GCC_LANG+=",fortran"
- is_f77 && GCC_LANG+=",f77"
- is_f95 && GCC_LANG+=",f95"
-
- # We do NOT want 'ADA support' in here!
- # is_ada && GCC_LANG+=",ada"
-
- confgcc+=( --enable-languages=${GCC_LANG} )
-
- ### general options
-
- confgcc+=(
- --enable-obsolete
- --enable-secureplt
- --disable-werror
- --with-system-zlib
- )
-
- if use nls ; then
- confgcc+=( --enable-nls --without-included-gettext )
- else
- confgcc+=( --disable-nls )
- fi
-
- tc_version_is_at_least 3.4 || confgcc+=( --disable-libunwind-exceptions )
-
- # Use the default ("release") checking because upstream usually neglects
- # to test "disabled" so it has a history of breaking. #317217
- if tc_version_is_at_least 4 || [[ -n ${GCC_CHECKS_LIST} ]] ; then
- confgcc+=( --enable-checking=${GCC_CHECKS_LIST:-release} )
- else
- confgcc+=( --disable-checking )
- fi
-
- # Branding
- tc_version_is_at_least 4.3 && confgcc+=(
- --with-bugurl=https://bugs.gentoo.org/
- --with-pkgversion="${BRANDING_GCC_PKGVERSION}"
- )
-
- # If we want hardened support with the newer piepatchset for >=gcc 4.4
- if tc_version_is_at_least 4.4 && want_minispecs ; then
- confgcc+=( $(use_enable hardened esp) )
- fi
-
- # allow gcc to search for clock funcs in the main C lib.
- # if it can't find them, then tough cookies -- we aren't
- # going to link in -lrt to all C++ apps. #411681
- if tc_version_is_at_least 4.4 && is_cxx ; then
- confgcc+=( --enable-libstdcxx-time )
- fi
-
- # # Turn on the -Wl,--build-id flag by default for ELF targets. #525942
- # # This helps with locating debug files.
- # case ${CTARGET} in
- # *-linux-*|*-elf|*-eabi)
- # tc_version_is_at_least 4.5 && confgcc+=(
- # --enable-linker-build-id
- # )
- # ;;
- # esac
-
- # newer gcc versions like to bootstrap themselves with C++,
- # so we need to manually disable it ourselves
- if tc_version_is_between 4.7 4.8 && ! is_cxx ; then
- confgcc+=( --disable-build-with-cxx --disable-build-poststage1-with-cxx )
- fi
-
- ### Cross-compiler options
- if is_crosscompile ; then
- # Enable build warnings by default with cross-compilers when system
- # paths are included (e.g. via -I flags).
- confgcc+=( --enable-poison-system-directories )
-
- # When building a stage1 cross-compiler (just C compiler), we have to
- # disable a bunch of features or gcc goes boom
- local needed_libc=""
- case ${CTARGET} in
- *-linux) needed_libc=no-fucking-clue;;
- *-dietlibc) needed_libc=dietlibc;;
- *-elf|*-eabi) needed_libc=newlib;;
- *-freebsd*) needed_libc=freebsd-lib;;
- *-gnu*) needed_libc=glibc;;
- *-klibc) needed_libc=klibc;;
- *-musl*) needed_libc=musl;;
- *-uclibc*)
- if ! echo '#include <features.h>' | \
- $(tc-getCPP ${CTARGET}) -E -dD - 2>/dev/null | \
- grep -q __HAVE_SHARED__
- then #291870
- confgcc+=( --disable-shared )
- fi
- needed_libc=uclibc
- ;;
- *-cygwin) needed_libc=cygwin;;
- x86_64-*-mingw*|\
- *-w64-mingw*) needed_libc=mingw64-runtime;;
- mingw*|*-mingw*) needed_libc=mingw-runtime;;
- avr) confgcc+=( --enable-shared --disable-threads );;
- esac
- if [[ -n ${needed_libc} ]] ; then
- local confgcc_no_libc=( --disable-shared )
- tc_version_is_at_least 4.8 && confgcc_no_libc+=( --disable-libatomic )
- if ! has_version ${CATEGORY}/${needed_libc} ; then
- confgcc+=(
- "${confgcc_no_libc[@]}"
- --disable-threads
- --without-headers
- )
- elif built_with_use --hidden --missing false ${CATEGORY}/${needed_libc} crosscompile_opts_headers-only ; then
- confgcc+=(
- "${confgcc_no_libc[@]}"
- --with-sysroot=${PREFIX}/${CTARGET}
- )
- else
- confgcc+=( --with-sysroot=${PREFIX}/${CTARGET} )
- fi
- fi
-
- tc_version_is_at_least 4.2 && confgcc+=( --disable-bootstrap )
- else
- if tc-is-static-only ; then
- confgcc+=( --disable-shared )
- else
- confgcc+=( --enable-shared )
- fi
- case ${CHOST} in
- mingw*|*-mingw*|*-cygwin)
- confgcc+=( --enable-threads=win32 ) ;;
- *)
- confgcc+=( --enable-threads=posix ) ;;
- esac
- fi
-
- # __cxa_atexit is "essential for fully standards-compliant handling of
- # destructors", but apparently requires glibc.
- case ${CTARGET} in
- *-uclibc*)
- confgcc+=(
- --disable-__cxa_atexit
- $(use_enable nptl tls)
- )
- tc_version_is_between 3.3 3.4 && confgcc+=( --enable-sjlj-exceptions )
- if tc_version_is_between 3.4 4.3 ; then
- confgcc+=( --enable-clocale=uclibc )
- fi
- ;;
- *-elf|*-eabi)
- confgcc+=( --with-newlib )
- ;;
- *-gnu*)
- confgcc+=(
- --enable-__cxa_atexit
- --enable-clocale=gnu
- )
- ;;
- *-freebsd*)
- confgcc+=( --enable-__cxa_atexit )
- ;;
- *-solaris*)
- confgcc+=( --enable-__cxa_atexit )
- ;;
- esac
-
- ### arch options
-
- gcc-multilib-configure
-
- # ppc altivec support
- confgcc+=( $(use_enable altivec) )
-
- # gcc has fixed-point arithmetic support in 4.3 for mips targets that can
- # significantly increase compile time by several hours. This will allow
- # users to control this feature in the event they need the support.
- tc_version_is_at_least 4.3 && confgcc+=( $(use_enable fixed-point) )
-
- case $(tc-is-softfloat) in
- yes) confgcc+=( --with-float=soft ) ;;
- softfp) confgcc+=( --with-float=softfp ) ;;
- *)
- # If they've explicitly opt-ed in, do hardfloat,
- # otherwise let the gcc default kick in.
- [[ ${CTARGET//_/-} == *-hardfloat-* ]] \
- && confgcc+=( --with-float=hard )
- ;;
- esac
-
- local with_abi_map=()
- case $(tc-arch) in
- arm) #264534 #414395
- local a arm_arch=${CTARGET%%-*}
- # Remove trailing endian variations first: eb el be bl b l
- for a in e{b,l} {b,l}e b l ; do
- if [[ ${arm_arch} == *${a} ]] ; then
- arm_arch=${arm_arch%${a}}
- break
- fi
- done
- # Convert armv7{a,r,m} to armv7-{a,r,m}
- [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
- # See if this is a valid --with-arch flag
- if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch};
- . "${srcdir}"/config.gcc) &>/dev/null
- then
- confgcc+=( --with-arch=${arm_arch} )
- fi
-
- # Make default mode thumb for microcontroller classes #418209
- [[ ${arm_arch} == *-m ]] && confgcc+=( --with-mode=thumb )
-
- # Enable hardvfp
- if [[ $(tc-is-softfloat) == "no" ]] && \
- [[ ${CTARGET} == armv[67]* ]] && \
- tc_version_is_at_least 4.5
- then
- # Follow the new arm hardfp distro standard by default
- confgcc+=( --with-float=hard )
- case ${CTARGET} in
- armv6*) confgcc+=( --with-fpu=vfp ) ;;
- armv7*) confgcc+=( --with-fpu=vfpv3-d16 ) ;;
- esac
- fi
- ;;
- mips)
- # Add --with-abi flags to set default ABI
- confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
- ;;
- amd64)
- # drop the older/ABI checks once this get's merged into some
- # version of gcc upstream
- if tc_version_is_at_least 4.7 && has x32 $(get_all_abis TARGET) ; then
- confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) )
- fi
- ;;
- x86)
- # Default arch for x86 is normally i386, lets give it a bump
- # since glibc will do so based on CTARGET anyways
- confgcc+=( --with-arch=${CTARGET%%-*} )
- ;;
- hppa)
- # Enable sjlj exceptions for backward compatibility on hppa
- [[ ${GCCMAJOR} == "3" ]] && confgcc+=( --enable-sjlj-exceptions )
- ;;
- ppc)
- # Set up defaults based on current CFLAGS
- is-flagq -mfloat-gprs=double && confgcc+=( --enable-e500-double )
- [[ ${CTARGET//_/-} == *-e500v2-* ]] && confgcc+=( --enable-e500-double )
- ;;
- esac
-
- # if the target can do biarch (-m32/-m64), enable it. overhead should
- # be small, and should simplify building of 64bit kernels in a 32bit
- # userland by not needing sys-devel/kgcc64. #349405
- case $(tc-arch) in
- ppc|ppc64) tc_version_is_at_least 3.4 && confgcc+=( --enable-targets=all ) ;;
- sparc) tc_version_is_at_least 4.4 && confgcc+=( --enable-targets=all ) ;;
- amd64|x86) tc_version_is_at_least 4.3 && confgcc+=( --enable-targets=all ) ;;
- esac
-
- # On Darwin we need libdir to be set in order to get correct install names
- # for things like libobjc-gnu, libgcj and libfortran. If we enable it on
- # non-Darwin we screw up the behaviour this eclass relies on. We in
- # particular need this over --libdir for bug #255315.
- [[ ${CTARGET} == *-darwin* ]] && \
- confgcc+=( --enable-version-specific-runtime-libs )
-
- ### library options
-
- if ! is_gcj ; then
- confgcc+=( --disable-libgcj )
- elif use awt ; then
- confgcc+=( --enable-java-awt=gtk )
- fi
-
- if tc_version_is_at_least 4.2 ; then
- if in_iuse openmp ; then
- # Make sure target has pthreads support. #326757 #335883
- # There shouldn't be a chicken & egg problem here as openmp won't
- # build without a C library, and you can't build that w/out
- # already having a compiler ...
- if ! is_crosscompile || \
- $(tc-getCPP ${CTARGET}) -E - <<<"#include <pthread.h>" >& /dev/null
- then
- confgcc+=( $(use_enable openmp libgomp) )
- else
- # Force disable as the configure script can be dumb #359855
- confgcc+=( --disable-libgomp )
- fi
- else
- # For gcc variants where we don't want openmp (e.g. kgcc)
- confgcc+=( --disable-libgomp )
- fi
- fi
-
- if tc_version_is_at_least 4.0 ; then
- if in_iuse mudflap ; then
- confgcc+=( $(use_enable mudflap libmudflap) )
- else
- confgcc+=( --disable-libmudflap )
- fi
-
- if use_if_iuse libssp ; then
- confgcc+=( --enable-libssp )
- else
- if hardened_gcc_is_stable ssp; then
- export gcc_cv_libc_provides_ssp=yes
- fi
- confgcc+=( --disable-libssp )
- fi
-
- fi
-
- # newer gcc's come with libquadmath, but only fortran uses
- # it, so auto punt it when we don't care
- if tc_version_is_at_least 4.6 && ! is_fortran ; then
- confgcc+=( --disable-libquadmath )
- fi
-
- if tc_version_is_at_least 4.6 ; then
- confgcc+=( --enable-lto )
- elif tc_version_is_at_least 4.5 ; then
- confgcc+=( --disable-lto )
- fi
-
- # graphite was added in 4.4 but we only support it in 4.6+ due to external
- # library issues. 4.6/4.7 uses cloog-ppl which is a fork of CLooG with a
- # PPL backend. 4.8+ uses upstream CLooG with the ISL backend. We install
- # cloog-ppl into a non-standard location to prevent collisions.
- if tc_version_is_at_least 4.8 ; then
- confgcc+=( $(use_with graphite cloog) )
- use graphite && confgcc+=( --disable-isl-version-check )
- elif tc_version_is_at_least 4.6 ; then
- confgcc+=( $(use_with graphite cloog) )
- confgcc+=( $(use_with graphite ppl) )
- use graphite && confgcc+=( --with-cloog-include=/usr/include/cloog-ppl )
- use graphite && confgcc+=( --disable-ppl-version-check )
- elif tc_version_is_at_least 4.4 ; then
- confgcc+=( --without-cloog )
- confgcc+=( --without-ppl )
- fi
-
- if tc_version_is_at_least 4.8 ; then
- confgcc+=( $(use_enable sanitize libsanitizer) )
- fi
-
- # Disable gcc info regeneration -- it ships with generated info pages
- # already. Our custom version/urls/etc... trigger it. #464008
- export gcc_cv_prog_makeinfo_modern=no
-
- # Do not let the X detection get in our way. We know things can be found
- # via system paths, so no need to hardcode things that'll break multilib.
- # Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up
- # killing the 32bit builds which want /usr/lib.
- export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries='
-
- confgcc+=( "$@" ${EXTRA_ECONF} )
-
- # Nothing wrong with a good dose of verbosity
- echo
- einfo "PREFIX: ${PREFIX}"
- einfo "BINPATH: ${BINPATH}"
- einfo "LIBPATH: ${LIBPATH}"
- einfo "DATAPATH: ${DATAPATH}"
- einfo "STDCXX_INCDIR: ${STDCXX_INCDIR}"
- echo
- einfo "Languages: ${GCC_LANG}"
- echo
- einfo "Configuring GCC with: ${confgcc[@]//--/\n\t--}"
- echo
-
- # Build in a separate build tree
- mkdir -p "${WORKDIR}"/build
- pushd "${WORKDIR}"/build > /dev/null
-
- # and now to do the actual configuration
- addwrite /dev/zero
- echo "${S}"/configure "${confgcc[@]}"
- "${S}"/configure "${confgcc[@]}" || die "failed to run configure"
-
- # return to whatever directory we were in before
- popd > /dev/null
-}
-
-# Replace -m flags unsupported by the version being built with the best
-# available equivalent
-downgrade_arch_flags() {
- local arch bver i isa myarch mytune rep ver
-
- bver=${1:-${GCC_BRANCH_VER}}
- [[ $(gcc-version) < ${bver} ]] && return 0
- [[ $(tc-arch) != amd64 && $(tc-arch) != x86 ]] && return 0
-
- myarch=$(get-flag march)
- mytune=$(get-flag mtune)
-
- # If -march=native isn't supported we have to tease out the actual arch
- if [[ ${myarch} == native || ${mytune} == native ]] ; then
- if [[ ${bver} < 4.2 ]] ; then
- arch=$($(tc-getCC) -march=native -v -E -P - </dev/null 2>&1 \
- | sed -rn "/cc1.*-march/s:.*-march=([^ ']*).*:\1:p")
- replace-cpu-flags native ${arch}
- fi
- fi
-
- # Handle special -mtune flags
- [[ ${mytune} == intel && ${bver} < 4.9 ]] && replace-cpu-flags intel generic
- [[ ${mytune} == generic && ${bver} < 4.2 ]] && filter-flags '-mtune=*'
- [[ ${mytune} == x86-64 ]] && filter-flags '-mtune=*'
- [[ ${bver} < 3.4 ]] && filter-flags '-mtune=*'
-
- # "added" "arch" "replacement"
- local archlist=(
- 4.9 bdver4 bdver3
- 4.9 bonnell atom
- 4.9 broadwell core-avx2
- 4.9 haswell core-avx2
- 4.9 ivybridge core-avx-i
- 4.9 nehalem corei7
- 4.9 sandybridge corei7-avx
- 4.9 silvermont corei7
- 4.9 westmere corei7
- 4.8 bdver3 bdver2
- 4.8 btver2 btver1
- 4.7 bdver2 bdver1
- 4.7 core-avx2 core-avx-i
- 4.6 bdver1 amdfam10
- 4.6 btver1 amdfam10
- 4.6 core-avx-i core2
- 4.6 corei7 core2
- 4.6 corei7-avx core2
- 4.5 atom core2
- 4.3 amdfam10 k8
- 4.3 athlon64-sse3 k8
- 4.3 barcelona k8
- 4.3 core2 nocona
- 4.3 geode k6-2 # gcc.gnu.org/PR41989#c22
- 4.3 k8-sse3 k8
- 4.3 opteron-sse3 k8
- 3.4 athlon-fx x86-64
- 3.4 athlon64 x86-64
- 3.4 c3-2 c3
- 3.4 k8 x86-64
- 3.4 opteron x86-64
- 3.4 pentium-m pentium3
- 3.4 pentium3m pentium3
- 3.4 pentium4m pentium4
- )
-
- for ((i = 0; i < ${#archlist[@]}; i += 3)) ; do
- myarch=$(get-flag march)
- mytune=$(get-flag mtune)
-
- ver=${archlist[i]}
- arch=${archlist[i + 1]}
- rep=${archlist[i + 2]}
-
- [[ ${myarch} != ${arch} && ${mytune} != ${arch} ]] && continue
-
- if [[ ${ver} > ${bver} ]] ; then
- einfo "Replacing ${myarch} (added in gcc ${ver}) with ${rep}..."
- [[ ${myarch} == ${arch} ]] && replace-cpu-flags ${myarch} ${rep}
- [[ ${mytune} == ${arch} ]] && replace-cpu-flags ${mytune} ${rep}
- continue
- else
- break
- fi
- done
-
- # we only check -mno* here since -m* get removed by strip-flags later on
- local isalist=(
- 4.9 -mno-sha
- 4.9 -mno-avx512pf
- 4.9 -mno-avx512f
- 4.9 -mno-avx512er
- 4.9 -mno-avx512cd
- 4.8 -mno-xsaveopt
- 4.8 -mno-xsave
- 4.8 -mno-rtm
- 4.8 -mno-fxsr
- 4.7 -mno-lzcnt
- 4.7 -mno-bmi2
- 4.7 -mno-avx2
- 4.6 -mno-tbm
- 4.6 -mno-rdrnd
- 4.6 -mno-fsgsbase
- 4.6 -mno-f16c
- 4.6 -mno-bmi
- 4.5 -mno-xop
- 4.5 -mno-movbe
- 4.5 -mno-lwp
- 4.5 -mno-fma4
- 4.4 -mno-pclmul
- 4.4 -mno-fma
- 4.4 -mno-avx
- 4.4 -mno-aes
- 4.3 -mno-ssse3
- 4.3 -mno-sse4a
- 4.3 -mno-sse4
- 4.3 -mno-sse4.2
- 4.3 -mno-sse4.1
- 4.3 -mno-popcnt
- 4.3 -mno-abm
- )
-
- for ((i = 0; i < ${#isalist[@]}; i += 2)) ; do
- ver=${isalist[i]}
- isa=${isalist[i + 1]}
- [[ ${ver} > ${bver} ]] && filter-flags ${isa} ${isa/-m/-mno-}
- done
-}
-
-gcc_do_filter_flags() {
- strip-flags
- replace-flags -O? -O2
-
- # dont want to funk ourselves
- filter-flags '-mabi*' -m31 -m32 -m64
-
- filter-flags -frecord-gcc-switches # 490738
- filter-flags -mno-rtm -mno-htm # 506202
-
- if tc_version_is_between 3.2 3.4 ; then
- # XXX: this is so outdated it's barely useful, but it don't hurt...
- replace-cpu-flags G3 750
- replace-cpu-flags G4 7400
- replace-cpu-flags G5 7400
-
- # XXX: should add a sed or something to query all supported flags
- # from the gcc source and trim everything else ...
- filter-flags -f{no-,}unit-at-a-time -f{no-,}web -mno-tls-direct-seg-refs
- filter-flags -f{no-,}stack-protector{,-all}
- filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
- fi
-
- if tc_version_is_at_least 3.4 ; then
- case $(tc-arch) in
- amd64|x86)
- filter-flags '-mcpu=*'
-
- tc_version_is_between 4.4 4.5 && append-flags -mno-avx # 357287
-
- if tc_version_is_between 4.6 4.7 ; then
- # https://bugs.gentoo.org/411333
- # https://bugs.gentoo.org/466454
- replace-cpu-flags c3-2 pentium2 pentium3 pentium3m pentium-m i686
- fi
- ;;
- alpha)
- # https://bugs.gentoo.org/454426
- append-ldflags -Wl,--no-relax
- ;;
- sparc)
- # temporary workaround for random ICEs reproduced by multiple users
- # https://bugs.gentoo.org/457062
- tc_version_is_between 4.6 4.8 && MAKEOPTS+=" -j1"
- ;;
- *-macos)
- # http://gcc.gnu.org/PR25127
- tc_version_is_between 4.0 4.2 && \
- filter-flags '-mcpu=*' '-march=*' '-mtune=*'
- ;;
- esac
- fi
-
- strip-unsupported-flags
-
- # these are set here so we have something sane at configure time
- if is_crosscompile ; then
- # Set this to something sane for both native and target
- CFLAGS="-O2 -pipe"
- FFLAGS=${CFLAGS}
- FCFLAGS=${CFLAGS}
-
- local VAR="CFLAGS_"${CTARGET//-/_}
- CXXFLAGS=${!VAR}
- fi
-
- export GCJFLAGS=${GCJFLAGS:-${CFLAGS}}
-}
-
-setup_minispecs_gcc_build_specs() {
- # Setup the "build.specs" file for gcc 4.3 to use when building.
- if hardened_gcc_works pie ; then
- cat "${WORKDIR}"/specs/pie.specs >> "${WORKDIR}"/build.specs
- fi
- if hardened_gcc_works ssp ; then
- for s in ssp sspall ; do
- cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
- done
- fi
- for s in nostrict znow ; do
- cat "${WORKDIR}"/specs/${s}.specs >> "${WORKDIR}"/build.specs
- done
- export GCC_SPECS="${WORKDIR}"/build.specs
-}
-
-gcc-multilib-configure() {
- if ! is_multilib ; then
- confgcc+=( --disable-multilib )
- # Fun times: if we are building for a target that has multiple
- # possible ABI formats, and the user has told us to pick one
- # that isn't the default, then not specifying it via the list
- # below will break that on us.
- else
- confgcc+=( --enable-multilib )
- fi
-
- # translate our notion of multilibs into gcc's
- local abi list
- for abi in $(get_all_abis TARGET) ; do
- local l=$(gcc-abi-map ${abi})
- [[ -n ${l} ]] && list+=",${l}"
- done
- if [[ -n ${list} ]] ; then
- case ${CTARGET} in
- x86_64*)
- tc_version_is_at_least 4.7 && confgcc+=( --with-multilib-list=${list:1} )
- ;;
- esac
- fi
-}
-
-gcc-abi-map() {
- # Convert the ABI name we use in Gentoo to what gcc uses
- local map=()
- case ${CTARGET} in
- mips*) map=("o32 32" "n32 n32" "n64 64") ;;
- x86_64*) map=("amd64 m64" "x86 m32" "x32 mx32") ;;
- esac
-
- local m
- for m in "${map[@]}" ; do
- l=( ${m} )
- [[ $1 == ${l[0]} ]] && echo ${l[1]} && break
- done
-}
-
-#----> src_compile <----
-
-toolchain_src_compile() {
- case ${EAPI:-0} in
- 0|1) toolchain_src_configure ;;
- esac
-
- touch "${S}"/gcc/c-gperf.h
-
- # Do not make manpages if we do not have perl ...
- [[ ! -x /usr/bin/perl ]] \
- && find "${WORKDIR}"/build -name '*.[17]' | xargs touch
-
- gcc_do_make ${GCC_MAKE_TARGET}
-}
-
-gcc_do_make() {
- # This function accepts one optional argument, the make target to be used.
- # If omitted, gcc_do_make will try to guess whether it should use all,
- # or bootstrap-lean depending on CTARGET and arch.
- # An example of how to use this function:
- #
- # gcc_do_make all-target-libstdc++-v3
-
- [[ -n ${1} ]] && GCC_MAKE_TARGET=${1}
-
- # default target
- if is_crosscompile || tc-is-cross-compiler ; then
- # 3 stage bootstrapping doesnt quite work when you cant run the
- # resulting binaries natively ^^;
- GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
- else
- GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
- fi
-
- # Older versions of GCC could not do profiledbootstrap in parallel due to
- # collisions with profiling info.
- # boundschecking also seems to introduce parallel build issues.
- if [[ ${GCC_MAKE_TARGET} == "profiledbootstrap" ]] || use_if_iuse boundschecking ; then
- ! tc_version_is_at_least 4.6 && export MAKEOPTS="${MAKEOPTS} -j1"
- fi
-
- if [[ ${GCC_MAKE_TARGET} == "all" ]] ; then
- STAGE1_CFLAGS=${STAGE1_CFLAGS-"${CFLAGS}"}
- elif [[ $(gcc-version) == "3.4" && ${GCC_BRANCH_VER} == "3.4" ]] && gcc-specs-ssp ; then
- # See bug #79852
- STAGE1_CFLAGS=${STAGE1_CFLAGS-"-O2"}
- fi
-
- if is_crosscompile; then
- # In 3.4, BOOT_CFLAGS is never used on a crosscompile...
- # but I'll leave this in anyways as someone might have had
- # some reason for putting it in here... --eradicator
- BOOT_CFLAGS=${BOOT_CFLAGS-"-O2"}
- else
- # we only want to use the system's CFLAGS if not building a
- # cross-compiler.
- BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
- fi
-
- einfo "Compiling ${PN} (${GCC_MAKE_TARGET})..."
-
- pushd "${WORKDIR}"/build >/dev/null
-
- emake \
- LDFLAGS="${LDFLAGS}" \
- STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
- LIBPATH="${LIBPATH}" \
- BOOT_CFLAGS="${BOOT_CFLAGS}" \
- ${GCC_MAKE_TARGET} \
- || die "emake failed with ${GCC_MAKE_TARGET}"
-
- if ! is_crosscompile && use cxx && use_if_iuse doc ; then
- if type -p doxygen > /dev/null ; then
- if tc_version_is_at_least 4.3 ; then
- cd "${CTARGET}"/libstdc++-v3/doc
- emake doc-man-doxygen || ewarn "failed to make docs"
- elif tc_version_is_at_least 3.0 ; then
- cd "${CTARGET}"/libstdc++-v3
- emake doxygen-man || ewarn "failed to make docs"
- fi
- else
- ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed"
- fi
- fi
-
- popd >/dev/null
-}
-
-#---->> src_test <<----
-
-toolchain_src_test() {
- if use regression-test ; then
- cd "${WORKDIR}"/build
- emake -k check
- fi
-}
-
-#---->> src_install <<----
-
-toolchain_src_install() {
- cd "${WORKDIR}"/build
-
- # Do allow symlinks in private gcc include dir as this can break the build
- find gcc/include*/ -type l -delete
-
- # Copy over the info pages. We disabled their generation earlier, but the
- # build system only expects to install out of the build dir, not the source. #464008
- mkdir -p gcc/doc
- local x=
- for x in "${S}"/gcc/doc/*.info* ; do
- if [[ -f ${x} ]] ; then
- cp "${x}" gcc/doc/ || die
- fi
- done
-
- # Remove generated headers, as they can cause things to break
- # (ncurses, openssl, etc).
- while read x ; do
- grep -q 'It has been auto-edited by fixincludes from' "${x}" \
- && rm -f "${x}"
- done < <(find gcc/include*/ -name '*.h')
-
- # Do the 'make install' from the build directory
- S="${WORKDIR}"/build emake -j1 DESTDIR="${D}" install || die
-
- # Punt some tools which are really only useful while building gcc
- find "${D}" -name install-tools -prune -type d -exec rm -rf "{}" \;
- # This one comes with binutils
- find "${D}" -name libiberty.a -delete
-
- # Move the libraries to the proper location
- gcc_movelibs
-
- # Basic sanity check
- if ! is_crosscompile ; then
- local EXEEXT
- eval $(grep ^EXEEXT= "${WORKDIR}"/build/gcc/config.log)
- [[ -r ${D}${BINPATH}/gcc${EXEEXT} ]] || die "gcc not found in ${D}"
- fi
-
- dodir /etc/env.d/gcc
- create_gcc_env_entry
-
- # Setup the gcc_env_entry for hardened gcc 4 with minispecs
- want_minispecs && copy_minispecs_gcc_specs
-
- # Make sure we dont have stuff lying around that
- # can nuke multiple versions of gcc
- gcc_slot_java
-
- dodir /usr/bin
- cd "${D}"${BINPATH}
- # Ugh: we really need to auto-detect this list.
- # It's constantly out of date.
- for x in cpp gcc g++ c++ gcov g77 gcj gcjh gfortran gccgo ; do
- # For some reason, g77 gets made instead of ${CTARGET}-g77...
- # this should take care of that
- [[ -f ${x} ]] && mv ${x} ${CTARGET}-${x}
-
- if [[ -f ${CTARGET}-${x} ]] ; then
- if ! is_crosscompile ; then
- ln -sf ${CTARGET}-${x} ${x}
- dosym ${BINPATH}/${CTARGET}-${x} \
- /usr/bin/${x}-${GCC_CONFIG_VER}
- fi
- # Create versioned symlinks
- dosym ${BINPATH}/${CTARGET}-${x} \
- /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
- fi
-
- if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
- rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
- ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
- fi
- done
-
- # Now do the fun stripping stuff
- env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
- env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
- # gcc used to install helper binaries in lib/ but then moved to libexec/
- [[ -d ${D}${PREFIX}/libexec/gcc ]] && \
- env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}"
-
- cd "${S}"
- if is_crosscompile; then
- rm -rf "${D}"/usr/share/{man,info}
- rm -rf "${D}"${DATAPATH}/{man,info}
- else
- if tc_version_is_at_least 3.0 ; then
- local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man)
- if [[ -d ${cxx_mandir} ]] ; then
- # clean bogus manpages #113902
- find "${cxx_mandir}" -name '*_build_*' -exec rm {} \;
- cp -r "${cxx_mandir}"/man? "${D}/${DATAPATH}"/man/
- fi
- fi
- has noinfo ${FEATURES} \
- && rm -r "${D}/${DATAPATH}"/info \
- || prepinfo "${DATAPATH}"
- has noman ${FEATURES} \
- && rm -r "${D}/${DATAPATH}"/man \
- || prepman "${DATAPATH}"
- fi
- # prune empty dirs left behind
- find "${D}" -depth -type d -delete 2>/dev/null
-
- # install testsuite results
- if use regression-test; then
- docinto testsuite
- find "${WORKDIR}"/build -type f -name "*.sum" -print0 | xargs -0 dodoc
- find "${WORKDIR}"/build -type f -path "*/testsuite/*.log" -print0 \
- | xargs -0 dodoc
- fi
-
- # Rather install the script, else portage with changing $FILESDIR
- # between binary and source package borks things ....
- if ! is_crosscompile ; then
- insinto "${DATAPATH}"
- if tc_version_is_at_least 4.0 ; then
- newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die
- find "${D}/${LIBPATH}" -name libstdc++.la -type f -exec rm "{}" \;
- find "${D}/${LIBPATH}" -name "lib?san.la" -type f -exec rm "{}" \; # 487550
- else
- doins "${GCC_FILESDIR}"/awk/fixlafiles.awk || die
- fi
- exeinto "${DATAPATH}"
- doexe "${GCC_FILESDIR}"/fix_libtool_files.sh || die
- doexe "${GCC_FILESDIR}"/c{89,99} || die
- fi
-
- # Use gid of 0 because some stupid ports don't have
- # the group 'root' set to gid 0. Send to /dev/null
- # for people who are testing as non-root.
- chown -R root:0 "${D}"${LIBPATH} 2>/dev/null
-
- # Move pretty-printers to gdb datadir to shut ldconfig up
- local py gdbdir=/usr/share/gdb/auto-load${LIBPATH/\/lib\//\/$(get_libdir)\/}
- pushd "${D}"${LIBPATH} >/dev/null
- for py in $(find . -name '*-gdb.py') ; do
- local multidir=${py%/*}
- insinto "${gdbdir}/${multidir}"
- sed -i "/^libdir =/s:=.*:= '${LIBPATH}/${multidir}':" "${py}" || die #348128
- doins "${py}" || die
- rm "${py}" || die
- done
- popd >/dev/null
-
- # Don't scan .gox files for executable stacks - false positives
- export QA_EXECSTACK="usr/lib*/go/*/*.gox"
- export QA_WX_LOAD="usr/lib*/go/*/*.gox"
-
- # Disable RANDMMAP so PCH works. #301299
- if tc_version_is_at_least 4.3 ; then
- pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1"
- pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus"
- fi
-}
-
-# Move around the libs to the right location. For some reason,
-# when installing gcc, it dumps internal libraries into /usr/lib
-# instead of the private gcc lib path
-gcc_movelibs() {
- # older versions of gcc did not support --print-multi-os-directory
- tc_version_is_at_least 3.2 || return 0
-
- local x multiarg removedirs=""
- for multiarg in $($(XGCC) -print-multi-lib) ; do
- multiarg=${multiarg#*;}
- multiarg=${multiarg//@/ -}
-
- local OS_MULTIDIR=$($(XGCC) ${multiarg} --print-multi-os-directory)
- local MULTIDIR=$($(XGCC) ${multiarg} --print-multi-directory)
- local TODIR=${D}${LIBPATH}/${MULTIDIR}
- local FROMDIR=
-
- [[ -d ${TODIR} ]] || mkdir -p ${TODIR}
-
- for FROMDIR in \
- ${LIBPATH}/${OS_MULTIDIR} \
- ${LIBPATH}/../${MULTIDIR} \
- ${PREFIX}/lib/${OS_MULTIDIR} \
- ${PREFIX}/${CTARGET}/lib/${OS_MULTIDIR}
- do
- removedirs="${removedirs} ${FROMDIR}"
- FROMDIR=${D}${FROMDIR}
- if [[ ${FROMDIR} != "${TODIR}" && -d ${FROMDIR} ]] ; then
- local files=$(find "${FROMDIR}" -maxdepth 1 ! -type d 2>/dev/null)
- if [[ -n ${files} ]] ; then
- mv ${files} "${TODIR}"
- fi
- fi
- done
- fix_libtool_libdir_paths "${LIBPATH}/${MULTIDIR}"
-
- # SLOT up libgcj.pc if it's available (and let gcc-config worry about links)
- FROMDIR="${PREFIX}/lib/${OS_MULTIDIR}"
- for x in "${D}${FROMDIR}"/pkgconfig/libgcj*.pc ; do
- [[ -f ${x} ]] || continue
- sed -i "/^libdir=/s:=.*:=${LIBPATH}/${MULTIDIR}:" "${x}"
- mv "${x}" "${D}${FROMDIR}"/pkgconfig/libgcj-${GCC_PV}.pc || die
- done
- done
-
- # We remove directories separately to avoid this case:
- # mv SRC/lib/../lib/*.o DEST
- # rmdir SRC/lib/../lib/
- # mv SRC/lib/../lib32/*.o DEST # Bork
- for FROMDIR in ${removedirs} ; do
- rmdir "${D}"${FROMDIR} >& /dev/null
- done
- find "${D}" -type d | xargs rmdir >& /dev/null
-}
-
-# make sure the libtool archives have libdir set to where they actually
-# -are-, and not where they -used- to be. also, any dependencies we have
-# on our own .la files need to be updated.
-fix_libtool_libdir_paths() {
- pushd "${D}" >/dev/null
-
- pushd "./${1}" >/dev/null
- local dir="${PWD#${D%/}}"
- local allarchives=$(echo *.la)
- allarchives="\(${allarchives// /\\|}\)"
- popd >/dev/null
-
- sed -i \
- -e "/^libdir=/s:=.*:='${dir}':" \
- ./${dir}/*.la
- sed -i \
- -e "/^dependency_libs=/s:/[^ ]*/${allarchives}:${LIBPATH}/\1:g" \
- $(find ./${PREFIX}/lib* -maxdepth 3 -name '*.la') \
- ./${dir}/*.la
-
- popd >/dev/null
-}
-
-create_gcc_env_entry() {
- dodir /etc/env.d/gcc
- local gcc_envd_base="/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}"
-
- local gcc_specs_file
- local gcc_envd_file="${D}${gcc_envd_base}"
- if [[ -z $1 ]] ; then
- # I'm leaving the following commented out to remind me that it
- # was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset
- # on chroot or in non-toolchain.eclass gcc ebuilds!
- #gcc_specs_file="${LIBPATH}/specs"
- gcc_specs_file=""
- else
- gcc_envd_file+="-$1"
- gcc_specs_file="${LIBPATH}/$1.specs"
- fi
-
- # We want to list the default ABI's LIBPATH first so libtool
- # searches that directory first. This is a temporary
- # workaround for libtool being stupid and using .la's from
- # conflicting ABIs by using the first one in the search path
- local ldpaths mosdirs
- if tc_version_is_at_least 3.2 ; then
- local mdir mosdir abi ldpath
- for abi in $(get_all_abis TARGET) ; do
- mdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) --print-multi-directory)
- ldpath=${LIBPATH}
- [[ ${mdir} != "." ]] && ldpath+="/${mdir}"
- ldpaths="${ldpath}${ldpaths:+:${ldpaths}}"
-
- mosdir=$($(XGCC) $(get_abi_CFLAGS ${abi}) -print-multi-os-directory)
- mosdirs="${mosdir}${mosdirs:+:${mosdirs}}"
- done
- else
- # Older gcc's didn't do multilib, so logic is simple.
- ldpaths=${LIBPATH}
- fi
-
- cat <<-EOF > ${gcc_envd_file}
- PATH="${BINPATH}"
- ROOTPATH="${BINPATH}"
- GCC_PATH="${BINPATH}"
- LDPATH="${ldpaths}"
- MANPATH="${DATAPATH}/man"
- INFOPATH="${DATAPATH}/info"
- STDCXX_INCDIR="${STDCXX_INCDIR##*/}"
- CTARGET="${CTARGET}"
- GCC_SPECS="${gcc_specs_file}"
- MULTIOSDIRS="${mosdirs}"
- EOF
-}
-
-copy_minispecs_gcc_specs() {
- # setup the hardenedno* specs files and the vanilla specs file.
- if hardened_gcc_works ; then
- create_gcc_env_entry hardenednopiessp
- fi
- if hardened_gcc_works pie ; then
- create_gcc_env_entry hardenednopie
- fi
- if hardened_gcc_works ssp ; then
- create_gcc_env_entry hardenednossp
- fi
- create_gcc_env_entry vanilla
- insinto ${LIBPATH}
- doins "${WORKDIR}"/specs/*.specs || die "failed to install specs"
- # Build system specs file which, if it exists, must be a complete set of
- # specs as it completely and unconditionally overrides the builtin specs.
- if ! tc_version_is_at_least 4.4 ; then
- $(XGCC) -dumpspecs > "${WORKDIR}"/specs/specs
- cat "${WORKDIR}"/build.specs >> "${WORKDIR}"/specs/specs
- doins "${WORKDIR}"/specs/specs || die "failed to install the specs file"
- fi
-}
-
-gcc_slot_java() {
- local x
-
- # Move Java headers to compiler-specific dir
- for x in "${D}"${PREFIX}/include/gc*.h "${D}"${PREFIX}/include/j*.h ; do
- [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/include/
- done
- for x in gcj gnu java javax org ; do
- if [[ -d ${D}${PREFIX}/include/${x} ]] ; then
- dodir /${LIBPATH}/include/${x}
- mv -f "${D}"${PREFIX}/include/${x}/* "${D}"${LIBPATH}/include/${x}/
- rm -rf "${D}"${PREFIX}/include/${x}
- fi
- done
-
- if [[ -d ${D}${PREFIX}/lib/security ]] || [[ -d ${D}${PREFIX}/$(get_libdir)/security ]] ; then
- dodir /${LIBPATH}/security
- mv -f "${D}"${PREFIX}/lib*/security/* "${D}"${LIBPATH}/security
- rm -rf "${D}"${PREFIX}/lib*/security
- fi
-
- # Move random gcj files to compiler-specific directories
- for x in libgcj.spec logging.properties ; do
- x="${D}${PREFIX}/lib/${x}"
- [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/
- done
-
- # Rename jar because it could clash with Kaffe's jar if this gcc is
- # primary compiler (aka don't have the -<version> extension)
- cd "${D}"${BINPATH}
- [[ -f jar ]] && mv -f jar gcj-jar
-}
-
-#---->> pkg_post* <<----
-
-toolchain_pkg_postinst() {
- do_gcc_config
-
- if ! is_crosscompile ; then
- echo
- ewarn "If you have issues with packages unable to locate libstdc++.la,"
- ewarn "then try running 'fix_libtool_files.sh' on the old gcc versions."
- echo
- ewarn "You might want to review the GCC upgrade guide when moving between"
- ewarn "major versions (like 4.2 to 4.3):"
- ewarn "http://www.gentoo.org/doc/en/gcc-upgrading.xml"
- echo
-
- # Clean up old paths
- rm -f "${ROOT}"/*/rcscripts/awk/fixlafiles.awk "${ROOT}"/sbin/fix_libtool_files.sh
- rmdir "${ROOT}"/*/rcscripts{/awk,} 2>/dev/null
-
- mkdir -p "${ROOT}"/usr/{share/gcc-data,sbin,bin}
- cp "${ROOT}/${DATAPATH}"/fixlafiles.awk "${ROOT}"/usr/share/gcc-data/ || die
- cp "${ROOT}/${DATAPATH}"/fix_libtool_files.sh "${ROOT}"/usr/sbin/ || die
-
- # Since these aren't critical files and portage sucks with
- # handling of binpkgs, don't require these to be found
- cp "${ROOT}/${DATAPATH}"/c{89,99} "${ROOT}"/usr/bin/ 2>/dev/null
- fi
-
- if use regression-test ; then
- elog "Testsuite results have been installed into /usr/share/doc/${PF}/testsuite"
- echo
- fi
-
- if [[ -n ${PRERELEASE}${SNAPSHOT} ]] ; then
- einfo "This GCC ebuild is provided for your convenience, and the use"
- einfo "of this compiler is not supported by the Gentoo Developers."
- einfo "Please report bugs to upstream at http://gcc.gnu.org/bugzilla/"
- fi
-}
-
-toolchain_pkg_postrm() {
- # to make our lives easier (and saner), we do the fix_libtool stuff here.
- # rather than checking SLOT's and trying in upgrade paths, we just see if
- # the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
- # unmerging. if it does, that means this was a simple re-emerge.
-
- # clean up the cruft left behind by cross-compilers
- if is_crosscompile ; then
- if [[ -z $(ls "${ROOT}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then
- rm -f "${ROOT}"/etc/env.d/gcc/config-${CTARGET}
- rm -f "${ROOT}"/etc/env.d/??gcc-${CTARGET}
- rm -f "${ROOT}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64}
- fi
- return 0
- fi
-
- # ROOT isnt handled by the script
- [[ ${ROOT} != "/" ]] && return 0
-
- if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then
- # make sure the profile is sane during same-slot upgrade #289403
- do_gcc_config
-
- einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'"
- /usr/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}
- if [[ -n ${BRANCH_UPDATE} ]] ; then
- einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}'"
- /usr/sbin/fix_libtool_files.sh ${GCC_RELEASE_VER}-${BRANCH_UPDATE}
- fi
- fi
-
- return 0
-}
-
-do_gcc_config() {
- if ! should_we_gcc_config ; then
- env -i ROOT="${ROOT}" gcc-config --use-old --force
- return 0
- fi
-
- local current_gcc_config="" current_specs="" use_specs=""
-
- current_gcc_config=$(env -i ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>/dev/null)
- if [[ -n ${current_gcc_config} ]] ; then
- # figure out which specs-specific config is active
- current_specs=$(gcc-config -S ${current_gcc_config} | awk '{print $3}')
- [[ -n ${current_specs} ]] && use_specs=-${current_specs}
- fi
- if [[ -n ${use_specs} ]] && \
- [[ ! -e ${ROOT}/etc/env.d/gcc/${CTARGET}-${GCC_CONFIG_VER}${use_specs} ]]
- then
- ewarn "The currently selected specs-specific gcc config,"
- ewarn "${current_specs}, doesn't exist anymore. This is usually"
- ewarn "due to enabling/disabling hardened or switching to a version"
- ewarn "of gcc that doesnt create multiple specs files. The default"
- ewarn "config will be used, and the previous preference forgotten."
- use_specs=""
- fi
-
- gcc-config ${CTARGET}-${GCC_CONFIG_VER}${use_specs}
-}
-
-should_we_gcc_config() {
- # if the current config is invalid, we definitely want a new one
- # Note: due to bash quirkiness, the following must not be 1 line
- local curr_config
- curr_config=$(env -i ROOT="${ROOT}" gcc-config -c ${CTARGET} 2>&1) || return 0
-
- # if the previously selected config has the same major.minor (branch) as
- # the version we are installing, then it will probably be uninstalled
- # for being in the same SLOT, make sure we run gcc-config.
- local curr_config_ver=$(env -i ROOT="${ROOT}" gcc-config -S ${curr_config} | awk '{print $2}')
-
- local curr_branch_ver=$(get_version_component_range 1-2 ${curr_config_ver})
-
- # If we're using multislot, just run gcc-config if we're installing
- # to the same profile as the current one.
- use multislot && return $([[ ${curr_config_ver} == ${GCC_CONFIG_VER} ]])
-
- if [[ ${curr_branch_ver} == ${GCC_BRANCH_VER} ]] ; then
- return 0
- else
- # if we're installing a genuinely different compiler version,
- # we should probably tell the user -how- to switch to the new
- # gcc version, since we're not going to do it for him/her.
- # We don't want to switch from say gcc-3.3 to gcc-3.4 right in
- # the middle of an emerge operation (like an 'emerge -e world'
- # which could install multiple gcc versions).
- # Only warn if we're installing a pkg as we might be called from
- # the pkg_{pre,post}rm steps. #446830
- if [[ ${EBUILD_PHASE} == *"inst" ]] ; then
- einfo "The current gcc config appears valid, so it will not be"
- einfo "automatically switched for you. If you would like to"
- einfo "switch to the newly installed gcc version, do the"
- einfo "following:"
- echo
- einfo "gcc-config ${CTARGET}-${GCC_CONFIG_VER}"
- einfo "source /etc/profile"
- echo
- fi
- return 1
- fi
-}
-
-#---->> support and misc functions <<----
-
-# This is to make sure we don't accidentally try to enable support for a
-# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc.
-#
-# Also add a hook so special ebuilds (kgcc64) can control which languages
-# exactly get enabled
-gcc-lang-supported() {
- grep ^language=\"${1}\" "${S}"/gcc/*/config-lang.in > /dev/null || return 1
- [[ -z ${TOOLCHAIN_ALLOWED_LANGS} ]] && return 0
- has $1 ${TOOLCHAIN_ALLOWED_LANGS}
-}
-
-is_ada() {
- gcc-lang-supported ada || return 1
- use ada
-}
-
-is_cxx() {
- gcc-lang-supported 'c++' || return 1
- ! is_crosscompile && tc_version_is_at_least 4.8 && return 0
- use cxx
-}
-
-is_d() {
- gcc-lang-supported d || return 1
- use_if_iuse d
-}
-
-is_f77() {
- gcc-lang-supported f77 || return 1
- use fortran
-}
-
-is_f95() {
- gcc-lang-supported f95 || return 1
- use fortran
-}
-
-is_fortran() {
- gcc-lang-supported fortran || return 1
- use fortran
-}
-
-is_gcj() {
- gcc-lang-supported java || return 1
- use cxx && use_if_iuse gcj
-}
-
-is_go() {
- gcc-lang-supported go || return 1
- use cxx && use_if_iuse go
-}
-
-is_multilib() {
- tc_version_is_at_least 3 || return 1
- use multilib
-}
-
-is_objc() {
- gcc-lang-supported objc || return 1
- use_if_iuse objc
-}
-
-is_objcxx() {
- gcc-lang-supported 'obj-c++' || return 1
- use cxx && use_if_iuse objc++
-}
-
-# Grab a variable from the build system (taken from linux-info.eclass)
-get_make_var() {
- local var=$1 makefile=${2:-${WORKDIR}/build/Makefile}
- echo -e "e:\\n\\t@echo \$(${var})\\ninclude ${makefile}" | \
- r=${makefile%/*} emake --no-print-directory -s -f - 2>/dev/null
-}
-
-XGCC() { get_make_var GCC_FOR_TARGET ; }
-
-# The gentoo piessp patches allow for 3 configurations:
-# 1) PIE+SSP by default
-# 2) PIE by default
-# 3) SSP by default
-hardened_gcc_works() {
- if [[ $1 == "pie" ]] ; then
- # $gcc_cv_ld_pie is unreliable as it simply take the output of
- # `ld --help | grep -- -pie`, that reports the option in all cases, also if
- # the loader doesn't actually load the resulting executables.
- # To avoid breakage, blacklist FreeBSD here at least
- [[ ${CTARGET} == *-freebsd* ]] && return 1
-
- want_pie || return 1
- use_if_iuse nopie && return 1
- hardened_gcc_is_stable pie
- return $?
- elif [[ $1 == "ssp" ]] ; then
- [[ -n ${SPECS_VER} ]] || return 1
- use_if_iuse nossp && return 1
- hardened_gcc_is_stable ssp
- return $?
- else
- # laziness ;)
- hardened_gcc_works pie || return 1
- hardened_gcc_works ssp || return 1
- return 0
- fi
-}
-
-hardened_gcc_is_stable() {
- local tocheck
- if [[ $1 == "pie" ]] ; then
- if [[ ${CTARGET} == *-uclibc* ]] ; then
- tocheck=${PIE_UCLIBC_STABLE}
- elif [[ ${CTARGET} == *-musl* ]] ; then
- tocheck=${PIE_MUSL_STABLE}
- elif [[ ${CTARGET} == *-gnu* ]] ; then
- tocheck=${PIE_GLIBC_STABLE}
- fi
- elif [[ $1 == "ssp" ]] ; then
- if [[ ${CTARGET} == *-uclibc* ]] ; then
- tocheck=${SSP_UCLIBC_STABLE}
- elif [[ ${CTARGET} == *-musl* ]] ; then
- tocheck=${SSP_MUSL_STABLE}
- elif [[ ${CTARGET} == *-gnu* ]] ; then
- tocheck=${SSP_STABLE}
- fi
- else
- die "hardened_gcc_stable needs to be called with pie or ssp"
- fi
-
- has $(tc-arch) ${tocheck} && return 0
- return 1
-}
-
-want_minispecs() {
- if tc_version_is_at_least 4.3.2 && use hardened ; then
- if ! want_pie ; then
- ewarn "PIE_VER or SPECS_VER is not defined in the GCC ebuild."
- elif use vanilla ; then
- ewarn "You will not get hardened features if you have the vanilla USE-flag."
- elif use nopie && use nossp ; then
- ewarn "You will not get hardened features if you have the nopie and nossp USE-flag."
- elif ! hardened_gcc_works ; then
- ewarn "Your $(tc-arch) arch is not supported."
- else
- return 0
- fi
- ewarn "Hope you know what you are doing. Hardened will not work."
- return 0
- fi
- return 1
-}
-
-want_pie() {
- ! use hardened && [[ -n ${PIE_VER} ]] && use nopie && return 1
- [[ -n ${PIE_VER} ]] && [[ -n ${SPECS_VER} ]] && return 0
- tc_version_is_at_least 4.3.2 && return 1
- [[ -z ${PIE_VER} ]] && return 1
- use !nopie && return 0
- return 1
-}
-
-has toolchain_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" toolchain_death_notice"
-toolchain_death_notice() {
- if [[ -e "${WORKDIR}"/build ]] ; then
- pushd "${WORKDIR}"/build >/dev/null
- (echo '' | $(tc-getCC ${CTARGET}) ${CFLAGS} -v -E - 2>&1) > gccinfo.log
- [[ -e "${T}"/build.log ]] && cp "${T}"/build.log .
- tar jcf "${WORKDIR}"/gcc-build-logs.tar.bz2 \
- gccinfo.log build.log $(find -name config.log)
- rm gccinfo.log build.log
- eerror
- eerror "Please include ${WORKDIR}/gcc-build-logs.tar.bz2 in your bug report."
- eerror
- popd >/dev/null
- fi
-}
diff --git a/gnome-base/libgtop/files/libgtop-musl.patch b/gnome-base/libgtop/files/libgtop-musl.patch
deleted file mode 100644
index c8bb40f..0000000
--- a/gnome-base/libgtop/files/libgtop-musl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur libgtop-2.28.5.orig/sysdeps/linux/netload.c libgtop-2.28.5/sysdeps/linux/netload.c
---- libgtop-2.28.5.orig/sysdeps/linux/netload.c 2013-07-27 12:40:23.000000000 +0000
-+++ libgtop-2.28.5/sysdeps/linux/netload.c 2014-06-18 12:05:40.024216274 +0000
-@@ -34,8 +34,6 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-
--#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
--/* GNU LibC */
- #include <net/if.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/in.h>
-@@ -43,14 +41,6 @@
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
- #include <net/if.h>
--#else /* Libc 5 */
--#include <linux/if.h>
--#include <linux/in.h>
--#include <linux/ip.h>
--#include <linux/icmp.h>
--#include <linux/tcp.h>
--#include <linux/udp.h>
--#endif
-
-
- #ifdef HAVE_IFADDRS_H
diff --git a/gnome-base/libgtop/libgtop-2.28.5-r99.ebuild b/gnome-base/libgtop/libgtop-2.28.5-r99.ebuild
deleted file mode 100644
index ec25292..0000000
--- a/gnome-base/libgtop/libgtop-2.28.5-r99.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.28.5.ebuild,v 1.10 2014/05/17 15:31:27 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="http://developer.gnome.org/libgtop/stable/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="debug +introspection"
-
-RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-musl.patch
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog NEWS README"
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
diff --git a/gnome-base/libgtop/libgtop-2.30.0-r99.ebuild b/gnome-base/libgtop/libgtop-2.30.0-r99.ebuild
deleted file mode 100644
index b09a665..0000000
--- a/gnome-base/libgtop/libgtop-2.30.0-r99.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgtop/libgtop-2.30.0.ebuild,v 1.1 2014/05/31 10:19:20 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="http://developer.gnome.org/libgtop/stable/"
-
-LICENSE="GPL-2"
-SLOT="2/10" # libgtop soname version
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="debug +introspection"
-
-RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-musl.patch
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml
deleted file mode 100644
index 3147d74..0000000
--- a/gnome-base/libgtop/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnome</herd>
-<use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
- introspection</flag>
-</use>
-</pkgmetadata>
diff --git a/mail-client/mailx-support/files/mailx-support-20030215-gentoo.patch b/mail-client/mailx-support/files/mailx-support-20030215-gentoo.patch
deleted file mode 100644
index 829b858..0000000
--- a/mail-client/mailx-support/files/mailx-support-20030215-gentoo.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- - 2003-02-15 23:35:46.000000000 +0800
-+++ locking.c 2003-02-15 23:19:11.000000000 +0800
-@@ -45,6 +45,7 @@
- #include <stdarg.h>
- #include "pathnames.h"
- #include "mail.local.h"
-+#include "open_with_exlock.h"
-
- static char lpath[MAXPATHLEN];
-
-@@ -93,7 +94,7 @@
- }
- goto again;
- }
-- if ((lfd = open(lpath, O_CREAT|O_WRONLY|O_EXCL|O_EXLOCK,
-+ if ((lfd = open_with_exlock(lpath, O_CREAT|O_WRONLY|O_EXCL,
- S_IRUSR|S_IWUSR)) != -1)
- break;
- again:
-@@ -104,7 +105,7 @@
- return(-1);
- }
- if (tries > 9 &&
-- (lfd = open(lpath, O_WRONLY|O_EXLOCK, 0)) != -1) {
-+ (lfd = open_with_exlock(lpath, O_WRONLY, 0)) != -1) {
- if (fstat(lfd, &fsb) != -1 &&
- lstat(lpath, &sb) != -1) {
- if (fsb.st_dev == sb.st_dev &&
-@@ -169,3 +170,4 @@
- if (isfatal)
- exit(1);
- }
-+
---- - 2003-02-15 23:37:13.000000000 +0800
-+++ mail.local.c 2003-02-15 23:20:50.000000000 +0800
-@@ -66,6 +66,7 @@
- #include <string.h>
- #include "pathnames.h"
- #include "mail.local.h"
-+#include "open_with_exlock.h"
-
- int
- main(int argc, char *argv[])
-@@ -218,7 +219,7 @@
- merr(NOTFATAL, "%s: %s", path, strerror(errno));
- goto bad;
- }
-- if ((mbfd = open(path, O_APPEND|O_CREAT|O_EXCL|O_WRONLY|O_EXLOCK,
-+ if ((mbfd = open_with_exlock(path, O_APPEND|O_CREAT|O_EXCL|O_WRONLY,
- S_IRUSR|S_IWUSR)) < 0) {
- if (errno == EEXIST) {
- /* file appeared since lstat */
-@@ -244,7 +245,7 @@
- merr(NOTFATAL, "%s: linked or special file", path);
- goto bad;
- }
-- if ((mbfd = open(path, O_APPEND|O_WRONLY|O_EXLOCK,
-+ if ((mbfd = open_with_exlock(path, O_APPEND|O_WRONLY,
- S_IRUSR|S_IWUSR)) < 0) {
- merr(NOTFATAL, "%s: %s", path, strerror(errno));
- goto bad;
-@@ -340,3 +341,4 @@
- {
- merr(FATAL, "usage: mail.local [-lL] [-f from] user ...");
- }
-+
diff --git a/mail-client/mailx-support/files/mailx-support-20060102-add-sys_file_h.patch b/mail-client/mailx-support/files/mailx-support-20060102-add-sys_file_h.patch
deleted file mode 100644
index b3b871b..0000000
--- a/mail-client/mailx-support/files/mailx-support-20060102-add-sys_file_h.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Naur mailx-support-20060102.orig/open_with_exlock.c mailx-support-20060102/open_with_exlock.c
---- mailx-support-20060102.orig/open_with_exlock.c 2003-06-09 19:01:08.000000000 +0000
-+++ mailx-support-20060102/open_with_exlock.c 2014-04-01 12:17:31.830213927 +0000
-@@ -1,4 +1,5 @@
- #include <fcntl.h>
-+#include <sys/file.h>
-
- int open_with_exlock(const char *path, int flags, mode_t mode)
- {
diff --git a/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch b/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch
deleted file mode 100644
index 42aa569..0000000
--- a/mail-client/mailx-support/files/mailx-support-20060102-respect-ldflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: mailx-support-20060102/Makefile
-===================================================================
---- mailx-support-20060102.orig/Makefile
-+++ mailx-support-20060102/Makefile
-@@ -17,10 +17,10 @@ clean:
- ${RM} -f ${PRODUCTS} *.o
-
- mail.local: mail.local.o locking.o open_with_exlock.o
-- ${CC} ${CFLAGS} -o $@ $^
-+ ${CC} ${LDFLAGS} ${CFLAGS} -o $@ $^
-
- lockspool: lockspool.o locking.o open_with_exlock.o
-- ${CC} ${CFLAGS} -o $@ $^
-+ ${CC} ${LDFLAGS} ${BINDNOW_FLAGS} ${CFLAGS} -o $@ $^
-
- .c.o:
- ${CC} ${CFLAGS} -c -o $@ $^
-
diff --git a/mail-client/mailx-support/mailx-support-20060102-r99.ebuild b/mail-client/mailx-support/mailx-support-20060102-r99.ebuild
deleted file mode 100644
index 60eb5a3..0000000
--- a/mail-client/mailx-support/mailx-support-20060102-r99.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx-support/mailx-support-20060102-r1.ebuild,v 1.17 2013/02/17 20:46:43 zmedico Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Provides lockspool utility"
-HOMEPAGE="http://www.openbsd.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-respect-ldflags.patch
- epatch "${FILESDIR}"/${P}-add-sys_file_h.patch
-
- # This code should only be ran with Gentoo Prefix profiles
- if use prefix; then
- ebegin "Allowing unprivileged install"
- sed -i -e "s|-g 0 -o 0||g" Makefile
- eend $?
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" BINDNOW_FLAGS="" || die "emake failed"
-}
-
-src_install() {
- einstall || die "einstall failed"
-}
diff --git a/mail-client/mailx-support/metadata.xml b/mail-client/mailx-support/metadata.xml
deleted file mode 100644
index 51f94e3..0000000
--- a/mail-client/mailx-support/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/mail-mta/exim/exim-4.84-r99.ebuild b/mail-mta/exim/exim-4.84-r99.ebuild
deleted file mode 100644
index e160456..0000000
--- a/mail-mta/exim/exim-4.84-r99.ebuild
+++ /dev/null
@@ -1,513 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.84.ebuild,v 1.17 2015/03/21 21:18:34 jlec Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X"
-REQUIRED_USE="spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )"
-
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
- mirror://gentoo/system_filter.exim.gz
- doc? ( ${COMM_URI}/${PN}-html-${PV//rc/RC}.tar.bz2 )"
-HOMEPAGE="http://www.exim.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~mips x86"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
- >=sys-libs/db-3.2
- dev-libs/libpcre
- perl? ( dev-lang/perl:= )
- pam? ( virtual/pam )
- tcpd? ( sys-apps/tcp-wrappers )
- ssl? ( dev-libs/openssl )
- gnutls? ( net-libs/gnutls[pkcs11?]
- dev-libs/libtasn1 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
- sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
- redis? ( dev-libs/hiredis )
- spf? ( >=mail-filter/libspf2-1.2.5-r1 )
- dmarc? ( mail-filter/opendmarc )
- srs? ( mail-filter/libsrs_alt )
- X? ( x11-proto/xproto
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXt
- x11-libs/libXaw
- )
- sqlite? ( dev-db/sqlite )
- radius? ( net-dialup/radiusclient )
- virtual/libiconv
- "
- # added X check for #57206
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/mini-qmail
- !<mail-mta/msmtp-1.4.19-r1
- !>=mail-mta/msmtp-1.4.19-r1[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/postfix
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/mailwrapper
- >=net-mail/mailbase-0.00-r5
- virtual/logger
- dcc? ( mail-filter/dcc )
- selinux? ( sec-policy/selinux-exim )
- "
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
- epatch "${FILESDIR}"/exim-4.14-tail.patch
- epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
- epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
- epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
- epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
- epatch "${FILESDIR}"/exim-4.77-as-needed-ldflags.patch # 352265, 391279
- epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-
- if use maildir ; then
- epatch "${FILESDIR}"/exim-4.20-maildir.patch
- else
- epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
- fi
-
- # user Exim believes it should be
- MAILUSER=mail
- MAILGROUP=mail
- if use prefix && [[ ${EUID} != 0 ]] ; then
- MAILUSER=$(id -un)
- MAILGROUP=$(id -gn)
- fi
-}
-
-src_configure() {
- # general config and paths
-
- sed -i.orig \
- -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
- "${S}"/src/configure.default || die
-
- sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
- sed -e "48i\CFLAGS=${CFLAGS}" \
- -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
- -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
- -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:" \
- -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
- -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
- src/EDITME > Local/Makefile
-
- if use elibc_musl; then
- sed -e 's/^LIBS = -lnsl/LIBS =/g' \
- -e 's/^HAVE_ICONV=yes/#HAVE_ICONV=yes/' \
- -i OS/Makefile-Linux
- fi
-
- cd Local
-
- cat >> Makefile <<- EOC
- INFO_DIRECTORY=${EPREFIX}/usr/share/info
- PID_FILE_PATH=${EPREFIX}/run/exim.pid
- SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
- EOC
-
- # if we use libiconv, now is the time to tell so
- use !elibc_glibc && use !elibc_musl && echo "EXTRALIBS_EXIM=-liconv" >> Makefile
-
- # support for IPv6
- if use ipv6; then
- cat >> Makefile <<- EOC
- HAVE_IPV6=YES
- EOC
- fi
-
- #
- # mail storage formats
-
- # mailstore is Exim's traditional storage format
- cat >> Makefile <<- EOC
- SUPPORT_MAILSTORE=yes
- EOC
-
- # mbox
- if use mbx; then
- cat >> Makefile <<- EOC
- SUPPORT_MBX=yes
- EOC
- fi
-
- # maildir
- if use maildir; then
- cat >> Makefile <<- EOC
- SUPPORT_MAILDIR=yes
- EOC
- fi
-
- #
- # lookup methods
-
- # use the "native" interfaces to the DBM and CDB libraries, support
- # passwd and directory lookups by default
- cat >> Makefile <<- EOC
- USE_DB=yes
- DBMLIB=-ldb
- LOOKUP_CDB=yes
- LOOKUP_PASSWD=yes
- LOOKUP_DSEARCH=yes
- EOC
-
- if ! use dnsdb; then
- # DNSDB lookup is enabled by default
- sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
- fi
-
- if use ldap; then
- cat >> Makefile <<- EOC
- LOOKUP_LDAP=yes
- LDAP_LIB_TYPE=OPENLDAP2
- LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
- LOOKUP_LIBS += -lldap -llber
- EOC
- fi
-
- if use mysql; then
- cat >> Makefile <<- EOC
- LOOKUP_MYSQL=yes
- LOOKUP_INCLUDE += $(mysql_config --include)
- LOOKUP_LIBS += $(mysql_config --libs)
- EOC
- fi
-
- if use nis; then
- cat >> Makefile <<- EOC
- LOOKUP_NIS=yes
- LOOKUP_NISPLUS=yes
- EOC
- fi
-
- if use postgres; then
- cat >> Makefile <<- EOC
- LOOKUP_PGSQL=yes
- LOOKUP_INCLUDE += -I$(pg_config --includedir)
- LOOKUP_LIBS += -L$(pg_config --libdir) -lpq
- EOC
- fi
-
- if use sqlite; then
- cat >> Makefile <<- EOC
- LOOKUP_SQLITE=yes
- LOOKUP_SQLITE_PC=sqlite3
- EOC
- fi
-
- if use redis; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_REDIS=yes
- LOOKUP_LIBS += -lhiredis
- EOC
- fi
-
- #
- # Exim monitor, enabled by default, controlled via X USE-flag,
- # disable if not requested, bug #46778
- if use X; then
- cp ../exim_monitor/EDITME eximon.conf || die
- else
- sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile
- fi
-
- #
- # features
-
- # content scanning support
- if use exiscan-acl; then
- cat >> Makefile <<- EOC
- WITH_CONTENT_SCAN=yes
- WITH_OLD_DEMIME=yes
- EOC
- fi
-
- # DomainKeys Identified Mail, RFC4871
- if ! use dkim; then
- # DKIM is enabled by default
- cat >> Makefile <<- EOC
- DISABLE_DKIM=yes
- EOC
- fi
-
- # Per-Recipient-Data-Response
- if ! use prdr; then
- # PRDR is enabled by default
- cat >> Makefile <<- EOC
- DISABLE_PRDR=yes
- EOC
- fi
-
- # log to syslog
- if use syslog; then
- sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
- cat >> Makefile <<- EOC
- LOG_FILE_PATH=syslog
- EOC
- else
- cat >> Makefile <<- EOC
- LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log
- EOC
- fi
-
- # starttls support (ssl)
- if use ssl; then
- echo "SUPPORT_TLS=yes" >> Makefile
- if use gnutls; then
- echo "USE_GNUTLS=yes" >> Makefile
- echo "USE_GNUTLS_PC=gnutls" >> Makefile
- use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile
- else
- echo "USE_OPENSSL_PC=openssl" >> Makefile
- fi
- fi
-
- # TCP wrappers
- if use tcpd; then
- cat >> Makefile <<- EOC
- USE_TCP_WRAPPERS=yes
- EXTRALIBS_EXIM += -lwrap
- EOC
- fi
-
- # Light Mail Transport Protocol
- if use lmtp; then
- cat >> Makefile <<- EOC
- TRANSPORT_LMTP=yes
- EOC
- fi
-
- # embedded Perl
- if use perl; then
- cat >> Makefile <<- EOC
- EXIM_PERL=perl.o
- EOC
- fi
-
- # dlfunc
- if use dlfunc; then
- cat >> Makefile <<- EOC
- EXPAND_DLFUNC=yes
- EOC
- fi
-
- #
- # experimental features
-
- # Distributed Checksum Clearinghouse
- if use dcc; then
- echo "EXPERIMENTAL_DCC=yes">> Makefile
- fi
-
- # Sender Policy Framework
- if use spf; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_SPF=yes
- EXTRALIBS_EXIM += -lspf2
- EOC
- fi
-
- # Sender Rewriting Scheme
- if use srs; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_SRS=yes
- EXTRALIBS_EXIM += -lsrs_alt
- EOC
- fi
-
- # DMARC
- if use dmarc; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_DMARC=yes
- EXTRALIBS_EXIM += -lopendmarc
- EOC
- fi
-
- # Transport post-delivery actions
- if use tpda; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_TPDA=yes
- EOC
- fi
-
- # Proxy Protocol
- if use proxy; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_PROXY=yes
- EOC
- fi
-
- # Delivery Sender Notifications
- if use dsn; then
- cat >> Makefile <<- EOC
- EXPERIMENTAL_DSN=yes
- EOC
- fi
-
- #
- # authentication (SMTP AUTH)
-
- # standard bits
- cat >> Makefile <<- EOC
- AUTH_SPA=yes
- AUTH_CRAM_MD5=yes
- AUTH_PLAINTEXT=yes
- EOC
-
- # Cyrus SASL
- if use sasl; then
- cat >> Makefile <<- EOC
- CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux
- AUTH_CYRUS_SASL=yes
- AUTH_LIBS += -lsasl2
- EOC
- fi
-
- # Dovecot
- if use dovecot-sasl; then
- cat >> Makefile <<- EOC
- AUTH_DOVECOT=yes
- EOC
- fi
-
- # Pluggable Authentication Modules
- if use pam; then
- cat >> Makefile <<- EOC
- SUPPORT_PAM=yes
- AUTH_LIBS += -lpam
- EOC
- fi
-
- # Radius
- if use radius; then
- cat >> Makefile <<- EOC
- RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf
- RADIUS_LIB_TYPE=RADIUSCLIENT
- AUTH_LIBS += -lradiusclient
- EOC
- fi
-}
-
-src_compile() {
- emake -j1 CC="$(tc-getCC)" HOSTCC="$(tc-getCC $CBUILD)" \
- AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \
- || die "make failed"
-}
-
-src_install () {
- cd "${S}"/build-exim-gentoo || die
- dosbin exim
- if use X; then
- dosbin eximon.bin
- dosbin eximon
- fi
- fperms 4755 /usr/sbin/exim
-
- dosym exim /usr/sbin/sendmail
- dosym exim /usr/sbin/rsmtp
- dosym exim /usr/sbin/rmail
- dosym /usr/sbin/exim /usr/bin/mailq
- dosym /usr/sbin/exim /usr/bin/newaliases
- dosym /usr/sbin/sendmail /usr/lib/sendmail
-
- for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \
- exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \
- convert4r3 convert4r4 exipick
- do
- dosbin $i
- done
-
- dodoc "${S}"/doc/*
- doman "${S}"/doc/exim.8
- use dsn && dodoc "${S}"/README.DSN
- use doc && dohtml -r "${WORKDIR}"/${PN}-html-${PV//rc/RC}/doc/html/spec_html/*
-
- # conf files
- insinto /etc/exim
- newins "${S}"/src/configure.default exim.conf.dist
- if use exiscan-acl; then
- newins "${S}"/src/configure.default exim.conf.exiscan-acl
- fi
- doins "${WORKDIR}"/system_filter.exim
- doins "${FILESDIR}"/auth_conf.sub
-
- pamd_mimic system-auth exim auth account
-
- # headers, #436406
- if use dlfunc ; then
- # fixup includes so they actually can be found when including
- sed -i \
- -e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \
- local_scan.h || die
- insinto /usr/include/exim
- doins {config,local_scan}.h ../src/{mytypes,store}.h
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/exim.logrotate" exim
-
- newinitd "${FILESDIR}"/exim.rc8 exim
- newconfd "${FILESDIR}"/exim.confd exim
-
- systemd_dounit "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket}
- systemd_newunit "${FILESDIR}"/exim_at.service 'exim@.service'
- systemd_newunit "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service'
-
- DIROPTIONS="-m 0750 -o ${MAILUSER} -g ${MAILGROUP}"
- dodir /var/log/${PN}
-}
-
-pkg_postinst() {
- if [[ ! -f ${EROOT}etc/exim/exim.conf ]] ; then
- einfo "${EROOT}etc/exim/system_filter.exim is a sample system_filter."
- einfo "${EROOT}etc/exim/auth_conf.sub contains the configuration sub for using smtp auth."
- einfo "Please create ${EROOT}etc/exim/exim.conf from ${EROOT}etc/exim/exim.conf.dist."
- fi
- if use dcc ; then
- einfo "DCC support is experimental, you can find some limited"
- einfo "documentation at the bottom of this prerelease message:"
- einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
- fi
- use spf && einfo "SPF support is experimental"
- use srs && einfo "SRS support is experimental"
- if use dmarc ; then
- einfo "DMARC support is experimental. See global settings to"
- einfo "configure DMARC, for usage see the documentation at "
- einfo "experimental-spec.txt."
- fi
- use tpda && einfo "TPDA support is experimental"
- use proxy && einfo "proxy support is experimental"
- if use dsn ; then
- einfo "Starting from Exim 4.83, DSN support comes from upstream."
- einfo "DSN support is an experimental feature. If you used DSN"
- einfo "support prior to 4.83, make sure to remove all dsn_process"
- einfo "switches from your routers, see http://bugs.gentoo.org/511818"
- fi
- einfo "Exim maintains some db files under its spool directory that need"
- einfo "cleaning from time to time. (${EROOT}var/spool/exim/db)"
- einfo "Please use the exim_tidydb tool as documented in the Exim manual:"
- einfo "http://www.exim.org/exim-html-current/doc/html/spec_html/ch-exim_utilities.html#SECThindatmai"
-}
diff --git a/mail-mta/exim/files/auth_conf.sub b/mail-mta/exim/files/auth_conf.sub
deleted file mode 100644
index 24434a7..0000000
--- a/mail-mta/exim/files/auth_conf.sub
+++ /dev/null
@@ -1,25 +0,0 @@
-######################################################################
-# AUTHENTICATION CONFIGURATION #
-######################################################################
-# If you're using PAM to authenticate, lifes real simple.
-# This plain directive works for nearly everything except windows MUA's the
-# login directive will allow you to authenticate your Outlook 2000 and
-# outlook express clients.
-
-
-
-plain:
- driver = plaintext
- public_name = PLAIN
- server_condition = "${if pam{$2:$3}{1}{0}}"
- server_set_id = $2
-
-login:
- driver = plaintext
- public_name = LOGIN
- server_prompts = "Username:: : Password::"
- server_condition = "${if pam{$1:${sg{$2}{:}{::}}}{1}{0}}"
- server_set_id = $1
-#
-# FIXME
-# Need to add authenticator for SPA!!
diff --git a/mail-mta/exim/files/exim-4.14-tail.patch b/mail-mta/exim/files/exim-4.14-tail.patch
deleted file mode 100644
index 481dca9..0000000
--- a/mail-mta/exim/files/exim-4.14-tail.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Configure-config.h.orig 2003-07-17 18:01:19.000000000 -0400
-+++ scripts/Configure-config.h 2003-07-17 18:01:25.000000000 -0400
-@@ -41,7 +41,7 @@
-
- # Double-check that config.h is complete.
-
--if [ "`tail -1 config.h`" != "/* End of config.h */" ] ; then
-+if [ "`tail -n 1 config.h`" != "/* End of config.h */" ] ; then
- echo "*** config.h appears to be incomplete"
- echo "*** unexpected failure in buildconfig program"
- exit 1
diff --git a/mail-mta/exim/files/exim-4.20-maildir.patch b/mail-mta/exim/files/exim-4.20-maildir.patch
deleted file mode 100644
index 3cb198d..0000000
--- a/mail-mta/exim/files/exim-4.20-maildir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN ./exim-4.20.orig/src/configure.default exim-4.20/src/configure.default
---- ./exim-4.20.orig/src/configure.default 2003-06-27 16:48:22.000000000 -0700
-+++ exim-4.20/src/configure.default 2003-06-27 16:52:20.000000000 -0700
-@@ -451,7 +451,9 @@
-
- local_delivery:
- driver = appendfile
-- file = /var/mail/$local_part
-+# file = /var/mail/$local_part
-+ directory = /home/$local_part/.maildir
-+ maildir_format
- delivery_date_add
- envelope_to_add
- return_path_add
diff --git a/mail-mta/exim/files/exim-4.69-r1.27021.patch b/mail-mta/exim/files/exim-4.69-r1.27021.patch
deleted file mode 100644
index 804e16d..0000000
--- a/mail-mta/exim/files/exim-4.69-r1.27021.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN exim-4.69.orig/src/configure.default exim-4.69/src/configure.default
---- exim-4.69.orig/src/configure.default 2008-05-05 10:17:44.000000000 +0100
-+++ exim-4.69/src/configure.default 2008-05-05 10:18:26.000000000 +0100
-@@ -592,6 +592,22 @@
- pipe_transport = address_pipe
- reply_transport = address_reply
-
-+# This router runs procmail if users have a .procmailrc file
-+procmail:
-+ check_local_user
-+ driver = accept
-+ transport = procmail_pipe
-+ require_files = ${local_part}:+${home}:+${home}/.procmailrc:+/usr/bin/procmail
-+ no_verify
-+
-+# This router runs maildrop if users have a .mailfilter file
-+maildrop:
-+ check_local_user
-+ driver = accept
-+ transport = maildrop_pipe
-+ require_files = ${local_part}:+${home}:+${home}/.mailfilter:+/usr/bin/maildrop
-+ no_verify
-+
-
- # This router matches local user mailboxes. If the router fails, the error
- # message is "Unknown user".
-@@ -676,6 +692,21 @@
- address_reply:
- driver = autoreply
-
-+# This transport is used for procmail
-+procmail_pipe:
-+ driver = pipe
-+ command = "/usr/bin/procmail -d ${local_part}"
-+ return_path_add
-+ delivery_date_add
-+ envelope_to_add
-+
-+# This transport is used for courier-maildrop filtering (Maildir filter system)
-+maildrop_pipe:
-+ driver = pipe
-+ command = "/usr/bin/maildrop -d ${local_part}"
-+ return_path_add
-+ delivery_date_add
-+ envelope_to_add
-
-
- ######################################################################
diff --git a/mail-mta/exim/files/exim-4.74-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.74-localscan_dlopen.patch
deleted file mode 100644
index 3bb57c1..0000000
--- a/mail-mta/exim/files/exim-4.74-localscan_dlopen.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -Naur exim-4.32/src/EDITME exim-4.32-dlopen/src/EDITME
---- src/EDITME 2004-04-15 08:27:01.000000000 +0000
-+++ src/EDITME 2004-05-06 16:15:47.000000000 +0000
-@@ -505,6 +505,24 @@
-
-
- #------------------------------------------------------------------------------
-+# On systems which support dynamic loading of shared libraries, Exim can
-+# load a local_scan function specified in its config file instead of having
-+# to be recompiled with the desired local_scan function. For a full
-+# description of the API to this function, see the Exim specification.
-+
-+DLOPEN_LOCAL_SCAN=yes
-+
-+# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the
-+# linker flags. Without it, the loaded .so won't be able to access any
-+# functions from exim.
-+
-+LFLAGS = -rdynamic
-+ifeq ($(OSTYPE),Linux)
-+LFLAGS += -ldl
-+endif
-+
-+
-+#------------------------------------------------------------------------------
- # The default distribution of Exim contains only the plain text form of the
- # documentation. Other forms are available separately. If you want to install
- # the documentation in "info" format, first fetch the Texinfo documentation
-diff -Naur exim-4.32/src/config.h.defaults exim-4.32-dlopen/src/config.h.defaults
---- src/config.h.defaults 2004-04-15 08:27:01.000000000 +0000
-+++ src/config.h.defaults 2004-05-06 16:16:30.000000000 +0000
-@@ -20,6 +20,8 @@
- #define AUTH_PLAINTEXT
- #define AUTH_SPA
-
-+#define DLOPEN_LOCAL_SCAN
-+
- #define BIN_DIRECTORY
-
- #define CONFIGURE_FILE
-diff -Naur exim-4.32/src/globals.c exim-4.32-dlopen/src/globals.c
---- src/globals.c 2004-04-15 08:27:01.000000000 +0000
-+++ src/globals.c 2004-05-06 16:17:07.000000000 +0000
-@@ -109,6 +109,10 @@
- uschar *tls_verify_hosts = NULL;
- #endif
-
-+#ifdef DLOPEN_LOCAL_SCAN
-+uschar *local_scan_path = NULL;
-+#endif
-+
-
- /* Input-reading functions for messages, so we can use special ones for
- incoming TCP/IP. The defaults use stdin. We never need these for any
-diff -Naur exim-4.32/src/globals.h exim-4.32-dlopen/src/globals.h
---- src/globals.h 2004-04-15 08:27:01.000000000 +0000
-+++ src/globals.h 2004-05-06 16:17:50.000000000 +0000
-@@ -73,6 +73,9 @@
- extern uschar *tls_verify_hosts; /* Mandatory client verification */
- #endif
-
-+#ifdef DLOPEN_LOCAL_SCAN
-+extern uschar *local_scan_path; /* Path to local_scan() library */
-+#endif
-
- /* Input-reading functions for messages, so we can use special ones for
- incoming TCP/IP. */
-diff -Naur exim-4.32/src/local_scan.c exim-4.32-dlopen/src/local_scan.c
---- src/local_scan.c 2004-04-15 08:27:01.000000000 +0000
-+++ src/local_scan.c 2004-05-06 16:21:57.000000000 +0000
-@@ -5,60 +5,131 @@
- /* Copyright (c) University of Cambridge 1995 - 2004 */
- /* See the file NOTICE for conditions of use and distribution. */
-
-+#include "exim.h"
-
--/******************************************************************************
--This file contains a template local_scan() function that just returns ACCEPT.
--If you want to implement your own version, you should copy this file to, say
--Local/local_scan.c, and edit the copy. To use your version instead of the
--default, you must set
--
--LOCAL_SCAN_SOURCE=Local/local_scan.c
--
--in your Local/Makefile. This makes it easy to copy your version for use with
--subsequent Exim releases.
--
--For a full description of the API to this function, see the Exim specification.
--******************************************************************************/
--
--
--/* This is the only Exim header that you should include. The effect of
--including any other Exim header is not defined, and may change from release to
--release. Use only the documented interface! */
--
--#include "local_scan.h"
--
--
--/* This is a "do-nothing" version of a local_scan() function. The arguments
--are:
--
-- fd The file descriptor of the open -D file, which contains the
-- body of the message. The file is open for reading and
-- writing, but modifying it is dangerous and not recommended.
--
-- return_text A pointer to an unsigned char* variable which you can set in
-- order to return a text string. It is initialized to NULL.
--
--The return values of this function are:
--
-- LOCAL_SCAN_ACCEPT
-- The message is to be accepted. The return_text argument is
-- saved in $local_scan_data.
--
-- LOCAL_SCAN_REJECT
-- The message is to be rejected. The returned text is used
-- in the rejection message.
--
-- LOCAL_SCAN_TEMPREJECT
-- This specifies a temporary rejection. The returned text
-- is used in the rejection message.
--*/
-+#ifdef DLOPEN_LOCAL_SCAN
-+#include <dlfcn.h>
-+static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
-+static int load_local_scan_library(void);
-+#endif
-
- int
- local_scan(int fd, uschar **return_text)
- {
- fd = fd; /* Keep picky compilers happy */
- return_text = return_text;
--return LOCAL_SCAN_ACCEPT;
-+#ifdef DLOPEN_LOCAL_SCAN
-+/* local_scan_path is defined AND not the empty string */
-+if (local_scan_path && *local_scan_path)
-+ {
-+ if (!local_scan_fn)
-+ {
-+ if (!load_local_scan_library())
-+ {
-+ char *base_msg , *error_msg , *final_msg ;
-+ int final_length = -1 ;
-+
-+ base_msg=US"Local configuration error - local_scan() library failure\n";
-+ error_msg = dlerror() ;
-+
-+ final_length = strlen(base_msg) + strlen(error_msg) + 1 ;
-+ final_msg = (char*)malloc( final_length*sizeof(char) ) ;
-+ *final_msg = '\0' ;
-+
-+ strcat( final_msg , base_msg ) ;
-+ strcat( final_msg , error_msg ) ;
-+
-+ *return_text = final_msg ;
-+ return LOCAL_SCAN_TEMPREJECT;
-+ }
-+ }
-+ return local_scan_fn(fd, return_text);
-+ }
-+else
-+#endif
-+ return LOCAL_SCAN_ACCEPT;
-+}
-+
-+#ifdef DLOPEN_LOCAL_SCAN
-+
-+static int load_local_scan_library(void)
-+{
-+/* No point in keeping local_scan_lib since we'll never dlclose() anyway */
-+void *local_scan_lib = NULL;
-+int (*local_scan_version_fn)(void);
-+int vers_maj;
-+int vers_min;
-+
-+local_scan_lib = dlopen(local_scan_path, RTLD_NOW);
-+if (!local_scan_lib)
-+ {
-+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - "
-+ "message temporarily rejected");
-+ return FALSE;
-+ }
-+
-+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major");
-+if (!local_scan_version_fn)
-+ {
-+ dlclose(local_scan_lib);
-+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
-+ "local_scan_version_major() function - message temporarily rejected");
-+ return FALSE;
-+ }
-+
-+/* The major number is increased when the ABI is changed in a non
-+ backward compatible way. */
-+vers_maj = local_scan_version_fn();
-+
-+local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor");
-+if (!local_scan_version_fn)
-+ {
-+ dlclose(local_scan_lib);
-+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
-+ "local_scan_version_minor() function - message temporarily rejected");
-+ return FALSE;
-+ }
-+
-+/* The minor number is increased each time a new feature is added (in a
-+ way that doesn't break backward compatibility) -- Marc */
-+vers_min = local_scan_version_fn();
-+
-+
-+if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR)
-+ {
-+ dlclose(local_scan_lib);
-+ local_scan_lib = NULL;
-+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major"
-+ "version number, you need to recompile your module for this version"
-+ "of exim (The module was compiled for version %d.%d and this exim provides"
-+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
-+ LOCAL_SCAN_ABI_VERSION_MINOR);
-+ return FALSE;
-+ }
-+else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR)
-+ {
-+ dlclose(local_scan_lib);
-+ local_scan_lib = NULL;
-+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor"
-+ "version number, you need to recompile your module for this version"
-+ "of exim (The module was compiled for version %d.%d and this exim provides"
-+ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR,
-+ LOCAL_SCAN_ABI_VERSION_MINOR);
-+ return FALSE;
-+ }
-+
-+local_scan_fn = dlsym(local_scan_lib, "local_scan");
-+if (!local_scan_fn)
-+ {
-+ dlclose(local_scan_lib);
-+ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain "
-+ "local_scan() function - message temporarily rejected");
-+ return FALSE;
-+ }
-+
-+return TRUE;
- }
-
-+#endif /* DLOPEN_LOCAL_SCAN */
-+
- /* End of local_scan.c */
-diff -Naur exim-4.32/src/readconf.c exim-4.32-dlopen/src/readconf.c
---- src/readconf.c 2004-04-15 08:27:01.000000000 +0000
-+++ src/readconf.c 2004-05-06 16:23:12.000000000 +0000
-@@ -223,6 +223,9 @@
- { "local_from_prefix", opt_stringptr, &local_from_prefix },
- { "local_from_suffix", opt_stringptr, &local_from_suffix },
- { "local_interfaces", opt_stringptr, &local_interfaces },
-+#ifdef DLOPEN_LOCAL_SCAN
-+ { "local_scan_path", opt_stringptr, &local_scan_path },
-+#endif
- { "local_scan_timeout", opt_time, &local_scan_timeout },
- { "local_sender_retain", opt_bool, &local_sender_retain },
- { "localhost_number", opt_stringptr, &host_number_string },
diff --git a/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch b/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch
deleted file mode 100644
index 247668e..0000000
--- a/mail-mta/exim/files/exim-4.74-radius-db-ENV-clash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Nasty workaround for
-http://bugs.gentoo.org/show_bug.cgi?id=287426
-
---- src/auths/call_radius.c
-+++ src/auths/call_radius.c
-@@ -10,6 +10,16 @@
- /* This file was originally supplied by Ian Kirk. The libradius support came
- from Alex Kiernan. */
-
-+/* ugly hack to work around redefinition of ENV by radiusclient.h and
-+ * db.h: define _DB_H_ so the db.h include thinks it's already included,
-+ * we can get away with it like this, since this file doesn't use any db
-+ * functions. */
-+#ifndef _DB_H_
-+#define _DB_H_ 1
-+#define _DB_EXT_PROT_IN_ 1
-+#define DB void
-+#endif
-+
- #include "../exim.h"
-
- /* This module contains functions that call the Radius authentication
diff --git a/mail-mta/exim/files/exim-4.76-crosscompile.patch b/mail-mta/exim/files/exim-4.76-crosscompile.patch
deleted file mode 100644
index cf47ade..0000000
--- a/mail-mta/exim/files/exim-4.76-crosscompile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=266591
-
---- OS/Makefile-Base
-+++ OS/Makefile-Base
-@@ -114,8 +114,8 @@
-
- # Targets for special-purpose configuration header builders
- buildconfig: buildconfig.c
-- @echo "$(CC) buildconfig.c"
-- $(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
-+ @echo "$(HOSTCC) buildconfig.c"
-+ $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
-
-
- # Target for the exicyclog utility script
diff --git a/mail-mta/exim/files/exim-4.76-dsn.patch b/mail-mta/exim/files/exim-4.76-dsn.patch
deleted file mode 100644
index 8a608ba..0000000
--- a/mail-mta/exim/files/exim-4.76-dsn.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366835
-https://sourceforge.net/tracker/?func=detail&aid=3300653&group_id=121058&atid=689120
-
---- exim_469_dsn_1_3.patch
-+++ exim_469_dsn_1_3.patch
-@@ -524,10 +524,10 @@
- diff -urN exim-4.69-orig/src/readconf.c exim-4.69-dsn/src/readconf.c
- --- exim-4.69-orig/src/readconf.c 2007-08-23 12:01:49.000000000 +0100
- +++ exim-4.69-dsn/src/readconf.c 2008-07-28 09:52:55.000000000 +0100
--@@ -207,6 +207,9 @@
-- { "dns_ipv4_lookup", opt_stringptr, &dns_ipv4_lookup },
-+@@ -219,6 +219,9 @@
- { "dns_retrans", opt_time, &dns_retrans },
- { "dns_retry", opt_int, &dns_retry },
-+ { "dns_use_edns0", opt_int, &dns_use_edns0 },
- +#ifdef SUPPORT_DSN
- + { "dsn", opt_bool, &dsn },
- +#endif
diff --git a/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch b/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
deleted file mode 100644
index 4eac9aa..0000000
--- a/mail-mta/exim/files/exim-4.77-as-needed-ldflags.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=352265
-
-Make sure LDFLAGS comes first, such that all libraries are considered,
-and not discarded when --as-needed is in effect.
-
-https://bugs.gentoo.org/show_bug.cgi?id=391279
-
-Use LDFLAGS for all targets, not just the exim binary, such that
---as-needed works as well.
-
-
---- OS/Makefile-Base
-+++ OS/Makefile-Base
-@@ -327,12 +327,12 @@
- $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
- rm -f exim
- @echo "$(LNCC) -o exim"
-- $(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
-+ $(FE)$(PURIFY) $(LNCC) -o exim $(LDFLAGS) $(OBJ_EXIM) version.o \
- routers/routers.a transports/transports.a lookups/lookups.a \
- auths/auths.a pdkim/pdkim.a \
- $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
- $(EXTRALIBS_EXIM) $(DBMLIB) $(LOOKUP_LIBS) $(AUTH_LIBS) \
-- $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LDFLAGS)
-+ $(PERL_LIBS) $(TLS_LIBS) $(PCRE_LIBS) $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) exim; \
- $(STRIP_COMMAND) exim; \
-@@ -340,8 +340,8 @@
-
- exim_dumpdb: $(OBJ_DUMPDB)
- @echo "$(LNCC) -o exim_dumpdb"
-- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LFLAGS) $(OBJ_DUMPDB) \
-- $(LIBS) $(EXTRALIBS) $(DBMLIB)
-+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_dumpdb $(LDFLAGS) $(OBJ_DUMPDB) \
-+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) exim_dumpdb; \
- $(STRIP_COMMAND) exim_dumpdb; \
-@@ -355,8 +355,8 @@
-
- exim_fixdb: $(OBJ_FIXDB) auths/auths.a
- @echo "$(LNCC) -o exim_fixdb"
-- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LFLAGS) $(OBJ_FIXDB) \
-- auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB)
-+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_fixdb $(LDFLAGS) $(OBJ_FIXDB) \
-+ auths/auths.a $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) exim_fixdb; \
- $(STRIP_COMMAND) exim_fixdb; \
-@@ -370,8 +370,8 @@
-
- exim_tidydb: $(OBJ_TIDYDB)
- @echo "$(LNCC) -o exim_tidydb"
-- $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LFLAGS) $(OBJ_TIDYDB) \
-- $(LIBS) $(EXTRALIBS) $(DBMLIB)
-+ $(FE)$(LNCC) $(CFLAGS) $(INCLUDE) -o exim_tidydb $(LDFLAGS) $(OBJ_TIDYDB) \
-+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) exim_tidydb; \
- $(STRIP_COMMAND) exim_tidydb; \
-@@ -383,8 +383,8 @@
-
- exim_dbmbuild: exim_dbmbuild.o
- @echo "$(LNCC) -o exim_dbmbuild"
-- $(FE)$(LNCC) -o exim_dbmbuild $(LFLAGS) exim_dbmbuild.o \
-- $(LIBS) $(EXTRALIBS) $(DBMLIB)
-+ $(FE)$(LNCC) -o exim_dbmbuild $(LDFLAGS) exim_dbmbuild.o \
-+ $(LIBS) $(EXTRALIBS) $(DBMLIB) $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) exim_dbmbuild; \
- $(STRIP_COMMAND) exim_dbmbuild; \
-@@ -398,8 +398,8 @@
- @echo "$(CC) exim_lock.c"
- $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) exim_lock.c
- @echo "$(LNCC) -o exim_lock"
-- $(FE)$(LNCC) -o exim_lock $(LFLAGS) exim_lock.o \
-- $(LIBS) $(EXTRALIBS)
-+ $(FE)$(LNCC) -o exim_lock $(LDFLAGS) exim_lock.o \
-+ $(LIBS) $(EXTRALIBS) $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) exim_lock; \
- $(STRIP_COMMAND) exim_lock; \
-@@ -429,9 +429,9 @@
- $(FE)$(CC) -o em_version.o -c \
- $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
- @echo "$(LNCC) -o eximon.bin"
-- $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
-+ $(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LDFLAGS) $(XLFLAGS) \
- $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 $(PCRE_LIBS) \
-- $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
-+ $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc $(LFLAGS)
- @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
- echo $(STRIP_COMMAND) eximon.bin; \
- $(STRIP_COMMAND) eximon.bin; \
-@@ -706,9 +706,9 @@
- test_dbfn: config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \
- string.o tod.o version.o
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c
-- $(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \
-+ $(LNCC) -o test_dbfn $(LDFLAGS) dbfn.o \
- dummies.o sa-globals.o sa-os.o store.o string.o \
-- tod.o version.o $(LIBS) $(DBMLIB)
-+ tod.o version.o $(LIBS) $(DBMLIB) $(LFLAGS)
- rm -f dbfn.o
-
- test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \
-@@ -717,28 +717,28 @@
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST host.c
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dns.c
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE -DTEST_HOST dummies.c
-- $(LNCC) -o test_host $(LFLAGS) \
-+ $(LNCC) -o test_host $(LDFLAGS) \
- host.o child.o dns.o dummies.o sa-globals.o os.o store.o string.o \
-- tod.o tree.o $(LIBS) $(LIBRESOLV)
-+ tod.o tree.o $(LIBS) $(LIBRESOLV) $(LFLAGS)
- rm -f child.o dummies.o host.o dns.o
-
- test_os: os.h os.c dummies.o sa-globals.o store.o string.o tod.o
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE os.c
-- $(LNCC) -o test_os $(LFLAGS) os.o dummies.o \
-- sa-globals.o store.o string.o tod.o $(LIBS)
-+ $(LNCC) -o test_os $(LDFLAGS) os.o dummies.o \
-+ sa-globals.o store.o string.o tod.o $(LIBS) $(LFLAGS)
- rm -f os.o
-
- test_parse: config.h parse.c dummies.o sa-globals.o \
- store.o string.o tod.o version.o
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE parse.c
-- $(LNCC) -o test_parse $(LFLAGS) parse.o \
-- dummies.o sa-globals.o store.o string.o tod.o version.o
-+ $(LNCC) -o test_parse $(LDFLAGS) parse.o \
-+ dummies.o sa-globals.o store.o string.o tod.o version.o $(LFLAGS)
- rm -f parse.o
-
- test_string: config.h string.c dummies.o sa-globals.o store.o tod.o
- $(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE string.c
-- $(LNCC) -o test_string $(LFLAGS) -DSTAND_ALONE string.o \
-- dummies.o sa-globals.o store.o tod.o $(LIBS)
-+ $(LNCC) -o test_string $(LDFLAGS) -DSTAND_ALONE string.o \
-+ dummies.o sa-globals.o store.o tod.o $(LIBS) $(LFLAGS)
- rm -f string.o
-
- # End
diff --git a/mail-mta/exim/files/exim-4.77-makefile-freebsd.patch b/mail-mta/exim/files/exim-4.77-makefile-freebsd.patch
deleted file mode 100644
index f3c0332..0000000
--- a/mail-mta/exim/files/exim-4.77-makefile-freebsd.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- OS/Makefile-FreeBSD
-+++ OS/Makefile-FreeBSD
-@@ -1,12 +1,10 @@
--# Exim: OS-specific make file for FreeBSD
--# There's no setting of CFLAGS here, to allow the system default
--# for "make" to be the default.
--
--PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
--
--CHOWN_COMMAND=/usr/sbin/chown
--STRIP_COMMAND=/usr/bin/strip
--CHMOD_COMMAND=/bin/chmod
-+# Exim: OS-specific FreeBSD make file, modified for Gentoo Prefix
-+
-+
-+BASENAME_COMMAND=look_for_it
-+CHOWN_COMMAND=look_for_it
-+CHGRP_COMMAND=look_for_it
-+CHMOD_COMMAND=look_for_it
-
- HAVE_SA_LEN=YES
-
-@@ -18,23 +16,12 @@
- # Dynamicly loaded modules need to be built with -fPIC
- CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
-
--# FreeBSD always ships with Berkeley DB
-+DBMLIB = -ldb
- USE_DB=yes
-
--# This code for building outside ports suggested by Richard Clayton
--.ifdef X11BASE
--X11=${X11BASE}
--.elifdef LOCALBASE
--X11=$(LOCALBASE)
--.else
--X11=/usr/local
--.endif
--
-+X11=/usr/X11R6
- XINCLUDE=-I$(X11)/include
- XLFLAGS=-L$(X11)/lib
--.if ${PORTOBJFORMAT} == "elf"
--XLFLAGS+=-Wl,-rpath,${X11}/lib
--.endif
- X11_LD_LIB=$(X11)/lib
-
- EXIWHAT_PS_ARG=-ax
diff --git a/mail-mta/exim/files/exim-4.80-spool-mail-group.patch b/mail-mta/exim/files/exim-4.80-spool-mail-group.patch
deleted file mode 100644
index 6f88d85..0000000
--- a/mail-mta/exim/files/exim-4.80-spool-mail-group.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Change default such that we run on a stock Gentoo system. Bug #438606
-
---- src/configure.default
-+++ src/configure.default
-@@ -674,8 +674,9 @@
- # BSD mailbox format. By default it will be run under the uid and gid of the
- # local user, and requires the sticky bit to be set on the /var/mail directory.
- # Some systems use the alternative approach of running mail deliveries under a
--# particular group instead of using the sticky bit. The commented options below
--# show how this can be done.
-+# particular group instead of using the sticky bit. This is also the
-+# default case on Gentoo, therefore group and mode are set below.
-+# Comment them out, to get the default behaviour.
-
- local_delivery:
- driver = appendfile
-@@ -683,8 +684,8 @@
- delivery_date_add
- envelope_to_add
- return_path_add
--# group = mail
--# mode = 0660
-+ group = mail
-+ mode = 0660
-
-
- # This transport is used for handling pipe deliveries generated by alias or
diff --git a/mail-mta/exim/files/exim-4.82-makefile-freebsd.patch b/mail-mta/exim/files/exim-4.82-makefile-freebsd.patch
deleted file mode 100644
index 9693d49..0000000
--- a/mail-mta/exim/files/exim-4.82-makefile-freebsd.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- OS/Makefile-FreeBSD.orig 2013-09-30 19:59:09.000000000 +0200
-+++ OS/Makefile-FreeBSD 2013-09-30 20:01:22.000000000 +0200
-@@ -1,10 +1,8 @@
--# Exim: OS-specific make file for FreeBSD
--# There's no setting of CFLAGS here, to allow the system default
--# for "make" to be the default.
--
--CHOWN_COMMAND=/usr/sbin/chown
--STRIP_COMMAND=/usr/bin/strip
--CHMOD_COMMAND=/bin/chmod
-+# Exim: OS-specific FreeBSD make file, modified for Gentoo Prefix
-+
-+CHOWN_COMMAND=look_for_it
-+STRIP_COMMAND=
-+CHMOD_COMMAND=look_for_it
-
- HAVE_SA_LEN=YES
-
-@@ -15,17 +13,9 @@
- CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
-
- # FreeBSD always ships with Berkeley DB
-+DBMLIB = -ldb
- USE_DB=yes
-
--# This code for building outside ports suggested by Richard Clayton
--.ifdef X11BASE
--X11=${X11BASE}
--.elifdef LOCALBASE
--X11=$(LOCALBASE)
--.else
--X11=/usr/local
--.endif
--
- # nb: FreeBSD is entirely elf; objformat was removed prior to FreeBSD 7
- # http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.bin/objformat/Attic/objformat.c
- # deleted Jan 2007.
-@@ -37,6 +27,7 @@
- # switch to default to ELF came with FreeBSD 3. elf(5) claims ELF support
- # introduced in FreeBSD 2.2.6.
- #
-+X11=/usr/X11R6
- XINCLUDE=-I$(X11)/include
- XLFLAGS=-L$(X11)/lib -Wl,-rpath,${X11}/lib
- X11_LD_LIB=$(X11)/lib
diff --git a/mail-mta/exim/files/exim-submission.socket b/mail-mta/exim/files/exim-submission.socket
deleted file mode 100644
index b9593e2..0000000
--- a/mail-mta/exim/files/exim-submission.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Transfer Agent (message submission)
-Conflicts=exim.service
-
-[Socket]
-ListenStream=587
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/mail-mta/exim/files/exim-submission_at.service b/mail-mta/exim/files/exim-submission_at.service
deleted file mode 100644
index 4f90cd8..0000000
--- a/mail-mta/exim/files/exim-submission_at.service
+++ /dev/null
@@ -1,11 +0,0 @@
-# It doesn't make sense for this to be separate from exim@.service
-# However, I couldn't think of a way to have two .socket files point
-# to it ([Socket] Service= is rejected if Accept=yes is set).
-
-[Unit]
-Description=Exim Mail Daemon per-connection server (message submission)
-
-[Service]
-ExecStart=-/usr/bin/exim -bs
-StandardInput=socket
-StandardError=syslog
diff --git a/mail-mta/exim/files/exim.confd b/mail-mta/exim/files/exim.confd
deleted file mode 100644
index 1534d9d..0000000
--- a/mail-mta/exim/files/exim.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Command-line options for running exim
-EXIM_OPTS="-bd -q15m"
-
-# Additional flags passed to exim_tidydb upon start (e.g. -t 7d)
-TIDY_OPTS=""
diff --git a/mail-mta/exim/files/exim.logrotate b/mail-mta/exim/files/exim.logrotate
deleted file mode 100644
index f54f8c4..0000000
--- a/mail-mta/exim/files/exim.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/exim/exim*.log {
- daily
- missingok
- rotate 28
- compress
- delaycompress
- notifempty
- create 640 mail mail
-}
diff --git a/mail-mta/exim/files/exim.rc8 b/mail-mta/exim/files/exim.rc8
deleted file mode 100644
index f84d772..0000000
--- a/mail-mta/exim/files/exim.rc8
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc8,v 1.1 2013/10/08 18:16:18 grobian Exp $
-
-extra_started_commands="reload"
-
-depend() {
- need logger
- use antivirus net
- provide mta
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/exim --pidfile /run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name exim
- eend $?
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile /run/${SVCNAME}.pid --name exim
- eend $?
-}
diff --git a/mail-mta/exim/files/exim.rc9 b/mail-mta/exim/files/exim.rc9
deleted file mode 100644
index c88f653..0000000
--- a/mail-mta/exim/files/exim.rc9
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/files/exim.rc9,v 1.1 2015/05/05 12:55:34 grobian Exp $
-
-extra_started_commands="reload"
-
-depend() {
- need logger
- use antivirus net
- provide mta
-}
-
-tidy_dbs() {
- local spooldir=$(/usr/sbin/exim -C /etc/exim/${SVCNAME}.conf -bP -n spool_directory)
- local db
- local ret=0
- ebegin "Tidying hints databases in ${spooldir}/db"
- for db in "${spooldir}"/db/* ; do
- [[ ${db} == *".lockfile" || ${db} == *"*" ]] && continue
- /usr/sbin/exim_tidydb ${TIDY_OPTS} "${spooldir}" ${db##*/} > /dev/null
- : $((ret += $?))
- done
- eend ${ret}
-}
-
-start() {
- # if you use multiple instances, make sure you set spool_directory
- # in the configfile
- tidy_dbs
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/exim --pidfile /run/${SVCNAME}.pid -- -C /etc/exim/${SVCNAME}.conf ${EXIM_OPTS:--bd -q15m}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile /run/${SVCNAME}.pid --name exim
- eend $?
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP --pidfile /run/${SVCNAME}.pid --name exim
- eend $?
-}
diff --git a/mail-mta/exim/files/exim.service b/mail-mta/exim/files/exim.service
deleted file mode 100644
index c8a61cd..0000000
--- a/mail-mta/exim/files/exim.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Exim Mail Transport Agent
-After=network.target
-
-[Service]
-Environment=QUEUE=15m
-ExecStart=/usr/sbin/exim -bdf -q${QUEUE}
-ExecReload=/bin/kill -HUP $MAINPID
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mail-mta/exim/files/exim.socket b/mail-mta/exim/files/exim.socket
deleted file mode 100644
index 36d2868..0000000
--- a/mail-mta/exim/files/exim.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Transfer Agent
-Conflicts=exim.service
-
-[Socket]
-ListenStream=25
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/mail-mta/exim/files/exim_482_dsn_1_3.patch b/mail-mta/exim/files/exim_482_dsn_1_3.patch
deleted file mode 100644
index c300699..0000000
--- a/mail-mta/exim/files/exim_482_dsn_1_3.patch
+++ /dev/null
@@ -1,1212 +0,0 @@
-Modified for 4.82 by Gentoo -- not the official patch from
-http://sourceforge.net/projects/eximdsn/
-
-diff -Naur exim-4.82_RC5.orig/README.DSN exim-4.82_RC5/README.DSN
---- exim-4.82_RC5.orig/README.DSN 1970-01-01 01:00:00.000000000 +0100
-+++ exim-4.82_RC5/README.DSN 2013-10-27 21:47:32.000000000 +0100
-@@ -0,0 +1,118 @@
-+Exim DSN Patch (4.76)
-+---------------------
-+
-+This patch is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or
-+(at your option) any later version.
-+
-+This patch is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this patch; if not, write to the Free Software
-+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
-+
-+Install
-+-------
-+cd into the source tree for a vanilla exim
-+
-+patch -p1 </path/to/patch/file.patch
-+
-+Example :-
-+[root@linuxbuild exim-4.72-test]# patch -p1 <../exim.dsn.patch-472
-+
-+Expected Output :-
-+patching file README.DSN
-+patching file src/config.h.defaults
-+patching file src/deliver.c
-+patching file src/exim.c
-+patching file src/exim.h
-+patching file src/globals.c
-+patching file src/globals.h
-+patching file src/local_scan.h
-+patching file src/macros.h
-+patching file src/readconf.c
-+patching file src/route.c
-+patching file src/smtp_in.c
-+patching file src/spool_in.c
-+patching file src/spool_out.c
-+patching file src/structs.h
-+patching file src/transport.c
-+patching file src/transports/smtp.c
-+
-+
-+This patch can be included / excluded from the compilation by use of the #define SUPPORT_DSN
-+which gets added into src/config.h.defaults & src/EDITME by the patch.
-+
-+Use
-+---
-+
-+The facility (once compiled in) can be turned on for a particular router via the
-+dsn_process directive Eg :-
-+
-+dest_delivery_int:
-+ driver = manualroute
-+ domains = +relay_to_domains
-+ condition = ${if eq {${lc:$sender_address_domain}}\
-+ {domain.com}\
-+ {yes}{no}\
-+ }
-+ dsn_process
-+ hide route_data = ${lc:${extract{mailHost}{$address_data}{$value}{}}}
-+ transport = remote_smtp
-+
-+Exim will produce 1 of 2 DSN's back to the originator, or pass on the DSN request.
-+The 2 DSN's will either contain (relayed via non "Remote SMTP" router) or
-+(relayed to non-DSN-aware mailer) depending on if the delivery was VIA an SMTP
-+transport or not.
-+
-+
-+Credits
-+-------
-+
-+The original work for the patch was done by Philip Hazel in Exim 3
-+
-+The extract was taken and re-applied to Exim 4 by the following :-
-+Phil Bingham (phil.bingham@cwipapps.net)
-+Steve Falla (steve.falla@cwipapps.net)
-+Ray Edah (ray.edah@cwipapps.net)
-+Andrew Johnson (andrew.johnson@cwippaps.net)
-+Adrian Hungate (adrian.hungate@cwipapps.net)
-+
-+Now Primarily maintained by :-
-+Andrew Johnson (andrew.johnson@cwippaps.net)
-+
-+Contributions
-+-------------
-+Andrey J. Melnikoff (TEMHOTA) (temnota@kmv.ru)
-+
-+
-+ChangeLog
-+---------
-+
-+14-Apr-2006 : Changed subject to "Delivery Status Notification"
-+
-+17-May-2006 : debug_printf in spool-in.c were not wrapped with #ifndef COMPILE_UTILITY
-+ thanks to Andrey J. Melnikoff for this information
-+
-+12-Sep-2006 : Now supports Exim 4.63
-+
-+12-Sep-2006 : src/EDITME did not include the #define SUPPORT_DSN as stated
-+ in the documentation, this has now been corrected
-+ thanks to Robert Kehl for this information
-+
-+28-Jul-2008 : New version for exim 4.69 released.
-+
-+02-Jul-2010 : New version for exim 4.72 released.
-+
-+20-May-2011 : New version for exim 4.76 released.
-+
-+
-+Support for this patch (limited though it is) will only be provided through the SourceForge
-+project page (http://sourceforge.net/projects/eximdsn/)
-+
-+--
-+Andrew Johnson Cable & Wireless
-diff -Naur exim-4.82_RC5.orig/src/config.h.defaults exim-4.82_RC5/src/config.h.defaults
---- exim-4.82_RC5.orig/src/config.h.defaults 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/config.h.defaults 2013-10-27 21:47:32.000000000 +0100
-@@ -136,6 +136,7 @@
- #define SUPPORT_MOVE_FROZEN_MESSAGES
- #define SUPPORT_PAM
- #define SUPPORT_TLS
-+#define SUPPORT_DSN
- #define SUPPORT_TRANSLATE_IP_ADDRESS
-
- #define SYSLOG_LOG_PID
-diff -Naur exim-4.82_RC5.orig/src/deliver.c exim-4.82_RC5/src/deliver.c
---- exim-4.82_RC5.orig/src/deliver.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/deliver.c 2013-10-27 21:47:32.000000000 +0100
-@@ -63,6 +63,9 @@
- static address_item *addr_remote = NULL;
- static address_item *addr_route = NULL;
- static address_item *addr_succeed = NULL;
-+#ifdef SUPPORT_DSN
-+static address_item *addr_dsntmp = NULL;
-+#endif
-
- static FILE *message_log = NULL;
- static BOOL update_spool;
-@@ -2966,6 +2969,15 @@
- addr->flags |= af_prdr_used; break;
- #endif
-
-+ #ifdef SUPPORT_DSN
-+ case 'D':
-+ if (addr == NULL) break;
-+ addr->dsn_aware = (*ptr)? string_copy(ptr) : string_copy(" ");
-+ while (*ptr++);
-+ DEBUG(D_deliver) debug_printf("DSN read: addr->dsn_aware = %s\n", addr->dsn_aware);
-+ break;
-+ #endif
-+
- case 'A':
- if (addr == NULL)
- {
-@@ -4074,6 +4086,15 @@
- if (addr->flags & af_prdr_used) rmt_dlv_checked_write(fd, "P", 1);
- #endif
-
-+ #ifdef SUPPORT_DSN
-+ if (addr->dsn_aware == NULL)
-+ addr->dsn_aware = string_copy(" ");
-+ DEBUG(D_deliver) debug_printf("DSN write: addr->dsn_aware = %s\n", addr->dsn_aware);
-+ sprintf(big_buffer, "D%s", addr->dsn_aware);
-+ DEBUG(D_deliver) debug_printf("DSN write: big_buffer = %s (%d)\n", big_buffer, strlen(big_buffer)+1);
-+ write(fd, big_buffer, strlen(big_buffer)+1);
-+ #endif
-+
- /* Retry information: for most success cases this will be null. */
-
- for (r = addr->retries; r != NULL; r = r->next)
-@@ -5219,6 +5240,14 @@
- if (r->pno >= 0)
- new->onetime_parent = recipients_list[r->pno].address;
-
-+ #ifdef SUPPORT_DSN
-+ /* If DSN support is enabled, set the dsn flags and the original receipt
-+ to be passed on to other DSN enabled MTAs */
-+ new->dsn_flags = r->dsn_flags & rf_dsnflags;
-+ new->dsn_orcpt = r->orcpt;
-+ debug_printf("DSN (deliver): orcpt: %s flags: %d\n", new->dsn_orcpt, new->dsn_flags);
-+ #endif
-+
- switch (process_recipients)
- {
- /* RECIP_DEFER is set when a system filter freezes a message. */
-@@ -6163,6 +6192,12 @@
- regex_must_compile(US"\\n250[\\s\\-]PRDR(\\s|\\n|$)", FALSE, TRUE);
- #endif
-
-+ #ifdef SUPPORT_DSN
-+ /* Set the regex to check for DSN support on remote MTA */
-+ if (regex_DSN == NULL) regex_DSN =
-+ regex_must_compile(US"\\n250[\\s\\-]DSN(\\s|\\n|$)", FALSE, TRUE);
-+ #endif
-+
- /* Now sort the addresses if required, and do the deliveries. The yield of
- do_remote_deliveries is FALSE when mua_wrapper is set and all addresses
- cannot be delivered in one transaction. */
-@@ -6267,6 +6302,179 @@
-
- else if (!dont_deliver) retry_update(&addr_defer, &addr_failed, &addr_succeed);
-
-+#ifdef SUPPORT_DSN
-+/* ********** philb - Send DSN for successful messages */
-+
-+addr_dsntmp = addr_succeed;
-+
-+while(addr_dsntmp != NULL)
-+{
-+ BOOL dsn_sendmessage = FALSE;
-+ uschar dsnmsgbuf[4096];
-+
-+ DEBUG(D_deliver)
-+ debug_printf("DSN: processing router : %s\n", addr_dsntmp->router->name);
-+
-+ DEBUG(D_deliver)
-+ debug_printf("DSN: processing successful delivery address: %s\n", addr_dsntmp->address);
-+
-+ if (testflag(addr_dsntmp, af_ignore_error))
-+ {
-+ DEBUG(D_deliver)
-+ debug_printf("DSN: Ignore error for: %s\n", addr_dsntmp->address);
-+ }
-+ else
-+ {
-+ DEBUG(D_deliver) debug_printf("DSN: Checking Flag\n");
-+ if (addr_dsntmp->dsn_aware == NULL) {
-+ DEBUG(D_deliver) debug_printf("DSN: dsn_aware was NULL, setting to space at %s %d\n", __FILE__, __LINE__);
-+ addr_dsntmp->dsn_aware = string_copy(" ");
-+ }
-+ DEBUG(D_deliver) debug_printf("DSN: Sender_address: %s\n", sender_address);
-+ DEBUG(D_deliver) debug_printf("DSN: orcpt: %s flags: %d\n", addr_dsntmp->dsn_orcpt, addr_dsntmp->dsn_flags);
-+ DEBUG(D_deliver) debug_printf("DSN: envid: %s ret: %d\n", dsn_envid, dsn_ret);
-+ DEBUG(D_deliver) debug_printf("DSN: Remote SMTP server supports DSN: %s\n", addr_dsntmp->dsn_aware);
-+
-+ /* Process the flags */
-+ if((addr_dsntmp->dsn_flags & rf_dsnflags) != 0)
-+ {
-+ /* We've got at least one flag set */
-+
-+ /* set flag so we don't send bounces */
-+ setflag(addr_dsntmp, af_ignore_error);
-+
-+ if((addr_dsntmp->dsn_flags & rf_notify_never) != 0)
-+ {
-+ DEBUG(D_deliver) debug_printf("DSN: NEVER FLAG\n");
-+
-+ /* nothing to do here */
-+ }
-+
-+ if((addr_dsntmp->dsn_flags & rf_notify_success) != 0)
-+ {
-+ DEBUG(D_deliver) debug_printf("DSN: SUCCESS FLAG\n");
-+
-+ dsn_sendmessage = TRUE;
-+ }
-+
-+ if((addr_dsntmp->dsn_flags & rf_notify_failure) != 0)
-+ {
-+ DEBUG(D_deliver) debug_printf("DSN: FAILURE FLAG\n");
-+
-+ /* allow bounce messages */
-+ clearflag(addr_dsntmp, af_ignore_error);
-+ }
-+
-+ if((addr_dsntmp->dsn_flags & rf_notify_delay) != 0)
-+ {
-+ DEBUG(D_deliver) debug_printf("DSN: DELAY FLAG\n");
-+
-+ /* hmm, what to do here? */
-+ }
-+ }
-+
-+ if ((addr_dsntmp->dsn_aware != 0) && (addr_dsntmp->dsn_aware[0] != 'Y') && (dsn_sendmessage == TRUE) && (addr_dsntmp->router->dsn_process == TRUE))
-+ {
-+ pid_t pid;
-+ int fd;
-+
-+ /* remote MTA does not support DSN, so we need to send message */
-+
-+ /* create exim process to send message */
-+ pid = child_open_exim(&fd);
-+
-+ DEBUG(D_deliver) debug_printf("DSN: child_open_exim returns: %d\n", pid);
-+
-+ if (pid < 0) /* Creation of child failed */
-+ {
-+ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Process %d (parent %d) failed to "
-+ "create child process to send failure message: %s", getpid(),
-+ getppid(), strerror(errno));
-+
-+ DEBUG(D_deliver) debug_printf("DSN: child_open_exim failed\n");
-+
-+ }
-+ else /* Creation of child succeeded */
-+ {
-+ FILE *f = fdopen(fd, "wb");
-+ int topt = topt_add_return_path;
-+ uschar boundaryStr[64];
-+
-+ DEBUG(D_deliver) debug_printf("sending error message to: %s\n", sender_address);
-+
-+ /* build unique id for MIME boundary */
-+ snprintf(boundaryStr, 63, "%d-cwdsn-%d", pid, rand());
-+ DEBUG(D_deliver) debug_printf("DSN: MIME boundary: %s\n", boundaryStr);
-+
-+ /* if the sender doesn't want the whole message returned, don't send the body */
-+ if (dsn_ret != dsn_ret_full) topt |= topt_no_body;
-+
-+ if (errors_reply_to != NULL) fprintf(f,"Reply-To: %s\n", errors_reply_to);
-+
-+ fprintf(f,"Auto-Submitted: auto-generated\n");
-+ fprintf(f,"From: Mail Delivery System <Mailer-Daemon@%s>\n", qualify_domain_sender);
-+ fprintf(f,"To: %s\n", sender_address);
-+ fprintf(f,"Subject: Delivery Status Notification\n");
-+ fprintf(f,"Content-Type: multipart/report; report-type=delivery-status; boundary=%s\n", boundaryStr);
-+ fprintf(f,"MIME-Version: 1.0\n\n");
-+
-+ fprintf(f,"--%s\n", boundaryStr);
-+ fprintf(f,"Content-type: text/plain; charset=us-ascii\n\n");
-+
-+ fprintf(f,"This message was created automatically by mail delivery software.\n");
-+ fprintf(f," ----- The following addresses had successful delivery notifications -----\n");
-+/* AH: added specific message for non "Remote SMTP" situations */
-+ if (addr_dsntmp->dsn_aware[0] == 'N') {
-+ fprintf(f,"<%s> (relayed to non-DSN-aware mailer)\n\n", addr_dsntmp->address);
-+ } else {
-+ fprintf(f,"<%s> (relayed via non \"Remote SMTP\" router)\n\n", addr_dsntmp->address);
-+ }
-+
-+ fprintf(f,"--%s\n", boundaryStr);
-+ fprintf(f,"Content-type: message/delivery-status\n\n");
-+
-+ if (dsn_envid) { /* Test for NULL added by GC */
-+ fprintf(f,"Original-Envelope-Id: %s\n", dsn_envid);
-+ }
-+ fprintf(f,"Reporting-MTA: dns; %s\n", qualify_domain_sender);
-+ if (addr_dsntmp->dsn_orcpt) { /* Test for NULL added by GC */
-+ fprintf(f,"Original-Recipient: %s\n", addr_dsntmp->dsn_orcpt);
-+ }
-+ fprintf(f,"Action: delivered\n\n");
-+
-+ fprintf(f,"--%s\n", boundaryStr);
-+ fprintf(f,"Content-type: message/rfc822\n\n");
-+
-+ fflush(f);
-+ transport_filter_argv = NULL; /* Just in case */
-+ return_path = sender_address; /* In case not previously set */
-+
-+ /* Write the original email out */
-+ transport_write_message(NULL, fileno(f), topt, 2048, NULL, NULL, NULL, NULL, NULL, 0);
-+ fflush(f);
-+
-+ fprintf(f,"\n");
-+ fprintf(f,"--%s--\n", boundaryStr);
-+
-+ fflush(f);
-+ fclose(f);
-+ rc = child_close(pid, 0); /* Waits for child to close, no timeout */
-+ }
-+ }
-+ else
-+ { if (addr_dsntmp->router->dsn_process == TRUE)
-+ DEBUG(D_deliver) debug_printf("DSN: *** NOT SENDING DSN SUCCESS Message ***\n");
-+ if (addr_dsntmp->router->dsn_process == FALSE)
-+ DEBUG(D_deliver) debug_printf("DSN: *** NOT SENDING DSN SUCCESS Message (gagged) ***\n");
-+ }
-+ }
-+
-+ addr_dsntmp = addr_dsntmp->next;
-+}
-+
-+/* ********** philb - end of mod */
-+#endif
-+
- /* If any addresses failed, we must send a message to somebody, unless
- af_ignore_error is set, in which case no action is taken. It is possible for
- several messages to get sent if there are addresses with different
-diff -Naur exim-4.82_RC5.orig/src/EDITME exim-4.82_RC5/src/EDITME
---- exim-4.82_RC5.orig/src/EDITME 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/EDITME 2013-10-27 21:47:32.000000000 +0100
-@@ -192,6 +192,8 @@
- # least one type of lookup. You should consider whether you want to build
- # the Exim monitor or not.
-
-+# Support DSN
-+SUPPORT_DSN=yes
-
- #------------------------------------------------------------------------------
- # These settings determine which individual router drivers are included in the
-diff -Naur exim-4.82_RC5.orig/src/exim.c exim-4.82_RC5/src/exim.c
---- exim-4.82_RC5.orig/src/exim.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/exim.c 2013-10-27 21:47:32.000000000 +0100
-@@ -831,6 +831,9 @@
- #ifdef EXPERIMENTAL_REDIS
- fprintf(f, " Experimental_Redis");
- #endif
-+#ifdef SUPPORT_DSN
-+ fprintf(f, " C&W_DSN_1.3");
-+#endif
- fprintf(f, "\n");
-
- fprintf(f, "Lookups (built-in):");
-@@ -2653,6 +2656,16 @@
- break;
- }
-
-+ #ifdef SUPPORT_DSN
-+ /* -MCD: set the smtp_use_dsn flag; this indicates that the host
-+ that exim is connected to supports the esmtp extension DSN */
-+ else if (strcmp(argrest, "CD") == 0)
-+ {
-+ smtp_use_dsn = TRUE;
-+ break;
-+ }
-+ #endif
-+
- /* -MCP: set the smtp_use_pipelining flag; this is useful only when
- it preceded -MC (see above) */
-
-diff -Naur exim-4.82_RC5.orig/src/globals.c exim-4.82_RC5/src/globals.c
---- exim-4.82_RC5.orig/src/globals.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/globals.c 2013-10-27 21:47:32.000000000 +0100
-@@ -124,6 +124,13 @@
- uschar *local_scan_path = NULL;
- #endif
-
-+#ifdef SUPPORT_DSN
-+BOOL dsn = TRUE;
-+uschar *dsn_envid = NULL;
-+int dsn_ret = 0;
-+const pcre *regex_DSN = NULL;
-+BOOL smtp_use_dsn = FALSE;
-+#endif
-
- #ifdef SUPPORT_TLS
- BOOL gnutls_compat_mode = FALSE;
-@@ -341,6 +348,11 @@
- NULL, /* authenticator */
- NULL, /* auth_id */
- NULL, /* auth_sndr */
-+ #ifdef SUPPORT_DSN
-+ NULL, /* dsn_orcpt */
-+ 0, /* dsn_flags */
-+ NULL, /* dsn_aware */
-+ #endif
- (uid_t)(-1), /* uid */
- (gid_t)(-1), /* gid */
- 0, /* flags */
-@@ -1096,6 +1108,9 @@
- TRUE, /* verify_sender */
- FALSE, /* uid_set */
- FALSE, /* unseen */
-+#ifdef SUPPORT_DSN
-+ FALSE, /* dsn_process */
-+#endif
-
- self_freeze, /* self_code */
- (uid_t)(-1), /* uid */
-@@ -1105,6 +1120,7 @@
- NULL, /* transport instance */
- NULL, /* pass_router */
- NULL /* redirect_router */
-+
- };
-
- uschar *router_name = NULL;
-diff -Naur exim-4.82_RC5.orig/src/globals.h exim-4.82_RC5/src/globals.h
---- exim-4.82_RC5.orig/src/globals.h 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/globals.h 2013-10-27 21:47:32.000000000 +0100
-@@ -130,6 +130,13 @@
- extern int (*receive_ferror)(void);
- extern BOOL (*receive_smtp_buffered)(void);
-
-+#ifdef SUPPORT_DSN
-+extern BOOL dsn; /* FALSE if DSN not to be used */
-+extern uschar *dsn_envid; /* DSN envid string */
-+extern int dsn_ret; /* DSN ret type*/
-+extern const pcre *regex_DSN; /* For recognizing DSN settings */
-+extern BOOL smtp_use_dsn; /* Global for passed connections */
-+#endif
-
- /* For clearing, saving, restoring address expansion variables. We have to have
- the size of this vector set explicitly, because it is referenced from more than
-diff -Naur exim-4.82_RC5.orig/src/local_scan.h exim-4.82_RC5/src/local_scan.h
---- exim-4.82_RC5.orig/src/local_scan.h 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/local_scan.h 2013-10-27 21:47:32.000000000 +0100
-@@ -124,9 +124,13 @@
- field is always NULL except for one_time aliases that had errors_to on the
- routers that generated them. */
-
-+/* Added the dsn attributes orcpt and dsn_flags for DSN support*/
-+
- typedef struct recipient_item {
- uschar *address; /* the recipient address */
- int pno; /* parent number for "one_time" alias, or -1 */
-+ uschar *orcpt; /* DSN orcpt */
-+ int dsn_flags; /* DSN flags */
- uschar *errors_to; /* the errors_to address or NULL */
- #ifdef EXPERIMENTAL_BRIGHTMAIL
- uschar *bmi_optin;
-diff -Naur exim-4.82_RC5.orig/src/macros.h exim-4.82_RC5/src/macros.h
---- exim-4.82_RC5.orig/src/macros.h 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/macros.h 2013-10-27 21:47:32.000000000 +0100
-@@ -778,6 +778,22 @@
- #define topt_no_body 0x040 /* Omit body */
- #define topt_escape_headers 0x080 /* Apply escape check to headers */
-
-+ /* Flags for recipient_block, used in DSN support */
-+
-+ #define rf_onetime 0x01 /* A one-time alias */
-+ #define rf_notify_never 0x02 /* NOTIFY= settings */
-+ #define rf_notify_success 0x04
-+ #define rf_notify_failure 0x08
-+ #define rf_notify_delay 0x10
-+
-+ #define rf_dsnflags (rf_notify_never | rf_notify_success | \
-+ rf_notify_failure | rf_notify_delay)
-+
-+ /* DSN RET types */
-+
-+ #define dsn_ret_full 1
-+ #define dsn_ret_hdrs 2
-+
- /* Codes for the host_find_failed and host_all_ignored options. */
-
- #define hff_freeze 0
-diff -Naur exim-4.82_RC5.orig/src/readconf.c exim-4.82_RC5/src/readconf.c
---- exim-4.82_RC5.orig/src/readconf.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/readconf.c 2013-10-27 21:49:15.000000000 +0100
-@@ -229,6 +229,9 @@
- /* This option is now a no-op, retained for compability */
- { "drop_cr", opt_bool, &drop_cr },
- /*********************************************************/
-+#ifdef SUPPORT_DSN
-+ { "dsn", opt_bool, &dsn },
-+#endif
- { "dsn_from", opt_stringptr, &dsn_from },
- { "envelope_to_remove", opt_bool, &envelope_to_remove },
- { "errors_copy", opt_stringptr, &errors_copy },
-diff -Naur exim-4.82_RC5.orig/src/receive.c exim-4.82_RC5/src/receive.c
---- exim-4.82_RC5.orig/src/receive.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/receive.c 2013-10-27 21:47:32.000000000 +0100
-@@ -490,6 +490,8 @@
- memcpy(recipients_list, oldlist, oldmax * sizeof(recipient_item));
- }
-
-+/* memset added by GC to blank dsn records, etc. */
-+memset(&recipients_list[recipients_count], 0, sizeof(recipient_item));
- recipients_list[recipients_count].address = recipient;
- recipients_list[recipients_count].pno = pno;
- #ifdef EXPERIMENTAL_BRIGHTMAIL
-diff -Naur exim-4.82_RC5.orig/src/route.c exim-4.82_RC5/src/route.c
---- exim-4.82_RC5.orig/src/route.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/route.c 2013-10-27 21:47:32.000000000 +0100
-@@ -58,6 +58,10 @@
- (void *)offsetof(router_instance, domains) },
- { "driver", opt_stringptr|opt_public,
- (void *)offsetof(router_instance, driver_name) },
-+ #ifdef SUPPORT_DSN
-+ { "dsn_process", opt_bool|opt_public,
-+ (void *)offsetof(router_instance, dsn_process) },
-+ #endif
- { "errors_to", opt_stringptr|opt_public,
- (void *)(offsetof(router_instance, errors_to)) },
- { "expn", opt_bool|opt_public,
-@@ -270,6 +274,13 @@
-
- if (r->pass_router_name != NULL)
- set_router(r, r->pass_router_name, &(r->pass_router), TRUE);
-+
-+ #ifdef SUPPORT_DSN
-+ if (r->dsn_process == FALSE)
-+ DEBUG(D_route) debug_printf("%s router skipping DSN - add dsn_process to router\n", r->name);
-+ if (r->dsn_process == TRUE)
-+ DEBUG(D_route) debug_printf("%s router performing DSN \n", r->name);
-+ #endif
- }
- }
-
-@@ -1412,7 +1423,10 @@
-
- copyflag(new, addr, af_propagate);
- new->p.address_data = addr->p.address_data;
--
-+#ifdef SUPPORT_DSN
-+ new->dsn_flags = addr->dsn_flags;
-+ new->dsn_orcpt = addr->dsn_orcpt;
-+#endif
-
- /* As it has turned out, we haven't set headers_add or headers_remove for the
- * clone. Thinking about it, it isn't entirely clear whether they should be
-diff -Naur exim-4.82_RC5.orig/src/smtp_in.c exim-4.82_RC5/src/smtp_in.c
---- exim-4.82_RC5.orig/src/smtp_in.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/smtp_in.c 2013-10-27 21:47:32.000000000 +0100
-@@ -213,6 +213,9 @@
- #ifdef EXPERIMENTAL_PRDR
- ENV_MAIL_OPT_PRDR,
- #endif
-+#ifdef SUPPORT_DSN
-+ ENV_MAIL_OPT_RET, ENV_MAIL_OPT_ENVID,
-+#endif
- ENV_MAIL_OPT_NULL
- };
- typedef struct {
-@@ -228,6 +231,10 @@
- #ifdef EXPERIMENTAL_PRDR
- { US"PRDR", ENV_MAIL_OPT_PRDR, FALSE },
- #endif
-+#ifdef SUPPORT_DSN
-+ { US"RET", ENV_MAIL_OPT_RET, FALSE },
-+ { US"ENVID", ENV_MAIL_OPT_ENVID, FALSE },
-+#endif
- { US"NULL", ENV_MAIL_OPT_NULL, FALSE }
- };
-
-@@ -1073,6 +1080,13 @@
- sender_verified_list = NULL; /* No senders verified */
- memset(sender_address_cache, 0, sizeof(sender_address_cache));
- memset(sender_domain_cache, 0, sizeof(sender_domain_cache));
-+
-+#ifdef SUPPORT_DSN
-+/* Reset the DSN flags */
-+dsn_ret = 0;
-+dsn_envid = NULL;
-+#endif
-+
- authenticated_sender = NULL;
- #ifdef EXPERIMENTAL_BRIGHTMAIL
- bmi_run = 0;
-@@ -2679,6 +2693,10 @@
- int ptr, size, rc;
- int c, i;
- auth_instance *au;
-+#ifdef SUPPORT_DSN
-+ uschar *orcpt = NULL;
-+ int flags;
-+#endif
-
- switch(smtp_read_command(TRUE))
- {
-@@ -3106,6 +3124,12 @@
- s = string_cat(s, &size, &ptr, US"-8BITMIME\r\n", 11);
- }
-
-+ #ifdef SUPPORT_DSN
-+ /* Advertise DSN support if configured to do so. */
-+ if (dsn)
-+ s = string_cat(s, &size, &ptr, US"250-DSN\r\n", 9);
-+ #endif
-+
- /* Advertise ETRN if there's an ACL checking whether a host is
- permitted to issue it; a check is made when any host actually tries. */
-
-@@ -3360,6 +3384,42 @@
- arg_error = TRUE;
- break;
-
-+#ifdef SUPPORT_DSN
-+
-+ /* Handle the two DSN options, but only if configured to do so
-+ * (which will have caused "DSN" to be given in the EHLO
-+ * response). The code itself is included only if configured in
-+ * at build time. */
-+
-+ case ENV_MAIL_OPT_RET:
-+ /* Check if RET has already been set */
-+ if (dsn_ret > 0) {
-+ synprot_error(L_smtp_syntax_error, 501, NULL,
-+ US"RET can be specified once only");
-+ goto COMMAND_LOOP;
-+ }
-+ dsn_ret = (strcmpic(value, US"HDRS") == 0)? dsn_ret_hdrs :
-+ (strcmpic(value, US"FULL") == 0)? dsn_ret_full : 0;
-+ DEBUG(D_receive) debug_printf("DSN_RET: %d\n", dsn_ret);
-+ /* Check for invalid invalid value, and exit with error */
-+ if (dsn_ret == 0) {
-+ synprot_error(L_smtp_syntax_error, 501, NULL,
-+ US"Value for RET is invalid");
-+ goto COMMAND_LOOP;
-+ }
-+ break;
-+ case ENV_MAIL_OPT_ENVID:
-+ /* Check if the dsn envid has been already set */
-+ if (dsn_envid != NULL) {
-+ synprot_error(L_smtp_syntax_error, 501, NULL,
-+ US"ENVID can be specified once only");
-+ goto COMMAND_LOOP;
-+ }
-+ dsn_envid = string_copy(value);
-+ DEBUG(D_receive) debug_printf("DSN_ENVID: %s\n", dsn_envid);
-+ break;
-+#endif
-+
- /* Handle the AUTH extension. If the value given is not "<>" and either
- the ACL says "yes" or there is no ACL but the sending host is
- authenticated, we set it up as the authenticated sender. However, if the
-@@ -3633,6 +3693,89 @@
- rcpt_fail_count++;
- break;
- }
-+
-+ #ifdef SUPPORT_DSN
-+ /* Set the DSN flags orcpt and dsn_flags from the session*/
-+ orcpt = NULL;
-+ flags = 0;
-+
-+ if (esmtp) for(;;)
-+ {
-+ uschar *name, *value, *end;
-+ int size;
-+
-+ if (!extract_option(&name, &value))
-+ {
-+ break;
-+ }
-+
-+ if (strcmpic(name, US"ORCPT") == 0)
-+ {
-+ /* Check whether orcpt has been already set */
-+ if (orcpt != NULL) {
-+ synprot_error(L_smtp_syntax_error, 501, NULL,
-+ US"ORCPT can be specified once only");
-+ goto COMMAND_LOOP;
-+ }
-+ orcpt = string_copy(value);
-+ DEBUG(D_receive) debug_printf("DSN orcpt: %s\n", orcpt);
-+ }
-+
-+ else if (strcmpic(name, US"NOTIFY") == 0)
-+ {
-+ /* Check if the notify flags have been already set */
-+ if (flags > 0)
-+ {
-+ synprot_error(L_smtp_syntax_error, 501, NULL,
-+ US"NOTIFY can be specified once only");
-+ goto COMMAND_LOOP;
-+ }
-+ if (strcmpic(value, US"NEVER") == 0) flags |= rf_notify_never; else
-+ {
-+ uschar *p = value;
-+ while (*p != 0)
-+ {
-+ uschar *pp = p;
-+ while (*pp != 0 && *pp != ',') pp++;
-+ if (*pp == ',') *pp++ = 0;
-+ if (strcmpic(p, US"SUCCESS") == 0) {
-+ DEBUG(D_receive) debug_printf("GC: Setting notify success\n");
-+ flags |= rf_notify_success;
-+ }
-+ else if (strcmpic(p, US"FAILURE") == 0) {
-+ DEBUG(D_receive) debug_printf("GC: Setting notify failure\n");
-+ flags |= rf_notify_failure;
-+ }
-+ else if (strcmpic(p, US"DELAY") == 0) {
-+ DEBUG(D_receive) debug_printf("GC: Setting notify delay\n");
-+ flags |= rf_notify_delay;
-+ }
-+ else
-+ {
-+ /* Catch any strange values */
-+ synprot_error(L_smtp_syntax_error, 501, NULL,
-+ US"Invalid value for NOTIFY parameter");
-+ goto COMMAND_LOOP;
-+ }
-+ p = pp;
-+ }
-+ DEBUG(D_receive) debug_printf("DSN Flags: %x\n", flags);
-+ }
-+ }
-+
-+ /* Unknown option. Stick back the terminator characters and break
-+ the loop. An error for a malformed address will occur. */
-+
-+ else
-+ {
-+ DEBUG(D_receive) debug_printf("Invalid dsn command: %s : %s\n", name, value);
-+ name[-1] = ' ';
-+ value[-1] = '=';
-+ break;
-+ }
-+ }
-+ #endif
-+
-
- /* Apply SMTP rewriting then extract the working address. Don't allow "<>"
- as a recipient address */
-@@ -3747,6 +3890,24 @@
- if (user_msg == NULL) smtp_printf("250 Accepted\r\n");
- else smtp_user_msg(US"250", user_msg);
- receive_add_recipient(recipient, -1);
-+
-+ #ifdef SUPPORT_DSN
-+
-+ /* Set the dsn flags in the recipients_list */
-+ if (orcpt != NULL)
-+ recipients_list[recipients_count-1].orcpt = orcpt;
-+ else
-+ recipients_list[recipients_count-1].orcpt = NULL;
-+
-+ if (flags != 0)
-+ recipients_list[recipients_count-1].dsn_flags = flags;
-+ else
-+ recipients_list[recipients_count-1].dsn_flags = 0;
-+ debug_printf("DSN-AJ(smtp-in): orcpt: %s flags: %d\n", recipients_list[recipients_count-1].orcpt, recipients_list[recipients_count-1].dsn_flags);
-+
-+
-+ #endif
-+
- }
-
- /* The recipient was discarded */
-diff -Naur exim-4.82_RC5.orig/src/spool_in.c exim-4.82_RC5/src/spool_in.c
---- exim-4.82_RC5.orig/src/spool_in.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/spool_in.c 2013-10-27 21:47:32.000000000 +0100
-@@ -293,6 +293,13 @@
- spam_score_int = NULL;
- #endif
-
-+#ifdef SUPPORT_DSN
-+#ifndef COMPILE_UTILITY
-+dsn_ret = 0;
-+dsn_envid = NULL;
-+#endif /* COMPILE_UTILITY */
-+#endif
-+
- /* Generate the full name and open the file. If message_subdir is already
- set, just look in the given directory. Otherwise, look in both the split
- and unsplit directories, as for the data file above. */
-@@ -467,6 +474,19 @@
- case 'd':
- if (Ustrcmp(p, "eliver_firsttime") == 0)
- deliver_firsttime = TRUE;
-+ #ifdef SUPPORT_DSN
-+ #ifndef COMPILE_UTILITY
-+ /* Check if the dsn flags have been set in the header file */
-+ else if (Ustrncmp(p, "sn_ret", 6) == 0)
-+ {
-+ dsn_ret= atoi(big_buffer + 8);
-+ }
-+ else if (Ustrncmp(p, "sn_envid", 8) == 0)
-+ {
-+ dsn_envid = string_copy(big_buffer + 11);
-+ }
-+ #endif /* COMPILE_UTILITY */
-+ #endif
- break;
-
- case 'f':
-@@ -554,7 +574,7 @@
- tls_in.sni = string_unprinting(string_copy(big_buffer + 9));
- break;
- #endif
--
-+
- default: /* Present because some compilers complain if all */
- break; /* possibilities are not covered. */
- }
-@@ -604,6 +624,10 @@
- {
- int nn;
- int pno = -1;
-+ #ifdef SUPPORT_DSN
-+ int dsn_flags = 0;
-+ uschar *orcpt = NULL;
-+ #endif
- uschar *errors_to = NULL;
- uschar *p;
-
-@@ -672,10 +696,19 @@
- }
-
- /* Handle current format Exim 4 spool files */
-+ /* Spool file is modified if DSN is supported
-+ Original was "address errors_to len(errors_to),pno
-+ New for DSN support is now:
-+ "address errors_to orcpt len(errors_to),len(orcpt),pno,dsn_flags */
-
- else if (*p == '#')
- {
- int flags;
-+
-+ #ifndef COMPILE_UTILITY
-+ DEBUG(D_deliver) debug_printf("**** SPOOL_IN - Exim 4 standard format spoolfile\n");
-+ #endif /* COMPILE_UTILITY */
-+
- (void)sscanf(CS p+1, "%d", &flags);
-
- if ((flags & 0x01) != 0) /* one_time data exists */
-@@ -688,15 +721,82 @@
- {
- p -= len;
- errors_to = string_copy(p);
-+ }
-+ }
-+
-+ *(--p) = 0; /* Terminate address */
-+ }
-+ #ifdef SUPPORT_DSN
-+ else if (*p == '!') /* Handle Exim4 + DSN spool files */
-+ {
-+ int flags;
-+ int temp_dsn_flags;
-+
-+ #ifndef COMPILE_UTILITY
-+ DEBUG(D_deliver) debug_printf("**** SPOOL_IN - C&W DSN format spoolfile\n");
-+ #endif /* COMPILE_UTILITY */
-+
-+ sscanf(CS p+1, "%d,%d", &flags, &temp_dsn_flags);
-+
-+ if (((flags & 0x01) != 0) || (temp_dsn_flags > 0)) /* one_time data or dsn_flags exist */
-+ {
-+ int len;
-+ int len_orcpt;
-+
-+ #ifndef COMPILE_UTILITY
-+ DEBUG(D_deliver) debug_printf("**** spool_in dsn_flags = 0\n");
-+ #endif /* COMPILE_UTILITY */
-+
-+ dsn_flags = 0;
-+
-+ while (isdigit(*(--p)) || *p == ',' || *p == '-');
-+ sscanf(CS p+1, "%d,%d,%d,%d", &len, &len_orcpt, &pno, &dsn_flags);
-+
-+ *p = 0;
-+ if (len_orcpt > 0)
-+ {
-+ p -= len_orcpt;
-+ orcpt = string_copy(p);
- }
-+ *(--p) = 0; /* change the space to a NULL */
-+
-+ if (len > 0)
-+ {
-+ p -= len;
-+ errors_to = string_copy(p);
-+ }
- }
-
- *(--p) = 0; /* Terminate address */
- }
-+ #endif
-+ #ifndef COMPILE_UTILITY
-+ else
-+ {
-+ DEBUG(D_deliver) debug_printf("**** SPOOL_IN - No additional fields\n");
-+ }
-+ #endif /* COMPILE_UTILITY */
-+
-+ #ifdef SUPPORT_DSN
-+ #ifndef COMPILE_UTILITY
-+ DEBUG(D_deliver) debug_printf("**** SPOOL_IN - address: |%s| errorsto: |%s| orcpt: |%s| dsn_flags: %d\n",
-+ big_buffer, errors_to, orcpt, dsn_flags);
-+ #endif /* COMPILE_UTILITY */
-+ #endif
-+ #ifndef SUPPORT_DSN
-+ #ifndef COMPILE_UTILITY
-+ DEBUG(D_deliver) debug_printf("**** SPOOL_IN - address: |%s| errorsto: |%s|\n",
-+ big_buffer, errors_to);
-+ #endif /* COMPILE_UTILITY */
-+ #endif
-
- recipients_list[recipients_count].address = string_copy(big_buffer);
- recipients_list[recipients_count].pno = pno;
- recipients_list[recipients_count].errors_to = errors_to;
-+ #ifdef SUPPORT_DSN
-+ recipients_list[recipients_count].orcpt = orcpt;
-+ recipients_list[recipients_count].dsn_flags = dsn_flags;
-+ #endif
- }
-
- /* The remainder of the spool header file contains the headers for the message,
-diff -Naur exim-4.82_RC5.orig/src/spool_out.c exim-4.82_RC5/src/spool_out.c
---- exim-4.82_RC5.orig/src/spool_out.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/spool_out.c 2013-10-27 21:47:32.000000000 +0100
-@@ -234,6 +234,15 @@
- if (tls_in.sni != NULL) fprintf(f, "-tls_sni %s\n", string_printing(tls_in.sni));
- #endif
-
-+#ifdef SUPPORT_DSN
-+/* Write the dsn flags to the spool header file */
-+DEBUG(D_deliver) debug_printf("DSN: Write SPOOL :-dsn_envid %s\n", dsn_envid);
-+if (dsn_envid != NULL) fprintf(f, "-dsn_envid %s\n", dsn_envid);
-+DEBUG(D_deliver) debug_printf("DSN: Write SPOOL :-dsn_ret %d\n", dsn_ret);
-+if (dsn_ret != 0) fprintf(f, "-dsn_ret %d\n", dsn_ret);
-+#endif
-+
-+
- /* To complete the envelope, write out the tree of non-recipients, followed by
- the list of recipients. These won't be disjoint the first time, when no
- checking has been done. If a recipient is a "one-time" alias, it is followed by
-@@ -244,14 +253,36 @@
- for (i = 0; i < recipients_count; i++)
- {
- recipient_item *r = recipients_list + i;
-- if (r->pno < 0 && r->errors_to == NULL)
-+#ifdef SUPPORT_DSN
-+DEBUG(D_deliver) debug_printf("DSN: Flags :%d\n", r->dsn_flags);
-+#endif
-+ if (r->pno < 0 && r->errors_to == NULL
-+ #ifdef SUPPORT_DSN
-+ && r->dsn_flags == 0
-+ #endif
-+ )
- fprintf(f, "%s\n", r->address);
- else
- {
- uschar *errors_to = (r->errors_to == NULL)? US"" : r->errors_to;
-+ #ifdef SUPPORT_DSN
-+ uschar *orcpt = (r->orcpt == NULL)? US"" : r->orcpt;
-+ fprintf(f, "%s %s %s %d,%d,%d,%d!1\n", r->address, errors_to, orcpt,
-+ Ustrlen(errors_to), Ustrlen(orcpt), r->pno, r->dsn_flags);
-+ #else
- fprintf(f, "%s %s %d,%d#1\n", r->address, errors_to,
- Ustrlen(errors_to), r->pno);
-+ #endif
- }
-+
-+ #ifdef SUPPORT_DSN
-+ DEBUG(D_deliver) debug_printf("DSN :**** SPOOL_OUT - address: |%s| errorsto: |%s| orcpt: |%s| dsn_flags: %d\n",
-+ r->address, r->errors_to, r->orcpt, r->dsn_flags);
-+ #endif
-+ #ifndef SUPPORT_DSN
-+ DEBUG(D_deliver) debug_printf("**** SPOOL_OUT - address: |%s| errorsto: |%s|\n",
-+ r->address, r->errors_to);
-+ #endif
- }
-
- /* Put a blank line before the headers */
-diff -Naur exim-4.82_RC5.orig/src/structs.h exim-4.82_RC5/src/structs.h
---- exim-4.82_RC5.orig/src/structs.h 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/structs.h 2013-10-27 21:47:32.000000000 +0100
-@@ -282,7 +282,9 @@
- BOOL verify_sender; /* Use this router when verifying a sender */
- BOOL uid_set; /* Flag to indicate uid is set */
- BOOL unseen; /* If TRUE carry on, even after success */
--
-+#ifdef SUPPORT_DSN
-+ BOOL dsn_process; /* If TRUE, activate DSN for this router */
-+#endif
- int self_code; /* Encoded version of "self" */
- uid_t uid; /* Fixed uid value */
- gid_t gid; /* Fixed gid value */
-@@ -547,6 +549,12 @@
- uschar *auth_id; /* auth "login" name used by transport */
- uschar *auth_sndr; /* AUTH arg to SMTP MAIL, used by transport */
-
-+ #ifdef SUPPORT_DSN
-+ uschar *dsn_orcpt; /* DSN orcpt value */
-+ int dsn_flags; /* DSN flags */
-+ uschar *dsn_aware; /* DSN aware flag */
-+ #endif
-+
- uid_t uid; /* uid for transporting */
- gid_t gid; /* gid for transporting */
-
-diff -Naur exim-4.82_RC5.orig/src/transport.c exim-4.82_RC5/src/transport.c
---- exim-4.82_RC5.orig/src/transport.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/transport.c 2013-10-27 21:47:32.000000000 +0100
-@@ -1802,6 +1802,11 @@
-
- argv = child_exec_exim(CEE_RETURN_ARGV, TRUE, &i, FALSE, 0);
-
-+ #ifdef SUPPORT_DSN
-+ /* Call with the dsn flag */
-+ if (smtp_use_dsn) argv[i++] = US"-MCD";
-+ #endif
-+
- if (smtp_authenticated) argv[i++] = US"-MCA";
-
- #ifdef SUPPORT_TLS
-diff -Naur exim-4.82_RC5.orig/src/transports/smtp.c exim-4.82_RC5/src/transports/smtp.c
---- exim-4.82_RC5.orig/src/transports/smtp.c 2013-10-27 21:46:25.000000000 +0100
-+++ exim-4.82_RC5/src/transports/smtp.c 2013-10-27 21:47:32.000000000 +0100
-@@ -242,6 +242,16 @@
- #endif
- };
-
-+#ifdef SUPPORT_DSN
-+/* some DSN flags for use later */
-+
-+static int rf_list[] = {rf_notify_never, rf_notify_success,
-+ rf_notify_failure, rf_notify_delay };
-+
-+static uschar *rf_names[] = { "NEVER", "SUCCESS", "FAILURE", "DELAY" };
-+#endif
-+
-+
-
- /* Local statics */
-
-@@ -1079,6 +1089,27 @@
- else if (new[0] != 0) local_authenticated_sender = new;
- }
-
-+#ifdef SUPPORT_DSN
-+/* Add any DSN flags to the mail command */
-+
-+if (smtp_use_dsn)
-+ {
-+ uschar *p = buffer;
-+ if (dsn_ret == dsn_ret_hdrs)
-+ {
-+ strcpy(p, " RET=HDRS");
-+ while (*p) p++;
-+ }
-+ else if (dsn_ret == dsn_ret_full)
-+ {
-+ strcpy(p, " RET=FULL");
-+ while (*p) p++;
-+ }
-+ if (dsn_envid != NULL)
-+ string_format(p, sizeof(buffer) - (p-buffer), " ENVID=%s", dsn_envid);
-+ }
-+#endif
-+
- /* Add the authenticated sender address if present */
-
- if ((smtp_authenticated || ob->authenticated_sender_force) &&
-@@ -1587,6 +1618,14 @@
- {DEBUG(D_transport) debug_printf("PRDR usable\n");}
- #endif
-
-+ #ifdef SUPPORT_DSN
-+ /* Note if the server supports DSN */
-+ smtp_use_dsn = dsn &&
-+ esmtp && pcre_exec(regex_DSN, NULL, CS buffer, (int)Ustrlen(CS buffer), 0,
-+ PCRE_EOPT, NULL, 0) >= 0;
-+ DEBUG(D_transport) debug_printf("use_dsn=%d\n", smtp_use_dsn);
-+ #endif
-+
- /* Note if the response to EHLO specifies support for the AUTH extension.
- If it has, check that this host is one we want to authenticate to, and do
- the business. The host name and address must be available when the
-@@ -1746,18 +1785,66 @@
- int count;
- BOOL no_flush;
-
-+ #ifdef SUPPORT_DSN
-+ /* philb - set dsn_aware flag for this recipient */
-+ if(smtp_use_dsn)
-+ addr->dsn_aware = string_copy("Y");
-+ else
-+ addr->dsn_aware = string_copy("N");
-+ #endif
-+
- if (addr->transport_return != PENDING_DEFER) continue;
-
- address_count++;
- no_flush = smtp_use_pipelining && (!mua_wrapper || addr->next != NULL);
-
-+ #ifdef SUPPORT_DSN
-+ /* Add any DSN flags to the rcpt command and add to the sent string */
-+
-+ p = buffer;
-+ *p = 0;
-+
-+ if (smtp_use_dsn)
-+ {
-+ if ((addr->dsn_flags & rf_dsnflags) != 0)
-+ {
-+ int i;
-+ BOOL first = TRUE;
-+ strcpy(p, " NOTIFY=");
-+ while (*p) p++;
-+ for (i = 0; i < 4; i++)
-+ {
-+ if ((addr->dsn_flags & rf_list[i]) != 0)
-+ {
-+ if (!first) *p++ = ',';
-+ first = FALSE;
-+ strcpy(p, rf_names[i]);
-+ while (*p) p++;
-+ }
-+ }
-+ }
-+
-+ if (addr->dsn_orcpt != NULL)
-+ string_format(p, sizeof(buffer) - (p-buffer), " ORCPT=%s",
-+ addr->dsn_orcpt);
-+ }
-+
-+ #endif
-+
-+
- /* Now send the RCPT command, and process outstanding responses when
- necessary. After a timeout on RCPT, we just end the function, leaving the
- yield as OK, because this error can often mean that there is a problem with
- just one address, so we don't want to delay the host. */
-
-+ #ifdef SUPPORT_DSN
-+ count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>%s%s\r\n",
-+ transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr, buffer);
-+ #else
- count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>%s\r\n",
- transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr);
-+ #endif
-+
- if (count < 0) goto SEND_FAILED;
- if (count > 0)
- {
diff --git a/mail-mta/exim/files/exim_at.service b/mail-mta/exim/files/exim_at.service
deleted file mode 100644
index 19c07a5..0000000
--- a/mail-mta/exim/files/exim_at.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Exim Mail Daemon per-connection server
-
-[Service]
-ExecStart=-/usr/bin/exim -bs
-StandardInput=socket
-StandardError=syslog
diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
deleted file mode 100644
index c94ff4f..0000000
--- a/mail-mta/exim/metadata.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>net-mail</herd>
- <maintainer>
- <email>grobian@gentoo.org</email>
- </maintainer>
- <longdescription>
- Exim is a message transfer agent (MTA) developed at the University of
- Cambridge for use on Unix systems connected to the Internet. It is
- freely available under the terms of the GNU General Public Licence. In
- style it is similar to Smail 3, but its facilities are more general.
- There is a great deal of flexibility in the way mail can be routed, and
- there are extensive facilities for checking incoming mail. Exim can be
- installed in place of sendmail, although the configuration of exim is
- quite different to that of sendmail.
- </longdescription>
- <use>
- <flag name='dcc'>Adds support for Distributed Checksum Clearinghouse
- (DCC)</flag>
- <flag name='dkim'>Adds support for DomainKeys Identified Mail
- (DKIM)</flag>
- <flag name='dnsdb'>Adds support for a DNS search for a record whose
- domain name is the supplied query</flag>
- <flag name='dovecot-sasl'>Adds support for Dovecot's
- authentication</flag>
- <flag name='dlfunc'>Install local_scan.h header to compile separate
- dlfunc libraries</flag>
- <flag name='dmarc'>Adds support for DMARC</flag>
- <flag name='dsn'>Adds support for Delivery Status Notifications
- (DSN)</flag>
- <flag name='exiscan-acl'>Patch providing support for content
- scanning</flag>
- <flag name='lmtp'>Adds support for lmtp</flag>
- <flag name='mbx'>Adds support for UW's mbx format</flag>
- <flag name='spf'>Adds support for Sender Policy Framework</flag>
- <flag name='srs'>Adds support for Sender Rewriting Scheme</flag>
- <flag name='proxy'>Add support for being behind a proxy, such as HAProxy</flag>
- <flag name='pkcs11'>Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
- <flag name='redis'>Adds support for querying <pkg>dev-db/redis</pkg></flag>
- <flag name='prdr'>Adds support for Per-Recipient Data Response</flag>
- <flag name='tpda'>Adds support for Transport Post-Delivery Actions</flag>
- </use>
- <upstream>
- <bugs-to>http://bugs.exim.org/</bugs-to>
- <!-- stupid DTD doesn't allow this
- <vcs>http://git.exim.org/exim.git</vcs>
- -->
- </upstream>
-</pkgmetadata>
diff --git a/media-gfx/sane-backends/files/niash_array_index.patch b/media-gfx/sane-backends/files/niash_array_index.patch
deleted file mode 100644
index 236c459..0000000
--- a/media-gfx/sane-backends/files/niash_array_index.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- backend/niash.c 2010-12-02 00:49:58.000000000 +0100
-+++ backend/niash.c.new 2011-09-21 20:09:07.000000000 +0200
-@@ -82,14 +82,7 @@
- optThreshold,
-
-
-- optLast,
--/* put temporarily disabled options here after optLast */
--
-- optGroupMisc,
-- optLamp,
--
-- optCalibrate,
-- optGamma /* analog gamma = single number */
-+ optLast
- } EOptionIndex;
-
-
-@@ -685,17 +678,6 @@
- pDesc->size = 0;
- break;
-
-- case optGamma:
-- pDesc->name = SANE_NAME_ANALOG_GAMMA;
-- pDesc->title = SANE_TITLE_ANALOG_GAMMA;
-- pDesc->desc = SANE_DESC_ANALOG_GAMMA;
-- pDesc->type = SANE_TYPE_FIXED;
-- pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
-- pDesc->constraint.range = &rangeGamma;
-- pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-- pVal->w = startUpGamma;
-- break;
--
- case optGammaTable:
- pDesc->name = SANE_NAME_GAMMA_VECTOR;
- pDesc->title = SANE_TITLE_GAMMA_VECTOR;
-@@ -707,31 +689,6 @@
- pVal->wa = s->aGammaTable;
- break;
-
-- case optGroupMisc:
-- pDesc->title = SANE_I18N ("Miscellaneous");
-- pDesc->type = SANE_TYPE_GROUP;
-- pDesc->size = 0;
-- break;
--
-- case optLamp:
-- pDesc->name = "lamp";
-- pDesc->title = SANE_I18N ("Lamp status");
-- pDesc->desc = SANE_I18N ("Switches the lamp on or off.");
-- pDesc->type = SANE_TYPE_BOOL;
-- pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
-- /* switch the lamp on when starting for first the time */
-- pVal->w = SANE_TRUE;
-- break;
--
-- case optCalibrate:
-- pDesc->name = "calibrate";
-- pDesc->title = SANE_I18N ("Calibrate");
-- pDesc->desc = SANE_I18N ("Calibrates for black and white level.");
-- pDesc->type = SANE_TYPE_BUTTON;
-- pDesc->cap = SANE_CAP_SOFT_SELECT;
-- pDesc->size = 0;
-- break;
--
- case optGroupMode:
- pDesc->title = SANE_I18N ("Scan Mode");
- pDesc->desc = "";
-@@ -1007,7 +964,6 @@
- /* Get options of type SANE_Word */
- case optCount:
- case optDPI:
-- case optGamma:
- case optTLX:
- case optTLY:
- case optBRX:
-@@ -1031,17 +987,6 @@
- strcpy ((char *) pVal, modeList[s->aValues[optMode].w]);
- break;
-
-- /* Get options of type SANE_Bool */
-- case optLamp:
-- GetLamp (&s->HWParams, &fLampIsOn);
-- *(SANE_Bool *) pVal = fLampIsOn;
-- break;
--
-- case optCalibrate:
-- /* although this option has nothing to read,
-- it's added here to avoid a warning when running scanimage --help */
-- break;
--
- default:
- DBG (DBG_MSG, "SANE_ACTION_GET_VALUE: Invalid option (%d)\n", n);
- }
-@@ -1061,7 +1006,6 @@
- case optCount:
- return SANE_STATUS_INVAL;
-
-- case optGamma:
- case optThreshold:
- case optDPI:
-
-@@ -1089,15 +1033,7 @@
- DBG (DBG_MSG,
- "sane_control_option: SANE_ACTION_SET_VALUE %d = %d\n", n,
- (int) s->aValues[n].w);
-- if (n == optGamma)
-- {
-- if (!fSame && optLast > optGammaTable)
-- {
-- info |= SANE_INFO_RELOAD_OPTIONS;
-- }
-- _SetScalarGamma (s->aGammaTable, s->aValues[n].w);
-- }
-- break;
-+ break;
-
- case optGammaTable:
- DBG (DBG_MSG, "Writing gamma table\n");
-@@ -1158,20 +1094,6 @@
- break;
-
-
--
-- case optLamp:
-- fVal = *(SANE_Bool *) pVal;
-- DBG (DBG_MSG, "lamp %s\n", fVal ? "on" : "off");
-- if (fVal)
-- _WarmUpLamp (s, WARMUP_INSESSION);
-- else
-- SetLamp (&s->HWParams, SANE_FALSE);
-- break;
--
-- case optCalibrate:
--/* SimpleCalib(&s->HWParams); */
-- break;
--
- default:
- DBG (DBG_ERR, "SANE_ACTION_SET_VALUE: Invalid option (%d)\n", n);
- }
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
deleted file mode 100644
index c0dfe3c..0000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 4365868..7413646 100644
---- a/configure.in
-+++ b/configure.in
-@@ -344,17 +344,24 @@ dnl $as_echo "in order to autodetect network scanners in kodakaio."
- dnl with_cups="no"
- dnl fi
-
--dnl added by llagendijk 12/7/2012 to detect systemd for saned
--$as_echo_n "Checking for systemd..."
--if test -e /usr/include/systemd/sd-daemon.h ; then
-- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-- with_systemd="yes"
-- SYSTEMD_LIBS=" -lsystemd-daemon"
-- AC_SUBST(SYSTEMD_LIBS)
-- $as_echo "yes"
--else
-- with_systemd="no"
-- $as_echo "no"
-+AC_ARG_WITH(systemd,
-+ AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
-+if test "x$with_systemd" != xno ; then
-+ dnl added by llagendijk 12/7/2012 to detect systemd for saned
-+ $as_echo_n "Checking for systemd..."
-+ if test -e /usr/include/systemd/sd-daemon.h ; then
-+ AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+ have_systemd="yes"
-+ SYSTEMD_LIBS=" -lsystemd-daemon"
-+ AC_SUBST(SYSTEMD_LIBS)
-+ $as_echo "yes"
-+ else
-+ have_systemd="no"
-+ $as_echo "no"
-+ if test "x$with_systemd" = xyes; then
-+ AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-+ fi
-+ fi
- fi
-
- dnl ***********
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
deleted file mode 100644
index e6f52ad..0000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/backend/kodakaio.c b/backend/kodakaio.c
-index 8c4583a..b442e50 100644
---- a/backend/kodakaio.c
-+++ b/backend/kodakaio.c
-@@ -127,7 +127,7 @@ for ubuntu 12.10
-
- #define KODAKAIO_VERSION 02
- #define KODAKAIO_REVISION 4
--#define KODAKAIO_BUILD 6
-+#define KODAKAIO_BUILD 7
-
- /* for usb (but also used for net though it's not required). */
- #define MAX_BLOCK_SIZE 32768
-@@ -2184,6 +2184,7 @@ static void resolve_callback(
- AvahiLookupResultFlags flags,
- AVAHI_GCC_UNUSED void* userdata) {
-
-+ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
- char *pidkey, *pidvalue;
- char *vidkey, *vidvalue;
- size_t valuesize;
-@@ -2204,20 +2205,40 @@ static void resolve_callback(
- avahi_address_snprint(a, sizeof(a), address);
-
- /* Output short for Kodak ESP */
-- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name);
-- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"),
-- &vidkey, &vidvalue, &valuesize);
-- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue);
-- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"),
-- &pidkey, &pidvalue, &valuesize);
-- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name);
-
-+ vid_pair_list = avahi_string_list_find(txt, "vid");
-+ if(vid_pair_list != NULL) {
-+ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
-+ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue);
-+ }
-+ else DBG(min(10,DBG_AUTO), "failed to find key vid\n");
-+
-+ pid_pair_list = avahi_string_list_find(txt, "pid");
-+ if(pid_pair_list != NULL) {
-+ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
-+ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+ }
-+ else DBG(min(10,DBG_AUTO), "failed to find key pid\n");
-+
-+ if(pid_pair_list != NULL && vid_pair_list != NULL) {
- ProcessAvahiDevice(name, vidvalue, pidvalue, a);
-- avahi_free(vidkey); avahi_free(vidvalue);
-- avahi_free(pidkey); avahi_free(pidvalue);
-+ }
-+ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
-+
-+ if(vid_pair_list != NULL) {
-+ avahi_free(vidkey);
-+ avahi_free(vidvalue);
-+ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
-+ }
-+ if(pid_pair_list != NULL) {
-+ avahi_free(pidkey);
-+ avahi_free(pidvalue);
-+ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
-+ }
- }
- }
--
-+ DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
- avahi_service_resolver_free(r);
- }
-
-diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
-index 7882513..5fb18ed 100644
---- a/doc/descriptions/kodakaio.desc
-+++ b/doc/descriptions/kodakaio.desc
-@@ -1,6 +1,6 @@
- :backend "kodakaio"
- :url "http://sourceforge.net/projects/cupsdriverkodak/"
--:version "2.4.6"
-+:version "2.4.7"
- :manpage "sane-kodakaio"
- :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
- :devicetype :scanner
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch
deleted file mode 100644
index c682961..0000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-saned_pidfile_location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sane-backends-1.0.23/frontend/saned.c
-+++ sane-backends-1.0.23/frontend/saned.c
-@@ -221,7 +221,7 @@
- int numchildren;
-
- #define SANED_CONFIG_FILE "saned.conf"
--#define SANED_PID_FILE "/var/run/saned.pid"
-+#define SANED_PID_FILE "/var/run/saned/saned.pid"
-
- #define SANED_SERVICE_NAME "sane-port"
- #define SANED_SERVICE_PORT 6566
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
deleted file mode 100644
index 2d36cfa..0000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 7413646..66828fc 100644
---- a/configure.in
-+++ b/configure.in
-@@ -347,21 +347,18 @@ dnl fi
- AC_ARG_WITH(systemd,
- AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
- if test "x$with_systemd" != xno ; then
-- dnl added by llagendijk 12/7/2012 to detect systemd for saned
-- $as_echo_n "Checking for systemd..."
-- if test -e /usr/include/systemd/sd-daemon.h ; then
-- AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-- have_systemd="yes"
-- SYSTEMD_LIBS=" -lsystemd-daemon"
-- AC_SUBST(SYSTEMD_LIBS)
-- $as_echo "yes"
-- else
-- have_systemd="no"
-- $as_echo "no"
-- if test "x$with_systemd" = xyes; then
-- AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-- fi
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no)
-+ if test "x$have_systemd" = xno; then
-+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon], have_systemd=yes, have_systemd=no)
-+ fi
-+ if test "x$have_systemd" = xyes; then
-+ AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+ AC_SUBST(SYSTEMD_LIBS)
-+ else
-+ if test "x$with_systemd" = xyes; then
-+ AC_MSG_ERROR([Systemd support was requested but systemd was not found])
- fi
-+ fi
- fi
-
- dnl ***********
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-u_char.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-u_char.patch
deleted file mode 100644
index 0a35335..0000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-u_char.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/sane-backends-1.0.24/include/sane/sanei_udp.h b/sane-backends-1.0.24/include/sane/sanei_udp.h
---- a/sane-backends-1.0.24/include/sane/sanei_udp.h
-+++ b/sane-backends-1.0.24/include/sane/sanei_udp.h
-@@ -27,6 +27,7 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #endif
-+#include <sys/types.h>
-
- extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp);
- extern SANE_Status sanei_udp_open_broadcast(int *fdp);
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
deleted file mode 100644
index c8ed34e..0000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/configure.in b/configure.in
-index e13888c..4365868 100644
---- a/configure.in
-+++ b/configure.in
-@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then
- AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
- fi
-
--dnl added by PN 3/2/12 to detect cups
--$as_echo "checking for cups"
--if test -e /usr/include/cups/cups.h ; then
-- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-- with_cups="yes"
-- LIBS="-lcups $LIBS"
--else
-- $as_echo "cups.h not found, you may want to install a cups development package"
-- $as_echo "in order to autodetect network scanners in kodakaio."
-- with_cups="no"
--fi
-+dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead
-+dnl $as_echo "checking for cups"
-+dnl if test -e /usr/include/cups/cups.h ; then
-+dnl AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-+dnl with_cups="yes"
-+dnl LIBS="-lcups $LIBS"
-+dnl else
-+dnl $as_echo "cups.h not found, you may want to install a cups development package"
-+dnl $as_echo "in order to autodetect network scanners in kodakaio."
-+dnl with_cups="no"
-+dnl fi
-
- dnl added by llagendijk 12/7/2012 to detect systemd for saned
- $as_echo_n "Checking for systemd..."
-@@ -816,7 +816,7 @@ fi
- echo "IPv6 support: `eval eval echo ${ipv6}`"
- echo "Avahi support: `eval eval echo ${enable_avahi}`"
- echo "SNMP support: `eval eval echo ${with_snmp}`"
--echo "CUPS support: `eval eval echo ${with_cups}`"
-+dnl echo "CUPS support: `eval eval echo ${with_cups}`" commented out 15/10/13
- echo "-> The following backends will be built:"
- for backend in ${BACKENDS} ; do
- echo $ECHO_N "${backend} "
diff --git a/media-gfx/sane-backends/files/saned b/media-gfx/sane-backends/files/saned
deleted file mode 100644
index 4b3e228..0000000
--- a/media-gfx/sane-backends/files/saned
+++ /dev/null
@@ -1,10 +0,0 @@
-service sane-port
-{
- socket_type = stream
- server = /usr/sbin/saned
- protocol = tcp
- user = saned
- group = scanner
- wait = no
- disable = yes
-}
diff --git a/media-gfx/sane-backends/files/saned.confd b/media-gfx/sane-backends/files/saned.confd
deleted file mode 100644
index adb1eab..0000000
--- a/media-gfx/sane-backends/files/saned.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# The user saned should drop its privileges to after startup
-#SANED_USER=""
diff --git a/media-gfx/sane-backends/files/saned.initd b/media-gfx/sane-backends/files/saned.initd
deleted file mode 100644
index 26498dd..0000000
--- a/media-gfx/sane-backends/files/saned.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/files/saned.initd,v 1.1 2013/03/15 08:15:52 phosphan Exp $
-
-pidfile="/var/run/saned/saned.pid"
-command="/usr/sbin/saned"
-command_args="-a ${SANED_USER:-root}"
-
-start_pre() {
- checkpath -d -o ${SANED_USER:-root} ${pidfile%/*}
-}
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
deleted file mode 100644
index 95a1b7f..0000000
--- a/media-gfx/sane-backends/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer>
- <email>teiresias@gentoo.org</email>
- <name>Chris Brannon</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r99.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r99.ebuild
deleted file mode 100644
index 7919a11..0000000
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r99.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r5.ebuild,v 1.2 2014/06/18 19:24:59 mgorny Exp $
-
-EAPI="5"
-
-inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs
-
-# gphoto and v4l are handled by their usual USE flags.
-# The pint backend was disabled because I could not get it to compile.
-IUSE_SANE_BACKENDS="
- abaton
- agfafocus
- apple
- artec
- artec_eplus48u
- as6e
- avision
- bh
- canon
- canon630u
- canon_dr
- canon_pp
- cardscan
- coolscan
- coolscan2
- coolscan3
- dc210
- dc240
- dc25
- dell1600n_net
- dmc
- epjitsu
- epson
- epson2
- fujitsu
- genesys
- gt68xx
- hp
- hp3500
- hp3900
- hp4200
- hp5400
- hp5590
- hpljm1005
- hpsj5s
- hs2p
- ibm
- kodak
- kodakaio
- kvs1025
- kvs20xx
- kvs40xx
- leo
- lexmark
- ma1509
- magicolor
- matsushita
- microtek
- microtek2
- mustek
- mustek_pp
- mustek_usb
- mustek_usb2
- nec
- net
- niash
- p5
- pie
- pixma
- plustek
- plustek_pp
- pnm
- qcam
- ricoh
- rts8891
- s9036
- sceptre
- sharp
- sm3600
- sm3840
- snapscan
- sp15c
- st400
- stv680
- tamarack
- teco1
- teco2
- teco3
- test
- u12
- umax
- umax1220u
- umax_pp
- xerox_mfp"
-
-IUSE="avahi doc gphoto2 ipv6 threads usb v4l xinetd snmp systemd"
-
-for backend in ${IUSE_SANE_BACKENDS}; do
- case ${backend} in
- # Disable backends that require parallel ports as no one has those anymore.
- canon_pp|hpsj5s|mustek_pp|\
- pnm)
- IUSE+=" -sane_backends_${backend}"
- ;;
- mustek_usb2|kvs40xx)
- IUSE+=" sane_backends_${backend}"
- ;;
- *)
- IUSE+=" +sane_backends_${backend}"
- esac
-done
-
-REQUIRED_USE="
- sane_backends_mustek_usb2? ( threads )
- sane_backends_kvs40xx? ( threads )
-"
-
-DESCRIPTION="Scanner Access Now Easy - Backends"
-HOMEPAGE="http://www.sane-project.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
- sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
- sane_backends_dc240? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
- sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
- >=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] )
- avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
- sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
- sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
- sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] )
- usb? ( >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] )
- gphoto2? (
- >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}]
- >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}]
- )
- v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
- xinetd? ( sys-apps/xinetd )
- snmp? ( net-analyzer/net-snmp )
- systemd? ( sys-apps/systemd:0= )
-"
-
-DEPEND="${RDEPEND}
- v4l? ( sys-kernel/linux-headers )
- doc? (
- virtual/latex-base
- dev-texlive/texlive-latexextra
- )
- >=sys-apps/sed-4
-
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device)
-RDEPEND="${RDEPEND}
- !<sys-fs/udev-114
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-medialibs-20140508
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
- )"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/sane-config
-)
-
-pkg_setup() {
- enewgroup scanner
- enewuser saned -1 -1 -1 scanner
-}
-
-src_prepare() {
- cat >> backend/dll.conf.in <<-EOF
- # Add support for the HP-specific backend. Needs net-print/hplip installed.
- hpaio
- # Add support for the Epson-specific backend. Needs media-gfx/iscan installed.
- epkowa
- EOF
- epatch "${FILESDIR}"/niash_array_index.patch \
- "${FILESDIR}"/${P}-unused-cups.patch \
- "${FILESDIR}"/${P}-automagic_systemd.patch \
- "${FILESDIR}"/${P}-systemd_pkgconfig.patch \
- "${FILESDIR}"/${P}-kodakaio_avahi.patch \
- "${FILESDIR}"/${P}-saned_pidfile_location.patch \
- "${FILESDIR}"/${P}-u_char.patch
- # Fix for "make check".
- sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html*
- AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- # the blank is intended - an empty string would result in building ALL backends.
- local BACKENDS=" "
-
- use gphoto2 && BACKENDS="gphoto2"
- use v4l && BACKENDS="${BACKENDS} v4l"
- for backend in ${IUSE_SANE_BACKENDS}; do
- if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then
- BACKENDS="${BACKENDS} ${backend}"
- fi
- done
-
- local myconf=(
- $(use_enable usb libusb_1_0)
- $(multilib_native_use_with snmp)
- )
-
- # you can only enable this backend, not disable it...
- if use sane_backends_pnm; then
- myconf+=( --enable-pnm-backend )
- fi
- if ! use doc; then
- myconf+=( --disable-latex )
- fi
- if use sane_backends_mustek_pp; then
- myconf+=( --enable-parport-directio )
- fi
- if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then
- myconf+=( sane_cv_use_libieee1284=no )
- fi
- # if LINGUAS is set, just use the listed and supported localizations.
- if [ "${LINGUAS-NoLocalesSet}" != NoLocalesSet ]; then
- mkdir -p po || die
- echo > po/LINGUAS
- for lang in ${LINGUAS}; do
- if [ -a "${S}"/po/${lang}.po ]; then
- echo ${lang} >> po/LINGUAS
- fi
- done
- fi
-
- # relative path must be used for tests to work properly
- ECONF_SOURCE=../${P} \
- SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \
- BACKENDS="${BACKENDS}" \
- econf \
- $(use_with gphoto2) \
- $(multilib_native_use_with systemd) \
- $(use_with v4l) \
- $(use_enable avahi) \
- $(use_enable ipv6) \
- $(use_enable threads pthread) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake VARTEXFONTS="${T}/fonts"
-
- if use usb; then
- cd tools/hotplug || die
- sed -i -e '/^$/d' libsane.usermap || die
- fi
-
- if tc-is-cross-compiler; then
- # The build system sucks and doesn't handle this properly.
- # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366
- tc-export_build_env BUILD_CC
- cd "${BUILD_DIR}"/tools || die
- ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} -I. -I../include -I"${S}"/include \
- "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \
- "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die
- local dirs=( hal hotplug hotplug-ng udev )
- local targets=(
- hal/libsane.fdi
- hotplug/libsane.usermap
- hotplug-ng/libsane.db
- udev/libsane.rules
- )
- mkdir -p "${dirs[@]}" || die
- emake "${targets[@]}"
- fi
-}
-
-multilib_src_install() {
- emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
- docdir="${EPREFIX}"/usr/share/doc/${PF}
-
- if multilib_is_native_abi; then
- if use usb; then
- insinto /etc/hotplug/usb
- doins tools/hotplug/libsane.usermap
- fi
-
- udev_newrules tools/udev/libsane.rules 41-libsane.rules
- insinto "/usr/share/pkgconfig"
- doins tools/sane-backends.pc
- fi
-}
-
-multilib_src_install_all() {
- keepdir /var/lib/lock/sane
- fowners root:scanner /var/lib/lock/sane
- fperms g+w /var/lib/lock/sane
- dodir /etc/env.d
-
- if use usb; then
- exeinto /etc/hotplug/usb
- doexe tools/hotplug/libusbscanner
- newdoc tools/hotplug/README README.hotplug
- fi
-
- dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux
- prune_libtool_files --all
- if use xinetd; then
- insinto /etc/xinetd.d
- doins "${FILESDIR}"/saned
- fi
-
- newinitd "${FILESDIR}"/saned.initd saned
- newconfd "${FILESDIR}"/saned.confd saned
-}
-
-pkg_postinst() {
- if use xinetd; then
- elog "If you want remote clients to connect, edit"
- elog "/etc/sane.d/saned.conf and /etc/hosts.allow"
- fi
-
- elog "If you are using a USB scanner, add all users who want"
- elog "to access your scanner to the \"scanner\" group."
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild
deleted file mode 100644
index 0967bf4..0000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r99.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.15 2013/09/01 18:36:03 ago Exp $
-
-EAPI=5
-
-# no support for python3_2 or above yet wrt #471326
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="doc debug alisp python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.2.6 )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
- # force use of correct python-config wrt #478802
- if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
- use python && { sed -i -e "s:python-config:$EPYTHON-config:" configure.in || die; }
- fi
- epatch "${FILESDIR}"/${P}-rewind.patch #477282
- epatch "${FILESDIR}"/${P}-musl.patch
- epatch "${FILESDIR}"/${PN}-1.0.25-pcm-h.patch
- epatch "${FILESDIR}"/${PN}-1.0.27.2-portable-mutex.patch
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- local myconf
- use elibc_uclibc && myconf="--without-versioned"
-
- ECONF_SOURCE=${S} \
- econf \
- --disable-maintainer-mode \
- --enable-shared \
- --disable-resmgr \
- --enable-rawmidi \
- --enable-seq \
- --enable-aload \
- $(use_with debug) \
- $(use_enable alisp) \
- $(use_enable python) \
- ${myconf}
-}
-
-src_compile() {
- emake
-
- if use doc; then
- emake doc
- fgrep -Zrl "${S}" doc/doxygen/html | \
- xargs -0 sed -i -e "s:${S}::"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- if use doc; then
- dohtml -r doc/doxygen/html/.
- fi
- prune_libtool_files --all
- find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
- dodoc ChangeLog doc/asoundrc.txt NOTES TODO
-}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch
deleted file mode 100644
index 7d6dc13..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.25-pcm-h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-taken from sabotage linux
-
---- alsa-lib-1.0.25/include/pcm.h
-+++ alsa-lib-1.0.25.patched/include/pcm.h
-@@ -33,6 +33,7 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
- /**
- * \defgroup PCM PCM Interface
- * See the \ref pcm page for more details.
-@@ -941,10 +942,10 @@
- int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
- ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
--u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
--u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
--u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
--u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
-+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
-+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
-+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
-
- snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-musl.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-musl.patch
deleted file mode 100644
index 0521fe0..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur a/alsa-lib-1.0.27.1/configure.in b/alsa-lib-1.0.27.1/configure.in
---- a/alsa-lib-1.0.27.1/configure.in 2013-05-21 08:48:28.000000000 +0000
-+++ b/alsa-lib-1.0.27.1/configure.in 2014-02-16 21:04:29.833236371 +0000
-@@ -64,7 +64,7 @@
-
- dnl Checks for library functions.
- AC_PROG_GCC_TRADITIONAL
--AC_CHECK_FUNC([hsearch_r], [HAVE_HSEARCH_R=yes])
-+AC_CHECK_FUNC([hsearch], [HAVE_HSEARCH_R=yes])
- AM_CONDITIONAL([ALSA_HSEARCH_R], [test "x$HAVE_HSEARCH_R" != xyes])
- AC_CHECK_FUNCS([uselocale])
-
-diff -ur a/alsa-lib-1.0.27.1/include/global.h b/alsa-lib-1.0.27.1/include/global.h
---- a/alsa-lib-1.0.27.1/include/global.h 2013-05-21 08:48:28.000000000 +0000
-+++ b/alsa-lib-1.0.27.1/include/global.h 2014-02-16 20:08:10.954478169 +0000
-@@ -133,7 +133,7 @@
-
- int snd_user_file(const char *file, char **result);
-
--#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
-+#if 0
- struct timeval {
- time_t tv_sec; /* seconds */
- long tv_usec; /* microseconds */
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch
deleted file mode 100644
index f585645..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27.1-rewind.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f2d39afe6139ab16aa2aeea0f51f32db79ab1262 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Thu, 30 May 2013 12:26:34 +0200
-Subject: [PATCH] pcm_plugin: Fix return value of snd_pcm_rewind
-
-In case the rewind did not rewind as much as expected, e g due to
-time delay between the latest avail update and the rewind, we must
-properly account for that in the plugin layer.
-
-Otherwise, the plugin's appl ptr and the hw's appl ptr become
-unsynchronised, which is very bad, especially in mmap_shadow plugins,
-e g, this could cause the overlapping memcpy in the softvol plugin
-as seen here:
-https://bugs.freedesktop.org/show_bug.cgi?id=64299
-
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- src/pcm/pcm_plugin.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index 96218a8..17157e8 100644
---- a/src/pcm/pcm_plugin.c
-+++ b/src/pcm/pcm_plugin.c
-@@ -219,9 +219,9 @@ static snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
- snd_atomic_write_end(&plugin->watom);
- return sframes;
- }
-- snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) frames);
-+ snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) sframes);
- snd_atomic_write_end(&plugin->watom);
-- return (snd_pcm_sframes_t) frames;
-+ return (snd_pcm_sframes_t) sframes;
- }
-
- static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm)
---
-1.7.11.7
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch
deleted file mode 100644
index c4f90d2..0000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27.2-portable-mutex.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-taken from sabotage linux
-
---- alsa-lib-1.0.27.2.orig/src/conf.c
-+++ alsa-lib-1.0.27.2/src/conf.c
-@@ -427,8 +427,8 @@
- #ifndef DOC_HIDDEN
-
- #ifdef HAVE_LIBPTHREAD
--static pthread_mutex_t snd_config_update_mutex =
-- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t snd_config_update_mutex;
-+static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT;
- #endif
-
- struct _snd_config {
-@@ -472,8 +472,19 @@
-
- #ifdef HAVE_LIBPTHREAD
-
-+static void snd_config_init_mutex(void)
-+{
-+ pthread_mutexattr_t attr;
-+
-+ pthread_mutexattr_init(&attr);
-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+ pthread_mutex_init(&snd_config_update_mutex, &attr);
-+ pthread_mutexattr_destroy(&attr);
-+}
-+
- static inline void snd_config_lock(void)
- {
-+ pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex);
- pthread_mutex_lock(&snd_config_update_mutex);
- }
-
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
deleted file mode 100644
index 0ea67ae..0000000
--- a/media-libs/alsa-lib/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>alsa</herd>
- <maintainer>
- <email>alsa-bugs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="alisp">Enable support for ALISP (ALSA LISP) interpreter for advanced features.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:alsa-project:alsa-lib</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/libmpdclient/files/libmpdclient-2.9-missing_headers.patch b/media-libs/libmpdclient/files/libmpdclient-2.9-missing_headers.patch
deleted file mode 100644
index cd1b384..0000000
--- a/media-libs/libmpdclient/files/libmpdclient-2.9-missing_headers.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/libmpdclient-2.9/src/socket.c
-+++ b/libmpdclient-2.9/src/socket.c
-@@ -36,6 +36,7 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/select.h>
-
- #ifdef WIN32
- # include <winsock2.h>
---- a/libmpdclient-2.9/src/sync.c
-+++ b/libmpdclient-2.9/src/sync.c
-@@ -35,6 +35,7 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/select.h>
-
- static bool
- ignore_errno(int e)
diff --git a/media-libs/libmpdclient/libmpdclient-2.9-r99.ebuild b/media-libs/libmpdclient/libmpdclient-2.9-r99.ebuild
deleted file mode 100644
index 045a1df..0000000
--- a/media-libs/libmpdclient/libmpdclient-2.9-r99.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpdclient/libmpdclient-2.9.ebuild,v 1.8 2014/01/26 12:15:37 ago Exp $
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="http://www.musicpd.org"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="doc examples static-libs"
-
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
- sed -e "s:@top_srcdir@:.:" -i doc/doxygen.conf.in
-
- epatch ${FILESDIR}/${P}-missing_headers.patch
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- $(use_enable static-libs static) \
- $(use_enable doc documentation)
-}
-
-src_install() {
- default
- use examples && dodoc src/example.c
- use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
- find "${ED}" -name "*.la" -exec rm -rf {} + || die "failed to delete .la files"
-}
diff --git a/media-libs/libmpdclient/metadata.xml b/media-libs/libmpdclient/metadata.xml
deleted file mode 100644
index f939777..0000000
--- a/media-libs/libmpdclient/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sound</herd>
- <maintainer>
- <email>angelos@gentoo.org</email>
- <name>Christoph Mende</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-libs/libv4l/files/libv4l-1.0.0-configure.patch b/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
deleted file mode 100644
index d9437e6..0000000
--- a/media-libs/libv4l/files/libv4l-1.0.0-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/v4l-utils-1.0.0/configure.ac
-+++ b/v4l-utils-1.0.0/configure.ac
-@@ -144,15 +144,6 @@
- AC_SUBST([DLOPEN_LIBS])
- LIBS=$dl_saved_libs
-
--AC_CHECK_HEADER([argp.h],,AC_MSG_ERROR(Cannot continue: argp.h not found))
--argp_saved_libs=$LIBS
-- AC_SEARCH_LIBS([argp_parse],
-- [argp],
-- [test "$ac_cv_search_argp_parse" = "none required" || ARGP_LIBS=$ac_cv_search_argp_parse],
-- [AC_MSG_ERROR([unable to find the argp_parse() function])])
-- AC_SUBST([ARGP_LIBS])
--LIBS=$argp_saved_libs
--
- AC_CHECK_HEADER([linux/i2c-dev.h], [linux_i2c_dev=yes], [linux_i2c_dev=no])
- AM_CONDITIONAL([HAVE_LINUX_I2C_DEV], [test x$linux_i2c_dev = xyes])
-
-@@ -238,7 +229,7 @@
- AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4lutils != xno])
- AM_CONDITIONAL([WITH_QV4L2], [test ${qt_pkgconfig} = true -a x$enable_qv4l2 != xno])
- AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_libv4l != xno -a x$enable_shared != xno])
--AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_libv4l != xno -a x$enable_shared != xno])
-+AM_CONDITIONAL([WITH_V4L_WRAPPERS], [false])
-
- # append -static to libtool compile and link command to enforce static libs
- AS_IF([test x$enable_libdvbv5 != xyes], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])])
diff --git a/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch b/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch
deleted file mode 100644
index 4fdd632..0000000
--- a/media-libs/libv4l/files/libv4l-1.0.0-off_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/v4l-utils-1.0.0/lib/libv4lconvert/libv4lsyscall-priv.h
-+++ b/v4l-utils-1.0.0/lib/libv4lconvert/libv4lsyscall-priv.h
-@@ -99,7 +99,7 @@
- #else
- #define SYS_MMAP(addr, len, prot, flags, fd, off) \
- syscall(SYS_mmap2, (void *)(addr), (size_t)(len), \
-- (int)(prot), (int)(flags), (int)(fd), (__off_t)((off) >> MMAP2_PAGE_SHIFT))
-+ (int)(prot), (int)(flags), (int)(fd), (off_t)((off) >> MMAP2_PAGE_SHIFT))
- #endif
-
- #define SYS_MUNMAP(addr, len) \
diff --git a/media-libs/libv4l/libv4l-1.0.0-r99.ebuild b/media-libs/libv4l/libv4l-1.0.0-r99.ebuild
deleted file mode 100644
index 51985fb..0000000
--- a/media-libs/libv4l/libv4l-1.0.0-r99.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-1.0.0.ebuild,v 1.6 2014/07/28 13:46:11 ago Exp $
-
-EAPI=5
-inherit eutils linux-info udev multilib-minimal autotools
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND=">=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}]
- virtual/glu
- virtual/opengl
- x11-libs/libX11:=
- !media-tv/v4l2-ctl
- !<media-tv/ivtv-utils-1.4.0-r2
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/os-headers
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- CONFIG_CHECK="~SHMEM"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- epatch ${FILESDIR}/${P}-configure.patch
- epatch ${FILESDIR}/${P}-off_t.patch
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --disable-qv4l2 \
- --disable-v4l-utils \
- --with-udevdir="$(get_udevdir)"
-}
-
-multilib_src_compile() {
- emake -C lib
-}
-
-multilib_src_install() {
- emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README.lib* TODO
- prune_libtool_files --all
-}
diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
deleted file mode 100644
index 1e04bfc..0000000
--- a/media-libs/libv4l/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
- <email>tetromino@gentoo.org</email>
- <name>Alexandre Rostovtsev</name>
- </maintainer>
- <longdescription lang="en">
- libv4l is a collection of libraries which adds a thin abstraction layer on
- top of video4linux2 devices. The purpose of this (thin) layer is to make it
- easy for application writers to support a wide variety of devices without
- having to write separate code for different devices in the same class.
-
- libv4l consists of 3 different libraries: libv4lconvert, libv4l1 and libv4l2.
-
- libv4lconvert offers functions to convert from any (known) pixelformat
- to V4l2_PIX_FMT_BGR24 or V4l2_PIX_FMT_YUV420.
-
- libv4l1 offers the (deprecated) v4l1 API on top of v4l2 devices, independent
- of the drivers for those devices supporting v4l1 compatibility (which many
- v4l2 drivers do not).
-
- libv4l2 offers the v4l2 API on top of v4l2 devices, while adding for the
- application transparent libv4lconvert conversion where necessary.
- </longdescription>
-</pkgmetadata>
-
diff --git a/media-libs/mesa/files/eselect-mesa.conf.8.1 b/media-libs/mesa/files/eselect-mesa.conf.8.1
deleted file mode 100644
index 63a21aa..0000000
--- a/media-libs/mesa/files/eselect-mesa.conf.8.1
+++ /dev/null
@@ -1,38 +0,0 @@
-# mesa classic/gallium implementations in this release
-
-# Syntax description:
-# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
-# classic/gallium implementations.
-# * MESA_DRIVERS is an associative array, for each member "foo" of
-# MESA_IMPLEMENTATIONS it contains the following elements:
-# foo,description - Human-readable description of the driver
-# foo,classicdriver - Filename of the classic driver
-# foo,galliumdriver - Filename of the gallium driver
-# foo,default - which of classic or gallium is chosen by default
-
-MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
-declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
-
-MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
-MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
-MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
-MESA_DRIVERS[i915,default]="gallium"
-
-MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)"
-MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
-MESA_DRIVERS[i965,default]="classic"
-
-MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
-MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
-MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
-MESA_DRIVERS[r300,default]="gallium"
-
-MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
-MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
-MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
-MESA_DRIVERS[r600,default]="gallium"
-
-MESA_DRIVERS[sw,description]="sw (Software renderer)"
-MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
-MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
-MESA_DRIVERS[sw,default]="gallium"
diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 b/media-libs/mesa/files/eselect-mesa.conf.9.2
deleted file mode 100644
index ff590f5..0000000
--- a/media-libs/mesa/files/eselect-mesa.conf.9.2
+++ /dev/null
@@ -1,39 +0,0 @@
-# mesa classic/gallium implementations in this release
-
-# Syntax description:
-# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
-# classic/gallium implementations.
-# * MESA_DRIVERS is an associative array, for each member "foo" of
-# MESA_IMPLEMENTATIONS it contains the following elements:
-# foo,description - Human-readable description of the driver
-# foo,classicdriver - Filename of the classic driver
-# foo,galliumdriver - Filename of the gallium driver
-# foo,default - which of classic or gallium is chosen by default
-
-MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
-declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
-
-MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
-MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
-MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
-MESA_DRIVERS[i915,default]="gallium"
-
-MESA_DRIVERS[i965,description]="i965 (Intel GMA 965, G/Q3x, G/Q4x, HD)"
-MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
-MESA_DRIVERS[i965,galliumdriver]="ilo_dri.so"
-MESA_DRIVERS[i965,default]="classic"
-
-MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
-MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
-MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
-MESA_DRIVERS[r300,default]="gallium"
-
-MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
-MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
-MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
-MESA_DRIVERS[r600,default]="gallium"
-
-MESA_DRIVERS[sw,description]="sw (Software renderer)"
-MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
-MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
-MESA_DRIVERS[sw,default]="gallium"
diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch
deleted file mode 100644
index 495b7dc..0000000
--- a/media-libs/mesa/files/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org
-
- #240956
- * configure.ac add support to enable readonly test segment on x86
-
---- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100
-+++ configure.ac 2008-11-17 23:20:17.000000000 +0100
-@@ -499,6 +499,20 @@
- enable_xcb=no
- fi
-
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+ [AS_HELP_STRING([--enable-glx-rts],
-+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
-+ [enable_glx_rts="$enableval"],
-+ [enable_glx_rts=no])
-+if test "x$enable_glx_rts" = xyes; then
-+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
-+else
-+ enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl libGL configuration per driver
- dnl
diff --git a/media-libs/mesa/files/mesa-10-pthread.patch b/media-libs/mesa/files/mesa-10-pthread.patch
deleted file mode 100644
index 17a8bda..0000000
--- a/media-libs/mesa/files/mesa-10-pthread.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-mesa-10.patch from sabotage linux
-
---- ./include/c11/threads_posix.h.orig
-+++ ./include/c11/threads_posix.h
-@@ -178,7 +178,7 @@
- return thrd_error;
- pthread_mutexattr_init(&attr);
- if ((type & mtx_recursive) != 0) {
--#if defined(__linux__) || defined(__linux)
-+#if defined(__GLIBC__)
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- #else
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
-+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
-@@ -34,7 +34,7 @@
- #ifndef VMW_SCREEN_H_
- #define VMW_SCREEN_H_
-
--
-+#include <sys/stat.h>
- #include "pipe/p_compiler.h"
- #include "pipe/p_state.h"
-
diff --git a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch
deleted file mode 100644
index a85a3c1..0000000
--- a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac 2014-03-03 04:05:33.110522943 +0100
-+++ b/configure.ac 2014-03-03 04:06:44.165518094 +0100
-@@ -1774,7 +1774,6 @@
- HAVE_GALLIUM_R300=yes
- PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
- gallium_require_drm_loader
-- gallium_require_llvm "Gallium R300"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
- gallium_check_st "radeon/drm" "r300/dri" "" "" ""
- DRICOMMON_NEED_LIBDRM=yes
diff --git a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch b/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch
deleted file mode 100644
index c38757d..0000000
--- a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32e98e8ef06f0bb6ad55f9fb5858be77c03367b0 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 2 Feb 2015 17:26:49 -0800
-Subject: [PATCH] gallium/util: Don't use __builtin_clrsb in util_last_bit().
-
-Unclear circumstances lead to undefined symbols on x86.
-
-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536916
-Cc: mesa-stable@lists.freedesktop.org
-Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
----
- src/gallium/auxiliary/util/u_math.h | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
-index 19c7343..ca6d0f1 100644
---- a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -561,14 +561,10 @@ util_last_bit(unsigned u)
- static INLINE unsigned
- util_last_bit_signed(int i)
- {
--#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER)
-- return 31 - __builtin_clrsb(i);
--#else
- if (i >= 0)
- return util_last_bit(i);
- else
- return util_last_bit(~(unsigned)i);
--#endif
- }
-
- /* Destructively loop over all of the bits in a mask as in:
---
-2.0.4
-
diff --git a/media-libs/mesa/files/mesa-9.1.6-fpclassify.patch b/media-libs/mesa/files/mesa-9.1.6-fpclassify.patch
deleted file mode 100644
index 3d606c9..0000000
--- a/media-libs/mesa/files/mesa-9.1.6-fpclassify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Mesa-9.1.6.org/src/mesa/main/querymatrix.c 2013-08-04 18:12:47.046000003 +0000
-+++ Mesa-9.1.6/src/mesa/main/querymatrix.c 2013-08-04 18:23:35.360000003 +0000
-@@ -71,7 +71,7 @@
- }
- }
-
--#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
-+#elif defined(fpclassify) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
- defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
- (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
- (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__)
diff --git a/media-libs/mesa/mesa-10.3.7-r1.ebuild b/media-libs/mesa/mesa-10.3.7-r1.ebuild
deleted file mode 100644
index 5417c73..0000000
--- a/media-libs/mesa/mesa-10.3.7-r1.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.3.7-r1.ebuild,v 1.4 2015/02/20 11:16:40 ago Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
- python-any-r1 toolchain-funcs pax-utils ${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/.0/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
- SRC_URI="${SRC_PATCHES}"
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
- ${SRC_PATCHES}"
-fi
-
-# 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="amd64 arm ~mips ppc x86"
-
-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 +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
- opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
- +udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux"
-
-REQUIRED_USE="
- llvm? ( gallium )
- openvg? ( egl gallium )
- opencl? (
- gallium
- llvm
- video_cards_r600? ( r600-llvm-compiler )
- video_cards_radeon? ( r600-llvm-compiler )
- video_cards_radeonsi? ( r600-llvm-compiler )
- )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
- wayland? ( egl gbm )
- xa? ( 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 )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.2.7
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- video_cards_r600? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
- video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] )
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-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}
- ${PYTHON_DEPS}
- llvm? (
- r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-# 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
-
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-src_prepare() {
- # apply patches
- if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
- EPATCH_FORCE="yes" \
- EPATCH_SOURCE="${WORKDIR}/patches" \
- EPATCH_SUFFIX="patch" \
- epatch
- fi
-
- epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch
-
- # relax the requirement that r300 must have llvm, bug 380303
- epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch
-
- # for musl
- epatch "${FILESDIR}"/${PN}-9.1.6-fpclassify.patch
- epatch "${FILESDIR}"/${PN}-10-pthread.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
-
- base_src_prepare
-
- eautoreconf
- multilib_copy_sources
-}
-
-multilib_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") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable llvm gallium-llvm)
- $(use_enable openvg)
- $(use_enable openvg gallium-egl)
- $(use_enable openmax omx)
- $(use_enable r600-llvm-compiler)
- $(use_enable vdpau)
- $(use_enable xa)
- $(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/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- # 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 "$(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}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- 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
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- 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
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-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
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- 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
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- 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
deleted file mode 100644
index fe098a4..0000000
--- a/media-libs/mesa/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
- <flag name='bindist'>Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
- <flag name='classic'>Build drivers based on the classic architecture.</flag>
- <flag name='d3d9'>Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
- <flag name='dri3'>Enable DRI3 support.</flag>
- <flag name='egl'>Enable EGL support.</flag>
- <flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
- <flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
- <flag name='gles'>Enable GLES (both v1 and v2) support.</flag>
- <flag name='gles1'>Enable GLESv1 support.</flag>
- <flag name='gles2'>Enable GLESv2 support.</flag>
- <flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
- <flag name='opencl'>Enable the Clover Gallium OpenCL state tracker.</flag>
- <flag name='openmax'>Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
- <flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
- <flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
- <flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
- <flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
- <flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag>
- <flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
- <flag name='wayland'>Enable support for dev-libs/wayland</flag>
- <flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
- <flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
-</use>
-</pkgmetadata>
diff --git a/media-libs/netpbm/files/make-tarball.sh b/media-libs/netpbm/files/make-tarball.sh
deleted file mode 100755
index d391522..0000000
--- a/media-libs/netpbm/files/make-tarball.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/init.d/functions.sh
-
-if [[ $# -eq 0 || $# -gt 2 ]] ; then
- exec echo "Usage: $0 <version> [netpbm svn root]"
-fi
-
-PN=netpbm
-PV=$1
-P=${PN}-${PV}
-
-SVN_ROOT=${2:-/usr/local/src}
-
-T=/tmp
-
-maint_pkg_create() {
- local base="/usr/local/src"
- local srcdir="${base}/netpbm/release_number"
- local htmldir="${base}/netpbm/userguide"
- if [[ -d ${srcdir} ]] ; then
- cd "${T}" || die
-
- rm -rf ${P}
-
- ebegin "Exporting ${srcdir}/${PV} to ${P}"
- svn export -q "${srcdir}/${PV}" ${P}
- eend $? || return 1
-
- ebegin "Exporting ${htmldir} to ${P}/userguide"
- svn export -q "${htmldir}" ${P}/userguide
- eend $? || return 1
-
- ebegin "Generating manpages from html"
- (cd "${P}/userguide" && ../buildtools/makeman *.html)
- eend $? || return 1
-
- ebegin "Creating ${P}.tar.xz"
- tar cf - ${P} | xz > ${P}.tar.xz
- eend $?
-
- einfo "Tarball now ready at: ${T}/${P}.tar.xz"
- else
- einfo "You need to run:"
- einfo " cd ${base}"
- einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
- die "need svn checkout dir"
- fi
-}
-maint_pkg_create
diff --git a/media-libs/netpbm/files/netpbm-10.31-build.patch b/media-libs/netpbm/files/netpbm-10.31-build.patch
deleted file mode 100644
index cd74474..0000000
--- a/media-libs/netpbm/files/netpbm-10.31-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-- Don't install libnetpbm.a and libnetpbm.so into a sep link dir
-- Try to fix parallel building
-- Make the libopt tool less 'helpful'
-
---- lib/Makefile
-+++ lib/Makefile
-@@ -249,7 +249,7 @@
- .PHONY: install.staticlib
- install.staticlib: $(PKGDIR)/link
- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
-+ $(PKGDIR)/lib
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -257,9 +257,9 @@
- install.sharedlibstub: $(PKGDIR)/link
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
-+ cd $(PKGDIR)/lib ; \
- rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
- libnetpbm.$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
---- GNUmakefile
-+++ GNUmakefile
-@@ -87,6 +87,9 @@
-
- .PHONY: nonmerge
- nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
-+
-+$(PRODUCT_SUBDIRS:%=%/all): buildtools/all
-+converter/all analyzer/all editor/all generator/all other/all: lib/all
-
- OMIT_CONFIG_RULE = 1
- include $(SRCDIR)/Makefile.common
---- buildtools/libopt.c
-+++ buildtools/libopt.c
-@@ -502,7 +502,7 @@
-
- strcpy(outputLine, ""); /* initial value */
- runtime = FALSE; /* initial value */
-- quiet = FALSE; /* initial value */
-+ quiet = TRUE; /* initial value */
- error = FALSE; /* no error yet */
- for (arg = 1; arg < argc && !error; arg++) {
- if (strcmp(argv[arg], "-runtime") == 0)
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-getline.patch b/media-libs/netpbm/files/netpbm-10.51.00-getline.patch
deleted file mode 100644
index 645623e..0000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-getline.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- a/netpbm-10.51.00/converter/ppm/xpmtoppm.c
-+++ b/netpbm-10.51.00/converter/ppm/xpmtoppm.c
-@@ -123,7 +123,7 @@
-
-
- static void
--getline(char * const line,
-+my_getline(char * const line,
- size_t const size,
- FILE * const stream) {
- /*----------------------------------------------------------------------------
-@@ -141,7 +141,7 @@
- Exit program if the line doesn't fit in the buffer.
- -----------------------------------------------------------------------------*/
- if (size > sizeof(lastInputLine))
-- pm_error("INTERNAL ERROR: getline() received 'size' parameter "
-+ pm_error("INTERNAL ERROR: my_getline() received 'size' parameter "
- "which is out of bounds");
-
- if (backup) {
-@@ -387,7 +387,7 @@
- int * const transparentP) {
- /*----------------------------------------------------------------------------
- Read the header of the XPM file on stream 'stream'. Assume the
-- getline() stream is presently positioned to the beginning of the
-+ my_getline() stream is presently positioned to the beginning of the
- file and it is a Version 3 XPM file. Leave the stream positioned
- after the header.
-
-@@ -423,25 +423,25 @@
- unsigned int * ptab;
-
- /* Read the XPM signature comment */
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- if (strncmp(line, xpm3_signature, strlen(xpm3_signature)) != 0)
- pm_error("Apparent XPM 3 file does not start with '/* XPM */'. "
- "First line is '%s'", xpm3_signature);
-
- /* Read the assignment line */
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- if (strncmp(line, "static char", 11) != 0)
- pm_error("Cannot find data structure declaration. Expected a "
- "line starting with 'static char', but found the line "
- "'%s'.", line);
-
- /* Read the hints line */
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- /* skip the comment line if any */
- if (!strncmp(line, "/*", 2)) {
- while (!strstr(line, "*/"))
-- getline(line, sizeof(line), stream);
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- }
- if (sscanf(line, "\"%u %u %u %u\",", &width, &height,
- &nColors, &charsPerPixel) != 4)
-@@ -475,10 +475,10 @@
- *transparentP = -1; /* initial value */
-
- for (seqNum = 0; seqNum < nColors; ++seqNum) {
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- /* skip the comment line if any */
- if (!strncmp(line, "/*", 2))
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
-
- interpretXpm3ColorTableLine(line, seqNum, charsPerPixel,
- colors, ptab, nColors, transparentP);
-@@ -504,7 +504,7 @@
- unsigned int ** const ptabP) {
- /*----------------------------------------------------------------------------
- Read the header of the XPM file on stream 'stream'. Assume the
-- getline() stream is presently positioned to the beginning of the
-+ my_getline() stream is presently positioned to the beginning of the
- file and it is a Version 1 XPM file. Leave the stream positioned
- after the header.
-
-@@ -525,7 +525,7 @@
- /* Read the initial defines. */
- processedStaticChar = FALSE;
- while (!processedStaticChar) {
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
-
- if (sscanf(line, "#define %s %d", str1, &v) == 2) {
- char *t1;
-@@ -576,7 +576,7 @@
- /* If there's a monochrome color table, skip it. */
- if (!strncmp(t1, "mono", 4)) {
- for (;;) {
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- if (!strncmp(line, "static char", 11))
- break;
- }
-@@ -599,7 +599,7 @@
-
- /* Read color table. */
- for (i = 0; i < *ncolorsP; ++i) {
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
-
- if ((t1 = strchr(line, '"')) == NULL)
- pm_error("D error scanning color table");
-@@ -635,7 +635,7 @@
- "static char ...").
- */
- for (;;) {
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- if (strncmp(line, "static char", 11) == 0)
- break;
- }
-@@ -741,7 +741,7 @@
- backup = FALSE;
-
- /* Read the header line */
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- backup = TRUE; /* back up so next read reads this line again */
-
- rc = sscanf(line, "/* %s */", str1);
-@@ -761,7 +761,7 @@
- pm_error("Could not get %d bytes of memory for image", totalpixels);
- cursor = *dataP;
- maxcursor = *dataP + totalpixels - 1;
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- /* read next line (first line may not always start with comment) */
- while (cursor <= maxcursor) {
- if (strncmp(line, "/*", 2) == 0) {
-@@ -771,7 +771,7 @@
- ncolors, ptab, &cursor, maxcursor);
- }
- if (cursor <= maxcursor)
-- getline(line, sizeof(line), stream);
-+ my_getline(line, sizeof(line), stream);
- }
- if (ptab) free(ptab);
- }
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch b/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
deleted file mode 100644
index 1eb5506..0000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-pnmconvol-nooffset.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-taken from upstream
-
-http://bugs.gentoo.org/338230
-
-Index: editor/pnmconvol.c
-===================================================================
---- editor/pnmconvol.c (revision 1297)
-+++ editor/pnmconvol.c (revision 1298)
-@@ -455,13 +455,13 @@ static void
- convKernelCreatePnm(struct pam * const cpamP,
- tuple * const * const ctuples,
- unsigned int const depth,
-- bool const offsetPgm,
-+ bool const offsetPnm,
- struct convKernel ** const convKernelPP) {
- /*----------------------------------------------------------------------------
-- Compute the convolution matrix in normalized form from the PGM
-- form. Each element of the output matrix is the actual weight we give an
-- input pixel -- i.e. the thing by which we multiple a value from the
-- input image.
-+ Compute the convolution matrix in normalized form from the PGM form
-+ 'ctuples'/'cpamP'. Each element of the output matrix is the actual weight
-+ we give an input pixel -- i.e. the thing by which we multiple a value from
-+ the input image.
-
- 'depth' is the required number of planes in the kernel. If 'ctuples' has
- fewer planes than that, we duplicate as necessary. E.g. if 'ctuples' is
-@@ -470,13 +470,13 @@ convKernelCreatePnm(struct pam *
- 'ctuples' has more planes than specified, we ignore the higher numbered
- ones.
-
-- 'offsetPgm' means the PGM convolution matrix is defined in offset form so
-+ 'offsetPnm' means the PNM convolution matrix is defined in offset form so
- that it can represent negative values. E.g. with maxval 100, 50 means
- 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
- and there are no negative weights.
- -----------------------------------------------------------------------------*/
-- double const scale = (offsetPgm ? 2.0 : 1.0) / cpamP->maxval;
-- double const offset = offsetPgm ? - 1.0 : 0.0;
-+ double const scale = (offsetPnm ? 2.0 : 1.0) / cpamP->maxval;
-+ double const offset = offsetPnm ? - 1.0 : 0.0;
- unsigned int const planes = MIN(3, depth);
-
- struct convKernel * convKernelP;
-@@ -579,9 +579,19 @@ normalizeKernel(struct convKernel * cons
- static void
- getKernelPnm(const char * const fileName,
- unsigned int const depth,
-- bool const nooffset,
-+ bool const offset,
- struct convKernel ** const convKernelPP) {
-+/*----------------------------------------------------------------------------
-+ Get the convolution kernel from the PNM file named 'fileName'.
-+ 'offset' means the PNM convolution matrix is defined in offset form so
-+ that it can represent negative values. E.g. with maxval 100, 50 means
-+ 0, 100 means 50, and 0 means -50. If 'offsetPgm' is false, 0 means 0
-+ and there are no negative weights.
-+
-+ Make the kernel suitable for convolving an image of depth 'depth'.
-
-+ Return the kernel as *convKernelPP.
-+-----------------------------------------------------------------------------*/
- struct pam cpam;
- FILE * cifP;
- tuple ** ctuples;
-@@ -594,7 +604,7 @@ getKernelPnm(const char * const
-
- validateKernelDimensions(cpam.width, cpam.height);
-
-- convKernelCreatePnm(&cpam, ctuples, depth, nooffset, convKernelPP);
-+ convKernelCreatePnm(&cpam, ctuples, depth, offset, convKernelPP);
- }
-
-
-@@ -893,7 +903,7 @@ getKernel(struct cmdlineInfo const cmd
- struct convKernel * convKernelP;
-
- if (cmdline.pnmMatrixFileName)
-- getKernelPnm(cmdline.pnmMatrixFileName, depth, cmdline.nooffset,
-+ getKernelPnm(cmdline.pnmMatrixFileName, depth, !cmdline.nooffset,
- &convKernelP);
- else if (cmdline.matrixfile)
- convKernelCreateSimpleFile(cmdline.matrixfile, cmdline.normalize,
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch b/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
deleted file mode 100644
index 0c1e485..0000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-ppmtompeg-free.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-fix from upstream
-
-------------------------------------------------------------------------
-r1285 | giraffedata | 2010-09-18 16:13:39 -0400 (Sat, 18 Sep 2010) | 1 line
-
-Fix free of non-allocated memory
-
-Index: converter/ppm/ppmtompeg/param.c
-===================================================================
---- converter/ppm/ppmtompeg/param.c (revision 1284)
-+++ converter/ppm/ppmtompeg/param.c (revision 1285)
-@@ -283,8 +283,8 @@ GetFrameRate(const char * const p)
-
-
- static void
--mergeInputSource(struct inputSource * const baseSourceP,
-- struct inputSource * const addedSourceP) {
-+mergeInputSource(struct inputSource * const baseSourceP,
-+ const struct inputSource * const addedSourceP) {
-
- unsigned int i;
-
-@@ -294,12 +294,6 @@ mergeInputSource(struct inputSource * co
- for (i = 0; i < addedSourceP->numInputFileEntries; ++i)
- baseSourceP->inputFileEntries[baseSourceP->numInputFileEntries++] =
- addedSourceP->inputFileEntries[i];
--
-- free(addedSourceP);
-- /* Note the space allocated for the *addedSourceP input file
-- entries themselves is still allocated, and used by
-- *baseSourceP.
-- */
- }
-
-
diff --git a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch b/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch
deleted file mode 100644
index e161242..0000000
--- a/media-libs/netpbm/files/netpbm-10.51.00-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- converter/other/Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/converter/other/Makefile b/converter/other/Makefile
-index 1417cd3..c178101 100644
---- a/converter/other/Makefile
-+++ b/converter/other/Makefile
-@@ -167,7 +167,7 @@ pngtopam: %: %.o pngx.o $(NETPBMLIB) $(LIBOPT)
- pnmtopng: %: %.o pngx.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o pngx.o pngtxt.o \
- $(shell $(LIBOPT) $(NETPBMLIB)) \
-- $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD)
-+ $(PNGLIB_LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) -lz
-
- pamrgbatopng: %: %.o $(NETPBMLIB) $(LIBOPT)
- $(LD) -o $@ $@.o \
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
deleted file mode 100644
index 8674333..0000000
--- a/media-libs/netpbm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>graphics</herd>
- <use>
- <flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
- </use>
-</pkgmetadata>
diff --git a/media-libs/netpbm/netpbm-10.51.00-r99.ebuild b/media-libs/netpbm/netpbm-10.51.00-r99.ebuild
deleted file mode 100644
index ea6cfbe..0000000
--- a/media-libs/netpbm/netpbm-10.51.00-r99.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.51.00-r2.ebuild,v 1.6 2013/08/27 15:32:09 kensington Exp $
-
-EAPI="3"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-HOMEPAGE="http://netpbm.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- mirror://gentoo/${P}-libpng-1.5.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
-
-RDEPEND="jbig? ( media-libs/jbigkit )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
- png? ( >=media-libs/libpng-1.4:0 )
- rle? ( media-libs/urt )
- svga? ( media-libs/svgalib )
- tiff? ( >=media-libs/tiff-3.5.5:0 )
- xml? ( dev-libs/libxml2 )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- sys-devel/flex"
-
-maint_pkg_create() {
- local base="/usr/local/src"
- local srcdir="${base}/netpbm/release_number"
- if [[ -d ${srcdir} ]] ; then
- cd "${T}" || die
-
- ebegin "Exporting ${srcdir}/${PV} to netpbm-${PV}"
- svn export -q ${srcdir}/${PV} netpbm-${PV}
- eend $? || return 1
-
- ebegin "Creating netpbm-${PV}.tar.xz"
- tar cf - netpbm-${PV} | xz > netpbm-${PV}.tar.xz
- eend $?
-
- einfo "Tarball now ready at: ${T}/netpbm-${PV}.tar.xz"
- else
- einfo "You need to run:"
- einfo " cd ${base}"
- einfo " svn co https://netpbm.svn.sourceforge.net/svnroot/netpbm"
- die "need svn checkout dir"
- fi
-}
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} && ! -e ${DISTDIR}/${P}.tar.xz ]] && maint_pkg_create ; }
-
-netpbm_libtype() {
- case ${CHOST} in
- *-darwin*) echo dylib;;
- *) echo unixshared;;
- esac
-}
-netpbm_libsuffix() {
- local suffix=$(get_libname)
- echo ${suffix//\.}
-}
-netpbm_ldshlib() {
- case ${CHOST} in
- *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';;
- *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';;
- esac
-}
-netpbm_config() {
- if use $1 ; then
- [[ $2 != "!" ]] && echo -l${2:-$1}
- else
- echo NONE
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/netpbm-10.31-build.patch
- epatch "${FILESDIR}"/${P}-ppmtompeg-free.patch
- epatch "${FILESDIR}"/${P}-pnmconvol-nooffset.patch #338230
- epatch "${WORKDIR}"/${P}-libpng-1.5.patch #355025
- epatch "${FILESDIR}"/${P}-underlinking.patch #367405
-
- epatch "${FILESDIR}"/${P}-getline.patch
-
- # make sure we use system urt
- sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die
- rm -rf urt
-
- # take care of the importinc stuff ourselves by only doing it once
- # at the top level and having all subdirs use that one set #149843
- sed -i \
- -e '/^importinc:/s|^|importinc:\nmanual_|' \
- -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\
- common.mk || die
- sed -i \
- -e '/%.c/s: importinc$::' \
- common.mk lib/Makefile lib/util/Makefile || die
-
- # avoid ugly depend.mk warnings
- touch $(find . -name Makefile | sed s:Makefile:depend.mk:g)
-}
-
-src_configure() {
- cat config.mk.in - >> config.mk <<-EOF
- # Misc crap
- BUILD_FIASCO = N
- SYMLINK = ln -sf
-
- # Toolchain options
- CC = $(tc-getCC) -Wall
- LD = \$(CC)
- CC_FOR_BUILD = $(tc-getBUILD_CC)
- LD_FOR_BUILD = \$(CC_FOR_BUILD)
- AR = $(tc-getAR)
- RANLIB = $(tc-getRANLIB)
-
- STRIPFLAG =
- CFLAGS_SHLIB = -fPIC
-
- LDRELOC = \$(LD) -r
- LDSHLIB = $(netpbm_ldshlib)
- LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to
- LINKERISCOMPILER = Y
- NETPBMLIBSUFFIX = $(netpbm_libsuffix)
- NETPBMLIBTYPE = $(netpbm_libtype)
-
- # Gentoo build options
- TIFFLIB = $(netpbm_config tiff)
- JPEGLIB = $(netpbm_config jpeg)
- PNGLIB = $(netpbm_config png)
- ZLIB = $(netpbm_config zlib z)
- LINUXSVGALIB = $(netpbm_config svga vga)
- XML2_LIBS = $(netpbm_config xml xml2)
- JBIGLIB = -ljbig
- JBIGHDR_DIR = $(netpbm_config jbig "!")
- JASPERLIB = -ljasper
- JASPERHDR_DIR = $(netpbm_config jpeg2k "!")
- URTLIB = $(netpbm_config rle)
- URTHDR_DIR =
- X11LIB = $(netpbm_config X X11)
- X11HDR_DIR =
- EOF
- # cannot chain the die with the heredoc above as bash-3
- # has a parser bug in that setup #282902
- [ $? -eq 0 ] || die "writing config.mk failed"
-}
-
-src_compile() {
- emake -j1 pm_config.h version.h manual_importinc || die #149843
- emake || die
-}
-
-src_install() {
- # Subdir make targets like to use `mkdir` all over the place
- # without any actual dependencies, thus the -j1.
- emake -j1 package pkgdir="${D}"/usr || die
-
- [[ $(get_libdir) != "lib" ]] && mv "${D}"/usr/lib "${D}"/usr/$(get_libdir)
-
- # Remove cruft that we don't need, and move around stuff we want
- rm "${D}"/usr/bin/{doc.url,manweb} || die
- rm -r "${D}"/usr/man/web || die
- rm -r "${D}"/usr/link || die
- rm "${D}"/usr/{README,VERSION,config_template,pkginfo} || die
- dodir /usr/share
- mv "${D}"/usr/man "${D}"/usr/share/ || die
- mv "${D}"/usr/misc "${D}"/usr/share/netpbm || die
-
- dodoc README
- cd doc
- dodoc HISTORY Netpbm.programming USERDOC
- dohtml -r .
-}
diff --git a/media-sound/mpg123/files/mpg123-largefile.patch b/media-sound/mpg123/files/mpg123-largefile.patch
deleted file mode 100644
index 81bab6d..0000000
--- a/media-sound/mpg123/files/mpg123-largefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mpg123-1.15.4/src/libmpg123/mpg123.h.in
-+++ b/mpg123-1.15.4/src/libmpg123/mpg123.h.in
-@@ -53,6 +53,7 @@
- Now, the renaming of large file aware functions.
- By default, it appends underscore _FILE_OFFSET_BITS (so, mpg123_seek_64 for mpg123_seek), if _FILE_OFFSET_BITS is defined. You can force a different suffix via MPG123_LARGESUFFIX (that must include the underscore), or you can just disable the whole mess by defining MPG123_NO_LARGENAME.
- */
-+#define MPG123_NO_LARGENAME
- #if (!defined MPG123_NO_LARGENAME) && ((defined _FILE_OFFSET_BITS) || (defined MPG123_LARGESUFFIX))
-
- /* Need some trickery to concatenate the value(s) of the given macro(s). */
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
deleted file mode 100644
index e45dc8d..0000000
--- a/media-sound/mpg123/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>sound</herd>
- <upstream>
- <maintainer>
- <email>thomas-forum@orgis.org</email>
- <name>Thomas Orgis</name>
- </maintainer>
- </upstream>
- <use>
- <flag name="3dnowext">Enable 3dnowext cpu instructions</flag>
- <flag name="int-quality">Use rounding instead of fast truncation for integer output, where possible</flag>
- </use>
-</pkgmetadata>
diff --git a/media-sound/mpg123/mpg123-1.15.4-r99.ebuild b/media-sound/mpg123/mpg123-1.15.4-r99.ebuild
deleted file mode 100644
index 6410cc7..0000000
--- a/media-sound/mpg123/mpg123-1.15.4-r99.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.15.4.ebuild,v 1.11 2013/08/07 13:24:23 ago Exp $
-
-EAPI=5
-inherit toolchain-funcs libtool flag-o-matic
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="http://www.mpg123.org/"
-SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
-
-RDEPEND="app-eselect/eselect-mpg123
- >=sys-devel/libtool-2.2.6b
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- nas? ( media-libs/nas )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
- elibtoolize # for Darwin bundles
-
- epatch ${FILESDIR}/${PN}-largefile.patch
-}
-
-src_configure() {
- local _audio=dummy
- local _output=dummy
- local _cpu=generic_fpu
-
- for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
- if use ${flag}; then
- _audio="${_audio} ${flag/pulseaudio/pulse}"
- _output=${flag/pulseaudio/pulse}
- fi
- done
-
- use altivec && _cpu=altivec
-
- if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
- use sse && _cpu=x86-64
- elif use x86 && gcc-specs-pie ; then
- # Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
- _cpu=generic_fpu
- elif use x86-macos ; then
- # ASM doesn't work quite as expected with the Darwin linker
- _cpu=generic_fpu
- else
- use mmx && _cpu=mmx
- use 3dnow && _cpu=3dnow
- use sse && _cpu=x86
- use 3dnowext && _cpu=x86
- fi
-
- econf \
- --with-optimization=0 \
- --with-audio="${_audio}" \
- --with-default-audio=${_output} \
- --with-cpu=${_cpu} \
- --enable-network \
- --disable-lfs-alias \
- $(use_enable ipv6) \
- --enable-int-quality=$(usex int-quality)
-}
-
-src_install() {
- default
- mv "${ED}"/usr/bin/mpg123{,-mpg123}
- find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
-
-pkg_postinst() {
- eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
- eselect mpg123 update ifunset
-}
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
deleted file mode 100644
index 8d013ab..0000000
--- a/media-video/ffmpeg/ffmpeg-1.2.6-r99.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.12 2014/06/08 13:01:45 ago Exp $
-
-EAPI="4"
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-2"
- EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
- SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0"
-if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-IUSE="
- aac aacplus alsa amr bindist bluray +bzip2 cdio celt
- cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
- gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
- libcaca libsoxr libv4l modplug mp3 +network openal openssl opus oss pic
- pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
- truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
- "
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext ssse3 vis neon"
-
-for i in ${CPU_FEATURES}; do
- IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
- IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
- alsa? ( media-libs/alsa-lib )
- amr? ( media-libs/opencore-amr )
- bluray? ( media-libs/libbluray )
- bzip2? ( app-arch/bzip2 )
- cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
- celt? ( >=media-libs/celt-0.11.1 )
- encode? (
- aac? ( media-libs/vo-aacenc )
- aacplus? ( media-libs/libaacplus )
- amr? ( media-libs/vo-amrwbenc )
- faac? ( media-libs/faac )
- fdk? ( media-libs/fdk-aac )
- mp3? ( >=media-sound/lame-3.98.3 )
- theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
- twolame? ( media-sound/twolame )
- x264? ( >=media-libs/x264-0.0.20111017 )
- xvid? ( >=media-libs/xvid-1.1.0 )
- )
- flite? ( app-accessibility/flite )
- fontconfig? ( media-libs/fontconfig )
- frei0r? ( media-plugins/frei0r-plugins )
- gnutls? ( >=net-libs/gnutls-2.12.16 )
- gsm? ( >=media-sound/gsm-1.0.12-r1 )
- iconv? ( virtual/libiconv )
- iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
- ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
- libass? ( media-libs/libass )
- libcaca? ( media-libs/libcaca )
- libsoxr? ( media-libs/soxr )
- libv4l? ( media-libs/libv4l )
- modplug? ( media-libs/libmodplug )
- openal? ( >=media-libs/openal-1.1 )
- openssl? ( dev-libs/openssl )
- opus? ( media-libs/opus )
- pulseaudio? ( media-sound/pulseaudio )
- rtmp? ( >=media-video/rtmpdump-2.2f )
- sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video] )
- schroedinger? ( media-libs/schroedinger )
- speex? ( >=media-libs/speex-1.2_beta3 )
- truetype? ( media-libs/freetype:2 )
- vaapi? ( >=x11-libs/libva-0.32 )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
- vpx? ( >=media-libs/libvpx-0.9.6 )
- X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
- zlib? ( sys-libs/zlib )
- !media-video/qt-faststart
- !media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- doc? ( app-text/texi2html )
- fontconfig? ( virtual/pkgconfig )
- gnutls? ( virtual/pkgconfig )
- ieee1394? ( virtual/pkgconfig )
- libv4l? ( virtual/pkgconfig )
- mmx? ( dev-lang/yasm )
- rtmp? ( virtual/pkgconfig )
- schroedinger? ( virtual/pkgconfig )
- test? ( net-misc/wget )
- truetype? ( virtual/pkgconfig )
- v4l? ( sys-kernel/linux-headers )
-"
-# faac is license-incompatible with ffmpeg
-REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
- libv4l? ( v4l )
- fftools_cws2fws? ( zlib )
- test? ( encode )"
-
-S=${WORKDIR}/${P/_/-}
-BUILD_DIR=${S}_build
-
-src_prepare() {
- if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- export revision=git-N-${FFMPEG_REVISION}
- fi
-
- epatch "${FILESDIR}/dirac_arith_hardened.patch"
- epatch "${FILESDIR}/${P}-strerror_r.patch" # for musl
- epatch_user
-}
-
-src_configure() {
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
-
- local myconf="${EXTRA_FFMPEG_CONF}"
-
- # options to use as use_enable in the foo[:bar] form.
- # This will feed configure with $(use_enable foo bar)
- # or $(use_enable foo foo) if no :bar is set.
- local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
- gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
- use openssl && myconf="${myconf} --enable-nonfree"
-
- # Encoders
- if use encode
- then
- ffuse="${ffuse} aac:libvo-aacenc amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
- for i in aacplus faac theora twolame x264 xvid; do
- ffuse="${ffuse} ${i}:lib${i}"
- done
-
- # Licensing.
- if use aac || use amr ; then
- myconf="${myconf} --enable-version3"
- fi
- if use aacplus || use faac || use fdk ; then
- myconf="${myconf} --enable-nonfree"
- fi
- else
- myconf="${myconf} --disable-encoders"
- fi
-
- # libavdevice options
- ffuse="${ffuse} cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
-
- # Indevs
- use v4l || myconf="${myconf} --disable-indev=v4l2"
- for i in alsa oss jack ; do
- use ${i} || myconf="${myconf} --disable-indev=${i}"
- done
- ffuse="${ffuse} libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
-
- # Outdevs
- for i in alsa oss sdl ; do
- use ${i} || myconf="${myconf} --disable-outdev=${i}"
- done
-
- # libavfilter options
- ffuse="${ffuse} flite:libflite frei0r fontconfig libass truetype:libfreetype"
-
- # libswresample options
- ffuse="${ffuse} libsoxr"
-
- # Threads; we only support pthread for now but ffmpeg supports more
- ffuse="${ffuse} threads:pthreads"
-
- # Decoders
- ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb jpeg2k:libopenjpeg"
- use amr && myconf="${myconf} --enable-version3"
- for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
- ffuse="${ffuse} ${i}:lib${i}"
- done
-
- for i in ${ffuse} ; do
- myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
- done
-
- # CPU features
- for i in ${CPU_FEATURES}; do
- use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
- done
- if use pic ; then
- myconf="${myconf} --enable-pic"
- # disable asm code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- use x86 && myconf="${myconf} --disable-asm"
- fi
- [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host" # bug #273421
- myconf="${myconf} --cpu=${i}"
- break
- done
-
- # Mandatory configuration
- myconf="
- --enable-gpl
- --enable-postproc
- --enable-avfilter
- --enable-avresample
- --disable-stripping
- ${myconf}"
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
- case ${CHOST} in
- *freebsd*)
- myconf="${myconf} --target-os=freebsd"
- ;;
- mingw32*)
- myconf="${myconf} --target-os=mingw32"
- ;;
- *linux*)
- myconf="${myconf} --target-os=linux"
- ;;
- esac
- fi
-
- "${S}/configure" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --mandir="${EPREFIX}/usr/share/man" \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- $(use_enable static-libs static) \
- ${myconf} || die
-}
-
-src_compile() {
- cd "${BUILD_DIR}"
- emake V=1
-
- for i in ${FFTOOLS} ; do
- if use fftools_$i ; then
- emake V=1 tools/$i
- fi
- done
-}
-
-src_install() {
- cd "${BUILD_DIR}"
- emake V=1 DESTDIR="${D}" install install-man
-
- for i in ${FFTOOLS} ; do
- if use fftools_$i ; then
- dobin tools/$i
- fi
- done
-
- cd "${S}"
- dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
- use doc && dohtml -r doc/*
- if use examples ; then
- dodoc -r doc/examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}"
- LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
- emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild
deleted file mode 100644
index e5eb797..0000000
--- a/media-video/ffmpeg/ffmpeg-2.2.14-r99.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.3 2015/04/11 12:09:46 zlogene Exp $
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=52.55.55
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-2"
- EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
- SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
-SLOT="0/${FFMPEG_SUBSLOT}"
-if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-fi
-IUSE="
- aac aacplus alsa amr amrenc bluray +bzip2 cdio celt
- cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
- gme gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k
- ladspa libass libcaca libsoxr libv4l modplug mp3 +network openal opengl
- openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex ssh
- static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx
- wavpack webp X x264 x265 xvid +zlib zvbi
- "
-
-ARM_CPU_FEATURES="armv5te armv6 armv6t2 neon armvfp:vfp"
-MIPS_CPU_FEATURES="mips32r2 mipsdspr1 mipsdspr2 mipsfpu"
-PPC_CPU_FEATURES="altivec"
-X86_CPU_FEATURES=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 )
-
-# String for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-CPU_FEATURES="
- ${ARM_CPU_FEATURES}
- ${MIPS_CPU_FEATURES}
- ${PPC_CPU_FEATURES}
- ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}
-"
-
-for i in ${CPU_FEATURES}; do
- IUSE="${IUSE} ${i%:*}"
-done
-
-FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
-
-for i in ${FFTOOLS}; do
- IUSE="${IUSE} +fftools_$i"
-done
-
-RDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
- amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
- bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
- bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
- cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
- celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
- encode? (
- aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
- aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
- amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
- faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- theora? (
- >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
- wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
- webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
- x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
- x265? ( >=media-libs/x265-0.8:=[${MULTILIB_USEDEP}] )
- xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
- )
- fdk? ( >=media-libs/fdk-aac-0.1.3[${MULTILIB_USEDEP}] )
- flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
- fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- frei0r? ( media-plugins/frei0r-plugins )
- gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
- gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
- gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
- iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
- iec61883? (
- >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
- >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
- )
- jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
- libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
- libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
- libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
- libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
- modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
- openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
- opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
- pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- quvi? ( media-libs/libquvi:0.4 )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
- sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
- schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
- speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
- vorbis? (
- >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
- >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
- )
- vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
- >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
- !media-video/qt-faststart
- !media-libs/libpostproc
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/make-3.81
- doc? ( app-text/texi2html )
- fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
- libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
- rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- test? ( net-misc/wget sys-devel/bc )
- truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
- v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-REQUIRED_USE="
- libv4l? ( v4l )
- fftools_cws2fws? ( zlib )
- test? ( encode )"
-# faac is license-incompatible with ffmpeg
-RESTRICT="encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
- if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
- export revision=git-N-${FFMPEG_REVISION}
- fi
- epatch "${FILESDIR}/ladspadl.patch"
- epatch "${FILESDIR}/${PN}-1.2.6-strerror_r.patch"
- epatch_user
-}
-
-multilib_src_configure() {
- local myconf=( ${EXTRA_FFMPEG_CONF} )
-
- # options to use as use_enable in the foo[:bar] form.
- # This will feed configure with $(use_enable foo bar)
- # or $(use_enable foo foo) if no :bar is set.
- local ffuse=(
- bzip2:bzlib cpudetection:runtime-cpudetect debug doc
- gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi
- vdpau zlib
- )
- use openssl && myconf+=( --enable-nonfree )
-
- # Encoders
- if use encode
- then
- ffuse+=( aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame )
- for i in aacplus faac theora twolame wavpack webp x264 x265 xvid; do
- ffuse+=( ${i}:lib${i} )
- done
-
- # Licensing.
- if use aac || use amrenc ; then
- myconf+=( --enable-version3 )
- fi
- if use aacplus || use faac ; then
- myconf+=( --enable-nonfree )
- fi
- else
- myconf+=( --disable-encoders )
- fi
-
- # libavdevice options
- ffuse+=( cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl )
-
- # Indevs
- use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
- for i in alsa oss jack ; do
- use ${i} || myconf+=( --disable-indev=${i} )
- done
- ffuse+=( libv4l:libv4l2 pulseaudio:libpulse X:x11grab )
-
- # Outdevs
- for i in alsa oss sdl ; do
- use ${i} || myconf+=( --disable-outdev=${i} )
- done
-
- # libavfilter options
- ffuse+=( flite:libflite frei0r fontconfig ladspa libass truetype:libfreetype )
-
- # libswresample options
- ffuse+=( libsoxr )
-
- # Threads; we only support pthread for now but ffmpeg supports more
- ffuse+=( threads:pthreads )
-
- # Decoders
- ffuse+=( amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac jpeg2k:libopenjpeg )
- use amr && myconf+=( --enable-version3 )
- for i in bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi; do
- ffuse+=( ${i}:lib${i} )
- done
- use fdk && myconf+=( --enable-nonfree )
-
- for i in "${ffuse[@]}" ; do
- myconf+=( $(use_enable ${i%:*} ${i#*:}) )
- done
-
- # (temporarily) disable non-multilib deps
- if ! multilib_is_native_abi; then
- for i in frei0r libquvi; do
- myconf+=( --disable-${i} )
- done
- fi
-
- # CPU features
- for i in ${CPU_FEATURES}; do
- use ${i%:*} || myconf+=( --disable-${i#*:} )
- done
- if use pic ; then
- myconf+=( --enable-pic )
- # disable asm code if PIC is required
- # as the provided asm decidedly is not PIC for x86.
- [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
- fi
- [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
- # Try to get cpu type based on CFLAGS.
- # Bug #172723
- # We need to do this so that features of that CPU will be better used
- # If they contain an unknown CPU it will not hurt since ffmpeg's configure
- # will just ignore it.
- for i in $(get-flag mcpu) $(get-flag mtune) $(get-flag march) ; do
- [[ ${i} = native ]] && i="host" # bug #273421
- myconf+=( --cpu=${i} )
- break
- done
-
- # Mandatory configuration
- myconf=(
- --enable-gpl
- --enable-postproc
- --enable-avfilter
- --enable-avresample
- --disable-stripping
- "${myconf[@]}"
- )
-
- # cross compile support
- if tc-is-cross-compiler ; then
- myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
- case ${CHOST} in
- *freebsd*)
- myconf+=( --target-os=freebsd )
- ;;
- mingw32*)
- myconf+=( --target-os=mingw32 )
- ;;
- *linux*)
- myconf+=( --target-os=linux )
- ;;
- esac
- fi
-
- set -- "${S}/configure" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --mandir="${EPREFIX}/usr/share/man" \
- --enable-shared \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --optflags="${CFLAGS}" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- $(use_enable static-libs static) \
- "${myconf[@]}"
- echo "${@}"
- "${@}" || die
-}
-
-multilib_src_compile() {
- emake V=1
-
- if multilib_is_native_abi; then
- for i in ${FFTOOLS} ; do
- if use fftools_${i} ; then
- emake V=1 tools/${i}
- fi
- done
- fi
-}
-
-multilib_src_install() {
- emake V=1 DESTDIR="${D}" install install-man
-
- if multilib_is_native_abi; then
- for i in ${FFTOOLS} ; do
- if use fftools_${i} ; then
- dobin tools/${i}
- fi
- done
- fi
-}
-
-multilib_src_install_all() {
- dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
- use doc && dohtml -r doc/*
- if use examples ; then
- dodoc -r doc/examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-multilib_src_test() {
- LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
- emake V=1 fate
-}
diff --git a/media-video/ffmpeg/files/dirac_arith_hardened.patch b/media-video/ffmpeg/files/dirac_arith_hardened.patch
deleted file mode 100644
index 2661423..0000000
--- a/media-video/ffmpeg/files/dirac_arith_hardened.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit d8ab7f31dd819f7b3e0d460a2fa4261aaae87b98
-Author: Anthoine Bourgeois <anthoine.bourgeois@gmail.com>
-Date: Wed Apr 9 12:18:32 2014 +0200
-
- avcodec/dirac_arith: Fix build with PIC and stack-check options
-
- Fixes Ticket3540
-
- The function dirac_get_arith_bit in libavcodec/dirac_arith.h can't be
- built with PIC and check-stack because the asm code needs 6 registers
- and PIC and check-stack options take 1 each and x86 is quite limited
- in this area.
-
- Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-
-diff --git a/libavcodec/dirac_arith.h b/libavcodec/dirac_arith.h
-index f9a8bba..089c71a 100644
---- a/libavcodec/dirac_arith.h
-+++ b/libavcodec/dirac_arith.h
-@@ -28,6 +28,7 @@
- #ifndef AVCODEC_DIRAC_ARITH_H
- #define AVCODEC_DIRAC_ARITH_H
-
-+#include "libavutil/x86/asm.h"
- #include "bytestream.h"
- #include "get_bits.h"
-
-@@ -134,7 +135,7 @@ static inline int dirac_get_arith_bit(DiracArith *c, int ctx)
-
- range_times_prob = (c->range * prob_zero) >> 16;
-
--#if HAVE_FAST_CMOV && HAVE_INLINE_ASM
-+#if HAVE_FAST_CMOV && HAVE_INLINE_ASM && HAVE_6REGS
- low -= range_times_prob << 16;
- range -= range_times_prob;
- bit = 0;
diff --git a/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch b/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
deleted file mode 100644
index bf0c8a5..0000000
--- a/media-video/ffmpeg/files/ffmpeg-1.2.6-strerror_r.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/ffmpeg-1.2.6/libavutil/error.c
-+++ b/ffmpeg-1.2.6/libavutil/error.c
-@@ -17,6 +17,7 @@
- */
-
- #undef _GNU_SOURCE
-+#define _POSIX_SOURCE
- #include "avutil.h"
- #include "avstring.h"
- #include "common.h"
diff --git a/media-video/ffmpeg/files/ladspadl.patch b/media-video/ffmpeg/files/ladspadl.patch
deleted file mode 100644
index 12fc988..0000000
--- a/media-video/ffmpeg/files/ladspadl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c27dc27c50cb016d470b45c5852c884718f4769c Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Tue, 20 May 2014 20:06:28 +0200
-Subject: [PATCH] Fix build with --enable-ladspa --disable-frei0r.
-
-https://bugs.gentoo.org/show_bug.cgi?id=510516
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index b6d35ae..0848fed 100755
---- a/configure
-+++ b/configure
-@@ -2499,6 +2499,7 @@ hqdn3d_filter_deps="gpl"
- interlace_filter_deps="gpl"
- kerndeint_filter_deps="gpl"
- ladspa_filter_deps="ladspa dlopen"
-+ladspa_filter_extralibs='$ldl'
- mcdeint_filter_deps="avcodec gpl"
- movie_filter_deps="avcodec avformat"
- mp_filter_deps="gpl avcodec swscale inline_asm"
---
-1.9.3
-
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
deleted file mode 100644
index 2137df5..0000000
--- a/media-video/ffmpeg/metadata.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>video</herd>
- <maintainer>
- <email>media-video@gentoo.org</email>
- </maintainer>
- <use>
- <flag name="3dnowext">
- Enable manually-optimised routines using the AMD 3DNow!Ex SIMD
- instruction set, present in modern AMD CPUs. (Check for
- 3dnowext in /proc/cpuinfo to know whether your CPU supports it).
- </flag>
- <flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg>.</flag>
- <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
- <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
- <flag name="bindist">Enforces license compatibility constraints via REQUIRED_USE.</flag>
- <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
- <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
- <flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
- <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
- <flag name="faac">Use external faac library for AAC encoding</flag>
- <flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
- <flag name="flite">Adds a text-to-speech filter based on <pkg>app-accessibility/flite</pkg>.</flag>
- <flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
- <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
- <flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
- <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
- <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
- <flag name="mmxext">Enables mmx2 support</flag>
- <flag name="network">Enables network streaming support</flag>
- <flag name="openssl">Enables <pkg>dev-libs/openssl</pkg> support. Adds support for encrypted network protocols (TLS/HTTPS).</flag>
- <flag name="opus">Adds (decoding) support for the Opus codec via <pkg>media-libs/opus</pkg>.</flag>
- <flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
- <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
- <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
- <flag name="ssse3">Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
- <flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
- <flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
- <flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
- <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
- </use>
-</pkgmetadata>
diff --git a/metadata/layout.conf b/metadata/layout.conf
deleted file mode 100644
index d43e61c..0000000
--- a/metadata/layout.conf
+++ /dev/null
@@ -1 +0,0 @@
-masters = gentoo
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
deleted file mode 100644
index 3943f05..0000000
--- a/net-dialup/ppp/ChangeLog
+++ /dev/null
@@ -1,1306 +0,0 @@
-# ChangeLog for net-dialup/ppp
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.304 2015/05/14 10:21:15 pinkbyte Exp $
-
- 14 May 2015; Sergey Popov <pinkbyte@gentoo.org> ppp-2.4.6-r3.ebuild,
- ppp-2.4.7.ebuild, ppp-2.4.7-r1.ebuild:
- Explicitly set SLOT on dev-libs/openssl dependency
-
-*ppp-2.4.7-r1 (14 May 2015)
-
- 14 May 2015; Sergey Popov <pinkbyte@gentoo.org> ppp-2.4.7.ebuild,
- +ppp-2.4.7-r1.ebuild:
- Revision bump: split ppp scripts into separate package -
- net-dialup/ppp-scripts. Adjust dependencies
-
- 03 Mar 2015; Yixun Lan <dlan@gentoo.org> ppp-2.4.7.ebuild:
- add arm64 support, tested on A53 board
-
- 21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ppp-2.4.7.ebuild:
- Stable for ppc, wrt bug #519650
-
- 20 Aug 2014; Raúl Porcel <armin76@gentoo.org> ppp-2.4.7.ebuild:
- alpha/arm/sparc stable wrt #519650
-
- 19 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ppp-2.4.7.ebuild:
- Stable for ppc64, wrt bug #519650
-
- 19 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ppp-2.4.7.ebuild:
- Stable for ia64, wrt bug #519650
-
- 13 Aug 2014; Jeroen Roovers <jer@gentoo.org> ppp-2.4.7.ebuild:
- Stable for HPPA (bug #519650).
-
- 12 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ppp-2.4.7.ebuild:
- Stable for x86, wrt bug #519650
-
- 12 Aug 2014; Agostino Sarubbo <ago@gentoo.org> ppp-2.4.7.ebuild:
- Stable for amd64, wrt bug #519650
-
-*ppp-2.4.7 (12 Aug 2014)
-
- 12 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> +ppp-2.4.7.ebuild:
- Security bump (bug #519650).
-
-*ppp-2.4.6-r3 (18 Jun 2014)
-
- 18 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> -ppp-2.4.6-r2.ebuild,
- +ppp-2.4.6-r3.ebuild:
- Revision bump: finally fix bug #513512, thanks again to Daniel Kenzelmann
- <gentoo AT k8n.de>. Drop old revision
-
-*ppp-2.4.6-r2 (17 Jun 2014)
-
- 17 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> -ppp-2.4.6.ebuild,
- -ppp-2.4.6-r1.ebuild, +ppp-2.4.6-r2.ebuild:
- Revision bump: fix missing semicolon in ip-up.d/50-initd.sh script, update
- patchset, wrt bug #513512. Thanks to Daniel Kenzelmann <gentoo AT k8n.de> for
- discovering this issue. Drop old revisions
-
-*ppp-2.4.6-r1 (16 Jun 2014)
-
- 16 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> +ppp-2.4.6-r1.ebuild:
- Revision bump: add missing 'die' to sed calls. Call OpenRC scripts only when
- OpenRC is active init-system, wrt bug #490820. Fix issue with logwtmp not
- working properly
-
-*ppp-2.4.6 (19 Feb 2014)
-
- 19 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -ppp-2.4.5-r1.ebuild,
- -ppp-2.4.5-r2.ebuild, +ppp-2.4.6.ebuild:
- Version bump (bug #501530). Removed old.
-
- 09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
- Add upstream CPE tag (security info) from ChromiumOS.
-
- 24 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> ppp-2.4.5-r3.ebuild:
- Adjust SRC_URI, wrt bug #457854. Thanks to Theo Chatzimichos for discovering
- this issue
-
- 16 Dec 2012; Raúl Porcel <armin76@gentoo.org> ppp-2.4.5-r3.ebuild:
- alpha/ia64/s390/sh/sparc stable wrt #444256
-
- 29 Nov 2012; Jeroen Roovers <jer@gentoo.org> ppp-2.4.5-r3.ebuild:
- Stable for HPPA (bug #444256).
-
- 26 Nov 2012; <ago@gentoo.org> ppp-2.4.5-r3.ebuild:
- Stable for x86, wrt to bug #444256
-
- 25 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> ppp-2.4.5-r3.ebuild:
- Stable on amd64, wrt bug #444256
-
- 25 Nov 2012; Anthony G. Basile <blueness@gentoo.org> ppp-2.4.5-r3.ebuild:
- stable arm ppc ppc64, bug #444256
-
- 25 Nov 2012; Mike Gilbert <floppym@gentoo.org> ppp-2.4.5-r3.ebuild:
- Fix 80_all_eaptls-mppe-0.991-gentoo.patch, a casualty of CVS keyword
- expansion.
-
- 22 Sep 2012; Mike Frysinger <vapier@gentoo.org> ppp-2.4.5-r3.ebuild:
- Always unpack the dhcp code (since it is small) and update the patches to work
- with patch-2.7 #435588.
-
- 18 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> ppp-2.4.5-r3.ebuild:
- Make patch apply. Fixes bug#430830. Patch by Andrey Volkov.
-
-*ppp-2.4.5-r3 (10 Aug 2012)
-
- 10 Aug 2012; Mike Frysinger <vapier@gentoo.org> +ppp-2.4.5-r3.ebuild:
- Update to EAPI=4 and move patchset to CVS.
-
- 07 Aug 2012; Mike Frysinger <vapier@gentoo.org> ppp-2.4.5-r2.ebuild:
- Remove local copies of linux-headers and rely on the system one being up-to-
- date #427684 by SpanKY.
-
- 14 Jun 2012; Zac Medico <zmedico@gentoo.org> ppp-2.4.4-r25.ebuild,
- ppp-2.4.5-r1.ebuild, ppp-2.4.5-r2.ebuild:
- inherit multilib for get_libdir
-
- 06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
- Drop maintainer due retirement, bug #63588
-
- 11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> ppp-2.4.5-r2.ebuild:
- QA: fetch the patchset from dev.gentoo.org rather than mirrors.
-
-*ppp-2.4.5-r2 (11 Nov 2011)
-
- 11 Nov 2011; Alin Năstac <mrness@gentoo.org> -ppp-2.4.5.ebuild,
- +ppp-2.4.5-r2.ebuild, metadata.xml:
- Fix QA issues in pppdump.c. Update EAP-TLS patch. Remove reference to
- undefined symbol in passwordfd plugin (#389565).
-
- 17 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> ppp-2.4.5-r1.ebuild:
- ppc/ppc64 stable wrt #366719
-
- 12 Jun 2011; Raúl Porcel <armin76@gentoo.org> ppp-2.4.5-r1.ebuild:
- alpha/ia64/s390/sh/sparc stable wrt #366719
-
- 05 Jun 2011; Jeroen Roovers <jer@gentoo.org> ppp-2.4.5-r1.ebuild:
- Stable for HPPA (bug #366719).
-
- 02 Jun 2011; Markus Meier <maekke@gentoo.org> ppp-2.4.5-r1.ebuild:
- arm stable, bug #366719
-
- 31 May 2011; Markus Meier <maekke@gentoo.org> ppp-2.4.5-r1.ebuild:
- amd64/x86 stable, bug #366719
-
- 02 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> ppp-2.4.4-r25.ebuild,
- ppp-2.4.5.ebuild, ppp-2.4.5-r1.ebuild:
- Use net-libs/libpcap instead of virtual/libpcap wrt #358835.
-
- 29 Mar 2011; Christoph Mende <angelos@gentoo.org> ppp-2.4.4-r25.ebuild:
- Fixed slot deps
-
-*ppp-2.4.5-r1 (27 Nov 2010)
-
- 27 Nov 2010; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r24.ebuild,
- +ppp-2.4.5-r1.ebuild:
- Fix PPPOE freeze when garbage packets are received iso PADO/PADS
- (#340267). Add lcp-echo-adaptive option (#344273).
-
- 02 Nov 2010; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r25.ebuild:
- Stable for PPC (bug #331611).
-
- 02 Nov 2010; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r25.ebuild:
- Stable for HPPA (bug #331611).
-
- 30 Sep 2010; Brent Baude <ranger@gentoo.org> ppp-2.4.4-r25.ebuild:
- stable ppc64, bug 331611
-
- 05 Sep 2010; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r25.ebuild:
- alpha/ia64/s390/sh/sparc stable wrt #331611
-
- 03 Sep 2010; Markos Chandras <hwoarang@gentoo.org> ppp-2.4.5.ebuild:
- New patchset which fixes bug #334047 and bug #334727. No revbump
-
- 22 Aug 2010; Markus Meier <maekke@gentoo.org> ppp-2.4.4-r25.ebuild:
- arm stable, bug #331611
-
- 09 Aug 2010; Markos Chandras <hwoarang@gentoo.org> ppp-2.4.4-r25.ebuild:
- Stable on amd64 wrt bug #331611
-
- 08 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> ppp-2.4.4-r25.ebuild:
- x86 stable wrt bug #331611
-
-*ppp-2.4.5 (08 Aug 2010)
-
- 08 Aug 2010; Alin Năstac <mrness@gentoo.org> +ppp-2.4.5.ebuild:
- Version bump (#296267).
-
- 08 Aug 2010; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r23.ebuild,
- ppp-2.4.4-r25.ebuild:
- Build radius plugin only when correspondent USE flag is enabled (#296436).
-
- 06 Jan 2010; Brent Baude <ranger@gentoo.org> ppp-2.4.4-r24.ebuild:
- Marking ppp-2.4.4-r24 ppc64 for bug 289593
-
- 08 Dec 2009; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r24.ebuild:
- Stable for HPPA (bug #289593).
-
- 26 Nov 2009; Markus Meier <maekke@gentoo.org> ppp-2.4.4-r24.ebuild:
- amd64 stable, bug #289593
-
-*ppp-2.4.4-r25 (16 Nov 2009)
-
- 16 Nov 2009; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r25.ebuild:
- Redesign kill-pg patch due to strange side effect (#292374). Make
- 40-dns.sh script compatible with busybox (#292571). Add backport patch of
- the pppoe-mac option (#291889).
-
- 03 Nov 2009; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r24.ebuild:
- arm/ia64/s390/sh/sparc stable wrt #289593
-
- 29 Oct 2009; Christian Faulhammer <fauli@gentoo.org> ppp-2.4.4-r24.ebuild:
- stable x86, bug 289593
-
- 24 Oct 2009; Tobias Klausmann <klausman@gentoo.org> ppp-2.4.4-r24.ebuild:
- Stable on alpha, bug #289593
-
- 24 Oct 2009; nixnut <nixnut@gentoo.org> ppp-2.4.4-r24.ebuild:
- ppc stable #289593
-
- 18 Oct 2009; Alin Năstac <mrness@gentoo.org> ppp-2.4.4-r24.ebuild:
- Add warning about missing CONFIG_PACKET.
-
- 10 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> ppp-2.4.4-r23.ebuild,
- ppp-2.4.4-r24.ebuild:
- Change the config check to avoid triggering it during catalyst autobuild
- for the meantime.
-
- 08 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> ppp-2.4.4-r23.ebuild,
- ppp-2.4.4-r24.ebuild:
- Fix for linux-info change to give more suitable warnings when kernel
- sources are not present.
-
- 16 Aug 2009; Alin Năstac <mrness@gentoo.org> ppp-2.4.4-r24.ebuild:
- Readd scripts to gentoo tarball (#281591).
-
-*ppp-2.4.4-r24 (15 Aug 2009)
-
- 15 Aug 2009; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r24.ebuild:
- Change connect-errors file path to /var/log/ppp-connect-errors (#279695).
-
-*ppp-2.4.4-r23 (23 Jun 2009)
-
- 23 Jun 2009; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r21.ebuild,
- -ppp-2.4.4-r22.ebuild, +ppp-2.4.4-r23.ebuild:
- Correct sed command performed on modules.d file when mppe-mppc USE flag is
- enabled (#274934).
-
- 28 May 2009; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r22.ebuild:
- Stable for HPPA (bug #269127). Catch cases where /sbin/update-modules does
- not return 0 (like when /etc/modules.conf has not been automatically
- generated).
-
- 20 May 2009; nixnut <nixnut@gentoo.org> ppp-2.4.4-r22.ebuild:
- ppc stable #269127
-
- 15 May 2009; Markus Meier <maekke@gentoo.org> ppp-2.4.4-r22.ebuild:
- amd64 stable, bug #269127
-
- 11 May 2009; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r22.ebuild:
- arm/ia64/s390/sh/sparc/x86 stable wrt #269127
-
- 11 May 2009; Brent Baude <ranger@gentoo.org> ppp-2.4.4-r22.ebuild:
- stable ppc64, bug 269127
-
- 09 May 2009; Tobias Klausmann <klausman@gentoo.org> ppp-2.4.4-r22.ebuild:
- Stable on alpha, bug #269127
-
- 09 May 2009; Alin Năstac <mrness@gentoo.org> ppp-2.4.4-r22.ebuild:
- Migrate to EAPI 2.
-
-*ppp-2.4.4-r22 (06 May 2009)
-
- 06 May 2009; Mike Frysinger <vapier@gentoo.org> +ppp-2.4.4-r22.ebuild:
- Install modprobe.d file with a .conf extension.
-
- 02 Dec 2008; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r14.ebuild,
- -ppp-2.4.4-r15.ebuild:
- Remove obsolete versions.
-
- 02 Dec 2008; Brent Baude <ranger@gentoo.org> ppp-2.4.4-r21.ebuild:
- stable ppc64, bug 239851
-
- 18 Oct 2008; nixnut <nixnut@gentoo.org> ppp-2.4.4-r21.ebuild:
- Stable on ppc wrt bug 239851
-
- 18 Oct 2008; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r21.ebuild:
- Stable for HPPA (bug #239851).
-
- 08 Oct 2008; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r21.ebuild:
- alpha/ia64 stable wrt #239851
-
- 06 Oct 2008; Markus Meier <maekke@gentoo.org> ppp-2.4.4-r21.ebuild:
- amd64/x86 stable, bug #239851
-
- 06 Oct 2008; Friedrich Oslage <bluebird@gentoo.org> ppp-2.4.4-r21.ebuild:
- Stable on sparc, bug #239851
-
-*ppp-2.4.4-r21 (19 Aug 2008)
-
- 19 Aug 2008; Alin Năstac <mrness@gentoo.org> metadata.xml,
- -ppp-2.4.4-r19.ebuild, -ppp-2.4.4-r20.ebuild, +ppp-2.4.4-r21.ebuild:
- Export LDFLAGS from plugins/Makefile (#234915). Add usepeerwins option,
- thanks to Jaco Kroon <jaco at uls dot co dot za>; remove wins-ack USE
- flag (#234583).
-
-*ppp-2.4.4-r20 (15 Aug 2008)
-
- 15 Aug 2008; Alin Năstac <mrness@gentoo.org> metadata.xml,
- -ppp-2.4.4-r17.ebuild, +ppp-2.4.4-r20.ebuild:
- Add wins-ack USE flag and patch (#234583). Add USE flag description to
- metadata.
-
-*ppp-2.4.4-r19 (01 Aug 2008)
-
- 01 Aug 2008; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r18.ebuild,
- +ppp-2.4.4-r19.ebuild:
- Export LDFLAGS used to compile plugin programs (#233317).
-
- 01 Aug 2008; nixnut <nixnut@gentoo.org> ppp-2.4.4-r15.ebuild:
- Stable on ppc wrt bug 227183
-
-*ppp-2.4.4-r18 (30 Jul 2008)
-
- 30 Jul 2008; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r18.ebuild:
- Link pppoe-discovery program with user selected LDFLAGS (#233317).
-
- 15 Jul 2008; Alin Năstac <mrness@gentoo.org> ppp-2.4.4-r15.ebuild,
- ppp-2.4.4-r17.ebuild:
- Move ppp-gentoo tarballs back to distfiles-local (#231842).
-
- 11 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org>
- ppp-2.4.4-r15.ebuild:
- stable amd64, bug 227183
-
- 28 Jun 2008; Tobias Klausmann <klausman@gentoo.org> ppp-2.4.4-r15.ebuild:
- Stable on alpha, bug #227183
-
-*ppp-2.4.4-r17 (27 Jun 2008)
-
- 27 Jun 2008; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r16.ebuild,
- +ppp-2.4.4-r17.ebuild:
- Re-add script directory to ppp-2.4.4-gentoo tarball and make sure it never
- happens again (#229757). Fix passwordfd-read-early patch (#229773).
-
-*ppp-2.4.4-r16 (25 Jun 2008)
-
- 25 Jun 2008; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r16.ebuild:
- Patch passwordfd plugin to read password as soon as it gets the fd number -
- openrc use stdin for that, fd that could be closed by pppd before plugin
- reads the password (#209294).
-
- 21 Jun 2008; Markus Rothe <corsair@gentoo.org> ppp-2.4.4-r15.ebuild:
- Stable on ppc64; bug #227183
-
- 21 Jun 2008; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r15.ebuild:
- ia64/sparc stable wrt #227183
-
- 19 Jun 2008; Christian Faulhammer <opfer@gentoo.org> ppp-2.4.4-r15.ebuild:
- stable x86, bug 227183
-
- 17 Jun 2008; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r15.ebuild:
- Stable for HPPA (bug #227183).
-
- 14 Jun 2008; Zac Medico <zmedico@gentoo.org> ppp-2.4.4-r14.ebuild,
- ppp-2.4.4-r15.ebuild:
- Bug #226505 - For compatibility with phase execution order in
- >=portage-2.1.5, call has_version inside pkg_preinst instead of
- pkg_postinst.
-
- 14 May 2008; Diego Pettenò <flameeyes@gentoo.org> ppp-2.4.4-r15.ebuild:
- Depend on virtual/pam as the code builds fine with OpenPAM.
-
-*ppp-2.4.4-r15 (12 Apr 2008)
-
- 12 Apr 2008; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r15.ebuild:
- Re-write kill-pg.patch (#181145 and #216183). Fix LCP timeout error
- (#210852). Fix QA warning (#211160). Install modprobe.d file (#213879).
-
- 31 Mar 2008; <ricmm@gentoo.org> ppp-2.4.4-r14.ebuild:
- Drop to ~mips due to unstable deps
-
- 20 Feb 2008; Alin Năstac <mrness@gentoo.org> ppp-2.4.4-r14.ebuild:
- Re-add bindnow LDFLAGS (#210837).
-
-*ppp-2.4.4-r14 (20 Feb 2008)
-
- 20 Feb 2008; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r13.ebuild,
- +ppp-2.4.4-r14.ebuild:
- Improve pam file (#210824). Drop bindnow LDFLAGS.
-
- 13 Jan 2008; Alin Năstac <mrness@gentoo.org> -files/ip-down,
- -files/ip-up, -ppp-2.4.4-r9.ebuild, -ppp-2.4.4-r11.ebuild:
- Remove obsolete revisions.
-
- 23 Dec 2007; Stuart Longland <redhatter@gentoo.org> ppp-2.4.4-r13.ebuild:
- Tested and working on MIPS. Marked stable.
-
- 05 Nov 2007; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r13.ebuild:
- sparc stable wrt #194820
-
- 02 Nov 2007; Steve Dibb <beandog@gentoo.org> ppp-2.4.4-r13.ebuild:
- amd64 stable, bug 194820
-
- 14 Oct 2007; Markus Rothe <corsair@gentoo.org> ppp-2.4.4-r13.ebuild:
- Stable on ppc64; bug #194820
-
- 11 Oct 2007; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r13.ebuild:
- alpha/ia64 stable wrt #194820
-
- 09 Oct 2007; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r13.ebuild:
- Stable for HPPA (bug #194820).
-
- 06 Oct 2007; Christian Faulhammer <opfer@gentoo.org> ppp-2.4.4-r13.ebuild:
- stable x86, bug 194820
-
- 06 Oct 2007; Lars Weiler <pylon@gentoo.org> ppp-2.4.4-r13.ebuild:
- stable ppc, bug #194820
-
-*ppp-2.4.4-r13 (03 Sep 2007)
-
- 03 Sep 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r12.ebuild,
- +ppp-2.4.4-r13.ebuild:
- Improve up/down scripts (#190143).
-
-*ppp-2.4.4-r12 (31 Aug 2007)
-
- 31 Aug 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r4.ebuild,
- +ppp-2.4.4-r12.ebuild:
- Use gtk+-2 library (#189350). Add support for /etc/ppp/ip-{up,down}.d
- directories (#190143).
-
-*ppp-2.4.4-r11 (17 Aug 2007)
-
- 17 Aug 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r10.ebuild,
- +ppp-2.4.4-r11.ebuild:
- Create /dev/ppp instead loading ppp_generic module (#163098).
-
- 07 Aug 2007; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r10.ebuild:
- Add defaultmetric option and allow setting the default route even if one
- already exist (but has a different metric). Load ppp_generic kernel module
- before trying to open /dev/ppp (#163098).
-
- 04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> ppp-2.4.4-r9.ebuild:
- ppc stable, bug #184696
-
-*ppp-2.4.4-r10 (07 Aug 2007)
-
- 07 Aug 2007; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r10.ebuild:
- Add defaultmetric option. Load ppp_generic kernel module before trying to
- open /dev/ppp (#163098).
-
- 28 Jul 2007; Christoph Mende <angelos@gentoo.org> ppp-2.4.4-r9.ebuild:
- Stable on amd64 wrt bug #184696
-
- 23 Jul 2007; Joshua Kinard <kumba@gentoo.org> ppp-2.4.4-r9.ebuild:
- Stable on mips, per #184695.
-
- 12 Jul 2007; Christian Faulhammer <opfer@gentoo.org> ppp-2.4.4-r9.ebuild:
- stable x86, bug 184696
-
- 11 Jul 2007; Markus Rothe <corsair@gentoo.org> ppp-2.4.4-r9.ebuild:
- Stable on ppc64; bug #184696
-
- 11 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> ppp-2.4.4-r9.ebuild:
- Stable on sparc wrt #184696
-
- 10 Jul 2007; Raúl Porcel <armin76@gentoo.org> ppp-2.4.4-r9.ebuild:
- alpha/x86 stable wrt #184696
-
- 10 Jul 2007; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r9.ebuild:
- Stable for HPPA (bug #184696).
-
-*ppp-2.4.4-r9 (09 Jul 2007)
-
- 09 Jul 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r5.ebuild,
- -ppp-2.4.4-r8.ebuild, +ppp-2.4.4-r9.ebuild:
- Install pppd header files (#184545).
-
-*ppp-2.4.4-r8 (14 Jun 2007)
-
- 14 Jun 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r7.ebuild,
- +ppp-2.4.4-r8.ebuild:
- Fix another grammar error (#180180).
-
-*ppp-2.4.4-r7 (14 Jun 2007)
-
- 14 Jun 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r6.ebuild,
- +ppp-2.4.4-r7.ebuild:
- Correct auth-fail paragraphs of the pppd man page (#180180).
-
-*ppp-2.4.4-r6 (09 Jun 2007)
-
- 09 Jun 2007; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r6.ebuild:
- Kill children instead process group when pppd is still attached to the
- controlling terminal (#181145). Add auth-fail script, thanks to Jaco Kroon
- <jaco at kroon dot co dot za> (#180180).
-
-*ppp-2.4.4-r5 (28 May 2007)
-
- 28 May 2007; Alin Năstac <mrness@gentoo.org> +ppp-2.4.4-r5.ebuild:
- Fix QA notice. Remove /var/run/ppp-$linkname.pid only on exit (#179978).
-
- 06 May 2007; Marius Mauch <genone@gentoo.org> ppp-2.4.4-r4.ebuild:
- Replacing einfo with elog
-
- 28 Apr 2007; Sven Wegener <swegener@gentoo.org> ppp-2.4.4-r4.ebuild:
- Drop dodir from dodir/*into combination.
-
- 16 Apr 2007; Stefan Schweizer <genstef@gentoo.org> ppp-2.4.4-r4.ebuild:
- Use update-modules thanks to jakub in bug 174749
-
- 13 Apr 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.3-r16.ebuild:
- Remove old version.
-
- 13 Apr 2007; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable for HPPA (bug #157525).
-
- 08 Apr 2007; <solar@gentoo.org> ppp-2.4.4-r4.ebuild:
- - added ~s390
-
- 27 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on MIPS; bug #157525
-
- 21 Jan 2007; Alin Năstac <mrness@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on amd64 (#157525).
-
- 05 Jan 2007; Alin Năstac <mrness@gentoo.org> -ppp-2.4.4-r3.ebuild,
- ppp-2.4.4-r4.ebuild:
- Add -D_GNU_SOURCE to CFLAGS (#159877). Remove obsolete revision.
-
- 31 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on Alpha, bug 157525.
-
- 23 Dec 2006; Alexander H. Færøy <eroyf@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on IA64; bug #157525
-
- 17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on ppc wrt bug #157525.
-
- 11 Dec 2006; Christian Faulhammer <opfer@gentoo.org> ppp-2.4.4-r4.ebuild:
- stable x86, bug #157525
-
- 11 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on sparc wrt #157525
-
- 09 Dec 2006; Markus Rothe <corsair@gentoo.org> ppp-2.4.4-r4.ebuild:
- Stable on ppc64; bug #157525
-
-*ppp-2.4.4-r4 (24 Nov 2006)
-
- 24 Nov 2006; Alin Nastac <mrness@gentoo.org> +ppp-2.4.4-r4.ebuild:
- Correct initialization of mschap-v2 response buffer, thanks to Guillaume
- Knispel <gknispel at proformatique dot com> (#156052).
-
-*ppp-2.4.4-r3 (03 Nov 2006)
-
- 03 Nov 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.4-r2.ebuild,
- +ppp-2.4.4-r3.ebuild:
- Fix wait-children patch (#153798).
-
- 24 Oct 2006; Alin Nastac <mrness@gentoo.org> -files/chat-default,
- -files/confd.ppp0, files/ip-down, -files/ip-down.baselayout, files/ip-up,
- -files/ip-up.baselayout, -files/net.ppp0, -files/options-pppoe,
- -files/options-pptp, -files/plog, -files/poff, -files/pon, -files/pon.1,
- -files/pppoe.html, -ppp-2.4.2-r15.ebuild, ppp-2.4.3-r16.ebuild,
- -ppp-2.4.4-r1.ebuild, ppp-2.4.4-r2.ebuild:
- Remove obsolete versions.
-
- 24 Oct 2006; Fernando J. Pereda <ferdy@gentoo.org> ppp-2.4.3-r16.ebuild:
- Alpha stable as per bug #148472
-
- 14 Oct 2006; Aron Griffis <agriffis@gentoo.org> ppp-2.4.3-r16.ebuild:
- Mark 2.4.3-r16 stable on ia64. #148472
-
-*ppp-2.4.4-r2 (05 Oct 2006)
-
- 05 Oct 2006; Alin Nastac <mrness@gentoo.org> +ppp-2.4.4-r2.ebuild:
- Set the gateway in the default route, just as ppp-2.4.3 used to set (the
- default gateway is needed by openswan's %defaultroute).
-
- 23 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org>
- ppp-2.4.3-r16.ebuild:
- hppa stable, bug #148472
-
- 10 Sep 2006; Alin Nastac <mrness@gentoo.org> ppp-2.4.3-r16.ebuild,
- -ppp-2.4.4.ebuild, ppp-2.4.4-r1.ebuild:
- Fix broken build against openssl-0.9.8 (#146780).
-
- 04 Sep 2006; Joshua Kinard <kumba@gentoo.org> ppp-2.4.3-r16.ebuild:
- Marked stable on mips.
-
- 30 Aug 2006; Michael Hanselmann <hansmi@gentoo.org> ppp-2.4.3-r16.ebuild:
- Stable on ppc.
-
-*ppp-2.4.4-r1 (28 Aug 2006)
-
- 28 Aug 2006; Alin Nastac <mrness@gentoo.org> metadata.xml,
- +ppp-2.4.4-r1.ebuild:
- Take maintainership of this package. Extend limit of maxoctets parameter
- to UINT_MAX, thanks to Serhij S. Stasyuk <stas@onlineua.net> (#145313).
-
-*ppp-2.4.4 (22 Aug 2006)
-
- 22 Aug 2006; Alin Nastac <mrness@gentoo.org> +ppp-2.4.4.ebuild:
- Version bump (#144690).
-
- 16 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> ppp-2.4.3-r16.ebuild:
- Stable on sparc
-
- 16 Aug 2006; Markus Rothe <corsair@gentoo.org> ppp-2.4.3-r16.ebuild:
- Stable on ppc64
-
- 14 Aug 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r15.ebuild,
- ppp-2.4.3-r16.ebuild:
- Stable on amd64 and x86.
-
-*ppp-2.4.3-r16 (07 Jul 2006)
-
- 07 Jul 2006; Alin Nastac <mrness@gentoo.org> +ppp-2.4.3-r16.ebuild:
- Fix local privilege escaladation (#139477).
-
- 13 Jun 2006; <uberlord@gentoo.org> ppp-2.4.2-r15.ebuild,
- ppp-2.4.3-r15.ebuild:
- Change update-modules to modules-update.
-
- 23 May 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r14.ebuild,
- ppp-2.4.3-r15.ebuild:
- Remove old test version. Take advantage of the new features implemented in
- linux-info.eclass (#133026).
-
- 16 May 2006; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r15.ebuild:
- Fix recursive definitions of COPTS make variable (#133309).
-
- 15 May 2006; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r15.ebuild:
- Fix build error on systems where libcrypt is not installed in /usr/lib
- (#133309).
-
-*ppp-2.4.3-r15 (07 May 2006)
-
- 07 May 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.2-r10.ebuild,
- +ppp-2.4.3-r15.ebuild:
- Remove old revision. Fix makefiles wrt CFLAGS and LDFLAGS used by the user
- (#132115). Extend kernel configuration tests performed in pkg_postinst
- function.
-
- 03 May 2006; Torsten Veller <tove@gentoo.org> ppp-2.4.3-r14.ebuild:
- Cross-compile fix for
- <http://article.gmane.org/gmane.linux.gentoo.embedded/588>
-
- 24 Apr 2006; Joshua Kinard <kumba@gentoo.org> ppp-2.4.2-r15.ebuild:
- Marked stable on mips.
-
-*ppp-2.4.3-r14 (09 Apr 2006)
-
- 09 Apr 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r13.ebuild,
- +ppp-2.4.3-r14.ebuild:
- Modprobe pppoatm silently in pppoatm plugin, for avoiding the annoyance of a
- bogus error when PPPoA support is compiled into the kernel (#129282).
-
-*ppp-2.4.3-r13 (23 Mar 2006)
-
- 23 Mar 2006; Alin Nastac <mrness@gentoo.org> files/ip-down.baselayout,
- -ppp-2.4.3-r12.ebuild, +ppp-2.4.3-r13.ebuild:
- Fix typo in ip-down script (#127339).
-
-*ppp-2.4.3-r12 (20 Mar 2006)
-
- 20 Mar 2006; Alin Nastac <mrness@gentoo.org> files/ip-down.baselayout,
- files/ip-up.baselayout, -ppp-2.4.3-r11.ebuild, +ppp-2.4.3-r12.ebuild:
- Change the baselayout-1.12 compatible ip-up/ip-down scripts, at uberlord
- request.
-
- 12 Mar 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r10.ebuild,
- ppp-2.4.3-r11.ebuild:
- Remove old test version. Simplify dependencies. Quote $S, $D, $WORKDIR,
- $FILESDIR and $ROOT.
-
-*ppp-2.4.3-r11 (21 Feb 2006)
-
- 21 Feb 2006; Alin Nastac <mrness@gentoo.org> +ppp-2.4.3-r11.ebuild:
- Wait for user scripts to finish at the end of PPP session (#122795).
-
- 23 Jan 2006; Alin Nastac <mrness@gentoo.org> files/modules.ppp,
- ppp-2.4.2-r10.ebuild, ppp-2.4.2-r15.ebuild, -ppp-2.4.3-r9.ebuild,
- ppp-2.4.3-r10.ebuild:
- Remove old test version. Add warnings about MPPE-MPPC patch problems and
- incompatibilities (#119705). If eap-tls is enabled, apply eap-tls-0.7-mppe
- patch regardless whether mppe-mppc flag is enabled or not.
-
- 25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> ppp-2.4.3-r10.ebuild:
- Use bindnow-flags function instead of -Wl,-z,now.
-
-*ppp-2.4.3-r10 (29 Nov 2005)
-
- 29 Nov 2005; Alin Nastac <mrness@gentoo.org> +files/ip-down.baselayout,
- +files/ip-up.baselayout, -ppp-2.4.2-r12.ebuild, -ppp-2.4.3-r8.ebuild,
- +ppp-2.4.3-r10.ebuild:
- Remove old versions. Add support for the new pppd net module introduced by
- sys-apps/baselayout-1.12.0_pre11.
-
- 14 Nov 2005; Luis Medinas <metalgod@gentoo.org> ppp-2.4.2-r15.ebuild:
- Marked Stable on amd64.
-
-*ppp-2.4.3-r9 (05 Nov 2005)
-
- 05 Nov 2005; Alin Nastac <mrness@gentoo.org> +ppp-2.4.3-r9.ebuild:
- Add experimental support for EAP-TLS, selectable through eap-tls useflag
- (#109935).
-
- 18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ppp-2.4.2-r15.ebuild:
- Mark 2.4.2-r15 stable on alpha
-
- 24 Sep 2005; Markus Rothe <corsair@gentoo.org> ppp-2.4.2-r15.ebuild:
- Stable on ppc64
-
- 22 Sep 2005; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r15.ebuild,
- ppp-2.4.3-r8.ebuild:
- Make kernel configuration checks non-fatal (#103396).
-
- 20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> ppp-2.4.2-r15.ebuild:
- Stable on sparc
-
- 15 Sep 2005; Joseph Jezak <josejx@gentoo.org> ppp-2.4.2-r15.ebuild:
- Marked ppc stable.
-
- 13 Sep 2005; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r15.ebuild:
- Stable on x86.
-
- 09 Sep 2005; Tom Gall <tgall@gentoo.org> ppp-2.4.2-r12.ebuild,
- ppp-2.4.2-r15.ebuild:
- stable on ppc64 (r12) ~ppc64 (r15)
-
- 29 Aug 2005; Alin Nastac <mrness@gentoo.org> files/ip-up,
- ppp-2.4.2-r12.ebuild, ppp-2.4.2-r15.ebuild, -ppp-2.4.3-r6.ebuild,
- ppp-2.4.3-r8.ebuild:
- Fix cp -a usage for Gentoo BSD (#103487) and remove old test version.
-
- 24 Aug 2005; Aron Griffis <agriffis@gentoo.org> ppp-2.4.2-r12.ebuild:
- stable on ia64
-
-*ppp-2.4.3-r8 (29 Jul 2005)
-*ppp-2.4.2-r15 (29 Jul 2005)
-
- 29 Jul 2005; Alin Nastac <mrness@gentoo.org> -ppp-2.4.2-r14.ebuild,
- +ppp-2.4.2-r15.ebuild, -ppp-2.4.3-r7.ebuild, +ppp-2.4.3-r8.ebuild:
- Fix on-demand links with outbound keyword in active-filter/pass-filter
- (#99190).
-
-*ppp-2.4.2-r14 (29 Jul 2005)
-
- 29 Jul 2005; Alin Nastac <mrness@gentoo.org> -ppp-2.4.2-r13.ebuild,
- +ppp-2.4.2-r14.ebuild, ppp-2.4.3-r7.ebuild:
- Correct the activefilter patch and add kernel configuration checks (#99190).
-
-*ppp-2.4.3-r7 (27 Jul 2005)
-*ppp-2.4.2-r13 (27 Jul 2005)
-
- 27 Jul 2005; Alin Nastac <mrness@gentoo.org> +ppp-2.4.2-r13.ebuild,
- +ppp-2.4.3-r7.ebuild:
- Add fixes for activefilter support (#99190) and remove interface name check
- in rp-pppoe plugin (#100437). Add upstream CVS patches to ppp-2.4.3.
-
- 09 Jul 2005; Joseph Jezak <josejx@gentoo.org> ppp-2.4.2-r12.ebuild:
- Marked ppc stable.
-
- 05 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> ppp-2.4.2-r12.ebuild:
- Stable on hppa.
-
- 04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> ppp-2.4.2-r12.ebuild:
- Stable on sparc
-
- 03 Jul 2005; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r12.ebuild:
- Stable on x86.
-
-*ppp-2.4.3-r6 (12 Jun 2005)
-*ppp-2.4.2-r12 (12 Jun 2005)
-
- 12 Jun 2005; Alin Nastac <mrness@gentoo.org> -ppp-2.4.2-r11.ebuild,
- +ppp-2.4.2-r12.ebuild, -ppp-2.4.3-r3.ebuild, -ppp-2.4.3-r5.ebuild,
- +ppp-2.4.3-r6.ebuild:
- Create {pap,chap}-secrets files based on example files (#95402). Remove old
- test versions.
-
-*ppp-2.4.3-r5 (26 May 2005)
-
- 26 May 2005; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r4.ebuild,
- +ppp-2.4.3-r5.ebuild:
- Move /etc/radiusclient directory installed by ppp-2.4.3 to /etc/ppp/radius
- for avoiding collisions with net-dialup/radiusclient package (#92878).
-
-*ppp-2.4.3-r4 (23 May 2005)
-*ppp-2.4.2-r11 (23 May 2005)
-
- 23 May 2005; Alin Nastac <mrness@gentoo.org> +ppp-2.4.2-r11.ebuild,
- ppp-2.4.3-r3.ebuild, +ppp-2.4.3-r4.ebuild:
- Add radius USE flag which controls installation of RADIUS plugins. Partially
- solve conflicts with net-dialup/radiusclient by not installing radiusclient
- library - ppp is statically linked with it (#92878). Install radiusclient
- configuration files in ppp-2.4.3-r4 (#92977).
-
- 14 May 2005; Alin Nastac <mrness@gentoo.org> -files/2.4.2/README.mpls,
- -files/2.4.2/cbcp-dosfix.patch, -files/2.4.2/cflags.patch,
- -files/2.4.2/chat-default, -files/2.4.2/control_c.patch,
- -files/2.4.2/killaddr-smarter.patch.gz, -files/2.4.2/modules.ppp,
- -files/2.4.2/mpls.patch.gz, -files/2.4.2/mppe-mppc-1.0.patch.gz,
- -files/2.4.2/options-pppoe, -files/2.4.2/options-pptp,
- -files/2.4.2/pcap.patch, -files/2.4.2/pppoatm-2.diff.gz,
- -files/2.4.2/pppoatm.diff.gz, -files/2.4.2/pppoe.html,
- -files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz, -files/2.4.3/README.mpls,
- -files/2.4.3/chat-default, -files/2.4.3/fixes-from-upstream-cvs.patch,
- -files/2.4.3/killaddr-smarter.patch, -files/2.4.3/modules.ppp,
- -files/2.4.3/mpls.patch, -files/2.4.3/options-pppoe,
- -files/2.4.3/options-pptp, -files/2.4.3/ppp_flags.patch,
- -files/2.4.3/pppoe.html, +files/README.mpls,
- -files/gcc3.3-multiline.patch, -files/gcc33-amd64.patch,
- +files/options-pppoe, +files/options-pptp,
- -files/ppp-sys_error_to_strerror.patch, -ppp-2.4.1-r14.ebuild,
- ppp-2.4.2-r10.ebuild, -ppp-2.4.3.ebuild, -ppp-2.4.3-r1.ebuild,
- -ppp-2.4.3-r2.ebuild, ppp-2.4.3-r3.ebuild:
- Fix multilib-strict issue (#92111) in 2.4.2. Remove obsolete versions.
- Reorganize patches and FILESDIR stuff.
-
- 10 May 2005; Herbie Hopkins <herbs@gentoo.org> ppp-2.4.3-r3.ebuild:
- Fixed multilib-strict issue, bug #92111
-
- 08 May 2005; Torsten Veller <tove@gentoo.org> ppp-2.4.3-r3.ebuild:
- using toolchain-funcs
-
-*ppp-2.4.3-r3 (08 May 2005)
-
- 08 May 2005; Alin Nastac <mrness@gentoo.org> +files/2.4.3/README.mpls,
- metadata.xml, +ppp-2.4.3-r3.ebuild:
- Fix plugins installation on amd64 (#74093).
-
-*ppp-2.4.3-r2 (05 May 2005)
-
- 05 May 2005; Alin Nastac <mrness@gentoo.org> +ppp-2.4.3-r2.ebuild:
- Import fixes from upstream CVS (#74093).
-
- 16 Apr 2005; Alin Nastac <mrness@gentoo.org> files/net.ppp0:
- Fix net.ppp0 script regarding default route removal (#89017).
-
- 14 Apr 2005; Tom Gall <tgall@gentoo.org> ppp-2.4.3-r1.ebuild:
- added ~ppc64, bug #89139
-
- 18 Mar 2005; Alin Nastac <mrness@gentoo.org> files/net.ppp0:
- Pass peer name as 6th param to the ip-up/ip-down scripts (#85700).
-
- 12 Feb 2005; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r10.ebuild:
- Fix broken build of radiusclient plugin on SMP machines (#81544).
-
- 06 Feb 2005; Alin Nastac <mrness@gentoo.org> files/confd.ppp0,
- files/ip-down, files/ip-up, files/net.ppp0, -files/2.4.2/confd.ppp0,
- -files/2.4.2/ip-down, -files/2.4.2/ip-up, -files/2.4.2/net.ppp0,
- -files/2.4.3/confd.ppp0, -files/2.4.3/ip-down, -files/2.4.3/ip-up,
- -files/2.4.3/net.ppp0, ppp-2.4.2-r10.ebuild, ppp-2.4.3-r1.ebuild,
- ppp-2.4.3.ebuild:
- Use same scripts in all versions.
-
- 30 Jan 2005; Daniel Black <dragonheart@gentoo.org> ppp-2.4.1-r14.ebuild,
- ppp-2.4.2-r10.ebuild, ppp-2.4.3-r1.ebuild, ppp-2.4.3.ebuild:
- Transition dependancy from net-libs/libpcap to virtual/libpcap
-
- 21 Jan 2005; Christian Zoffoli <xmerlin@gentoo.org>
- +files/ppp-sys_error_to_strerror.patch, ppp-2.4.2-r10.ebuild,
- ppp-2.4.3.ebuild, ppp-2.4.3-r1.ebuild:
- See bug #78679.
-
-*ppp-2.4.3-r1 (09 Jan 2005)
-
- 09 Jan 2005; Alin Nastac <mrness@gentoo.org>
- +files/2.4.3/fixes-from-upstream-cvs.patch, +ppp-2.4.3-r1.ebuild:
- Add fixes from upstream CVS for bug IDs 1103-1106. See bug #58275 and #74093.
-
- 08 Jan 2005; Alin Nastac <mrness@gentoo.org> -files/ppp-2.4.1-r10.patch,
- -ppp-2.4.2-r9.ebuild:
- Remove old ebuild.
-
- 06 Jan 2005; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r10.ebuild:
- Mark stable on all arches.
-
- 29 Nov 2004; Alin Nastac <mrness@gentoo.org>
- -files/ppp-2.4.1-MSCHAPv2-fix.patch, -ppp-2.4.2-r1.ebuild,
- -ppp-2.4.2-r2.ebuild, -ppp-2.4.2-r6.ebuild, -ppp-2.4.2-r7.ebuild,
- -ppp-2.4.2-r8.ebuild, -ppp-2.4.2.ebuild:
- Remove old ebuilds.
-
-*ppp-2.4.3 (27 Nov 2004)
-
- 27 Nov 2004; Alin Nastac <mrness@gentoo.org> +files/2.4.3/chat-default,
- +files/2.4.3/confd.ppp0, +files/2.4.3/ip-down, +files/2.4.3/ip-up,
- +files/2.4.3/killaddr-smarter.patch, +files/2.4.3/modules.ppp,
- +files/2.4.3/mpls.patch, +files/2.4.3/net.ppp0, +files/2.4.3/options-pppoe,
- +files/2.4.3/options-pptp, +files/2.4.3/ppp_flags.patch,
- +files/2.4.3/pppoe.html, +ppp-2.4.3.ebuild:
- Import ebuild for 2.4.3 from #72405, thanks to tove <bugs@veller.net>.
-
- 18 Nov 2004; Alin Nastac <mrness@gentoo.org> ppp-2.4.2-r10.ebuild,
- ppp-2.4.2-r9.ebuild:
- Add pam library to dependencies. See bug #71577.
-
-*ppp-2.4.2-r10 (14 Nov 2004)
-
- 14 Nov 2004; Alin Nastac <mrness@gentoo.org> +ppp-2.4.2-r10.ebuild:
- Install pam file for ppp (see #70957). Add failures when failed to install
- essential parts.
-
-*ppp-2.4.2-r9 (11 Nov 2004)
-
- 11 Nov 2004; Alin Nastac <mrness@gentoo.org>
- files/2.4.2/ip-up, files/2.4.2/ip-down, +ppp-2.4.2-r9.ebuild:
- Create a world readable resolv.conf (see #37886).
- Leave it stable it is a trivial script correction.
-
-*ppp-2.4.2-r8 (09 Nov 2004)
-
- 09 Nov 2004; Alin Nastac <mrness@gentoo.org>
- files/2.4.2/ip-up, files/2.4.2/ip-down, +ppp-2.4.2-r8.ebuild:
- Correctly pass empty params to ip-up.local and ip-down.local .
- Leave it stable on all arches since is a trivial change. See bug #70440.
-
- 07 Nov 2004; Steve Arnold <nerdboy@gentoo.org>
- +files/2.4.2/mppe-mppc-1.0.patch.gz, ppp-2.4.2-r2.ebuild:
- updated mppe patch for bug 51744
-
- 05 Nov 2004; Hardave Riar <hardave@gentoo.org> ppp-2.4.2-r7.ebuild:
- Stable on mips, bug #69152.
-
- 01 Nov 2004; Daniel Black <dragonheart@gentoo.org> files/net.ppp0:
- Permissions changed from 640 to 644 on ip-up/down scripts as per bug #37886
- Thanks to Oliver Schoett <oschoett@t-online.de>
-
- 31 Oct 2004; <SeJo@gentoo.org> ppp-2.4.2-r7.ebuild:
- stable on ppc gsla: 69152
-
- 31 Oct 2004; Daniel Black <dragonheart@gentoo.org> ppp-2.4.2-r7.ebuild:
- x86 stable
-
- 30 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> ppp-2.4.2-r7.ebuild:
- Stable on alpha, bug 69152.
-
- 30 Oct 2004; Jason Wever <weeve@gentoo.org> ppp-2.4.2-r7.ebuild:
- Stable on sparc wrt security bug #69152.
-
- 30 Oct 2004; Simon Stelling <blubb@gentoo.org> ppp-2.4.2-r7.ebuild:
- stable on amd64 for security reasons (bug #69152)
-
-*ppp-2.4.2-r7 (30 Oct 2004)
-
- 30 Oct 2004; Daniel Black <dragonheart@gentoo.org>
- +files/2.4.2/cbcp-dosfix.patch, +ppp-2.4.2-r7.ebuild:
- Added patch cbcp-dosfix.patch to fix remote DOS as per bug #69152. Thanks Dan
- Margolis <krispykringle@gentoo.org>
-
-*ppp-2.4.2-r6 (14 Oct 2004)
-
- 14 Oct 2004; Daniel Black <dragonheart@gentoo.org> -ppp-2.4.2-r5.ebuild,
- +ppp-2.4.2-r6.ebuild:
- revision bump and remove old version to fix bug #67125. Thanks Ned for
- the notification and Alin Nastac for the simple fix
-
-*ppp-2.4.2-r5 (27 Sep 2004)
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> -ppp-2.4.2-r4.ebuild,
- +ppp-2.4.2-r5.ebuild:
- add dhcp plugin, bug #62969
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/net.ppp0:
- fix setup for two modems, bug #43923
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r4.ebuild:
- fix activfilter useflag
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/net.ppp0:
- fix handling of INITSTRING, bug #49861
-
-*ppp-2.4.2-r4 (27 Sep 2004)
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/modules.ppp,
- -ppp-2.4.2-r3.ebuild, +ppp-2.4.2-r4.ebuild:
- add mppe-mppc support via useflag, bug #51027
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r3.ebuild:
- move radius plugin from /usr/lib to /usr/lib/ppp/2.4.2, bug #56747
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.1-r14.ebuild:
- apply pcap patch to 2.4.1-r14, bug #51059
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
- +files/2.4.2/endless-loop.patch, ppp-2.4.2.ebuild:
- fix endless loop, bug #58364
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r3.ebuild:
- remove unneccesary x86 dependencie of atm use flag, bug #55881
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/net.ppp0:
- load ppp module if not present, bug #55233
-
- 27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/ip-down,
- files/2.4.2/ip-up:
- fix resolv.conf permissions
-
- 25 Sep 2004; Mike Frysinger <vapier@gentoo.org> ppp-2.4.1-r14.ebuild,
- ppp-2.4.2-r1.ebuild, ppp-2.4.2-r2.ebuild, ppp-2.4.2-r3.ebuild,
- ppp-2.4.2.ebuild:
- Do not install the pap/chap secrets files because if a user makes a binary
- package, they could include their passwords without realizing it.
-
-*ppp-2.4.2-r3 (24 Sep 2004)
-
- 24 Sep 2004; Daniel Black <dragonheart@gentoo.org>
- -files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz,
- -files/ppp-crypto-fix.patch.bz2, +files/2.4.2/control_c.patch,
- ppp-2.4.1-r14.ebuild, +ppp-2.4.2-r3.ebuild:
- Patch added to fix bug #57238. Thank to Thomas G <ganto2@gmx.de> et al.
- Removed unused patch files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz. Moved
- files/ppp-crypto-fix.patch.bz2 to mirrors.
-
- 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ppp-2.4.1-r14.ebuild,
- ppp-2.4.2-r1.ebuild, ppp-2.4.2-r2.ebuild, ppp-2.4.2.ebuild:
- virtual/glibc -> virtual/libc
-
- 13 Jun 2004; Travis Tilley <lv@gentoo.org> ppp-2.4.2-r2.ebuild:
- pushing to stable -way- early to fix bug #53615
-
- 12 Jun 2004; Travis Tilley <lv@gentoo.org> ppp-2.4.2-r2.ebuild:
- this version compiles on amd64, re-adding ~amd64 keyword
-
- 09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ppp-2.4.1-r14.ebuild,
- ppp-2.4.2-r1.ebuild, ppp-2.4.2-r2.ebuild, ppp-2.4.2.ebuild:
- Fix use invocation
-
- 03 May 2004; Jason Eric Huebel <jhuebel@gentoo.org> ppp-2.4.2-r2.ebuild:
- gnuconfig update
-
- 30 Apr 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r1.ebuild,
- ppp-2.4.2-r2.ebuild:
- bug #49318
-
- 28 Apr 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r2.ebuild:
- link to libatm, bug #49133
-
-*ppp-2.4.2-r2 (27 Apr 2004)
-
- 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ppp-2.4.1-r14.ebuild,
- ppp-2.4.2-r1.ebuild, ppp-2.4.2-r2.ebuild, ppp-2.4.2.ebuild:
- Add inherit eutils
-
- 26 Apr 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2b3/README.mpls,
- files/2.4.2b3/cflags.patch, files/2.4.2b3/chat-default,
- files/2.4.2b3/confd.ppp0, files/2.4.2b3/ip-down, files/2.4.2b3/ip-up,
- files/2.4.2b3/killaddr-smarter.patch, files/2.4.2b3/modules.ppp,
- files/2.4.2b3/mpls.patch, files/2.4.2b3/net.ppp0,
- files/2.4.2b3/options-pppoe, files/2.4.2b3/options-pptp,
- files/2.4.2b3/pppoe.html:
- remove old version
-
- 26 Apr 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/modules.ppp:
- update pppoatm patch, bug #47574
- add mppe alias, bug #47091
-
- 08 Mar 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r1.ebuild:
- install pppoatm.so, not only build it
-
- 06 Mar 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r1.ebuild:
- add support for udev
-
-*ppp-2.4.2-r1 (06 Mar 2004)
-
- 06 Mar 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r1.ebuild:
- add atm to IUSE=""
-
- 06 Mar 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2.ebuild,
- files/2.4.2/killaddr-smarter.patch, files/2.4.2/killaddr-smarter.patch.gz,
- files/2.4.2/mpls.patch, files/2.4.2/mpls.patch.gz,
- files/2.4.2/pppoatm.diff.gz, files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz:
- add atm support (bug #41607) and mppc support (bug #42212)
-
- 22 Feb 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2.ebuild:
- bug #41914
-
- 14 Feb 2004; Aron Griffis <agriffis@gentoo.org> ppp-2.4.2.ebuild,
- files/2.4.2/pcap.patch:
- Patch for libpcap headers; fixes bug 41416
-
-*ppp-2.4.2 (12 Feb 2004)
-
- 12 Feb 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2.ebuild:
- version bump
-
- 18 Jan 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild:
- enable radius
-
- 17 Jan 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2b3/ip-down,
- files/2.4.2b3/ip-up:
- resolv.conf permissions again, took method from debian
-
- 12 Jan 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2b3/ip-down,
- files/2.4.2b3/ip-up:
- resolv.conf permissions again
-
- 01 Jan 2004; <tuxus@gentoo.org> ppp-2.4.1-r14.ebuild:
- Added mips to KEYWORDS
-
- 27 Dec 2003; Heinrich Wendel <lanius@gentoo.org> files/2.4.2b3/net.ppp0:
- fixed sleep command to work on all locales (bug #36571)
-
- 27 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild:
- fixed sed expression to only replace pppoe.so but not rp-pppoe.so
-
- 26 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild:
- automatically change pppoe.so to rp-pppoe.so (library name changed in 2.4.2)
-
- 23 Dec 2003; Brad House <brad_mssw@gentoo.org> ppp-2.4.2_beta3-r1.ebuild:
- freezes on compile on amd64, even after libtoolize addition
-
- 22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.1-r11.ebuild,
- ppp-2.4.1-r12.ebuild, ppp-2.4.1-r13.ebuild, ppp-2.4.2_beta3.ebuild:
- removed old versions
-
- 22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> files/2.4.2b3/ip-down,
- files/2.4.2b3/ip-up, files/2.4.2b3/net.ppp0:
- speed up startup in special cases (bug #36195)
-
-*ppp-2.4.2_beta3-r1 (22 Dec 2003)
-
- 22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild,
- files/2.4.2b3/confd.ppp0, files/2.4.2b3/net.ppp0:
- added support for leased-line pppd setups (bug #33290)
-
-*ppp-2.4.2_beta3-r1 (22 Dec 2003)
-
- 22 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3-r1.ebuild,
- files/2.4.2b3/README.mpls, files/2.4.2b3/cflags.patch,
- files/2.4.2b3/chat-default, files/2.4.2b3/confd.ppp0, files/2.4.2b3/ip-down,
- files/2.4.2b3/ip-up, files/2.4.2b3/killaddr-smarter.patch,
- files/2.4.2b3/modules.ppp, files/2.4.2b3/mpls.patch, files/2.4.2b3/net.ppp0,
- files/2.4.2b3/options-pppoe, files/2.4.2b3/options-pptp,
- files/2.4.2b3/pppoe.html:
-
- major cleanups:
- - moved all cflags fixed to one patch
- - added mpls support
- - use pon, poff, plog scripts from ppp distribution
- - added killaddr-smarter patch (http://seclists.org/lists/linux-kernel/2001/Jan/ 5745.html)
- - added options files for pppoe and pptp
- - fixed resolv.conf issues
- - fixed stopping of net.ppp0
- - some minor things i forgot
-
- many thx to:
- - Robert Cernansky <openhs@users.sourceforge.net> (bug#26920)
- - Cory Visi <cory@visi.name> (bug #35381)
- - Francesco Pretto <ceztko@libero.it> (bug #36081)
- - Steve Hudson <shudson2@uwo.ca> (bug #26311)
- - BlueRaven <blueraven@libero.it> (bug #31418)
-
- 08 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.1-r14.ebuild:
- added alpha to keywords, stable on sparc
-
- 05 Dec 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.1-r13.ebuild:
- fixed chown syntax
-
- 19 Nov 2003; Heinrich Wendel <lanius@gentoo.org> metadata.xml:
- metadata.xml
-
-*ppp-2.4.2_beta3 (02 Oct 2003)
-
- 02 Oct 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3.ebuild:
- version bump
-
- 06 Sep 2003; Seemant Kulleen <seemant@gentoo.org> files/net.ppp0:
- surround username with quotes for the secrets file generation. This helps with
- users who have funky characters in the usernames. Thanks to choenig__ in
- #gentoo-bugs (Christian Hoenig <gentoo@christianhoenig.de>)
-
- 06 Sep 2003; Martin Holzer <mholzer@gentoo.org> ppp-2.4.1-r14.ebuild:
- removing pppatm
-
- 07 Aug 2003; Tavis Ormandy <taviso@gentoo.org> ppp-2.4.1-r12.ebuild:
- stable on alpha
-
- 01 Jul 2003; Olivier Crete <tester@gentoo.org> ppp-2.4.1-r14.ebuild:
- fix for va_list on amd64 (its like ppc)
-
- 15 Jul 2003; Martin Schlemmer <azarah@gentoo.org> files/net.ppp0:
- Do not update /etc/ppp/peers if no NUMBER is set - this is for non
- dialup users, thanks to Maciek Freudenheim <fahren@bochnia.pl>.
-
- 12 Jun 2003; <msterret@gentoo.org> ppp-2.4.1-r13.ebuild,
- ppp-2.4.1-r14.ebuild:
- add Header
-
- 26 May 2003; Luca Barbato <lu_zero@gentoo.org> ppp-2.4.1-r14.ebuild:
- gcc-3.3 fix and moving the patches in src_unpack.
-
-*ppp-2.4.1-r14 (22 May 2003)
-
- 04 Aug 2003; Guy Martin <gmsoft@gentoo.org> ppp-2.4.1-r14.ebuild :
- Marked stable on hppa.
-
- 22 May 2003; Chuck Brewer <killian@gentoo.org> ppp-2.4.1-r14.ebuild:
- new testing ebuild, adds pppoatm.so that should work with this build
-
-*ppp-2.4.1-r12 (22 May 2003)
-
- 22 May 2003; Chuck Brewer <killian@gentoo.org> ppp-2.4.1-r12.ebuild:
- Added stuff from baselayout to be provided by the ppp package, i.e.
- net.ppp0,conf.d/net.ppp0 and chat-default
-
-*ppp-2.4.1-r13 (24 Apr 2003)
-
- 24 Apr 2003; Chuck Brewer <killian@gentoo.org> ppp-2.4.1-r13.ebuild:
- Added ppp-2.4.1-r13.ebuild and digest to include support for p* and
- ip-* scripts, perms fix, details in bug #18264
-
- 15 Apr 2003; Tavis Ormandy <taviso@gentoo.org> ppp-2.4.1-r12.ebuild:
- Adding ~alpha keyword.
-
- 28 Mar 2003; Guy Martin <gmsoft@gentoo.org> ppp-2.4.1-r12.ebuild :
- Added hppa to KEYWORDS.
-
- 02 Mar 2003; Seemant Kulleen <seemant@gentoo.org> ppp-2.4.1-r12.ebuild :
-
- Moved to stable x86. Closing bug #12002
-
- 05 Feb 2003; Hannes Mehnert <hannes@gentoo.org> ppp-2.4.1-r12.ebuild:
- added local activefilter useflag, thanks to Alexander Holler
- <holler@ahsoftware.de> for his patch
-
- 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-*ppp-2.4.1-r12 (15 Dec 2002)
-
- 15 Dec 2002; phoen][x <phoenix@gentoo.org> ppp-2.4.1-r12.ebuild, ChangeLog,
- files/digest-ppp-2.4.1-r12 :
- Fixed a pretty severe bug: /etc/modules.d/ppp was set +x - that caused
- a strange behaviour with update-modules. See bug #12002 for more details.
- Fixed the LICENSE setting: GPL -> GPL-2.
- Revision bump to force portage to update ppp.
-
-*ppp-2.4.1-r11 (28 Aug 2002)
-
- 13 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ppp-2.4.1-r11.ebuild :
- added sample /etc/ppp/ip-up script submitted in bug #8609, added IUSE
-
- 16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> ppp-2.4.1-r11.ebuild :
- Added sparc and sparc64 keywords. Revamped ChangeLog layout.
-
- 15 Sep 2002; phoen][x <phoenix@gentoo.org> ppp-2.4.1-r11.ebuild :
- Uploaded the tarball to ibiblio and modified SRC_URI.
- This closes bug 7771.
-
- 05 Sep 2002; phoen][x <phoenix@gentoo.org> ppp-2.4.1-r11.ebuild :
- Enabled callback.
- This closes bug 7373.
-
- 28 Aug 2002; phoen][x <phoenix@gentoo.org> ppp-2.4.1-r11.ebuild :
- Added ipv6 useflag support.
- This closes bug 6972.
-
-*ppp-2.4.1-r10 (31 Jul 2002)
-
- 16 Sep 2002; Maarten Thibaut <murphy@gentoo.org> ppp-2.4.1-r10.ebuild :
- Added sparc and sparc64 keywords.
-
- 3 Aug 2002; Calum Selkirk <cselkirk@gentoo.org> ppp-2.4.1-r10.ebuild
- ppp-2.4.1-r9.ebuild :
- Added ppc to KEYWORDS.
-
- 31 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ppp-2.4.1-r10.ebuild :
- Security fix - added a patch to prevent race condition.
-
-*ppp-2.4.1-r9
-
- 16 Jul 2002; Ben Lutgens <lamer@gentoo.org> ppp-2.4.1-r[789].ebuild :
- updated homepage
-
-*ppp-2.4.1-r8 (09 Apr 2002)
-
- 22 May 2002; Mike Jones <ashmodai@gentoo.org> :
- Added (optional - USE crypt variable was used) MPPE support for ppp, enabling
- clients who use the pptp server to have encrypted connections.
-
-*ppp-2.4.1-r8 (09 Apr 2002)
-
- 09 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : fixed plugin installation
- path; closing bug #1629.
-
-*ppp-2.4.1-r7 (08 Apr 2002)
-
- 08 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : New release of ppp (using
- new kernel pppoe-enabled ebuild submitted by Christian Loitsch.) Closes bug
- #1527.
-
-*ppp-2.4.1-r6 (01 Feb 2002)
-
- 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
- Added initial ChangeLog which should be updated whenever the package is
- updated in any way. This changelog is targetted to users. This means that the
- comments should well explained and written in clean English. The details about
- writing correct changelogs are explained in the skel.ChangeLog file which you
- can find in the root directory of the portage repository.
diff --git a/net-dialup/ppp/files/README.mpls b/net-dialup/ppp/files/README.mpls
deleted file mode 100644
index 1ae7ae4..0000000
--- a/net-dialup/ppp/files/README.mpls
+++ /dev/null
@@ -1,15 +0,0 @@
-MPLS consists of 3 components:
-1. MPLS forwarding
-2. MPLS signalling
-3. Mapping layer 3 traffic onto MPLS LSPs
-
-The document mpls-forwarding basics explains item 1.
-
-Examples of MPLS signalling protocols are: RSVP-TE LDP and CR-LDP.
-The package ldp-portable is an implementation of LDP and contains more
-information about LDP based MPLS signalling.
-
-Mapping of layer 3 traffic to MPLS LSPs is accomplised in a couple of
-different ways.
--Per FEC where FEC is an entry in the routing table
--Virtual interface that represents an LSP
diff --git a/net-dialup/ppp/files/modules.ppp b/net-dialup/ppp/files/modules.ppp
deleted file mode 100644
index e936041..0000000
--- a/net-dialup/ppp/files/modules.ppp
+++ /dev/null
@@ -1,10 +0,0 @@
-alias char-major-108 ppp_generic
-alias /dev/ppp ppp_generic
-alias tty-ldisc-3 ppp_async
-alias tty-ldisc-13 n_hdlc
-alias tty-ldisc-14 ppp_synctty
-alias ppp-compress-18 ppp_mppe
-alias ppp-compress-21 bsd_comp
-alias ppp-compress-24 ppp_deflate
-alias ppp-compress-26 ppp_deflate
-alias net-pf-24 pppoe
diff --git a/net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch b/net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch
deleted file mode 100644
index 4830bfe..0000000
--- a/net-dialup/ppp/files/ppp-2.4.7-dhcp-musl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur ppp-2.4.7.orig/pppd/plugins/dhcp/clientpacket.c ppp-2.4.7/pppd/plugins/dhcp/clientpacket.c
---- ppp-2.4.7.orig/pppd/plugins/dhcp/clientpacket.c 2002-08-31 12:19:20.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/dhcp/clientpacket.c 2015-05-20 13:24:41.299978928 +0000
-@@ -205,9 +205,9 @@
-
- /* Make sure its the right packet for us, and that it passes sanity checks */
- if (packet.ip.protocol != IPPROTO_UDP || packet.ip.version != IPVERSION ||
-- packet.ip.ihl != sizeof(packet.ip) >> 2 || packet.udp.dest != htons(CLIENT_PORT) ||
-+ packet.ip.ihl != sizeof(packet.ip) >> 2 || packet.udp.uh_dport != htons(CLIENT_PORT) ||
- bytes > (int) sizeof(struct udp_dhcp_packet) ||
-- ntohs(packet.udp.len) != (short) (bytes - sizeof(packet.ip))) {
-+ ntohs(packet.udp.uh_ulen) != (short) (bytes - sizeof(packet.ip))) {
- DEBUG(LOG_INFO, "unrelated/bogus packet");
- return -1;
- }
-@@ -223,14 +223,14 @@
- /* verify the UDP checksum by replacing the header with a psuedo header */
- source = packet.ip.saddr;
- dest = packet.ip.daddr;
-- check = packet.udp.check;
-- packet.udp.check = 0;
-+ check = packet.udp.uh_sum;
-+ packet.udp.uh_sum = 0;
- memset(&packet.ip, 0, sizeof(packet.ip));
-
- packet.ip.protocol = IPPROTO_UDP;
- packet.ip.saddr = source;
- packet.ip.daddr = dest;
-- packet.ip.tot_len = packet.udp.len; /* cheat on the psuedo-header */
-+ packet.ip.tot_len = packet.udp.uh_ulen; /* cheat on the psuedo-header */
- if (check && check != checksum(&packet, bytes)) {
- DEBUG(LOG_ERR, "packet with bad UDP checksum received, ignoring");
- return -1;
-diff -ur ppp-2.4.7.orig/pppd/plugins/dhcp/dhcpd.h ppp-2.4.7/pppd/plugins/dhcp/dhcpd.h
---- ppp-2.4.7.orig/pppd/plugins/dhcp/dhcpd.h 2002-08-31 11:52:31.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/dhcp/dhcpd.h 2015-05-20 13:24:10.999978974 +0000
-@@ -4,6 +4,7 @@
-
- #include <netinet/ip.h>
- #include <netinet/udp.h>
-+#include <sys/types.h>
-
- #include "leases.h"
-
diff --git a/net-dialup/ppp/files/ppp-2.4.7-musl.patch b/net-dialup/ppp/files/ppp-2.4.7-musl.patch
deleted file mode 100644
index 8b75727..0000000
--- a/net-dialup/ppp/files/ppp-2.4.7-musl.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ur ppp-2.4.7.orig/include/linux/ppp_defs.h ppp-2.4.7/include/linux/ppp_defs.h
---- ppp-2.4.7.orig/include/linux/ppp_defs.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/include/linux/ppp_defs.h 2015-05-20 12:38:46.739983089 +0000
-@@ -50,6 +50,10 @@
- #ifndef _PPP_DEFS_H_
- #define _PPP_DEFS_H_
-
-+#ifndef __P
-+# define __P(x) x
-+#endif
-+
- /*
- * The basic PPP frame.
- */
-diff -ur ppp-2.4.7.orig/include/net/ppp_defs.h ppp-2.4.7/include/net/ppp_defs.h
---- ppp-2.4.7.orig/include/net/ppp_defs.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/include/net/ppp_defs.h 2015-05-20 12:38:46.739983089 +0000
-@@ -38,6 +38,8 @@
- #ifndef _PPP_DEFS_H_
- #define _PPP_DEFS_H_
-
-+#include <sys/time.h>
-+
- /*
- * The basic PPP frame.
- */
-diff -ur ppp-2.4.7.orig/pppd/Makefile.linux ppp-2.4.7/pppd/Makefile.linux
---- ppp-2.4.7.orig/pppd/Makefile.linux 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/Makefile.linux 2015-05-20 12:38:46.739983089 +0000
-@@ -126,7 +126,7 @@
- endif
-
- ifdef USE_LIBUTIL
--CFLAGS += -DHAVE_LOGWTMP=1
-+#CFLAGS += -DHAVE_LOGWTMP=1
- LIBS += -lutil
- endif
-
-diff -ur ppp-2.4.7.orig/pppd/magic.h ppp-2.4.7/pppd/magic.h
---- ppp-2.4.7.orig/pppd/magic.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/magic.h 2015-05-20 12:38:46.739983089 +0000
-@@ -42,6 +42,10 @@
- * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
- */
-
-+#ifndef __P
-+# define __P(x) x
-+#endif
-+
- void magic_init __P((void)); /* Initialize the magic number generator */
- u_int32_t magic __P((void)); /* Returns the next magic number */
-
-diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h ppp-2.4.7/pppd/plugins/rp-pppoe/config.h
---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/config.h 2015-05-20 12:38:46.739983089 +0000
-@@ -101,9 +101,6 @@
- /* Define if you have the <netpacket/packet.h> header file. */
- #define HAVE_NETPACKET_PACKET_H 1
-
--/* Define if you have the <sys/cdefs.h> header file. */
--#define HAVE_SYS_CDEFS_H 1
--
- /* Define if you have the <sys/dlpi.h> header file. */
- /* #undef HAVE_SYS_DLPI_H */
-
-diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c ppp-2.4.7/pppd/plugins/rp-pppoe/if.c
---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/if.c 2015-05-20 12:38:46.739983089 +0000
-@@ -30,10 +30,6 @@
- #include <linux/if_packet.h>
- #endif
-
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
- #endif
-diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c 2015-05-20 12:38:46.739983089 +0000
-@@ -46,7 +46,6 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <net/ethernet.h>
- #include <net/if_arp.h>
- #include <linux/ppp_defs.h>
- #include <linux/if_pppox.h>
-diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c
---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe-discovery.c 2015-05-20 12:38:46.739983089 +0000
-@@ -27,10 +27,6 @@
- #include <linux/if_packet.h>
- #endif
-
--#ifdef HAVE_NET_ETHERNET_H
--#include <net/ethernet.h>
--#endif
--
- #ifdef HAVE_ASM_TYPES_H
- #include <asm/types.h>
- #endif
-@@ -55,6 +51,8 @@
- exit(status);
- }
-
-+#define error(x...) fprintf(stderr, x)
-+
- /* Initialize frame types to RFC 2516 values. Some broken peers apparently
- use different frame types... sigh... */
-
-diff -ur ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h
---- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/plugins/rp-pppoe/pppoe.h 2015-05-20 12:38:46.739983089 +0000
-@@ -39,10 +39,6 @@
- #error Unknown method for accessing raw Ethernet frames
- #endif
-
--#ifdef HAVE_SYS_CDEFS_H
--#include <sys/cdefs.h>
--#endif
--
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-@@ -86,19 +82,6 @@
-
- #include <netinet/in.h>
-
--#ifdef HAVE_NETINET_IF_ETHER_H
--#include <sys/types.h>
--
--#ifdef HAVE_SYS_SOCKET_H
--#include <sys/socket.h>
--#endif
--#ifndef HAVE_SYS_DLPI_H
--#include <netinet/if_ether.h>
--#endif
--#endif
--
--
--
- /* Ethernet frame types according to RFC 2516 */
- #define ETH_PPPOE_DISCOVERY 0x8863
- #define ETH_PPPOE_SESSION 0x8864
-diff -ur ppp-2.4.7.orig/pppd/sys-linux.c ppp-2.4.7/pppd/sys-linux.c
---- ppp-2.4.7.orig/pppd/sys-linux.c 2014-08-09 12:31:39.000000000 +0000
-+++ ppp-2.4.7/pppd/sys-linux.c 2015-05-20 12:39:38.269983011 +0000
-@@ -73,7 +73,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/file.h>
- #include <sys/stat.h>
- #include <sys/utsname.h>
-@@ -102,19 +102,11 @@
- #define MAX_ADDR_LEN 7
- #endif
-
--#if __GLIBC__ >= 2
- #include <asm/types.h> /* glibc 2 conflicts with linux/types.h */
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <net/route.h>
- #include <netinet/if_ether.h>
--#else
--#include <linux/types.h>
--#include <linux/if.h>
--#include <linux/if_arp.h>
--#include <linux/route.h>
--#include <linux/if_ether.h>
--#endif
- #include <netinet/in.h>
- #include <arpa/inet.h>
-
diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
deleted file mode 100644
index a80d7e9..0000000
--- a/net-dialup/ppp/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>net-dialup</herd>
- <longdescription>ppp (Paul's PPP Package) is an open source package which
- implements the Point-to-Point Protocol</longdescription>
- <use>
- <flag name="activefilter">Enables active filter support</flag>
- <flag name="atm">Enables ATM (Asynchronous Transfer Mode) protocol
- support</flag>
- <flag name="dhcp">Installs PPP DHCP client plugin for IP address allocation
- by a DHCP server (see http://www.netservers.co.uk/gpl/)</flag>
- <flag name="eap-tls">Enables support for Extensible Authentication
- Protocol and Transport Level Security (see
- http://www.nikhef.nl/~janjust/ppp/index.html)</flag>
- <flag name="gtk">Installs GTK+ password prompting program that can be used
- by passprompt.so PPP plugin for reading the password from a X11 input
- terminal</flag>
- <flag name="ipv6">Enables support for IP version 6</flag>
- <flag name="mppe-mppc">Enables support for MPPC (Microsoft Point-to-Point
- Compression) - NEEDS A PATCHED KERNEL <=2.6.14 (see
- http://mppe-mppc.alphacron.de)</flag>
- <flag name="pam">Enables PAM (Pluggable Authentication Modules)
- support</flag>
- <flag name="radius">Enables RADIUS support</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:samba:ppp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-dialup/ppp/ppp-2.4.7-r99.ebuild b/net-dialup/ppp/ppp-2.4.7-r99.ebuild
deleted file mode 100644
index 68c2c8c..0000000
--- a/net-dialup/ppp/ppp-2.4.7-r99.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.7-r1.ebuild,v 1.2 2015/05/14 10:21:15 pinkbyte Exp $
-
-EAPI=5
-
-inherit eutils linux-info multilib pam toolchain-funcs
-
-PATCH_VER="2"
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
- http://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-patches-${PATCH_VER}.tar.xz
- http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz"
-
-LICENSE="BSD GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
-
-DEPEND="activefilter? ( net-libs/libpcap )
- atm? ( net-dialup/linux-atm )
- pam? ( virtual/pam )
- gtk? ( x11-libs/gtk+:2 )
- eap-tls? ( net-misc/curl dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-PDEPEND="net-dialup/ppp-scripts"
-
-src_prepare() {
- mv "${WORKDIR}/dhcp" "${S}/pppd/plugins" || die
-
- use eap-tls || EPATCH_EXCLUDE+=" 8?_all_eaptls-*"
- EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}"/patch
-
- if use atm ; then
- einfo "Enabling PPPoATM support"
- sed -i '/^#HAVE_LIBATM=yes/s:#::' \
- pppd/plugins/pppoatm/Makefile.linux || die
- fi
-
- if ! use activefilter ; then
- einfo "Disabling active filter"
- sed -i '/^FILTER=y/s:^:#:' pppd/Makefile.linux || die
- fi
-
- if use pam ; then
- einfo "Enabling PAM"
- sed -i '/^#USE_PAM=y/s:^#::' pppd/Makefile.linux || die
- fi
-
- if use ipv6 ; then
- einfo "Enabling IPv6"
- sed -i '/#HAVE_INET6/s:#::' pppd/Makefile.linux || die
- fi
-
- einfo "Enabling CBCP"
- sed -i '/^#CBCP=y/s:#::' pppd/Makefile.linux || die
-
- if use dhcp ; then
- einfo "Adding ppp-dhcp plugin files"
- sed -i \
- -e '/^SUBDIRS :=/s:$: dhcp:' \
- pppd/plugins/Makefile.linux || die
- fi
-
- # Set correct libdir
- sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
- pppd/{pathnames.h,pppd.8} || die
-
- if use radius ; then
- #set the right paths in radiusclient.conf
- sed -i -e "s:/usr/local/etc:/etc:" \
- -e "s:/usr/local/sbin:/usr/sbin:" \
- pppd/plugins/radius/etc/radiusclient.conf || die
- #set config dir to /etc/ppp/radius
- sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
- pppd/plugins/radius/{*.8,*.c,*.h} \
- pppd/plugins/radius/etc/* || die
- else
- einfo "Disabling radius"
- sed -i -e '/+= radius/s:^:#:' pppd/plugins/Makefile.linux || die
- fi
-
- if use elibc_musl ; then
- einfo "Conditionally patching for musl"
- epatch "${FILESDIR}"/${P}-musl.patch
-
- if use dhcp ; then
- einfo "Conditionally patching dhcp support for musl"
- epatch "${FILESDIR}"/${P}-dhcp-musl.patch
- fi
- fi
-}
-
-src_compile() {
- tc-export AR CC
- emake COPTS="${CFLAGS} -D_GNU_SOURCE"
-
- # build pppgetpass
- cd contrib/pppgetpass || die
- if use gtk ; then
- emake -f Makefile.linux
- else
- emake pppgetpass.vt
- fi
-}
-
-src_install() {
- local i
- for i in chat pppd pppdump pppstats ; do
- doman ${i}/${i}.8
- dosbin ${i}/${i}
- done
- fperms u+s-w /usr/sbin/pppd
-
- # Install pppd header files
- emake -C pppd INSTROOT="${D}" install-devel
-
- dosbin pppd/plugins/rp-pppoe/pppoe-discovery
-
- dodir /etc/ppp/peers
- insinto /etc/ppp
- insopts -m0600
- newins etc.ppp/pap-secrets pap-secrets.example
- newins etc.ppp/chap-secrets chap-secrets.example
-
- insopts -m0644
- doins etc.ppp/options
-
- pamd_mimic_system ppp auth account session
-
- local PLUGINS_DIR="/usr/$(get_libdir)/pppd/${PV}"
- # closing " for syntax coloring
- insinto "${PLUGINS_DIR}"
- insopts -m0755
- doins pppd/plugins/minconn.so
- doins pppd/plugins/passprompt.so
- doins pppd/plugins/passwordfd.so
- doins pppd/plugins/winbind.so
- doins pppd/plugins/rp-pppoe/rp-pppoe.so
- doins pppd/plugins/pppol2tp/openl2tp.so
- doins pppd/plugins/pppol2tp/pppol2tp.so
- if use atm ; then
- doins pppd/plugins/pppoatm/pppoatm.so
- fi
- if use dhcp ; then
- doins pppd/plugins/dhcp/dhcpc.so
- fi
- if use radius ; then
- doins pppd/plugins/radius/rad{ius,attr,realms}.so
-
- #Copy radiusclient configuration files (#92878)
- insinto /etc/ppp/radius
- insopts -m0644
- doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
- doman pppd/plugins/radius/pppd-rad{ius,attr}.8
- fi
-
- insinto /etc/modprobe.d
- insopts -m0644
- newins "${FILESDIR}/modules.ppp" ppp.conf
-
- dodoc PLUGINS README* SETUP Changes-2.3 FAQ
- dodoc "${FILESDIR}/README.mpls"
-
- dosbin scripts/p{on,off,log}
- doman scripts/pon.1
-
- # Adding misc. specialized scripts to doc dir
- insinto /usr/share/doc/${PF}/scripts/chatchat
- doins scripts/chatchat/*
- insinto /usr/share/doc/${PF}/scripts
- doins scripts/*
-
- if use gtk ; then
- dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
- newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
- else
- newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
- fi
- doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_src_exists ; then
- echo
- ewarn "If the following test report contains a missing kernel configuration option that you need,"
- ewarn "you should reconfigure and rebuild your kernel before running pppd."
- CONFIG_CHECK="~PPP ~PPP_ASYNC ~PPP_SYNC_TTY"
- local ERROR_PPP="CONFIG_PPP:\t missing PPP support (REQUIRED)"
- local ERROR_PPP_ASYNC="CONFIG_PPP_ASYNC:\t missing asynchronous serial line discipline (optional, but highly recommended)"
- local WARNING_PPP_SYNC_TTY="CONFIG_PPP_SYNC_TTY:\t missing synchronous serial line discipline (optional; used by 'sync' pppd option)"
- if use activefilter ; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
- local ERROR_PPP_FILTER="CONFIG_PPP_FILTER:\t missing PPP filtering support (REQUIRED)"
- fi
- CONFIG_CHECK="${CONFIG_CHECK} ~PPP_DEFLATE ~PPP_BSDCOMP ~PPP_MPPE"
- local ERROR_PPP_DEFLATE="CONFIG_PPP_DEFLATE:\t missing Deflate compression (optional, but highly recommended)"
- local ERROR_PPP_BSDCOMP="CONFIG_PPP_BSDCOMP:\t missing BSD-Compress compression (optional, but highly recommended)"
- local WARNING_PPP_MPPE="CONFIG_PPP_MPPE:\t missing MPPE encryption (optional, mostly used by PPTP links)"
- CONFIG_CHECK="${CONFIG_CHECK} ~PPPOE ~PACKET"
- local WARNING_PPPOE="CONFIG_PPPOE:\t missing PPPoE support (optional, needed by rp-pppoe plugin)"
- local WARNING_PACKET="CONFIG_PACKET:\t missing AF_PACKET support (optional, used by rp-pppoe and dhcpc plugins)"
- if use atm ; then
- CONFIG_CHECK="${CONFIG_CHECK} ~PPPOATM"
- local WARNING_PPPOATM="CONFIG_PPPOATM:\t missing PPPoA support (optional, needed by pppoatm plugin)"
- fi
- check_extra_config
- fi
-
- # create *-secrets files if not exists
- [ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
- cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
- [ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
- cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
- # lib name has changed
- sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options" || die
-
- echo
- elog "Pon, poff and plog scripts have been supplied for experienced users."
- elog "Users needing particular scripts (ssh,rsh,etc.) should check out the"
- elog "/usr/share/doc/${PF}/scripts directory."
-}
diff --git a/net-firewall/iptables/files/ip6tables-1.4.13.confd b/net-firewall/iptables/files/ip6tables-1.4.13.confd
deleted file mode 100644
index 3bb3698..0000000
--- a/net-firewall/iptables/files/ip6tables-1.4.13.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/conf.d/ip6tables
-
-# Location in which iptables initscript will save set rules on
-# service shutdown
-IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"
-
-# Options to pass to iptables-save and iptables-restore
-SAVE_RESTORE_OPTIONS="-c"
-
-# Save state on stopping iptables
-SAVE_ON_STOP="yes"
-
-# If you need to log iptables messages as soon as iptables starts,
-# AND your logger does NOT depend on the network, then you may wish
-# to uncomment the next line.
-# If your logger depends on the network, and you uncomment this line
-# you will create an unresolvable circular dependency during startup.
-# After commenting or uncommenting this line, you must run 'rc-update -u'.
-#rc_use="logger"
diff --git a/net-firewall/iptables/files/iptables-1.4.13-r1.init b/net-firewall/iptables/files/iptables-1.4.13-r1.init
deleted file mode 100644
index a63d076..0000000
--- a/net-firewall/iptables/files/iptables-1.4.13-r1.init
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.4.13-r1.init,v 1.3 2013/04/27 17:29:09 vapier Exp $
-
-extra_commands="check save panic"
-extra_started_commands="reload"
-
-iptables_name=${SVCNAME}
-case ${iptables_name} in
-iptables|ip6tables) ;;
-*) iptables_name="iptables" ;;
-esac
-
-iptables_bin="/sbin/${iptables_name}"
-case ${iptables_name} in
- iptables) iptables_proc="/proc/net/ip_tables_names"
- iptables_save=${IPTABLES_SAVE};;
- ip6tables) iptables_proc="/proc/net/ip6_tables_names"
- iptables_save=${IP6TABLES_SAVE};;
-esac
-
-depend() {
- need localmount #434774
- before net
-}
-
-set_table_policy() {
- local chains table=$1 policy=$2
- case ${table} in
- nat) chains="PREROUTING POSTROUTING OUTPUT";;
- mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;
- filter) chains="INPUT FORWARD OUTPUT";;
- *) chains="";;
- esac
- local chain
- for chain in ${chains} ; do
- ${iptables_bin} -t ${table} -P ${chain} ${policy}
- done
-}
-
-checkkernel() {
- if [ ! -e ${iptables_proc} ] ; then
- eerror "Your kernel lacks ${iptables_name} support, please load"
- eerror "appropriate modules and try again."
- return 1
- fi
- return 0
-}
-checkconfig() {
- if [ ! -f ${iptables_save} ] ; then
- eerror "Not starting ${iptables_name}. First create some rules then run:"
- eerror "/etc/init.d/${iptables_name} save"
- return 1
- fi
- return 0
-}
-
-start() {
- checkconfig || return 1
- ebegin "Loading ${iptables_name} state and starting firewall"
- ${iptables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
- eend $?
-}
-
-stop() {
- if [ "${SAVE_ON_STOP}" = "yes" ] ; then
- save || return 1
- fi
- checkkernel || return 1
- ebegin "Stopping firewall"
- local a
- for a in $(cat ${iptables_proc}) ; do
- set_table_policy $a ACCEPT
-
- ${iptables_bin} -F -t $a
- ${iptables_bin} -X -t $a
- done
- eend $?
-}
-
-reload() {
- checkkernel || return 1
- checkrules || return 1
- ebegin "Flushing firewall"
- local a
- for a in $(cat ${iptables_proc}) ; do
- ${iptables_bin} -F -t $a
- ${iptables_bin} -X -t $a
- done
- eend $?
-
- start
-}
-
-checkrules() {
- ebegin "Checking rules"
- ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"
- eend $?
-}
-
-check() {
- # Short name for users of init.d script.
- checkrules
-}
-
-save() {
- ebegin "Saving ${iptables_name} state"
- checkpath -q -d "$(dirname "${iptables_save}")"
- checkpath -q -m 0600 -f "${iptables_save}"
- ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"
- eend $?
-}
-
-panic() {
- checkkernel || return 1
- if service_started ${iptables_name}; then
- rc-service ${iptables_name} stop
- fi
-
- local a
- ebegin "Dropping all packets"
- for a in $(cat ${iptables_proc}) ; do
- ${iptables_bin} -F -t $a
- ${iptables_bin} -X -t $a
-
- set_table_policy $a DROP
- done
- eend $?
-}
diff --git a/net-firewall/iptables/files/iptables-1.4.13.confd b/net-firewall/iptables/files/iptables-1.4.13.confd
deleted file mode 100644
index 7225374..0000000
--- a/net-firewall/iptables/files/iptables-1.4.13.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# /etc/conf.d/iptables
-
-# Location in which iptables initscript will save set rules on
-# service shutdown
-IPTABLES_SAVE="/var/lib/iptables/rules-save"
-
-# Options to pass to iptables-save and iptables-restore
-SAVE_RESTORE_OPTIONS="-c"
-
-# Save state on stopping iptables
-SAVE_ON_STOP="yes"
-
-# If you need to log iptables messages as soon as iptables starts,
-# AND your logger does NOT depend on the network, then you may wish
-# to uncomment the next line.
-# If your logger depends on the network, and you uncomment this line
-# you will create an unresolvable circular dependency during startup.
-# After commenting or uncommenting this line, you must run 'rc-update -u'.
-#rc_use="logger"
diff --git a/net-firewall/iptables/files/iptables-1.4.20-musl.patch b/net-firewall/iptables/files/iptables-1.4.20-musl.patch
deleted file mode 100644
index cd5b1a7..0000000
--- a/net-firewall/iptables/files/iptables-1.4.20-musl.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-diff -ur a/iptables-1.4.20/extensions/libxt_conntrack.c b/iptables-1.4.20/extensions/libxt_conntrack.c
---- a/iptables-1.4.20/extensions/libxt_conntrack.c
-+++ b/iptables-1.4.20/extensions/libxt_conntrack.c
-@@ -786,7 +786,7 @@
-
- static void
- conntrack_dump_ports(const char *prefix, const char *opt,
-- u_int16_t port_low, u_int16_t port_high)
-+ uint16_t port_low, uint16_t port_high)
- {
- if (port_high == 0 || port_low == port_high)
- printf(" %s%s %u", prefix, opt, port_low);
-diff -ur a/iptables-1.4.20/include/libipq/libipq.h b/iptables-1.4.20/include/libipq/libipq.h
---- a/iptables-1.4.20/include/libipq/libipq.h
-+++ b/iptables-1.4.20/include/libipq/libipq.h
-@@ -48,19 +48,19 @@
- struct ipq_handle
- {
- int fd;
-- u_int8_t blocking;
-+ uint8_t blocking;
- struct sockaddr_nl local;
- struct sockaddr_nl peer;
- };
-
--struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol);
-+struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol);
-
- int ipq_destroy_handle(struct ipq_handle *h);
-
- ssize_t ipq_read(const struct ipq_handle *h,
- unsigned char *buf, size_t len, int timeout);
-
--int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len);
-+int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len);
-
- ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf);
-
-diff -ur a/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h b/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h
---- a/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h
-+++ b/iptables-1.4.20/include/libiptc/ipt_kernel_headers.h
-@@ -15,13 +15,12 @@
- #include <sys/types.h>
- #else /* libc5 */
- #include <sys/socket.h>
--#include <linux/ip.h>
--#include <linux/in.h>
--#include <linux/if.h>
-+#include <netinet/ip.h>
-+#include <netinet/in.h>
-+#include <net/if.h>
- #include <linux/icmp.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/types.h>
--#include <linux/in6.h>
- #endif
- #endif
-diff -ur a/iptables-1.4.20/include/libiptc/libxtc.h b/iptables-1.4.20/include/libiptc/libxtc.h
---- a/iptables-1.4.20/include/libiptc/libxtc.h
-+++ b/iptables-1.4.20/include/libiptc/libxtc.h
-@@ -10,7 +10,7 @@
- #endif
-
- #ifndef XT_MIN_ALIGN
--/* xt_entry has pointers and u_int64_t's in it, so if you align to
-+/* xt_entry has pointers and uint64_t's in it, so if you align to
- it, you'll also align to any crazy matches and targets someone
- might write */
- #define XT_MIN_ALIGN (__alignof__(struct xt_entry))
-diff -ur a/iptables-1.4.20/include/libipulog/libipulog.h b/iptables-1.4.20/include/libipulog/libipulog.h
---- a/iptables-1.4.20/include/libipulog/libipulog.h 2013-08-06 15:48:43.000000000 +0000
-+++ b/iptables-1.4.20/include/libipulog/libipulog.h 2014-02-09 09:32:45.058650377 +0000
-@@ -21,9 +21,9 @@
-
- struct ipulog_handle;
-
--u_int32_t ipulog_group2gmask(u_int32_t group);
-+uint32_t ipulog_group2gmask(uint32_t group);
-
--struct ipulog_handle *ipulog_create_handle(u_int32_t gmask);
-+struct ipulog_handle *ipulog_create_handle(uint32_t gmask);
-
- void ipulog_destroy_handle(struct ipulog_handle *h);
-
-diff -ur a/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h b/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h
---- a/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/iptables-1.4.20/include/linux/netfilter_ipv4/ip_tables.h
-@@ -15,6 +15,7 @@
- #ifndef _IPTABLES_H
- #define _IPTABLES_H
-
-+#include <stdint.h>
- #include <linux/types.h>
-
- #include <linux/netfilter_ipv4.h>
-@@ -73,12 +74,12 @@
- unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-
- /* Protocol, 0 = ANY */
-- u_int16_t proto;
-+ uint16_t proto;
-
- /* Flags word */
-- u_int8_t flags;
-+ uint8_t flags;
- /* Inverse flags */
-- u_int8_t invflags;
-+ uint8_t invflags;
- };
-
- /* Values for "flag" field in struct ipt_ip (general ip structure). */
-@@ -106,9 +107,9 @@
- unsigned int nfcache;
-
- /* Size of ipt_entry + matches */
-- u_int16_t target_offset;
-+ uint16_t target_offset;
- /* Size of ipt_entry + matches + target */
-- u_int16_t next_offset;
-+ uint16_t next_offset;
-
- /* Back pointer */
- unsigned int comefrom;
-@@ -125,7 +126,7 @@
- * Unlike BSD Linux inherits IP options so you don't have to use a raw
- * socket for this. Instead we check rights in the calls.
- *
-- * ATTENTION: check linux/in.h before adding new number here.
-+ * ATTENTION: check netinet/in.h before adding new number here.
- */
- #define IPT_BASE_CTL 64
-
-@@ -141,9 +142,9 @@
-
- /* ICMP matching stuff */
- struct ipt_icmp {
-- u_int8_t type; /* type to match */
-- u_int8_t code[2]; /* range of code */
-- u_int8_t invflags; /* Inverse flags */
-+ uint8_t type; /* type to match */
-+ uint8_t code[2]; /* range of code */
-+ uint8_t invflags; /* Inverse flags */
- };
-
- /* Values for "inv" field for struct ipt_icmp. */
-diff -ur a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h
---- a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h
-+++ b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6_tables.h
-@@ -73,14 +73,14 @@
- * MH do not match any packets.
- * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
- */
-- u_int16_t proto;
-+ uint16_t proto;
- /* TOS to match iff flags & IP6T_F_TOS */
-- u_int8_t tos;
-+ uint8_t tos;
-
- /* Flags word */
-- u_int8_t flags;
-+ uint8_t flags;
- /* Inverse flags */
-- u_int8_t invflags;
-+ uint8_t invflags;
- };
-
- /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
-@@ -110,9 +110,9 @@
- unsigned int nfcache;
-
- /* Size of ipt_entry + matches */
-- u_int16_t target_offset;
-+ uint16_t target_offset;
- /* Size of ipt_entry + matches + target */
-- u_int16_t next_offset;
-+ uint16_t next_offset;
-
- /* Back pointer */
- unsigned int comefrom;
-@@ -162,7 +162,6 @@
- * Unlike BSD Linux inherits IP options so you don't have to use
- * a raw socket for this. Instead we check rights in the calls.
- *
-- * ATTENTION: check linux/in6.h before adding new number here.
- */
- #define IP6T_BASE_CTL 64
-
-@@ -178,9 +177,9 @@
-
- /* ICMP matching stuff */
- struct ip6t_icmp {
-- u_int8_t type; /* type to match */
-- u_int8_t code[2]; /* range of code */
-- u_int8_t invflags; /* Inverse flags */
-+ uint8_t type; /* type to match */
-+ uint8_t code[2]; /* range of code */
-+ uint8_t invflags; /* Inverse flags */
- };
-
- /* Values for "inv" field for struct ipt_icmp. */
-diff -ur a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h
---- a/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h
-+++ b/iptables-1.4.20/include/linux/netfilter_ipv6/ip6t_rt.h
-@@ -2,7 +2,6 @@
- #define _IP6T_RT_H
-
- #include <linux/types.h>
--/*#include <linux/in6.h>*/
-
- #define IP6T_RT_HOPS 16
-
-diff -ur a/iptables-1.4.20/include/xtables.h b/iptables-1.4.20/include/xtables.h
---- a/iptables-1.4.20/include/xtables.h
-+++ b/iptables-1.4.20/include/xtables.h
-@@ -220,12 +220,12 @@
- const char *real_name;
-
- /* Revision of match (0 by default). */
-- u_int8_t revision;
-+ uint8_t revision;
-
- /* Extension flags */
-- u_int8_t ext_flags;
-+ uint8_t ext_flags;
-
-- u_int16_t family;
-+ uint16_t family;
-
- /* Size of match data. */
- size_t size;
-@@ -297,12 +297,12 @@
- const char *real_name;
-
- /* Revision of target (0 by default). */
-- u_int8_t revision;
-+ uint8_t revision;
-
- /* Extension flags */
-- u_int8_t ext_flags;
-+ uint8_t ext_flags;
-
-- u_int16_t family;
-+ uint16_t family;
-
-
- /* Size of target data. */
-@@ -373,7 +373,7 @@
- */
- struct xtables_pprot {
- const char *name;
-- u_int8_t num;
-+ uint8_t num;
- };
-
- enum xtables_tryload {
-@@ -446,12 +446,12 @@
- extern bool xtables_strtoui(const char *, char **, unsigned int *,
- unsigned int, unsigned int);
- extern int xtables_service_to_port(const char *name, const char *proto);
--extern u_int16_t xtables_parse_port(const char *port, const char *proto);
-+extern uint16_t xtables_parse_port(const char *port, const char *proto);
- extern void
- xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask);
-
- /* this is a special 64bit data type that is 8-byte aligned */
--#define aligned_u64 u_int64_t __attribute__((aligned(8)))
-+#define aligned_u64 uint64_t __attribute__((aligned(8)))
-
- extern struct xtables_globals *xt_params;
- #define xtables_error (xt_params->exit_err)
-@@ -514,7 +514,7 @@
- #endif
-
- extern const struct xtables_pprot xtables_chain_protos[];
--extern u_int16_t xtables_parse_protocol(const char *s);
-+extern uint16_t xtables_parse_protocol(const char *s);
-
- /* kernel revision handling */
- extern int kernel_version;
-diff -ur a/iptables-1.4.20/libipq/ipq_create_handle.3 b/iptables-1.4.20/libipq/ipq_create_handle.3
---- a/iptables-1.4.20/libipq/ipq_create_handle.3
-+++ b/iptables-1.4.20/libipq/ipq_create_handle.3
-@@ -24,7 +24,7 @@
- .br
- .B #include <libipq.h>
- .sp
--.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");"
-+.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");"
- .br
- .BI "int ipq_destroy_handle(struct ipq_handle *" h );
- .SH DESCRIPTION
-diff -ur a/iptables-1.4.20/libipq/ipq_set_mode.3 b/iptables-1.4.20/libipq/ipq_set_mode.3
---- a/iptables-1.4.20/libipq/ipq_set_mode.3
-+++ b/iptables-1.4.20/libipq/ipq_set_mode.3
-@@ -24,7 +24,7 @@
- .br
- .B #include <libipq.h>
- .sp
--.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range );
-+.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range );
- .SH DESCRIPTION
- The
- .B ipq_set_mode
diff --git a/net-firewall/iptables/files/iptables-1.4.21-musl.patch b/net-firewall/iptables/files/iptables-1.4.21-musl.patch
deleted file mode 100644
index 286ea87..0000000
--- a/net-firewall/iptables/files/iptables-1.4.21-musl.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -ru a/iptables-1.4.21/extensions/libip6t_ipv6header.c b/iptables-1.4.21/extensions/libip6t_ipv6header.c
---- a/iptables-1.4.21/extensions/libip6t_ipv6header.c
-+++ b/iptables-1.4.21/extensions/libip6t_ipv6header.c
-@@ -10,6 +10,9 @@
- #include <netdb.h>
- #include <xtables.h>
- #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
-+#ifndef IPPROTO_HOPOPTS
-+# define IPPROTO_HOPOPTS 0
-+#endif
-
- enum {
- O_HEADER = 0,
-diff -ru a/iptables-1.4.21/extensions/libxt_TCPOPTSTRIP.c b/iptables-1.4.21/extensions/libxt_TCPOPTSTRIP.c
---- a/iptables-1.4.21/extensions/libxt_TCPOPTSTRIP.c
-+++ b/iptables-1.4.21/extensions/libxt_TCPOPTSTRIP.c
-@@ -12,6 +12,21 @@
- #ifndef TCPOPT_MD5SIG
- # define TCPOPT_MD5SIG 19
- #endif
-+#ifndef TCPOPT_MAXSEG
-+# define TCPOPT_MAXSEG 2
-+#endif
-+#ifndef TCPOPT_WINDOW
-+# define TCPOPT_WINDOW 3
-+#endif
-+#ifndef TCPOPT_SACK_PERMITTED
-+# define TCPOPT_SACK_PERMITTED 4
-+#endif
-+#ifndef TCPOPT_SACK
-+# define TCPOPT_SACK 5
-+#endif
-+#ifndef TCPOPT_TIMESTAMP
-+# define TCPOPT_TIMESTAMP 8
-+#endif
-
- enum {
- O_STRIP_OPTION = 0,
-diff -ru a/iptables-1.4.21/include/libiptc/ipt_kernel_headers.h b/iptables-1.4.21/include/libiptc/ipt_kernel_headers.h
---- a/iptables-1.4.21/include/libiptc/ipt_kernel_headers.h
-+++ b/iptables-1.4.21/include/libiptc/ipt_kernel_headers.h
-@@ -5,7 +5,6 @@
-
- #include <limits.h>
-
--#if defined(__GLIBC__) && __GLIBC__ == 2
- #include <netinet/ip.h>
- #include <netinet/in.h>
- #include <netinet/ip_icmp.h>
-@@ -13,15 +12,4 @@
- #include <netinet/udp.h>
- #include <net/if.h>
- #include <sys/types.h>
--#else /* libc5 */
--#include <sys/socket.h>
--#include <linux/ip.h>
--#include <linux/in.h>
--#include <linux/if.h>
--#include <linux/icmp.h>
--#include <linux/tcp.h>
--#include <linux/udp.h>
--#include <linux/types.h>
--#include <linux/in6.h>
--#endif
- #endif
-diff -ru a/iptables-1.4.21/include/linux/netfilter_ipv4/ip_tables.h b/iptables-1.4.21/include/linux/netfilter_ipv4/ip_tables.h
---- a/iptables-1.4.21/include/linux/netfilter_ipv4/ip_tables.h
-+++ b/iptables-1.4.21/include/linux/netfilter_ipv4/ip_tables.h
-@@ -16,6 +16,7 @@
- #define _IPTABLES_H
-
- #include <linux/types.h>
-+#include <sys/types.h>
-
- #include <linux/netfilter_ipv4.h>
-
-diff -ru a/iptables-1.4.21/iptables/ip6tables-restore.c b/iptables-1.4.21/iptables/ip6tables-restore.c
---- a/iptables-1.4.21/iptables/ip6tables-restore.c
-+++ b/iptables-1.4.21/iptables/ip6tables-restore.c
-@@ -9,7 +9,7 @@
- */
-
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdbool.h>
- #include <string.h>
- #include <stdio.h>
-diff -ru a/iptables-1.4.21/iptables/ip6tables-save.c b/iptables-1.4.21/iptables/ip6tables-save.c
---- a/iptables-1.4.21/iptables/ip6tables-save.c
-+++ b/iptables-1.4.21/iptables/ip6tables-save.c
-@@ -6,7 +6,7 @@
- * This code is distributed under the terms of GNU GPL v2
- */
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <stdlib.h>
-diff -ru a/iptables-1.4.21/iptables/iptables-restore.c b/iptables-1.4.21/iptables/iptables-restore.c
---- a/iptables-1.4.21/iptables/iptables-restore.c
-+++ b/iptables-1.4.21/iptables/iptables-restore.c
-@@ -6,7 +6,7 @@
- */
-
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdbool.h>
- #include <string.h>
- #include <stdio.h>
-diff -ru a/iptables-1.4.21/iptables/iptables-save.c b/iptables-1.4.21/iptables/iptables-save.c
---- a/iptables-1.4.21/iptables/iptables-save.c
-+++ b/iptables-1.4.21/iptables/iptables-save.c
-@@ -6,7 +6,7 @@
- *
- */
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <stdlib.h>
-diff -ru a/iptables-1.4.21/iptables/iptables-xml.c b/iptables-1.4.21/iptables/iptables-xml.c
---- a/iptables-1.4.21/iptables/iptables-xml.c
-+++ b/iptables-1.4.21/iptables/iptables-xml.c
-@@ -7,7 +7,7 @@
- */
-
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/net-firewall/iptables/files/systemd/ip6tables-restore.service b/net-firewall/iptables/files/systemd/ip6tables-restore.service
deleted file mode 100644
index 88415fa..0000000
--- a/net-firewall/iptables/files/systemd/ip6tables-restore.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Restore ip6tables firewall rules
-# if both are queued for some reason, don't store before restoring :)
-Before=ip6tables-store.service
-# sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/ip6tables-restore /var/lib/ip6tables/rules-save
-
-[Install]
-WantedBy=basic.target
diff --git a/net-firewall/iptables/files/systemd/ip6tables-store.service b/net-firewall/iptables/files/systemd/ip6tables-store.service
deleted file mode 100644
index 9975378..0000000
--- a/net-firewall/iptables/files/systemd/ip6tables-store.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Store ip6tables firewall rules
-Before=shutdown.target
-DefaultDependencies=No
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "/sbin/ip6tables-save --counters > /var/lib/ip6tables/rules-save"
-
-[Install]
-WantedBy=shutdown.target
diff --git a/net-firewall/iptables/files/systemd/ip6tables.service b/net-firewall/iptables/files/systemd/ip6tables.service
deleted file mode 100644
index 0a6d7fa..0000000
--- a/net-firewall/iptables/files/systemd/ip6tables.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Store and restore ip6tables firewall rules
-
-[Install]
-Also=ip6tables-store.service
-Also=ip6tables-restore.service
diff --git a/net-firewall/iptables/files/systemd/iptables-restore.service b/net-firewall/iptables/files/systemd/iptables-restore.service
deleted file mode 100644
index 9d568d7..0000000
--- a/net-firewall/iptables/files/systemd/iptables-restore.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Restore iptables firewall rules
-# if both are queued for some reason, don't store before restoring :)
-Before=iptables-store.service
-# sounds reasonable to have firewall up before any of the services go up
-Before=network.target
-Conflicts=shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=/sbin/iptables-restore /var/lib/iptables/rules-save
-
-[Install]
-WantedBy=basic.target
diff --git a/net-firewall/iptables/files/systemd/iptables-store.service b/net-firewall/iptables/files/systemd/iptables-store.service
deleted file mode 100644
index aa16e75..0000000
--- a/net-firewall/iptables/files/systemd/iptables-store.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Store iptables firewall rules
-Before=shutdown.target
-DefaultDependencies=No
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "/sbin/iptables-save --counters > /var/lib/iptables/rules-save"
-
-[Install]
-WantedBy=shutdown.target
diff --git a/net-firewall/iptables/files/systemd/iptables.service b/net-firewall/iptables/files/systemd/iptables.service
deleted file mode 100644
index 3643a3e..0000000
--- a/net-firewall/iptables/files/systemd/iptables.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Store and restore iptables firewall rules
-
-[Install]
-Also=iptables-store.service
-Also=iptables-restore.service
diff --git a/net-firewall/iptables/iptables-1.4.20-r99.ebuild b/net-firewall/iptables/iptables-1.4.20-r99.ebuild
deleted file mode 100644
index 287dec6..0000000
--- a/net-firewall/iptables/iptables-1.4.20-r99.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.20.ebuild,v 1.12 2014/01/18 19:48:53 ago Exp $
-
-EAPI="4"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.netfilter.org/projects/iptables/"
-SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
- netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
- virtual/os-headers
- virtual/pkgconfig
-"
-
-src_prepare() {
- # use the saner headers from the kernel
- rm -f include/linux/{kernel,types}.h
-
- epatch ${FILESDIR}/${P}-musl.patch
-
- # Remove problematic extensions
- rm -f extensions/libxt_TCPOPTSTRIP.*
- rm -f extensions/libxt_osf.*
-
- # Only run autotools if user patched something
- epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
- # Some libs use $(AR) rather than libtool to build #444282
- tc-export AR
-
- sed -i \
- -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
- configure || die
-
- econf \
- --sbindir="${EPREFIX}/sbin" \
- --libexecdir="${EPREFIX}/$(get_libdir)" \
- --enable-devel \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable ipv6)
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- default
- dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
- # all the iptables binaries are in /sbin, so might as well
- # put these small files in with them
- into /
- dosbin iptables/iptables-apply
- dosym iptables-apply /sbin/ip6tables-apply
- doman iptables/iptables-apply.8
-
- insinto /usr/include
- doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
- insinto /usr/include/iptables
- doins include/iptables/internal.h
-
- keepdir /var/lib/iptables
- newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
- newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
- if use ipv6 ; then
- keepdir /var/lib/ip6tables
- newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
- newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
- fi
-
- # Move important libs to /lib
- gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
- prune_libtool_files
-}
diff --git a/net-firewall/iptables/iptables-1.4.21-r99.ebuild b/net-firewall/iptables/iptables-1.4.21-r99.ebuild
deleted file mode 100644
index 6f5106d..0000000
--- a/net-firewall/iptables/iptables-1.4.21-r99.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.21-r1.ebuild,v 1.5 2014/06/14 11:52:14 zlogene Exp $
-
-EAPI="5"
-
-# Force users doing their own patches to install their own tools
-AUTOTOOLS_AUTO_DEPEND=no
-
-inherit eutils multilib systemd toolchain-funcs autotools
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="http://www.netfilter.org/projects/iptables/"
-SRC_URI="http://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6 netlink static-libs"
-
-RDEPEND="
- netlink? ( net-libs/libnfnetlink )
-"
-DEPEND="${RDEPEND}
- virtual/os-headers
- virtual/pkgconfig
-"
-
-src_prepare() {
- # use the saner headers from the kernel
- rm -f include/linux/{kernel,types}.h
-
- epatch ${FILESDIR}/${P}-musl.patch
-
- # Only run autotools if user patched something
- epatch_user && eautoreconf || elibtoolize
-}
-
-src_configure() {
- # Some libs use $(AR) rather than libtool to build #444282
- tc-export AR
-
- sed -i \
- -e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
- configure || die
-
- econf \
- --sbindir="${EPREFIX}/sbin" \
- --libexecdir="${EPREFIX}/$(get_libdir)" \
- --enable-devel \
- --enable-shared \
- $(use_enable static-libs static) \
- $(use_enable ipv6)
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- default
- dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
- # all the iptables binaries are in /sbin, so might as well
- # put these small files in with them
- into /
- dosbin iptables/iptables-apply
- dosym iptables-apply /sbin/ip6tables-apply
- doman iptables/iptables-apply.8
-
- insinto /usr/include
- doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
- insinto /usr/include/iptables
- doins include/iptables/internal.h
-
- keepdir /var/lib/iptables
- newinitd "${FILESDIR}"/${PN}-1.4.13-r1.init iptables
- newconfd "${FILESDIR}"/${PN}-1.4.13.confd iptables
- if use ipv6 ; then
- keepdir /var/lib/ip6tables
- newinitd "${FILESDIR}"/iptables-1.4.13-r1.init ip6tables
- newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
- fi
-
- systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
- if use ipv6 ; then
- systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
- fi
-
- # Move important libs to /lib
- gen_usr_ldscript -a ip{4,6}tc iptc xtables
-
- prune_libtool_files
-}
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
deleted file mode 100644
index ed96e3d..0000000
--- a/net-firewall/iptables/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
-</use>
-<longdescription>
- iptables is the userspace command line program used to set up, maintain, and
- inspect the tables of IPv4 packet filter rules in the Linux kernel. It's a
- part of packet filtering framework which allows the stateless and stateful
- packet filtering, all kinds of network address and port translation, and is a
- flexible and extensible infrastructure with multiple layers of API's for 3rd
- party extensions. The iptables package also includes ip6tables. ip6tables is
- used for configuring the IPv6 packet filter.
-
- Note that some extensions (e.g. imq and l7filter) are not included into
- official kernel sources so you have to patch the sources before installation.
-</longdescription>
-<upstream>
- <remote-id type="cpe">cpe:/a:netfilter_core_team:iptables</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/net-fs/cifs-utils/cifs-utils-6.1-r99.ebuild b/net-fs/cifs-utils/cifs-utils-6.1-r99.ebuild
deleted file mode 100644
index de04aac..0000000
--- a/net-fs/cifs-utils/cifs-utils-6.1-r99.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-6.1-r1.ebuild,v 1.13 2014/06/22 21:28:55 klausman Exp $
-
-EAPI=5
-
-inherit eutils linux-info multilib
-
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+acl +ads +caps +caps-ng creds"
-
-DEPEND="!net-fs/mount-cifs
- !<net-fs/samba-3.6_rc1
- ads? (
- sys-apps/keyutils
- sys-libs/talloc
- virtual/krb5
- )
- caps? ( !caps-ng? ( sys-libs/libcap ) )
- caps? ( caps-ng? ( sys-libs/libcap-ng ) )
- creds? ( sys-apps/keyutils )"
-PDEPEND="${DEPEND}
- acl? ( || (
- =net-fs/samba-3.6*[winbind]
- >=net-fs/samba-4.0.0_alpha1
- ) )
-"
-
-REQUIRED_USE="acl? ( ads )"
-
-DOCS="doc/linux-cifs-client-guide.odt"
-
-pkg_setup() {
- linux-info_pkg_setup
-
- if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
- ewarn "You must enable CIFS support in your kernel config, "
- ewarn "to be able to mount samba shares. You can find it at"
- ewarn
- ewarn " File systems"
- ewarn " Network File Systems"
- ewarn " CIFS support"
- ewarn
- ewarn "and recompile your kernel ..."
- fi
-}
-
-src_prepare() {
- # Do not rely on hardcoded path to systemd-ask-password, bug #478538
- epatch "${FILESDIR}/${P}-hardcoded-path.patch"
- epatch "${FILESDIR}/${P}-paths.h.patch" #for musl
-}
-
-src_configure() {
- ROOTSBINDIR="${EPREFIX}"/sbin \
- econf \
- $(use_enable acl cifsacl cifsidmap) \
- $(use_enable ads cifsupcall) \
- $(use caps && use_with !caps-ng libcap || echo --without-libcap) \
- $(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \
- $(use_enable creds cifscreds)
-}
-
-src_install() {
- default
-
- # remove empty directories
- find "${ED}" -type d -print0 | xargs --null rmdir \
- --ignore-fail-on-non-empty &>/dev/null
-
- if use acl ; then
- dodir /etc/cifs-utils
- dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \
- /etc/cifs-utils/idmap-plugin
- dodir /etc/request-key.d
- echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
- > "${ED}/etc/request-key.d/cifs.idmap.conf"
- fi
-
- if use ads ; then
- dodir /etc/request-key.d
- echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
- > "${ED}/etc/request-key.d/cifs.upcall.conf"
- fi
-}
-
-pkg_postinst() {
- # Inform about set-user-ID bit of mount.cifs
- ewarn "setuid use flag was dropped due to multiple security implications"
- ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
- ewarn "You are free to set setuid flags by yourself"
-
- # Inform about upcall usage
- if use acl ; then
- einfo "The cifs.idmap utility has been enabled by creating the"
- einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
- einfo "This enables you to get and set CIFS acls."
- fi
-
- if use ads ; then
- einfo "The cifs.upcall utility has been enabled by creating the"
- einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
- einfo "This enables you to mount DFS shares."
- fi
-}
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
deleted file mode 100644
index c2e2ea2..0000000
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4e315f6a02a4edb259b33bcf0665eba259fee2f2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 30 Jul 2013 10:00:26 +0200
-Subject: [PATCH] Do not rely on hardcoded path to systemd-ask-password.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Relying on hardcoded /bin/systemd-ask-password path breaks systemd that
-install systemd-ask-password in /usr/bin. Since both paths are supposed
-to be in ${PATH} and popen() passes the command to shell, just pass
-'systemd-ask-password' and let the shell find it.
-
-Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- mount.cifs.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index e76beee..7206dcb 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -1626,7 +1626,7 @@ drop_child_privs(void)
- }
-
- /*
-- * If systemd is running and /bin/systemd-ask-password --
-+ * If systemd is running and systemd-ask-password --
- * is available, then use that else fallback on getpass(..)
- *
- * Returns: @input or NULL on error
-@@ -1649,7 +1649,7 @@ get_password(const char *prompt, char *input, int capacity)
- FILE *ask_pass_fp = NULL;
-
- cmd = ret = NULL;
-- if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
-+ if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) {
- ask_pass_fp = popen (cmd, "re");
- free (cmd);
- }
---
-1.7.0.4
-
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-paths.h.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-paths.h.patch
deleted file mode 100644
index 5e2434d..0000000
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-paths.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cifs-utils-6.1/mtab.c
-+++ b/cifs-utils-6.1/mtab.c
-@@ -38,6 +38,7 @@
- #include <mntent.h>
- #include <stdlib.h>
- #include <signal.h>
-+#include <paths.h>
- #include "mount.h"
- #include "config.h"
-
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
deleted file mode 100644
index a31a339..0000000
--- a/net-fs/cifs-utils/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>samba</herd>
- <maintainer>
- <email>samba@gentoo.org</email>
- <name>Samba Team</name>
- </maintainer>
- <longdescription>The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package</longdescription>
- <use>
- <flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag>
- <flag name="caps">libcap support</flag>
- <flag name="caps-ng">libcap-ng support</flag>
- <flag name="creds">cifs credentials support</flag>
- </use>
-</pkgmetadata>
diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in b/net-libs/liblockfile/files/Makefile.Darwin.in
deleted file mode 100644
index bdd320f..0000000
--- a/net-libs/liblockfile/files/Makefile.Darwin.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Makefile.in Makefile for the liblockfile package (Darwin version)
-#
-# Gentoo version for Darwin, based on original:
-# version: @(#)Makefile.in 1.01 16-Apr-1999 miquels@cistron.nl
-#
-
-VER = 1.0
-NVER = 0.1
-
-CFLAGS = @CFLAGS@ -I.
-LDFLAGS = @LDFLAGS@
-CC = @CC@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-mandir = @mandir@
-nfslockdir = @nfslockdir@
-includedir = @includedir@
-
-MAILGROUP = @MAILGROUP@
-
-all: @TARGETS@
-install: @INSTALL_TARGETS@
-
-static: liblockfile.a dotlockfile
-shared: liblockfile.dylib dotlockfile
-nfslib: nfslock.$(VER).dylib
-
-liblockfile.a: lockfile.o
- ar rv liblockfile.a lockfile.o
-
-liblockfile.dylib: liblockfile.a
- $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name @libdir@/liblockfile.1.0.dylib \
- -o liblockfile.dylib lockfile.o -lc
-
-nfslock.$(VER).dylib: nfslock.o
- $(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name nfslock.0.dylib \
- -o nfslock.$(NVER).dylib nfslock.o
-
-dotlockfile: dotlockfile.o xlockfile.o
- $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
-
-lockfile.o: lockfile.c
- $(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \
- -c lockfile.c
-
-xlockfile.o: lockfile.c
- $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
-
-install_static: static install_common
- install -m 644 liblockfile.a $(ROOT)$(libdir)
-
-install_shared: shared install_common
- install -m 755 liblockfile.dylib \
- $(ROOT)$(libdir)/liblockfile.$(VER).dylib
- ln -s liblockfile.$(VER).dylib $(ROOT)$(libdir)/liblockfile.dylib
-
-install_common:
- install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
- if [ "$(MAILGROUP)" != "" ]; then\
- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
- else \
- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
- fi
- install -m 644 *.1 $(ROOT)$(mandir)/man1
- install -m 644 *.3 $(ROOT)$(mandir)/man3
-
-install_nfslib: nfslib
- install -m 755 nfslock.$(VER).dylib $(ROOT)$(nfslockdir)
-
-clean:
- rm -f *.a *.o *.dylib dotlockfile
-
-distclean: clean
- rm -f Makefile autoconf.h maillock.h \
- config.cache config.log config.status
-
diff --git a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
deleted file mode 100644
index 1a8d0eb..0000000
--- a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: liblockfile-1.06/Makefile.in
-===================================================================
---- liblockfile-1.06.orig/Makefile.in
-+++ liblockfile-1.06/Makefile.in
-@@ -32,11 +32,11 @@ liblockfile.a: lockfile.o
- ar rv liblockfile.a lockfile.o
-
- liblockfile.so: liblockfile.a
-- $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
-+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
- -o liblockfile.so lockfile.o -lc
-
- nfslock.so.$(VER): nfslock.o
-- $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
-+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \
- -o nfslock.so.$(NVER) nfslock.o
-
- dotlockfile: dotlockfile.o xlockfile.o
diff --git a/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch b/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch
deleted file mode 100644
index a478fa8..0000000
--- a/net-libs/liblockfile/files/liblockfile-1.09-no-ldconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/liblockfile-1.09/Makefile.in
-+++ b/liblockfile-1.09/Makefile.in
-@@ -56,7 +56,7 @@
- install -m 755 liblockfile.so \
- $(ROOT)$(libdir)/liblockfile.so.$(VER)
- ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
-- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-+ if test "$(ROOT)" = ""; then sh -c '@LDCONFIG@'; fi
-
- install_common:
- install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
-@@ -70,7 +70,7 @@
-
- install_nfslib: nfslib
- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir)
-- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-+ if test "$(ROOT)" = ""; then sh -c '@LDCONFIG@'; fi
-
- clean:
- rm -f *.a *.o *.so *.so.* dotlockfile
diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
deleted file mode 100644
index 4a8c75a..0000000
--- a/net-libs/liblockfile/files/liblockfile-orphan-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in
---- liblockfile-1.06-orig/Makefile.in 2006-11-28 06:19:09.000000000 +0100
-+++ liblockfile-1.06/Makefile.in 2006-11-28 06:24:30.000000000 +0100
-@@ -5,6 +5,7 @@
- #
-
- VER = 1.0
-+MVER = 1
- NVER = 0.1
-
- CFLAGS = @CFLAGS@ -I.
-@@ -55,6 +56,7 @@
- install_shared: shared install_common
- install -m 755 liblockfile.so \
- $(ROOT)$(libdir)/liblockfile.so.$(VER)
-+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.$(MVER)
- ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-
diff --git a/net-libs/liblockfile/liblockfile-1.09-r99.ebuild b/net-libs/liblockfile/liblockfile-1.09-r99.ebuild
deleted file mode 100644
index 531a64b..0000000
--- a/net-libs/liblockfile/liblockfile-1.09-r99.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/liblockfile-1.09.ebuild,v 1.16 2014/01/08 06:42:31 vapier Exp $
-
-EAPI=4
-
-inherit eutils multilib autotools user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-pkg_setup() {
- enewgroup mail 12
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.06-respectflags.patch
- epatch "${FILESDIR}"/${PN}-1.09-no-ldconfig.patch
- epatch "${FILESDIR}"/${PN}-orphan-file.patch
-
- # I don't feel like making the Makefile portable
- [[ ${CHOST} == *-darwin* ]] \
- && cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
- eautoreconf
-}
-
-src_configure() {
- local grp=mail
- if use prefix ; then
- # we never want to use LDCONFIG
- export LDCONFIG=${EPREFIX}/bin/true
- # in unprivileged installs this is "mail"
- grp=$(id -g)
- fi
- econf --with-mailgroup=${grp} --enable-shared
-}
-
-src_install() {
- dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
- emake ROOT="${D}" install
- dodoc README Changelog
-}
diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
deleted file mode 100644
index 51f94e3..0000000
--- a/net-libs/liblockfile/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch b/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch
deleted file mode 100644
index c94748e..0000000
--- a/net-libs/libnfsidmap/files/0001-add_missing_header_musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cfg.h 2015-01-10 14:25:50.384148769 +0000
-+++ cfg.h 2015-01-10 14:28:23.062148769 +0000
-@@ -33,6 +33,9 @@
- #ifndef _CONF_H_
- #define _CONF_H_
-
-+#if ! defined(__GLIBC__) || ! defined(__UCLIBC__)
-+#include <sys/types.h>
-+#endif
- #include "queue.h"
-
- struct conf_list_node {
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
deleted file mode 100644
index 0d5d367..0000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/169909
-
---- libnfsidmap-0.19/configure.in
-+++ libnfsidmap-0.19/configure.in
-@@ -38,7 +38,7 @@
-
- # Checks for library functions.
- AC_FUNC_MALLOC
--AC_CHECK_FUNCS([strchr strdup])
-+AC_CHECK_FUNCS([strchr strdup getgrouplist])
-
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT(libnfsidmap.pc)
---- libnfsidmap-0.19/nss.c
-+++ libnfsidmap-0.19/nss.c
-@@ -49,6 +49,8 @@
- #include "cfg.h"
- #include <syslog.h>
-
-+#include "getgrouplist.c"
-+
- /*
- * NSS Translation Methods
- *
---- libnfsidmap-0.19/getgrouplist.c
-+++ libnfsidmap-0.19/getgrouplist.c
-@@ -0,0 +1,88 @@
-+/*
-+ * getgrouplist.c
-+ *
-+ * if system does not provide the non-standard getgrouplist, we will emulate
-+ * it via POSIX standard functions
-+ *
-+ * Copyright (c) 1991, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#ifndef HAVE_GETGROUPLIST
-+static
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+ const struct group *grp;
-+ int i, maxgroups, ngroups, ret;
-+
-+ ret = 0;
-+ ngroups = 0;
-+ maxgroups = *grpcnt;
-+ /*
-+ * When installing primary group, duplicate it;
-+ * the first element of groups is the effective gid
-+ * and will be overwritten when a setgid file is executed.
-+ */
-+ groups[ngroups++] = agroup;
-+ if (maxgroups > 1)
-+ groups[ngroups++] = agroup;
-+ /*
-+ * Scan the group file to find additional groups.
-+ */
-+ setgrent();
-+ while ((grp = getgrent()) != NULL) {
-+ for (i = 0; i < ngroups; i++) {
-+ if (grp->gr_gid == groups[i])
-+ goto skip;
-+ }
-+ for (i = 0; grp->gr_mem[i]; i++) {
-+ if (!strcmp(grp->gr_mem[i], uname)) {
-+ if (ngroups >= maxgroups) {
-+ ret = -1;
-+ break;
-+ }
-+ groups[ngroups++] = grp->gr_gid;
-+ break;
-+ }
-+ }
-+skip:
-+ ;
-+ }
-+ endgrent();
-+ *grpcnt = ngroups;
-+ return (ret);
-+}
-+#endif
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
deleted file mode 100644
index 6ef12d4..0000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-for toupper and such
-
---- a/nss.c
-+++ b/nss.c
-@@ -34,6 +34,7 @@
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include <ctype.h>
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
---- a/libnfsidmap.c
-+++ b/libnfsidmap.c
-@@ -37,6 +37,7 @@
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#include <ctype.h>
- #include <sys/types.h>
- #include <errno.h>
- #include <unistd.h>
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.24-r99.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.24-r99.ebuild
deleted file mode 100644
index bddfb34..0000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.24-r99.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild,v 1.8 2014/01/18 04:50:16 vapier Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
- !<net-fs/nfs-utils-1.2.2
- !net-fs/idmapd"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
- epatch "${FILESDIR}"/${PN}-0.21-headers.patch
- epatch "${FILESDIR}"/0001-add_missing_header_musl.patch
- epatch_user
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static) \
- $(use_enable ldap)
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog NEWS README
-
- insinto /etc
- doins idmapd.conf || die
-
- # remove useless files
- rm -f "${D}"/usr/lib*/libnfsidmap/*.{a,la}
- use static-libs || rm -f "${D}"/usr/lib*/*.la
-}
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
deleted file mode 100644
index ca66751..0000000
--- a/net-libs/libnfsidmap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-fs</herd>
-</pkgmetadata>
diff --git a/net-libs/libtirpc/files/0001-Provide-getrpcbynumber-and-getrpcbyname-if-those-are.patch b/net-libs/libtirpc/files/0001-Provide-getrpcbynumber-and-getrpcbyname-if-those-are.patch
deleted file mode 100644
index 3708638..0000000
--- a/net-libs/libtirpc/files/0001-Provide-getrpcbynumber-and-getrpcbyname-if-those-are.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From d3b5ffed6d7d49cc93b2343afcf0e4502a3e54ce Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 24 Apr 2014 09:19:45 +0200
-Subject: [PATCH 1/2] Provide getrpcbynumber and getrpcbyname if those are
- missing
-
-We enable the config.h again and check fi getrpcbynumber and
-getrpcbyname exists on the building patform. If it does not exist, then
-provide those functions.
-
-This is needed for musl libc.
----
- configure.ac | 6 ++++--
- src/getrpcent.c | 10 ++++++++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 10d17ea..0180801 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,14 +24,16 @@ if test "x$enable_ipv6" != xno; then
- fi
-
- AC_PROG_CC
--m4_pattern_allow(AM_CONFIG_HEADERS(config.h))
-+AC_CONFIG_HEADERS([config.h])
- AC_PROG_LIBTOOL
- AC_HEADER_DIRENT
- AC_PREFIX_DEFAULT(/usr)
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
- AC_CHECK_LIB([pthread], [pthread_create])
- AC_CHECK_LIB([nsl], [yp_get_default_domain])
--
-+AC_CHECK_FUNCS([getrpcbyname getrpcbynumber])
-
- AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
- AC_OUTPUT(libtirpc.pc)
-+
-+
-diff --git a/src/getrpcent.c b/src/getrpcent.c
-index 1b54b6d..6da006a 100644
---- a/src/getrpcent.c
-+++ b/src/getrpcent.c
-@@ -50,6 +50,10 @@
- #include <libc_private.h>
- #endif
-
-+#if HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- /*
- * Internet version.
- */
-@@ -89,7 +93,7 @@ _rpcdata()
- return (d);
- }
-
--#ifdef GQ
-+#if !HAVE_GETRPCBYNYMBER
- struct rpcent *
- getrpcbynumber(number)
- int number;
-@@ -135,7 +139,9 @@ no_yp:
- endrpcent();
- return (p);
- }
-+#endif /* !HAVE_GETRPCBYNUMBER */
-
-+#if !HAVE_GETRPCBYNAME
- struct rpcent *
- getrpcbyname(name)
- const char *name;
-@@ -158,7 +164,7 @@ done:
- endrpcent();
- return (rpc);
- }
--#endif /* GQ */
-+#endif /* !HAVE_GETRPCBYNAME */
-
- void
- setrpcent(f)
---
-1.9.2
-
diff --git a/net-libs/libtirpc/files/0002-Misc-header-fixes.patch b/net-libs/libtirpc/files/0002-Misc-header-fixes.patch
deleted file mode 100644
index 9287d03..0000000
--- a/net-libs/libtirpc/files/0002-Misc-header-fixes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ed6dc31ed1092baf42f99278ef9c5c297805c3d0 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 24 Apr 2014 08:58:20 +0200
-Subject: [PATCH 2/2] Misc header fixes
-
-src/bindresvport.c: IPPORT_RESERVED needs netdb.h
-
-Misc fixes for building on musl libc
----
- src/bindresvport.c | 1 +
- tirpc/netconfig.h | 1 +
- tirpc/rpc/rpcent.h | 2 +-
- tirpc/rpc/types.h | 1 +
- 4 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/bindresvport.c b/src/bindresvport.c
-index d6d9c14..5a7a1a9 100644
---- a/src/bindresvport.c
-+++ b/src/bindresvport.c
-@@ -37,6 +37,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
-
-+#include <netdb.h>
- #include <netinet/in.h>
-
- #include <errno.h>
-diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
-index c865e51..a36cf91 100644
---- a/tirpc/rpc/rpcent.h
-+++ b/tirpc/rpc/rpcent.h
-@@ -47,7 +47,7 @@
- __BEGIN_DECLS
-
- /* These are defined in /usr/include/rpc/netdb.h */
--#if 0
-+#if !defined(__GLIBC__)
- struct rpcent {
- char *r_name; /* name of server for this rpc program */
- char **r_aliases; /* alias list */
diff --git a/net-libs/libtirpc/files/0003-fix_cdefs_h_include.patch b/net-libs/libtirpc/files/0003-fix_cdefs_h_include.patch
deleted file mode 100644
index 4f09b70..0000000
--- a/net-libs/libtirpc/files/0003-fix_cdefs_h_include.patch
+++ /dev/null
@@ -1,618 +0,0 @@
---- ./tirpc/rpc/xdr.h.orig 2014-11-28 09:09:44.902289976 +0000
-+++ ./tirpc/rpc/xdr.h 2014-11-28 09:09:44.903289976 +0000
-@@ -40,7 +40,9 @@
-
- #ifndef _TIRPC_XDR_H
- #define _TIRPC_XDR_H
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <stdio.h>
- #include <netinet/in.h>
-
---- ./tirpc/rpc/pmap_prot.h.orig 2014-11-28 09:09:44.901289976 +0000
-+++ ./tirpc/rpc/pmap_prot.h 2014-11-28 09:09:44.902289976 +0000
-@@ -71,7 +71,9 @@
-
- #ifndef _RPC_PMAP_PROT_H
- #define _RPC_PMAP_PROT_H
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #define PMAPPORT ((u_short)111)
- #define PMAPPROG ((u_long)100000)
---- ./tirpc/rpc/auth.h.orig 2014-11-28 09:09:44.896289976 +0000
-+++ ./tirpc/rpc/auth.h 2014-11-28 09:09:44.897289976 +0000
-@@ -48,7 +48,9 @@
-
- #include <rpc/xdr.h>
- #include <rpc/clnt_stat.h>
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/types.h>
-
---- ./tirpc/rpc/svc.h.orig 2014-11-28 09:09:44.904289976 +0000
-+++ ./tirpc/rpc/svc.h 2014-11-28 09:09:44.905289976 +0000
-@@ -40,7 +40,9 @@
-
- #ifndef _TIRPC_SVC_H
- #define _TIRPC_SVC_H
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * This interface must manage two items concerning remote procedure calling:
---- ./tirpc/rpc/svc_soc.h.orig 2014-11-28 09:09:44.906289976 +0000
-+++ ./tirpc/rpc/svc_soc.h 2014-11-28 09:09:44.907289976 +0000
-@@ -38,7 +38,9 @@
-
- #ifndef _RPC_SVC_SOC_H
- #define _RPC_SVC_SOC_H
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /* #pragma ident "@(#)svc_soc.h 1.11 94/04/25 SMI" */
- /* svc_soc.h 1.8 89/05/01 SMI */
---- ./tirpc/rpc/clnt_soc.h.orig 2014-11-28 09:09:44.893289976 +0000
-+++ ./tirpc/rpc/clnt_soc.h 2014-11-28 09:09:44.894289976 +0000
-@@ -46,7 +46,9 @@
- * with TS-RPC.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #define UDPMSGSIZE 8800 /* rpc imposed limit on udp msg size */
-
---- ./tirpc/rpc/rpc_com.h.orig 2014-11-28 09:09:44.894289976 +0000
-+++ ./tirpc/rpc/rpc_com.h 2014-11-28 09:09:44.894289976 +0000
-@@ -41,7 +41,9 @@
- #ifndef _RPC_RPCCOM_H
- #define _RPC_RPCCOM_H
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */
-
---- ./tirpc/rpc/auth_unix.h.orig 2014-11-28 09:09:44.905289976 +0000
-+++ ./tirpc/rpc/auth_unix.h 2014-11-28 09:09:44.906289976 +0000
-@@ -45,7 +45,9 @@
-
- #ifndef _TIRPC_AUTH_UNIX_H
- #define _TIRPC_AUTH_UNIX_H
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /* The machine name is part of a credential; it may not exceed 255 bytes */
- #define MAX_MACHINE_NAME 255
---- ./tirpc/rpc/pmap_rmt.h.orig 2014-11-28 09:09:44.899289976 +0000
-+++ ./tirpc/rpc/pmap_rmt.h 2014-11-28 09:09:44.900289976 +0000
-@@ -41,7 +41,9 @@
-
- #ifndef _RPC_PMAP_RMT_H
- #define _RPC_PMAP_RMT_H
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- struct rmtcallargs {
- u_long prog, vers, proc, arglen;
---- ./tirpc/rpc/des_crypt.h.orig 2014-11-28 09:09:44.900289976 +0000
-+++ ./tirpc/rpc/des_crypt.h 2014-11-28 09:09:44.901289976 +0000
-@@ -43,7 +43,9 @@
- #ifndef _DES_DES_CRYPT_H
- #define _DES_DES_CRYPT_H
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <rpc/rpc.h>
-
- #define DES_MAXDATA 8192 /* max bytes encrypted in one call */
---- ./tirpc/rpc/clnt.h.orig 2014-11-28 09:09:44.897289976 +0000
-+++ ./tirpc/rpc/clnt.h 2014-11-28 09:09:44.899289976 +0000
-@@ -42,7 +42,9 @@
- #include <rpc/clnt_stat.h>
- #include <rpc/auth.h>
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <netconfig.h>
- #include <sys/un.h>
-
---- ./tirpc/rpc/pmap_clnt.h.orig 2014-11-28 09:09:44.895289976 +0000
-+++ ./tirpc/rpc/pmap_clnt.h 2014-11-28 09:09:44.895289976 +0000
-@@ -63,7 +63,9 @@
-
- #ifndef _RPC_PMAP_CLNT_H_
- #define _RPC_PMAP_CLNT_H_
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- __BEGIN_DECLS
- extern bool_t pmap_set(u_long, u_long, int, int);
---- ./tirpc/rpcsvc/crypt.x.orig 2014-11-28 09:09:44.907289976 +0000
-+++ ./tirpc/rpcsvc/crypt.x 2014-11-28 09:09:44.908289976 +0000
-@@ -31,7 +31,9 @@
- */
-
- #ifndef RPC_HDR
--%#include <sys/cdefs.h>
-+%#ifdef __GLIBC__
-+%#include <sys/cdefs.h>
-+%#endif
- %__FBSDID("$FreeBSD: src/include/rpcsvc/crypt.x,v 1.5 2003/05/04 02:51:42 obrien Exp $");
- #endif
-
---- ./src/auth_none.c.orig 2014-11-28 09:09:44.875289976 +0000
-+++ ./src/auth_none.c 2014-11-28 09:09:44.876289976 +0000
-@@ -31,7 +31,9 @@
- static char *sccsid = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
- static char *sccsid = "@(#)auth_none.c 2.1 88/07/29 4.0 RPCSRC";
- #endif
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- __FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.12 2002/03/22 23:18:35 obrien Exp $");
- */
-
---- ./src/crypt_client.c.orig 2014-11-28 09:09:44.886289976 +0000
-+++ ./src/crypt_client.c 2014-11-28 09:09:44.886289976 +0000
-@@ -30,7 +30,9 @@
- * SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #include <err.h>
- #include <sys/types.h>
---- ./src/xdr_reference.c.orig 2014-11-28 09:09:44.858289976 +0000
-+++ ./src/xdr_reference.c 2014-11-28 09:09:44.859289976 +0000
-@@ -26,8 +26,12 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr_reference.c, Generic XDR routines impelmentation.
---- ./src/auth_unix.c.orig 2014-11-28 09:09:44.863289976 +0000
-+++ ./src/auth_unix.c 2014-11-28 09:09:44.864289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * auth_unix.c, Implements UNIX style authentication parameters.
---- ./src/authdes_prot.c.orig 2014-11-28 09:09:44.868289976 +0000
-+++ ./src/authdes_prot.c 2014-11-28 09:09:44.869289976 +0000
-@@ -1,4 +1,6 @@
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- /*
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
---- ./src/rpcb_st_xdr.c.orig 2014-11-28 09:09:44.847289976 +0000
-+++ ./src/rpcb_st_xdr.c 2014-11-28 09:09:44.848289976 +0000
-@@ -35,7 +35,9 @@
- * routines used with the rpcbind stats facility.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #include <rpc/rpc.h>
-
---- ./src/auth_time.c.orig 2014-11-28 09:09:44.887289976 +0000
-+++ ./src/auth_time.c 2014-11-28 09:09:44.888289976 +0000
-@@ -25,7 +25,9 @@
- * needed to deal with TCP connections.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
---- ./src/des_crypt.c.orig 2014-11-28 09:09:44.871289976 +0000
-+++ ./src/des_crypt.c 2014-11-28 09:09:44.872289976 +0000
-@@ -39,7 +39,9 @@
- static char sccsid[] = "@(#)des_crypt.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
- #endif
- #endif
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
- int (*__des_crypt_LOCAL)() = 0;
---- ./src/svc_vc.c.orig 2014-11-28 09:09:44.878289976 +0000
-+++ ./src/svc_vc.c 2014-11-28 09:09:44.879289976 +0000
-@@ -27,7 +27,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * svc_vc.c, Server side for Connection Oriented based RPC.
---- ./src/xdr_float.c.orig 2014-11-28 09:09:44.882289976 +0000
-+++ ./src/xdr_float.c 2014-11-28 09:09:44.883289976 +0000
-@@ -27,7 +27,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr_float.c, Generic XDR routines implementation.
---- ./src/xdr_sizeof.c.orig 2014-11-28 09:09:44.865289976 +0000
-+++ ./src/xdr_sizeof.c 2014-11-28 09:09:44.866289976 +0000
-@@ -34,7 +34,9 @@
- * when serialized using XDR.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #include <rpc/types.h>
- #include <rpc/xdr.h>
---- ./src/xdr_array.c.orig 2014-11-28 09:09:44.892289976 +0000
-+++ ./src/xdr_array.c 2014-11-28 09:09:44.893289976 +0000
-@@ -27,7 +27,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr_array.c, Generic XDR routines impelmentation.
---- ./src/rpc_generic.c.orig 2014-11-28 09:09:44.842289976 +0000
-+++ ./src/rpc_generic.c 2014-11-28 09:09:44.844289976 +0000
-@@ -29,7 +29,9 @@
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * rpc_generic.c, Miscl routines for RPC.
---- ./src/getpeereid.c.orig 2014-11-28 09:09:44.855289976 +0000
-+++ ./src/getpeereid.c 2014-11-28 09:09:44.856289976 +0000
-@@ -24,7 +24,9 @@
- * SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #include <sys/param.h>
- #include <sys/socket.h>
---- ./src/xdr_stdio.c.orig 2014-11-28 09:09:44.880289976 +0000
-+++ ./src/xdr_stdio.c 2014-11-28 09:09:44.881289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr_stdio.c, XDR implementation on standard i/o file.
---- ./src/clnt_bcast.c.orig 2014-11-28 09:09:44.859289976 +0000
-+++ ./src/clnt_bcast.c 2014-11-28 09:09:44.861289976 +0000
-@@ -28,7 +28,9 @@
- /*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * clnt_bcast.c
---- ./src/xdr_mem.c.orig 2014-11-28 09:09:44.876289976 +0000
-+++ ./src/xdr_mem.c 2014-11-28 09:09:44.877289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr_mem.h, XDR implementation using memory buffers.
---- ./src/key_call.c.orig 2014-11-28 09:09:44.889289976 +0000
-+++ ./src/key_call.c 2014-11-28 09:09:44.890289976 +0000
-@@ -30,7 +30,9 @@
- */
-
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * key_call.c, Interface to keyserver
---- ./src/svc_simple.c.orig 2014-11-28 09:09:44.874289976 +0000
-+++ ./src/svc_simple.c 2014-11-28 09:09:44.875289976 +0000
-@@ -29,7 +29,9 @@
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * svc_simple.c
---- ./src/mt_misc.c.orig 2014-11-28 09:09:44.870289976 +0000
-+++ ./src/mt_misc.c 2014-11-28 09:09:44.871289976 +0000
-@@ -1,5 +1,7 @@
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <pthread.h>
- #include <reentrant.h>
- #include <rpc/rpc.h>
---- ./src/authunix_prot.c.orig 2014-11-28 09:09:44.885289976 +0000
-+++ ./src/authunix_prot.c 2014-11-28 09:09:44.885289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * authunix_prot.c
---- ./src/des_soft.c.orig 2014-11-28 09:09:44.851289976 +0000
-+++ ./src/des_soft.c 2014-11-28 09:09:44.851289976 +0000
-@@ -1,4 +1,6 @@
--//#include <sys/cdefs.h>
-+//#ifdef __GLIBC__
-+#include <sys/cdefs.h>
-+#endif
-
- /*
- * Copyright (c) 2009, Sun Microsystems, Inc.
---- ./src/rpcdname.c.orig 2014-11-28 09:09:44.850289976 +0000
-+++ ./src/rpcdname.c 2014-11-28 09:09:44.850289976 +0000
-@@ -25,7 +25,9 @@
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * rpcdname.c
---- ./src/getnetpath.c.orig 2014-11-28 09:09:44.884289976 +0000
-+++ ./src/getnetpath.c 2014-11-28 09:09:44.884289976 +0000
-@@ -25,13 +25,17 @@
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <stdio.h>
- #include <errno.h>
- #include <netconfig.h>
---- ./src/svc_dg.c.orig 2014-11-28 09:09:44.852289976 +0000
-+++ ./src/svc_dg.c 2014-11-28 09:09:44.853289976 +0000
-@@ -31,7 +31,9 @@
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * svc_dg.c, Server side for connectionless RPC.
---- ./src/rpc_com.h.orig 2014-11-28 09:09:44.845289976 +0000
-+++ ./src/rpc_com.h 2014-11-28 09:09:44.846289976 +0000
-@@ -40,7 +40,9 @@
- #ifndef _TIRPC_RPCCOM_H
- #define _TIRPC_RPCCOM_H
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /* #pragma ident "@(#)rpc_com.h 1.11 93/07/05 SMI" */
-
---- ./src/pmap_getmaps.c.orig 2014-11-28 09:09:44.891289976 +0000
-+++ ./src/pmap_getmaps.c 2014-11-28 09:09:44.892289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * pmap_getmap.c
---- ./src/pmap_clnt.c.orig 2014-11-28 09:09:44.869289976 +0000
-+++ ./src/pmap_clnt.c 2014-11-28 09:09:44.870289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * pmap_clnt.c
---- ./src/bindresvport.c.orig 2014-11-28 09:09:44.848289976 +0000
-+++ ./src/bindresvport.c 2014-11-28 09:09:44.849289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * Copyright (c) 1987 by Sun Microsystems, Inc.
---- ./src/xdr_rec.c.orig 2014-11-28 09:09:44.866289976 +0000
-+++ ./src/xdr_rec.c 2014-11-28 09:09:44.868289976 +0000
-@@ -27,8 +27,12 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
---- ./src/clnt_perror.c.orig 2014-11-28 09:09:44.854289976 +0000
-+++ ./src/clnt_perror.c 2014-11-28 09:09:44.855289976 +0000
-@@ -27,7 +27,9 @@
- */
-
- /*
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- */
- /*
- * clnt_perror.c
---- ./src/key_prot_xdr.c.orig 2014-11-28 09:09:44.888289976 +0000
-+++ ./src/key_prot_xdr.c 2014-11-28 09:09:44.889289976 +0000
-@@ -33,7 +33,9 @@
- */
- /* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * Compiled from key_prot.x using rpcgen.
---- ./src/getnetconfig.c.orig 2014-11-28 09:09:44.856289976 +0000
-+++ ./src/getnetconfig.c 2014-11-28 09:09:44.858289976 +0000
-@@ -32,7 +32,9 @@
-
- #include <pthread.h>
- #include <reentrant.h>
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <stdio.h>
- #include <errno.h>
- #include <netconfig.h>
---- ./src/getpublickey.c.orig 2014-11-28 09:09:44.844289976 +0000
-+++ ./src/getpublickey.c 2014-11-28 09:09:44.845289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
- /*
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- */
-
- /*
---- ./src/clnt_simple.c.orig 2014-11-28 09:09:44.881289976 +0000
-+++ ./src/clnt_simple.c 2014-11-28 09:09:44.882289976 +0000
-@@ -29,7 +29,9 @@
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * clnt_simple.c
---- ./src/auth_des.c.orig 2014-11-28 09:09:44.872289976 +0000
-+++ ./src/auth_des.c 2014-11-28 09:09:44.874289976 +0000
-@@ -38,7 +38,9 @@
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
- #include <rpc/des_crypt.h>
- #include <syslog.h>
- #include <rpc/types.h>
-@@ -52,7 +54,9 @@
-
- #if defined(LIBC_SCCS) && !defined(lint)
- #endif
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- #include "debug.h"
-
---- ./src/xdr.c.orig 2014-11-28 09:09:44.861289976 +0000
-+++ ./src/xdr.c 2014-11-28 09:09:44.863289976 +0000
-@@ -26,7 +26,9 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __GLIBC__
- #include <sys/cdefs.h>
-+#endif
-
- /*
- * xdr.c, Generic XDR routines implementation.
diff --git a/net-libs/libtirpc/files/0004-fix_DECLS.patch b/net-libs/libtirpc/files/0004-fix_DECLS.patch
deleted file mode 100644
index 86abf77..0000000
--- a/net-libs/libtirpc/files/0004-fix_DECLS.patch
+++ /dev/null
@@ -1,1226 +0,0 @@
---- ./tirpc/rpc/xdr.h.orig 2014-11-28 09:16:53.990289976 +0000
-+++ ./tirpc/rpc/xdr.h 2014-11-28 09:16:53.991289976 +0000
-@@ -289,7 +289,11 @@ struct xdr_discrim {
- /*
- * These are the "generic" xdr routines.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_void(void);
- extern bool_t xdr_int(XDR *, int *);
- extern bool_t xdr_u_int(XDR *, u_int *);
-@@ -332,7 +336,11 @@ extern bool_t xdr_hyper(XDR *, quad_t *)
- extern bool_t xdr_u_hyper(XDR *, u_quad_t *);
- extern bool_t xdr_longlong_t(XDR *, quad_t *);
- extern bool_t xdr_u_longlong_t(XDR *, u_quad_t *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Common opaque bytes objects used by many rpc protocols;
-@@ -350,7 +358,11 @@ extern bool_t xdr_netobj(XDR *, struct
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- /* XDR using memory buffers */
- extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op);
-
-@@ -371,6 +383,10 @@ extern bool_t xdrrec_skiprecord(XDR *);
- /* true if no more input */
- extern bool_t xdrrec_eof(XDR *);
- extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_TIRPC_XDR_H */
---- ./tirpc/rpc/auth_des.h.orig 2014-11-28 09:16:53.994289976 +0000
-+++ ./tirpc/rpc/auth_des.h 2014-11-28 09:16:53.995289976 +0000
-@@ -114,17 +114,33 @@ struct authdes_verf {
- * Map a des credential into a unix cred.
- *
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_authdes_cred(XDR *, struct authdes_cred *);
- extern bool_t xdr_authdes_verf(XDR *, struct authdes_verf *);
- extern int rtime(dev_t, struct netbuf *, int, struct timeval *,
- struct timeval *);
- extern void kgetnetname(char *);
- extern enum auth_stat _svcauth_des(struct svc_req *, struct rpc_msg *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* ndef _TI_AUTH_DES_ */
---- ./tirpc/rpc/pmap_prot.h.orig 2014-11-28 09:16:53.988289976 +0000
-+++ ./tirpc/rpc/pmap_prot.h 2014-11-28 09:16:53.989289976 +0000
-@@ -99,10 +99,18 @@ struct pmaplist {
- struct pmaplist *pml_next;
- };
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_pmap(XDR *, struct pmap *);
- extern bool_t xdr_pmaplist(XDR *, struct pmaplist **);
- extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_PMAP_PROT_H */
---- ./tirpc/rpc/auth.h.orig 2014-11-28 09:16:53.982289976 +0000
-+++ ./tirpc/rpc/auth.h 2014-11-28 09:16:53.983289976 +0000
-@@ -166,9 +166,17 @@ union des_block {
- char c[8];
- };
- typedef union des_block des_block;
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_des_block(XDR *, des_block *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Authentication info. Opaque to client.
-@@ -279,9 +287,17 @@ auth_put(AUTH *auth)
- xfunc, xwhere))
-
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern struct opaque_auth _null_auth;
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Any style authentication. These routines can be used by any
-@@ -302,11 +318,19 @@ int authany_wrap(void), authany_unwrap(v
- * int len;
- * int *aup_gids;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);
- extern AUTH *authunix_create_default(void); /* takes no parameters */
- extern AUTH *authnone_create(void); /* takes no parameters */
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
- /*
- * DES style authentication
- * AUTH *authsecdes_create(servername, window, timehost, ckey)
-@@ -315,15 +339,31 @@ __END_DECLS
- * const char *timehost; - optional hostname to sync with
- * des_block *ckey; - optional conversation key to use
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);
- extern AUTH *authdes_seccreate (const char *, const u_int, const char *,
- const des_block *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
- #define authsys_create_default() authunix_create_default()
-@@ -331,36 +371,60 @@ __END_DECLS
- /*
- * Netname manipulation routines.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern int getnetname(char *);
- extern int host2netname(char *, const char *, const char *);
- extern int user2netname(char *, const uid_t, const char *);
- extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *);
- extern int netname2host(char *, char *, const int);
- extern void passwd2des ( char *, char * );
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- *
- * These routines interface to the keyserv daemon
- *
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern int key_decryptsession(const char *, des_block *);
- extern int key_encryptsession(const char *, des_block *);
- extern int key_gendes(des_block *);
- extern int key_setsecret(const char *);
- extern int key_secretkey_is_set(void);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Publickey routines.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern int getpublickey (const char *, char *);
- extern int getpublicandprivatekey (char *, char *);
- extern int getsecretkey (char *, char *, char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #ifdef KERBEROS
- /*
-@@ -373,10 +437,18 @@ __END_DECLS
- * const char *timehost; - optional hostname to sync with
- * int *status; - kerberos status returned
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern AUTH *authkerb_seccreate(const char *, const char *, const char *,
- const u_int, const char *, int *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Map a kerberos credential into a unix cred.
-@@ -389,20 +461,36 @@ __END_DECLS
- * int *groups;
- *
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern int authkerb_getucred(/* struct svc_req *, uid_t *, gid_t *,
- short *, int * */);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
- #endif /* KERBEROS */
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- struct svc_req;
- struct rpc_msg;
- enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
- enum auth_stat _svcauth_gss (struct svc_req *, struct rpc_msg *, bool_t *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #define AUTH_NONE 0 /* no authentication */
- #define AUTH_NULL 0 /* backward compatibility */
---- ./tirpc/rpc/svc.h.orig 2014-11-28 09:16:53.992289976 +0000
-+++ ./tirpc/rpc/svc.h 2014-11-28 09:16:53.993289976 +0000
-@@ -202,11 +202,19 @@ struct svc_req {
- * const struct netconfig *nconf;
- */
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
- void (*)(struct svc_req *, SVCXPRT *),
- const struct netconfig *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Service un-registration
-@@ -216,9 +224,17 @@ __END_DECLS
- * const rpcvers_t vers;
- */
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void svc_unreg(const rpcprog_t, const rpcvers_t);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Transport registration.
-@@ -226,9 +242,17 @@ __END_DECLS
- * xprt_register(xprt)
- * SVCXPRT *xprt;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void xprt_register(SVCXPRT *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Transport un-register
-@@ -236,9 +260,17 @@ __END_DECLS
- * xprt_unregister(xprt)
- * SVCXPRT *xprt;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void xprt_unregister(SVCXPRT *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
-@@ -267,7 +299,11 @@ __END_DECLS
- * deadlock the caller and server processes!
- */
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, void *);
- extern void svcerr_decode(SVCXPRT *);
- extern void svcerr_weakauth(SVCXPRT *);
-@@ -279,7 +315,11 @@ extern void svcerr_systemerr(SVCXPRT *);
- extern int rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
- char *(*)(char *), xdrproc_t, xdrproc_t,
- char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Lowest level dispatching -OR- who owns this process anyway.
-@@ -308,11 +348,23 @@ extern int svc_fds;
- * a small program implemented by the svc_rpc implementation itself;
- * also see clnt.h for protocol numbers.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void rpctest_service(void);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void svc_getreq(int);
- extern void svc_getreqset(fd_set *);
- extern void svc_getreq_common(int);
-@@ -321,7 +373,11 @@ extern void svc_getreq_poll(struct pollf
-
- extern void svc_run(void);
- extern void svc_exit(void);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Socket to use on svcxxx_create call to get default socket
-@@ -333,7 +389,11 @@ __END_DECLS
- * These are the existing service side transport implementations
- */
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- /*
- * Transport independent svc_create routine.
- */
-@@ -429,7 +489,11 @@ int svc_dg_enablecache(SVCXPRT *, const
-
- int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid);
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /* for backward compatibility */
---- ./tirpc/rpc/rpc.h.orig 2014-11-28 09:16:53.994289976 +0000
-+++ ./tirpc/rpc/rpc.h 2014-11-28 09:16:53.994289976 +0000
-@@ -79,7 +79,11 @@
- #define UDPMSGSIZE 8800
- #endif
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern int get_myaddress(struct sockaddr_in *);
- extern int bindresvport(int, struct sockaddr_in *) __THROW;
- extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
-@@ -93,18 +97,30 @@ struct netbuf *uaddr2taddr(const struct
-
- struct sockaddr;
- extern int bindresvport_sa(int, struct sockaddr *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * The following are not exported interfaces, they are for internal library
- * and rpcbind use only. Do not use, they may change without notice.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- int __rpc_nconf2fd(const struct netconfig *);
- int __rpc_nconf2fd_flags(const struct netconfig *, int);
- int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
- int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
- u_int __rpc_get_t_size(int, int, int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_RPC_H */
---- ./tirpc/rpc/svc_soc.h.orig 2014-11-28 09:16:53.998289976 +0000
-+++ ./tirpc/rpc/svc_soc.h 2014-11-28 09:16:53.999289976 +0000
-@@ -66,10 +66,18 @@
- * void (*dispatch)();
- * int protocol; like TCP or UDP, zero means do not register
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t svc_register(SVCXPRT *, u_long, u_long,
- void (*)(struct svc_req *, SVCXPRT *), int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Service un-registration
-@@ -78,44 +86,84 @@ __END_DECLS
- * u_long prog;
- * u_long vers;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void svc_unregister(u_long, u_long);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
- * Memory based rpc for testing and timing.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern SVCXPRT *svcraw_create(void);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
- * Udp based rpc.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern SVCXPRT *svcudp_create(int);
- extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
- extern int svcudp_enablecache(SVCXPRT *, u_long);
- extern SVCXPRT *svcudp6_create(int);
- extern SVCXPRT *svcudp6_bufcreate(int, u_int, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
- * Tcp based rpc.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern SVCXPRT *svctcp_create(int, u_int, u_int);
- extern SVCXPRT *svctcp6_create(int, u_int, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Fd based rpc.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern SVCXPRT *svcfd_create(int, u_int, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_SVC_SOC_H */
---- ./tirpc/rpc/clnt_soc.h.orig 2014-11-28 09:16:53.976289976 +0000
-+++ ./tirpc/rpc/clnt_soc.h 2014-11-28 09:16:53.977289976 +0000
-@@ -63,27 +63,51 @@
- * u_int sendsz;
- * u_int recvsz;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
- u_int, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Raw (memory) rpc.
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern CLIENT *clntraw_create(u_long, u_long);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
- IPv6 socket version
- */
- #ifdef INET6
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern CLIENT *clnttcp6_create(struct sockaddr_in6 *, u_long, u_long, int *,
- u_int, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
- #endif
-
- /*
-@@ -107,7 +131,11 @@ __END_DECLS
- * u_int sendsz;
- * u_int recvsz;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long,
- struct timeval, int *);
- extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
-@@ -118,7 +146,11 @@ extern CLIENT *clntudp6_create(struct so
- extern CLIENT *clntudp6_bufcreate(struct sockaddr_in6 *, u_long, u_long,
- struct timeval, int *, u_int, u_int);
- #endif
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- #endif /* _RPC_CLNT_SOC_H */
---- ./tirpc/rpc/rpc_com.h.orig 2014-11-28 09:16:53.977289976 +0000
-+++ ./tirpc/rpc/rpc_com.h 2014-11-28 09:16:53.978289976 +0000
-@@ -57,7 +57,11 @@
- #define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \
- (u_int32_t)(now)->tv_usec)
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern u_int __rpc_get_a_size(int);
- extern int __rpc_dtbsize(void);
- extern int _rpc_dtablesize(void);
-@@ -79,6 +83,10 @@ bool_t rpc_control(int,void *);
-
- char *_get_next_token(char *, int);
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* _RPC_RPCCOM_H */
---- ./tirpc/rpc/auth_unix.h.orig 2014-11-28 09:16:53.998289976 +0000
-+++ ./tirpc/rpc/auth_unix.h 2014-11-28 09:16:53.998289976 +0000
-@@ -69,9 +69,17 @@ struct authunix_parms {
-
- #define authsys_parms authunix_parms
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * If a response verifier has flavor AUTH_SHORT,
---- ./tirpc/rpc/pmap_rmt.h.orig 2014-11-28 09:16:53.986289976 +0000
-+++ ./tirpc/rpc/pmap_rmt.h 2014-11-28 09:16:53.986289976 +0000
-@@ -58,9 +58,17 @@ struct rmtcallres {
- xdrproc_t xdr_results;
- };
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *);
- extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_PMAP_RMT_H */
---- ./tirpc/rpc/des_crypt.h.orig 2014-11-28 09:16:53.987289976 +0000
-+++ ./tirpc/rpc/des_crypt.h 2014-11-28 09:16:53.988289976 +0000
-@@ -85,23 +85,47 @@
- /*
- * Cipher Block Chaining mode
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- int cbc_crypt( char *, char *, unsigned int, unsigned int, char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Electronic Code Book mode
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- int ecb_crypt( char *, char *, unsigned int, unsigned int );
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Set des parity for a key.
- * DES parity is odd and in the low bit of each byte
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- void des_setparity( char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* _DES_DES_CRYPT_H */
---- ./tirpc/rpc/rpcb_clnt.h.orig 2014-11-28 09:16:53.979289976 +0000
-+++ ./tirpc/rpc/rpcb_clnt.h 2014-11-28 09:16:53.979289976 +0000
-@@ -59,7 +59,11 @@
-
- #include <rpc/types.h>
- #include <rpc/rpcb_prot.h>
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,
- const struct netconfig *, const struct netbuf *);
- extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,
-@@ -78,6 +82,10 @@ extern bool_t rpcb_getaddr(const rpcprog
- extern bool_t rpcb_gettime(const char *, time_t *);
- extern char *rpcb_taddr2uaddr(struct netconfig *, struct netbuf *);
- extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_RPCB_CLNT_H */
---- ./tirpc/rpc/clnt.h.orig 2014-11-28 09:16:53.984289976 +0000
-+++ ./tirpc/rpc/clnt.h 2014-11-28 09:16:53.985289976 +0000
-@@ -269,7 +269,11 @@ struct rpc_timers {
- * Generic client creation routine. Supported protocols are those that
- * belong to the nettype namespace (/etc/netconfig).
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t,
- const char *);
- /*
-@@ -416,32 +420,60 @@ extern CLIENT *clnt_dg_create(const int,
- */
- extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
- * Print why creation failed
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void clnt_pcreateerror(const char *); /* stderr */
- extern char *clnt_spcreateerror(const char *); /* string */
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Like clnt_perror(), but is more verbose in its output
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void clnt_perrno(enum clnt_stat); /* stderr */
- extern char *clnt_sperrno(enum clnt_stat); /* string */
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * Print an English error message, given the client error code
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void clnt_perror(CLIENT *, const char *); /* stderr */
- extern char *clnt_sperror(CLIENT *, const char *); /* string */
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
-
- /*
-@@ -452,9 +484,17 @@ struct rpc_createerr {
- struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
- };
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern struct rpc_createerr *__rpc_createerr(void);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
- #define get_rpc_createerr() (*(__rpc_createerr()))
- #define rpc_createerr (*(__rpc_createerr()))
-
-@@ -471,12 +511,20 @@ __END_DECLS
- * char *out;
- * const char *nettype;
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
- const rpcvers_t, const rpcproc_t,
- const xdrproc_t, const char *,
- const xdrproc_t, char *, const char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /*
- * RPC broadcast interface
-@@ -524,7 +572,11 @@ __END_DECLS
-
- typedef bool_t (*resultproc_t)(caddr_t, ...);
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
- const rpcproc_t, const xdrproc_t,
- caddr_t, const xdrproc_t, caddr_t,
-@@ -534,7 +586,11 @@ extern enum clnt_stat rpc_broadcast_exp(
- caddr_t, const xdrproc_t, caddr_t,
- const resultproc_t, const int,
- const int, const char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- /* For backward compatibility */
- #include <rpc/clnt_soc.h>
---- ./tirpc/rpc/rpcent.h.orig 2014-11-28 09:16:53.996289976 +0000
-+++ ./tirpc/rpc/rpcent.h 2014-11-28 09:16:53.996289976 +0000
-@@ -44,7 +44,11 @@
- /* #pragma ident "@(#)rpcent.h 1.13 94/04/25 SMI" */
- /* @(#)rpcent.h 1.1 88/12/06 SMI */
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
-
- /* These are defined in /usr/include/rpc/netdb.h */
- #if 0
-@@ -62,6 +66,10 @@ extern struct rpcent *getrpcent(void);
-
- extern void setrpcent(int) __THROW;
- extern void endrpcent(void) __THROW;
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_CENT_H */
---- ./tirpc/rpc/pmap_clnt.h.orig 2014-11-28 09:16:53.980289976 +0000
-+++ ./tirpc/rpc/pmap_clnt.h 2014-11-28 09:16:53.980289976 +0000
-@@ -67,7 +67,11 @@
- #include <sys/cdefs.h>
- #endif
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern bool_t pmap_set(u_long, u_long, int, int);
- extern bool_t pmap_unset(u_long, u_long);
- extern struct pmaplist *pmap_getmaps(struct sockaddr_in *);
-@@ -82,6 +86,10 @@ extern enum clnt_stat clnt_broadcast(u_l
- resultproc_t);
- extern u_short pmap_getport(struct sockaddr_in *,
- u_long, u_long, u_int);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_PMAP_CLNT_H_ */
---- ./tirpc/rpc/auth_gss.h.orig 2014-11-28 09:16:53.989289976 +0000
-+++ ./tirpc/rpc/auth_gss.h 2014-11-28 09:16:53.990289976 +0000
-@@ -104,7 +104,11 @@ struct rpc_gss_init_res {
- #define MAXSEQ 0x80000000
-
- /* Prototypes. */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- bool_t xdr_rpc_gss_cred __P((XDR *xdrs, struct rpc_gss_cred *p));
- bool_t xdr_rpc_gss_init_args __P((XDR *xdrs, gss_buffer_desc *p));
- bool_t xdr_rpc_gss_init_res __P((XDR *xdrs, struct rpc_gss_init_res *p));
-@@ -126,6 +130,10 @@ void gss_log_status __P((char *m, OM_ui
- OM_uint32 minor));
- void gss_log_hexdump __P((const u_char *buf, int len, int offset));
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_TIRPC_AUTH_GSS_H */
---- ./tirpc/rpc/rpc_msg.h.orig 2014-11-28 09:16:53.996289976 +0000
-+++ ./tirpc/rpc/rpc_msg.h 2014-11-28 09:16:53.997289976 +0000
-@@ -161,7 +161,11 @@ struct rpc_msg {
- #define acpted_rply ru.RM_rmb.ru.RP_ar
- #define rjcted_rply ru.RM_rmb.ru.RP_dr
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- /*
- * XDR routine to handle a rpc message.
- * xdr_callmsg(xdrs, cmsg)
-@@ -210,6 +214,10 @@ extern bool_t xdr_rejected_reply(XDR *,
- * struct rpc_err *error;
- */
- extern void _seterr_reply(struct rpc_msg *, struct rpc_err *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_TIRPC_RPC_MSG_H */
---- ./tirpc/rpc/nettype.h.orig 2014-11-28 09:16:53.981289976 +0000
-+++ ./tirpc/rpc/nettype.h 2014-11-28 09:16:53.982289976 +0000
-@@ -53,11 +53,19 @@
- #define _RPC_TCP 7
- #define _RPC_UDP 8
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern void *__rpc_setconf(const char *);
- extern void __rpc_endconf(void *);
- extern struct netconfig *__rpc_getconf(void *);
- extern struct netconfig *__rpc_getconfip(const char *);
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_TIRPC_NETTYPE_H */
---- ./tirpc/rpc/svc_auth.h.orig 2014-11-28 09:16:53.986289976 +0000
-+++ ./tirpc/rpc/svc_auth.h 2014-11-28 09:16:53.987289976 +0000
-@@ -65,13 +65,21 @@ typedef struct SVCAUTH {
- /*
- * Server side authenticator
- */
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern enum auth_stat _gss_authenticate(struct svc_req *, struct rpc_msg *,
- bool_t *);
- extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *);
- extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *,
- struct rpc_msg *));
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* !_RPC_SVC_AUTH_H */
---- ./tirpc/rpcsvc/nis.h.orig 2014-11-28 09:16:54.001289976 +0000
-+++ ./tirpc/rpcsvc/nis.h 2014-11-28 09:16:54.002289976 +0000
-@@ -36,7 +36,11 @@
- #include <rpc/rpc.h>
- #include <rpcsvc/nis_tags.h>
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
-
- /*
- * nis.h
-@@ -611,6 +615,10 @@ extern nis_error * nis_rmdir_3_svc (nis
- extern nis_error * nis_updkeys_3 (nis_name *, CLIENT *) __THROW;
- extern nis_error * nis_updkeys_3_svc (nis_name *, struct svc_req *) __THROW;
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* ! _RPCSVC_NIS_H */
---- ./tirpc/rpcsvc/nislib.h.orig 2014-11-28 09:16:53.999289976 +0000
-+++ ./tirpc/rpcsvc/nislib.h 2014-11-28 09:16:54.000289976 +0000
-@@ -23,7 +23,11 @@
-
- #include <features.h>
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
-
- typedef const char *const_nis_name;
-
-@@ -283,6 +287,10 @@ extern nis_error __nisfind_server (const
-
- #endif
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* __RPCSVC_NISLIB_H__ */
---- ./tirpc/netconfig.h.orig 2014-11-28 09:16:54.003289976 +0000
-+++ ./tirpc/netconfig.h 2014-11-28 09:16:54.003289976 +0000
-@@ -74,7 +74,11 @@ typedef struct {
- #define NC_UDP "udp"
- #define NC_ICMP "icmp"
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
-
- extern void *setnetconfig (void);
- extern struct netconfig *getnetconfig (void *);
-@@ -89,6 +93,10 @@ extern int endnetpath (void *);
- extern void nc_perror (const char *);
- extern char *nc_sperror (void);
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* _NETCONFIG_H_ */
---- ./src/rpc_com.h.orig 2014-11-28 09:16:53.975289976 +0000
-+++ ./src/rpc_com.h 2014-11-28 09:16:53.975289976 +0000
-@@ -56,7 +56,11 @@
- #define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \
- (u_int32_t)(now)->tv_usec)
-
-+#ifdef __GLIBC__
- __BEGIN_DECLS
-+#elif defined(__cplusplus)
-+extern "C" {
-+#endif
- extern u_int __rpc_get_a_size(int);
- extern int __rpc_dtbsize(void);
- extern struct netconfig * __rpcgettp(int);
-@@ -92,6 +96,10 @@ void __xprt_set_raddr(SVCXPRT *, const s
- SVCXPRT **__svc_xports;
- int __svc_maxrec;
-
-+#ifdef __GLIBC__
- __END_DECLS
-+#elif defined(__cplusplus)
-+}
-+#endif
-
- #endif /* _TIRPC_RPCCOM_H */
diff --git a/net-libs/libtirpc/files/0005-fix_remaining_issues.patch b/net-libs/libtirpc/files/0005-fix_remaining_issues.patch
deleted file mode 100644
index 538e79e..0000000
--- a/net-libs/libtirpc/files/0005-fix_remaining_issues.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./tirpc/rpc/rpcent.h 2014-11-21 21:33:50.421928818 +0000
-+++ ./tirpc/rpc/rpcent.h 2014-11-21 21:35:05.140928818 +0000
-@@ -64,6 +64,10 @@ extern struct rpcent *getrpcbynumber(int
- extern struct rpcent *getrpcent(void);
- #endif
-
-+#ifndef __GLIBC__
-+#define __THROW
-+#endif
-+
- extern void setrpcent(int) __THROW;
- extern void endrpcent(void) __THROW;
- #ifdef __GLIBC__
-
diff --git a/net-libs/libtirpc/files/0006-fix_queue_h_include.patch b/net-libs/libtirpc/files/0006-fix_queue_h_include.patch
deleted file mode 100644
index 9db410c..0000000
--- a/net-libs/libtirpc/files/0006-fix_queue_h_include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/clnt_bcast.c.orig 2014-11-28 09:31:22.462289976 +0000
-+++ src/clnt_bcast.c 2014-11-28 09:34:06.588289976 +0000
-@@ -43,8 +43,41 @@
- */
- #include <sys/socket.h>
- #include <sys/types.h>
-+#ifdef __GLIBC__
- #include <sys/queue.h>
-+#else
-+/*
-+ * * Tail queue definitions.
-+ * */
-+#define _TAILQ_HEAD(name, type, qual) \
-+struct name { \
-+ qual type *tqh_first; /* first element */ \
-+ qual type *qual *tqh_last; /* addr of last next element */ \
-+}
-+#define TAILQ_HEAD(name, type) _TAILQ_HEAD(name, struct type,)
-
-+#define _TAILQ_ENTRY(type, qual) \
-+struct { \
-+ qual type *tqe_next; /* next element */ \
-+ qual type *qual *tqe_prev; /* address of previous next element */\
-+}
-+#define TAILQ_ENTRY(type) _TAILQ_ENTRY(struct type,)
-+/*
-+ * * Tail queue functions.
-+ * */
-+#define TAILQ_INIT(head) do { \
-+ (head)->tqh_first = NULL; \
-+ (head)->tqh_last = &(head)->tqh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_INSERT_TAIL(head, elm, field) do { \
-+ (elm)->field.tqe_next = NULL; \
-+ (elm)->field.tqe_prev = (head)->tqh_last; \
-+ *(head)->tqh_last = (elm); \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#endif
- #include <net/if.h>
- #include <netinet/in.h>
- #include <ifaddrs.h>
diff --git a/net-libs/libtirpc/files/0007-no-des.patch b/net-libs/libtirpc/files/0007-no-des.patch
deleted file mode 100644
index 4347261..0000000
--- a/net-libs/libtirpc/files/0007-no-des.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libtirpc-0.2.5.orig/src/Makefile.am
-+++ libtirpc-0.2.5/src/Makefile.am
-@@ -51,7 +51,7 @@
- rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
- rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \
- svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
-- auth_time.c auth_des.c authdes_prot.c debug.c
-+ auth_time.c debug.c
-
- ## XDR
- libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
---- libtirpc-0.2.5.orig/src/rpc_soc.c
-+++ libtirpc-0.2.5/src/rpc_soc.c
-@@ -520,6 +520,7 @@
- (resultproc_t) rpc_wrap_bcast, "udp");
- }
-
-+#if 0
- /*
- * Create the client des authentication object. Obsoleted by
- * authdes_seccreate().
-@@ -551,6 +552,7 @@
- dummy = authdes_seccreate(servername, window, NULL, ckey);
- return (dummy);
- }
-+#endif
-
- /*
- * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
diff --git a/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch b/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch
deleted file mode 100644
index 8006de3..0000000
--- a/net-libs/libtirpc/files/libtirpc-0.2.5-stdarg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d26607bade0893fe8652e1a0983f9fae59c64649 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 12 Aug 2014 03:11:41 -0400
-Subject: [PATCH libtirpc] include stdarg.h when used
-
-The debug.h header uses va_list but doesn't include stdarg.h which
-can lead to random build failures.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/debug.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/debug.h b/src/debug.h
-index afc8d57..c971ac3 100644
---- a/src/debug.h
-+++ b/src/debug.h
-@@ -21,6 +21,8 @@
-
- #ifndef _DEBUG_H
- #define _DEBUG_H
-+
-+#include <stdarg.h>
- #include <syslog.h>
-
- extern int libtirpc_debug_level;
---
-2.0.0
-
diff --git a/net-libs/libtirpc/libtirpc-0.2.5-r99.ebuild b/net-libs/libtirpc/libtirpc-0.2.5-r99.ebuild
deleted file mode 100644
index 74341b7..0000000
--- a/net-libs/libtirpc/libtirpc-0.2.5-r99.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libtirpc/libtirpc-0.2.5.ebuild,v 1.4 2014/12/30 18:09:41 maekke Exp $
-
-EAPI="4"
-
-inherit multilib-minimal toolchain-funcs autotools
-
-DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
-HOMEPAGE="http://libtirpc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
- mirror://gentoo/${PN}-glibc-nfs.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6 kerberos static-libs"
-
-RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${RDEPEND}
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-src_unpack() {
- unpack ${A}
- cp -r tirpc "${S}"/ || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-stdarg.patch
- epatch "${FILESDIR}"/0001-Provide-getrpcbynumber-and-getrpcbyname-if-those-are.patch
- epatch "${FILESDIR}"/0002-Misc-header-fixes.patch
- epatch "${FILESDIR}"/0003-fix_cdefs_h_include.patch
- epatch "${FILESDIR}"/0004-fix_DECLS.patch
- epatch "${FILESDIR}"/0005-fix_remaining_issues.patch
- epatch "${FILESDIR}"/0006-fix_queue_h_include.patch
- epatch "${FILESDIR}"/0007-no-des.patch
- eautoconf
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable ipv6) \
- $(use_enable kerberos gssapi) \
- $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- default
-
- # libtirpc replaces rpc support in glibc, so we need it in /
- multilib_is_native_abi && gen_usr_ldscript -a tirpc
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- insinto /etc
- doins doc/netconfig
-
- insinto /usr/include/tirpc
- doins -r "${WORKDIR}"/tirpc/*
-
- # makes sure that the linking order for nfs-utils is proper, as
- # libtool would inject a libgssglue dependency in the list.
- use static-libs || prune_libtool_files
-}
diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
deleted file mode 100644
index ca66751..0000000
--- a/net-libs/libtirpc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-fs</herd>
-</pkgmetadata>
diff --git a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper b/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
deleted file mode 100755
index d4f270c..0000000
--- a/net-libs/webkit-gtk/files/gir-paxctl-lt-wrapper
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Wrapper for $(LIBTOOL) that performs PaX marking on the dumper binary
-# generated by g-ir-scanner.
-# PaX marking code stolen from pax-utils.eclass
-
-flags=${1//-}; shift
-
-echo ${LIBTOOL} "$@"
-${LIBTOOL} "$@"
-
-retval=$?
-
-files=$(find . -path "*tmp-introspect*/.libs/*")
-
-if type -p paxctl > /dev/null; then
- echo "PT PaX marking -${flags} ${files}"
- for f in ${files}; do
- # First, try modifying the existing PAX_FLAGS header
- paxctl -q${flags} "${f}" && continue
- # Second, try stealing the (unused under PaX) PT_GNU_STACK header
- paxctl -qc${flags} "${f}" && continue
- # Third, try pulling the base down a page, to create space and
- # insert a PT_GNU_STACK header (works on ET_EXEC)
- paxctl -qC${flags} "${f}" && continue
- done
-elif type -p scanelf > /dev/null; then
- # Try scanelf, the Gentoo swiss-army knife ELF utility
- # Currently this sets PT if it can, no option to control what it does.
- echo "Fallback PaX marking -${flags} ${files}"
- scanelf -Xxz ${flags} ${files}
-fi
-
-exit ${retval}
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
deleted file mode 100644
index 8f56ab2..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.old 2013-03-02 09:22:53.791750644 +0200
-+++ configure.ac 2013-03-02 09:24:56.725213764 +0200
-@@ -24,6 +24,7 @@
- m4_include([Source/autotools/SetupLibtool.m4])
- m4_include([Source/autotools/ReadCommandLineArguments.m4])
- m4_include([Source/autotools/FindDependencies.m4])
-+GTK_DOC_CHECK([1.10])
- m4_include([Source/autotools/SetupCompilerFlags.m4])
- m4_include([Source/autotools/SetupAutoconfHeader.m4])
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
deleted file mode 100644
index 5ad357e..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Original from:
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
-Adapted for 1.6.1
-
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -70,6 +70,8 @@
- #endif
- #include <gtk/gtk.h>
-
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -439,9 +441,9 @@
- event->setDefaultHandled();
- }
-
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
- if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
- return;
-
-@@ -454,10 +456,12 @@
- event.detail = NotifyDetailNone;
-
- dispatchNPEvent(npEvent);
-+#endif
- }
-
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
- if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
- return;
-
-@@ -470,8 +474,8 @@
- event.detail = NotifyDetailNone;
-
- dispatchNPEvent(npEvent);
--}
- #endif
-+}
-
- void PluginView::setParent(ScrollView* parent)
- {
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
- * The GtkXtBin widget allows for Xt toolkit code to be used
- * inside a GTK application.
- */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -966,3 +966,4 @@
-
- return;
- }
-+#endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
deleted file mode 100644
index a6077b4..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.4-unittests-build.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 03 Feb 2014 23:47:39 +0100
-Subject: [PATCH] Build unittests on demand
-
---- a/GNUmakefile.am 2013-11-27 23:52:56.148735433 +0100
-+++ b/GNUmakefile.am 2013-11-27 23:51:25.551590806 +0100
-@@ -51,6 +51,9 @@
- # Libraries and support components
- bin_PROGRAMS :=
- noinst_PROGRAMS :=
-+check_PROGRAMS :=
-+check_LTLIBRARIES :=
-+check_DATA :=
- libexec_PROGRAMS :=
- noinst_DATA :=
- noinst_HEADERS :=
---- a/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-03 23:44:52.534272572 +0100
-+++ b/Tools/TestWebKitAPI/GNUmakefile.am 2014-02-03 23:45:41.711783299 +0100
-@@ -1,8 +1,8 @@
--noinst_LTLIBRARIES += \
-+check_LTLIBRARIES += \
- Libraries/libTestWebKitAPIMain.la
-
- if ENABLE_WEBKIT2
--noinst_LTLIBRARIES += \
-+check_LTLIBRARIES += \
- Libraries/libTestWebKit2GtkAPI.la
- endif
-
-@@ -111,14 +111,14 @@
- Libraries_libTestWebKit2GtkAPI_la_CPPFLAGS = $(webkit2gtk_tests_cppflags)
-
-
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- Programs/TestWebKitAPI/WTF/TestWTF \
- Programs/TestWebKitAPI/JavaScriptCore/TestJavaScriptCore \
- Programs/TestWebKitAPI/WebCore/TestWebCore \
- Programs/TestWebKitAPI/WebCoreGtk/TestWebCoreGtk
-
- if ENABLE_WEBKIT1
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- Programs/TestWebKitAPI/WebKitGtk/testapplicationcache \
- Programs/TestWebKitAPI/WebKitGtk/testcontextmenu \
- Programs/TestWebKitAPI/WebKitGtk/testdomdocument \
-@@ -150,7 +150,7 @@
- endif
-
- if ENABLE_WEBKIT2
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- Programs/TestWebKitAPI/WebKit2/TestWebKit2 \
- Programs/TestWebKitAPI/WebKit2Gtk/InspectorTestServer \
- Programs/TestWebKitAPI/WebKit2Gtk/TestAuthentication \
-@@ -179,7 +179,7 @@
- Programs/TestWebKitAPI/WebKit2Gtk/TestWebViewEditor
-
- if HAVE_ATSPI2
--noinst_PROGRAMS += \
-+check_PROGRAMS += \
- Programs/TestWebKitAPI/WebKit2Gtk/AccessibilityTestServer \
- Programs/TestWebKitAPI/WebKit2Gtk/TestWebKitAccessibility
- endif
-@@ -627,7 +627,7 @@
- Tools/TestWebKitAPI/Tests/WebKit2/WKURL.cpp
-
- if ENABLE_WEBKIT2
--noinst_LTLIBRARIES += \
-+check_LTLIBRARIES += \
- Libraries/libTestWebKitAPIInjectedBundle.la
- endif # ENABLE_WEBKIT2
-
-@@ -684,7 +684,7 @@
-
-
- if ENABLE_WEBKIT2
--noinst_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
-+check_LTLIBRARIES += Libraries/WebExtensions/libWebExtensionTest.la
- endif
-
- Libraries_WebExtensions_libWebExtensionTest_la_SOURCES = \
-@@ -711,7 +711,7 @@
-
-
- if ENABLE_WEBKIT2
--noinst_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
-+check_LTLIBRARIES += Libraries/WebExtensions/libWebProcessTest.la
- endif
-
- Libraries_WebExtensions_libWebProcessTest_la_SOURCES = \
-@@ -747,7 +747,7 @@
- DISTCLEANFILES += \
- Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
-
--noinst_DATA += \
-+check_DATA += \
- Programs/TestWebKitAPI/WebKit2Gtk/resources/webkit2gtk-tests-resources.gresource
-
-
---
-1.8.3.2
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
deleted file mode 100644
index 854a112..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-gir-nvidia-hangs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: deadlock in gobject introspection
-Bug-Dyson: http://osdyson.org/issues/161
-Bug-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=463960
-Stack:
-25849: /home/pashev/packaging/webkitgtk/webkitgtk-2.0.4/build-2.0/tmp-introsp
------------------ lwp# 1 / thread# 1 --------------------
- fffffd7ffeeaf957 lwp_park (0, 0, 0)
- fffffd7ffeea8036 mutex_lock_impl () + 156
- fffffd7ffeea810b mutex_lock () + b
- fffffd7ffee340fa _preexec_atfork_unload () + 3a
- fffffd7ffee343ab _preexec_exit_handlers () + bb
- fffffd7fff5ccf0d purge_exit_handlers () + 10d
- fffffd7fff5cec18 remove_hdl () + ce8
- fffffd7fff5c8895 dlclose_core () + c5
- fffffd7fff5c88e5 dlclose_intn () + 15
- fffffd7fff5c89bb dlclose_check () + 7b
- fffffd7fff5c8a21 dlclose () + 41
- fffffd7ffaa03c41 px_module_manager_load () + 191
- fffffd7ffaa03cf6 px_module_manager_load_dir () + 66
- fffffd7ffaa050d7 px_proxy_factory_new () + 107
- fffffd7ffb201671 ???????? ()
- fffffd7feca30eca g_type_create_instance () + 16a
- fffffd7feca1597c ???????? ()
- fffffd7feca17472 g_object_newv () + 792
- fffffd7feca17aec g_object_new () + ec
- fffffd7fece5d052 ???????? ()
- fffffd7fece5d1d8 ???????? ()
- fffffd7fc98659a5 ???????? ()
- fffffd7feca173f6 g_object_newv () + 716
- fffffd7feca17aec g_object_new () + ec
- fffffd7fc986da24 soup_session_add_feature_by_type () + e4
- fffffd7fc986fb43 ???????? ()
- fffffd7feca17e00 g_object_set_valist () + 300
- fffffd7feca186d7 g_object_set () + e7
- fffffd7fc5724f87 WebCore::ResourceHandle::defaultSession() () + a7
- fffffd7fc48da299 webkitExit() () + 9
- fffffd7ffee33f56 _exithandle () + 66
- fffffd7ffee1e191 exit () + 11
- 00000000004086af ???????? ()
- 000000000040724c _start () + 6c
------------------ lwp# 2 / thread# 2 --------------------
- fffffd7ffeeaf957 lwp_park (0, 0, 0)
- fffffd7ffeea94bf cond_wait_queue () + 4f
- fffffd7ffeea9b12 __cond_wait () + b2
- fffffd7ffeea9b42 cond_wait () + 22
- fffffd7ffeea9b79 pthread_cond_wait () + 9
- fffffd7fc4eed04b WebCore::IconDatabase::syncThreadMainLoop() () + 12b
- fffffd7fc4eed278 WebCore::IconDatabase::iconDatabaseSyncThread() () + 138
- fffffd7fc3b2bc59 WTF::wtfThreadEntryPoint(void*) () + 19
- fffffd7ffeeaf617 _thrp_setup () + 77
- fffffd7ffeeaf910 _lwp_start ()
------------------ lwp# 3 / thread# 3 --------------------
- fffffd7ffeeaf957 lwp_park (0, 0, 0)
- fffffd7ffeea8036 mutex_lock_impl () + 156
- fffffd7ffeea810b mutex_lock () + b
- fffffd7ffee33e17 atexit_locks () + 17
- fffffd7ffee58ce9 libc_prepare_atfork () + 9
- fffffd7ffee34533 _prefork_handler () + 33
- fffffd7ffee9fc85 forkx () + 275
- fffffd7ffee9fcab fork () + b
- fffffd7fec68aacb ???????? ()
- fffffd7fec68b2a7 g_spawn_sync () + 167
- fffffd7fec68b994 g_spawn_command_line_sync () + 74
- fffffd7feceb2748 ???????? ()
- fffffd7feceb4019 g_dbus_address_get_for_bus_sync () + 2c9
- fffffd7fecebd11e ???????? ()
- fffffd7fecec4643 g_bus_get_sync () + 63
- fffffd7ffc60700b ???????? ()
- fffffd7ffc60714f ???????? ()
- fffffd7fec648ad0 g_main_context_dispatch () + 130
- fffffd7fec648e40 ???????? ()
- fffffd7fec648f08 g_main_context_iteration () + 38
- fffffd7ffc606f65 ???????? ()
- fffffd7fec66d50d ???????? ()
- fffffd7ffeeaf617 _thrp_setup () + 77
- fffffd7ffeeaf910 _lwp_start ()
-Index: webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp
-===================================================================
---- webkit.orig/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-02 00:06:10.504150531 +0400
-+++ webkit/Source/WebKit/gtk/webkit/webkitglobals.cpp 2013-12-03 14:08:05.956932011 +0400
-@@ -564,6 +564,14 @@
-
- WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
-
-+ // http://osdyson.org/issues/161
-+ // WebKitGTK FTBFS when building GObject introspection due to deadlock.
-+ // When gobject introspection is done, a simple program call exit()
-+ // exit() -> webkitExit() -> g_object_unref() -> webkit_get_default_session()
-+ // -> ResourceHandle::defaultSession() => default session doesn't exist! AND
-+ // we try to create it! Thus deadlock. So, create default session earlier:
-+ (void) webkit_get_default_session();
-+
- atexit(webkitExit);
- }
-
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
deleted file mode 100644
index 8aee778..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -72,6 +72,15 @@
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-
-+/* CPU(HPPA) - HP PARISC */
-+#if defined(__hppa__)
-+#define WTF_CPU_HPPA 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
-+#endif
-+
- /* CPU(IA64) - Itanium / IA-64 */
- #if defined(__ia64__)
- #define WTF_CPU_IA64 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
deleted file mode 100644
index 5f0542c..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wide pointer issues on ia64 (closes: #642750).
-Author: Stephan Schreiber <info@fs-driver.org>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -705,6 +705,13 @@
- #define ENABLE_JIT 1
- #endif
-
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+ some memory barriers are missing in the thread-unsafe code around the
-+ pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
- #if !defined(ENABLE_JIT) \
- && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
deleted file mode 100644
index a63e9e8..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Source/WTF/wtf/Platform.h 2014-02-25 00:33:16.561606810 +0100
-+++ b/Source/WTF/wtf/Platform.h 2014-02-25 00:49:52.895512955 +0100
-@@ -79,6 +79,9 @@
- #if !defined(__LP64__)
- #define WTF_CPU_IA64_32 1
- #endif
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
- #endif
-
- /* CPU(MIPS) - MIPS 32-bit */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
deleted file mode 100644
index 691b528..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-sparc64-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-Source_WTF_wtf_Atomics_h,v 1.3 2013/10/20 09:07:57 landry Exp $
-
-https://bugs.webkit.org/show_bug.cgi?id=86835
-Fix build failure on sparc64 since 1.8.1, provide atomic{In,De}crement implems based on __sync_fetch_and_add builtin
-
---- Source/WTF/wtf/Atomics.h.orig Sat Aug 3 18:10:38 2013
-+++ Source/WTF/wtf/Atomics.h Sun Oct 20 11:06:14 2013
-@@ -112,6 +112,15 @@ inline int atomicDecrement(int volatile* addend) { ret
- inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); }
- inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); }
-
-+#elif COMPILER(GCC) && CPU(SPARC64)
-+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-+
-+inline int atomicIncrement(int volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int atomicDecrement(int volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
-+inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, 1) + 1; }
-+inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_fetch_and_add(addend, -1) - 1; }
-+
- #endif
-
- #if OS(WINDOWS)
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-musl-remove-execinfo.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-musl-remove-execinfo.patch
deleted file mode 100644
index bb120f6..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.6-musl-remove-execinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur webkitgtk-2.2.6.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.2.6/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.2.6.orig/Source/WTF/wtf/Assertions.cpp 2014-03-19 03:53:02.000000000 -0400
-+++ webkitgtk-2.2.6/Source/WTF/wtf/Assertions.cpp 2014-06-18 08:33:19.280216672 -0400
-@@ -64,12 +64,6 @@
- #include <windows.h>
- #endif
-
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
--#include <cxxabi.h>
--#include <dlfcn.h>
--#include <execinfo.h>
--#endif
--
- #if PLATFORM(BLACKBERRY)
- #include <BlackBerryPlatformLog.h>
- #endif
-@@ -242,9 +236,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
-- *size = backtrace(stack, *size);
--#elif OS(WINDOWS) && !OS(WINCE)
-+#if OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
- // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
- // through GetProcAddress.
-@@ -278,9 +270,6 @@
-
- #if OS(DARWIN) || OS(LINUX)
- # if PLATFORM(QT) || PLATFORM(GTK)
--# if defined(__GLIBC__) && !defined(__UCLIBC__)
--# define WTF_USE_BACKTRACE_SYMBOLS 1
--# endif
- # else
- # define WTF_USE_DLADDR 1
- # endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
deleted file mode 100644
index 8c387ff..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wide pointer issues on ia64 (closes: #642750).
-Author: Stephan Schreiber <info@fs-driver.org>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -705,6 +705,13 @@
- #define ENABLE_JIT 1
- #endif
-
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+ some memory barriers are missing in the thread-unsafe code around the
-+ pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Win64. */
- #if !defined(ENABLE_JIT) \
- && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-musl-remove-execinfo.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-musl-remove-execinfo.patch
deleted file mode 100644
index a234f26..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-musl-remove-execinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur webkitgtk-2.4.1.orig/Source/WTF/wtf/Assertions.cpp webkitgtk-2.4.1/Source/WTF/wtf/Assertions.cpp
---- webkitgtk-2.4.1.orig/Source/WTF/wtf/Assertions.cpp 2014-04-14 02:40:45.000000000 -0400
-+++ webkitgtk-2.4.1/Source/WTF/wtf/Assertions.cpp 2014-06-18 09:16:35.617334849 -0400
-@@ -63,12 +63,6 @@
- #include <windows.h>
- #endif
-
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
--#include <cxxabi.h>
--#include <dlfcn.h>
--#include <execinfo.h>
--#endif
--
- extern "C" {
-
- WTF_ATTRIBUTE_PRINTF(1, 0)
-@@ -233,9 +227,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
-- *size = backtrace(stack, *size);
--#elif OS(WINDOWS) && !OS(WINCE)
-+#if OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
- // in the Windows Server 2003 R2 Platform SDK. So, we'll grab the function
- // through GetProcAddress.
-@@ -269,9 +261,6 @@
-
- #if OS(DARWIN) || OS(LINUX)
- # if PLATFORM(GTK)
--# if defined(__GLIBC__) && !defined(__UCLIBC__)
--# define WTF_USE_BACKTRACE_SYMBOLS 1
--# endif
- # else
- # define WTF_USE_DLADDR 1
- # endif
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
deleted file mode 100644
index b49dc03..0000000
--- a/net-libs/webkit-gtk/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>gnome</herd>
- <use>
- <flag name="coverage">Enable code coverage support</flag>
- <flag name='egl'>Enable EGL support.</flag>
- <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
- <flag name='gles2'>Enable GLESv2 support.</flag>
- <flag name="libsecret">Enable libsecret support to store login credentials</flag>
- <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild
deleted file mode 100644
index bb018be..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.6-r99.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.6.ebuild,v 1.9 2014/04/21 10:30:20 ago Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-GCONF_DEBUG="no"
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/29" # soname version
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell +webgl"
-# bugs 372493, 416331
-REQUIRED_USE="
- geoloc? ( introspection )
- introspection? ( gstreamer )
- gles2? ( egl )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/harfbuzz:=[icu(+)]
- media-libs/libwebp:=
- virtual/jpeg:0=
- >=media-libs/libpng-1.4:0=
- >=x11-libs/cairo-1.10:=[X]
- >=dev-libs/glib-2.36.0:2
- >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
- >=dev-libs/icu-3.8.1-r1:=
- >=net-libs/libsoup-2.42.0:2.4[introspection?]
- dev-db/sqlite:3=
- >=x11-libs/pango-1.30.0.0
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/gtk+-2.24.10:2
-
- egl? ( media-libs/mesa[egl] )
- geoloc? ( app-misc/geoclue:0 )
- gles2? ( media-libs/mesa[gles2] )
- gstreamer? (
- >=media-libs/gstreamer-1.2:1.0
- >=media-libs/gst-plugins-base-1.2:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
- libsecret? ( app-crypt/libsecret )
- opengl? ( virtual/opengl )
- spell? ( >=app-text/enchant-0.22:= )
- webgl? (
- x11-libs/cairo[opengl]
- x11-libs/libXcomposite
- x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/perl
- || (
- virtual/rubygems[ruby_targets_ruby20]
- virtual/rubygems[ruby_targets_ruby21]
- virtual/rubygems[ruby_targets_ruby19]
- )
- >=app-accessibility/at-spi2-core-2.5.3
- >=dev-libs/atk-2.8.0
- >=dev-util/gtk-doc-am-1.10
- dev-util/gperf
- >=sys-devel/bison-2.4.3
- >=sys-devel/flex-2.5.33
- || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.0 )
- sys-devel/gettext
- >=sys-devel/make-3.82-r4
- virtual/pkgconfig
-
- introspection? ( jit? ( sys-apps/paxctl ) )
- test? (
- dev-lang/python:2.7
- dev-python/pygobject:3[python_targets_python2_7]
- x11-themes/hicolor-icon-theme
- jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++11; then
- die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
- fi
-}
-
-pkg_setup() {
- # Check whether any of the debugging flags is enabled
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
- replace-flags -ggdb -g
- ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
- ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
- ewarn "large for current binutils releases (bug #432784) and has very"
- ewarn "high temporary build space and memory requirements."
- ewarn "If you really want to build ${PN} with \"-ggdb\", add"
- ewarn "WEBKIT_GTK_GGDB=yes"
- ewarn "to your make.conf file."
- fi
- einfo "You need to have at least 18GB of temporary build space available"
- einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
- einfo "not be enough, as the total space requirements depend on the flags"
- einfo "(-ggdb vs -g1) and enabled features."
- check-reqs_pkg_setup
- fi
-
- [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
- DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
- # intermediate MacPorts hack while upstream bug is not fixed properly
- # https://bugs.webkit.org/show_bug.cgi?id=28727
- use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
- # Don't force -O2
- sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die
-
- # Failing tests
- # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
- # * keyevents is interactive
- # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
- # * webdatasource test needs a network connection and intermittently fails with icedtea-web
- # * webplugindatabase intermittently fails with icedtea-web, bug #????
- sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
- -i Source/WebKit/gtk/GNUmakefile.am || die
-
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # bug #459978, upstream bug #113397
- epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
- # Do not build unittests unless requested, upstream bug #128163
- epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
-
- # Deadlock causing infinite compilations with nvidia-drivers:
- # https://bugs.gentoo.org/show_bug.cgi?id=463960
- # http://osdyson.org/issues/161
- # https://bugs.webkit.org/show_bug.cgi?id=125651
- epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
-
- # Debian patches to fix support for some arches
- # https://bugs.webkit.org/show_bug.cgi?id=129540
- epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
- # https://bugs.webkit.org/show_bug.cgi?id=129542
- epatch "${FILESDIR}"/${PN}-2.2.5-ia64-malloc.patch
-
- # OpenBSD patches to fix support for some arches
- # https://bugs.webkit.org/show_bug.cgi?id=86835
- epatch "${FILESDIR}"/${PN}-2.2.5-sparc64-build.patch
-
- epatch "${FILESDIR}"/${P}-musl-remove-execinfo.patch
-
- AT_M4DIR=Source/autotools eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # Arches without JIT support also need this to really disable it in all places
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
- # It doesn't compile on alpha without this in LDFLAGS, bug #???
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- # --no-keep-memory doesn't work on ia64, bug #502492
- if ! use ia64; then
- append-ldflags "-Wl,--no-keep-memory"
- fi
- if ! $(tc-getLD) --version | grep -q "GNU gold"; then
- append-ldflags "-Wl,--reduce-memory-overheads"
- fi
-
- local myconf=""
-
- if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
- myconf="${myconf} RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- myconf="${myconf} RUBY=$(type -P ruby20)"
- else
- myconf="${myconf} RUBY=$(type -P ruby19)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # * Aqua support in gtk3 is untested
- # * dependency-tracking is required so parallel builds won't fail
- gnome2_src_configure \
- $(use_enable coverage) \
- $(use_enable debug) \
- $(use_enable egl) \
- $(use_enable geoloc geolocation) \
- $(use_enable gles2) \
- $(use_enable gstreamer video) \
- $(use_enable gstreamer web-audio) \
- $(use_enable introspection) \
- $(use_enable jit) \
- $(use_enable libsecret credential_storage) \
- $(use_enable opengl glx) \
- $(use_enable spell spellcheck) \
- $(use_enable webgl) \
- $(use_enable webgl accelerated-compositing) \
- --with-gtk=3.0 \
- --enable-dependency-tracking \
- --disable-gtk-doc \
- $(usex aqua "--with-font-backend=pango --with-target=quartz" "")
- ${myconf}
-}
-
-src_test() {
- # Tests expect an out-of-source build in WebKitBuild
- ln -s . WebKitBuild || die "ln failed"
-
- # Prevents test failures on PaX systems
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
- unset DISPLAY
- # Tests need virtualx, bug #294691, bug #310695
- # Parallel tests sometimes fail
- Xemake -j1 check
-}
-
-src_install() {
- # https://bugs.webkit.org/show_bug.cgi?id=129242
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
- newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
- newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
- newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
- # Prevents crashes on PaX systems
- use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.1-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.1-r99.ebuild
deleted file mode 100644
index 5a6f1ab..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.1-r99.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.1.ebuild,v 1.1 2014/04/27 18:26:53 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
- geoloc? ( introspection )
- introspection? ( gstreamer )
- gles2? ( egl )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
- || ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/harfbuzz:=[icu(+)]
- media-libs/libwebp:=
- virtual/jpeg:0=
- >=media-libs/libpng-1.4:0=
- >=x11-libs/cairo-1.10:=[X]
- >=dev-libs/glib-2.36.0:2
- >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
- >=dev-libs/icu-3.8.1-r1:=
- >=net-libs/libsoup-2.42.0:2.4[introspection?]
- dev-db/sqlite:3=
- >=x11-libs/pango-1.30.0.0
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/gtk+-2.24.10:2
-
- egl? ( media-libs/mesa[egl] )
- geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
- gles2? ( media-libs/mesa[gles2] )
- gstreamer? (
- >=media-libs/gstreamer-1.2:1.0
- >=media-libs/gst-plugins-base-1.2:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
- libsecret? ( app-crypt/libsecret )
- opengl? ( virtual/opengl )
- spell? ( >=app-text/enchant-0.22:= )
- wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
- webgl? (
- x11-libs/cairo[opengl]
- x11-libs/libXcomposite
- x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/perl
- || (
- virtual/rubygems[ruby_targets_ruby20]
- virtual/rubygems[ruby_targets_ruby21]
- virtual/rubygems[ruby_targets_ruby19]
- )
- >=app-accessibility/at-spi2-core-2.5.3
- >=dev-libs/atk-2.8.0
- >=dev-util/gtk-doc-am-1.10
- dev-util/gperf
- >=sys-devel/bison-2.4.3
- >=sys-devel/flex-2.5.33
- || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
- sys-devel/gettext
- >=sys-devel/make-3.82-r4
- virtual/pkgconfig
-
- introspection? ( jit? ( sys-apps/paxctl ) )
- test? (
- dev-lang/python:2.7
- dev-python/pygobject:3[python_targets_python2_7]
- x11-themes/hicolor-icon-theme
- jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++11; then
- die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-}
-
-pkg_setup() {
- # Check whether any of the debugging flags is enabled
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
- replace-flags -ggdb -g
- ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
- ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
- ewarn "large for current binutils releases (bug #432784) and has very"
- ewarn "high temporary build space and memory requirements."
- ewarn "If you really want to build ${PN} with \"-ggdb\", add"
- ewarn "WEBKIT_GTK_GGDB=yes"
- ewarn "to your make.conf file."
- fi
- einfo "You need to have at least 18GB of temporary build space available"
- einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
- einfo "not be enough, as the total space requirements depend on the flags"
- einfo "(-ggdb vs -g1) and enabled features."
- check-reqs_pkg_setup
- fi
-
- [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # intermediate MacPorts hack while upstream bug is not fixed properly
- # https://bugs.webkit.org/show_bug.cgi?id=28727
- use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
- # Leave optimization level to user CFLAGS
- # FORTIFY_SOURCE is enabled by default in Gentoo
- sed -e 's/-O[012]//g' \
- -e 's/-D_FORTIFY_SOURCE=2//g' \
- -i Source/autotools/SetupCompilerFlags.m4 || die
-
- # Failing tests
- # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
- # * keyevents is interactive
- # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
- # * webdatasource test needs a network connection and intermittently fails with icedtea-web
- # * webplugindatabase intermittently fails with icedtea-web, bug #????
- sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
- -i Tools/TestWebKitAPI/GNUmakefile.am || die
-
- # bug #459978, upstream bug #113397
- epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
- # Do not build unittests unless requested, upstream bug #128163
- epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
-
- # Deadlock causing infinite compilations with nvidia-drivers:
- # https://bugs.gentoo.org/show_bug.cgi?id=463960
- # http://osdyson.org/issues/161
- # https://bugs.webkit.org/show_bug.cgi?id=125651
- epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
-
- # Debian patches to fix support for some arches
- # https://bugs.webkit.org/show_bug.cgi?id=129540
- epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
- # https://bugs.webkit.org/show_bug.cgi?id=129542
- epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
- epatch "${FILESDIR}"/${PN}-2.4.1-musl-remove-execinfo.patch
-
- AT_M4DIR=Source/autotools eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # Arches without JIT support also need this to really disable it in all places
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
- # It doesn't compile on alpha without this in LDFLAGS, bug #???
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- # --no-keep-memory doesn't work on ia64, bug #502492
- if ! use ia64; then
- append-ldflags "-Wl,--no-keep-memory"
- fi
- if ! $(tc-getLD) --version | grep -q "GNU gold"; then
- append-ldflags "-Wl,--reduce-memory-overheads"
- fi
-
- local myconf=""
-
- if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
- myconf="${myconf} RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- myconf="${myconf} RUBY=$(type -P ruby20)"
- else
- myconf="${myconf} RUBY=$(type -P ruby19)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # * Aqua support in gtk3 is untested
- # * dependency-tracking is required so parallel builds won't fail
- gnome2_src_configure \
- $(use_enable aqua quartz-target) \
- $(use_enable coverage) \
- $(use_enable debug) \
- $(use_enable egl) \
- $(use_enable geoloc geolocation) \
- $(use_enable gles2) \
- $(use_enable gstreamer video) \
- $(use_enable gstreamer web-audio) \
- $(use_enable introspection) \
- $(use_enable jit) \
- $(use_enable libsecret credential_storage) \
- $(use_enable opengl glx) \
- $(use_enable spell spellcheck) \
- $(use_enable webgl) \
- $(use_enable webgl accelerated-compositing) \
- $(use_enable wayland wayland-target) \
- $(use_enable X x11-target) \
- --with-gtk=3.0 \
- --enable-dependency-tracking \
- --disable-gtk-doc \
- ${myconf}
-}
-
-src_test() {
- # Tests expect an out-of-source build in WebKitBuild
- ln -s . WebKitBuild || die "ln failed"
-
- # Prevents test failures on PaX systems
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
- unset DISPLAY
- # Tests need virtualx, bug #294691, bug #310695
- # Parallel tests sometimes fail
- Xemake -j1 check
-}
-
-src_install() {
- DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
- # https://bugs.webkit.org/show_bug.cgi?id=129242
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
- newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
- newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
- newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
- # Prevents crashes on PaX systems
- use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.3-r99.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.3-r99.ebuild
deleted file mode 100644
index 68651e5..0000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.3-r99.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.3.ebuild,v 1.1 2014/05/30 05:03:33 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
- geoloc? ( introspection )
- introspection? ( gstreamer )
- gles2? ( egl )
- webgl? ( ^^ ( gles2 opengl ) )
- !webgl? ( ?? ( gles2 opengl ) )
- || ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-RDEPEND="
- dev-libs/libxml2:2
- dev-libs/libxslt
- media-libs/harfbuzz:=[icu(+)]
- media-libs/libwebp:=
- virtual/jpeg:0=
- >=media-libs/libpng-1.4:0=
- >=x11-libs/cairo-1.10:=[X]
- >=dev-libs/glib-2.36.0:2
- >=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
- >=dev-libs/icu-3.8.1-r1:=
- >=net-libs/libsoup-2.42.0:2.4[introspection?]
- dev-db/sqlite:3=
- >=x11-libs/pango-1.30.0.0
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/gtk+-2.24.10:2
-
- egl? ( media-libs/mesa[egl] )
- geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
- gles2? ( media-libs/mesa[gles2] )
- gstreamer? (
- >=media-libs/gstreamer-1.2:1.0
- >=media-libs/gst-plugins-base-1.2:1.0 )
- introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
- libsecret? ( app-crypt/libsecret )
- opengl? ( virtual/opengl )
- spell? ( >=app-text/enchant-0.22:= )
- wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
- webgl? (
- x11-libs/cairo[opengl]
- x11-libs/libXcomposite
- x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-lang/perl
- || (
- virtual/rubygems[ruby_targets_ruby20]
- virtual/rubygems[ruby_targets_ruby21]
- virtual/rubygems[ruby_targets_ruby19]
- )
- >=app-accessibility/at-spi2-core-2.5.3
- >=dev-libs/atk-2.8.0
- >=dev-util/gtk-doc-am-1.10
- dev-util/gperf
- >=sys-devel/bison-2.4.3
- >=sys-devel/flex-2.5.33
- || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
- sys-devel/gettext
- >=sys-devel/make-3.82-r4
- virtual/pkgconfig
-
- introspection? ( jit? ( sys-apps/paxctl ) )
- test? (
- dev-lang/python:2.7
- dev-python/pygobject:3[python_targets_python2_7]
- x11-themes/hicolor-icon-theme
- jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
- check-reqs_pkg_pretend
- fi
-
- if ! test-flag-CXX -std=c++11; then
- die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
- fi
-}
-
-pkg_setup() {
- # Check whether any of the debugging flags is enabled
- if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
- if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
- replace-flags -ggdb -g
- ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
- ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
- ewarn "large for current binutils releases (bug #432784) and has very"
- ewarn "high temporary build space and memory requirements."
- ewarn "If you really want to build ${PN} with \"-ggdb\", add"
- ewarn "WEBKIT_GTK_GGDB=yes"
- ewarn "to your make.conf file."
- fi
- einfo "You need to have at least 18GB of temporary build space available"
- einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
- einfo "not be enough, as the total space requirements depend on the flags"
- einfo "(-ggdb vs -g1) and enabled features."
- check-reqs_pkg_setup
- fi
-
- [[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # intermediate MacPorts hack while upstream bug is not fixed properly
- # https://bugs.webkit.org/show_bug.cgi?id=28727
- use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
- # Leave optimization level to user CFLAGS
- # FORTIFY_SOURCE is enabled by default in Gentoo
- sed -e 's/-O[012]//g' \
- -e 's/-D_FORTIFY_SOURCE=2//g' \
- -i Source/autotools/SetupCompilerFlags.m4 || die
-
- # Failing tests
- # * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
- # * keyevents is interactive
- # * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
- # * webdatasource test needs a network connection and intermittently fails with icedtea-web
- # * webplugindatabase intermittently fails with icedtea-web, bug #????
- sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
- -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
- -i Tools/TestWebKitAPI/GNUmakefile.am || die
-
- # bug #459978, upstream bug #113397
- epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
-
- # Do not build unittests unless requested, upstream bug #128163
- epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
-
- # Deadlock causing infinite compilations with nvidia-drivers:
- # https://bugs.gentoo.org/show_bug.cgi?id=463960
- # http://osdyson.org/issues/161
- # https://bugs.webkit.org/show_bug.cgi?id=125651
- epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
-
- # Debian patches to fix support for some arches
- # https://bugs.webkit.org/show_bug.cgi?id=129540
- epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
- # https://bugs.webkit.org/show_bug.cgi?id=129542
- epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
- epatch "${FILESDIR}"/${PN}-2.4.1-musl-remove-execinfo.patch
-
- AT_M4DIR=Source/autotools eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # Respect CC, otherwise fails on prefix #395875
- tc-export CC
-
- # Arches without JIT support also need this to really disable it in all places
- use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
- # It doesn't compile on alpha without this in LDFLAGS, bug #???
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Sigbuses on SPARC with mcpu and co., bug #???
- use sparc && filter-flags "-mvis"
-
- # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
- use ppc64 && append-flags "-mminimal-toc"
-
- # Try to use less memory, bug #469942 (see Fedora .spec for reference)
- # --no-keep-memory doesn't work on ia64, bug #502492
- if ! use ia64; then
- append-ldflags "-Wl,--no-keep-memory"
- fi
- if ! $(tc-getLD) --version | grep -q "GNU gold"; then
- append-ldflags "-Wl,--reduce-memory-overheads"
- fi
-
- local myconf=""
-
- if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
- myconf="${myconf} RUBY=$(type -P ruby21)"
- elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
- myconf="${myconf} RUBY=$(type -P ruby20)"
- else
- myconf="${myconf} RUBY=$(type -P ruby19)"
- fi
-
- # TODO: Check Web Audio support
- # should somehow let user select between them?
- #
- # * Aqua support in gtk3 is untested
- # * dependency-tracking is required so parallel builds won't fail
- gnome2_src_configure \
- $(use_enable aqua quartz-target) \
- $(use_enable coverage) \
- $(use_enable debug) \
- $(use_enable egl) \
- $(use_enable geoloc geolocation) \
- $(use_enable gles2) \
- $(use_enable gstreamer video) \
- $(use_enable gstreamer web-audio) \
- $(use_enable introspection) \
- $(use_enable jit) \
- $(use_enable libsecret credential_storage) \
- $(use_enable opengl glx) \
- $(use_enable spell spellcheck) \
- $(use_enable webgl) \
- $(use_enable webgl accelerated-compositing) \
- $(use_enable wayland wayland-target) \
- $(use_enable X x11-target) \
- --with-gtk=3.0 \
- --enable-dependency-tracking \
- --disable-gtk-doc \
- ${myconf}
-}
-
-src_test() {
- # Tests expect an out-of-source build in WebKitBuild
- ln -s . WebKitBuild || die "ln failed"
-
- # Prevents test failures on PaX systems
- use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
- unset DISPLAY
- # Tests need virtualx, bug #294691, bug #310695
- # Parallel tests sometimes fail
- Xemake -j1 check
-}
-
-src_install() {
- DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
- # https://bugs.webkit.org/show_bug.cgi?id=129242
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
- newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
- newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
- newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
- # Prevents crashes on PaX systems
- use jit && pax-mark m "${ED}usr/bin/jsc-3"
-}
diff --git a/net-misc/dhcp/dhcp-4.3.1-r99.ebuild b/net-misc/dhcp/dhcp-4.3.1-r99.ebuild
deleted file mode 100644
index 9b3aae0..0000000
--- a/net-misc/dhcp/dhcp-4.3.1-r99.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.3.1-r2.ebuild,v 1.10 2015/04/14 10:59:58 ago Exp $
-
-EAPI="4"
-
-inherit eutils systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl )
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-src_prepare() {
- # Gentoo patches - these will probably never be accepted upstream
- # Fix for musl
- epatch "${FILESDIR}"/${PN}-4.3.2-fix-compilation-for-musl.patch
- # Fix some permission issues
- epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
- # Enable dhclient to equery NTP servers
- epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
- epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
- # Stop downing the interface on Linux as that breaks link daemons
- # such as wpa_supplicant and netplug
- epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
- # Enable dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
- epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
- -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<client\>::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/dhcp-4.3.2-r99.ebuild b/net-misc/dhcp/dhcp-4.3.2-r99.ebuild
deleted file mode 100644
index 411a9ad..0000000
--- a/net-misc/dhcp/dhcp-4.3.2-r99.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.3.2.ebuild,v 1.1 2015/03/10 02:17:25 vapier Exp $
-
-EAPI="4"
-
-inherit eutils systemd toolchain-funcs user
-
-MY_PV="${PV//_alpha/a}"
-MY_PV="${MY_PV//_beta/b}"
-MY_PV="${MY_PV//_rc/rc}"
-MY_PV="${MY_PV//_p/-P}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
-HOMEPAGE="http://www.isc.org/products/DHCP"
-SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
- ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
-
-DEPEND="
- client? (
- kernel_linux? (
- ipv6? ( sys-apps/iproute2 )
- sys-apps/net-tools
- )
- )
- ldap? (
- net-nds/openldap
- ssl? ( dev-libs/openssl )
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-dhcp )
- vim-syntax? ( app-vim/dhcpd-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- # handle local bind hell
- cd "${S}"/bind
- unpack ./bind.tar.gz
-}
-
-src_prepare() {
- # Gentoo patches - these will probably never be accepted upstream
- # Fix for musl
- epatch "${FILESDIR}"/${PN}-4.3.2-fix-compilation-for-musl.patch
- # Fix some permission issues
- epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
- # Enable dhclient to equery NTP servers
- epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
- epatch "${FILESDIR}"/${PN}-4.3.1-dhclient-resolvconf.patch
- # Stop downing the interface on Linux as that breaks link daemons
- # such as wpa_supplicant and netplug
- epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
- # Enable dhclient to get extra configuration from stdin
- epatch "${FILESDIR}"/${PN}-4.2.2-dhclient-stdin-conf.patch
- epatch "${FILESDIR}"/${PN}-4.2.2-nogateway.patch #265531
- epatch "${FILESDIR}"/${PN}-4.2.4-quieter-ping.patch #296921
- epatch "${FILESDIR}"/${PN}-4.2.4-always-accept-4.patch #437108
- epatch "${FILESDIR}"/${PN}-4.2.5-iproute2-path.patch #480636
- epatch "${FILESDIR}"/${PN}-4.2.5-bindtodevice-inet6.patch #471142
-
- # Brand the version with Gentoo
- sed -i \
- -e "/VERSION=/s:'$: Gentoo-${PR}':" \
- configure || die
-
- # Change the hook script locations of the scripts
- sed -i \
- -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
- -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
- client/scripts/* || die
-
- # No need for the linux script to force bash #158540
- sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
-
- # Quiet the freebsd logger a little
- sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
-
- # Remove these options from the sample config
- sed -i -r \
- -e "/(script|host-name|domain-name) /d" \
- client/dhclient.conf.example || die
-
- if use client && ! use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
- Makefile.in || die
- elif ! use client && use server ; then
- sed -i -r \
- -e '/^SUBDIRS/s:\<client\>::' \
- Makefile.in || die
- fi
-
- # Only install different man pages if we don't have en
- if [[ " ${LINGUAS} " != *" en "* ]]; then
- # Install Japanese man pages
- if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
- einfo "Installing Japanese documention"
- cp doc/ja_JP.eucJP/dhclient* client
- cp doc/ja_JP.eucJP/dhcp* common
- fi
- fi
- # Now remove the non-english docs so there are no errors later
- rm -rf doc/ja_JP.eucJP
-
- # make the bind build work
- binddir=${S}/bind
- cd "${binddir}" || die
- cat <<-EOF > bindvar.tmp
- binddir=${binddir}
- GMAKE=${MAKE:-gmake}
- EOF
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-disable.patch
- cd bind-*/
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
- epatch "${FILESDIR}"/${PN}-4.2.2-bind-build-flags.patch
-}
-
-src_configure() {
- # bind defaults to stupid `/usr/bin/ar`
- tc-export AR BUILD_CC
- export ac_cv_path_AR=${AR}
-
- # this is tested for by the bind build system, and can cause trouble
- # when cross-building; since dhcp itself doesn't make use of libcap,
- # simply disable it.
- export ac_cv_lib_cap_cap_set_proc=no
-
- # Use FHS sane paths ... some of these have configure options,
- # but not all, so just do it all here.
- local e="/etc/dhcp" r="/var/run/dhcp" l="/var/lib/dhcp"
- cat <<-EOF >> includes/site.h
- #define _PATH_DHCPD_CONF "${e}/dhcpd.conf"
- #define _PATH_DHCLIENT_CONF "${e}/dhclient.conf"
- #define _PATH_DHCPD_DB "${l}/dhcpd.leases"
- #define _PATH_DHCPD6_DB "${l}/dhcpd6.leases"
- #define _PATH_DHCLIENT_DB "${l}/dhclient.leases"
- #define _PATH_DHCLIENT6_DB "${l}/dhclient6.leases"
- #define _PATH_DHCPD_PID "${r}/dhcpd.pid"
- #define _PATH_DHCPD6_PID "${r}/dhcpd6.pid"
- #define _PATH_DHCLIENT_PID "${r}/dhcpclient.pid"
- #define _PATH_DHCLIENT6_PID "${r}/dhcpclient6.pid"
- #define _PATH_DHCRELAY_PID "${r}/dhcrelay.pid"
- #define _PATH_DHCRELAY6_PID "${r}/dhcrelay6.pid"
- EOF
-
- econf \
- --enable-paranoia \
- --enable-early-chroot \
- --sysconfdir=${e} \
- $(use_enable ipv6 dhcpv6) \
- $(use_with ldap) \
- $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
-
- # configure local bind cruft. symtable option requires
- # perl and we don't want to require that #383837.
- cd bind/bind-*/ || die
- eval econf \
- $(sed -n '/ [.].configure /{s:^[^-]*::;s:>.*::;p}' ../Makefile) \
- --disable-symtable \
- --without-make-clean
-}
-
-src_compile() {
- # build local bind cruft first
- emake -C bind/bind-*/lib/export install
- # then build standard dhcp code
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
- dohtml doc/References.html
-
- if [[ -e client/dhclient ]] ; then
- # move the client to /
- dodir /sbin
- mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
-
- exeinto /sbin
- if use kernel_linux ; then
- newexe "${S}"/client/scripts/linux dhclient-script
- else
- newexe "${S}"/client/scripts/freebsd dhclient-script
- fi
- fi
-
- if [[ -e server/dhcpd ]] ; then
- if use ldap ; then
- insinto /etc/openldap/schema
- doins contrib/ldap/dhcp.*
- dosbin contrib/ldap/dhcpd-conf-to-ldap
- fi
-
- newinitd "${FILESDIR}"/dhcpd.init5 dhcpd
- newconfd "${FILESDIR}"/dhcpd.conf2 dhcpd
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay
- newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
- newinitd "${FILESDIR}"/dhcrelay.init3 dhcrelay6
- newconfd "${FILESDIR}"/dhcrelay6.conf dhcrelay6
-
- systemd_newtmpfilesd "${FILESDIR}"/dhcpd.tmpfiles dhcpd.conf
- systemd_dounit "${FILESDIR}"/dhcpd4.service
- systemd_dounit "${FILESDIR}"/dhcpd6.service
- systemd_dounit "${FILESDIR}"/dhcrelay4.service
- systemd_dounit "${FILESDIR}"/dhcrelay6.service
- systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf
- systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf
-
- sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560
- fi
-
- # the default config files aren't terribly useful #384087
- local f
- for f in "${ED}"/etc/dhcp/*.conf.example ; do
- mv "${f}" "${f%.example}" || die
- done
- sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die
-}
-
-pkg_preinst() {
- enewgroup dhcp
- enewuser dhcp -1 -1 /var/lib/dhcp dhcp
-
- # Keep the user files over the sample ones. The
- # hashing is to ignore the crappy defaults #384087.
- local f h
- for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do
- h=${f#*:}
- f="/etc/dhcp/${f%:*}.conf"
- if [ -e "${EROOT}"${f} ] ; then
- case $(md5sum "${EROOT}"${f}) in
- ${h}*) ;;
- *) cp -p "${EROOT}"${f} "${ED}"${f};;
- esac
- fi
- done
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
- ewarn
- ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
- ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
- ewarn "and dhcp should be removed from the default runlevel"
- ewarn
- fi
-}
diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
deleted file mode 100644
index 13debb2..0000000
--- a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- server/dhcpd.c 2003-11-05 14:08:09.000000000 -0800
-+++ server/dhcpd.c 2003-11-05 14:15:32.000000000 -0800
-@@ -602,6 +602,12 @@
- if (lftest)
- exit (0);
-
-+#if defined (PARANOIA)
-+ /* Set proper permissions... */
-+ if (lchown (path_dhcpd_db, set_uid, set_gid))
-+ log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
-+#endif /* PARANOIA */
-+
- /* Discover all the network interfaces and initialize them. */
- discover_interfaces (DISCOVER_SERVER);
-
diff --git a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
deleted file mode 100644
index 886f5cb..0000000
--- a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-
-paranoia (non-root/chroot) patch for ISC dhcp 3.0
-file to patch: dhcp-3.0/server/dhcpd.c
-
-update from paranoia patch for ISC dhcp 2.0
-
-Adds 3 options:
-
- -user <user>
- -group <group>
- -chroot <chroot_dir>
-
-Notes:
- -DPARANOIA must be passed as an argument to the --copts option
- of configure. Otherwise, the paranoia code will not be compiled
- in. Example: ./configure --copts -DPARANOIA
-
- The chroot() call has been delayed in order to allow /dev/log to
- be reopened after the configuration file has been read. This is
- beneficial for systems on which /dev/log is a unix domain socket.
- The main side effect is that dhcpd.conf should be placed in /etc,
- instead of <chroot_dir>/etc.
-
- If dhcpd is to be run on a sysV-style architecture (or, more
- generally, if /dev/log is a character device), one may opt to
- create the <chroot_dir>/dev/log character device and add
- -DEARLY_CHROOT to the --copts option of configure (in addition to
- -DPARANOIA). This will perform the chroot() call at the earliest
- convenience (before reading the configuration file).
-
- If the -user option is used, the lease and pid file directories
- should be writable to the server process after it drops
- privileges.
-
-
-ari edelkind (12/10/2001)
-last modified 12/10/2001
-
-
---- dhcp-3.0/server/dhcpd.c Thu Jun 21 22:12:58 2001
-+++ dhcp-3.0+paranoia/server/dhcpd.c Wed Oct 17 08:23:00 2001
-@@ -56,6 +56,16 @@
- #include "version.h"
- #include <omapip/omapip_p.h>
-
-+#if defined (PARANOIA)
-+# include <sys/types.h>
-+# include <unistd.h>
-+# include <pwd.h>
-+/* get around the ISC declaration of group */
-+# define group real_group
-+# include <grp.h>
-+# undef group
-+#endif /* PARANOIA */
-+
- static void usage PROTO ((void));
-
- TIME cur_time;
-@@ -204,6 +214,22 @@
- omapi_object_dereference (&listener, MDL);
- }
-
-+#if defined (PARANOIA)
-+/* to be used in one of two possible scenarios */
-+static void setup_chroot (char *chroot_dir) {
-+ if (geteuid())
-+ log_fatal ("you must be root to use chroot");
-+
-+ if (chroot(chroot_dir)) {
-+ log_fatal ("chroot(\"%s\"): %m", chroot_dir);
-+ }
-+ if (chdir ("/")) {
-+ /* probably permission denied */
-+ log_fatal ("chdir(\"/\"): %m");
-+ }
-+}
-+#endif /* PARANOIA */
-+
- int main (argc, argv, envp)
- int argc;
- char **argv, **envp;
-@@ -236,6 +262,14 @@
- char *traceinfile = (char *)0;
- char *traceoutfile = (char *)0;
- #endif
-+#if defined (PARANOIA)
-+ char *set_user = 0;
-+ char *set_group = 0;
-+ char *set_chroot = 0;
-+
-+ uid_t set_uid = 0;
-+ gid_t set_gid = 0;
-+#endif /* PARANOIA */
-
- /* Make sure we have stdin, stdout and stderr. */
- status = open ("/dev/null", O_RDWR);
-@@ -298,6 +332,20 @@
- if (++i == argc)
- usage ();
- server = argv [i];
-+#if defined (PARANOIA)
-+ } else if (!strcmp (argv [i], "-user")) {
-+ if (++i == argc)
-+ usage ();
-+ set_user = argv [i];
-+ } else if (!strcmp (argv [i], "-group")) {
-+ if (++i == argc)
-+ usage ();
-+ set_group = argv [i];
-+ } else if (!strcmp (argv [i], "-chroot")) {
-+ if (++i == argc)
-+ usage ();
-+ set_chroot = argv [i];
-+#endif /* PARANOIA */
- } else if (!strcmp (argv [i], "-cf")) {
- if (++i == argc)
- usage ();
-@@ -397,6 +445,44 @@
- trace_seed_stop, MDL);
- #endif
-
-+#if defined (PARANOIA)
-+ /* get user and group info if those options were given */
-+ if (set_user) {
-+ struct passwd *tmp_pwd;
-+
-+ if (geteuid())
-+ log_fatal ("you must be root to set user");
-+
-+ if (!(tmp_pwd = getpwnam(set_user)))
-+ log_fatal ("no such user: %s", set_user);
-+
-+ set_uid = tmp_pwd->pw_uid;
-+
-+ /* use the user's group as the default gid */
-+ if (!set_group)
-+ set_gid = tmp_pwd->pw_gid;
-+ }
-+
-+ if (set_group) {
-+/* get around the ISC declaration of group */
-+#define group real_group
-+ struct group *tmp_grp;
-+
-+ if (geteuid())
-+ log_fatal ("you must be root to set group");
-+
-+ if (!(tmp_grp = getgrnam(set_group)))
-+ log_fatal ("no such group: %s", set_group);
-+
-+ set_gid = tmp_grp->gr_gid;
-+#undef group
-+ }
-+
-+# if defined (EARLY_CHROOT)
-+ if (set_chroot) setup_chroot (set_chroot);
-+# endif /* EARLY_CHROOT */
-+#endif /* PARANOIA */
-+
- /* Default to the DHCP/BOOTP port. */
- if (!local_port)
- {
-@@ -500,6 +586,10 @@
-
- postconf_initialization (quiet);
-
-+#if defined (PARANOIA) && !defined (EARLY_CHROOT)
-+ if (set_chroot) setup_chroot (set_chroot);
-+#endif /* PARANOIA && !EARLY_CHROOT */
-+
- /* test option should cause an early exit */
- if (cftest && !lftest)
- exit(0);
-@@ -543,6 +633,22 @@
- exit (0);
- }
-
-+#if defined (PARANOIA)
-+ /* change uid to the specified one */
-+
-+ if (set_gid) {
-+ if (setgroups (0, (void *)0))
-+ log_fatal ("setgroups: %m");
-+ if (setgid (set_gid))
-+ log_fatal ("setgid(%d): %m", (int) set_gid);
-+ }
-+
-+ if (set_uid) {
-+ if (setuid (set_uid))
-+ log_fatal ("setuid(%d): %m", (int) set_uid);
-+ }
-+#endif /* PARANOIA */
-+
- /* Read previous pid file. */
- if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
- status = read (i, pbuf, (sizeof pbuf) - 1);
-@@ -888,6 +994,10 @@
-
- log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s",
- "\n [-cf config-file] [-lf lease-file]",
-+#if defined (PARANOIA)
-+ /* meld into the following string */
-+ "\n [-user user] [-group group] [-chroot dir]"
-+#endif /* PARANOIA */
- #if defined (TRACING)
- "\n [-tf trace-output-file]",
- "\n [-play trace-input-file]",
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
deleted file mode 100644
index 518efec..0000000
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- client/scripts/linux
-+++ client/scripts/linux
-@@ -118,9 +118,9 @@
- if [ x$reason = xPREINIT ]; then
- if [ x$alias_ip_address != x ]; then
- # Bring down alias interface. Its routes will disappear too.
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
-- ifconfig $interface 0 up
-+ ifconfig $interface 0.0.0.0 up
-
- # We need to give the kernel some time to get the interface up.
- sleep 1
-@@ -145,12 +145,12 @@
- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- [ x$alias_ip_address != x$old_ip_address ]; then
- # Possible new alias. Remove old alias.
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
- # IP address changed. Bringing down the interface will delete all routes,
- # and clear the ARP cache.
-- ifconfig $interface inet 0 down
-+ ifconfig $interface inet 0.0.0.0
-
- fi
- if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-@@ -171,7 +171,7 @@
- fi
- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
- then
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
- route add -host $alias_ip_address $interface:0
- fi
-@@ -183,11 +183,11 @@
- || [ x$reason = xSTOP ]; then
- if [ x$alias_ip_address != x ]; then
- # Turn off alias interface.
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- if [ x$old_ip_address != x ]; then
- # Shut down interface, which will delete routes and clear arp cache.
-- ifconfig $interface inet 0 down
-+ ifconfig $interface inet 0.0.0.0
- fi
- if [ x$alias_ip_address != x ]; then
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-@@ -198,7 +198,7 @@
-
- if [ x$reason = xTIMEOUT ]; then
- if [ x$alias_ip_address != x ]; then
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- ifconfig $interface inet $new_ip_address $new_subnet_arg \
- $new_broadcast_arg $mtu_arg
-@@ -223,7 +223,7 @@
- make_resolv_conf
- exit_with_hooks 0
- fi
-- ifconfig $interface inet 0 down
-+ ifconfig $interface inet 0.0.0.0
- exit_with_hooks 1
- fi
-
diff --git a/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch
deleted file mode 100644
index 89935df..0000000
--- a/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nuar --exclude '*.orig' dhcp-3.1.3.orig//client/scripts/linux dhcp-3.1.3//client/scripts/linux
---- dhcp-3.1.3.orig//client/scripts/linux 2010-10-15 04:59:15.890664245 +0000
-+++ dhcp-3.1.3//client/scripts/linux 2010-10-15 05:04:57.940396350 +0000
-@@ -118,7 +118,7 @@
- if [ x$reason = xPREINIT ]; then
- if [ x$alias_ip_address != x ]; then
- # Bring down alias interface. Its routes will disappear too.
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
- then
-@@ -127,7 +127,7 @@
- # Add route to make broadcast work. Do not omit netmask.
- route add default dev $interface netmask 0.0.0.0
- else
-- ifconfig $interface 0 up
-+ ifconfig $interface 0.0.0.0 up
- fi
-
- # We need to give the kernel some time to get the interface up.
-@@ -155,12 +155,12 @@
- if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- [ x$alias_ip_address != x$old_ip_address ]; then
- # Possible new alias. Remove old alias.
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
- # IP address changed. Bringing down the interface will delete all routes,
- # and clear the ARP cache.
-- ifconfig $interface inet 0 down
-+ ifconfig $interface inet 0.0.0.0
-
- fi
- if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-@@ -179,7 +179,7 @@
- fi
- if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
- then
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
- route add -host $alias_ip_address $interface:0
- fi
-@@ -191,11 +191,11 @@
- || [ x$reason = xSTOP ]; then
- if [ x$alias_ip_address != x ]; then
- # Turn off alias interface.
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- if [ x$old_ip_address != x ]; then
- # Shut down interface, which will delete routes and clear arp cache.
-- ifconfig $interface inet 0 down
-+ ifconfig $interface inet 0.0.0.0
- fi
- if [ x$alias_ip_address != x ]; then
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-@@ -206,7 +206,7 @@
-
- if [ x$reason = xTIMEOUT ]; then
- if [ x$alias_ip_address != x ]; then
-- ifconfig $interface:0- inet 0
-+ ifconfig $interface:0- inet 0.0.0.0
- fi
- ifconfig $interface inet $new_ip_address $new_subnet_arg \
- $new_broadcast_arg $mtu_arg
-@@ -227,7 +227,7 @@
- make_resolv_conf
- exit_with_hooks 0
- fi
-- ifconfig $interface inet 0 down
-+ ifconfig $interface inet 0.0.0.0
- exit_with_hooks 1
- fi
-
diff --git a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
deleted file mode 100644
index d3f2971..0000000
--- a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -uNr dhcp-4.0.0.ORIG/client/clparse.c dhcp-4.0.0/client/clparse.c
---- dhcp-4.0.0.ORIG/client/clparse.c 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/clparse.c 2008-09-01 11:48:17.000000000 +0100
-@@ -37,7 +37,7 @@
-
- struct client_config top_level_config;
-
--#define NUM_DEFAULT_REQUESTED_OPTS 9
-+#define NUM_DEFAULT_REQUESTED_OPTS 10
- struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
-
- static void parse_client_default_duid(struct parse *cfile);
-@@ -98,15 +98,20 @@
- dhcp_universe.code_hash, &code, 0, MDL);
-
- /* 8 */
-- code = D6O_NAME_SERVERS;
-+ code = DHO_NTP_SERVERS;
- option_code_hash_lookup(&default_requested_options[7],
-- dhcpv6_universe.code_hash, &code, 0, MDL);
-+ dhcp_universe.code_hash, &code, 0, MDL);
-
- /* 9 */
-- code = D6O_DOMAIN_SEARCH;
-+ code = D6O_NAME_SERVERS;
- option_code_hash_lookup(&default_requested_options[8],
- dhcpv6_universe.code_hash, &code, 0, MDL);
-
-+ /* 10 */
-+ code = D6O_DOMAIN_SEARCH;
-+ option_code_hash_lookup(&default_requested_options[9],
-+ dhcpv6_universe.code_hash, &code, 0, MDL);
-+
- for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
- if (default_requested_options[code] == NULL)
- log_fatal("Unable to find option definition for "
-diff -uNr dhcp-4.0.0.ORIG/client/scripts/bsdos dhcp-4.0.0/client/scripts/bsdos
---- dhcp-4.0.0.ORIG/client/scripts/bsdos 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/scripts/bsdos 2008-09-01 11:39:30.000000000 +0100
-@@ -29,6 +29,26 @@
-
- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
- fi
-+ # If we're making confs, may as well make an ntp.conf too
-+ make_ntp_conf
-+}
-+
-+make_ntp_conf() {
-+ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
-+ if [ x$new_ntp_servers != x ]; then
-+ conf="# Generated by dhclient for interface $interface\n"
-+ conf="${conf}restrict default noquery notrust nomodify\n"
-+ conf="${conf}restrict 127.0.0.1\n"
-+ for ntpserver in $new_ntp_servers; do
-+ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
-+ conf="${conf}server $ntpserver\n"
-+ done
-+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
-+ conf="${conf}logfile /var/log/ntp.log\n"
-+ printf "${conf}" > /etc/ntp.conf
-+ chmod 644 /etc/ntp.conf
-+ fi
-+ fi
- }
-
- # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-diff -uNr dhcp-4.0.0.ORIG/client/scripts/freebsd dhcp-4.0.0/client/scripts/freebsd
---- dhcp-4.0.0.ORIG/client/scripts/freebsd 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/scripts/freebsd 2008-09-01 11:39:30.000000000 +0100
-@@ -73,6 +73,26 @@
- fi
- fi
- fi
-+ # If we're making confs, may as well make an ntp.conf too
-+ make_ntp_conf
-+}
-+
-+make_ntp_conf() {
-+ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
-+ if [ "x$new_ntp_servers" != x ]; then
-+ conf="# Generated by dhclient for interface $interface\n"
-+ conf="${conf}restrict default noquery notrust nomodify\n"
-+ conf="${conf}restrict 127.0.0.1\n"
-+ for ntpserver in $new_ntp_servers; do
-+ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
-+ conf="${conf}server $ntpserver\n"
-+ done
-+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
-+ conf="${conf}logfile /var/log/ntp.log\n"
-+ printf "${conf}" > /etc/ntp.conf
-+ chmod 644 /etc/ntp.conf
-+ fi
-+ fi
- }
-
- # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-diff -uNr dhcp-4.0.0.ORIG/client/scripts/linux dhcp-4.0.0/client/scripts/linux
---- dhcp-4.0.0.ORIG/client/scripts/linux 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/scripts/linux 2008-09-01 11:39:30.000000000 +0100
-@@ -55,6 +55,26 @@
-
- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
- fi
-+ # If we're making confs, may as well make an ntp.conf too
-+ make_ntp_conf
-+}
-+
-+make_ntp_conf() {
-+ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
-+ if [ "x$new_ntp_servers" != x ]; then
-+ conf="# Generated by dhclient for interface $interface\n"
-+ conf="${conf}restrict default noquery notrust nomodify\n"
-+ conf="${conf}restrict 127.0.0.1\n"
-+ for ntpserver in $new_ntp_servers; do
-+ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
-+ conf="${conf}server $ntpserver\n"
-+ done
-+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
-+ conf="${conf}logfile /var/log/ntp.log\n"
-+ printf "${conf}" > /etc/ntp.conf
-+ chmod 644 /etc/ntp.conf
-+ fi
-+ fi
- }
-
- # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-diff -uNr dhcp-4.0.0.ORIG/client/scripts/netbsd dhcp-4.0.0/client/scripts/netbsd
---- dhcp-4.0.0.ORIG/client/scripts/netbsd 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/scripts/netbsd 2008-09-01 11:39:30.000000000 +0100
-@@ -29,6 +29,26 @@
-
- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
- fi
-+ # If we're making confs, may as well make an ntp.conf too
-+ make_ntp_conf
-+}
-+
-+make_ntp_conf() {
-+ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
-+ if [ "x$new_ntp_servers" != x ]; then
-+ conf="# Generated by dhclient for interface $interface\n"
-+ conf="${conf}restrict default noquery notrust nomodify\n"
-+ conf="${conf}restrict 127.0.0.1\n"
-+ for ntpserver in $new_ntp_servers; do
-+ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
-+ conf="${conf}server $ntpserver\n"
-+ done
-+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
-+ conf="${conf}logfile /var/log/ntp.log\n"
-+ printf "${conf}" > /etc/ntp.conf
-+ chmod 644 /etc/ntp.conf
-+ fi
-+ fi
- }
-
- # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-diff -uNr dhcp-4.0.0.ORIG/client/scripts/openbsd dhcp-4.0.0/client/scripts/openbsd
---- dhcp-4.0.0.ORIG/client/scripts/openbsd 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/scripts/openbsd 2008-09-01 11:39:30.000000000 +0100
-@@ -29,6 +29,26 @@
-
- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
- fi
-+ # If we're making confs, may as well make an ntp.conf too
-+ make_ntp_conf
-+}
-+
-+make_ntp_conf() {
-+ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
-+ if [ "x$new_ntp_servers" != x ]; then
-+ conf="# Generated by dhclient for interface $interface\n"
-+ conf="${conf}restrict default noquery notrust nomodify\n"
-+ conf="${conf}restrict 127.0.0.1\n"
-+ for ntpserver in $new_ntp_servers; do
-+ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
-+ conf="${conf}server $ntpserver\n"
-+ done
-+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
-+ conf="${conf}logfile /var/log/ntp.log\n"
-+ printf "${conf}" > /etc/ntp.conf
-+ chmod 644 /etc/ntp.conf
-+ fi
-+ fi
- }
-
- # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
-diff -uNr dhcp-4.0.0.ORIG/client/scripts/solaris dhcp-4.0.0/client/scripts/solaris
---- dhcp-4.0.0.ORIG/client/scripts/solaris 2008-09-01 11:38:51.000000000 +0100
-+++ dhcp-4.0.0/client/scripts/solaris 2008-09-01 11:39:30.000000000 +0100
-@@ -17,6 +17,26 @@
-
- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- fi
-+ # If we're making confs, may as well make an ntp.conf too
-+ make_ntp_conf
-+}
-+
-+make_ntp_conf() {
-+ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
-+ if [ "x$new_ntp_servers" != x ]; then
-+ conf="# Generated by dhclient for interface $interface\n"
-+ conf="${conf}restrict default noquery notrust nomodify\n"
-+ conf="${conf}restrict 127.0.0.1\n"
-+ for ntpserver in $new_ntp_servers; do
-+ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
-+ conf="${conf}server $ntpserver\n"
-+ done
-+ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
-+ conf="${conf}logfile /var/log/ntp.log\n"
-+ printf "${conf}" > /etc/ntp.conf
-+ chmod 644 /etc/ntp.conf
-+ fi
-+ fi
- }
-
- # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch
deleted file mode 100644
index f882a13..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-ripped from Fedora & tweaked
-
---- dhcp-4.2.0/omapip/errwarn.c
-+++ dhcp-4.2.0/omapip/errwarn.c
-@@ -76,20 +76,13 @@
-
- #if !defined (NOMINUM)
- log_error ("%s", "");
-- log_error ("If you did not get this software from ftp.isc.org, please");
-- log_error ("get the latest from ftp.isc.org and install that before");
-- log_error ("requesting help.");
-+ log_error ("This version of ISC DHCP is based on the release available");
-+ log_error ("on ftp.isc.org. Features have been added and other changes");
-+ log_error ("have been made to the base software release in order to make");
-+ log_error ("it work better with this distribution.");
- log_error ("%s", "");
-- log_error ("If you did get this software from ftp.isc.org and have not");
-- log_error ("yet read the README, please read it before requesting help.");
-- log_error ("If you intend to request help from the dhcp-server@isc.org");
-- log_error ("mailing list, please read the section on the README about");
-- log_error ("submitting bug reports and requests for help.");
-- log_error ("%s", "");
-- log_error ("Please do not under any circumstances send requests for");
-- log_error ("help directly to the authors of this software - please");
-- log_error ("send them to the appropriate mailing list as described in");
-- log_error ("the README file.");
-+ log_error ("Please report for this software via the Gentoo Bugzilla site:");
-+ log_error (" http://bugs.gentoo.org/");
- log_error ("%s", "");
- log_error ("exiting.");
- #endif
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
deleted file mode 100644
index ae33638..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-bind-build-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-bind sets up BUILD_XXX vars for building native tools, but then
-doesn't use them for the "gen" tool
-
---- a/bind/lib/export/dns/Makefile.in
-+++ b/bind/lib/export/dns/Makefile.in
-@@ -166,7 +166,7 @@
- ./gen -s ${srcdir} > code.h
-
- gen: ${srcdir}/gen.c
-- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+ ${BUILD_CC} ${BUILD_CFLAGS} ${CINCLUDES} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
-
- #We don't need rbtdb64 for this library
- #rbtdb64.@O@: rbtdb.c
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch
deleted file mode 100644
index 4c7810e..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-bind-disable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-we take care of building this ourselves in the ebuild so
-build settings are properly respected
-
---- dhcp-4.2.2/bind/Makefile
-+++ dhcp-4.2.2/bind/Makefile
-@@ -29,6 +29,7 @@
- bindsrcdir=bind-${version}
-
- all:
-+disable:
- # Extract the source from the tarball, if it hasn't been already.
- @if test -d ${bindsrcdir} ; then \
- echo ${bindsrcdir} already unpacked... ; \
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch b/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
deleted file mode 100644
index 6136154..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-bind-parallel-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix the bind subdir parallel builds
-
-https://bugs.gentoo.org/380717
-
---- a/bind/lib/export/isc/Makefile.in
-+++ b/bind/lib/export/isc/Makefile.in
-@@ -114,6 +114,7 @@
- -DLIBAGE=${LIBAGE} \
- -c ${srcdir}/version.c
-
-+${OBJS}: | subdirs
- libisc.@SA@: ${OBJS}
- ${AR} ${ARFLAGS} $@ ${OBJS}
- ${RANLIB} $@
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch
deleted file mode 100644
index 28080a8..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-resolvconf.patch
+++ /dev/null
@@ -1,409 +0,0 @@
---- a/client/scripts/bsdos
-+++ b/client/scripts/bsdos
-@@ -1,40 +1,46 @@
- #!/bin/sh
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
- if [ "x$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_search}\n"
- elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >> /etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id='';;
- esac
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/freebsd
-+++ b/client/scripts/freebsd
-@@ -11,73 +11,45 @@
- fi
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- ( cat /dev/null > /etc/resolv.conf.dhclient )
-- exit_status=$?
-- if [ $exit_status -ne 0 ]; then
-- $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
-- else
-- if [ "x$new_domain_search" != x ]; then
-- ( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
-- exit_status=$?
-- elif [ "x$new_domain_name" != x ]; then
-- # Note that the DHCP 'Domain Name Option' is really just a domain
-- # name, and that this practice of using the domain name option as
-- # a search path is both nonstandard and deprecated.
-- ( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
-- exit_status=$?
-- fi
-- for nameserver in $new_domain_name_servers; do
-- if [ $exit_status -ne 0 ]; then
-- break
-- fi
-- ( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
-- exit_status=$?
-- done
--
-- # If there were no errors, attempt to mv the new file into place.
-- if [ $exit_status -eq 0 ]; then
-- ( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
-- exit_status=$?
-- fi
--
-- if [ $exit_status -ne 0 ]; then
-- $LOGGER "Error while writing new /etc/resolv.conf."
-- fi
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
-+ # Note that the DHCP 'Domain Name Option' is really just a domain
-+ # name, and that this practice of using the domain name option as
-+ # a search path is both nonstandard and deprecated.
-+ conf="${conf}search ${new_domain_name}\n"
- fi
-+ for nameserver in $new_domain_name_servers; do
-+ conf="${conf}nameserver ${nameserver}\n"
-+ done
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- ( cat /dev/null > /etc/resolv.conf.dhclient6 )
-- exit_status=$?
-- if [ $exit_status -ne 0 ] ; then
-- $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status"
-- else
-- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- ( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 )
-- exit_status=$?
-- fi
-- for nameserver in ${new_dhcp6_name_servers} ; do
-- if [ $exit_status -ne 0 ] ; then
-- break
-- fi
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id='';;
- esac
-- ( echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 )
-- exit_status=$?
-- done
--
-- if [ $exit_status -eq 0 ] ; then
-- ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf )
-- exit_status=$?
-- fi
-+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
-+ fi
-+ for nameserver in ${new_dhcp6_name_servers} ; do
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
-+ done
-+ fi
-
-- if [ $exit_status -ne 0 ] ; then
-- $LOGGER "Error while writing new /etc/resolv.conf."
-- fi
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
- fi
- fi
- }
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -26,44 +26,49 @@
- ip=/sbin/ip
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- chmod 644 /etc/resolv.conf.dhclient
-- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ x"$new_domain_name" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- shopt -s nocasematch
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- if [[ "$nameserver" =~ ^fe80:: ]]
- then
- zone_id="%$interface"
- else
- zone_id=
- fi
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
- shopt -u nocasematch
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/netbsd
-+++ b/client/scripts/netbsd
-@@ -1,40 +1,46 @@
- #!/bin/sh
-
- make_resolv_conf() {
-- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- if [ "x$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ "x$new_domain_name" != x ]; then
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
-+ if [ x"$new_domain_name_servers" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id='';;
- esac
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/openbsd
-+++ b/client/scripts/openbsd
-@@ -1,40 +1,46 @@
- #!/bin/sh
-
- make_resolv_conf() {
-- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ x"$new_domain_name" != x ]; then
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
-+ if [ x"$new_domain_name_servers" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id='';;
- esac
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/solaris
-+++ b/client/scripts/solaris
-@@ -1,21 +1,39 @@
- #!/bin/sh
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ x"$new_domain_name" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
-+ done
-+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
-+ fi
-+ for nameserver in ${new_dhcp6_name_servers} ; do
-+ conf="${conf}nameserver ${nameserver}\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
deleted file mode 100644
index bf5a54c..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-dhclient-stdin-conf.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- dhcp-4.2.2/client/clparse.c
-+++ dhcp-4.2.2/client/clparse.c
-@@ -182,6 +182,10 @@ isc_result_t read_client_conf ()
- #endif
- }
-
-+ /* Read any extra configuration from stdin */
-+ extern int read_client_conf_stdin (struct interface_info *ip, struct client_config *client);
-+ read_client_conf_stdin (NULL, &top_level_config);
-+
- /* Set up state and config structures for clients that don't
- have per-interface configuration statements. */
- config = (struct client_config *)0;
-@@ -211,23 +215,13 @@ isc_result_t read_client_conf ()
- return status;
- }
-
--int read_client_conf_file (const char *name, struct interface_info *ip,
-+int read_client_conf_actual (struct parse *cfile, struct interface_info *ip,
- struct client_config *client)
- {
-- int file;
-- struct parse *cfile;
- const char *val;
- int token;
- isc_result_t status;
-
-- if ((file = open (name, O_RDONLY)) < 0)
-- return uerr2isc (errno);
--
-- cfile = NULL;
-- status = new_parse(&cfile, file, NULL, 0, path_dhclient_conf, 0);
-- if (status != ISC_R_SUCCESS || cfile == NULL)
-- return status;
--
- do {
- token = peek_token (&val, (unsigned *)0, cfile);
- if (token == END_OF_FILE)
-@@ -238,10 +232,74 @@ int read_client_conf_file (const char *name, struct interface_info *ip,
- status = (cfile -> warnings_occurred
- ? DHCP_R_BADPARSE
- : ISC_R_SUCCESS);
-+ return status;
-+}
-+
-+int read_client_conf_file (const char *name, struct interface_info *ip,
-+ struct client_config *client)
-+{
-+ int file;
-+ struct parse *cfile;
-+ isc_result_t status;
-+
-+ if ((file = open (name, O_RDONLY)) < 0)
-+ return uerr2isc (errno);
-+
-+ cfile = (struct parse *)0;
-+ new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
-+ status = read_client_conf_actual(cfile, ip, client);
- end_parse (&cfile);
- return status;
- }
-
-+int read_client_conf_stdin (struct interface_info *ip,
-+ struct client_config *client)
-+{
-+ int file;
-+ char *buffer = NULL, *p;
-+ unsigned buflen, len = 0;
-+ struct parse *cfile;
-+ size_t bytes;
-+ isc_result_t status;
-+
-+ file = fileno(stdin);
-+ if (isatty (file))
-+ return ISC_R_NOTFOUND;
-+ if (fcntl (file, F_SETFL, O_NONBLOCK) < 0)
-+ log_fatal ("could not set stdin to non blocking!");
-+
-+ buflen = BUFSIZ;
-+ buffer = malloc (BUFSIZ + 1);
-+ p = buffer;
-+ do {
-+ bytes = read (file, p, BUFSIZ);
-+ if (bytes == 0)
-+ break;
-+ if (bytes == -1)
-+ log_fatal ("failed to read stdin!");
-+ if (bytes >= BUFSIZ) {
-+ buflen += BUFSIZ;
-+ len += BUFSIZ;
-+ buffer = realloc (buffer, buflen + 1);
-+ if (!buffer)
-+ log_fatal ("not enough buffer to read stdin!");
-+ p = buffer + len;
-+ } else {
-+ len += bytes;
-+ break;
-+ }
-+ } while(1);
-+ buffer[len] = '\0';
-+
-+ cfile = (struct parse *)0;
-+ status = new_parse (&cfile, -1, buffer, len, "stdin", 0);
-+ if (status == ISC_R_SUCCESS) {
-+ status = read_client_conf_actual (cfile, ip, client);
-+ end_parse (&cfile);
-+ }
-+ free(buffer);
-+ return status;
-+}
-
- /* lease-file :== client-lease-statements END_OF_FILE
- client-lease-statements :== <nil>
diff --git a/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch b/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch
deleted file mode 100644
index 27fb2b0..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.2-nogateway.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://bugs.gentoo.org/265531
-
---- dhcp-4.2.2/client/scripts/linux
-+++ dhcp-4.2.2/client/scripts/linux
-@@ -193,12 +193,14 @@
- ifconfig $interface inet $new_ip_address $new_subnet_arg \
- $new_broadcast_arg $mtu_arg
- # Add a network route to the computed network address.
-- for router in $new_routers; do
-- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-- fi
-- route add default gw $router $metric_arg dev $interface
-- done
-+ if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
-+ for router in $new_routers; do
-+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-+ route add -host $router dev $interface
-+ fi
-+ route add default gw $router $metric_arg dev $interface
-+ done
-+ fi
- else
- # we haven't changed the address, have we changed other options
- # that we wish to update?
-@@ -244,12 +246,14 @@
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
- route add -host $alias_ip_address dev $interface:0
- fi
-- for router in $new_routers; do
-- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-- route add -host $router dev $interface
-- fi
-- route add default gw $router $metric_arg dev $interface
-- done
-+ if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
-+ for router in $new_routers; do
-+ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-+ route add -host $router dev $interface
-+ fi
-+ route add default gw $router $metric_arg dev $interface
-+ done
-+ fi
- make_resolv_conf
- exit_with_hooks 0
- fi
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
deleted file mode 100644
index 6cec86c..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/437108
-
-always accept the -4 option even if we don't have IPv6 support enabled.
-the relay code does this already.
-
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -170,8 +170,8 @@ main(int argc, char **argv) {
- if (!strcmp(argv[i], "-r")) {
- release_mode = 1;
- no_daemon = 1;
--#ifdef DHCPv6
- } else if (!strcmp(argv[i], "-4")) {
-+#ifdef DHCPv6
- if (local_family_set && local_family != AF_INET)
- log_fatal("Client can only do v4 or v6, not "
- "both.");
---- a/server/dhcpd.c
-+++ b/server/dhcpd.c
-@@ -373,8 +373,8 @@ main(int argc, char **argv) {
- } else if (!strcmp (argv [i], "-q")) {
- quiet = 1;
- quiet_interface_discovery = 1;
--#ifdef DHCPv6
- } else if (!strcmp(argv[i], "-4")) {
-+#ifdef DHCPv6
- if (local_family_set && (local_family != AF_INET)) {
- log_fatal("Server cannot run in both IPv4 and "
- "IPv6 mode at the same time.");
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch
deleted file mode 100644
index 66a1fcd..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/296921
-
-`ping -q` will still print out summary information. send that to /dev/null.
-
-patch by Martin Mokrejš
-
---- a/client/scripts/bsdos
-+++ b/client/scripts/bsdos
-@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
- sleep 1
- if [ "$new_routers" != "" ]; then
- set $new_routers
-- if ping -q -c 1 -w 1 $1; then
-+ if ping -q -c 1 -w 1 $1 >/dev/null; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
- ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
---- a/client/scripts/freebsd
-+++ b/client/scripts/freebsd
-@@ -284,7 +284,7 @@ if [ x$reason = xTIMEOUT ]; then
- if [ -n "$new_routers" ]; then
- $LOGGER "New Routers: $new_routers"
- set -- $new_routers
-- if ping -q -c 1 $1; then
-+ if ping -q -c 1 $1 >/dev/null; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
- ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -253,7 +253,7 @@ if [ x$reason = xTIMEOUT ]; then
- ifconfig $interface inet $new_ip_address $new_subnet_arg \
- $new_broadcast_arg $mtu_arg
- set $new_routers
-- if ping -q -c 1 $1; then
-+ if ping -q -c 1 $1 >/dev/null; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
- ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
---- a/client/scripts/netbsd
-+++ b/client/scripts/netbsd
-@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then
- sleep 1
- if [ "$new_routers" != "" ]; then
- set $new_routers
-- if ping -q -c 1 -w 1 $1; then
-+ if ping -q -c 1 -w 1 $1 >/dev/null; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
- ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
---- a/client/scripts/openbsd
-+++ b/client/scripts/openbsd
-@@ -245,7 +245,7 @@ if [ x$reason = xTIMEOUT ]; then
- sleep 1
- if [ "$new_routers" != "" ]; then
- set $new_routers
-- if ping -q -c 1 -w 1 $1; then
-+ if ping -q -c 1 -w 1 $1 >/dev/null; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
- ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg
---- a/client/scripts/openwrt
-+++ b/client/scripts/openwrt
-@@ -186,7 +186,7 @@ if [ x$reason = xTIMEOUT ]; then
- ifconfig $interface $new_ip_address $new_subnet_arg \
- $new_broadcast_arg $mtu_arg $metric_arg
- set $new_routers
-- if ping -q -c 1 $1; then
-+ if ping -q -c 1 $1 >/dev/null; then
- if [ x$new_ip_address != x$alias_ip_address ] && \
- [ x$alias_ip_address != x ]; then
- ifconfig $interface:0 $alias_ip_address $alias_subnet_arg
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch b/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
deleted file mode 100644
index 77254c3..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.5-bindtodevice-inet6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/471142
-
-snipped from fedora
-
-# dhclient -6: bind socket to interface (#1001742)
-# (Submitted to dhcp-bugs@isc.org - [ISC-Bugs #34784])
-
-diff -up dhcp-4.2.5/common/socket.c.bindtodevice_inet6 dhcp-4.2.5/common/socket.c
---- dhcp-4.2.5/common/socket.c.bindtodevice_inet6 2013-09-17 16:47:05.000000000 +0200
-+++ dhcp-4.2.5/common/socket.c 2013-09-17 16:48:18.975997842 +0200
-@@ -245,7 +245,7 @@ if_register_socket(struct interface_info
-
- #if defined(SO_BINDTODEVICE)
- /* Bind this socket to this interface. */
-- if ((local_family != AF_INET6) && (info->ifp != NULL) &&
-+ if (((do_multicast == 0)||(*do_multicast == 0)) && (info->ifp != NULL) &&
- setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE,
- (char *)(info -> ifp), sizeof(*(info -> ifp))) < 0) {
- log_fatal("setsockopt: SO_BINDTODEVICE: %m");
diff --git a/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch b/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch
deleted file mode 100644
index ea223ed..0000000
--- a/net-misc/dhcp/files/dhcp-4.2.5-iproute2-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-find `ip` via $PATH and not hardcoded path
-
-https://bugs.gentoo.org/480636
-
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -23,7 +23,7 @@
- # of the $1 in its args.
-
- # 'ip' just looks too weird. /sbin/ip looks less weird.
--ip=/sbin/ip
-+ip=ip
-
- make_resolv_conf() {
- if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
diff --git a/net-misc/dhcp/files/dhcp-4.3.1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.3.1-dhclient-resolvconf.patch
deleted file mode 100644
index 71d3f2c..0000000
--- a/net-misc/dhcp/files/dhcp-4.3.1-dhclient-resolvconf.patch
+++ /dev/null
@@ -1,411 +0,0 @@
-resolvconf support in dhclient-script
-
---- a/client/scripts/bsdos
-+++ b/client/scripts/bsdos
-@@ -1,40 +1,46 @@
- #!/bin/sh
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
- if [ "x$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_search}\n"
- elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >> /etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id="";;
- esac
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/freebsd
-+++ b/client/scripts/freebsd
-@@ -11,73 +11,45 @@
- fi
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- ( cat /dev/null > /etc/resolv.conf.dhclient )
-- exit_status=$?
-- if [ $exit_status -ne 0 ]; then
-- $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
-- else
-- if [ "x$new_domain_search" != x ]; then
-- ( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
-- exit_status=$?
-- elif [ "x$new_domain_name" != x ]; then
-- # Note that the DHCP 'Domain Name Option' is really just a domain
-- # name, and that this practice of using the domain name option as
-- # a search path is both nonstandard and deprecated.
-- ( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
-- exit_status=$?
-- fi
-- for nameserver in $new_domain_name_servers; do
-- if [ $exit_status -ne 0 ]; then
-- break
-- fi
-- ( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
-- exit_status=$?
-- done
--
-- # If there were no errors, attempt to mv the new file into place.
-- if [ $exit_status -eq 0 ]; then
-- ( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
-- exit_status=$?
-- fi
--
-- if [ $exit_status -ne 0 ]; then
-- $LOGGER "Error while writing new /etc/resolv.conf."
-- fi
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
-+ # Note that the DHCP 'Domain Name Option' is really just a domain
-+ # name, and that this practice of using the domain name option as
-+ # a search path is both nonstandard and deprecated.
-+ conf="${conf}search ${new_domain_name}\n"
- fi
-+ for nameserver in $new_domain_name_servers; do
-+ conf="${conf}nameserver ${nameserver}\n"
-+ done
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- ( cat /dev/null > /etc/resolv.conf.dhclient6 )
-- exit_status=$?
-- if [ $exit_status -ne 0 ] ; then
-- $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status"
-- else
-- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- ( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 )
-- exit_status=$?
-- fi
-- for nameserver in ${new_dhcp6_name_servers} ; do
-- if [ $exit_status -ne 0 ] ; then
-- break
-- fi
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id="";;
- esac
-- ( echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 )
-- exit_status=$?
-- done
--
-- if [ $exit_status -eq 0 ] ; then
-- ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf )
-- exit_status=$?
-- fi
-+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
-+ fi
-+ for nameserver in ${new_dhcp6_name_servers} ; do
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
-+ done
-+ fi
-
-- if [ $exit_status -ne 0 ] ; then
-- $LOGGER "Error while writing new /etc/resolv.conf."
-- fi
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
- fi
- fi
- }
---- a/client/scripts/linux
-+++ b/client/scripts/linux
-@@ -26,44 +26,49 @@
- ip=/sbin/ip
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- chmod 644 /etc/resolv.conf.dhclient
-- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ x"$new_domain_name" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- shopt -s nocasematch
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- if [[ "$nameserver" =~ ^fe80:: ]]
- then
- zone_id="%$interface"
- else
- zone_id=
- fi
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
- shopt -u nocasematch
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/netbsd
-+++ b/client/scripts/netbsd
-@@ -1,40 +1,46 @@
- #!/bin/sh
-
- make_resolv_conf() {
-- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- if [ "x$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ "x$new_domain_name" != x ]; then
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
-+ if [ x"$new_domain_name_servers" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id="";;
- esac
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/openbsd
-+++ b/client/scripts/openbsd
-@@ -1,40 +1,46 @@
- #!/bin/sh
-
- make_resolv_conf() {
-- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ x"$new_domain_name" != x ]; then
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
-+ if [ x"$new_domain_name_servers" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
- done
--
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
- elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-- cat /dev/null > /etc/resolv.conf.dhclient6
-- chmod 644 /etc/resolv.conf.dhclient6
--
- if [ "x${new_dhcp6_domain_search}" != x ] ; then
-- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
- fi
- for nameserver in ${new_dhcp6_name_servers} ; do
- # If the nameserver has a link-local address
- # add a <zone_id> (interface name) to it.
- case $nameserver in
- fe80:*) zone_id="%$interface";;
- FE80:*) zone_id="%$interface";;
- *) zone_id="";;
- esac
-- echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
-+ conf="${conf}nameserver ${nameserver}$zone_id\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
---- a/client/scripts/solaris
-+++ b/client/scripts/solaris
-@@ -1,21 +1,39 @@
- #!/bin/sh
-
- make_resolv_conf() {
-+ if [ x"$PEER_DNS" != x ] && [ x"$PEER_DNS" != xyes ]; then
-+ return 0
-+ fi
-+ local conf=
- if [ x"$new_domain_name_servers" != x ]; then
-- cat /dev/null > /etc/resolv.conf.dhclient
-- if [ x"$new_domain_search" != x ]; then
-- echo search $new_domain_search >> /etc/resolv.conf.dhclient
-- elif [ x"$new_domain_name" != x ]; then
-+ if [ "x$new_domain_search" != x ]; then
-+ conf="${conf}search ${new_domain_search}\n"
-+ elif [ "x$new_domain_name" != x ]; then
- # Note that the DHCP 'Domain Name Option' is really just a domain
- # name, and that this practice of using the domain name option as
- # a search path is both nonstandard and deprecated.
-- echo search $new_domain_name >> /etc/resolv.conf.dhclient
-+ conf="${conf}search ${new_domain_name}\n"
- fi
- for nameserver in $new_domain_name_servers; do
-- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
-+ conf="${conf}nameserver ${nameserver}\n"
-+ done
-+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
-+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
-+ conf="${conf}search ${new_dhcp6_domain_search}\n"
-+ fi
-+ for nameserver in ${new_dhcp6_name_servers} ; do
-+ conf="${conf}nameserver ${nameserver}\n"
- done
-+ fi
-
-- mv /etc/resolv.conf.dhclient /etc/resolv.conf
-+ if [ x"$conf" != x ]; then
-+ conf="# Generated by dhclient or interface $interface\n${conf}"
-+ if type resolvconf >/dev/null 2>&1; then
-+ printf "${conf}" | resolvconf -a $interface
-+ else
-+ printf "${conf}" > /etc/resolv.conf
-+ chmod 644 /etc/resolv.conf
-+ fi
- fi
- }
-
diff --git a/net-misc/dhcp/files/dhcp-4.3.2-fix-compilation-for-musl.patch b/net-misc/dhcp/files/dhcp-4.3.2-fix-compilation-for-musl.patch
deleted file mode 100644
index 841f727..0000000
--- a/net-misc/dhcp/files/dhcp-4.3.2-fix-compilation-for-musl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur dhcp-4.3.2.orig/dst/dst_api.c dhcp-4.3.2/dst/dst_api.c
---- dhcp-4.3.2.orig/dst/dst_api.c 2015-02-26 20:35:43.000000000 +0100
-+++ dhcp-4.3.2/dst/dst_api.c 2015-05-19 01:11:22.520053688 +0200
-@@ -49,6 +49,7 @@
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
-
- #include "cdefs.h"
-diff -Naur dhcp-4.3.2.orig/dst/dst_internal.h dhcp-4.3.2/dst/dst_internal.h
---- dhcp-4.3.2.orig/dst/dst_internal.h 2015-02-26 20:35:43.000000000 +0100
-+++ dhcp-4.3.2/dst/dst_internal.h 2015-05-19 01:02:22.090054505 +0200
-@@ -20,6 +20,7 @@
- */
- #include <limits.h>
- #include <sys/param.h>
-+#include <sys/types.h>
-
- #ifndef PATH_MAX
- # ifdef POSIX_PATH_MAX
-diff -Naur dhcp-4.3.2.orig/dst/dst_support.c dhcp-4.3.2/dst/dst_support.c
---- dhcp-4.3.2.orig/dst/dst_support.c 2015-02-26 20:35:43.000000000 +0100
-+++ dhcp-4.3.2/dst/dst_support.c 2015-05-19 01:10:29.790053768 +0200
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
-+#include <sys/types.h>
-
- #include "cdefs.h"
- #include "osdep.h"
-diff -Naur dhcp-4.3.2.orig/dst/hmac_link.c dhcp-4.3.2/dst/hmac_link.c
---- dhcp-4.3.2.orig/dst/hmac_link.c 2015-02-26 20:35:43.000000000 +0100
-+++ dhcp-4.3.2/dst/hmac_link.c 2015-05-19 01:12:14.190053610 +0200
-@@ -31,6 +31,7 @@
- #include <sys/time.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
-+#include <sys/types.h>
-
- #include "cdefs.h"
- #include "osdep.h"
diff --git a/net-misc/dhcp/files/dhcpd.conf2 b/net-misc/dhcp/files/dhcpd.conf2
deleted file mode 100644
index 5cd2eec..0000000
--- a/net-misc/dhcp/files/dhcpd.conf2
+++ /dev/null
@@ -1,28 +0,0 @@
-# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd
-
-# If you require more than one instance of dhcpd you can create symbolic
-# links to dhcpd service like so
-# cd /etc/init.d
-# ln -s dhcpd dhcpd.foo
-# cd ../conf.d
-# cp dhcpd dhcpd.foo
-# Now you can edit dhcpd.foo and specify a different configuration file.
-# You'll also need to specify a pidfile in that dhcpd.conf file.
-# See the pid-file-name option in the dhcpd.conf man page for details.
-
-# If you wish to run dhcpd in a chroot, uncomment the following line
-# DHCPD_CHROOT="/var/lib/dhcp/chroot"
-
-# All file paths below are relative to the chroot.
-# You can specify a different chroot directory but MAKE SURE it's empty.
-
-# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
-# DHCPD_CONF="/etc/dhcp/dhcpd.conf"
-
-# Configure which interface or interfaces to for dhcpd to listen on.
-# List all interfaces space separated. If this is not specified then
-# we listen on all interfaces.
-# DHCPD_IFACE=""
-
-# Insert any other dhcpd options - see the man page for a full list.
-# DHCPD_OPTS=""
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
deleted file mode 100755
index 65148e0..0000000
--- a/net-misc/dhcp/files/dhcpd.init5
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init5,v 1.6 2015/02/10 00:27:08 polynomial-c Exp $
-
-extra_commands="configtest"
-
-: ${DHCPD_CONF:=/etc/dhcp/${SVCNAME}.conf}
-
-depend() {
- need net
- use logger dns #@slapd@
-}
-
-get_var() {
- local var="$(sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' "${chroot}${DHCPD_CONF}")"
- echo ${var:-$2}
-}
-
-checkconfig() {
- set -- ${DHCPD_OPTS} ${chroot:+-chroot} ${chroot} -t
-
- dhcpd "$@" 1>/dev/null 2>&1
- local ret=$?
- if [ ${ret} -ne 0 ] ; then
- eerror "${SVCNAME} has detected a syntax error in your configuration files:"
- dhcpd "$@"
- fi
-
- return ${ret}
-}
-
-configtest() {
- local chroot=${DHCPD_CHROOT%/}
-
- ebegin "Checking ${SVCNAME} configuration"
- checkconfig
- eend $?
-}
-
-start() {
- local chroot=${DHCPD_CHROOT%/}
-
- # Work out our cffile if it's in our DHCPD_OPTS
- case " ${DHCPD_OPTS} " in
- *" -cf "*)
- DHCPD_CONF=" ${DHCPD_OPTS} "
- DHCPD_CONF="${DHCPD_CONF##* -cf }"
- DHCPD_CONF="${DHCPD_CONF%% *}"
- ;;
- *) DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
- ;;
- esac
-
- if [ -n "${chroot}" ] ; then
- # the config test want's these to exist
- mkdir -p \
- "${chroot}"/var/run/dhcp \
- "${chroot}"/var/lib/dhcp \
- "${chroot}"/etc/dhcp
- fi
-
- # see comment in get_var() above
- if [ ! -f "${chroot}${DHCPD_CONF}" ] ; then
- eerror "${chroot}${DHCPD_CONF} does not exist"
- return 1
- fi
-
- checkconfig || return 1
-
- checkpath -d -o dhcp:dhcp "${chroot}"/var/run/dhcp "${chroot}"/var/lib/dhcp
-
- local leasefile="$(get_var lease-file-name /var/lib/dhcp/${SVCNAME}.leases)"
- checkpath -f -o dhcp:dhcp "${chroot}${leasefile}"
-
- # Setup LD_PRELOAD so name resolution works in our chroot.
- if [ -n "${chroot}" ] ; then
- checkpath -d -o root:root -m 755 "${chroot}"/dev "${chroot}"/etc "${chroot}"/proc
- cp -pP /etc/localtime /etc/resolv.conf "${chroot}"/etc/
- export LD_PRELOAD="${LD_PRELOAD} libresolv.so libnss_dns.so"
- if ! mountinfo -q "${chroot}/proc" ; then
- mount --bind /proc "${chroot}/proc"
- fi
- fi
-
- local pidfile="$(get_var pid-file-name /var/run/dhcp/${SVCNAME}.pid)"
-
- ebegin "Starting ${chroot:+chrooted }${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/dhcpd \
- --pidfile "${chroot}/${pidfile}" \
- -- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
- -user dhcp -group dhcp \
- ${chroot:+-chroot} ${chroot} ${DHCPD_IFACE}
- eend $? \
- && save_options dhcpd_chroot "${chroot}" \
- && save_options pidfile "${pidfile}"
-}
-
-stop() {
- local chroot="$(get_options dhcpd_chroot)"
- [ -z "$chroot" ] && chroot="$(get_options chroot)"
-
- ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/dhcpd \
- --pidfile "${chroot}/$(get_options pidfile)"
- res=$?
-
- if [ ${res} -eq 0 ] && [ -n "${chroot}" ] ; then
- if mountinfo -q "${chroot}/proc" ; then
- umount "${chroot}/proc"
- fi
- fi
-
- eend $res
-}
diff --git a/net-misc/dhcp/files/dhcpd.tmpfiles b/net-misc/dhcp/files/dhcpd.tmpfiles
deleted file mode 100644
index ee2f4de..0000000
--- a/net-misc/dhcp/files/dhcpd.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/lib/dhcp/ 0755 dhcp dhcp
-f /var/lib/dhcp/dhcpd.leases 0644 dhcp dhcp
\ No newline at end of file
diff --git a/net-misc/dhcp/files/dhcpd4.service b/net-misc/dhcp/files/dhcpd4.service
deleted file mode 100644
index b064bd9..0000000
--- a/net-misc/dhcp/files/dhcpd4.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=DHCPv4 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-ExecStart=/usr/sbin/dhcpd -f -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcpd6.service b/net-misc/dhcp/files/dhcpd6.service
deleted file mode 100644
index 603cacd..0000000
--- a/net-misc/dhcp/files/dhcpd6.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=DHCPv6 Server Daemon
-Documentation=man:dhcpd(8) man:dhcpd.conf(5)
-After=network.target
-After=time-sync.target
-
-[Service]
-ExecStart=/usr/sbin/dhcpd -f -s -6 -cf /etc/dhcp/dhcpd.conf -user dhcp -group dhcp --no-pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
deleted file mode 100644
index 4469968..0000000
--- a/net-misc/dhcp/files/dhcrelay.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay
-
-# Configure which interface or interfaces to for dhcrelay to listen on
-# and send to.
-# List all interfaces space separated. If this is not specified then
-# we use all interfaces.
-#IFACE=""
-# If you have split net interfaces, you might want to depend on them
-# explicitly here.
-#rc_need=$(printf 'net.%s ' ${IFACE})
-
-# Insert any other options needed. See dhcrelay(8) for details.
-#DHCRELAY_OPTS=""
-
-# Space separated list of IPs to forward BOOTP/DHCP packets to.
-DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.init3 b/net-misc/dhcp/files/dhcrelay.init3
deleted file mode 100755
index fe4ec8c..0000000
--- a/net-misc/dhcp/files/dhcrelay.init3
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init3,v 1.3 2012/11/11 21:42:02 vapier Exp $
-
-depend() {
- need net
- use logger #@slapd@
-}
-
-start() {
- if [ -z "${DHCRELAY_SERVERS}" ] ; then
- eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/${SVCNAME}"
- return 1
- fi
-
- checkpath -d /var/run/dhcp
-
- local iface_opts
- if [ -n "${IFACE}" ] ; then
- iface_opts=$(printf -- '-i %s ' ${IFACE})
- fi
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/dhcrelay \
- -- -q ${iface_opts} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile /var/run/dhcp/${SVCNAME}.pid
- eend $?
-}
diff --git a/net-misc/dhcp/files/dhcrelay4.service b/net-misc/dhcp/files/dhcrelay4.service
deleted file mode 100644
index 09e835d..0000000
--- a/net-misc/dhcp/files/dhcrelay4.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-Documentation=man:dhcrelay(8)
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/dhcrelay -d --no-pid $DHCRELAY_SERVERS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcrelay4.service.conf b/net-misc/dhcp/files/dhcrelay4.service.conf
deleted file mode 100644
index 1a0465b..0000000
--- a/net-misc/dhcp/files/dhcrelay4.service.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Space separated list of IPs to forward BOOTP/DHCP packets to.
-[Service]
-Environment="DHCRELAY_SERVERS="
\ No newline at end of file
diff --git a/net-misc/dhcp/files/dhcrelay6.conf b/net-misc/dhcp/files/dhcrelay6.conf
deleted file mode 100644
index 4e8b8c6..0000000
--- a/net-misc/dhcp/files/dhcrelay6.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/conf.d/dhcrelay6: config file for /etc/init.d/dhcrelay6
-
-# Insert any other options needed. See dhcrelay(8) for details.
-# Make sure you specify the lower (-l)/upper (-u) interfaces.
-DHCRELAY_OPTS="-6 -l lower-iface -u upper-iface"
-
-# Space separated list of IPs to forward BOOTP/DHCP packets to.
-DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay6.service b/net-misc/dhcp/files/dhcrelay6.service
deleted file mode 100644
index 1e5e498..0000000
--- a/net-misc/dhcp/files/dhcrelay6.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=DHCP Relay Agent Daemon
-Documentation=man:dhcrelay(8)
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/dhcrelay -d --no-pid -6 -l $lower-iface -u $upper-iface $DHCRELAY_SERVERS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/dhcp/files/dhcrelay6.service.conf b/net-misc/dhcp/files/dhcrelay6.service.conf
deleted file mode 100644
index ae293ab..0000000
--- a/net-misc/dhcp/files/dhcrelay6.service.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[Service]
-# Space separated list of IPs to forward BOOTP/DHCP packets to
-Environment="DHCRELAY_SERVERS="
-# Make sure you specify the lower (-l)/upper (-u) interfaces
-Environment="lower-iface="
-Environment="upper-iface="
diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
deleted file mode 100644
index 9ee6944..0000000
--- a/net-misc/dhcp/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <longdescription lang="en">The ISC DHCP client/server package.</longdescription>
- <longdescription lang="ja">ISC DHCP クライアント/サーãƒãƒ»ãƒ‘ッケージã§ã™ã€‚</longdescription>
- <use>
- <flag name='client'>Install the dhclient program</flag>
- <flag name='server'>Install the dhcpd and dhcrelay programs</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:isc:dhcp</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch b/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
deleted file mode 100644
index e790d2b..0000000
--- a/net-misc/iputils/files/021109-uclibc-no-ether_ntohost.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- iputils/rarpd.c.mps 2004-06-10 15:27:01.000000000 +0200
-+++ iputils/rarpd.c 2004-06-10 15:26:29.000000000 +0200
-@@ -42,7 +42,9 @@ int listen_arp;
- char *ifname;
- char *tftp_dir = "/etc/tftpboot";
-
-+#ifndef __UCLIBC__
- extern int ether_ntohost(char *name, unsigned char *ea);
-+#endif
- void usage(void) __attribute__((noreturn));
-
- struct iflink
-@@ -305,7 +307,11 @@ struct rarp_map *rarp_lookup(int ifindex
- 6,
- };
-
-+#ifndef __UCLIBC__
- if (ether_ntohost(ename, lladdr) != 0 ||
-+#else
-+ if (
-+#endif
- (hp = gethostbyname(ename)) == NULL) {
- if (verbose)
- syslog(LOG_INFO, "not found in /etc/ethers");
diff --git a/net-misc/iputils/files/iputils-20100418-makefile.patch b/net-misc/iputils/files/iputils-20100418-makefile.patch
deleted file mode 100644
index 50a0e81..0000000
--- a/net-misc/iputils/files/iputils-20100418-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -1,20 +1,17 @@
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
-
--DEFINES=
--
- #options if you have a bind>=4.9.4 libresolv (or, maybe, glibc)
- LDLIBS=
--ADDLIB=
-
- #options if you compile with libc5, and without a bind>=4.9.4 libresolv
- # NOT AVAILABLE. Please, use libresolv.
-
--CC=gcc
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
- #CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g -Werror
--CCOPT=-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -g
--CFLAGS=$(CCOPT) $(GLIBCFIX) $(DEFINES)
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wstrict-prototypes -Wall
-+CPPFLAGS += -D_GNU_SOURCE
-
- IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
-@@ -35,7 +32,7 @@
- rdisc_srv: rdisc_srv.o
-
- rdisc_srv.o: rdisc.c
-- $(CC) $(CFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
-+ $(CC) $(CFLAGS) $(CPPFLAGS) -DRDISC_SERVER -o rdisc_srv.o rdisc.c
-
-
- check-kernel:
diff --git a/net-misc/iputils/files/iputils-20100418-printf-size.patch b/net-misc/iputils/files/iputils-20100418-printf-size.patch
deleted file mode 100644
index edde65b..0000000
--- a/net-misc/iputils/files/iputils-20100418-printf-size.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6ccd3b91c18d8b13bc468ef962a9ef9dfc6c4515 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Aug 2010 01:16:42 -0400
-Subject: [PATCH] tracepath: re-use printf return in print_host
-
-The printf funcs take an int for field widths, not a size_t. Also, since
-the printf funcs already return the length of chars displayed, use that
-value instead of re-calculating the length with strlen.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tracepath.c | 11 ++++-------
- tracepath6.c | 11 ++++-------
- 2 files changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/tracepath.c b/tracepath.c
-index 81c22e9..ca84a69 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -68,13 +68,10 @@ void data_wait(int fd)
-
- void print_host(const char *a, const char *b, int both)
- {
-- size_t plen = 0;
-- printf("%s", a);
-- plen = strlen(a);
-- if (both) {
-- printf(" (%s)", b);
-- plen += strlen(b) + 3;
-- }
-+ int plen;
-+ plen = printf("%s", a);
-+ if (both)
-+ plen += printf(" (%s)", b);
- if (plen >= HOST_COLUMN_SIZE)
- plen = HOST_COLUMN_SIZE - 1;
- printf("%*s", HOST_COLUMN_SIZE - plen, "");
-diff --git a/tracepath6.c b/tracepath6.c
-index 5cc7424..5c2db8f 100644
---- a/tracepath6.c
-+++ b/tracepath6.c
-@@ -80,13 +80,10 @@ void data_wait(int fd)
-
- void print_host(const char *a, const char *b, int both)
- {
-- size_t plen = 0;
-- printf("%s", a);
-- plen = strlen(a);
-- if (both) {
-- printf(" (%s)", b);
-- plen += strlen(b) + 3;
-- }
-+ int plen;
-+ plen = printf("%s", a);
-+ if (both)
-+ plen += printf(" (%s)", b);
- if (plen >= HOST_COLUMN_SIZE)
- plen = HOST_COLUMN_SIZE - 1;
- printf("%*s", HOST_COLUMN_SIZE - plen, "");
---
-1.7.1.1
-
diff --git a/net-misc/iputils/files/iputils-20100418-so_mark.patch b/net-misc/iputils/files/iputils-20100418-so_mark.patch
deleted file mode 100644
index ad92254..0000000
--- a/net-misc/iputils/files/iputils-20100418-so_mark.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/335347
-
-fix building with older linux headers that don't define SO_MARK
-
---- ping_common.c
-+++ ping_common.c
-@@ -485,6 +485,7 @@
- fprintf(stderr, "Warning: no SO_TIMESTAMP support, falling back to SIOCGSTAMP\n");
- }
- #endif
-+#ifdef SO_MARK
- if (options & F_MARK) {
- if (setsockopt(icmp_sock, SOL_SOCKET, SO_MARK,
- &mark, sizeof(mark)) == -1) {
-@@ -494,6 +495,7 @@
- fprintf(stderr, "Warning: Failed to set mark %d\n", mark);
- }
- }
-+#endif
-
- /* Set some SNDTIMEO to prevent blocking forever
- * on sends, when device is too slow or stalls. Just put limit
diff --git a/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff b/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff
deleted file mode 100644
index 86c85bc..0000000
--- a/net-misc/iputils/files/iputils-20101006-owl-pingsock.diff
+++ /dev/null
@@ -1,224 +0,0 @@
-http://openwall.info/wiki/people/segoon/ping
-
---- iputils-s20101006/ping.c
-+++ iputils-s20101006/ping.c
-@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi
- int optlen = 0;
- int settos = 0; /* Set TOS, Precendence or other QOS options */
- int icmp_sock; /* socket file descriptor */
-+int using_ping_socket = 0;
- u_char outpack[0x10000];
- int maxpacket = sizeof(outpack);
-
-@@ -123,7 +124,11 @@ main(int argc, char **argv)
- char *target, hnamebuf[MAX_HOSTNAMELEN];
- char rspace[3 + 4 * NROUTES + 1]; /* record route space */
-
-- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
-+ if (icmp_sock != -1)
-+ using_ping_socket = 1;
-+ else
-+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
- socket_errno = errno;
-
- uid = getuid();
-@@ -377,13 +382,35 @@ main(int argc, char **argv)
- }
- }
-
-- if ((options&F_STRICTSOURCE) &&
-- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
-- perror("bind");
-- exit(2);
-+ if (!using_ping_socket) {
-+ if ((options&F_STRICTSOURCE) &&
-+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
-+ perror("bind");
-+ exit(2);
-+ }
-+ } else {
-+ struct sockaddr_in sa;
-+ socklen_t sl;
-+
-+ sa.sin_family = AF_INET;
-+ sa.sin_port = 0;
-+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
-+ source.sin_addr.s_addr : 0;
-+ sl = sizeof(sa);
-+
-+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
-+ perror("bind");
-+ exit(2);
-+ }
-+
-+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
-+ perror("getsockname");
-+ exit(2);
-+ }
-+ ident = sa.sin_port;
- }
-
-- if (1) {
-+ if (!using_ping_socket) {
- struct icmp_filter filt;
- filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
- (1<<ICMP_DEST_UNREACH)|
-@@ -398,6 +425,12 @@ main(int argc, char **argv)
- hold = 1;
- if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
- fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
-+ if (using_ping_socket) {
-+ if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
-+ perror("WARNING: setsockopt(IP_RECVTTL)");
-+ if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
-+ perror("WARNING: setsockopt(IP_RETOPTS)");
-+ }
-
- /* record route option */
- if (options & F_RROUTE) {
-@@ -566,6 +599,7 @@ int receive_error_msg()
- nerrors++;
- } else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
- struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
-+ int error_pkt;
-
- if (res < sizeof(icmph) ||
- target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
-@@ -576,9 +610,18 @@ int receive_error_msg()
- goto out;
- }
-
-- acknowledge(ntohs(icmph.un.echo.sequence));
-+ error_pkt = (e->ee_type != ICMP_REDIRECT &&
-+ e->ee_type != ICMP_SOURCE_QUENCH);
-+ if (error_pkt) {
-+ acknowledge(ntohs(icmph.un.echo.sequence));
-+ net_errors++;
-+ nerrors++;
-+ }
-+ else {
-+ saved_errno = 0;
-+ }
-
-- if (!working_recverr) {
-+ if (!using_ping_socket && !working_recverr) {
- struct icmp_filter filt;
- working_recverr = 1;
- /* OK, it works. Add stronger filter. */
-@@ -589,15 +632,14 @@ int receive_error_msg()
- perror("\rWARNING: setsockopt(ICMP_FILTER)");
- }
-
-- net_errors++;
-- nerrors++;
- if (options & F_QUIET)
- goto out;
- if (options & F_FLOOD) {
-- write(STDOUT_FILENO, "\bE", 2);
-+ if (error_pkt)
-+ write(STDOUT_FILENO, "\bE", 2);
- } else {
- print_timestamp();
-- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
-+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
- pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
- fflush(stdout);
- }
-@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc,
- struct iphdr *ip;
- int hlen;
- int csfailed;
-+ struct cmsghdr *cmsg;
-+ int ttl;
-+ __u8 *opts;
-+ int optlen;
-
- /* Check the IP header */
- ip = (struct iphdr *)buf;
-- hlen = ip->ihl*4;
-- if (cc < hlen + 8 || ip->ihl < 5) {
-- if (options & F_VERBOSE)
-- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
-- pr_addr(from->sin_addr.s_addr));
-- return 1;
-+ if (!using_ping_socket) {
-+ hlen = ip->ihl*4;
-+ if (cc < hlen + 8 || ip->ihl < 5) {
-+ if (options & F_VERBOSE)
-+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
-+ pr_addr(from->sin_addr.s_addr));
-+ return 1;
-+ }
-+ ttl = ip->ttl;
-+ opts = buf + sizeof(struct iphdr);
-+ optlen = hlen - sizeof(struct iphdr);
-+ } else {
-+ hlen = 0;
-+ ttl = 0;
-+ opts = buf;
-+ optlen = 0;
-+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-+ if (cmsg->cmsg_level != SOL_IP)
-+ continue;
-+ if (cmsg->cmsg_type == IP_TTL) {
-+ if (cmsg->cmsg_len < sizeof(int))
-+ continue;
-+ ttl = *(int *) CMSG_DATA(cmsg);
-+ } else if (cmsg->cmsg_type == IP_RETOPTS) {
-+ opts = (__u8 *) CMSG_DATA(cmsg);
-+ optlen = cmsg->cmsg_len;
-+ }
-+ }
- }
-
- /* Now the ICMP part */
-@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc,
- return 1; /* 'Twas not our ECHO */
- if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
- ntohs(icp->un.echo.sequence),
-- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
-+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
- pr_echo_reply))
- return 0;
- } else {
-@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc,
- }
-
- if (!(options & F_FLOOD)) {
-- pr_options(buf + sizeof(struct iphdr), hlen);
-+ pr_options(opts, optlen + sizeof(struct iphdr));
-
- if (options & F_AUDIBLE)
- putchar('\a');
-@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
- printf("Redirect, Bad Code: %d", code);
- break;
- }
-- if (icp)
-- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
-+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
- if (icp && (options & F_VERBOSE))
- pr_iph((struct iphdr*)(icp + 1));
- break;
-@@ -1217,7 +1284,7 @@ void install_filter(void)
- insns
- };
-
-- if (once)
-+ if (once || using_ping_socket)
- return;
- once = 1;
-
---- iputils-s20101006/ping_common.c
-+++ iputils-s20101006/ping_common.c
-@@ -515,7 +515,8 @@ void setup(int icmp_sock)
- *p++ = i;
- }
-
-- ident = htons(getpid() & 0xFFFF);
-+ if (!ident)
-+ ident = htons(getpid() & 0xFFFF);
-
- set_signal(SIGINT, sigexit);
- set_signal(SIGALRM, sigexit);
diff --git a/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch b/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch
deleted file mode 100644
index 9ea3418..0000000
--- a/net-misc/iputils/files/iputils-20121221-add-bits_types_h.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -Naur iputils-s20121221.orig/clockdiff.c iputils-s20121221/clockdiff.c
---- iputils-s20121221.orig/clockdiff.c 2014-01-24 15:32:49.111934548 +0000
-+++ iputils-s20121221/clockdiff.c 2014-01-24 15:32:14.438932610 +0000
-@@ -23,6 +23,8 @@
- #include <sys/capability.h>
- #endif
-
-+#include "types.h"
-+
- void usage(void) __attribute__((noreturn));
-
- #define MAX_HOSTNAMELEN NI_MAXHOST
-diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c
---- iputils-s20121221.orig/ping.c 2014-01-24 15:32:49.111934548 +0000
-+++ iputils-s20121221/ping.c 2014-01-24 15:32:14.459932611 +0000
-@@ -59,6 +59,7 @@
- */
-
- #include "ping_common.h"
-+#include "types.h"
-
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
-diff -Naur iputils-s20121221.orig/ping6.c iputils-s20121221/ping6.c
---- iputils-s20121221.orig/ping6.c 2014-01-24 15:32:49.112934549 +0000
-+++ iputils-s20121221/ping6.c 2014-01-24 15:32:14.439932610 +0000
-@@ -67,6 +67,7 @@
- * This program has to run SUID to ROOT to access the ICMP socket.
- */
- #include "ping_common.h"
-+#include "types.h"
-
- #include <linux/filter.h>
- #include <netinet/ip6.h>
-diff -Naur iputils-s20121221.orig/ping_common.c iputils-s20121221/ping_common.c
---- iputils-s20121221.orig/ping_common.c 2014-01-24 15:32:49.112934549 +0000
-+++ iputils-s20121221/ping_common.c 2014-01-24 15:32:14.439932610 +0000
-@@ -1,4 +1,5 @@
- #include "ping_common.h"
-+#include "types.h"
- #include <ctype.h>
- #include <sched.h>
- #include <math.h>
-diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
---- iputils-s20121221.orig/ping_common.h 2014-01-24 15:32:14.419932609 +0000
-+++ iputils-s20121221/ping_common.h 2014-01-24 15:33:08.206935616 +0000
-@@ -35,6 +35,7 @@
- #include <linux/errqueue.h>
-
- #include "SNAPSHOT.h"
-+#include "types.h"
-
- #define DEFDATALEN (64 - 8) /* default data length */
-
-diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
---- iputils-s20121221.orig/rdisc.c 2014-01-24 15:32:49.113934549 +0000
-+++ iputils-s20121221/rdisc.c 2014-01-24 15:32:14.450932610 +0000
-@@ -62,6 +62,7 @@
- #include <syslog.h>
-
- #include "SNAPSHOT.h"
-+#include "types.h"
-
- struct interface
- {
-diff -Naur iputils-s20121221.orig/traceroute6.c iputils-s20121221/traceroute6.c
---- iputils-s20121221.orig/traceroute6.c 2014-01-24 15:32:49.113934549 +0000
-+++ iputils-s20121221/traceroute6.c 2014-01-24 15:32:14.440932610 +0000
-@@ -267,6 +267,7 @@
- #include <string.h>
- #include <unistd.h>
-
-+#include "types.h"
- #include "SNAPSHOT.h"
-
- #ifndef SOL_IPV6
-diff -Naur iputils-s20121221.orig/types.h iputils-s20121221/types.h
---- iputils-s20121221.orig/types.h 1970-01-01 00:00:00.000000000 +0000
-+++ iputils-s20121221/types.h 2014-01-24 15:32:14.440932610 +0000
-@@ -0,0 +1,14 @@
-+/* This is a small version of <bits/types.h> from glibc
-+ * to take care of type u_char.
-+ *
-+ * Anthony G. Basile <blueness@gentoo.org>
-+ */
-+#ifndef _BITS_TYPES_H
-+#define _BITS_TYPES_H 1
-+
-+typedef unsigned char u_char;
-+typedef unsigned short int u_short;
-+typedef unsigned int u_int;
-+typedef unsigned long int u_long;
-+
-+#endif /* mini <bits/types.h> */
diff --git a/net-misc/iputils/files/iputils-20121221-crypto-build.patch b/net-misc/iputils/files/iputils-20121221-crypto-build.patch
deleted file mode 100644
index 1ec3c10..0000000
--- a/net-misc/iputils/files/iputils-20121221-crypto-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
-From: Arjan van de Ven <arjanvandeven@gmail.com>
-Date: Wed, 16 Jan 2013 03:12:15 +0900
-Subject: [PATCH [iputils]] ping6: Fix build command line argument with gnutls.
-
-The ping6 command can use either openssl or gnutls...
-and the Makefile has a bunch of setup for defining which of the two to use.
-
-Unfortunately, the final -D define on the commandline to enable gnutls
-inside the ping6.c file didn't actually make it onto the gcc
-commandline.
-This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
-
-Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
-Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c62d9df..89249f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
- DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
- LIB_ping = $(LIB_CAP) $(LIB_IDN)
--DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
-+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
- LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
-
- ping: ping_common.o
---
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-fix-header-order.patch b/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
deleted file mode 100644
index 6bfcea4..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-header-order.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur iputils-s20121221.orig/tracepath.c iputils-s20121221/tracepath.c
---- iputils-s20121221.orig/tracepath.c 2014-11-20 07:39:59.114108620 -0500
-+++ iputils-s20121221/tracepath.c 2014-11-20 07:40:37.813110381 -0500
-@@ -14,13 +14,13 @@
- #include <unistd.h>
- #include <sys/socket.h>
- #include <linux/types.h>
--#include <linux/errqueue.h>
- #include <errno.h>
- #include <string.h>
- #include <netdb.h>
- #include <netinet/in.h>
- #include <resolv.h>
- #include <sys/time.h>
-+#include <linux/errqueue.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
- #include <limits.h>
diff --git a/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch b/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch
deleted file mode 100644
index 554ce9b..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-init-elemnt.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur iputils-s20121221.orig/ping.c iputils-s20121221/ping.c
---- iputils-s20121221.orig/ping.c 2014-01-24 15:05:02.082841335 +0000
-+++ iputils-s20121221/ping.c 2014-01-24 15:17:12.975882203 +0000
-@@ -774,9 +774,16 @@
-
- do {
- static struct iovec iov = {outpack, 0};
-- static struct msghdr m = { &whereto, sizeof(whereto),
-- &iov, 1, &cmsg, 0, 0 };
-- m.msg_controllen = cmsg_len;
-+ static struct msghdr m;
-+
-+ m.msg_name = &whereto;
-+ m.msg_namelen = sizeof(whereto);
-+ m.msg_iov = &iov;
-+ m.msg_iovlen = 1;
-+ m.msg_control = &cmsg;
-+ m.msg_controllen = sizeof(cmsg);
-+ m.msg_flags = 0;
-+
- iov.iov_len = cc;
-
- i = sendmsg(icmp_sock, &m, confirm);
diff --git a/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch b/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
deleted file mode 100644
index d12dd82..0000000
--- a/net-misc/iputils/files/iputils-20121221-fix-musl-headers.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur iputils-s20121221.orig/arping.c iputils-s20121221/arping.c
---- iputils-s20121221.orig/arping.c 2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/arping.c 2014-01-23 21:19:57.091268011 +0000
-@@ -16,7 +16,7 @@
- #include <linux/sockios.h>
- #include <sys/file.h>
- #include <sys/time.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <linux/if_packet.h>
---- iputils-s20121221.orig/clockdiff.c 2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/clockdiff.c 2014-01-23 21:19:57.093268011 +0000
-@@ -14,7 +14,6 @@
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
- #define TSPTYPES
--#include <protocols/timed.h>
- #include <fcntl.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-diff -Naur iputils-s20121221.orig/ping_common.h iputils-s20121221/ping_common.h
---- iputils-s20121221.orig/ping_common.h 2012-12-21 14:01:07.000000000 +0000
-+++ iputils-s20121221/ping_common.h 2014-01-23 21:27:07.677292088 +0000
-@@ -7,16 +7,17 @@
- #include <linux/sockios.h>
- #include <sys/file.h>
- #include <sys/time.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ioctl.h>
- #include <net/if.h>
- #include <sys/uio.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <ctype.h>
- #include <errno.h>
- #include <string.h>
- #include <netdb.h>
- #include <setjmp.h>
-+#include <asm-generic/param.h>
-
- #ifdef CAPABILITIES
- #include <sys/prctl.h>
---- iputils-s20121221.orig/rarpd.c 2014-01-24 13:38:46.816551953 +0000
-+++ iputils-s20121221/rarpd.c 2014-01-24 13:36:51.833545524 +0000
-@@ -19,16 +19,17 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
--#include <sys/errno.h>
--#include <sys/fcntl.h>
-+#include <poll.h>
-+#include <errno.h>
-+#include <fcntl.h>
- #include <sys/socket.h>
--#include <sys/signal.h>
-+#include <signal.h>
- #include <linux/if.h>
- #include <linux/if_arp.h>
- #include <netinet/in.h>
- #include <linux/if_packet.h>
- #include <linux/filter.h>
-+#include <sys/types.h>
-
- int do_reload = 1;
-
---- iputils-s20121221.orig/tracepath.c 2014-01-24 13:38:46.865551956 +0000
-+++ iputils-s20121221/tracepath.c 2014-01-23 21:19:57.109268012 +0000
-@@ -23,6 +23,7 @@
- #include <sys/time.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
---- iputils-s20121221.orig/tracepath6.c 2014-01-24 13:38:46.865551956 +0000
-+++ iputils-s20121221/tracepath6.c 2014-01-23 21:20:40.316270428 +0000
-@@ -25,6 +25,7 @@
- #include <sys/time.h>
- #include <sys/uio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
-
- #ifdef USE_IDN
- #include <idna.h>
diff --git a/net-misc/iputils/files/iputils-20121221-makefile.patch b/net-misc/iputils/files/iputils-20121221-makefile.patch
deleted file mode 100644
index 66424c8..0000000
--- a/net-misc/iputils/files/iputils-20121221-makefile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c66609d2c830d6fe06f48f5d38c54eb5cc6f2975 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:36:16 -0500
-Subject: [PATCH [iputils]] fix handling of CFLAGS
-
-This defaults CFLAGS to -O3 without clobbering settings people have set
-up in the environment already.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2c49940..ecabac3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,6 @@
- # Configuration
- #
-
--# CC
--CC=gcc
- # Path to parent kernel include files directory
- LIBC_INCLUDE=/usr/include
- # Libraries
-@@ -48,11 +46,10 @@ ENABLE_RDISC_SERVER=no
-
- # -------------------------------------
- # What a pity, all new gccs are buggy and -Werror does not work. Sigh.
--# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
--CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
--CCOPTOPT=-O3
--GLIBCFIX=-D_GNU_SOURCE
--DEFINES=
-+# CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
-+CFLAGS?=-O3 -g
-+CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall
-+CPPFLAGS+=-D_GNU_SOURCE
- LDLIB=
-
- FUNC_LIB = $(if $(filter static,$(1)),$(LDFLAG_STATIC) $(2) $(LDFLAG_DYNAMIC),$(2))
-@@ -113,7 +110,6 @@ IPV4_TARGETS=tracepath ping clockdiff rdisc arping tftpd rarpd
- IPV6_TARGETS=tracepath6 traceroute6 ping6
- TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
-
--CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
- LDLIBS=$(LDLIB) $(ADDLIB)
-
- UNAME_N:=$(shell uname -n)
-@@ -132,6 +128,7 @@ all: $(TARGETS)
- $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -S -o $@
- %.o: %.c
- $(COMPILE.c) $< $(DEF_$(patsubst %.o,%,$@)) -o $@
-+LINK.o += $(CFLAGS)
- $(TARGETS): %: %.o
- $(LINK.o) $^ $(LIB_$@) $(LDLIBS) -o $@
-
---
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-openssl.patch b/net-misc/iputils/files/iputils-20121221-openssl.patch
deleted file mode 100644
index 1c6ba81..0000000
--- a/net-misc/iputils/files/iputils-20121221-openssl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From b57d77dcfa5cb363b7eba5b331324669a8505ac4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 24 Jan 2013 23:32:39 -0500
-Subject: [PATCH [iputils]] ping6: allow disabling of openssl support
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 5 ++++-
- ping6.c | 14 +++++++++++++-
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 89249f5..2c49940 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,7 @@ ARPING_DEFAULT_DEVICE=
-
- # GNU TLS library for ping6 [yes|no|static]
- USE_GNUTLS=yes
--# Crypto library for ping6 [shared|static]
-+# Crypto library for ping6 [shared|static|no]
- USE_CRYPTO=shared
- # Resolv library for ping6 [yes|static]
- USE_RESOLV=yes
-@@ -63,7 +63,10 @@ ifneq ($(USE_GNUTLS),no)
- LIB_CRYPTO = $(call FUNC_LIB,$(USE_GNUTLS),$(LDFLAG_GNUTLS))
- DEF_CRYPTO = -DUSE_GNUTLS
- else
-+ifneq ($(USE_CRYPTO),no)
- LIB_CRYPTO = $(call FUNC_LIB,$(USE_CRYPTO),$(LDFLAG_CRYPTO))
-+ DEF_CRYPTO = -DUSE_OPENSSL
-+endif
- endif
-
- # USE_RESOLV: LIB_RESOLV
-diff --git a/ping6.c b/ping6.c
-index c39864d..f2f90af 100644
---- a/ping6.c
-+++ b/ping6.c
-@@ -168,8 +168,10 @@ static int icmp_sock;
-
- #ifdef USE_GNUTLS
- # include <gnutls/openssl.h>
--#else
-+# define USE_CRYPTO
-+#elif defined USE_OPENSSL
- # include <openssl/md5.h>
-+# define USE_CRYPTO
- #endif
-
- /* Node Information query */
-@@ -326,6 +328,7 @@ static void niquery_init_nonce(void)
- #if !PING6_NONCE_MEMORY
- static int niquery_nonce(__u8 *nonce, int fill)
- {
-+# ifdef USE_CRYPTO
- static __u8 digest[MD5_DIGEST_LENGTH];
- static int seq = -1;
-
-@@ -348,6 +351,10 @@ static int niquery_nonce(__u8 *nonce, int fill)
- return -1;
- return ntohsp((__u16 *)nonce);
- }
-+# else
-+ fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+ exit(3);
-+# endif
- }
- #endif
-
-@@ -502,6 +509,7 @@ static int niquery_option_subject_addr_handler(int index, const char *arg)
-
- static int niquery_option_subject_name_handler(int index, const char *arg)
- {
-+#ifdef USE_CRYPTO
- static char nigroup_buf[INET6_ADDRSTRLEN + 1 + IFNAMSIZ];
- unsigned char *dnptrs[2], **dpp, **lastdnptr;
- int n;
-@@ -627,6 +635,10 @@ errexit:
- free(idn);
- free(name);
- exit(1);
-+#else
-+ fprintf(stderr, "ping6: function not available; crypto disabled\n");
-+ exit(3);
-+#endif
- }
-
- int niquery_option_help_handler(int index, const char *arg)
---
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff b/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
deleted file mode 100644
index 283aa98..0000000
--- a/net-misc/iputils/files/iputils-20121221-owl-pingsock.diff
+++ /dev/null
@@ -1,224 +0,0 @@
-http://openwall.info/wiki/people/segoon/ping
-
---- iputils-s20101006/ping.c
-+++ iputils-s20101006/ping.c
-@@ -88,6 +88,7 @@ struct sockaddr_in whereto; /* who to pi
- int optlen = 0;
- int settos = 0; /* Set TOS, Precendence or other QOS options */
- int icmp_sock; /* socket file descriptor */
-+int using_ping_socket = 0;
- u_char outpack[0x10000];
- int maxpacket = sizeof(outpack);
-
-@@ -123,7 +124,11 @@ main(int argc, char **argv)
- char *target, hnamebuf[MAX_HOSTNAMELEN];
- char rspace[3 + 4 * NROUTES + 1]; /* record route space */
-
-- icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-+ icmp_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
-+ if (icmp_sock != -1)
-+ using_ping_socket = 1;
-+ else
-+ icmp_sock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
- socket_errno = errno;
-
- uid = getuid();
-@@ -377,13 +382,35 @@ main(int argc, char **argv)
- }
- }
-
-- if ((options&F_STRICTSOURCE) &&
-- bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
-- perror("bind");
-- exit(2);
-+ if (!using_ping_socket) {
-+ if ((options&F_STRICTSOURCE) &&
-+ bind(icmp_sock, (struct sockaddr*)&source, sizeof(source)) == -1) {
-+ perror("bind");
-+ exit(2);
-+ }
-+ } else {
-+ struct sockaddr_in sa;
-+ socklen_t sl;
-+
-+ sa.sin_family = AF_INET;
-+ sa.sin_port = 0;
-+ sa.sin_addr.s_addr = (options&F_STRICTSOURCE) ?
-+ source.sin_addr.s_addr : 0;
-+ sl = sizeof(sa);
-+
-+ if (bind(icmp_sock, (struct sockaddr *) &sa, sl) == -1) {
-+ perror("bind");
-+ exit(2);
-+ }
-+
-+ if (getsockname(icmp_sock, (struct sockaddr *) &sa, &sl) == -1) {
-+ perror("getsockname");
-+ exit(2);
-+ }
-+ ident = sa.sin_port;
- }
-
-- if (1) {
-+ if (!using_ping_socket) {
- struct icmp_filter filt;
- filt.data = ~((1<<ICMP_SOURCE_QUENCH)|
- (1<<ICMP_DEST_UNREACH)|
-@@ -398,6 +425,12 @@ main(int argc, char **argv)
- hold = 1;
- if (setsockopt(icmp_sock, SOL_IP, IP_RECVERR, (char *)&hold, sizeof(hold)))
- fprintf(stderr, "WARNING: your kernel is veeery old. No problems.\n");
-+ if (using_ping_socket) {
-+ if (setsockopt(icmp_sock, SOL_IP, IP_RECVTTL, (char *)&hold, sizeof(hold)))
-+ perror("WARNING: setsockopt(IP_RECVTTL)");
-+ if (setsockopt(icmp_sock, SOL_IP, IP_RETOPTS, (char *)&hold, sizeof(hold)))
-+ perror("WARNING: setsockopt(IP_RETOPTS)");
-+ }
-
- /* record route option */
- if (options & F_RROUTE) {
-@@ -566,6 +599,7 @@ int receive_error_msg()
- nerrors++;
- } else if (e->ee_origin == SO_EE_ORIGIN_ICMP) {
- struct sockaddr_in *sin = (struct sockaddr_in*)(e+1);
-+ int error_pkt;
-
- if (res < sizeof(icmph) ||
- target.sin_addr.s_addr != whereto.sin_addr.s_addr ||
-@@ -576,9 +610,18 @@ int receive_error_msg()
- goto out;
- }
-
-- acknowledge(ntohs(icmph.un.echo.sequence));
-+ error_pkt = (e->ee_type != ICMP_REDIRECT &&
-+ e->ee_type != ICMP_SOURCE_QUENCH);
-+ if (error_pkt) {
-+ acknowledge(ntohs(icmph.un.echo.sequence));
-+ net_errors++;
-+ nerrors++;
-+ }
-+ else {
-+ saved_errno = 0;
-+ }
-
-- if (!working_recverr) {
-+ if (!using_ping_socket && !working_recverr) {
- struct icmp_filter filt;
- working_recverr = 1;
- /* OK, it works. Add stronger filter. */
-@@ -589,15 +632,14 @@ int receive_error_msg()
- perror("\rWARNING: setsockopt(ICMP_FILTER)");
- }
-
-- net_errors++;
-- nerrors++;
- if (options & F_QUIET)
- goto out;
- if (options & F_FLOOD) {
-- write_stdout("\bE", 2);
-+ if (error_pkt)
-+ write_stdout("\bE", 2);
- } else {
- print_timestamp();
-- printf("From %s icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
-+ printf("From %s: icmp_seq=%u ", pr_addr(sin->sin_addr.s_addr), ntohs(icmph.un.echo.sequence));
- pr_icmph(e->ee_type, e->ee_code, e->ee_info, NULL);
- fflush(stdout);
- }
-@@ -695,15 +737,41 @@ parse_reply(struct msghdr *msg, int cc,
- struct iphdr *ip;
- int hlen;
- int csfailed;
-+ struct cmsghdr *cmsg;
-+ int ttl;
-+ __u8 *opts;
-+ int optlen;
-
- /* Check the IP header */
- ip = (struct iphdr *)buf;
-- hlen = ip->ihl*4;
-- if (cc < hlen + 8 || ip->ihl < 5) {
-- if (options & F_VERBOSE)
-- fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
-- pr_addr(from->sin_addr.s_addr));
-- return 1;
-+ if (!using_ping_socket) {
-+ hlen = ip->ihl*4;
-+ if (cc < hlen + 8 || ip->ihl < 5) {
-+ if (options & F_VERBOSE)
-+ fprintf(stderr, "ping: packet too short (%d bytes) from %s\n", cc,
-+ pr_addr(from->sin_addr.s_addr));
-+ return 1;
-+ }
-+ ttl = ip->ttl;
-+ opts = buf + sizeof(struct iphdr);
-+ optlen = hlen - sizeof(struct iphdr);
-+ } else {
-+ hlen = 0;
-+ ttl = 0;
-+ opts = buf;
-+ optlen = 0;
-+ for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-+ if (cmsg->cmsg_level != SOL_IP)
-+ continue;
-+ if (cmsg->cmsg_type == IP_TTL) {
-+ if (cmsg->cmsg_len < sizeof(int))
-+ continue;
-+ ttl = *(int *) CMSG_DATA(cmsg);
-+ } else if (cmsg->cmsg_type == IP_RETOPTS) {
-+ opts = (__u8 *) CMSG_DATA(cmsg);
-+ optlen = cmsg->cmsg_len;
-+ }
-+ }
- }
-
- /* Now the ICMP part */
-@@ -716,7 +784,7 @@ parse_reply(struct msghdr *msg, int cc,
- return 1; /* 'Twas not our ECHO */
- if (gather_statistics((__u8*)icp, sizeof(*icp), cc,
- ntohs(icp->un.echo.sequence),
-- ip->ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
-+ ttl, 0, tv, pr_addr(from->sin_addr.s_addr),
- pr_echo_reply))
- return 0;
- } else {
-@@ -807,7 +875,7 @@ parse_reply(struct msghdr *msg, int cc,
- }
-
- if (!(options & F_FLOOD)) {
-- pr_options(buf + sizeof(struct iphdr), hlen);
-+ pr_options(opts, optlen + sizeof(struct iphdr));
-
- if (options & F_AUDIBLE)
- putchar('\a');
-@@ -916,8 +984,7 @@ void pr_icmph(__u8 type, __u8 code, __u3
- printf("Redirect, Bad Code: %d", code);
- break;
- }
-- if (icp)
-- printf("(New nexthop: %s)\n", pr_addr(icp->un.gateway));
-+ printf("(New nexthop: %s)\n", pr_addr(icp ? icp->un.gateway : info));
- if (icp && (options & F_VERBOSE))
- pr_iph((struct iphdr*)(icp + 1));
- break;
-@@ -1217,7 +1284,7 @@ void install_filter(void)
- insns
- };
-
-- if (once)
-+ if (once || using_ping_socket)
- return;
- once = 1;
-
---- iputils-s20101006/ping_common.c
-+++ iputils-s20101006/ping_common.c
-@@ -515,7 +515,8 @@ void setup(int icmp_sock)
- *p++ = i;
- }
-
-- ident = htons(getpid() & 0xFFFF);
-+ if (!ident)
-+ ident = htons(getpid() & 0xFFFF);
-
- set_signal(SIGINT, sigexit);
- set_signal(SIGALRM, sigexit);
diff --git a/net-misc/iputils/files/iputils-20121221-printf-size.patch b/net-misc/iputils/files/iputils-20121221-printf-size.patch
deleted file mode 100644
index 6d6c3b7..0000000
--- a/net-misc/iputils/files/iputils-20121221-printf-size.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 23fcb10ae15a96aa9e5a823cfe0b612d9522691c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 14 Aug 2010 01:16:42 -0400
-Subject: [PATCH [iputils]] tracepath: re-use printf return in print_host
-
-Since the printf funcs already return the length of chars displayed,
-use that value instead of re-calculating the length with strlen.
-
-This also fixes the handling of the strlen return -- it's a size_t,
-not an int.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tracepath.c | 11 ++++-------
- tracepath6.c | 11 ++++-------
- 2 files changed, 8 insertions(+), 14 deletions(-)
-
-diff --git a/tracepath.c b/tracepath.c
-index 8a08f1d..f155816 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -73,13 +73,10 @@ void data_wait(int fd)
-
- void print_host(const char *a, const char *b, int both)
- {
-- int plen = 0;
-- printf("%s", a);
-- plen = strlen(a);
-- if (both) {
-- printf(" (%s)", b);
-- plen += strlen(b) + 3;
-- }
-+ int plen;
-+ plen = printf("%s", a);
-+ if (both)
-+ plen += printf(" (%s)", b);
- if (plen >= HOST_COLUMN_SIZE)
- plen = HOST_COLUMN_SIZE - 1;
- printf("%*s", HOST_COLUMN_SIZE - plen, "");
-diff --git a/tracepath6.c b/tracepath6.c
-index 126fadf..bee95c3 100644
---- a/tracepath6.c
-+++ b/tracepath6.c
-@@ -86,13 +86,10 @@ void data_wait(int fd)
-
- void print_host(const char *a, const char *b, int both)
- {
-- int plen = 0;
-- printf("%s", a);
-- plen = strlen(a);
-- if (both) {
-- printf(" (%s)", b);
-- plen += strlen(b) + 3;
-- }
-+ int plen;
-+ plen = printf("%s", a);
-+ if (both)
-+ plen += printf(" (%s)", b);
- if (plen >= HOST_COLUMN_SIZE)
- plen = HOST_COLUMN_SIZE - 1;
- printf("%*s", HOST_COLUMN_SIZE - plen, "");
---
-1.8.0.2
-
diff --git a/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch b/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch
deleted file mode 100644
index 08e764d..0000000
--- a/net-misc/iputils/files/iputils-20121221-remove-rdisc-glibc-assumption.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur iputils-s20121221.orig/rdisc.c iputils-s20121221/rdisc.c
---- iputils-s20121221.orig/rdisc.c 2014-01-24 14:59:29.937822762 +0000
-+++ iputils-s20121221/rdisc.c 2014-01-23 21:25:58.760288234 +0000
-@@ -115,26 +114,7 @@
-
- #define MAXIFS 32
-
--#if !defined(__GLIBC__) || __GLIBC__ < 2
--/* For router advertisement */
--struct icmp_ra
--{
-- u_char icmp_type; /* type of message, see below */
-- u_char icmp_code; /* type sub code */
-- u_short icmp_cksum; /* ones complement cksum of struct */
-- u_char icmp_num_addrs;
-- u_char icmp_wpa; /* Words per address */
-- short icmp_lifetime;
--};
--
--struct icmp_ra_addr
--{
-- __u32 ira_addr;
-- __u32 ira_preference;
--};
--#else
- #define icmp_ra icmp
--#endif
-
- /* Router constants */
- #define MAX_INITIAL_ADVERT_INTERVAL 16
diff --git a/net-misc/iputils/iputils-20121221-r99.ebuild b/net-misc/iputils/iputils-20121221-r99.ebuild
deleted file mode 100644
index bccdd55..0000000
--- a/net-misc/iputils/iputils-20121221-r99.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-20121221-r1.ebuild,v 1.17 2015/04/25 00:34:24 vapier Exp $
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors. This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI="4"
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
- inherit git-2
-else
- SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
- mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
-
-LICENSE="BSD-4"
-SLOT="0"
-IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
- idn? ( net-dns/libidn[static-libs(+)] )
- ipv6? ( ssl? (
- gnutls? (
- net-libs/gnutls[openssl(+)]
- net-libs/gnutls[static-libs(+)]
- )
- !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
- ) )"
-RDEPEND="!net-misc/rarpd
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
- DEPEND+="
- app-text/openjade
- dev-perl/SGMLSpm
- app-text/docbook-sgml-dtd
- app-text/docbook-sgml-utils
- "
-fi
-
-S=${WORKDIR}/${PN}-s${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
- epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
- epatch "${FILESDIR}"/${PN}-20121221-crypto-build.patch
- epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
- epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
- epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
- epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
- epatch "${FILESDIR}"/${PN}-20121221-fix-musl-headers.patch
- epatch "${FILESDIR}"/${PN}-20121221-add-bits_types_h.patch
- epatch "${FILESDIR}"/${PN}-20121221-remove-rdisc-glibc-assumption.patch
- epatch "${FILESDIR}"/${PN}-20121221-fix-init-elemnt.patch
- epatch "${FILESDIR}"/${PN}-20121221-fix-header-order.patch
- use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
- use static && append-ldflags -static
-}
-
-src_compile() {
- tc-export CC
- emake \
- USE_CAP=$(usex caps) \
- USE_IDN=$(usex idn) \
- USE_GNUTLS=$(usex gnutls) \
- USE_CRYPTO=$(usex ssl) \
- $(use ipv6 || echo IPV6_TARGETS=)
-
- if [[ ${PV} == "99999999" ]] ; then
- emake -j1 html man
- fi
-}
-
-ipv6() { usex ipv6 "$*" '' ; }
-
-src_install() {
- into /
- dobin arping ping $(ipv6 ping6)
- into /usr
- dobin clockdiff
- dosbin rarpd rdisc ipg tftpd tracepath $(ipv6 tracepath6)
-
- dodoc INSTALL RELNOTES
- use ipv6 \
- && dosym ping.8 /usr/share/man/man8/ping6.8 \
- || rm -f doc/*6.8
- rm -f doc/{setkey,traceroute6}.8
- doman doc/*.8
-
- use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
- fcaps cap_net_raw \
- bin/{ar,}ping \
- $(ipv6 bin/ping6) \
- usr/bin/clockdiff
-}
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
deleted file mode 100644
index 5c2d8fe..0000000
--- a/net-misc/iputils/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <use>
- <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:skbuff:iputils</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/openssh/files/openssh-4.7_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-4.7_p1-GSSAPI-dns.patch
deleted file mode 100644
index c81ae5c..0000000
--- a/net-misc/openssh/files/openssh-4.7_p1-GSSAPI-dns.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-http://bugs.gentoo.org/165444
-https://bugzilla.mindrot.org/show_bug.cgi?id=1008
-
-Index: readconf.c
-===================================================================
-RCS file: /cvs/openssh/readconf.c,v
-retrieving revision 1.135
-diff -u -r1.135 readconf.c
---- readconf.c 5 Aug 2006 02:39:40 -0000 1.135
-+++ readconf.c 19 Aug 2006 11:59:52 -0000
-@@ -126,6 +126,7 @@
- oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+ oGssTrustDns,
- oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
- oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
-@@ -163,9 +164,11 @@
- #if defined(GSSAPI)
- { "gssapiauthentication", oGssAuthentication },
- { "gssapidelegatecredentials", oGssDelegateCreds },
-+ { "gssapitrustdns", oGssTrustDns },
- #else
- { "gssapiauthentication", oUnsupported },
- { "gssapidelegatecredentials", oUnsupported },
-+ { "gssapitrustdns", oUnsupported },
- #endif
- { "fallbacktorsh", oDeprecated },
- { "usersh", oDeprecated },
-@@ -444,6 +447,10 @@
- intptr = &options->gss_deleg_creds;
- goto parse_flag;
-
-+ case oGssTrustDns:
-+ intptr = &options->gss_trust_dns;
-+ goto parse_flag;
-+
- case oBatchMode:
- intptr = &options->batch_mode;
- goto parse_flag;
-@@ -1010,6 +1017,7 @@
- options->challenge_response_authentication = -1;
- options->gss_authentication = -1;
- options->gss_deleg_creds = -1;
-+ options->gss_trust_dns = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->kbd_interactive_devices = NULL;
-@@ -1100,6 +1108,8 @@
- options->gss_authentication = 0;
- if (options->gss_deleg_creds == -1)
- options->gss_deleg_creds = 0;
-+ if (options->gss_trust_dns == -1)
-+ options->gss_trust_dns = 0;
- if (options->password_authentication == -1)
- options->password_authentication = 1;
- if (options->kbd_interactive_authentication == -1)
-Index: readconf.h
-===================================================================
-RCS file: /cvs/openssh/readconf.h,v
-retrieving revision 1.63
-diff -u -r1.63 readconf.h
---- readconf.h 5 Aug 2006 02:39:40 -0000 1.63
-+++ readconf.h 19 Aug 2006 11:59:52 -0000
-@@ -45,6 +45,7 @@
- /* Try S/Key or TIS, authentication. */
- int gss_authentication; /* Try GSS authentication */
- int gss_deleg_creds; /* Delegate GSS credentials */
-+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
- int password_authentication; /* Try password
- * authentication. */
- int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
-Index: ssh_config.5
-===================================================================
-RCS file: /cvs/openssh/ssh_config.5,v
-retrieving revision 1.97
-diff -u -r1.97 ssh_config.5
---- ssh_config.5 5 Aug 2006 01:34:51 -0000 1.97
-+++ ssh_config.5 19 Aug 2006 11:59:53 -0000
-@@ -483,7 +483,16 @@
- Forward (delegate) credentials to the server.
- The default is
- .Dq no .
--Note that this option applies to protocol version 2 only.
-+Note that this option applies to protocol version 2 connections using GSSAPI.
-+.It Cm GSSAPITrustDns
-+Set to
-+.Dq yes to indicate that the DNS is trusted to securely canonicalize
-+the name of the host being connected to. If
-+.Dq no, the hostname entered on the
-+command line will be passed untouched to the GSSAPI library.
-+The default is
-+.Dq no .
-+This option only applies to protocol version 2 connections using GSSAPI.
- .It Cm HashKnownHosts
- Indicates that
- .Xr ssh 1
-Index: sshconnect2.c
-===================================================================
-RCS file: /cvs/openssh/sshconnect2.c,v
-retrieving revision 1.151
-diff -u -r1.151 sshconnect2.c
---- sshconnect2.c 18 Aug 2006 14:33:34 -0000 1.151
-+++ sshconnect2.c 19 Aug 2006 11:59:53 -0000
-@@ -499,6 +499,12 @@
- static u_int mech = 0;
- OM_uint32 min;
- int ok = 0;
-+ const char *gss_host;
-+
-+ if (options.gss_trust_dns)
-+ gss_host = get_canonical_hostname(1);
-+ else
-+ gss_host = authctxt->host;
-
- /* Try one GSSAPI method at a time, rather than sending them all at
- * once. */
-@@ -511,7 +517,7 @@
- /* My DER encoding requires length<128 */
- if (gss_supported->elements[mech].length < 128 &&
- ssh_gssapi_check_mechanism(&gssctxt,
-- &gss_supported->elements[mech], authctxt->host)) {
-+ &gss_supported->elements[mech], gss_host)) {
- ok = 1; /* Mechanism works */
- } else {
- mech++;
diff --git a/net-misc/openssh/files/openssh-6.3_p1-x509-hpn14v2-glue.patch b/net-misc/openssh/files/openssh-6.3_p1-x509-hpn14v2-glue.patch
deleted file mode 100644
index c3647d5..0000000
--- a/net-misc/openssh/files/openssh-6.3_p1-x509-hpn14v2-glue.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- openssh-6.3p1/Makefile.in
-+++ openssh-6.3p1/Makefile.in
-@@ -45,7 +45,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
-+CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
- K5LIBS=@K5LIBS@
- GSSLIBS=@GSSLIBS@
-@@ -53,6 +53,7 @@
- SSHDLIBS=@SSHDLIBS@
- LIBEDIT=@LIBEDIT@
- LIBLDAP=@LDAP_LDFLAGS@ @LDAP_LIBS@
-+CPPFLAGS+=@LDAP_CPPFLAGS@
- AR=@AR@
- AWK=@AWK@
- RANLIB=@RANLIB@
---- openssh-6.3p1/sshconnect.c
-+++ openssh-6.3p1/sshconnect.c
-@@ -465,7 +465,7 @@
- {
- /* Send our own protocol version identification. */
- if (compat20) {
-- xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n",
-+ xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
- } else {
- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
---- openssh-6.3p1/sshd.c
-+++ openssh-6.3p1/sshd.c
-@@ -472,8 +472,8 @@
- comment = "";
- }
-
-- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
-- major, minor, SSH_VERSION, comment,
-+ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
-+ major, minor, SSH_VERSION,
- *options.version_addendum == '\0' ? "" : " ",
- options.version_addendum, newline);
-
---- openssh-6.3p1/version.h
-+++ openssh-6.3p1/version.h
-@@ -3,4 +3,5 @@
- #define SSH_VERSION "OpenSSH_6.3"
-
- #define SSH_PORTABLE "p1"
-+#define SSH_X509 " PKIX"
- #define SSH_RELEASE SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/files/openssh-6.4_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.4_p1-x509-glue.patch
deleted file mode 100644
index 6aed19b..0000000
--- a/net-misc/openssh/files/openssh-6.4_p1-x509-glue.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch and remove
-redundant README.x509v3 directory.
-
---- openssh-6.4p1+x509-7.7.diff.orig 2013-11-09 14:51:13.400696545 -0800
-+++ openssh-6.4p1+x509-7.7.diff 2013-11-09 14:51:05.798786189 -0800
-@@ -6809,9 +6809,9 @@
-
- -$OpenBSD: README.dns,v 1.2 2003/10/14 19:43:23 jakob Exp $
- +$OpenBSD$
--diff -ruN openssh-6.4p1/README.x509v3/README.x509v3 openssh-6.4p1+x509-7.7/README.x509v3/README.x509v3
----- openssh-6.4p1/README.x509v3/README.x509v3 1970-01-01 02:00:00.000000000 +0200
--+++ openssh-6.4p1+x509-7.7/README.x509v3/README.x509v3 2013-05-17 18:50:02.156263192 +0300
-+diff -ruN openssh-6.4p1/README.x509v3 openssh-6.4p1+x509-7.7/README.x509v3
-+--- openssh-6.4p1/README.x509v3 1970-01-01 02:00:00.000000000 +0200
-++++ openssh-6.4p1+x509-7.7/README.x509v3 2013-05-17 18:50:02.156263192 +0300
- @@ -0,0 +1,615 @@
- + Roumen Petrov
- + Sofia, Bulgaria
-@@ -14793,10 +14793,9 @@
- .It Cm ChallengeResponseAuthentication
- Specifies whether challenge-response authentication is allowed (e.g. via
- PAM or though authentication styles supported in
--@@ -490,6 +567,16 @@
-+@@ -490,5 +567,15 @@
- The default is
- .Dq yes .
-- Note that this option applies to protocol version 2 only.
- +.It Cm HostbasedAlgorithms
- +Specifies the protocol version 2 algorithms used in
- +.Dq hostbased
diff --git a/net-misc/openssh/files/openssh-6.4p1-fix-typo-construct_utmpx.patch b/net-misc/openssh/files/openssh-6.4p1-fix-typo-construct_utmpx.patch
deleted file mode 100644
index a3361ca..0000000
--- a/net-misc/openssh/files/openssh-6.4p1-fix-typo-construct_utmpx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur openssh-6.4p1.orig/loginrec.c openssh-6.4p1/loginrec.c
---- openssh-6.4p1.orig/loginrec.c 2014-01-22 17:33:12.380676129 +0000
-+++ openssh-6.4p1/loginrec.c 2014-01-22 17:55:40.957751536 +0000
-@@ -785,12 +785,12 @@
- /* this is just a 128-bit IPv6 address */
- if (li->hostaddr.sa.sa_family == AF_INET6) {
- sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
-- memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
-+ memcpy(utx->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
- if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
-- ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
-- ut->ut_addr_v6[1] = 0;
-- ut->ut_addr_v6[2] = 0;
-- ut->ut_addr_v6[3] = 0;
-+ utx->ut_addr_v6[0] = utx->ut_addr_v6[3];
-+ utx->ut_addr_v6[1] = 0;
-+ utx->ut_addr_v6[2] = 0;
-+ utx->ut_addr_v6[3] = 0;
- }
- }
- # endif
diff --git a/net-misc/openssh/files/openssh-6.4p1-missing-sys_param_h.patch b/net-misc/openssh/files/openssh-6.4p1-missing-sys_param_h.patch
deleted file mode 100644
index 22b6ffa..0000000
--- a/net-misc/openssh/files/openssh-6.4p1-missing-sys_param_h.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Naur openssh-6.4p1.orig/channels.c openssh-6.4p1/channels.c
---- openssh-6.4p1.orig/channels.c 2014-01-22 17:14:19.508612783 +0000
-+++ openssh-6.4p1/channels.c 2014-01-22 17:18:18.176626129 +0000
-@@ -61,6 +61,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <stdarg.h>
-+#include <sys/param.h>
-
- #include "openbsd-compat/sys-queue.h"
- #include "xmalloc.h"
-diff -Naur openssh-6.4p1.orig/loginrec.c openssh-6.4p1/loginrec.c
---- openssh-6.4p1.orig/loginrec.c 2013-06-01 22:07:32.000000000 +0000
-+++ openssh-6.4p1/loginrec.c 2014-01-22 17:30:57.322668577 +0000
-@@ -162,6 +162,7 @@
- #include <stdarg.h>
- #include <string.h>
- #include <time.h>
-+#include <sys/time.h>
- #include <unistd.h>
-
- #include "xmalloc.h"
-diff -Naur openssh-6.4p1.orig/sshconnect.c openssh-6.4p1/sshconnect.c
---- openssh-6.4p1.orig/sshconnect.c 2014-01-22 17:16:53.809621411 +0000
-+++ openssh-6.4p1/sshconnect.c 2014-01-22 17:17:19.535622850 +0000
-@@ -40,6 +40,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/param.h>
-
- #include "xmalloc.h"
- #include "key.h"
-diff -Naur openssh-6.4p1.orig/sshd.c openssh-6.4p1/sshd.c
---- openssh-6.4p1.orig/sshd.c 2014-01-22 17:14:19.517612784 +0000
-+++ openssh-6.4p1/sshd.c 2014-01-22 17:18:54.560628163 +0000
-@@ -83,6 +83,8 @@
- #include <prot.h>
- #endif
-
-+#include <sys/param.h>
-+
- #include "xmalloc.h"
- #include "ssh.h"
- #include "ssh1.h"
-diff -Naur openssh-6.4p1.orig/ssh-keyscan.c openssh-6.4p1/ssh-keyscan.c
---- openssh-6.4p1.orig/ssh-keyscan.c 2013-06-01 21:31:19.000000000 +0000
-+++ openssh-6.4p1/ssh-keyscan.c 2014-01-22 17:59:37.756764777 +0000
-@@ -29,6 +29,7 @@
- #include <signal.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/param.h>
-
- #include "xmalloc.h"
- #include "ssh.h"
-diff -Naur openssh-6.4p1.orig/ssh-pkcs11-helper.c openssh-6.4p1/ssh-pkcs11-helper.c
---- openssh-6.4p1.orig/ssh-pkcs11-helper.c 2013-06-01 21:31:19.000000000 +0000
-+++ openssh-6.4p1/ssh-pkcs11-helper.c 2014-01-22 18:00:04.653766281 +0000
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/param.h>
-
- #include "xmalloc.h"
- #include "buffer.h"
diff --git a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch b/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
deleted file mode 100644
index fa33af3..0000000
--- a/net-misc/openssh/files/openssh-6.7_p1-openssl-ignore-status.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-the last nibble of the openssl version represents the status. that is,
-whether it is a beta or release. when it comes to version checks in
-openssh, this component does not matter, so ignore it.
-
-https://bugzilla.mindrot.org/show_bug.cgi?id=2212
-
---- a/openbsd-compat/openssl-compat.c
-+++ b/openbsd-compat/openssl-compat.c
-@@ -58,7 +58,7 @@ ssh_compatible_openssl(long headerver, long libver)
- * For versions >= 1.0.0, major,minor,status must match and library
- * fix version must be equal to or newer than the header.
- */
-- mask = 0xfff0000fL; /* major,minor,status */
-+ mask = 0xfff00000L; /* major,minor,status */
- hfix = (headerver & 0x000ff000) >> 12;
- lfix = (libver & 0x000ff000) >> 12;
- if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
diff --git a/net-misc/openssh/files/openssh-6.7_p1-sctp-x509-glue.patch b/net-misc/openssh/files/openssh-6.7_p1-sctp-x509-glue.patch
deleted file mode 100644
index bd0b7ce..0000000
--- a/net-misc/openssh/files/openssh-6.7_p1-sctp-x509-glue.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- openssh-6.7_p1-sctp.patch.orig 2014-11-24 10:34:31.817538707 -0800
-+++ openssh-6.7_p1-sctp.patch 2014-11-24 10:38:52.744990154 -0800
-@@ -195,14 +195,6 @@
- .Op Fl c Ar cipher
- .Op Fl F Ar ssh_config
- .Op Fl i Ar identity_file
--@@ -178,6 +178,7 @@ For full details of the options listed b
-- .It ServerAliveCountMax
-- .It StrictHostKeyChecking
-- .It TCPKeepAlive
--+.It Transport
-- .It UsePrivilegedPort
-- .It User
-- .It UserKnownHostsFile
- @@ -218,6 +219,8 @@ and
- to print debugging messages about their progress.
- This is helpful in
-@@ -482,14 +474,6 @@
- .Op Fl b Ar bind_address
- .Op Fl c Ar cipher_spec
- .Op Fl D Oo Ar bind_address : Oc Ns Ar port
--@@ -473,6 +473,7 @@ For full details of the options listed b
-- .It StreamLocalBindUnlink
-- .It StrictHostKeyChecking
-- .It TCPKeepAlive
--+.It Transport
-- .It Tunnel
-- .It TunnelDevice
-- .It UsePrivilegedPort
- @@ -665,6 +666,8 @@ Trusted X11 forwardings are not subjecte
- controls.
- .It Fl y
-@@ -527,7 +511,7 @@
-- again:
-+
- - while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
- + while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" SCTP_OPT
-- "ACD:E:F:I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
-+ "ACD:E:F:" ENGCONFIG "I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
- switch (opt) {
- case '1':
- @@ -732,6 +738,11 @@ main(int ac, char **av)
diff --git a/net-misc/openssh/files/openssh-6.7_p1-sshd-gssapi-multihomed.patch b/net-misc/openssh/files/openssh-6.7_p1-sshd-gssapi-multihomed.patch
deleted file mode 100644
index 96818e4..0000000
--- a/net-misc/openssh/files/openssh-6.7_p1-sshd-gssapi-multihomed.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-https://bugs.gentoo.org/378361
-https://bugzilla.mindrot.org/show_bug.cgi?id=928
-
---- a/gss-serv.c
-+++ b/gss-serv.c
-@@ -41,9 +41,12 @@
- #include "channels.h"
- #include "session.h"
- #include "misc.h"
-+#include "servconf.h"
-
- #include "ssh-gss.h"
-
-+extern ServerOptions options;
-+
- static ssh_gssapi_client gssapi_client =
- { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL}};
-@@ -77,25 +80,32 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx)
- char lname[NI_MAXHOST];
- gss_OID_set oidset;
-
-- gss_create_empty_oid_set(&status, &oidset);
-- gss_add_oid_set_member(&status, ctx->oid, &oidset);
--
-- if (gethostname(lname, sizeof(lname))) {
-- gss_release_oid_set(&status, &oidset);
-- return (-1);
-- }
-+ if (options.gss_strict_acceptor) {
-+ gss_create_empty_oid_set(&status, &oidset);
-+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
-+
-+ if (gethostname(lname, MAXHOSTNAMELEN)) {
-+ gss_release_oid_set(&status, &oidset);
-+ return (-1);
-+ }
-+
-+ if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
-+ gss_release_oid_set(&status, &oidset);
-+ return (ctx->major);
-+ }
-+
-+ if ((ctx->major = gss_acquire_cred(&ctx->minor,
-+ ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds,
-+ NULL, NULL)))
-+ ssh_gssapi_error(ctx);
-
-- if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) {
- gss_release_oid_set(&status, &oidset);
- return (ctx->major);
-+ } else {
-+ ctx->name = GSS_C_NO_NAME;
-+ ctx->creds = GSS_C_NO_CREDENTIAL;
- }
--
-- if ((ctx->major = gss_acquire_cred(&ctx->minor,
-- ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL)))
-- ssh_gssapi_error(ctx);
--
-- gss_release_oid_set(&status, &oidset);
-- return (ctx->major);
-+ return GSS_S_COMPLETE;
- }
-
- /* Privileged */
---- a/servconf.c
-+++ b/servconf.c
-@@ -86,6 +86,7 @@ initialize_server_options(ServerOptions
- options->kerberos_get_afs_token = -1;
- options->gss_authentication=-1;
- options->gss_cleanup_creds = -1;
-+ options->gss_strict_acceptor = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->challenge_response_authentication = -1;
-@@ -200,6 +201,8 @@ fill_default_server_options(ServerOption
- options->gss_authentication = 0;
- if (options->gss_cleanup_creds == -1)
- options->gss_cleanup_creds = 1;
-+ if (options->gss_strict_acceptor == -1)
-+ options->gss_strict_acceptor = 0;
- if (options->password_authentication == -1)
- options->password_authentication = 1;
- if (options->kbd_interactive_authentication == -1)
-@@ -277,7 +280,8 @@ typedef enum {
- sBanner, sUseDNS, sHostbasedAuthentication,
- sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
- sClientAliveCountMax, sAuthorizedKeysFile,
-- sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel,
-+ sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
-+ sAcceptEnv, sPermitTunnel,
- sMatch, sPermitOpen, sForceCommand, sChrootDirectory,
- sUsePrivilegeSeparation, sAllowAgentForwarding,
- sZeroKnowledgePasswordAuthentication, sHostCertificate,
-@@ -327,9 +331,11 @@ static struct {
- #ifdef GSSAPI
- { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
- { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
-+ { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
- #else
- { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
- { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
-+ { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
- #endif
- { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
- { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
-@@ -850,6 +856,10 @@ process_server_config_line(ServerOptions
-
- case sGssCleanupCreds:
- intptr = &options->gss_cleanup_creds;
-+ goto parse_flag;
-+
-+ case sGssStrictAcceptor:
-+ intptr = &options->gss_strict_acceptor;
- goto parse_flag;
-
- case sPasswordAuthentication:
---- a/servconf.h
-+++ b/servconf.h
-@@ -92,6 +92,7 @@ typedef struct {
- * authenticated with Kerberos. */
- int gss_authentication; /* If true, permit GSSAPI authentication */
- int gss_cleanup_creds; /* If true, destroy cred cache on logout */
-+ int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
- int password_authentication; /* If true, permit password
- * authentication. */
- int kbd_interactive_authentication; /* If true, permit */
---- a/sshd_config
-+++ b/sshd_config
-@@ -69,6 +69,7 @@
- # GSSAPI options
- #GSSAPIAuthentication no
- #GSSAPICleanupCredentials yes
-+#GSSAPIStrictAcceptorCheck yes
-
- # Set this to 'yes' to enable PAM authentication, account processing,
- # and session processing. If this is enabled, PAM authentication will
---- a/sshd_config.5
-+++ b/sshd_config.5
-@@ -386,6 +386,21 @@ on logout.
- The default is
- .Dq yes .
- Note that this option applies to protocol version 2 only.
-+.It Cm GSSAPIStrictAcceptorCheck
-+Determines whether to be strict about the identity of the GSSAPI acceptor
-+a client authenticates against.
-+If set to
-+.Dq yes
-+then the client must authenticate against the
-+.Pa host
-+service on the current hostname.
-+If set to
-+.Dq no
-+then the client may authenticate against any service key stored in the
-+machine's default store.
-+This facility is provided to assist with operation on multi homed machines.
-+The default is
-+.Dq yes .
- .It Cm HostbasedAuthentication
- Specifies whether rhosts or /etc/hosts.equiv authentication together
- with successful public key client host authentication is allowed
diff --git a/net-misc/openssh/files/openssh-6.7_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.7_p1-x509-glue.patch
deleted file mode 100644
index 71b9c51..0000000
--- a/net-misc/openssh/files/openssh-6.7_p1-x509-glue.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- openssh-6.7p1.orig/sshd_config.5 2014-11-24 10:24:29.356244415 -0800
-+++ openssh-6.7p1/sshd_config.5 2014-11-24 10:23:49.415029039 -0800
-@@ -610,21 +610,6 @@
- The default is
- .Dq yes .
- Note that this option applies to protocol version 2 only.
--.It Cm GSSAPIStrictAcceptorCheck
--Determines whether to be strict about the identity of the GSSAPI acceptor
--a client authenticates against.
--If set to
--.Dq yes
--then the client must authenticate against the
--.Pa host
--service on the current hostname.
--If set to
--.Dq no
--then the client may authenticate against any service key stored in the
--machine's default store.
--This facility is provided to assist with operation on multi homed machines.
--The default is
--.Dq yes .
- .It Cm HostbasedAuthentication
- Specifies whether rhosts or /etc/hosts.equiv authentication together
- with successful public key client host authentication is allowed
-@@ -651,6 +636,21 @@
- attempting to resolve the name from the TCP connection itself.
- The default is
- .Dq no .
-+.It Cm GSSAPIStrictAcceptorCheck
-+Determines whether to be strict about the identity of the GSSAPI acceptor
-+a client authenticates against.
-+If set to
-+.Dq yes
-+then the client must authenticate against the
-+.Pa host
-+service on the current hostname.
-+If set to
-+.Dq no
-+then the client may authenticate against any service key stored in the
-+machine's default store.
-+This facility is provided to assist with operation on multi homed machines.
-+The default is
-+.Dq yes .
- .It Cm HostCertificate
- Specifies a file containing a public host certificate.
- The certificate's public key must match a private host key already specified
diff --git a/net-misc/openssh/files/openssh-6.7p1-avoid-exit.patch b/net-misc/openssh/files/openssh-6.7p1-avoid-exit.patch
deleted file mode 100644
index 4998a94..0000000
--- a/net-misc/openssh/files/openssh-6.7p1-avoid-exit.patch
+++ /dev/null
@@ -1,441 +0,0 @@
-diff -ur a/openssh-6.7p1/configure.ac b/openssh-6.7p1/configure.ac
---- a/openssh-6.7p1/configure.ac 2014-08-26 21:32:01.000000000 -0100
-+++ b/openssh-6.7p1/configure.ac 2014-12-08 20:55:47.281836604 -0100
-@@ -252,7 +252,7 @@
- [AC_LANG_PROGRAM([[
- #include <stdlib.h>
- __attribute__((__unused__)) static void foo(void){return;}]],
-- [[ exit(0); ]])],
-+ [[ return 0; ]])],
- [ AC_MSG_RESULT([yes]) ],
- [ AC_MSG_RESULT([no])
- AC_DEFINE(NO_ATTRIBUTE_ON_RETURN_TYPE, 1,
-@@ -442,7 +442,7 @@
- [AC_LANG_PROGRAM([[
- #define testmacro foo
- #define testmacro bar]],
-- [[ exit(0); ]])],
-+ [[ return 0; ]])],
- [ AC_MSG_RESULT([yes]) ],
- [ AC_MSG_RESULT([no])
- CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
-@@ -562,9 +562,9 @@
- AC_MSG_CHECKING([if we have working getaddrinfo])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <mach-o/dyld.h>
- main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
-- exit(0);
-+ return 0;
- else
-- exit(1);
-+ return 1;
- }
- ]])],
- [AC_MSG_RESULT([working])],
-@@ -1067,7 +1067,7 @@
- esac
-
- AC_MSG_CHECKING([compiler and flags for sanity])
--AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ exit(0); ]])],
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include <stdio.h> ]], [[ return 0; ]])],
- [ AC_MSG_RESULT([yes]) ],
- [
- AC_MSG_RESULT([no])
-@@ -1099,9 +1099,9 @@
- strncpy(buf,"/etc", 32);
- s = dirname(buf);
- if (!s || strncmp(s, "/", 32) != 0) {
-- exit(1);
-+ return 1;
- } else {
-- exit(0);
-+ return 0;
- }
- }
- ]])],
-@@ -1191,19 +1191,19 @@
- int a=0, b=0, c=0, d=0, n, v;
- n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
- if (n != 3 && n != 4)
-- exit(1);
-+ return 1;
- v = a*1000000 + b*10000 + c*100 + d;
- fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
-
- /* 1.1.4 is OK */
- if (a == 1 && b == 1 && c >= 4)
-- exit(0);
-+ return 0;
-
- /* 1.2.3 and up are OK */
- if (v >= 1020300)
-- exit(0);
-+ return 0;
-
-- exit(2);
-+ return 2;
- ]])],
- AC_MSG_RESULT([no]),
- [ AC_MSG_RESULT([yes])
-@@ -1308,7 +1308,7 @@
- #include <dirent.h>]],
- [[
- struct dirent d;
-- exit(sizeof(d.d_name)<=sizeof(char));
-+ return sizeof(d.d_name)<=sizeof(char);
- ]])],
- [AC_MSG_RESULT([yes])],
- [
-@@ -1354,7 +1354,7 @@
- #include <skey.h>
- ]], [[
- char *ff = skey_keyinfo(""); ff="";
-- exit(0);
-+ return 0;
- ]])],
- [AC_MSG_RESULT([yes])],
- [
-@@ -1403,7 +1403,7 @@
- #include <stdlib.h>
- #include <stdint.h>
- #include <ldns/ldns.h>
--int main() { ldns_status status = ldns_verify_trusted(NULL, NULL, NULL, NULL); status=LDNS_STATUS_OK; exit(0); }
-+int main() { ldns_status status = ldns_verify_trusted(NULL, NULL, NULL, NULL); status=LDNS_STATUS_OK; return 0; }
- ]])
- ],
- [AC_MSG_RESULT(yes)],
-@@ -1460,7 +1460,7 @@
- [[
- int i = H_SETSIZE;
- el_init("", NULL, NULL, NULL);
-- exit(0);
-+ return 0;
- ]])],
- [ AC_MSG_RESULT([yes]) ],
- [ AC_MSG_RESULT([no])
-@@ -1808,9 +1808,9 @@
- errno=0;
- setresuid(0,0,0);
- if (errno==ENOSYS)
-- exit(1);
-+ return 1;
- else
-- exit(0);
-+ return 0;
- ]])],
- [AC_MSG_RESULT([yes])],
- [AC_DEFINE([BROKEN_SETRESUID], [1],
-@@ -1831,9 +1831,9 @@
- errno=0;
- setresgid(0,0,0);
- if (errno==ENOSYS)
-- exit(1);
-+ return 1;
- else
-- exit(0);
-+ return 0;
- ]])],
- [AC_MSG_RESULT([yes])],
- [AC_DEFINE([BROKEN_SETRESGID], [1],
-@@ -1875,7 +1875,7 @@
- [[
- char b[5];
- snprintf(b,5,"123456789");
-- exit(b[4]!='\0');
-+ return b[4]!='\0';
- ]])],
- [AC_MSG_RESULT([yes])],
- [
-@@ -1966,9 +1966,9 @@
- ]], [[
- char template[]="conftest.mkstemp-test";
- if (mkstemp(template) == -1)
-- exit(1);
-+ return 1;
- unlink(template);
-- exit(0);
-+ return 0;
- ]])],
- [
- AC_MSG_RESULT([no])
-@@ -1999,22 +1999,22 @@
-
- pid = fork();
- if (pid < 0) { /* failed */
-- exit(1);
-+ return 1;
- } else if (pid > 0) { /* parent */
- waitpid(pid, &status, 0);
- if (WIFEXITED(status))
-- exit(WEXITSTATUS(status));
-+ return WEXITSTATUS(status);
- else
-- exit(2);
-+ return 2;
- } else { /* child */
- close(0); close(1); close(2);
- setsid();
- openpty(&ptyfd, &ttyfd, NULL, NULL, NULL);
- fd = open("/dev/tty", O_RDWR | O_NOCTTY);
- if (fd >= 0)
-- exit(3); /* Acquired ctty: broken */
-+ return 3; /* Acquired ctty: broken */
- else
-- exit(0); /* Did not acquire ctty: OK */
-+ return 0; /* Did not acquire ctty: OK */
- }
- ]])],
- [
-@@ -2055,7 +2055,7 @@
- err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai);
- if (err != 0) {
- fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err));
-- exit(1);
-+ return 1;
- }
-
- for (ai = gai_ai; ai != NULL; ai = ai->ai_next) {
-@@ -2072,7 +2072,7 @@
- else
- fprintf(stderr, "getnameinfo failed: %s\n",
- gai_strerror(err));
-- exit(2);
-+ return 2;
- }
-
- sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-@@ -2080,10 +2080,10 @@
- perror("socket");
- if (bind(sock, ai->ai_addr, ai->ai_addrlen) < 0) {
- if (errno == EBADF)
-- exit(3);
-+ return 3;
- }
- }
-- exit(0);
-+ return 0;
- ]])],
- [
- AC_MSG_RESULT([yes])
-@@ -2123,7 +2123,7 @@
- err = getaddrinfo(name, TEST_PORT, &hints, &gai_ai);
- if (err != 0) {
- fprintf(stderr, "getaddrinfo failed (%s)", gai_strerror(err));
-- exit(1);
-+ return 1;
- }
-
- for (ai = gai_ai; ai != NULL; ai = ai->ai_next) {
-@@ -2136,10 +2136,10 @@
-
- if (ai->ai_family == AF_INET && err != 0) {
- perror("getnameinfo");
-- exit(2);
-+ return 2;
- }
- }
-- exit(0);
-+ return 0;
- ]])],
- [
- AC_MSG_RESULT([yes])
-@@ -2248,12 +2248,12 @@
-
- fd = fopen(DATA,"w");
- if(fd == NULL)
-- exit(1);
-+ return 1;
-
- if ((rc = fprintf(fd ,"%08x (%s)\n", OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_TEXT)) <0)
-- exit(1);
-+ return 1;
-
-- exit(0);
-+ return 0;
- ]])],
- [
- ssl_header_ver=`cat conftest.sslincver`
-@@ -2283,13 +2283,13 @@
-
- fd = fopen(DATA,"w");
- if(fd == NULL)
-- exit(1);
-+ return 1;
-
- if ((rc = fprintf(fd ,"%08x (%s)\n", SSLeay(),
- SSLeay_version(SSLEAY_VERSION))) <0)
-- exit(1);
-+ return 1;
-
-- exit(0);
-+ return 0;
- ]])],
- [
- ssl_library_ver=`cat conftest.ssllibver`
-@@ -2330,7 +2330,7 @@
- #include <string.h>
- #include <openssl/opensslv.h>
- ]], [[
-- exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1);
-+ return SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1;
- ]])],
- [
- AC_MSG_RESULT([yes])
-@@ -2419,7 +2419,7 @@
- #include <string.h>
- #include <openssl/evp.h>
- ]], [[
-- exit(EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL);
-+ return EVP_aes_192_cbc() == NULL || EVP_aes_256_cbc() == NULL;
- ]])],
- [
- AC_MSG_RESULT([no])
-@@ -2490,7 +2490,7 @@
- #include <openssl/evp.h>
- ]], [[
- if(EVP_DigestUpdate(NULL, NULL,0))
-- exit(0);
-+ return 0;
- ]])],
- [
- AC_MSG_RESULT([yes])
-@@ -2604,7 +2604,7 @@
- ]],[[
- EC_KEY *e = EC_KEY_new_by_curve_name(NID_secp521r1);
- const EVP_MD *m = EVP_sha512(); /* We need this too */
-- exit(e == NULL || m == NULL);
-+ return e == NULL || m == NULL;
- ]])],
- [ AC_MSG_RESULT([yes])
- enable_nistp521=1 ],
-@@ -2677,7 +2677,7 @@
- #include <string.h>
- #include <openssl/rand.h>
- ]], [[
-- exit(RAND_status() == 1 ? 0 : 1);
-+ return RAND_status() == 1 ? 0 : 1;
- ]])],
- [
- OPENSSL_SEEDS_ITSELF=yes
-@@ -2985,7 +2985,7 @@
- struct rlimit rl_zero;
-
- rl_zero.rlim_cur = rl_zero.rlim_max = 0;
-- exit(setrlimit(RLIMIT_FSIZE, &rl_zero) != 0);
-+ return setrlimit(RLIMIT_FSIZE, &rl_zero) != 0;
- ]])],
- [AC_MSG_RESULT([yes])],
- [AC_MSG_RESULT([no])
-@@ -3119,7 +3119,7 @@
- long long i, llmin, llmax = 0;
-
- if((f = fopen(DATA,"w")) == NULL)
-- exit(1);
-+ return 1;
-
- #if defined(LLONG_MIN) && defined(LLONG_MAX)
- fprintf(stderr, "Using system header for LLONG_MIN and LLONG_MAX\n");
-@@ -3138,16 +3138,16 @@
- || llmax - 1 > llmax || llmin == llmax || llmin == 0
- || llmax == 0 || llmax < LONG_MAX || llmin > LONG_MIN) {
- fprintf(f, "unknown unknown\n");
-- exit(2);
-+ return 2;
- }
-
- if (fprint_ll(f, llmin) < 0)
-- exit(3);
-+ return 3;
- if (fprint_ll(f, llmax) < 0)
-- exit(4);
-+ return 4;
- if (fclose(f) < 0)
-- exit(5);
-- exit(0);
-+ return 5;
-+ return 0;
- ]])],
- [
- llong_min=`$AWK '{print $1}' conftest.llminmax`
-@@ -3553,8 +3553,8 @@
- strcpy(expected_out, "9223372036854775807");
- snprintf(buf, mazsize, "%lld", num);
- if(strcmp(buf, expected_out) != 0)
-- exit(1);
-- exit(0);
-+ return 1;
-+ return 0;
- }
- #else
- main() { exit(0); }
-@@ -3641,11 +3641,11 @@
- ]], [[
- #ifdef msg_accrights
- #error "msg_accrights is a macro"
--exit(1);
-+return 1;
- #endif
- struct msghdr m;
- m.msg_accrights = 0;
--exit(0);
-+return 0;
- ]])],
- [ ac_cv_have_accrights_in_msghdr="yes" ],
- [ ac_cv_have_accrights_in_msghdr="no" ]
-@@ -3702,11 +3702,11 @@
- ]], [[
- #ifdef msg_control
- #error "msg_control is a macro"
--exit(1);
-+return 1;
- #endif
- struct msghdr m;
- m.msg_control = 0;
--exit(0);
-+return 0;
- ]])],
- [ ac_cv_have_control_in_msghdr="yes" ],
- [ ac_cv_have_control_in_msghdr="no" ]
-@@ -4128,22 +4128,22 @@
-
- fd = fopen(DATA,"w");
- if(fd == NULL)
-- exit(1);
-+ return 1;
-
- #if defined (_PATH_MAILDIR)
- if ((rc = fprintf(fd ,"_PATH_MAILDIR:%s\n", _PATH_MAILDIR)) <0)
-- exit(1);
-+ return 1;
- #elif defined (MAILDIR)
- if ((rc = fprintf(fd ,"MAILDIR:%s\n", MAILDIR)) <0)
-- exit(1);
-+ return 1;
- #elif defined (_PATH_MAIL)
- if ((rc = fprintf(fd ,"_PATH_MAIL:%s\n", _PATH_MAIL)) <0)
-- exit(1);
-+ return 1;
- #else
- exit (2);
- #endif
-
-- exit(0);
-+ return 0;
- ]])],
- [
- maildir_what=`awk -F: '{print $1}' conftest.maildir`
-@@ -4378,12 +4378,12 @@
-
- fd = fopen(DATA,"w");
- if(fd == NULL)
-- exit(1);
-+ return 1;
-
- if ((rc = fprintf(fd,"%s", _PATH_STDPATH)) < 0)
-- exit(1);
-+ return 1;
-
-- exit(0);
-+ return 0;
- ]])],
- [ user_path=`cat conftest.stdpath` ],
- [ user_path="/usr/bin:/bin:/usr/sbin:/sbin" ],
diff --git a/net-misc/openssh/files/sshd.confd b/net-misc/openssh/files/sshd.confd
deleted file mode 100644
index 28952b4..0000000
--- a/net-misc/openssh/files/sshd.confd
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/conf.d/sshd: config file for /etc/init.d/sshd
-
-# Where is your sshd_config file stored?
-
-SSHD_CONFDIR="/etc/ssh"
-
-
-# Any random options you want to pass to sshd.
-# See the sshd(8) manpage for more info.
-
-SSHD_OPTS=""
-
-
-# Pid file to use (needs to be absolute path).
-
-#SSHD_PIDFILE="/var/run/sshd.pid"
-
-
-# Path to the sshd binary (needs to be absolute path).
-
-#SSHD_BINARY="/usr/sbin/sshd"
diff --git a/net-misc/openssh/files/sshd.pam_include.2 b/net-misc/openssh/files/sshd.pam_include.2
deleted file mode 100644
index b801aaa..0000000
--- a/net-misc/openssh/files/sshd.pam_include.2
+++ /dev/null
@@ -1,4 +0,0 @@
-auth include system-remote-login
-account include system-remote-login
-password include system-remote-login
-session include system-remote-login
diff --git a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4
deleted file mode 100755
index 1b872bc..0000000
--- a/net-misc/openssh/files/sshd.rc6.4
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/files/sshd.rc6.4,v 1.3 2013/04/24 03:13:03 vapier Exp $
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-SSHD_CONFDIR=${SSHD_CONFDIR:-/etc/ssh}
-SSHD_CONFIG=${SSHD_CONFIG:-${SSHD_CONFDIR}/sshd_config}
-SSHD_PIDFILE=${SSHD_PIDFILE:-/var/run/${SVCNAME}.pid}
-SSHD_BINARY=${SSHD_BINARY:-/usr/sbin/sshd}
-
-depend() {
- use logger dns
- if [ "${rc_need+set}" = "set" ]; then
- : # Do nothing, the user has explicitly set rc_need
- else
- warn_addr=''
- for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do
- case "$x" in
- 0.0.0.0|0.0.0.0:*) ;;
- ::|\[::\]*) ;;
- *) warn_addr="${warn_addr} $x" ;;
- esac
- done
- unset x
- if [ "${warn_addr:+set}" = "set" ]; then
- need net
- ewarn "You are binding an interface in ListenAddress statement in your sshd_config!"
- ewarn "You must add rc_need=\"net.FOO\" to your /etc/conf.d/sshd"
- ewarn "where FOO is the interface(s) providing the following address(es):"
- ewarn "${warn_addr}"
- fi
- unset warn_addr
- fi
-}
-
-checkconfig() {
- if [ ! -d /var/empty ] ; then
- mkdir -p /var/empty || return 1
- fi
-
- if [ ! -e "${SSHD_CONFDIR}"/sshd_config ] ; then
- eerror "You need an ${SSHD_CONFDIR}/sshd_config file to run sshd"
- eerror "There is a sample file in /usr/share/doc/openssh"
- return 1
- fi
-
- ssh-keygen -A || return 1
-
- [ "${SSHD_PIDFILE}" != "/var/run/sshd.pid" ] \
- && SSHD_OPTS="${SSHD_OPTS} -o PidFile=${SSHD_PIDFILE}"
- [ "${SSHD_CONFDIR}" != "/etc/ssh" ] \
- && SSHD_OPTS="${SSHD_OPTS} -f ${SSHD_CONFDIR}/sshd_config"
-
- "${SSHD_BINARY}" -t ${SSHD_OPTS} || return 1
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec "${SSHD_BINARY}" \
- --pidfile "${SSHD_PIDFILE}" \
- -- ${SSHD_OPTS}
- eend $?
-}
-
-stop() {
- if [ "${RC_CMD}" = "restart" ] ; then
- checkconfig || return 1
- fi
-
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec "${SSHD_BINARY}" \
- --pidfile "${SSHD_PIDFILE}" --quiet
- eend $?
-}
-
-reload() {
- checkconfig || return 1
- ebegin "Reloading ${SVCNAME}"
- start-stop-daemon --signal HUP \
- --exec "${SSHD_BINARY}" --pidfile "${SSHD_PIDFILE}"
- eend $?
-}
diff --git a/net-misc/openssh/files/sshd.service b/net-misc/openssh/files/sshd.service
deleted file mode 100644
index b5e96b3..0000000
--- a/net-misc/openssh/files/sshd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=OpenSSH server daemon
-After=syslog.target network.target auditd.service
-
-[Service]
-ExecStartPre=/usr/bin/ssh-keygen -A
-ExecStart=/usr/sbin/sshd -D -e
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openssh/files/sshd.socket b/net-misc/openssh/files/sshd.socket
deleted file mode 100644
index 94b9533..0000000
--- a/net-misc/openssh/files/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=OpenSSH Server Socket
-Conflicts=sshd.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/net-misc/openssh/files/sshd_at.service b/net-misc/openssh/files/sshd_at.service
deleted file mode 100644
index 2645ad0..0000000
--- a/net-misc/openssh/files/sshd_at.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH per-connection server daemon
-After=syslog.target auditd.service
-
-[Service]
-ExecStart=-/usr/sbin/sshd -i -e
-StandardInput=socket
-StandardError=syslog
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
deleted file mode 100644
index 885648b..0000000
--- a/net-misc/openssh/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <maintainer restrict="net-misc/openssh[ldap]">
- <email>robbat2@gentoo.org</email>
- <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
- </maintainer>
- <longdescription>
-OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that
-increasing numbers of people on the Internet are coming to rely on. Many users of telnet,
-rlogin, ftp, and other such programs might not realize that their password is transmitted
-across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords)
-to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks.
-Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety
-of authentication methods.
-
-The OpenSSH suite includes the ssh program which replaces rlogin and telnet, scp which
-replaces rcp, and sftp which replaces ftp. Also included is sshd which is the server side of
-the package, and the other basic utilities like ssh-add, ssh-agent, ssh-keysign, ssh-keyscan,
-ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and 2.0.
-</longdescription>
- <use>
- <flag name="bindist">Disable EC/RC5 algorithms in OpenSSL for patent reasons.</flag>
- <flag name="hpn">Enable high performance ssh</flag>
- <flag name="ldap">Add support for storing SSH public keys in LDAP</flag>
- <flag name="ldns">Use LDNS for DNSSEC/SSHFP validation.</flag>
- <flag name="sctp">Support for Stream Control Transmission Protocol</flag>
- <flag name="X509">Adds support for X.509 certificate authentication</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:openssh:openssh</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/openssh/openssh-6.7_p1-r99.ebuild b/net-misc/openssh/openssh-6.7_p1-r99.ebuild
deleted file mode 100644
index f6ad39c..0000000
--- a/net-misc/openssh/openssh-6.7_p1-r99.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.7_p1-r3.ebuild,v 1.1 2014/11/25 22:35:45 chutzpah Exp $
-
-EAPI="4"
-inherit eutils user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_PATCH="${PN}-6.7p1-hpnssh14v5.tar.xz"
-LDAP_PATCH="${PN}-lpk-6.7p1-0.3.14.patch.xz"
-X509_VER="8.2" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
- mirror://gentoo/${P}-sctp.patch.xz
- ${HPN_PATCH:+hpn? (
- mirror://gentoo/${HPN_PATCH}
- http://dev.gentoo.org/~vapier/dist/${HPN_PATCH}
- mirror://sourceforge/hpnssh/${HPN_PATCH}
- )}
- ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
- ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
- "
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="bindist ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit pam +pie sctp selinux skey static X X509"
-REQUIRED_USE="pie? ( !static )"
-
-LIB_DEPEND="sctp? ( net-misc/lksctp-tools[static-libs(+)] )
- selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
- skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
- libedit? ( dev-libs/libedit[static-libs(+)] )
- >=dev-libs/openssl-0.9.6d:0[bindist=]
- dev-libs/openssl[static-libs(+)]
- >=sys-libs/zlib-1.2.3[static-libs(+)]"
-RDEPEND="
- !static? (
- ${LIB_DEPEND//\[static-libs(+)]}
- ldns? (
- !bindist? ( net-libs/ldns[ecdsa,ssl] )
- bindist? ( net-libs/ldns[-ecdsa,ssl] )
- )
- )
- pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- ldns? (
- !bindist? ( net-libs/ldns[ecdsa,ssl,static-libs(+)] )
- bindist? ( net-libs/ldns[-ecdsa,ssl,static-libs(+)] )
- )
- )
- virtual/pkgconfig
- virtual/os-headers
- sys-devel/autoconf"
-RDEPEND="${RDEPEND}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( virtual/shadow )
- X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use X509 && maybe_fail X509 X509_PATCH)
- $(use ldap && maybe_fail ldap LDAP_PATCH)
- $(use hpn && maybe_fail hpn HPN_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "booooo"
- fi
-}
-
-save_version() {
- # version.h patch conflict avoidence
- mv version.h version.h.$1
- cp -f version.h.pristine version.h
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
- # keep this as we need it to avoid the conflict between LPK and HPN changing
- # this file.
- cp version.h version.h.pristine
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- epatch "${FILESDIR}"/${PN}-6.7_p1-sshd-gssapi-multihomed.patch #378361
- if use X509 ; then
- pushd .. >/dev/null
- epatch "${FILESDIR}"/${P}-x509-glue.patch
- epatch "${FILESDIR}"/${P}-sctp-x509-glue.patch
- popd >/dev/null
- epatch "${WORKDIR}"/${X509_PATCH%.*}
- epatch "${FILESDIR}"/${PN}-6.3_p1-x509-hpn14v2-glue.patch
- save_version X509
- fi
- if ! use X509 ; then
- if [[ -n ${LDAP_PATCH} ]] && use ldap ; then
- epatch "${WORKDIR}"/${LDAP_PATCH%.*}
- save_version LPK
- fi
- else
- use ldap && ewarn "Sorry, X509 and LDAP conflict internally, disabling LDAP"
- fi
- epatch "${FILESDIR}"/${PN}-4.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- epatch "${WORKDIR}"/${PN}-6.7_p1-sctp.patch
- if [[ -n ${HPN_PATCH} ]] && use hpn; then
- epatch "${WORKDIR}"/${HPN_PATCH%.*}/*
- save_version HPN
- fi
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- sed -i "${sed_args[@]}" configure{.ac,} || die
-
- epatch "${FILESDIR}"/${PN}-6.7p1-avoid-exit.patch
- epatch "${FILESDIR}"/${PN}-6.4p1-missing-sys_param_h.patch
- epatch "${FILESDIR}"/${PN}-6.4p1-fix-typo-construct_utmpx.patch
-
- epatch_user #473004
-
- # Now we can build a sane merged version.h
- (
- sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
- macros=()
- for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
- printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
- ) > version.h
-
- eautoreconf
-}
-
-static_use_with() {
- local flag=$1
- if use static && use ${flag} ; then
- ewarn "Disabling '${flag}' support because of USE='static'"
- # rebuild args so that we invert the first one (USE flag)
- # but otherwise leave everything else working so we can
- # just leverage use_with
- shift
- [[ -z $1 ]] && flag="${flag} ${flag}"
- set -- !${flag} "$@"
- fi
- use_with "$@"
-}
-
-src_configure() {
- local myconf=()
- addwrite /dev/ptmx
- addpredict /etc/skey/skeykeys #skey configure code triggers this
-
- use static && append-ldflags -static
-
- # Special settings for Gentoo/FreeBSD 9.0 or later (see bug #391011)
- if use elibc_FreeBSD && version_is_at_least 9.0 "$(uname -r|sed 's/\(.\..\).*/\1/')" ; then
- myconf+=( --disable-utmp --disable-wtmp --disable-wtmpx )
- append-ldflags -lutil
- fi
-
- # __stack_chk_fail_local
- use x86 && myconf+=( --without-stackprotect)
- use ppc && myconf+=( --without-stackprotect)
-
- econf \
- --with-ldflags="${LDFLAGS}" \
- --disable-strip \
- --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run \
- --sysconfdir="${EPREFIX}"/etc/ssh \
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc \
- --datadir="${EPREFIX}"/usr/share/openssh \
- --with-privsep-path="${EPREFIX}"/var/empty \
- --with-privsep-user=sshd \
- --with-md5-passwords \
- --with-ssl-engine \
- $(static_use_with pam) \
- $(static_use_with kerberos kerberos5 "${EPREFIX}"/usr) \
- ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \
- $(use_with ldns) \
- $(use_with libedit) \
- $(use_with pie) \
- $(use_with sctp) \
- $(use_with selinux) \
- $(use_with skey) \
- "${myconf[@]}"
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.4 sshd
- newconfd "${FILESDIR}"/sshd.confd sshd
- keepdir /var/empty
-
- # not all openssl installs support ecc, or are functional #352645
- if ! grep -q '#define OPENSSL_HAS_ECC 1' config.h ; then
- elog "dev-libs/openssl was built with 'bindist' - disabling ecdsa support"
- sed -i 's:&& gen_key ecdsa::' "${ED}"/etc/init.d/sshd || die
- fi
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die "sed of configuration file failed"
- fi
-
- # Gentoo tweaks to default config files
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables #367017
- AcceptEnv LANG LC_*
- EOF
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables #367017
- SendEnv LANG LC_*
- EOF
-
- # This instruction is from the HPN webpage,
- # Used for the server logging functionality
- if [[ -n ${HPN_PATCH} ]] && use hpn ; then
- keepdir /var/empty/dev
- fi
-
- if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
- insinto /etc/openldap/schema/
- newins openssh-lpk_openldap.schema openssh-lpk.schema
- fi
-
- doman contrib/ssh-copy-id.1
- dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
- local t tests skipped failed passed shell
- tests="interop-tests compat-tests"
- skipped=""
- shell=$(egetshell ${UID})
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite"
- elog "requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped="${skipped} tests"
- else
- tests="${tests} tests"
- fi
- # It will also attempt to write to the homedir .ssh
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in ${tests} ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" \
- emake -k -j1 ${t} </dev/null \
- && passed="${passed}${t} " \
- || failed="${failed}${t} "
- done
- einfo "Passed tests: ${passed}"
- ewarn "Skipped tests: ${skipped}"
- if [[ -n ${failed} ]] ; then
- ewarn "Failed tests: ${failed}"
- die "Some tests failed: ${failed}"
- else
- einfo "Failed tests: ${failed}"
- return 0
- fi
-}
-
-pkg_preinst() {
- enewgroup sshd 22
- enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
- if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
- elog "Starting with openssh-5.8p1, the server will default to a newer key"
- elog "algorithm (ECDSA). You are encouraged to manually update your stored"
- elog "keys list as servers update theirs. See ssh-keyscan(1) for more info."
- fi
- ewarn "Remember to merge your config files in /etc/ssh/ and then"
- ewarn "reload sshd: '/etc/init.d/sshd reload'."
- # This instruction is from the HPN webpage,
- # Used for the server logging functionality
- if [[ -n ${HPN_PATCH} ]] && use hpn ; then
- echo
- einfo "For the HPN server logging patch, you must ensure that"
- einfo "your syslog application also listens at /var/empty/dev/log."
- fi
-}
diff --git a/net-misc/openvpn/files/2.3.6-disable-compression.patch b/net-misc/openvpn/files/2.3.6-disable-compression.patch
deleted file mode 100644
index d9d1c76..0000000
--- a/net-misc/openvpn/files/2.3.6-disable-compression.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://community.openvpn.net/openvpn/changeset/5d5233778868ddd568140c394adfcfc8e3453245/
-
---- openvpn-2.3.6/src/openvpn/ssl_openssl.c.orig 2014-11-29 23:00:35.000000000 +0800
-+++ openvpn-2.3.6/src/openvpn/ssl_openssl.c 2015-01-12 21:14:30.186993686 +0800
-@@ -238,6 +238,13 @@
- if (tls_ver_min > TLS_VER_1_2 || tls_ver_max < TLS_VER_1_2)
- sslopt |= SSL_OP_NO_TLSv1_2;
- #endif
-+
-+#ifdef SSL_OP_NO_COMPRESSION
-+ msg (M_WARN, "[Workaround] disable SSL compression");
-+ sslopt |= SSL_OP_NO_COMPRESSION;
-+#endif
-+
-+
- SSL_CTX_set_options (ctx->ctx, sslopt);
- }
-
diff --git a/net-misc/openvpn/files/2.3.6-musl-compat.patch b/net-misc/openvpn/files/2.3.6-musl-compat.patch
deleted file mode 100644
index 9b1289b..0000000
--- a/net-misc/openvpn/files/2.3.6-musl-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur openvpn-2.3.6.orig/src/openvpn/syshead.h openvpn-2.3.6/src/openvpn/syshead.h
---- openvpn-2.3.6.orig/src/openvpn/syshead.h 2014-11-29 16:00:35.000000000 +0100
-+++ openvpn-2.3.6/src/openvpn/syshead.h 2015-05-08 00:42:34.171634884 +0200
-@@ -214,10 +214,6 @@
-
- #ifdef TARGET_LINUX
-
--#if defined(HAVE_NETINET_IF_ETHER_H)
--#include <netinet/if_ether.h>
--#endif
--
- #ifdef HAVE_LINUX_IF_TUN_H
- #include <linux/if_tun.h>
- #endif
diff --git a/net-misc/openvpn/files/2.3.6-null-cipher.patch b/net-misc/openvpn/files/2.3.6-null-cipher.patch
deleted file mode 100644
index 1e831cf..0000000
--- a/net-misc/openvpn/files/2.3.6-null-cipher.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-The "really fix cipher none" patch has been merged to release/2.3 and master:
-
-commit 785838614afc20d362b64907b0212e9a779e2287 (release/2.3)
-commit 98156e90e1e83133a6a6a020db8e7333ada6156b (master)
-
-diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h
-index 8749878..4e45df0 100644
---- a/src/openvpn/crypto_backend.h
-+++ b/src/openvpn/crypto_backend.h
-@@ -237,8 +237,7 @@ int cipher_kt_mode (const cipher_kt_t *cipher_kt);
- *
- * @return true iff the cipher is a CBC mode cipher.
- */
--bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
-- __attribute__((nonnull));
-+bool cipher_kt_mode_cbc(const cipher_kt_t *cipher);
-
- /**
- * Check if the supplied cipher is a supported OFB or CFB mode cipher.
-@@ -247,8 +246,7 @@ bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
- *
- * @return true iff the cipher is a OFB or CFB mode cipher.
- */
--bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher)
-- __attribute__((nonnull));
-+bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher);
-
-
- /**
-diff --git a/tests/t_lpback.sh b/tests/t_lpback.sh
-index 8f88ad9..d7792cd 100755
---- a/tests/t_lpback.sh
-+++ b/tests/t_lpback.sh
-@@ -35,6 +35,9 @@ CIPHERS=$(${top_builddir}/src/openvpn/openvpn --show-ciphers | \
- # GD, 2014-07-06 do not test RC5-* either (fails on NetBSD w/o libcrypto_rc5)
- CIPHERS=$(echo "$CIPHERS" | egrep -v '^(DES-EDE3-CFB1|DES-CFB1|RC5-)' )
-
-+# Also test cipher 'none'
-+CIPHERS=${CIPHERS}$(printf "\nnone")
-+
- "${top_builddir}/src/openvpn/openvpn" --genkey --secret key.$$
- set +e
-
---
-1.9.1
-
diff --git a/net-misc/openvpn/files/65openvpn b/net-misc/openvpn/files/65openvpn
deleted file mode 100644
index 4ddb034..0000000
--- a/net-misc/openvpn/files/65openvpn
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROTECT="/usr/share/openvpn/easy-rsa"
diff --git a/net-misc/openvpn/files/down.sh b/net-misc/openvpn/files/down.sh
deleted file mode 100755
index 1c70db0..0000000
--- a/net-misc/openvpn/files/down.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# If we have a service specific script, run this now
-if [ -x /etc/openvpn/"${SVCNAME}"-down.sh ] ; then
- /etc/openvpn/"${SVCNAME}"-down.sh "$@"
-fi
-
-# Restore resolv.conf to how it was
-if [ "${PEER_DNS}" != "no" ]; then
- if [ -x /sbin/resolvconf ] ; then
- /sbin/resolvconf -d "${dev}"
- elif [ -e /etc/resolv.conf-"${dev}".sv ] ; then
- # Important that we copy instead of move incase resolv.conf is
- # a symlink and not an actual file
- cp /etc/resolv.conf-"${dev}".sv /etc/resolv.conf
- rm -f /etc/resolv.conf-"${dev}".sv
- fi
-fi
-
-if [ -n "${SVCNAME}" ]; then
- # Re-enter the init script to start any dependant services
- if /etc/init.d/"${SVCNAME}" --quiet status ; then
- export IN_BACKGROUND=true
- /etc/init.d/"${SVCNAME}" --quiet stop
- fi
-fi
-
-exit 0
-
-# vim: ts=4 :
diff --git a/net-misc/openvpn/files/openvpn-2.1.conf b/net-misc/openvpn/files/openvpn-2.1.conf
deleted file mode 100644
index 72510c3..0000000
--- a/net-misc/openvpn/files/openvpn-2.1.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# OpenVPN automatically creates an /etc/resolv.conf (or sends it to
-# resolvconf) if given DNS information by the OpenVPN server.
-# Set PEER_DNS="no" to stop this.
-PEER_DNS="yes"
-
-# OpenVPN can run in many modes. Most people will want the init script
-# to automatically detect the mode and try and apply a good default
-# configuration and setup scripts. However, there are cases where the
-# OpenVPN configuration looks like a client, but it's really a peer or
-# something else. DETECT_CLIENT controls this behaviour.
-DETECT_CLIENT="yes"
-
-# If DETECT_CLIENT is no and you have your own scripts to re-enter the openvpn
-# init script (ie, it first becomes "inactive" and the script then starts the
-# script again to make it "started") then you can state this below.
-# In other words, unless you understand service dependencies and are a
-# competent shell scripter, don't set this.
-RE_ENTER="no"
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init
deleted file mode 100755
index d65e6f8..0000000
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR=${VPNDIR:-/etc/openvpn}
-VPN=${SVCNAME#*.}
-if [ -n "${VPN}" ] && [ ${SVCNAME} != "openvpn" ]; then
- VPNPID="/var/run/openvpn.${VPN}.pid"
-else
- VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
- need localmount net
- use dns
- after bootmisc
-}
-
-checkconfig() {
- # Linux has good dynamic tun/tap creation
- if [ $(uname -s) = "Linux" ] ; then
- if [ ! -e /dev/net/tun ]; then
- if ! modprobe tun ; then
- eerror "TUN/TAP support is not available" \
- "in this kernel"
- return 1
- fi
- fi
- if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
- ebegin "Detected broken /dev/net/tun symlink, fixing..."
- rm -f /dev/net/tun
- ln -s /dev/misc/net/tun /dev/net/tun
- eend $?
- fi
- return 0
- fi
-
- # Other OS's don't, so we rely on a pre-configured interface
- # per vpn instance
- local ifname=$(sed -n -e 's/[[:space:]]*dev[[:space:]][[:space:]]*\([^[:space:]]*\).*/\1/p' "${VPNCONF}")
- if [ -z ${ifname} ] ; then
- eerror "You need to specify the interface that this openvpn" \
- "instance should use" \
- "by using the dev option in ${VPNCONF}"
- return 1
- fi
-
- if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then
- # Try and create it
- echo > /dev/"${ifname}" >/dev/null
- fi
- if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then
- eerror "${VPNCONF} requires interface ${ifname}" \
- "but that does not exist"
- return 1
- fi
-}
-
-start() {
- # If we are re-called by the openvpn gentoo-up.sh script
- # then we don't actually want to start openvpn
- [ "${IN_BACKGROUND}" = "true" ] && return 0
-
- ebegin "Starting ${SVCNAME}"
-
- checkconfig || return 1
-
- local args="" reenter=${RE_ENTER:-no}
- # If the config file does not specify the cd option, we do
- # But if we specify it, we override the config option which we do not want
- if ! grep -q "^[ ]*cd[ ].*" "${VPNCONF}" ; then
- args="${args} --cd ${VPNDIR}"
- fi
-
- # We mark the service as inactive and then start it.
- # When we get an authenticated packet from the peer then we run our script
- # which configures our DNS if any and marks us as up.
- if [ "${DETECT_CLIENT:-yes}" = "yes" ] && \
- grep -q "^[ ]*remote[ ].*" "${VPNCONF}" ; then
- reenter="yes"
- args="${args} --up-delay --up-restart"
- args="${args} --script-security 2"
- args="${args} --up /etc/openvpn/up.sh"
- args="${args} --down-pre --down /etc/openvpn/down.sh"
-
- # Warn about setting scripts as we override them
- if grep -Eq "^[ ]*(up|down)[ ].*" "${VPNCONF}" ; then
- ewarn "WARNING: You have defined your own up/down scripts"
- ewarn "As you're running as a client, we now force Gentoo specific"
- ewarn "scripts to be run for up and down events."
- ewarn "These scripts will call /etc/openvpn/${SVCNAME}-{up,down}.sh"
- ewarn "where you can put your own code."
- fi
-
- # Warn about the inability to change ip/route/dns information when
- # dropping privs
- if grep -q "^[ ]*user[ ].*" "${VPNCONF}" ; then
- ewarn "WARNING: You are dropping root privileges!"
- ewarn "As such openvpn may not be able to change ip, routing"
- ewarn "or DNS configuration."
- fi
- else
- # So we're a server. Run as openvpn unless otherwise specified
- grep -q "^[ ]*user[ ].*" "${VPNCONF}" || args="${args} --user openvpn"
- grep -q "^[ ]*group[ ].*" "${VPNCONF}" || args="${args} --group openvpn"
- fi
-
- # Ensure that our scripts get the PEER_DNS variable
- [ -n "${PEER_DNS}" ] && args="${args} --setenv PEER_DNS ${PEER_DNS}"
-
- [ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}"
- start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
- -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon \
- --setenv SVCNAME "${SVCNAME}" ${args}
- eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
- # If we are re-called by the openvpn gentoo-down.sh script
- # then we don't actually want to stop openvpn
- if [ "${IN_BACKGROUND}" = "true" ] ; then
- mark_service_inactive "${SVCNAME}"
- return 0
- fi
-
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet \
- --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
- eend $?
-}
-
-# vim: set ts=4 :
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
deleted file mode 100644
index 489ab49..0000000
--- a/net-misc/openvpn/files/openvpn.init
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR="/etc/openvpn"
-VPN="${SVCNAME#*.}"
-if [ -n "${VPN}" ] && [ "${SVCNAME}" != "openvpn" ]; then
- VPNPID="/var/run/openvpn.${VPN}.pid"
-else
- VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
- need localmount net
- before netmount
- after bootmisc
-}
-
-checktundevice() {
- if [ ! -e /dev/net/tun ]; then
- if ! modprobe tun ; then
- eerror "TUN/TAP support is not available in this kernel"
- return 1
- fi
- fi
- if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
- ebegin "Detected broken /dev/net/tun symlink, fixing..."
- rm -f /dev/net/tun
- ln -s /dev/misc/net/tun /dev/net/tun
- eend $?
- fi
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
-
- checktundevice || return 1
-
- if [ ! -e "${VPNCONF}" ]; then
- eend 1 "${VPNCONF} does not exist"
- return 1
- fi
-
- local args=""
- # If the config file does not specify the cd option, we do
- # But if we specify it, we override the config option which we do not want
- if ! grep -q "^[ ]*cd[ ].*" "${VPNCONF}" ; then
- args="${args} --cd ${VPNDIR}"
- fi
-
- start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
- -- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
- eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
- eend $?
-}
-
-# vim: ts=4
diff --git a/net-misc/openvpn/files/openvpn.service b/net-misc/openvpn/files/openvpn.service
deleted file mode 100644
index 358dcb7..0000000
--- a/net-misc/openvpn/files/openvpn.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I
-After=syslog.target network.target
-
-[Service]
-PrivateTmp=true
-Type=forking
-PIDFile=/var/run/openvpn/%i.pid
-ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/openvpn/files/openvpn.tmpfile b/net-misc/openvpn/files/openvpn.tmpfile
deleted file mode 100644
index d5fca71..0000000
--- a/net-misc/openvpn/files/openvpn.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/openvpn 0710 root openvpn -
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
deleted file mode 100755
index 6ce82d6..0000000
--- a/net-misc/openvpn/files/up.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Setup our resolv.conf
-# Vitally important that we use the domain entry in resolv.conf so we
-# can setup the nameservers are for the domain ONLY in resolvconf if
-# we're using a decent dns cache/forwarder like dnsmasq and NOT nscd/libc.
-# nscd/libc users will get the VPN nameservers before their other ones
-# and will use the first one that responds - maybe the LAN ones?
-# non resolvconf users just the the VPN resolv.conf
-
-# FIXME:- if we have >1 domain, then we have to use search :/
-# We need to add a flag to resolvconf to say
-# "these nameservers should only be used for the listed search domains
-# if other global nameservers are present on other interfaces"
-# This however, will break compatibility with Debians resolvconf
-# A possible workaround would be to just list multiple domain lines
-# and try and let resolvconf handle it
-
-min_route() {
- local n=1
- local m
- local r
-
- eval m="\$route_metric_$n"
- while [ -n "${m}" ]; do
- if [ -z "$r" ] || [ "$r" -gt "$m" ]; then
- r="$m"
- fi
- n="$(($n+1))"
- eval m="\$route_metric_$n"
- done
-
- echo "$r"
-}
-
-if [ "${PEER_DNS}" != "no" ]; then
- NS=
- DOMAIN=
- SEARCH=
- i=1
- while true ; do
- eval opt=\$foreign_option_${i}
- [ -z "${opt}" ] && break
- if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ] ; then
- if [ -z "${DOMAIN}" ] ; then
- DOMAIN="${opt#dhcp-option DOMAIN *}"
- else
- SEARCH="${SEARCH}${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
- fi
- elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
- NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
- fi
- i=$((${i} + 1))
- done
-
- if [ -n "${NS}" ] ; then
- DNS="# Generated by openvpn for interface ${dev}\n"
- if [ -n "${SEARCH}" ] ; then
- DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
- elif [ -n "${DOMAIN}" ]; then
- DNS="${DNS}domain ${DOMAIN}\n"
- fi
- DNS="${DNS}${NS}"
- if [ -x /sbin/resolvconf ] ; then
- metric="$(min_route)"
- printf "${DNS}" | /sbin/resolvconf -a "${dev}" ${metric:+-m ${metric}}
- else
- # Preserve the existing resolv.conf
- if [ -e /etc/resolv.conf ] ; then
- cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv
- fi
- printf "${DNS}" > /etc/resolv.conf
- chmod 644 /etc/resolv.conf
- fi
- fi
-fi
-
-# Below section is Gentoo specific
-# Quick summary - our init scripts are re-entrant and set the SVCNAME env var
-# as we could have >1 openvpn service
-
-if [ -n "${SVCNAME}" ]; then
- # If we have a service specific script, run this now
- if [ -x /etc/openvpn/"${SVCNAME}"-up.sh ] ; then
- /etc/openvpn/"${SVCNAME}"-up.sh "$@"
- fi
-
- # Re-enter the init script to start any dependant services
- if ! /etc/init.d/"${SVCNAME}" --quiet status ; then
- export IN_BACKGROUND=true
- /etc/init.d/${SVCNAME} --quiet start
- fi
-fi
-
-exit 0
-
-# vim: ts=4 :
diff --git a/net-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
deleted file mode 100644
index ef30850..0000000
--- a/net-misc/openvpn/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>djc@gentoo.org</email>
- <name>Dirkjan Ochtman</name>
- </maintainer>
- <longdescription>OpenVPN is an easy-to-use, robust and highly
-configurable VPN daemon which can be used to securely link two or more
-networks using an encrypted tunnel.</longdescription>
- <use>
- <flag name="down-root">Enable the down-root plugin</flag>
- <flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
- <flag name="passwordsave">Enables openvpn to save passwords</flag>
- <flag name="polarssl">Use PolarSSL instead of OpenSSL</flag>
- <flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
- <flag name="plugins">Enable the OpenVPN plugin system</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:openvpn:openvpn</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-misc/openvpn/openvpn-2.3.6-r99.ebuild b/net-misc/openvpn/openvpn-2.3.6-r99.ebuild
deleted file mode 100644
index ebb4c70..0000000
--- a/net-misc/openvpn/openvpn-2.3.6-r99.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r2.ebuild,v 1.1 2015/02/17 18:46:07 djc Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
- polarssl? ( ssl )
- pkcs11? ( ssl )
- !plugins? ( !pam !down-root )"
-
-DEPEND="
- kernel_linux? (
- iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
- )
- pam? ( virtual/pam )
- ssl? (
- !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
- )
- lzo? ( >=dev-libs/lzo-1.07 )
- pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-openvpn )
-"
-
-src_prepare() {
- # Set correct pass to systemd-ask-password binary
- sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
- epatch "${FILESDIR}/2.3.6-null-cipher.patch" || die
- epatch "${FILESDIR}/2.3.6-disable-compression.patch" || die
- epatch "${FILESDIR}/2.3.6-musl-compat.patch" || die
- eautoreconf
-}
-
-src_configure() {
- use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
- local myconf
- echo "DROPPY"
- use polarssl && echo "FLOZZY"
- use polarssl && myconf="--with-crypto-library=polarssl"
- econf \
- ${myconf} \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
- $(use_enable passwordsave password-save) \
- $(use_enable ssl) \
- $(use_enable ssl crypto) \
- $(use_enable lzo) \
- $(use_enable pkcs11) \
- $(use_enable plugins) \
- $(use_enable iproute2) \
- $(use_enable pam plugin-auth-pam) \
- $(use_enable down-root plugin-down-root) \
- $(use_enable systemd)
-}
-
-src_install() {
- default
- find "${ED}/usr" -name '*.la' -delete
- # install documentation
- dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
- # Install some helper scripts
- keepdir /etc/openvpn
- exeinto /etc/openvpn
- doexe "${FILESDIR}/up.sh"
- doexe "${FILESDIR}/down.sh"
-
- # Install the init script and config file
- newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
- newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
- # install examples, controlled by the respective useflag
- if use examples ; then
- # dodoc does not supportly support directory traversal, #15193
- insinto /usr/share/doc/${PF}/examples
- doins -r sample contrib
- fi
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
- systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
-}
-
-pkg_postinst() {
- # Add openvpn user so openvpn servers can drop privs
- # Clients should run as root so they can change ip addresses,
- # dns information and other such things.
- enewgroup openvpn
- enewuser openvpn "" "" "" openvpn
-
- if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
- ewarn "WARNING: The openvpn init script has changed"
- ewarn ""
- fi
-
- elog "The openvpn init script expects to find the configuration file"
- elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
- elog ""
- elog "To create more VPNs, simply create a new .conf file for it and"
- elog "then create a symlink to the openvpn init script from a link called"
- elog "openvpn.newconfname - like so"
- elog " cd /etc/openvpn"
- elog " ${EDITOR##*/} foo.conf"
- elog " cd /etc/init.d"
- elog " ln -s openvpn openvpn.foo"
- elog ""
- elog "You can then treat openvpn.foo as any other service, so you can"
- elog "stop one vpn and start another if you need to."
-
- if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
- ewarn ""
- ewarn "WARNING: If you use the remote keyword then you are deemed to be"
- ewarn "a client by our init script and as such we force up,down scripts."
- ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
- ewarn "can move your scripts to."
- fi
-
- if use plugins ; then
- einfo ""
- einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
- fi
-
- einfo ""
- einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
- einfo "They can now be emerged via app-crypt/easy-rsa."
-}
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
deleted file mode 100644
index 408b395..0000000
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.8 2014/11/02 09:13:00 swift Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user git-2
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl +lzo static userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
- polarssl? ( ssl )
- !plugins? ( !pam !down-root )"
-
-DEPEND="
- kernel_linux? (
- iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
- )
- pam? ( virtual/pam )
- ssl? (
- !polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.1.0 )
- )
- lzo? ( >=dev-libs/lzo-1.07 )
- pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-openvpn )
-"
-
-src_prepare() {
- eautoreconf
-}
-
-src_configure() {
- use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
- local myconf
- use polarssl && myconf="--with-crypto-library=polarssl"
- econf \
- ${myconf} \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
- $(use_enable passwordsave password-save) \
- $(use_enable ssl) \
- $(use_enable ssl crypto) \
- $(use_enable lzo) \
- $(use_enable pkcs11) \
- $(use_enable plugins) \
- $(use_enable iproute2) \
- $(use_enable pam plugin-auth-pam) \
- $(use_enable down-root plugin-down-root)
-}
-
-src_install() {
- default
- find "${ED}/usr" -name '*.la' -delete
- # install documentation
- dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
- # Install some helper scripts
- keepdir /etc/openvpn
- exeinto /etc/openvpn
- doexe "${FILESDIR}/up.sh"
- doexe "${FILESDIR}/down.sh"
-
- # Install the init script and config file
- newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
- newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
- # install examples, controlled by the respective useflag
- if use examples ; then
- # dodoc does not supportly support directory traversal, #15193
- insinto /usr/share/doc/${PF}/examples
- doins -r sample contrib
- fi
-}
-
-pkg_postinst() {
- # Add openvpn user so openvpn servers can drop privs
- # Clients should run as root so they can change ip addresses,
- # dns information and other such things.
- enewgroup openvpn
- enewuser openvpn "" "" "" openvpn
-
- if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
- ewarn "WARNING: The openvpn init script has changed"
- ewarn ""
- fi
-
- elog "The openvpn init script expects to find the configuration file"
- elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
- elog ""
- elog "To create more VPNs, simply create a new .conf file for it and"
- elog "then create a symlink to the openvpn init script from a link called"
- elog "openvpn.newconfname - like so"
- elog " cd /etc/openvpn"
- elog " ${EDITOR##*/} foo.conf"
- elog " cd /etc/init.d"
- elog " ln -s openvpn openvpn.foo"
- elog ""
- elog "You can then treat openvpn.foo as any other service, so you can"
- elog "stop one vpn and start another if you need to."
-
- if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
- ewarn ""
- ewarn "WARNING: If you use the remote keyword then you are deemed to be"
- ewarn "a client by our init script and as such we force up,down scripts."
- ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
- ewarn "can move your scripts to."
- fi
-
- if use plugins ; then
- einfo ""
- einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
- fi
-
- ewarn ""
- ewarn "You are using a live ebuild building from the sources of openvpn"
- ewarn "repository from http://openvpn.git.sourceforge.net. For reporting"
- ewarn "bugs please contact: openvpn-devel@lists.sourceforge.net."
-}
diff --git a/net-misc/radvd/files/radvd-1.9.1.init b/net-misc/radvd/files/radvd-1.9.1.init
deleted file mode 100644
index c44d861..0000000
--- a/net-misc/radvd/files/radvd-1.9.1.init
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd-1.9.1.init,v 1.2 2014/02/18 03:33:37 prometheanfire Exp $
-
-CONFIGFILE=/etc/radvd.conf
-PIDFILE=/var/run/radvd/radvd.pid
-SYSCTL_FORWARD=net.ipv6.conf.all.forwarding
-
-extra_started_commands="reload"
-
-depend() {
- need net
-}
-
-checkconfig() {
- if [ ! -f "${CONFIGFILE}" ]; then
- eerror "Configuration file ${CONFIGFILE} not found"
- return 1
- fi
-
- if ! /usr/sbin/radvd -c -C "${CONFIGFILE}" ; then
- eerror "Configuration file ${CONFIGFILE} failed test"
- return 1
- fi
-
- checkpath -d -o radvd:radvd ${PIDFILE%/*}
-}
-
-start() {
- if [ "${FORWARD}" != "no" ]; then
- ebegin "Enabling IPv6 forwarding"
- sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
- eend $?
- fi
-
- checkconfig || return 1
-
- ebegin "Starting IPv6 Router Advertisement Daemon"
- start-stop-daemon --start --exec /usr/sbin/radvd \
- --pidfile "${PIDFILE}" \
- -- -C "${CONFIGFILE}" -p "${PIDFILE}" -u radvd ${OPTIONS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping IPv6 Router Advertisement Daemon"
- start-stop-daemon --stop --exec /usr/sbin/radvd --pidfile "${PIDFILE}"
- eend $?
-
- if [ "${FORWARD}" != "no" ]; then
- ebegin "Disabling IPv6 forwarding"
- sysctl -w "${SYSCTL_FORWARD}=0" > /dev/null
- eend $?
- fi
-}
-
-reload() {
- if [ "${FORWARD}" != "no" ]; then
- ebegin "Enabling IPv6 forwarding"
- sysctl -w "${SYSCTL_FORWARD}=1" >/dev/null
- eend $?
- fi
-
- checkconfig || return 1
-
- ebegin "Reloading IPv6 Router Advertisement Daemon"
- start-stop-daemon --signal HUP \
- --exec /usr/sbin/radvd --pidfile "${PIDFILE}"
- eend $?
-}
diff --git a/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch b/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch
deleted file mode 100644
index c44f284..0000000
--- a/net-misc/radvd/files/radvd-2.10-musl-libc-fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 1d8973e13d89802eee0b648451e2b97ac65cf9e0 Mon Sep 17 00:00:00 2001
-From: Reuben Hawkins <reubenhwk@gmail.com>
-Date: Sat, 16 May 2015 09:27:38 -0700
-Subject: [PATCH] device-linux.c: IEEE 802.15.4 musl libc fix
-
-The ARPHRD_IEEE802154 macro's definition and name have been recently
-moved around from kernel header to glibc headers. Include linux/if_arp.h
-if available and then use either ARPHRD_IEEE802154_MONITOR or ARPHRD_IEEE802154_PHY,
-whichever comes first.
----
- configure.ac | 1 +
- device-linux.c | 8 ++++++++
- includes.h | 6 ++++++
- 3 files changed, 15 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 0c1efd6..4bd4c9d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -156,6 +156,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS( \
- getopt.h \
- ifaddrs.h \
-+ linux/if_arp.h \
- machine/limits.h \
- machine/param.h \
- net/if_arp.h \
-diff --git a/device-linux.c b/device-linux.c
-index fa7d978..de83f2e 100644
---- a/device-linux.c
-+++ b/device-linux.c
-@@ -79,10 +79,12 @@ int update_device_info(int sock, struct Interface *iface)
- iface->sllao.if_maxmtu = -1;
- break;
- #endif /* ARPHDR_ARCNET */
-+#ifdef ARPHRD_IEEE802154
- case ARPHRD_IEEE802154:
- iface->sllao.if_hwaddr_len = 64;
- iface->sllao.if_prefix_len = 64;
- break;
-+#endif
- default:
- iface->sllao.if_hwaddr_len = -1;
- iface->sllao.if_prefix_len = -1;
-@@ -371,9 +373,15 @@ static char const *hwstr(unsigned short sa_family)
- case ARPHRD_IEEE802154:
- rc = "ARPHRD_IEEE802154";
- break;
-+#if ARPHRD_IEEE802154_MONITOR
-+ case ARPHRD_IEEE802154_MONITOR:
-+ rc = "ARPHRD_IEEE802154_MONITOR";
-+ break;
-+#elif ARPHRD_IEEE802154_PHY
- case ARPHRD_IEEE802154_PHY:
- rc = "ARPHRD_IEEE802154_PHY";
- break;
-+#endif
- case ARPHRD_VOID:
- rc = "ARPHRD_VOID";
- break;
-diff --git a/includes.h b/includes.h
-index 39a36d2..d2449c4 100644
---- a/includes.h
-+++ b/includes.h
-@@ -81,9 +81,11 @@
- #ifdef HAVE_NET_IF_DL_H
- #include <net/if_dl.h>
- #endif
-+
- #ifdef HAVE_NET_IF_TYPES_H
- #include <net/if_types.h>
- #endif
-+
- #if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
- #include <net/if_arp.h>
- #endif /* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */
-@@ -100,3 +102,7 @@
- #include <ifaddrs.h>
- #endif
-
-+#ifdef HAVE_LINUX_IF_ARP_H
-+#include <linux/if_arp.h>
-+#endif
-+
---
-2.3.6
-
diff --git a/net-misc/radvd/files/radvd.conf b/net-misc/radvd/files/radvd.conf
deleted file mode 100644
index e025c68..0000000
--- a/net-misc/radvd/files/radvd.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/files/radvd.conf,v 1.1 2006/07/19 13:02:36 uberlord Exp $
-
-# Extra options to pass to radvd
-OPTIONS=""
-
-# Set this to "no" to tell the init script NOT to set up IPv6 forwarding
-# using /proc/sys/net/ipv6/conf/all/forwarding
-# Only change this if you know what you're doing!
-FORWARD="yes"
diff --git a/net-misc/radvd/files/radvd.service b/net-misc/radvd/files/radvd.service
deleted file mode 100644
index d9095f6..0000000
--- a/net-misc/radvd/files/radvd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Router advertisement daemon for IPv6
-Documentation=man:radvd(8)
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/radvd --username radvd --logmethod stderr --debug 0
-ExecReload=/usr/sbin/radvd --configtest ; \
- /bin/kill -HUP $MAINPID
-CPUSchedulingPolicy=idle
-PIDFile=/run/radvd/radvd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/radvd/files/radvd.tmpfilesd b/net-misc/radvd/files/radvd.tmpfilesd
deleted file mode 100644
index 26f203d..0000000
--- a/net-misc/radvd/files/radvd.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /run/radvd 0755 radvd radvd
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
deleted file mode 100644
index 74f40b3..0000000
--- a/net-misc/radvd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>xmw@gentoo.org</email>
- <name>Michael Weber</name>
- </maintainer>
- <maintainer>
- <email>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
-</pkgmetadata>
diff --git a/net-misc/radvd/radvd-2.10-r99.ebuild b/net-misc/radvd/radvd-2.10-r99.ebuild
deleted file mode 100644
index fa4e771..0000000
--- a/net-misc/radvd/radvd-2.10-r99.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.10.ebuild,v 1.5 2015/05/21 13:29:04 ago Exp $
-
-EAPI=4
-
-inherit systemd user eutils readme.gentoo
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~sparc x86 ~x86-fbsd"
-IUSE="kernel_FreeBSD selinux"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
- dev-libs/check
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-pkg_setup() {
- enewgroup radvd
- enewuser radvd -1 -1 /dev/null radvd
-
- # force ownership of radvd user and group (bug #19647)
- [[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.10-musl-libc-fix.patch
-}
-
-src_configure() {
- econf --with-pidfile=/var/run/radvd/radvd.pid \
- --disable-silent-rules
-}
-
-src_install() {
- default
-
- dohtml INTRO.html
-
- newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
-
- if use kernel_FreeBSD ; then
- sed -i -e \
- 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
- "${D}"/etc/init.d/${PN} || die
- fi
-
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuratoion ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-misc/radvd/radvd-2.11-r99.ebuild b/net-misc/radvd/radvd-2.11-r99.ebuild
deleted file mode 100644
index b66e624..0000000
--- a/net-misc/radvd/radvd-2.11-r99.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/radvd/radvd-2.11.ebuild,v 1.1 2015/04/24 01:35:16 xmw Exp $
-
-EAPI=4
-
-inherit systemd user eutils readme.gentoo
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="http://v6web.litech.org/radvd/"
-SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="kernel_FreeBSD selinux test"
-
-CDEPEND="dev-libs/libdaemon"
-DEPEND="${CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- test? ( dev-libs/check )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-radvd )
-"
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-pkg_setup() {
- enewgroup radvd
- enewuser radvd -1 -1 /dev/null radvd
-
- # force ownership of radvd user and group (bug #19647)
- [[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.10-musl-libc-fix.patch
-}
-
-src_configure() {
- econf --with-pidfile=/var/run/radvd/radvd.pid \
- --disable-silent-rules \
- $(use_with test check)
-}
-
-src_install() {
- default
-
- dohtml INTRO.html
-
- newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
- newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
- systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
-
- if use kernel_FreeBSD ; then
- sed -i -e \
- 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \
- "${D}"/etc/init.d/${PN} || die
- fi
-
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please create a configuratoion ${ROOT}etc/radvd.conf.
-See ${ROOT}usr/share/doc/${PF} for an example.
-
-grsecurity users should allow a specific group to read /proc
-and add the radvd user to that group, otherwise radvd may
-segfault on startup."
diff --git a/net-news/newsbeuter/files/newsbeuter-2.8-musl.patch b/net-news/newsbeuter/files/newsbeuter-2.8-musl.patch
deleted file mode 100644
index 562fba5..0000000
--- a/net-news/newsbeuter/files/newsbeuter-2.8-musl.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/akrennmair/newsbeuter/issues/174
-
-diff -ur a/newsbeuter-2.8/src/stflpp.cpp b/newsbeuter-2.8/src/stflpp.cpp
---- a/newsbeuter-2.8/src/stflpp.cpp 2014-01-19 01:10:41.000000000 -0200
-+++ b/newsbeuter-2.8/src/stflpp.cpp 2015-04-09 23:49:37.768386550 -0200
-@@ -16,7 +16,7 @@
- */
-
- stfl::form::form(const std::string& text) : f(0) {
-- ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str());
-+ ipool = stfl_ipool_create(nl_langinfo(CODESET));
- if (!ipool) {
- throw exception(errno);
- }
-@@ -82,7 +82,7 @@
-
- std::string stfl::quote(const std::string& text) {
- scope_mutex lock("e_mtx);
-- stfl_ipool * ipool = stfl_ipool_create((std::string(nl_langinfo(CODESET)) + "//TRANSLIT").c_str());
-+ stfl_ipool * ipool = stfl_ipool_create(nl_langinfo(CODESET));
- std::string retval = stfl_ipool_fromwc(ipool,stfl_quote(stfl_ipool_towc(ipool,text.c_str())));
- stfl_ipool_destroy(ipool);
- return retval;
-diff -ur a/newsbeuter-2.8/src/utils.cpp b/newsbeuter-2.8/src/utils.cpp
---- a/newsbeuter-2.8/src/utils.cpp 2014-01-19 01:10:41.000000000 -0200
-+++ b/newsbeuter-2.8/src/utils.cpp 2015-04-09 23:47:39.570864222 -0200
-@@ -262,7 +262,7 @@
- if (strcasecmp(tocode.c_str(), fromcode.c_str())==0)
- return text;
-
-- iconv_t cd = ::iconv_open((tocode + "//TRANSLIT").c_str(), fromcode.c_str());
-+ iconv_t cd = ::iconv_open(tocode.c_str(), fromcode.c_str());
-
- if (cd == reinterpret_cast<iconv_t>(-1))
- return result;
-@@ -493,7 +493,6 @@
-
- std::string utils::wstr2str(const std::wstring& wstr) {
- std::string codeset = nl_langinfo(CODESET);
-- codeset.append("//TRANSLIT");
- struct stfl_ipool * ipool = stfl_ipool_create(codeset.c_str());
- std::string result = stfl_ipool_fromwc(ipool, wstr.c_str());
- stfl_ipool_destroy(ipool);
diff --git a/net-news/newsbeuter/metadata.xml b/net-news/newsbeuter/metadata.xml
deleted file mode 100644
index eb32917..0000000
--- a/net-news/newsbeuter/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>radhermit@gentoo.org</email>
- <name>Tim Harder</name>
- </maintainer>
- <longdescription lang="en">
- newsbeuter is an RSS feed reader for the text console. It is designed
- to run Unix-like operating systems such as Linux.
- </longdescription>
-</pkgmetadata>
diff --git a/net-news/newsbeuter/newsbeuter-2.8-r99.ebuild b/net-news/newsbeuter/newsbeuter-2.8-r99.ebuild
deleted file mode 100644
index 09c3cea..0000000
--- a/net-news/newsbeuter/newsbeuter-2.8-r99.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/newsbeuter/newsbeuter-2.8.ebuild,v 1.3 2014/03/29 06:08:40 ago Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A RSS/Atom feed reader for the text console"
-HOMEPAGE="http://www.newsbeuter.org/index.html"
-SRC_URI="http://www.${PN}.org/downloads/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND=">=dev-db/sqlite-3.5:3
- >=dev-libs/stfl-0.21
- >=net-misc/curl-7.18.0
- dev-libs/json-c:=
- dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- sys-devel/gettext
- test? (
- dev-libs/boost
- sys-devel/bc
- )"
-
-# tests require network access
-RESTRICT="test"
-
-src_prepare() {
- sed -i 's:-ggdb::' Makefile || die
- epatch "${FILESDIR}"/${P}-musl.patch
-}
-
-src_configure() {
- ./config.sh || die
-}
-
-src_compile() {
- emake CXX="$(tc-getCXX)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
- emake test
- # Tests fail if in ${S} rather than in ${S}/test
- cd "${S}"/test
- ./test || die
-}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
- dodoc AUTHORS README CHANGES
-}
diff --git a/net-wireless/bluez/bluez-5.23-r99.ebuild b/net-wireless/bluez/bluez-5.23-r99.ebuild
deleted file mode 100644
index 467772e..0000000
--- a/net-wireless/bluez/bluez-5.23-r99.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.23.ebuild,v 1.2 2014/09/25 09:11:55 pacho Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/glib-2.28:2
- >=sys-apps/dbus-1.6:=
- >=sys-apps/hwids-20121202.2
- cups? ( net-print/cups:= )
- obex? ( dev-libs/libical )
- readline? ( sys-libs/readline:= )
- selinux? ( sec-policy/selinux-bluetooth )
- systemd? ( sys-apps/systemd )
- udev? ( >=virtual/udev-172 )
- abi_x86_32? (
- !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
- )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- >=dev-python/dbus-python-1
- dev-python/pygobject:2
- dev-python/pygobject:3
- )
-"
-
-DOC_CONTENTS="
- If you want to use rfcomm as a normal user, you need to add the user
- to the uucp group.
-"
-
-pkg_setup() {
- enewgroup plugdev
- use test && python-any-r1_pkg_setup
-
- if ! use udev; then
- ewarn
- ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
- ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
- ewarn "and hid2hci will not be available."
- ewarn
- fi
-}
-
-src_prepare() {
- # Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
- epatch "${FILESDIR}"/bluez-plugdev.patch
-
- # Fedora patches
- # http://www.spinics.net/lists/linux-bluetooth/msg38490.html
- epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg40136.html
- epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
- # http://www.spinics.net/lists/linux-bluetooth/msg41264.html
- epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
-
- # ???
- epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-
- # Ubuntu workaround for bug #501120
- epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
-
- # Patches for musl
- epatch "${FILESDIR}"/0001-tools-Fix-compilation-errors-with-musl.patch
- epatch "${FILESDIR}"/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
-
- if use cups; then
- sed -i \
- -e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
- Makefile.{in,tools} || die
- fi
-
- eautoreconf
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- local myconf=(
- # readline is automagic when client is enabled
- # --enable-client always needs readline, bug #504038
- ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # deps not used for the library
- {DBUS,GLIB}_{CFLAGS,LIBS}=' '
- )
- fi
-
- # Missing flags: experimental (sap, nfc, ...)
- econf \
- --localstatedir=/var \
- --disable-android \
- --enable-datafiles \
- --enable-experimental \
- --enable-optimization \
- $(use_enable debug) \
- --enable-pie \
- --enable-threads \
- --enable-library \
- $(multilib_native_use_enable test) \
- --enable-tools \
- --enable-manpages \
- --enable-monitor \
- $(multilib_native_use_enable cups) \
- $(multilib_native_use_enable obex) \
- $(multilib_native_use_enable readline client) \
- $(multilib_native_use_enable systemd) \
- $(systemd_with_unitdir) \
- $(multilib_native_use_enable udev) \
- $(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- emake -f Makefile -f - libs \
- <<<'libs: $(lib_LTLIBRARIES)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && default
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
-
- # Unittests are not that useful once installed
- if use test ; then
- rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
- fi
- else
- emake DESTDIR="${D}" \
- install-includeHEADERS \
- install-libLTLIBRARIES \
- install-pkgconfigDATA
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-
- keepdir /var/lib/bluetooth
-
- # Upstream don't want people to play with them
- # But we keep installing them due 'historical' reasons
- insinto /etc/bluetooth
- local d
- for d in input network proximity; do
- doins profiles/${d}/${d}.conf
- done
- doins src/main.conf
- doins src/bluetooth.conf
-
-# FIXME:
-# Looks like upstream installs it only for systemd, probably not needed
-# insinto /usr/share/dbus-1/system-services
-# doins src/org.bluez.service
-
- newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
- newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
-
- einstalldocs
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- use udev && udev_reload
-
- has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
- if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
- elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
- elog "be able to run bluetooth clients as root. If you want to be able to run bluetooth clients as"
- elog "a regular user, you need to add the user to the plugdev group."
- fi
-}
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
deleted file mode 100644
index 1ea3e6f..0000000
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
-Date: Sat, 12 Oct 2013 17:45:25 +0200
-Subject: [PATCH] Allow using obexd without systemd in the user session
-
-Not all sessions run systemd --user (actually, the majority
-doesn't), so the dbus daemon must be able to spawn obexd
-directly, and to do so it needs the full path of the daemon.
----
- Makefile.obexd | 4 ++--
- obexd/src/org.bluez.obex.service | 4 ----
- obexd/src/org.bluez.obex.service.in | 4 ++++
- 3 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 obexd/src/org.bluez.obex.service
- create mode 100644 obexd/src/org.bluez.obex.service.in
-
-diff --git a/Makefile.obexd b/Makefile.obexd
-index 3760867..142e7c3 100644
---- a/Makefile.obexd
-+++ b/Makefile.obexd
-@@ -2,12 +2,12 @@
- if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
- systemduserunit_DATA = obexd/src/obex.service
-+endif
-
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
- dbussessionbus_DATA = obexd/src/org.bluez.obex.service
--endif
-
--EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
-+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
-
- obex_plugindir = $(libdir)/obex/plugins
-
-diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
-deleted file mode 100644
-index a538088..0000000
---- a/obexd/src/org.bluez.obex.service
-+++ /dev/null
-@@ -1,4 +0,0 @@
--[D-BUS Service]
--Name=org.bluez.obex
--Exec=/bin/false
--SystemdService=dbus-org.bluez.obex.service
-diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
-new file mode 100644
-index 0000000..9c815f2
---- /dev/null
-+++ b/obexd/src/org.bluez.obex.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
-+SystemdService=dbus-org.bluez.obex.service
---
-1.8.3.1
-
diff --git a/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch b/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
deleted file mode 100644
index 766734a..0000000
--- a/net-wireless/bluez/files/0001-emulator-serial.c-use-posix_openpt-instead-of-getpt.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 57c33317f5c3f6d21a9b3c56f8d1e97179e4c457 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sat, 4 Oct 2014 09:34:05 -0400
-Subject: [PATCH] emulator/serial.c: use posix_openpt() instead of getpt()
-
-getpt(3) is glibc-specific and is not provided on musl. Instead, we
-use use posix_openpt(3) which is equivalent and portable.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- emulator/serial.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/emulator/serial.c b/emulator/serial.c
-index 9583be4..8b49dc6 100644
---- a/emulator/serial.c
-+++ b/emulator/serial.c
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/epoll.h>
- #include <sys/uio.h>
-@@ -160,7 +161,7 @@ static void open_pty(struct serial *serial)
- {
- enum btdev_type uninitialized_var(type);
-
-- serial->fd = getpt();
-+ serial->fd = posix_openpt(O_RDWR | O_NOCTTY);
- if (serial->fd < 0) {
- perror("Failed to get master pseudo terminal");
- return;
---
-2.0.4
-
diff --git a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
deleted file mode 100644
index 004a389..0000000
--- a/net-wireless/bluez/files/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f7861d27fbcbc519f57d8496aa9486f487908821 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Sat, 9 Nov 2013 18:13:43 +0100
-Subject: [PATCH 1/5] obex: Use GLib helper function to manipulate paths
-
-Instead of trying to do it by hand. This also makes sure that
-relative paths aren't used by the agent.
----
- obexd/src/manager.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/obexd/src/manager.c b/obexd/src/manager.c
-index cec8a39..f18896e 100644
---- a/obexd/src/manager.c
-+++ b/obexd/src/manager.c
-@@ -651,14 +651,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data)
- DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID)) {
- /* Splits folder and name */
-- const char *slash = strrchr(name, '/');
-+ gboolean is_relative = !g_path_is_absolute(name);
- DBG("Agent replied with %s", name);
-- if (!slash) {
-- agent->new_name = g_strdup(name);
-+ if (is_relative) {
-+ agent->new_name = g_path_get_basename(name);
- agent->new_folder = NULL;
- } else {
-- agent->new_name = g_strdup(slash + 1);
-- agent->new_folder = g_strndup(name, slash - name);
-+ agent->new_name = g_path_get_basename(name);
-+ agent->new_folder = g_path_get_dirname(name);
- }
- }
-
---
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch b/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch
deleted file mode 100644
index 501e75a..0000000
--- a/net-wireless/bluez/files/0001-tools-Fix-compilation-errors-with-musl.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 51ec4fd847369bc77e72850fe93d727ae9c656b9 Mon Sep 17 00:00:00 2001
-From: Szymon Janc <szymon.janc@tieto.com>
-Date: Fri, 19 Sep 2014 16:10:07 +0200
-Subject: [PATCH] tools: Fix compilation errors with musl
-
-This fix number of includes for <sys/poll.h> instead of <poll.h>
-
- CC tools/hciattach.o
-In file included from tools/hciattach.c:41:0:
-/usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect
- #include <sys/poll.h> to <poll.h> [-Werror=cpp]
- #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
- ^
----
- tools/amptest.c | 2 +-
- tools/btattach.c | 2 +-
- tools/btsnoop.c | 1 +
- tools/ciptool.c | 2 +-
- tools/cltest.c | 2 +-
- tools/hciattach.c | 2 +-
- tools/hciattach_qualcomm.c | 2 +-
- tools/hciattach_tialt.c | 2 +-
- tools/hcidump.c | 2 +-
- tools/l2ping.c | 2 +-
- tools/l2test.c | 2 +-
- tools/rfcomm.c | 2 +-
- 12 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/tools/amptest.c b/tools/amptest.c
-index 6192f7e..bba0a9a 100644
---- a/tools/amptest.c
-+++ b/tools/amptest.c
-@@ -32,7 +32,7 @@
- #include <alloca.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/btattach.c b/tools/btattach.c
-index 9458fd7..bdbbe16 100644
---- a/tools/btattach.c
-+++ b/tools/btattach.c
-@@ -35,7 +35,7 @@
- #include <getopt.h>
- #include <termios.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
-+#include <poll.h>
-
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/hci.h>
-diff --git a/tools/btsnoop.c b/tools/btsnoop.c
-index 14581f2..71191eb 100644
---- a/tools/btsnoop.c
-+++ b/tools/btsnoop.c
-@@ -35,6 +35,7 @@
- #include <stdbool.h>
- #include <string.h>
- #include <getopt.h>
-+#include <endian.h>
- #include <arpa/inet.h>
- #include <sys/stat.h>
-
-diff --git a/tools/ciptool.c b/tools/ciptool.c
-index 72338dc..3ff9fb1 100644
---- a/tools/ciptool.c
-+++ b/tools/ciptool.c
-@@ -32,7 +32,7 @@
- #include <string.h>
- #include <getopt.h>
- #include <signal.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/cltest.c b/tools/cltest.c
-index 4ddb98a..0231805 100644
---- a/tools/cltest.c
-+++ b/tools/cltest.c
-@@ -32,7 +32,7 @@
- #include <alloca.h>
- #include <stdlib.h>
- #include <stdbool.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/hciattach.c b/tools/hciattach.c
-index 1904ac5..d8ef7e7 100644
---- a/tools/hciattach.c
-+++ b/tools/hciattach.c
-@@ -37,8 +37,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
-
-diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
-index eb72a0f..0e25905 100644
---- a/tools/hciattach_qualcomm.c
-+++ b/tools/hciattach_qualcomm.c
-@@ -36,8 +36,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/uio.h>
-diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
-index 5c7f3a5..a7c1706 100644
---- a/tools/hciattach_tialt.c
-+++ b/tools/hciattach_tialt.c
-@@ -35,8 +35,8 @@
- #include <syslog.h>
- #include <termios.h>
- #include <time.h>
-+#include <poll.h>
- #include <sys/time.h>
--#include <sys/poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/uio.h>
-diff --git a/tools/hcidump.c b/tools/hcidump.c
-index 37a9f00..8839eb0 100644
---- a/tools/hcidump.c
-+++ b/tools/hcidump.c
-@@ -33,7 +33,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <getopt.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ioctl.h>
-diff --git a/tools/l2ping.c b/tools/l2ping.c
-index 29fb3d0..3dd437e 100644
---- a/tools/l2ping.c
-+++ b/tools/l2ping.c
-@@ -35,7 +35,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/socket.h>
-
- #include <bluetooth/bluetooth.h>
-diff --git a/tools/l2test.c b/tools/l2test.c
-index 67ca70a..71ad109 100644
---- a/tools/l2test.c
-+++ b/tools/l2test.c
-@@ -38,7 +38,7 @@
- #include <syslog.h>
- #include <signal.h>
- #include <sys/time.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-
-diff --git a/tools/rfcomm.c b/tools/rfcomm.c
-index b5bea38..659bbec 100644
---- a/tools/rfcomm.c
-+++ b/tools/rfcomm.c
-@@ -34,7 +34,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <termios.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
---
-2.0.4
-
diff --git a/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch b/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
deleted file mode 100644
index 55d5af6..0000000
--- a/net-wireless/bluez/files/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aa73bf5039dfd2cf0a52dd6fd22501d955cc1a00 Mon Sep 17 00:00:00 2001
-From: Tommy <mesilliac@gmail.com>
-Date: Thu, 10 Jan 2013 09:18:43 +0100
-Subject: [PATCH] work around Logitech diNovo Edge keyboard firmware issue
-
-https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/269851
----
- tools/hid2hci.rules | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/tools/hid2hci.rules b/tools/hid2hci.rules
-index db6bb03..7db4572 100644
---- a/tools/hid2hci.rules
-+++ b/tools/hid2hci.rules
-@@ -11,7 +11,10 @@ ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProt
- RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
-
- # Logitech devices
--KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
-+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[5e]", \
-+ RUN+="hid2hci --method=logitech-hid --devpath=%p"
-+# Logitech, Inc. RAW communicating devices
-+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[34abc]|c71[34bc]", \
- RUN+="hid2hci --method=logitech-hid --devpath=%p"
-
- ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"
---
-1.8.0.1
-
diff --git a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch b/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch
deleted file mode 100644
index 68751ae..0000000
--- a/net-wireless/bluez/files/0002-autopair-Don-t-handle-the-iCade.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c16ae7041c7511d8d1ed8441f696716fa6a9117e Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 19 Nov 2013 14:11:39 +0100
-Subject: [PATCH 2/5] autopair: Don't handle the iCade
-
-We can't easily enter digits other than 1 through 4 (inclusive)
-so leave it up to the agent to figure out a good passcode
-for the iCade.
-
-Note that we can not use the VID/PID of the device, as it is not
-yet known at that point.
----
- plugins/autopair.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/autopair.c b/plugins/autopair.c
-index 8c98c12..5d2f6f7 100644
---- a/plugins/autopair.c
-+++ b/plugins/autopair.c
-@@ -57,13 +57,23 @@ static ssize_t autopair_pincb(struct btd_adapter *adapter,
- {
- char addr[18];
- char pinstr[7];
-+ char name[25];
- uint32_t class;
-
- ba2str(device_get_address(device), addr);
-
- class = btd_device_get_class(device);
-
-- DBG("device %s 0x%x", addr, class);
-+ device_get_name(device, name, sizeof(name));
-+ name[sizeof(name) - 1] = 0;
-+
-+ DBG("device %s (%s) 0x%x", addr, name, class);
-+
-+ g_message ("vendor 0x%X product: 0x%X", btd_device_get_vendor (device), btd_device_get_product (device));
-+
-+ /* The iCade shouldn't use random PINs like normal keyboards */
-+ if (name != NULL && strstr(name, "iCade") != NULL)
-+ return 0;
-
- /* This is a class-based pincode guesser. Ignore devices with an
- * unknown class.
---
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch b/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
deleted file mode 100644
index 2746e0c..0000000
--- a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 9 Dec 2013 18:04:56 +0100
-Subject: [PATCH 4/5] agent: Assert possible infinite loop
-
----
- src/agent.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/agent.c b/src/agent.c
-index bcba969..b292881 100644
---- a/src/agent.c
-+++ b/src/agent.c
-@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent)
- if (agent->ref > 0)
- return;
-
-+ g_assert (agent->ref == 0);
-+
- if (agent->request) {
- DBusError err;
- agent_pincode_cb pincode_cb;
---
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r3 b/net-wireless/bluez/files/bluetooth-init.d-r3
deleted file mode 100644
index f97fdb2..0000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r3,v 1.2 2014/01/09 13:24:42 joker Exp $
-
-depend() {
- after coldplug
- need dbus localmount hostname
-}
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --background --exec /usr/libexec/bluetooth/bluetoothd
- eend $?
-}
-
-stop() {
- ebegin "Shutting down ${SVCNAME}"
- start-stop-daemon --stop --quiet --exec /usr/libexec/bluetooth/bluetoothd
- eend $?
-}
diff --git a/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch b/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
deleted file mode 100644
index 3630df6..0000000
--- a/net-wireless/bluez/files/bluez-5.23-use-posix_openpt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur bluez-5.23.orig/emulator/serial.c bluez-5.23/emulator/serial.c
---- bluez-5.23.orig/emulator/serial.c 2014-08-06 17:25:36.000000000 +0000
-+++ bluez-5.23/emulator/serial.c 2014-10-04 13:02:38.081336391 +0000
-@@ -32,6 +32,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/param.h>
- #include <sys/epoll.h>
-
-@@ -159,7 +160,7 @@
- {
- enum btdev_type uninitialized_var(type);
-
-- serial->fd = getpt();
-+ serial->fd = posix_openpt(O_RDWR | O_NOCTTY);
- if (serial->fd < 0) {
- perror("Failed to get master pseudo terminal");
- return;
diff --git a/net-wireless/bluez/files/bluez-plugdev.patch b/net-wireless/bluez/files/bluez-plugdev.patch
deleted file mode 100755
index 726838a..0000000
--- a/net-wireless/bluez/files/bluez-plugdev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp bluez-4.39.orig/src/bluetooth.conf bluez-4.39/src/bluetooth.conf
---- bluez-4.39.orig/src/bluetooth.conf 2008-12-20 20:18:10.000000000 +0100
-+++ bluez-4.39/src/bluetooth.conf 2009-09-05 13:30:34.411581498 +0200
-@@ -17,6 +17,10 @@
- <allow send_destination="org.bluez"/>
- </policy>
-
-+ <policy group="plugdev">
-+ <allow send_destination="org.bluez"/>
-+ </policy>
-+
- <policy context="default">
- <deny send_destination="org.bluez"/>
- </policy>
diff --git a/net-wireless/bluez/files/rfcomm-init.d-r2 b/net-wireless/bluez/files/rfcomm-init.d-r2
deleted file mode 100755
index c564055..0000000
--- a/net-wireless/bluez/files/rfcomm-init.d-r2
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/rfcomm-init.d-r2,v 1.1 2014/06/26 17:18:43 alonbl Exp $
-
-depend() {
- need bluetooth
-}
-
-checkconfig() {
- if [ -z "${ADDRESS}" ]; then
- eerror "ADDRESS must be set"
- return 1
- fi
-
- return 0
-}
-
-start() {
- local DEVICE=${RC_SVCNAME#*.}
-
- checkconfig || return 1
-
- ebegin "Starting ${RC_SVCNAME}"
- rfcomm bind "${DEVICE}" "${ADDRESS}" ${CHANNEL}
- eend $?
-}
-
-stop() {
- local DEVICE=${RC_SVCNAME#*.}
-
- ebegin "Shutting down ${RC_SVCNAME}"
- rfcomm release "${DEVICE}"
- eend $?
-}
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
deleted file mode 100644
index de19c8b..0000000
--- a/net-wireless/bluez/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>pacho@gentoo.org</email>
- <name>Pacho Ramos</name>
- </maintainer>
- <use>
- <flag name="test-programs">Install tools for testing of
- various Bluetooth functions</flag>
- <flag name="hid2hci">The HID proxying makes the keyboard / mouse show up
- as regular USB HID devices, but needs them to be
- paired before enabling this, otherwise they won't be
- detected</flag>
- <flag name="obex">Enable OBEX transfer support.</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:bluez:bluez</remote-id>
- <remote-id type="cpe">cpe:/a:bluez:bluez-libs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/net-wireless/crda/crda-1.1.2-r3.ebuild b/net-wireless/crda/crda-1.1.2-r3.ebuild
deleted file mode 100644
index 93306ac..0000000
--- a/net-wireless/crda/crda-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r3.ebuild,v 1.11 2013/01/01 08:27:28 ago Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs python
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
- dev-libs/libnl
- net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
- dev-python/m2crypto
- =dev-lang/python-2*
- virtual/pkgconfig"
-RDEPEND="${RDEPEND}
- >=virtual/udev-171"
-
-src_prepare() {
- epatch "${FILESDIR}"/libnl31-support.diff
- epatch "${FILESDIR}"/${P}-missing-include.patch
-
- python_convert_shebangs 2 utils/key2pub.py
-
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- Makefile || die
-}
-
-src_compile() {
- emake UDEV_RULE_DIR=/lib/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 CC="$(tc-getCC)" all_noverify
-}
-
-src_test() {
- emake USE_OPENSSL=1 CC="$(tc-getCC)" verify
-}
-
-src_install() {
- emake UDEV_RULE_DIR=/lib/udev/rules.d/ REG_BIN=/usr/$(get_libdir)/crda/regulatory.bin USE_OPENSSL=1 DESTDIR="${D}" install
- keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/files/crda-1.1.2-missing-include.patch b/net-wireless/crda/files/crda-1.1.2-missing-include.patch
deleted file mode 100644
index 7d28a77..0000000
--- a/net-wireless/crda/files/crda-1.1.2-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/crda-1.1.2/reglib.c
-+++ b/crda-1.1.2/reglib.c
-@@ -1,6 +1,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- #include <sys/types.h>
- #include <dirent.h>
- #include "reglib.h"
diff --git a/net-wireless/crda/files/libnl31-support.diff b/net-wireless/crda/files/libnl31-support.diff
deleted file mode 100644
index 56243ee..0000000
--- a/net-wireless/crda/files/libnl31-support.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aurp a/crda-1.1.2/crda.c b/crda-1.1.2/crda.c
---- a/crda-1.1.2/crda.c 2011-11-07 19:52:28.884873650 +0000
-+++ b/crda-1.1.2/crda.c 2011-11-07 19:53:30.501874372 +0000
-@@ -21,7 +21,7 @@
- #include "regdb.h"
- #include "reglib.h"
-
--#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30)
-+#if !defined(CONFIG_LIBNL20) && !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL31)
- /* libnl 2.0 compatibility code */
- static inline struct nl_handle *nl_socket_alloc(void)
- {
-@@ -44,7 +44,7 @@ static inline int __genl_ctrl_alloc_cach
-
- #define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
- #define nl_sock nl_handle
--#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 */
-+#endif /* CONFIG_LIBNL20 && CONFIG_LIBNL30 && CONFIG_LIBNL31 */
-
- struct nl80211_state {
- struct nl_sock *nl_sock;
-diff -aurp a/crda-1.1.2/Makefile b/crda-1.1.2/Makefile
---- a/crda-1.1.2/Makefile 2011-11-07 19:52:28.884873650 +0000
-+++ b/crda-1.1.2/Makefile 2011-11-07 19:54:25.906872386 +0000
-@@ -48,19 +48,26 @@ INSTALL ?= install
- NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)
- NL2FOUND := $(shell pkg-config --atleast-version=2 libnl-2.0 && echo Y)
- NL3FOUND := $(shell pkg-config --atleast-version=3 libnl-3.0 && echo Y)
-+NL31FOUND := $(shell pkg-config --atleast-version=3 libnl-3.1 && echo Y)
-
--ifeq ($(NL3FOUND),Y)
-+ifeq ($(NL31FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
--NLLIBS += -lnl-genl
--NLLIBNAME = libnl-3.0
-+NLLIBS += $(shell pkg-config --libs libnl-genl-3.1)
-+NLLIBNAME = libnl-3.1
- else
-- ifeq ($(NL2FOUND),Y)
-- CFLAGS += -DCONFIG_LIBNL20
-- NLLIBS += -lnl-genl
-- NLLIBNAME = libnl-2.0
-+ ifeq ($(NL3FOUND),Y)
-+ CFLAGS += -DCONFIG_LIBNL30
-+ NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
-+ NLLIBNAME = libnl-3.0
- else
-- ifeq ($(NL1FOUND),Y)
-- NLLIBNAME = libnl-1
-+ ifeq ($(NL2FOUND),Y)
-+ CFLAGS += -DCONFIG_LIBNL20
-+ NLLIBS += -lnl-genl
-+ NLLIBNAME = libnl-2.0
-+ else
-+ ifeq ($(NL1FOUND),Y)
-+ NLLIBNAME = libnl-1
-+ endif
- endif
- endif
- endif
diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
deleted file mode 100644
index e6745d7..0000000
--- a/net-wireless/crda/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>gurligebis@gentoo.org</email>
- <name>Bjarke Istrup Pedersen</name>
- </maintainer>
- <maintainer>
- <email>zerochaos@gentoo.org</email>
- <name>Rick Farina</name>
- </maintainer>
- <longdescription lang="en">
- Central Regulatory Domain Agent
- </longdescription>
-</pkgmetadata>
-
diff --git a/profiles/repo_name b/profiles/repo_name
deleted file mode 100644
index c320dd8..0000000
--- a/profiles/repo_name
+++ /dev/null
@@ -1 +0,0 @@
-hardened-development
diff --git a/sys-apps/attr/attr-2.4.46-r99.ebuild b/sys-apps/attr/attr-2.4.46-r99.ebuild
deleted file mode 100644
index c38d860..0000000
--- a/sys-apps/attr/attr-2.4.46-r99.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.46-r2.ebuild,v 1.13 2014/01/17 04:23:10 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="http://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )
- sys-devel/autoconf"
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.4.44-gettext.patch
- epatch "${FILESDIR}"/${PN}-2.4.46-config-shell.patch #366671
- epatch "${FILESDIR}"/${PN}-2.4.46-generic-syscalls.patch #460702
- epatch "${FILESDIR}"/${PN}-2.4.46-ifdef_cplusplus.patch
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
- include/builddefs.in \
- || die "failed to update builddefs"
- strip-linguas -u po
-}
-
-src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- econf \
- $(use_enable nls gettext) \
- --enable-shared $(use_enable static-libs static) \
- --libexecdir="${EPREFIX}"/usr/$(get_libdir) \
- --bindir="${EPREFIX}"/bin
-}
-
-src_install() {
- emake DIST_ROOT="${D}" install install-lib install-dev || die
- use static-libs || find "${D}" -name '*.la' -delete
- # the man-pages packages provides the man2 files
- rm -r "${ED}"/usr/share/man/man2
-
- # we install attr into /bin, so we need the shared lib with it
- gen_usr_ldscript -a attr
-}
diff --git a/sys-apps/attr/attr-2.4.47-r99.ebuild b/sys-apps/attr/attr-2.4.47-r99.ebuild
deleted file mode 100644
index ccd1558..0000000
--- a/sys-apps/attr/attr-2.4.47-r99.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/attr/attr-2.4.47-r1.ebuild,v 1.9 2014/02/15 18:41:59 nimiux Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="http://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )
- sys-devel/autoconf"
-RDEPEND="abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.4.46-ifdef_cplusplus.patch
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
- include/builddefs.in \
- || die
- strip-linguas -u po
- multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736
-}
-
-multilib_src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- econf \
- $(use_enable nls gettext) \
- --enable-shared $(use_enable static-libs static) \
- --libexecdir="${EPREFIX}"/usr/$(get_libdir) \
- --bindir="${EPREFIX}"/bin
-}
-
-multilib_src_compile() {
- emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=)
-}
-
-multilib_src_install() {
- emake \
- $(multilib_is_native_abi || echo TOOL_SUBDIRS=) \
- DIST_ROOT="${D}" \
- install install-lib install-dev
-
- if multilib_is_native_abi; then
- # we install attr into /bin, so we need the shared lib with it
- gen_usr_ldscript -a attr
- # the man-pages packages provides the man2 files
- # note: man-pages are installed by TOOL_SUBDIRS
- rm -r "${ED}"/usr/share/man/man2 || die
- fi
-}
-
-multilib_src_install_all() {
- use static-libs || prune_libtool_files --all
- einstalldocs
-}
diff --git a/sys-apps/attr/files/attr-2.4.44-gettext.patch b/sys-apps/attr/files/attr-2.4.44-gettext.patch
deleted file mode 100644
index 49c2d32..0000000
--- a/sys-apps/attr/files/attr-2.4.44-gettext.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- include/gettext.h
-+++ include/gettext.h
-@@ -0,0 +1,10 @@
-+#include <config.h>
-+#ifdef ENABLE_GETTEXT
-+# include <libintl.h>
-+# define _(x) gettext(x)
-+#else
-+# define _(x) (x)
-+# define textdomain(d) do { } while (0)
-+# define bindtextdomain(d,dir) do { } while (0)
-+#endif
-+#include <locale.h>
---- attr/attr.c
-+++ attr/attr.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <string.h>
- #include <locale.h>
-+#include "gettext.h"
-
- #include <attr/attributes.h>
- #include "config.h"
---- libattr/attr_copy_file.c.orig 2007-09-20 02:51:37.000000000 -0400
-+++ libattr/attr_copy_file.c 2007-09-20 02:51:51.000000000 -0400
-@@ -19,6 +19,7 @@
-
- #if defined (HAVE_CONFIG_H)
- #include "config.h"
-+#include "gettext.h"
- #endif
-
- #include <sys/types.h>
---- libattr/attr_copy_fd.c.orig 2007-09-20 02:52:23.000000000 -0400
-+++ libattr/attr_copy_fd.c 2007-09-20 02:52:31.000000000 -0400
-@@ -19,6 +19,7 @@
-
- #if defined (HAVE_CONFIG_H)
- #include "config.h"
-+#include "gettext.h"
- #endif
-
- #include <sys/types.h>
---- getfattr/getfattr.c.orig 2007-09-20 02:52:49.000000000 -0400
-+++ getfattr/getfattr.c 2007-09-20 02:52:59.000000000 -0400
-@@ -30,6 +30,7 @@
- #include <regex.h>
- #include <ftw.h>
- #include <locale.h>
-+#include "gettext.h"
-
- #include <attr/xattr.h>
- #include "config.h"
---- setfattr/setfattr.c.orig 2007-09-20 02:53:12.000000000 -0400
-+++ setfattr/setfattr.c 2007-09-20 02:53:20.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <getopt.h>
- #include <locale.h>
- #include <ctype.h>
-+#include "gettext.h"
-
- #include <attr/xattr.h>
- #include "config.h"
diff --git a/sys-apps/attr/files/attr-2.4.46-config-shell.patch b/sys-apps/attr/files/attr-2.4.46-config-shell.patch
deleted file mode 100644
index b6660e6..0000000
--- a/sys-apps/attr/files/attr-2.4.46-config-shell.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/366671
-
-From 10bfb16245ec4b55c1f5b6dc5554913bc9b13c9c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 16 May 2011 01:59:52 -0400
-Subject: [PATCH] use SHELL from configure
-
-If /bin/sh is not a functional enough shell, configure will select a
-SHELL of /bin/bash or better. But the current build helpers always
-hardcode /bin/sh, so if libtool itself configures itself for /bin/bash,
-things will fail when it attempts to do:
- SHELL = /bin/sh
- LIBTOOL = $(SHELL) .../libtool
- ...
- eval: 1: base_compile+= -pipe: not found
- ...
-
-So rather than hardcoding SHELL to /bin/sh, set it to @SHELL@ and let
-configure find a good value for us.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- include/builddefs.in | 1 +
- include/buildmacros | 1 -
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d054a56..434ce95 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -46,6 +46,7 @@ MAKE = @make@
- ECHO = @echo@
- SORT = @sort@
- LN_S = @LN_S@
-+SHELL = @SHELL@
- LIBTOOL = @LIBTOOL@
- MAKEDEPEND = @makedepend@
-
-diff --git a/include/buildmacros b/include/buildmacros
-index ab89182..8efb32e 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -42,7 +42,6 @@ OBJECTS = $(ASFILES:.s=.o) \
-
- INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
-
--SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
- DIST_DIR = $(TOPDIR)/dist
-
---
-1.7.5.rc3
-
diff --git a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch b/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch
deleted file mode 100644
index d12fcd2..0000000
--- a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-http://lists.nongnu.org/archive/html/acl-devel/2012-12/msg00000.html
-https://bugs.gentoo.org/460702
-
---- a/libattr/syscalls.c
-+++ b/libattr/syscalls.c
-@@ -23,172 +23,10 @@
-
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/syscall.h>
-
--#if defined (__i386__)
-+#if defined (__NR_setxattr)
- # define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 226
--# define __NR_lsetxattr 227
--# define __NR_fsetxattr 228
--# define __NR_getxattr 229
--# define __NR_lgetxattr 230
--# define __NR_fgetxattr 231
--# define __NR_listxattr 232
--# define __NR_llistxattr 233
--# define __NR_flistxattr 234
--# define __NR_removexattr 235
--# define __NR_lremovexattr 236
--# define __NR_fremovexattr 237
--#elif defined (__sparc__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 169
--# define __NR_lsetxattr 170
--# define __NR_fsetxattr 171
--# define __NR_getxattr 172
--# define __NR_lgetxattr 173
--# define __NR_fgetxattr 177
--# define __NR_listxattr 178
--# define __NR_llistxattr 179
--# define __NR_flistxattr 180
--# define __NR_removexattr 181
--# define __NR_lremovexattr 182
--# define __NR_fremovexattr 186
--#elif defined (__ia64__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 1217
--# define __NR_lsetxattr 1218
--# define __NR_fsetxattr 1219
--# define __NR_getxattr 1220
--# define __NR_lgetxattr 1221
--# define __NR_fgetxattr 1222
--# define __NR_listxattr 1223
--# define __NR_llistxattr 1224
--# define __NR_flistxattr 1225
--# define __NR_removexattr 1226
--# define __NR_lremovexattr 1227
--# define __NR_fremovexattr 1228
--#elif defined (__powerpc__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 209
--# define __NR_lsetxattr 210
--# define __NR_fsetxattr 211
--# define __NR_getxattr 212
--# define __NR_lgetxattr 213
--# define __NR_fgetxattr 214
--# define __NR_listxattr 215
--# define __NR_llistxattr 216
--# define __NR_flistxattr 217
--# define __NR_removexattr 218
--# define __NR_lremovexattr 219
--# define __NR_fremovexattr 220
--#elif defined (__x86_64__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 188
--# define __NR_lsetxattr 189
--# define __NR_fsetxattr 190
--# define __NR_getxattr 191
--# define __NR_lgetxattr 192
--# define __NR_fgetxattr 193
--# define __NR_listxattr 194
--# define __NR_llistxattr 195
--# define __NR_flistxattr 196
--# define __NR_removexattr 197
--# define __NR_lremovexattr 198
--# define __NR_fremovexattr 199
--#elif defined (__s390__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 224
--# define __NR_lsetxattr 225
--# define __NR_fsetxattr 226
--# define __NR_getxattr 227
--# define __NR_lgetxattr 228
--# define __NR_fgetxattr 229
--# define __NR_listxattr 230
--# define __NR_llistxattr 231
--# define __NR_flistxattr 232
--# define __NR_removexattr 233
--# define __NR_lremovexattr 234
--# define __NR_fremovexattr 235
--#elif defined (__arm__)
--# define HAVE_XATTR_SYSCALLS 1
--# if defined(__ARM_EABI__) || defined(__thumb__)
--# define __NR_SYSCALL_BASE 0
--# else
--# define __NR_SYSCALL_BASE 0x900000
--# endif
--# define __NR_setxattr (__NR_SYSCALL_BASE+226)
--# define __NR_lsetxattr (__NR_SYSCALL_BASE+227)
--# define __NR_fsetxattr (__NR_SYSCALL_BASE+228)
--# define __NR_getxattr (__NR_SYSCALL_BASE+229)
--# define __NR_lgetxattr (__NR_SYSCALL_BASE+230)
--# define __NR_fgetxattr (__NR_SYSCALL_BASE+231)
--# define __NR_listxattr (__NR_SYSCALL_BASE+232)
--# define __NR_llistxattr (__NR_SYSCALL_BASE+233)
--# define __NR_flistxattr (__NR_SYSCALL_BASE+234)
--# define __NR_removexattr (__NR_SYSCALL_BASE+235)
--# define __NR_lremovexattr (__NR_SYSCALL_BASE+236)
--# define __NR_fremovexattr (__NR_SYSCALL_BASE+237)
--#elif defined (__mips64)
--# define HAVE_XATTR_SYSCALLS 1
--# ifdef __LP64__ /* mips64 using n64 ABI */
--# define __NR_Linux 5000
--# else /* mips64 using n32 ABI */
--# define __NR_Linux 6000
--# endif
--# define __NR_setxattr (__NR_Linux + 180)
--# define __NR_lsetxattr (__NR_Linux + 181)
--# define __NR_fsetxattr (__NR_Linux + 182)
--# define __NR_getxattr (__NR_Linux + 183)
--# define __NR_lgetxattr (__NR_Linux + 184)
--# define __NR_fgetxattr (__NR_Linux + 185)
--# define __NR_listxattr (__NR_Linux + 186)
--# define __NR_llistxattr (__NR_Linux + 187)
--# define __NR_flistxattr (__NR_Linux + 188)
--# define __NR_removexattr (__NR_Linux + 189)
--# define __NR_lremovexattr (__NR_Linux + 190)
--# define __NR_fremovexattr (__NR_Linux + 191)
--#elif defined (__mips__) /* mips32, or mips64 using o32 ABI */
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_Linux 4000
--# define __NR_setxattr (__NR_Linux + 224)
--# define __NR_lsetxattr (__NR_Linux + 225)
--# define __NR_fsetxattr (__NR_Linux + 226)
--# define __NR_getxattr (__NR_Linux + 227)
--# define __NR_lgetxattr (__NR_Linux + 228)
--# define __NR_fgetxattr (__NR_Linux + 229)
--# define __NR_listxattr (__NR_Linux + 230)
--# define __NR_llistxattr (__NR_Linux + 231)
--# define __NR_flistxattr (__NR_Linux + 232)
--# define __NR_removexattr (__NR_Linux + 233)
--# define __NR_lremovexattr (__NR_Linux + 234)
--# define __NR_fremovexattr (__NR_Linux + 235)
--#elif defined (__alpha__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 382
--# define __NR_lsetxattr 383
--# define __NR_fsetxattr 384
--# define __NR_getxattr 385
--# define __NR_lgetxattr 386
--# define __NR_fgetxattr 387
--# define __NR_listxattr 388
--# define __NR_llistxattr 389
--# define __NR_flistxattr 390
--# define __NR_removexattr 391
--# define __NR_lremovexattr 392
--# define __NR_fremovexattr 393
--#elif defined (__mc68000__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr 223
--# define __NR_lsetxattr 224
--# define __NR_fsetxattr 225
--# define __NR_getxattr 226
--# define __NR_lgetxattr 227
--# define __NR_fgetxattr 228
--# define __NR_listxattr 229
--# define __NR_llistxattr 230
--# define __NR_flistxattr 231
--# define __NR_removexattr 232
--# define __NR_lremovexattr 233
--# define __NR_fremovexattr 234
- #else
- # warning "Extended attribute syscalls undefined for this architecture"
- # define HAVE_XATTR_SYSCALLS 0
diff --git a/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch b/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch
deleted file mode 100644
index 7b01afe..0000000
--- a/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur attr-2.4.46.orig/include/xattr.h attr-2.4.46/include/xattr.h
---- attr-2.4.46.orig/include/xattr.h 2014-01-21 22:14:56.418790180 +0000
-+++ attr-2.4.46/include/xattr.h 2014-01-21 22:14:19.626788123 +0000
-@@ -31,7 +31,11 @@
- #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
-
-
-+#ifdef __cpluplus
- __BEGIN_DECLS
-+#else
-+#define __THROW
-+#endif
-
- extern int setxattr (const char *__path, const char *__name,
- const void *__value, size_t __size, int __flags) __THROW;
-@@ -58,6 +62,8 @@
- extern int lremovexattr (const char *__path, const char *__name) __THROW;
- extern int fremovexattr (int __filedes, const char *__name) __THROW;
-
-+#ifdef __cpluplus
- __END_DECLS
-+#endif
-
- #endif /* __XATTR_H__ */
diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-apps/attr/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/busybox/busybox-1.21.0-r99.ebuild b/sys-apps/busybox/busybox-1.21.0-r99.ebuild
deleted file mode 100644
index dab6258..0000000
--- a/sys-apps/busybox/busybox-1.21.0-r99.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.21 2013/09/14 10:38:45 ago Exp $
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${PN}
- EGIT_REPO_URI="git://busybox.net/busybox.git"
- inherit git-2
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- while [[ $# -gt 0 ]] ; do
- if [[ ${flag} == "y" ]] ; then
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
- else
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
- fi
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-src_prepare() {
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- # patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
- epatch "${FILESDIR}"/${P}-*.patch
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 oldconfig > /dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 allyesconfig > /dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
-
- # turn off some options causing trouble with musl
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
- busybox_config_option n IFPLUGD
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option n HUSH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- fi
-
- if use static && use pam ; then
- ewarn "You cannot have USE='static pam'. Assuming static is more important."
- fi
- busybox_config_option $(usex static n pam) PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.rc.1 mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/busybox-1.22.1-r99.ebuild b/sys-apps/busybox/busybox-1.22.1-r99.ebuild
deleted file mode 100644
index da1fea1..0000000
--- a/sys-apps/busybox/busybox-1.22.1-r99.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.22.1.ebuild,v 1.2 2014/02/02 08:17:37 vapier Exp $
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${PN}
- EGIT_REPO_URI="git://busybox.net/busybox.git"
- inherit git-2
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- while [[ $# -gt 0 ]] ; do
- if [[ ${flag} == "y" ]] ; then
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
- else
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
- fi
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-src_prepare() {
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- # patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
- epatch "${FILESDIR}"/${P}-*.patch
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 oldconfig > /dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 allyesconfig > /dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
-
- # turn off some options causing trouble with musl
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
- busybox_config_option n IFPLUGD
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option n HUSH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- fi
-
- if use static && use pam ; then
- ewarn "You cannot have USE='static pam'. Assuming static is more important."
- fi
- busybox_config_option $(usex static n pam) PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.rc.1 mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/busybox-1.23.0-r99.ebuild b/sys-apps/busybox/busybox-1.23.0-r99.ebuild
deleted file mode 100644
index cdc38d1..0000000
--- a/sys-apps/busybox/busybox-1.23.0-r99.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.0.ebuild,v 1.4 2015/01/17 03:11:56 zlogene Exp $
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${PN}
- EGIT_REPO_URI="git://busybox.net/busybox.git"
- inherit git-2
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- while [[ $# -gt 0 ]] ; do
- if [[ ${flag} == "y" ]] ; then
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
- else
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
- fi
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-src_prepare() {
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- # patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-# epatch "${FILESDIR}"/${P}-*.patch
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 -s oldconfig >/dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 -s defconfig >/dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
-
- # causes trouble with musl
- busybox_config_option n IFPLUGD
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option n HUSH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- busybox_config_option n UDHCPC6
- fi
-
- if use static && use pam ; then
- ewarn "You cannot have USE='static pam'. Assuming static is more important."
- fi
- busybox_config_option $(usex static n pam) PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
- busybox_config_option $(usex debug y n) TFTP_DEBUG
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.initd mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/busybox-1.23.1-r99.ebuild b/sys-apps/busybox/busybox-1.23.1-r99.ebuild
deleted file mode 100644
index 14887a0..0000000
--- a/sys-apps/busybox/busybox-1.23.1-r99.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.1-r1.ebuild,v 1.3 2015/02/08 22:35:39 blueness Exp $
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${PN}
- EGIT_REPO_URI="git://busybox.net/busybox.git"
- inherit git-2
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- while [[ $# -gt 0 ]] ; do
- if [[ ${flag} == "y" ]] ; then
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
- else
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
- fi
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-src_prepare() {
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- # patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-# epatch "${FILESDIR}"/${P}-*.patch
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 -s oldconfig >/dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 -s allyesconfig >/dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n START_STOP_DAEMON
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
-
- # causes trouble with musl
- busybox_config_option n IFPLUGD
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option n HUSH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- busybox_config_option n UDHCPC6
- fi
-
- if use static && use pam ; then
- ewarn "You cannot have USE='static pam'. Assuming static is more important."
- fi
- busybox_config_option $(usex static n pam) PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
- busybox_config_option $(usex debug y n) TFTP_DEBUG
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.initd mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/busybox-1.23.2-r99.ebuild b/sys-apps/busybox/busybox-1.23.2-r99.ebuild
deleted file mode 100644
index 98f537d..0000000
--- a/sys-apps/busybox/busybox-1.23.2-r99.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.23.1-r1.ebuild,v 1.3 2015/02/08 22:35:39 blueness Exp $
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="4"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${PN}
- EGIT_REPO_URI="git://busybox.net/busybox.git"
- inherit git-2
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- while [[ $# -gt 0 ]] ; do
- if [[ ${flag} == "y" ]] ; then
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
- else
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config
- fi
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...)
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-src_prepare() {
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- # patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
- #epatch "${FILESDIR}"/${P}-*.patch
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 -s oldconfig >/dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 -s allyesconfig >/dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n START_STOP_DAEMON
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
-
- # causes trouble with musl
- busybox_config_option n IFPLUGD
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option n HUSH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- busybox_config_option n UDHCPC6
- fi
-
- if use static && use pam ; then
- ewarn "You cannot have USE='static pam'. Assuming static is more important."
- fi
- busybox_config_option $(usex static n pam) PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
- busybox_config_option $(usex debug y n) TFTP_DEBUG
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with <linux-2.6.23
- busybox_config_option n FEATURE_MOUNT_NFS
-
- # default a bunch of uncommon options to off
- local opt
- for opt in \
- ADD_SHELL \
- BEEP BOOTCHARTD \
- CRONTAB \
- DC DEVFSD DNSD DPKG{,_DEB} \
- FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
- FEATURE_DEVFS \
- HOSTID HUSH \
- INETD INOTIFYD IPCALC \
- LOCALE_SUPPORT LOGNAME LPD \
- MAKEMIME MKFS_MINIX MSH \
- OD \
- RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
- SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
- TASKSET TCPSVD \
- RPM RPM2CPIO \
- UDPSVD UUDECODE UUENCODE
- do
- busybox_config_option n ${opt}
- done
-
- emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.initd mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/busybox/files/busybox-1.19.0-bb.patch b/sys-apps/busybox/files/busybox-1.19.0-bb.patch
deleted file mode 100644
index a66b45a..0000000
--- a/sys-apps/busybox/files/busybox-1.19.0-bb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -75,6 +75,8 @@
- //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
- //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, sh))
- //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, bash))
-+//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
-+//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
-
- //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
- //kbuild:lib-$(CONFIG_ASH_RANDOM_SUPPORT) += random.o
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7255,6 +7255,8 @@
- }
- /* re-exec ourselves with the new arguments */
- execve(bb_busybox_exec_path, argv, envp);
-+ execve("/bin/busybox.static", argv, envp);
-+ execve("/bin/busybox", argv, envp);
- /* If they called chroot or otherwise made the binary no longer
- * executable, fall through */
- }
diff --git a/sys-apps/busybox/files/busybox-1.21.0-ifconfig.patch b/sys-apps/busybox/files/busybox-1.21.0-ifconfig.patch
deleted file mode 100644
index bc74904..0000000
--- a/sys-apps/busybox/files/busybox-1.21.0-ifconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/busybox-1.21.0/networking/ifconfig.c
-+++ b/busybox-1.21.0/networking/ifconfig.c
-@@ -56,7 +56,7 @@
- #endif
-
- #if ENABLE_FEATURE_IFCONFIG_SLIP
--# include <net/if_slip.h>
-+# include <linux/if_slip.h>
- #endif
-
- /* I don't know if this is needed for busybox or not. Anyone? */
diff --git a/sys-apps/busybox/files/busybox-1.21.0-iplink.patch b/sys-apps/busybox/files/busybox-1.21.0-iplink.patch
deleted file mode 100644
index 80d8e5d..0000000
--- a/sys-apps/busybox/files/busybox-1.21.0-iplink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/busybox-1.21.0/networking/libiproute/iplink.c
-+++ b/busybox-1.21.0/networking/libiproute/iplink.c
-@@ -5,8 +5,7 @@
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
- #include <net/if.h>
--#include <net/if_packet.h>
--#include <netpacket/packet.h>
-+#include <linux/if_packet.h>
- #include <netinet/if_ether.h>
-
- #include "ip_common.h" /* #include "libbb.h" is inside */
diff --git a/sys-apps/busybox/files/busybox-1.21.0-mdev.patch b/sys-apps/busybox/files/busybox-1.21.0-mdev.patch
deleted file mode 100644
index cb873fa..0000000
--- a/sys-apps/busybox/files/busybox-1.21.0-mdev.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- busybox-1.21.0/util-linux/mdev.c
-+++ busybox-1.21.0-mdev/util-linux/mdev.c
-@@ -661,6 +661,8 @@ static void make_device(char *device_nam
- if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST)
- bb_perror_msg("can't create '%s'", node_name);
- if (ENABLE_FEATURE_MDEV_CONF) {
-+ if (G.verbose)
-+ bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid);
- chmod(node_name, rule->mode);
- chown(node_name, rule->ugid.uid, rule->ugid.gid);
- }
-@@ -813,6 +815,7 @@ static void load_firmware(const char *fi
- full_write(loading_fd, "-1", 2);
-
- out:
-+ xchdir("/dev");
- if (ENABLE_FEATURE_CLEAN_UP) {
- close(firmware_fd);
- close(loading_fd);
-@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha
- }
-
- {
-- int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND);
-+ int logfd = open("mdev.log", O_WRONLY | O_APPEND);
- if (logfd >= 0) {
- xmove_fd(logfd, STDERR_FILENO);
- G.verbose = 1;
-- bb_error_msg("seq: %s action: %s", seq, action);
-+ if (seq)
-+ applet_name = xasprintf("%s[%s]", applet_name, seq);
-+ bb_error_msg("action: %s", action);
- }
- }
-
diff --git a/sys-apps/busybox/files/busybox-1.21.0-platform.patch b/sys-apps/busybox/files/busybox-1.21.0-platform.patch
deleted file mode 100644
index 9be6cb8..0000000
--- a/sys-apps/busybox/files/busybox-1.21.0-platform.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- busybox-1.21.0/archival/libarchive/decompress_unxz.c
-+++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c
-@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *
- /* We use arch-optimized unaligned accessors */
- #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
- #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
--#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
--#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
-+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
-+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
-
- #include "unxz/xz_dec_bcj.c"
- #include "unxz/xz_dec_lzma2.c"
---- busybox-1.21.0/include/platform.h
-+++ busybox-1.21.0-platform/include/platform.h
-@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI
- # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
- # define move_to_unaligned16(u16p, v) do { \
- uint16_t __t = (v); \
-- memcpy((u16p), &__t, 4); \
-+ memcpy((u16p), &__t, 2); \
- } while (0)
- # define move_to_unaligned32(u32p, v) do { \
- uint32_t __t = (v); \
diff --git a/sys-apps/busybox/files/busybox-1.21.0-xz.patch b/sys-apps/busybox/files/busybox-1.21.0-xz.patch
deleted file mode 100644
index 56ba1a2..0000000
--- a/sys-apps/busybox/files/busybox-1.21.0-xz.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- busybox-1.21.0/archival/libarchive/decompress_unxz.c
-+++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c
-@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *
- IF_DESKTOP(long long) int FAST_FUNC
- unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
- {
-+ enum xz_ret xz_result;
- struct xz_buf iobuf;
- struct xz_dec *state;
- unsigned char *membuf;
-@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t
- /* Limit memory usage to about 64 MiB. */
- state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
-
-+ xz_result = X_OK;
- while (1) {
-- enum xz_ret r;
--
- if (iobuf.in_pos == iobuf.in_size) {
- int rd = safe_read(src_fd, membuf, BUFSIZ);
- if (rd < 0) {
-@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t
- total = -1;
- break;
- }
-+ if (rd == 0 && xz_result == XZ_STREAM_END)
-+ break;
- iobuf.in_size = rd;
- iobuf.in_pos = 0;
- }
-+ if (xz_result == XZ_STREAM_END) {
-+ /*
-+ * Try to start decoding next concatenated stream.
-+ * Stream padding must always be a multiple of four
-+ * bytes to preserve four-byte alignment. To keep the
-+ * code slightly smaller, we aren't as strict here as
-+ * the .xz spec requires. We just skip all zero-bytes
-+ * without checking the alignment and thus can accept
-+ * files that aren't valid, e.g. the XZ utils test
-+ * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
-+ */
-+ do {
-+ if (membuf[iobuf.in_pos] != 0) {
-+ xz_dec_reset(state);
-+ goto do_run;
-+ }
-+ iobuf.in_pos++;
-+ } while (iobuf.in_pos < iobuf.in_size);
-+ }
-+ do_run:
- // bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
- // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
-- r = xz_dec_run(state, &iobuf);
-+ xz_result = xz_dec_run(state, &iobuf);
- // bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
--// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
-+// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
- if (iobuf.out_pos) {
- xwrite(dst_fd, iobuf.out, iobuf.out_pos);
- IF_DESKTOP(total += iobuf.out_pos;)
- iobuf.out_pos = 0;
- }
-- if (r == XZ_STREAM_END) {
-- break;
-+ if (xz_result == XZ_STREAM_END) {
-+ /*
-+ * Can just "break;" here, if not for concatenated
-+ * .xz streams.
-+ * Checking for padding may require buffer
-+ * replenishment. Can't do it here.
-+ */
-+ continue;
- }
-- if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
-+ if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
- bb_error_msg("corrupted data");
- total = -1;
- break;
- }
- }
-+
- xz_dec_end(state);
- free(membuf);
-
diff --git a/sys-apps/busybox/files/busybox-1.22.1-ash.patch b/sys-apps/busybox/files/busybox-1.22.1-ash.patch
deleted file mode 100644
index 301e942..0000000
--- a/sys-apps/busybox/files/busybox-1.22.1-ash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- busybox-1.22.1/shell/ash.c
-+++ busybox-1.22.1-ash/shell/ash.c
-@@ -13014,7 +13014,7 @@ init(void)
- setvar2("PPID", utoa(getppid()));
- #if ENABLE_ASH_BASH_COMPAT
- p = lookupvar("SHLVL");
-- setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1));
-+ setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT);
- #endif
- p = lookupvar("PWD");
- if (p) {
diff --git a/sys-apps/busybox/files/busybox-1.22.1-date.patch b/sys-apps/busybox/files/busybox-1.22.1-date.patch
deleted file mode 100644
index 6380d87..0000000
--- a/sys-apps/busybox/files/busybox-1.22.1-date.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- busybox-1.22.1/libbb/time.c
-+++ busybox-1.22.1-date/libbb/time.c
-@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char
- /* else end != NUL and we error out */
- }
- } else
-- /* yyyy-mm-dd HH */
-- if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
-+ if (strchr(date_str, '-')
-+ /* Why strchr('-') check?
-+ * sscanf below will trash ptm->tm_year, this breaks
-+ * if parse_str is "10101010" (iow, "MMddhhmm" form)
-+ * because we destroy year. Do these sscanf
-+ * only if we saw a dash in parse_str.
-+ */
-+ /* yyyy-mm-dd HH */
-+ && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year,
- &ptm->tm_mon, &ptm->tm_mday,
- &ptm->tm_hour,
- &end) >= 4
-- /* yyyy-mm-dd */
-- || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
-+ /* yyyy-mm-dd */
-+ || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year,
- &ptm->tm_mon, &ptm->tm_mday,
- &end) >= 3
-+ )
- ) {
- ptm->tm_year -= 1900; /* Adjust years */
- ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
diff --git a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch b/sys-apps/busybox/files/busybox-1.22.1-iplink.patch
deleted file mode 100644
index dbd76c5..0000000
--- a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- busybox-1.22.1/networking/libiproute/iplink.c
-+++ busybox-1.22.1-iplink/networking/libiproute/iplink.c
-@@ -31,6 +31,16 @@
- #ifndef IFLA_LINKINFO
- # define IFLA_LINKINFO 18
- # define IFLA_INFO_KIND 1
-+# define IFLA_INFO_DATA 2
-+#endif
-+
-+#ifndef IFLA_VLAN_MAX
-+# define IFLA_VLAN_ID 1
-+# define IFLA_VLAN_FLAGS 2
-+struct ifla_vlan_flags {
-+ uint32_t flags;
-+ uint32_t mask;
-+};
- #endif
-
- /* taken from linux/sockios.h */
diff --git a/sys-apps/busybox/files/ginit.c b/sys-apps/busybox/files/ginit.c
deleted file mode 100644
index de98e4a..0000000
--- a/sys-apps/busybox/files/ginit.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * simple init to bootstrap sep-/usr
- *
- * Copyright (C) 2012-2013 Mike Frysinger <vapier@gentoo.org>
- *
- * Licensed under GPLv2 or later
- */
-
-//applet:IF_GINIT(APPLET(ginit, BB_DIR_SBIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_GINIT) += ginit.o
-
-//config:config GINIT
-//config: bool "ginit"
-//config: default y
-//config: select MKDIR
-//config: select MDEV
-//config: select MOUNT
-//config: select MOUNTPOINT
-//config: help
-//config: sep-/usr bootstrapper
-
-//usage:#define ginit_trivial_usage NOUSAGE_STR
-//usage:#define ginit_full_usage ""
-
-#include "libbb.h"
-
-#define eprintf(fmt, args...) printf("%s" fmt, "sep-usr init: ", ## args)
-
-static void process_args(char **args)
-{
- size_t i;
-
- eprintf("running: ");
- for (i = 0; args[i]; ++i) {
- /* String needs to be writable, so dupe it */
- args[i] = xstrdup(args[i]);
- printf("'%s' ", args[i]);
- }
- printf("\n");
-}
-
-int ginit_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ginit_main(int argc UNUSED_PARAM, char **argv)
-{
- FILE *mntlist;
- bool ismnted_dev, ismnted_sys, ismnted_usr;
- struct mntent *mntent;
-
- /*
- int fd = open("/dev/console", O_RDWR);
- if (fd >= 0) {
- dup2(fd, 0);
- dup2(fd, 1);
- dup2(fd, 2);
- }
- */
-
- /* If given an argv[] with an applet name, run it instead.
- * Makes recovering simple by doing: init=/ginit bb
- */
- if (argv[1] && argv[1][0] != '/') {
- eprintf("running user requested applet %s\n", argv[1]);
- return spawn_and_wait(argv+1);
- }
-
-#define saw(argv...) \
- ({ \
- static const char *args[] = { argv, NULL }; \
- /* These casts are fine -- see process_args for mem setup */ \
- process_args((void *)args); \
- spawn_and_wait((void *)args); \
- })
-
- /* First setup basic /dev */
- if (saw("mountpoint", "-q", "/dev") != 0) {
- /* Try /etc/fstab */
- if (saw("mount", "-n", "/dev"))
- /* Then devtmpfs */
- if (saw("mount", "-n", "-t", "devtmpfs", "devtmpfs", "/dev"))
- /* Finally normal tmpfs */
- saw("mount", "-n", "-t", "tmpfs", "dev", "/dev");
- } else {
- eprintf("%s appears to be mounted; skipping its setup\n", "/dev");
- }
-
- /* If /dev is empty (e.g. tmpfs), run mdev to seed things */
- if (access("/dev/console", F_OK) != 0) {
- if (saw("mountpoint", "-q", "/sys") != 0) {
- if (saw("mount", "-n", "/sys"))
- saw("mount", "-n", "-t", "sysfs", "sysfs", "/sys");
- } else {
- eprintf("%s appears to be mounted; skipping its setup\n", "/sys");
- }
-
- /* Mount /proc as mdev will fork+exec /proc/self/exe */
- if (saw("mountpoint", "-q", "/proc") != 0) {
- /* Try /etc/fstab */
- if (saw("mount", "-n", "/proc"))
- saw("mount", "-n", "-t", "proc", "proc", "/proc");
- }
-
- saw("mdev", "-s");
- }
-
- /* Then seed the stuff we care about */
- saw("mkdir", "-p", "/dev/pts", "/dev/shm");
-
- /* Then mount /usr */
- if (saw("mountpoint", "-q", "/usr") != 0) {
- saw("mount", "-n", "/usr", "-o", "ro");
- } else {
- eprintf("%s appears to be mounted; skipping its setup\n", "/usr");
- }
-
- /* Now that we're all done, exec the real init */
- if (!argv[1]) {
- argv[0] = (void *)"/sbin/init";
- argv[1] = NULL;
- } else
- ++argv;
- process_args(argv);
- return execv(argv[0], argv);
-}
diff --git a/sys-apps/busybox/files/klogd.confd b/sys-apps/busybox/files/klogd.confd
deleted file mode 100644
index 4c16096..0000000
--- a/sys-apps/busybox/files/klogd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/busybox-sysklogd
-
-# run "/sbin/klogd --help" to see all possible options.
-
-# activate if you need remote logging
-#rc_need="net"
-
-# send warnings and above to the console
-KLOGD_OPTS="-c 3"
diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd
deleted file mode 100644
index 4c6dbbc..0000000
--- a/sys-apps/busybox/files/klogd.initd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/klogd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $
-
-command="/bin/busybox klogd"
-command_args="${KLOGD_OPTS}"
-pidfile="/var/run/klogd.pid"
-
-depend() {
- need clock hostname
-}
diff --git a/sys-apps/busybox/files/mdev-start.sh b/sys-apps/busybox/files/mdev-start.sh
deleted file mode 100755
index 8784cd5..0000000
--- a/sys-apps/busybox/files/mdev-start.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-find_mdev()
-{
- if [ -x /sbin/mdev ] ; then
- echo "/sbin/mdev"
- else
- echo "/bin/busybox mdev"
- fi
-}
-
-populate_mdev()
-{
- # populate /dev with devices already found by the kernel
-
- if get_bootparam "nocoldplug" ; then
- RC_COLDPLUG="no"
- ewarn "Skipping mdev coldplug as requested in kernel cmdline"
- fi
-
- ebegin "Populating /dev with existing devices with mdev -s"
- $(find_mdev) -s
- eend $?
-
- return 0
-}
-
-seed_dev()
-{
- # Seed /dev with some things that we know we need
-
- # creating /dev/console and /dev/tty1 to be able to write
- # to $CONSOLE with/without bootsplash before mdev creates it
- [ -c /dev/console ] || mknod /dev/console c 5 1
- [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1
-
- # udevd will dup its stdin/stdout/stderr to /dev/null
- # and we do not want a file which gets buffered in ram
- [ -c /dev/null ] || mknod /dev/null c 1 3
-
- # copy over any persistant things
- if [ -d /lib/mdev/devices ] ; then
- cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
- fi
-
- # Not provided by sysfs but needed
- ln -snf /proc/self/fd /dev/fd
- ln -snf fd/0 /dev/stdin
- ln -snf fd/1 /dev/stdout
- ln -snf fd/2 /dev/stderr
- [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
- # Create problematic directories
- mkdir -p /dev/pts /dev/shm
-}
-
-mount_it_b1()
-{
- if [ "${RC_USE_FSTAB}" = "yes" ] ; then
- mntcmd=$(get_mount_fstab /dev)
- else
- unset mntcmd
- fi
- if [ -n "${mntcmd}" ] ; then
- try mount -n ${mntcmd}
- else
- if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then
- mntcmd="tmpfs"
- else
- mntcmd="ramfs"
- fi
- # many video drivers require exec access in /dev #92921
- try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 mdev /dev
- fi
-}
-mount_it_b2()
-{
- if fstabinfo --quiet /dev ; then
- mount -n /dev
- else
- # Some devices require exec, Bug #92921
- mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev
- fi
-}
-mount_it()
-{
- type fstabinfo && mount_it_b2 || mount_it_b1
-}
-
-main()
-{
- # Setup temporary storage for /dev
- ebegin "Mounting /dev for mdev"
- mount_it
- eend $?
-
- # Create a file so that our rc system knows it's still in sysinit.
- # Existance means init scripts will not directly run.
- # rc will remove the file when done with sysinit.
- touch /dev/.rcsysinit
-
- # Selinux lovin; /selinux should be mounted by selinux-patched init
- if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then
- restorecon /dev > /selinux/null
- fi
-
- seed_dev
-
- # Setup hotplugging (if possible)
- if [ -e /proc/sys/kernel/hotplug ] ; then
- ebegin "Setting up proper hotplug agent"
- eindent
- einfo "Setting /sbin/mdev as hotplug agent ..."
- echo $(find_mdev) > /proc/sys/kernel/hotplug
- eoutdent
- eend 0
- fi
-
- populate_mdev
-}
-
-main
-
-# vim:ts=4
diff --git a/sys-apps/busybox/files/mdev.initd b/sys-apps/busybox/files/mdev.initd
deleted file mode 100644
index 2a61f99..0000000
--- a/sys-apps/busybox/files/mdev.initd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.initd,v 1.1 2014/12/30 19:13:42 williamh Exp $
-
-depend()
-{
- provide dev
- need dev-mount sysfs
-}
-
-find_mdev()
-{
- if [ -x /sbin/mdev ] ; then
- echo "/sbin/mdev"
- else
- echo "/bin/busybox mdev"
- fi
-}
-
-populate_mdev()
-{
- ebegin "Populating /dev with existing devices with mdev -s"
- $(find_mdev) -s
- eend $?
- return 0
-}
-
-seed_dev()
-{
- # copy over any persistent things
- if [ -d /lib/mdev/devices ] ; then
- cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
- fi
-}
-
-start()
-{
- seed_dev
-
- # Setup hotplugging (if possible)
- if [ -e /proc/sys/kernel/hotplug ] ; then
- ebegin "Setting up mdev as hotplug agent"
- echo $(find_mdev) > /proc/sys/kernel/hotplug
- eend 0
- fi
-
- if get_bootparam "nocoldplug" ; then
- ewarn "Skipping mdev coldplug as requested in kernel cmdline"
- else
- populate_mdev
- fi
-}
diff --git a/sys-apps/busybox/files/mdev.rc b/sys-apps/busybox/files/mdev.rc
deleted file mode 100755
index 5470404..0000000
--- a/sys-apps/busybox/files/mdev.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc,v 1.1 2010/08/15 03:55:29 vapier Exp $
-
-start()
-{
- . /lib/rcscripts/addons/mdev-start.sh
-}
diff --git a/sys-apps/busybox/files/mdev.rc.1 b/sys-apps/busybox/files/mdev.rc.1
deleted file mode 100755
index 569d540..0000000
--- a/sys-apps/busybox/files/mdev.rc.1
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/mdev.rc.1,v 1.2 2012/09/26 21:25:23 robbat2 Exp $
-
-depend()
-{
- provide dev dev-mount
- need sysfs
-}
-
-find_mdev()
-{
- if [ -x /sbin/mdev ] ; then
- echo "/sbin/mdev"
- else
- echo "/bin/busybox mdev"
- fi
-}
-
-populate_mdev()
-{
- # populate /dev with devices already found by the kernel
-
- if get_bootparam "nocoldplug" ; then
- RC_COLDPLUG="no"
- ewarn "Skipping mdev coldplug as requested in kernel cmdline"
- fi
-
- ebegin "Populating /dev with existing devices with mdev -s"
- $(find_mdev) -s
- eend $?
-
- return 0
-}
-
-seed_dev()
-{
- # Seed /dev with some things that we know we need
-
- # creating /dev/console and /dev/tty1 to be able to write
- # to $CONSOLE with/without bootsplash before mdev creates it
- [ -c /dev/console ] || mknod /dev/console c 5 1
- [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1
-
- # udevd will dup its stdin/stdout/stderr to /dev/null
- # and we do not want a file which gets buffered in ram
- [ -c /dev/null ] || mknod /dev/null c 1 3
-
- # copy over any persistant things
- if [ -d /lib/mdev/devices ] ; then
- cp -RPp /lib/mdev/devices/* /dev 2>/dev/null
- fi
-
- # Not provided by sysfs but needed
- ln -snf /proc/self/fd /dev/fd
- ln -snf fd/0 /dev/stdin
- ln -snf fd/1 /dev/stdout
- ln -snf fd/2 /dev/stderr
- [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
- # Create problematic directories
- mkdir -p /dev/pts /dev/shm
-}
-
-mount_it()
-{
- if fstabinfo --quiet /dev ; then
- mount -n /dev
- else
- # Some devices require exec, Bug #92921
- mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev
- fi
-}
-
-start()
-{
- # Setup temporary storage for /dev
- ebegin "Mounting /dev for mdev"
- mount_it
- eend $?
-
- # Create a file so that our rc system knows it's still in sysinit.
- # Existance means init scripts will not directly run.
- # rc will remove the file when done with sysinit.
- touch /dev/.rcsysinit
-
- seed_dev
-
- # Setup hotplugging (if possible)
- if [ -e /proc/sys/kernel/hotplug ] ; then
- ebegin "Setting up mdev as hotplug agent"
- echo $(find_mdev) > /proc/sys/kernel/hotplug
- eend 0
- fi
-
- populate_mdev
-}
diff --git a/sys-apps/busybox/files/mdev/dvbdev b/sys-apps/busybox/files/mdev/dvbdev
deleted file mode 100644
index f0186c1..0000000
--- a/sys-apps/busybox/files/mdev/dvbdev
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# MDEV=dvb0.demux1 -> ADAPTER=dvb0 -> N=0
-ADAPTER=${MDEV%.*}
-N=${ADAPTER#dvb}
-# MDEV=dvb0.demux1 -> DEVB_DEV=demux1
-DVB_DEV=${MDEV#*.}
-
-case "$ACTION" in
- add|"")
- mkdir -p dvb/adapter${N}
- mv ${MDEV} dvb/adapter${N}/${DVB_DEV}
- ;;
- remove)
- rm -f dvb/adapter${N}/${DVB_DEV}
- rmdir dvb/adapter${N} 2>/dev/null
- rmdir dvb/ 2>/dev/null
-esac
diff --git a/sys-apps/busybox/files/mdev/ide_links b/sys-apps/busybox/files/mdev/ide_links
deleted file mode 100644
index be0c95a..0000000
--- a/sys-apps/busybox/files/mdev/ide_links
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-[ -f /proc/ide/$MDEV/media ] || exit
-
-media=`cat /proc/ide/$MDEV/media`
-for i in $media $media[0-9]* ; do
- if [ "`readlink $i 2>/dev/null`" = $MDEV ] ; then
- LINK=$i
- break
- fi
-done
-
-# link exist, remove if necessary and exit
-if [ "$LINK" ] ; then
- [ "$ACTION" = remove ] && rm $LINK
- exit
-fi
-
-# create a link
-num=`ls $media[0-9]* 2>/dev/null | wc -l`
-ln -sf $MDEV "$media`echo $num`"
-[ -e "$media" ] || ln -sf $MDEV "$media"
-
diff --git a/sys-apps/busybox/files/mdev/usbdev b/sys-apps/busybox/files/mdev/usbdev
deleted file mode 100644
index ea5b915..0000000
--- a/sys-apps/busybox/files/mdev/usbdev
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# script is buggy; until patched just do exit 0
-#exit 0
-
-# add zeros to device or bus
-add_zeros () {
- case "$(echo $1 | wc -L)" in
- 1) echo "00$1" ;;
- 2) echo "0$1" ;;
- *) echo "$1"
- esac
- exit 0
-}
-
-
-# bus and device dirs in /sys
-USB_PATH=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).[0-9]/usb\1/')
-USB_PATH=$(find /sys/devices -type d -name "$USB_PATH")
-USB_DEV_DIR=$(echo $MDEV | sed -e 's/usbdev\([0-9]\).\([0-9]\)/\1-\2/')
-
-# dir names in /dev
-BUS=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev\([0-9]\).[0-9]/\1/'))
-USB_DEV=$(add_zeros $(echo $MDEV | sed -e 's/^usbdev[0-9].\([0-9]\)/\1/'))
-
-
-# try to load the proper driver for usb devices
-case "$ACTION" in
- add|"")
- # load usb bus driver
- for i in $USB_PATH/*/modalias ; do
- modprobe `cat $i` 2>/dev/null
- done
- # load usb device driver if existent
- if [ -d $USB_PATH/$USB_DEV_DIR ]; then
- for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
- modprobe `cat $i` 2>/dev/null
- done
- fi
- # move usb device file
- mkdir -p bus/usb/$BUS
- mv $MDEV bus/usb/$BUS/$USB_DEV
- ;;
- remove)
- # unload device driver, if device dir is existent
- if [ -d $USB_PATH/$USB_DEV_DIR ]; then
- for i in $USB_PATH/$USB_DEV_DIR/*/modalias ; do
- modprobe -r `cat $i` 2>/dev/null
- done
- fi
- # unload usb bus driver. Does this make sense?
- # what happens, if two usb devices are plugged in
- # and one is removed?
- for i in $USB_PATH/*/modalias ; do
- modprobe -r `cat $i` 2>/dev/null
- done
- # remove device file and possible empty dirs
- rm -f bus/usb/$BUS/$USB_DEV
- rmdir bus/usb/$BUS/ 2>/dev/null
- rmdir bus/usb/ 2>/dev/null
- rmdir bus/ 2>/dev/null
-esac
diff --git a/sys-apps/busybox/files/mdev/usbdisk_link b/sys-apps/busybox/files/mdev/usbdisk_link
deleted file mode 100644
index 6bb0692..0000000
--- a/sys-apps/busybox/files/mdev/usbdisk_link
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# NOTE: since mdev -s only provide $MDEV, don't depend on any hotplug vars.
-
-current=$(readlink usbdisk)
-
-if [ "$current" = "$MDEV" ] && [ "$ACTION" = "remove" ]; then
- rm -f usbdisk usba1
-fi
-[ -n "$current" ] && exit
-
-if [ -e /sys/block/$MDEV ]; then
- SYSDEV=$(readlink -f /sys/block/$MDEV/device)
- # if /sys device path contains '/usb[0-9]' then we assume its usb
- # also, if it's a usb without partitions we require FAT
- if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
- # do not create link if there is not FAT
- dd if=/dev/$MDEV bs=512 count=1 2>/dev/null | strings | grep FAT >/dev/null || exit 0
-
- ln -sf $MDEV usbdisk
- # keep this for compat. people have it in fstab
- ln -sf $MDEV usba1
- fi
-
-elif [ -e /sys/block/*/$MDEV ] ; then
- PARENT=$(dirname /sys/block/*/$MDEV)
- SYSDEV=$(readlink -f $PARENT/device)
- if [ "${SYSDEV##*/usb[0-9]}" != "$SYSDEV" ]; then
- ln -sf $MDEV usbdisk
- # keep this for compat. people have it in fstab
- ln -sf $MDEV usba1
- fi
-fi
-
diff --git a/sys-apps/busybox/files/ntpd.confd b/sys-apps/busybox/files/ntpd.confd
deleted file mode 100644
index f50d4c2..0000000
--- a/sys-apps/busybox/files/ntpd.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Config file for /etc/init.d/busybox-ntpd
-
-# run "/sbin/ntpd --help" to see all possible options.
-
-# Get time from specified server and run in background
-NTPD_OPTS="-N -p pool.ntp.org"
diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd
deleted file mode 100644
index 5a05c31..0000000
--- a/sys-apps/busybox/files/ntpd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/ntpd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $
-
-command="/bin/busybox ntpd"
-command_args="${NTPD_OPTS}"
-pidfile="/var/run/ntpd.pid"
-
-depend() {
- use net dns logger
- after ntp-client
-}
diff --git a/sys-apps/busybox/files/syslogd.confd b/sys-apps/busybox/files/syslogd.confd
deleted file mode 100644
index 7df6885..0000000
--- a/sys-apps/busybox/files/syslogd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/busybox-sysklogd
-
-# run "/sbin/syslogd --help" to see all possible options.
-
-# activate if you need remote logging
-#rc_need="net"
-
-# Log to shared mem buffer (use logread to read it)
-SYSLOGD_OPTS="-C128"
diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd
deleted file mode 100644
index f14224a..0000000
--- a/sys-apps/busybox/files/syslogd.initd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/syslogd.initd,v 1.2 2012/12/21 03:15:28 blueness Exp $
-
-command="/bin/busybox syslogd"
-command_args="${SYSLOGD_OPTS}"
-pidfile="/var/run/syslogd.pid"
-
-depend() {
- need clock hostname
- provide logger
-}
diff --git a/sys-apps/busybox/files/watchdog.confd b/sys-apps/busybox/files/watchdog.confd
deleted file mode 100644
index bd6aec0..0000000
--- a/sys-apps/busybox/files/watchdog.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/busybox-watchdog
-
-# run "/sbin/watchdog --help" to see all possible options.
-
-# Periodically write to watchdog device
-WATCHDOG_OPTS="/dev/watchdog"
-
-# optionally set the nice-level
-#SSD_NICELEVEL="-20"
diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd
deleted file mode 100644
index 214468a..0000000
--- a/sys-apps/busybox/files/watchdog.initd
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/watchdog.initd,v 1.3 2013/04/27 07:47:23 vapier Exp $
-
-command="/bin/busybox watchdog"
-command_args="${WATCHDOG_OPTS}"
-pidfile="/var/run/watchdog.pid"
diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
deleted file mode 100644
index 72850fb..0000000
--- a/sys-apps/busybox/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>embedded</herd>
-<use>
-<flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
-<flag name="math">Enable math support in gawk (requires libm)</flag>
-<flag name="mdev">Create the appropriate symlink in /sbin and install mdev.conf and support files</flag>
-<flag name="sep-usr">Support a separate /usr without needing an initramfs by booting with init=/ginit</flag>
-<flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag>
-<flag name="systemd">Support systemd</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
deleted file mode 100644
index 9ff86f6..0000000
--- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-newer gnulib has rewritten these checks in a way that works for the x32,
-and for the targets we care about, these checks won't return false. so
-just drop them to make our life simpler.
-
-https://sites.google.com/site/x32abi/x32-patches
-
---- findutils-4.4.2/gnulib/lib/getdate.c.x32 2009-05-10 14:23:57.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/getdate.c 2011-12-05 11:41:18.130675712 -0800
-@@ -114,7 +114,6 @@
- wraps around, but there's no portable way to check for that at
- compile-time. */
- verify (TYPE_IS_INTEGER (time_t));
--verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
-
- /* An integer value, and the number of digits in its textual
- representation. */
---- findutils-4.4.2/gnulib/lib/mktime.c.x32 2009-05-10 14:25:13.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/mktime.c 2011-12-05 11:49:38.368589386 -0800
-@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda
- {
- verify (C99_integer_division, -1 / 2 == 0);
-- verify (long_int_year_and_yday_are_wide_enough,
-- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
-
- /* Compute intervening leap days correctly even if year is negative.
- Take care to avoid integer overflow here. */
diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch
deleted file mode 100644
index 0a47c90..0000000
--- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur findutils-4.4.2.orig/gnulib/lib/freadahead.c findutils-4.4.2/gnulib/lib/freadahead.c
---- findutils-4.4.2.orig/gnulib/lib/freadahead.c 2009-05-10 21:23:57.000000000 +0000
-+++ findutils-4.4.2/gnulib/lib/freadahead.c 2013-07-06 01:54:25.443043832 +0000
-@@ -22,6 +22,7 @@
- size_t
- freadahead (FILE *fp)
- {
-+#if 0
- #if defined _IO_ferror_unlocked /* GNU libc, BeOS */
- if (fp->_IO_write_ptr > fp->_IO_write_base)
- return 0;
-@@ -63,4 +64,6 @@
- #else
- #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread on your system, then report this to bug-gnulib."
- #endif
-+#endif
-+ return 0;
- }
diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
deleted file mode 100644
index 66c9c41..0000000
--- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
+++ /dev/null
@@ -1,464 +0,0 @@
-diff -purN findutils-4.4.2.orig/find/Makefile.am findutils-4.4.2/find/Makefile.am
---- findutils-4.4.2.orig/find/Makefile.am 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.am 2010-04-25 03:58:33.762402367 +0000
-@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options
- localedir = $(datadir)/locale
- # noinst_PROGRAMS = regexprops
- # regexprops_SOURCES = regexprops.c
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
-
- noinst_LIBRARIES = libfindtools.a
- libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c
-@@ -26,7 +27,7 @@ endif
-
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = . testsuite
-
-diff -purN findutils-4.4.2.orig/find/Makefile.in findutils-4.4.2/find/Makefile.in
---- findutils-4.4.2.orig/find/Makefile.in 2009-05-16 15:28:13.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.in 2010-04-25 03:58:33.762402367 +0000
-@@ -275,7 +275,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFAULT_ARG_SIZE = @DEFAULT_ARG_SIZE@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- DIRENT_H = @DIRENT_H@
- ECHO_C = @ECHO_C@
-@@ -607,7 +607,7 @@ libfindtools_a_SOURCES = finddata.c fsty
- @WITH_FTS_TRUE@oldfind_SOURCES = find.c
- @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
- EXTRA_DIST = defs.h $(man_MANS)
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = . testsuite
- all: all-recursive
-diff -purN findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h
---- findutils-4.4.2.orig/find/defs.h 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/defs.h 2010-04-25 03:58:33.762402367 +0000
-@@ -91,6 +91,9 @@ int get_statinfo PARAMS((const char *pat
- #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
-
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-
- struct predicate;
- struct options;
-@@ -315,6 +318,9 @@ struct predicate
- struct samefile_file_id samefileid; /* samefile */
- mode_t type; /* type */
- struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
-+#ifdef WITH_SELINUX
-+ security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
- } args;
-
- /* The next predicate in the user input sequence,
-@@ -459,7 +465,9 @@ PREDICATEFUNCTION pred_used;
- PREDICATEFUNCTION pred_user;
- PREDICATEFUNCTION pred_writable;
- PREDICATEFUNCTION pred_xtype;
--
-+#ifdef WITH_SELINUX
-+PREDICATEFUNCTION pred_scontext;
-+#endif /* WITH_SELINUX */
-
-
- int launch PARAMS((const struct buildcmd_control *ctl,
-@@ -605,10 +613,13 @@ struct options
- */
- unsigned short optimisation_level;
-
--
- /* How should we quote filenames in error messages and so forth?
- */
- enum quoting_style err_quoting_style;
-+
-+#ifdef WITH_SELINUX
-+ int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
-
-diff -purN findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1
---- findutils-4.4.2.orig/find/find.1 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.1 2010-04-25 03:58:33.762402367 +0000
-@@ -934,6 +934,10 @@ checks the type of the file that
- .B \-type
- does not check.
-
-+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
-+(SELinux only) File has the security context \fIscontext\fR.
-+
- .SS ACTIONS
- .IP "\-delete\fR"
- Delete files; true if removal succeeded. If the removal failed, an
-@@ -1354,6 +1358,8 @@ File's type (like in
- U=unknown type (shouldn't happen)
- .IP %Y
- File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
-+.IP %Z
-+(SELinux only) file's security context.
- .PP
- A `%' character followed by any other character is discarded, but the
- other character is printed (don't rely on this, as further format
-diff -purN findutils-4.4.2.orig/find/find.c findutils-4.4.2/find/find.c
---- findutils-4.4.2.orig/find/find.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.c 2010-04-25 03:58:33.764899827 +0000
-@@ -1270,7 +1270,7 @@ process_path (char *pathname, char *name
- static void
- process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent)
- {
-- int subdirs_left; /* Number of unexamined subdirs in PATHNAME. */
-+ int subdirs_left=0; /* Number of unexamined subdirs in PATHNAME. */
- boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
- unsigned int idx; /* Which entry are we on? */
- struct stat stat_buf;
-diff -purN findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c
---- findutils-4.4.2.orig/find/parser.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/parser.c 2010-04-25 03:58:33.764899827 +0000
-@@ -53,6 +53,13 @@
- #include <unistd.h>
- #include <sys/stat.h>
-
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+int optionh_getfilecon(const char *name, security_context_t *p);
-+int optionl_getfilecon(const char *name, security_context_t *p);
-+int optionp_getfilecon(const char *name, security_context_t *p);
-+#endif /*WITH_SELINUX*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -155,6 +162,9 @@ static boolean parse_noignore_race PARAM
- static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#ifdef WITH_SELINUX
-+static boolean parse_scontext PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#endif /*WITH_SELINUX*/
-
- boolean parse_print PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-
-@@ -340,6 +350,8 @@ static struct parser_table const parse_t
- {ARG_TEST, "-help", parse_help, NULL}, /* GNU */
- {ARG_TEST, "version", parse_version, NULL}, /* GNU */
- {ARG_TEST, "-version", parse_version, NULL}, /* GNU */
-+ {ARG_TEST, "context", parse_scontext, pred_scontext}, /* SELinux */
-+ {ARG_TEST, "-context", parse_scontext, pred_scontext}, /* SELinux */
- {0, 0, 0, 0}
- };
- \f
-@@ -451,10 +463,16 @@ set_follow_state(enum SymlinkOption opt)
- case SYMLINK_ALWAYS_DEREF: /* -L */
- options.xstat = optionl_stat;
- options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = optionl_getfilecon;
-+#endif /* WITH_SELINUX */
- break;
-
- case SYMLINK_NEVER_DEREF: /* -P (default) */
- options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = optionp_getfilecon;
-+#endif /* WITH_SELINUX */
- /* Can't turn no_leaf_check off because the user might have specified
- * -noleaf anyway
- */
-@@ -463,6 +481,9 @@ set_follow_state(enum SymlinkOption opt)
- case SYMLINK_DEREF_ARGSONLY: /* -H */
- options.xstat = optionh_stat;
- options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+ options.x_getfilecon = optionh_getfilecon;
-+#endif /* WITH_SELINUX */
- }
- }
- options.symlink_handling = opt;
-@@ -670,6 +691,94 @@ collect_arg_stat_info(char **argv, int *
-
- The predicate structure is updated with the new information. */
-
-+#ifdef WITH_SELINUX
-+\f
-+static int
-+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv)
-+{
-+ /* Our original getfilecon() call failed. Perhaps we can't follow a
-+ * symbolic link. If that might be the problem, lgetfilecon() the link.
-+ * Otherwise, admit defeat.
-+ */
-+ switch (errno)
-+ {
-+ case ENOENT:
-+ case ENOTDIR:
-+#ifdef DEBUG_STAT
-+ fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name);
-+#endif
-+ return lgetfilecon(name, p);
-+
-+ case EACCES:
-+ case EIO:
-+ case ELOOP:
-+ case ENAMETOOLONG:
-+#ifdef EOVERFLOW
-+ case EOVERFLOW: /* EOVERFLOW is not #defined on UNICOS. */
-+#endif
-+ default:
-+ return prev_rv;
-+ }
-+}
-+
-+\f
-+/* optionh_getfilecon() implements the getfilecon operation when the
-+ * -H option is in effect.
-+ *
-+ * If the item to be examined is a command-line argument, we follow
-+ * symbolic links. If the getfilecon() call fails on the command-line
-+ * item, we fall back on the properties of the symbolic link.
-+ *
-+ * If the item to be examined is not a command-line argument, we
-+ * examine the link itself.
-+ */
-+int
-+optionh_getfilecon(const char *name, security_context_t *p)
-+{
-+ if (0 == state.curdepth)
-+ {
-+ /* This file is from the command line; deference the link (if it
-+ * is a link).
-+ */
-+ int rv = getfilecon(name, p);
-+ if (0 == rv)
-+ return 0; /* success */
-+ else
-+ return fallback_getfilecon(name, p, rv);
-+ }
-+ else
-+ {
-+ /* Not a file on the command line; do not derefernce the link.
-+ */
-+ return lgetfilecon(name, p);
-+ }
-+}
-+\f
-+/* optionl_getfilecon() implements the getfilecon operation when the
-+ * -L option is in effect. That option makes us examine the thing the
-+ * symbolic link points to, not the symbolic link itself.
-+ */
-+int
-+optionl_getfilecon(const char *name, security_context_t *p)
-+{
-+ int rv = getfilecon(name, p);
-+ if (0 == rv)
-+ return 0; /* normal case. */
-+ else
-+ return fallback_getfilecon(name, p, rv);
-+}
-+\f
-+/* optionp_getfilecon() implements the stat operation when the -P
-+ * option is in effect (this is also the default). That option makes
-+ * us examine the symbolic link itself, not the thing it points to.
-+ */
-+int
-+optionp_getfilecon(const char *name, security_context_t *p)
-+{
-+ return lgetfilecon(name, p);
-+}
-+#endif /* WITH_SELINUX */
-+
- \f
- static boolean
- parse_and (const struct parser_table* entry, char **argv, int *arg_ptr)
-@@ -1128,6 +1237,10 @@ tests (N can be +N or -N or N): -amin N
- -readable -writable -executable\n\
- -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
- -used N -user NAME -xtype [bcdpfls]\n"));
-+#ifdef WITH_SELINUX
-+ puts (_("\
-+ -context CONTEXT\n"));
-+#endif /*WITH_SELINUX*/
- puts (_("\
- actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
- -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -2552,6 +2665,29 @@ parse_version (const struct parser_table
- exit (0);
- }
-
-+#ifdef WITH_SELINUX
-+
-+static boolean
-+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr)
-+{
-+ struct predicate *our_pred;
-+
-+ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
-+ return( false );
-+
-+ our_pred = insert_primary(entry);
-+ our_pred->need_stat = false;
-+#ifdef DEBUG
-+ our_pred->p_name = find_pred_name (pred_scontext);
-+#endif /*DEBUG*/
-+ our_pred->args.scontext = argv[*arg_ptr];;
-+
-+ (*arg_ptr)++;
-+ return( true );
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- static boolean
- parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
- {
-@@ -2803,7 +2939,11 @@ insert_fprintf (struct format_val *vec,
- if (*scan2 == '.')
- for (scan2++; ISDIGIT (*scan2); scan2++)
- /* Do nothing. */ ;
-+#ifdef WITH_SELINUX
-+ if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
-+#else
- if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
-+#endif
- {
- segmentp = make_segment (segmentp, format, scan2 - format,
- KIND_FORMAT, *scan2, 0,
-diff -purN findutils-4.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c
---- findutils-4.4.2.orig/find/pred.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/pred.c 2010-04-25 03:58:33.764899827 +0000
-@@ -48,6 +48,14 @@
- #include "error.h"
- #include "verify.h"
-
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
-+#ifndef FNM_CASEFOLD
-+#define FNM_CASEFOLD (1<<4)
-+#endif /*FNM_CASEFOLD*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -230,6 +238,9 @@ struct pred_assoc pred_table[] =
- {pred_user, "user "},
- {pred_writable, "writable "},
- {pred_xtype, "xtype "},
-+#ifdef WITH_SELINUX
-+ {pred_scontext, "context"},
-+#endif /*WITH_SELINUX*/
- {0, "none "}
- };
- #endif
-@@ -1054,6 +1065,26 @@ do_fprintf(struct format_val *dest,
- mode_to_filetype(stat_buf->st_mode & S_IFMT));
- }
- break;
-+#ifdef WITH_SELINUX
-+ case 'Z': /* SELinux security context */
-+ {
-+ security_context_t scontext;
-+ int rv;
-+ rv = (*options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+ if ( rv < 0 ) {
-+ fprintf(stderr, "getfileconf(%s): %s",
-+ pathname, strerror(errno));
-+ fflush(stderr);
-+ }
-+ else {
-+ segment->text[segment->text_len] = 's';
-+ checked_fprintf (dest, segment->text, scontext);
-+ freecon(scontext);
-+ }
-+ }
-+ break ;
-+#endif /* WITH_SELINUX */
- }
- /* end of KIND_FORMAT case */
- break;
-@@ -1844,6 +1875,31 @@ pred_xtype (const char *pathname, struct
- */
- return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
-+{
-+ int rv;
-+ security_context_t scontext;
-+
-+ rv = (* options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+ if ( rv < 0 ) {
-+ (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
-+ (void) fflush(stderr);
-+ return ( false );
-+ }
-+
-+ rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
-+ freecon(scontext);
-+ return rv;
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- \f
- /* 1) fork to get a child; parent remembers the child pid
- 2) child execs the command requested
-diff -purN findutils-4.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c
---- findutils-4.4.2.orig/find/tree.c 2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/tree.c 2010-04-25 03:58:33.764899827 +0000
-@@ -1195,6 +1195,10 @@ build_expression_tree(int argc, char *ar
- const struct parser_table *entry_close, *entry_print, *entry_open;
- int i, oldi;
-
-+#ifdef WITH_SELINUX
-+ int is_selinux_enabled_flag = is_selinux_enabled()>0;
-+#endif /* WITH_SELINUX */
-+
- predicates = NULL;
-
- /* Find where in ARGV the predicates begin by skipping the list of
-@@ -1230,6 +1234,16 @@ build_expression_tree(int argc, char *ar
- }
-
- predicate_name = argv[i];
-+
-+#ifdef WITH_SELINUX
-+ if (! is_selinux_enabled_flag) {
-+ if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
-+ (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
-+ error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
-+ }
-+ }
-+#endif
-+
- parse_entry = find_parser (predicate_name);
- if (parse_entry == NULL)
- {
-@@ -1434,6 +1448,9 @@ get_new_pred (const struct parser_table
- last_pred->need_stat = true;
- last_pred->need_type = true;
- last_pred->args.str = NULL;
-+#ifdef WITH_SELINUX
-+ last_pred->args.scontext = NULL;
-+#endif
- last_pred->pred_next = NULL;
- last_pred->pred_left = NULL;
- last_pred->pred_right = NULL;
diff --git a/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch b/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch
deleted file mode 100644
index b553801..0000000
--- a/sys-apps/findutils/files/findutils-4.5.12-gnulib-musl.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Naur findutils-4.5.12.orig/gl/lib/fseeko.c findutils-4.5.12/gl/lib/fseeko.c
---- findutils-4.5.12.orig/gl/lib/fseeko.c 2013-09-22 15:27:42.000000000 +0000
-+++ findutils-4.5.12/gl/lib/fseeko.c 2014-03-01 13:35:14.718973449 +0000
-@@ -26,128 +26,6 @@
-
- int
- fseeko (FILE *fp, off_t offset, int whence)
--#undef fseeko
--#if !HAVE_FSEEKO
--# undef fseek
--# define fseeko fseek
--#endif
--#if _GL_WINDOWS_64_BIT_OFF_T
--# undef fseeko
--# if HAVE__FSEEKI64 /* msvc, mingw64 */
--# define fseeko _fseeki64
--# else /* mingw */
--# define fseeko fseeko64
--# endif
--#endif
- {
--#if LSEEK_PIPE_BROKEN
-- /* mingw gives bogus answers rather than failure on non-seekable files. */
-- if (lseek (fileno (fp), 0, SEEK_CUR) == -1)
-- return EOF;
--#endif
--
-- /* These tests are based on fpurge.c. */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-- if (fp->_IO_read_end == fp->_IO_read_ptr
-- && fp->_IO_write_ptr == fp->_IO_write_base
-- && fp->_IO_save_base == NULL)
--#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
--# if defined __SL64 && defined __SCLE /* Cygwin */
-- if ((fp->_flags & __SL64) == 0)
-- {
-- /* Cygwin 1.5.0 through 1.5.24 failed to open stdin in 64-bit
-- mode; but has an fseeko that requires 64-bit mode. */
-- FILE *tmp = fopen ("/dev/null", "r");
-- if (!tmp)
-- return -1;
-- fp->_flags |= __SL64;
-- fp->_seek64 = tmp->_seek64;
-- fclose (tmp);
-- }
--# endif
-- if (fp_->_p == fp_->_bf._base
-- && fp_->_r == 0
-- && fp_->_w == ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */
-- ? fp_->_bf._size
-- : 0)
-- && fp_ub._base == NULL)
--#elif defined __EMX__ /* emx+gcc */
-- if (fp->_ptr == fp->_buffer
-- && fp->_rcount == 0
-- && fp->_wcount == 0
-- && fp->_ungetc_count == 0)
--#elif defined __minix /* Minix */
-- if (fp_->_ptr == fp_->_buf
-- && (fp_->_ptr == NULL || fp_->_count == 0))
--#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-- if (fp_->_ptr == fp_->_base
-- && (fp_->_ptr == NULL || fp_->_cnt == 0))
--#elif defined __UCLIBC__ /* uClibc */
-- if (((fp->__modeflags & __FLAG_WRITING) == 0
-- || fp->__bufpos == fp->__bufstart)
-- && ((fp->__modeflags & (__FLAG_READONLY | __FLAG_READING)) == 0
-- || fp->__bufpos == fp->__bufread))
--#elif defined __QNX__ /* QNX */
-- if ((fp->_Mode & 0x2000 /* _MWRITE */ ? fp->_Next == fp->_Buf : fp->_Next == fp->_Rend)
-- && fp->_Rback == fp->_Back + sizeof (fp->_Back)
-- && fp->_Rsave == NULL)
--#elif defined __MINT__ /* Atari FreeMiNT */
-- if (fp->__bufp == fp->__buffer
-- && fp->__get_limit == fp->__bufp
-- && fp->__put_limit == fp->__bufp
-- && !fp->__pushed_back)
--#elif defined EPLAN9 /* Plan9 */
-- if (fp->rp == fp->buf
-- && fp->wp == fp->buf)
--#else
-- #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
--#endif
-- {
-- /* We get here when an fflush() call immediately preceded this one (or
-- if ftell() has created buffers but no I/O has occurred on a
-- newly-opened stream). We know there are no buffers. */
-- off_t pos = lseek (fileno (fp), offset, whence);
-- if (pos == -1)
-- {
--#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
-- fp_->_flags &= ~__SOFF;
--#endif
-- return -1;
-- }
--
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-- fp->_flags &= ~_IO_EOF_SEEN;
-- fp->_offset = pos;
--#elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
--# if defined __CYGWIN__
-- /* fp_->_offset is typed as an integer. */
-- fp_->_offset = pos;
--# else
-- /* fp_->_offset is an fpos_t. */
-- {
-- /* Use a union, since on NetBSD, the compilation flags
-- determine whether fpos_t is typedef'd to off_t or a struct
-- containing a single off_t member. */
-- union
-- {
-- fpos_t f;
-- off_t o;
-- } u;
-- u.o = pos;
-- fp_->_offset = u.f;
-- }
--# endif
-- fp_->_flags |= __SOFF;
-- fp_->_flags &= ~__SEOF;
--#elif defined __EMX__ /* emx+gcc */
-- fp->_flags &= ~_IOEOF;
--#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-- fp->_flag &= ~_IOEOF;
--#elif defined __MINT__ /* Atari FreeMiNT */
-- fp->__offset = pos;
-- fp->__eof = 0;
--#endif
-- return 0;
-- }
- return fseeko (fp, offset, whence);
- }
diff --git a/sys-apps/findutils/findutils-4.4.2-r99.ebuild b/sys-apps/findutils/findutils-4.4.2-r99.ebuild
deleted file mode 100644
index 12c72e9..0000000
--- a/sys-apps/findutils/findutils-4.4.2-r99.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.4.2-r1.ebuild,v 1.10 2012/03/27 17:50:37 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SELINUX_PATCH="findutils-4.4.2-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
- mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch
- epatch "${FILESDIR}"/${P}-gnulib-musl.patch
-
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
- use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-}
-
-src_compile() {
- use static && append-ldflags -static
-
- local myconf
- use userland_GNU || myconf=" --program-prefix=g"
-
- econf \
- $(use_enable nls) \
- --libexecdir=/usr/$(get_libdir)/find \
- ${myconf} \
- || die "configure failed"
- emake AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc NEWS README TODO ChangeLog
-}
diff --git a/sys-apps/findutils/findutils-4.5.12-r99.ebuild b/sys-apps/findutils/findutils-4.5.12-r99.ebuild
deleted file mode 100644
index c3a869a..0000000
--- a/sys-apps/findutils/findutils-4.5.12-r99.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.12.ebuild,v 1.4 2014/01/18 03:28:44 vapier Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gnulib-musl.patch
- # Don't build or install locate because it conflicts with slocate,
- # which is a secure version of locate. See bug 18729
- sed -i '/^SUBDIRS/s/locate//' Makefile.in
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- program_prefix=$(usex userland_GNU '' g)
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="http://bugs.gentoo.org/" \
- --program-prefix=${program_prefix} \
- $(use_enable nls) \
- $(use_with selinux) \
- --libexecdir='$(libdir)'/find
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc NEWS README TODO ChangeLog
-
- # We don't need this, so punt it.
- rm "${ED}"/usr/bin/${program_prefix}oldfind \
- "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die
-}
diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
deleted file mode 100644
index b122af8..0000000
--- a/sys-apps/findutils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <upstream>
- <remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-apps/hdparm/files/hdparm-9.39-musl.patch b/sys-apps/hdparm/files/hdparm-9.39-musl.patch
deleted file mode 100644
index 8c71bc7..0000000
--- a/sys-apps/hdparm/files/hdparm-9.39-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur a/hdparm-9.39/Makefile b/hdparm-9.39/Makefile
---- a/hdparm-9.39/Makefile
-+++ b/hdparm-9.39/Makefile
-@@ -13,7 +13,7 @@
- CC ?= gcc
- STRIP ?= strip
-
--CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
-+CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs -D _GNU_SOURCE $(CFLAGS)
-
- LDFLAGS = -s
- #LDFLAGS = -s -static
-diff -ur a/hdparm-9.39/geom.c b/hdparm-9.39/geom.c
---- a/hdparm-9.39/geom.c
-+++ b/hdparm-9.39/geom.c
-@@ -16,7 +16,7 @@
- #include <dirent.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
--#include <linux/types.h>
-+#include <sys/types.h>
- #include <linux/fs.h>
-
- #include "hdparm.h"
-diff -ur a/hdparm-9.39/hdparm.h b/hdparm-9.39/hdparm.h
---- a/hdparm-9.39/hdparm.h
-+++ b/hdparm-9.39/hdparm.h
-@@ -2,6 +2,7 @@
-
- //#undef __KERNEL_STRICT_NAMES
- #include <linux/types.h>
-+#include <sys/stat.h>
-
- #if !defined(__GNUC__) && !defined(__attribute__)
- #define __attribute__(x)
-diff -ur a/hdparm-9.39/sysfs.c b/hdparm-9.39/sysfs.c
---- a/hdparm-9.39/sysfs.c
-+++ b/hdparm-9.39/sysfs.c
-@@ -12,9 +12,10 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <limits.h>
- #include <dirent.h>
- #include <sys/stat.h>
--#include <linux/types.h>
-+#include <sys/types.h>
-
- #include "hdparm.h"
-
diff --git a/sys-apps/hdparm/files/hdparm-9.45-musl.patch b/sys-apps/hdparm/files/hdparm-9.45-musl.patch
deleted file mode 100644
index a9fe0aa..0000000
--- a/sys-apps/hdparm/files/hdparm-9.45-musl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur a/hdparm-9.45/fallocate.c b/hdparm-9.45/fallocate.c
---- a/hdparm-9.45/fallocate.c 2010-10-04 20:38:39.000000000 -0100
-+++ b/hdparm-9.45/fallocate.c 2015-01-28 21:19:59.201795557 -0100
-@@ -27,7 +27,7 @@
- err = EINVAL;
- #else
- int fd;
-- loff_t offset = 0, len;
-+ off_t offset = 0, len;
- int mode = 0;
-
- fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600);
-diff -ur a/hdparm-9.45/hdparm.h b/hdparm-9.45/hdparm.h
---- a/hdparm-9.45/hdparm.h 2014-09-27 14:31:18.000000000 -0100
-+++ b/hdparm-9.45/hdparm.h 2015-01-28 21:19:08.662427386 -0100
-@@ -1,7 +1,7 @@
- /* Some prototypes for extern functions. */
-
- //#undef __KERNEL_STRICT_NAMES
--#include <linux/types.h>
-+#include <sys/types.h>
-
- #if !defined(__GNUC__) && !defined(__attribute__)
- #define __attribute__(x)
-diff -ur a/hdparm-9.45/sysfs.c b/hdparm-9.45/sysfs.c
---- a/hdparm-9.45/sysfs.c 2010-10-04 20:39:20.000000000 -0100
-+++ b/hdparm-9.45/sysfs.c 2015-01-28 21:19:25.692214485 -0100
-@@ -13,6 +13,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <dirent.h>
-+#include <limits.h>
- #include <sys/stat.h>
- #include <linux/types.h>
-
diff --git a/sys-apps/hdparm/files/hdparm-conf.d.3 b/sys-apps/hdparm/files/hdparm-conf.d.3
deleted file mode 100644
index a1ae626..0000000
--- a/sys-apps/hdparm/files/hdparm-conf.d.3
+++ /dev/null
@@ -1,26 +0,0 @@
-# /etc/conf.d/hdparm: config file for /etc/init.d/hdparm
-
-#
-# Note that options such as -y which force *immediate* power saving options
-# should generally not be placed here. The hdparm init.d script may run at
-# anytime with respect to other init.d scripts that do system wide drive
-# scans (like the hald script), so they will merely get spun right back up.
-# If you wish to use these options, please use the local.start init.d script
-# instead so that you're guaranteed that it will run last.
-#
-
-# You can either set hdparm arguments for each drive using hdX_args,
-# discX_args, cdromX_args and genericX_args, e.g.
-#
-# hda_args="-d1 -X66"
-# disc1_args="-d1"
-# cdrom0_args="-d1"
-
-# or you can set options for all PATA drives
-pata_all_args="-d1"
-
-# or you can set options for all SATA drives
-sata_all_args=""
-
-# or, you can set hdparm options for all drives
-all_args=""
diff --git a/sys-apps/hdparm/files/hdparm-init-8 b/sys-apps/hdparm/files/hdparm-init-8
deleted file mode 100644
index 9a4200c..0000000
--- a/sys-apps/hdparm/files/hdparm-init-8
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-init-8,v 1.3 2012/04/29 00:30:18 vapier Exp $
-
-depend() {
- before bootmisc
-}
-
-do_hdparm() {
- local e=
- eval e=\$${extra_args}
- [ -z "${args}${all_args}${e}" ] && return 0
-
- if [ -n "${args:=${all_args} ${e}}" ] ; then
- local orgdevice=$(readlink -f "${device}")
- if [ -b "${orgdevice}" ] ; then
- ebegin "Running hdparm on ${device}"
- hdparm ${args} "${device}" > /dev/null
- eend $?
- fi
- fi
-}
-
-scan_nondevfs() {
- # non-devfs compatible system
- local device
-
- for device in /dev/hd* /dev/sd* /dev/cdrom* ; do
- [ -e "${device}" ] || continue
- case "${device}" in
- *[0-9]) continue ;;
- /dev/hd*) extra_args="pata_all_args" ;;
- /dev/sd*) extra_args="sata_all_args" ;;
- *) extra_args="_no_xtra_args" ;;
- esac
-
- # check that the block device really exists by
- # opening it for reading
- local errmsg= status= nomed=1
- errmsg=$(export LC_ALL=C ; : 2>&1 <"${device}")
- status=$?
- case ${errmsg} in
- *": No medium found") nomed=0;;
- esac
- if [ -b "${device}" ] && [ "${status}" = "0" -o "${nomed}" = "0" ] ; then
- local conf_var="${device##*/}_args"
- eval args=\$${conf_var}
- do_hdparm
- fi
- done
-}
-
-start() {
- if get_bootparam "nohdparm" ; then
- ewarn "Skipping hdparm init as requested in kernel cmdline"
- return 0
- fi
-
- scan_nondevfs
-}
diff --git a/sys-apps/hdparm/hdparm-9.39-r99.ebuild b/sys-apps/hdparm/hdparm-9.39-r99.ebuild
deleted file mode 100644
index a7814a6..0000000
--- a/sys-apps/hdparm/hdparm-9.39-r99.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.39.ebuild,v 1.10 2012/09/29 09:58:03 ulm Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="http://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-src_prepare() {
- epatch ${FILESDIR}/${P}-musl.patch
-
- sed -i \
- -e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
- -e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
- Makefile || die "sed"
-}
-
-src_compile() {
- emake STRIP=: CC="$(tc-getCC)"
-}
-
-src_install() {
- into /
- dosbin hdparm contrib/idectl
-
- newinitd "${FILESDIR}"/hdparm-init-8 hdparm
- newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
- doman hdparm.8
- dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
- docinto wiper
- dodoc wiper/{README.txt,wiper.sh}
-}
diff --git a/sys-apps/hdparm/hdparm-9.45-r99.ebuild b/sys-apps/hdparm/hdparm-9.45-r99.ebuild
deleted file mode 100644
index d0826b0..0000000
--- a/sys-apps/hdparm/hdparm-9.45-r99.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-9.45.ebuild,v 1.2 2015/06/02 11:38:26 zlogene Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="http://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-IUSE="static"
-
-src_prepare() {
- use static && append-ldflags -static
- sed -i \
- -e "/^CFLAGS/ s:-O2:${CFLAGS}:" \
- -e "/^LDFLAGS/ s:-s:${LDFLAGS}:" \
- Makefile || die "sed"
- epatch "${FILESDIR}"/${P}-musl.patch
-}
-
-src_compile() {
- emake STRIP=: CC="$(tc-getCC)"
-}
-
-src_install() {
- into /
- dosbin hdparm contrib/idectl
-
- newinitd "${FILESDIR}"/hdparm-init-8 hdparm
- newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
- doman hdparm.8
- dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
- docinto wiper
- dodoc wiper/{README.txt,wiper.sh}
-}
diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-apps/hdparm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
deleted file mode 100644
index fa12dad..0000000
--- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://bugs.gentoo.org/291907
-
-This patch was merged from two patches extracted from this thread:
-http://markmail.org/thread/qkd76gpdgefpjlfn
-
-tc_stab.c: small fixes to commandline help
-
-
-tc_core.c:
-As kernel part of things relies on cell align which is always set to -1,
-I also added it to userspace computation stage. This way if someone
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set
-to 2048 (disregarding weirdness of setting mtu to such values).
-
-
-Unless I missed something, this is harmless and feels cleaner, but if it's
-not allowed, documentation will have to be changed back to 2047 + extra
-explanation as well.
-
---- iproute2/tc/tc_core.c
-+++ iproute2/tc/tc_core.c
-@@ -155,12 +155,12 @@
- }
-
- if (s->mtu == 0)
-- s->mtu = 2047;
-+ s->mtu = 2048;
- if (s->tsize == 0)
- s->tsize = 512;
-
- s->cell_log = 0;
-- while ((s->mtu >> s->cell_log) > s->tsize - 1)
-+ while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
- s->cell_log++;
-
- *stab = malloc(s->tsize * sizeof(__u16));
---- iproute2/tc/tc_stab.c
-+++ iproute2/tc/tc_stab.c
-@@ -32,7 +32,7 @@
- fprintf(stderr,
- "Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n"
- " [ overhead BYTES ] [ linklayer TYPE ] ...\n"
-- " mtu : max packet size we create rate map for {2047}\n"
-+ " mtu : max packet size we create size table for {2048}\n"
- " tsize : how many slots should size table have {512}\n"
- " mpu : minimum packet size used in rate computations\n"
- " overhead : per-packet size overhead used in rate computations\n"
diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch
deleted file mode 100644
index 1282a1b..0000000
--- a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/326849
-
-allow ipv6 to be disabled
-
---- a/ip/iptunnel.c
-+++ b/ip/iptunnel.c
-@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv)
- break;
- case AF_INET:
- break;
-- /*
-- * This is silly enough but we have no easy way to make it
-- * protocol-independent because of unarranged structure between
-- * IPv4 and IPv6.
-- */
-- case AF_INET6:
-- return do_ip6tunnel(argc, argv);
- default:
- fprintf(stderr, "Unsupported family:%d\n", preferred_family);
- exit(-1);
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
- iplink_macvlan.o iplink_macvtap.o ipl2tp.o
---- a/ip/ipmonitor.c
-+++ b/ip/ipmonitor.c
-@@ -76,7 +76,6 @@ int accept_msg(const struct sockaddr_nl *who,
- if (n->nlmsg_type == RTM_NEWPREFIX) {
- if (prefix_banner)
- fprintf(fp, "[PREFIX]");
-- print_prefix(who, n, arg);
- return 0;
- }
- if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
diff --git a/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch
deleted file mode 100644
index 86d80d2..0000000
--- a/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/326849
-
-allow ipv6 to be disabled
-
---- a/ip/iptunnel.c
-+++ b/ip/iptunnel.c
-@@ -629,13 +629,6 @@ int do_iptunnel(int argc, char **argv)
- break;
- case AF_INET:
- break;
-- /*
-- * This is silly enough but we have no easy way to make it
-- * protocol-independent because of unarranged structure between
-- * IPv4 and IPv6.
-- */
-- case AF_INET6:
-- return do_ip6tunnel(argc, argv);
- default:
- fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- exit(-1);
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
-- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-- ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+ ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
- ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
- iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
- iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o \
---- a/ip/ipmonitor.c
-+++ b/ip/ipmonitor.c
-@@ -96,7 +96,6 @@ static int accept_msg(const struct socka
- if (n->nlmsg_type == RTM_NEWPREFIX) {
- if (prefix_banner)
- fprintf(fp, "[PREFIX]");
-- print_prefix(who, n, arg);
- return 0;
- }
- if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
diff --git a/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch b/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch
deleted file mode 100644
index 6ebc808..0000000
--- a/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur a/iproute2-3.19.0/include/linux/if_bridge.h b/iproute2-3.19.0/include/linux/if_bridge.h
---- a/iproute2-3.19.0/include/linux/if_bridge.h 2015-02-11 01:14:32.000000000 -0200
-+++ b/iproute2-3.19.0/include/linux/if_bridge.h 2015-04-25 21:39:38.130830774 -0200
-@@ -15,7 +15,6 @@
-
- #include <linux/types.h>
- #include <linux/if_ether.h>
--#include <linux/in6.h>
-
- #define SYSFS_BRIDGE_ATTR "bridge"
- #define SYSFS_BRIDGE_FDB "brforward"
-diff -ur a/iproute2-3.19.0/lib/namespace.c b/iproute2-3.19.0/lib/namespace.c
---- a/iproute2-3.19.0/lib/namespace.c 2015-02-11 01:14:32.000000000 -0200
-+++ b/iproute2-3.19.0/lib/namespace.c 2015-04-25 21:39:01.273291557 -0200
-@@ -9,6 +9,7 @@
-
- #include <fcntl.h>
- #include <dirent.h>
-+#include <sys/param.h>
-
- #include "utils.h"
- #include "namespace.h"
diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch b/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch
deleted file mode 100644
index a0b2e45..0000000
--- a/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur iproute2-3.8.0.orig/misc/arpd.c iproute2-3.8.0/misc/arpd.c
---- iproute2-3.8.0.orig/misc/arpd.c 2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/arpd.c 2015-01-17 12:23:52.251980551 +0000
-@@ -18,7 +18,7 @@
- #include <netdb.h>
- #include <db_185.h>
- #include <sys/ioctl.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <sys/uio.h>
-diff -Naur iproute2-3.8.0.orig/misc/ifstat.c iproute2-3.8.0/misc/ifstat.c
---- iproute2-3.8.0.orig/misc/ifstat.c 2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/ifstat.c 2015-01-17 12:23:42.795640740 +0000
-@@ -21,7 +21,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <signal.h>
-diff -Naur iproute2-3.8.0.orig/misc/lnstat.h iproute2-3.8.0/misc/lnstat.h
---- iproute2-3.8.0.orig/misc/lnstat.h 2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/lnstat.h 2015-01-17 12:33:50.391207710 +0000
-@@ -2,6 +2,7 @@
- #define _LNSTAT_H
-
- #include <limits.h>
-+#include <sys/time.h>
-
- #define LNSTAT_VERSION "0.02 041002"
-
-diff -Naur iproute2-3.8.0.orig/misc/nstat.c iproute2-3.8.0/misc/nstat.c
---- iproute2-3.8.0.orig/misc/nstat.c 2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/nstat.c 2015-01-17 12:23:27.683097666 +0000
-@@ -21,7 +21,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <signal.h>
-diff -Naur iproute2-3.8.0.orig/misc/rtacct.c iproute2-3.8.0/misc/rtacct.c
---- iproute2-3.8.0.orig/misc/rtacct.c 2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/rtacct.c 2015-01-17 12:23:35.340372834 +0000
-@@ -22,7 +22,7 @@
- #include <sys/file.h>
- #include <sys/socket.h>
- #include <sys/un.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-diff -Naur iproute2-3.8.0.orig/tc/tc_stab.c iproute2-3.8.0/tc/tc_stab.c
---- iproute2-3.8.0.orig/tc/tc_stab.c 2015-01-17 12:19:44.001058119 +0000
-+++ iproute2-3.8.0/tc/tc_stab.c 2015-01-17 12:22:35.692229262 +0000
-@@ -21,6 +21,7 @@
- #include <arpa/inet.h>
- #include <string.h>
- #include <malloc.h>
-+#include <sys/param.h>
-
- #include "utils.h"
- #include "tc_util.h"
-diff -Naur iproute2-3.8.0.orig/tc/tc_util.c iproute2-3.8.0/tc/tc_util.c
---- iproute2-3.8.0.orig/tc/tc_util.c 2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/tc/tc_util.c 2015-01-17 12:21:57.785866923 +0000
-@@ -20,6 +20,7 @@
- #include <arpa/inet.h>
- #include <string.h>
- #include <math.h>
-+#include <sys/param.h>
-
- #include "utils.h"
- #include "tc_util.h"
diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch b/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch
deleted file mode 100644
index 96280e0..0000000
--- a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 03fdb011dd661315a83998af8af779d8f089e3fe Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Wed, 17 Apr 2013 13:33:26 -0700
-Subject: [PATCH] ipnetns: fix build on older systems
-
-Debian Squeeze has out of date <sys/mount.h> without the required flags.
----
- ip/ipnetns.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/ip/ipnetns.c b/ip/ipnetns.c
-index b047b97..c9bc20a 100644
---- a/ip/ipnetns.c
-+++ b/ip/ipnetns.c
-@@ -29,6 +29,20 @@
- #define MNT_DETACH 0x00000002 /* Just detach from the tree */
- #endif /* MNT_DETACH */
-
-+/* sys/mount.h may be out too old to have these */
-+#ifndef MS_REC
-+#define MS_REC 16384
-+#endif
-+
-+#ifndef MS_SLAVE
-+#define MS_SLAVE (1 << 19)
-+#endif
-+
-+#ifndef MS_SHARED
-+#define MS_SHARED (1 << 20)
-+#endif
-+
-+
- #ifndef HAVE_SETNS
- static int setns(int fd, int nstype)
- {
---
-1.8.2.1
-
diff --git a/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch b/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch
deleted file mode 100644
index 5281be3..0000000
--- a/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
-index 913bd8e..260d1e0 100644
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -15,7 +15,6 @@
-
- #include <linux/types.h>
- #include <linux/if_ether.h>
--#include <linux/in6.h>
-
- #define SYSFS_BRIDGE_ATTR "bridge"
- #define SYSFS_BRIDGE_FDB "brforward"
-diff --git a/lib/namespace.c b/lib/namespace.c
-index c03a103..f121eaa 100644
---- a/lib/namespace.c
-+++ b/lib/namespace.c
-@@ -9,6 +9,7 @@
-
- #include <fcntl.h>
- #include <dirent.h>
-+#include <sys/param.h>
-
- #include "utils.h"
- #include "namespace.h"
diff --git a/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch b/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch
deleted file mode 100644
index 6c6c9a5..0000000
--- a/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/546928
-
-From 46679bbbe89699016d31486de7599590d02a5054 Mon Sep 17 00:00:00 2001
-From: Vadim Kochan <vadim4j@gmail.com>
-Date: Mon, 20 Apr 2015 08:33:32 +0300
-Subject: [PATCH] tc util: Fix possible buffer overflow when print class id
-
-Use correct handle buffer length.
-
-Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
----
- tc/tc_util.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/tc/tc_util.c b/tc/tc_util.c
-index 1d3153d..dc2b70f 100644
---- a/tc/tc_util.c
-+++ b/tc/tc_util.c
-@@ -128,30 +128,31 @@ ok:
- return 0;
- }
-
--int print_tc_classid(char *buf, int len, __u32 h)
-+int print_tc_classid(char *buf, int blen, __u32 h)
- {
-- char handle[40] = {};
-+ SPRINT_BUF(handle) = {};
-+ int hlen = SPRINT_BSIZE - 1;
-
- if (h == TC_H_ROOT)
- sprintf(handle, "root");
- else if (h == TC_H_UNSPEC)
-- snprintf(handle, len, "none");
-+ snprintf(handle, hlen, "none");
- else if (TC_H_MAJ(h) == 0)
-- snprintf(handle, len, ":%x", TC_H_MIN(h));
-+ snprintf(handle, hlen, ":%x", TC_H_MIN(h));
- else if (TC_H_MIN(h) == 0)
-- snprintf(handle, len, "%x:", TC_H_MAJ(h) >> 16);
-+ snprintf(handle, hlen, "%x:", TC_H_MAJ(h) >> 16);
- else
-- snprintf(handle, len, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
-+ snprintf(handle, hlen, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
-
- if (use_names) {
- char clname[IDNAME_MAX] = {};
-
- if (id_to_name(cls_names, h, clname))
-- snprintf(buf, len, "%s#%s", clname, handle);
-+ snprintf(buf, blen, "%s#%s", clname, handle);
- else
-- snprintf(buf, len, "%s", handle);
-+ snprintf(buf, blen, "%s", handle);
- } else {
-- snprintf(buf, len, "%s", handle);
-+ snprintf(buf, blen, "%s", handle);
- }
-
- return 0;
---
-2.3.5
-
diff --git a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild b/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
deleted file mode 100644
index 08c29de..0000000
--- a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.19.0.ebuild,v 1.5 2015/04/25 12:36:09 zlogene Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-RDEPEND="!net-misc/arpd
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- !minimal? ( berkdb? ( sys-libs/db ) )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- sys-devel/bison
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6.27
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-
- epatch "${FILESDIR}"/${PN}-3.19.0-musl.patch
-
- sed -i \
- -e '/^CC =/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- ip/ipnetns.c \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- # don't build arpd if USE=-berkdb #81660
- use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild b/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild
deleted file mode 100644
index cae49ff..0000000
--- a/sys-apps/iproute2/iproute2-3.8.0-r99.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.8.0.ebuild,v 1.18 2014/01/18 11:02:22 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal"
-
-RDEPEND="!net-misc/arpd
- iptables? ( >=net-firewall/iptables-1.4.16 )
- !minimal? ( berkdb? ( sys-libs/db ) )
- atm? ( net-dialup/linux-atm )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- sys-devel/bison
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6.27
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- epatch "${FILESDIR}"/${P}-old-mount-libc.patch #468120
- epatch "${FILESDIR}"/${P}-musl-headers.patch
- use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
-
- sed -i \
- -e '/^CC =/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- # don't build arpd if USE=-berkdb #81660
- use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild b/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
deleted file mode 100644
index c9ef072..0000000
--- a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild,v 1.1 2015/04/20 20:51:18 vapier Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
- inherit git-2
-else
- SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-RDEPEND="!net-misc/arpd
- iptables? ( >=net-firewall/iptables-1.4.20:= )
- !minimal? ( berkdb? ( sys-libs/db:= ) )
- atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- iptables? ( virtual/pkgconfig )
- sys-devel/bison
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6.27
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- epatch "${FILESDIR}"/${P}-tc-show-buffer-overflow.patch #546928
- use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
- epatch "${FILESDIR}"/${PN}-4.0.0-fix-build-with-musl.patch
-
- sed -i \
- -e '/^CC =/d' \
- -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
- -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^WFLAGS/s:-Werror::" \
- -e "/^DBM_INCLUDE/s:=.*:=${T}:" \
- Makefile || die
-
- # Use /run instead of /var/run.
- sed -i \
- -e 's:/var/run:/run:g' \
- ip/ipnetns.c \
- man/man8/ip-netns.8 || die
-
- # build against system headers
- rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
- sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
- # don't build arpd if USE=-berkdb #81660
- use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
- use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
-}
-
-src_configure() {
- tc-export AR CC PKG_CONFIG
-
- # This sure is ugly. Should probably move into toolchain-funcs at some point.
- local setns
- pushd "${T}" >/dev/null
- echo 'main(){return setns();};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
- echo 'main(){};' > test.c
- ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
- popd >/dev/null
-
- cat <<-EOF > Config
- TC_CONFIG_ATM := $(usex atm y n)
- TC_CONFIG_XT := $(usex iptables y n)
- HAVE_SELINUX := $(usex selinux y n)
- IP_CONFIG_SETNS := ${setns}
- # Use correct iptables dir, #144265 #293709
- IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
- EOF
-}
-
-src_install() {
- if use minimal ; then
- into /
- dosbin tc/tc
- return 0
- fi
-
- emake \
- DESTDIR="${D}" \
- LIBDIR="${EPREFIX}"/$(get_libdir) \
- SBINDIR="${EPREFIX}"/sbin \
- CONFDIR="${EPREFIX}"/etc/iproute2 \
- DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- MANDIR="${EPREFIX}"/usr/share/man \
- ARPDDIR="${EPREFIX}"/var/lib/arpd \
- install
-
- rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
- dodir /bin
- mv "${ED}"/{s,}bin/ip || die #330115
-
- dolib.a lib/libnetlink.a
- insinto /usr/include
- doins include/libnetlink.h
- # This local header pulls in a lot of linux headers it
- # doesn't directly need. Delete this header that requires
- # linux-headers-3.8 until that goes stable. #467716
- sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
- if use berkdb ; then
- dodir /var/lib/arpd
- # bug 47482, arpd doesn't need to be in /sbin
- dodir /usr/bin
- mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
- fi
-}
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
deleted file mode 100644
index eab1d3a..0000000
--- a/sys-apps/iproute2/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='berkdb'>build programs that use berkdb (just arpd)</flag>
- <flag name='iptables'>include support for iptables filtering</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch
deleted file mode 100644
index 2936090..0000000
--- a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur kbd-1.15.5.orig/src/resizecons.c kbd-1.15.5/src/resizecons.c
---- kbd-1.15.5.orig/src/resizecons.c 2012-12-01 21:41:38.000000000 +0000
-+++ kbd-1.15.5/src/resizecons.c 2014-01-16 13:48:25.793935059 +0000
-@@ -82,7 +82,6 @@
- #include <sys/perm.h>
- #else
- #include <linux/types.h>
--#include <linux/termios.h>
- #endif
- #include <linux/vt.h>
- #include "paths.h"
diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
deleted file mode 100644
index c78a227..0000000
--- a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/447440
-
-From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Tue, 11 Dec 2012 14:24:44 +0400
-Subject: [PATCH] Fix regression in 16117ce6ab
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/loadkeys.analyze.l | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
-index c18dcea..f817c78 100644
---- a/src/loadkeys.analyze.l
-+++ b/src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To to|To|TO
- char *s = xstrndup(yytext+1, strlen(yytext)-2);
- /* use static pathname to store *s ? */
- open_include(s);
-- yy_pop_state();
-- state_ptr--;
-+ while (state_ptr > 0) {
-+ yy_pop_state();
-+ state_ptr--;
-+ }
- }
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol} {
- yyerror(_("expected filename between quotes"));
-@@ -323,7 +325,7 @@ To to|To|TO
- }
- {Eol} {
- line_nr++;
-- if (state_ptr > 0) {
-+ while (state_ptr > 0) {
- yy_pop_state();
- state_ptr--;
- }
-@@ -428,8 +430,10 @@ To to|To|TO
- }
- <STR>\" {
- *p = '\0';
-- yy_pop_state();
-- state_ptr--;
-+ while (state_ptr > 0) {
-+ yy_pop_state();
-+ state_ptr--;
-+ }
- return(STRLITERAL);
- }
- . {
---- a/src/loadkeys.analyze.c
-+++ b/src/loadkeys.analyze.c
-@@ -1359,8 +1359,10 @@ YY_RULE_SETUP
- char *s = xstrndup(yytext+1, strlen(yytext)-2);
- /* use static pathname to store *s ? */
- open_include(s);
-- yy_pop_state();
-- state_ptr--;
-+ while (state_ptr > 0) {
-+ yy_pop_state();
-+ state_ptr--;
-+ }
- }
- YY_BREAK
- case 3:
-@@ -1393,7 +1395,7 @@ YY_RULE_SETUP
- #line 324 "loadkeys.analyze.l"
- {
- line_nr++;
-- if (state_ptr > 0) {
-+ while (state_ptr > 0) {
- yy_pop_state();
- state_ptr--;
- }
-@@ -1670,8 +1670,10 @@ YY_RULE_SETUP
- #line 429 "loadkeys.analyze.l"
- {
- *p = '\0';
-- yy_pop_state();
-- state_ptr--;
-+ while (state_ptr > 0) {
-+ yy_pop_state();
-+ state_ptr--;
-+ }
- return(STRLITERAL);
- }
- YY_BREAK
---
-1.8.0.2
diff --git a/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch b/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch
deleted file mode 100644
index ad52a63..0000000
--- a/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -Naur kbd-1.15.3.orig/src/dumpkeys.c kbd-1.15.3/src/dumpkeys.c
---- kbd-1.15.3.orig/src/dumpkeys.c 2011-05-07 20:33:42.000000000 +0000
-+++ kbd-1.15.3/src/dumpkeys.c 2013-07-06 02:20:41.660131968 +0000
-@@ -12,6 +12,7 @@
- #include <linux/kd.h>
- #include <linux/keyboard.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
- #include <string.h>
- #include <errno.h>
- #include "ksyms.h"
-diff -Naur kbd-1.15.3.orig/src/kbdinfo.c kbd-1.15.3/src/kbdinfo.c
---- kbd-1.15.3.orig/src/kbdinfo.c 2011-05-07 20:33:42.000000000 +0000
-+++ kbd-1.15.3/src/kbdinfo.c 2013-07-06 02:29:12.057160508 +0000
-@@ -1,6 +1,5 @@
- #include <stdio.h>
- #include <errno.h>
--#include <error.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <linux/kd.h>
-@@ -9,6 +8,10 @@
- #include "nls.h"
- #include "version.h"
-
-+#define error(e, n, s) \
-+ perror(s); \
-+ exit(e); \
-+
- static const char *action = NULL;
- static const char *value = NULL;
-
-diff -Naur kbd-1.15.3.orig/src/kbdrate.c kbd-1.15.3/src/kbdrate.c
---- kbd-1.15.3.orig/src/kbdrate.c 2011-05-07 20:33:42.000000000 +0000
-+++ kbd-1.15.3/src/kbdrate.c 2013-07-06 02:21:53.121135964 +0000
-@@ -74,6 +74,7 @@
- #include <errno.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
-+#include <fcntl.h>
-
- #ifdef __sparc__
- #include <asm/param.h>
-diff -Naur kbd-1.15.3.orig/src/loadkeys.c kbd-1.15.3/src/loadkeys.c
---- kbd-1.15.3.orig/src/loadkeys.c 2011-05-07 20:33:42.000000000 +0000
-+++ kbd-1.15.3/src/loadkeys.c 2013-07-06 02:21:02.148133114 +0000
-@@ -79,6 +79,7 @@
- #include <ctype.h>
- #include <sys/param.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
- #include <linux/kd.h>
- #include <linux/keyboard.h>
- #include <unistd.h>
-diff -Naur kbd-1.15.3.orig/src/openvt.c kbd-1.15.3/src/openvt.c
---- kbd-1.15.3.orig/src/openvt.c 2011-05-07 20:33:42.000000000 +0000
-+++ kbd-1.15.3/src/openvt.c 2013-07-06 02:22:11.080136968 +0000
-@@ -10,6 +10,7 @@
- #include <sys/vt.h>
- #include <sys/wait.h>
- #include <sys/file.h>
-+#include <fcntl.h>
-
- #include "version.h"
- #include "xmalloc.h"
-diff -Naur kbd-1.15.3.orig/src/setvtrgb.c kbd-1.15.3/src/setvtrgb.c
---- kbd-1.15.3.orig/src/setvtrgb.c 2011-05-07 20:33:42.000000000 +0000
-+++ kbd-1.15.3/src/setvtrgb.c 2013-07-06 02:34:26.390178084 +0000
-@@ -5,12 +5,15 @@
- #include <sys/ioctl.h>
- #include <linux/kd.h>
- #include <errno.h>
--#include <error.h>
- #include "kbd.h"
- #include "getfd.h"
- #include "nls.h"
- #include "version.h"
-
-+#define error(e, n, s) \
-+ perror(s); \
-+ exit(e); \
-+
- static unsigned char *cmap;
-
- /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's
-@@ -82,25 +85,21 @@
- if (c == EOF)
- error(EXIT_FAILURE, errno, "fscanf");
-
-- error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."),
-- filename, rows + 1, cols + 1);
-+ error(EXIT_FAILURE, 0, "setvtrgb");
- }
-
- cmap[rows + cols * 3] = (unsigned char) val;
-
- if (cols < 15 && fgetc(fd) != ',')
-- error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."),
-- filename, rows + 1);
-+ error(EXIT_FAILURE, 0, "setvtrgb");
- cols++;
- }
-
- if ((c = fgetc(fd)) == EOF)
-- error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"),
-- filename, rows + 1);
-+ error(EXIT_FAILURE, 0, "setvtrgb");
-
- if (c != '\n')
-- error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"),
-- filename, rows + 1);
-+ error(EXIT_FAILURE, 0, "setvtrgb");
- }
- }
-
diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
deleted file mode 100644
index 7a4e186..0000000
--- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -11,7 +11,13 @@
- AC_CONFIG_SRCDIR([src/loadkeys.c])
- AC_CONFIG_HEADERS(config.h)
-
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+AC_ARG_ENABLE(tests,
-+ AS_HELP_STRING(--enable-tests, [build tests]),
-+ [BUILD_TESTS=$enableval],[BUILD_TESTS=no])
-+AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
-+if test "$BUILD_TESTS" = "yes"; then
-+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+fi
-
- m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
- AM_SILENT_RULES([yes])
---- Makefile.am
-+++ Makefile.am
-@@ -8,7 +8,10 @@
- CREDITS \
- contrib docs rc
-
--SUBDIRS = src data po tests docs
-+SUBDIRS = src data po docs
-+if BUILD_TESTS
-+SUBDIRS += tests
-+endif
-
- kbd-$(VERSION).tar.xz:
- make distcheck
diff --git a/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch b/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch
deleted file mode 100644
index 69ac7d0..0000000
--- a/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/src/kbdinfo.c b/src/kbdinfo.c
-index e5f122d..dcdcac0 100644
---- a/src/kbdinfo.c
-+++ b/src/kbdinfo.c
-@@ -1,6 +1,5 @@
- #include <stdio.h>
- #include <errno.h>
--#include <error.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <linux/kd.h>
-@@ -9,6 +8,10 @@
- #include "nls.h"
- #include "version.h"
-
-+#define error(e, n, ...) \
-+ fprintf(stderr, ##__VA_ARGS__); \
-+ exit(e);
-+
- static const char *action = NULL;
- static const char *value = NULL;
-
-diff --git a/src/kbdrate.c b/src/kbdrate.c
-index 2ab8388..5faff00 100644
---- a/src/kbdrate.c
-+++ b/src/kbdrate.c
-@@ -74,6 +74,7 @@ beats rebuilding the kernel!
- #include <errno.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
-+#include <fcntl.h>
- #include <linux/kd.h>
-
- #ifdef __sparc__
-diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
-index 0262e24..606931e 100644
---- a/src/libkeymap/dump.c
-+++ b/src/libkeymap/dump.c
-@@ -13,6 +13,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <unistd.h>
-+#include <sys/types.h>
-
- #include "keymap.h"
-
-diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c
-index 67be81e..e13498b 100644
---- a/src/libkeymap/kmap.c
-+++ b/src/libkeymap/kmap.c
-@@ -1,5 +1,6 @@
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
-
- #include "nls.h"
- #include "kbd.h"
-diff --git a/src/libkeymap/summary.c b/src/libkeymap/summary.c
-index 46df90d..0912ae8 100644
---- a/src/libkeymap/summary.c
-+++ b/src/libkeymap/summary.c
-@@ -9,6 +9,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/ioctl.h>
-+#include <sys/types.h>
-
- #include "keymap.h"
-
-diff --git a/src/openvt.c b/src/openvt.c
-index 075136f..49720d7 100644
---- a/src/openvt.c
-+++ b/src/openvt.c
-@@ -10,6 +10,7 @@
- #include <sys/vt.h>
- #include <sys/wait.h>
- #include <sys/file.h>
-+#include <fcntl.h>
-
- #include "version.h"
- #include "xmalloc.h"
-@@ -19,6 +20,8 @@
- #include "compat/linux-limits.h"
- #endif
-
-+#define NAME_MAX 255
-+
- // There must be a universal way to find these!
- #define TRUE (1)
- #define FALSE (0)
-diff --git a/src/setvtrgb.c b/src/setvtrgb.c
-index f99badc..f1a631c 100644
---- a/src/setvtrgb.c
-+++ b/src/setvtrgb.c
-@@ -5,12 +5,15 @@
- #include <sys/ioctl.h>
- #include <linux/kd.h>
- #include <errno.h>
--#include <error.h>
- #include "kbd.h"
- #include "getfd.h"
- #include "nls.h"
- #include "version.h"
-
-+#define error(e, n, ...) \
-+ fprintf(stderr, ##__VA_ARGS__); \
-+ exit(e);
-+
- static unsigned char *cmap;
-
- /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's
-diff --git a/src/vlock/auth.c b/src/vlock/auth.c
-index da135ce..a3f365b 100644
---- a/src/vlock/auth.c
-+++ b/src/vlock/auth.c
-@@ -22,7 +22,6 @@
- */
-
- #include <errno.h>
--#include <error.h>
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-diff --git a/src/vlock/vlock.c b/src/vlock/vlock.c
-index c2c4158..fa2f386 100644
---- a/src/vlock/vlock.c
-+++ b/src/vlock/vlock.c
-@@ -23,7 +23,6 @@
-
- #include <stdio.h>
- #include <errno.h>
--#include <error.h>
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff --git a/src/vlock/vt.c b/src/vlock/vt.c
-index 4e5282b..f3ba85d 100644
---- a/src/vlock/vt.c
-+++ b/src/vlock/vt.c
-@@ -23,7 +23,6 @@
-
- #include <stdio.h>
- #include <errno.h>
--#include <error.h>
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/sys-apps/kbd/kbd-1.15.5-r99.ebuild b/sys-apps/kbd/kbd-1.15.5-r99.ebuild
deleted file mode 100644
index 7857257..0000000
--- a/sys-apps/kbd/kbd-1.15.5-r99.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.15.5-r1.ebuild,v 1.6 2014/01/09 13:37:41 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://freshmeat.net/projects/kbd/"
-SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="nls pam"
-
-RDEPEND="pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- default
- cd "${S}"
-
- # broken file ... upstream git punted it
- rm po/es.po
-
- # Rename conflicting keymaps to have unique names, bug #293228
- cd "${S}"/data/keymaps/i386
- mv dvorak/no.map dvorak/no-dvorak.map
- mv fgGIod/trf.map fgGIod/trf-fgGIod.map
- mv olpc/es.map olpc/es-olpc.map
- mv olpc/pt.map olpc/pt-olpc.map
- mv qwerty/cz.map qwerty/cz-qwerty.map
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440
- epatch "${FILESDIR}"/${P}-musl-headers-error.patch
- epatch "${FILESDIR}"/${P}-fix-struct_winsize-collision.patch
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable pam vlock)
-}
-
-src_install() {
- default
- dohtml doc/*.html
-}
diff --git a/sys-apps/kbd/kbd-2.0.2-r99.ebuild b/sys-apps/kbd/kbd-2.0.2-r99.ebuild
deleted file mode 100644
index 93f2fb0..0000000
--- a/sys-apps/kbd/kbd-2.0.2-r99.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-2.0.2.ebuild,v 1.1 2014/08/01 10:35:43 vapier Exp $
-
-EAPI=5
-
-SCM=""
-if [[ ${PV} == "9999" ]] ; then
- SCM="git-r3"
- EGIT_REPO_URI="http://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
- EGIT_BRANCH="master"
-else
- SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-inherit autotools eutils ${SCM}
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-
-RDEPEND="pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-libs/check )"
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-r3_src_unpack
- else
- default
- fi
-
- # Rename conflicting keymaps to have unique names, bug #293228
- cd "${S}"/data/keymaps/i386 || die
- mv dvorak/no.map dvorak/no-dvorak.map || die
- mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
- mv olpc/es.map olpc/es-olpc.map || die
- mv olpc/pt.map olpc/pt-olpc.map || die
- mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch
- epatch "${FILESDIR}"/${PN}-1.15.5-fix-struct_winsize-collision.patch
- epatch "${FILESDIR}"/${PN}-2.0.2-musl-headers-error.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable pam vlock) \
- $(use_enable test tests)
-}
-
-src_install() {
- default
- dohtml docs/doc/*.html
-}
diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-apps/kbd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch b/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch
deleted file mode 100644
index ff4bcfa..0000000
--- a/sys-apps/keyutils/files/keyutils-1.5.5-makefile-fixup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Raw patch edit based on:
-
-From af14e945bd617bb82ebc4c6c8d4fb948d715f16a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 2 Sep 2011 13:30:30 -0400
-Subject: [PATCH] depend on $(DEVELLIB) not -lkeyutils
-
----
- Makefile | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9e3fa9b..46695d1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -91,7 +91,7 @@
- $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- mkdir -p $(DESTDIR)$(USRLIBDIR)
-- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+ $(LNS) $(SONAME) $(DESTDIR)$(LIBDIR)/$(DEVELLIB)
- $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
---
-1.7.6
-
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch b/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch
deleted file mode 100644
index 65a50b0..0000000
--- a/sys-apps/keyutils/files/keyutils-1.5.9-UINT_MAX.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Patch sent to dhowells@redhat.com
-
---- a/keyutils-1.5.9/key.dns_resolver.c 2014-02-21 17:18:24.000000000 -0200
-+++ b/keyutils-1.5.9/key.dns_resolver.c 2015-04-03 17:29:22.517832174 -0200
-@@ -42,6 +42,7 @@
- #include <netinet/in.h>
- #include <arpa/nameser.h>
- #include <arpa/inet.h>
-+#include <limits.h>
- #include <resolv.h>
- #include <getopt.h>
- #include <sys/types.h>
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild
deleted file mode 100644
index d148784..0000000
--- a/sys-apps/keyutils/keyutils-1.5.9-r99.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild,v 1.12 2015/01/05 13:45:19 jlec Exp $
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs linux-info multilib-minimal
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
-SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="test"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-pkg_setup() {
- CONFIG_CHECK="~KEYS"
- use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
- ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
- ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
- linux-info_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
- epatch "${FILESDIR}"/${PN}-1.5.9-UINT_MAX.patch
-
- # The lsb check is useless, so avoid spurious command not found messages.
- sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
- # All the test files are bash, but try to execute via `sh`.
- sed -i -r \
- -e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
- tests/{Makefile*,*.sh} || die
- find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
- # Some tests call the kernel which calls userspace, but that will
- # run the install keyutils rather than the locally compiled one,
- # so disable round trip tests.
- rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
- multilib_copy_sources
-}
-
-multilib_src_compile() {
- tc-export CC
- tc-export AR
- sed -i \
- -e '1iRPATH=' \
- -e '/^C.*FLAGS/s|:=|+=|' \
- -e 's:-Werror::' \
- -e '/^BUILDFOR/s:=.*:=:' \
- -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
- -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
- -e "s: /: ${EPREFIX}/:g" \
- Makefile || die
-
- emake
-}
-
-multilib_src_test() {
- # Execute the locally compiled code rather than the
- # older versions already installed in the system.
- LD_LIBRARY_PATH=${BUILD_DIR} \
- PATH="${BUILD_DIR}:${PATH}" \
- emake test
-}
-
-multilib_src_install() {
- default
- multilib_is_native_abi && gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
- dodoc README
-}
diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
deleted file mode 100644
index 035bc6b..0000000
--- a/sys-apps/keyutils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
- <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/kmod/files/kmod-19-strndupa.patch b/sys-apps/kmod/files/kmod-19-strndupa.patch
deleted file mode 100644
index 74b2af6..0000000
--- a/sys-apps/kmod/files/kmod-19-strndupa.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From efb5bfaca938fa5991865c1e9a0c730dc919708c Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 17 Nov 2014 09:36:29 +0100
-Subject: util: fix build on systems missing strndupa
-
-we need include shared/missing.h to be able to compile on sysmtes that
-lacks strndupa.
-
-diff --git a/shared/util.c b/shared/util.c
-index 855d4e4..23bbb26 100644
---- a/shared/util.c
-+++ b/shared/util.c
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include <unistd.h>
-
-+#include <shared/missing.h>
- #include <shared/util.h>
-
- #define USEC_PER_SEC 1000000ULL
---
-cgit v0.10.1
-
diff --git a/sys-apps/kmod/files/kmod-static-nodes-r1 b/sys-apps/kmod/files/kmod-static-nodes-r1
deleted file mode 100644
index dcbf679..0000000
--- a/sys-apps/kmod/files/kmod-static-nodes-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/files/kmod-static-nodes-r1,v 1.1 2014/07/11 12:28:07 ssuominen Exp $
-
-description="Create list of required static device nodes for the current kernel"
-
-depend() {
- after dev-mount
- before tmpfiles.dev dev
- keyword -lxc
-}
-
-start() {
- ebegin "Creating list of required static device nodes for the current kernel"
- checkpath -q -d /run/tmpfiles.d
- kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
- eend $?
-}
diff --git a/sys-apps/kmod/kmod-19-r99.ebuild b/sys-apps/kmod/kmod-19-r99.ebuild
deleted file mode 100644
index 6da3cd0..0000000
--- a/sys-apps/kmod/kmod-19-r99.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-19.ebuild,v 1.1 2014/11/23 06:51:01 williamh Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-
-inherit bash-completion-r1 eutils multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
- inherit autotools git-2
-else
- SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
- inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc lzma python static-libs +tools zlib"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
- !sys-apps/modutils
- !<sys-apps/openrc-0.13
- !<sys-apps/systemd-217
- lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
- python? ( ${PYTHON_DEPS} )
- zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
- doc? ( dev-util/gtk-doc )
- lzma? ( virtual/pkgconfig )
- python? (
- dev-python/cython[${PYTHON_USEDEP}]
- virtual/pkgconfig
- )
- zlib? ( virtual/pkgconfig )"
-if [[ ${PV} == 9999* ]]; then
- DEPEND="${DEPEND}
- dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS="NEWS README TODO"
-
-src_prepare() {
- if [ ! -e configure ]; then
- if use doc; then
- gtkdocize --copy --docdir libkmod/docs || die
- else
- touch libkmod/docs/gtk-doc.make
- fi
- eautoreconf
- else
- elibtoolize
- fi
-
- epatch "${FILESDIR}"/${P}-strndupa.patch
-
- # Restore possibility of running --enable-static wrt #472608
- sed -i \
- -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
- configure || die
-}
-
-src_configure() {
- local myeconfargs=(
- --bindir="${EPREFIX}/bin"
- --with-rootlibdir="${EPREFIX}/$(get_libdir)"
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable tools)
- $(use_enable debug)
- $(use_enable doc gtk-doc)
- $(use_with lzma xz)
- $(use_with zlib)
- --with-bashcompletiondir="$(get_bashcompdir)"
- )
-
- local ECONF_SOURCE="${S}"
-
- kmod_configure() {
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir econf "${myeconfargs[@]}" "$@"
- }
-
- BUILD_DIR="${WORKDIR}/build"
- kmod_configure --disable-python
-
- if use python; then
- python_parallel_foreach_impl kmod_configure --enable-python
- fi
-}
-
-src_compile() {
- emake -C "${BUILD_DIR}"
-
- if use python; then
- local native_builddir=${BUILD_DIR}
-
- python_compile() {
- emake -C "${BUILD_DIR}" -f Makefile -f - python \
- VPATH="${native_builddir}:${S}" \
- native_builddir="${native_builddir}" \
- libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
- <<< 'python: $(pkgpyexec_LTLIBRARIES)'
- }
-
- python_foreach_impl python_compile
- fi
-}
-
-src_install() {
- emake -C "${BUILD_DIR}" DESTDIR="${D}" install
- einstalldocs
-
- if use python; then
- local native_builddir=${BUILD_DIR}
-
- python_install() {
- emake -C "${BUILD_DIR}" DESTDIR="${D}" \
- VPATH="${native_builddir}:${S}" \
- install-pkgpyexecLTLIBRARIES \
- install-dist_pkgpyexecPYTHON
- }
-
- python_foreach_impl python_install
- fi
-
- prune_libtool_files --modules
-
- if use tools; then
- local bincmd sbincmd
- for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
- dosym /bin/kmod /sbin/${sbincmd}
- done
-
- # These are also usable as normal user
- for bincmd in lsmod modinfo; do
- dosym kmod /bin/${bincmd}
- done
- fi
-
- cat <<-EOF > "${T}"/usb-load-ehci-first.conf
- softdep uhci_hcd pre: ehci_hcd
- softdep ohci_hcd pre: ehci_hcd
- EOF
-
- insinto /lib/modprobe.d
- doins "${T}"/usb-load-ehci-first.conf #260139
-
- newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
- if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
- ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
- rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
- fi
-
- # Add kmod to the runlevel automatically if this is the first install of this package.
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
- mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
- fi
- if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
- ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
- fi
- fi
-
- if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
- if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
- ewarn
- ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
- ewarn "kernel modules to have required static nodes!"
- ewarn "Run this command:"
- ewarn "\trc-update add kmod-static-nodes sysinit"
- fi
- fi
-}
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
deleted file mode 100644
index 723317e..0000000
--- a/sys-apps/kmod/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <maintainer>
- <email>udev-bugs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name='tools'>Install module loading/unloading tools.</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-apps/ldconfig/files/ldconfig-0.1 b/sys-apps/ldconfig/files/ldconfig-0.1
deleted file mode 100644
index 7139450..0000000
--- a/sys-apps/ldconfig/files/ldconfig-0.1
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash -e
-
-ROOT="/"
-
-LDSO_CONF="/etc/ld.so.conf"
-if [[ ! -e $LDSO_CONF ]]; then
- echo "$LDSO_CONF not found" >&2
- exit 1
-fi
-
-LDSO_CONF_DIR=$(dirname $LDSO_CONF)
-
-VERBOSE=0
-
-UPDATE_LINKS=1
-
-get_options() {
- while getopts "vnNXf:C:r:p" opt "$@"; do
- case $opt in
- v)
- echo "ldconfig for musl in Gentoo"
- VERBOSE=1
- ;;
- r)
- ROOT=$OPTARG
- ;;
- f)
- LDSO_CONF=$OPTARG
- ;;
- X)
- UPDATE_LINKS=0
- ;;
- \?)
- echo "Invalid option: -$opt" >&2
- exit 1
- ;;
- n|N|C|p)
- echo "Unimplemented option: -$opt" >&2
- exit 1
- ;;
- esac
- done
-
- if [[ $UPDATE_LINKS == 1 ]]; then
- echo "Updating links is not implemented."
- fi
-}
-
-
-repeated() {
- local l=$1
- local drs="${@:2}"
- for m in $drs; do
- [[ $m == $l ]] && return 0
- done
- return 1
-}
-
-expand() {
- # We are assuming the ld.so.conf's 'include' is not recursive
- local f line l
- local glob="$LDSO_CONF_DIR/$1"
- local drs="${@:2} "
-
- for f in $glob; do
- [[ ! -f $f ]] && continue
- while read line; do
- line=${line%%#*}
- line=${line//:/ }
- line=${line//,/ }
- for l in $line; do
- #We must add this whether or not the directory exists
- repeated $l $drs && continue
- drs+=" $l "
- done
- done < $f
- done
-
- echo $drs
-}
-
-read_ldso_conf() {
- local drs=" "
-
- while read line; do
- # Sanitize the line - see ldconfig(8) for delimiters
- # Note: bash read turns tabs into spaces and read already
- # delimits on newlines with the default $IFS
- line=${line%%#*} # Remove comments
- line=${line//:/ } # Change colon delimiter to space
- line=${line//,/ } # Change comma delimiter to space
-
- next=0
- for l in $line; do
- if [[ $next == 1 ]]; then
- next=0
- drs=$(expand $l $drs)
- elif [[ $l == "include" ]]; then
- next=1
- else
- # glibc's ldconfig silently skips non directories
- if [[ -d $l ]]; then
- repeated $l $drs && continue
- drs+=" $l "
- fi
- fi
- done
- done < $1
-
- echo $drs
-}
-
-sanitize() {
- local drs=$@
-
- repeated "/lib" $drs || drs="/lib $drs"
- repeated "/usr/lib" $drs || drs="/usr/lib $drs"
-
- echo $drs
-}
-
-get_options "$@"
-drs=$(read_ldso_conf "$LDSO_CONF")
-drs=$(sanitize $drs)
-
-LDSO_PATH=$(ls /lib/ld-musl-*.so.1)
-if [[ ! -e $LDSO_PATH ]]; then
- echo "$LDSO_PATH not found" >&2
- exit 1
-fi
-
-LDSO_ARCH=$(basename $LDSO_PATH)
-LDSO_NAME=${LDSO_ARCH%.so.1}
-ETC_LDSO_PATH=/etc/${LDSO_NAME}.path
-
-X=$(mktemp --tmpdir=/tmp ${LDSO_NAME}.XXXXXX)
-for d in $drs; do
- echo $d >> $X
-done
-chmod 644 $X
-mv $X $ETC_LDSO_PATH
diff --git a/sys-apps/ldconfig/ldconfig-0.1.ebuild b/sys-apps/ldconfig/ldconfig-0.1.ebuild
deleted file mode 100644
index 05ab221..0000000
--- a/sys-apps/ldconfig/ldconfig-0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="ldconfig for musl in Gentoo"
-HOMEPAGE="http://dev.gentoo.org/~blueness"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~amd64"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_preinst () {
- use elibc_musl || die "This package only works on a musl system"
-}
-
-src_unpack () {
- mkdir -p ${P}
- cp "${FILESDIR}"/${P} ${P}/${PN}
-}
-
-src_install () {
- into /
- dosbin ${PN}
- echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl
- doenvd "${T}"/00musl || die
-}
diff --git a/sys-apps/ldconfig/metadata.xml b/sys-apps/ldconfig/metadata.xml
deleted file mode 100644
index 1e75873..0000000
--- a/sys-apps/ldconfig/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch b/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
deleted file mode 100644
index f56dffc..0000000
--- a/sys-apps/net-tools/files/net-tools-fix-header-assumptions.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c net-tools-1.60_p20120127084908/lib/inet6_gr.c
---- net-tools-1.60_p20120127084908.orig/lib/inet6_gr.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/inet6_gr.c 2014-01-21 19:18:50.557199377 +0000
-@@ -23,9 +23,6 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#ifndef __GLIBC__
--#include <netinet6/ipv6_route.h> /* glibc doesn't have this */
--#endif
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c net-tools-1.60_p20120127084908/lib/inet6_sr.c
---- net-tools-1.60_p20120127084908.orig/lib/inet6_sr.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/inet6_sr.c 2014-01-21 19:19:23.307201208 +0000
-@@ -23,11 +23,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
--#ifdef __GLIBC__
- #include <net/route.h>
--#else
--#include <netinet6/ipv6_route.h> /* glibc does not have this */
--#endif
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/inet_sr.c net-tools-1.60_p20120127084908/lib/inet_sr.c
---- net-tools-1.60_p20120127084908.orig/lib/inet_sr.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/inet_sr.c 2014-01-21 20:41:59.223478324 +0000
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <asm-generic/param.h>
- #include "version.h"
- #include "net-support.h"
- #include "pathnames.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/lib/util-ank.c net-tools-1.60_p20120127084908/lib/util-ank.c
---- net-tools-1.60_p20120127084908.orig/lib/util-ank.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/lib/util-ank.c 2014-01-21 20:42:56.876481548 +0000
-@@ -25,6 +25,7 @@
- #include <netdb.h>
- #include <arpa/inet.h>
- #include <resolv.h>
-+#include <limits.h>
-
- #include "intl.h"
- #include "util-ank.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/mii-tool.c net-tools-1.60_p20120127084908/mii-tool.c
---- net-tools-1.60_p20120127084908.orig/mii-tool.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/mii-tool.c 2014-01-21 20:54:31.563520392 +0000
-@@ -47,10 +47,6 @@
- #include <net/if.h>
- #include <linux/sockios.h>
-
--#ifndef __GLIBC__
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
--#endif
- #include <linux/mii.h>
- #include <linux/sockios.h>
- #include "version.h"
-diff -Naur net-tools-1.60_p20120127084908.orig/netstat.c net-tools-1.60_p20120127084908/netstat.c
---- net-tools-1.60_p20120127084908.orig/netstat.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/netstat.c 2014-01-21 20:43:34.023483625 +0000
-@@ -88,6 +88,7 @@
- #include <sys/stat.h>
- #include <net/if.h>
- #include <dirent.h>
-+#include <asm-generic/param.h>
-
- #if HAVE_SELINUX
- #include <selinux/selinux.h>
-diff -Naur net-tools-1.60_p20120127084908.orig/slattach.c net-tools-1.60_p20120127084908/slattach.c
---- net-tools-1.60_p20120127084908.orig/slattach.c 2012-01-27 08:49:08.000000000 +0000
-+++ net-tools-1.60_p20120127084908/slattach.c 2014-01-21 20:44:46.953487703 +0000
-@@ -45,14 +45,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <linux/if_slip.h>
--
--#if defined(__GLIBC__)
--#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
--# include <termbits.h>
--#else
- # include <termios.h>
--#endif
--#endif
-
- #include "pathnames.h"
- #include "net-support.h"
diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
deleted file mode 100644
index 0c72e81..0000000
--- a/sys-apps/net-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild
deleted file mode 100644
index abb911a..0000000
--- a/sys-apps/net-tools/net-tools-1.60_p20120127084908-r99.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20120127084908.ebuild,v 1.16 2014/01/18 03:28:51 vapier Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
- inherit git-2
- KEYWORDS=""
-else
- PATCH_VER="1"
- SRC_URI="mirror://gentoo/${P}.tar.xz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-maint_pkg_create() {
- cd /usr/local/src/net-tools
- #git-update
- local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
- local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
- local p="${PN}-${pv}"
- git archive --prefix="nt/" master | tar xf - -C "${T}"
- pushd "${T}" >/dev/null
- pushd nt >/dev/null
- sed -i "/^RELEASE/s:=.*:=${pv}:" Makefile || die
- emake dist >/dev/null
- popd >/dev/null
- zcat ${p}.tar.gz | xz > ${p}.tar.xz
- rm -f ${p}.tar.gz
- popd >/dev/null
-
- local patches="${p}-patches-${PATCH_VER:-1}"
- local d="${T}/${patches}"
- mkdir "${d}"
- git format-patch -o "${d}" master..gentoo > /dev/null
- echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
- tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
- rm -rf "${d}"
-
- du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
- local opt=$1 ans
- shift
- ans=$("$@" && echo y || echo n)
- einfo "Setting option ${opt} to ${ans}"
- sed -i \
- -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
- config.in || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch
- if [[ -n ${PATCH_VER} ]] ; then
- use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
- fi
-}
-
-src_configure() {
- set_opt I18N use nls
- set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
- set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
- set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
- set_opt HAVE_AFECONET 0
- if use static ; then
- append-flags -static
- append-ldflags -static
- fi
- tc-export AR CC
- yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die
- dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
- einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild
deleted file mode 100644
index b453df8..0000000
--- a/sys-apps/net-tools/net-tools-1.60_p20130513023548-r99.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20130513023548.ebuild,v 1.6 2014/04/07 20:12:31 vapier Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
- inherit git-2
-else
- PATCH_VER="1"
- SRC_URI="mirror://gentoo/${P}.tar.xz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- selinux? ( virtual/pkgconfig )
- app-arch/xz-utils"
-
-maint_pkg_create() {
- cd /usr/local/src/net-tools
- #git-update
- local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
- local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
- local p="${PN}-${pv}"
- git archive --prefix="${p}/" master | tar xf - -C "${T}"
- pushd "${T}" >/dev/null
- sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
- tar cf - ${p}/ | xz > ${p}.tar.xz
- popd >/dev/null
-
- local patches="${p}-patches-${PATCH_VER:-1}"
- local d="${T}/${patches}"
- mkdir "${d}"
- git format-patch -o "${d}" master..gentoo > /dev/null
- echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
- tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
- rm -rf "${d}"
-
- du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
- local opt=$1 ans
- shift
- ans=$("$@" && echo y || echo n)
- einfo "Setting option ${opt} to ${ans}"
- sed -i \
- -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
- config.in || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch
- if [[ -n ${PATCH_VER} ]] ; then
- use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
- fi
-}
-
-src_configure() {
- set_opt I18N use nls
- set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
- set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
- set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
- set_opt HAVE_AFECONET 0
- set_opt SELINUX use selinux
- if use static ; then
- append-flags -static
- append-ldflags -static
- fi
- tc-export AR CC
- yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die
- dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
- einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild b/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild
deleted file mode 100644
index 529d30e..0000000
--- a/sys-apps/net-tools/net-tools-1.60_p20141019041918-r99.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60_p20141019041918.ebuild,v 1.1 2014/10/19 04:24:16 vapier Exp $
-
-EAPI="3"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://net-tools.git.sourceforge.net/gitroot/net-tools/net-tools"
- inherit git-2
-else
- PATCH_VER="1"
- SRC_URI="mirror://gentoo/${P}.tar.xz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz"
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="Standard Linux networking tools"
-HOMEPAGE="http://net-tools.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls old-output selinux static"
-
-RDEPEND="!<sys-apps/openrc-0.9.9.3
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- selinux? ( virtual/pkgconfig )
- app-arch/xz-utils"
-
-maint_pkg_create() {
- cd /usr/local/src/net-tools
- #git-update
- local stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d%H%M%S)
- local pv="${PV/_p*}_p${stamp}"; pv=${pv/9999/1.60}
- local p="${PN}-${pv}"
- git archive --prefix="${p}/" master | tar xf - -C "${T}"
- pushd "${T}" >/dev/null
- sed -i "/^RELEASE/s:=.*:=${pv}:" */Makefile || die
- tar cf - ${p}/ | xz > ${p}.tar.xz
- popd >/dev/null
-
- local patches="${p}-patches-${PATCH_VER:-1}"
- local d="${T}/${patches}"
- mkdir "${d}"
- git format-patch -o "${d}" master..gentoo > /dev/null
- echo "From http://git.overlays.gentoo.org/gitweb/?p=proj/net-tools.git" > "${d}"/README
- tar cf - -C "${T}" ${d##*/} | xz > "${T}"/${patches}.tar.xz
- rm -rf "${d}"
-
- du -b "${T}"/*.tar.xz
-}
-
-pkg_setup() { [[ -n ${VAPIER_LOVES_YOU} ]] && maint_pkg_create ; }
-
-set_opt() {
- local opt=$1 ans
- shift
- ans=$("$@" && echo y || echo n)
- einfo "Setting option ${opt} to ${ans}"
- sed -i \
- -e "/^bool.* ${opt} /s:[yn]$:${ans}:" \
- config.in || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-fix-header-assumptions.patch
- if [[ -n ${PATCH_VER} ]] ; then
- use old-output || EPATCH_EXCLUDE="0001-revert-621a2f376334f8097604b9fee5783e0f1141e66d-for-.patch"
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch "${WORKDIR}"/${P}-patches-${PATCH_VER}
- fi
-}
-
-src_configure() {
- set_opt I18N use nls
- set_opt HAVE_HWIB has_version '>=sys-kernel/linux-headers-2.6'
- set_opt HAVE_HWTR has_version '<sys-kernel/linux-headers-3.5'
- set_opt HAVE_HWSTRIP has_version '<sys-kernel/linux-headers-3.6'
- set_opt HAVE_AFECONET 0
- set_opt SELINUX use selinux
- if use static ; then
- append-flags -static
- append-ldflags -static
- fi
- tc-export AR CC
- yes "" | ./configure.sh config.in || die
-}
-
-src_install() {
- emake DESTDIR="${ED}" install || die
- dodoc README README.ipv6 TODO
-}
-
-pkg_postinst() {
- einfo "etherwake and such have been split into net-misc/ethercard-diag"
-}
diff --git a/sys-apps/pciutils/files/conf.d-pciparm b/sys-apps/pciutils/files/conf.d-pciparm
deleted file mode 100644
index f036b15..0000000
--- a/sys-apps/pciutils/files/conf.d-pciparm
+++ /dev/null
@@ -1,28 +0,0 @@
-# PCI tweaking article:
-# http://www.gentoo.org/doc/en/articles/hardware-stability-p2.xml
-#
-# Apply to all devices:
-# PCIPARM_ALL="...."
-# Cards also can be addressed by vid:pid or by bus:slot.func
-# (see setpci man page relative to -d and -s options)
-# PCIPARM_(BUS|VENDOR)_#="...."
-# Where # is sequentially numbered from zero.
-
-# Examples:
-# "open up" the PCI bus by allowing fairly long bursts
-# for all devices, increasing performance
-# (equivalent to: setpci -v -d *:* latency_timer=b0)
-#PCIPARM_ALL="latency_timer=b0"
-
-# maximize latency timers for network and audio,
-# allowing them to transmit more data per burst,
-# preventing buffer over/under-run conditions
-#PCIPARM_BUS_0="00:04.0 latency_timer=ff"
-#PCIPARM_BUS_1="01:04.0 latency_timer=ff"
-#PCIPARM_VENDOR_0="1057:3410 latency_timer=ff"
-
-# -v : whether to be verbose about changes
-# -D : dry-run, no commit
-# -f : do not warn if the change is already set
-# (see the setpci manpage for more advanced options)
-SETPCI_OPT="-f"
diff --git a/sys-apps/pciutils/files/init.d-pciparm b/sys-apps/pciutils/files/init.d-pciparm
deleted file mode 100644
index 705b647..0000000
--- a/sys-apps/pciutils/files/init.d-pciparm
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 1.3 2008/10/11 02:47:50 robbat2 Exp $
-
-depend() {
- before bootmisc hdparm
- after localmount
-}
-
-checkconfig() {
- if [ ! -f /etc/conf.d/pciparm ]; then
- ewarn "/etc/conf.d/pciparm does not exist, skipping"
- return 1
- fi
-
- if [ -z "${PCIPARM_ALL}" -a -z "${PCIPARM_BUS_0}" -a -z "${PCIPARM_VENDOR_0}" ]; then
- ewarn "None of PCIPARM_ALL, PCIPARM_BUS_* or PCIPARM_VENDOR_* set in /etc/conf.d/pciparm"
- return 1
- fi
-}
-
-do_setpci() {
- #ewarn "do_setpci: /usr/sbin/setpci $SETPCI_OPT $@"
- SWITCH=$1
- SPEC_ID=$2
- shift 2
- case "$SWITCH" in
- -d) DESC=vendor ;;
- -s) DESC=bus ;;
- *) eerror "Unknown setpci type: $SWITCH" ; return 1 ;;
- esac
-
- if [ -z "$SPEC_ID" ]; then
- eerror "Missing device specifier!"
- return 1
- fi
- if [ -z "$*" ]; then
- eerror "Missing configuration to set for ($DESC) $SPEC_ID!"
- return 1
- fi
-
- ebegin "Setting PCI params for ($DESC) $SPEC_ID to $@"
- /usr/sbin/setpci $SETPCI_OPT $SWITCH $SPEC_ID "$@"
- rc=$?
- eend $rc
- return $rc
-}
-
-do_setpci_array() {
- name=$1
- shift
- i=0
- while true; do
- eval opt="\$${name}_$i"
- # End of loop
- [ -z "${opt}" ] && break
- # Pass in all other parameters here, in case we want to use multiple
- # arguments later.
- do_setpci "$@" $opt #|| return 1
- i=$(($i+1))
- done
-}
-
-start() {
- if get_bootparam "nopciparm" ; then
- ewarn "Skipping pciparm init as requested in kernel cmdline"
- return 0
- fi
-
- checkconfig || return 1
-
- # We do not exit after any errors presently, because it might be a
- # stability-related fix after a failure.
- [ -n "$PCIPARM_ALL" ] && \
- do_setpci -d '*:*' $PCIPARM_ALL #|| return 1
-
- do_setpci_array PCIPARM_BUS -s #|| return 1
- do_setpci_array PCIPARM_VENDOR -d #|| return 1
-}
diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
deleted file mode 100644
index 9e63b7e..0000000
--- a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make sure all lib entries get into libs.private in the .pc file
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in
- -e 's,@LIBDIR@,$(LIBDIR),' \
- -e 's,@IDSDIR@,$(IDSDIR),' \
- -e 's,@VERSION@,$(VERSION),' \
-- -e 's,@LDLIBS@,$(LDLIBS),'
-+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),'
-
- init.o: init.c $(INCL)
- access.o: access.c $(INCL)
diff --git a/sys-apps/pciutils/files/pciutils-3.2.0-io.patch b/sys-apps/pciutils/files/pciutils-3.2.0-io.patch
deleted file mode 100644
index f8cf13b..0000000
--- a/sys-apps/pciutils/files/pciutils-3.2.0-io.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/pciutils-3.2.0/lib/i386-io-linux.h
-+++ b/pciutils-3.2.0/lib/i386-io-linux.h
-@@ -6,11 +6,7 @@
- * Can be freely distributed and used under the terms of the GNU GPL.
- */
-
--#ifdef __GLIBC__
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
-
- static int
- intel_setup_io(struct pci_access *a UNUSED)
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
deleted file mode 100644
index aa9db86..0000000
--- a/sys-apps/pciutils/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <use>
- <flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
- <flag name='zlib'>Support compressed pci.ids database</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild b/sys-apps/pciutils/pciutils-3.2.0.ebuild
deleted file mode 100644
index 8e9ed66..0000000
--- a/sys-apps/pciutils/pciutils-3.2.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.14 2014/01/18 04:55:35 vapier Exp $
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+kmod static-libs zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
-DEPEND="kmod? ( sys-apps/kmod )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-DEPEND="${DEPEND}
- kmod? ( virtual/pkgconfig )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
- epatch "${FILESDIR}"/${PN}-3.2.0-io.patch
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- fi
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- DNS="yes" \
- IDSDIR='$(SHAREDIR)/misc' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD="$(usex kmod)" \
- "$@"
-}
-
-src_compile() {
- pemake OPT="${CFLAGS}" all
- if use static-libs ; then
- pemake \
- -C "${S}.static" \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-src_install() {
- pemake DESTDIR="${D}" install install-lib
- use static-libs && dolib.a "${S}.static/lib/libpci.a"
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
- "${ED}"/usr/share/man/man8/update-pciids.8*
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
- elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
- elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
- fi
-}
diff --git a/sys-apps/sandbox/files/09sandbox b/sys-apps/sandbox/files/09sandbox
deleted file mode 100644
index 9181eb0..0000000
--- a/sys-apps/sandbox/files/09sandbox
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROTECT_MASK="/etc/sandbox.d"
diff --git a/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch b/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch
deleted file mode 100644
index e4dc529..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-check-empty-paths-at.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From dd726dcc6a95355d0e0cc949018d9c8aefc89a02 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Dec 2012 19:41:49 -0500
-Subject: [PATCH 1/2] libsandbox: reject "" paths with *at funcs before
- checking the dirfd
-
-When it comes to processing errors, an empty path is checked before
-an invalid dirfd. Make sure sandbox matches that behavior for the
-random testsuites out there that look for this.
-
-URL: https://bugs.gentoo.org/346929
-Reported-by: Marien Zwart <marienz@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/wrapper-funcs/__pre_check.c | 2 ++
- libsandbox/wrapper-funcs/mkdirat_pre_check.c | 17 +++++------------
- libsandbox/wrapper-funcs/openat_pre_check.c | 15 ++++-----------
- libsandbox/wrapper-funcs/unlinkat_pre_check.c | 17 +++++------------
- libsandbox/wrappers.h | 2 ++
- tests/mkdirat-3.sh | 7 +++++++
- tests/mkdirat.at | 1 +
- tests/openat-2.sh | 9 +++++++++
- tests/openat.at | 1 +
- tests/unlinkat-4.sh | 7 +++++++
- tests/unlinkat.at | 1 +
- 11 files changed, 44 insertions(+), 35 deletions(-)
- create mode 100755 tests/mkdirat-3.sh
- create mode 100755 tests/openat-2.sh
- create mode 100755 tests/unlinkat-4.sh
-
-diff --git a/libsandbox/wrapper-funcs/__pre_check.c b/libsandbox/wrapper-funcs/__pre_check.c
-index 2d5711f..28ad91f 100644
---- a/libsandbox/wrapper-funcs/__pre_check.c
-+++ b/libsandbox/wrapper-funcs/__pre_check.c
-@@ -20,3 +20,5 @@
- #if SB_NR_UNLINK != SB_NR_UNDEF && SB_NR_UNLINKAT == SB_NR_UNDEF
- # include "unlinkat_pre_check.c"
- #endif
-+
-+#include "__pre_at_check.c"
-diff --git a/libsandbox/wrapper-funcs/mkdirat_pre_check.c b/libsandbox/wrapper-funcs/mkdirat_pre_check.c
-index 77a65df..0b48d1f 100644
---- a/libsandbox/wrapper-funcs/mkdirat_pre_check.c
-+++ b/libsandbox/wrapper-funcs/mkdirat_pre_check.c
-@@ -1,20 +1,13 @@
- bool sb_mkdirat_pre_check(const char *func, const char *pathname, int dirfd)
- {
- char canonic[SB_PATH_MAX];
-- char dirfd_path[SB_PATH_MAX];
-
- save_errno();
-
-- /* Expand the dirfd path first */
-- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) {
-- case -1:
-- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n",
-- func, pathname, strerror(errno));
-- return false;
-- case 0:
-- pathname = dirfd_path;
-- break;
-- }
-+ /* Check incoming args against common *at issues */
-+ char dirfd_path[SB_PATH_MAX];
-+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path)))
-+ return false;
-
- /* Then break down any relative/symlink paths */
- if (-1 == canonicalize(pathname, canonic))
-diff --git a/libsandbox/wrapper-funcs/openat_pre_check.c b/libsandbox/wrapper-funcs/openat_pre_check.c
-index 0127708..5fd5eaa 100644
---- a/libsandbox/wrapper-funcs/openat_pre_check.c
-+++ b/libsandbox/wrapper-funcs/openat_pre_check.c
-@@ -15,17 +15,10 @@ bool sb_openat_pre_check(const char *func, const char *pathname, int dirfd, int
-
- save_errno();
-
-- /* Expand the dirfd path first */
-+ /* Check incoming args against common *at issues */
- char dirfd_path[SB_PATH_MAX];
-- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) {
-- case -1:
-- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n",
-- func, pathname, strerror(errno));
-- return false;
-- case 0:
-- pathname = dirfd_path;
-- break;
-- }
-+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path)))
-+ return false;
-
- /* Doesn't exist -> skip permission checks */
- struct stat st;
-diff --git a/libsandbox/wrapper-funcs/unlinkat_pre_check.c b/libsandbox/wrapper-funcs/unlinkat_pre_check.c
-index 9f5e7d7..c004d15 100644
---- a/libsandbox/wrapper-funcs/unlinkat_pre_check.c
-+++ b/libsandbox/wrapper-funcs/unlinkat_pre_check.c
-@@ -1,20 +1,13 @@
- bool sb_unlinkat_pre_check(const char *func, const char *pathname, int dirfd)
- {
- char canonic[SB_PATH_MAX];
-- char dirfd_path[SB_PATH_MAX];
-
- save_errno();
-
-- /* Expand the dirfd path first */
-- switch (resolve_dirfd_path(dirfd, pathname, dirfd_path, sizeof(dirfd_path))) {
-- case -1:
-- sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n",
-- func, pathname, strerror(errno));
-- return false;
-- case 0:
-- pathname = dirfd_path;
-- break;
-- }
-+ /* Check incoming args against common *at issues */
-+ char dirfd_path[SB_PATH_MAX];
-+ if (!sb_common_at_pre_check(func, &pathname, dirfd, dirfd_path, sizeof(dirfd_path)))
-+ return false;
-
- /* Then break down any relative/symlink paths */
- if (-1 == canonicalize(pathname, canonic))
-diff --git a/libsandbox/wrappers.h b/libsandbox/wrappers.h
-index 5b97787..0aa58bb 100644
---- a/libsandbox/wrappers.h
-+++ b/libsandbox/wrappers.h
-@@ -28,5 +28,7 @@ attribute_hidden bool sb_mkdirat_pre_check (const char *func, const char *pathn
- attribute_hidden bool sb_openat_pre_check (const char *func, const char *pathname, int dirfd, int flags);
- attribute_hidden bool sb_openat64_pre_check (const char *func, const char *pathname, int dirfd, int flags);
- attribute_hidden bool sb_unlinkat_pre_check (const char *func, const char *pathname, int dirfd);
-+attribute_hidden bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd,
-+ char *dirfd_path, size_t dirfd_path_len);
-
- #endif
---
-1.8.1.2
-
-From 0b8a6d9773cc0e6d86bf1187f46817d5716698fe Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Dec 2012 19:41:49 -0500
-Subject: [PATCH 2/2] libsandbox: reject "" paths with *at funcs before
- checking the dirfd [missing file]
-
-When it comes to processing errors, an empty path is checked before
-an invalid dirfd. Make sure sandbox matches that behavior for the
-random testsuites out there that look for this.
-
-Forgot to `git add` in the previous commit :/.
-
-URL: https://bugs.gentoo.org/346929
-Reported-by: Marien Zwart <marienz@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/wrapper-funcs/__pre_at_check.c | 34 +++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
- create mode 100644 libsandbox/wrapper-funcs/__pre_at_check.c
-
-diff --git a/libsandbox/wrapper-funcs/__pre_at_check.c b/libsandbox/wrapper-funcs/__pre_at_check.c
-new file mode 100644
-index 0000000..f72c40c
---- /dev/null
-+++ b/libsandbox/wrapper-funcs/__pre_at_check.c
-@@ -0,0 +1,34 @@
-+/*
-+ * common *at() pre-checks.
-+ *
-+ * Copyright 1999-2012 Gentoo Foundation
-+ * Licensed under the GPL-2
-+ */
-+
-+/* We assume the parent has nested use with save/restore errno */
-+bool sb_common_at_pre_check(const char *func, const char **pathname, int dirfd,
-+ char *dirfd_path, size_t dirfd_path_len)
-+{
-+ /* the empty path name should fail with ENOENT before any dirfd
-+ * checks get a chance to run #346929
-+ */
-+ if (*pathname && *pathname[0] == '\0') {
-+ errno = ENOENT;
-+ sb_debug_dyn("EARLY FAIL: %s(%s): %s\n",
-+ func, *pathname, strerror(errno));
-+ return false;
-+ }
-+
-+ /* Expand the dirfd path first */
-+ switch (resolve_dirfd_path(dirfd, *pathname, dirfd_path, dirfd_path_len)) {
-+ case -1:
-+ sb_debug_dyn("EARLY FAIL: %s(%s) @ resolve_dirfd_path: %s\n",
-+ func, *pathname, strerror(errno));
-+ return false;
-+ case 0:
-+ *pathname = dirfd_path;
-+ break;
-+ }
-+
-+ return true;
-+}
---
-1.8.1.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.6-desktop.patch b/sys-apps/sandbox/files/sandbox-2.6-desktop.patch
deleted file mode 100644
index fbecb07..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 00044ab0c8aaaabf048b5ff0ec2da5b3d7d25752 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 17 Nov 2012 14:14:26 -0500
-Subject: [PATCH] sandbox.desktop: drop .svg from Icon field
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-URL: http://bugs.gentoo.org/443672
-Reported-by: Petteri Räty <betelgeuse@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- data/sandbox.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/sandbox.desktop b/data/sandbox.desktop
-index 5b5b576..27a887e 100644
---- a/data/sandbox.desktop
-+++ b/data/sandbox.desktop
-@@ -5,6 +5,6 @@ Type=Application
- Comment=launch a sandboxed shell ... useful for debugging ebuilds
- Exec=sandbox
- TryExec=sandbox
--Icon=sandbox.svg
-+Icon=sandbox
- Categories=Development;
- Terminal=true
---
-1.8.1.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.6-include-PROTECTED-symbols.patch b/sys-apps/sandbox/files/sandbox-2.6-include-PROTECTED-symbols.patch
deleted file mode 100644
index cb29a6c..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-include-PROTECTED-symbols.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sandbox-2.6.orig/scripts/gen_symbol_version_map.awk sandbox-2.6/scripts/gen_symbol_version_map.awk
---- sandbox-2.6.orig/scripts/gen_symbol_version_map.awk 2009-02-20 06:29:29.000000000 +0000
-+++ sandbox-2.6/scripts/gen_symbol_version_map.awk 2015-06-08 19:29:55.727290000 +0000
-@@ -14,7 +14,7 @@
-
- # Only check FUNCtion symbols which are not LOCAL, or
- # do not have DEFAULT visibility
-- if ($4 != "FUNC" || $5 == "LOCAL" || $6 != "DEFAULT")
-+ if ($4 != "FUNC" || $5 == "LOCAL" || ($6 != "DEFAULT" && $6 != "PROTECTED"))
- next;
-
- for (x in SYMBOLS) {
diff --git a/sys-apps/sandbox/files/sandbox-2.6-log-var.patch b/sys-apps/sandbox/files/sandbox-2.6-log-var.patch
deleted file mode 100644
index bfea9e5..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-log-var.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 853b42c86432eefc6d4cfba86197fb37d446366d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 3 Mar 2013 05:34:09 -0500
-Subject: [PATCH] sandbox: accept SANDBOX_LOG vars whatever their values
-
-Commit 40abb498ca4a24495fe34e133379382ce8c3eaca subtly broke the sandbox
-with portage. It changed how the sandbox log env var was accessed by
-moving from getenv() to get_sandbox_log(). The latter has path checking
-and will kick out values that contain a slash. That means every time a
-new process starts, a new sandbox log path will be generated, and when a
-program triggers a violation, it'll write to the new file. Meanwhile,
-portage itself watches the original one which never gets updated.
-
-This code has been around forever w/out documentation, and I can't think
-of a reason we need it. So punt it.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsbutil/get_sandbox_log.c | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/libsbutil/get_sandbox_log.c b/libsbutil/get_sandbox_log.c
-index a79b399..bdb4278 100644
---- a/libsbutil/get_sandbox_log.c
-+++ b/libsbutil/get_sandbox_log.c
-@@ -21,17 +21,13 @@ static void _get_sb_log(char *path, const char *tmpdir, const char *env, const c
-
- sandbox_log_env = getenv(env);
-
-- if (sandbox_log_env && is_env_on(ENV_SANDBOX_TESTING)) {
-- /* When testing, just use what the env says to */
-+ if (sandbox_log_env) {
-+ /* If the env is viable, roll with it. We aren't really
-+ * about people breaking the security of the sandbox by
-+ * exporting SANDBOX_LOG=/dev/null.
-+ */
- strncpy(path, sandbox_log_env, SB_PATH_MAX);
- } else {
-- /* THIS CHUNK BREAK THINGS BY DOING THIS:
-- * SANDBOX_LOG=/tmp/sandbox-app-admin/superadduser-1.0.7-11063.log
-- */
-- if ((NULL != sandbox_log_env) &&
-- (NULL != strchr(sandbox_log_env, '/')))
-- sandbox_log_env = NULL;
--
- snprintf(path, SB_PATH_MAX, "%s%s%s%s%d%s",
- SANDBOX_LOG_LOCATION, prefix,
- (sandbox_log_env == NULL ? "" : sandbox_log_env),
---
-1.8.1.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.6-musl.patch b/sys-apps/sandbox/files/sandbox-2.6-musl.patch
deleted file mode 100644
index ee288d7..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-musl.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur sandbox-2.6.orig/headers.h sandbox-2.6/headers.h
---- sandbox-2.6.orig/headers.h 2012-07-03 18:27:44.000000000 +0000
-+++ sandbox-2.6/headers.h 2014-05-22 13:57:55.225002786 +0000
-@@ -133,9 +133,11 @@
- #ifdef HAVE_ASM_PTRACE_H
- # include <asm/ptrace.h>
- #endif
-+/*
- #ifdef HAVE_LINUX_PTRACE_H
- # include <linux/ptrace.h>
- #endif
-+*/
- #undef FU_ia64_fpreg
- #undef FU_pt_all_user_regs
-
-diff -Naur sandbox-2.6.orig/libsandbox/trace.c sandbox-2.6/libsandbox/trace.c
---- sandbox-2.6.orig/libsandbox/trace.c 2014-05-22 13:58:25.215002800 +0000
-+++ sandbox-2.6/libsandbox/trace.c 2014-05-22 13:57:26.515002772 +0000
-@@ -9,7 +9,7 @@
- #include "wrappers.h"
- #include "sb_nr.h"
-
--static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data);
-+static long _do_ptrace(int request, const char *srequest, void *addr, void *data);
- #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr, data)
- #define _trace_possible(data) true
-
-@@ -43,7 +43,7 @@
- _exit(status);
- }
-
--static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data)
-+static long _do_ptrace(int request, const char *srequest, void *addr, void *data)
- {
- long ret;
- try_again:
-diff -Naur sandbox-2.6.orig/scripts/gen_symbol_header.awk sandbox-2.6/scripts/gen_symbol_header.awk
---- sandbox-2.6.orig/scripts/gen_symbol_header.awk 2014-05-22 13:58:25.235002800 +0000
-+++ sandbox-2.6/scripts/gen_symbol_header.awk 2014-05-22 13:57:26.520002772 +0000
-@@ -161,7 +161,7 @@
- else
- printf("symbol_version(%s, %s, %s);\n",
- sym_real_name, sym_index, symbol_array[2]);
-- } else {
-+ } else if (!(sym_index ~ 64)) {
- # For non-versioned libc's we use strong aliases
- printf("strong_alias(%s, %s);\n", sym_real_name,
- sym_index);
diff --git a/sys-apps/sandbox/files/sandbox-2.6-no-pch.patch b/sys-apps/sandbox/files/sandbox-2.6-no-pch.patch
deleted file mode 100644
index fe22749..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-no-pch.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-gcc crashes when trying to use pch under hardened kernels
-
-http://bugs.gentoo.org/425524
-
---- Makefile.in
-+++ Makefile.in
-@@ -300,7 +300,7 @@
- src \
- tests
-
--SANDBOX_PCH = headers.h.gch libsandbox/headers.h.gch libsbutil/headers.h.gch
-+SANDBOX_PCH =
- BUILT_SOURCES = $(SANDBOX_PCH)
- noinst_LTLIBRARIES = libpch.la
- nodist_libpch_la_SOURCES = $(SANDBOX_PCH)
-@@ -862,10 +862,9 @@
- $(builddir)/headers.h.gch: headers.h
- $(AM_V_GEN)$(COMPILE) -c -o $@.o $< && $(GCH_CP)
-
--libsbutil: libsbutil/headers.h.gch
--libsandbox: libsbutil libsandbox/headers.h.gch
--src: libsbutil headers.h.gch
--tests: src headers.h.gch
-+libsandbox: libsbutil
-+src: libsbutil
-+tests: src
-
- ChangeLog:
- touch ChangeLog
diff --git a/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch b/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch
deleted file mode 100644
index 0101ece..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-open-nofollow.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 45fa8714a1d35e6555083d88a71851ada2aacac4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 24 Dec 2012 18:46:29 -0500
-Subject: [PATCH] libsandbox: handle open(O_NOFOLLOW)
-
-We don't check for O_NOFOLLOW in the open wrappers, so we end up
-returning the wrong error when operating on broken symlinks.
-
-URL: https://bugs.gentoo.org/413441
-Reported-by: Marien Zwart <marienz@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/wrapper-funcs/__64_post.h | 1 +
- libsandbox/wrapper-funcs/__64_pre.h | 1 +
- libsandbox/wrapper-funcs/openat_pre_check.c | 2 +-
- tests/open-2.sh | 10 ++++++++++
- tests/open.at | 1 +
- 5 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100755 tests/open-2.sh
-
-diff --git a/libsandbox/wrapper-funcs/__64_post.h b/libsandbox/wrapper-funcs/__64_post.h
-index 2fd2182..82d2a16 100644
---- a/libsandbox/wrapper-funcs/__64_post.h
-+++ b/libsandbox/wrapper-funcs/__64_post.h
-@@ -1,3 +1,4 @@
- #undef SB64
- #undef stat
-+#undef lstat
- #undef off_t
-diff --git a/libsandbox/wrapper-funcs/__64_pre.h b/libsandbox/wrapper-funcs/__64_pre.h
-index 2132110..0b34b25 100644
---- a/libsandbox/wrapper-funcs/__64_pre.h
-+++ b/libsandbox/wrapper-funcs/__64_pre.h
-@@ -1,3 +1,4 @@
- #define SB64
- #define stat stat64
-+#define lstat lstat64
- #define off_t off64_t
-diff --git a/libsandbox/wrapper-funcs/openat_pre_check.c b/libsandbox/wrapper-funcs/openat_pre_check.c
-index c827ee6..0127708 100644
---- a/libsandbox/wrapper-funcs/openat_pre_check.c
-+++ b/libsandbox/wrapper-funcs/openat_pre_check.c
-@@ -29,7 +29,7 @@ bool sb_openat_pre_check(const char *func, const char *pathname, int dirfd, int
-
- /* Doesn't exist -> skip permission checks */
- struct stat st;
-- if (-1 == stat(pathname, &st)) {
-+ if (((flags & O_NOFOLLOW) ? lstat(pathname, &st) : stat(pathname, &st)) == -1) {
- sb_debug_dyn("EARLY FAIL: %s(%s): %s\n",
- func, pathname, strerror(errno));
- return false;
---
-1.8.1.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch b/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch
deleted file mode 100644
index 7fc0972..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-static-close-fd.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From a3ff1534945c3898332b2481c9fd355dfbd56e1f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 23 Jun 2012 11:52:51 -0700
-Subject: [PATCH] libsandbox: clean up open file handles in parent tracing
- process
-
-Currently, if a non-static app sets up a pipe (with cloexec enabled) and
-executes a static app, the handle to that pipe is left open in the parent
-process. This causes trouble when the parent is waiting for that to be
-closed immediately.
-
-Since none of the fds in the forked parent process matter to us, we can
-just go ahead and clean up all fds before we start tracing the child.
-
-URL: http://bugs.gentoo.org/364877
-Reported-by: Victor Stinner <victor.stinner@haypocalc.com>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/trace.c | 3 +-
- libsbutil/sb_close.c | 26 +++++++++++-
- libsbutil/sbutil.h | 1 +
- tests/Makefile.am | 2 +
- tests/pipe-fork_static_tst.c | 18 +++++++++
- tests/pipe-fork_tst.c | 95 ++++++++++++++++++++++++++++++++++++++++++++
- tests/script-9.sh | 5 +++
- tests/script.at | 1 +
- 8 files changed, 149 insertions(+), 2 deletions(-)
- create mode 100644 tests/pipe-fork_static_tst.c
- create mode 100644 tests/pipe-fork_tst.c
- create mode 100755 tests/script-9.sh
-
-diff --git a/libsandbox/trace.c b/libsandbox/trace.c
-index 32ad2d6..dfbab18 100644
---- a/libsandbox/trace.c
-+++ b/libsandbox/trace.c
-@@ -504,8 +504,9 @@ void trace_main(const char *filename, char *const argv[])
- /* Not all kernel versions support this, so ignore return */
- ptrace(PTRACE_SETOPTIONS, trace_pid, NULL, (void *)PTRACE_O_TRACESYSGOOD);
- #endif
-+ sb_close_all_fds();
- trace_loop();
-- return;
-+ sb_ebort("ISE: child should have quit, as should we\n");
- }
-
- sb_debug("child setting up ...");
-diff --git a/libsbutil/sb_close.c b/libsbutil/sb_close.c
-index 17a4560..5379197 100644
---- a/libsbutil/sb_close.c
-+++ b/libsbutil/sb_close.c
-@@ -29,3 +29,27 @@ int sb_close(int fd)
-
- return res;
- }
-+
-+/* Quickly close all the open fds (good for daemonization) */
-+void sb_close_all_fds(void)
-+{
-+ DIR *dirp;
-+ struct dirent *de;
-+ int dfd, fd;
-+ const char *fd_dir = sb_get_fd_dir();
-+
-+ dirp = opendir(fd_dir);
-+ if (!dirp)
-+ sb_ebort("could not process %s\n", fd_dir);
-+ dfd = dirfd(dirp);
-+
-+ while ((de = readdir(dirp)) != NULL) {
-+ if (de->d_name[0] == '.')
-+ continue;
-+ fd = atoi(de->d_name);
-+ if (fd != dfd)
-+ close(fd);
-+ }
-+
-+ closedir(dirp);
-+}
-diff --git a/libsbutil/sbutil.h b/libsbutil/sbutil.h
-index 02b88cb..479734b 100644
---- a/libsbutil/sbutil.h
-+++ b/libsbutil/sbutil.h
-@@ -97,6 +97,7 @@ int sb_open(const char *path, int flags, mode_t mode);
- size_t sb_read(int fd, void *buf, size_t count);
- size_t sb_write(int fd, const void *buf, size_t count);
- int sb_close(int fd);
-+void sb_close_all_fds(void);
- int sb_copy_file_to_fd(const char *file, int ofd);
-
- /* Reliable output */
---
-1.8.1.2
-
diff --git a/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch b/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch
deleted file mode 100644
index 7e73822..0000000
--- a/sys-apps/sandbox/files/sandbox-2.6-trace-hppa.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7b01f6103a9baddaf0252e7f850a4cef91a48b67 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 6 Jul 2012 14:58:16 -0400
-Subject: [PATCH] libsandbox: fix hppa trace code
-
-URL: https://bugs.gentoo.org/425062
-Reported-by: Jeroen Roovers <jer@gentoo.org>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libsandbox/trace/linux/hppa.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libsandbox/trace/linux/hppa.c b/libsandbox/trace/linux/hppa.c
-index d23b0d1..5414354 100644
---- a/libsandbox/trace/linux/hppa.c
-+++ b/libsandbox/trace/linux/hppa.c
-@@ -1,5 +1,5 @@
--#define trace_reg_sysnum (20 * 4) /* PT_GR20 */
--#define trace_reg_ret (28 * 4) /* PT_GR28 */
-+#define trace_reg_sysnum gr[20]
-+#define trace_reg_ret gr[28]
-
- static unsigned long trace_arg(void *vregs, int num)
- {
---
-1.7.9.7
-
diff --git a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml
deleted file mode 100644
index 9e13eae..0000000
--- a/sys-apps/sandbox/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-
-<!-- portage lacks a herd. correct this when we have one. -->
-
-<maintainer>
- <email>sandbox@gentoo.org</email>
- <description>Sandbox Maintainers</description>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/sandbox/sandbox-2.6-r999.ebuild b/sys-apps/sandbox/sandbox-2.6-r999.ebuild
deleted file mode 100644
index 1221d28..0000000
--- a/sys-apps/sandbox/sandbox-2.6-r999.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sandbox/sandbox-2.6-r1.ebuild,v 1.16 2014/01/18 01:59:21 vapier Exp $
-
-#
-# don't monkey with this ebuild unless contacting portage devs.
-# period.
-#
-
-inherit eutils flag-o-matic toolchain-funcs multilib unpacker multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/sandbox/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="multilib"
-
-DEPEND="app-arch/xz-utils
- >=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-EMULTILIB_PKG="true"
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
- ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
- ewarn "FEATURES=-sandbox emerge sandbox"
-}
-
-sb_get_install_abis() { use multilib && get_install_abis || echo ${ABI:-default} ; }
-
-sb_foreach_abi() {
- local OABI=${ABI}
- for ABI in $(sb_get_install_abis) ; do
- cd "${WORKDIR}/build-${ABI}"
- einfo "Running $1 for ABI=${ABI}..."
- "$@"
- done
- ABI=${OABI}
-}
-
-src_unpack() {
- unpacker
- cd "${S}"
- epatch "${FILESDIR}"/${P}-trace-hppa.patch #425062
- epatch "${FILESDIR}"/${P}-log-var.patch
- epatch "${FILESDIR}"/${P}-static-close-fd.patch #364877
- epatch "${FILESDIR}"/${P}-desktop.patch #443672
- epatch "${FILESDIR}"/${P}-open-nofollow.patch #413441
- epatch "${FILESDIR}"/${P}-check-empty-paths-at.patch #346929
- epatch "${FILESDIR}"/${P}-no-pch.patch #425524
- epatch "${FILESDIR}"/${P}-musl.patch
- epatch "${FILESDIR}"/${P}-include-PROTECTED-symbols.patch
- epatch_user
-}
-
-sb_configure() {
- mkdir "${WORKDIR}/build-${ABI}"
- cd "${WORKDIR}/build-${ABI}"
-
- use multilib && multilib_toolchain_setup ${ABI}
-
- # hack for conflict between powerpc bits/user.h and asm/ptrace.h
- use elibc_musl && append-cppflags -D_ASM_POWERPC_PTRACE_H
-
- einfo "Configuring sandbox for ABI=${ABI}..."
- ECONF_SOURCE="../${P}/" \
- econf ${myconf} || die
-}
-
-sb_compile() {
- emake || die
-}
-
-src_compile() {
- filter-lfs-flags #90228
-
- # Run configures in parallel!
- multijob_init
- local OABI=${ABI}
- for ABI in $(sb_get_install_abis) ; do
- multijob_child_init sb_configure
- done
- ABI=${OABI}
- multijob_finish
-
- sb_foreach_abi sb_compile
-}
-
-sb_test() {
- emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)" || die
-}
-
-src_test() {
- sb_foreach_abi sb_test
-}
-
-sb_install() {
- emake DESTDIR="${D}" install || die
- insinto /etc/sandbox.d #333131
- doins etc/sandbox.d/00default || die
-}
-
-src_install() {
- sb_foreach_abi sb_install
-
- doenvd "${FILESDIR}"/09sandbox
-
- keepdir /var/log/sandbox
- fowners root:portage /var/log/sandbox
- fperms 0770 /var/log/sandbox
-
- cd "${S}"
- dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
- chown root:portage "${D}"/var/log/sandbox
- chmod 0770 "${D}"/var/log/sandbox
-
- local old=$(find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
- if [[ -n ${old} ]] ; then
- elog "Removing old sandbox libraries for you:"
- elog ${old//${ROOT}}
- find "${ROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -exec rm -fv {} \;
- fi
-}
-
-pkg_postinst() {
- chmod 0755 "${ROOT}"/etc/sandbox.d #265376
-
- # Sandbox builds on mips-musl but fails to run
- use mips && chmod -x "${ROOT}"/usr/bin/sandbox
-}
diff --git a/sys-apps/shadow/files/default/useradd b/sys-apps/shadow/files/default/useradd
deleted file mode 100644
index ae81dbb..0000000
--- a/sys-apps/shadow/files/default/useradd
+++ /dev/null
@@ -1,7 +0,0 @@
-# useradd defaults file
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
diff --git a/sys-apps/shadow/files/login.defs b/sys-apps/shadow/files/login.defs
deleted file mode 100644
index 4aa7044..0000000
--- a/sys-apps/shadow/files/login.defs
+++ /dev/null
@@ -1,212 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# $Id: login.defs,v 1.6 2006/03/12 23:47:08 flameeyes Exp $
-#
-# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed. All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux. --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY 3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB yes
-SYSLOG_SG_ENAB yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names. Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE /etc/securetty
-#CONSOLE console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE /var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100 tty01".
-#
-#TTYTYPE_FILE /etc/ttytype
-
-#
-# If defined, the command name to display when running "su -". For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su". If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME su
-
-#
-# *REQUIRED*
-# Directory where mailboxes reside, _or_ name of file, relative to the
-# home directory. If you _do_ define both, MAIL_DIR takes precedence.
-#
-MAIL_DIR /var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence. If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file. If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE .hushlogin
-#HUSHLOGIN_FILE /etc/hushlogins
-
-#
-# *REQUIRED* The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-# TTYGROUP Login tty will be assigned this group ownership.
-# TTYPERM Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP tty
-TTYPERM 0600
-
-#
-# Login configuration initializations:
-#
-# ERASECHAR Terminal ERASE character ('\010' = backspace).
-# KILLCHAR Terminal KILL character ('\025' = CTRL/U).
-# UMASK Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR 0177
-KILLCHAR 025
-UMASK 022
-
-#
-# Password aging controls:
-#
-# PASS_MAX_DAYS Maximum number of days a password may be used.
-# PASS_MIN_DAYS Minimum number of days allowed between password changes.
-# PASS_WARN_AGE Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS 99999
-PASS_MIN_DAYS 0
-PASS_WARN_AGE 7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN 1000
-UID_MAX 60000
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN 100
-GID_MAX 60000
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES 3
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT 60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone). If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-#
-CHFN_RESTRICT rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting). Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD /usr/sbin/userdel_local
-
-#
-# When prompting for password without echo, getpass() can optionally
-# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*'
-# characters for each character typed. This feature is designed to
-# confuse people looking over your shoulder when you enter a password :-).
-# Also, the new getpass() accepts both Backspace (8) and Delete (127)
-# keys to delete previous character (to cope with different terminal
-# types), Control-U to delete all characters, and beeps when there are
-# no more characters to delete, or too many characters entered.
-#
-# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour -
-# exactly one '*' displayed for each character typed.
-#
-# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace,
-# Delete, Control-U and beep continue to work as described above).
-#
-# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass()
-# without any new features. This is the default.
-#
-GETPASS_ASTERISKS 0
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/sys-apps/shadow/files/login.pamd.3 b/sys-apps/shadow/files/login.pamd.3
deleted file mode 100644
index 13abd27..0000000
--- a/sys-apps/shadow/files/login.pamd.3
+++ /dev/null
@@ -1,6 +0,0 @@
-auth required pam_securetty.so
-auth include system-local-login
-
-account include system-local-login
-password include system-local-login
-session include system-local-login
diff --git a/sys-apps/shadow/files/login_defs.awk b/sys-apps/shadow/files/login_defs.awk
deleted file mode 100644
index 56087c6..0000000
--- a/sys-apps/shadow/files/login_defs.awk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Fixes up login defs for PAM by commenting all non-PAM options and adding a
-# comment that it is not supported with PAM.
-#
-# Call with lib/getdef.c and etc/login.defs as args in the root source directory
-# of shadow, ie:
-#
-# gawk -f login_defs.awk lib/getdef.c etc/login.defs > login.defs.new
-#
-
-(FILENAME == "lib/getdef.c") {
- if ($2 == "USE_PAM")
- start_printing = 1
- else if ($1 == "#endif")
- nextfile
- else if (start_printing == 1)
- VARS[count++] = substr($1, 3, length($1) - 4)
-}
-
-(FILENAME != "lib/getdef.c") {
- print_line = 1
- for (x in VARS) {
- regex = "(^|#)" VARS[x]
- if ($0 ~ regex) {
- print_line = 0
- printf("%s%s\t(NOT SUPPORTED WITH PAM)\n",
- ($0 ~ /^#/) ? "" : "#", $0)
- }
- }
- if (print_line)
- print $0
-}
-
diff --git a/sys-apps/shadow/files/login_defs_pam.sed b/sys-apps/shadow/files/login_defs_pam.sed
deleted file mode 100644
index ba308ba..0000000
--- a/sys-apps/shadow/files/login_defs_pam.sed
+++ /dev/null
@@ -1,24 +0,0 @@
-/^FAILLOG_ENAB/b comment
-/^LASTLOG_ENAB/b comment
-/^MAIL_CHECK_ENAB/b comment
-/^OBSCURE_CHECKS_ENAB/b comment
-/^PORTTIME_CHECKS_ENAB/b comment
-/^QUOTAS_ENAB/b comment
-/^MOTD_FILE/b comment
-/^FTMP_FILE/b comment
-/^NOLOGINS_FILE/b comment
-/^ENV_HZ/b comment
-/^PASS_MIN_LEN/b comment
-/^SU_WHEEL_ONLY/b comment
-/^CRACKLIB_DICTPATH/b comment
-/^PASS_CHANGE_TRIES/b comment
-/^PASS_ALWAYS_WARN/b comment
-/^CHFN_AUTH/b comment
-/^ENVIRON_FILE/b comment
-
-b exit
-
-: comment
- s:^:#:
-
-: exit
diff --git a/sys-apps/shadow/files/pam.d-include/login b/sys-apps/shadow/files/pam.d-include/login
deleted file mode 100644
index 9d21677..0000000
--- a/sys-apps/shadow/files/pam.d-include/login
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-
-auth required pam_securetty.so
-auth include system-auth
-auth required pam_nologin.so
-
-account include system-auth
-
-password include system-auth
-
-session include system-auth
-session optional pam_console.so
diff --git a/sys-apps/shadow/files/pam.d-include/other b/sys-apps/shadow/files/pam.d-include/other
deleted file mode 100644
index bb0b964..0000000
--- a/sys-apps/shadow/files/pam.d-include/other
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-
-auth required pam_deny.so
-
-account required pam_deny.so
-
-password required pam_deny.so
-
-session required pam_deny.so
diff --git a/sys-apps/shadow/files/pam.d-include/passwd b/sys-apps/shadow/files/pam.d-include/passwd
deleted file mode 100644
index 960b32e..0000000
--- a/sys-apps/shadow/files/pam.d-include/passwd
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-
-auth sufficient pam_rootok.so
-auth include system-auth
-
-account include system-auth
-
-password include system-auth
diff --git a/sys-apps/shadow/files/pam.d-include/shadow b/sys-apps/shadow/files/pam.d-include/shadow
deleted file mode 100644
index 743b2f0..0000000
--- a/sys-apps/shadow/files/pam.d-include/shadow
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-
-auth sufficient pam_rootok.so
-auth required pam_permit.so
-
-account include system-auth
-
-password required pam_permit.so
diff --git a/sys-apps/shadow/files/pam.d-include/su b/sys-apps/shadow/files/pam.d-include/su
deleted file mode 100644
index d15c7ed..0000000
--- a/sys-apps/shadow/files/pam.d-include/su
+++ /dev/null
@@ -1,32 +0,0 @@
-#%PAM-1.0
-
-auth sufficient pam_rootok.so
-
-# If you want to restrict users begin allowed to su even more,
-# create /etc/security/suauth.allow (or to that matter) that is only
-# writable by root, and add users that are allowed to su to that
-# file, one per line.
-#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow
-
-# Uncomment this to allow users in the wheel group to su without
-# entering a passwd.
-#auth sufficient pam_wheel.so use_uid trust
-
-# Alternatively to above, you can implement a list of users that do
-# not need to supply a passwd with a list.
-#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass
-
-# Comment this to allow any user, even those not in the 'wheel'
-# group to su
-auth required pam_wheel.so use_uid
-
-auth include system-auth
-
-account include system-auth
-
-password include system-auth
-
-session include system-auth
-session required pam_env.so
-session optional pam_xauth.so
-
diff --git a/sys-apps/shadow/files/pam.d-include/su-openpam b/sys-apps/shadow/files/pam.d-include/su-openpam
deleted file mode 100644
index e9ec7d3..0000000
--- a/sys-apps/shadow/files/pam.d-include/su-openpam
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-
-auth sufficient pam_rootok.so
-
-auth include system-auth
-
-account include system-auth
-
-password include system-auth
-
-session include system-auth
-session required pam_env.so
-session optional pam_xauth.so
-
diff --git a/sys-apps/shadow/files/pam.d-include/system-auth b/sys-apps/shadow/files/pam.d-include/system-auth
deleted file mode 100644
index b7c37af..0000000
--- a/sys-apps/shadow/files/pam.d-include/system-auth
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-
-auth required pam_env.so
-auth sufficient pam_unix.so likeauth nullok nodelay
-auth required pam_deny.so
-
-account required pam_unix.so
-
-password required pam_cracklib.so retry=3
-password sufficient pam_unix.so nullok md5 shadow use_authtok
-password required pam_deny.so
-
-session required pam_limits.so
-session required pam_unix.so
diff --git a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sys-apps/shadow/files/pam.d-include/system-auth-1.1
deleted file mode 100644
index fe80483..0000000
--- a/sys-apps/shadow/files/pam.d-include/system-auth-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-
-auth required pam_env.so
-auth sufficient pam_unix.so likeauth nullok
-auth required pam_deny.so
-
-account required pam_unix.so
-
-password required pam_cracklib.so retry=3
-password sufficient pam_unix.so nullok md5 shadow use_authtok
-password required pam_deny.so
-
-session required pam_limits.so
-session required pam_unix.so
diff --git a/sys-apps/shadow/files/securetty b/sys-apps/shadow/files/securetty
deleted file mode 100644
index c7042fa..0000000
--- a/sys-apps/shadow/files/securetty
+++ /dev/null
@@ -1,33 +0,0 @@
-# /etc/securetty: list of terminals on which root is allowed to login.
-# See securetty(5) and login(1).
-console
-
-vc/0
-vc/1
-vc/2
-vc/3
-vc/4
-vc/5
-vc/6
-vc/7
-vc/8
-vc/9
-vc/10
-vc/11
-vc/12
-tty0
-tty1
-tty2
-tty3
-tty4
-tty5
-tty6
-tty7
-tty8
-tty9
-tty10
-tty11
-tty12
-
-tts/0
-ttyS0
diff --git a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch b/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch
deleted file mode 100644
index efcb33d..0000000
--- a/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- shadow-4.1.3/libmisc/chkname.c
-+++ shadow-4.1.3/libmisc/chkname.c
-@@ -66,6 +66,7 @@
- ( ('0' <= *name) && ('9' >= *name) ) ||
- ('_' == *name) ||
- ('-' == *name) ||
-+ ('.' == *name) ||
- ( ('$' == *name) && ('\0' == *(name + 1)) )
- )) {
- return false;
diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch b/sys-apps/shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch
deleted file mode 100644
index 35ed22e..0000000
--- a/sys-apps/shadow/files/shadow-4.1.5.1-fix-RUSEROK.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur shadow-4.1.5.1.orig/libmisc/rlogin.c shadow-4.1.5.1/libmisc/rlogin.c
---- shadow-4.1.5.1.orig/libmisc/rlogin.c 2009-07-12 22:24:45.000000000 +0000
-+++ shadow-4.1.5.1/libmisc/rlogin.c 2013-07-06 11:01:09.415878105 +0000
-@@ -187,7 +187,7 @@
- * go fix the #define in config.h.
- */
-
--#ifndef RUSEROK
-+#if RUSEROK == 0
- return 0;
- #else
- return ruserok (remote_host, pwd->pw_uid == 0,
diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-fix-struct_in_addr-collision.patch b/sys-apps/shadow/files/shadow-4.1.5.1-fix-struct_in_addr-collision.patch
deleted file mode 100644
index 6761ff9..0000000
--- a/sys-apps/shadow/files/shadow-4.1.5.1-fix-struct_in_addr-collision.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur shadow-4.1.5.1.orig/libmisc/utmp.c shadow-4.1.5.1/libmisc/utmp.c
---- shadow-4.1.5.1.orig/libmisc/utmp.c 2014-01-16 13:59:51.517973402 +0000
-+++ shadow-4.1.5.1/libmisc/utmp.c 2014-01-16 14:00:13.147974612 +0000
-@@ -45,8 +45,6 @@
- #include <netdb.h>
- #include <stdio.h>
- #include <sys/socket.h>
--#include <linux/in.h>
--#include <linux/in6.h>
-
- #ident "$Id: utmp.c 3720 2012-05-18 17:57:52Z nekral-guest $"
-
diff --git a/sys-apps/shadow/files/shadow-4.1.5.1-include-sys-socket.patch b/sys-apps/shadow/files/shadow-4.1.5.1-include-sys-socket.patch
deleted file mode 100644
index 0b93c9d..0000000
--- a/sys-apps/shadow/files/shadow-4.1.5.1-include-sys-socket.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur shadow-4.1.5.1.orig/libmisc/utmp.c shadow-4.1.5.1/libmisc/utmp.c
---- shadow-4.1.5.1.orig/libmisc/utmp.c 2012-05-18 17:57:54.000000000 +0000
-+++ shadow-4.1.5.1/libmisc/utmp.c 2013-07-06 03:49:09.871428783 +0000
-@@ -44,6 +44,9 @@
- #include <assert.h>
- #include <netdb.h>
- #include <stdio.h>
-+#include <sys/socket.h>
-+#include <linux/in.h>
-+#include <linux/in6.h>
-
- #ident "$Id: utmp.c 3720 2012-05-18 17:57:52Z nekral-guest $"
-
diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
deleted file mode 100644
index 5979227..0000000
--- a/sys-apps/shadow/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<herd>pam</herd> <!-- only for USE=pam -->
-<use>
- <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-apps/shadow/shadow-4.1.5.1-r99.ebuild b/sys-apps/shadow/shadow-4.1.5.1-r99.ebuild
deleted file mode 100644
index 26536e6..0000000
--- a/sys-apps/shadow/shadow-4.1.5.1-r99.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1.ebuild,v 1.4 2013/03/12 14:19:37 vapier Exp $
-
-EAPI=4
-
-inherit eutils libtool toolchain-funcs pam multilib
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/"
-SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="acl audit cracklib nls pam selinux skey xattr"
-
-RDEPEND="acl? ( sys-apps/acl )
- audit? ( sys-process/audit )
- cracklib? ( >=sys-libs/cracklib-2.7-r3 )
- pam? ( virtual/pam )
- skey? ( sys-auth/skey )
- selinux? (
- >=sys-libs/libselinux-1.28
- sys-libs/libsemanage
- )
- nls? ( virtual/libintl )
- xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
- pam? ( >=sys-auth/pambase-20120417 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920
- epatch "${FILESDIR}"/${P}-include-sys-socket.patch
- epatch "${FILESDIR}"/${P}-fix-RUSEROK.patch
- epatch "${FILESDIR}"/${P}-fix-struct_in_addr-collision.patch
- epatch_user
- elibtoolize
-}
-
-src_configure() {
- tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes
- econf \
- --without-group-name-max-length \
- --without-tcb \
- --enable-shared=no \
- --enable-static=yes \
- $(use_with acl) \
- $(use_with audit) \
- $(use_with cracklib libcrack) \
- $(use_with pam libpam) \
- $(use_with skey) \
- $(use_with selinux) \
- $(use_enable nls) \
- $(use_with elibc_glibc nscd) \
- $(use_with xattr attr)
- has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-}
-
-set_login_opt() {
- local comment="" opt=$1 val=$2
- [[ -z ${val} ]] && comment="#"
- sed -i -r \
- -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \
- "${D}"/etc/login.defs
- local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs)
- einfo ${res:-Unable to find ${opt} in /etc/login.defs}
-}
-
-src_install() {
- emake DESTDIR="${D}" suidperms=4711 install
-
- # Remove libshadow and libmisc; see bug 37725 and the following
- # comment from shadow's README.linux:
- # Currently, libshadow.a is for internal use only, so if you see
- # -lshadow in a Makefile of some other package, it is safe to
- # remove it.
- rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
- insinto /etc
- # Using a securetty with devfs device names added
- # (compat names kept for non-devfs compatibility)
- insopts -m0600 ; doins "${FILESDIR}"/securetty
- if ! use pam ; then
- insopts -m0600
- doins etc/login.access etc/limits
- fi
- # Output arch-specific cruft
- local devs
- case $(tc-arch) in
- ppc*) devs="hvc0 hvsi0 ttyPSC0";;
- hppa) devs="ttyB0";;
- arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttymxc2 ttymxc3 ttyO0 ttyO1 ttyO2";;
- sh) devs="ttySC0 ttySC1";;
- esac
- [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty
-
- # needed for 'useradd -D'
- insinto /etc/default
- insopts -m0600
- doins "${FILESDIR}"/default/useradd
-
- # move passwd to / to help recover broke systems #64441
- mv "${D}"/usr/bin/passwd "${D}"/bin/
- dosym /bin/passwd /usr/bin/passwd
-
- cd "${S}"
- insinto /etc
- insopts -m0644
- newins etc/login.defs login.defs
-
- if ! use pam ; then
- set_login_opt MAIL_CHECK_ENAB no
- set_login_opt SU_WHEEL_ONLY yes
- set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
- set_login_opt LOGIN_RETRIES 3
- set_login_opt ENCRYPT_METHOD SHA512
- else
- dopamd "${FILESDIR}"/pam.d-include/shadow
-
- for x in chpasswd chgpasswd newusers; do
- newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
- done
-
- for x in chage chsh chfn \
- user{add,del,mod} group{add,del,mod} ; do
- newpamd "${FILESDIR}"/pam.d-include/shadow ${x}
- done
-
- # comment out login.defs options that pam hates
- local opt
- for opt in \
- CHFN_AUTH \
- CRACKLIB_DICTPATH \
- ENV_HZ \
- ENVIRON_FILE \
- FAILLOG_ENAB \
- FTMP_FILE \
- LASTLOG_ENAB \
- MAIL_CHECK_ENAB \
- MOTD_FILE \
- NOLOGINS_FILE \
- OBSCURE_CHECKS_ENAB \
- PASS_ALWAYS_WARN \
- PASS_CHANGE_TRIES \
- PASS_MIN_LEN \
- PORTTIME_CHECKS_ENAB \
- QUOTAS_ENAB \
- SU_WHEEL_ONLY
- do
- set_login_opt ${opt}
- done
-
- sed -i -f "${FILESDIR}"/login_defs_pam.sed \
- "${D}"/etc/login.defs
-
- # remove manpages that pam will install for us
- # and/or don't apply when using pam
- find "${D}"/usr/share/man \
- '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
- -exec rm {} +
-
- # Remove pam.d files provided by pambase.
- rm "${D}"/etc/pam.d/{login,passwd,su} || die
- fi
-
- # Remove manpages that are handled by other packages
- find "${D}"/usr/share/man \
- '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
- -exec rm {} +
-
- cd "${S}"
- dodoc ChangeLog NEWS TODO
- newdoc README README.download
- cd doc
- dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
- rm -f "${ROOT}"/etc/pam.d/system-auth.new \
- "${ROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
- # Enable shadow groups.
- if [ ! -f "${ROOT}"/etc/gshadow ] ; then
- if grpck -r -R "${ROOT}" 2>/dev/null ; then
- grpconv -R "${ROOT}"
- else
- ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
- ewarn "run 'grpconv' afterwards!"
- fi
- fi
-
- einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87
deleted file mode 100644
index cf07548..0000000
--- a/sys-apps/sysvinit/files/inittab-2.87
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# /etc/inittab: This file describes how the INIT process should set up
-# the system in a certain run-level.
-#
-# Author: Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by: Daniel Robbins, <drobbins@gentoo.org>
-# Modified by: Martin Schlemmer, <azarah@gentoo.org>
-# Modified by: Mike Frysinger, <vapier@gentoo.org>
-# Modified by: Robin H. Johnson, <robbat2@gentoo.org>
-#
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.2 2013/04/20 03:51:26 vapier Exp $
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown
-l0s:0:wait:/sbin/halt -dhp
-l1:1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-l6r:6:wait:/sbin/reboot -dk
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/rc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
diff --git a/sys-apps/sysvinit/files/reboot.sh b/sys-apps/sysvinit/files/reboot.sh
deleted file mode 100755
index 3e50f71..0000000
--- a/sys-apps/sysvinit/files/reboot.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="-dpk"
-[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i"
-
-/sbin/reboot "${opts}" 2>/dev/null
-
-# hmm, if the above failed, that's kind of odd ...
-# so let's force a reboot
-/sbin/reboot -f
diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh
deleted file mode 100755
index 502ef52..0000000
--- a/sys-apps/sysvinit/files/shutdown.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="-d"
-[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p"
-[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i"
-[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h"
-
-/sbin/halt "${opts}"
-
-# hmm, if the above failed, that's kind of odd ...
-# so let's force a halt
-/sbin/halt -f
diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch
deleted file mode 100644
index 4948806..0000000
--- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-halt: add a -k kexec flag
-
---- a/man/halt.8
-+++ b/man/halt.8
-@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system.
- .RB [ \-d ]
- .RB [ \-f ]
- .RB [ \-i ]
-+.RB [ \-k ]
- .br
- .B /sbin/poweroff
- .RB [ \-n ]
-@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off
- .IP \fB\-p\fP
- When halting the system, switch off the power. This is the default when halt is
- called as \fBpoweroff\fP.
-+.IP \fB\-k\fP
-+Try to reboot using \fBkexec\fP, if kernel supports it.
- .\"}}}
- .\"{{{ Diagnostics
- .SH DIAGNOSTICS
---- a/src/halt.c
-+++ b/src/halt.c
-@@ -8,7 +8,7 @@
- * execute an "shutdown -r". This is for compatibility with
- * sysvinit 2.4.
- *
-- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p]
-+ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k]
- * -n: don't sync before halting the system
- * -w: only write a wtmp reboot record and exit.
- * -d: don't write a wtmp record.
-@@ -16,6 +16,7 @@
- * -h: put harddisks in standby mode
- * -i: shut down all network interfaces.
- * -p: power down the system (if possible, otherwise halt).
-+ * -k: reboot the system using kexec.
- *
- * Reboot and halt are both this program. Reboot
- * is just a link to halt. Invoking the program
-@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line);
- */
- void usage(void)
- {
-- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n",
-- progname, strcmp(progname, "halt") ? "" : " [-p]");
-+ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n",
-+ progname,
-+ strcmp(progname, "halt") ? "" : " [-p]",
-+ strcmp(progname, "reboot") ? "" : " [-k]");
- fprintf(stderr, "\t-n: don't sync before halting the system\n");
- fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n");
- fprintf(stderr, "\t-d: don't write a wtmp record.\n");
-@@ -84,6 +87,8 @@ void usage(void)
- fprintf(stderr, "\t-i: shut down all network interfaces.\n");
- if (!strcmp(progname, "halt"))
- fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n");
-+ if (!strcmp(progname, "reboot"))
-+ fprintf(stderr, "\t-k: reboot the system using kexec.\n");
- exit(1);
- }
-
-@@ -182,6 +187,7 @@ int main(int argc, char **argv)
- int do_ifdown = 0;
- int do_hddown = 0;
- int do_poweroff = 0;
-+ int do_kexec = 0;
- int c;
- char *tm = NULL;
-
-@@ -201,7 +207,7 @@ int main(int argc, char **argv)
- /*
- * Get flags
- */
-- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) {
-+ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) {
- switch(c) {
- case 'n':
- do_sync = 0;
-@@ -225,6 +231,9 @@ int main(int argc, char **argv)
- case 'p':
- do_poweroff = 1;
- break;
-+ case 'k':
-+ do_kexec = 1;
-+ break;
- case 't':
- tm = optarg;
- break;
-@@ -242,10 +251,24 @@ int main(int argc, char **argv)
- (void)chdir("/");
-
- if (!do_hard && !do_nothing) {
-+ c = get_runlevel();
-+
-+ /*
-+ * We can't reboot using kexec through this path.
-+ */
-+ if (c != '6' && do_reboot && do_kexec) {
-+ fprintf(stderr, "ERROR: using -k at this"
-+ " runlevel requires also -f\n"
-+ " (You probably want instead to reboot"
-+ " normally and let your reboot\n"
-+ " script, usually /etc/init.d/reboot,"
-+ " specify -k)\n");
-+ exit(1);
-+ }
-+
- /*
- * See if we are in runlevel 0 or 6.
- */
-- c = get_runlevel();
- if (c != '0' && c != '6')
- do_shutdown(do_reboot ? "-r" : "-h", tm);
- }
-@@ -277,6 +300,15 @@ int main(int argc, char **argv)
- if (do_nothing) exit(0);
-
- if (do_reboot) {
-+ /*
-+ * kexec or reboot
-+ */
-+ if (do_kexec)
-+ init_reboot(BMAGIC_KEXEC);
-+
-+ /*
-+ * Fall through if failed
-+ */
- init_reboot(BMAGIC_REBOOT);
- } else {
- /*
---- a/src/reboot.h
-+++ b/src/reboot.h
-@@ -47,5 +47,8 @@
- # define BMAGIC_POWEROFF BMAGIC_HALT
- #endif
-
-+/* for kexec support */
-+#define BMAGIC_KEXEC 0x45584543
-+
- #define init_reboot(magic) reboot(magic)
-
diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch
deleted file mode 100644
index b8e403f..0000000
--- a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch makes shutdown use the Single User runlevel by default so
-the gettys are shutdown too.
-
-Roy Marples <uberlord@gentoo.org>
-
---- a/man/shutdown.8
-+++ b/man/shutdown.8
-@@ -44,7 +44,7 @@ mail and news processing programs a chance to exit cleanly, etc.
- \fBshutdown\fP does its job by signalling the \fBinit\fP process,
- asking it to change the runlevel.
- Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used
--to reboot the system, and runlevel \fB1\fP is used to put to system into
-+to reboot the system, and runlevel \fBS\fP is used to put to system into
- a state where administrative tasks can be performed; this is the default
- if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP.
- To see which actions are taken on halt or reboot see the appropriate
---- a/src/shutdown.c
-+++ b/src/shutdown.c
-@@ -506,7 +506,7 @@ int main(int argc, char **argv)
- usage();
- exit(1);
- }
-- strcpy(down_level, "1");
-+ strcpy(down_level, "S");
- halttype = NULL;
-
- /* Process the options. */
-@@ -685,6 +685,8 @@ int main(int argc, char **argv)
- strcpy(newstate, "for reboot");
- break;
- case '1':
-+ case 'S':
-+ case 's':
- strcpy(newstate, "to maintenance mode");
- break;
- default:
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch
deleted file mode 100644
index 22f463c..0000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://savannah.nongnu.org/bugs/index.php?29758
-
-From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001
-From: wfink <wfink@456724a4-4300-0410-8514-c89748c515a2>
-Date: Tue, 4 May 2010 07:50:12 +0000
-Subject: [PATCH] Fix sysvinit bug #29758
-
-git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2
-
-diff --git a/src/Makefile b/src/Makefile
-index e2b8028..19675c5 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN)
- init: LDLIBS += $(INITLIBS) $(STATIC)
- init: init.o init_utmp.o
-
--halt: halt.o ifdown.o hddown.o utmp.o reboot.h
-+halt: halt.o ifdown.o hddown.o utmp.o
-
--last: last.o oldutmp.h
-+last: last.o
-
- mesg: mesg.o
-
-@@ -109,7 +109,7 @@ sulogin: sulogin.o
-
- wall: dowall.o wall.o
-
--shutdown: dowall.o shutdown.o utmp.o reboot.h
-+shutdown: dowall.o shutdown.o utmp.o
-
- bootlogd: LDLIBS += -lutil
- bootlogd: bootlogd.o
-@@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF)
- sulogin.o: sulogin.c
-
- init.o: CPPFLAGS += $(SELINUX_DEF)
--init.o: init.c init.h set.h reboot.h initreq.h
-+init.o: init.c init.h initreq.h paths.h reboot.h set.h
-
--utmp.o: utmp.c init.h
-+utmp.o:
-
- init_utmp.o: CPPFLAGS += -DINIT_MAIN
--init_utmp.o: utmp.c init.h
-+init_utmp.o: utmp.c init.h initreq.h paths.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
-
-+utmpdump.o: utmpdump.c oldutmp.h
-+
-+shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h
-+
-+halt.o: halt.c reboot.h
-+
-+last.o: last.c oldutmp.h
-+
- cleanobjs:
- rm -f *.o *.bak
-
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch b/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch
deleted file mode 100644
index 6011278..0000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sysvinit-2.88dsf.org/src/init.c
-+++ sysvinit-2.88dsf/src/init.c
-@@ -51,6 +51,7 @@
- #include <stdarg.h>
- #include <sys/syslog.h>
- #include <sys/time.h>
-+#include <sys/ttydefaults.h>
-
- #ifdef WITH_SELINUX
- # include <selinux/selinux.h>
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch
deleted file mode 100644
index 91b7435..0000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90
-https://bugs.gentoo.org/326697
-
---- sysvinit/trunk/src/init.c 2010/05/07 15:16:26 89
-+++ sysvinit/trunk/src/init.c 2010/05/17 09:44:34 90
-@@ -54,10 +54,6 @@
-
- #ifdef WITH_SELINUX
- # include <selinux/selinux.h>
--# include <sys/mount.h>
--# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */
--# define MNT_DETACH 2
--# endif
- #endif
-
- #ifdef __i386__
-@@ -2872,11 +2868,9 @@
-
- #ifdef WITH_SELINUX
- if (getenv("SELINUX_INIT") == NULL) {
-- const int rc = mount("proc", "/proc", "proc", 0, 0);
-- if (is_selinux_enabled() > 0) {
-- putenv("SELINUX_INIT=YES");
-- if (rc == 0) umount2("/proc", MNT_DETACH);
-+ if (is_selinux_enabled() != 1) {
- if (selinux_init_load_policy(&enforce) == 0) {
-+ putenv("SELINUX_INIT=YES");
- execv(myname, argv);
- } else {
- if (enforce > 0) {
-@@ -2887,7 +2881,6 @@
- }
- }
- }
-- if (rc == 0) umount2("/proc", MNT_DETACH);
- }
- #endif
- /* Start booting. */
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch
deleted file mode 100644
index 716999c..0000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-other inits have moved to not requiring the -h flag when used with -H/-P.
-modify sysvinit to be the same since it really doesn't matter.
-
-https://bugs.gentoo.org/449354
-
-patch by Doug Goldstein
-
---- sysvinit-2.88dsf/man/shutdown.8
-+++ sysvinit-2.88dsf/man/shutdown.8
-@@ -66,16 +66,15 @@
- .\"}}}
- .\"{{{ -h
- .IP \fB\-h\fP
--Halt or power off after shutdown.
-+Equivalent to -P, unless -H is specified.
- .\"}}}
- .\"{{{ -P
- .IP \fB\-P\fP
--Halt action is to turn off the power.
-+Action is to power-off the machine.
- .\"}}}
- .\"{{{ -H
- .IP \fB\-H\fP
--Modifier to the -h flag. Halt action is to halt or drop into boot
--monitor on systems that support it. Must be used with the -h flag.
-+Action is to halt the machine.
- .\"}}}
- .\"{{{ -f
- .IP \fB\-f\fP
---- sysvinit-2.88dsf/src/shutdown.c
-+++ sysvinit-2.88dsf/src/shutdown.c
-@@ -514,9 +514,11 @@
- switch(c) {
- case 'H':
- halttype = "HALT";
-+ down_level[0] = '0';
- break;
- case 'P':
- halttype = "POWERDOWN";
-+ down_level[0] = '0';
- break;
- case 'a': /* Access control. */
- useacl = 1;
-@@ -532,6 +534,8 @@
- break;
- case 'h': /* Halt after shutdown */
- down_level[0] = '0';
-+ if (!halttype)
-+ halttype = "POWERDOWN";
- break;
- case 'f': /* Don't perform fsck after next boot */
- fastboot = 1;
-@@ -565,12 +569,6 @@
- }
- }
-
-- if (NULL != halttype && down_level[0] != '0') {
-- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
-- usage();
-- exit(1);
-- }
--
- /* Do we need to use the shutdown.allow file ? */
- if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
-
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-apps/sysvinit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild
deleted file mode 100644
index 6fb78ce..0000000
--- a/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.88-r5.ebuild,v 1.4 2013/09/29 01:24:03 vapier Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )"
-DEPEND="${RDEPEND}
- virtual/os-headers"
-
-S=${WORKDIR}/${P}dsf
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220
- epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615
- epatch "${FILESDIR}"/${P}-makefile.patch #319197
- epatch "${FILESDIR}"/${P}-selinux.patch #326697
- epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354
- epatch "${FILESDIR}"/${P}-musl.patch
- sed -i '/^CPPFLAGS =$/d' src/Makefile || die
-
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
- sed -i -r \
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
- src/Makefile || die
-
- # pidof has moved to >=procps-3.3.9
- sed -i -r \
- -e '/\/bin\/pidof/d' \
- -e '/^MAN8/s:\<pidof.8\>::g' \
- src/Makefile || die
-
- # Mung inittab for specific architectures
- cd "${WORKDIR}"
- cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab"
- local insert=()
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
- if use ibm ; then
- insert+=(
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
- )
- fi
- (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
- if use kernel_FreeBSD ; then
- sed -i \
- -e 's/linux/cons25/g' \
- -e 's/ttyS0/cuaa0/g' \
- -e 's/ttyS1/cuaa1/g' \
- inittab #121786
- fi
- if use x86 || use amd64 ; then
- sed -i \
- -e '/ttyS[01]/s:9600:115200:' \
- inittab
- fi
- if [[ ${#insert[@]} -gt 0 ]] ; then
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
- fi
-}
-
-src_compile() {
- local myconf
-
- tc-export CC
- append-lfs-flags
- export DISTRO= #381311
- use static && append-ldflags -static
- use selinux && myconf=WITH_SELINUX=yes
- emake -C src ${myconf} || die
-}
-
-src_install() {
- emake -C src install ROOT="${D}"
- dodoc README doc/*
-
- insinto /etc
- doins "${WORKDIR}"/inittab
-
- # dead symlink
- rm -f "${D}"/usr/bin/lastb
-
- doinitd "${FILESDIR}"/{reboot,shutdown}.sh
-}
-
-pkg_postinst() {
- # Reload init to fix unmounting problems of / on next reboot.
- # This is really needed, as without the new version of init cause init
- # not to quit properly on reboot, and causes a fsck of / on next reboot.
- if [[ ${ROOT} == / ]] ; then
- # Do not return an error if this fails
- /sbin/telinit U &>/dev/null
- fi
-
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-}
diff --git a/sys-apps/tcp-wrappers/files/hosts.allow.example b/sys-apps/tcp-wrappers/files/hosts.allow.example
deleted file mode 100644
index c473eb9..0000000
--- a/sys-apps/tcp-wrappers/files/hosts.allow.example
+++ /dev/null
@@ -1,17 +0,0 @@
-# For more information, please see the hosts.allow(5) manpage
-
-# Rule format:
-# daemon : client list
-# The value for 'daemon' is determined by the name of the binary.
-# OpenSSH runs as 'sshd' so you would use 'sshd' for 'daemon'.
-# Client list can be a list of ip's or hostnames.
-
-# Allow only sshd connections from ips matching 192.168.0.*
-#sshd: 192.168.0.
-
-# Only allow sendmail connections from the localhost
-#sendmail: localhost
-
-# Allow everyone from foobar.edu to access everything except for
-# the terminalserver
-#ALL: .foobar.edu EXCEPT terminalserver.foobar.edu
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch
deleted file mode 100644
index 328a4a1..0000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch
+++ /dev/null
@@ -1,295 +0,0 @@
---- a/options.c
-+++ b/options.c
-@@ -34,6 +34,8 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
---- a/safe_finger.c
-+++ b/safe_finger.c
-@@ -20,6 +20,11 @@
-
- /* System libraries */
-
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <sys/wait.h>
-+#include <grp.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <signal.h>
-@@ -27,7 +31,7 @@
- #include <ctype.h>
- #include <pwd.h>
-
--extern void exit();
-+int pipe_stdin(char **argv);
-
- /* Local stuff */
-
---- a/scaffold.c
-+++ b/scaffold.c
-@@ -10,6 +10,7 @@
-
- /* System libraries. */
-
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -27,7 +27,4 @@
- #endif
-
--#ifndef INET6
--extern char *malloc();
--#endif
-
- /* Application-specific. */
---- a/shell_cmd.c
-+++ b/shell_cmd.c
-@@ -14,6 +14,10 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <sys/wait.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <signal.h>
-@@ -25,8 +25,6 @@
- #include <syslog.h>
- #include <string.h>
-
--extern void exit();
--
- /* Local stuff. */
-
- #include "tcpd.h"
---- a/tcpdchk.c
-+++ b/tcpdchk.c
-@@ -20,6 +20,8 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #ifdef INET6
-@@ -35,10 +36,7 @@
- #include <netdb.h>
- #include <string.h>
-
--extern int errno;
--extern void exit();
--extern int optind;
--extern char *optarg;
-+int cidr_mask_addr(char *str);
-
- #ifndef INADDR_NONE
- #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
---- a/clean_exit.c
-+++ b/clean_exit.c
-@@ -13,8 +13,8 @@
- #endif
-
- #include <stdio.h>
--
--extern void exit();
-+#include <unistd.h>
-+#include <stdlib.h>
-
- #include "tcpd.h"
-
---- a/hosts_access.c
-+++ b/hosts_access.c
-@@ -23,6 +23,7 @@
-
- /* System libraries. */
-
-+#include <stdlib.h>
- #include <sys/types.h>
- #ifdef INT32_T
- typedef uint32_t u_int32_t;
-@@ -43,8 +44,8 @@
- #include <netdb.h>
- #endif
-
--extern char *fgets();
--extern int errno;
-+static int match_pattern_ylo(const char *s, const char *pattern);
-+int cidr_mask_addr(char *str);
-
- #ifndef INADDR_NONE
- #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
---- a/inetcf.c
-+++ b/inetcf.c
-@@ -9,15 +9,14 @@
- static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
- #endif
-
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
-
--extern int errno;
--extern void exit();
--
-+#include "scaffold.h"
- #include "tcpd.h"
- #include "inetcf.h"
-
---- a/percent_x.c
-+++ b/percent_x.c
-@@ -16,12 +16,12 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
-
--extern void exit();
--
- /* Local stuff. */
-
- #include "tcpd.h"
---- a/rfc931.c
-+++ b/rfc931.c
-@@ -15,6 +15,7 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <sys/types.h>
---- a/tcpd.c
-+++ b/tcpd.c
-@@ -16,6 +16,7 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-@@ -39,6 +39,8 @@
- #include "patchlevel.h"
- #include "tcpd.h"
-
-+void fix_options(struct request_info *request);
-+
- int allow_severity = SEVERITY; /* run-time adjustable */
- int deny_severity = LOG_WARNING; /* ditto */
-
---- a/tcpdmatch.c
-+++ b/tcpdmatch.c
-@@ -19,6 +19,8 @@
-
- /* System libraries. */
-
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -30,9 +32,6 @@
- #include <setjmp.h>
- #include <string.h>
-
--extern void exit();
--extern int optind;
--extern char *optarg;
-
- #ifndef INADDR_NONE
- #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
---- a/update.c
-+++ b/update.c
-@@ -19,6 +19,7 @@
-
- /* System libraries */
-
-+#include <unistd.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
---- a/misc.c
-+++ b/misc.c
-@@ -14,11 +14,10 @@
- #include <arpa/inet.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
-
- #include "tcpd.h"
-
--extern char *fgets();
--
- #ifndef INADDR_NONE
- #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
- #endif
---- a/fix_options.c
-+++ b/fix_options.c
-@@ -32,6 +32,7 @@
-
- /* fix_options - get rid of IP-level socket options */
-
-+void
- fix_options(request)
- struct request_info *request;
- {
-@@ -38,11 +38,8 @@
- #ifdef IP_OPTIONS
- unsigned char optbuf[BUFFER_SIZE / 3], *cp;
- char lbuf[BUFFER_SIZE], *lp;
--#ifdef __GLIBC__
-- size_t optsize = sizeof(optbuf), ipproto;
--#else
-- int optsize = sizeof(optbuf), ipproto;
--#endif
-+ socklen_t optsize = sizeof(optbuf);
-+ int ipproto;
- struct protoent *ip;
- int fd = request->fd;
- unsigned int opt;
---- a/socket.c
-+++ b/socket.c
-@@ -95,11 +95,7 @@
- static struct sockaddr_in client;
- static struct sockaddr_in server;
- #endif
--#ifdef __GLIBC__
-- size_t len;
--#else
-- int len;
--#endif
-+ socklen_t len;
- char buf[BUFSIZ];
- int fd = request->fd;
-
-@@ -430,11 +426,7 @@
- #else
- struct sockaddr_in sin;
- #endif
--#ifdef __GLIBC__
-- size_t size = sizeof(sin);
--#else
-- int size = sizeof(sin);
--#endif
-+ socklen_t size;
-
- /*
- * Eat up the not-yet received datagram. Some systems insist on a
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch
deleted file mode 100644
index 4a68476..0000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-redhat-bug11881.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- tcp_wrappers_7.6/tcpd.c.bug11881
-+++ tcp_wrappers_7.6/tcpd.c
-@@ -60,10 +60,10 @@
- */
-
- if (argv[0][0] == '/') {
-- strcpy(path, argv[0]);
-+ strncpy(path, argv[0], sizeof(path));
- argv[0] = strrchr(argv[0], '/') + 1;
- } else {
-- sprintf(path, "%s/%s", REAL_DAEMON_DIR, argv[0]);
-+ snprintf(path, sizeof(path), "%s/%s", REAL_DAEMON_DIR, argv[0]);
- }
-
- /*
---- tcp_wrappers_7.6/eval.c.bug11881
-+++ tcp_wrappers_7.6/eval.c
-@@ -111,7 +111,7 @@
- return (hostinfo);
- #endif
- if (STR_NE(eval_user(request), unknown)) {
-- sprintf(both, "%s@%s", request->user, hostinfo);
-+ snprintf(both, sizeof(both), "%s@%s", request->user, hostinfo);
- return (both);
- } else {
- return (hostinfo);
-@@ -128,7 +128,7 @@
- char *daemon = eval_daemon(request);
-
- if (STR_NE(host, unknown)) {
-- sprintf(both, "%s@%s", daemon, host);
-+ snprintf(both, sizeof(both), "%s@%s", daemon, host);
- return (both);
- } else {
- return (daemon);
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch
deleted file mode 100644
index 1382c6d..0000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-remove-DECLS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h
---- tcp_wrappers_7.6.orig/tcpd.h 2013-07-06 02:14:23.070110799 +0000
-+++ tcp_wrappers_7.6/tcpd.h 2013-07-06 02:14:56.184112650 +0000
-@@ -21,8 +21,6 @@
- #include <netinet/in.h>
- #include <stdio.h>
-
--__BEGIN_DECLS
--
- /* Structure to describe one communications endpoint. */
-
- #define STRING_LENGTH 128 /* hosts, users, processes */
-@@ -259,6 +257,4 @@
- extern char *my_strtok();
- #endif
-
--__END_DECLS
--
- #endif /* tcpd.h */
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.22-remove-DECLS.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.22-remove-DECLS.patch
deleted file mode 100644
index 0fbd5ed..0000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6.22-remove-DECLS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h
---- tcp_wrappers_7.6.orig/tcpd.h 2014-03-24 18:39:52.000000000 +0000
-+++ tcp_wrappers_7.6/tcpd.h 2014-03-24 18:48:21.000000000 +0000
-@@ -11,7 +11,9 @@
- #include <netinet/in.h>
- #include <stdio.h>
-
-+#ifdef __cplusplus
- __BEGIN_DECLS
-+#endif
-
- /* Structure to describe one communications endpoint. */
-
-@@ -252,6 +254,8 @@
- extern char *my_strtok();
- #endif
-
-+#ifdef __cplusplus
- __END_DECLS
-+#endif
-
- #endif
diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
deleted file mode 100644
index 1cecd60..0000000
--- a/sys-apps/tcp-wrappers/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='netgroups'>
- Support matching NIS (host) netgroup names via the @netgroup syntax
- (if you don't know what this means, you most likely need want it)
- </flag>
-</use>
-</pkgmetadata>
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild
deleted file mode 100644
index bca5ab9..0000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r99.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.26 2013/05/14 05:46:04 radhermit Exp $
-
-inherit eutils toolchain-funcs multilib
-
-MY_P="${P//-/_}"
-PATCH_VER="1.0"
-DESCRIPTION="TCP Wrappers"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- chmod ug+w Makefile
-
- EPATCH_SUFFIX="patch"
- PATCHDIR=${WORKDIR}/${PV}
- epatch ${PATCHDIR}/${P}-makefile.patch
- epatch ${PATCHDIR}/generic
- epatch ${PATCHDIR}/${P}-shared.patch
- use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff
-
- epatch "${FILESDIR}"/${P}-remove-DECLS.patch
-}
-
-src_compile() {
- tc-export AR CC RANLIB
-
- local myconf="-DHAVE_WEAKSYMS"
- use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
-
- emake \
- REAL_DAEMON_DIR=/usr/sbin \
- GENTOO_OPT="${myconf}" \
- MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
- config-check || die "emake config-check failed"
-
- emake \
- REAL_DAEMON_DIR=/usr/sbin \
- GENTOO_OPT="${myconf}" \
- MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \
- linux || die "emake linux failed"
-}
-
-src_install() {
- dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die
-
- doman *.[358]
- dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
- dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
-
- insinto /usr/include
- doins tcpd.h
-
- into /usr
- dolib.a libwrap.a
-
- into /
- newlib.so libwrap.so libwrap.so.0.${PV}
- dosym libwrap.so.0.${PV} /$(get_libdir)/libwrap.so.0
- dosym libwrap.so.0 /$(get_libdir)/libwrap.so
- # bug #4411
- gen_usr_ldscript libwrap.so || die "gen_usr_ldscript failed"
-
- dodoc BLURB CHANGES DISCLAIMER README* "${FILESDIR}"/hosts.allow.example
-}
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild
deleted file mode 100644
index 39b8e84..0000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r99.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild,v 1.7 2014/03/16 17:17:09 maekke Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal
-
-MY_PV=$(get_version_component_range 1-2)
-DEB_PV=$(get_version_component_range 3)
-MY_P="${PN//-/_}_${MY_PV}"
-DESCRIPTION="TCP Wrappers"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
- mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.gz"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6 netgroups static-libs"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- EPATCH_OPTS="-p1" \
- epatch $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
- epatch "${FILESDIR}"/${PN}-7.6-headers.patch
- epatch "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
- epatch "${FILESDIR}"/${PN}-7.6.22-remove-DECLS.patch
-
- multilib_copy_sources
-}
-
-temake() {
- local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
- use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
- emake \
- REAL_DAEMON_DIR="${EPREFIX}"/usr/sbin \
- TLI= VSYSLOG= PARANOID= BUGS= \
- AUTH="-DALWAYS_RFC931" \
- AUX_OBJ="weak_symbols.o" \
- DOT="-DAPPEND_DOT" \
- HOSTNAME="-DALWAYS_HOSTNAME" \
- NETGROUP=$(usex netgroups -DNETGROUPS "") \
- STYLE="-DPROCESS_OPTIONS" \
- LIBS=$(usex netgroups -lnsl "") \
- LIB=$(usex static-libs libwrap.a "") \
- AR="$(tc-getAR)" ARFLAGS=rc \
- CC="$(tc-getCC)" \
- RANLIB="$(tc-getRANLIB)" \
- COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
- LDFLAGS="${LDFLAGS}" \
- "$@" || die
-}
-
-multilib_src_configure() {
- tc-export AR RANLIB
- temake config-check
-}
-
-multilib_src_compile() {
- temake all
-}
-
-multilib_src_install() {
- into /usr
- use static-libs && dolib.a libwrap.a
- dolib.so shared/libwrap.so*
-
- insinto /usr/include
- doins tcpd.h
-
- if multilib_build_binaries; then
- gen_usr_ldscript -a wrap
- dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
- fi
-}
-
-multilib_src_install_all() {
- doman *.[358]
- dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
- dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
-
- insinto /etc
- newins "${FILESDIR}"/hosts.allow.example hosts.allow
-
- dodoc BLURB CHANGES DISCLAIMER README*
-}
-
-pkg_preinst() {
- # don't clobber people with our default example config
- [[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
-}
diff --git a/sys-apps/util-linux/files/crypto-loop.confd b/sys-apps/util-linux/files/crypto-loop.confd
deleted file mode 100644
index 6a88434..0000000
--- a/sys-apps/util-linux/files/crypto-loop.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/crypto-loop: Configuration file for /etc/init.d/crypto-loop
-
-# More info can be found in the init.d script
-
-# Specify loopback configurations here. The format of this file is
-# shown in the following commented-out example. One line per loopback
-# configuration. For possible hash values, see `man hashalot`.
-
-# loop=/dev/loop0 hash='' cipher=serpent keysize=256 device=/dev/system/test other=''
diff --git a/sys-apps/util-linux/files/crypto-loop.initd b/sys-apps/util-linux/files/crypto-loop.initd
deleted file mode 100755
index 853bae2..0000000
--- a/sys-apps/util-linux/files/crypto-loop.initd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/files/crypto-loop.initd,v 1.4 2008/10/26 03:16:48 vapier Exp $
-
-depend() {
- if [ -x /etc/init.d/root ]; then
- need root
- else
- need checkroot
- fi
- need modules
- before localmount
-}
-
-start() {
- local status="0"
-
- ebegin "Starting crypto loop devices"
-
- if [ -e /etc/conf.d/crypto-loop ] ; then
- egrep "^loop" /etc/conf.d/crypto-loop | \
- while read loopline ; do
- eval ${loopline}
-
- local configured=$(awk -v MOUNT="${device}" \
- '($2 == MOUNT) { print "yes" }' /proc/mounts)
-
- if [ "${configured}" != "yes" ] ; then
- einfo " Loop ${loop} on device ${device} (cipher ${cipher}, key size ${keysize}): "
-
- if [ -n "${hash}" ] ; then
- /usr/sbin/hashalot -n ${keysize} ${hash} </dev/tty|\
- /sbin/losetup -p 0 -e ${cipher}-${keysize} ${loop} ${device} ${other}
- else
- /sbin/losetup -e ${cipher}-${keysize} ${loop} ${device} ${other}
- fi
-
- if [ $? -ne 0 ] ; then
- ewarn "Failure configuring ${loop}. Skipping."
- status=1
- fi
- else
- ewarn " Loop ${loop} on device ${device} are already configured"
- fi
- done
- fi
- ewend ${status} "Failed to start some loop devices."
-
- # We do not fail if some loop devices did not start ...
- return 0
-}
-
-stop() {
- local status="0"
- for loop in $(ls /dev/loop[0-9] 2>/dev/null) ; do
- losetup ${loop} > /dev/null 2>&1
- if [ $? -eq 0 ] ; then
- ( umount ${loop} || swapoff "${loop}" ) >/dev/null 2>&1
- if ! /sbin/losetup -d ${loop} > /dev/null 2>&1; then
- ewarn "Failure deconfiguring ${loop}."
- status=1
- fi
- fi
- done
- ewend ${status}
-}
-
-
-# vim:ts=4
diff --git a/sys-apps/util-linux/files/ttydefaults.h b/sys-apps/util-linux/files/ttydefaults.h
deleted file mode 100644
index af692ac..0000000
--- a/sys-apps/util-linux/files/ttydefaults.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _SYS_TTYDEFAULTS_H_
-#define _SYS_TTYDEFAULTS_H_
-#define TTYDEF_IFLAG (BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY)
-#define TTYDEF_OFLAG (OPOST | ONLCR | XTABS)
-#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
-#define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL)
-#define TTYDEF_SPEED (B9600)
-#define CTRL(x) (x&037)
-#define CEOF CTRL('d')
-#ifdef _POSIX_VDISABLE
-# define CEOL _POSIX_VDISABLE
-#else
-# define CEOL '\0'
-#endif
-#define CERASE 0177
-#define CINTR CTRL('c')
-#ifdef _POSIX_VDISABLE
-# define CSTATUS _POSIX_VDISABLE
-#else
-# define CSTATUS '\0'
-#endif
-#define CKILL CTRL('u')
-#define CMIN 1
-#define CQUIT 034
-#define CSUSP CTRL('z')
-#define CTIME 0
-#define CDSUSP CTRL('y')
-#define CSTART CTRL('q')
-#define CSTOP CTRL('s')
-#define CLNEXT CTRL('v')
-#define CDISCARD CTRL('o')
-#define CWERASE CTRL('w')
-#define CREPRINT CTRL('r')
-#define CEOT CEOF
-#define CBRK CEOL
-#define CRPRNT CREPRINT
-#define CFLUSH CDISCARD
-#endif
diff --git a/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch b/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch
deleted file mode 100644
index 7868998..0000000
--- a/sys-apps/util-linux/files/util-linux-2.23.1-musl.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-patch taken from sabotage linux -- https://github.com/rofl0r/sabotage
-diff -aur util-linux-2.23.1.org/fdisks/cfdisk.c util-linux-2.23.1/fdisks/cfdisk.c
---- util-linux-2.23.1.org/fdisks/cfdisk.c 2013-07-01 21:37:58.508000002 +0000
-+++ util-linux-2.23.1/fdisks/cfdisk.c 2013-07-01 22:00:23.042000002 +0000
-@@ -325,7 +325,7 @@
- int logical = 0;
- long long logical_sectors[MAXIMUM_PARTS];
-
--__sighandler_t old_SIGINT, old_SIGTERM;
-+sighandler_t old_SIGINT, old_SIGTERM;
-
- int arrow_cursor = FALSE;
- int display_units = MEGABYTES;
-diff -aur util-linux-2.23.1.org/fdisks/fdisksunlabel.c util-linux-2.23.1/fdisks/fdisksunlabel.c
---- util-linux-2.23.1.org/fdisks/fdisksunlabel.c 2013-07-01 21:37:58.508000002 +0000
-+++ util-linux-2.23.1/fdisks/fdisksunlabel.c 2013-07-01 21:59:43.721000002 +0000
-@@ -383,9 +383,11 @@
- }
- }
-
--static int verify_sun_cmp(int *a, int *b, void *data)
-+static void* cmp_data;
-+static int verify_sun_cmp(const void *pa, const void *pb)
- {
-- unsigned int *verify_sun_starts = (unsigned int *) data;
-+ const int *a = pa, *b = pb;
-+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data;
-
- if (*a == -1)
- return 1;
-@@ -449,9 +451,8 @@
- else
- array[i] = -1;
- }
-- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
-- (int (*)(const void *,const void *,void *)) verify_sun_cmp,
-- verify_sun_starts);
-+ cmp_data = verify_sun_starts;
-+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp);
-
- if (array[0] == -1) {
- fdisk_info(cxt, _("No partitions defined"));
-diff -aur util-linux-2.23.1.org/include/ttyutils.h util-linux-2.23.1/include/ttyutils.h
---- util-linux-2.23.1.org/include/ttyutils.h 2013-07-01 21:37:58.433000002 +0000
-+++ util-linux-2.23.1/include/ttyutils.h 2013-07-01 21:48:42.328000002 +0000
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <termios.h>
- #include <limits.h>
-+#include "ttydefaults.h"
- #ifdef HAVE_SYS_IOCTL_H
- #include <sys/ioctl.h>
- #endif
-diff -aur util-linux-2.23.1.org/term-utils/setterm.c util-linux-2.23.1/term-utils/setterm.c
---- util-linux-2.23.1.org/term-utils/setterm.c 2013-07-01 21:37:58.442000002 +0000
-+++ util-linux-2.23.1/term-utils/setterm.c 2013-07-01 22:02:54.244000002 +0000
-@@ -123,7 +123,7 @@
- #include "nls.h"
- #include "closestream.h"
-
--#if __GNU_LIBRARY__ < 5
-+#if defined(__GLIBC__) && __GNU_LIBRARY__ < 5
- #ifndef __alpha__
- # include <linux/unistd.h>
- #define __NR_klogctl __NR_syslog
-diff -aur util-linux-2.23.1.org/term-utils/ttymsg.c util-linux-2.23.1/term-utils/ttymsg.c
---- util-linux-2.23.1.org/term-utils/ttymsg.c 2013-07-01 21:37:58.442000002 +0000
-+++ util-linux-2.23.1/term-utils/ttymsg.c 2013-07-01 22:07:02.788000002 +0000
-@@ -41,6 +41,7 @@
- */
-
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/uio.h>
- #include <signal.h>
- #include <fcntl.h>
-diff -aur util-linux-2.23.1.org/text-utils/hexdump.h util-linux-2.23.1/text-utils/hexdump.h
---- util-linux-2.23.1.org/text-utils/hexdump.h 2013-07-01 21:37:58.437000002 +0000
-+++ util-linux-2.23.1/text-utils/hexdump.h 2013-07-01 22:01:27.005000002 +0000
-@@ -32,7 +32,7 @@
- *
- * @(#)hexdump.h 5.4 (Berkeley) 6/1/90
- */
--
-+#include <sys/types.h>
- typedef struct _pr {
- struct _pr *nextpr; /* next print unit */
- #define F_ADDRESS 0x001 /* print offset */
-diff -aur util-linux-2.23.1.org/text-utils/pg.c util-linux-2.23.1/text-utils/pg.c
---- util-linux-2.23.1.org/text-utils/pg.c 2013-07-01 21:37:58.437000002 +0000
-+++ util-linux-2.23.1/text-utils/pg.c 2013-07-01 22:01:55.831000002 +0000
-@@ -37,7 +37,7 @@
- #ifndef TIOCGWINSZ
- # include <sys/ioctl.h>
- #endif
--#include <sys/termios.h>
-+#include <termios.h>
- #include <fcntl.h>
- #include <regex.h>
- #include <stdio.h>
---- util-linux-2.23.1.orig/sys-utils/eject.c
-+++ util-linux-2.23.1/sys-utils/eject.c
-@@ -40,7 +40,6 @@
- #include <sys/mount.h>
- #include <scsi/scsi.h>
- #include <scsi/sg.h>
--#include <scsi/scsi_ioctl.h>
- #include <sys/time.h>
-
- #include <libmount.h>
diff --git a/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch
deleted file mode 100644
index 77cf478..0000000
--- a/sys-apps/util-linux/files/util-linux-2.24-last-tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-https://bugs.gentoo.org/501408
-
-From 3c76515abd2e80dc1da03041eb868b8c1e596fb1 Mon Sep 17 00:00:00 2001
-From: Sami Kerola <kerolasa@iki.fi>
-Date: Sun, 16 Feb 2014 23:54:18 +0000
-Subject: [PATCH] tests: align last.1 with recent phantom detection
-
-None existing account is not still-logged-in but gone mysteriously,
-assuming wtmp logout markup is missing.
-
-Signed-off-by: Sami Kerola <kerolasa@iki.fi>
----
- tests/expected/last/last | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/expected/last/last b/tests/expected/last/last
-index 2ff5cc1..dfb140b 100644
---- a/tests/expected/last/last
-+++ b/tests/expected/last/last
-@@ -1,6 +1,6 @@
- ~~~ basic output ~~~
- rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14)
--torvalds linux hobby Mon Aug 26 00:57 still logged in
-+torvalds linux hobby Mon Aug 26 00:57 gone - no logout
- reboot system boot system-name Wed Aug 28 18:00 still running
- reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00)
- IPv4 root dns-server Wed Aug 28 13:00 - 14:00 (01:00)
-@@ -17,7 +17,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00)
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ include system ~~~
- rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14)
--torvalds linux hobby Mon Aug 26 00:57 still logged in
-+torvalds linux hobby Mon Aug 26 00:57 gone - no logout
- reboot system boot system-name Wed Aug 28 18:00 still running
- shutdown system down system-name Wed Aug 28 17:00 - 18:00 (01:00)
- reboot system boot system-name Wed Aug 28 16:00 - 17:00 (01:00)
-@@ -47,16 +47,16 @@ IPv4 root Wed Aug 28 13:00 - 14:00 (01:00) a.root-servers.net
-
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ show ip ~~~
--torvalds linux 128.214.205.14 Mon Aug 26 00:57 still logged in
-+torvalds linux 128.214.205.14 Mon Aug 26 00:57 gone - no logout
-
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ no host ~~~
--torvalds linux Mon Aug 26 00:57 still logged in
-+torvalds linux Mon Aug 26 00:57 gone - no logout
-
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ full times ~~~
- rick long never-gonna-logo Thu Jan 1 00:00:00 1970 - Tue Jan 19 03:14:07 2038 (24855+03:14)
--torvalds linux hobby Mon Aug 26 00:57:08 1991 still logged in
-+torvalds linux hobby Mon Aug 26 00:57:08 1991 gone - no logout
- reboot system boot system-name Wed Aug 28 18:00:00 2013 still running
- reboot system boot system-name Wed Aug 28 16:00:00 2013 - Wed Aug 28 17:00:00 2013 (01:00)
- IPv4 root dns-server Wed Aug 28 13:00:00 2013 - Wed Aug 28 14:00:00 2013 (01:00)
-@@ -73,7 +73,7 @@ accounti foo nine Wed Aug 28 03:00:00 2013 - Wed Aug 28 04:
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ no time ~~~
- rick long never-gonna-logo (24855+03:14)
--torvalds linux hobby logged in
-+torvalds linux hobby - no logout
- reboot system boot system-name running
- reboot system boot system-name (01:00)
- IPv4 root dns-server (01:00)
-@@ -90,7 +90,7 @@ accounti foo nine (01:00)
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ iso-8601 time ~~~
- rick long never-gonna-logout 1970-01-01T00:00:00+0000 - 2038-01-19T03:14:07+0000 (24855+03:14)
--torvalds linux hobby 1991-08-26T00:57:08+0000 still logged in
-+torvalds linux hobby 1991-08-26T00:57:08+0000 gone - no logout
- reboot system boot system-name 2013-08-28T18:00:00+0000 still running
- reboot system boot system-name 2013-08-28T16:00:00+0000 - 2013-08-28T17:00:00+0000 (01:00)
- IPv4 root dns-server 2013-08-28T13:00:00+0000 - 2013-08-28T14:00:00+0000 (01:00)
-@@ -115,7 +115,7 @@ accounti foo nine Wed Aug 28 03:00 - 04:00 (01:00)
- wtmp begins Wed Aug 28 03:00:00 2013
- ~~~ present ~~~
- rick long never-gonna-logo Thu Jan 1 00:00 - 03:14 (24855+03:14)
--torvalds linux hobby Mon Aug 26 00:57 still logged in
-+torvalds linux hobby Mon Aug 26 00:57 gone - no logout
- runlevel foo one Wed Aug 28 11:00 - 12:00 (01:00)
-
- wtmp begins Wed Aug 28 03:00:00 2013
---
-1.8.5.5
-
diff --git a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch
deleted file mode 100644
index 5148053..0000000
--- a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6b55612b9ad1193a042f3c3a1d9216e63b0d2907 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 22 Dec 2013 18:17:15 -0500
-Subject: [PATCH] tests: last: skip when last is not enabled
-
-References: https://bugs.gentoo.org/489794
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- tests/ts/last/ipv6 | 2 ++
- tests/ts/last/last | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/tests/ts/last/ipv6 b/tests/ts/last/ipv6
-index 8e2b01e..60b72bd 100755
---- a/tests/ts/last/ipv6
-+++ b/tests/ts/last/ipv6
-@@ -18,6 +18,8 @@ TS_DESC="last ipv6"
- . $TS_TOPDIR/functions.sh
- ts_init "$*"
-
-+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled"
-+
- export LANG=C
- export TZ=GMT
-
-diff --git a/tests/ts/last/last b/tests/ts/last/last
-index 4ad38cb..83b7f8d 100755
---- a/tests/ts/last/last
-+++ b/tests/ts/last/last
-@@ -18,6 +18,8 @@ TS_DESC="last"
- . $TS_TOPDIR/functions.sh
- ts_init "$*"
-
-+[ -x $TS_CMD_LAST ] || ts_skip "last not enabled"
-+
- export LANG=C
- export TZ=GMT
-
---
-1.8.4.3
-
diff --git a/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch b/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch
deleted file mode 100644
index 3d9efcf..0000000
--- a/sys-apps/util-linux/files/util-linux-2.24.1-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-adapted from a patch from sabotage linux
-diff -ru a/util-linux-2.24.1/libfdisk/src/sun.c b/util-linux-2.24.1/libfdisk/src/sun.c
---- a/util-linux-2.24.1/libfdisk/src/sun.c
-+++ b/util-linux-2.24.1/libfdisk/src/sun.c
-@@ -361,9 +361,11 @@
- }
- }
-
--static int verify_sun_cmp(int *a, int *b, void *data)
-+static void* cmp_data;
-+static int verify_sun_cmp(const void *pa, const void *pb)
- {
-- unsigned int *verify_sun_starts = (unsigned int *) data;
-+ const int *a = pa, *b = pb;
-+ unsigned int *verify_sun_starts = (unsigned int *) cmp_data;
-
- if (*a == -1)
- return 1;
-@@ -427,9 +429,8 @@
- else
- array[i] = -1;
- }
-- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
-- (int (*)(const void *,const void *,void *)) verify_sun_cmp,
-- verify_sun_starts);
-+ cmp_data = verify_sun_starts;
-+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), verify_sun_cmp);
-
- if (array[0] == -1) {
- fdisk_info(cxt, _("No partitions defined."));
diff --git a/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch b/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch
deleted file mode 100644
index 716ea53..0000000
--- a/sys-apps/util-linux/files/util-linux-2.24.2-hexdump.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-from alpine linux
---- ./text-utils/parse.c.orig
-+++ ./text-utils/parse.c
-@@ -208,7 +208,7 @@
- PR *pr, **nextpr;
- FU *fu;
- char *p1, *p2;
-- char savech, *fmtp, cs[3];
-+ char savech, *fmtp, cs[4];
- int nconv, prec;
-
- nextpr = NULL;
-@@ -282,9 +282,10 @@
- goto isint;
- case 'o': case 'u': case 'x': case 'X':
- pr->flags = F_UINT;
--isint: cs[2] = '\0';
-- cs[1] = cs[0];
-- cs[0] = 'q';
-+isint: cs[3] = '\0';
-+ cs[2] = cs[0];
-+ cs[1] = 'l';
-+ cs[0] = 'l';
- switch(fu->bcnt) {
- case 0: case 4:
- pr->bcnt = 4;
-@@ -342,9 +343,10 @@
- ++p2;
- switch(p1[2]) {
- case 'd': case 'o': case'x':
-- cs[0] = 'q';
-- cs[1] = p1[2];
-- cs[2] = '\0';
-+ cs[0] = 'l';
-+ cs[1] = 'l';
-+ cs[2] = p1[2];
-+ cs[3] = '\0';
- break;
- default:
- p1[3] = '\0';
diff --git a/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch b/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch
deleted file mode 100644
index f66ffa7..0000000
--- a/sys-apps/util-linux/files/util-linux-2.25-lscpu-pic.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From f86d649d5f2522c61b791366a96e9f00cd255668 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 5 Aug 2014 18:58:52 -0400
-Subject: [PATCH] lscpu: clean up vmware inline asm
-
-This code is not PIC clean which means it fails to build on hardened
-32bit x86 systems (i.e. building as PIE).
-
-While here, optimize the existing cpuid logic slightly.
-
-URL: https://bugs.gentoo.org/518936
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- sys-utils/lscpu.c | 36 ++++++++++++++++++++++++++----------
- 1 file changed, 26 insertions(+), 10 deletions(-)
-
-diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
-index 062dff5..9965eeb 100644
---- a/sys-utils/lscpu.c
-+++ b/sys-utils/lscpu.c
-@@ -546,10 +546,9 @@ cpuid(unsigned int op, unsigned int *eax, unsigned int *ebx,
- __asm__(
- #if defined(__PIC__) && defined(__i386__)
- /* x86 PIC cannot clobber ebx -- gcc bitches */
-- "pushl %%ebx;"
-+ "xchg %%ebx, %%esi;"
- "cpuid;"
-- "movl %%ebx, %%esi;"
-- "popl %%ebx;"
-+ "xchg %%esi, %%ebx;"
- : "=S" (*ebx),
- #else
- "cpuid;"
-@@ -656,12 +655,29 @@ read_hypervisor_powerpc(struct lscpu_desc *desc)
- #define VMWARE_BDOOR_PORT 0x5658
- #define VMWARE_BDOOR_CMD_GETVERSION 10
-
--#define VMWARE_BDOOR(eax, ebx, ecx, edx) \
-- __asm__("inl (%%dx), %%eax" : \
-- "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \
-- "0"(VMWARE_BDOOR_MAGIC), "1"(VMWARE_BDOOR_CMD_GETVERSION), \
-- "2"(VMWARE_BDOOR_PORT), "3"(0) : \
-- "memory");
-+static inline
-+void vmware_bdoor(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
-+{
-+ __asm__(
-+#if defined(__PIC__) && defined(__i386__)
-+ /* x86 PIC cannot clobber ebx -- gcc bitches */
-+ "xchg %%ebx, %%esi;"
-+ "inl (%%dx), %%eax;"
-+ "xchg %%esi, %%ebx;"
-+ : "=S" (*ebx),
-+#else
-+ "inl (%%dx), %%eax;"
-+ : "=b" (*ebx),
-+#endif
-+ "=a" (*eax),
-+ "=c" (*ecx),
-+ "=d" (*edx)
-+ : "0" (VMWARE_BDOOR_MAGIC),
-+ "1" (VMWARE_BDOOR_CMD_GETVERSION),
-+ "2" (VMWARE_BDOOR_PORT),
-+ "3" (0)
-+ : "memory");
-+}
-
- static jmp_buf segv_handler_env;
-
-@@ -697,7 +713,7 @@ is_vmware_platform(void)
- if (sigaction(SIGSEGV, &act, &oact))
- err(EXIT_FAILURE, _("error: can not set signal handler"));
-
-- VMWARE_BDOOR(eax, ebx, ecx, edx);
-+ vmware_bdoor(&eax, &ebx, &ecx, &edx);
-
- if (sigaction(SIGSEGV, &oact, NULL))
- err(EXIT_FAILURE, _("error: can not restore signal handler"));
---
-2.0.0
-
diff --git a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch b/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch
deleted file mode 100644
index 86edab4..0000000
--- a/sys-apps/util-linux/files/util-linux-2.25-remove__SWORD_TYPE.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur util-linux-2.25.orig/sys-utils/switch_root.c util-linux-2.25/sys-utils/switch_root.c
---- util-linux-2.25.orig/sys-utils/switch_root.c 2014-08-13 15:08:15.632801343 +0000
-+++ util-linux-2.25/sys-utils/switch_root.c 2014-08-13 15:09:19.617801087 +0000
-@@ -181,8 +181,8 @@
- if (pid <= 0) {
- struct statfs stfs;
- if (fstatfs(cfd, &stfs) == 0 &&
-- (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC ||
-- stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC))
-+ (stfs.f_type == STATFS_RAMFS_MAGIC ||
-+ stfs.f_type == STATFS_TMPFS_MAGIC))
- recursiveRemove(cfd);
- else
- warn(_("old root filesystem is not an initramfs"));
diff --git a/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch b/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch
deleted file mode 100644
index 85c4811..0000000
--- a/sys-apps/util-linux/files/util-linux-2.25.2-runuser-bash-completion.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/522288
-
-From a95987423c4d7781a14ffda34f082086cd51f4f7 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 24 Oct 2014 12:08:22 -0400
-Subject: [PATCH] bash-completion: fix runuser install
-
-The runuser symlink used to depend on su being enabled, but a refactoring
-broke that. So if you build with runuser enabled but not su, you end up
-with a broken symlink. Rework the logic so it works in both cases.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- bash-completion/Makemodule.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/bash-completion/Makemodule.am b/bash-completion/Makemodule.am
-index 271a6db..045c2d5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11071,7 +10823,8 @@
- @BUILD_MOUNT_TRUE@@MAKEINSTALL_DO_SETUID_TRUE@ chmod 4755 $(DESTDIR)$(bindir)/umount
-
- @BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@install-data-hook-bashcomp-runuser::
--@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@ ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser
-+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_TRUE@ ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser
-+@BUILD_BASH_COMPLETION_TRUE@@BUILD_RUNUSER_TRUE@@BUILD_SU_FALSE@ cp $(top_srcdir)/bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser
-
- clean-local-tests:
- rm -rf $(top_builddir)/tests/output $(top_builddir)/tests/diff
---
-2.1.2
-
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
deleted file mode 100644
index 785ff9f..0000000
--- a/sys-apps/util-linux/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
-<use>
- <flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
- <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
- <flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
- <flag name='fdformat'>build fdformat (floppy disk format)</flag>
- <flag name='suid'>
- install mount/umount as setuid so non-root users may mount/umount devices,
- and wall/write as setgid so non-root users can notify other users
- </flag>
- <flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag>
-</use>
- <upstream>
- <remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild b/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild
deleted file mode 100644
index bb150bc..0000000
--- a/sys-apps/util-linux/util-linux-2.24.1-r99.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.1-r2.ebuild,v 1.8 2014/05/14 18:13:29 ssuominen Exp $
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-2 autotools
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- KEYWORDS="amd64 arm ~mips ppc x86"
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="bash-completion caps +cramfs cytune fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !sys-block/eject
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-1.3-r2
- caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib )
- ncurses? ( >=sys-libs/ncurses-5.2-r2 )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- selinux? ( sys-libs/libselinux )
- slang? ( sys-libs/slang )
- udev? ( virtual/udev )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
- epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
- epatch "${FILESDIR}"/${PN}-2.24-last-tests.patch #501408
- epatch "${FILESDIR}"/${PN}-2.24.1-musl.patch #for musl
- epatch "${FILESDIR}"/${PN}-2.24.2-hexdump.patch #for musl
- find tests/ -name bigyear -delete #489794
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.c
-}
-
-src_configure() {
- lfs_fallocate_test
- export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
- econf \
- --docdir="/usr/share/doc/${PF}" \
- --enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
- $(use_enable nls) \
- --enable-agetty \
- --with-bashcompletiondir="$(get_bashcompdir)" \
- $(use_enable bash-completion) \
- $(use_enable caps setpriv) \
- $(use_enable cramfs) \
- $(use_enable cytune) \
- $(use_enable fdformat) \
- --with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
- --disable-kill \
- --disable-login \
- $(use_enable tty-helpers mesg) \
- --disable-nologin \
- --enable-partx \
- $(use_with python) \
- --enable-raw \
- --enable-rename \
- --disable-reset \
- --enable-schedutils \
- --disable-su \
- $(use_enable tty-helpers wall) \
- $(use_enable tty-helpers write) \
- $(use_enable suid makeinstall-chown) \
- $(use_enable suid makeinstall-setuid) \
- $(use_with selinux) \
- $(use_with slang) \
- $(use_enable static-libs static) \
- $(use_with udev) \
- $(tc-has-tls || echo --disable-tls)
-}
-
-src_test() {
- emake check
-}
-
-src_install() {
- default
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- use python && python_optimize
-
- # need the libs in /
- gen_usr_ldscript -a blkid mount uuid
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.25-r99.ebuild b/sys-apps/util-linux/util-linux-2.25-r99.ebuild
deleted file mode 100644
index 2e10960..0000000
--- a/sys-apps/util-linux/util-linux-2.25-r99.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.ebuild,v 1.5 2014/08/05 23:04:39 vapier Exp $
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- python-single-r1 multilib-minimal
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-2 autotools
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- #KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
- KEYWORDS=""
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="bash-completion caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !sys-block/eject
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-1.3-r2
- caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib )
- ncurses? ( >=sys-libs/ncurses-5.2-r2 )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- slang? ( sys-libs/slang )
- udev? ( virtual/udev )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140406-r2
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
- epatch "${FILESDIR}"/${P}-lscpu-pic.patch #518936
- epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- # We manually set --libdir to the default since on prefix, econf will set it to
- # a value which the configure script does not recognize. This makes it set the
- # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
- ECONF_SOURCE=${S} \
- econf \
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
- --libdir='${prefix}/'"$(get_libdir)" \
- $(multilib_native_use_enable nls) \
- --enable-agetty \
- --with-bashcompletiondir="$(get_bashcompdir)" \
- $(multilib_native_use_enable bash-completion) \
- $(multilib_native_use_enable caps setpriv) \
- --disable-chfn-chsh \
- $(multilib_native_use_enable cramfs) \
- $(multilib_native_use_enable fdformat) \
- --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
- --disable-kill \
- --disable-login \
- $(multilib_native_use_enable tty-helpers mesg) \
- --disable-nologin \
- --enable-partx \
- $(multilib_native_use_with python) \
- --enable-raw \
- --enable-rename \
- --disable-reset \
- --enable-schedutils \
- --disable-su \
- $(multilib_native_use_enable tty-helpers wall) \
- $(multilib_native_use_enable tty-helpers write) \
- $(multilib_native_use_enable suid makeinstall-chown) \
- $(multilib_native_use_enable suid makeinstall-setuid) \
- $(use_with selinux) \
- $(multilib_native_use_with slang) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with udev) \
- $(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- # build libraries only
- emake -f Makefile -f - mylibs \
- <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- default
- else
- emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
- install-pkgconfigDATA install-uuidincHEADERS \
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
- install-nodist_smartcolsincHEADERS
- fi
-
- if multilib_is_native_abi; then
- # need the libs in /
- gen_usr_ldscript -a blkid mount smartcols uuid
-
- use python && python_optimize
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild b/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild
deleted file mode 100644
index 17f7738..0000000
--- a/sys-apps/util-linux/util-linux-2.25.2-r99.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.2.ebuild,v 1.1 2014/10/24 16:27:07 vapier Exp $
-
-EAPI="4"
-
-PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
-
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
- python-single-r1 multilib-minimal
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-if [[ ${PV} == 9999 ]] ; then
- inherit git-2 autotools
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
- KEYWORDS="amd64 arm ~mips ppc x86"
- SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
-
-RDEPEND="!sys-process/schedutils
- !sys-apps/setarch
- !<sys-apps/sysvinit-2.88-r7
- !sys-block/eject
- !<sys-libs/e2fsprogs-libs-1.41.8
- !<sys-fs/e2fsprogs-1.41.8
- !<app-shells/bash-completion-1.3-r2
- caps? ( sys-libs/libcap-ng )
- cramfs? ( sys-libs/zlib )
- ncurses? ( >=sys-libs/ncurses-5.2-r2 )
- pam? ( sys-libs/pam )
- python? ( ${PYTHON_DEPS} )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- slang? ( sys-libs/slang )
- udev? ( virtual/udev )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140406-r2
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bc )
- virtual/os-headers"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-runuser-bash-completion.patch #522288
- epatch "${FILESDIR}"/${PN}-2.25-remove__SWORD_TYPE.patch
- if [[ ${PV} == 9999 ]] ; then
- po/update-potfiles
- eautoreconf
- fi
- elibtoolize
-}
-
-lfs_fallocate_test() {
- # Make sure we can use fallocate with LFS #300307
- cat <<-EOF > "${T}"/fallocate.${ABI}.c
- #define _GNU_SOURCE
- #include <fcntl.h>
- main() { return fallocate(0, 0, 0, 0); }
- EOF
- append-lfs-flags
- $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
- || export ac_cv_func_fallocate=no
- rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
- lfs_fallocate_test
- export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
- # We manually set --libdir to the default since on prefix, econf will set it to
- # a value which the configure script does not recognize. This makes it set the
- # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
- ECONF_SOURCE=${S} \
- econf \
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
- --libdir='${prefix}/'"$(get_libdir)" \
- $(multilib_native_use_enable nls) \
- --enable-agetty \
- --with-bashcompletiondir="$(get_bashcompdir)" \
- --enable-bash-completion \
- $(multilib_native_use_enable caps setpriv) \
- --disable-chfn-chsh \
- $(multilib_native_use_enable cramfs) \
- $(multilib_native_use_enable fdformat) \
- --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
- --disable-kill \
- --disable-login \
- $(multilib_native_use_enable tty-helpers mesg) \
- --disable-nologin \
- --enable-partx \
- $(multilib_native_use_with python) \
- --enable-raw \
- --enable-rename \
- --disable-reset \
- --enable-schedutils \
- --disable-su \
- $(multilib_native_use_enable tty-helpers wall) \
- $(multilib_native_use_enable tty-helpers write) \
- $(multilib_native_use_enable suid makeinstall-chown) \
- $(multilib_native_use_enable suid makeinstall-setuid) \
- $(use_with selinux) \
- $(multilib_native_use_with slang) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with udev) \
- $(tc-has-tls || echo --disable-tls)
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- default
- else
- # build libraries only
- emake -f Makefile -f - mylibs \
- <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- default
- else
- emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
- install-pkgconfigDATA install-uuidincHEADERS \
- install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
- install-nodist_smartcolsincHEADERS
- fi
-
- if multilib_is_native_abi; then
- # need the libs in /
- gen_usr_ldscript -a blkid mount smartcols uuid
-
- use python && python_optimize
- fi
-}
-
-multilib_src_install_all() {
- dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
- # e2fsprogs-libs didnt install .la files, and .pc work fine
- prune_libtool_files
-}
-
-pkg_postinst() {
- if ! use tty-helpers; then
- elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
- fi
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The agetty util now clears the terminal by default. You"
- elog "might want to add --noclear to your /etc/inittab lines."
- fi
-}
diff --git a/sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch b/sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch
deleted file mode 100644
index 07efd0e..0000000
--- a/sys-auth/polkit/files/polkit-make-netgroup-support-optional.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4bb6d90..8d30a95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -158,7 +158,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"],
- [AC_MSG_ERROR([Can't find expat library. Please install expat.])])
- AC_SUBST(EXPAT_LIBS)
-
--AC_CHECK_FUNCS(clearenv)
-+AC_CHECK_FUNCS(clearenv getnetgrent innetgr)
-
- if test "x$GCC" = "xyes"; then
- LDFLAGS="-Wl,--as-needed $LDFLAGS"
-diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
-index 3bd2f0b..9d2ec61 100644
---- a/src/polkitbackend/polkitbackendinteractiveauthority.c
-+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -2103,6 +2103,7 @@ get_users_in_group (PolkitIdentity *group,
- return ret;
- }
-
-+#if defined HAVE_GETNETGRENT
- static GList *
- get_users_in_net_group (PolkitIdentity *group,
- gboolean include_root)
-@@ -2154,6 +2155,7 @@ get_users_in_net_group (PolkitIdentity *group,
- endnetgrent ();
- return ret;
- }
-+#endif
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-@@ -2243,10 +2245,12 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent,
- {
- user_identities = g_list_concat (user_identities, get_users_in_group (identity, FALSE));
- }
-+#if defined HAVE_GETNETGRENT
- else if (POLKIT_IS_UNIX_NETGROUP (identity))
- {
- user_identities = g_list_concat (user_identities, get_users_in_net_group (identity, FALSE));
- }
-+#endif
- else
- {
- g_warning ("Unsupported identity");
-diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
-index bc2fe22..b84c110 100644
---- a/src/polkitbackend/polkitbackendjsauthority.c
-+++ b/src/polkitbackend/polkitbackendjsauthority.c
-@@ -29,6 +29,7 @@
- #include <glib/gstdio.h>
- #include <locale.h>
- #include <glib/gi18n-lib.h>
-+#include <sys/wait.h>
-
- #include <polkit/polkit.h>
- #include "polkitbackendjsauthority.h"
-@@ -1450,13 +1451,16 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
- JSBool ret = JS_FALSE;
- JSString *user_str;
- JSString *netgroup_str;
-- char *user;
-- char *netgroup;
- JSBool is_in_netgroup = JS_FALSE;
-
- if (!JS_ConvertArguments (cx, argc, JS_ARGV (cx, vp), "SS", &user_str, &netgroup_str))
- goto out;
-
-+#if defined(HAVE_INNETGR)
-+ {
-+ char *user;
-+ char *netgroup;
-+
- user = JS_EncodeString (cx, user_str);
- netgroup = JS_EncodeString (cx, netgroup_str);
-
-@@ -1470,6 +1474,8 @@ js_polkit_user_is_in_netgroup (JSContext *cx,
-
- JS_free (cx, netgroup);
- JS_free (cx, user);
-+ }
-+#endif
-
- ret = JS_TRUE;
-
diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
deleted file mode 100644
index d553f2f..0000000
--- a/sys-auth/polkit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>freedesktop</herd>
- <maintainer>
- <email>freedesktop-bugs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name='systemd'>Use <pkg>sys-apps/systemd</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-auth/polkit/polkit-0.112-r99.ebuild b/sys-auth/polkit/polkit-0.112-r99.ebuild
deleted file mode 100644
index 1d239c2..0000000
--- a/sys-auth/polkit/polkit-0.112-r99.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.17 2015/02/11 03:45:06 patrick Exp $
-
-EAPI=5
-inherit eutils autotools multilib pam pax-utils systemd user
-
-DESCRIPTION="Policy framework for controlling privileges for system-wide services"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
-SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples gtk +introspection jit kde nls pam selinux systemd"
-
-CDEPEND="
- ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
- hppa? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
- mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
- !hppa? ( !ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug,jit=] ) ) )
- >=dev-libs/glib-2.32
- >=dev-libs/expat-2:=
- introspection? ( >=dev-libs/gobject-introspection-1 )
- pam? (
- sys-auth/pambase
- virtual/pam
- )
- systemd? ( sys-apps/systemd:0= )"
-DEPEND="${CDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- dev-util/intltool
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-policykit )
-"
-PDEPEND="
- gtk? ( || (
- >=gnome-extra/polkit-gnome-0.105
- lxde-base/lxpolkit
- ) )
- kde? ( || (
- kde-plasma/polkit-kde-agent
- sys-auth/polkit-kde-agent
- ) )
- !systemd? ( sys-auth/consolekit[policykit] )"
-
-QA_MULTILIB_PATHS="
- usr/lib/polkit-1/polkit-agent-helper-1
- usr/lib/polkit-1/polkitd"
-
-pkg_setup() {
- local u=polkitd
- local g=polkitd
- local h=/var/lib/polkit-1
-
- enewgroup ${g}
- enewuser ${u} -1 -1 ${h} ${g}
- esethome ${u} ${h}
-}
-
-src_prepare() {
- sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
- epatch "${FILESDIR}"/${PN}-make-netgroup-support-optional.patch
- eautoreconf || die
-}
-
-src_configure() {
- econf \
- --localstatedir="${EPREFIX}"/var \
- --disable-static \
- --enable-man-pages \
- --disable-gtk-doc \
- $(use_enable systemd libsystemd-login) \
- $(use_enable introspection) \
- --disable-examples \
- $(use_enable nls) \
- $(if use hppa || use ia64 || use mips; then echo --with-mozjs=mozjs185; else echo --with-mozjs=mozjs-17.0; fi) \
- "$(systemd_with_unitdir)" \
- --with-authfw=$(usex pam pam shadow) \
- $(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
- --with-os-type=gentoo
-}
-
-src_compile() {
- default
-
- # Required for polkitd on hardened/PaX due to spidermonkey's JIT
- local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
- local m=''
- # Only used when USE="jit" is enabled for 'dev-lang/spidermonkey:17' wrt #485910
- has_version 'dev-lang/spidermonkey:17[jit]' && m='m'
- # hppa, ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
- use hppa && m='mr'
- use ia64 && m='mr'
- use mips && m='mr'
- [ -n "$m" ] && pax-mark ${m} ${f}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc docs/TODO HACKING NEWS README
-
- fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
-
- diropts -m0700 -o polkitd -g polkitd
- keepdir /var/lib/polkit-1
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins src/examples/{*.c,*.policy*}
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
- chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}
diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch
deleted file mode 100644
index 0cd3e0e..0000000
--- a/sys-block/parted/files/parted-3.2-devmapper.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -2304,6 +2304,7 @@
- return r < 0 ? NULL : resultp;
- }
-
-+#ifdef ENABLE_DEVICE_MAPPER
- static char *
- dm_canonical_path (PedDevice const *dev)
- {
-@@ -2326,12 +2327,22 @@
- err:
- return NULL;
- }
-+#endif /* ENABLE_DEVICE_MAPPER */
-
- static char*
- _device_get_part_path (PedDevice const *dev, int num)
- {
-- char *devpath = (dev->type == PED_DEVICE_DM
-- ? dm_canonical_path (dev) : dev->path);
-+ char *devpath =
-+#ifdef ENABLE_DEVICE_MAPPER
-+ (
-+ dev->type == PED_DEVICE_DM
-+ ? dm_canonical_path (dev) :
-+#endif /* ENABLE_DEVICE_MAPPER */
-+ dev->path
-+#ifdef ENABLE_DEVICE_MAPPER
-+ )
-+#endif /* ENABLE_DEVICE_MAPPER */
-+ ;
- size_t path_len = strlen (devpath);
- char *result;
- /* Check for devfs-style /disc => /partN transformation
-@@ -2945,12 +2956,14 @@
- unsigned long long *length);
-
-
-+#ifdef ENABLE_DEVICE_MAPPER
- if (disk->dev->type == PED_DEVICE_DM) {
- add_partition = _dm_add_partition;
- remove_partition = _dm_remove_partition;
- resize_partition = _dm_resize_partition;
- get_partition_start_and_length = _dm_get_partition_start_and_length;
- } else {
-+#endif /* ENABLE_DEVICE_MAPPER */
- add_partition = _blkpg_add_partition;
- remove_partition = _blkpg_remove_partition;
- #ifdef BLKPG_RESIZE_PARTITION
-@@ -2959,7 +2972,9 @@
- resize_partition = NULL;
- #endif
- get_partition_start_and_length = _kernel_get_partition_start_and_length;
-+#ifdef ENABLE_DEVICE_MAPPER
- }
-+#endif /* ENABLE_DEVICE_MAPPER */
-
- /* lpn = largest partition number.
- * for remove pass, use greater of device or label limit */
diff --git a/sys-block/parted/files/parted-3.2-fix-includes.patch b/sys-block/parted/files/parted-3.2-fix-includes.patch
deleted file mode 100644
index c6eff0e..0000000
--- a/sys-block/parted/files/parted-3.2-fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h
-+++ parted-3.1/libparted/fs/xfs/platform_defs.h
-@@ -35,6 +35,7 @@
- #define __XFS_PLATFORM_DEFS_H__
-
- #include <stdio.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <endian.h>
diff --git a/sys-block/parted/files/parted-3.2-po4a-mandir.patch b/sys-block/parted/files/parted-3.2-po4a-mandir.patch
deleted file mode 100644
index be0a9c6..0000000
--- a/sys-block/parted/files/parted-3.2-po4a-mandir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/doc/po4a.mk
-+++ b/doc/po4a.mk
-@@ -23,7 +23,7 @@
- # threshold is 80%), it won't be distributed, and the build won't fail.
- #
-
--mandir = $(mandir)/$(lang)
-+mandir := $(mandir)/$(lang)
-
- # Inform automake that we want to install some man pages in section 1, 5
- # and 8.
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
deleted file mode 100644
index 57a6769..0000000
--- a/sys-block/parted/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>livecd</herd>
-<use>
- <flag name='device-mapper'>
- Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
- </flag>
- <flag name="debug">
- Enable debugging as encouraged by upstream: [The default configuration]
- includes --enable-debug (by default), which contains many assertions.
- Obviously, these "waste" space, but in the past, they have caught
- potentially dangerous bugs before they would have done damage, so we think
- it's worth it. Also, it means we get more bug reports ;)
- </flag>
-</use>
-</pkgmetadata>
diff --git a/sys-block/parted/parted-3.2-r99.ebuild b/sys-block/parted/parted-3.2-r99.ebuild
deleted file mode 100644
index b7b307b..0000000
--- a/sys-block/parted/parted-3.2-r99.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-3.2.ebuild,v 1.14 2015/03/03 09:57:56 dlan Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="http://www.gnu.org/software/parted"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
- >=sys-fs/e2fsprogs-1.27
- >=sys-libs/ncurses-5.7-r7
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- readline? ( >=sys-libs/readline-5.2:= )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( >=sys-devel/gettext-0.12.1-r2 )
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.2-devmapper.patch
- epatch "${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
- epatch "${FILESDIR}"/${PN}-3.2-fix-includes.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable device-mapper) \
- $(use_enable nls) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- $(use_with readline) \
- --disable-rpath \
- --disable-silent-rules
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild b/sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild
deleted file mode 100644
index 6f043a7..0000000
--- a/sys-boot/efibootmgr/efibootmgr-0.11.0-r99.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/efibootmgr/efibootmgr-0.11.0.ebuild,v 1.4 2015/02/28 13:25:47 ago Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space application to modify the EFI boot manager"
-HOMEPAGE="https://github.com/vathpela/efibootmgr"
-SRC_URI="https://github.com/vathpela/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE=""
-
-RDEPEND="sys-apps/pciutils
- sys-libs/efivar"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/efibootmgr-use-linux-pci-header.patch"
- sed -i -e s/-Werror// Makefile || die
-}
-
-src_configure() {
- tc-export CC
- export EXTRA_CFLAGS=${CFLAGS}
-}
-
-src_install() {
- # build system uses perl, so just do it ourselves
- dosbin src/efibootmgr/efibootmgr
- doman src/man/man8/efibootmgr.8
- dodoc AUTHORS README doc/ChangeLog doc/TODO
-}
diff --git a/sys-boot/efibootmgr/files/efibootmgr-use-linux-pci-header.patch b/sys-boot/efibootmgr/files/efibootmgr-use-linux-pci-header.patch
deleted file mode 100644
index 7fa44f0..0000000
--- a/sys-boot/efibootmgr/files/efibootmgr-use-linux-pci-header.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use pci.h from linux... sys/pci.h is glibc specific.
-
---- src/lib/scsi_ioctls.c.orig 2014-12-28 10:43:35.513305649 +0100
-+++ src/lib/scsi_ioctls.c 2014-12-28 10:43:45.024306074 +0100
-@@ -19,11 +19,11 @@
- */
-
- #include <stdio.h>
--#include <sys/pci.h>
- #include <stdint.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <linux/pci.h>
- #include <linux/nvme.h>
- #include "scsi_ioctls.h"
-
diff --git a/sys-boot/efibootmgr/metadata.xml b/sys-boot/efibootmgr/metadata.xml
deleted file mode 100644
index 1f9a68b..0000000
--- a/sys-boot/efibootmgr/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>yannick.schaeffer@epfl.ch</email>
- <name>Yannick Schaeffer</name>
- <description>Mantainer. Assign bugs to him</description>
- </maintainer>
- <maintainer>
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
- </maintainer>
- <longdescription>
- This is efibootmgr, a Linux user-space application to modify the Intel
- Extensible Firmware Interface (EFI) Boot Manager. This application
- can create and destroy boot entries, change the boot order, change
- the next running boot option, and more.
- </longdescription>
-</pkgmetadata>
diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk b/sys-devel/gcc/files/awk/fixlafiles.awk
deleted file mode 100644
index ffade96..0000000
--- a/sys-devel/gcc/files/awk/fixlafiles.awk
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk,v 1.15 2008/02/19 05:47:29 vapier Exp $
-
-#
-# Helper functions
-#
-function printn(string) {
- printf("%s", string)
-}
-function einfo(string) {
- printf(" \033[32;01m*\033[0m %s\n", string)
-}
-function einfon(string) {
- printf(" \033[32;01m*\033[0m %s", string)
-}
-function ewarn(string) {
- printf(" \033[33;01m*\033[0m %s\n", string)
-}
-function ewarnn(string) {
- printf(" \033[33;01m*\033[0m %s", string)
-}
-function eerror(string) {
- printf(" \033[31;01m*\033[0m %s\n", string)
-}
-
-#
-# assert(condition, errmsg)
-# assert that a condition is true. Otherwise exit.
-#
-function assert(condition, string) {
- if (! condition) {
- printf("%s:%d: assertion failed: %s\n",
- FILENAME, FNR, string) > "/dev/stderr"
- _assert_exit = 1
- exit 1
- }
-}
-
-#
-# system(command, return)
-# wrapper that normalizes return codes ...
-#
-function dosystem(command, ret) {
- ret = 0
- ret = system(command)
- if (ret == 0)
- return 1
- else
- return 0
-}
-
-BEGIN {
- #
- # Get our variables from environment
- #
- OLDVER = ENVIRON["OLDVER"]
- OLDCHOST = ENVIRON["OLDCHOST"]
-
- if (OLDVER == "") {
- eerror("Could not get OLDVER!");
- exit 1
- }
-
- # Setup some sane defaults
- LIBCOUNT = 2
- HAVE_GCC34 = 0
- DIRLIST[1] = "/lib"
- DIRLIST[2] = "/usr/lib"
-
- #
- # Walk /etc/ld.so.conf to discover all our library paths
- #
- pipe = "cat /etc/ld.so.conf | sort 2>/dev/null"
- while(((pipe) | getline ldsoconf_data) > 0) {
- if (ldsoconf_data !~ /^[[:space:]]*#/) {
- if (ldsoconf_data == "") continue
-
- # Remove any trailing comments
- sub(/#.*$/, "", ldsoconf_data)
- # Remove any trailing spaces
- sub(/[[:space:]]+$/, "", ldsoconf_data)
-
- # If there's more than one path per line, split
- # it up as if they were sep lines
- split(ldsoconf_data, nodes, /[:,[:space:]]/)
-
- # Now add the rest from ld.so.conf
- for (x in nodes) {
- # wtf does this line do ?
- sub(/=.*/, "", nodes[x])
- # Prune trailing /
- sub(/\/$/, "", nodes[x])
-
- if (nodes[x] == "") continue
-
- #
- # Drop the directory if its a child directory of
- # one that was already added ...
- # For example, if we have:
- # /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
- # We really just want to save /usr/lib /usr/libexec
- #
- CHILD = 0
- for (y in DIRLIST) {
- if (nodes[x] ~ "^" DIRLIST[y] "(/|$)") {
- CHILD = 1
- break
- }
- }
- if (CHILD) continue
-
- DIRLIST[++LIBCOUNT] = nodes[x]
- }
- }
- }
- close(pipe)
-
- #
- # Get line from gcc's output containing CHOST
- #
- pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
- if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
- close(pipe)
-
- # If we fail to get the CHOST, see if we can get the CHOST
- # portage thinks we are using ...
- pipe = "/usr/bin/portageq envvar 'CHOST'"
- assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
- } else {
- # Check pre gcc-3.4.x versions
- CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
-
- if (CHOST == TMP_CHOST || CHOST == "") {
- # Check gcc-3.4.x or later
- CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
-
- if (CHOST == TMP_CHOST || CHOST == "")
- CHOST = ""
- else
- HAVE_GCC34 = 1
- }
- }
- close(pipe)
-
- if (CHOST == "") {
- eerror("Could not get gcc's CHOST!")
- exit 1
- }
-
- if (OLDCHOST != "")
- if (OLDCHOST == CHOST)
- OLDCHOST = ""
-
- GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/"
- GCCLIBPREFIX_NEW = "/usr/lib/gcc/"
-
- if (HAVE_GCC34)
- GCCLIBPREFIX = GCCLIBPREFIX_NEW
- else
- GCCLIBPREFIX = GCCLIBPREFIX_OLD
-
- GCCLIB = GCCLIBPREFIX CHOST
-
- if (OLDCHOST != "") {
- OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
- OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
- }
-
- # Get current gcc's version
- pipe = "gcc -dumpversion"
- assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
- close(pipe)
-
- if (NEWVER == "") {
- eerror("Could not get gcc's version!")
- exit 1
- }
-
- # Nothing to do ?
- if ((OLDVER == NEWVER) && (OLDCHOST == ""))
- exit 0
-
- #
- # Ok, now let's scan for the .la files and actually fix them up
- #
- for (x = 1; x <= LIBCOUNT; x++) {
- # Do nothing if the target dir is gcc's internal library path
- if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
- DIRLIST[x] ~ GCCLIBPREFIX_NEW)
- continue
-
- einfo(" [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
-
- pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
- while (((pipe) | getline la_files) > 0) {
-
- # Do nothing if the .la file is located in gcc's internal lib path
- if (la_files ~ GCCLIBPREFIX_OLD ||
- la_files ~ GCCLIBPREFIX_NEW)
- continue
-
- CHANGED = 0
- CHOST_CHANGED = 0
-
- # See if we need to fix the .la file
- while ((getline la_data < (la_files)) > 0) {
- if (OLDCHOST != "") {
- if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
- GCCLIB, la_data) > 0) ||
- (gsub(OLDGCCLIB2 "[/[:space:]]+",
- GCCLIB, la_data) > 0)) {
- CHANGED = 1
- CHOST_CHANGED = 1
- }
- }
- if (OLDVER != NEWVER) {
- if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
- GCCLIB "/" NEWVER, la_data) > 0) ||
- (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
- GCCLIB "/" NEWVER, la_data) > 0))
- CHANGED = 1
- }
- }
- close(la_files)
-
- # Do the actual changes in a second loop, as we can then
- # verify that CHOST_CHANGED among things is correct ...
- if (CHANGED) {
- ewarnn(" FIXING: " la_files " ...")
-
- if (CHANGED)
- printn("[")
-
- # Clear the temp file (removing rather than '>foo' is better
- # out of a security point of view?)
- dosystem("rm -f " la_files ".new")
-
- while ((getline la_data < (la_files)) > 0) {
- if (OLDCHOST != "") {
- tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
- GCCLIB "\\1", "g", la_data)
- tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
- GCCLIB "\\1", "g", tmpstr)
-
- if (la_data != tmpstr) {
- printn("c")
- la_data = tmpstr
- }
-
- if (CHOST_CHANGED > 0) {
- # We try to be careful about CHOST changes outside
- # the gcc library path (meaning we cannot match it
- # via /GCCLIBPREFIX CHOST/) ...
-
- # Catch:
- #
- # dependency_libs=' -L/usr/CHOST/{bin,lib}'
- #
- gsub("-L/usr/" OLDCHOST "/",
- "-L/usr/" CHOST "/", la_data)
- # Catch:
- #
- # dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
- #
- la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
- "\\1/" CHOST "/", "g", la_data)
- }
- }
-
- if (OLDVER != NEWVER) {
- # Catch:
- #
- # dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
- #
- tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
- GCCLIB "/" NEWVER "\\1", "g", la_data)
- tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
- GCCLIB "/" NEWVER "\\1", "g", tmpstr)
-
- if (la_data != tmpstr) {
- # Catch:
- #
- # dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
- #
- # in cases where we have gcc34
- tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
- GCCLIBPREFIX "\\1", "g", tmpstr)
- tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
- GCCLIBPREFIX "\\1", "g", tmpstr)
- printn("v")
- la_data = tmpstr
- }
- }
-
- print la_data >> (la_files ".new")
- }
-
- if (CHANGED)
- print "]"
-
- close(la_files)
- close(la_files ".new")
-
- assert(dosystem("mv -f " la_files ".new " la_files),
- "dosystem(\"mv -f " la_files ".new " la_files "\")")
- }
- }
-
- close(pipe)
- }
-}
-
-# vim:ts=4
diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la b/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
deleted file mode 100644
index 346bd16..0000000
--- a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la,v 1.4 2010/03/19 23:53:07 vapier Exp $
-
-#
-# Helper functions
-#
-function printn(string) {
- printf("%s", string)
-}
-function einfo(string) {
- printf(" \033[32;01m*\033[0m %s\n", string)
-}
-function einfon(string) {
- printf(" \033[32;01m*\033[0m %s", string)
-}
-function ewarn(string) {
- printf(" \033[33;01m*\033[0m %s\n", string)
-}
-function ewarnn(string) {
- printf(" \033[33;01m*\033[0m %s", string)
-}
-function eerror(string) {
- printf(" \033[31;01m*\033[0m %s\n", string)
-}
-
-#
-# assert(condition, errmsg)
-# assert that a condition is true. Otherwise exit.
-#
-function assert(condition, string) {
- if (! condition) {
- printf("%s:%d: assertion failed: %s\n",
- FILENAME, FNR, string) > "/dev/stderr"
- _assert_exit = 1
- exit 1
- }
-}
-
-#
-# system(command, return)
-# wrapper that normalizes return codes ...
-#
-function dosystem(command, ret) {
- ret = 0
- ret = system(command)
- if (ret == 0)
- return 1
- else
- return 0
-}
-
-#
-# parse_ld_conf(config_file)
-#
-function parse_ld_conf(conf, pipe, ldsoconf_data, CHILD, y) {
- pipe = "cd /etc; cat " conf " | sort 2>/dev/null"
- while(((pipe) | getline ldsoconf_data) > 0) {
- if (ldsoconf_data ~ /^[[:space:]]*#/)
- continue
- if (ldsoconf_data == "")
- continue
-
- # Handle the "include" keyword
- if (ldsoconf_data ~ /^include /) {
- sub(/^include /, "", ldsoconf_data)
- parse_ld_conf(ldsoconf_data)
- continue
- }
-
- # Remove any trailing comments
- sub(/#.*$/, "", ldsoconf_data)
- # Remove any trailing spaces
- sub(/[[:space:]]+$/, "", ldsoconf_data)
- # Eat duplicate slashes
- sub(/\/\//, "/", ldsoconf_data)
- # Prune trailing /
- sub(/\/$/, "", ldsoconf_data)
-
- #
- # Drop the directory if its a child directory of
- # one that was already added ...
- # For example, if we have:
- # /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
- # We really just want to save /usr/lib /usr/libexec
- #
- CHILD = 0
- for (y in DIRLIST) {
- if (ldsoconf_data ~ "^" DIRLIST[y] "(/|$)") {
- CHILD = 1
- break
- }
- }
- if (CHILD) continue
-
- DIRLIST[++LIBCOUNT] = ldsoconf_data
- }
- close(pipe)
-}
-
-BEGIN {
- #
- # Get our variables from environment
- #
- OLDVER = ENVIRON["OLDVER"]
- OLDCHOST = ENVIRON["OLDCHOST"]
-
- if (OLDVER == "") {
- eerror("Could not get OLDVER!");
- exit 1
- }
-
- # Setup some sane defaults
- LIBCOUNT = 2
- HAVE_GCC34 = 0
- DIRLIST[1] = "/lib"
- DIRLIST[2] = "/usr/lib"
-
- #
- # Walk /etc/ld.so.conf to discover all our library paths
- #
- parse_ld_conf("/etc/ld.so.conf")
-
- #
- # Get line from gcc's output containing CHOST
- #
- pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
- if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
- close(pipe)
-
- # If we fail to get the CHOST, see if we can get the CHOST
- # portage thinks we are using ...
- pipe = "/usr/bin/portageq envvar 'CHOST'"
- assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
- } else {
- # Check pre gcc-3.4.x versions
- CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
-
- if (CHOST == TMP_CHOST || CHOST == "") {
- # Check gcc-3.4.x or later
- CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
-
- if (CHOST == TMP_CHOST || CHOST == "")
- CHOST = ""
- else
- HAVE_GCC34 = 1
- }
- }
- close(pipe)
-
- if (CHOST == "") {
- eerror("Could not get gcc's CHOST!")
- exit 1
- }
-
- if (OLDCHOST != "")
- if (OLDCHOST == CHOST)
- OLDCHOST = ""
-
- GCCLIBPREFIX_OLD = "/usr/lib/gcc-lib/"
- GCCLIBPREFIX_NEW = "/usr/lib/gcc/"
-
- if (HAVE_GCC34)
- GCCLIBPREFIX = GCCLIBPREFIX_NEW
- else
- GCCLIBPREFIX = GCCLIBPREFIX_OLD
-
- GCCLIB = GCCLIBPREFIX CHOST
-
- if (OLDCHOST != "") {
- OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
- OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
- }
-
- # Get current gcc's version
- pipe = "gcc -dumpversion"
- assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
- close(pipe)
-
- if (NEWVER == "") {
- eerror("Could not get gcc's version!")
- exit 1
- }
-
- # Nothing to do ?
- # NB: Do not check for (OLDVER == NEWVER) anymore, as we might need to
- # replace libstdc++.la ....
- if ((OLDVER == "") && (OLDCHOST == ""))
- exit 0
-
- #
- # Ok, now let's scan for the .la files and actually fix them up
- #
- for (x = 1; x <= LIBCOUNT; x++) {
- # Do nothing if the target dir is gcc's internal library path
- if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
- DIRLIST[x] ~ GCCLIBPREFIX_NEW)
- continue
-
- einfo(" [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
-
- pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
- while (((pipe) | getline la_files) > 0) {
-
- # Do nothing if the .la file is located in gcc's internal lib path
- if (la_files ~ GCCLIBPREFIX_OLD ||
- la_files ~ GCCLIBPREFIX_NEW)
- continue
-
- CHANGED = 0
- CHOST_CHANGED = 0
-
- # See if we need to fix the .la file
- while ((getline la_data < (la_files)) > 0) {
- if (OLDCHOST != "") {
- if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
- GCCLIB, la_data) > 0) ||
- (gsub(OLDGCCLIB2 "[/[:space:]]+",
- GCCLIB, la_data) > 0)) {
- CHANGED = 1
- CHOST_CHANGED = 1
- }
- }
- if (OLDVER != NEWVER) {
- if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
- GCCLIB "/" NEWVER, la_data) > 0) ||
- (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
- GCCLIB "/" NEWVER, la_data) > 0))
- CHANGED = 1
- }
- # We now check if we have libstdc++.la, as we remove the
- # libtool linker scripts for gcc ...
- # We do this last, as we only match the new paths
- if (gsub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la",
- "-lstdc++", la_data) > 0)
- CHANGED = 1
- }
- close(la_files)
-
- # Do the actual changes in a second loop, as we can then
- # verify that CHOST_CHANGED among things is correct ...
- if (CHANGED) {
- ewarnn(" FIXING: " la_files " ...[")
-
- # Clear the temp file (removing rather than '>foo' is better
- # out of a security point of view?)
- dosystem("rm -f " la_files ".new")
-
- while ((getline la_data < (la_files)) > 0) {
- if (OLDCHOST != "") {
- tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
- GCCLIB "\\1", "g", la_data)
- tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
- GCCLIB "\\1", "g", tmpstr)
-
- if (la_data != tmpstr) {
- printn("c")
- la_data = tmpstr
- }
-
- if (CHOST_CHANGED > 0) {
- # We try to be careful about CHOST changes outside
- # the gcc library path (meaning we cannot match it
- # via /GCCLIBPREFIX CHOST/) ...
-
- # Catch:
- #
- # dependency_libs=' -L/usr/CHOST/{bin,lib}'
- #
- gsub("-L/usr/" OLDCHOST "/",
- "-L/usr/" CHOST "/", la_data)
- # Catch:
- #
- # dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
- #
- la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
- "\\1/" CHOST "/", "g", la_data)
- }
- }
-
- if (OLDVER != NEWVER) {
- # Catch:
- #
- # dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
- #
- tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
- GCCLIB "/" NEWVER "\\1", "g", la_data)
- tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
- GCCLIB "/" NEWVER "\\1", "g", tmpstr)
-
- if (la_data != tmpstr) {
- # Catch:
- #
- # dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
- #
- # in cases where we have gcc34
- tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
- GCCLIBPREFIX "\\1", "g", tmpstr)
- tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
- GCCLIBPREFIX "\\1", "g", tmpstr)
- printn("v")
- la_data = tmpstr
- }
- }
-
- # We now check if we have libstdc++.la, as we remove the
- # libtool linker scripts for gcc and any referencese in any
- # libtool linker scripts.
- # We do this last, as we only match the new paths
- tmpstr = gensub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la",
- "-lstdc++", "g", la_data);
- if (la_data != tmpstr) {
- printn("l")
- la_data = tmpstr
- }
-
- print la_data >> (la_files ".new")
- }
-
- if (CHANGED)
- print "]"
-
- close(la_files)
- close(la_files ".new")
-
- assert(dosystem("mv -f " la_files ".new " la_files),
- "dosystem(\"mv -f " la_files ".new " la_files "\")")
- }
- }
-
- close(pipe)
- }
-}
-
-# vim:ts=4
diff --git a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89
deleted file mode 100755
index cee0325..0000000
--- a/sys-devel/gcc/files/c89
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-2.95):
-# -ansi
-# -std=c89
-# -std=iso9899:1990
-
-for i; do
- case "$i" in
- -ansi|-std=c89|-std=iso9899:1990)
- ;;
- -std=*)
- echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
- exit 1
- ;;
- esac
-done
-
-exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"
diff --git a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99
deleted file mode 100755
index c954209..0000000
--- a/sys-devel/gcc/files/c99
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-3.3):
-# -std=c99
-# -std=c9x
-# -std=iso9899:1999
-# -std=iso9899:199x
-
-for i; do
- case "$i" in
- -std=c9[9x]|-std=iso9899:199[9x])
- ;;
- -ansi|-std=*)
- echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
- exit 1
- ;;
- esac
-done
-
-exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}
diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
deleted file mode 100644
index c55250b..0000000
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.16 2012/05/18 21:28:56 vapier Exp $
-
-usage() {
-cat << "USAGE_END"
-Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
-
- Where <old-gcc-version> is the version number of the
- previous gcc version. For example, if you updated to
- gcc-3.2.1, and you had gcc-3.2 installed, run:
-
- # fix_libtool_files.sh 3.2
-
- If you updated to gcc-3.2.3, and the old CHOST was i586-pc-linux-gnu
- but you now have CHOST as i686-pc-linux-gnu, run:
-
- # fix_libtool_files.sh 3.2 --oldarch i586-pc-linux-gnu
-
- Note that if only the CHOST and not the version changed, you can run
- it with the current version and the '--oldarch <old-CHOST>' arguments,
- and it will do the expected:
-
- # fix_libtool_files.sh `gcc -dumpversion` --oldarch i586-pc-linux-gnu
-
-USAGE_END
- exit 1
-}
-
-case $2 in
---oldarch) [ $# -ne 3 ] && usage ;;
-*) [ $# -ne 1 ] && usage ;;
-esac
-
-ARGV1=$1
-ARGV2=$2
-ARGV3=$3
-
-. /etc/profile || exit 1
-. /etc/init.d/functions.sh || exit 1
-
-if [ ${EUID:-0} -ne 0 ] ; then
- eerror "${0##*/}: Must be root."
- exit 1
-fi
-
-# make sure the files come out sane
-umask 0022
-
-OLDCHOST=
-[ "${ARGV2}" = "--oldarch" ] && OLDCHOST=${ARGV3}
-
-AWKDIR="/usr/share/gcc-data"
-
-if [ ! -r "${AWKDIR}/fixlafiles.awk" ] ; then
- eerror "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
- exit 1
-fi
-
-OLDVER=${ARGV1}
-
-export OLDVER OLDCHOST
-
-einfo "Scanning libtool files for hardcoded gcc library paths..."
-exec gawk -f "${AWKDIR}/fixlafiles.awk"
-
-# vim:ts=4
diff --git a/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch b/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch
deleted file mode 100644
index d454053..0000000
--- a/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h gcc-4.7.3/gcc/config/arm/linux-eabi.h
---- gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h 2014-04-06 14:15:03.000000000 +0000
-+++ gcc-4.7.3/gcc/config/arm/linux-eabi.h 2014-04-06 12:12:42.000000000 +0000
-@@ -69,8 +69,8 @@
- GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
-
- #undef GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
--#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
-+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-musl-arm.so.1"
-+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-musl-armhf.so.1"
- #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
-
- #define GLIBC_DYNAMIC_LINKER \
-diff -Naur gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
---- gcc-4.7.3.orig/gcc/config/i386/linux64.h 2014-04-06 14:15:03.000000000 +0000
-+++ gcc-4.7.3/gcc/config/i386/linux64.h 2014-04-06 12:12:42.000000000 +0000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-4.7.3.orig/gcc/config/mips/linux.h gcc-4.7.3/gcc/config/mips/linux.h
---- gcc-4.7.3.orig/gcc/config/mips/linux.h 2011-07-19 18:00:27.000000000 +0000
-+++ gcc-4.7.3/gcc/config/mips/linux.h 2014-04-06 14:12:48.000000000 +0000
-@@ -18,4 +18,4 @@
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-mipsel.so.1"
-diff -Naur gcc-4.7.3.orig/gcc/config/rs6000/linux64.h gcc-4.7.3/gcc/config/rs6000/linux64.h
---- gcc-4.7.3/gcc/config/rs6000/linux64.h 2014-10-11 18:59:07.479279989 -0200
-+++ gcc-4.7.3/gcc/config/rs6000/linux64.h 2014-10-11 18:59:45.777801191 -0200
-@@ -358,8 +358,8 @@
- #undef LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
-diff -Naur gcc-4.7.3/gcc/config/rs6000/sysv4.h gcc-4.7.3/gcc/config/rs6000/sysv4.h
---- gcc-4.7.3/gcc/config/rs6000/sysv4.h 2014-10-11 19:00:03.079584889 -0200
-+++ gcc-4.7.3/gcc/config/rs6000/sysv4.h 2014-10-11 19:00:28.476267387 -0200
-@@ -802,7 +802,7 @@
-
- #define LINK_START_LINUX_SPEC ""
-
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
diff --git a/sys-devel/gcc/files/gcc-4.7.3-powerpc-libc-stack-end.patch b/sys-devel/gcc/files/gcc-4.7.3-powerpc-libc-stack-end.patch
deleted file mode 100644
index 91c1b34..0000000
--- a/sys-devel/gcc/files/gcc-4.7.3-powerpc-libc-stack-end.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From: amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 15 Feb 2013 13:53:40 +0000 (+0000)
-Subject: PR target/55431
-X-Git-Tag: gcc-4_8_0-release~416
-X-Git-Url: http://repo.or.cz/w/official-gcc.git/commitdiff_plain/2a0bfd56d1b6a8ece8fb852691ea32713c7891b3
-
- PR target/55431
- * config/rs6000/linux-unwind.h (ppc_linux_aux_vector): Delete.
- (ppc_fallback_frame_state): Always set up save locations for fp
- and altivec. Don't bother with non-callee-saved regs, r0-r13
- except for r2 on ppc64, fr0-fr13, v0-v19, vscr.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196077 138bc75d-0d04-0410-961f-82ee72b054a4
-diff --git a/libgcc/config/rs6000/linux-unwind.h b/libgcc/config/rs6000/linux-unwind.h
-index 3a2da6e..c9273c4 100644
---- a/libgcc/config/rs6000/linux-unwind.h
-+++ b/libgcc/config/rs6000/linux-unwind.h
-@@ -26,7 +26,6 @@
- #define R_CR2 70
- #define R_VR0 77
- #define R_VRSAVE 109
--#define R_VSCR 110
-
- struct gcc_vregs
- {
-@@ -175,38 +174,6 @@ get_regs (struct _Unwind_Context *context)
- }
- #endif
-
--/* Find an entry in the process auxiliary vector. The canonical way to
-- test for VMX is to look at AT_HWCAP. */
--
--static long
--ppc_linux_aux_vector (long which)
--{
-- /* __libc_stack_end holds the original stack passed to a process. */
-- extern long *__libc_stack_end;
-- long argc;
-- char **argv;
-- char **envp;
-- struct auxv
-- {
-- long a_type;
-- long a_val;
-- } *auxp;
--
-- /* The Linux kernel puts argc first on the stack. */
-- argc = __libc_stack_end[0];
-- /* Followed by argv, NULL terminated. */
-- argv = (char **) __libc_stack_end + 1;
-- /* Followed by environment string pointers, NULL terminated. */
-- envp = argv + argc + 1;
-- while (*envp++)
-- continue;
-- /* Followed by the aux vector, zero terminated. */
-- for (auxp = (struct auxv *) envp; auxp->a_type != 0; ++auxp)
-- if (auxp->a_type == which)
-- return auxp->a_val;
-- return 0;
--}
--
- /* Do code reading to identify a signal frame, and set the frame
- state data appropriately. See unwind-dw2.c for the structs. */
-
-@@ -216,8 +183,8 @@ static _Unwind_Reason_Code
- ppc_fallback_frame_state (struct _Unwind_Context *context,
- _Unwind_FrameState *fs)
- {
-- static long hwcap = 0;
- struct gcc_regs *regs = get_regs (context);
-+ struct gcc_vregs *vregs;
- long new_cfa;
- int i;
-
-@@ -229,12 +196,15 @@ ppc_fallback_frame_state (struct _Unwind_Context *context,
- fs->regs.cfa_reg = STACK_POINTER_REGNUM;
- fs->regs.cfa_offset = new_cfa - (long) context->cfa;
-
-- for (i = 0; i < 32; i++)
-- if (i != STACK_POINTER_REGNUM)
-- {
-- fs->regs.reg[i].how = REG_SAVED_OFFSET;
-- fs->regs.reg[i].loc.offset = (long) ®s->gpr[i] - new_cfa;
-- }
-+#ifdef __powerpc64__
-+ fs->regs.reg[2].how = REG_SAVED_OFFSET;
-+ fs->regs.reg[2].loc.offset = (long) ®s->gpr[2] - new_cfa;
-+#endif
-+ for (i = 14; i < 32; i++)
-+ {
-+ fs->regs.reg[i].how = REG_SAVED_OFFSET;
-+ fs->regs.reg[i].loc.offset = (long) ®s->gpr[i] - new_cfa;
-+ }
-
- fs->regs.reg[R_CR2].how = REG_SAVED_OFFSET;
- /* CR? regs are always 32-bit and PPC is big-endian, so in 64-bit
-@@ -250,57 +220,35 @@ ppc_fallback_frame_state (struct _Unwind_Context *context,
- fs->retaddr_column = ARG_POINTER_REGNUM;
- fs->signal_frame = 1;
-
-- if (hwcap == 0)
-+ /* If we have a FPU... */
-+ for (i = 14; i < 32; i++)
- {
-- hwcap = ppc_linux_aux_vector (16);
-- /* These will already be set if we found AT_HWCAP. A nonzero
-- value stops us looking again if for some reason we couldn't
-- find AT_HWCAP. */
--#ifdef __powerpc64__
-- hwcap |= 0xc0000000;
--#else
-- hwcap |= 0x80000000;
--#endif
-+ fs->regs.reg[i + 32].how = REG_SAVED_OFFSET;
-+ fs->regs.reg[i + 32].loc.offset = (long) ®s->fpr[i] - new_cfa;
- }
-
-- /* If we have a FPU... */
-- if (hwcap & 0x08000000)
-- for (i = 0; i < 32; i++)
-- {
-- fs->regs.reg[i + 32].how = REG_SAVED_OFFSET;
-- fs->regs.reg[i + 32].loc.offset = (long) ®s->fpr[i] - new_cfa;
-- }
--
- /* If we have a VMX unit... */
-- if (hwcap & 0x10000000)
-- {
-- struct gcc_vregs *vregs;
- #ifdef __powerpc64__
-- vregs = regs->vp;
-+ vregs = regs->vp;
- #else
-- vregs = ®s->vregs;
-+ vregs = ®s->vregs;
- #endif
-- if (regs->msr & (1 << 25))
-+ if (regs->msr & (1 << 25))
-+ {
-+ for (i = 20; i < 32; i++)
- {
-- for (i = 0; i < 32; i++)
-- {
-- fs->regs.reg[i + R_VR0].how = REG_SAVED_OFFSET;
-- fs->regs.reg[i + R_VR0].loc.offset
-- = (long) &vregs->vr[i] - new_cfa;
-- }
--
-- fs->regs.reg[R_VSCR].how = REG_SAVED_OFFSET;
-- fs->regs.reg[R_VSCR].loc.offset = (long) &vregs->vscr - new_cfa;
-+ fs->regs.reg[i + R_VR0].how = REG_SAVED_OFFSET;
-+ fs->regs.reg[i + R_VR0].loc.offset = (long) &vregs->vr[i] - new_cfa;
- }
--
-- fs->regs.reg[R_VRSAVE].how = REG_SAVED_OFFSET;
-- fs->regs.reg[R_VRSAVE].loc.offset = (long) &vregs->vsave - new_cfa;
- }
-
-+ fs->regs.reg[R_VRSAVE].how = REG_SAVED_OFFSET;
-+ fs->regs.reg[R_VRSAVE].loc.offset = (long) &vregs->vsave - new_cfa;
-+
- /* If we have SPE register high-parts... we check at compile-time to
- avoid expanding the code for all other PowerPC. */
- #ifdef __SPE__
-- for (i = 0; i < 32; i++)
-+ for (i = 14; i < 32; i++)
- {
- fs->regs.reg[i + FIRST_PSEUDO_REGISTER - 1].how = REG_SAVED_OFFSET;
- fs->regs.reg[i + FIRST_PSEUDO_REGISTER - 1].loc.offset
diff --git a/sys-devel/gcc/files/gcc-4.7.4-secure-plt.patch b/sys-devel/gcc/files/gcc-4.7.4-secure-plt.patch
deleted file mode 100644
index 1cc395f..0000000
--- a/sys-devel/gcc/files/gcc-4.7.4-secure-plt.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-adapted from musl-cross gcc-patches
-diff -ur a/gcc/config.gcc b/gcc/config.gcc
---- a/gcc/config.gcc 2013-10-03 02:52:23.000000000 -0200
-+++ b/gcc/config.gcc 2015-05-03 22:05:10.855150177 -0200
-@@ -2091,6 +2091,10 @@
- powerpc*-*-linux*paired*)
- tm_file="${tm_file} rs6000/750cl.h" ;;
- esac
-+ case ${target} in
-+ *-linux*-musl*)
-+ enable_secureplt=yes ;;
-+ esac
- if test x${enable_secureplt} = xyes; then
- tm_file="rs6000/secureplt.h ${tm_file}"
- fi
-diff -r 6097333f2ab4 gcc/config/rs6000/secureplt.h
---- a/gcc/config/rs6000/secureplt.h Tue May 20 11:06:08 2014 -0400
-+++ b/gcc/config/rs6000/secureplt.h Tue May 20 11:06:11 2014 -0400
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>. */
-
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
---- a/gcc/config/rs6000/sysv4.h 2012-04-30 19:39:01.000000000 -0200
-+++ b/gcc/config/rs6000/sysv4.h 2014-10-21 10:24:03.631956578 -0200
-@@ -537,6 +537,9 @@
- } \
- while (0)
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
-
- #undef ASM_SPEC
- #define ASM_SPEC "%(asm_cpu) \
-@@ -624,6 +627,7 @@
- /* Override the default target of the linker. */
- #define LINK_TARGET_SPEC "\
- %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \
-+%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}} \
- %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
- %{mcall-i960-old: --oformat elf32-powerpcle} \
- }}}}"
-@@ -938,6 +942,7 @@
- { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \
- { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \
- { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
-+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
- { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
- { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
- { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
diff --git a/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch b/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch
deleted file mode 100644
index 65bc45e..0000000
--- a/sys-devel/gcc/files/gcc-4.8.3-musl-fix-libc5-assumption.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /var/tmp/portage/sys-devel/gcc-4.8.3-r99/work/gcc-4.8.3/boehm-gc/os_dep.c 2013-03-06 15:08:58.000000000 +0000
-+++ gcc-4.8.3.new/boehm-gc/os_dep.c 2014-10-24 18:25:39.963379871 +0000
-@@ -41,7 +41,7 @@
- # else /* not 2 <= __GLIBC__ */
- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */
- /* one. Check LINUX_VERSION_CODE to see which we should reference. */
--# include <asm/sigcontext.h>
-+//# include <asm/sigcontext.h>
- # endif /* 2 <= __GLIBC__ */
- # endif
- # endif
diff --git a/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch b/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch
deleted file mode 100644
index a22fb80..0000000
--- a/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur a/gcc-4.8.3/gcc/config/arm/linux-eabi.h b/gcc-4.8.3/gcc/config/arm/linux-eabi.h
---- a/gcc-4.8.3/gcc/config/arm/linux-eabi.h 2013-01-10 21:38:27.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/arm/linux-eabi.h 2014-11-26 21:09:34.162787397 -0100
-@@ -68,8 +68,8 @@
- GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
-
- #undef GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
--#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
-+#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-musl-arm.so.1"
-+#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-musl-armhf.so.1"
- #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
-
- #define GLIBC_DYNAMIC_LINKER \
-diff -ur a/gcc-4.8.3/gcc/config/i386/linux64.h b/gcc-4.8.3/gcc/config/i386/linux64.h
---- a/gcc-4.8.3/gcc/config/i386/linux64.h 2013-01-10 21:38:27.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/i386/linux64.h 2014-11-26 21:09:34.162787397 -0100
-@@ -27,6 +27,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -ur a/gcc-4.8.3/gcc/config/mips/linux.h b/gcc-4.8.3/gcc/config/mips/linux.h
---- a/gcc-4.8.3/gcc/config/mips/linux.h 2013-01-10 21:38:27.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/mips/linux.h 2014-11-26 21:11:28.772354580 -0100
-@@ -17,4 +17,9 @@
- along with GCC; see the file COPYING3. If not see
- <http://www.gnu.org/licenses/>. */
-
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define GLIBC_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define GLIBC_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-mips" GLIBC_DYNAMIC_LINKER_E ".so.1"
-diff -ur a/gcc-4.8.3/gcc/config/rs6000/linux64.h b/gcc-4.8.3/gcc/config/rs6000/linux64.h
---- a/gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-04-04 16:10:24.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-11-26 21:09:34.164787372 -0100
-@@ -366,12 +366,8 @@
- #undef LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#ifdef LINUX64_DEFAULT_ABI_ELFv2
--#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
--#else
--#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
--#endif
-+#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
-diff -ur a/gcc-4.8.3/gcc/config/rs6000/sysv4.h b/gcc-4.8.3/gcc/config/rs6000/sysv4.h
---- a/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-04-04 15:50:31.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-11-26 21:09:34.164787372 -0100
-@@ -761,7 +761,7 @@
-
- #define LINK_START_LINUX_SPEC ""
-
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
- #if DEFAULT_LIBC == LIBC_UCLIBC
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
diff --git a/sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch b/sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch
deleted file mode 100644
index 7757c38..0000000
--- a/sys-devel/gcc/files/gcc-4.8.3-musl-res_state.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ENwbur gcc-4.8.3.orig/libsanitizer/tsan/tsan_platform_linux.cc gcc-4.8.3/libsanitizer/tsan/tsan_platform_linux.cc
---- gcc-4.8.3.orig/libsanitizer/tsan/tsan_platform_linux.cc 2014-08-31 12:50:18.381689906 +0000
-+++ gcc-4.8.3/libsanitizer/tsan/tsan_platform_linux.cc 2014-08-31 13:12:19.838446253 +0000
-@@ -292,7 +292,7 @@
- #ifndef TSAN_GO
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
- int cnt = 0;
-- __res_state *statp = (__res_state*)state;
-+ res_state statp = (res_state)state;
- for (int i = 0; i < MAXNS && cnt < nfd; i++) {
- if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
- fds[cnt++] = statp->_u._ext.nssocks[i];
diff --git a/sys-devel/gcc/files/gcc-4.8.3-secure-plt.patch b/sys-devel/gcc/files/gcc-4.8.3-secure-plt.patch
deleted file mode 100644
index fc367ae..0000000
--- a/sys-devel/gcc/files/gcc-4.8.3-secure-plt.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur a/gcc-4.8.3/gcc/config/rs6000/secureplt.h b/gcc-4.8.3/gcc/config/rs6000/secureplt.h
---- a/gcc-4.8.3/gcc/config/rs6000/secureplt.h 2013-01-10 21:38:27.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/rs6000/secureplt.h 2014-11-03 20:41:01.696584962 -0100
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>. */
-
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-diff -ur a/gcc-4.8.3/gcc/config/rs6000/sysv4.h b/gcc-4.8.3/gcc/config/rs6000/sysv4.h
---- a/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-04-04 15:50:31.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-11-03 20:42:30.098479787 -0100
-@@ -585,7 +585,8 @@
-
- /* Override the default target of the linker. */
- #define LINK_TARGET_SPEC \
-- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
-
- /* Any specific OS flags. */
- #define LINK_OS_SPEC "\
-@@ -894,6 +895,7 @@
- { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
- { "link_os_default", LINK_OS_DEFAULT_SPEC }, \
- { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
-+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \
- { "cpp_os_ads", CPP_OS_ADS_SPEC }, \
- { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
- { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
-diff -ur a/gcc-4.8.3/gcc/config.gcc b/gcc-4.8.3/gcc/config.gcc
---- a/gcc-4.8.3/gcc/config.gcc 2014-05-06 16:29:04.000000000 -0100
-+++ b/gcc-4.8.3/gcc/config.gcc 2014-11-03 20:40:13.135192063 -0100
-@@ -2135,6 +2135,10 @@
- powerpc*-*-linux*paired*)
- tm_file="${tm_file} rs6000/750cl.h" ;;
- esac
-+ case ${target} in
-+ *-linux*-musl*)
-+ enable_secureplt=yes ;;
-+ esac
- if test x${enable_secureplt} = xyes; then
- tm_file="rs6000/secureplt.h ${tm_file}"
- fi
diff --git a/sys-devel/gcc/files/gcc-configure-LANG.patch b/sys-devel/gcc/files/gcc-configure-LANG.patch
deleted file mode 100644
index d1b1b03..0000000
--- a/sys-devel/gcc/files/gcc-configure-LANG.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
-
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ unset $as_var
-+ fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
- esac
- done
-
--# NLS nuisances.
--# Only set these to C if already set. These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
-@@ -1850,6 +1850,19 @@
- # Compiler output produced by configure, useful for debugging
- # configure, is in ./config.log if it exists.
-
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
-+ eval \$as_var=C; export \$as_var
-+ else
-+ unset \$as_var
-+ fi
-+done
-+
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
- for ac_option
- do
diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch b/sys-devel/gcc/files/gcc-configure-texinfo.patch
deleted file mode 100644
index ddc098d..0000000
--- a/sys-devel/gcc/files/gcc-configure-texinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Chances are quite good that the installed makeinfo is sufficient.
-So ignore false positives where the makeinfo installed is so new
-that it violates the cheesy version grep.
-
-http://bugs.gentoo.org/198182
-
---- configure
-+++ configure
-@@ -3573,6 +3573,6 @@
- :
- else
-- MAKEINFO="$MISSING makeinfo"
-+ :
- fi
- ;;
-
diff --git a/sys-devel/gcc/files/gcc-spec-env-r1.patch b/sys-devel/gcc/files/gcc-spec-env-r1.patch
deleted file mode 100644
index a589268..0000000
--- a/sys-devel/gcc/files/gcc-spec-env-r1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-2013-08-22 Magnus Granberg <zorry@gentoo.org>
-
- * gcc/gcc.c (main): Add support for external spec file via the GCC_SPECS env var
- and move the process of the user specifed specs.
-
- This allows us to easily control pie/ssp defaults with gcc-config profiles.
- Original patch by Rob Holland
- Extended to support multiple entries separated by ':' by Kevin F. Quinn
- Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
- Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by Magnus Granberg
-
---- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100
-+++ gcc-4.8-20130210-work/gcc/gcc.c 2013-07-26 02:32:14.625089864 +0200
-@@ -6427,6 +6428,48 @@ main (int argc, char **argv)
- do_option_spec (option_default_specs[i].name,
- option_default_specs[i].spec);
-
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+ /* Add specs listed in GCC_SPECS. Note; in the process of separating
-+ * each spec listed, the string is overwritten at token boundaries
-+ * (':') with '\0', an effect of strtok_r().
-+ */
-+ specs_file = getenv ("GCC_SPECS");
-+ if (specs_file && (strlen(specs_file) > 0))
-+ {
-+ char *spec, *saveptr;
-+ for (spec=strtok_r(specs_file,":",&saveptr);
-+ spec!=NULL;
-+ spec=strtok_r(NULL,":",&saveptr))
-+ {
-+ struct user_specs *user = (struct user_specs *)
-+ xmalloc (sizeof (struct user_specs));
-+ user->next = (struct user_specs *) 0;
-+ user->filename = spec;
-+ if (user_specs_tail)
-+ user_specs_tail->next = user;
-+ else
-+ user_specs_head = user;
-+ user_specs_tail = user;
-+ }
-+ }
-+#endif
-+ /* Process any user specified specs in the order given on the command
-+ * line. */
-+ for (uptr = user_specs_head; uptr; uptr = uptr->next)
-+ {
-+ char *filename = find_a_file (&startfile_prefixes, uptr->filename,
-+ R_OK, true);
-+ read_specs (filename ? filename : uptr->filename, false, true);
-+ }
-+ /* Process any user self specs. */
-+ {
-+ struct spec_list *sl;
-+ for (sl = specs; sl; sl = sl->next)
-+ if (sl->name_len == sizeof "self_spec" - 1
-+ && !strcmp (sl->name, "self_spec"))
-+ do_self_spec (*sl->ptr_spec);
-+ }
-+
- /* Process DRIVER_SELF_SPECS, adding any new options to the end
- of the command line. */
-
-@@ -6535,24 +6578,6 @@ main (int argc, char **argv)
- PREFIX_PRIORITY_LAST, 0, 1);
- }
-
-- /* Process any user specified specs in the order given on the command
-- line. */
-- for (uptr = user_specs_head; uptr; uptr = uptr->next)
-- {
-- char *filename = find_a_file (&startfile_prefixes, uptr->filename,
-- R_OK, true);
-- read_specs (filename ? filename : uptr->filename, false, true);
-- }
--
-- /* Process any user self specs. */
-- {
-- struct spec_list *sl;
-- for (sl = specs; sl; sl = sl->next)
-- if (sl->name_len == sizeof "self_spec" - 1
-- && !strcmp (sl->name, "self_spec"))
-- do_self_spec (*sl->ptr_spec);
-- }
--
- if (compare_debug)
- {
- enum save_temps save;
diff --git a/sys-devel/gcc/files/gcc-spec-env.patch b/sys-devel/gcc/files/gcc-spec-env.patch
deleted file mode 100644
index 57e7567..0000000
--- a/sys-devel/gcc/files/gcc-spec-env.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- Add support for external spec file via the GCC_SPECS env var. This
- allows us to easily control pie/ssp defaults with gcc-config profiles.
-
- Original patch by Rob Holland
- Extended to support multiple entries separated by ':' by Kevin F. Quinn
- Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
-
---- gcc-4/gcc/gcc.c
-+++ gcc-4/gcc/gcc.c
-@@ -6482,6 +6482,32 @@
-
- /* Process any user specified specs in the order given on the command
- line. */
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+ /* Add specs listed in GCC_SPECS. Note; in the process of separating
-+ * each spec listed, the string is overwritten at token boundaries
-+ * (':') with '\0', an effect of strtok_r().
-+ */
-+ specs_file = getenv ("GCC_SPECS");
-+ if (specs_file && (strlen(specs_file) > 0))
-+ {
-+ char *spec, *saveptr;
-+ for (spec=strtok_r(specs_file,":",&saveptr);
-+ spec!=NULL;
-+ spec=strtok_r(NULL,":",&saveptr))
-+ {
-+ struct user_specs *user = (struct user_specs *)
-+ xmalloc (sizeof (struct user_specs));
-+
-+ user->next = (struct user_specs *) 0;
-+ user->filename = spec;
-+ if (user_specs_tail)
-+ user_specs_tail->next = user;
-+ else
-+ user_specs_head = user;
-+ user_specs_tail = user;
-+ }
-+ }
-+#endif
- for (uptr = user_specs_head; uptr; uptr = uptr->next)
- {
- char *filename = find_a_file (&startfile_prefixes, uptr->filename,
diff --git a/sys-devel/gcc/files/mkinfodir b/sys-devel/gcc/files/mkinfodir
deleted file mode 100644
index a62840e..0000000
--- a/sys-devel/gcc/files/mkinfodir
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-# $Id: mkinfodir,v 1.1 2001/09/01 07:56:19 drobbins Exp $
-# Generate the top-level Info node, given a directory of Info files
-# and (optionally) a skeleton file. The output will be suitable for a
-# top-level dir file. The skeleton file contains info topic names in the
-# order they should appear in the output. There are three special
-# lines that alter the behavior: a line consisting of just "--" causes
-# the next line to be echoed verbatim to the output. A line
-# containing just "%%" causes all the remaining filenames (wildcards
-# allowed) in the rest of the file to be ignored. A line containing
-# just "!!" exits the script when reached (unless preceded by a line
-# containing just "--"). Once the script reaches the end of the
-# skeleton file, it goes through the remaining files in the directory
-# in order, putting their entries at the end. The script will use the
-# ENTRY information in each info file if it exists. Otherwise it will
-# make a minimal entry.
-
-# sent by Jeffrey Osier <jeffrey@cygnus.com>, who thinks it came from
-# zoo@winternet.com (david d `zoo' zuhn)
-
-# modified 7 April 1995 by Joe Harrington <jh@tecate.gsfc.nasa.gov> to
-# take special flags
-
-INFODIR=$1
-if [ $# = 2 ] ; then
- SKELETON=$2
-else
- SKELETON=/dev/null
-fi
-
-skip=
-
-if [ $# -gt 2 ] ; then
- echo usage: $0 info-directory [ skeleton-file ] 1>&2
- exit 1
-elif [ -z "${INFODIR}" ] ; then
- INFODIR="%%DEFAULT_INFO_DIR%%"
-else
- true
-fi
-
-if [ ! -d ${INFODIR} ] ; then
- echo "$0: first argument must specify a directory"
- exit 1
-fi
-
-### output the dir header
-echo "-*- Text -*-"
-echo "This file was generated automatically by $0."
-echo "This version was generated on `date`"
-echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`"
-
-cat << moobler
-\$Id: mkinfodir,v 1.1 2001/09/01 07:56:19 drobbins Exp $
-This is the file .../info/dir, which contains the topmost node of the
-Info hierarchy. The first time you invoke Info you start off
-looking at that node, which is (dir)Top.
-\x1f
-File: dir Node: Top This is the top of the INFO tree
-
- This (the Directory node) gives a menu of major topics.
- Typing "q" exits, "?" lists all Info commands, "d" returns here,
- "h" gives a primer for first-timers,
- "mEmacs<Return>" visits the Emacs topic, etc.
-
- In Emacs, you can click mouse button 2 on a menu item or cross reference
- to select it.
-
-* Menu: The list of major topics begins on the next line.
-
-moobler
-
-### go through the list of files in the skeleton. If an info file
-### exists, grab the ENTRY information from it. If an entry exists
-### use it, otherwise create a minimal dir entry.
-###
-### Then remove that file from the list of existing files. If any
-### additional files remain (ones that don't have a skeleton entry),
-### then generate entries for those in the same way, putting the info for
-### those at the end....
-
-infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')`
-
-# echoing gets clobbered by backquotes; we do it the hard way...
-lines=`wc $SKELETON | awk '{print $1}'`
-line=1
-while [ $lines -ge $line ] ; do
- # Read one line from the file. This is so that we can echo lines with
- # whitespace and quoted characters in them.
- fileline=`awk NR==$line $SKELETON`
-
- # flag fancy features
- if [ ! -z "$echoline" ] ; then # echo line
- echo "$fileline"
- fileline=
- echoline=
- elif [ "${fileline}" = "--" ] ; then # should we echo the next line?
- echoline=1
- elif [ "${fileline}" = "%%" ] ; then # eliminate remaining files from dir?
- skip=1
- elif [ "${fileline}" = "!!" ] ; then # quit now
- exit 0
- fi
-
- # handle files if they exist
- for file in $fileline"" ; do # expand wildcards ("" handles blank lines)
-
- fname=
-
- if [ -z "$echoline" -a ! -z "$file" ] ; then
-
- # Find the file to operate upon. Check both possible names.
- infoname=`echo $file | sed 's/\.gz$//'`
- infoname=`echo $infoname | sed 's/\.info$//'`
- noext=
- ext=
- if [ -f ${INFODIR}/$infoname ] ; then
- noext=$infoname
- fi
- if [ -f ${INFODIR}/${infoname}.info ] ; then
- ext=${infoname}.info
- fi
- if [ -f ${INFODIR}/${infoname}.info.gz ] ; then
- ext=${infoname}.info.gz
- fi
- # If it exists with both names take what was said in the file.
- if [ ! -z "$ext" -a ! -z "$noext" ]; then
- fname=$file
- warn="### Warning: $ext and $noext both exist! Using ${file}. ###"
- elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then
- # just take the name if it exists only once
- fname=${noext}${ext}
- fi
-
- # if we found something and aren't skipping, do the entry
- if [ ! -z "$fname" ] ; then
- if [ -z "$skip" ] ; then
-
- if [ ! -z "$warn" ] ; then # issue any warning
- echo $warn
- warn=
- fi
- if [ "${fname##*.}" = "gz" ] ; then
- entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \
- -e '/END-INFO-DIR-ENTRY/,$d' `
- else
- entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
- -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname`
- fi
- if [ ! -z "${entry}" ] ; then
- echo "${entry}"
- else
- echo "* ${infoname}: (${infoname})."
- fi
- fi
-
- # remove the name from the directory listing
- infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/ / /g"`
-
- fi
-
- fi
-
- done
-
- line=`expr $line + 1`
-done
-
-if [ -z "${infofiles}" ] ; then
- exit 0
-elif [ $lines -gt 0 ]; then
- echo
-fi
-
-# Sort remaining files by INFO-DIR-SECTION.
-prevsect=
-filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \
- fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \
- sort -t: -k2 -k1 | tr ' ' '_')`
-for sectdata in ${filesectdata}; do
- file=`echo ${sectdata} | cut -d: -f1`
- section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file}`
- infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/ / /g"`
-
- if [ "${prevsect}" != "${section}" ] ; then
- if [ ! -z "${prevsect}" ] ; then
- echo ""
- fi
- echo "${section}"
- prevsect="${section}"
- fi
- infoname=`echo $file | sed 's/\.gz$//'`
- infoname=`echo $infoname | sed 's/\.info$//'`
- if [ "${file##*.}" = "gz" ] ; then
- entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \
- -e '/END-INFO-DIR-ENTRY/,$d' `
- else
- entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
- -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file`
- fi
- if [ ! -z "${entry}" ] ; then
- echo "${entry}"
- elif [ ! -d "${INFODIR}/${file}" ] ; then
- echo "* ${infoname}: (${infoname})."
- fi
-done
-
-# Process miscellaneous files.
-for file in ${infofiles}; do
- if [ ! -z "${prevsect}" ] ; then
- echo ""
- echo "Miscellaneous"
- prevsect=""
- fi
-
- infoname=`echo $file | sed 's/\.gz$//'`
- infoname=`echo $infoname | sed 's/\.info$//'`
- if [ "${file##*.}" = "gz" ] ; then
- entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \
- -e '/END-INFO-DIR-ENTRY/,$d'`
- else
- entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
- -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file`
- fi
-
-
- if [ ! -z "${entry}" ] ; then
- echo "${entry}"
- elif [ ! -d "${INFODIR}/${file}" ] ; then
- echo "* ${infoname}: (${infoname})."
- fi
-done
-
diff --git a/sys-devel/gcc/gcc-4.7.4-r99.ebuild b/sys-devel/gcc/gcc-4.7.4-r99.ebuild
deleted file mode 100644
index e2735a5..0000000
--- a/sys-devel/gcc/gcc-4.7.4-r99.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.7.3.ebuild,v 1.2 2013/05/20 10:56:06 aballier Exp $
-
-EAPI="2"
-
-PATCH_VER="1.1"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.5.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
-SSP_STABLE="amd64 x86 ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
-PIE_MUSL_STABLE="amd64 arm ppc x86"
-SSP_MUSL_STABLE="amd64 arm ppc x86"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="amd64 arm ~mips ppc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- >=${CATEGORY}/binutils-2.18"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
- if has_version '<sys-libs/glibc-2.12' ; then
- ewarn "Your host glibc is too old; disabling automatic fortify."
- ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
- EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
- fi
-
- toolchain_src_prepare
-
- if use elibc_musl; then
- cd "${S}"
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
- mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org
- cp -r libstdc\+\+-v3/config/os/generic libstdc\+\+-v3/config/os/gnu-linux
- cp libstdc++-v3/config/os/gnu-linux.org/arm-eabi-extra.ver libstdc++-v3/config/os/gnu-linux/
- mv libitm/config/linux/x86 libitm/config/linux/x86_glibc
- cp -r libitm/config/generic libitm/config/linux/x86
- epatch "${FILESDIR}"/${PN}-4.7.3-musl-linker-path.patch
- epatch "${FILESDIR}"/${PN}-4.7.3-powerpc-libc-stack-end.patch
- epatch "${FILESDIR}"/${PN}-4.7.4-secure-plt.patch
- fi
-
- use vanilla && return 0
-
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
-}
diff --git a/sys-devel/gcc/gcc-4.8.4-r99.ebuild b/sys-devel/gcc/gcc-4.8.4-r99.ebuild
deleted file mode 100644
index 33b9881..0000000
--- a/sys-devel/gcc/gcc-4.8.4-r99.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.2.ebuild,v 1.9 2014/01/19 01:51:34 dirtyepic Exp $
-
-EAPI="4"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.1"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-PIE_MUSL_STABLE="amd64 arm ppc mips x86"
-SSP_MUSL_STABLE="amd64 arm ppc mips"
-#end Hardened stuff
-
-inherit eutils toolchain
-
-KEYWORDS="amd64 arm ~mips ~ppc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- elibc_glibc? ( >=sys-libs/glibc-2.8 )
- >=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
- PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-fi
-
-src_prepare() {
- if has_version '<sys-libs/glibc-2.12' ; then
- ewarn "Your host glibc is too old; disabling automatic fortify."
- ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
- EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
- fi
-
- toolchain_src_prepare
-
- if use elibc_musl; then
- cd "${S}"
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
- mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org
- cp -r libstdc\+\+-v3/config/os/generic libstdc\+\+-v3/config/os/gnu-linux
- cp libstdc++-v3/config/os/gnu-linux.org/arm-eabi-extra.ver libstdc++-v3/config/os/gnu-linux/
- mv libitm/config/linux/x86 libitm/config/linux/x86_glibc
- cp -r libitm/config/generic libitm/config/linux/x86
- epatch "${FILESDIR}"/${PN}-4.8.3-musl-linker-path.patch
- epatch "${FILESDIR}"/${PN}-4.8.3-secure-plt.patch
- epatch "${FILESDIR}"/${PN}-4.8.3-musl-res_state.patch
- epatch "${FILESDIR}"/${PN}-4.8.3-musl-fix-libc5-assumption.patch
- fi
-
- use vanilla && return 0
- #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
- [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
deleted file mode 100644
index 0b0c8ff..0000000
--- a/sys-devel/gcc/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>toolchain</herd>
- <use>
- <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
- (AWT) peer support on top of GTK+</flag>
- <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets
- in gcc (Warning: significantly increases compile time!)</flag>
- <flag name="go">Build the GCC Go language frontend.</flag>
- <flag name="graphite">Add support for the framework for loop
- optimizations based on a polyhedral intermediate representation</flag>
- <flag name="libssp">Build SSP support into a dedicated library rather than use the
- code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
- <flag name="mudflap">Add support for mudflap, a pointer use checking library</flag>
- <flag name="multislot">Allow for SLOTs to include minor version (3.3.4
- instead of just 3.3)</flag>
- <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag>
- <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag>
- <flag name="objc">Build support for the Objective C code language</flag>
- <flag name="objc++">Build support for the Objective C++ language</flag>
- <flag name="objc-gc">Build support for the Objective C code language Garbage
- Collector</flag>
- <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
- <flag name="sanitize">Build support various sanitizer functions (ASAN/TSAN/etc...)</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-devel/gdb/files/gdb-7.4-linux-nat.patch b/sys-devel/gdb/files/gdb-7.4-linux-nat.patch
deleted file mode 100644
index 30bfbc8..0000000
--- a/sys-devel/gdb/files/gdb-7.4-linux-nat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-taken from sabotage linux
-
-the first chunk fixes build errors,
-the non_stop part below fixes thread debugging being available
-by default without setting any breakpoints or usage of libthread_db.
-
---- gdb-7.4.org/gdb/linux-nat.c 2013-08-10 05:24:24.651000003 +0000
-+++ gdb-7.4/gdb/linux-nat.c 2013-08-10 05:25:50.966000003 +0000
-@@ -71,6 +71,14 @@
- # endif
- #endif /* HAVE_PERSONALITY */
-
-+#ifndef __SIGRTMIN
-+#define __SIGRTMIN SIGRTMIN
-+#endif
-+
-+#ifndef W_STOPCODE
-+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
-+#endif
-+
- /* This comment documents high-level logic of this file.
-
- Waiting for events in sync mode
-@@ -2265,7 +2273,7 @@
- status = 0;
- }
-
-- if (non_stop)
-+ if (1)
- {
- /* Add the new thread to GDB's lists as soon as possible
- so that:
diff --git a/sys-devel/gdb/files/gdb-7.5.1-amd64-linux-nat.patch b/sys-devel/gdb/files/gdb-7.5.1-amd64-linux-nat.patch
deleted file mode 100644
index 13459ad..0000000
--- a/sys-devel/gdb/files/gdb-7.5.1-amd64-linux-nat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gdb-7.5.1/gdb/amd64-linux-nat.c
-+++ b/gdb-7.5.1/gdb/amd64-linux-nat.c
-@@ -31,7 +31,7 @@
- #include "elf/common.h"
- #include <sys/uio.h>
- #include <sys/ptrace.h>
--#include <sys/debugreg.h>
-+#include <asm/debugreg.h>
- #include <sys/syscall.h>
- #include <sys/procfs.h>
- #include <sys/user.h>
diff --git a/sys-devel/gdb/files/gdb-7.6-linux-low-threaddb.patch b/sys-devel/gdb/files/gdb-7.6-linux-low-threaddb.patch
deleted file mode 100644
index 4b0f1aa..0000000
--- a/sys-devel/gdb/files/gdb-7.6-linux-low-threaddb.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-taken from sabotage linux
-
-this patch fixes compilation of gdbserver on systems that don't have
-thread_db.h. in that case we fall back to gdb's own copy
-"gdb_thread_db.h", so the typedef of the td_thrhandle_t member is
-available, which is accessed in other parts of the code without
-checking whether thread_db.h is available.
-this is by far the cleaner solution, removing the accesses to the
-th member in other parts of the source would either litter it with
-ifdefs or cripple the functionality.
-
---- gdb-7.6.2.org/gdb/gdbserver/linux-low.h
-+++ gdb-7.6.2/gdb/gdbserver/linux-low.h
-@@ -18,6 +18,8 @@
-
- #ifdef HAVE_THREAD_DB_H
- #include <thread_db.h>
-+#else
-+#include "gdb_thread_db.h"
- #endif
- #include <signal.h>
-
-@@ -270,11 +272,9 @@
- int need_step_over;
-
- int thread_known;
--#ifdef HAVE_THREAD_DB_H
- /* The thread handle, used for e.g. TLS access. Only valid if
- THREAD_KNOWN is set. */
- td_thrhandle_t th;
--#endif
-
- /* Arch-specific additions. */
- struct arch_lwp_info *arch_private;
diff --git a/sys-devel/gdb/gdb-7.7.1-r99.ebuild b/sys-devel/gdb/gdb-7.7.1-r99.ebuild
deleted file mode 100644
index b588707..0000000
--- a/sys-devel/gdb/gdb-7.7.1-r99.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-7.7.1.ebuild,v 1.10 2014/11/04 20:15:26 maekke Exp $
-
-EAPI="4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit flag-o-matic eutils python-single-r1
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
- export CTARGET=${CATEGORY/cross-}
- fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-RPM=
-MY_PV=${PV}
-case ${PV} in
-*.*.*.*.*.*)
- # fedora version: gdb-6.8.50.20090302-8.fc11.src.rpm
- inherit versionator rpm
- gvcr() { get_version_component_range "$@"; }
- MY_PV=$(gvcr 1-4)
- RPM="${PN}-${MY_PV}-$(gvcr 5).fc$(gvcr 6).src.rpm"
- SRC_URI="mirror://fedora/development/source/SRPMS/${RPM}"
- ;;
-*.*.50.*)
- # weekly snapshots
- SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.bz2"
- ;;
-9999*)
- # live git tree
- EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
- inherit git-2
- SRC_URI=""
- ;;
-*)
- # Normal upstream release
- SRC_URI="mirror://gnu/gdb/${P}.tar.bz2
- ftp://sourceware.org/pub/gdb/releases/${P}.tar.bz2"
- ;;
-esac
-
-PATCH_VER="1"
-DESCRIPTION="GNU debugger"
-HOMEPAGE="http://sourceware.org/gdb/"
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-IUSE="+client expat lzma multitarget nls +python +server test vanilla zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="!dev-util/gdbserver
- >=sys-libs/ncurses-5.2-r2
- sys-libs/readline
- expat? ( dev-libs/expat )
- lzma? ( app-arch/xz-utils )
- python? ( ${PYTHON_DEPS} )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/yacc
- test? ( dev-util/dejagnu )
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch ${FILESDIR}/${PN}-7.4-linux-nat.patch
- epatch ${FILESDIR}/${PN}-7.5.1-amd64-linux-nat.patch
-
- [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
- use vanilla || [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- epatch_user
- strip-linguas -u bfd/po opcodes/po
- if [[ ${CHOST} == *-darwin* ]] ; then
- # make sure we have a python-config that matches our install,
- # such that the python check doesn't fail just because the
- # gdb-provided copy isn't quite what our python installed
- # version is
- rm -f "${S}"/gdb/python/python-config.py || die
- pushd "${S}"/gdb/python > /dev/null || die
- ln -s "${T}"/${EPYTHON}/bin/python-config python-config.py || die
- popd > /dev/null || die
- fi
-}
-
-gdb_branding() {
- printf "Gentoo ${PV} "
- if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
- printf "p${PATCH_VER}"
- else
- printf "vanilla"
- fi
-}
-
-src_configure() {
- strip-unsupported-flags
-
- local myconf=(
- --with-pkgversion="$(gdb_branding)"
- --with-bugurl='http://bugs.gentoo.org/'
- --disable-werror
- # Disable modules that are in a combined binutils/gdb tree. #490566
- --disable-{binutils,etc,gas,gold,gprof,ld}
- )
- local sysroot="${EPREFIX}/usr/${CTARGET}"
- is_cross && myconf+=(
- --with-sysroot="${sysroot}"
- --includedir="${sysroot}/usr/include"
- )
-
- if use server && ! use client ; then
- # just configure+build in the gdbserver subdir to speed things up
- cd gdb/gdbserver
- myconf+=( --program-transform-name='' )
- else
- # gdbserver only works for native targets (CHOST==CTARGET).
- # it also doesn't support all targets, so rather than duplicate
- # the target list (which changes between versions), use the
- # "auto" value when things are turned on.
- is_cross \
- && myconf+=( --disable-gdbserver ) \
- || myconf+=( $(use_enable server gdbserver auto) )
- fi
-
- if ! ( use server && ! use client ) ; then
- # if we are configuring in the top level, then use all
- # the additional global options
- myconf+=(
- --enable-64-bit-bfd
- --disable-install-libbfd
- --disable-install-libiberty
- # This only disables building in the readline subdir.
- # For gdb itself, it'll use the system version.
- --disable-readline
- --with-system-readline
- --with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
- $(use_with expat)
- $(use_with lzma)
- $(use_enable nls)
- $(use multitarget && echo --enable-targets=all)
- $(use_with python python "${EPYTHON}")
- $(use_with zlib)
- )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_test() {
- nonfatal emake check || ewarn "tests failed"
-}
-
-src_install() {
- use server && ! use client && cd gdb/gdbserver
- default
- use client && find "${ED}"/usr -name libiberty.a -delete
- cd "${S}"
-
- # Don't install docs when building a cross-gdb
- if [[ ${CTARGET} != ${CHOST} ]] ; then
- rm -r "${ED}"/usr/share
- return 0
- fi
- # Install it by hand for now:
- # http://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
- # Only install if it exists due to the twisted behavior (see
- # notes in src_configure above).
- [[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
-
- if use client ; then
- docinto gdb
- dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
- gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
- fi
- docinto sim
- dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
- if use server ; then
- docinto gdbserver
- dodoc gdb/gdbserver/{ChangeLog,README}
- fi
-
- if [[ -n ${PATCH_VER} ]] ; then
- dodoc "${WORKDIR}"/extra/gdbinit.sample
- fi
-
- # Remove shared info pages
- rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
-}
-
-pkg_postinst() {
- # portage sucks and doesnt unmerge files in /etc
- rm -vf "${EROOT}"/etc/skel/.gdbinit
-
- if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
- ewarn "gdb is unable to get a mach task port when installed by Prefix"
- ewarn "Portage, unprivileged. To make gdb fully functional you'll"
- ewarn "have to perform the following steps:"
- ewarn " % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
- ewarn " % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
- fi
-}
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
deleted file mode 100644
index ab9c41a..0000000
--- a/sys-devel/gdb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>toolchain</herd>
-<use>
- <flag name='client'>Install the main "gdb" program (most people want this)</flag>
- <flag name='multitarget'>Support all known targets in one gdb binary</flag>
- <flag name='python'>Enable support for the new internal scripting language, as well as extended pretty printers</flag>
- <flag name='server'>Install the "gdbserver" program (useful for embedded/remote targets)</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
deleted file mode 100644
index f5f1d9e..0000000
--- a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- tools/clang/lib/Frontend/InitHeaderSearch.cpp
-+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
-@@ -233,6 +233,7 @@
- case llvm::Triple::Bitrig:
- break;
- default:
-+ AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false);
- // FIXME: temporary hack: hard-coded paths.
- AddPath("/usr/local/include", System, false);
- break;
-@@ -505,6 +506,7 @@
- // Add the default framework include paths on Darwin.
- if (HSOpts.UseStandardSystemIncludes) {
- if (triple.isOSDarwin()) {
-+ AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true);
- AddPath("/System/Library/Frameworks", System, true);
- AddPath("/Library/Frameworks", System, true);
- }
diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch b/sys-devel/llvm/files/clang-3.5-gentoo-install.patch
deleted file mode 100644
index 5d4261d..0000000
--- a/sys-devel/llvm/files/clang-3.5-gentoo-install.patch
+++ /dev/null
@@ -1,57 +0,0 @@
----
- tools/clang/lib/Driver/Tools.cpp | 2 +-
- tools/clang/tools/scan-build/scan-build | 4 ++--
- tools/clang/tools/scan-view/scan-view | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp
-index 187ed38..55bcd99 100644
---- a/tools/clang/lib/Driver/Tools.cpp
-+++ b/tools/clang/lib/Driver/Tools.cpp
-@@ -1404,7 +1404,7 @@ static void AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args,
- // as gold requires -plugin to come before any -plugin-opt that -Wl might
- // forward.
- CmdArgs.push_back("-plugin");
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so";
- CmdArgs.push_back(Args.MakeArgString(Plugin));
-
- // Try to pass driver level flags relevant to LTO code generation down to
-diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build
-index 0f119f6..58f78d9 100755
---- a/tools/clang/tools/scan-build/scan-build
-+++ b/tools/clang/tools/scan-build/scan-build
-@@ -419,7 +419,7 @@
-
- my $Dir = shift;
-
-- my $JS = Cwd::realpath("$RealBin/sorttable.js");
-+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js");
-
- DieDiag("Cannot find 'sorttable.js'.\n")
- if (! -r $JS);
-@@ -429,7 +429,7 @@
- DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
- if (! -r "$Dir/sorttable.js");
-
-- my $CSS = Cwd::realpath("$RealBin/scanview.css");
-+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css");
-
- DieDiag("Cannot find 'scanview.css'.\n")
- if (! -r $CSS);
-diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view
-index fb27da6..1f8ddb8 100755
---- a/tools/clang/tools/scan-view/scan-view
-+++ b/tools/clang/tools/scan-view/scan-view
-@@ -54,7 +54,7 @@ def start_browser(port, options):
- webbrowser.open(url)
-
- def run(port, options, root):
-- import ScanView
-+ from clang import ScanView
- try:
- print 'Starting scan-view at: http://%s:%d'%(options.host,
- port)
---
-1.8.4.4
-
diff --git a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
deleted file mode 100644
index 1f81af0..0000000
--- a/sys-devel/llvm/files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 916572e1243633ddf913c8f32771a3a7f70fd853 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 5 Sep 2014 16:49:35 +0200
-Subject: [PATCH] Support obtaining active toolchain from gcc-config.
-
----
- tools/clang/lib/Driver/ToolChains.cpp | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/tools/clang/lib/Driver/ToolChains.cpp b/tools/clang/lib/Driver/ToolChains.cpp
-index b46f69d..2d4374d 100644
---- a/tools/clang/lib/Driver/ToolChains.cpp
-+++ b/tools/clang/lib/Driver/ToolChains.cpp
-@@ -1253,6 +1253,25 @@ Generic_GCC::GCCInstallationDetector::init(
- Prefixes.push_back("/usr");
- }
-
-+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) {
-+ llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-+ llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str());
-+ if (File)
-+ {
-+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str();
-+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText;
-+ if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o"))
-+ {
-+ Version = GCCVersion::Parse(VersionText);
-+ GCCInstallPath = GentooPath;
-+ GCCParentLibPath = GCCInstallPath + "/../../..";
-+ GCCTriple.setTriple(CandidateTripleAliases[k]);
-+ IsValid = true;
-+ return;
-+ }
-+ }
-+ }
-+
- // Loop over the various components which exist and select the best GCC
- // installation available. GCC installs are ranked by version number.
- Version = GCCVersion::Parse("0.0.0");
---
-2.1.0
-
diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch
deleted file mode 100644
index 3a622b5..0000000
--- a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200
-+++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200
-@@ -52,11 +52,10 @@
- # 'make generated BUILD_FOR_WEBSITE=1'
- generated:: $(generated_targets)
-
--install-html: $(PROJ_OBJ_DIR)/html.tar.gz
-+install-html:
- $(Echo) Installing HTML documentation
- $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
- $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
-
- $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- $(Echo) Packaging HTML documentation
-@@ -68,12 +67,11 @@
- install-doxygen: doxygen
- $(Echo) Installing doxygen documentation
- $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
- $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
- $(FIND) . -type f -exec \
- $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
-
--doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
-+doxygen: regendoc
-
- regendoc:
- $(Echo) Building doxygen documentation
-@@ -99,7 +97,6 @@
- install-ocamldoc: ocamldoc
- $(Echo) Installing ocamldoc documentation
- $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir)
- $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
- $(FIND) . -type f -exec \
- $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \;
-@@ -109,7 +106,6 @@
- $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar*
- $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc
- $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar
-- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/
-
- regen-ocamldoc:
- $(Echo) Building ocamldoc documentation
diff --git a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch b/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch
deleted file mode 100644
index 7da657f..0000000
--- a/sys-devel/llvm/files/llvm-3.5-gcc-4.9.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 080fb498017d17af2e4d7563608c7d8a848f20da
-Author: Sanjoy Das <sanjoy at azulsystems.com>
-Date: Thu Jun 19 15:38:02 2014 -0700
-
- Fix the --enable-shared build.
-
- Currently a build configured with ./configure --enable-shared breaks
- with an undefined "llvm::cl::parser<llvm::PassInfo
- const*>::getOption(unsigned int) const" symbol when linking opt. This
- body for this symbol gets emitted into Pass.o (along with the destructor
- for PassNameParser), but gets linked into libLLVM-3.5svn.so with local
- visibility, causing the link error.
-
- This fix uses the existing EXTERN_TEMPLATE machinery to force a globally
- visible definition for the functions in parser<const PassInfo *> into
- Pass.o.
-
-diff --git a/include/llvm/IR/LegacyPassNameParser.h b/include/llvm/IR/LegacyPassNameParser.h
-index e2e4912..a07e3fd 100644
---- a/include/llvm/IR/LegacyPassNameParser.h
-+++ b/include/llvm/IR/LegacyPassNameParser.h
-@@ -95,6 +95,8 @@ private:
- }
- };
-
-+EXTERN_TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>);
-+
- ///===----------------------------------------------------------------------===//
- /// FilteredPassNameParser class - Make use of the pass registration
- /// mechanism to automatically add a command line argument to opt for
-diff --git a/lib/IR/Pass.cpp b/lib/IR/Pass.cpp
-index 91d86ae..00ce223 100644
---- a/lib/IR/Pass.cpp
-+++ b/lib/IR/Pass.cpp
-@@ -234,6 +234,8 @@ PassNameParser::~PassNameParser() {
- // attempting to remove the registration listener is an error.
- }
-
-+TEMPLATE_INSTANTIATION(class cl::parser<const PassInfo *>);
-+
- //===----------------------------------------------------------------------===//
- // AnalysisUsage Class Implementation
- //
diff --git a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch
deleted file mode 100644
index 7a8c9f7..0000000
--- a/sys-devel/llvm/files/llvm-3.5-gentoo-install.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 19 Aug 2013 13:22:46 +0200
-Subject: [PATCH] gentoo install fixes
-
----
- Makefile.config.in | 6 +++---
- Makefile.rules | 6 +++---
- tools/llvm-config/BuildVariables.inc.in | 2 ++
- tools/llvm-config/Makefile | 4 ++++
- tools/llvm-config/llvm-config.cpp | 5 +++--
- utils/FileCheck/Makefile | 2 +-
- 7 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile.config.in b/Makefile.config.in
-index dcca45f..e75ae2e 100644
---- a/Makefile.config.in
-+++ b/Makefile.config.in
-@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix)
- endif
-
- PROJ_bindir := $(PROJ_prefix)/bin
--PROJ_libdir := $(PROJ_prefix)/lib
-+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR)
- PROJ_datadir := $(PROJ_prefix)/share
--PROJ_docsdir := $(PROJ_prefix)/docs/llvm
--PROJ_etcdir := $(PROJ_prefix)/etc/llvm
-+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@
-+PROJ_etcdir := @EPREFIX@/etc/llvm
- PROJ_includedir := $(PROJ_prefix)/include
- PROJ_infodir := $(PROJ_prefix)/info
- PROJ_mandir := $(PROJ_prefix)/share/man
-diff --git a/Makefile.rules b/Makefile.rules
-index e53598b..217f754 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
- BuildMode := Release
- # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD))
-- OmitFramePointer := -fomit-frame-pointer
-+ OmitFramePointer :=
- endif
-
- CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
-diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in
-index fe87afb..fd9f2c6 100644
---- a/tools/llvm-config/BuildVariables.inc.in
-+++ b/tools/llvm-config/BuildVariables.inc.in
-@@ -25,3 +25,4 @@
- #define LLVM_BUILDMODE "@LLVM_BUILDMODE@"
- #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@"
- #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
-+#define LLVM_LIBDIR "@LLVM_LIBDIR@"
-diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
-index b20b6bf..fc56781 100644
---- a/tools/llvm-config/Makefile
-+++ b/tools/llvm-config/Makefile
-@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
- >> temp.sed
- $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
- >> temp.sed
-+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \
-+ >> temp.sed
- $(Verb) $(SED) -f temp.sed < $< > $@
- $(Verb) $(RM) temp.sed
-
-diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index 3924e2e..f439c60 100644
---- a/tools/llvm-config/llvm-config.cpp
-+++ b/tools/llvm-config/llvm-config.cpp
-@@ -250,7 +250,7 @@ int main(int argc, char **argv) {
- ActivePrefix = CurrentExecPrefix;
- ActiveIncludeDir = ActivePrefix + "/include";
- ActiveBinDir = ActivePrefix + "/bin";
-- ActiveLibDir = ActivePrefix + "/lib";
-+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR;
- ActiveIncludeOption = "-I" + ActiveIncludeDir;
- }
-
---
-1.8.4.2
-
diff --git a/sys-devel/llvm/files/llvm-3.5-musl-clang-support.patch b/sys-devel/llvm/files/llvm-3.5-musl-clang-support.patch
deleted file mode 100644
index a492f12..0000000
--- a/sys-devel/llvm/files/llvm-3.5-musl-clang-support.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-adapted from llvm-alpine-linux.patch from Alpine
-
-diff -ru llvm-3.5.0.src.orig/tools/clang/lib/Driver/Tools.cpp llvm-3.5.0.src/tools/clang/lib/Driver/Tools.cpp
---- tools/clang/lib/Driver/Tools.cpp 2014-08-07 07:51:51.000000000 -0300
-+++ tools/clang/lib/Driver/Tools.cpp 2014-11-12 15:11:31.901864030 -0200
-@@ -7182,8 +7182,14 @@
- return "/system/bin/linker64";
- else
- return "/system/bin/linker";
-- } else if (ToolChain.getArch() == llvm::Triple::x86 ||
-- ToolChain.getArch() == llvm::Triple::sparc)
-+ } else if (ToolChain.getArch() == llvm::Triple::x86) {
-+ switch (ToolChain.getTriple().getEnvironment()) {
-+ case llvm::Triple::Musl:
-+ return "/lib/ld-musl-i386.so.1";
-+ default:
-+ return "/lib/ld-linux.so.2";
-+ }
-+ } else if (ToolChain.getArch() == llvm::Triple::sparc)
- return "/lib/ld-linux.so.2";
- else if (ToolChain.getArch() == llvm::Triple::aarch64 ||
- ToolChain.getArch() == llvm::Triple::arm64)
-@@ -7193,10 +7199,17 @@
- return "/lib/ld-linux-aarch64_be.so.1";
- else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb) {
-- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
-+ switch (ToolChain.getTriple().getEnvironment()) {
-+ case llvm::Triple::Musl:
-+ case llvm::Triple::MuslEABI:
-+ return "/lib/ld-musl-arm.so.3";
-+ case llvm::Triple::MuslEABIHF:
-+ return "/lib/ld-musl-armhf.so.3";
-+ case llvm::Triple::GNUEABIHF:
- return "/lib/ld-linux-armhf.so.3";
-- else
-+ default:
- return "/lib/ld-linux.so.3";
-+ }
- } else if (ToolChain.getArch() == llvm::Triple::armeb ||
- ToolChain.getArch() == llvm::Triple::thumbeb) {
- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
-@@ -7227,8 +7240,14 @@
- else if (ToolChain.getArch() == llvm::Triple::x86_64 &&
- ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32)
- return "/libx32/ld-linux-x32.so.2";
-- else
-- return "/lib64/ld-linux-x86-64.so.2";
-+ else {
-+ switch (ToolChain.getTriple().getEnvironment()) {
-+ case llvm::Triple::Musl:
-+ return "/lib/ld-musl-x86_64.so.1";
-+ default:
-+ return "/lib64/ld-linux-x86-64.so.2";
-+ }
-+ }
- }
-
- static void AddRunTimeLibs(const ToolChain &TC, const Driver &D,
diff --git a/sys-devel/llvm/files/llvm-3.5-musl-compiler-rt.patch b/sys-devel/llvm/files/llvm-3.5-musl-compiler-rt.patch
deleted file mode 100644
index b1f48d2..0000000
--- a/sys-devel/llvm/files/llvm-3.5-musl-compiler-rt.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur a/llvm-3.5.0.src/projects/compiler-rt/lib/Makefile.mk b/llvm-3.5.0.src/projects/compiler-rt/lib/Makefile.mk
---- a/projects/compiler-rt/lib/Makefile.mk 2014-02-14 10:20:33.000000000 -0100
-+++ b/projects/compiler-rt/lib/Makefile.mk 2015-01-07 13:56:00.362944069 -0100
-@@ -10,13 +10,13 @@
- SubDirs :=
-
- # Add submodules.
--SubDirs += asan
-+#SubDirs += asan
- SubDirs += builtins
--SubDirs += dfsan
-+#SubDirs += dfsan
- SubDirs += interception
--SubDirs += lsan
--SubDirs += msan
-+#SubDirs += lsan
-+#SubDirs += msan
- SubDirs += profile
--SubDirs += sanitizer_common
--SubDirs += tsan
--SubDirs += ubsan
-+#SubDirs += sanitizer_common
-+#SubDirs += tsan
-+#SubDirs += ubsan
-diff -ur a/llvm-3.5.0.src/projects/compiler-rt/lib/interception/interception_linux.cc b/llvm-3.5.0.src/projects/compiler-rt/lib/interception/interception_linux.cc
---- a/projects/compiler-rt/lib/interception/interception_linux.cc 2014-02-24 09:37:41.000000000 -0100
-+++ b/projects/compiler-rt/lib/interception/interception_linux.cc 2015-01-07 13:56:56.609240893 -0100
-@@ -24,12 +24,6 @@
- return real == wrapper;
- }
-
--#if !defined(__ANDROID__) // android does not have dlvsym
--void *GetFuncAddrVer(const char *func_name, const char *ver) {
-- return dlvsym(RTLD_NEXT, func_name, ver);
--}
--#endif // !defined(__ANDROID__)
--
- } // namespace __interception
-
-
-diff -ur a/llvm-3.5.0.src/projects/compiler-rt/lib/interception/interception_linux.h b/llvm-3.5.0.src/projects/compiler-rt/lib/interception/interception_linux.h
---- a/projects/compiler-rt/lib/interception/interception_linux.h 2014-02-24 09:37:41.000000000 -0100
-+++ b/projects/compiler-rt/lib/interception/interception_linux.h 2015-01-07 13:56:41.617428317 -0100
-@@ -34,14 +34,8 @@
- (::__interception::uptr) & (func), \
- (::__interception::uptr) & WRAP(func))
-
--#if !defined(__ANDROID__) // android does not have dlvsym
--# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
-- ::__interception::real_##func = (func##_f)(unsigned long) \
-- ::__interception::GetFuncAddrVer(#func, symver)
--#else
- # define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
- INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)
--#endif // !defined(__ANDROID__)
-
- #endif // INTERCEPTION_LINUX_H
- #endif // __linux__ || __FreeBSD__
diff --git a/sys-devel/llvm/files/llvm-3.5-musl-fixes.patch b/sys-devel/llvm/files/llvm-3.5-musl-fixes.patch
deleted file mode 100644
index 98d6133..0000000
--- a/sys-devel/llvm/files/llvm-3.5-musl-fixes.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-llvm-musl.patch from alpine linux
-
-diff -ru llvm-3.5.0.src.orig/include/llvm/Target/TargetLibraryInfo.h llvm-3.5.0.src/include/llvm/Target/TargetLibraryInfo.h
---- llvm-3.5.0.src.orig/include/llvm/Target/TargetLibraryInfo.h 2014-11-13 12:51:53.341455401 +0000
-+++ llvm-3.5.0.src/include/llvm/Target/TargetLibraryInfo.h 2014-11-13 12:52:35.078889077 +0000
-@@ -13,6 +13,15 @@
- #include "llvm/ADT/DenseMap.h"
- #include "llvm/Pass.h"
-
-+#undef fopen64
-+#undef fseeko64
-+#undef fstat64
-+#undef fstatvfs64
-+#undef ftello64
-+#undef lstat64
-+#undef stat64
-+#undef tmpfile64
-+
- namespace llvm {
- class Triple;
-
-diff -ru llvm-3.5.0.src.orig/lib/Support/DynamicLibrary.cpp llvm-3.5.0.src/lib/Support/DynamicLibrary.cpp
---- llvm-3.5.0.src.orig/lib/Support/DynamicLibrary.cpp 2014-11-13 12:51:53.341455401 +0000
-+++ llvm-3.5.0.src/lib/Support/DynamicLibrary.cpp 2014-11-13 12:52:07.781720766 +0000
-@@ -138,7 +138,7 @@
-
- // This macro returns the address of a well-known, explicit symbol
- #define EXPLICIT_SYMBOL(SYM) \
-- if (!strcmp(symbolName, #SYM)) return &SYM
-+ if (!strcmp(symbolName, #SYM)) return (void *) &SYM
-
- // On linux we have a weird situation. The stderr/out/in symbols are both
- // macros and global variables because of standards requirements. So, we
-diff -ru llvm-3.5.0.src.orig/lib/Support/Unix/Signals.inc llvm-3.5.0.src/lib/Support/Unix/Signals.inc
---- llvm-3.5.0.src.orig/lib/Support/Unix/Signals.inc 2014-11-13 12:51:53.341455401 +0000
-+++ llvm-3.5.0.src/lib/Support/Unix/Signals.inc 2014-11-13 12:52:07.781720766 +0000
-@@ -266,7 +266,7 @@
- // On glibc systems we have the 'backtrace' function, which works nicely, but
- // doesn't demangle symbols.
- void llvm::sys::PrintStackTrace(FILE *FD) {
--#if defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
-+#if defined(__GLIBC__) && defined(HAVE_BACKTRACE) && defined(ENABLE_BACKTRACES)
- static void* StackTrace[256];
- // Use backtrace() to output a backtrace on Linux systems with glibc.
- int depth = backtrace(StackTrace,
-diff -ru llvm-3.5.0.src.orig/lib/Target/TargetLibraryInfo.cpp llvm-3.5.0.src/lib/Target/TargetLibraryInfo.cpp
---- llvm-3.5.0.src.orig/lib/Target/TargetLibraryInfo.cpp 2014-11-13 12:51:53.341455401 +0000
-+++ llvm-3.5.0.src/lib/Target/TargetLibraryInfo.cpp 2014-11-13 12:52:07.785054160 +0000
-@@ -653,14 +653,15 @@
- }
-
- // The following functions are available on at least Linux:
-- if (!T.isOSLinux()) {
-+ if (!T.isOSLinux())
-+ TLI.setUnavailable(LibFunc::memalign);
-+ if (1 /*!T.isGlibc()*/) {
- TLI.setUnavailable(LibFunc::dunder_strdup);
- TLI.setUnavailable(LibFunc::dunder_strtok_r);
- TLI.setUnavailable(LibFunc::dunder_isoc99_scanf);
- TLI.setUnavailable(LibFunc::dunder_isoc99_sscanf);
- TLI.setUnavailable(LibFunc::under_IO_getc);
- TLI.setUnavailable(LibFunc::under_IO_putc);
-- TLI.setUnavailable(LibFunc::memalign);
- TLI.setUnavailable(LibFunc::fopen64);
- TLI.setUnavailable(LibFunc::fseeko64);
- TLI.setUnavailable(LibFunc::fstat64);
-diff -ru llvm-3.5.0.src.orig/utils/unittest/googletest/src/gtest.cc llvm-3.5.0.src/utils/unittest/googletest/src/gtest.cc
---- llvm-3.5.0.src.orig/utils/unittest/googletest/src/gtest.cc 2014-11-13 12:51:53.341455401 +0000
-+++ llvm-3.5.0.src/utils/unittest/googletest/src/gtest.cc 2014-11-13 12:52:07.785054160 +0000
-@@ -120,6 +120,7 @@
-
- #if GTEST_CAN_STREAM_RESULTS_
- # include <arpa/inet.h> // NOLINT
-+# include <sys/socket.h> // NOLINT
- # include <netdb.h> // NOLINT
- #endif
-
diff --git a/sys-devel/llvm/files/llvm-3.5-musl-support.patch b/sys-devel/llvm/files/llvm-3.5-musl-support.patch
deleted file mode 100644
index 4abb854..0000000
--- a/sys-devel/llvm/files/llvm-3.5-musl-support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-adapted from llvm-alpine-linux.patch from Alpine
-
-diff -ru llvm-3.5.0.src.orig/include/llvm/ADT/Triple.h llvm-3.5.0.src/include/llvm/ADT/Triple.h
---- include/llvm/ADT/Triple.h 2014-07-18 17:28:19.000000000 -0300
-+++ include/llvm/ADT/Triple.h 2014-11-12 14:44:41.738448045 -0200
-@@ -149,6 +149,10 @@
- EABIHF,
- Android,
-
-+ Musl,
-+ MuslEABI,
-+ MuslEABIHF,
-+
- MSVC,
- Itanium,
- Cygnus,
-Only in llvm-3.5.0.src/include/llvm/ADT: Triple.h.orig
-diff -ru llvm-3.5.0.src.orig/lib/Support/Triple.cpp llvm-3.5.0.src/lib/Support/Triple.cpp
---- lib/Support/Triple.cpp 2014-07-18 17:28:19.000000000 -0300
-+++ lib/Support/Triple.cpp 2014-11-12 14:47:06.565122146 -0200
-@@ -168,6 +168,9 @@
- case CODE16: return "code16";
- case EABI: return "eabi";
- case EABIHF: return "eabihf";
-+ case Musl: return "musl";
-+ case MuslEABI: return "musleabi";
-+ case MuslEABIHF: return "musleabihf";
- case Android: return "android";
- case MSVC: return "msvc";
- case Itanium: return "itanium";
-@@ -344,6 +347,9 @@
- .StartsWith("gnux32", Triple::GNUX32)
- .StartsWith("code16", Triple::CODE16)
- .StartsWith("gnu", Triple::GNU)
-+ .StartsWith("musl", Triple::Musl)
-+ .StartsWith("musleabi", Triple::MuslEABI)
-+ .StartsWith("musleabihf", Triple::MuslEABIHF)
- .StartsWith("android", Triple::Android)
- .StartsWith("msvc", Triple::MSVC)
- .StartsWith("itanium", Triple::Itanium)
-Only in llvm-3.5.0.src/lib/Support: Triple.cpp.orig
-diff -ru llvm-3.5.0.src.orig/lib/Target/ARM/ARMSubtarget.cpp llvm-3.5.0.src/lib/Target/ARM/ARMSubtarget.cpp
---- lib/Target/ARM/ARMSubtarget.cpp 2014-07-16 23:13:31.000000000 -0300
-+++ lib/Target/ARM/ARMSubtarget.cpp 2014-11-12 14:50:40.025133104 -0200
-@@ -273,6 +273,8 @@
- case Triple::EABIHF:
- case Triple::GNUEABI:
- case Triple::GNUEABIHF:
-+ case Triple::MuslEABI:
-+ case Triple::MuslEABIHF:
- TargetABI = ARM_ABI_AAPCS;
- break;
- default:
-diff -ru llvm-3.5.0.src.orig/lib/Target/ARM/ARMSubtarget.h llvm-3.5.0.src/lib/Target/ARM/ARMSubtarget.h
---- lib/Target/ARM/ARMSubtarget.h 2014-07-16 23:13:31.000000000 -0300
-+++ lib/Target/ARM/ARMSubtarget.h 2014-11-12 14:53:36.571808822 -0200
-@@ -372,8 +372,10 @@
- bool isTargetEHABICompatible() const {
- return (TargetTriple.getEnvironment() == Triple::EABI ||
- TargetTriple.getEnvironment() == Triple::GNUEABI ||
-+ TargetTriple.getEnvironment() == Triple::MuslEABI ||
- TargetTriple.getEnvironment() == Triple::EABIHF ||
- TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
-+ TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
- TargetTriple.getEnvironment() == Triple::Android) &&
- !isTargetDarwin() && !isTargetWindows();
- }
diff --git a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch b/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch
deleted file mode 100644
index 9fbd7b7..0000000
--- a/sys-devel/llvm/files/llvm-3.5.0-fix_LLVMExports_cmake.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: cmake/modules/Makefile
-===================================================================
---- cmake/modules/Makefile (revision 217451)
-+++ cmake/modules/Makefile (working copy)
-@@ -33,6 +33,16 @@
- LLVM_ENABLE_RTTI := 0
- endif
-
-+LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error))
-+
-+ifeq ($(LLVM_LIBS_TO_EXPORT),Error)
-+$(error llvm-config --libs failed)
-+endif
-+
-+ifndef LLVM_LIBS_TO_EXPORT
-+$(error LLVM_LIBS_TO_EXPORT cannot be empty)
-+endif
-+
- OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake
-
- $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag)
-@@ -45,7 +55,7 @@
- -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \
- -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \
- -e 's/@LLVM_COMMON_DEPENDS@//' \
-- -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \
-+ -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \
- -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \
- -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \
- -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \
-@@ -83,7 +93,7 @@
- $(Echo) 'Generating LLVM CMake target exports file'
- $(Verb) ( \
- echo '# LLVM CMake target exports. Do not include directly.' && \
-- for lib in $(subst -l,,$(LLVMConfigLibs)); do \
-+ for lib in $(LLVM_LIBS_TO_EXPORT); do \
- echo 'add_library('"$$lib"' STATIC IMPORTED)' && \
- echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \
- done && \
diff --git a/sys-devel/llvm/llvm-3.5.0-r99.ebuild b/sys-devel/llvm/llvm-3.5.0-r99.ebuild
deleted file mode 100644
index 22c7f6b..0000000
--- a/sys-devel/llvm/llvm-3.5.0-r99.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.11 2015/01/01 20:53:32 maekke Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit eutils flag-o-matic multibuild multilib \
- multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
- clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
- http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
- http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
- !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
-
-LICENSE="UoI-NCSA"
-SLOT="0/3.5"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
- +static-analyzer test xml video_cards_radeon
- kernel_Darwin kernel_FreeBSD"
-
-COMMON_DEPEND="
- sys-libs/zlib:0=
- clang? (
- python? ( ${PYTHON_DEPS} )
- static-analyzer? (
- dev-lang/perl:*
- ${PYTHON_DEPS}
- )
- xml? ( dev-libs/libxml2:2= )
- )
- gold? ( >=sys-devel/binutils-2.22:*[cxx] )
- libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
- libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] )
- ocaml? ( dev-lang/ocaml:0= )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- dev-lang/perl
- >=sys-devel/make-3.81
- >=sys-devel/flex-2.5.4
- >=sys-devel/bison-1.875d
- || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
- ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
- )
- || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
- clang? ( xml? ( virtual/pkgconfig ) )
- doc? ( dev-python/sphinx )
- libffi? ( virtual/pkgconfig )
- !!<dev-python/configparser-3.3.0.2
- ${PYTHON_DEPS}"
-RDEPEND="${COMMON_DEPEND}
- clang? ( !<=sys-devel/clang-${PV}-r99
- !>=sys-devel/clang-9999 )
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
-
-# pypy gives me around 1700 unresolved tests due to open file limit
-# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- test? ( || ( $(python_gen_useflags 'python*') ) )"
-
-S=${WORKDIR}/${P}.src
-
-# Some people actually override that in make.conf. That sucks since
-# we need to run install per-directory, and ninja can't do that...
-# so why did it call itself ninja in the first place?
-CMAKE_MAKEFILE_GENERATOR=emake
-
-pkg_pretend() {
- # in megs
- # !clang !debug !multitarget -O2 400
- # !clang !debug multitarget -O2 550
- # clang !debug !multitarget -O2 950
- # clang !debug multitarget -O2 1200
- # !clang debug multitarget -O2 5G
- # clang !debug multitarget -O0 -g 12G
- # clang debug multitarget -O2 16G
- # clang debug multitarget -O0 -g 14G
-
- local build_size=550
- use clang && build_size=1200
-
- if use debug; then
- ewarn "USE=debug is known to increase the size of package considerably"
- ewarn "and cause the tests to fail."
- ewarn
-
- (( build_size *= 14 ))
- elif is-flagq -g || is-flagq -ggdb; then
- ewarn "The C++ compiler -g option is known to increase the size of the package"
- ewarn "considerably. If you run out of space, please consider removing it."
- ewarn
-
- (( build_size *= 10 ))
- fi
-
- # Multiply by number of ABIs :).
- local abis=( $(multilib_get_enabled_abis) )
- (( build_size *= ${#abis[@]} ))
-
- local CHECKREQS_DISK_BUILD=${build_size}M
- check-reqs_pkg_pretend
-
- if [[ ${MERGE_TYPE} != binary ]]; then
- echo 'int main() {return 0;}' > "${T}"/test.cxx || die
- ebegin "Trying to build a C++11 test program"
- if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
- eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
- eerror "to gcc-4.7 or an equivalent version supporting C++11."
- die "Currently active compiler does not support -std=c++11"
- fi
- eend ${?}
- fi
-}
-
-pkg_setup() {
- pkg_pretend
-}
-
-src_unpack() {
- default
-
- rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
- || die "symlinks removal failed"
-
- if use clang; then
- mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
- || die "clang source directory move failed"
- mv "${WORKDIR}"/compiler-rt-${PV}.src "${S}"/projects/compiler-rt \
- || die "compiler-rt source directory move failed"
- mv "${WORKDIR}"/clang-tools-extra-${PV}.src "${S}"/tools/clang/tools/extra \
- || die "clang-tools-extra source directory move failed"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
- epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
- epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
-
- epatch "${FILESDIR}"/${PN}-3.5-musl-fixes.patch
- epatch "${FILESDIR}"/${PN}-3.5-musl-support.patch
-
- epatch "${FILESDIR}"/${P}-fix_LLVMExports_cmake.patch
-
- if use clang; then
- # Automatically select active system GCC's libraries, bugs #406163 and #417913
- epatch "${FILESDIR}"/${PN}-3.5-musl-compiler-rt.patch
- epatch "${FILESDIR}"/${PN}-3.5-musl-clang-support.patch
- epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
-
- epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
- epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
- eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
- fi
-
- if use prefix && use clang; then
- sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
- projects/compiler-rt/make/platform/clang_*.mk || die
- fi
-
- local sub_files=(
- Makefile.config.in
- Makefile.rules
- tools/llvm-config/llvm-config.cpp
- )
- use clang && sub_files+=(
- tools/clang/lib/Driver/Tools.cpp
- tools/clang/tools/scan-build/scan-build
- )
-
- # unfortunately ./configure won't listen to --mandir and the-like, so take
- # care of this.
- # note: we're setting the main libdir intentionally.
- # where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
- einfo "Fixing install dirs"
- sed -e "s,@libdir@,$(get_libdir),g" \
- -e "s,@PF@,${PF},g" \
- -e "s,@EPREFIX@,${EPREFIX},g" \
- -i "${sub_files[@]}" \
- || die "install paths sed failed"
-
- if use clang; then
- # constantly fails for a long time, likely due to our patches
- rm tools/clang/test/Driver/cross-linux.c || die
- fi
-
- # User patches
- epatch_user
-
- python_setup
-}
-
-multilib_src_configure() {
- # disable timestamps since they confuse ccache
- local conf_flags=(
- --disable-timestamps
- --enable-keep-symbols
- --enable-shared
- --with-optimize-option=
- $(tc-is-static-only && echo --disable-shared)
- $(use_enable !debug optimized)
- $(use_enable debug assertions)
- $(use_enable debug expensive-checks)
- $(use_enable libedit)
- $(use_enable ncurses terminfo)
- $(use_enable libffi)
- )
-
- # well, it's used only by clang executable c-index-test
- if multilib_is_native_abi && use clang && use xml; then
- conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
- else
- conf_flags+=( ac_cv_prog_XML2CONFIG="" )
- fi
-
- local targets bindings
- if use multitarget; then
- targets='all'
- else
- targets='host,cpp'
- use video_cards_radeon && targets+=',r600'
- fi
- conf_flags+=( --enable-targets=${targets} )
-
- if multilib_is_native_abi; then
- use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
- # extra commas don't hurt
- use ocaml && bindings+=',ocaml'
- fi
-
- [[ ${bindings} ]] || bindings='none'
- conf_flags+=( --enable-bindings=${bindings} )
-
- if use libffi; then
- local CPPFLAGS=${CPPFLAGS}
- append-cppflags "$(pkg-config --cflags libffi)"
- fi
-
- # llvm prefers clang over gcc, so we may need to force that
- tc-export CC CXX
-
- ECONF_SOURCE=${S} \
- econf "${conf_flags[@]}"
-}
-
-set_makeargs() {
- MAKEARGS=(
- VERBOSE=1
- REQUIRES_RTTI=1
- GENTOO_LIBDIR=$(get_libdir)
- )
-
- # for tests, we want it all! otherwise, we may use a little filtering...
- # adding ONLY_TOOLS also disables unittest building...
- if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
- local tools=( llvm-config )
- use clang && tools+=( clang )
-
- if multilib_is_native_abi; then
- tools+=(
- opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
- llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
- llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
- llvm-size llvm-stress llvm-mcmarkup llvm-profdata
- llvm-symbolizer obj2yaml yaml2obj lto bugpoint
- )
-
- # the build system runs explicitly specified tools in parallel,
- # so we need to split it into two runs
- if [[ ${1} != -1 ]]; then
- # those require lto
- tools+=( llvm-lto )
- use gold && tools+=( gold )
-
- # those require clang :)
- # we need to explicitly specify all its tools
- # since we're passing BUILD_CLANG_ONLY
- use clang && tools+=(
- clang/tools/{clang-check,clang-format,extra}
- )
- fi
- fi
-
- MAKEARGS+=(
- # filter tools + disable unittests implicitly
- ONLY_TOOLS="${tools[*]}"
-
- # this disables unittests & docs from clang
- BUILD_CLANG_ONLY=YES
- )
- fi
-}
-
-multilib_src_compile() {
- local MAKEARGS
- set_makeargs -1
- emake "${MAKEARGS[@]}"
-
- if multilib_is_native_abi; then
- set_makeargs
- emake -C tools "${MAKEARGS[@]}"
-
- if use doc; then
- emake -C "${S}"/docs -f Makefile.sphinx man
- use clang && emake -C "${S}"/tools/clang/docs/tools \
- BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
- emake -C "${S}"/docs -f Makefile.sphinx html
- fi
- fi
-
- if use debug; then
- pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
- pax-mark m Debug+Asserts+Checks/bin/lli
- pax-mark m Debug+Asserts+Checks/bin/lli-child-target
- else
- pax-mark m Release/bin/llvm-rtdyld
- pax-mark m Release/bin/lli
- pax-mark m Release/bin/lli-child-target
- fi
-}
-
-multilib_src_test() {
- local MAKEARGS
- set_makeargs
-
- # build the remaining tools & unittests
- emake "${MAKEARGS[@]}"
-
- pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
- pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
- pax-mark m unittests/Support/Release/SupportTests
-
- # respect TMPDIR!
- local -x LIT_PRESERVES_TMP=1
- emake "${MAKEARGS[@]}" check
- use clang && emake "${MAKEARGS[@]}" -C tools/clang test
-}
-
-src_install() {
- local MULTILIB_CHOST_TOOLS=(
- /usr/bin/llvm-config
- )
-
- local MULTILIB_WRAPPED_HEADERS=(
- /usr/include/llvm/Config/config.h
- /usr/include/llvm/Config/llvm-config.h
- )
-
- if use clang; then
- # note: magic applied below
- MULTILIB_CHOST_TOOLS+=(
- /usr/bin/clang
- /usr/bin/clang++
- /usr/bin/clang-${PV}
- /usr/bin/clang++-${PV}
- )
-
- MULTILIB_WRAPPED_HEADERS+=(
- /usr/include/clang/Config/config.h
- )
- fi
-
- multilib-minimal_src_install
-
- # Remove unnecessary headers on FreeBSD, bug #417171
- use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
-}
-
-multilib_src_install() {
- local MAKEARGS
- set_makeargs
-
- local root=${D}/_${ABI}
-
- emake "${MAKEARGS[@]}" DESTDIR="${root}" install
- multibuild_merge_root "${root}" "${D}"
-
- if ! multilib_is_native_abi; then
- # Backwards compat, will be happily removed someday.
- dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
- else
- # Install docs.
- if use doc; then
- doman "${S}"/docs/_build/man/*.1
- use clang && doman "${T}"/clang.1
- dohtml -r "${S}"/docs/_build/html/
- else
- if ! use clang; then
- rm "${WORKDIR}"/${P}-manpages/clang.1 || die
- fi
- doman "${WORKDIR}"/${P}-manpages/*.1
- fi
-
- # Symlink the gold plugin.
- if use gold; then
- dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
- dosym ../../../../$(get_libdir)/LLVMgold.so \
- /usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
- fi
- fi
-
- # apply CHOST and PV to clang executables
- # they're statically linked so we don't have to worry about the lib
- if use clang; then
- local clang_tools=( clang clang++ )
- local i
-
- # append ${PV} and symlink back
- # TODO: use alternatives.eclass? does that make any sense?
- # maybe with USE=-clang on :0 and USE=clang on older
- for i in "${clang_tools[@]}"; do
- mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
- dosym "${i}"-${PV} /usr/bin/${i}
- done
-
- # now prepend ${CHOST} and let the multilib-build.eclass symlink it
- if ! multilib_is_native_abi; then
- # non-native? let's replace it with a simple wrapper
- for i in "${clang_tools[@]}"; do
- rm "${ED%/}/usr/bin/${i}-${PV}" || die
- cat > "${T}"/wrapper.tmp <<-_EOF_
- #!${EPREFIX}/bin/sh
- exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
- _EOF_
- newbin "${T}"/wrapper.tmp "${i}-${PV}"
- done
- fi
- fi
-
- # Fix install_names on Darwin. The build system is too complicated
- # to just fix this, so we correct it post-install
- local lib= f= odylib= ndylib= libpv=${PV}
- if [[ ${CHOST} == *-darwin* ]] ; then
- eval $(grep PACKAGE_VERSION= configure)
- [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
- for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
- # libEnhancedDisassembly is Darwin10 only, so non-fatal
- # + omit clang libs if not enabled
- [[ -f ${ED}/usr/lib/${lib} ]] || continue
-
- ebegin "fixing install_name of $lib"
- install_name_tool \
- -id "${EPREFIX}"/usr/lib/${lib} \
- "${ED}"/usr/lib/${lib}
- eend $?
- done
- for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
- # omit clang libs if not enabled
- [[ -f ${ED}/usr/lib/${lib} ]] || continue
-
- scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
- while read odylib ; do
- ndylib=
- case ${odylib} in
- */libclang.dylib)
- ndylib="${EPREFIX}"/usr/lib/libclang.dylib
- ;;
- */libLLVM-${libpv}.dylib)
- ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
- ;;
- */libLTO.dylib)
- ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
- ;;
- esac
- if [[ -n ${ndylib} ]] ; then
- ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
- install_name_tool \
- -change "${odylib}" "${ndylib}" \
- "${f}"
- eend $?
- fi
- done
- done
- fi
-}
-
-multilib_src_install_all() {
- insinto /usr/share/vim/vimfiles/syntax
- doins utils/vim/*.vim
-
- if use clang; then
- cd tools/clang || die
-
- if use static-analyzer ; then
- dobin tools/scan-build/ccc-analyzer
- dosym ccc-analyzer /usr/bin/c++-analyzer
- dobin tools/scan-build/scan-build
-
- insinto /usr/share/${PN}
- doins tools/scan-build/scanview.css
- doins tools/scan-build/sorttable.js
- fi
-
- python_inst() {
- if use static-analyzer ; then
- pushd tools/scan-view >/dev/null || die
-
- python_doscript scan-view
-
- touch __init__.py || die
- python_moduleinto clang
- python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
-
- popd >/dev/null || die
- fi
-
- if use python ; then
- pushd bindings/python/clang >/dev/null || die
-
- python_moduleinto clang
- python_domodule __init__.py cindex.py enumerations.py
-
- popd >/dev/null || die
- fi
-
- # AddressSanitizer symbolizer (currently separate)
- python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
- }
- python_foreach_impl python_inst
- fi
-}
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
deleted file mode 100644
index 1a63066..0000000
--- a/sys-devel/llvm/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>voyageur@gentoo.org</email>
- <name>Bernard Cafarelli</name>
- </maintainer>
- <maintainer>
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <longdescription>Low Level Virtual Machine (LLVM) is:
- 1. A compilation strategy designed to enable effective program optimization across the entire lifetime of a program. LLVM supports effective optimization at compile time, link-time (particularly interprocedural), run-time and offline (i.e., after software is installed), while remaining transparent to developers and maintaining compatibility with existing build scripts.
- 2. A virtual instruction set - LLVM is a low-level object code representation that uses simple RISC-like instructions, but provides rich, language-independent, type information and dataflow (SSA) information about operands. This combination enables sophisticated transformations on object code, while remaining light-weight enough to be attached to the executable. This combination is key to allowing link-time, run-time, and offline transformations.
- 3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
- 4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
- <use>
- <flag name='clang'>Build the clang C/C++ compiler</flag>
- <flag name='cmake'>Enable cmake support (experimental)</flag>
- <flag name='doc'>Build and install the HTML documentation and regenerate the man pages</flag>
- <flag name='gold'>Build the gold linker plugin</flag>
- <flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
- <flag name='multitarget'>Build all host targets (default: host only)</flag>
- <flag name='ncurses'>Support querying terminal properties using ncurses' terminfo</flag>
- <flag name='static-analyzer'>Install the Clang static analyzer (requires USE=clang)</flag>
- <flag name='udis86'>Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch b/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
deleted file mode 100644
index bb887c4..0000000
--- a/sys-devel/m4/files/m4-1.4.16-fix-test-readlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/test-readlink.h
-+++ tests/test-readlink.h
-@@ -38,7 +38,7 @@
- ASSERT (errno == ENOENT);
- errno = 0;
- ASSERT (func ("", buf, sizeof buf) == -1);
-- ASSERT (errno == ENOENT);
-+ ASSERT (errno == ENOENT || errno == EINVAL);
- errno = 0;
- ASSERT (func (".", buf, sizeof buf) == -1);
- ASSERT (errno == EINVAL);
diff --git a/sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch b/sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch
deleted file mode 100644
index 8bf0507..0000000
--- a/sys-devel/m4/files/m4-1.4.16-gnulib-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur m4-1.4.16.orig/lib/freadahead.c m4-1.4.16/lib/freadahead.c
---- m4-1.4.16.orig/lib/freadahead.c 2011-03-01 16:39:27.000000000 +0000
-+++ m4-1.4.16/lib/freadahead.c 2013-07-06 03:37:11.809388632 +0000
-@@ -25,6 +25,7 @@
- size_t
- freadahead (FILE *fp)
- {
-+#if 0
- #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- if (fp->_IO_write_ptr > fp->_IO_write_base)
- return 0;
-@@ -82,4 +83,6 @@
- #else
- #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib."
- #endif
-+#endif
-+ return 0;
- }
diff --git a/sys-devel/m4/files/m4-1.4.16-no-gets.patch b/sys-devel/m4/files/m4-1.4.16-no-gets.patch
deleted file mode 100644
index bb8069b..0000000
--- a/sys-devel/m4/files/m4-1.4.16-no-gets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/424978
-
-hack until m4 pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -125,7 +125,6 @@
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/m4/m4-1.4.16-r99.ebuild b/sys-devel/m4/m4-1.4.16-r99.ebuild
deleted file mode 100644
index 37486ca..0000000
--- a/sys-devel/m4/m4-1.4.16-r99.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.16.ebuild,v 1.13 2013/02/18 01:07:35 zmedico Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="GNU macro processor"
-HOMEPAGE="http://www.gnu.org/software/m4/m4.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples"
-
-# remember: cannot dep on autoconf since it needs us
-DEPEND="app-arch/xz-utils"
-RDEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-test-readlink.patch #376639
- epatch "${FILESDIR}"/${P}-no-gets.patch #424978
- epatch "${FILESDIR}"/${P}-gnulib-musl.patch
-}
-
-src_configure() {
- # Disable automagic dependency over libsigsegv; see bug #278026
- export ac_cv_libsigsegv=no
-
- local myconf=""
- [[ ${USERLAND} != "GNU" ]] && myconf="--program-prefix=g"
- econf --enable-changeword ${myconf}
-}
-
-src_test() {
- [[ -d /none ]] && die "m4 tests will fail with /none/" #244396
- emake check || die
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- # autoconf-2.60 for instance, first checks gm4, then m4. If we don't have
- # gm4, it might find gm4 from outside the prefix on for instance Darwin
- use prefix && dosym /usr/bin/m4 /usr/bin/gm4
- dodoc BACKLOG ChangeLog NEWS README* THANKS TODO
- if use examples ; then
- docinto examples
- dodoc examples/*
- rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
- fi
-}
diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-devel/m4/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild b/sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild
deleted file mode 100644
index 63dc7c2..0000000
--- a/sys-fs/dosfstools/dosfstools-3.0.28-r99.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/dosfstools/dosfstools-3.0.27.ebuild,v 1.1 2015/04/03 07:05:29 vapier Exp $
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="http://www.daniel-baumann.ch/software/dosfstools/"
-SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-RESTRICT="test" # there is no test target #239071
-
-src_prepare() {
- sed -i \
- -e "/^PREFIX/s:=.*:= ${EPREFIX}/usr:" \
- -e '/^OPTFLAGS/d' \
- -e '/^DEBUGFLAGS/d' \
- -e "/\$(DOCDIR)/s:${PN}:${PF}:" \
- Makefile || die
- epatch "${FILESDIR}"/${PN}-3.0.27-Fix-format-string-in-check.c.patch
- epatch "${FILESDIR}"/${PN}-3.0.28-fix_build_with_musl.patch
- append-lfs-flags
- tc-export CC
-}
diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.27-Fix-format-string-in-check.c.patch b/sys-fs/dosfstools/files/dosfstools-3.0.27-Fix-format-string-in-check.c.patch
deleted file mode 100644
index 8a5bbb6..0000000
--- a/sys-fs/dosfstools/files/dosfstools-3.0.27-Fix-format-string-in-check.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 04d5d990904df782a7a774827e0c860eac640272 Mon Sep 17 00:00:00 2001
-From: Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
-Date: Thu, 16 Apr 2015 14:19:57 +0000
-Subject: [PATCH 2/2] Fix format string in check.c
-
----
- src/check.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/check.c b/src/check.c
-index d8880a8..bb783e5 100644
---- a/src/check.c
-+++ b/src/check.c
-@@ -582,7 +582,7 @@ static int check_file(DOS_FS * fs, DOS_FILE * file)
- if (!(file->dir_ent.attr & ATTR_DIR) && le32toh(file->dir_ent.size) <=
- (uint64_t)clusters * fs->cluster_size) {
- printf
-- ("%s\n File size is %u bytes, cluster chain length is > %lu "
-+ ("%s\n File size is %u bytes, cluster chain length is > %llu "
- "bytes.\n Truncating file to %u bytes.\n", path_name(file),
- le32toh(file->dir_ent.size),
- (uint64_t)clusters * fs->cluster_size,
---
-2.3.5
-
diff --git a/sys-fs/dosfstools/files/dosfstools-3.0.28-fix_build_with_musl.patch b/sys-fs/dosfstools/files/dosfstools-3.0.28-fix_build_with_musl.patch
deleted file mode 100644
index b495378..0000000
--- a/sys-fs/dosfstools/files/dosfstools-3.0.28-fix_build_with_musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile b/Makefile
-index f22a4c5..967defe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -30,7 +30,7 @@ MANDIR = $(PREFIX)/share/man
- #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- #WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes -Wwrite-strings
--CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
-+CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) -D _GNU_SOURCE
-
- VPATH = src
-
-diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
-index b38d116..7e6c996 100644
---- a/src/mkfs.fat.c
-+++ b/src/mkfs.fat.c
-@@ -60,6 +60,7 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-+#include <sys/types.h>
- #include <unistd.h>
- #include <time.h>
- #include <errno.h>
diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-fs/dosfstools/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-fs/encfs/encfs-1.7.4-r99.ebuild b/sys-fs/encfs/encfs-1.7.4-r99.ebuild
deleted file mode 100644
index ac96834..0000000
--- a/sys-fs/encfs/encfs-1.7.4-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.7.4.ebuild,v 1.6 2012/10/31 23:14:20 flameeyes Exp $
-
-EAPI=2
-inherit eutils multilib
-
-DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
-HOMEPAGE="http://www.arg0.net/encfs/"
-SRC_URI="http://encfs.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="xattr"
-
-RDEPEND=">=dev-libs/boost-1.34
- >=dev-libs/openssl-0.9.7
- >=dev-libs/rlog-1.4
- >=sys-fs/fuse-2.7.0
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
- xattr? ( sys-apps/attr )
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.7.4-r68:69.patch
- epatch "${FILESDIR}"/${PN}-1.7.4-encfsctl.patch
-}
-
-src_configure() {
- use xattr || export ac_cv_header_attr_xattr_h=no
-
- econf \
- --disable-dependency-tracking
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README
- find "${D}" -name '*.la' -delete
-}
diff --git a/sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch b/sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch
deleted file mode 100644
index fe11172..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/encfs-1.7.4/encfs/encfsctl.cpp
-+++ b/encfs-1.7.4/encfs/encfsctl.cpp
-@@ -38,6 +38,7 @@
- #include <getopt.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <limits.h>
- #include <fcntl.h>
- #ifdef __FreeBSD__
- #include <libintl.h>
diff --git a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch b/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
deleted file mode 100644
index 0c27095..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: encfs/base64.cpp
-===================================================================
---- encfs/base64.cpp (revision 68)
-+++ encfs/base64.cpp (revision 69)
-@@ -80,7 +80,7 @@
- }
-
- // we have at least one value that can be output
-- char outVal = work & mask;
-+ unsigned char outVal = work & mask;
- work >>= dst2Pow;
- workBits -= dst2Pow;
-
-@@ -96,8 +96,15 @@
- *outLoc++ = outVal;
-
- // we could have a partial value left in the work buffer..
-- if(workBits && outputPartialLastByte)
-- *outLoc = work & mask;
-+ if(outputPartialLastByte)
-+ {
-+ while(workBits > 0)
-+ {
-+ *outLoc++ = work & mask;
-+ work >>= dst2Pow;
-+ workBits -= dst2Pow;
-+ }
-+ }
- }
- }
-
diff --git a/sys-fs/encfs/metadata.xml b/sys-fs/encfs/metadata.xml
deleted file mode 100644
index 3693a6a..0000000
--- a/sys-fs/encfs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>blueness@gentoo.org</email>
- <name>Anthony G. Basile</name>
- </maintainer>
- <upstream>
- <remote-id type="google-code">encfs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-fs/fuse/files/fuse-2.9.3-includes.patch b/sys-fs/fuse/files/fuse-2.9.3-includes.patch
deleted file mode 100644
index db29377..0000000
--- a/sys-fs/fuse/files/fuse-2.9.3-includes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur a/fuse-2.9.3/lib/fuse.c b/fuse-2.9.3/lib/fuse.c
---- a/fuse-2.9.3/lib/fuse.c
-+++ b/fuse-2.9.3/lib/fuse.c
-@@ -33,6 +33,7 @@
- #include <dlfcn.h>
- #include <assert.h>
- #include <poll.h>
-+#include <sys/file.h>
- #include <sys/param.h>
- #include <sys/uio.h>
- #include <sys/time.h>
-diff -ur a/fuse-2.9.3/lib/fuse_lowlevel.c b/fuse-2.9.3/lib/fuse_lowlevel.c
---- a/fuse-2.9.3/lib/fuse_lowlevel.c
-+++ b/fuse-2.9.3/lib/fuse_lowlevel.c
-@@ -24,6 +24,7 @@
- #include <limits.h>
- #include <errno.h>
- #include <assert.h>
-+#include <sys/file.h>
-
- #ifndef F_LINUX_SPECIFIC_BASE
- #define F_LINUX_SPECIFIC_BASE 1024
-diff -ur a/fuse-2.9.3/lib/mount.c b/fuse-2.9.3/lib/mount.c
---- a/fuse-2.9.3/lib/mount.c
-+++ b/fuse-2.9.3/lib/mount.c
-@@ -20,6 +20,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <paths.h>
- #include <sys/poll.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-diff -ur a/fuse-2.9.3/lib/mount_util.c b/fuse-2.9.3/lib/mount_util.c
---- a/fuse-2.9.3/lib/mount_util.c
-+++ b/fuse-2.9.3/lib/mount_util.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <paths.h>
- #ifndef __NetBSD__
- #include <mntent.h>
- #endif
-diff -ur a/fuse-2.9.3/util/fusermount.c b/fuse-2.9.3/util/fusermount.c
---- a/fuse-2.9.3/util/fusermount.c
-+++ b/fuse-2.9.3/util/fusermount.c
-@@ -19,6 +19,7 @@
- #include <getopt.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <paths.h>
- #include <pwd.h>
- #include <mntent.h>
- #include <sys/wait.h>
-diff -ur a/fuse-2.9.3/util/mount_util.c b/fuse-2.9.3/util/mount_util.c
---- a/fuse-2.9.3/util/mount_util.c
-+++ b/fuse-2.9.3/util/mount_util.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <paths.h>
- #ifndef __NetBSD__
- #include <mntent.h>
- #endif
diff --git a/sys-fs/fuse/files/fuse-fbsd.init b/sys-fs/fuse/files/fuse-fbsd.init
deleted file mode 100644
index 19b8400..0000000
--- a/sys-fs/fuse/files/fuse-fbsd.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need localmount
-}
-
-start() {
- ebegin "Starting fuse"
- if ! kldstat -q -m fuse; then
- kldload fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
- fi
- eend ${?}
-}
-
-stop() {
- ebegin "Stopping fuse"
- if kldstat -q -m fuse; then
- kldunload fuse >/dev/null 2>&1 || eerror $? "Error unloading fuse module"
- fi
- eend ${?}
-}
diff --git a/sys-fs/fuse/files/fuse.init b/sys-fs/fuse/files/fuse.init
deleted file mode 100644
index 30b512e..0000000
--- a/sys-fs/fuse/files/fuse.init
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MOUNTPOINT=/sys/fs/fuse/connections
-
-depend() {
- need localmount
-}
-
-start() {
-
- ebegin "Starting fuse"
- if ! grep -qw fuse /proc/filesystems; then
- modprobe fuse >/dev/null 2>&1 || eerror $? "Error loading fuse module"
- fi
- if grep -qw fusectl /proc/filesystems && \
- ! grep -qw $MOUNTPOINT /proc/mounts; then
- mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
- eerror $? "Error mounting control filesystem"
- fi
- eend ${?}
-
-}
-
-stop() {
-
- ebegin "Stopping fuse"
- if grep -qw $MOUNTPOINT /proc/mounts; then
- umount $MOUNTPOINT >/dev/null 2>&1 || \
- eerror $? "Error unmounting control filesystem"
- fi
- eend ${?}
-
-}
diff --git a/sys-fs/fuse/fuse-2.9.3-r99.ebuild b/sys-fs/fuse/fuse-2.9.3-r99.ebuild
deleted file mode 100644
index 11cacff..0000000
--- a/sys-fs/fuse/fuse-2.9.3-r99.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.9.3.ebuild,v 1.11 2014/01/18 19:54:53 ago Exp $
-
-EAPI=5
-inherit eutils libtool linux-info udev toolchain-funcs
-
-MY_P=${P/_/-}
-DESCRIPTION="An interface for filesystems implemented in userspace."
-HOMEPAGE="http://fuse.sourceforge.net"
-SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- if use kernel_linux ; then
- if kernel_is lt 2 6 9 ; then
- die "Your kernel is too old."
- fi
- CONFIG_CHECK="~FUSE_FS"
- FUSE_FS_WARNING="You need to have FUSE module built to use user-mode utils"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- # sandbox violation with mtab writability wrt #438250
- # don't sed configure.in without eautoreconf because of maintainer mode
- sed -i 's:umount --fake:true --fake:' configure || die
- epatch "${FILESDIR}"/${PN}-2.9.3-includes.patch
- elibtoolize
-}
-
-src_configure() {
- econf \
- INIT_D_PATH="${EPREFIX}/etc/init.d" \
- MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
- UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
- $(use_enable static-libs static) \
- --disable-example
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog Filesystems README \
- README.NFS NEWS doc/how-fuse-works \
- doc/kernel.txt FAQ
-
- if use examples ; then
- docinto examples
- dodoc example/*
- fi
-
- if use kernel_linux ; then
- newinitd "${FILESDIR}"/fuse.init fuse
- elif use kernel_FreeBSD ; then
- insinto /usr/include/fuse
- doins include/fuse_kernel.h
- newinitd "${FILESDIR}"/fuse-fbsd.init fuse
- else
- die "We don't know what init code install for your kernel, please file a bug."
- fi
-
- prune_libtool_files
- rm -rf "${D}"/dev
-
- dodir /etc
- cat > "${ED}"/etc/fuse.conf <<-EOF
- # Set the maximum number of FUSE mounts allowed to non-root users.
- # The default is 1000.
- #
- #mount_max = 1000
-
- # Allow non-root users to specify the 'allow_other' or 'allow_root'
- # mount options.
- #
- #user_allow_other
- EOF
-}
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
deleted file mode 100644
index 5cb3fde..0000000
--- a/sys-fs/fuse/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>kernel-misc</herd>
- <upstream>
- <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-fs/lvm2/files/clvmd.confd-2.02.39 b/sys-fs/lvm2/files/clvmd.confd-2.02.39
deleted file mode 100644
index 5782170..0000000
--- a/sys-fs/lvm2/files/clvmd.confd-2.02.39
+++ /dev/null
@@ -1,9 +0,0 @@
-# CLVMD_CLUSTER_TIMEOUT -- amount of time to wait for cluster quorum.
-
-CLVMD_CLUSTER_TIMEOUT=30
-
-
-# CLVMD_NODES_TIMEOUT -- amount of time to wait for the other nodes to
-# join the cluster.
-
-CLVMD_NODES_TIMEOUT=60
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39
deleted file mode 100755
index 9647623..0000000
--- a/sys-fs/lvm2/files/clvmd.rc-2.02.39
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.39,v 1.3 2013/04/09 11:00:26 ssuominen Exp $
-
-[ -x /usr/sbin/clvmd ] && CLVMD_BIN="/usr/sbin/clvmd" || CLVMD_BIN="/sbin/clvmd"
-
-[ -z "$CLVMD_CLUSTER_TIMEOUT" ] && CLVMD_CLUSTER_TIMEOUT=30
-[ -n "$CLVMD_NODES_TIMEOUT" ] || CLVMD_NODES_TIMEOUT=60
-
-VGCHANGE="/sbin/vgchange"
-VGSCAN="/sbin/vgscan"
-VGDISPLAY="/sbin/vgdisplay"
-CLVMD_PIDFILE="/var/run/clvmd.pid"
-
-depend() {
- use net dns logger dmeventd
- need cman
-}
-
-load_modules() {
- local module modules
- modules=$1
-
- for module in ${modules}; do
- ebegin "Loading ${module} kernel module"
- modprobe ${module}
- eend $? "Failed to load ${module} kernel module"
- done
-}
-
-unload_modules() {
- local module modules
- modules=$1
-
- for module in ${modules}; do
- ebegin "Unloading ${module} kernel module"
- modprobe -r ${module}
- eend $? "Failed to unload ${module} kernel module"
- done
-}
-
-umount_gfs_filesystems() {
- local sig retry
- local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
- if [ -n "${remaining}" ]
- then
- sig=
- retry=3
- while [ -n "${remaining}" -a "${retry}" -gt 0 ]
- do
- if [ "${retry}" -lt 3 ]
- then
- ebegin "Unmounting GFS filesystems (retry)"
- umount ${remaining} &>/dev/null
- eend $? "Failed to unmount GFS filesystems this retry"
- else
- ebegin "Unmounting GFS filesystems"
- umount ${remaining} &>/dev/null
- eend $? "Failed to unmount GFS filesystems"
- fi
- remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
- [ -z "${remaining}" ] && break
- /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
- sleep 5
- retry=$((${retry} -1))
- sig=-9
- done
- fi
-}
-
-
-start_volumes() {
- ebegin "Scanning LVM volumes"
- $VGSCAN > /dev/null 2>&1
- eend $?
-
- ret=$?
- if [ "$ret" -eq 5 ]
- then
- einfo " Waiting for other nodes to join the cluster ($CLVMD_NODES_TIMEOUT seconds)"
- fi
-
- clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
- for vg in $clustervgs; do
- ebegin " Activating Clustered VG: ${vg} "
-
- wait=0
- while [ -n "$($VGCHANGE -a y ${vg} 2>&1 |grep "clvmd not running")" ]; do
- if [ $wait -lt $CLVMD_NODES_TIMEOUT ]; then
- sleep 3
- wait=$(($wait + 3))
- else
- eend 1
- fi
- done
- eend 0
- done
-}
-
-stop_volumes() {
- # Deactivate only clustered volumes
- clustervgs=`$VGDISPLAY 2> /dev/null | awk 'BEGIN {RS="VG Name"} {if (/Clustered/) print $1;}'`
- for vg in $clustervgs; do
- ebegin " Shutting Down Clustered VG: ${vg} "
- $VGCHANGE -anl ${vg} >/dev/null
- eend $?
- done
-}
-
-
-start() {
- local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/{modules,devices})
-
- if [ -z "${module}" ]; then
- load_modules "dm-mod"
- sleep 1s
- fi
-
- ebegin "Starting clvmd ($CLVMD_CLUSTER_TIMEOUT seconds)"
-
- start-stop-daemon --start --quiet --exec ${CLVMD_BIN} -- -T ${CLVMD_CLUSTER_TIMEOUT}
- eend $?
-
- start_volumes
-}
-
-stop() {
-
- # umount GFS filesystems
- umount_gfs_filesystems
-
- #stop_volumes
-
- ebegin "Stopping clvmd"
- #start-stop-daemon --stop -s TERM --quiet --exec ${CLVMD_BIN} --name clvmd
- killall -TERM ${CLVMD_BIN} >/dev/null
- eend $?
-
- #local module=$(awk '$1 == "dm_mod" { print $1 }' /proc/modules)
-
- #if [[ "$?" -eq 0 && ! -z "${module}" ]]; then
- # unload_modules "dm-mod"
- #fi
-}
diff --git a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3 b/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3
deleted file mode 100644
index bc7a251..0000000
--- a/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3
+++ /dev/null
@@ -1 +0,0 @@
-RC_AFTER="lvm"
diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
deleted file mode 100644
index 56e7503..0000000
--- a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $
-
-depend() {
- # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
- # means dmeventd is NOT notified, as it cannot be safely running
- before dmeventd checkfs fsck
- after modules
-}
-
-dm_in_proc() {
- local retval=0
- for x in devices misc ; do
- grep -qs 'device-mapper' /proc/${x}
- retval=$((${retval} + $?))
- done
- return ${retval}
-}
-
-# char **build_dmsetup_command(volume)
-#
-# Returns complete dmsetup command given single volume name
-build_dmsetup_command() {
- local count dmsetup_cmd
-
- # Number of lines mentioning volume name
- count=$(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | grep -c ${1})
-
- # If there's just one line:
- if [ ${count} -eq 1 ] ; then
- echo "echo $(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
- grep ${1} | awk '{$1=""; print $0}') | /sbin/dmsetup create ${1}"
-
- # For all cases with more lines:
- elif [ ${count} -gt 1 ] ; then
- for c in $( seq 1 ${count} ) ; do
- if [ ${c} -eq 1 ] ; then
- # Heavy escaping in awk-statement because we cannot use apostrophes
- dmsetup_cmd="echo -e $(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
- grep ${1} | awk NR==${c}\ \{\$1=\"\"\;\ print\ \$0\})"
- else
- # Append starting with newline
- dmsetup_cmd="${dmsetup_cmd}\\\\n \
- $(grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
- grep ${1} | awk NR==${c}\ \{\$1=\"\"\;\ print\ \$0\})"
- fi
- done
- echo "${dmsetup_cmd} | /sbin/dmsetup create ${1}"
- fi
-
- return 0
-}
-
-# char **get_new_dm_volumes(void)
-#
-# Return unique volumes from /etc/dmtab
-get_new_dm_volumes() {
- local volume
-
- # Filter comments and blank lines
- grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
- awk '{ print $1 }' | \
- uniq | \
- while read volume ; do
- # If it exists, skip it
- dmvolume_exists "${volume%:}" && continue
-
- echo "${volume%:}"
- done
-
- return 0
-}
-
-# int dmvolume_exists(volume)
-#
-# Return true if volume exists in DM table
-dmvolume_exists() {
- local x line volume=$1
-
- [ -z "${volume}" ] && return 1
-
- /sbin/dmsetup ls 2>/dev/null | \
- while read line ; do
- for x in ${line} ; do
- # the following conditonal return only breaks out
- # of the while loop, as it is running in a pipe.
- [ "${x}" = "${volume}" ] && return 1
- # We only want to check the volume name
- break
- done
- done
-
- # if 1 was returned from the above loop, then indicate that
- # volume exists
- [ $? = 1 ] && return 0
-
- # otherwise the loop exited normally and the volume does not
- # exist
- return 1
-}
-
-# int is_empty_dm_volume(volume)
-#
-# Return true if the volume exists in DM table, but is empty/non-valid
-is_empty_dm_volume() {
- local table volume=$1
-
- set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:")
- [ "${volume}" = "$1" -a -z "$2" ]
-}
-
-
-start() {
- if [ -e /proc/modules ] && ! dm_in_proc ; then
- modprobe dm-mod 2>/dev/null
- fi
- # Ensure the dirs exist for locking and running
- checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm
-
- local x volume
-
- if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then
- [ -n "$(get_new_dm_volumes)" ] && \
- einfo " Setting up device-mapper volumes:"
-
- get_new_dm_volumes | \
- while read x ; do
- [ -n "${x}" ] || continue
-
- volume="${x##* }"
-
- ebegin " Creating volume: ${volume}"
- if ! eval $(build_dmsetup_command ${volume}) >/dev/null 2>/dev/null ; then
- eend 1 " Error creating volume: ${volume}"
- # dmsetup still adds an empty volume in some cases,
- # so lets remove it
- is_empty_dm_volume "${volume}" && \
- /sbin/dmsetup remove "${volume}" 2>/dev/null
- else
- eend 0
- fi
- done
- fi
-}
-
diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2
deleted file mode 100644
index 9ac8cdb..0000000
--- a/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-2.02.95-r2,v 1.2 2013/04/09 11:00:26 ssuominen Exp $
-
-depend() {
- # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
- # means dmeventd is NOT notified, as it cannot be safely running
- before dmeventd checkfs fsck
- after modules
-}
-
-dm_in_proc() {
- local retval=0
- for x in devices misc ; do
- grep -qs 'device-mapper' /proc/${x}
- retval=$((${retval} + $?))
- done
- return ${retval}
-}
-
-# char **get_new_dm_volumes(void)
-#
-# Return dmsetup commands to setup volumes
-get_new_dm_volumes() {
- local volume params
-
- # Filter comments and blank lines
- grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
- while read volume params ; do
- # If it exists, skip it
- dmvolume_exists "${volume%:}" && continue
- # Assemble the command to run to create volume
- echo "echo ${params} | /sbin/dmsetup create ${volume%:}"
- done
-
- return 0
-}
-
-# int dmvolume_exists(volume)
-#
-# Return true if volume exists in DM table
-dmvolume_exists() {
- local x line volume=$1
-
- [ -z "${volume}" ] && return 1
-
- /sbin/dmsetup ls 2>/dev/null | \
- while read line ; do
- for x in ${line} ; do
- # the following conditonal return only breaks out
- # of the while loop, as it is running in a pipe.
- [ "${x}" = "${volume}" ] && return 1
- # We only want to check the volume name
- break
- done
- done
-
- # if 1 was returned from the above loop, then indicate that
- # volume exists
- [ $? = 1 ] && return 0
-
- # otherwise the loop exited normally and the volume does not
- # exist
- return 1
-}
-
-# int is_empty_dm_volume(volume)
-#
-# Return true if the volume exists in DM table, but is empty/non-valid
-is_empty_dm_volume() {
- local table volume=$1
-
- set -- $(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:")
- [ "${volume}" = "$1" -a -z "$2" ]
-}
-
-
-start() {
- if [ -e /proc/modules ] && ! dm_in_proc ; then
- modprobe dm-mod 2>/dev/null
- fi
- # Ensure the dirs exist for locking and running
- checkpath -q -d -m 0700 -o root:root /run/lvm /run/lock/lvm
-
- local x volume
-
- if [ -x /sbin/dmsetup -a -c /dev/mapper/control -a -f /etc/dmtab ] ; then
- [ -n "$(get_new_dm_volumes)" ] && \
- einfo " Setting up device-mapper volumes:"
-
- get_new_dm_volumes | \
- while read x ; do
- [ -n "${x}" ] || continue
-
- volume="${x##* }"
-
- ebegin " Creating volume: ${volume}"
- if ! eval "${x}" >/dev/null 2>/dev/null ; then
- eend 1 " Error creating volume: ${volume}"
- # dmsetup still adds an empty volume in some cases,
- # so lets remove it
- is_empty_dm_volume "${volume}" && \
- /sbin/dmsetup remove "${volume}" 2>/dev/null
- else
- eend 0
- fi
- done
- fi
-}
-
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
deleted file mode 100644
index 3c2f5f3..0000000
--- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1,v 1.3 2014/02/08 21:17:46 robbat2 Exp $
-
-PIDFILE=/run/dmeventd.pid
-BIN=/sbin/dmeventd
-
-depend() {
- # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
- # means dmeventd is NOT notified, as it cannot be safely running
- after lvm device-mapper
-}
-
-start() {
- ebegin "Starting dmeventd"
- start-stop-daemon --start --exec $BIN --pidfile $PIDFILE
- eend $?
-}
-
-stop() {
- ebegin "Stopping dmeventd"
- start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE
- eend $?
-}
-
diff --git a/sys-fs/lvm2/files/dmtab b/sys-fs/lvm2/files/dmtab
deleted file mode 100644
index 5fc1d79..0000000
--- a/sys-fs/lvm2/files/dmtab
+++ /dev/null
@@ -1,12 +0,0 @@
-#/etc/dmraid: config file for adding device-mapper volumes at boot
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/dmtab,v 1.1 2009/04/09 23:00:10 caleb Exp $
-
-# Format: <volume name>: <table>
-# Example: isw0: 0 312602976 striped 2 128 /dev/sda 0 /dev/sdb 0
-#
-# Alternatively you can create all your volumes the first time, and just run:
-#
-# dmsetup table >> /etc/dmtab
-#
-# and verify that they are correct.
-
diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
deleted file mode 100644
index c53a604..0000000
--- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $
-
-# This script is based on upstream file
-# LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in
-
-depend() {
- # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
- # means dmeventd is NOT notified, as it cannot be safely running
- need lvm dmeventd
-}
-
-VGCHANGE=/sbin/vgchange
-VGS=/sbin/vgs
-
-start() {
- ret=0
- # TODO do we want to separate out already active groups only?
- VGSLIST=`$VGS --noheadings -o name --rows 2> /dev/null`
- ebegin "Starting LVM monitoring for VGs ${VGSLIST}:"
- $VGCHANGE --monitor y --poll y ${VGSLIST}
- ret=$?
- eend $ret
- return $ret
-
-}
-
-stop() {
- ret=0
- # TODO do we want to separate out already active groups only?
- VGSLIST=`$VGS --noheadings -o name --rows 2> /dev/null`
- ebegin "Stopping LVM monitoring for VGs ${VGSLIST}:"
- $VGCHANGE --monitor n ${VGSLIST}
- ret=$?
- eend $ret
- return $ret
-}
diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2
deleted file mode 100644
index 6a41bb6..0000000
--- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.67-r2,v 1.4 2013/04/09 11:00:26 ssuominen Exp $
-
-# This script is based on upstream file
-# LVM2.2.02.67/scripts/lvm2_monitoring_init_red_hat.in
-
-depend() {
- # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
- # means dmeventd is NOT notified, as it cannot be safely running
- need lvm dmeventd
-}
-
-VGCHANGE=/sbin/vgchange
-VGS=/sbin/vgs
-
-start() {
- ret=0
- # TODO do we want to separate out already active groups only?
- VGSLIST=`$VGS --noheadings -o name 2> /dev/null`
- for vg in $VGSLIST
- do
- ebegin "Starting LVM monitoring for VG $vg:"
- $VGCHANGE --monitor y --poll y $vg
- ret2=$?
- eend $ret2
- [ $ret2 -ne 0 ] && ret=$ret2
- done
- return $ret
-}
-
-stop() {
- ret=0
- # TODO do we want to separate out already active groups only?
- VGSLIST=`$VGS --noheadings -o name 2> /dev/null`
- for vg in $VGSLIST
- do
- ebegin "Stopping LVM monitoring for VG $vg:"
- $VGCHANGE --monitor n $vg
- ret2=$?
- eend $ret2
- [ $ret2 -ne 0 ] && ret=$ret2
- done
- return $ret
-}
diff --git a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 b/sys-fs/lvm2/files/lvm.confd-2.02.28-r2
deleted file mode 100644
index 2fbd866..0000000
--- a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-# LVM should normally only be started after mdraid is available
-# this is because LVM physical volumes are very often MD devices.
-RC_AFTER="mdraid"
-
-# vim: ft=gentoo-conf-d
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
deleted file mode 100644
index 7fdf50e..0000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.105-r2,v 1.1 2014/02/02 19:52:34 robbat2 Exp $
-
-depend() {
- before checkfs fsck
- after modules device-mapper
- need lvmetad sysfs
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
- local retval=0
- for x in devices misc ; do
- grep -qs 'device-mapper' /proc/${x}
- retval=$((${retval} + $?))
- done
- return ${retval}
-}
-
-start() {
- # LVM support for /usr, /home, /opt ....
- # This should be done *before* checking local
- # volumes, or they never get checked.
-
- # NOTE: Add needed modules for LVM or RAID, etc
- # to /etc/modules.autoload if needed
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
- if [ -z "${CDBOOT}" ] ; then
- if [ -e /proc/modules ] && ! dm_in_proc ; then
- modprobe dm-mod 2>/dev/null
- fi
- if [ -d /proc/lvm ] || dm_in_proc ; then
- ebegin "Setting up the Logical Volume Manager"
- #still echo stderr for debugging
- lvm_commands="#! ${lvm_path} --config '${config}'\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}pvscan\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgscan --mknodes\n"
- # And turn them on!
- lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- eend $? "Failed to setup the LVM"
- fi
- fi
-}
-
-stop() {
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
-# Stop LVM2
-if [ -x /sbin/vgs ] && \
- [ -x /sbin/vgchange ] && \
- [ -x /sbin/lvchange ] && \
- [ -f /etc/lvmtab -o -d /etc/lvm ] && \
- [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
- einfo "Shutting down the Logical Volume Manager"
-
-
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
- if [ "$VGS" ]
- then
- ebegin " Shutting Down LVs & VGs"
- #still echo stderr for debugging
- lvm_commands="#! ${lvm_path} --config '${config}'\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n"
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- eend $? "Failed (possibly some LVs still needed for /usr or root)"
- fi
-
- einfo "Finished shutting down the Logical Volume Manager"
- return 0
-fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.95-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.95-r2
deleted file mode 100644
index 76d90f3..0000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.95-r2
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.95-r2,v 1.2 2013/04/09 11:00:26 ssuominen Exp $
-
-depend() {
- use dmeventd
- before checkfs fsck
- after dmeventd modules device-mapper
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
- local retval=0
- for x in devices misc ; do
- grep -qs 'device-mapper' /proc/${x}
- retval=$((${retval} + $?))
- done
- return ${retval}
-}
-
-start() {
- # LVM support for /usr, /home, /opt ....
- # This should be done *before* checking local
- # volumes, or they never get checked.
-
- # NOTE: Add needed modules for LVM or RAID, etc
- # to /etc/modules.autoload if needed
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
- if [ -z "${CDBOOT}" ] ; then
- if [ -e /proc/modules ] && ! dm_in_proc ; then
- modprobe dm-mod 2>/dev/null
- fi
- if [ -d /proc/lvm ] || dm_in_proc ; then
- ebegin "Setting up the Logical Volume Manager"
- #still echo stderr for debugging
- lvm_commands="#! ${lvm_path} --config '${config}'\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}pvscan\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgscan --mknodes\n"
- # And turn them on!
- lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- eend $? "Failed to setup the LVM"
- fi
- fi
-}
-
-stop() {
- for lvm_path in /bin/lvm /sbin/lvm ; do
- [ -x "$lvm_path" ] && break
- done
- if [ ! -x "$lvm_path" ]; then
- eerror "Cannot find lvm binary in /sbin or /bin!"
- return 1
- fi
-# Stop LVM2
-if [ -x /sbin/vgs ] && \
- [ -x /sbin/vgchange ] && \
- [ -x /sbin/lvchange ] && \
- [ -f /etc/lvmtab -o -d /etc/lvm ] && \
- [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
- einfo "Shutting down the Logical Volume Manager"
-
-
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix 2> /dev/null)
-
- if [ "$VGS" ]
- then
- ebegin " Shutting Down LVs & VGs"
- #still echo stderr for debugging
- lvm_commands="#! ${lvm_path} --config '${config}'\n"
- # Extra PV find pass because some devices might not have been available until very recently
- lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
- # Now make the nodes
- lvm_commands="${lvm_commands}vgchange --sysinit -a ln\n"
- # Order of this is important, have to work around dash and LVM readline
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
- eend $? "Failed"
- fi
-
- einfo "Finished Shutting down the Logical Volume Manager"
-fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch b/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch
deleted file mode 100644
index d6c8e5f..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.100-selinux_and_udev_static.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur LVM2.2.02.100.orig/configure.in LVM2.2.02.100/configure.in
---- LVM2.2.02.100.orig/configure.in 2013-08-13 13:44:43.000000000 +0300
-+++ LVM2.2.02.100/configure.in 2013-09-12 23:23:19.365329440 +0300
-@@ -954,6 +954,7 @@
- pkg_config_init
- fi
- PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
-
-@@ -1199,19 +1200,32 @@
- if test x$SELINUX = xyes; then
- AC_CHECK_LIB([sepol], [sepol_check_context], [
- AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
-- SELINUX_LIBS="-lsepol"])
-+ SEPOL_LIBS="-lsepol"])
-
-- AC_CHECK_LIB([selinux], [is_selinux_enabled], [
-- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
-- AC_CHECK_HEADERS([selinux/label.h])
-- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+ dnl -- init pkgconfig if required
-+ if test x$PKGCONFIG_INIT != x1; then
-+ pkg_config_init
-+ fi
-+ PKG_CHECK_MODULES(SELINUX, libselinux, [
- SELINUX_PC="libselinux"
-- HAVE_SELINUX=yes ], [
-- AC_MSG_WARN(Disabling selinux)
-- SELINUX_LIBS=
-- SELINUX_PC=
-- HAVE_SELINUX=no ])
-+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+ ],[
-+ dnl -- old non-pkgconfig method, is buggy with static builds
-+ AC_CHECK_LIB([selinux], [is_selinux_enabled], [
-+ AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
-+ AC_CHECK_HEADERS([selinux/label.h])
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+ SELINUX_LIBS="-lselinux $SEPOL_LIBS"
-+ SELINUX_STATIC_LIBS="$SELINUX_LIBS"
-+ SELINUX_PC="libselinux"
-+ HAVE_SELINUX=yes ], [
-+ AC_MSG_WARN(Disabling selinux)
-+ SELINUX_LIBS=
-+ SELINUX_PC=
-+ HAVE_SELINUX=no ])
-+ ])
- fi
-
- ################################################################################
-@@ -1615,6 +1629,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -1625,6 +1640,7 @@
- AC_SUBST(THIN_DUMP_CMD)
- AC_SUBST(THIN_REPAIR_CMD)
- AC_SUBST(UDEV_LIBS)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
-diff -ur LVM2.2.02.100.orig/make.tmpl.in LVM2.2.02.100/make.tmpl.in
---- LVM2.2.02.100.orig/make.tmpl.in 2013-08-13 13:44:43.000000000 +0300
-+++ LVM2.2.02.100/make.tmpl.in 2013-09-12 23:22:58.125328808 +0300
-@@ -32,7 +32,7 @@
-
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS += @CFLAGS@ @UDEV_CFLAGS@
-@@ -46,7 +46,9 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- TESTING = @TESTING@
-
- # Setup directory variables
diff --git a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch
deleted file mode 100644
index 594d606..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Make sure that libdm usage always brings in pthread libraries, both in
-pkgconfig and during manual build.
-
---- tools/Makefile.in
-+++ tools/Makefile.in
-@@ -87,6 +87,7 @@
- INSTALL_LVM_TARGETS += install_tools_static
- INSTALL_DMSETUP_TARGETS += install_dmsetup_static
- INSTALL_CMDLIB_TARGETS += install_cmdlib_static
-+ STATIC_LIBS += @PTHREAD_LIBS@
- endif
-
- LVMLIBS = $(LVMINTERNAL_LIBS)
-@@ -118,6 +119,10 @@
-
- include $(top_builddir)/make.tmpl
-
-+ifeq ("@STATIC_LINK@", "yes")
-+ STATIC_LIBS += @PTHREAD_LIBS@
-+endif
-+
- device-mapper: $(TARGETS_DM)
-
- CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
---- libdm/libdevmapper.pc.in
-+++ libdm/libdevmapper.pc.in
-@@ -8,4 +8,5 @@
- Version: @DM_LIB_PATCHLEVEL@
- Cflags: -I${includedir}
- Libs: -L${libdir} -ldevmapper
-+Libs.private: -L${libdir} @PTHREAD_LIBS@
- Requires.private: @SELINUX_PC@ @UDEV_PC@
diff --git a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch
deleted file mode 100644
index 723cd0e..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.107-static-pkgconfig-libs.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/configure.in LVM2.2.02.107/configure.in
---- LVM2.2.02.107.orig/configure.in 2014-07-15 12:57:55.867439868 -0700
-+++ LVM2.2.02.107/configure.in 2014-07-15 17:24:02.662666091 -0700
-@@ -997,6 +997,7 @@
- fi])
- if test "$BLKID_WIPING" = yes; then
- BLKID_PC="blkid"
-+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
- AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
- fi
- fi
-@@ -1022,6 +1023,7 @@
- if test "$UDEV_SYNC" = yes; then
- pkg_config_init
- PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
-
-@@ -1242,19 +1244,32 @@
- if test "$SELINUX" = yes; then
- AC_CHECK_LIB([sepol], [sepol_check_context], [
- AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
-- SELINUX_LIBS="-lsepol"])
-+ SEPOL_LIBS="-lsepol"])
-+
-+ dnl -- init pkgconfig if required
-+ if test x$PKGCONFIG_INIT != x1; then
-+ pkg_config_init
-+ fi
-+ PKG_CHECK_MODULES(SELINUX, libselinux, [
-+ SELINUX_PC="libselinux"
-+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+ ],[
-+ dnl -- old non-pkgconfig method, is buggy with static builds
-
- AC_CHECK_LIB([selinux], [is_selinux_enabled], [
- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
- AC_CHECK_HEADERS([selinux/label.h])
- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+ SELINUX_LIBS="-lselinux $SEPOL_LIBS"
- SELINUX_PC="libselinux"
- HAVE_SELINUX=yes ], [
- AC_MSG_WARN(Disabling selinux)
- SELINUX_LIBS=
- SELINUX_PC=
- HAVE_SELINUX=no ])
-+ ])
- fi
-
- ################################################################################
-@@ -1556,6 +1571,7 @@
- ################################################################################
- AC_SUBST(APPLIB)
- AC_SUBST(AWK)
-+AC_SUBST(BLKID_STATIC_LIBS)
- AC_SUBST(BLKID_PC)
- AC_SUBST(BLKID_WIPING)
- AC_SUBST(BUILD_CMIRRORD)
-@@ -1651,6 +1667,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -1662,6 +1679,7 @@
- AC_SUBST(THIN_DUMP_CMD)
- AC_SUBST(THIN_REPAIR_CMD)
- AC_SUBST(THIN_RESTORE_CMD)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.107.orig/make.tmpl.in LVM2.2.02.107/make.tmpl.in
---- LVM2.2.02.107.orig/make.tmpl.in 2014-07-15 12:57:55.868439884 -0700
-+++ LVM2.2.02.107/make.tmpl.in 2014-07-15 17:23:24.060055838 -0700
-@@ -44,7 +44,7 @@
-
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS += @CFLAGS@
-@@ -59,10 +59,13 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_CFLAGS = @UDEV_CFLAGS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_CFLAGS = @BLKID_CFLAGS@
- BLKID_LIBS = @BLKID_LIBS@
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
- TESTING = @TESTING@
-
- # Setup directory variables
diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch
deleted file mode 100644
index af5a5af..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Maintainer note: Forward ported without editing from lvm2-2.02.99-example.conf.in.patch to apply cleanly.
-
---- conf/example.conf.in
-+++ conf/example.conf.in
-@@ -105,6 +105,10 @@
- # By default we accept every block device:
- # filter = [ "a/.*/" ]
-
-+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+ # noise when you probed while not available.
-+ filter = [ "r|/dev/nbd.*|", "a/.*/" ]
-+
- # Exclude the cdrom drive
- # filter = [ "r|/dev/cdrom|" ]
-
-@@ -522,7 +526,8 @@
- # e.g. vgscan.lvm1 and they will stop working after you start using
- # the new lvm2 on-disk metadata format.
- # The default value is set when the tools are built.
-- # fallback_to_lvm1 = 0
-+ # Gentoo: the LVM tools are a seperate package.
-+ fallback_to_lvm1 = 0
-
- # The default metadata format that commands should use - "lvm1" or "lvm2".
- # The command line override is -M1 or -M2.
-@@ -1182,12 +1187,13 @@
-
- # Metadata settings
- #
--# metadata {
-+metadata {
- # Default number of copies of metadata to hold on each PV. 0, 1 or 2.
- # You might want to override it from the command line with 0
- # when running pvcreate on new PVs which are to be added to large VGs.
-
-- # pvmetadatacopies = 1
-+ # Gentoo: enable for data safety, but PV resize is then disabled.
-+ # pvmetadatacopies = 2
-
- # Default number of copies of metadata to maintain for each VG.
- # If set to a non-zero value, LVM automatically chooses which of
-@@ -1222,7 +1228,7 @@
- # the supplied toolset to make changes (e.g. vgcfgrestore).
-
- # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
-
- # Event daemon
- #
diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch
deleted file mode 100644
index 3ab6998..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Maintainer note: Forward ported without editing from lvm2-2.02.107-static-pkgconfig-libs.patch to apply cleanly.
-
---- configure.in
-+++ configure.in
-@@ -1067,6 +1067,7 @@
- fi])
- if test "$BLKID_WIPING" = yes; then
- BLKID_PC="blkid"
-+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
- AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
- fi
- fi
-@@ -1092,6 +1093,7 @@
- if test "$UDEV_SYNC" = yes; then
- pkg_config_init
- PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
-
-@@ -1312,19 +1314,32 @@
- if test "$SELINUX" = yes; then
- AC_CHECK_LIB([sepol], [sepol_check_context], [
- AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
-- SELINUX_LIBS="-lsepol"])
-+ SEPOL_LIBS="-lsepol"])
-+
-+ dnl -- init pkgconfig if required
-+ if test x$PKGCONFIG_INIT != x1; then
-+ pkg_config_init
-+ fi
-+ PKG_CHECK_MODULES(SELINUX, libselinux, [
-+ SELINUX_PC="libselinux"
-+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+ ],[
-+ dnl -- old non-pkgconfig method, is buggy with static builds
-
- AC_CHECK_LIB([selinux], [is_selinux_enabled], [
- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
- AC_CHECK_HEADERS([selinux/label.h])
- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+ SELINUX_LIBS="-lselinux $SEPOL_LIBS"
- SELINUX_PC="libselinux"
- HAVE_SELINUX=yes ], [
- AC_MSG_WARN(Disabling selinux)
- SELINUX_LIBS=
- SELINUX_PC=
- HAVE_SELINUX=no ])
-+ ])
- fi
-
- ################################################################################
-@@ -1626,6 +1641,7 @@
- ################################################################################
- AC_SUBST(APPLIB)
- AC_SUBST(AWK)
-+AC_SUBST(BLKID_STATIC_LIBS)
- AC_SUBST(BLKID_PC)
- AC_SUBST(BLKID_WIPING)
- AC_SUBST(BUILD_CMIRRORD)
-@@ -1721,6 +1737,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -1735,6 +1752,7 @@
- AC_SUBST(CACHE_DUMP_CMD)
- AC_SUBST(CACHE_REPAIR_CMD)
- AC_SUBST(CACHE_RESTORE_CMD)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
---- make.tmpl.in
-+++ make.tmpl.in
-@@ -43,7 +43,7 @@
-
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS += @CFLAGS@
-@@ -57,10 +57,13 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_CFLAGS = @UDEV_CFLAGS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_CFLAGS = @BLKID_CFLAGS@
- BLKID_LIBS = @BLKID_LIBS@
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
- TESTING = @TESTING@
-
- # Setup directory variables
diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch b/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch
deleted file mode 100644
index 59aaa9b..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.56-lvm2create_initrd.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- LVM2.2.02.56/scripts/lvm2create_initrd/lvm2create_initrd.orig 2006-11-21 22:41:56.000000000 +0000
-+++ LVM2.2.02.56/scripts/lvm2create_initrd/lvm2create_initrd 2009-12-26 01:47:08.025224602 +0000
-@@ -54,7 +54,9 @@
- DEVRAM=/tmp/initrd.$$
-
- # set defaults
--BINFILES=${BINFILES:-"`which lvm` `which bash` `which busybox` `which pivot_root`"}
-+LVM=`which lvm.static`
-+LVM=${LVM:-"`which lvm`"}
-+BINFILES=${BINFILES:-"${LVM} `which bash` `which busybox` `which pivot_root`"}
- BASICDEVICES=${BASICDEVICES:-"std consoleonly fd"}
- BLOCKDEVICES=${BLOCKDEVICES:-"md hda hdb hdc hdd sda sdb sdc sdd"}
- MAKEDEV=${MAKEDEV:-"debian"}
-@@ -119,6 +121,10 @@
- echo "$PRE Mounting /proc"
- mount -t proc none /proc
-
-+# We need /sys for lvm
-+echo "$PRE Mounting /sys"
-+mount -t sysfs sysfs /sys
-+
- # plug in modules listed in /etc/modules
- if [ -f /etc/modules ]; then
- echo -n "$PRE plugging in kernel modules:"
-@@ -179,26 +185,29 @@
- # run a shell if we're passed lvm2rescue on commandline
- grep lvm2rescue /proc/cmdline 1>/dev/null 2>&1
- if [ $? -eq 0 ]; then
-- lvm vgchange --ignorelockingfailure -P -a y
-+ $LVM vgchange --ignorelockingfailure -P -a y
- do_shell
- else
-- lvm vgchange --ignorelockingfailure -a y
-+ $LVM vgchange --ignorelockingfailure -a y
- fi
-
- echo "$PRE Mounting root filesystem $rootvol ro"
- mkdir /rootvol
- if ! mount -t auto -o ro $rootvol /rootvol; then
-- echo "\t*FAILED*";
-+ echo "\t*FAILED TRYING TO MOUNT ROOTVOL*";
- do_shell
- fi
-
- echo "$PRE Umounting /proc"
- umount /proc
-
-+echo "$PRE Umounting /sys"
-+umount /sys
-+
- echo "$PRE Changing roots"
- cd /rootvol
- if ! pivot_root . initrd ; then
-- echo "\t*FAILED*"
-+ echo "\t*FAILED PIVOT TO NEW ROOT*"
- do_shell
- fi
-
-@@ -356,7 +365,7 @@
- fi
-
- verbose "creating basic set of directories in $TMPMNT"
--(cd $TMPMNT; mkdir bin dev etc lib proc sbin var)
-+(cd $TMPMNT; mkdir bin dev etc lib proc sbin sys var)
- if [ $? -ne 0 ]; then
- echo "$cmd -- ERROR creating directories in $TMPMNT"
- cleanup 1
-@@ -499,4 +508,3 @@
- FINALTXT
-
- cleanup 0
--
diff --git a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch b/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch
deleted file mode 100644
index 5ddcb4e..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nuar --exclude '*~' LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in LVM2.2.02.63/daemons/dmeventd/Makefile.in
---- LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in 2010-04-09 14:42:48.000000000 -0700
-+++ LVM2.2.02.63/daemons/dmeventd/Makefile.in 2010-04-19 11:53:27.000000000 -0700
-@@ -28,11 +28,12 @@
- INSTALL_LIB_TARGETS = install_lib_dynamic
-
- LIB_NAME = libdevmapper-event
-+LIB_STATIC = $(LIB_NAME).a
-+INSTALL_LIB_TARGETS += install_lib_static
-+TARGETS += $(LIB_STATIC)
- ifeq ("@STATIC_LINK@", "yes")
-- LIB_STATIC = $(LIB_NAME).a
-- TARGETS += $(LIB_STATIC) dmeventd.static
-+ TARGETS += dmeventd.static
- INSTALL_DMEVENTD_TARGETS += install_dmeventd_static
-- INSTALL_LIB_TARGETS += install_lib_static
- endif
-
- LIB_VERSION = $(LIB_VERSION_DM)
-diff -Nuar --exclude '*~' LVM2.2.02.63.orig/libdm/Makefile.in LVM2.2.02.63/libdm/Makefile.in
---- LVM2.2.02.63.orig/libdm/Makefile.in 2010-04-09 14:42:51.000000000 -0700
-+++ LVM2.2.02.63/libdm/Makefile.in 2010-04-19 11:52:20.000000000 -0700
-@@ -34,8 +34,8 @@
-
- INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
-
--ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
-+ifeq ("@STATIC_LINK@", "yes")
- endif
-
- LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
-@@ -63,8 +63,8 @@
-
- INSTALL_TYPE = install_dynamic
-
--ifeq ("@STATIC_LINK@", "yes")
- INSTALL_TYPE += install_static
-+ifeq ("@STATIC_LINK@", "yes")
- endif
-
- ifeq ("@PKGCONFIG@", "yes")
diff --git a/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch b/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch
deleted file mode 100644
index 7f0bfb8..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.67-createinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=301331
-X-Gentoo-Bug: 301331
-
-diff -Nuar LVM2.2.02.67.orig/scripts/lvm2create_initrd/lvm2create_initrd LVM2.2.02.67/scripts/lvm2create_initrd/lvm2create_initrd
---- LVM2.2.02.67.orig/scripts/lvm2create_initrd/lvm2create_initrd 2010-06-07 18:44:34.182980475 +0000
-+++ LVM2.2.02.67/scripts/lvm2create_initrd/lvm2create_initrd 2010-06-07 18:51:27.636312899 +0000
-@@ -469,9 +469,9 @@
- rmdir $TMPMNT/lost+found
-
- echo "$cmd -- ummounting ram disk"
--umount $DEVRAM
-+umount $TMPMNT
- if [ $? -ne 0 ]; then
-- echo "$cmd -- ERROR umounting $DEVRAM"
-+ echo "$cmd -- ERROR umounting $TMPMNT"
- cleanup 1
- fi
-
diff --git a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch
deleted file mode 100644
index 7576e19..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/330255
-
-liblvm2app.so: undefined reference to `floor'
-
---- liblvm/Makefile.in
-+++ liblvm/Makefile.in
-@@ -39,7 +39,7 @@
-
- include $(top_builddir)/make.tmpl
-
--LIBS += $(LVMINTERNAL_LIBS) -ldevmapper
-+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -lm
-
- ifeq ("@DMEVENTD@", "yes")
- LIBS += -ldevmapper-event
diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
deleted file mode 100644
index de2b294..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/configure.in LVM2.2.02.92/configure.in
---- LVM2.2.02.92.orig/configure.in 2012-02-20 11:36:27.000000000 -0800
-+++ LVM2.2.02.92/configure.in 2012-02-20 15:53:40.700124222 -0800
-@@ -32,6 +32,7 @@
- COPTIMISE_FLAG="-O2"
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
- ELDFLAGS="-Wl,--export-dynamic"
-+ STATIC_LDFLAGS="-Wl,--no-export-dynamic"
- # FIXME Generate list and use --dynamic-list=.dlopen.sym
- CLDWHOLEARCHIVE="-Wl,-whole-archive"
- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -1458,6 +1459,7 @@
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTING)
- AC_SUBST(THIN)
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in LVM2.2.02.92/daemons/dmeventd/Makefile.in
---- LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in 2012-02-20 15:48:04.861683196 -0800
-+++ LVM2.2.02.92/daemons/dmeventd/Makefile.in 2012-02-20 15:52:50.732314588 -0800
-@@ -65,7 +65,7 @@
- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
-
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
-
- ifeq ("@PKGCONFIG@", "yes")
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in
---- LVM2.2.02.92.orig/make.tmpl.in 2012-02-20 15:48:05.034685963 -0800
-+++ LVM2.2.02.92/make.tmpl.in 2012-02-20 15:48:58.622550855 -0800
-@@ -38,6 +38,7 @@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
- LDFLAGS += @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- LIB_SUFFIX = @LIB_SUFFIX@
- LVMINTERNAL_LIBS = -llvm-internal $(UDEV_LIBS) $(DL_LIBS)
- DL_LIBS = @DL_LIBS@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/tools/Makefile.in LVM2.2.02.92/tools/Makefile.in
---- LVM2.2.02.92.orig/tools/Makefile.in 2011-11-14 13:30:36.000000000 -0800
-+++ LVM2.2.02.92/tools/Makefile.in 2012-02-20 15:52:25.242901501 -0800
-@@ -126,7 +126,7 @@
- -o $@ dmsetup.o -ldevmapper $(LIBS)
-
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
- -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
-
- all: device-mapper
-@@ -136,7 +136,7 @@
- $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
-
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
-
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch
deleted file mode 100644
index 38be5df..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.99-example.conf.in.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- conf/example.conf.in
-+++ conf/example.conf.in
-@@ -50,7 +50,9 @@
-
-
- # By default we accept every block device:
-- filter = [ "a/.*/" ]
-+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+ # noise when you probed while not available.
-+ filter = [ "r|/dev/nbd.*|", "a/.*/" ]
-
- # Exclude the cdrom drive
- # filter = [ "r|/dev/cdrom|" ]
-@@ -259,6 +261,8 @@
- # the new lvm2 on-disk metadata format.
- # The default value is set when the tools are built.
- # fallback_to_lvm1 = 0
-+ # Gentoo: the LVM tools are a seperate package.
-+ fallback_to_lvm1 = 0
-
- # The default metadata format that commands should use - "lvm1" or "lvm2".
- # The command line override is -M1 or -M2.
-@@ -449,12 +453,12 @@
-
- # Metadata settings
- #
--# metadata {
-+metadata {
- # Default number of copies of metadata to hold on each PV. 0, 1 or 2.
- # You might want to override it from the command line with 0
- # when running pvcreate on new PVs which are to be added to large VGs.
--
-- # pvmetadatacopies = 1
-+ # Gentoo: enable for data safety, but PV resize is then disabled.
-+ #pvmetadatacopies = 2
-
- # Approximate default size of on-disk metadata areas in sectors.
- # You should increase this if you have large volume groups or
-@@ -476,7 +480,7 @@
- # the supplied toolset to make changes (e.g. vgcfgrestore).
-
- # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
-
- # Event daemon
- #
diff --git a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch
deleted file mode 100644
index 364fbd4..0000000
--- a/sys-fs/lvm2/files/lvm2-2.02.99-locale-muck.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- make.tmpl.in
-+++ make.tmpl.in
-@@ -395,7 +395,7 @@
- ( cat $(srcdir)/.exported_symbols; \
- if test x$(EXPORTED_HEADER) != x; then \
- $(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \
-- $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
-+ LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ *]\($(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
- fi \
- ) > $@
-
diff --git a/sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch b/sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch
deleted file mode 100644
index 71fa5bf..0000000
--- a/sys-fs/lvm2/files/lvm2-fix-stdio-usage.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- LVM2.2.02.103.orig/lib/commands/toolcontext.c
-+++ LVM2.2.02.103/lib/commands/toolcontext.c
-@@ -1336,7 +1336,10 @@
- /*
- * Close and reopen stream on file descriptor fd.
- */
--static int _reopen_stream(FILE *stream, int fd, const char *mode, const char *name, FILE **new_stream)
-+#ifdef __GLIBC__
-+#define _reopen_stream(stream, fd, mode, name) __reopen_stream(stream, fd, mode, name, &stream)
-+
-+static int __reopen_stream(FILE *stream, int fd, const char *mode, const char *name, FILE **new_stream)
- {
- int fd_copy, new_fd;
-
-@@ -1363,6 +1366,9 @@
-
- return 1;
- }
-+#else
-+#define _reopen_stream(stream, fd, mode, name) (freopen(NULL, mode, stream) != NULL)
-+#endif
-
- /* Entry point */
- struct cmd_context *create_toolcontext(unsigned is_long_lived,
-@@ -1371,7 +1377,6 @@
- unsigned threaded)
- {
- struct cmd_context *cmd;
-- FILE *new_stream;
- int flags;
-
- #ifdef M_MMAP_MAX
-@@ -1421,9 +1426,8 @@
- if (is_valid_fd(STDIN_FILENO) &&
- ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_WRONLY) {
-- if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream))
-+ if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin"))
- goto_out;
-- stdin = new_stream;
- if (setvbuf(stdin, cmd->linebuffer, _IOLBF, linebuffer_size)) {
- log_sys_error("setvbuf", "");
- goto out;
-@@ -1433,9 +1437,8 @@
- if (is_valid_fd(STDOUT_FILENO) &&
- ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_RDONLY) {
-- if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream))
-+ if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout"))
- goto_out;
-- stdout = new_stream;
- if (setvbuf(stdout, cmd->linebuffer + linebuffer_size,
- _IOLBF, linebuffer_size)) {
- log_sys_error("setvbuf", "");
-@@ -1715,7 +1718,6 @@
- void destroy_toolcontext(struct cmd_context *cmd)
- {
- struct dm_config_tree *cft_cmdline;
-- FILE *new_stream;
- int flags;
-
- if (cmd->dump_filter && cmd->filter && cmd->filter->dump &&
-@@ -1752,8 +1754,7 @@
- if (is_valid_fd(STDIN_FILENO) &&
- ((flags = fcntl(STDIN_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_WRONLY) {
-- if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) {
-- stdin = new_stream;
-+ if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin")) {
- setlinebuf(stdin);
- } else
- cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */
-@@ -1762,8 +1763,7 @@
- if (is_valid_fd(STDOUT_FILENO) &&
- ((flags = fcntl(STDOUT_FILENO, F_GETFL)) > 0) &&
- (flags & O_ACCMODE) != O_RDONLY) {
-- if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) {
-- stdout = new_stream;
-+ if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout")) {
- setlinebuf(stdout);
- } else
- cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */
---- LVM2.2.02.103.orig/tools/lvmcmdline.c
-+++ LVM2.2.02.103/tools/lvmcmdline.c
-@@ -1252,7 +1252,7 @@
- int err = is_valid_fd(STDERR_FILENO);
-
- if (!is_valid_fd(STDIN_FILENO) &&
-- !(stdin = fopen(_PATH_DEVNULL, "r"))) {
-+ !freopen(_PATH_DEVNULL, "r", stdin)) {
- if (err)
- perror("stdin stream open");
- else
-@@ -1262,7 +1262,7 @@
- }
-
- if (!is_valid_fd(STDOUT_FILENO) &&
-- !(stdout = fopen(_PATH_DEVNULL, "w"))) {
-+ !freopen(_PATH_DEVNULL, "w", stdout)) {
- if (err)
- perror("stdout stream open");
- /* else no stdout */
-@@ -1270,7 +1270,7 @@
- }
-
- if (!is_valid_fd(STDERR_FILENO) &&
-- !(stderr = fopen(_PATH_DEVNULL, "w"))) {
-+ !freopen(_PATH_DEVNULL, "w", stderr)) {
- printf("stderr stream open: %s\n",
- strerror(errno));
- return 0;
diff --git a/sys-fs/lvm2/files/lvm2-musl-fixes.patch b/sys-fs/lvm2/files/lvm2-musl-fixes.patch
deleted file mode 100644
index b62e80a..0000000
--- a/sys-fs/lvm2/files/lvm2-musl-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uar LVM2.2.02.110-old/daemons/lvmetad/lvmetad-core.c LVM2.2.02.110/daemons/lvmetad/lvmetad-core.c
---- LVM2.2.02.110-old/daemons/lvmetad/lvmetad-core.c 2015-05-14 21:37:01.226755157 +0000
-+++ LVM2.2.02.110/daemons/lvmetad/lvmetad-core.c 2015-05-14 21:44:08.098585801 +0000
-@@ -124,7 +124,7 @@
- if (!(vg = dm_hash_lookup(s->lock.vg, id))) {
- if (!(vg = malloc(sizeof(pthread_mutex_t))) ||
- pthread_mutexattr_init(&rec) ||
-- pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE_NP) ||
-+ pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE) ||
- pthread_mutex_init(vg, &rec))
- goto bad;
- if (!dm_hash_insert(s->lock.vg, id, vg)) {
-@@ -1152,7 +1152,7 @@
- ls->log = s->log;
-
- pthread_mutexattr_init(&rec);
-- pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE_NP);
-+ pthread_mutexattr_settype(&rec, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&ls->lock.pvid_to_pvmeta, &rec);
- pthread_mutex_init(&ls->lock.vgid_to_metadata, &rec);
- pthread_mutex_init(&ls->lock.pvid_to_vgid, NULL);
-Only in LVM2.2.02.110/lib/commands: toolcontext.c.orig
-diff -uar LVM2.2.02.110-old/libdaemon/server/daemon-server.c LVM2.2.02.110/libdaemon/server/daemon-server.c
---- LVM2.2.02.110-old/libdaemon/server/daemon-server.c 2015-05-14 21:37:01.256755555 +0000
-+++ LVM2.2.02.110/libdaemon/server/daemon-server.c 2015-05-14 21:37:51.108437752 +0000
-@@ -26,6 +26,7 @@
- #include <sys/un.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <fcntl.h>
-
- #include <syslog.h> /* FIXME. For the global closelog(). */
-
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
deleted file mode 100755
index e16d55c..0000000
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2,v 1.2 2014/02/08 21:17:46 robbat2 Exp $
-
-pidfile="/run/lvmetad.pid"
-command="/sbin/lvmetad"
-command_args="${LVMETAD_OPTS:=-p ${pidfile}}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
- :
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild b/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild
deleted file mode 100644
index 4cffcec..0000000
--- a/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.110.ebuild,v 1.3 2014/08/29 07:15:02 ssuominen Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="http://sources.redhat.com/lvm2/"
-SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
- ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
- systemd? ( udev )
- static? ( !udev )" #520450
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
- readline? ( sys-libs/readline )
- udev? ( >=virtual/libudev-208:=[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
- >=sys-apps/baselayout-2.2
- !<sys-apps/openrc-0.11
- !<sys-fs/cryptsetup-1.1.2
- !!sys-fs/clvm
- !!sys-fs/lvm-user
- >=sys-apps/util-linux-2.16
- lvm2create_initrd? ( sys-apps/makedev )
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
- virtual/pkgconfig
- >=sys-devel/binutils-2.20.1-r1
- static? (
- selinux? ( sys-libs/libselinux[static-libs] )
- udev? ( >=virtual/libudev-208:=[static-libs] )
- >=sys-apps/util-linux-2.16[static-libs]
- )"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
- local CONFIG_CHECK="~SYSVIPC"
-
- if use udev; then
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
- if linux_config_exists; then
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
- ewarn "It's recommended to set an empty value to the following kernel config option:"
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
- fi
- fi
- fi
-
- check_extra_config
-
- # 1. Genkernel no longer copies /sbin/lvm blindly.
- if use static; then
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
- elog "their static versions. If you need the static binaries,"
- elog "you must append .static to the filename!"
- fi
-}
-
-src_prepare() {
- # Gentoo specific modification(s):
- epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
-
- sed -i \
- -e "1iAR = $(tc-getAR)" \
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
- make.tmpl.in || die #444082
-
- sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
-
- if use udev && ! use device-mapper-only; then
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
- elog "if it was previously disabled."
- fi
-
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
- # For upstream -- review and forward:
- epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
- epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
- epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
- epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
- epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
- epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
- epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
- epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
- # Patches for musl
- epatch "${FILESDIR}"/${PN}-fix-stdio-usage.patch # Patch from alpine linux
- epatch "${FILESDIR}"/${PN}-musl-fixes.patch
-
- # Without thin-privision-tools, there is nothing to install for target install_man7:
- use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
-
- eautoreconf
-}
-
-src_configure() {
- filter-flags -flto
- local myconf
- local buildmode
-
- myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
- myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
- myconf="${myconf} $(use_enable !device-mapper-only applib)"
- myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
- myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
- use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
-
- # Most of this package does weird stuff.
- # The build options are tristate, and --without is NOT supported
- # options: 'none', 'internal', 'shared'
- if use static; then
- buildmode="internal"
- # This only causes the .static versions to become available
- myconf="${myconf} --enable-static_link"
- else
- buildmode="shared"
- fi
- dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
- # dmeventd requires mirrors to be internal, and snapshot available
- # so we cannot disable them
- myconf="${myconf} --with-mirrors=${dmbuildmode}"
- myconf="${myconf} --with-snapshots=${dmbuildmode}"
- if use thin; then
- myconf="${myconf} --with-thin=internal --with-cache=internal"
- local texec
- for texec in check dump repair restore; do
- myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
- myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
- done
- else
- myconf="${myconf} --with-thin=none --with-cache=none"
- fi
-
- if use lvm1; then
- myconf="${myconf} --with-lvm1=${buildmode}"
- else
- myconf="${myconf} --with-lvm1=none"
- fi
-
- # disable O_DIRECT support on hppa, breaks pv detection (#99532)
- use hppa && myconf="${myconf} --disable-o_direct"
-
- if use clvm; then
- myconf="${myconf} --with-cluster=${buildmode}"
- # 4-state! Make sure we get it right, per bug 210879
- # Valid options are: none, cman, gulm, all
- #
- # 2009/02:
- # gulm is removed now, now dual-state:
- # cman, none
- # all still exists, but is not needed
- #
- # 2009/07:
- # TODO: add corosync and re-enable ALL
- local clvmd=""
- use cman && clvmd="cman"
- #clvmd="${clvmd/cmangulm/all}"
- [ -z "${clvmd}" ] && clvmd="none"
- myconf="${myconf} --with-clvmd=${clvmd}"
- myconf="${myconf} --with-pool=${buildmode}"
- else
- myconf="${myconf} --with-clvmd=none --with-cluster=none"
- fi
-
- econf \
- $(use_enable readline) \
- $(use_enable selinux) \
- --enable-pkgconfig \
- --with-confdir="${EPREFIX}"/etc \
- --exec-prefix="${EPREFIX}" \
- --sbindir="${EPREFIX}/sbin" \
- --with-staticdir="${EPREFIX}"/sbin \
- --libdir="${EPREFIX}/$(get_libdir)" \
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
- --with-default-dm-run-dir=/run \
- --with-default-run-dir=/run/lvm \
- --with-default-locking-dir=/run/lock/lvm \
- --with-default-pid-dir=/run \
- $(use_enable udev udev_rules) \
- $(use_enable udev udev_sync) \
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) \
- $(use_enable systemd udev-systemd-background-jobs) \
- "$(systemd_with_unitdir)" \
- ${myconf} \
- CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
- pushd include >/dev/null
- emake
- popd >/dev/null
-
- if use device-mapper-only ; then
- emake device-mapper
- else
- emake
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
- fi
-}
-
-src_install() {
- local inst
- INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
- use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
- for inst in ${INSTALL_TARGETS}; do
- emake DESTDIR="${D}" ${inst}
- done
-
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
- if use !device-mapper-only ; then
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
- newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
- newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
- fi
-
- if use clvm; then
- newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
- newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
- fi
-
- if use static-libs; then
- dolib.a libdm/ioctl/libdevmapper.a
- dolib.a libdaemon/client/libdaemonclient.a #462908
- #gen_usr_ldscript libdevmapper.so
- dolib.a daemons/dmeventd/libdevmapper-event.a
- #gen_usr_ldscript libdevmapper-event.so
- else
- rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
- fi
-
- if use lvm2create_initrd; then
- dosbin scripts/lvm2create_initrd/lvm2create_initrd
- doman scripts/lvm2create_initrd/lvm2create_initrd.8
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
- fi
-
- insinto /etc
- doins "${FILESDIR}"/dmtab
-
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
- ewarn "Make sure the \"lvm\" init script is in the runlevels:"
- ewarn "# rc-update add lvm boot"
- ewarn
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
- ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
- einfo "Tests are disabled because of device-node mucking, if you want to"
- einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
deleted file mode 100644
index 74f768f..0000000
--- a/sys-fs/lvm2/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>robbat2@gentoo.org</email>
- <name>Robin H. Johnson</name>
- </maintainer>
- <maintainer>
- <email>agk@redhat.com</email>
- <name>Alasdair Kergon</name>
- <description>Upstream Maintainer (please CC on bugs)</description>
- </maintainer>
- <use>
- <flag name='clvm'>Allow users to build clustered lvm2</flag>
- <flag name='cman'>Cman support for clustered lvm</flag>
- <flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag>
- <flag name='lvm2create_initrd'>Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
- <flag name='thin'>Support for thin volumes</flag>
- <flag name='device-mapper-only'>Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.2-missing-includes.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.2-missing-includes.patch
deleted file mode 100644
index 82451e0..0000000
--- a/sys-fs/squashfs-tools/files/squashfs-tools-4.2-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/squashfs4.2/squashfs-tools/pseudo.c
-+++ b/squashfs4.2/squashfs-tools/pseudo.c
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
deleted file mode 100644
index e1c66a4..0000000
--- a/sys-fs/squashfs-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>livecd</herd>
- <use>
- <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2-r99.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2-r99.ebuild
deleted file mode 100644
index 5ed51e5..0000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.2-r99.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild,v 1.12 2014/01/18 11:37:50 vapier Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV=${PV}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+xz lzo xattr"
-
-RDEPEND="
- sys-libs/zlib
- xz? ( app-arch/xz-utils )
- lzo? ( dev-libs/lzo )
- !xz? ( !lzo? ( sys-libs/zlib ) )
- xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-use_sed() {
- local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT"
- printf '/^#?%s =/%s\n' "${s}" \
- "$( use $u && echo s:.*:${s} = 1: || echo d )"
-}
-
-src_prepare() {
- epatch ${FILESDIR}/${P}-missing-includes.patch
-}
-
-src_configure() {
- append-cppflags -DFNM_EXTMATCH=0
- tc-export CC
- sed -i -r \
- -e "$(use_sed xz XZ)" \
- -e "$(use_sed lzo)" \
- -e "$(use_sed xattr)" \
- Makefile || die
-}
-
-src_install() {
- dobin mksquashfs unsquashfs || die
- cd ..
- dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README || die
-}
-
-pkg_postinst() {
- ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
- use xz &&
- ewarn "XZ support requires a 2.6.38 kernel or better"
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
deleted file mode 100644
index f186f88..0000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r99.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild,v 1.6 2014/09/28 11:02:46 blueness Exp $
-
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-IUSE="+xz lzma lz4 lzo xattr"
-
-RDEPEND="
- sys-libs/zlib
- !xz? ( !lzo? ( sys-libs/zlib ) )
- lz4? ( app-arch/lz4 )
- lzma? ( app-arch/xz-utils )
- lzo? ( dev-libs/lzo )
- xattr? ( sys-apps/attr )
- xz? ( app-arch/xz-utils )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/squashfs${PV}/${PN}"
-
-src_prepare() {
- epatch ${FILESDIR}/${PN}-4.2-missing-includes.patch
-}
-
-src_configure() {
- # set up make command line variables in EMAKE_SQUASHFS_CONF
- EMAKE_SQUASHFS_CONF=(
- $(usex lzma LZMA_XZ_SUPPORT=1 LZMA_XS_SUPPORT=0)
- $(usex lzo LZO_SUPPORT=1 LZO_SUPPORT=0)
- $(usex lz4 LZ4_SUPPORT=1 LZ4_SUPPORT=0)
- $(usex xattr XATTR_SUPPORT=1 XATTR_SUPPORT=0)
- $(usex xz XZ_SUPPORT=1 XZ_SUPPORT=0)
- )
-
- append-cppflags -DFNM_EXTMATCH=0
- tc-export CC
-}
-
-src_compile() {
- emake ${EMAKE_SQUASHFS_CONF[@]}
-}
-
-src_install() {
- dobin mksquashfs unsquashfs
- dodoc ../README
-}
-
-pkg_postinst() {
- ewarn "This version of mksquashfs requires a 2.6.29 kernel or better"
- use xz &&
- ewarn "XZ support requires a 2.6.38 kernel or better"
-}
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch b/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
deleted file mode 100644
index 014ca33..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.4-no-symlink.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://bugs.gentoo.org/311881
-
---- xfsdump-3.0.4/dump/Makefile
-+++ xfsdump-3.0.4/dump/Makefile
-@@ -102,7 +102,6 @@
- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
- $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
- install-dev:
-
- $(COMMINCL) $(COMMON):
---- xfsdump-3.0.4/restore/Makefile
-+++ xfsdump-3.0.4/restore/Makefile
-@@ -114,7 +114,6 @@
- $(INSTALL) -m 755 -d $(PKG_ROOT_SBIN_DIR)
- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_ROOT_SBIN_DIR)
- $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
-- $(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
- install-dev:
-
- $(COMMINCL) $(COMMON):
diff --git a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch b/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
deleted file mode 100644
index 053615c..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.0.5-prompt-overflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://oss.sgi.com/bugzilla/show_bug.cgi?id=876
-https://bugs.gentoo.org/335115
-
---- dump/content.c
-+++ dump/content.c
-@@ -6460,7 +6460,7 @@
- Media_prompt_erase( drive_t *drivep )
- {
- fold_t fold;
-- char question[ 100 ];
-+ char question[ 200 ];
- char *preamblestr[ PREAMBLEMAX ];
- size_t preamblecnt;
- char *querystr[ QUERYMAX ];
diff --git a/sys-fs/xfsdump/files/xfsdump-3.1.4-compat-musl.patch b/sys-fs/xfsdump/files/xfsdump-3.1.4-compat-musl.patch
deleted file mode 100644
index 643fba6..0000000
--- a/sys-fs/xfsdump/files/xfsdump-3.1.4-compat-musl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naurp xfsdump-3.1.4.orig/common/main.c xfsdump-3.1.4.mod/common/main.c
---- xfsdump-3.1.4.orig/common/main.c 2012-10-09 20:42:33.000000000 +0000
-+++ xfsdump-3.1.4.mod/common/main.c 2015-05-10 20:14:36.255773000 +0000
-@@ -50,6 +50,10 @@
- #include "content.h"
- #include "inventory.h"
-
-+#ifndef RLIM64_INFINITY
-+#define RLIM64_INFINITY (~0ULL)
-+#endif
-+
- #ifdef DUMP
- /* main.c - main for dump
- */
-@@ -2220,7 +2224,10 @@ static sig_printmap_t sig_printmap[ ] =
- {SIGTERM, "SIGTERM"},
- {SIGUSR1, "SIGUSR1"},
- {SIGUSR2, "SIGUSR2"},
-+ {SIGCHLD, "SIGCHLD"},
-+#ifdef SIGCLD
- {SIGCLD, "SIGCLD"},
-+#endif
- {SIGPWR, "SIGPWR"},
- {SIGURG, "SIGURG"},
- {SIGPOLL, "SIGPOLL"},
-diff -Naurp xfsdump-3.1.4.orig/dump/content.c xfsdump-3.1.4.mod/dump/content.c
---- xfsdump-3.1.4.orig/dump/content.c 2015-05-10 19:45:58.915773000 +0000
-+++ xfsdump-3.1.4.mod/dump/content.c 2015-05-10 22:23:10.705773000 +0000
-@@ -33,6 +33,7 @@
-
- #ifdef linux
- #include <xfs/xqm.h>
-+#include <linux/limits.h>
- #endif
-
- #include <attr/attributes.h>
diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-fs/xfsdump/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild b/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild
deleted file mode 100644
index c8c7302..0000000
--- a/sys-fs/xfsdump/xfsdump-3.1.4-r99.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsdump/xfsdump-3.1.4.ebuild,v 1.2 2014/09/04 05:19:58 polynomial-c Exp $
-
-EAPI="4"
-
-inherit multilib eutils
-
-DESCRIPTION="xfs dump/restore utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/e2fsprogs
- >=sys-fs/xfsprogs-3.2.0
- sys-apps/dmapi
- >=sys-apps/attr-2.4.19"
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- include/builddefs.in \
- || die
- epatch "${FILESDIR}"/${PN}-3.0.5-prompt-overflow.patch #335115
- epatch "${FILESDIR}"/${PN}-3.0.4-no-symlink.patch #311881
- epatch "${FILESDIR}"/${PN}-3.1.4-compat-musl.patch #549116
-}
-
-src_configure() {
- unset PLATFORM #184564
- export OPTIMIZER=${CFLAGS}
- export DEBUG=-DNDEBUG
-
- econf \
- --libdir=/$(get_libdir) \
- --libexecdir=/usr/$(get_libdir) \
- --sbindir=/sbin
-}
diff --git a/sys-fs/xfsprogs/ChangeLog b/sys-fs/xfsprogs/ChangeLog
deleted file mode 100644
index c299052..0000000
--- a/sys-fs/xfsprogs/ChangeLog
+++ /dev/null
@@ -1,783 +0,0 @@
-# ChangeLog for sys-fs/xfsprogs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.178 2014/12/15 10:01:52 polynomial-c Exp $
-
-*xfsprogs-3.2.2 (15 Dec 2014)
-
- 15 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> +xfsprogs-3.2.2.ebuild,
- +files/xfsprogs-3.2.2-sharedlibs.patch:
- Version bump.
-
- 11 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for ia64, wrt bug #524374
-
- 04 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for sparc, wrt bug #524374
-
- 03 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for x86, wrt bug #524374
-
- 02 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for alpha, wrt bug #524374
-
- 01 Nov 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for ppc, wrt bug #524374
-
- 31 Oct 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for ppc64, wrt bug #524374
-
- 30 Oct 2014; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for amd64, wrt bug #524374
-
- 23 Oct 2014; Jeroen Roovers <jer@gentoo.org> xfsprogs-3.2.1.ebuild:
- Stable for HPPA (bug #524374).
-
- 22 Oct 2014; Markus Meier <maekke@gentoo.org> xfsprogs-3.2.1.ebuild:
- arm stable, bug #524374
-
-*xfsprogs-3.2.1 (04 Sep 2014)
-
- 04 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -xfsprogs-3.1.11.ebuild,
- +xfsprogs-3.2.1.ebuild:
- Version bump (bug #510750). Removed old.
-
-*xfsprogs-3.1.11-r1 (25 Dec 2013)
-
- 25 Dec 2013; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-3.1.11-sharedlibs.patch, +xfsprogs-3.1.11-r1.ebuild:
- Install extra headers for libxfs #486514 by Stefan Reimer. Rewrite shared lib
- installs to only use libtool to avoid rpath issues.
-
-*xfsprogs-3.1.11 (18 Oct 2013)
-
- 18 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> -xfsprogs-3.1.7.ebuild,
- -xfsprogs-3.1.8.ebuild, +xfsprogs-3.1.11.ebuild,
- -files/xfsprogs-3.1.1-sharedlibs.patch, -files/xfsprogs-3.1.8-readline.patch:
- Version bump. Removed old.
-
- 15 May 2013; Mike Frysinger <vapier@gentoo.org> xfsprogs-3.1.10.ebuild:
- Add s390 love #444688.
-
- 02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for hppa, wrt bug #457486
-
- 31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for sh, wrt bug #457486
-
- 31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for sparc, wrt bug #457486
-
- 30 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for alpha, wrt bug #457486
-
- 28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for ia64, wrt bug #457486
-
- 28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for arm, wrt bug #457486
-
- 27 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for ppc64, wrt bug #457486
-
- 26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for ppc, wrt bug #457486
-
- 26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for x86, wrt bug #457486
-
- 26 Mar 2013; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.10.ebuild:
- Stable for amd64, wrt bug #457486
-
-*xfsprogs-3.1.10 (11 Jan 2013)
-
- 11 Jan 2013; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-3.1.10-sharedlibs.patch, +xfsprogs-3.1.10.ebuild:
- Version bump #450588 by Agostino Sarubbo.
-
- 19 Oct 2012; Mike Frysinger <vapier@gentoo.org>
- files/xfsprogs-3.1.1-sharedlibs.patch:
- Fix parallel install failures with libxlog #438764 by Jorge Manuel B. S.
- Vicetto.
-
- 25 Aug 2012; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-3.1.8-readline.patch, xfsprogs-3.1.8.ebuild:
- Link libxcmd against readline #432644 by David Badia.
-
- 19 Aug 2012; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.1.8.ebuild:
- alpha/ia64/sh/sparc stable wrt #422225
-
- 14 Jul 2012; Markus Meier <maekke@gentoo.org> xfsprogs-3.1.8.ebuild:
- arm stable, bug #422225
-
- 28 Jun 2012; Brent Baude <ranger@gentoo.org> xfsprogs-3.1.8.ebuild:
- Marking xfsprogs-3.1.8 ppc for bug 422225
-
- 27 Jun 2012; Jeroen Roovers <jer@gentoo.org> xfsprogs-3.1.8.ebuild:
- Stable for HPPA (bug #422225).
-
- 22 Jun 2012; Brent Baude <ranger@gentoo.org> xfsprogs-3.1.8.ebuild:
- Marking xfsprogs-3.1.8 ppc64 for bug 422225
-
- 21 Jun 2012; Jeff Horelick <jdhore@gentoo.org> xfsprogs-3.1.8.ebuild:
- marked x86 per bug 422225
-
- 19 Jun 2012; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.8.ebuild:
- Stable for amd64, wrt bug #422225
-
-*xfsprogs-3.1.8 (26 Apr 2012)
-
- 26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> +xfsprogs-3.1.8.ebuild,
- -xfsprogs-3.1.4.ebuild, -xfsprogs-3.1.5.ebuild, -xfsprogs-3.1.6.ebuild,
- -xfsprogs-3.1.7-r1.ebuild:
- Version bump to latest. Prune older a bit.
-
- 01 Apr 2012; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.1.7.ebuild:
- alpha/ia64/sh/sparc stable wrt #408021
-
-*xfsprogs-3.1.7-r1 (30 Mar 2012)
-
- 30 Mar 2012; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.1.7-r1.ebuild:
- Migrate to EAPI=4 and fix static-libs handling #410251 by Fernando V.
-
- 30 Mar 2012; Diego E. Pettenò <flameeyes@gentoo.org> xfsprogs-3.1.4.ebuild,
- xfsprogs-3.1.5.ebuild, xfsprogs-3.1.6.ebuild, xfsprogs-3.1.7.ebuild:
- Fix dependencies on util-linux with USE=static (bug #410251, thanks to
- Fernando V.).
-
- 25 Mar 2012; Markus Meier <maekke@gentoo.org> xfsprogs-3.1.7.ebuild:
- arm stable, bug #408021
-
- 24 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> xfsprogs-3.1.7.ebuild:
- x86 stable wrt bug #408021
-
- 15 Mar 2012; Jeroen Roovers <jer@gentoo.org> xfsprogs-3.1.7.ebuild:
- Stable for HPPA (bug #408021).
-
- 13 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> xfsprogs-3.1.7.ebuild:
- ppc/ppc64 stable wrt #408021
-
- 13 Mar 2012; Agostino Sarubbo <ago@gentoo.org> xfsprogs-3.1.7.ebuild:
- Stable for amd64, wrt bug #408021
-
-*xfsprogs-3.1.7 (09 Feb 2012)
-
- 09 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +xfsprogs-3.1.7.ebuild:
- Bug #402801: version bump.
-
-*xfsprogs-3.1.6 (06 Nov 2011)
-
- 06 Nov 2011; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.1.6.ebuild:
- Version bump.
-
-*xfsprogs-3.1.5 (12 Apr 2011)
-
- 12 Apr 2011; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.1.5.ebuild:
- Version bump #363261 by Lars Wendler.
-
- 30 Mar 2011; Jeroen Roovers <jer@gentoo.org> xfsprogs-3.1.4.ebuild:
- Stable for HPPA (bug #358499).
-
- 20 Mar 2011; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.1.4.ebuild:
- alpha/arm/ia64/sh/sparc stable wrt #358499
-
- 13 Mar 2011; Markos Chandras <hwoarang@gentoo.org> xfsprogs-3.1.4.ebuild:
- Stable on amd64 wrt bug #358499
-
- 13 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> xfsprogs-3.1.4.ebuild:
- ppc/ppc64 stable wrt #358499
-
- 13 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
- xfsprogs-3.1.4.ebuild:
- x86 stable wrt bug #358499
-
-*xfsprogs-3.1.4 (13 Dec 2010)
-
- 13 Dec 2010; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.1.4.ebuild:
- Version bump #348147 by Francisco Javier.
-
- 18 Aug 2010; Mike Frysinger <vapier@gentoo.org> xfsprogs-3.1.2.ebuild,
- +files/xfsprogs-3.1.2-depend.patch:
- Clean up dependency generation to avoid parallel build issues #333155 by
- Samuli Suominen.
-
- 17 Aug 2010; Mike Frysinger <vapier@gentoo.org>
- files/xfsprogs-3.1.1-sharedlibs.patch, xfsprogs-3.1.2.ebuild:
- Clean up library install and prefer readline over editline like upstream
- #311109.
-
-*xfsprogs-3.1.2 (03 Jun 2010)
-
- 03 Jun 2010; Tiziano Müller <dev-zero@gentoo.org>
- +files/xfsprogs-3.1.1-sharedlibs.patch, +xfsprogs-3.1.2.ebuild:
- Version bump (bug #311109), added deps for readline/libedit, added
- static-libs use flag, changed dependency from e2fsprogs to util-linux,
- thanks to Hendrik Leppkes for the updated patch.
-
- 11 May 2010; Joseph Jezak <josejx@gentoo.org> xfsprogs-3.0.3.ebuild:
- Marked ppc/ppc64 stable for bug #311381.
-
- 06 May 2010; Jeroen Roovers <jer@gentoo.org> xfsprogs-3.0.3.ebuild:
- Stable for HPPA (bug #311381).
-
- 25 Apr 2010; Raúl Porcel <armin76@gentoo.org> xfsprogs-3.0.3.ebuild:
- alpha/ia64/sh/sparc stable wrt #311381
-
- 05 Apr 2010; Markus Meier <maekke@gentoo.org> xfsprogs-3.0.3.ebuild:
- amd64/arm/x86 stable, bug #311381
-
-*xfsprogs-3.0.3 (23 Sep 2009)
-
- 23 Sep 2009; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.0.3.ebuild:
- Version bump #285985 by Lars Wendler.
-
- 19 Sep 2009; Robin H. Johnson <robbat2@gentoo.org>
- xfsprogs-3.0.1-r1.ebuild:
- Adding ~arm support. Tested on mv78100.arm.dev.gentoo.org thanks to
- Marvell.
-
-*xfsprogs-3.0.1-r1 (26 Jun 2009)
-
- 26 Jun 2009; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.0.1-r1.ebuild,
- files/xfsprogs-3.0.1-sharedlibs.patch:
- Fix by Lars Wendler to install missing libxcmd.so #275456 by Chris Smith.
-
- 25 Jun 2009; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.0.1.ebuild,
- +files/xfsprogs-3.0.1-sharedlibs.patch:
- Version bump #275405 by Lars Wendler and USE=static support #273219 by
- Wolfram Schlich.
-
-*xfsprogs-3.0.1 (25 Jun 2009)
-
- 25 Jun 2009; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.0.1.ebuild:
- Version bump #275405 by Lars Wendler.
-
- 24 Feb 2009; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-3.0.0-parallel-build.patch, xfsprogs-3.0.0.ebuild:
- Fix parallel build failures #260005 by Gilles Dartiguelongue.
-
- 24 Feb 2009; Mike Frysinger <vapier@gentoo.org> xfsprogs-3.0.0.ebuild:
- Apply blocker as some binaries have moved from xfsdump to xfsprogs #259966
- by Robin Johnson.
-
-*xfsprogs-3.0.0 (22 Feb 2009)
-
- 22 Feb 2009; Mike Frysinger <vapier@gentoo.org> +xfsprogs-3.0.0.ebuild:
- Version bump #259894 by Lars (Polynomial-C).
-
- 14 Feb 2009; Raúl Porcel <armin76@gentoo.org> xfsprogs-2.10.1.ebuild:
- ia64 stable wrt #252148
-
- 31 Jan 2009; Jeroen Roovers <jer@gentoo.org> xfsprogs-2.10.1.ebuild:
- Stable for HPPA (bug #252148).
-
- 09 Jan 2009; Brent Baude <ranger@gentoo.org> xfsprogs-2.10.1.ebuild:
- stable ppc, bug 252148
-
- 07 Jan 2009; Brent Baude <ranger@gentoo.org> xfsprogs-2.10.1.ebuild:
- stable ppc64, bug 252148
-
- 25 Dec 2008; Tobias Klausmann <klausman@gentoo.org>
- xfsprogs-2.10.1.ebuild:
- Stable on alpha, bug #252148
-
- 22 Dec 2008; Markus Meier <maekke@gentoo.org> xfsprogs-2.10.1.ebuild:
- amd64/x86 stable, bug #252148
-
- 22 Dec 2008; Ferris McCormick <fmccor@gentoo.org> xfsprogs-2.10.1.ebuild:
- Sparc stable, Bug #252148.
-
-*xfsprogs-2.10.2 (22 Dec 2008)
-
- 22 Dec 2008; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.10.2.ebuild:
- Version bump #251651 by Lars (Polynomial-C).
-
- 16 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
- +files/xfsprogs-2.10.1-parallelmake.patch, xfsprogs-2.10.1.ebuild:
- Add a patch to allow parallel make builds, reported upstream.
-
-*xfsprogs-2.10.1 (29 Sep 2008)
-
- 29 Sep 2008; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.10.1-headers.patch, +xfsprogs-2.10.1.ebuild:
- Version bump #237170 by Conrad Kostecki.
-
- 01 May 2008; Raúl Porcel <armin76@gentoo.org> xfsprogs-2.9.7.ebuild:
- ia64/sparc stable wrt #218942
-
- 01 May 2008; Tobias Scherbaum <dertobi123@gentoo.org>
- xfsprogs-2.9.7.ebuild:
- ppc stable, bug #218942
-
- 30 Apr 2008; Tobias Klausmann <klausman@gentoo.org> xfsprogs-2.9.7.ebuild:
- Stable on alpha, bug #218942
-
- 28 Apr 2008; Jeroen Roovers <jer@gentoo.org> xfsprogs-2.9.7.ebuild:
- Stable for HPPA (bug #218942).
-
- 26 Apr 2008; Markus Meier <maekke@gentoo.org> xfsprogs-2.9.7.ebuild:
- x86 stable, bug #218942
-
- 26 Apr 2008; Richard Freeman <rich0@gentoo.org> xfsprogs-2.9.7.ebuild:
- amd64 stable - 218942
-
- 24 Apr 2008; Markus Rothe <corsair@gentoo.org> xfsprogs-2.9.7.ebuild:
- Stable on ppc64; bug #218942
-
-*xfsprogs-2.9.8 (23 Apr 2008)
-
- 23 Apr 2008; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.9.8.ebuild:
- Version bump #219018 by Sergey Dryabzhinsky.
-
-*xfsprogs-2.9.7 (18 Mar 2008)
-
- 18 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +xfsprogs-2.9.7.ebuild:
- Version bump as 2.9.6 had a bad default that enabled lazy-counts and then
- the filesystem did not work on kernels older than 2.6.23.
-
- 07 Mar 2008; Richard Freeman <rich0@gentoo.org> xfsprogs-2.9.5.ebuild:
- amd64 stabe - 211152
-
- 28 Feb 2008; nixnut <nixnut@gentoo.org> xfsprogs-2.9.5.ebuild:
- Stable on ppc wrt bug 211152
-
- 27 Feb 2008; Raúl Porcel <armin76@gentoo.org> xfsprogs-2.9.5.ebuild:
- alpha/ia64/sparc stable wrt #211152
-
- 25 Feb 2008; Jeroen Roovers <jer@gentoo.org> xfsprogs-2.9.5.ebuild:
- Stable for HPPA (bug #211152).
-
- 24 Feb 2008; Brent Baude <ranger@gentoo.org> xfsprogs-2.9.5.ebuild:
- stable ppc64, bug 211152
-
- 24 Feb 2008; Markus Meier <maekke@gentoo.org> xfsprogs-2.9.5.ebuild:
- x86 stable, bug #211152
-
-*xfsprogs-2.9.6 (23 Feb 2008)
-
- 23 Feb 2008; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.9.6.ebuild:
- Version bump #211113 by Raúl Porcel.
-
-*xfsprogs-2.9.5 (26 Jan 2008)
-
- 26 Jan 2008; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.9.5.ebuild:
- Version bump #207411 by Sergey Dryabzhinsky.
-
- 19 Nov 2007; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.9.4.ebuild:
- Stable on mips, per #197204.
-
- 02 Nov 2007; Steve Dibb <beandog@gentoo.org> xfsprogs-2.9.4.ebuild:
- amd64 stable, bug 197204
-
- 31 Oct 2007; Jeroen Roovers <jer@gentoo.org> xfsprogs-2.9.4.ebuild:
- Stable for HPPA (bug #197204).
-
- 30 Oct 2007; nixnut <nixnut@gentoo.org> xfsprogs-2.9.4.ebuild:
- Stable on ppc wrt bug 197204
-
- 29 Oct 2007; Raúl Porcel <armin76@gentoo.org> xfsprogs-2.9.4.ebuild:
- ia64 stable wrt #197204
-
- 28 Oct 2007; Ferris McCormick <fmccor@gentoo.org> xfsprogs-2.9.4.ebuild:
- Sparc stable --- Bug #197204 (although we don't much use xfs).
-
- 28 Oct 2007; Jose Luis Rivero <yoswink@gentoo.org> xfsprogs-2.9.4.ebuild:
- Stable on alpha wrt bug #197204
-
- 28 Oct 2007; Markus Rothe <corsair@gentoo.org> xfsprogs-2.9.4.ebuild:
- Stable on ppc64; bug #197204
-
- 28 Oct 2007; Andrej Kacian <ticho@gentoo.org> xfsprogs-2.9.4.ebuild:
- Stable on x86, bug #197204.
-
- 06 Oct 2007; Tom Gall <tgall@gentoo.org> xfsprogs-2.9.3.ebuild:
- stable on ppc64, bug #193143
-
- 28 Sep 2007; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.9.3.ebuild:
- Stable on mips, per #193143.
-
- 26 Sep 2007; Raúl Porcel <armin76@gentoo.org> xfsprogs-2.9.3.ebuild:
- sparc stable wrt #193143
-
- 26 Sep 2007; Christoph Mende <angelos@gentoo.org> xfsprogs-2.9.3.ebuild:
- Stable on amd64 wrt bug #193143
-
- 23 Sep 2007; Raúl Porcel <armin76@gentoo.org> xfsprogs-2.9.3.ebuild:
- alpha/ia64 stable wrt #193143
-
- 22 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
- xfsprogs-2.9.3.ebuild:
- stable x86, bug 193143
-
- 20 Sep 2007; Lars Weiler <pylon@gentoo.org> xfsprogs-2.9.3.ebuild:
- Stable on ppc; bug #193143.
-
-*xfsprogs-2.9.4 (20 Sep 2007)
-
- 20 Sep 2007; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.9.4.ebuild:
- Version bump #192647 by Arfrever Frehtes Taifersar Arahesis.
-
- 01 Sep 2007; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.9.3-pthreads.patch, xfsprogs-2.9.3.ebuild:
- Link in libpthread with all binaries for now #190523 by Sergey D.
-
-*xfsprogs-2.9.3 (29 Aug 2007)
-
- 29 Aug 2007; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.9.3.ebuild:
- Version bump #190523 by Sergey D.
-
- 13 Jun 2007; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.8.21-LDFLAGS.patch, xfsprogs-2.8.21.ebuild:
- Respect LDFLAGS while linking the library.
-
- 09 Jun 2007; Markus Rothe <corsair@gentoo.org>
- +files/xfsprogs-2.8.21-kern-types.patch, xfsprogs-2.8.21.ebuild:
- Added patch for bug #131483; upstream fixed the fix ... and broke it
-
-*xfsprogs-2.8.21 (31 May 2007)
-
- 31 May 2007; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.8.21.ebuild:
- Version bump.
-
- 14 Feb 2007; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.8.18-symlinks.patch, xfsprogs-2.8.18.ebuild:
- Fix installing in parallel #166729 by Connor.
-
-*xfsprogs-2.8.18 (13 Feb 2007)
-
- 13 Feb 2007; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.8.18.ebuild:
- Version bump #166640 by Antti Mäkelä.
-
- 28 Jan 2007; Joseph Jezak <josejx@gentoo.org> xfsprogs-2.8.11.ebuild:
- Marked ppc stable for bug #156840.
-
- 31 Dec 2006; Bryan Østergaard <kloeri@gentoo.org> xfsprogs-2.8.11.ebuild:
- Stable on Alpha, bug 156840.
-
- 11 Dec 2006; Peter Weller <welp@gentoo.org> xfsprogs-2.8.11.ebuild:
- Added amd64 keyword wrt bug ##156840
-
- 07 Dec 2006; Guy Martin <gmsoft@gentoo.org> xfsprogs-2.8.11.ebuild:
- Stable on hppa.
-
- 07 Dec 2006; Christian Faulhammer <opfer@gentoo.org>
- xfsprogs-2.8.11.ebuild:
- stable x86, bug #156840
-
- 03 Dec 2006; Markus Rothe <corsair@gentoo.org> ChangeLog:
- Stable on ppc64; bug #156840
-
- 27 Sep 2006; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.8.11-kern-types.patch, xfsprogs-2.8.11.ebuild:
- Fix from upstream for building with newer kernel headers #131483 by Markus
- Rothe.
-
-*xfsprogs-2.8.11 (26 Sep 2006)
-
- 26 Sep 2006; Patrick McLean <chutzpah@gentoo.org> +xfsprogs-2.8.11.ebuild:
- Version bump.
-
-*xfsprogs-2.8.10 (10 Aug 2006)
-
- 10 Aug 2006; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.8.10.ebuild:
- Version bump #143377 by Christian Hesse.
-
- 12 Jul 2006; Aron Griffis <agriffis@gentoo.org> xfsprogs-2.7.11.ebuild:
- Mark 2.7.11 stable on ia64. #130436
-
- 14 May 2006; Luis Medinas <metalgod@gentoo.org> xfsprogs-2.7.11.ebuild:
- Stable on amd64.
-
- 29 Apr 2006; Guy Martin <gmsoft@gentoo.org> xfsprogs-2.7.11.ebuild:
- Stable on hppa.
-
- 29 Apr 2006; Joseph Jezak <josejx@gentoo.org> xfsprogs-2.7.11.ebuild:
- Marked ppc stable for bug #130436.
-
- 29 Apr 2006; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.7.11.ebuild:
- Marked stable on mips.
-
- 23 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
- xfsprogs-2.7.11.ebuild:
- Stable on x86 wrt bug #130436.
-
- 20 Apr 2006; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.7.11-LDFLAGS.patch, xfsprogs-2.7.11.ebuild:
- Respect user LDFLAGS #126825 by Diego Pettenò.
-
- 10 Apr 2006; Mike Frysinger <vapier@gentoo.org>
- +files/xfsprogs-2.7.11-no-compress-docs.patch, xfsprogs-2.7.11.ebuild:
- Let portage compress the docs #129486 by Stefan de Konink.
-
- 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.7.3.ebuild:
- Marked stable on mips.
-
- 29 Jan 2006; Simon Stelling <blubb@gentoo.org> xfsprogs-2.7.3.ebuild:
- stable on amd64
-
- 28 Jan 2006; Mark Loeser <halcy0n@gentoo.org> xfsprogs-2.7.3.ebuild:
- Stable on x86; bug #120486
-
- 28 Jan 2006; Markus Rothe <corsair@gentoo.org> xfsprogs-2.7.3.ebuild:
- Stable on ppc64; bug #120486
-
- 27 Jan 2006; Luca Barbato <lu_zero@gentoo.org> xfsprogs-2.7.3.ebuild:
- Marked ppc
-
- 27 Jan 2006; Aron Griffis <agriffis@gentoo.org> xfsprogs-2.7.3.ebuild:
- Mark 2.7.3 stable on alpha #120486
-
-*xfsprogs-2.7.11 (27 Jan 2006)
-
- 27 Jan 2006; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.7.11.ebuild:
- Version bump.
-
-*xfsprogs-2.7.3 (29 Nov 2005)
-
- 29 Nov 2005; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.7.3.ebuild:
- Version bump.
-
-*xfsprogs-2.6.36 (02 Sep 2005)
-
- 02 Sep 2005; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.6.36.ebuild:
- Version bump.
-
- 29 May 2005; <solar@gentoo.org> xfsprogs-2.6.25.ebuild:
- - update xfsprogs to use libc expanded variable elibc_uclibc vs uclibc so
- USE=-* works
-
- 29 Apr 2005; Markus Rothe <corsair@gentoo.org> xfsprogs-2.6.25.ebuild:
- Stable on ppc64
-
- 29 Apr 2005; Hanno Boeck <hanno@gentoo.org> +files/xfsprogs_gcc4.gz,
- xfsprogs-2.6.25.ebuild:
- Add patch to compile with gcc4 (from upstream cvs).
-
- 30 Mar 2005; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.25.ebuild:
- Clean up and add ppc64 KEYWORDS.
-
- 20 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> xfsprogs-2.6.25.ebuild:
- Stable on alpha.
-
- 19 Feb 2005; Joseph Jezak <josejx@gentoo.org> xfsprogs-2.6.25.ebuild:
- Marked ppc stable for bug #82181.
-
- 29 Jan 2005; <solar@gentoo.org> +files/2.6.25-uclibc-fadvise.patch,
- xfsprogs-2.6.25.ebuild:
- - temp work around to disable posix_fadvise till such times as _syscall6()
- exists for uClibc. bug #73855
-
- 19 Jan 2005; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.6.25.ebuild:
- Marked stable on mips.
-
- 03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
- Change encoding to UTF-8 for GLEP 31 compliance
-
- 14 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xfsprogs-2.6.25.ebuild:
- Stable on amd64.
-
-*xfsprogs-2.6.25 (09 Oct 2004)
-
- 09 Oct 2004; Mike Frysinger <vapier@gentoo.org> +xfsprogs-2.6.25.ebuild:
- Version bump.
-
- 07 Oct 2004; <solar@gentoo.org> +files/2.6.13-uclibc-mincore.patch,
- xfsprogs-2.6.13.ebuild:
- mincore() does not appear to be part of POSIX or the Single Unix
- Specification. So we patch it out for uclibc builds.
-
- 07 Oct 2004; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.13.ebuild,
- +files/2.6.13-configure.patch:
- Add patch to fix configure mis-detection #65735 by Marc Bevand.
-
- 21 Sep 2004; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.13.ebuild:
- Make nls support optional #64862 by Aaron GIpson.
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- xfsprogs-2.3.9.ebuild, xfsprogs-2.6.3.ebuild:
- Masked xfsprogs-2.6.3.ebuild stable for ppc
-
- 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
- xfsprogs-2.3.9.ebuild:
- Masked xfsprogs-2.3.9.ebuild stable for ppc
-
- 23 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> xfsprogs-2.6.13.ebuild:
- Stable on alpha.
-
- 21 Aug 2004; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.6.13.ebuild:
- Marked stable on mips.
-
- 21 Aug 2004; Mike Frysinger <vapier@gentoo.org> xfsprogs-2.6.13.ebuild:
- Unmask since latest stable xfsdump needs a the latest xfsprogs #42484 and to
- cheat at fixing #39559.
-
- 30 Jul 2004; Aron Griffis <agriffis@gentoo.org> xfsprogs-2.6.3.ebuild:
- stable on alpha and ia64
-
- 29 Jul 2004; Guy Martin <gmsoft@gentoo.org> xfsprogs-2.6.3.ebuild:
- Stable on hppa.
-
-*xfsprogs-2.6.13 (28 Jul 2004)
-
- 28 Jul 2004; Jon Portnoy <avenj@gentoo.org> xfsprogs-2.6.13.ebuild :
- Version bump.
-
- 28 Jul 2004; Jon Portnoy <avenj@gentoo.org> xfsprogs-2.6.3.ebuild :
- Bump to stable on x86 and AMD64, bug #54108.
-
- 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
- xfsprogs-1.3.13.ebuild, xfsprogs-2.6.3.ebuild:
- virtual/glibc -> virtual/libc
-
- 27 Jun 2004; Aron Griffis <agriffis@gentoo.org> xfsprogs-2.6.0.ebuild:
- QA - fix use invocation
-
- 24 May 2004; Michael Sterrett <mr_bones_@gentoo.org> xfsprogs-2.6.3.ebuild:
- IUSE; don't rdepend on sed; use character class in sed; error check disk io;
- compress docs
-
- 25 Apr 2004; Joshua Kinard <kumba@gentoo.org> xfsprogs-2.6.3.ebuild:
- Tweaked the arch check to see if PLATFORM needed to be unset and added mips to
- that arch list.
-
- 18 Apr 2004; Luca Barbato <lu_zero@gentoo.org> xfsprogs-2.6.0.ebuild,
- xfsprogs-2.6.3.ebuild:
- Fixed bug #42181
-
-*xfsprogs-2.6.3 (11 Feb 2004)
-
- 11 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
- Version bump #19406.
-
- 31 Jan 2004; Brian Harring <ferringb@gentoo.org> xfsprogs-1.3.13.ebuild,
- xfsprogs-2.3.9.ebuild, xfsprogs-2.6.0.ebuild:
- Adjusted all xfsprogs ebuild SRC_URI's to mirror://gentoo, due to upstream
- files no longer existing.
-
- 17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> :
- manifest fix
-
- 16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> xfsprogs-2.6.0.ebuild:
- set ppc in keywords
-
- 15 Dec 2003; Jason Wever <weeve@gentoo.org> xfsprogs-2.6.0.ebuild:
- Added sparc fix and marked ~sparc.
-
-*xfsprogs-2.6.0 (13 Nov 2003)
-
- 13 Nov 2003; <plasmaroo@gentoo.org> xfsprogs-2.6.0.ebuild:
- Version bump. Bug #33358
-
- 28 Sep 2003; David Holm <dholm@gentoo.org> xfsprogs-2.3.9.ebuild:
- Added to ~ppc.
-
-*xfsprogs-2.3.6-r1 (15 Sep 2003)
-
- 15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xfsprogs-1.3.13.ebuild,
- xfsprogs-2.0.1_p20020330.ebuild, xfsprogs-2.2.2-r1.ebuild,
- xfsprogs-2.2.2.ebuild, xfsprogs-2.3.6-r1.ebuild, xfsprogs-2.3.6-r2.ebuild,
- xfsprogs-2.3.6.ebuild, xfsprogs-2.3.9.ebuild:
- moved to sys-fs
-
- 10 Jun 2003; Brandon Low <lostlogic@gentoo.org> xfsprogs-2.3.9.ebuild:
- Change to sed -i and more better fix bug 19527
-
- 10 Jun 2003; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.3.9.ebuild:
- added fix from bug #19527
-
- 09 Jun 2003; Brad Laue <brad@gentoo.org> xfsprogs-2.3.9.ebuild:
- Marking xfsprogs-2.3.9 stable: the 2.3.6 distfile is no longer on the main FTP
- site.
-
- 03 Jun 2003; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.3.9.ebuild:
- added dep to close bug #21160
-
-*xfsprogs-2.3.9 (16 Apr 2003)
-
- 16 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> xfsprogs-2.3.9.ebuild :
- Version bump.
-
-*xfsprogs-2.3.6-r2 (26 Dec 2002)
-
- 28 Mar 2003; Guy Martin <gmsoft@gentoo.org> xfsprogs-2.3.6-r2.ebuild :
- Added ~hppa to KEYWORDS.
-
- 24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> xfsprogs-2.3.6-r2.ebuild :
- Marked as testing for mips. Made ChangeLog compatible with echangelog.
-
- 26 Dec 2002; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.3.6-r2.ebuild,
- files/digest-xfsprogs-2.3.6-r2:
- Changed some sedding to use flag-o-matic, and exported some vars.
-
- 21 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: renamed xfsprogs version
- 20020330-r1 to 2.0.1_p20020330 to bring in line with CVS ebuild policy and
- fix version comparison snafu.
-
-*xfsprogs-2.3.6-r1 (16 Dec 2002)
-
- 16 Dec 2002; Bjoern Brauel <bjb@gentoo.org> xfsprogs-2.3.6-r1.ebuild,
- files/digest-xfsprogs-2.3.6-r1:
-
- Add ~alpha to KEYWORDS
-
- 16 Dec 2002; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.3.6-r1.ebuild,
- files/digest-xfsprogs-2.3.6-r1:
-
- Cleaned up ebuild.
-
-*xfsprogs-2.3.6 (09 Dec 2002)
-
- 09 Dec 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release.
-
-*xfsprogs-2.2.2-r1 (29 Oct 2002)
-
- 27 Oct 2002; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.2.2-r1.ebuild
- files/digest-xfsprogs-2.2.2-r1 :
-
- Updated symlinks for bug# 9861.
-
-*xfsprogs-2.2.2 (27 Sep 2002)
-
- 05 Oct 2002; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.2.2.ebuild :
-
- Fixed symlinks and "modernized" ebuild.
-
- 27 Sep 2002; Brad Cowan <bcowan@gentoo.org> xfsprogs-2.2.2.ebuild
- files/digest-xfsprogs-2.2.2 :
-
- version bump thanks to Hanno Boeck <hanno@gentoo.org>
-
-*xfsprogs-20020330-r1 (26 July 2002)
-
- 26 Jul 2002; phoen][x <phoenix@gentoo.org>:
- This package will be compiled with -O1 now.
- Compiling it with a higher setting, breaks xfs_check in
- a gcc-2.95.3 environment. Closes bug #5551.
-
-*xfsprogs-20020330 (14 July 2002)
-
- 21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
- updated keywords (ppc)
-
- 14 Jul 2002; phoen][x <phoenix@gentoo.org> xfsprogs-20020330.ebuild :
- Added LICENSE, KEYWORDS, SLOT.
-
-*xfsprogs-1.3.13 (14 July 2002)
-
- 25 Feb 2003; Brandon Low <lostlogic@gentoo.org> xfsprogs-1.3.13.ebuild :
- Fix massively long line
-
- 14 Jul 2002; phoen][x <phoenix@gentoo.org> xfsprogs-1.3.13.ebuild :
- Added LICENSE, KEYWORDS, SLOT.
-
-*xfsprogs-20020124-r2 (1 Feb 2002)
-
- 14 Jul 2002; phoen][x <phoenix@gentoo.org> xfsprogs-20020124-r2.ebuild :
- Added LICENSE, KEYWORDS, SLOT.
-
- 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
- Added initial ChangeLog which should be updated whenever the package is
- updated in any way. This changelog is targetted to users. This means that the
- comments should well explained and written in clean English. The details about
- writing correct changelogs are explained in the skel.ChangeLog file which you
- can find in the root directory of the portage repository.
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-add-limits-h.patch b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-add-limits-h.patch
deleted file mode 100644
index 813119f..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-add-limits-h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./libxfs/xfs_attr_remote.c.orig
-+++ ./libxfs/xfs_attr_remote.c
-@@ -17,6 +17,7 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
- #include <xfs.h>
-+#include <linux/limits.h>
-
- #define ATTR_RMTVALUE_MAPSIZE 1 /* # of map entries at once */
-
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-musl-compat.patch b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-musl-compat.patch
deleted file mode 100644
index bffa6fb..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-musl-compat.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff --git a/fsr/xfs_fsr.c b/fsr/xfs_fsr.c
-index 6f00b41..5b4af53 100644
---- a/fsr/xfs_fsr.c
-+++ b/fsr/xfs_fsr.c
-@@ -44,6 +44,10 @@
- #define _PATH_FSRLAST "/var/tmp/.fsrlast_xfs"
- #define _PATH_PROC_MOUNTS "/proc/mounts"
-
-+#ifndef _PATH_MOUNTED
-+#define _PATH_MOUNTED MOUNTED
-+#endif
-+
-
- char *progname;
-
-diff --git a/include/platform_defs.h.in b/include/platform_defs.h.in
-index ac260bc..0e7fccf 100644
---- a/include/platform_defs.h.in
-+++ b/include/platform_defs.h.in
-@@ -68,6 +68,32 @@ typedef __u64 __bitwise __be64;
-
- typedef struct filldir filldir_t;
-
-+#ifndef __uint8_t
-+#define __uint8_t uint8_t
-+#endif
-+#ifndef __uint16_t
-+#define __uint16_t uint16_t
-+#endif
-+#ifndef __uint32_t
-+#define __uint32_t uint32_t
-+#endif
-+#ifndef __uint64_t
-+#define __uint64_t uint64_t
-+#endif
-+
-+#ifndef __int8_t
-+#define __int8_t int8_t
-+#endif
-+#ifndef __int16_t
-+#define __int16_t int16_t
-+#endif
-+#ifndef __int32_t
-+#define __int32_t int32_t
-+#endif
-+#ifndef __int64_t
-+#define __int64_t int64_t
-+#endif
-+
- #if defined(__linux__)
- #include <xfs/linux.h>
- #elif defined(__FreeBSD__)
-diff --git a/libhandle/handle.c b/libhandle/handle.c
-index 9a232fa..1db7772 100644
---- a/libhandle/handle.c
-+++ b/libhandle/handle.c
-@@ -20,6 +20,9 @@
- #include <xfs/xfs.h>
- #include <xfs/handle.h>
- #include <xfs/parent.h>
-+#if defined(__linux__)
-+#include <linux/limits.h>
-+#endif
-
- /* just pick a value we know is more than big enough */
- #define MAXHANSIZ 64
-diff --git a/libhandle/jdm.c b/libhandle/jdm.c
-index 070407b..8dd6322 100644
---- a/libhandle/jdm.c
-+++ b/libhandle/jdm.c
-@@ -20,6 +20,9 @@
- #include <xfs/handle.h>
- #include <xfs/jdm.h>
- #include <xfs/parent.h>
-+#if defined(__linux__)
-+#include <linux/limits.h>
-+#endif
-
- /* internal fshandle - typecast to a void for external use */
- #define FSHANDLE_SZ 8
-diff --git a/libxfs/linux.c b/libxfs/linux.c
-index 2e07d54..4075786 100644
---- a/libxfs/linux.c
-+++ b/libxfs/linux.c
-@@ -16,12 +16,9 @@
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
--#define ustat __kernel_ustat
- #include <xfs/libxfs.h>
- #include <mntent.h>
- #include <sys/stat.h>
--#undef ustat
--#include <sys/ustat.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
- #include <sys/sysinfo.h>
-@@ -49,9 +46,12 @@ static int max_block_alignment;
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
-- /* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
-- struct ustat ust[2];
- struct stat64 st;
-+ FILE *f;
-+ struct stat64 mst;
-+ struct mntent *mnt;
-+ char mounts[MAXPATHLEN];
-+ int ismounted = 0;
-
- if (!s) {
- if (stat64(block, &st) < 0)
-@@ -61,14 +61,25 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- s = &st;
- }
-
-- if (ustat(s->st_rdev, ust) >= 0) {
-+ strcpy(mounts, (!access(PROC_MOUNTED, R_OK)) ? PROC_MOUNTED : MOUNTED);
-+ if ((f = setmntent(mounts, "r")) == NULL)
-+ return 0;
-+
-+ while ((mnt = getmntent(f)) != NULL) {
-+ if (stat64(mnt->mnt_dir, &mst) < 0)
-+ continue;
-+ if (mst.st_dev != s->st_rdev)
-+ continue;
-+
- if (verbose)
- fprintf(stderr,
- _("%s: %s contains a mounted filesystem\n"),
- progname, name);
-- return 1;
-+ ismounted = 1;
-+ break;
- }
-- return 0;
-+ endmntent(f);
-+ return ismounted;
- }
-
- int
---- ./repair/attr_repair.c.orig
-+++ ./repair/attr_repair.c
-@@ -24,6 +24,10 @@
- #include "bmap.h"
- #include "protos.h"
- #include "dir2.h"
-+#if defined(__linux__)
-+#include <linux/limits.h>
-+#endif
-+
-
- static int xfs_acl_valid(struct xfs_mount *mp, struct xfs_acl *daclp);
- static int xfs_mac_valid(xfs_mac_label_t *lp);
diff --git a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
deleted file mode 100644
index 118874a..0000000
--- a/sys-fs/xfsprogs/files/xfsprogs-3.2.2-sharedlibs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-use libtool to do all installing. do not use the manual file install as
-that'll copy files directly from the .libs/ subdir which might have rpaths
-that we do not want.
-
---- xfsprogs-3.2.2/include/buildmacros
-+++ xfsprogs-3.2.2/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-3.2.2/libdisk/Makefile
-+++ xfsprogs-3.2.2/libdisk/Makefile
-@@ -31,6 +31,7 @@
- install: default
-
- install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- install-qa: install-dev
-
---- xfsprogs-3.2.2/libhandle/Makefile
-+++ xfsprogs-3.2.2/libhandle/Makefile
-@@ -20,7 +20,6 @@
- include $(BUILDRULES)
-
- install: default
-- $(INSTALL_LTLIB)
-
- install-dev: default
- $(INSTALL_LTLIB_DEV)
---- xfsprogs-3.2.2/libxcmd/Makefile
-+++ xfsprogs-3.2.2/libxcmd/Makefile
-@@ -34,6 +34,11 @@
-
- include $(BUILDRULES)
-
--install install-dev install-qa: default
-+install: default
-+
-+ install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
-
- -include .ltdep
---- xfsprogs-3.2.2/libxfs/Makefile
-+++ xfsprogs-3.2.2/libxfs/Makefile
-@@ -86,6 +86,7 @@
- install: default
-
- install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- install-qa: default
-
---- xfsprogs-3.2.2/libxlog/Makefile
-+++ xfsprogs-3.2.2/libxlog/Makefile
-@@ -12,6 +12,8 @@
-
- CFILES = xfs_log_recover.c util.c
-
-+LTLIBS = $(LIBUUID) $(LIBXFS)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
-
-@@ -19,6 +21,11 @@
-
- include $(BUILDRULES)
-
--install install-dev install-qa: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-+
-+install-qa: default
-
- -include .ltdep
---- xfsprogs-3.2.2/Makefile
-+++ xfsprogs-3.2.2/Makefile
-@@ -63,6 +63,8 @@
- mkfs: libxfs
- quota: libxcmd
- repair: libxfs libxlog
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
-
- ifneq ($(ENABLE_BLKID), yes)
- mkfs: libdisk
diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-fs/xfsprogs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-fs/xfsprogs/xfsprogs-3.2.2-r99.ebuild b/sys-fs/xfsprogs/xfsprogs-3.2.2-r99.ebuild
deleted file mode 100644
index c9216e3..0000000
--- a/sys-fs/xfsprogs/xfsprogs-3.2.2-r99.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.2.2.ebuild,v 1.1 2014/12/15 10:01:52 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="http://oss.sgi.com/projects/xfs/"
-SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
- ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="libedit nls readline static static-libs"
-REQUIRED_USE="static? ( static-libs )"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
- readline? ( sys-libs/readline[static-libs(+)] )
- !readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- !<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
- static? (
- ${LIB_DEPEND}
- readline? ( sys-libs/ncurses[static-libs] )
- )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- if use readline && use libedit ; then
- ewarn "You have USE='readline libedit' but these are exclusive."
- ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
- epatch "${FILESDIR}"/${PN}-3.2.2-musl-compat.patch
- epatch "${FILESDIR}"/${PN}-3.2.2-add-limits-h.patch
-
- sed -i \
- -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
- include/builddefs.in || die
- sed -i \
- -e '1iLLDFLAGS = -static' \
- {estimate,fsr}/Makefile || die
- sed -i \
- -e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \
- $(find -name Makefile) || die
-
- # libdisk has broken blkid conditional checking
- sed -i \
- -e '/LIB_SUBDIRS/s:libdisk::' \
- Makefile || die
-
- # TODO: write a patch for configure.in to use pkg-config for the uuid-part
- if use static && use readline ; then
- sed -i \
- -e 's|-lreadline|\0 -lncurses|' \
- -e 's|-lblkid|\0 -luuid|' \
- configure || die
- fi
-}
-
-src_configure() {
- export DEBUG=-DNDEBUG
- export OPTIMIZER=${CFLAGS}
- unset PLATFORM # if set in user env, this breaks configure
-
- local myconf
- if use static || use static-libs ; then
- myconf+=" --enable-static"
- else
- myconf+=" --disable-static"
- fi
-
- econf \
- --bindir=/usr/bin \
- --libexecdir=/usr/$(get_libdir) \
- $(use_enable nls gettext) \
- $(use_enable readline) \
- $(usex readline --disable-editline $(use_enable libedit editline)) \
- ${myconf}
-
- MAKEOPTS+=" V=1"
-}
-
-src_install() {
- emake DIST_ROOT="${ED}" install
- # parallel install fails on these targets for >=xfsprogs-3.2.0
- emake -j1 DIST_ROOT="${ED}" install-{dev,qa}
-
- # handle is for xfsdump, the rest for xfsprogs
- gen_usr_ldscript -a xfs xlog
- # removing unnecessary .la files if not needed
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-kernel/linux-headers/files/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch b/sys-kernel/linux-headers/files/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
deleted file mode 100644
index 0b4cfb1..0000000
--- a/sys-kernel/linux-headers/files/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./include/uapi/linux/kernel.h.orig
-+++ ./include/uapi/linux/kernel.h
-@@ -1,7 +1,9 @@
- #ifndef _UAPI_LINUX_KERNEL_H
- #define _UAPI_LINUX_KERNEL_H
-
-+#ifdef __GLIBC__
- #include <linux/sysinfo.h>
-+#endif
-
- /*
- * 'kernel.h' contains some often-used function prototypes etc
diff --git a/sys-kernel/linux-headers/files/libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/sys-kernel/linux-headers/files/libc-compat.h-fix-some-issues-arising-from-in6.h.patch
deleted file mode 100644
index e4ce3d6..0000000
--- a/sys-kernel/linux-headers/files/libc-compat.h-fix-some-issues-arising-from-in6.h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- ./include/uapi/linux/libc-compat.h.orig
-+++ ./include/uapi/linux/libc-compat.h
-@@ -48,35 +48,26 @@
- #ifndef _UAPI_LIBC_COMPAT_H
- #define _UAPI_LIBC_COMPAT_H
-
--/* We have included glibc headers... */
--#if defined(__GLIBC__)
-+#ifndef __KERNEL__ /* we're used from userspace */
-
--/* Coordinate with glibc netinet/in.h header. */
--#if defined(_NETINET_IN_H)
-+/* Coordinate with libc netinet/in.h header. */
-+#ifdef _NETINET_IN_H
-
- /* GLIBC headers included first so don't define anything
- * that would already be defined. */
- #define __UAPI_DEF_IN6_ADDR 0
--/* The exception is the in6_addr macros which must be defined
-- * if the glibc code didn't define them. This guard matches
-- * the guard in glibc/inet/netinet/in.h which defines the
-- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
--#if defined(__USE_MISC) || defined (__USE_GNU)
- #define __UAPI_DEF_IN6_ADDR_ALT 0
--#else
--#define __UAPI_DEF_IN6_ADDR_ALT 1
--#endif
- #define __UAPI_DEF_SOCKADDR_IN6 0
- #define __UAPI_DEF_IPV6_MREQ 0
- #define __UAPI_DEF_IPPROTO_V6 0
-
--#else
-+#else /* defined(_NETINET_IN_H) */
-
- /* Linux headers included first, and we must define everything
-- * we need. The expectation is that glibc will check the
-+ * we need. The expectation is that the libc will check the
- * __UAPI_DEF_* defines and adjust appropriately. */
- #define __UAPI_DEF_IN6_ADDR 1
--/* We unconditionally define the in6_addr macros and glibc must
-+/* We unconditionally define the in6_addr macros and the libc must
- * coordinate. */
- #define __UAPI_DEF_IN6_ADDR_ALT 1
- #define __UAPI_DEF_SOCKADDR_IN6 1
-@@ -89,7 +80,7 @@
- /* If we did not see any headers from any supported C libraries,
- * or we are being included in the kernel, then define everything
- * that we need. */
--#else /* !defined(__GLIBC__) */
-+#else /* __KERNEL__ */
-
- /* Definitions for in6.h */
- #define __UAPI_DEF_IN6_ADDR 1
-@@ -98,6 +89,6 @@
- #define __UAPI_DEF_IPV6_MREQ 1
- #define __UAPI_DEF_IPPROTO_V6 1
-
--#endif /* __GLIBC__ */
-+#endif /* __KERNEL__ */
-
- #endif /* _UAPI_LIBC_COMPAT_H */
diff --git a/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
deleted file mode 100644
index b8ac94f..0000000
--- a/sys-kernel/linux-headers/files/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./include/uapi/linux/if_ether.h.orig
-+++ ./include/uapi/linux/if_ether.h
-@@ -22,6 +22,7 @@
- #define _UAPI_LINUX_IF_ETHER_H
-
- #include <linux/types.h>
-+#include <linux/libc-compat.h>
-
- /*
- * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
-@@ -130,11 +131,12 @@
- * This is an Ethernet frame header.
- */
-
-+#if __UAPI_DEF_ETHHDR
- struct ethhdr {
- unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
- unsigned char h_source[ETH_ALEN]; /* source ether addr */
- __be16 h_proto; /* packet type ID field */
- } __attribute__((packed));
--
-+#endif
-
- #endif /* _UAPI_LINUX_IF_ETHER_H */
---- ./include/uapi/linux/libc-compat.h.orig
-+++ ./include/uapi/linux/libc-compat.h
-@@ -50,6 +50,12 @@
-
- #ifndef __KERNEL__ /* we're used from userspace */
-
-+#ifdef _NETINET_IF_ETHER_H /* musl */
-+#define __UAPI_DEF_ETHHDR 0
-+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
- /* Coordinate with libc netinet/in.h header. */
- #ifdef _NETINET_IN_H
-
diff --git a/sys-kernel/linux-headers/linux-headers-3.18-r99.ebuild b/sys-kernel/linux-headers/linux-headers-3.18-r99.ebuild
deleted file mode 100644
index d9113b8..0000000
--- a/sys-kernel/linux-headers/linux-headers-3.18-r99.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.18.ebuild,v 1.3 2015/03/24 20:13:13 maekke Exp $
-
-EAPI="4"
-
-ETYPE="headers"
-H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa"
-inherit kernel-2
-detect_version
-
-PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
- ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
-
-KEYWORDS="amd64 arm ~mips ppc x86"
-
-DEPEND="app-arch/xz-utils
- dev-lang/perl"
-RDEPEND="!!media-sound/alsa-headers"
-
-S=${WORKDIR}/gentoo-headers-base-${PV}
-
-src_unpack() {
- unpack ${A}
-}
-
-src_prepare() {
- [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
- epatch "${FILESDIR}"/glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
- epatch "${FILESDIR}"/libc-compat.h-fix-some-issues-arising-from-in6.h.patch
- epatch "${FILESDIR}"/libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch
-}
-
-src_install() {
- kernel-2_src_install
-
- # hrm, build system sucks
- find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
- find "${ED}" -depth -type d -delete 2>/dev/null
-
- # provided by libdrm (for now?)
- rm -rf "${ED}"/$(kernel_header_destdir)/drm
-}
-
-src_test() {
- einfo "Possible unescaped attribute/type usage"
- egrep -r \
- -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
- -e '\<([us](8|16|32|64))\>' \
- .
-
- einfo "Missing linux/types.h include"
- egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h
-
- emake ARCH=$(tc-arch-kernel) headers_check
-}
diff --git a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml
deleted file mode 100644
index 0cddf52..0000000
--- a/sys-kernel/linux-headers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>toolchain</herd>
-<upstream>
- <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-libs/efivar/efivar-0.15-r99.ebuild b/sys-libs/efivar/efivar-0.15-r99.ebuild
deleted file mode 100644
index 94461c5..0000000
--- a/sys-libs/efivar/efivar-0.15-r99.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/efivar/efivar-0.15.ebuild,v 1.5 2015/02/28 13:25:44 ago Exp $
-
-EAPI=5
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Tools and library to manipulate EFI variables"
-HOMEPAGE="https://github.com/vathpela/efivar"
-SRC_URI="https://github.com/vathpela/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-0.15-portability.patch" || die
-}
-
-src_configure() {
- tc-export CC
- export libdir="/usr/$(get_libdir)"
-}
diff --git a/sys-libs/efivar/files/efivar-0.15-portability.patch b/sys-libs/efivar/files/efivar-0.15-portability.patch
deleted file mode 100644
index 2c824a0..0000000
--- a/sys-libs/efivar/files/efivar-0.15-portability.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Portability fixes:
-
-- Initialize outbuf with the expected size! fixes a segfault with musl.
-- Really use __builtin_va_arg_pack_len().
-
---- a/src/efivar.h
-+++ b/src/efivar.h
-@@ -85,7 +85,7 @@ efi_set_variable(efi_guid_t guid, const char *name,
- return -1;
- }
-
-- if (__va_arg_pack_len() == 0)
-+ if (__builtin_va_arg_pack_len() == 0)
- return _efi_set_variable(guid, name, data, data_size,
- attributes, 0644);
-
-diff --git a/src/makeguids.c b/src/makeguids.c
-index 321a7e7..7d68b8a 100644
---- a/src/makeguids.c
-+++ b/src/makeguids.c
-@@ -100,7 +100,7 @@ main(int argc, char *argv[])
- err(1, "makeguids: could not read \"%s\"", argv[1]);
-
- /* strictly speaking, this *has* to be too large. */
-- struct guidname *outbuf = calloc(inlen, sizeof (char));
-+ struct guidname *outbuf = calloc(inlen, sizeof (struct guidname));
- if (!outbuf)
- err(1, "makeguids");
-
diff --git a/sys-libs/efivar/metadata.xml b/sys-libs/efivar/metadata.xml
deleted file mode 100644
index 1a97370..0000000
--- a/sys-libs/efivar/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>yannick.schaeffer@epfl.ch</email>
- <name>Yannick Schaeffer</name>
- <description>Mantainer. Assign bugs to him</description>
- </maintainer>
- <maintainer>
- <email>floppym@gentoo.org</email>
- <name>Mike Gilbert</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-libs/gdbm/gdbm-1.11-r99.ebuild b/sys-libs/gdbm/gdbm-1.11-r99.ebuild
deleted file mode 100644
index 7ac020f..0000000
--- a/sys-libs/gdbm/gdbm-1.11-r99.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/gdbm/gdbm-1.11.ebuild,v 1.1 2014/01/13 15:41:08 polynomial-c Exp $
-
-EAPI="4"
-
-inherit flag-o-matic libtool multilib multilib-minimal
-
-EX_P="${PN}-1.8.3"
-DESCRIPTION="Standard GNU database libraries"
-HOMEPAGE="http://www.gnu.org/software/gdbm/"
-SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
- exporter? ( mirror://gnu/gdbm/${EX_P}.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+berkdb exporter nls static-libs"
-
-RDEPEND="
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-EX_S="${WORKDIR}"/${EX_P}
-
-src_prepare() {
- elibtoolize
-}
-
-multilib_src_configure() {
- # gdbm doesn't appear to use either of these libraries
- export ac_cv_lib_dbm_main=no ac_cv_lib_ndbm_main=no
-
- if multilib_build_binaries && use exporter ; then
- pushd "${EX_S}" >/dev/null
- append-lfs-flags
- econf --disable-shared
- popd >/dev/null
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --includedir="${EPREFIX}"/usr/include/gdbm \
- --with-gdbm183-libdir="${EX_S}/.libs" \
- --with-gdbm183-includedir="${EX_S}" \
- $(use_enable berkdb libgdbm-compat) \
- $(multilib_build_binaries && use_enable exporter gdbm-export) \
- $(use_enable nls) \
- $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
- use exporter && emake -C "${EX_S}" libgdbm.la
- emake
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED}" -name '*.la' -delete
- mv "${ED}"/usr/include/gdbm/gdbm.h "${ED}"/usr/include/ || die
-}
-
-pkg_preinst() {
- preserve_old_lib libgdbm{,_compat}.so.{2,3} #32510
-}
-
-pkg_postinst() {
- preserve_old_lib_notify libgdbm{,_compat}.so.{2,3} #32510
-}
diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
deleted file mode 100644
index 07b3785..0000000
--- a/sys-libs/gdbm/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='berkdb'>enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
- <flag name='exporter'>enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.7.3-add-missing-unistd_h.patch b/sys-libs/libcap-ng/files/libcap-ng-0.7.3-add-missing-unistd_h.patch
deleted file mode 100644
index fa6fab2..0000000
--- a/sys-libs/libcap-ng/files/libcap-ng-0.7.3-add-missing-unistd_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur libcap-ng-0.7.3.orig/utils/proc-llist.c libcap-ng-0.7.3/utils/proc-llist.c
---- libcap-ng-0.7.3.orig/utils/proc-llist.c 2012-11-09 19:59:13.000000000 +0000
-+++ libcap-ng-0.7.3/utils/proc-llist.c 2014-02-22 15:58:17.933566760 +0000
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include "proc-llist.h"
-
- void list_create(llist *l)
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.3-r99.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.3-r99.ebuild
deleted file mode 100644
index 27d737d..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.3-r99.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild,v 1.14 2014/01/19 20:11:39 vapier Exp $
-
-EAPI=5
-
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
-
-inherit autotools eutils flag-o-matic python
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="http://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="http://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- python? ( >=dev-lang/swig-2 )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-pkg_setup() {
- use python && python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-add-missing-unistd_h.patch
-
- # Disable byte-compilation of Python modules.
- >py-compile
-
- # Python bindings are built/tested/installed manually.
- sed -i -e "/^SUBDIRS/s/ python//" bindings/Makefile.am || die
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
- eautoreconf
-
- use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with python)
-}
-
-src_compile() {
- default
-
- if use python; then
- python_copy_sources bindings/python
-
- building() {
- emake \
- CFLAGS="${CFLAGS}" \
- PYTHON_VERSION="$(python_get_version)" \
- pyexecdir="$(python_get_sitedir)" \
- pythondir="$(python_get_sitedir)"
- }
- python_execute_function -s --source-dir bindings/python building
- fi
-}
-
-src_test() {
- if [[ "${EUID}" -eq 0 ]]; then
- ewarn "Skipping tests due to root permissions."
- return
- fi
-
- default
-
- if use python; then
- testing() {
- emake \
- PYTHON_VERSION="$(python_get_version)" \
- pyexecdir="$(python_get_sitedir)" \
- pythondir="$(python_get_sitedir)" \
- TESTS_ENVIRONMENT="PYTHONPATH=..:../.libs" \
- check
- }
- python_execute_function -s --source-dir bindings/python testing
- fi
-}
-
-src_install() {
- default
-
- if use python; then
- installation() {
- emake \
- DESTDIR="${D}" \
- PYTHON_VERSION="$(python_get_version)" \
- pyexecdir="$(python_get_sitedir)" \
- pythondir="$(python_get_sitedir)" \
- install
- }
- python_execute_function -s --source-dir bindings/python installation
-
- python_clean_installation_image
- fi
-
- rm -f "${ED}"/usr/lib*/${PN}.la
-}
-
-pkg_postinst() {
- use python && python_mod_optimize capng.py
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup capng.py
-}
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.4-r99.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.4-r99.ebuild
deleted file mode 100644
index 92aacac..0000000
--- a/sys-libs/libcap-ng/libcap-ng-0.7.4-r99.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.4.ebuild,v 1.10 2014/12/06 16:40:48 ago Exp $
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools-utils flag-o-matic python-r1
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="http://people.redhat.com/sgrubb/libcap-ng/"
-SRC_URI="http://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- python? ( >=dev-lang/swig-2 )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.7.3-add-missing-unistd_h.patch
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
- autotools-utils_src_prepare
-
- use sparc && replace-flags -O? -O0
-}
-
-src_configure() {
- local myeconfargs=(
- --without-python
- )
-
- # set up the library build
- autotools-utils_src_configure
-
- if use python; then
- python_parallel_foreach_impl \
- autotools-utils_src_configure --with-python
- fi
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use python; then
- python_compile() {
- local CFLAGS=${CFLAGS}
-
- python_is_python3 || CFLAGS+=" -fno-strict-aliasing"
-
- emake "${@}" \
- -C "${BUILD_DIR}"/bindings/python
- }
-
- # help build system find the right objects
- python_foreach_impl python_compile \
- VPATH="${BUILD_DIR}"/bindings/python \
- LIBS="${BUILD_DIR}"/src/libcap-ng.la
- fi
-}
-
-src_test() {
- if [[ "${EUID}" -eq 0 ]]; then
- ewarn "Skipping tests due to root permissions."
- return
- fi
-
- autotools-utils_src_test
-
- if use python; then
- python_foreach_impl \
- autotools-utils_src_compile -C bindings/python check \
- VPATH="${BUILD_DIR}"/bindings/python:"${S}"/bindings/python/test
- fi
-}
-
-src_install() {
- autotools-utils_src_install
-
- if use python; then
- python_foreach_impl \
- autotools-utils_src_install -C bindings/python \
- VPATH="${BUILD_DIR}"/bindings/python
- fi
-}
diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
deleted file mode 100644
index 703c252..0000000
--- a/sys-libs/libcap-ng/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <longdescription>The libcap-ng library is intended to make programming with
- POSIX capabilities much easier than the traditional libcap library. It
- includes utilities that can analyse all currently running applications and
- print out any capabilities and whether or not it has an open ended bounding
- set.</longdescription>
-</pkgmetadata>
diff --git a/sys-libs/libutempter/files/libutempter-remove-glibc-assumption.patch b/sys-libs/libutempter/files/libutempter-remove-glibc-assumption.patch
deleted file mode 100644
index 6ed9335..0000000
--- a/sys-libs/libutempter/files/libutempter-remove-glibc-assumption.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur libutempter-1.1.6.orig/utempter.c libutempter-1.1.6/utempter.c
---- libutempter-1.1.6.orig/utempter.c 2010-11-04 13:14:53.000000000 -0400
-+++ libutempter-1.1.6/utempter.c 2014-06-20 16:37:09.762403323 -0400
-@@ -34,13 +34,7 @@
- #include <sys/stat.h>
- #include <utmp.h>
-
--#ifdef __GLIBC__
- # include <pty.h>
--#elif defined(__FreeBSD__)
--# include <libutil.h>
--#else
--# error Unsupported platform
--#endif /* __GLIBC__ || __FreeBSD__ */
-
- #define DEV_PREFIX "/dev/"
- #define DEV_PREFIX_LEN (sizeof(DEV_PREFIX)-1)
-@@ -106,17 +100,12 @@
-
- static int
- write_uwtmp_record(const char *user, const char *term, const char *host,
--#ifdef __GLIBC__
- pid_t pid,
--#endif
- int add)
- {
- struct utmp ut;
- struct timeval tv;
--
--#ifdef __GLIBC__
- size_t offset;
--#endif
-
- memset(&ut, 0, sizeof(ut));
-
-@@ -128,8 +117,6 @@
- if (host)
- strncpy(ut.ut_host, host, sizeof(ut.ut_host));
-
--#ifdef __GLIBC__
--
- offset = (strlen(term) <= sizeof(ut.ut_id)) ? 0 :
- strlen(term) - sizeof(ut.ut_id);
- strncpy(ut.ut_id, term + offset, sizeof(ut.ut_id));
-@@ -156,27 +143,6 @@
-
- (void) updwtmp(_PATH_WTMP, &ut);
-
--#elif defined(__FreeBSD__)
--
-- ut.ut_time = tv.tv_sec;
--
-- if (add)
-- {
-- login(&ut);
-- } else
-- {
-- if (logout(term) != 1)
-- {
--#ifdef UTEMPTER_DEBUG
-- fprintf(stderr, "utempter: logout: %s\n",
-- strerror(errno));
--#endif
-- exit(EXIT_FAILURE);
-- }
-- }
--
--#endif /* __GLIBC__ || __FreeBSD__ */
--
- #ifdef UTEMPTER_DEBUG
- fprintf(stderr,
- "utempter: DEBUG: utmp/wtmp record %s for terminal '%s'\n",
-@@ -255,8 +221,6 @@
- validate_device(device);
-
- return write_uwtmp_record(pw->pw_name, device + DEV_PREFIX_LEN, host,
--#ifdef __GLIBC__
- pid,
--#endif
- add);
- }
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r99.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r99.ebuild
deleted file mode 100644
index e4049be..0000000
--- a/sys-libs/libutempter/libutempter-1.1.6-r99.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libutempter/libutempter-1.1.6-r2.ebuild,v 1.1 2014/05/06 12:52:04 chainsaw Exp $
-
-EAPI="4"
-
-inherit eutils user multilib flag-o-matic
-
-DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info, which need root access"
-HOMEPAGE="http://altlinux.org/index.php?module=sisyphus&package=libutempter"
-SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="static-libs elibc_FreeBSD"
-
-RDEPEND="!sys-apps/utempter"
-
-pkg_setup() {
- enewgroup utmp 406
-}
-
-src_prepare() {
- local args=(
- -e "/^libdir /s:/usr/lib:${EPREFIX}/usr/$(get_libdir):"
- -e '/^libexecdir /s:=.*:= $(libdir)/misc:'
- -e '/^CFLAGS = $(RPM_OPT_FLAGS)/d'
- -e 's:,-stats::'
- -e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
- -e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
- )
- use static-libs || args+=(
- -e '/^STATICLIB/d'
- -e '/INSTALL.*STATICLIB/d'
- )
- sed -i "${args[@]}" Makefile || die
-
- epatch "${FILESDIR}"/${PN}-remove-glibc-assumption.patch
-}
-
-src_configure() {
- use elibc_FreeBSD && append-libs -lutil
- tc-export AR CC
-}
-
-src_compile() {
- emake LDLIBS="${LIBS}"
-}
-
-src_install() {
- default
-
- if ! use prefix ; then
- fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
- fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
- fi
- dodir /usr/sbin
- dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
-}
-
-pkg_postinst() {
- if [ -f "${EROOT}/var/log/wtmp" ] ; then
- chown root:utmp "${EROOT}/var/log/wtmp"
- chmod 664 "${EROOT}/var/log/wtmp"
- fi
-
- if [ -f "${EROOT}/var/run/utmp" ] ; then
- chown root:utmp "${EROOT}/var/run/utmp"
- chmod 664 "${EROOT}/var/run/utmp"
- fi
-}
diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
deleted file mode 100644
index 5aafc10..0000000
--- a/sys-libs/libutempter/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>base-system</herd>
- <herd>x11</herd>
-</pkgmetadata>
diff --git a/sys-libs/pam/files/pam-1.1.8-doc-install.patch b/sys-libs/pam/files/pam-1.1.8-doc-install.patch
deleted file mode 100644
index bdd5b9d..0000000
--- a/sys-libs/pam/files/pam-1.1.8-doc-install.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-https://bugs.gentoo.org/473650
-https://fedorahosted.org/linux-pam/ticket/31
-
-fix doc installs when doing out of tree builds
-
---- a/doc/adg/Makefile.in
-+++ b/doc/adg/Makefile.in
-@@ -463,17 +463,17 @@ install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
-- test -f html/Linux-PAM_ADG.html || exit 0; \
-+ test -f html/Linux-PAM_ADG.html -o -f $(srcdir)/html/Linux-PAM_ADG.html || exit 0; \
- $(install_sh_DATA) html/Linux-PAM_ADG.html html/adg-*.html \
- $(DESTDIR)$(htmldir)/ || \
- $(install_sh_DATA) $(srcdir)/html/Linux-PAM_ADG.html \
-- $(srcdir)/html/sag-*.html \
-+ $(srcdir)/html/adg-*.html \
- $(DESTDIR)$(htmldir)/
-- test -f Linux-PAM_ADG.txt || exit 0; \
-+ test -f Linux-PAM_ADG.txt -o -f $(srcdir)/Linux-PAM_ADG.txt || exit 0; \
- $(install_sh_DATA) Linux-PAM_ADG.txt $(DESTDIR)$(docdir)/ || \
- $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.txt \
- $(DESTDIR)$(docdir)/
-- test -f Linux-PAM_ADG.pdf || exit 0; \
-+ test -f Linux-PAM_ADG.pdf -o -f $(srcdir)/Linux-PAM_ADG.pdf || exit 0; \
- $(install_sh_DATA) Linux-PAM_ADG.pdf $(DESTDIR)$(pdfdir)/ || \
- $(install_sh_DATA) $(srcdir)/Linux-PAM_ADG.pdf \
- $(DESTDIR)$(pdfdir)/
-@@ -486,18 +486,18 @@ uninstall-local:
-
- releasedocs: all
- $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html
-- test -f html/Linux-PAM_ADG.html || exit 0; \
-+ test -f html/Linux-PAM_ADG.html -o -f $(srcdir)/html/Linux-PAM_ADG.html || exit 0; \
- cp -ap html/Linux-PAM_ADG.html html/adg-*.html \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/ || \
- cp -ap $(srcdir)/html/Linux-PAM_ADG.html \
- $(srcdir)/html/adg-*.html \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/html/
-- test -f Linux-PAM_ADG.txt || exit 0; \
-+ test -f Linux-PAM_ADG.txt -o -f $(srcdir)/Linux-PAM_ADG.txt || exit 0; \
- cp -p Linux-PAM_ADG.txt \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
- cp -p $(srcdir)/Linux-PAM_ADG.txt \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/
-- test -f Linux-PAM_ADG.pdf || exit 0; \
-+ test -f Linux-PAM_ADG.pdf -o -f $(srcdir)/Linux-PAM_ADG.pdf || exit 0; \
- cp -p Linux-PAM_ADG.pdf \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
- cp -p $(srcdir)/Linux-PAM_ADG.pdf \
---- a/doc/mwg/Makefile.in
-+++ b/doc/mwg/Makefile.in
-@@ -463,17 +463,17 @@ install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
-- test -f html/Linux-PAM_MWG.html || exit 0; \
-+ test -f html/Linux-PAM_MWG.html -o -f $(srcdir)/html/Linux-PAM_MWG.html || exit 0; \
- $(install_sh_DATA) html/Linux-PAM_MWG.html html/mwg-*.html \
- $(DESTDIR)$(htmldir)/ || \
- $(install_sh_DATA) $(srcdir)/html/Linux-PAM_MWG.html \
-- $(srcdir)/html/sag-*.html \
-+ $(srcdir)/html/mwg-*.html \
- $(DESTDIR)$(htmldir)/
-- test -f Linux-PAM_MWG.txt || exit 0; \
-+ test -f Linux-PAM_MWG.txt -o -f $(srcdir)/Linux-PAM_MWG.txt || exit 0; \
- $(install_sh_DATA) Linux-PAM_MWG.txt $(DESTDIR)$(docdir)/ || \
- $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.txt \
- $(DESTDIR)$(docdir)/
-- test -f Linux-PAM_MWG.pdf || exit 0; \
-+ test -f Linux-PAM_MWG.pdf -o -f $(srcdir)/Linux-PAM_MWG.pdf || exit 0; \
- $(install_sh_DATA) Linux-PAM_MWG.pdf $(DESTDIR)$(pdfdir)/ || \
- $(install_sh_DATA) $(srcdir)/Linux-PAM_MWG.pdf \
- $(DESTDIR)$(pdfdir)/
-@@ -486,18 +486,18 @@ uninstall-local:
-
- releasedocs: all
- $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html
-- test -f html/Linux-PAM_MWG.html || exit 0; \
-+ test -f html/Linux-PAM_MWG.html -o -f $(srcdir)/html/Linux-PAM_MWG.html || exit 0; \
- cp -ap html/Linux-PAM_MWG.html html/mwg-*.html \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/ || \
- cp -ap $(srcdir)/html/Linux-PAM_MWG.html \
- $(srcdir)/html/mwg-*.html \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/html/
-- test -f Linux-PAM_MWG.txt || exit 0; \
-+ test -f Linux-PAM_MWG.txt -o -f $(srcdir)/Linux-PAM_MWG.txt || exit 0; \
- cp -p Linux-PAM_MWG.txt \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
- cp -p $(srcdir)/Linux-PAM_MWG.txt \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/
-- test -f Linux-PAM_MWG.pdf || exit 0; \
-+ test -f Linux-PAM_MWG.pdf -o -f $(srcdir)/Linux-PAM_MWG.pdf || exit 0; \
- cp -p Linux-PAM_MWG.pdf \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
- cp -p $(srcdir)/Linux-PAM_MWG.pdf \
---- a/doc/sag/Makefile.in
-+++ b/doc/sag/Makefile.in
-@@ -463,17 +463,17 @@ install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- $(mkinstalldirs) $(DESTDIR)$(pdfdir)
- $(mkinstalldirs) $(DESTDIR)$(htmldir)
-- test -f html/Linux-PAM_SAG.html || exit 0; \
-+ test -f html/Linux-PAM_SAG.html -o -f $(srcdir)/html/Linux-PAM_SAG.html || exit 0; \
- $(install_sh_DATA) html/Linux-PAM_SAG.html html/sag-*.html \
- $(DESTDIR)$(htmldir)/ || \
- $(install_sh_DATA) $(srcdir)/html/Linux-PAM_SAG.html \
- $(srcdir)/html/sag-*.html \
- $(DESTDIR)$(htmldir)/
-- test -f Linux-PAM_SAG.txt || exit 0; \
-+ test -f Linux-PAM_SAG.txt -o -f $(srcdir)/Linux-PAM_SAG.txt || exit 0; \
- $(install_sh_DATA) Linux-PAM_SAG.txt $(DESTDIR)$(docdir)/ || \
- $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.txt \
- $(DESTDIR)$(docdir)/
-- test -f Linux-PAM_SAG.pdf || exit 0; \
-+ test -f Linux-PAM_SAG.pdf -o -f $(srcdir)/Linux-PAM_SAG.pdf || exit 0; \
- $(install_sh_DATA) Linux-PAM_SAG.pdf $(DESTDIR)$(pdfdir)/ || \
- $(install_sh_DATA) $(srcdir)/Linux-PAM_SAG.pdf \
- $(DESTDIR)$(pdfdir)/
-@@ -486,18 +486,18 @@ uninstall-local:
-
- releasedocs: all
- $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html
-- test -f html/Linux-PAM_SAG.html || exit 0; \
-+ test -f html/Linux-PAM_SAG.html -o -f $(srcdir)/html/Linux-PAM_SAG.html || exit 0; \
- cp -ap html/Linux-PAM_SAG.html html/sag-*.html \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/ || \
- cp -ap $(srcdir)/html/Linux-PAM_SAG.html \
- $(srcdir)/html/sag-*.html \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/html/
-- test -f Linux-PAM_SAG.txt || exit 0; \
-+ test -f Linux-PAM_SAG.txt -o -f $(srcdir)/Linux-PAM_SAG.txt || exit 0; \
- cp -p Linux-PAM_SAG.txt \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
- cp -p $(srcdir)/Linux-PAM_SAG.txt \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/
-- test -f Linux-PAM_SAG.pdf || exit 0; \
-+ test -f Linux-PAM_SAG.pdf -o -f $(srcdir)/Linux-PAM_SAG.pdf || exit 0; \
- cp -p Linux-PAM_SAG.pdf \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
- cp -p $(srcdir)/Linux-PAM_SAG.pdf \
diff --git a/sys-libs/pam/files/pam-1.1.8-fix-compat.patch b/sys-libs/pam/files/pam-1.1.8-fix-compat.patch
deleted file mode 100644
index 332f609..0000000
--- a/sys-libs/pam/files/pam-1.1.8-fix-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/modules/pam_lastlog/pam_lastlog.c
-+++ b/modules/pam_lastlog/pam_lastlog.c
-@@ -10,6 +10,7 @@
-
- #include "config.h"
-
-+#include <paths.h>
- #include <fcntl.h>
- #include <time.h>
- #include <errno.h>
-@@ -48,6 +49,10 @@
-
- #ifndef _PATH_BTMP
- # define _PATH_BTMP "/var/log/btmp"
-+#endif
-+
-+#ifndef __GLIBC__
-+#define logwtmp(args...)
- #endif
-
- /* XXX - time before ignoring lock. Is 1 sec enough? */
diff --git a/sys-libs/pam/files/pam-1.1.8-innetgr.patch b/sys-libs/pam/files/pam-1.1.8-innetgr.patch
deleted file mode 100644
index a94fa3d..0000000
--- a/sys-libs/pam/files/pam-1.1.8-innetgr.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- Linux-PAM-1.1.3.orig/modules/pam_group/pam_group.c
-+++ Linux-PAM-1.1.3/modules/pam_group/pam_group.c
-@@ -658,10 +658,13 @@
- continue;
- }
- /* If buffer starts with @, we are using netgroups */
-+#ifdef HAVE_INNETGR
- if (buffer[0] == '@')
- good &= innetgr (&buffer[1], NULL, user, NULL);
- /* otherwise, if the buffer starts with %, it's a UNIX group */
-- else if (buffer[0] == '%')
-+ else
-+#endif
-+ if (buffer[0] == '%')
- good &= pam_modutil_user_in_group_nam_nam(pamh, user, &buffer[1]);
- else
- good &= logic_field(pamh,user, buffer, count, is_same);
---- Linux-PAM-1.1.3.orig/modules/pam_succeed_if/pam_succeed_if.c
-+++ Linux-PAM-1.1.3/modules/pam_succeed_if/pam_succeed_if.c
-@@ -233,16 +233,20 @@
- static int
- evaluate_innetgr(const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- if (innetgr(group, host, user, NULL) == 1)
- return PAM_SUCCESS;
-+#endif
- return PAM_AUTH_ERR;
- }
- /* Return PAM_SUCCESS if the (host,user) is NOT in the netgroup. */
- static int
- evaluate_notinnetgr(const char *host, const char *user, const char *group)
- {
-+#ifdef HAVE_INNETGR
- if (innetgr(group, host, user, NULL) == 0)
- return PAM_SUCCESS;
-+#endif
- return PAM_AUTH_ERR;
- }
-
---- Linux-PAM-1.1.3.orig/modules/pam_time/pam_time.c
-+++ Linux-PAM-1.1.3/modules/pam_time/pam_time.c
-@@ -554,9 +554,11 @@
- continue;
- }
- /* If buffer starts with @, we are using netgroups */
-+#ifdef HAVE_INNETGR
- if (buffer[0] == '@')
- good &= innetgr (&buffer[1], NULL, user, NULL);
- else
-+#endif
- good &= logic_field(pamh, user, buffer, count, is_same);
- D(("with user: %s", good ? "passes":"fails" ));
-
diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
deleted file mode 100644
index 4ee5aec..0000000
--- a/sys-libs/pam/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>pam</herd>
- <maintainer>
- <email>pam-bugs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
-
- <flag name="berkdb">
- Build the pam_userdb module, that allows to authenticate users
- against a Berkeley DB file. Please note that enabling this USE
- flag will create a PAM module that links to the Berkeley DB (as
- provided by <pkg>sys-libs/db</pkg>) installed in /usr/lib and
- will thus not work for boot-critical services authentication.
- </flag>
-
- <flag name="cracklib">
- Build the pam_cracklib module, that allows to verify the chosen
- passwords' strength through the use of
- <pkg>sys-libs/cracklib</pkg>. Please note that simply enabling
- the USE flag on this package will not make use of pam_cracklib
- by default, you should also enable it in
- <pkg>sys-auth/pambase</pkg> as well as update your configuration
- files.
- </flag>
- </use>
- <upstream>
- <remote-id type="cpe">cpe:/a:kernel:linux-pam</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-libs/pam/pam-1.1.8-r99.ebuild b/sys-libs/pam/pam-1.1.8-r99.ebuild
deleted file mode 100644
index 4b3c659..0000000
--- a/sys-libs/pam/pam-1.1.8-r99.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-HOMEPAGE="https://fedorahosted.org/linux-pam/"
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-
-SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
- http://www.linux-pam.org/documentation/${MY_P}-docs.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_musl elibc_glibc debug berkdb nis"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
- audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
- elibc_glibc? (
- >=sys-libs/glibc-2.7
- nis? ( || ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] <sys-libs/glibc-2.14 ) )
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2
- >=sys-devel/flex-2.5.39-r1[${MULTILIB_USEDEP}]
- nls? ( sys-devel/gettext )
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-PDEPEND="sys-auth/pambase
- vim-syntax? ( app-vim/pam-syntax )"
-RDEPEND="${RDEPEND}
- !<sys-apps/openrc-0.11.8
- !sys-auth/openpam
- !sys-auth/pam_userdb
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-check_old_modules() {
- local retval="0"
-
- if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
- eerror ""
- eerror "Your current setup is using the pam_stack module."
- eerror "This module is deprecated and no longer supported, and since version"
- eerror "0.99 is no longer installed, nor provided by any other package."
- eerror "The package will be built (to allow binary package builds), but will"
- eerror "not be installed."
- eerror "Please replace pam_stack usage with proper include directive usage,"
- eerror "following the PAM Upgrade guide at the following URL"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
-
- retval=1
- fi
-
- if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
- eerror ""
- eerror "Your current setup is using one or more of the following modules,"
- eerror "that are not built or supported anymore:"
- eerror "pam_pwdb, pam_console"
- eerror "If you are in real need for these modules, please contact the maintainers"
- eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
- eerror "use cases."
- eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
- eerror " http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
- eerror ""
-
- retval=1
- fi
-
- return $retval
-}
-
-pkg_pretend() {
- # do not error out, this is just a warning, one could build a binpkg
- # with old modules enabled.
- check_old_modules
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.8-doc-install.patch #473650
- epatch "${FILESDIR}"/${PN}-1.1.8-fix-compat.patch
- epatch "${FILESDIR}"/${PN}-1.1.8-innetgr.patch
-
- # disable insecure modules (musl-libc doesn't implement the functions anyway)
- use elibc_musl && sed -e 's/pam_rhosts//g' -i modules/Makefile.am modules/Makefile.in
- elibtoolize
-}
-
-multilib_src_configure() {
- # Disable automatic detection of libxcrypt; we _don't_ want the
- # user to link libxcrypt in by default, since we won't track the
- # dependency and allow to break PAM this way.
- export ac_cv_header_xcrypt_h=no
-
- # Disable automatic detection of libcrypt
- use elibc_musl && export ac_cv_search_crypt=no
-
- local myconf=(
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --enable-securedir="${EPREFIX}"/$(get_libdir)/security
- --enable-isadir="${EPREFIX}"/$(get_libdir)/security
- $(use_enable nls)
- $(use_enable selinux)
- $(use_enable cracklib)
- $(use_enable audit)
- $(use_enable debug)
- $(use_enable berkdb db)
- $(use_enable nis)
- --with-db-uniquename=-$(db_findver sys-libs/db)
- --disable-prelude
- )
-
- if use hppa || use elibc_FreeBSD; then
- myconf+=( --disable-pie )
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- emake sepermitlockdir="${EPREFIX}/run/sepermit"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install \
- sepermitlockdir="${EPREFIX}/run/sepermit"
-
- local prefix
- if multilib_is_native_abi; then
- prefix=
- gen_usr_ldscript -a pam pamc pam_misc
- else
- prefix=/usr
- fi
-
- # create extra symlinks just in case something depends on them...
- local lib
- for lib in pam pamc pam_misc; do
- if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then
- dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname)
- fi
- done
-}
-
-DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS )
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- # Need to be suid
- fperms u+s /sbin/unix_chkpwd
-
- docinto modules
- for dir in modules/pam_*; do
- newdoc "${dir}"/README README."$(basename "${dir}")"
- done
-
- if use selinux; then
- dodir /usr/lib/tmpfiles.d
- cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
- fi
-}
-
-pkg_preinst() {
- check_old_modules || die "deprecated PAM modules still used"
-}
-
-pkg_postinst() {
- ewarn "Some software with pre-loaded PAM libraries might experience"
- ewarn "warnings or failures related to missing symbols and/or versions"
- ewarn "after any update. While unfortunate this is a limit of the"
- ewarn "implementation of PAM and the software, and it requires you to"
- ewarn "restart the software manually after the update."
- ewarn ""
- ewarn "You can get a list of such software running a command like"
- ewarn " lsof / | egrep -i 'del.*libpam\\.so'"
- ewarn ""
- ewarn "Alternatively, simply reboot your system."
- if [[ -x "${EROOT}"/var/log/tallylog ]] ; then
- elog ""
- elog "Because of a bug present up to version 1.1.1-r2, you have"
- elog "an executable /var/log/tallylog file. You can safely"
- elog "correct it by running the command"
- elog " chmod -x /var/log/tallylog"
- elog ""
- fi
-}
diff --git a/sys-libs/readline/files/readline-5.0-no_rpath.patch b/sys-libs/readline/files/readline-5.0-no_rpath.patch
deleted file mode 100644
index 624b2d7..0000000
--- a/sys-libs/readline/files/readline-5.0-no_rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-ripped from Fedora
-
---- support/shobj-conf
-+++ support/shobj-conf
-@@ -102,7 +102,7 @@
- SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
-
-- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
-+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
- SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
- ;;
-
diff --git a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch b/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
deleted file mode 100644
index fc63491..0000000
--- a/sys-libs/readline/files/readline-5.2-no-ignore-shlib-errors.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-dont ignore errors in the shlib subdir
-
-http://bugs.gentoo.org/216952
-
---- Makefile.in
-+++ Makefile.in
-@@ -194,7 +194,7 @@
-
- shared: force
- -test -d shlib || mkdir shlib
-- -( cd shlib ; ${MAKE} ${MFLAGS} all )
-+ ( cd shlib ; ${MAKE} ${MFLAGS} all )
-
- documentation: force
- -test -d doc || mkdir doc
-@@ -238,7 +238,7 @@
- -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
-
- install-shared: installdirs install-headers shared install-doc
-- -( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
-+ ( cd shlib ; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} install )
-
- uninstall-shared: maybe-uninstall-headers
- -( cd shlib; ${MAKE} ${MFLAGS} DESTDIR=${DESTDIR} uninstall )
diff --git a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch b/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
deleted file mode 100644
index b898bf0..0000000
--- a/sys-libs/readline/files/readline-6.2-rlfe-tgoto.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/385091
-
-https://lists.gnu.org/archive/html/bug-readline/2011-10/msg00000.html
-
---- a/examples/rlfe/configure
-+++ b/examples/rlfe/configure
-@@ -4062,6 +4062,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+extern char *tgoto(char *, int, int);
- main()
- {
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-libs/readline/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-libs/readline/readline-6.2_p4-r99.ebuild b/sys-libs/readline/readline-6.2_p4-r99.ebuild
deleted file mode 100644
index 54df6a4..0000000
--- a/sys-libs/readline/readline-6.2_p4-r99.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p4.ebuild,v 1.2 2013/02/17 23:40:35 zmedico Exp $
-
-inherit eutils multilib toolchain-funcs flag-o-matic
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- [[ ${PLEVEL} -eq 0 ]] && return 1
- local opt=$1
- eval set -- {1..${PLEVEL}}
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- cd "${S}"
- sed -i -e 's:sgtty:termios:' examples/rlfe/os.h
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
-
- # force ncurses linking #71420
- sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
-
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
- # objformat for years, so we don't want to rely on that.
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
- ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_compile() {
- # fix implicit decls with widechar funcs
- append-cppflags -D_GNU_SOURCE
- # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change
- # so we can re-use the config cache file between the two.
- append-ldflags -L.
- econf \
- --cache-file="${S}"/config.cache \
- --with-curses \
- $(use_enable static-libs static)
- emake || die
-
- if ! tc-is-cross-compiler ; then
- # code is full of AC_TRY_RUN()
- cd examples/rlfe
- local l
- for l in readline history ; do
- ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
- ln -sf ../../lib${l}.a lib${l}.a
- done
- econf --cache-file="${S}"/config.cache
- emake || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- gen_usr_ldscript -a readline history #4411
-
- if ! tc-is-cross-compiler; then
- dobin examples/rlfe/rlfe || die
- fi
-
- dodoc CHANGELOG CHANGES README USAGE NEWS
- docinto ps
- dodoc doc/*.ps
- dohtml -r doc
-}
-
-pkg_preinst() {
- preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
-}
diff --git a/sys-libs/readline/readline-6.2_p5-r99.ebuild b/sys-libs/readline/readline-6.2_p5-r99.ebuild
deleted file mode 100644
index ee13305..0000000
--- a/sys-libs/readline/readline-6.2_p5-r99.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p5-r1.ebuild,v 1.14 2014/07/18 10:56:45 pacho Exp $
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- [[ ${PLEVEL} -eq 0 ]] && return 1
- local opt=$1
- eval set -- {1..${PLEVEL}}
- set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
- printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
- done
- fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r7
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
- sed -i -e 's:sgtty:termios:' examples/rlfe/os.h # For musl
- [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
- epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
- epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
- epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-
- # Force ncurses linking. #71420
- # Use pkg-config to get the right values. #457558
- local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
- sed -i \
- -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
- support/shobj-conf || die
- sed -i \
- -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
- examples/rlfe/configure || die
-
- # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
- # objformat for years, so we don't want to rely on that.
- sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
- ln -s ../.. examples/rlfe/readline # for local readline headers
-}
-
-src_configure() {
- # fix implicit decls with widechar funcs
- append-cppflags -D_GNU_SOURCE
- # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
- append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
- # Make sure configure picks a better ar than `ar`. #484866
- export ac_cv_prog_AR=$(tc-getAR)
-
- # Force the test since we used sed above to force it.
- export bash_cv_termcap_lib=ncurses
-
- # This is for rlfe, but we need to make sure LDFLAGS doesn't change
- # so we can re-use the config cache file between the two.
- append-ldflags -L.
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --cache-file="${BUILD_DIR}"/config.cache \
- --with-curses \
- $(use_enable static-libs static)
-
- if multilib_is_native_abi && ! tc-is-cross-compiler ; then
- # code is full of AC_TRY_RUN()
- mkdir -p examples/rlfe || die
- cd examples/rlfe || die
- ECONF_SOURCE=${S}/examples/rlfe \
- econf --cache-file="${BUILD_DIR}"/config.cache
- fi
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi && ! tc-is-cross-compiler ; then
- # code is full of AC_TRY_RUN()
- cd examples/rlfe || die
- local l
- for l in readline history ; do
- ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
- ln -sf ../../lib${l}.a lib${l}.a
- done
- emake
- fi
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi ; then
- gen_usr_ldscript -a readline history #4411
-
- if ! tc-is-cross-compiler; then
- dobin examples/rlfe/rlfe
- fi
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- dodoc USAGE
- dohtml -r doc/.
- docinto ps
- dodoc doc/*.ps
-}
-
-pkg_preinst() {
- preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
-}
diff --git a/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch b/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch
deleted file mode 100644
index f872ef5..0000000
--- a/sys-libs/talloc/files/talloc-remove-check-bsd-strtoll.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur talloc-2.1.0.orig/lib/replace/wscript talloc-2.1.0/lib/replace/wscript
---- talloc-2.1.0.orig/lib/replace/wscript 2013-09-08 12:24:14.000000000 +0000
-+++ talloc-2.1.0/lib/replace/wscript 2014-02-22 19:46:36.033471201 +0000
-@@ -272,20 +272,6 @@
-
- #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
- #Let's detect those cases
-- if conf.CONFIG_SET('HAVE_STRTOLL'):
-- conf.CHECK_CODE('''
-- long long nb = strtoll("Text", NULL, 0);
-- if (errno == EINVAL) {
-- return 0;
-- } else {
-- return 1;
-- }
-- ''',
-- msg="Checking correct behavior of strtoll",
-- headers = 'errno.h',
-- execute = True,
-- define = 'HAVE_BSD_STRTOLL',
-- )
- conf.CHECK_FUNCS('if_nametoindex strerror_r')
- conf.CHECK_FUNCS('getdirentries getdents syslog')
- conf.CHECK_FUNCS('gai_strerror get_current_dir_name')
diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
deleted file mode 100644
index be0176a..0000000
--- a/sys-libs/talloc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>samba</herd>
- <maintainer>
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
- <use>
- <flag name="compat">Enable extra compatibility stuff</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-libs/talloc/talloc-2.0.8-r99.ebuild b/sys-libs/talloc/talloc-2.0.8-r99.ebuild
deleted file mode 100644
index d1d81f0..0000000
--- a/sys-libs/talloc/talloc-2.0.8-r99.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.8-r1.ebuild,v 1.3 2013/08/25 20:01:47 maekke Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-
-inherit eutils waf-utils python-single-r1 multilib
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="http://talloc.samba.org/"
-SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="compat python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- || ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_configure() {
- local extra_opts=""
-
- use compat && extra_opts+=" --enable-talloc-compat1"
- use python || extra_opts+=" --disable-python"
- waf-utils_src_configure \
- ${extra_opts}
-}
-
-src_install() {
- waf-utils_src_install
-
- # waf is stupid, and no, we can't fix the build-system, since it's provided
- # as a brilliant binary blob thats decompressed on the fly
- if [[ ${CHOST} == *-darwin* ]] ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
- if use python ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"$(python_get_sitedir)/talloc.bundle || die
- fi
- fi
-}
diff --git a/sys-libs/talloc/talloc-2.1.0-r99.ebuild b/sys-libs/talloc/talloc-2.1.0-r99.ebuild
deleted file mode 100644
index 41645cd..0000000
--- a/sys-libs/talloc/talloc-2.1.0-r99.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.1.0.ebuild,v 1.4 2014/02/02 17:40:57 vostorga Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-
-inherit eutils waf-utils python-single-r1 multilib
-
-DESCRIPTION="Samba talloc library"
-HOMEPAGE="http://talloc.samba.org/"
-SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="compat +python"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !!<sys-libs/talloc-2.0.5"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- || ( dev-lang/python:2.7[threads] dev-lang/python:2.6[threads] )"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_configure() {
- local extra_opts=""
-
- use compat && extra_opts+=" --enable-talloc-compat1"
- use python || extra_opts+=" --disable-python"
- waf-utils_src_configure \
- ${extra_opts}
-}
-
-src_install() {
- waf-utils_src_install
-
- # waf is stupid, and no, we can't fix the build-system, since it's provided
- # as a brilliant binary blob thats decompressed on the fly
- if [[ ${CHOST} == *-darwin* ]] ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
- if use python ; then
- install_name_tool \
- -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
- install_name_tool \
- -change "${S}/bin/default/libtalloc.dylib" \
- "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
- "${ED}"$(python_get_sitedir)/talloc.bundle || die
- fi
- fi
-}
diff --git a/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch b/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch
deleted file mode 100644
index 8108209..0000000
--- a/sys-libs/tdb/files/tdb-remove-check-bsd-strtoll.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur tdb-1.2.11.orig/lib/replace/wscript tdb-1.2.11/lib/replace/wscript
---- tdb-1.2.11.orig/lib/replace/wscript 2012-11-30 08:51:31.000000000 +0000
-+++ tdb-1.2.11/lib/replace/wscript 2014-02-23 12:37:58.921617847 +0000
-@@ -215,21 +215,6 @@
-
- #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
- #Let's detect those cases
-- if conf.CONFIG_SET('HAVE_STRTOLL'):
-- conf.CHECK_CODE('''
-- long long nb = strtoll("Text", NULL, 0);
-- if (errno == EINVAL) {
-- return 0;
-- } else {
-- return 1;
-- }
-- ''',
-- msg="Checking correct behavior of strtoll",
-- headers = 'errno.h',
-- execute = True,
-- define_ret = True,
-- define = 'HAVE_BSD_STRTOLL',
-- )
- conf.CHECK_FUNCS('if_nametoindex strerror_r')
- conf.CHECK_FUNCS('getdirentries getdents syslog')
- conf.CHECK_FUNCS('gai_strerror get_current_dir_name')
diff --git a/sys-libs/tdb/metadata.xml b/sys-libs/tdb/metadata.xml
deleted file mode 100644
index eb993d3..0000000
--- a/sys-libs/tdb/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>samba</herd>
- <maintainer>
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-libs/tdb/tdb-1.2.11-r99.ebuild b/sys-libs/tdb/tdb-1.2.11-r99.ebuild
deleted file mode 100644
index ae082f1..0000000
--- a/sys-libs/tdb/tdb-1.2.11-r99.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.11.ebuild,v 1.8 2013/09/06 16:04:59 ago Exp $
-
-EAPI=3
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit waf-utils python
-
-DESCRIPTION="A simple database API"
-HOMEPAGE="http://tdb.samba.org/"
-SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="python"
-
-RDEPEND=""
-DEPEND="|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
- app-text/docbook-xml-dtd:4.2"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_configure() {
- local extra_opts=""
- use python || extra_opts+=" --disable-python"
- waf-utils_src_configure \
- ${extra_opts}
-}
-
-src_test() {
- # the default src_test runs 'make test' and 'make check', letting
- # the tests fail occasionally (reason: unknown)
- emake check || die "emake check failed"
-}
diff --git a/sys-libs/tdb/tdb-1.2.12-r99.ebuild b/sys-libs/tdb/tdb-1.2.12-r99.ebuild
deleted file mode 100644
index 3914093..0000000
--- a/sys-libs/tdb/tdb-1.2.12-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.2.12-r1.ebuild,v 1.1 2013/06/30 16:33:13 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit waf-utils python-single-r1
-
-DESCRIPTION="A simple database API"
-HOMEPAGE="http://tdb.samba.org/"
-SRC_URI="http://samba.org/ftp/tdb/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="
- ${RDEPEND}
- app-text/docbook-xml-dtd:4.2"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_configure() {
- local extra_opts=""
- use python || extra_opts+=" --disable-python"
- waf-utils_src_configure \
- ${extra_opts}
-}
-
-src_test() {
- # the default src_test runs 'make test' and 'make check', letting
- # the tests fail occasionally (reason: unknown)
- emake check
-}
diff --git a/sys-libs/tevent/files/add-py-file-0.9.14.patch b/sys-libs/tevent/files/add-py-file-0.9.14.patch
deleted file mode 100644
index 3270816..0000000
--- a/sys-libs/tevent/files/add-py-file-0.9.14.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- /dev/null
-+++ /tevent.py
-@@ -0,0 +1,29 @@
-+#!/usr/bin/python
-+#
-+# Python integration for tevent
-+#
-+# Copyright (C) Jelmer Vernooij 2011
-+#
-+# ** NOTE! The following LGPL license applies to the tevent
-+# ** library. This does NOT imply that all of Samba is released
-+# ** under the LGPL
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 3 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
-+
-+from _tevent import (
-+ __version__,
-+ backend_list,
-+ Context,
-+ Signal,
-+ )
diff --git a/sys-libs/tevent/files/add-py-file.patch b/sys-libs/tevent/files/add-py-file.patch
deleted file mode 100644
index cd91983..0000000
--- a/sys-libs/tevent/files/add-py-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- /dev/null
-+++ b/tevent.py
-@@ -0,0 +1,29 @@
-+#!/usr/bin/python
-+#
-+# Python integration for tevent
-+#
-+# Copyright (C) Jelmer Vernooij 2011
-+#
-+# ** NOTE! The following LGPL license applies to the tevent
-+# ** library. This does NOT imply that all of Samba is released
-+# ** under the LGPL
-+#
-+# This library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 3 of the License, or (at your option) any later version.
-+#
-+# This library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# Lesser General Public License for more details.
-+#
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with this library; if not, see <http://www.gnu.org/licenses/>.
-+
-+from _tevent import (
-+ __version__,
-+ backend_list,
-+ Context,
-+ Signal,
-+ )
diff --git a/sys-libs/tevent/files/tevent-remove-check-bsd-strtoll.patch b/sys-libs/tevent/files/tevent-remove-check-bsd-strtoll.patch
deleted file mode 100644
index 481f0d4..0000000
--- a/sys-libs/tevent/files/tevent-remove-check-bsd-strtoll.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tevent-0.9.19.orig/lib/replace/wscript tevent-0.9.19/lib/replace/wscript
---- tevent-0.9.19.orig/lib/replace/wscript 2013-06-04 14:21:30.000000000 +0000
-+++ tevent-0.9.19/lib/replace/wscript 2014-02-23 12:01:19.733793736 +0000
-@@ -272,20 +272,6 @@
-
- #Some OS (ie. freebsd) return EINVAL if the convertion could not be done, it's not what we expect
- #Let's detect those cases
-- if conf.CONFIG_SET('HAVE_STRTOLL'):
-- conf.CHECK_CODE('''
-- long long nb = strtoll("Text", NULL, 0);
-- if (errno == EINVAL) {
-- return 0;
-- } else {
-- return 1;
-- }
-- ''',
-- msg="Checking correct behavior of strtoll",
-- headers = 'errno.h',
-- execute = True,
-- define = 'HAVE_BSD_STRTOLL',
-- )
- conf.CHECK_FUNCS('if_nametoindex strerror_r')
- conf.CHECK_FUNCS('getdirentries getdents syslog')
- conf.CHECK_FUNCS('gai_strerror get_current_dir_name')
diff --git a/sys-libs/tevent/files/tevent-version.patch b/sys-libs/tevent/files/tevent-version.patch
deleted file mode 100644
index 2042ec5..0000000
--- a/sys-libs/tevent/files/tevent-version.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/pytevent.c
-+++ b/pytevent.c
-@@ -761,4 +761,6 @@ void init_tevent(void)
-
- Py_INCREF(&TeventFd_Type);
- PyModule_AddObject(m, "Fd", (PyObject *)&TeventFd_Type);
-+
-+ PyModule_AddObject(m, "__version__", PyString_FromString(PACKAGE_VERSION));
- }
---- a/wscript
-+++ b/wscript
-@@ -92,7 +92,14 @@
- 'pytevent.c',
- deps='tevent',
- enabled=True,
-- realname='_tevent.so')
-+ realname='_tevent.so',
-+ cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION)
-+ # install out various python scripts for use by make test
-+ bld.SAMBA_SCRIPT('tevent_python',
-+ pattern='tevent.py',
-+ installdir='python')
-+
-+ bld.INSTALL_WILDCARD('${PYTHONDIR}', 'tevent.py', flat=False)
-
-
- def test(ctx):
diff --git a/sys-libs/tevent/metadata.xml b/sys-libs/tevent/metadata.xml
deleted file mode 100644
index e06ba37..0000000
--- a/sys-libs/tevent/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>samba</herd>
- <maintainer>
- <email>patrick@gentoo.org</email>
- <name>Patrick Lauer</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-libs/tevent/tevent-0.9.19-r99.ebuild b/sys-libs/tevent/tevent-0.9.19-r99.ebuild
deleted file mode 100644
index b5d6060..0000000
--- a/sys-libs/tevent/tevent-0.9.19-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.19.ebuild,v 1.15 2013/09/06 20:08:35 maekke Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit waf-utils python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="http://tevent.samba.org/"
-SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/talloc-2.0.8[python]
- ${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_install() {
- waf-utils_src_install
- python_export PYTHON_SITEDIR
- insinto "${PYTHON_SITEDIR#${EPREFIX}}"
- doins tevent.py
- python_optimize
-}
diff --git a/sys-libs/tevent/tevent-0.9.20-r99.ebuild b/sys-libs/tevent/tevent-0.9.20-r99.ebuild
deleted file mode 100644
index 8b1a9c5..0000000
--- a/sys-libs/tevent/tevent-0.9.20-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.20.ebuild,v 1.2 2013/12/16 08:53:50 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit waf-utils python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="http://tevent.samba.org/"
-SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/talloc-2.1.0[python]
- ${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_install() {
- waf-utils_src_install
- python_export PYTHON_SITEDIR
- insinto "${PYTHON_SITEDIR#${EPREFIX}}"
- doins tevent.py
- python_optimize
-}
diff --git a/sys-libs/tevent/tevent-0.9.21-r99.ebuild b/sys-libs/tevent/tevent-0.9.21-r99.ebuild
deleted file mode 100644
index 89f9e79..0000000
--- a/sys-libs/tevent/tevent-0.9.21-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/tevent/tevent-0.9.21.ebuild,v 1.1 2014/01/18 23:19:27 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit waf-utils python-single-r1
-
-DESCRIPTION="Samba tevent library"
-HOMEPAGE="http://tevent.samba.org/"
-SRC_URI="http://samba.org/ftp/tevent/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/talloc-2.1.0[python]
- ${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-remove-check-bsd-strtoll.patch
-}
-
-src_install() {
- waf-utils_src_install
- python_export PYTHON_SITEDIR
- insinto "${PYTHON_SITEDIR#${EPREFIX}}"
- doins tevent.py
- python_optimize
-}
diff --git a/sys-process/cronie/cronie-1.4.12-r99.ebuild b/sys-process/cronie/cronie-1.4.12-r99.ebuild
deleted file mode 100644
index 026029f..0000000
--- a/sys-process/cronie/cronie-1.4.12-r99.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.12.ebuild,v 1.4 2014/12/30 17:42:09 maekke Exp $
-
-EAPI=5
-
-inherit cron eutils pam systemd user
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
-SRC_URI="https://fedorahosted.org/releases/c/r/cronie/${P}.tar.gz"
-HOMEPAGE="https://fedorahosted.org/cronie/wiki"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="anacron +inotify pam selinux"
-
-DEPEND="pam? ( virtual/pam )
- anacron? ( !sys-process/anacron )"
-RDEPEND="${DEPEND}"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-src_prepare() {
- epatch "${FILESDIR}"/0001-add_limits_h_and_MAXNAMLEN.patch
-}
-
-pkg_setup() {
- enewgroup crontab
-}
-
-src_configure() {
- SPOOL_DIR="/var/spool/cron/crontabs" \
- ANACRON_SPOOL_DIR="/var/spool/anacron" \
- econf \
- $(use_with inotify) \
- $(use_with pam) \
- $(use_with selinux) \
- $(use_enable anacron) \
- --enable-syscrontab \
- --with-daemon_username=cron \
- --with-daemon_groupname=cron
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-
- docrondir -m 1730 -o root -g crontab
- fowners root:crontab /usr/bin/crontab
- fperms 2751 /usr/bin/crontab
-
- insinto /etc/conf.d
- newins "${S}"/crond.sysconfig ${PN}
-
- insinto /etc
- newins "${FILESDIR}/${PN}-1.3-crontab" crontab
- newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
- keepdir /etc/cron.d
- newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
- newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-
- sed s:sysconfig/crond:conf.d/cronie: contrib/cronie.systemd \
- > "${T}"/cronie.service
- systemd_dounit "${T}"/cronie.service
-
- if use anacron ; then
- local anacrondir="/var/spool/anacron"
- keepdir ${anacrondir}
- fowners root:cron ${anacrondir}
- fperms 0750 ${anacrondir}
-
- insinto /etc
-
- doins contrib/anacrontab
-
- insinto /etc/cron.hourly
- doins contrib/0anacron
- fperms 0750 /etc/cron.hourly/0anacron
- fi
-
- dodoc AUTHORS README contrib/*
-}
-
-pkg_postinst() {
- cron_pkg_postinst
-}
diff --git a/sys-process/cronie/files/0001-add_limits_h_and_MAXNAMLEN.patch b/sys-process/cronie/files/0001-add_limits_h_and_MAXNAMLEN.patch
deleted file mode 100644
index fdf721b..0000000
--- a/sys-process/cronie/files/0001-add_limits_h_and_MAXNAMLEN.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/database.c 2015-01-10 13:17:11.253148769 +0000
-+++ src/database.c 2015-01-10 13:18:45.491148769 +0000
-@@ -38,6 +38,12 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#if ! defined(__GLIBC__) && ! defined(__UCLIBC__)
-+#include <limits.h>
-+
-+/* match gnu to posix */
-+#define MAXNAMLEN NAME_MAX
-+#endif
-
- #ifdef WITH_INOTIFY
- # include <sys/inotify.h>
diff --git a/sys-process/cronie/files/cronie-1.2-cron.deny b/sys-process/cronie/files/cronie-1.2-cron.deny
deleted file mode 100644
index f909922..0000000
--- a/sys-process/cronie/files/cronie-1.2-cron.deny
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id: cronie-1.2-cron.deny,v 1.1 2009/02/17 22:09:35 bangert Exp $
-# If for any reason you have users in the 'cron' group who should not
-# be allowed to run crontab, add them to this file (one username per
-# line)
-
diff --git a/sys-process/cronie/files/cronie-1.3-crontab b/sys-process/cronie/files/cronie-1.3-crontab
deleted file mode 100644
index b14eeda..0000000
--- a/sys-process/cronie/files/cronie-1.3-crontab
+++ /dev/null
@@ -1,16 +0,0 @@
-# for cronie
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/cronie-1.3-crontab,v 1.2 2014/04/18 13:24:55 polynomial-c Exp $
-
-# Global variables
-SHELL=/bin/bash
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-MAILTO=root
-HOME=/
-
-# check scripts in cron.hourly, cron.daily, cron.weekly and cron.monthly
-# if anacron is not present
-59 * * * * root [ ! -x /etc/cron.hourly/0anacron ] && rm -f /var/spool/cron/lastrun/cron.hourly
-9 3 * * * root [ ! -x /etc/cron.hourly/0anacron ] && rm -f /var/spool/cron/lastrun/cron.daily
-19 4 * * 6 root [ ! -x /etc/cron.hourly/0anacron ] && rm -f /var/spool/cron/lastrun/cron.weekly
-29 5 1 * * root [ ! -x /etc/cron.hourly/0anacron ] && rm -f /var/spool/cron/lastrun/cron.monthly
-*/10 * * * * root [ ! -x /etc/cron.hourly/0anacron ] && { test -x /usr/sbin/run-crons && /usr/sbin/run-crons ; }
diff --git a/sys-process/cronie/files/cronie-1.3-initd b/sys-process/cronie/files/cronie-1.3-initd
deleted file mode 100644
index 138530f..0000000
--- a/sys-process/cronie/files/cronie-1.3-initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/cronie-1.3-initd,v 1.3 2014/03/04 00:17:58 polynomial-c Exp $
-
-command="/usr/sbin/crond"
-command_args="${CRONDARGS}"
-pidfile="/var/run/crond.pid"
-
-depend() {
- use clock logger
- need localmount
- provide cron
-}
diff --git a/sys-process/cronie/files/cronie-1.4.3-pamd b/sys-process/cronie/files/cronie-1.4.3-pamd
deleted file mode 100644
index e82be8d..0000000
--- a/sys-process/cronie/files/cronie-1.4.3-pamd
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# The PAM configuration file for the cron daemon
-#
-#
-auth include system-auth
-account required pam_access.so
-account include system-auth
-session required pam_loginuid.so
-session include system-auth
diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
deleted file mode 100644
index 79ee246..0000000
--- a/sys-process/cronie/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>cron</herd>
-<maintainer>
- <email>polynomial-c@gentoo.org</email>
- <name>Lars Wendler</name>
-</maintainer>
- <longdescription lang="en">
- Cronie contains the standard UNIX daemon crond that runs specified programs at
- scheduled times and related tools. It is based on the original cron and
- has security and configuration enhancements like the ability to use pam and
- SELinux.
- And why cronie? See http://www.urbandictionary.com/define.php?term=cronie
- </longdescription>
- <use>
- <flag name='anacron'>Install the periodic anacron command scheduler.</flag>
- <flag name='inotify'>Enable inotify filesystem monitoring support.</flag>
- </use>
-</pkgmetadata>
diff --git a/sys-process/lsof/files/lsof-4.85-arg.c.patch b/sys-process/lsof/files/lsof-4.85-arg.c.patch
deleted file mode 100644
index 98838cd..0000000
--- a/sys-process/lsof/files/lsof-4.85-arg.c.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-arg.c.patch Patches: lsof_4.85_src/arg.c
-
- Importance: major for all dialects supporting
- the +|-e option (e.g., Linux)
-
- Function: this patch corrects a bug in the
- accumulation of multiple +|-e
- option values
-
-*** /tmp/T0iAaaeo Thu Oct 20 14:08:43 2011
---- arg.c Thu Oct 20 14:03:49 2011
-***************
-*** 778,785 ****
- ep->pathl = i;
- ep->rdlnk = rdlnk;
- ep->mp = (struct mounts *)NULL;
-! if (!(ep->next = Efsysl))
-! Efsysl = ep;
- return(0);
- }
- #endif /* defined(HASEOPT) */
---- 778,785 ----
- ep->pathl = i;
- ep->rdlnk = rdlnk;
- ep->mp = (struct mounts *)NULL;
-! ep->next = Efsysl;
-! Efsysl = ep;
- return(0);
- }
- #endif /* defined(HASEOPT) */
diff --git a/sys-process/lsof/files/lsof-4.85-cross.patch b/sys-process/lsof/files/lsof-4.85-cross.patch
deleted file mode 100644
index 186c6d8..0000000
--- a/sys-process/lsof/files/lsof-4.85-cross.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-let the preprocessor work its magic rather than executing the code
-
-https://bugs.gentoo.org/432120
-
---- a/Configure
-+++ b/Configure
-@@ -2730,20 +2730,17 @@ LOCKF_OWNER4
- rm -f ${LSOF_TMPC}.*
- cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
- #include <features.h>
--main() {
-+#undef XXX
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
--printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
-+XXX: __GLIBC__ * 100 + __GLIBC_MINOR__
- #elif defined(__GLIBC__)
--printf("-DGLIBCV=%d00\n",__GLIBC__);
--#else
--printf("\n");
-+XXX: __GLIBC__ * 100
- #endif
--return(0); }
- .LSOF_END_HERE_DOC1
-- $LINUX_CONF_CC ${LSOF_TMPC}.c -I$LSOF_INCLUDE -o ${LSOF_TMPC}.x > /dev/null 2>&1
-+ $LINUX_CONF_CC ${LSOF_TMPC}.c -E -I$LSOF_INCLUDE 2>/dev/null | sed -n '/^XXX:/s|.*:||p' > ${LSOF_TMPC}.x
-- if test -x ${LSOF_TMPC}.x # {
-+ if test -s ${LSOF_TMPC}.x # {
- then
-- LINUX_CLIB=`${LSOF_TMPC}.x`
-+ LINUX_CLIB="-DGLIBCV=$(( `cat ${LSOF_TMPC}.x` ))"
- LSOF_TMP=$?
- else
- LINUX_CLIB=""
diff --git a/sys-process/lsof/files/lsof-4.85-fix-missing-netinet_tcp_h.patch b/sys-process/lsof/files/lsof-4.85-fix-missing-netinet_tcp_h.patch
deleted file mode 100644
index 919c7ae..0000000
--- a/sys-process/lsof/files/lsof-4.85-fix-missing-netinet_tcp_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur lsof_4.85.orig/lsof_4.85_src/lsof.h lsof_4.85/lsof_4.85_src/lsof.h
---- lsof_4.85.orig/lsof_4.85_src/lsof.h 2011-09-07 19:14:10.000000000 +0000
-+++ lsof_4.85/lsof_4.85_src/lsof.h 2014-02-21 19:31:43.322452780 +0000
-@@ -53,6 +53,7 @@
- #include <locale.h>
- # endif /* defined(HASSETLOCALE) */
-
-+#include <netinet/tcp.h>
- #include <netdb.h>
- #include <pwd.h>
- #include <stdio.h>
diff --git a/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch b/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch
deleted file mode 100644
index 1e121cb..0000000
--- a/sys-process/lsof/files/lsof-4.87-remove-glibc-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lsof_4.87_src/dialects/linux/dlsof.h 2015-02-28 22:37:00.731421615 +0000
-+++ b/lsof_4.87_src/dialects/linux/dlsof.h 2015-02-28 22:37:57.585422124 +0000
-@@ -49,12 +49,7 @@
- #include <setjmp.h>
- #include <unistd.h>
- #include <netinet/in.h>
--
--# if defined(GLIBCV) || defined(__UCLIBC__)
- #include <netinet/tcp.h>
--# else /* !defined(GLIBCV) && !defined(__UCLIBC__) */
--#include <linux/tcp.h>
--# endif /* defined(GLIBCV) || defined(__UCLIBC__) */
-
- # if !defined(HASNORPC_H)
- #include <rpc/rpc.h>
\ No newline at end of file
diff --git a/sys-process/lsof/lsof-4.85-r99.ebuild b/sys-process/lsof/lsof-4.85-r99.ebuild
deleted file mode 100644
index 5382919..0000000
--- a/sys-process/lsof/lsof-4.85-r99.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.85-r2.ebuild,v 1.12 2014/01/20 06:40:56 vapier Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
- ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
- ftp://ftp.cerias.purdue.edu/pub/tools/unix/sysutils/lsof/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- rpc? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
- unpack ${A}
- cd ${MY_P}
- unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-missing-netinet_tcp_h.patch #for musl
- epatch "${FILESDIR}"/${P}-arg.c.patch #388555
- epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
- # convert `test -r header.h` into a compile test
- sed -i -r \
- -e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
- -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
- Configure || die
-}
-
-target() { usex kernel_FreeBSD freebsd linux ; }
-src_configure() {
- use static && append-ldflags -static
-
- append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
- append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
- export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
- $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
- # Set LSOF_INCLUDE to a dummy location so the script doesn't poke
- # around in it and mix /usr/include paths with cross-compile/etc.
- touch .neverInv
- LINUX_HASSELINUX=$(usex selinux y n) \
- LSOF_INCLUDE=${T} \
- LSOF_CC=$(tc-getCC) \
- LSOF_AR="$(tc-getAR) rc" \
- LSOF_RANLIB=$(tc-getRANLIB) \
- LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
- ./Configure -n $(target) || die
-}
-
-src_compile() {
- emake DEBUG="" all || die
-}
-
-src_install() {
- dobin lsof || die
-
- if use examples ; then
- insinto /usr/share/lsof/scripts
- doins scripts/* || die
- fi
-
- doman lsof.8 || die
- dodoc 00*
-}
diff --git a/sys-process/lsof/lsof-4.87-r99.ebuild b/sys-process/lsof/lsof-4.87-r99.ebuild
deleted file mode 100644
index dd3753b..0000000
--- a/sys-process/lsof/lsof-4.87-r99.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/lsof/lsof-4.87-r1.ebuild,v 1.13 2014/12/06 16:38:45 ago Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
- ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- rpc? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
- unpack ${A}
- cd ${MY_P}
- unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-4.87-remove-glibc-check.patch #for musl
- epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
- # convert `test -r header.h` into a compile test
- sed -i -r \
- -e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
- -e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
- Configure || die
-}
-
-target() {
- case ${CHOST} in
- *-darwin*) echo darwin ;;
- *-freebsd*) echo freebsd ;;
- *-solaris*) echo solaris ;;
- *-aix*) echo aixgcc ;;
- *) echo linux ;;
- esac
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
- append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
- export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
- $(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
- # Set LSOF_INCLUDE to a dummy location so the script doesn't poke
- # around in it and mix /usr/include paths with cross-compile/etc.
- touch .neverInv
- LINUX_HASSELINUX=$(usex selinux y n) \
- LSOF_INCLUDE=${T} \
- LSOF_CC=$(tc-getCC) \
- LSOF_AR="$(tc-getAR) rc" \
- LSOF_RANLIB=$(tc-getRANLIB) \
- LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
- ./Configure -n $(target) || die
-}
-
-src_compile() {
- emake DEBUG="" all
-}
-
-src_install() {
- dobin lsof
-
- if use examples ; then
- insinto /usr/share/lsof/scripts
- doins scripts/*
- fi
-
- doman lsof.8
- dodoc 00*
-}
-
-pkg_postinst() {
- if [[ ${CHOST} == *-solaris* ]] ; then
- einfo "Note: to use lsof on Solaris you need read permissions on"
- einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
- elif [[ ${CHOST} == *-aix* ]] ; then
- einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
- einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
- fi
-}
diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
deleted file mode 100644
index 49fb858..0000000
--- a/sys-process/lsof/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='rpc'>support looking up RPC service info</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-process/procps/files/procps-3.3.6-error_at_line.patch b/sys-process/procps/files/procps-3.3.6-error_at_line.patch
deleted file mode 100644
index 4329a49..0000000
--- a/sys-process/procps/files/procps-3.3.6-error_at_line.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-ps/display.c:65:7: warning: implicit declaration of function ‘error_at_line’ [-Wimplicit-function-declaration]
-
---- ps/display.c
-+++ ps/display.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <error.h> /* error_at_line */
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
diff --git a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch b/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
deleted file mode 100644
index 0039748..0000000
--- a/sys-process/procps/files/procps-3.3.8-kill-neg-pid.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 396cbc4cf36166217d877e2ff7e0a290758b0bc2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 27 Jun 2013 18:37:17 -0400
-Subject: [PATCH] kill: fix -PID handling
-
-Commit 19b6f48990b02aeca211b480625b95b2033c1017 tried to fix -PID
-handling, but the new logic ends up skipping over the arg. This is
-because getopt increments optind after it processed the -PID (even
-though it was an unknown option). We need to decrement it by one
-so the loop at the end of the code will process it for us.
-
-I also fixed some whitespace errors in that same commit.
-
-URL: http://code.google.com/p/chromium/issues/detail?id=255209
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- skill.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/skill.c b/skill.c
-index fb57305..074c5d7 100644
---- a/skill.c
-+++ b/skill.c
-@@ -390,7 +390,7 @@ static void __attribute__ ((__noreturn__))
- else
- sigopt++;
-
-- opterr=0; /* suppress errors on -123 */
-+ opterr = 0; /* suppress errors on -123 */
- while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1)
- switch (i) {
- case 'l':
-@@ -423,7 +423,9 @@ static void __attribute__ ((__noreturn__))
- xwarnx(_("invalid argument %c"), optopt);
- kill_usage(stderr);
- }
-- loop=0;
-+ /* We need to back off by one since getopt() ate the -PID */
-+ --optind;
-+ loop = 0;
- break;
- default:
- kill_usage(stderr);
---
-1.8.2.1
-
diff --git a/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch b/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
deleted file mode 100644
index 09af4208..0000000
--- a/sys-process/procps/files/procps-3.3.8-no-GLOB_TILDE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar procps-ng-3.3.8.orig/sysctl.c procps-ng-3.3.8/sysctl.c
---- procps-ng-3.3.8.orig/sysctl.c 2013-05-25 21:39:41.000000000 +0000
-+++ procps-ng-3.3.8/sysctl.c 2014-01-17 16:28:37.241303653 +0000
-@@ -500,7 +500,7 @@
- int globerr;
- int j;
-
-- globerr = glob(filename, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf);
-+ globerr = glob(filename, GLOB_NOCHECK, NULL, &globbuf);
- if (globerr != 0 && globerr != GLOB_NOMATCH)
- xerr(EXIT_FAILURE, _("glob failed"));
-
diff --git a/sys-process/procps/files/procps-3.3.8-no-error_h.patch b/sys-process/procps/files/procps-3.3.8-no-error_h.patch
deleted file mode 100644
index e6ca793..0000000
--- a/sys-process/procps/files/procps-3.3.8-no-error_h.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur procps-ng-3.3.8.orig/ps/display.c procps-ng-3.3.8/ps/display.c
---- procps-ng-3.3.8.orig/ps/display.c 2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/display.c 2014-01-17 14:43:26.027950754 +0000
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
- case SIGUSR2:
- exit(EXIT_FAILURE);
- default:
-+#if HAVE_ERROR_H
- error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+ err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
- signal(signo, SIG_DFL); /* allow core file creation */
- kill(getpid(), signo);
- }
---- procps-ng-3.3.8.orig/ps/global.c 2013-05-25 21:39:40.000000000 +0000
-+++ procps-ng-3.3.8/ps/global.c 2014-01-17 14:42:00.972945998 +0000
-@@ -25,7 +27,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +529,10 @@
- unsigned int linenum,
- const char *message)
- {
-+#if HAVE_ERROR_H
- error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+ err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
- exit(EXIT_FAILURE);
- }
diff --git a/sys-process/procps/files/procps-3.3.9-configure.patch b/sys-process/procps/files/procps-3.3.9-configure.patch
deleted file mode 100644
index 4822f62..0000000
--- a/sys-process/procps/files/procps-3.3.9-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/procps-ng-3.3.9/configure.ac
-+++ b/procps-ng-3.3.9/configure.ac
-@@ -235,7 +235,9 @@
- else
- AC_SEARCH_LIBS([dlopen], [dl], [],
- [AC_MSG_ERROR([dynamic linking unavailable, circumvent with --disable-numa])])
-- DL_LIB="$ac_cv_search_dlopen"
-+ if test "$ac_cv_search_dlopen" != "none required" ; then
-+ DL_LIB="$ac_cv_search_dlopen"
-+ fi
- fi
- AC_SUBST([DL_LIB])
-
diff --git a/sys-process/procps/files/procps-3.3.9-no-error_h.patch b/sys-process/procps/files/procps-3.3.9-no-error_h.patch
deleted file mode 100644
index 070e1fe..0000000
--- a/sys-process/procps/files/procps-3.3.9-no-error_h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -aur a/procps-ng-3.3.9/lib/nsutils.c b/procps-ng-3.3.9/lib/nsutils.c
---- a/procps-ng-3.3.9/lib/nsutils.c
-+++ b/procps-ng-3.3.9/lib/nsutils.c
-@@ -1,5 +1,4 @@
- #include <errno.h>
--#include <error.h>
- #include <stdio_ext.h>
- #include <stdlib.h>
- #include <sys/types.h>
-diff -aur a/procps-ng-3.3.9/ps/display.c b/procps-ng-3.3.9/ps/display.c
---- a/procps-ng-3.3.9/ps/display.c
-+++ b/procps-ng-3.3.9/ps/display.c
-@@ -25,7 +25,12 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/sysmacros.h>
- #include <sys/types.h>
-@@ -63,7 +68,11 @@
- case SIGUSR2:
- exit(EXIT_FAILURE);
- default:
-+#if HAVE_ERROR_H
- error_at_line(0, 0, __FILE__, __LINE__, "%s", _("please report this bug"));
-+#else
-+ err(1, "%s:%d: %s", __FILE__, __LINE__, _("please report this bug"));
-+#endif
- signal(signo, SIG_DFL); /* allow core file creation */
- kill(getpid(), signo);
- }
-diff -aur a/procps-ng-3.3.9/ps/global.c b/procps-ng-3.3.9/ps/global.c
---- a/procps-ng-3.3.9/ps/global.c
-+++ b/procps-ng-3.3.9/ps/global.c
-@@ -25,7 +25,12 @@
- #include <string.h>
- #include <termios.h>
- #include <unistd.h>
-+
-+#if HAVE_ERROR_H
- #include <error.h>
-+#else
-+#include <err.h>
-+#endif
-
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-@@ -522,6 +527,10 @@
- unsigned int linenum,
- const char *message)
- {
-+#if HAVE_ERROR_H
- error_at_line(0, 0, filename, linenum, "%s", message);
-+#else
-+ err(1, "%s:%d: %s", filename, linenum, message);
-+#endif
- exit(EXIT_FAILURE);
- }
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
deleted file mode 100644
index 16e9fa3..0000000
--- a/sys-process/procps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='ncurses'>Build programs that use ncurses: top, slabtop, watch</flag>
-</use>
-</pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.10-r99.ebuild b/sys-process/procps/procps-3.3.10-r99.ebuild
deleted file mode 100644
index 9c1b4d8..0000000
--- a/sys-process/procps/procps-3.3.10-r99.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.10-r1.ebuild,v 1.1 2014/09/24 06:14:53 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-#FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-#SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
-SRC_URI="http://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86"
-IUSE="+ncurses modern-top nls selinux static-libs systemd test"
-
-RDEPEND="!<sys-apps/sysvinit-2.88-r6
- ncurses? ( >=sys-libs/ncurses-5.7-r7 )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209 )"
-DEPEND="${RDEPEND}
- ncurses? ( virtual/pkgconfig )
- systemd? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
- sed -i -e 's:systemd-login:systemd:' configure || die #501306
-}
-
-src_configure() {
- use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- --disable-watch8bit \
- $(use_enable modern-top) \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable selinux libselinux) \
- $(use_enable static-libs static) \
- $(use_with systemd)
-}
-
-src_install() {
- default
- #dodoc sysctl.conf
-
- mv "${ED}"/usr/bin/pidof "${ED}"/bin/ || die
-
- # The configure script is completely whacked in the head
- mv "${ED}"/lib* "${ED}"/usr/ || die
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.8-r99.ebuild b/sys-process/procps/procps-3.3.8-r99.ebuild
deleted file mode 100644
index 1ed3ba5..0000000
--- a/sys-process/procps/procps-3.3.8-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.8-r1.ebuild,v 1.10 2013/12/26 14:41:10 maekke Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="aecbeeda2ab308f8d09dddcb4cb9a572"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz
- https://gitorious.org/${PN}/${PN}/commit/ce5e995921e770bfcda25e42fe090aeccdbf1291.patch -> ${P}-respect_epipe_in_fileutils.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+ncurses nls static-libs unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )"
-DEPEND="${RDEPEND}
- ncurses? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-kill-neg-pid.patch \
- "${DISTDIR}"/${P}-respect_epipe_in_fileutils.patch \
- "${FILESDIR}"/${P}-no-error_h.patch \
- "${FILESDIR}"/${P}-no-GLOB_TILDE.patch
-}
-
-src_configure() {
- use elibc_musl && export ac_cv_search_dlopen=
- use elibc_musl && append-cflags -D_XOPEN_SOURCE_EXTENDED
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable unicode watch8bit)
-}
-
-src_install() {
- default
-# dodoc sysctl.conf
-
- # The configure script is completely whacked in the head
- mv "${ED}"/lib* "${ED}"/usr/ || die
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
diff --git a/sys-process/procps/procps-3.3.9-r99.ebuild b/sys-process/procps/procps-3.3.9-r99.ebuild
deleted file mode 100644
index 41b08e2..0000000
--- a/sys-process/procps/procps-3.3.9-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.9.ebuild,v 1.6 2014/05/14 18:16:01 ssuominen Exp $
-
-EAPI="4"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="standard informational utilities and process-handling tools"
-# http://packages.debian.org/sid/procps
-HOMEPAGE="http://procps.sourceforge.net/ http://gitorious.org/procps"
-# SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.xz"
-FEDORA_HASH="0980646fa25e0be58f7afb6b98f79d74"
-SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}-ng/${PN}-ng-${PV}.tar.xz/${FEDORA_HASH}/${PN}-ng-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+ncurses nls static-libs test unicode"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.7-r7[unicode?] )
- !<sys-apps/sysvinit-2.88-r6"
-DEPEND="${RDEPEND}
- ncurses? ( virtual/pkgconfig )
- test? ( dev-util/dejagnu )"
-
-S=${WORKDIR}/${PN}-ng-${PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.3.8-kill-neg-pid.patch
- epatch "${FILESDIR}"/${PN}-3.3.8-no-GLOB_TILDE.patch
- epatch "${FILESDIR}"/${P}-no-error_h.patch
- epatch "${FILESDIR}"/${P}-configure.patch
- autoreconf
-}
-
-src_configure() {
- use elibc_musl && append-cppflags -D_XOPEN_SOURCE_EXTENDED
- econf \
- --exec-prefix="${EPREFIX}" \
- --docdir='$(datarootdir)'/doc/${PF} \
- $(use_with ncurses) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable unicode watch8bit)
-}
-
-src_install() {
- default
-# dodoc sysctl.conf
-
- # The configure script is completely whacked in the head
- mv "${ED}"/lib* "${ED}"/usr/ || die
- gen_usr_ldscript -a procps
- prune_libtool_files
-}
diff --git a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch b/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch
deleted file mode 100644
index 6ebb34a..0000000
--- a/sys-process/psmisc/files/psmisc-22.21-add-limits_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur psmisc-22.21.orig/src/pstree.c psmisc-22.21/src/pstree.c
---- psmisc-22.21.orig/src/pstree.c 2013-09-29 05:11:56.000000000 +0000
-+++ psmisc-22.21/src/pstree.c 2014-03-26 13:30:36.000000000 +0000
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <limits.h>
-
- #include "i18n.h"
- #include "comm.h"
diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml
deleted file mode 100644
index 96a2d58..0000000
--- a/sys-process/psmisc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>
diff --git a/sys-process/psmisc/psmisc-22.21-r99.ebuild b/sys-process/psmisc/psmisc-22.21-r99.ebuild
deleted file mode 100644
index f2b097d..0000000
--- a/sys-process/psmisc/psmisc-22.21-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.21.ebuild,v 1.2 2014/01/18 03:51:41 vapier Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
- nls? ( virtual/libintl )
- selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6b
- nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-add-limits_h.patch
-}
-
-src_configure() {
- econf \
- $(use_enable selinux) \
- --disable-harden-flags \
- $(use_enable ipv6) \
- $(use_enable nls)
-}
-
-src_compile() {
- # peekfd is a fragile crap hack #330631
- nonfatal emake -C src peekfd || touch src/peekfd{.o,}
- emake
-}
-
-src_install() {
- default
-
- use X || rm -f "${ED}"/usr/bin/pstree.x11
-
- [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
- [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
- # fuser is needed by init.d scripts; use * wildcard for #458250
- dodir /bin
- mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
diff --git a/www-client/firefox/files/1130164.patch b/www-client/firefox/files/1130164.patch
deleted file mode 100644
index 2b292f8..0000000
--- a/www-client/firefox/files/1130164.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423173074 -3600
-# Thu Feb 05 22:51:14 2015 +0100
-# Node ID a446b4e607445d1c6faec25b43a5d9b5d45bcacf
-# Parent 89120ad0518fb4932de5b5f466debed68ee787ce
-Bug 1130164 - tools/profiler: Use <stdint.h> types. r=jseward
-
-diff -r 89120ad0518f -r a446b4e60744 tools/profiler/UnwinderThread2.cpp
---- a/tools/profiler/UnwinderThread2.cpp Thu Mar 05 06:04:03 2015 -0500
-+++ b/tools/profiler/UnwinderThread2.cpp Thu Feb 05 22:51:14 2015 +0100
-@@ -470,7 +470,7 @@
- //////////////////////////////////////////////////////////
-
- // This is the interface to LUL.
--typedef struct { u_int64_t pc; u_int64_t sp; } PCandSP;
-+typedef struct { uint64_t pc; uint64_t sp; } PCandSP;
-
- // Forward declaration. Implementation is below.
- static
-@@ -1338,7 +1338,7 @@
- else {
- // We have at least one N and one P entry available.
- // Scan forwards to find the SP of the current P entry
-- u_int64_t sp_cur_P = 0;
-+ uint64_t sp_cur_P = 0;
- unsigned int m = next_P + 1;
- while (1) {
- /* This assertion should hold because in a well formed
-@@ -1349,7 +1349,7 @@
- if (ent.is_ent_hint('Q'))
- break;
- if (ent.is_ent('S')) {
-- sp_cur_P = reinterpret_cast<u_int64_t>(ent.get_tagPtr());
-+ sp_cur_P = reinterpret_cast<uint64_t>(ent.get_tagPtr());
- break;
- }
- m++;
-@@ -1358,7 +1358,7 @@
- if (0) LOG(" P <= last_was_P && sp_cur_P == 0");
- use_P = true;
- } else {
-- u_int64_t sp_cur_N = pairs[next_N].sp;
-+ uint64_t sp_cur_N = pairs[next_N].sp;
- use_P = (sp_cur_P > sp_cur_N);
- if (0) LOGF(" %s <= sps P %p N %p",
- use_P ? "P" : "N", (void*)(intptr_t)sp_cur_P,
-diff -r 89120ad0518f -r a446b4e60744 tools/profiler/local_debug_info_symbolizer.cc
---- a/tools/profiler/local_debug_info_symbolizer.cc Thu Mar 05 06:04:03 2015 -0500
-+++ b/tools/profiler/local_debug_info_symbolizer.cc Thu Feb 05 22:51:14 2015 +0100
-@@ -222,7 +222,7 @@
- debug_info_module = it->second;
- }
-
-- u_int64_t address = frame->instruction - frame->module->base_address();
-+ uint64_t address = frame->instruction - frame->module->base_address();
- Module::Function* function =
- debug_info_module->FindFunctionByAddress(address);
- if (function) {
-@@ -282,7 +282,7 @@
- if (it == symbols_.end()) return NULL;
-
- Module* module = it->second;
-- u_int64_t address = frame->instruction - frame->module->base_address();
-+ uint64_t address = frame->instruction - frame->module->base_address();
- Module::StackFrameEntry* entry =
- module->FindStackFrameEntryByAddress(address);
- if (!entry)
diff --git a/www-client/firefox/files/1130175.patch b/www-client/firefox/files/1130175.patch
deleted file mode 100644
index 8946a56..0000000
--- a/www-client/firefox/files/1130175.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423171460 -3600
-# Thu Feb 05 22:24:20 2015 +0100
-# Node ID af818fbea923d7c026bc8e22a6512f14f788ba56
-# Parent 9c40ffbcf6b32d688abf089f2cce3c85dd8bdb29
-Bug 1130175 - nICEr: avoid sysctl.h include. r=bwc
-
-diff -r 9c40ffbcf6b3 -r af818fbea923 media/mtransport/third_party/nICEr/src/stun/addrs.c
---- a/media/mtransport/third_party/nICEr/src/stun/addrs.c Mon Feb 23 07:39:00 2015 -0500
-+++ b/media/mtransport/third_party/nICEr/src/stun/addrs.c Thu Feb 05 22:24:20 2015 +0100
-@@ -45,13 +45,11 @@
- #include <sys/param.h>
- #include <sys/socket.h>
- #ifndef ANDROID
--#include <sys/sysctl.h>
- #include <sys/syslog.h>
- #else
- #include <syslog.h>
- /* Work around an Android NDK < r8c bug */
- #undef __unused
--#include <linux/sysctl.h>
- #endif
- #ifndef LINUX
- #include <net/if.h>
-@@ -122,6 +120,7 @@
- */
-
- #include <err.h>
-+#include <sys/sysctl.h>
-
- static void stun_rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
- static int stun_grab_addrs(char *name, int addrcount,
diff --git a/www-client/firefox/files/1130710.patch b/www-client/firefox/files/1130710.patch
deleted file mode 100644
index 02c2877..0000000
--- a/www-client/firefox/files/1130710.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423172841 -3600
-# Node ID 48efa200aae98f4b5fced4f1afa4f1b8c8cde9e1
-# Parent 3693f117ad5018927922c92cf5bd9739bc25f394
-Bug 1130710 - xre: Use stdint uint*_t instead of nonstandard __uint*_t. r=bsmedberg
-
-diff --git a/toolkit/xre/nsSigHandlers.cpp b/toolkit/xre/nsSigHandlers.cpp
---- a/toolkit/xre/nsSigHandlers.cpp
-+++ b/toolkit/xre/nsSigHandlers.cpp
-@@ -160,17 +160,17 @@ static void fpehandler(int signum, sigin
- #if defined(__i386__) || defined(__amd64__)
- _STRUCT_FP_CONTROL *ctrl = &uc->uc_mcontext->__fs.__fpu_fcw;
- ctrl->__invalid = ctrl->__denorm = ctrl->__zdiv = ctrl->__ovrfl = ctrl->__undfl = ctrl->__precis = 1;
-
- _STRUCT_FP_STATUS *status = &uc->uc_mcontext->__fs.__fpu_fsw;
- status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl =
- status->__precis = status->__stkflt = status->__errsumm = 0;
-
-- __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr;
-+ uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr;
- *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
- *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
- #endif
- #if defined(LINUX) && !defined(ANDROID)
- ucontext_t *uc = (ucontext_t *)context;
-
- #if defined(__i386__)
-@@ -180,23 +180,23 @@ static void fpehandler(int signum, sigin
- */
- unsigned long int *cw = &uc->uc_mcontext.fpregs->cw;
- *cw |= FPU_EXCEPTION_MASK;
-
- unsigned long int *sw = &uc->uc_mcontext.fpregs->sw;
- *sw &= ~FPU_STATUS_FLAGS;
- #endif
- #if defined(__amd64__)
-- __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd;
-+ uint16_t *cw = &uc->uc_mcontext.fpregs->cwd;
- *cw |= FPU_EXCEPTION_MASK;
-
-- __uint16_t *sw = &uc->uc_mcontext.fpregs->swd;
-+ uint16_t *sw = &uc->uc_mcontext.fpregs->swd;
- *sw &= ~FPU_STATUS_FLAGS;
-
-- __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr;
-+ uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr;
- *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
- *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
- #endif
- #ifdef SOLARIS
- ucontext_t *uc = (ucontext_t *)context;
-
- #if defined(__i386)
-
diff --git a/www-client/firefox/files/basename.patch b/www-client/firefox/files/basename.patch
deleted file mode 100644
index bfbfaea..0000000
--- a/www-client/firefox/files/basename.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423172942 -3600
-# Thu Feb 05 22:49:02 2015 +0100
-# Node ID 5f3abeb6ae6c0512901724428d908f601b9e49d4
-# Parent 2d344ef8da33717224d5a08570dc834ca2254f9f
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1041962
-LulElf: Avoid basename
-
-diff -r 2d344ef8da33 -r 5f3abeb6ae6c tools/profiler/LulElf.cpp
---- a/tools/profiler/LulElf.cpp Sun Feb 01 19:32:36 2015 +0100
-+++ b/tools/profiler/LulElf.cpp Thu Feb 05 22:49:02 2015 +0100
-@@ -611,9 +611,9 @@
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string &filename) {
- // Lots of copies! basename's behavior is less than ideal.
-- char *c_filename = strdup(filename.c_str());
-- string base = basename(c_filename);
-- free(c_filename);
-+ const char *c_filename = filename.c_str();
-+ const char *p = strrchr(c_filename, '/');
-+ string base = p ? p+1 : c_filename;
- return base;
- }
-
diff --git a/www-client/firefox/files/crashreporter.patch b/www-client/firefox/files/crashreporter.patch
deleted file mode 100644
index 719ed0d..0000000
--- a/www-client/firefox/files/crashreporter.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423172597 -3600
-# Thu Feb 05 22:43:17 2015 +0100
-# Node ID df5ec9e5685a52bcd19bbe566c0770daa40f14b1
-# Parent 2d344ef8da33717224d5a08570dc834ca2254f9f
-crashreporter: compile with musl
-
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_server.cc
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_server.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/crash_generation_server.cc Thu Feb 05 22:43:17 2015 +0100
-@@ -28,7 +28,6 @@
- // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include <assert.h>
--#include <dirent.h>
- #include <fcntl.h>
- #include <limits.h>
- #include <poll.h>
-@@ -49,6 +48,8 @@
- #include "common/linux/guid_creator.h"
- #include "common/linux/safe_readlink.h"
-
-+#include <dirent.h>
-+
- static const char kCommandQuit = 'x';
-
- namespace google_breakpad {
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc Thu Feb 05 22:43:17 2015 +0100
-@@ -77,7 +77,7 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
--#include <sys/signal.h>
-+#include <signal.h>
- #include <sys/ucontext.h>
- #include <sys/user.h>
- #include <ucontext.h>
-@@ -418,11 +418,11 @@
- siginfo_t siginfo = {};
- // Mimic a trusted signal to allow tracing the process (see
- // ExceptionHandler::HandleSignal().
-- siginfo.si_code = SI_USER;
-- siginfo.si_pid = getpid();
-- struct ucontext context;
-- getcontext(&context);
-- return HandleSignal(sig, &siginfo, &context);
-+// siginfo.si_code = SI_USER;
-+// siginfo.si_pid = getpid();
-+// struct ucontext context;
-+// getcontext(&context);
-+// return HandleSignal(sig, &siginfo, &context);
- }
-
- // This function may run in a compromised context: see the top of the file.
-@@ -567,7 +567,7 @@
- sys_prctl(PR_SET_DUMPABLE, 1);
-
- CrashContext context;
-- int getcontext_result = getcontext(&context.context);
-+ int getcontext_result = 1;//getcontext(&context.context);
- if (getcontext_result)
- return false;
- #if !defined(__ARM_EABI__)
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.h Thu Feb 05 22:43:17 2015 +0100
-@@ -192,7 +192,7 @@
- struct ucontext context;
- #if !defined(__ARM_EABI__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
-- struct _libc_fpstate float_state;
-+ struct _fpstate float_state;
- #endif
- };
-
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
---- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc Thu Feb 05 22:43:17 2015 +0100
-@@ -174,7 +174,7 @@
- // out: the minidump structure
- // info: the collection of register structures.
- void CPUFillFromUContext(MDRawContextX86 *out, const ucontext *uc,
-- const struct _libc_fpstate* fp) {
-+ const struct _fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
- out->context_flags = MD_CONTEXT_X86_FULL |
-@@ -274,7 +274,7 @@
- }
-
- void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext *uc,
-- const struct _libc_fpstate* fpregs) {
-+ const struct _fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
- out->context_flags = MD_CONTEXT_AMD64_FULL;
-@@ -341,7 +341,7 @@
- }
-
- void CPUFillFromUContext(MDRawContextARM* out, const ucontext* uc,
-- const struct _libc_fpstate* fpregs) {
-+ const struct _fpstate* fpregs) {
- out->context_flags = MD_CONTEXT_ARM_FULL;
-
- out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -1480,7 +1480,7 @@
- const char* path_; // Path to the file where the minidum should be written.
-
- const struct ucontext* const ucontext_; // also from the signal handler
-- const struct _libc_fpstate* const float_state_; // ditto
-+ const struct _fpstate* const float_state_; // ditto
- LinuxDumper* dumper_;
- MinidumpFileWriter minidump_writer_;
- off_t minidump_size_limit_;
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/android/include/stab.h
---- a/toolkit/crashreporter/google-breakpad/src/common/android/include/stab.h Sun Feb 01 19:32:36 2015 +0100
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,100 +0,0 @@
--// Copyright (c) 2012, Google Inc.
--// All rights reserved.
--//
--// Redistribution and use in source and binary forms, with or without
--// modification, are permitted provided that the following conditions are
--// met:
--//
--// * Redistributions of source code must retain the above copyright
--// notice, this list of conditions and the following disclaimer.
--// * Redistributions in binary form must reproduce the above
--// copyright notice, this list of conditions and the following disclaimer
--// in the documentation and/or other materials provided with the
--// distribution.
--// * Neither the name of Google Inc. nor the names of its
--// contributors may be used to endorse or promote products derived from
--// this software without specific prior written permission.
--//
--// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
--#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
--
--#include <sys/cdefs.h>
--
--#ifdef __BIONIC_HAVE_STAB_H
--#include <stab.h>
--#else
--
--#ifdef __cplusplus
--extern "C" {
--#endif // __cplusplus
--
--#define _STAB_CODE_LIST \
-- _STAB_CODE_DEF(UNDF,0x00) \
-- _STAB_CODE_DEF(GSYM,0x20) \
-- _STAB_CODE_DEF(FNAME,0x22) \
-- _STAB_CODE_DEF(FUN,0x24) \
-- _STAB_CODE_DEF(STSYM,0x26) \
-- _STAB_CODE_DEF(LCSYM,0x28) \
-- _STAB_CODE_DEF(MAIN,0x2a) \
-- _STAB_CODE_DEF(PC,0x30) \
-- _STAB_CODE_DEF(NSYMS,0x32) \
-- _STAB_CODE_DEF(NOMAP,0x34) \
-- _STAB_CODE_DEF(OBJ,0x38) \
-- _STAB_CODE_DEF(OPT,0x3c) \
-- _STAB_CODE_DEF(RSYM,0x40) \
-- _STAB_CODE_DEF(M2C,0x42) \
-- _STAB_CODE_DEF(SLINE,0x44) \
-- _STAB_CODE_DEF(DSLINE,0x46) \
-- _STAB_CODE_DEF(BSLINE,0x48) \
-- _STAB_CODE_DEF(BROWS,0x48) \
-- _STAB_CODE_DEF(DEFD,0x4a) \
-- _STAB_CODE_DEF(EHDECL,0x50) \
-- _STAB_CODE_DEF(MOD2,0x50) \
-- _STAB_CODE_DEF(CATCH,0x54) \
-- _STAB_CODE_DEF(SSYM,0x60) \
-- _STAB_CODE_DEF(SO,0x64) \
-- _STAB_CODE_DEF(LSYM,0x80) \
-- _STAB_CODE_DEF(BINCL,0x82) \
-- _STAB_CODE_DEF(SOL,0x84) \
-- _STAB_CODE_DEF(PSYM,0xa0) \
-- _STAB_CODE_DEF(EINCL,0xa2) \
-- _STAB_CODE_DEF(ENTRY,0xa4) \
-- _STAB_CODE_DEF(LBRAC,0xc0) \
-- _STAB_CODE_DEF(EXCL,0xc2) \
-- _STAB_CODE_DEF(SCOPE,0xc4) \
-- _STAB_CODE_DEF(RBRAC,0xe0) \
-- _STAB_CODE_DEF(BCOMM,0xe2) \
-- _STAB_CODE_DEF(ECOMM,0xe4) \
-- _STAB_CODE_DEF(ECOML,0xe8) \
-- _STAB_CODE_DEF(NBTEXT,0xf0) \
-- _STAB_CODE_DEF(NBDATA,0xf2) \
-- _STAB_CODE_DEF(NBBSS,0xf4) \
-- _STAB_CODE_DEF(NBSTS,0xf6) \
-- _STAB_CODE_DEF(NBLCS,0xf8) \
-- _STAB_CODE_DEF(LENG,0xfe)
--
--enum __stab_debug_code {
--#define _STAB_CODE_DEF(x,y) N_##x = y,
--_STAB_CODE_LIST
--#undef _STAB_CODE_DEF
--};
--
--#ifdef __cplusplus
--} // extern "C"
--#endif // __cplusplus
--
--#endif // __BIONIC_HAVE_STAB_H
--
--#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_STAB_H
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/android/include/sys/signal.h
---- a/toolkit/crashreporter/google-breakpad/src/common/android/include/sys/signal.h Sun Feb 01 19:32:36 2015 +0100
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,35 +0,0 @@
--// Copyright (c) 2012, Google Inc.
--// All rights reserved.
--//
--// Redistribution and use in source and binary forms, with or without
--// modification, are permitted provided that the following conditions are
--// met:
--//
--// * Redistributions of source code must retain the above copyright
--// notice, this list of conditions and the following disclaimer.
--// * Redistributions in binary form must reproduce the above
--// copyright notice, this list of conditions and the following disclaimer
--// in the documentation and/or other materials provided with the
--// distribution.
--// * Neither the name of Google Inc. nor the names of its
--// contributors may be used to endorse or promote products derived from
--// this software without specific prior written permission.
--//
--// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
--// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
--// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
--// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
--// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
--// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
--// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
--// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
--// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
--// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
--// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
--#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
--#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
--
--#include <signal.h>
--
--#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_SIGNAL_H
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc Thu Feb 05 22:43:17 2015 +0100
-@@ -829,9 +829,9 @@
- // last slash, or the whole filename if there are no slashes.
- string BaseFileName(const string &filename) {
- // Lots of copies! basename's behavior is less than ideal.
-- char *c_filename = strdup(filename.c_str());
-- string base = basename(c_filename);
-- free(c_filename);
-+ const char *c_filename = filename.c_str();
-+ const char *p = strrchr(c_filename, '/');
-+ string base = p ? p+1 : c_filename;
- return base;
- }
-
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/linux/elf_core_dump.h
---- a/toolkit/crashreporter/google-breakpad/src/common/linux/elf_core_dump.h Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/elf_core_dump.h Thu Feb 05 22:43:17 2015 +0100
-@@ -36,6 +36,7 @@
- #include <elf.h>
- #include <link.h>
- #include <stddef.h>
-+#include <sys/reg.h>
-
- #include "common/memory_range.h"
-
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc Thu Feb 05 22:43:17 2015 +0100
-@@ -34,7 +34,6 @@
- #include "common/stabs_reader.h"
-
- #include <assert.h>
--#include <stab.h>
- #include <string.h>
-
- #include <string>
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h Thu Feb 05 22:43:17 2015 +0100
-@@ -53,12 +53,19 @@
- #include <config.h>
- #endif
-
--#ifdef HAVE_A_OUT_H
--#include <a.out.h>
--#endif
- #ifdef HAVE_MACH_O_NLIST_H
- #include <mach-o/nlist.h>
- #endif
-+// Definitions from <stab.h> and <a.out.h> for systems which
-+// do not have them
-+#undef N_UNDF
-+#define N_UNDF 0x0
-+#define N_FUN 0x24
-+#define N_SLINE 0x44
-+#define N_SO 0x64
-+#define N_LSYM 0x80
-+#define N_BINCL 0x82
-+#define N_SOL 0x84
-
- #include <string>
- #include <vector>
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/common/stabs_reader_unittest.cc
---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader_unittest.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader_unittest.cc Thu Feb 05 22:43:17 2015 +0100
-@@ -33,7 +33,6 @@
-
- #include <assert.h>
- #include <errno.h>
--#include <stab.h>
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
---- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h Thu Feb 05 22:43:17 2015 +0100
-@@ -2814,7 +2814,7 @@
- LSS_INLINE _syscall6(void*, mmap, void*, s,
- size_t, l, int, p,
- int, f, int, d,
-- __off64_t, o)
-+ off64_t, o)
-
- LSS_INLINE _syscall4(int, newfstatat, int, d,
- const char *, p,
-diff -r 2d344ef8da33 -r df5ec9e5685a toolkit/crashreporter/nsExceptionHandler.cpp
---- a/toolkit/crashreporter/nsExceptionHandler.cpp Sun Feb 01 19:32:36 2015 +0100
-+++ b/toolkit/crashreporter/nsExceptionHandler.cpp Thu Feb 05 22:43:17 2015 +0100
-@@ -49,6 +49,7 @@
- #elif defined(XP_LINUX)
- #include "nsIINIParser.h"
- #include "common/linux/linux_libc_support.h"
-+#undef getdents64
- #include "third_party/lss/linux_syscall_support.h"
- #include "client/linux/crash_generation/client_info.h"
- #include "client/linux/crash_generation/crash_generation_server.h"
diff --git a/www-client/firefox/files/firefox-35.0-gmp-clearkey-sprintf.patch b/www-client/firefox/files/firefox-35.0-gmp-clearkey-sprintf.patch
deleted file mode 100644
index dfd9a8d..0000000
--- a/www-client/firefox/files/firefox-35.0-gmp-clearkey-sprintf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/mozilla-beta/media/gmp-clearkey/0.1/openaes/oaes_lib.c 2014-12-04 11:24:16.279571363 -0500
-+++ b/mozilla-beta/media/gmp-clearkey/0.1/openaes/oaes_lib.c 2014-12-04 11:23:07.449572313 -0500
-@@ -42,6 +42,7 @@
-
- #include "oaes_config.h"
- #include "oaes_lib.h"
-+#include "standard.h"
-
- #ifdef OAES_HAVE_ISAAC
- #include "rand.h"
diff --git a/www-client/firefox/files/fts.patch b/www-client/firefox/files/fts.patch
deleted file mode 100644
index 4c1734f..0000000
--- a/www-client/firefox/files/fts.patch
+++ /dev/null
@@ -1,480 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1428142499 -7200
-# Sat Apr 04 12:14:59 2015 +0200
-# Node ID b85504ff4ee9c548d58e75398a2de69f2089e907
-# Parent 90adc073cbc6398f4fab9b1cd07b685368559f34
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1139173
-ipc/chromium: Remove dead code to make it compile on linux without <fts.h>
-
-diff -r 90adc073cbc6 -r b85504ff4ee9 ipc/chromium/moz.build
---- a/ipc/chromium/moz.build Thu Apr 02 08:10:00 2015 -0400
-+++ b/ipc/chromium/moz.build Sat Apr 04 12:14:59 2015 +0200
-@@ -50,7 +50,6 @@
- 'src/base/pickle.cc',
- 'src/base/rand_util.cc',
- 'src/base/revocable_store.cc',
-- 'src/base/scoped_temp_dir.cc',
- 'src/base/string_piece.cc',
- 'src/base/string_util.cc',
- 'src/base/thread.cc',
-diff -r 90adc073cbc6 -r b85504ff4ee9 ipc/chromium/src/base/file_util.cc
---- a/ipc/chromium/src/base/file_util.cc Thu Apr 02 08:10:00 2015 -0400
-+++ b/ipc/chromium/src/base/file_util.cc Sat Apr 04 12:14:59 2015 +0200
-@@ -139,12 +139,6 @@
- path->push_back(FilePath::kSeparators[0]);
- path->append(new_ending);
- }
--bool CopyDirectory(const std::wstring& from_path, const std::wstring& to_path,
-- bool recursive) {
-- return CopyDirectory(FilePath::FromWStringHack(from_path),
-- FilePath::FromWStringHack(to_path),
-- recursive);
--}
- bool CopyFile(const std::wstring& from_path, const std::wstring& to_path) {
- return CopyFile(FilePath::FromWStringHack(from_path),
- FilePath::FromWStringHack(to_path));
-@@ -172,8 +166,8 @@
- *temp_file = temp_file_path.ToWStringHack();
- return true;
- }
--bool Delete(const std::wstring& path, bool recursive) {
-- return Delete(FilePath::FromWStringHack(path), recursive);
-+bool Delete(const std::wstring& path) {
-+ return Delete(FilePath::FromWStringHack(path));
- }
- bool DirectoryExists(const std::wstring& path) {
- return DirectoryExists(FilePath::FromWStringHack(path));
-diff -r 90adc073cbc6 -r b85504ff4ee9 ipc/chromium/src/base/file_util.h
---- a/ipc/chromium/src/base/file_util.h Thu Apr 02 08:10:00 2015 -0400
-+++ b/ipc/chromium/src/base/file_util.h Sat Apr 04 12:14:59 2015 +0200
-@@ -16,7 +16,6 @@
- #include <sys/stat.h>
- #elif defined(OS_POSIX)
- #include <sys/types.h>
--#include <fts.h>
- #include <sys/stat.h>
- #endif
-
-@@ -87,34 +86,17 @@
-
- // Deletes the given path, whether it's a file or a directory.
- // If it's a directory, it's perfectly happy to delete all of the
--// directory's contents. Passing true to recursive deletes
--// subdirectories and their contents as well.
-+// directory's contents.
- // Returns true if successful, false otherwise.
--//
--// WARNING: USING THIS WITH recursive==true IS EQUIVALENT
--// TO "rm -rf", SO USE WITH CAUTION.
--bool Delete(const FilePath& path, bool recursive);
-+bool Delete(const FilePath& path);
- // Deprecated temporary compatibility function.
--bool Delete(const std::wstring& path, bool recursive);
-+bool Delete(const std::wstring& path);
-
- // Copies a single file. Use CopyDirectory to copy directories.
- bool CopyFile(const FilePath& from_path, const FilePath& to_path);
- // Deprecated temporary compatibility function.
- bool CopyFile(const std::wstring& from_path, const std::wstring& to_path);
-
--// Copies the given path, and optionally all subdirectories and their contents
--// as well.
--// If there are files existing under to_path, always overwrite.
--// Returns true if successful, false otherwise.
--// Dont't use wildcards on the names, it may stop working without notice.
--//
--// If you only need to copy a file use CopyFile, it's faster.
--bool CopyDirectory(const FilePath& from_path, const FilePath& to_path,
-- bool recursive);
--// Deprecated temporary compatibility function.
--bool CopyDirectory(const std::wstring& from_path, const std::wstring& to_path,
-- bool recursive);
--
- // Returns true if the given path exists on the local filesystem,
- // false otherwise.
- bool PathExists(const FilePath& path);
-diff -r 90adc073cbc6 -r b85504ff4ee9 ipc/chromium/src/base/file_util_posix.cc
---- a/ipc/chromium/src/base/file_util_posix.cc Thu Apr 02 08:10:00 2015 -0400
-+++ b/ipc/chromium/src/base/file_util_posix.cc Sat Apr 04 12:14:59 2015 +0200
-@@ -8,13 +8,10 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <fnmatch.h>
--#ifndef ANDROID
--#include <fts.h>
--#endif
- #include <libgen.h>
- #include <stdio.h>
- #include <string.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <sys/mman.h>
- #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures
- #include <sys/stat.h>
-@@ -53,7 +50,7 @@
- // which works both with and without the recursive flag. I'm not sure we need
- // that functionality. If not, remove from file_util_win.cc, otherwise add it
- // here.
--bool Delete(const FilePath& path, bool recursive) {
-+bool Delete(const FilePath& path) {
- const char* path_str = path.value().c_str();
- struct stat file_info;
- int test = stat(path_str, &file_info);
-@@ -64,174 +61,8 @@
- }
- if (!S_ISDIR(file_info.st_mode))
- return (unlink(path_str) == 0);
-- if (!recursive)
-- return (rmdir(path_str) == 0);
-
--#ifdef ANDROID
-- // XXX Need ftsless impl for bionic
-- return false;
--#else
-- bool success = true;
-- int ftsflags = FTS_PHYSICAL | FTS_NOSTAT;
-- char top_dir[PATH_MAX];
-- if (base::strlcpy(top_dir, path_str,
-- arraysize(top_dir)) >= arraysize(top_dir)) {
-- return false;
-- }
-- char* dir_list[2] = { top_dir, NULL };
-- FTS* fts = fts_open(dir_list, ftsflags, NULL);
-- if (fts) {
-- FTSENT* fts_ent = fts_read(fts);
-- while (success && fts_ent != NULL) {
-- switch (fts_ent->fts_info) {
-- case FTS_DNR:
-- case FTS_ERR:
-- // log error
-- success = false;
-- continue;
-- break;
-- case FTS_DP:
-- success = (rmdir(fts_ent->fts_accpath) == 0);
-- break;
-- case FTS_D:
-- break;
-- case FTS_NSOK:
-- case FTS_F:
-- case FTS_SL:
-- case FTS_SLNONE:
-- success = (unlink(fts_ent->fts_accpath) == 0);
-- break;
-- default:
-- DCHECK(false);
-- break;
-- }
-- fts_ent = fts_read(fts);
-- }
-- fts_close(fts);
-- }
-- return success;
--#endif
--}
--
--bool Move(const FilePath& from_path, const FilePath& to_path) {
-- if (rename(from_path.value().c_str(), to_path.value().c_str()) == 0)
-- return true;
--
-- if (!CopyDirectory(from_path, to_path, true))
-- return false;
--
-- Delete(from_path, true);
-- return true;
--}
--
--bool CopyDirectory(const FilePath& from_path,
-- const FilePath& to_path,
-- bool recursive) {
-- // Some old callers of CopyDirectory want it to support wildcards.
-- // After some discussion, we decided to fix those callers.
-- // Break loudly here if anyone tries to do this.
-- // TODO(evanm): remove this once we're sure it's ok.
-- DCHECK(to_path.value().find('*') == std::string::npos);
-- DCHECK(from_path.value().find('*') == std::string::npos);
--
-- char top_dir[PATH_MAX];
-- if (base::strlcpy(top_dir, from_path.value().c_str(),
-- arraysize(top_dir)) >= arraysize(top_dir)) {
-- return false;
-- }
--
--#ifdef ANDROID
-- // XXX Need ftsless impl for bionic
-- return false;
--#else
-- char* dir_list[] = { top_dir, NULL };
-- FTS* fts = fts_open(dir_list, FTS_PHYSICAL | FTS_NOSTAT, NULL);
-- if (!fts) {
-- CHROMIUM_LOG(ERROR) << "fts_open failed: " << strerror(errno);
-- return false;
-- }
--
-- int error = 0;
-- FTSENT* ent;
-- while (!error && (ent = fts_read(fts)) != NULL) {
-- // ent->fts_path is the source path, including from_path, so paste
-- // the suffix after from_path onto to_path to create the target_path.
-- std::string suffix(&ent->fts_path[from_path.value().size()]);
-- // Strip the leading '/' (if any).
-- if (!suffix.empty()) {
-- DCHECK_EQ('/', suffix[0]);
-- suffix.erase(0, 1);
-- }
-- const FilePath target_path = to_path.Append(suffix);
-- switch (ent->fts_info) {
-- case FTS_D: // Preorder directory.
-- // If we encounter a subdirectory in a non-recursive copy, prune it
-- // from the traversal.
-- if (!recursive && ent->fts_level > 0) {
-- if (fts_set(fts, ent, FTS_SKIP) != 0)
-- error = errno;
-- continue;
-- }
--
-- // Try creating the target dir, continuing on it if it exists already.
-- // Rely on the user's umask to produce correct permissions.
-- if (mkdir(target_path.value().c_str(), 0777) != 0) {
-- if (errno != EEXIST)
-- error = errno;
-- }
-- break;
-- case FTS_F: // Regular file.
-- case FTS_NSOK: // File, no stat info requested.
-- errno = 0;
-- if (!CopyFile(FilePath(ent->fts_path), target_path))
-- error = errno ? errno : EINVAL;
-- break;
-- case FTS_DP: // Postorder directory.
-- case FTS_DOT: // "." or ".."
-- // Skip it.
-- continue;
-- case FTS_DC: // Directory causing a cycle.
-- // Skip this branch.
-- if (fts_set(fts, ent, FTS_SKIP) != 0)
-- error = errno;
-- break;
-- case FTS_DNR: // Directory cannot be read.
-- case FTS_ERR: // Error.
-- case FTS_NS: // Stat failed.
-- // Abort with the error.
-- error = ent->fts_errno;
-- break;
-- case FTS_SL: // Symlink.
-- case FTS_SLNONE: // Symlink with broken target.
-- CHROMIUM_LOG(WARNING) << "CopyDirectory() skipping symbolic link: " <<
-- ent->fts_path;
-- continue;
-- case FTS_DEFAULT: // Some other sort of file.
-- CHROMIUM_LOG(WARNING) << "CopyDirectory() skipping file of unknown type: " <<
-- ent->fts_path;
-- continue;
-- default:
-- NOTREACHED();
-- continue; // Hope for the best!
-- }
-- }
-- // fts_read may have returned NULL and set errno to indicate an error.
-- if (!error && errno != 0)
-- error = errno;
--
-- if (!fts_close(fts)) {
-- // If we already have an error, let's use that error instead of the error
-- // fts_close set.
-- if (!error)
-- error = errno;
-- }
--
-- if (error) {
-- CHROMIUM_LOG(ERROR) << "CopyDirectory(): " << strerror(error);
-- return false;
-- }
-- return true;
--#endif
-+ return (rmdir(path_str) == 0);
- }
-
- bool PathExists(const FilePath& path) {
-diff -r 90adc073cbc6 -r b85504ff4ee9 ipc/chromium/src/base/file_util_win.cc
---- a/ipc/chromium/src/base/file_util_win.cc Thu Apr 02 08:10:00 2015 -0400
-+++ b/ipc/chromium/src/base/file_util_win.cc Sat Apr 04 12:14:59 2015 +0200
-@@ -27,14 +27,14 @@
- return true;
- }
-
--bool Delete(const FilePath& path, bool recursive) {
-+bool Delete(const FilePath& path) {
- if (path.value().length() >= MAX_PATH)
- return false;
-
-- // If we're not recursing use DeleteFile; it should be faster. DeleteFile
-+ // Use DeleteFile; it should be faster. DeleteFile
- // fails if passed a directory though, which is why we fall through on
- // failure to the SHFileOperation.
-- if (!recursive && DeleteFile(path.value().c_str()) != 0)
-+ if (DeleteFile(path.value().c_str()) != 0)
- return true;
-
- // SHFILEOPSTRUCT wants the path to be terminated with two NULLs,
-@@ -48,8 +48,7 @@
- file_operation.wFunc = FO_DELETE;
- file_operation.pFrom = double_terminated_path;
- file_operation.fFlags = FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION;
-- if (!recursive)
-- file_operation.fFlags |= FOF_NORECURSION | FOF_FILESONLY;
-+ file_operation.fFlags |= FOF_NORECURSION | FOF_FILESONLY;
- int err = SHFileOperation(&file_operation);
- // Some versions of Windows return ERROR_FILE_NOT_FOUND when
- // deleting an empty directory.
-@@ -98,26 +97,6 @@
- return (SHFileOperation(&file_operation) == 0);
- }
-
--bool CopyDirectory(const FilePath& from_path, const FilePath& to_path,
-- bool recursive) {
-- if (recursive)
-- return ShellCopy(from_path, to_path, true);
--
-- // Instead of creating a new directory, we copy the old one to include the
-- // security information of the folder as part of the copy.
-- if (!PathExists(to_path)) {
-- // Except that Vista fails to do that, and instead do a recursive copy if
-- // the target directory doesn't exist.
-- if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
-- CreateDirectory(to_path);
-- else
-- ShellCopy(from_path, to_path, false);
-- }
--
-- FilePath directory = from_path.Append(L"*.*");
-- return ShellCopy(directory, to_path, false);
--}
--
- bool PathExists(const FilePath& path) {
- return (GetFileAttributes(path.value().c_str()) != INVALID_FILE_ATTRIBUTES);
- }
-diff -r 40f6b9e6448e -r e25335f4fbb2 ipc/chromium/src/base/scoped_temp_dir.cc
---- a/ipc/chromium/src/base/scoped_temp_dir.cc Tue Mar 03 23:02:07 2015 +0100
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,47 +0,0 @@
--// Copyright (c) 2009 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style license that can be
--// found in the LICENSE file.
--
--#include "base/scoped_temp_dir.h"
--
--#include "base/file_util.h"
--#include "base/logging.h"
--#include "base/string_util.h"
--
--ScopedTempDir::ScopedTempDir() {
--}
--
--ScopedTempDir::~ScopedTempDir() {
-- if (!path_.empty() && !file_util::Delete(path_, true))
-- CHROMIUM_LOG(ERROR) << "ScopedTempDir unable to delete " << path_.value();
--}
--
--bool ScopedTempDir::CreateUniqueTempDir() {
-- // This "scoped_dir" prefix is only used on Windows and serves as a template
-- // for the unique name.
-- if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("scoped_dir"),
-- &path_))
-- return false;
--
-- return true;
--}
--
--bool ScopedTempDir::Set(const FilePath& path) {
-- DCHECK(path_.empty());
-- if (!file_util::DirectoryExists(path) &&
-- !file_util::CreateDirectory(path)) {
-- return false;
-- }
-- path_ = path;
-- return true;
--}
--
--FilePath ScopedTempDir::Take() {
-- FilePath ret = path_;
-- path_ = FilePath();
-- return ret;
--}
--
--bool ScopedTempDir::IsValid() const {
-- return !path_.empty() && file_util::DirectoryExists(path_);
--}
-diff -r 40f6b9e6448e -r e25335f4fbb2 ipc/chromium/src/base/scoped_temp_dir.h
---- a/ipc/chromium/src/base/scoped_temp_dir.h Tue Mar 03 23:02:07 2015 +0100
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,47 +0,0 @@
--// Copyright (c) 2009 The Chromium Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style license that can be
--// found in the LICENSE file.
--
--#ifndef BASE_SCOPED_TEMP_DIR_H_
--#define BASE_SCOPED_TEMP_DIR_H_
--
--// An object representing a temporary / scratch directory that should be cleaned
--// up (recursively) when this object goes out of scope. Note that since
--// deletion occurs during the destructor, no further error handling is possible
--// if the directory fails to be deleted. As a result, deletion is not
--// guaranteed by this class.
--
--#include "base/file_path.h"
--
--class ScopedTempDir {
-- public:
-- // No directory is owned/created initially.
-- ScopedTempDir();
--
-- // Recursively delete path_
-- ~ScopedTempDir();
--
-- // Creates a unique directory in TempPath, and takes ownership of it.
-- // See file_util::CreateNewTemporaryDirectory.
-- bool CreateUniqueTempDir();
--
-- // Takes ownership of directory at |path|, creating it if necessary.
-- // Don't call multiple times unless Take() has been called first.
-- bool Set(const FilePath& path);
--
-- // Caller takes ownership of the temporary directory so it won't be destroyed
-- // when this object goes out of scope.
-- FilePath Take();
--
-- const FilePath& path() const { return path_; }
--
-- // Returns true if path_ is non-empty and exists.
-- bool IsValid() const;
--
-- private:
-- FilePath path_;
--
-- DISALLOW_COPY_AND_ASSIGN(ScopedTempDir);
--};
--
--#endif // BASE_SCOPED_TEMP_DIR_H_
-diff -r 90adc073cbc6 -r b85504ff4ee9 ipc/chromium/src/base/shared_memory_posix.cc
---- a/ipc/chromium/src/base/shared_memory_posix.cc Thu Apr 02 08:10:00 2015 -0400
-+++ b/ipc/chromium/src/base/shared_memory_posix.cc Sat Apr 04 12:14:59 2015 +0200
-@@ -93,7 +93,7 @@
-
- FilePath path(WideToUTF8(mem_filename));
- if (file_util::PathExists(path)) {
-- return file_util::Delete(path, false);
-+ return file_util::Delete(path);
- }
-
- // Doesn't exist, so success.
-@@ -170,7 +170,7 @@
- // Deleting the file prevents anyone else from mapping it in
- // (making it private), and prevents the need for cleanup (once
- // the last fd is closed, it is truly freed).
-- file_util::Delete(path, false);
-+ file_util::Delete(path);
- } else {
- std::wstring mem_filename;
- if (FilenameForMemoryName(name, &mem_filename) == false)
diff --git a/www-client/firefox/files/gentoo-default-prefs.js-1 b/www-client/firefox/files/gentoo-default-prefs.js-1
deleted file mode 100644
index 22a51ff..0000000
--- a/www-client/firefox/files/gentoo-default-prefs.js-1
+++ /dev/null
@@ -1,17 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("browser.display.use_system_colors", true);
-pref("browser.link.open_external", 3);
-pref("general.smoothScroll", true);
-pref("general.autoScroll", false);
-pref("browser.tabs.tabMinWidth", 15);
-pref("browser.backspace_action", 0);
-pref("browser.urlbar.hideGoButton", true);
-pref("accessibility.typeaheadfind", true);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("browser.EULA.override", true);
-pref("general.useragent.vendor", "Gentoo");
-pref("intl.locale.matchOS", true);
-pref("general.useragent.locale", "chrome://global/locale/intl.properties");
-pref("extensions.autoDisableScopes", 0);
-pref("layout.css.dpi", 0);
diff --git a/www-client/firefox/files/icon/firefox.desktop b/www-client/firefox/files/icon/firefox.desktop
deleted file mode 100644
index 35999a8..0000000
--- a/www-client/firefox/files/icon/firefox.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=@NAME@
-Comment=Web Browser
-Exec=firefox %U
-Icon=@ICON@
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-Categories=Network;WebBrowser;
diff --git a/www-client/firefox/files/libstagefright-cdefs.patch b/www-client/firefox/files/libstagefright-cdefs.patch
deleted file mode 100644
index b45f97f..0000000
--- a/www-client/firefox/files/libstagefright-cdefs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423171584 -3600
-# Thu Feb 05 22:26:24 2015 +0100
-# Node ID 48a43c9da31a3ae083edd563be50fb04d9a5b99a
-# Parent 2d344ef8da33717224d5a08570dc834ca2254f9f
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1151202
-libstagefright: Fix compilation for systems without <sys/cdefs.h>
-
-diff -r 2d344ef8da33 -r 48a43c9da31a media/libstagefright/system/core/include/cutils/properties.h
---- a/media/libstagefright/system/core/include/cutils/properties.h Sun Feb 01 19:32:36 2015 +0100
-+++ b/media/libstagefright/system/core/include/cutils/properties.h Thu Feb 05 22:26:24 2015 +0100
-@@ -17,7 +17,7 @@
- #ifndef __CUTILS_PROPERTIES_H
- #define __CUTILS_PROPERTIES_H
-
--#include <sys/cdefs.h>
-+#include <sys/types.h>
- #include <stddef.h>
-
- #ifdef __cplusplus
diff --git a/www-client/firefox/files/profiler-gettid.patch b/www-client/firefox/files/profiler-gettid.patch
deleted file mode 100644
index d9983b4..0000000
--- a/www-client/firefox/files/profiler-gettid.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423173146 -3600
-# Thu Feb 05 22:52:26 2015 +0100
-# Node ID c084550fcab646d911bbf4f05747f228759161e4
-# Parent 2d344ef8da33717224d5a08570dc834ca2254f9f
-profiler: avoid getcontext and gettid
-
-diff -r 2d344ef8da33 -r c084550fcab6 tools/profiler/GeckoTaskTracer.cpp
---- a/tools/profiler/GeckoTaskTracer.cpp Sun Feb 01 19:32:36 2015 +0100
-+++ b/tools/profiler/GeckoTaskTracer.cpp Thu Feb 05 22:52:26 2015 +0100
-@@ -18,8 +18,8 @@
-
- #include <stdarg.h>
-
--#if defined(__GLIBC__)
--// glibc doesn't implement gettid(2).
-+#if defined(OS_LINUX) && !defined(ANDROID)
-+// only bionic wraps gettid(2).
- #include <sys/syscall.h>
- static pid_t gettid()
- {
-diff -r 2d344ef8da33 -r c084550fcab6 tools/profiler/platform-linux.cc
---- a/tools/profiler/platform-linux.cc Sun Feb 01 19:32:36 2015 +0100
-+++ b/tools/profiler/platform-linux.cc Thu Feb 05 22:52:26 2015 +0100
-@@ -92,8 +92,8 @@
-
- #define SIGNAL_SAVE_PROFILE SIGUSR2
-
--#if defined(__GLIBC__)
--// glibc doesn't implement gettid(2).
-+#if !defined(ANDROID)
-+// only android wraps gettid(2).
- #include <sys/syscall.h>
- pid_t gettid()
- {
-@@ -652,10 +652,10 @@
- {
- MOZ_ASSERT(aContext);
- ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);
-- if (!getcontext(pContext)) {
-- context = pContext;
-- SetSampleContext(this, aContext);
-- }
-+// if (!getcontext(pContext)) {
-+// context = pContext;
-+// SetSampleContext(this, aContext);
-+// }
- }
-
- void OS::SleepMicro(int microseconds)
diff --git a/www-client/firefox/files/sandbox-cdefs.patch b/www-client/firefox/files/sandbox-cdefs.patch
deleted file mode 100644
index 9591a29..0000000
--- a/www-client/firefox/files/sandbox-cdefs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423172498 -3600
-# Thu Feb 05 22:41:38 2015 +0100
-# Node ID 375c73854f92701f13403b8461b35727dccde825
-# Parent 2d344ef8da33717224d5a08570dc834ca2254f9f
-# https://codereview.chromium.org/278583005
-chromium sandbox: Avoid cdefs.h
-
-diff -r 2d344ef8da33 -r 375c73854f92 security/sandbox/chromium/sandbox/linux/seccomp-bpf/linux_seccomp.h
---- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/linux_seccomp.h Sun Feb 01 19:32:36 2015 +0100
-+++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/linux_seccomp.h Thu Feb 05 22:41:38 2015 +0100
-@@ -16,7 +16,7 @@
- #include <asm/unistd.h>
- #include <linux/filter.h>
-
--#include <sys/cdefs.h>
-+#include <sys/types.h>
- // Old Bionic versions do not have sys/user.h. The if can be removed once we no
- // longer need to support these old Bionic versions.
- // All x86_64 builds use a new enough bionic to have sys/user.h.
diff --git a/www-client/firefox/files/sctp-36.patch b/www-client/firefox/files/sctp-36.patch
deleted file mode 100644
index 77a18a8..0000000
--- a/www-client/firefox/files/sctp-36.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1146096
-
-diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/netinet/sctp_os_userspace.h
---- a/netwerk/sctp/src/netinet/sctp_os_userspace.h Tue Mar 17 14:22:40 2015 -0400
-+++ b/netwerk/sctp/src/netinet/sctp_os_userspace.h Tue Mar 17 22:17:01 2015 +0100
-@@ -273,9 +273,11 @@
- #endif
-
- #else /* !defined(Userspace_os_Windows) */
-+#ifdef __FreeBSD__
- #include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
-+#endif /* __FreeBSD__ */
- #include <sys/socket.h>
--#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
-+#if !defined(__Userspace_os_Windows) && !defined(__Userspace_os_Darwin)
- #include <pthread.h>
- #endif
- typedef pthread_mutex_t userland_mutex_t;
-@@ -437,7 +439,7 @@
- /* #include <sys/param.h> in FreeBSD defines MSIZE */
- /* #include <sys/ktr.h> */
- /* #include <sys/systm.h> */
--#if defined(__Userspace_os_Windows)
-+#if 1
- #include <user_queue.h>
- #else
- #include <sys/queue.h>
-diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/netinet/sctp_pcb.c
---- a/netwerk/sctp/src/netinet/sctp_pcb.c Tue Mar 17 14:22:40 2015 -0400
-+++ b/netwerk/sctp/src/netinet/sctp_pcb.c Tue Mar 17 22:17:01 2015 +0100
-@@ -30,6 +30,9 @@
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#define _BSD_SOURCE /* for IPPORT_RESERVED */
-+#include <netdb.h>
-+
- #ifdef __FreeBSD__
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 277031 2015-01-11 21:55:30Z tuexen $");
-diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/user_queue.h
---- a/netwerk/sctp/src/user_queue.h Tue Mar 17 14:22:40 2015 -0400
-+++ b/netwerk/sctp/src/user_queue.h Tue Mar 17 22:17:01 2015 +0100
-@@ -31,7 +31,7 @@
- #ifndef _USER_QUEUE_H_
- #define _USER_QUEUE_H_
-
--#if !defined (__Userspace_os_Windows)
-+#if defined(__Userspace_os_FreeBSD)
- #include <sys/cdefs.h>
- #endif
- /*
diff --git a/www-client/firefox/files/sctp.patch b/www-client/firefox/files/sctp.patch
deleted file mode 100644
index 5155c85..0000000
--- a/www-client/firefox/files/sctp.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1426627021 -3600
-# Tue Mar 17 22:17:01 2015 +0100
-# Node ID 4ca8a9e2718089a1d220d1d420ebe583be4be9e5
-# Parent e965a1a534ecb6635975fae33a929dc6c06bcb50
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1146096
-
-diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/netinet/sctp_os_userspace.h
---- a/netwerk/sctp/src/netinet/sctp_os_userspace.h Tue Mar 17 14:22:40 2015 -0400
-+++ b/netwerk/sctp/src/netinet/sctp_os_userspace.h Tue Mar 17 22:17:01 2015 +0100
-@@ -273,9 +273,11 @@
- #endif
-
- #else /* !defined(Userspace_os_Windows) */
-+#ifdef __FreeBSD__
- #include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
-+#endif /* __FreeBSD__ */
- #include <sys/socket.h>
--#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(__Userspace_os_NaCl)
-+#if !defined(__Userspace_os_Windows) && !defined(__Userspace_os_Darwin)
- #include <pthread.h>
- #endif
- typedef pthread_mutex_t userland_mutex_t;
-@@ -437,7 +439,7 @@
- /* #include <sys/param.h> in FreeBSD defines MSIZE */
- /* #include <sys/ktr.h> */
- /* #include <sys/systm.h> */
--#if defined(__Userspace_os_Windows)
-+#if 1
- #include <user_queue.h>
- #else
- #include <sys/queue.h>
-diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/netinet/sctp_pcb.c
---- a/netwerk/sctp/src/netinet/sctp_pcb.c Tue Mar 17 14:22:40 2015 -0400
-+++ b/netwerk/sctp/src/netinet/sctp_pcb.c Tue Mar 17 22:17:01 2015 +0100
-@@ -30,6 +30,9 @@
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#define _BSD_SOURCE /* for IPPORT_RESERVED */
-+#include <netdb.h>
-+
- #ifdef __FreeBSD__
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 277031 2015-01-11 21:55:30Z tuexen $");
-diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/user_queue.h
---- a/netwerk/sctp/src/user_queue.h Tue Mar 17 14:22:40 2015 -0400
-+++ b/netwerk/sctp/src/user_queue.h Tue Mar 17 22:17:01 2015 +0100
-@@ -31,7 +31,7 @@
- #ifndef _USER_QUEUE_H_
- #define _USER_QUEUE_H_
-
--#if !defined (__Userspace_os_Windows)
-+#if defined(__Userspace_os_FreeBSD)
- #include <sys/cdefs.h>
- #endif
- /*
diff --git a/www-client/firefox/files/sipcc.patch b/www-client/firefox/files/sipcc.patch
deleted file mode 100644
index 060fdf9..0000000
--- a/www-client/firefox/files/sipcc.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1423304332 -3600
-# Sat Feb 07 11:18:52 2015 +0100
-# Node ID fbbc5e616bd05c0f3b29ede3d777609e04dce620
-# Parent 204cb68867f5b09f0949bd4a49a4a8c1aaf0f467
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1130709
-sipcc: Make __BEGIN_DECLS and __END_DECLS explicit
-
-diff -r 204cb68867f5 -r fbbc5e616bd0 media/webrtc/signaling/src/sdp/sipcc/cpr_darwin_types.h
---- a/media/webrtc/signaling/src/sdp/sipcc/cpr_darwin_types.h Sat Feb 07 09:22:26 2015 +0100
-+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_darwin_types.h Sat Feb 07 11:18:52 2015 +0100
-@@ -54,27 +54,6 @@
- #endif
-
- /**
-- * __BEGIN_DECLS and __END_DECLS
-- *
-- * Define macros for compilation by C++ compiler
-- */
--#ifndef __BEGIN_DECLS
--#ifdef __cplusplus
--#define __BEGIN_DECLS extern "C" {
--#else
--#define __BEGIN_DECLS
--#endif
--#endif
--
--#ifndef __END_DECLS
--#ifdef __cplusplus
--#define __END_DECLS }
--#else
--#define __END_DECLS
--#endif
--#endif
--
--/**
- * Define TRUE/FALSE
- * defined in several header files
- */
-diff -r 204cb68867f5 -r fbbc5e616bd0 media/webrtc/signaling/src/sdp/sipcc/cpr_linux_types.h
---- a/media/webrtc/signaling/src/sdp/sipcc/cpr_linux_types.h Sat Feb 07 09:22:26 2015 +0100
-+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_linux_types.h Sat Feb 07 11:18:52 2015 +0100
-@@ -62,28 +62,6 @@
- #endif
- #endif
-
--
--
--/**
-- * __BEGIN_DECLS and __END_DECLS
-- *
-- * Define macros for compilation by C++ compiler
-- */
--#ifndef __BEGIN_DECLS
--#ifdef __cplusplus
--#define __BEGIN_DECLS extern "C" {
--#else
--#define __BEGIN_DECLS
--#endif
--#endif
--
--#ifndef __END_DECLS
--#ifdef __cplusplus
--#define __END_DECLS }
--#else
--#define __END_DECLS
--#endif
--#endif
- /**
- * Define TRUE/FALSE
- * defined in several header files
-diff -r 204cb68867f5 -r fbbc5e616bd0 media/webrtc/signaling/src/sdp/sipcc/cpr_string.h
---- a/media/webrtc/signaling/src/sdp/sipcc/cpr_string.h Sat Feb 07 09:22:26 2015 +0100
-+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_string.h Sat Feb 07 11:18:52 2015 +0100
-@@ -10,7 +10,9 @@
- #include "cpr_types.h"
- #include "cpr_strings.h"
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /**
- * sstrncpy
-@@ -130,6 +132,8 @@
- char *
- cpr_strdup(const char *str);
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif
-diff -r 204cb68867f5 -r fbbc5e616bd0 media/webrtc/signaling/src/sdp/sipcc/cpr_strings.h
---- a/media/webrtc/signaling/src/sdp/sipcc/cpr_strings.h Sat Feb 07 09:22:26 2015 +0100
-+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_strings.h Sat Feb 07 11:18:52 2015 +0100
-@@ -7,8 +7,6 @@
-
- #include "cpr_types.h"
-
--__BEGIN_DECLS
--
-
- #include <string.h>
-
-@@ -25,6 +23,4 @@
-
- #endif // _MSC_VER
-
--__END_DECLS
--
- #endif
-diff -r 204cb68867f5 -r fbbc5e616bd0 media/webrtc/signaling/src/sdp/sipcc/cpr_types.h
---- a/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h Sat Feb 07 09:22:26 2015 +0100
-+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_types.h Sat Feb 07 11:18:52 2015 +0100
-@@ -13,7 +13,9 @@
- #include "cpr_darwin_types.h"
- #endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-
- /*
- * CPR Return Codes
-@@ -114,6 +116,8 @@
-
- typedef const char *string_t;
-
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
-
- #endif
-diff -r 204cb68867f5 -r fbbc5e616bd0 media/webrtc/signaling/src/sdp/sipcc/cpr_win_types.h
---- a/media/webrtc/signaling/src/sdp/sipcc/cpr_win_types.h Sat Feb 07 09:22:26 2015 +0100
-+++ b/media/webrtc/signaling/src/sdp/sipcc/cpr_win_types.h Sat Feb 07 11:18:52 2015 +0100
-@@ -100,16 +100,5 @@
- */
- /* DONE defined in windef.h */
-
--/*
-- * Define __BEGIN_DECLS and __END_DECLS
-- */
--#ifdef __cplusplus
--#define __BEGIN_DECLS extern "C" {
--#define __END_DECLS }
--#else
--#define __BEGIN_DECLS
--#define __END_DECLS
--#endif
--
- #endif // _CPR_WIN_TYPES_H_
-
diff --git a/www-client/firefox/files/updater.patch b/www-client/firefox/files/updater.patch
deleted file mode 100644
index e6852a3..0000000
--- a/www-client/firefox/files/updater.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1428142217 -7200
-# Sat Apr 04 12:10:17 2015 +0200
-# Node ID c04cc88f3bb26e254356df6de06583a542ae6796
-# Parent 90adc073cbc6398f4fab9b1cd07b685368559f34
-updater: no fts.h and MAXNAMLEN
-
-diff -r 90adc073cbc6 -r c04cc88f3bb2 toolkit/mozapps/update/common/updatedefines.h
---- a/toolkit/mozapps/update/common/updatedefines.h Thu Apr 02 08:10:00 2015 -0400
-+++ b/toolkit/mozapps/update/common/updatedefines.h Sat Apr 04 12:10:17 2015 +0200
-@@ -109,7 +109,7 @@
- # include <sys/wait.h>
- # include <unistd.h>
-
--#ifdef SOLARIS
-+#if 1
- # include <sys/stat.h>
- #else
- # include <fts.h>
-diff -r 90adc073cbc6 -r c04cc88f3bb2 toolkit/mozapps/update/updater/updater.cpp
---- a/toolkit/mozapps/update/updater/updater.cpp Thu Apr 02 08:10:00 2015 -0400
-+++ b/toolkit/mozapps/update/updater/updater.cpp Sat Apr 04 12:10:17 2015 +0200
-@@ -3338,7 +3338,8 @@
- return rv;
- }
-
--#elif defined(SOLARIS)
-+#elif 1
-+//#defined(SOLARIS)
- int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
- {
- int rv = OK;
-@@ -3346,7 +3347,7 @@
- NS_tchar foundpath[MAXPATHLEN];
- struct {
- dirent dent_buffer;
-- char chars[MAXNAMLEN];
-+ char chars[NAME_MAX];
- } ent_buf;
- struct dirent* ent;
-
diff --git a/www-client/firefox/files/xpcom-blocksize.patch b/www-client/firefox/files/xpcom-blocksize.patch
deleted file mode 100644
index 9e25ba9..0000000
--- a/www-client/firefox/files/xpcom-blocksize.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User Felix Janda <felix.janda@posteo.de>
-# Date 1424989496 -3600
-# Thu Feb 26 23:24:56 2015 +0100
-# Node ID 6980ec675819ae01048026a1be510c64e069ffe3
-# Parent 490274146476bc459cc1a9ed9e0d3771a4fe7d57
-xpcom: Use dbtob instead of BLOCK_SIZE
-
-diff -r 490274146476 -r 6980ec675819 xpcom/io/nsLocalFileUnix.cpp
---- a/xpcom/io/nsLocalFileUnix.cpp Thu Feb 26 22:58:09 2015 +0100
-+++ b/xpcom/io/nsLocalFileUnix.cpp Thu Feb 26 23:24:56 2015 +0100
-@@ -1408,8 +1408,8 @@
- && dq.dqb_bhardlimit) {
- int64_t QuotaSpaceAvailable = 0;
- // dqb_bhardlimit is count of BLOCK_SIZE blocks, dqb_curspace is bytes
-- if ((BLOCK_SIZE * dq.dqb_bhardlimit) > dq.dqb_curspace)
-- QuotaSpaceAvailable = int64_t(BLOCK_SIZE * dq.dqb_bhardlimit - dq.dqb_curspace);
-+ if (dbtob(dq.dqb_bhardlimit) > dq.dqb_curspace)
-+ QuotaSpaceAvailable = (dbtob(dq.dqb_bhardlimit) - dq.dqb_curspace);
- if (QuotaSpaceAvailable < *aDiskSpaceAvailable) {
- *aDiskSpaceAvailable = QuotaSpaceAvailable;
- }
diff --git a/www-client/firefox/firefox-37.0.1-r99.ebuild b/www-client/firefox/firefox-37.0.1-r99.ebuild
deleted file mode 100644
index 03254dd..0000000
--- a/www-client/firefox/firefox-37.0.1-r99.ebuild
+++ /dev/null
@@ -1,421 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-37.0.1.ebuild,v 1.1 2015/04/05 23:07:55 polynomial-c Exp $
-
-EAPI="5"
-VIRTUALX_REQUIRED="pgo"
-WANT_AUTOCONF="2.1"
-MOZ_ESR=""
-
-# This list can be updated with scripts/get_langs.sh from the mozilla overlay
-# No official support as of fetch time
-# csb
-MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en
-en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd
-gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr
-nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk vi xh zh-CN zh-TW )
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
-
-if [[ ${MOZ_ESR} == 1 ]]; then
- # ESR releases have slightly version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-# Patch version
-PATCH="${PN}-36.0-patches-01"
-# Upstream ftp release URI that's used by mozlinguas.eclass
-# We don't use the http mirror because it deletes old tarballs.
-MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases"
-MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
-
-MOZCONFIG_OPTIONAL_WIFI=1
-MOZCONFIG_OPTIONAL_JIT="enabled"
-
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.36 multilib pax-utils fdo-mime autotools virtualx mozlinguas
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="http://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist hardened +minimal pgo selinux +gmp-autoupdate test"
-RESTRICT="!bindist? ( bindist )"
-
-# More URIs appended below...
-SRC_URI="${SRC_URI}
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
- http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
- http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
-
-ASM_DEPEND=">=dev-lang/yasm-1.1"
-
-# Mesa 7.10 needed for WebGL + bugfixes
-RDEPEND="
- >=dev-libs/nss-3.17.4
- >=dev-libs/nspr-4.10.8
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${RDEPEND}
- pgo? (
- >=sys-devel/gcc-4.5 )
- amd64? ( ${ASM_DEPEND}
- virtual/opengl )
- x86? ( ${ASM_DEPEND}
- virtual/opengl )"
-
-# No source releases for alpha|beta
-if [[ ${PV} =~ alpha ]]; then
- CHANGESET="8a3042764de7"
- SRC_URI="${SRC_URI}
- http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2"
- S="${WORKDIR}/mozilla-aurora-${CHANGESET}"
-elif [[ ${PV} =~ beta ]]; then
- S="${WORKDIR}/mozilla-beta"
- SRC_URI="${SRC_URI}
- ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
-else
- SRC_URI="${SRC_URI}
- ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2
- ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
- if [[ ${MOZ_ESR} == 1 ]]; then
- S="${WORKDIR}/mozilla-esr${PV%%.*}"
- else
- S="${WORKDIR}/mozilla-release"
- fi
-fi
-
-QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox"
-
-BUILD_OBJ_DIR="${S}/ff"
-
-pkg_setup() {
- moz_pkgsetup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XDG_SESSION_COOKIE \
- XAUTHORITY
-
- if ! use bindist; then
- einfo
- elog "You are enabling official branding. You may not redistribute this build"
- elog "to any users on your network or the internet. Doing so puts yourself into"
- elog "a legal problem with Mozilla Foundation"
- elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
- fi
-
- if use pgo; then
- einfo
- ewarn "You will do a double build for profile guided optimization."
- ewarn "This will result in your build taking at least twice as long as before."
- fi
-}
-
-pkg_pretend() {
- # Ensure we have enough disk space to compile
- if use pgo || use debug || use test ; then
- CHECKREQS_DISK_BUILD="8G"
- else
- CHECKREQS_DISK_BUILD="4G"
- fi
- check-reqs_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
-
- # Unpack language packs
- mozlinguas_src_unpack
-}
-
-src_prepare() {
- # Apply our patches
- EPATCH_EXCLUDE="8002_jemalloc_configure_unbashify.patch" \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}/firefox"
-
- epatch "${FILESDIR}"/${PN}-35.0-gmp-clearkey-sprintf.patch
- #epatch "${FILESDIR}"/${PN}-36.0-disable-ion.patch
- #epatch "${FILESDIR}"/${PN}-36.0-depollute-CONST-from-dtoa.patch
-
- ## patches for building with musl libc
-
- # already upstream
- epatch "${FILESDIR}"/1130164.patch
- epatch "${FILESDIR}"/1130175.patch
- epatch "${FILESDIR}"/sctp-36.patch # backported
- epatch "${FILESDIR}"/1130710.patch
-
- # others against hg
- epatch "${FILESDIR}"/basename.patch
- epatch "${FILESDIR}"/crashreporter.patch
- epatch "${FILESDIR}"/fts.patch
- epatch "${FILESDIR}"/libstagefright-cdefs.patch
- epatch "${FILESDIR}"/profiler-gettid.patch
- epatch "${FILESDIR}"/sandbox-cdefs.patch
- epatch "${FILESDIR}"/updater.patch
- epatch "${FILESDIR}"/xpcom-blocksize.patch
- epatch "${FILESDIR}"/sipcc.patch
-
- cp "${S}"/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h "${S}"/media/mtransport/third_party/nrappkit/src/port/linux/include/sys
-
- ## end of musl patching
-
- # Allow user to apply any additional patches without modifing ebuild
- epatch_user
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- # Ensure that our plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
- sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
-
- # Fix sandbox violations during make clean, bug 372817
- sed -e "s:\(/no-such-file\):${T}\1:g" \
- -i "${S}"/config/rules.mk \
- -i "${S}"/nsprpub/configure{.in,} \
- || die
-
- # Don't exit with error when some libs are missing which we have in
- # system.
- sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
- -i "${S}"/browser/installer/Makefile.in || die
-
- # Don't error out when there's no files to be removed:
- sed 's@\(xargs rm\)$@\1 -f@' \
- -i "${S}"/toolkit/mozapps/installer/packager.mk || die
-
- eautoreconf
-
- # Must run autoconf in js/src
- cd "${S}"/js/src || die
- eautoconf
-
- # Need to update jemalloc's configure
- cd "${S}"/memory/jemalloc/src || die
- WANT_AUTOCONF= eautoconf
-}
-
-src_configure() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- MEXTENSIONS="default"
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- # Add full relro support for hardened
- use hardened && append-ldflags "-Wl,-z,relro,-z,now"
-
- # Setup api key for location services
- echo -n "${_google_api_key}" > "${S}"/google-api-key
- mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
-
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --disable-mailnews
-
- # Other ff-specific settings
- mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-
- # mozjemalloc doesn't build on musl yet
- mozconfig_annotate '' --disable-replace-malloc
- mozconfig_annotate '' --disable-jemalloc
-
- # Allow for a proper pgo build
- if use pgo; then
- echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig
- fi
-
- echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
- if use amd64 || use x86; then
- append-flags -mno-avx
- fi
- fi
-}
-
-src_compile() {
- if use pgo; then
- addpredict /root
- addpredict /etc/gconf
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- # Firefox tries to use dri stuff when it's run, see bug 380283
- shopt -s nullglob
- cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
- if test -z "${cards}"; then
- cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g')
- if test -n "${cards}"; then
- # Binary drivers seem to cause access violations anyway, so
- # let's use indirect rendering so that the device files aren't
- # touched at all. See bug 394715.
- export LIBGL_ALWAYS_INDIRECT=1
- fi
- fi
- shopt -u nullglob
- addpredict "${cards}"
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
- Xemake -f client.mk profiledbuild || die "Xemake failed"
- else
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
- emake -f client.mk
- fi
-
-}
-
-src_install() {
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
- DICTPATH="\"${EPREFIX}/usr/share/myspell\""
-
- cd "${BUILD_OBJ_DIR}" || die
-
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
- # Add our default prefs for firefox
- cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- # Set default path to search for dictionaries.
- echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
- >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- echo "pref(\"extensions.autoDisableScopes\", 3);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
-
- local plugin
- use gmp-autoupdate || for plugin in \
- gmp-gmpopenh264 ; do
- echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
- "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
- || die
- done
-
- MOZ_MAKE_FLAGS="${MAKEOPTS}" \
- emake DESTDIR="${D}" install
-
- # Install language packs
- mozlinguas_src_install
-
- local size sizes icon_path icon name
- if use bindist; then
- sizes="16 32 48"
- icon_path="${S}/browser/branding/aurora"
- # Firefox's new rapid release cycle means no more codenames
- # Let's just stick with this one...
- icon="aurora"
- name="Aurora"
- else
- sizes="16 22 24 32 256"
- icon_path="${S}/browser/branding/official"
- icon="${PN}"
- name="Mozilla Firefox"
- fi
-
- # Install icons and .desktop for menu entry
- for size in ${sizes}; do
- insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png"
- done
- # The 128x128 icon has a different name
- insinto "/usr/share/icons/hicolor/128x128/apps"
- newins "${icon_path}/mozicon128.png" "${icon}.png"
- # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
- newicon "${icon_path}/content/icon48.png" "${icon}.png"
- newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop"
- sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
- "${ED}/usr/share/applications/${PN}.desktop" || die
-
- # Add StartupNotify=true bug 237317
- if use startup-notification ; then
- echo "StartupNotify=true"\
- >> "${ED}/usr/share/applications/${PN}.desktop" \
- || die
- fi
-
- # Required in order to use plugins and even run firefox on hardened.
- if use jit; then
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
- else
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
- fi
-
- if use minimal; then
- rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
- || die "Failed to remove sdk and headers"
- fi
-
- # very ugly hack to make firefox not sigbus on sparc
- # FIXME: is this still needed??
- use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \
- -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \
- || die "sparc sed failed"; }
-
- # revdep-rebuild entry
- insinto /etc/revdep-rebuild
- echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox
- doins "${T}"/10${PN} || die
-
- # workaround to make firefox find libmozalloc.so on musl
- insinto /etc/env.d
- echo "LDPATH=${MOZILLA_FIVE_HOME}" >> "${T}"/20firefox
- doins "${T}"/20firefox || die
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update mimedb for the new .desktop file
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
deleted file mode 100644
index 10544e4..0000000
--- a/www-client/firefox/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>mozilla</herd>
-<use>
- <flag name="bindist">Disable official Firefox branding (icons, name) which
- are not binary-redistributable according to upstream.</flag>
- <flag name="custom-optimization">Fine-tune custom compiler
- optimizations (-Os, -O0, -O1, -O2, -O3)</flag>
- <flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
- downloaded and kept up-to-date in user profiles</flag>
- <flag name="minimal"> Prevent sdk and headers from being installed</flag>
- <flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
- for faster binaries. This option will double the compile time.</flag>
- <flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
- instead of bundled.</flag>
- <flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
- instead of bundled.</flag>
- <flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
- instead of bundled.</flag>
- <flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
- instead of bundled.</flag>
- <flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
- installation with secure-delete enabled</flag>
-</use>
-</pkgmetadata>
diff --git a/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch b/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch
deleted file mode 100644
index ba9fab0..0000000
--- a/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- htnet/Connection.cc.orig 2014-12-27 13:40:45.961149583 +0000
-+++ htnet/Connection.cc 2014-12-27 13:45:45.967149583 +0000
-@@ -64,7 +64,7 @@
-
- typedef void (*SIGNAL_HANDLER) (...);
-
--#ifndef _MSC_VER /* _WIN32 */
-+#if ! defined(_MSC_VER) && (defined(__GLIBC__) || defined(__UCLIBC__))
- extern "C" {
- int rresvport(int *);
- }
-@@ -162,7 +162,7 @@ int Connection::Open(int priv)
- int aport = IPPORT_RESERVED - 1;
-
- // Native Windows (MSVC) has no rresvport
--#ifndef _MSC_VER /* _WIN32 */
-+#if ! defined(_MSC_VER) && (defined(__GLIBC__) || defined(__UCLIBC__))
- sock = rresvport(&aport);
- #else
- return NOTOK;
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
deleted file mode 100644
index bf455ea..0000000
--- a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- htdig-3.2.0b6/Makefile.config.orig 2006-11-19 08:49:57.000000000 -0800
-+++ htdig-3.2.0b6/Makefile.config 2006-11-19 08:51:19.000000000 -0800
-@@ -22,10 +22,7 @@
- $(LOCAL_DEFINES) $(PROFILING)
-
- HTLIBS= $(top_builddir)/htnet/libhtnet.la \
-- $(top_builddir)/htcommon/libcommon.la \
-- $(top_builddir)/htword/libhtword.la \
- $(top_builddir)/htlib/libht.la \
- $(top_builddir)/htcommon/libcommon.la \
- $(top_builddir)/htword/libhtword.la \
-- $(top_builddir)/db/libhtdb.la \
-- $(top_builddir)/htlib/libht.la
-+ $(top_builddir)/db/libhtdb.la
---- htdig-3.2.0b6/htlib/Makefile.am.orig 2006-11-19 09:13:47.000000000 -0800
-+++ htdig-3.2.0b6/htlib/Makefile.am 2006-11-19 09:17:50.000000000 -0800
-@@ -1,7 +1,8 @@
- include $(top_srcdir)/Makefile.config
-
- pkglib_LTLIBRARIES = libht.la
--
-+libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la
-+libht_la_LIBADD= $(top_builddir)/db/libhtdb.la
- libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \
- DB2_db.cc IntObject.cc List.cc Object.cc \
- ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \
-@@ -17,9 +18,6 @@
- myqsort.c \
- md5.cc mhash_md5.c
-
--libht_la_LIBADD=@LTLIBOBJS@
--# this includes regex.c
--
- libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}
-
- pkginclude_HEADERS = \
---- htdig-3.2.0b6/htword/Makefile.am.orig 2006-11-19 08:55:08.000000000 -0800
-+++ htdig-3.2.0b6/htword/Makefile.am 2006-11-19 08:56:51.000000000 -0800
-@@ -10,7 +10,8 @@
- LOCAL_DEFINES =
-
- pkglib_LTLIBRARIES = libhtword.la
--
-+libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la
-+libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la
- libhtword_la_SOURCES = \
- WordBitCompress.cc \
- WordContext.cc \
-
---- htdig-3.2.0b6/htcommon/Makefile.am.orig 2006-11-19 09:32:39.000000000 -0800
-+++ htdig-3.2.0b6/htcommon/Makefile.am 2006-11-19 09:33:42.000000000 -0800
-@@ -12,7 +12,8 @@
- EXTRA_DIST=conf_lexer.cxx conf_parser.cxx
-
- pkglib_LTLIBRARIES = libcommon.la
--
-+libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la
-+libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la
- libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \
- HtWordReference.cc HtWordList.cc defaults.cc \
- HtURLCodec.cc URL.cc URLTrans.cc \
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
deleted file mode 100644
index 58dec13..0000000
--- a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h
---- htdig-3.2.0b6.orig/htsearch/Collection.h 2004-05-28 06:15:24.000000000 -0700
-+++ htdig-3.2.0b6/htsearch/Collection.h 2006-03-22 11:35:40.000000000 -0800
-@@ -36,9 +36,9 @@ public:
- const char *docExcerpt);
- ~Collection();
-
-- void Collection::Open();
-+ void Open();
-
-- void Collection::Close();
-+ void Close();
-
- char *getWordFile() { return wordFile.get(); }
- DocumentRef *getDocumentRef(int id);
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
deleted file mode 100644
index 57b0e3b..0000000
--- a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: htdig-3.2.0b6/htsearch/Display.cc
-===================================================================
---- htdig-3.2.0b6.orig/htsearch/Display.cc
-+++ htdig-3.2.0b6/htsearch/Display.cc
-@@ -137,7 +137,7 @@ Display::display(int pageNumber)
- // Must temporarily stash the message in a String, since
- // displaySyntaxError will overwrite the static temp used in form.
-
-- String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
-+ String s("invalid sort method");
-
- displaySyntaxError(s);
- return;
-Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
-===================================================================
---- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
-+++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
-@@ -142,7 +142,7 @@ ResultFetch::fetch()
- // Must temporarily stash the message in a String, since
- // displaySyntaxError will overwrite the static temp used in form.
-
-- String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
-+ String s("invalid sort method");
-
- displaySyntaxError(s);
- //return;
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild
deleted file mode 100644
index 2c09cf5..0000000
--- a/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.12 2013/05/02 04:13:35 patrick Exp $
-
-inherit eutils autotools
-
-MY_PV=${PV/_beta/b}
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DESCRIPTION="HTTP/HTML indexing and searching system"
-HOMEPAGE="http://www.htdig.org"
-SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="ssl"
-
-DEPEND=">=sys-libs/zlib-1.1.3
- app-arch/unzip
- ssl? ( dev-libs/openssl )"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}"/${P}-gcc4.patch
- epatch "${FILESDIR}"/${P}-as-needed.patch
- epatch "${FILESDIR}"/${P}-quoting.patch
- epatch "${FILESDIR}"/0001-remove_rresvport_usage_on_musl.patch
- epatch_user
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
- eautoreconf
-}
-
-src_compile() {
- use prefix || EPREFIX=
-
- econf \
- --with-config-dir="${EPREFIX}"/etc/${PN} \
- --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
- --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
- --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
- --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
- --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
- $(use_with ssl)
-
-# --with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
-
- emake || die "emake failed"
-}
-
-src_install () {
- use prefix || ED="${D}"
-
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc ChangeLog README
- dohtml -r htdoc
-
- sed -i "s:${D}::g" \
- "${ED}"/etc/${PN}/${PN}.conf \
- "${ED}"/usr/bin/rundig \
- || die "sed failed (removing \${D} from installed files)"
-
- # symlink htsearch so it can be easily found. see bug #62087
- dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
-}
diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml
deleted file mode 100644
index 95c06f0..0000000
--- a/www-misc/htdig/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>web-apps</herd>
-</pkgmetadata>
diff --git a/x11-apps/sessreg/files/sessreg-1.0.8-missing_path_wtmpx.patch b/x11-apps/sessreg/files/sessreg-1.0.8-missing_path_wtmpx.patch
deleted file mode 100644
index dac2124..0000000
--- a/x11-apps/sessreg/files/sessreg-1.0.8-missing_path_wtmpx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sessreg-1.0.8.orig/sessreg.h sessreg-1.0.8/sessreg.h
---- sessreg-1.0.8.orig/sessreg.h 2013-02-10 21:43:50.000000000 -0500
-+++ sessreg-1.0.8/sessreg.h 2014-06-18 10:02:17.769459663 -0400
-@@ -106,3 +106,8 @@
- #ifndef UTMPX_FILE
- # define UTMPX_FILE _PATH_UTMPX
- #endif
-+
-+#ifndef _PATH_WTMPX
-+# define _PATH_WTMPX "/var/log/wtmp"
-+#endif
-+
diff --git a/x11-apps/sessreg/metadata.xml b/x11-apps/sessreg/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-apps/sessreg/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-apps/sessreg/sessreg-1.0.8-r99.ebuild b/x11-apps/sessreg/sessreg-1.0.8-r99.ebuild
deleted file mode 100644
index 7bb22c7..0000000
--- a/x11-apps/sessreg/sessreg-1.0.8-r99.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-1.0.8.ebuild,v 1.10 2013/10/08 05:02:56 ago Exp $
-
-EAPI=5
-inherit eutils xorg-2
-
-DESCRIPTION="manage utmp/wtmp entries for non-init clients"
-
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- x11-proto/xproto"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-missing_path_wtmpx.patch
-}
diff --git a/x11-base/xorg-server/files/xdm-setup.initd-1 b/x11-base/xorg-server/files/xdm-setup.initd-1
deleted file mode 100644
index 365664e..0000000
--- a/x11-base/xorg-server/files/xdm-setup.initd-1
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $
-
-depend() {
- need localmount
-}
-
-start() {
- if get_bootparam "nox" ; then
- touch /etc/.noxdm
- fi
-}
diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4
deleted file mode 100644
index c82fece..0000000
--- a/x11-base/xorg-server/files/xdm.confd-4
+++ /dev/null
@@ -1,10 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you haven't accidentally configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-DISPLAYMANAGER="xdm"
diff --git a/x11-base/xorg-server/files/xdm.initd-10 b/x11-base/xorg-server/files/xdm.initd-10
deleted file mode 100644
index 9826e6b..0000000
--- a/x11-base/xorg-server/files/xdm.initd-10
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-10,v 1.1 2013/09/26 15:23:33 axs Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem: if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2. When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-# x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
- need localmount xdm-setup
-
- # this should start as early as possible
- # we can't do 'before *' as that breaks it
- # (#139824) Start after ypbind and autofs for network authentication
- # (#145219 #180163) Could use lirc mouse as input device
- # (#70689 comment #92) Start after consolefont to avoid display corruption
- # (#291269) Start after quota, since some dm need readable home
- # (#390609) gdm-3 will fail when dbus is not running
- # (#366753) starting keymaps after X causes problems
- after bootmisc consolefont modules netmount
- after readahead-list ypbind autofs openvpn gpm lircmd
- after quota keymaps
- before alsasound
-
- # Start before X
- use consolekit dbus xfs
-}
-
-setup_dm() {
- local MY_XDM
-
- MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
- # Load our root path from profile.env
- # Needed for kdm
- PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-
- NAME=
- case "${MY_XDM}" in
- kdm|kde)
- EXE=/usr/bin/kdm
- PIDFILE=/run/kdm.pid
- ;;
- entrance*)
- EXE=/usr/sbin/entrance
- PIDFILE=/run/entrance.pid
- ;;
- gdm|gnome)
- # gdm-3 and above has different paths
- if [ -f /usr/sbin/gdm ]; then
- EXE=/usr/sbin/gdm
- PIDFILE=/run/gdm/gdm.pid
- START_STOP_ARGS="--background"
- AUTOCLEAN_CGROUP="yes"
- else
- EXE=/usr/bin/gdm
- PIDFILE=/run/gdm.pid
- fi
- [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
- ;;
- wdm)
- EXE=/usr/bin/wdm
- PIDFILE=
- ;;
- gpe)
- EXE=/usr/bin/gpe-dm
- PIDFILE=/run/gpe-dm.pid
- ;;
- lxdm)
- EXE=/usr/sbin/lxdm-binary
- PIDFILE=/run/lxdm.pid
- START_STOP_ARGS="--background"
- ;;
- lightdm)
- EXE=/usr/sbin/lightdm
- PIDFILE=/run/lightdm.pid
- START_STOP_ARGS="--background"
- ;;
- *)
- # first find out if there is such executable
- EXE="$(command -v ${MY_XDM} 2>/dev/null)"
- PIDFILE="/run/${MY_XDM}.pid"
-
- # warn user that he is doing sick things if the exe was not found
- if [ -z "${EXE}" ]; then
- echo "ERROR: Your XDM value is invalid."
- echo " No ${MY_XDM} executable could be found on your system."
- fi
- ;;
- esac
-
- if ! [ -x "${EXE}" ]; then
- EXE=/usr/bin/xdm
- PIDFILE=/run/xdm.pid
- if ! [ -x "/usr/bin/xdm" ]; then
- echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
- echo " or install x11-apps/xdm package"
- eend 255
- fi
- fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
- if [ -e /etc/inittab ] ; then
- grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
- elif [ -e /etc/ttys ] ; then
- grep -q "^ttyv$(($1 - 1))" /etc/ttys
- else
- return 1
- fi
-}
-
-start() {
- local EXE NAME PIDFILE AUTOCLEAN_CGROUP
- setup_dm
-
- if [ -f /etc/.noxdm ]; then
- einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
- rm /etc/.noxdm
- return 0
- fi
-
- ebegin "Setting up ${EXE##*/}"
-
- # save the prefered DM
- save_options "service" "${EXE}"
- save_options "name" "${NAME}"
- save_options "pidfile" "${PIDFILE}"
- save_options "start_stop_args" "${START_STOP_ARGS}"
- save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
-
- if [ -n "${CHECKVT-y}" ] ; then
- if vtstatic "${CHECKVT:-7}" ; then
- if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
- ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
- telinit a >/dev/null 2>&1
- return 0
- else
- eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
- return 1
- fi
- fi
- fi
-
- /etc/X11/startDM.sh
- eend 0
-}
-
-stop() {
- local curvt retval
-
- retval=0
- if [ -t 0 ]; then
- if type fgconsole >/dev/null 2>&1; then
- curvt=$(fgconsole 2>/dev/null)
- else
- curvt=$(tty)
- case "${curvt}" in
- /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
- *) curvt= ;;
- esac
- fi
- fi
- local myexe myname mypidfile myservice
- myexe=$(get_options "service")
- myname=$(get_options "name")
- mypidfile=$(get_options "pidfile")
- myservice=${myexe##*/}
- yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
-
- [ -z "${myexe}" ] && return 0
-
- ebegin "Stopping ${myservice}"
-
- if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
- start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
- ${mypidfile:+--pidfile} ${mypidfile} \
- ${myname:+--name} ${myname}
- retval=${?}
- fi
-
- # switch back to original vt
- if [ -n "${curvt}" ]; then
- if type chvt >/dev/null 2>&1; then
- chvt "${curvt}"
- else
- vidcontrol -s "$((curvt + 1))"
- fi
- fi
-
- eend ${retval} "Error stopping ${myservice}"
- return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11
deleted file mode 100644
index 2f7b47c..0000000
--- a/x11-base/xorg-server/files/xdm.initd-11
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-11,v 1.1 2014/04/14 16:19:25 chithanh Exp $
-
-# This is here to serve as a note to myself, and future developers.
-#
-# Any Display manager (gdm,kdm,xdm) has the following problem: if
-# it is started before any getty, and no vt is specified, it will
-# usually run on vt2. When the getty on vt2 then starts, and the
-# DM is already started, the getty will take control of the keyboard,
-# leaving us with a "dead" keyboard.
-#
-# Resolution: add the following line to /etc/inittab
-#
-# x:a:once:/etc/X11/startDM.sh
-#
-# and have /etc/X11/startDM.sh start the DM in daemon mode if
-# a lock is present (with the info of what DM should be started),
-# else just fall through.
-#
-# How this basically works, is the "a" runlevel is a additional
-# runlevel that you can use to fork processes with init, but the
-# runlevel never gets changed to this runlevel. Along with the "a"
-# runlevel, the "once" key word means that startDM.sh will only be
-# run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runlevel, as was
-# done previously.
-#
-# This script then just calls "telinit a", and init will run
-# /etc/X11/startDM.sh after the current runlevel completes (this
-# script should only be added to the actual runlevel the user is
-# using).
-#
-# Martin Schlemmer
-# aka Azarah
-# 04 March 2002
-
-depend() {
- need localmount xdm-setup
-
- # this should start as early as possible
- # we can't do 'before *' as that breaks it
- # (#139824) Start after ypbind and autofs for network authentication
- # (#145219 #180163) Could use lirc mouse as input device
- # (#70689 comment #92) Start after consolefont to avoid display corruption
- # (#291269) Start after quota, since some dm need readable home
- # (#390609) gdm-3 will fail when dbus is not running
- # (#366753) starting keymaps after X causes problems
- after bootmisc consolefont modules netmount
- after readahead-list ypbind autofs openvpn gpm lircmd
- after quota keymaps
- before alsasound
-
- # Start before X
- use consolekit dbus xfs
-}
-
-setup_dm() {
- local MY_XDM
-
- MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')
-
- # Load our root path from profile.env
- # Needed for kdm
- PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")
-
- NAME=
- case "${MY_XDM}" in
- kdm|kde)
- EXE=/usr/bin/kdm
- PIDFILE=/run/kdm.pid
- ;;
- entrance*)
- EXE=/usr/sbin/entrance
- PIDFILE=/run/entrance.pid
- ;;
- gdm|gnome)
- # gdm-3 and above has different paths
- if [ -f /usr/sbin/gdm ]; then
- EXE=/usr/sbin/gdm
- PIDFILE=/run/gdm/gdm.pid
- START_STOP_ARGS="--background"
- AUTOCLEAN_CGROUP="yes"
- else
- EXE=/usr/bin/gdm
- PIDFILE=/run/gdm.pid
- fi
- [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
- ;;
- wdm)
- EXE=/usr/bin/wdm
- PIDFILE=
- ;;
- gpe)
- EXE=/usr/bin/gpe-dm
- PIDFILE=/run/gpe-dm.pid
- ;;
- lxdm)
- EXE=/usr/sbin/lxdm-binary
- PIDFILE=/run/lxdm.pid
- START_STOP_ARGS="--background"
- ;;
- lightdm)
- EXE=/usr/sbin/lightdm
- PIDFILE=/run/lightdm.pid
- START_STOP_ARGS="--background"
- ;;
- sddm)
- EXE="/usr/bin/sddm"
- START_STOP_ARGS="-m --background"
- PIDFILE=/run/sddm.pid
- ;;
- *)
- # first find out if there is such executable
- EXE="$(command -v ${MY_XDM} 2>/dev/null)"
- PIDFILE="/run/${MY_XDM}.pid"
-
- # warn user that he is doing sick things if the exe was not found
- if [ -z "${EXE}" ]; then
- echo "ERROR: Your XDM value is invalid."
- echo " No ${MY_XDM} executable could be found on your system."
- fi
- ;;
- esac
-
- if ! [ -x "${EXE}" ]; then
- EXE=/usr/bin/xdm
- PIDFILE=/run/xdm.pid
- if ! [ -x "/usr/bin/xdm" ]; then
- echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
- echo " or install x11-apps/xdm package"
- eend 255
- fi
- fi
-}
-
-# Check to see if something is defined on our VT
-vtstatic() {
- if [ -e /etc/inittab ] ; then
- grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
- elif [ -e /etc/ttys ] ; then
- grep -q "^ttyv$(($1 - 1))" /etc/ttys
- else
- return 1
- fi
-}
-
-start() {
- local EXE NAME PIDFILE AUTOCLEAN_CGROUP
- setup_dm
-
- if [ -f /etc/.noxdm ]; then
- einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."
- rm /etc/.noxdm
- return 0
- fi
-
- ebegin "Setting up ${EXE##*/}"
-
- # save the prefered DM
- save_options "service" "${EXE}"
- save_options "name" "${NAME}"
- save_options "pidfile" "${PIDFILE}"
- save_options "start_stop_args" "${START_STOP_ARGS}"
- save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
-
- if [ -n "${CHECKVT-y}" ] ; then
- if vtstatic "${CHECKVT:-7}" ; then
- if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then
- ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later"
- telinit a >/dev/null 2>&1
- return 0
- else
- eerror "Something is already defined on VT ${CHECKVT:-7}, not starting"
- return 1
- fi
- fi
- fi
-
- /etc/X11/startDM.sh
- eend 0
-}
-
-stop() {
- local curvt retval
-
- retval=0
- if [ -t 0 ]; then
- if type fgconsole >/dev/null 2>&1; then
- curvt=$(fgconsole 2>/dev/null)
- else
- curvt=$(tty)
- case "${curvt}" in
- /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;;
- *) curvt= ;;
- esac
- fi
- fi
- local myexe myname mypidfile myservice
- myexe=$(get_options "service")
- myname=$(get_options "name")
- mypidfile=$(get_options "pidfile")
- myservice=${myexe##*/}
- yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
-
- [ -z "${myexe}" ] && return 0
-
- ebegin "Stopping ${myservice}"
-
- if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
- start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
- ${mypidfile:+--pidfile} ${mypidfile} \
- ${myname:+--name} ${myname}
- retval=${?}
- fi
-
- # switch back to original vt
- if [ -n "${curvt}" ]; then
- if type chvt >/dev/null 2>&1; then
- chvt "${curvt}"
- else
- vidcontrol -s "$((curvt + 1))"
- fi
- fi
-
- eend ${retval} "Error stopping ${myservice}"
- return ${retval}
-}
-
-# vim: set ts=4 :
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-4396.patch b/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-4396.patch
deleted file mode 100644
index 4b6727e..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-cve-2013-4396.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Mon, 16 Sep 2013 21:47:16 -0700
-Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText()
- [CVE-2013-4396]
-
-Save a pointer to the passed in closure structure before copying it
-and overwriting the *c pointer to point to our copy instead of the
-original. If we hit an error, once we free(c), reset c to point to
-the original structure before jumping to the cleanup code that
-references *c.
-
-Since one of the errors being checked for is whether the server was
-able to malloc(c->nChars * itemSize), the client can potentially pass
-a number of characters chosen to cause the malloc to fail and the
-error path to be taken, resulting in the read from freed memory.
-
-Since the memory is accessed almost immediately afterwards, and the
-X server is mostly single threaded, the odds of the free memory having
-invalid contents are low with most malloc implementations when not using
-memory debugging features, but some allocators will definitely overwrite
-the memory there, leading to a likely crash.
-
-Reported-by: Pedro Ribeiro <pedrib@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
----
- dix/dixfonts.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index feb765d..2e34d37 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
- GC *pGC;
- unsigned char *data;
- ITclosurePtr new_closure;
-+ ITclosurePtr old_closure;
-
- /* We're putting the client to sleep. We need to
- save some state. Similar problem to that handled
-@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c)
- err = BadAlloc;
- goto bail;
- }
-+ old_closure = c;
- *new_closure = *c;
- c = new_closure;
-
- data = malloc(c->nChars * itemSize);
- if (!data) {
- free(c);
-+ c = old_closure;
- err = BadAlloc;
- goto bail;
- }
-@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
- if (!pGC) {
- free(c->data);
- free(c);
-+ c = old_closure;
- err = BadAlloc;
- goto bail;
- }
-@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
- FreeScratchGC(pGC);
- free(c->data);
- free(c);
-+ c = old_closure;
- err = BadAlloc;
- goto bail;
- }
---
-1.7.9.2
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
deleted file mode 100644
index df43dbd..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2011-10-31 19:40:02.000000000 +0100
-+++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100
-@@ -1624,7 +1624,6 @@
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*|ia64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
deleted file mode 100644
index 24a5a02..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -r --context xorg-server-1.12.3/hw/xfree86/common/compiler.h xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h
-*** xorg-server-1.12.3/hw/xfree86/common/compiler.h 2012-07-06 07:17:19.000000000 +0200
---- xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h 2012-08-29 00:14:39.000000000 +0200
-***************
-*** 421,426 ****
---- 421,474 ----
- #include <machine/pio.h>
- #endif /* __NetBSD__ */
-
-+ #elif defined(linux) && defined(__ia64__)
-+ /* for Linux on ia64, we use the LIBC _inx/_outx routines */
-+ /* note that the appropriate setup via "ioperm" needs to be done */
-+ /* *before* any inx/outx is done. */
-+
-+ extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
-+ extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
-+ extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
-+ extern _X_EXPORT unsigned int _inb(unsigned long port);
-+ extern _X_EXPORT unsigned int _inw(unsigned long port);
-+ extern _X_EXPORT unsigned int _inl(unsigned long port);
-+
-+ static __inline__ void
-+ outb(unsigned long port, unsigned char val)
-+ {
-+ _outb(val, port);
-+ }
-+
-+ static __inline__ void
-+ outw(unsigned long port, unsigned short val)
-+ {
-+ _outw(val, port);
-+ }
-+
-+ static __inline__ void
-+ outl(unsigned long port, unsigned int val)
-+ {
-+ _outl(val, port);
-+ }
-+
-+ static __inline__ unsigned int
-+ inb(unsigned long port)
-+ {
-+ return _inb(port);
-+ }
-+
-+ static __inline__ unsigned int
-+ inw(unsigned long port)
-+ {
-+ return _inw(port);
-+ }
-+
-+ static __inline__ unsigned int
-+ inl(unsigned long port)
-+ {
-+ return _inl(port);
-+ }
-+
- #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
-
- #include <inttypes.h>
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
deleted file mode 100644
index 57c7349..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
---- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 18:26:42.000000000 +0200
-+++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 18:28:54.000000000 +0200
-@@ -1109,39 +1109,38 @@
- static void
- RemoveChild(ModuleDescPtr child)
- {
- ModuleDescPtr mdp;
- ModuleDescPtr prevsib;
- ModuleDescPtr parent;
-
- if (!child->parent)
- return;
-
- parent = child->parent;
- if (parent->child == child) {
- parent->child = child->sib;
-- return;
-- }
--
-- prevsib = parent->child;
-- mdp = prevsib->sib;
-- while (mdp && mdp != child) {
-- prevsib = mdp;
-- mdp = mdp->sib;
-+ }
-+ else {
-+ prevsib = parent->child;
-+ mdp = prevsib->sib;
-+ while (mdp && mdp != child) {
-+ prevsib = mdp;
-+ mdp = mdp->sib;
-+ }
-+ if (mdp == child)
-+ prevsib->sib = child->sib;
- }
-- if (mdp == child)
-- prevsib->sib = child->sib;
- child->sib = NULL;
-- return;
- }
-
- void
- LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
- {
- const char *msg;
- MessageType type = X_ERROR;
-
- switch (errmaj) {
- case LDR_NOERROR:
- msg = "no error";
- break;
- case LDR_NOMEM:
diff --git a/x11-base/xorg-server/files/xorg-server-1.14.3-musl.patch b/x11-base/xorg-server/files/xorg-server-1.14.3-musl.patch
deleted file mode 100644
index dae9848..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.14.3-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur a/xorg-server-1.14.3/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server-1.14.3/hw/xfree86/os-support/xf86_OSlib.h
---- a/xorg-server-1.14.3/hw/xfree86/os-support/xf86_OSlib.h
-+++ b/xorg-server-1.14.3/hw/xfree86/os-support/xf86_OSlib.h
-@@ -179,7 +179,7 @@
- #include <assert.h>
-
- #ifdef __linux__
--#include <termio.h>
-+#include <termios.h>
- #else /* __GLIBC__ */
- #include <termios.h>
- #endif
-diff -ur a/xorg-server-1.14.3/os/access.c b/xorg-server-1.14.3/os/access.c
---- a/xorg-server-1.14.3/os/access.c
-+++ b/xorg-server-1.14.3/os/access.c
-@@ -89,6 +89,7 @@
- #define XSERV_t
- #define TRANS_SERVER
- #define TRANS_REOPEN
-+#define _GNU_SOURCE
- #include <X11/Xtrans/Xtrans.h>
- #include <X11/Xauth.h>
- #include <X11/X.h>
-@@ -98,6 +99,7 @@
- #include <errno.h>
- #include <sys/types.h>
- #ifndef WIN32
-+#define _GNU_SOURCE
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <ctype.h>
diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
deleted file mode 100644
index cc80e6c..0000000
--- a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
-Subject: [PATCH] Don't build the ACPI code.
-
-No good can come of this.
----
- configure.ac | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
- case $host_cpu in
- ia64*)
- linux_ia64=yes
-- linux_acpi="yes"
- ;;
- alpha*)
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
---
-1.6.1.3
-
diff --git a/x11-base/xorg-server/files/xorg-sets.conf b/x11-base/xorg-server/files/xorg-sets.conf
deleted file mode 100644
index 5cd8112..0000000
--- a/x11-base/xorg-server/files/xorg-sets.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Rebuild all X11 modules (mostly useful after xorg-server ABI change).
-[x11-module-rebuild]
-class = portage.sets.dbapi.VariableSet
-world-candidate = false
-variable = CATEGORY
-includes = x11-drivers
diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
deleted file mode 100644
index c5056f1..0000000
--- a/x11-base/xorg-server/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<use>
- <flag name='dmx'>Build the Distributed Multiheaded X server</flag>
- <flag name='kdrive'>Build the kdrive X servers</flag>
- <flag name='tslib'>Build with tslib support for touchscreen devices</flag>
- <flag name='unwind'>Enable libunwind usage for backtraces</flag>
- <flag name='xnest'>Build the Xnest server</flag>
- <flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
- <flag name='xvfb'>Build the Xvfb server</flag>
-</use>
-<upstream>
- <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-base/xorg-server/xorg-server-1.14.3-r99.ebuild b/x11-base/xorg-server/xorg-server-1.14.3-r99.ebuild
deleted file mode 100644
index 217b33c..0000000
--- a/x11-base/xorg-server/xorg-server-1.14.3-r99.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.3-r2.ebuild,v 1.10 2013/10/22 07:36:05 ago Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-# avoid maintainer mode, bug #484634
-XORG_EAUTORECONF=yes
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~mips ppc x86"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
-
-RDEPEND=">=app-eselect/eselect-opengl-1.0.8
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.20
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.2.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.99.4
- >=x11-libs/libXfixes-5.0
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- x11-libs/libXrender
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.99.2
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-8[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 )
- udev? ( >=virtual/udev-150 )
- >=x11-apps/xinit-1.3
- selinux? ( sec-policy/selinux-xserver )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-5.0
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.16
- >=x11-proto/inputproto-2.2.99.1
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.4.0
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.2.0
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.1.99
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.22
- dmx? (
- >=x11-proto/dmxproto-2.2.99.1
- doc? (
- || (
- www-client/links
- www-client/lynx
- www-client/w3m
- )
- )
- )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.8
- )"
-
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )"
-
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-#)
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- "${FILESDIR}"/${PN}-1.12-cve-2013-4396.patch
- "${FILESDIR}"/${PN}-1.14.3-musl.patch
-)
-
-pkg_pretend() {
- # older gcc is not supported
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo
- # package it somewhere
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable dmx)
- $(use_enable kdrive)
- $(use_enable kdrive kdrive-kbd)
- $(use_enable kdrive kdrive-mouse)
- $(use_enable kdrive kdrive-evdev)
- $(use_enable suid install-setuid)
- $(use_enable tslib)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xnest)
- $(use_enable xorg)
- $(use_enable xvfb)
- $(use_enable nptl glx-tls)
- $(use_enable udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- --enable-libdrm
- --sysconfdir="${EPREFIX}"/etc/X11
- --localstatedir="${EPREFIX}"/var
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts
- --with-xkb-output="${EPREFIX}"/var/lib/xkb
- --disable-config-hal
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- )
-
- # Xorg-server requires includes from OS mesa which are not visible for
- # users of binary drivers.
- mkdir -p "${T}/mesa-symlinks/GL"
- for i in gl glx glxmd glxproto glxtokens; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- for i in glext glxext; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- append-cppflags "-I${T}/mesa-symlinks"
-
- xorg-2_src_configure
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
- fi
-
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-10 xdm
- newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set xorg-x11 --use-old
-
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
- ewarn "because the ABI changed. If you cannot start X because"
- ewarn "of module version mismatch errors, this is your problem."
-
- echo
- ewarn "You can rebuild all installed packages in the x11-drivers"
- ewarn "category using this command:"
- ewarn " emerge @x11-module-rebuild"
- fi
-
- if use udev && has_version virtual/udev[-keymap]; then
- ewarn "virtual/udev was built without keymap support. This may cause input device"
- ewarn "autoconfiguration to fail."
- fi
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}
-
-dynamic_libgl_install() {
- # next section is to setup the dynamic libGL stuff
- ebegin "Moving GL files for dynamic switching"
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
- local x=""
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
- fi
- done
- eend 0
-}
-
-server_based_install() {
- if ! use xorg; then
- rm "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x
- fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.15.0-r99.ebuild b/x11-base/xorg-server/xorg-server-1.15.0-r99.ebuild
deleted file mode 100644
index d6f7ab2..0000000
--- a/x11-base/xorg-server/xorg-server-1.15.0-r99.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.0.ebuild,v 1.6 2014/03/28 01:51:18 jer Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~x86"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
-
-RDEPEND=">=app-eselect/eselect-opengl-1.0.8
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.20
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.3.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.99.4
- >=x11-libs/libXfixes-5.0
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- x11-libs/libXrender
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.99.2
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-9.2.0[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 )
- udev? ( >=virtual/udev-150 )
- unwind? ( sys-libs/libunwind )
- >=x11-apps/xinit-1.3
- selinux? ( sec-policy/selinux-xserver )"
-
-DEPEND="${RDEPEND}
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-5.0
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.17
- >=x11-proto/inputproto-2.2.99.1
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.4.0
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.2.0
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.2.99.901
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.22
- >=x11-proto/presentproto-1.0
- >=x11-proto/dri3proto-1.0
- dmx? (
- >=x11-proto/dmxproto-2.2.99.1
- doc? (
- || (
- www-client/links
- www-client/lynx
- www-client/w3m
- )
- )
- )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.8
- )"
-
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )"
-
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-#)
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- "${FILESDIR}"/${PN}-1.14.3-musl.patch
-)
-
-pkg_pretend() {
- # older gcc is not supported
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo
- # package it somewhere
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable dmx)
- $(use_enable kdrive)
- $(use_enable kdrive kdrive-kbd)
- $(use_enable kdrive kdrive-mouse)
- $(use_enable kdrive kdrive-evdev)
- $(use_enable suid install-setuid)
- $(use_enable tslib)
- $(use_enable unwind libunwind)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xnest)
- $(use_enable xorg)
- $(use_enable xvfb)
- $(use_enable nptl glx-tls)
- $(use_enable udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- --enable-libdrm
- --sysconfdir="${EPREFIX}"/etc/X11
- --localstatedir="${EPREFIX}"/var
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts
- --with-xkb-output="${EPREFIX}"/var/lib/xkb
- --disable-config-hal
- --disable-linux-acpi
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- --with-sha1=libcrypto
- )
-
- # Xorg-server requires includes from OS mesa which are not visible for
- # users of binary drivers.
- mkdir -p "${T}/mesa-symlinks/GL"
- for i in gl glx glxmd glxproto glxtokens; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- for i in glext glxext; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- append-cppflags "-I${T}/mesa-symlinks"
-
- xorg-2_src_configure
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
- fi
-
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-10 xdm
- newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set xorg-x11 --use-old
-
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
- ewarn "because the ABI changed. If you cannot start X because"
- ewarn "of module version mismatch errors, this is your problem."
-
- echo
- ewarn "You can rebuild all installed packages in the x11-drivers"
- ewarn "category using this command:"
- ewarn " emerge @x11-module-rebuild"
- fi
-
- if use udev && has_version virtual/udev[-keymap]; then
- ewarn "virtual/udev was built without keymap support. This may cause input device"
- ewarn "autoconfiguration to fail."
- fi
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}
-
-dynamic_libgl_install() {
- # next section is to setup the dynamic libGL stuff
- ebegin "Moving GL files for dynamic switching"
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
- local x=""
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
- fi
- done
- eend 0
-}
-
-server_based_install() {
- if ! use xorg; then
- rm "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x
- fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r99.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r99.ebuild
deleted file mode 100644
index f5e05c2..0000000
--- a/x11-base/xorg-server/xorg-server-1.15.2-r99.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.15.2-r1.ebuild,v 1.8 2015/01/16 08:08:28 ago Exp $
-
-EAPI=5
-
-XORG_EAUTORECONF=yes
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.16-cve-2014-8091..8103.patches.tar.xz"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev unwind"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.0.8
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.20
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.3.2
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.99.4
- >=x11-libs/libXfixes-5.0
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- x11-libs/libXrender
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.99.2
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-9.2.0[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 )
- udev? ( >=virtual/udev-150 )
- unwind? ( sys-libs/libunwind )
- >=x11-apps/xinit-1.3"
-
-DEPEND="${CDEPEND}
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-5.0
- >=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.17
- >=x11-proto/inputproto-2.2.99.1
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.4.0
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.2.0
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.2.99.901
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.22
- >=x11-proto/presentproto-1.0
- >=x11-proto/dri3proto-1.0
- dmx? (
- >=x11-proto/dmxproto-2.2.99.1
- doc? (
- || (
- www-client/links
- www-client/lynx
- www-client/w3m
- )
- )
- )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.8
- )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )"
-
-pkg_pretend() {
- # older gcc is not supported
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_prepare() {
- UPSTREAMED_PATCHES=(
- "${WORKDIR}"/patches/*.patch
- )
- PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- "${FILESDIR}"/${PN}-1.14.3-musl.patch
- )
- xorg-2_src_prepare
-}
-
-src_configure() {
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo
- # package it somewhere
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable dmx)
- $(use_enable kdrive)
- $(use_enable kdrive kdrive-kbd)
- $(use_enable kdrive kdrive-mouse)
- $(use_enable kdrive kdrive-evdev)
- $(use_enable suid install-setuid)
- $(use_enable tslib)
- $(use_enable unwind libunwind)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xnest)
- $(use_enable xorg)
- $(use_enable xvfb)
- $(use_enable nptl glx-tls)
- $(use_enable udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- --enable-libdrm
- --sysconfdir="${EPREFIX}"/etc/X11
- --localstatedir="${EPREFIX}"/var
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts
- --with-xkb-output="${EPREFIX}"/var/lib/xkb
- --disable-config-hal
- --disable-linux-acpi
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- --with-sha1=libcrypto
- )
-
- # Xorg-server requires includes from OS mesa which are not visible for
- # users of binary drivers.
- mkdir -p "${T}/mesa-symlinks/GL"
- for i in gl glx glxmd glxproto glxtokens; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- for i in glext glxext; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- append-cppflags "-I${T}/mesa-symlinks"
-
- xorg-2_src_configure
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
- fi
-
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-11 xdm
- newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set xorg-x11 --use-old
-
- if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
- ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
- ewarn "because the ABI changed. If you cannot start X because"
- ewarn "of module version mismatch errors, this is your problem."
-
- echo
- ewarn "You can rebuild all installed packages in the x11-drivers"
- ewarn "category using this command:"
- ewarn " emerge @x11-module-rebuild"
- fi
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}
-
-dynamic_libgl_install() {
- # next section is to setup the dynamic libGL stuff
- ebegin "Moving GL files for dynamic switching"
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
- local x=""
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
- fi
- done
- eend 0
-}
-
-server_based_install() {
- if ! use xorg; then
- rm "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x
- fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild
deleted file mode 100644
index 5c88b4a..0000000
--- a/x11-base/xorg-server/xorg-server-1.16.4-r99.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4.ebuild,v 1.5 2015/02/20 11:17:22 ago Exp $
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/1.16.1"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-
-IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.0.8
- !>=app-eselect/eselect-opengl-1.3.0
- dev-libs/openssl
- media-libs/freetype
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.20
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.3.3
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.99.4
- >=x11-libs/libXfixes-5.0
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- x11-libs/libXrender
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.99.2
- )
- glamor? (
- media-libs/libepoxy
- media-libs/mesa[egl,gbm]
- !x11-libs/glamor
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-9.2.0[nptl=]
- )
- tslib? ( >=x11-libs/tslib-1.0 )
- udev? ( >=virtual/udev-150 )
- unwind? ( sys-libs/libunwind )
- wayland? (
- >=dev-libs/wayland-1.3.0
- media-libs/libepoxy
- )
- >=x11-apps/xinit-1.3
- systemd? (
- sys-apps/dbus
- sys-apps/systemd
- )"
-
-DEPEND="${CDEPEND}
- sys-devel/flex
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-5.0
- >=x11-proto/fontsproto-2.1.3
- >=x11-proto/glproto-1.4.17
- >=x11-proto/inputproto-2.2.99.1
- >=x11-proto/kbproto-1.0.3
- >=x11-proto/randrproto-1.4.0
- >=x11-proto/recordproto-1.13.99.1
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.2.0
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/trapproto-3.4.3
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.2.99.901
- >=x11-proto/xf86dgaproto-2.0.99.1
- >=x11-proto/xf86rushproto-1.1.2
- >=x11-proto/xf86vidmodeproto-2.2.99.1
- >=x11-proto/xineramaproto-1.1.3
- >=x11-proto/xproto-7.0.26
- >=x11-proto/presentproto-1.0
- >=x11-proto/dri3proto-1.0
- dmx? (
- >=x11-proto/dmxproto-2.2.99.1
- doc? (
- || (
- www-client/links
- www-client/lynx
- www-client/w3m
- )
- )
- )
- !minimal? (
- >=x11-proto/xf86driproto-2.1.0
- >=x11-proto/dri2proto-2.8
- )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )"
-
-#UPSTREAMED_PATCHES=(
-# "${WORKDIR}/patches/"
-#)
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- "${FILESDIR}"/${PN}-1.14.3-musl.patch
-)
-
-pkg_pretend() {
- # older gcc is not supported
- [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
- die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-src_configure() {
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
- # NOTE: fop is used for doc generating ; and i have no idea if gentoo
- # package it somewhere
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable dmx)
- $(use_enable glamor)
- $(use_enable kdrive)
- $(use_enable kdrive kdrive-kbd)
- $(use_enable kdrive kdrive-mouse)
- $(use_enable kdrive kdrive-evdev)
- $(use_enable suid install-setuid)
- $(use_enable tslib)
- $(use_enable unwind libunwind)
- $(use_enable wayland xwayland)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal install-libxf86config)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal glx)
- $(use_enable xnest)
- $(use_enable xorg)
- $(use_enable xvfb)
- $(use_enable nptl glx-tls)
- $(use_enable udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- $(use_with systemd systemd-daemon)
- $(use_enable systemd systemd-logind)
- --enable-libdrm
- --sysconfdir="${EPREFIX}"/etc/X11
- --localstatedir="${EPREFIX}"/var
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts
- --with-xkb-output="${EPREFIX}"/var/lib/xkb
- --disable-config-hal
- --disable-linux-acpi
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- --with-sha1=libcrypto
- )
-
- # Xorg-server requires includes from OS mesa which are not visible for
- # users of binary drivers.
- mkdir -p "${T}/mesa-symlinks/GL"
- for i in gl glx glxmd glxproto glxtokens; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- for i in glext glxext; do
- ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
- done
- append-cppflags "-I${T}/mesa-symlinks"
-
- xorg-2_src_configure
-}
-
-src_install() {
- xorg-2_src_install
-
- dynamic_libgl_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
- fi
-
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-11 xdm
- newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}
-
-dynamic_libgl_install() {
- # next section is to setup the dynamic libGL stuff
- ebegin "Moving GL files for dynamic switching"
- dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
- local x=""
- for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
- fi
- done
- eend 0
-}
-
-server_based_install() {
- if ! use xorg; then
- rm "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x
- fi
-}
diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch
deleted file mode 100644
index 263dc01..0000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libpciaccess-0.13.2/src/linux_sysfs.c
-+++ b/libpciaccess-0.13.2/src/linux_sysfs.c
-@@ -45,7 +45,7 @@
- #include <dirent.h>
- #include <errno.h>
-
--#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
-+#if defined(__i386__) || defined(__x86_64__)
- #include <sys/io.h>
- #else
- #define inb(x) -1
diff --git a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch b/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch
deleted file mode 100644
index 463b418..0000000
--- a/x11-libs/libpciaccess/files/libpciaccess-0.13.2-limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libpciaccess-0.13.2/src/linux_sysfs.c
-+++ b/libpciaccess-0.13.2/src/linux_sysfs.c
-@@ -44,6 +44,7 @@
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
-
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
- #include <sys/io.h>
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
deleted file mode 100644
index 84324a9..0000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.2-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.2.ebuild,v 1.11 2013/10/08 05:07:22 ago Exp $
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="minimal zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.13.2-limits.patch
- "${FILESDIR}"/${PN}-0.13.2-arm.patch
-)
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- "$(use_with zlib)"
- "--with-pciids-path=${EPREFIX}/usr/share/misc"
- )
-}
-
-src_install() {
- xorg-2_src_install
-
- if ! use minimal; then
- scanpci_install() {
- ${BASH} "${BUILD_DIR}/libtool" --mode=install "$(type -P install)" -c "${BUILD_DIR}/scanpci/scanpci" "${ED}"/usr/bin || die
- }
-
- dodir /usr/bin
- multilib_foreach_abi scanpci_install
- fi
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3-r99.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.3-r99.ebuild
deleted file mode 100644
index 5ae4774..0000000
--- a/x11-libs/libpciaccess/libpciaccess-0.13.3-r99.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild,v 1.4 2015/02/20 11:18:03 ago Exp $
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="minimal zlib"
-
-DEPEND="!<x11-base/xorg-server-1.5
- zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.13.2-limits.patch
- "${FILESDIR}"/${PN}-0.13.2-arm.patch
-)
-
-pkg_setup() {
- xorg-2_pkg_setup
-
- XORG_CONFIGURE_OPTIONS=(
- "$(use_with zlib)"
- "--with-pciids-path=${EPREFIX}/usr/share/misc"
- )
-}
-
-multilib_src_install() {
- default
-
- if multilib_is_native_abi; then
- dodir /usr/bin
- ${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
- fi
-}
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
deleted file mode 100644
index 01c4c00..0000000
--- a/x11-libs/libpciaccess/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-</pkgmetadata>
diff --git a/x11-misc/slim/files/Xsession-r3 b/x11-misc/slim/files/Xsession-r3
deleted file mode 100644
index 237fb36..0000000
--- a/x11-misc/slim/files/Xsession-r3
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/sh
-#
-# Slim login manager Xsession script
-#
-
-command="$@"
-
-# this will go into slim.log along with all other echo's
-# good for debugging where things go wrong
-echo "$0: Beginning session setup..."
-
-# First read /etc/profile and .profile
-test -f /etc/profile && . /etc/profile
-test -f "$HOME/.profile" && . "$HOME/.profile"
-# Second read /etc/xprofile and .xprofile for X specific setup
-test -f /etc/xprofile && . /etc/xprofile
-test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
-
-# wrap possible arguments to determine whether to treat special or not
-if [ "x$command" = "xcustom" ] || [ "x$command" = "xCustom" ] || [ "x$command" = "xdefault" ] || [ "x$command" = "xDefault" ]; then
- command="Xsession"
-fi
-if [ "x$command" = "x" ]; then
- # no default specified, check if Xsession will complete
- # and if not then assign XSESSION to command
- if [ -x "$HOME/.xsession" ] || [ -x "$HOME/.Xclients" ] || [ -x /etc/X11/xinit/Xclients ] || [ -x /etc/X11/Xclients ]; then
- command="Xsession"
- else
- command=$XSESSION
- fi
-fi
-
-# most of this is from /etc/X11/chooser.sh
-sessionscript=""
-if [ -n "${command}" ]; then
- # find a match for $command in /etc/X11/Sessions
- for x in /etc/X11/Sessions/* ; do
- if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" = "`echo ${command} | awk '{ print toupper($1) }'`" ]; then
- sessionscript=${x}
- break
- fi
- done
- if [ -n "${sessionscript}" ]; then
- if [ -x "${sessionscript}" ]; then
- command="${sessionscript}"
- else
- command="/bin/sh ${sessionscript}"
- fi
- else
-
- # find an executable for $command
- x=""
- y=""
-
- for x in "${command}" "`echo ${command} | awk '{ print toupper($1) }'`" "`echo ${command} | awk '{ print tolower($1) }'`"
- do
- # Fall through ...
- if [ -x "`which ${x} 2>/dev/null`" ]; then
- y="`which ${x} 2>/dev/null`"
- break
- fi
- done
- # note , if the command could not be found then $command will be empty
- command="$y"
- unset x
- unset y
- fi
-fi
-
-# call xrdb and xmodmap and such, since $command is not a session script
-if [ -z "${sessionscript}" ]; then
- userresources="$HOME/.Xresources"
- usermodmap="$HOME/.Xmodmap"
- userxkbmap="$HOME/.Xkbmap"
-
- sysresources=/etc/X11/Xresources
- sysmodmap=/etc/X11/Xmodmap
- sysxkbmap=/etc/X11/Xkbmap
-
- rh6sysresources=/etc/X11/xinit/Xresources
- rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
- # merge in defaults
- if [ -f "$rh6sysresources" ]; then
- xrdb -merge "$rh6sysresources"
- fi
-
- if [ -f "$sysresources" ]; then
- xrdb -merge "$sysresources"
- fi
-
- if [ -f "$userresources" ]; then
- xrdb -merge "$userresources"
- fi
-
- # merge in keymaps
- if [ -f "$sysxkbmap" ]; then
- setxkbmap `cat "$sysxkbmap"`
- XKB_IN_USE=yes
- fi
-
- if [ -f "$userxkbmap" ]; then
- setxkbmap `cat "$userxkbmap"`
- XKB_IN_USE=yes
- fi
-
- #
- # Eeek, this seems like too much magic here
- #
- if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
- if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
- xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
- if [ -n "$xkbsymbols" ]; then
- setxkbmap -symbols "$xkbsymbols"
- XKB_IN_USE=yes
- fi
- fi
- fi
-
- # xkb and xmodmap don't play nice together
- if [ -z "$XKB_IN_USE" ]; then
- if [ -f "$rh6sysmodmap" ]; then
- xmodmap "$rh6sysmodmap"
- fi
-
- if [ -f "$sysmodmap" ]; then
- xmodmap "$sysmodmap"
- fi
-
- if [ -f "$usermodmap" ]; then
- xmodmap "$usermodmap"
- fi
- fi
-
- unset XKB_IN_USE
-fi
-unset sessionscript
-
-# start failsafe session
-if [ -z "${command}" ]; then
- echo "$0: Failed to find a command to start the session, so starting a failsafe xterm."
- exec xterm -geometry 80x24+0+0
-fi
-
-# run all system xinitrc shell scripts which will update command
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for i in /etc/X11/xinit/xinitrc.d/* ; do
- if [ -x "$i" ]; then
- . "$i"
- fi
- done
- unset i
-fi
-
-echo "$0: Setup done, will execute: $command"
-exec $command
-
-# vim:ts=4
diff --git a/x11-misc/slim/files/slim-1.3.5-arm.patch b/x11-misc/slim/files/slim-1.3.5-arm.patch
deleted file mode 100644
index 9438ce4..0000000
--- a/x11-misc/slim/files/slim-1.3.5-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Ck.cpp 2012-06-26 04:20:14.000000000 -0400
-+++ b/Ck.cpp 2012-10-05 13:25:29.000000000 -0400
-@@ -91,7 +91,7 @@
-
- vt = *((long *)return_value);
-
-- std::snprintf(device, 32, "/dev/tty%ld", vt);
-+ std::sprintf(device, "/dev/tty%ld", vt);
-
- if(return_value)
- XFree(return_value);
diff --git a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch b/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
deleted file mode 100644
index f7e3617..0000000
--- a/x11-misc/slim/files/slim-1.3.5-disable-ck-for-systemd.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -Naur slim-1.3.5/app.cpp slim-1.3.5.new/app.cpp
---- slim-1.3.5/app.cpp 2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5.new/app.cpp 2013-08-22 14:16:37.994854259 -0400
-@@ -138,11 +138,14 @@
- daemonmode = false;
- force_nodaemon = false;
- firstlogin = true;
-+#ifdef USE_CONSOLEKIT
-+ consolekit_support_enabled = true;
-+#endif
- Dpy = NULL;
-
- /* Parse command line
- Note: we force a option for nodaemon switch to handle "-nodaemon" */
-- while((tmp = getopt(argc, argv, "vhp:n:d?")) != EOF) {
-+ while((tmp = getopt(argc, argv, "vhsp:n:d?")) != EOF) {
- switch (tmp) {
- case 'p': /* Test theme */
- testtheme = optarg;
-@@ -163,6 +166,11 @@
- std::cout << APPNAME << " version " << VERSION << endl;
- exit(OK_EXIT);
- break;
-+#ifdef USE_CONSOLEKIT
-+ case 's': /* Disable consolekit support */
-+ consolekit_support_enabled = false;
-+ break;
-+#endif
- case '?': /* Illegal */
- logStream << endl;
- case 'h': /* Help */
-@@ -171,6 +179,9 @@
- << " -d: daemon mode" << endl
- << " -nodaemon: no-daemon mode" << endl
- << " -v: show version" << endl
-+#ifdef USE_CONSOLEKIT
-+ << " -s: start for systemd, disable consolekit support" << endl
-+#endif
- << " -p /path/to/theme/dir: preview theme" << endl;
- exit(OK_EXIT);
- break;
-@@ -559,6 +570,7 @@
- #endif
-
- #ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled) {
- /* Setup the ConsoleKit session */
- try {
- ck.open_session(DisplayName, pw->pw_uid);
-@@ -567,6 +579,7 @@
- logStream << APPNAME << ": " << e << endl;
- exit(ERR_EXIT);
- }
-+ }
- #endif
-
- /* Create new process */
-@@ -578,6 +591,7 @@
- char** child_env = pam.getenvlist();
-
- # ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled) {
- char** old_env = child_env;
-
- /* Grow the copy of the environment for the session cookie */
-@@ -590,6 +604,7 @@
- memcpy(child_env, old_env, sizeof(char*)*n+1);
- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- child_env[n] = NULL;
-+ }
- # endif /* USE_CONSOLEKIT */
- #else
-
-@@ -611,6 +626,7 @@
- child_env[n++]=StrConcat("MAIL=", maildir.c_str());
- child_env[n++]=StrConcat("XAUTHORITY=", xauthority.c_str());
- # ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled)
- child_env[n++]=StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- # endif /* USE_CONSOLEKIT */
- child_env[n++]=0;
-@@ -656,12 +672,14 @@
- }
-
- #ifdef USE_CONSOLEKIT
-+ if (consolekit_support_enabled) {
- try {
- ck.close_session();
- }
- catch(Ck::Exception &e) {
- logStream << APPNAME << ": " << e << endl;
- };
-+ }
- #endif
-
- #ifdef USE_PAM
-diff -Naur slim-1.3.5/app.h slim-1.3.5.new/app.h
---- slim-1.3.5/app.h 2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5.new/app.h 2013-08-22 14:12:45.536850016 -0400
-@@ -108,6 +108,10 @@
- char *testtheme;
- bool testing;
-
-+#ifdef USE_CONSOLEKIT
-+ bool consolekit_support_enabled;
-+#endif
-+
- std::string themeName;
- std::string mcookie;
-
-diff -Naur slim-1.3.5/slim.service slim-1.3.5.new/slim.service
---- slim-1.3.5/slim.service 2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5.new/slim.service 2013-08-22 14:15:39.186853186 -0400
-@@ -3,7 +3,7 @@
- After=systemd-user-sessions.service
-
- [Service]
--ExecStart=/usr/bin/slim -nodaemon
-+ExecStart=/usr/bin/slim -nodaemon -s
-
- [Install]
- Alias=display-manager.service
diff --git a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch b/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch
deleted file mode 100644
index f137d94..0000000
--- a/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur slim-1.3.6.orig/panel.cpp slim-1.3.6/panel.cpp
---- slim-1.3.6.orig/panel.cpp 2014-06-18 11:04:57.958630814 -0400
-+++ slim-1.3.6/panel.cpp 2014-06-18 11:05:10.675631393 -0400
-@@ -11,6 +11,7 @@
-
- #include <sstream>
- #include <poll.h>
-+#include <libgen.h>
- #include <X11/extensions/Xrandr.h>
- #include "panel.h"
-
diff --git a/x11-misc/slim/files/slim-1.3.6-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff
deleted file mode 100644
index 9da6795..0000000
--- a/x11-misc/slim/files/slim-1.3.6-config.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- slim.conf.orig 2010-08-25 11:52:23.000000000 -0400
-+++ slim.conf 2010-08-25 11:58:58.000000000 -0400
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path /bin:/usr/bin:/usr/local/bin
- default_xserver /usr/bin/X
--#xserver_arguments -dpi 75
-+xserver_arguments -nolisten tcp -br -deferglyphs 16 vt07
-
- # Commands for halt, login, etc.
- halt_cmd /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
-
-
- # Activate numlock when slim starts. Valid values: on|off
--# numlock on
-+numlock on
-
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd exec /bin/sh - ~/.xinitrc %session
--login_cmd exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd exec /bin/bash -login ~/.xinitrc %session
-+login_cmd exec /bin/bash -login /usr/share/slim/Xsession %session
-
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,20 +42,30 @@
- #
- # sessionstart_cmd some command
- # sessionstop_cmd some command
-+sessionstart_cmd /usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd /usr/bin/sessreg -d -l :0.0 %user
-
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon yes
-+daemon yes
-
--# Available sessions (first one is the default).
--# The current chosen session name is replaced in the login_cmd
-+# Available sessions:
-+# The current chosen session name replaces %session in the login_cmd
- # above, so your login command can handle different sessions.
-+# If no session is chosen (via F1), %session will be an empty string.
- # see the xinitrc.sample file shipped with slim sources
--sessions xfce4,icewm-session,wmaker,blackbox
-+#sessions xfce4,icewm-session,wmaker,blackbox
-+# Alternatively, read available sessions from a directory of scripts:
-+#sessiondir /etc/X11/Sessions
-+# Or, read available sessions from the xsessions desktop files --
-+# note that this may provide a full path to the session executable!
-+sessiondir /usr/share/xsessions
-
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd import -window root /slim.png
-+#screenshot_cmd scrot /root/slim.png
-
- # welcome message. Available variables: %host, %domain
- welcome_msg Welcome to %host
-@@ -83,8 +91,8 @@
- # randomly choose from
- current_theme default
-
--# Lock file
--lockfile /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile /run/slim.pid
-
- # Log file
- logfile /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch b/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch
deleted file mode 100644
index cf2106a..0000000
--- a/x11-misc/slim/files/slim-1.3.6-drop-zlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt 2014-02-28 10:38:48.655262163 -0500
-+++ b/CMakeLists.txt 2014-02-28 10:47:01.671271162 -0500
-@@ -96,7 +96,6 @@
- find_package(Freetype REQUIRED)
- find_package(JPEG REQUIRED)
- find_package(PNG REQUIRED)
--find_package(ZLIB REQUIRED)
-
- # Fontconfig
- set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
deleted file mode 100644
index d5fc4db..0000000
--- a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/CMakeLists.txt 2013-10-27 21:24:21.193802669 -0400
-+++ b/CMakeLists.txt 2013-10-27 21:26:54.127806951 -0400
-@@ -220,7 +220,6 @@
- ####### install
- # slim
- install(TARGETS slim RUNTIME DESTINATION bin)
--install(TARGETS slimlock RUNTIME DESTINATION bin)
-
- if (BUILD_SHARED_LIBS)
- set_target_properties(libslim PROPERTIES
-@@ -235,8 +234,14 @@
-
- # man file
- install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
--install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
-+
-+#slimlock
-+if(BUILD_SLIMLOCK)
-+install(TARGETS slimlock RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
-+install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
-+endif(BUILD_SLIMLOCK)
-+
- # themes directory
- subdirs(themes)
diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
deleted file mode 100644
index 8335e0f..0000000
--- a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400
-+++ CMakeLists.txt.new 2013-10-15 11:33:18.975741094 -0400
-@@ -42,11 +42,6 @@
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
-
--# Flags
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
--set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
--
- # source
- set(slim_srcs
- main.cpp
diff --git a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch b/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
deleted file mode 100644
index 11e39dc..0000000
--- a/x11-misc/slim/files/slim-1.3.6-libslim-cmake-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/CMakeLists.txt 2013-10-15 11:35:16.688739802 -0400
-+++ b/CMakeLists.txt 2013-10-15 11:53:46.185727620 -0400
-@@ -115,6 +115,7 @@
- message("\tPAM Found")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
- target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
-+ target_link_libraries(libslim ${PAM_LIBRARY})
- target_link_libraries(slimlock ${PAM_LIBRARY})
- include_directories(${PAM_INCLUDE_DIR})
- else(PAM_FOUND)
-@@ -173,7 +174,10 @@
- )
-
- target_link_libraries(libslim
-- ${JPEG_LIBRARIES}
-+ ${RT_LIB}
-+ ${X11_Xft_LIB}
-+ ${X11_Xrandr_LIB}
-+ ${JPEG_LIBRARIES}
- ${PNG_LIBRARIES}
- )
-
-@@ -228,8 +228,8 @@
- SOVERSION ${SLIM_VERSION})
-
- install(TARGETS libslim
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SIFFUX}
- )
- endif (BUILD_SHARED_LIBS)
-
diff --git a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch b/x11-misc/slim/files/slim-1.3.6-session-chooser.patch
deleted file mode 100644
index b43c9a3..0000000
--- a/x11-misc/slim/files/slim-1.3.6-session-chooser.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- a/cfg.cpp 2013-10-01 18:38:05.000000000 -0400
-+++ b/cfg.cpp 2013-10-24 12:12:20.584103253 -0400
-@@ -274,14 +274,14 @@
- while (true) {
- string::const_iterator begin = s;
- while (*s != c && s != str.end()) { ++s; }
-- tmp = string(begin, s);
-- if (useEmpty || tmp.size() > 0)
-+ tmp = string(begin, s);
-+ if (useEmpty || tmp.size() > 0)
- v.push_back(tmp);
- if (s == str.end()) {
- break;
- }
- if (++s == str.end()) {
-- if (useEmpty)
-+ if (useEmpty)
- v.push_back("");
- break;
- }
-@@ -289,6 +289,7 @@
- }
-
- void Cfg::fillSessionList(){
-+ string strSessionList = getOption("sessions");
- string strSessionDir = getOption("sessiondir");
-
- sessions.clear();
-@@ -307,29 +308,29 @@
- struct stat oFileStat;
-
- if (stat(strFile.c_str(), &oFileStat) == 0) {
-- if (S_ISREG(oFileStat.st_mode) &&
-- access(strFile.c_str(), R_OK) == 0){
-- ifstream desktop_file( strFile.c_str() );
-- if (desktop_file){
-- string line, session_name = "", session_exec = "";
-- while (getline( desktop_file, line )) {
-- if (line.substr(0, 5) == "Name=") {
-- session_name = line.substr(5);
-- if (!session_exec.empty())
-- break;
-- } else
-- if (line.substr(0, 5) == "Exec=") {
-- session_exec = line.substr(5);
-- if (!session_name.empty())
-- break;
-- }
-- }
-- desktop_file.close();
-- pair<string,string> session(session_name,session_exec);
-- sessions.push_back(session);
-- cout << session_exec << " - " << session_name << endl;
-- }
--
-+ if (S_ISREG(oFileStat.st_mode) &&
-+ access(strFile.c_str(), R_OK) == 0){
-+ ifstream desktop_file( strFile.c_str() );
-+ if (desktop_file){
-+ string line, session_name = "", session_exec = "";
-+ while (getline( desktop_file, line )) {
-+ if (line.substr(0, 5) == "Name=") {
-+ session_name = line.substr(5);
-+ if (!session_exec.empty()) break;
-+ } else if (line.substr(0, 5) == "Exec=") {
-+ session_exec = line.substr(5);
-+ if (!session_name.empty()) break;
-+ }
-+ }
-+ desktop_file.close();
-+ if (!session_name.empty() && !session_exec.empty()) {
-+ pair<string,string> session(session_name,session_exec);
-+ sessions.push_back(session);
-+ } else if (access(strFile.c_str(), X_OK) == 0) {
-+ pair<string,string> session(string(pDirent->d_name),strFile);
-+ sessions.push_back(session);
-+ }
-+ }
- }
- }
- }
-@@ -338,8 +339,18 @@
- }
-
- if (sessions.empty()){
-- pair<string,string> session("","");
-- sessions.push_back(session);
-+ if (strSessionList.empty()) {
-+ pair<string,string> session("","");
-+ sessions.push_back(session);
-+ } else {
-+ // iterate through the split of the session list
-+ vector<string> sessit;
-+ split(sessit,strSessionList,',',false);
-+ for (vector<string>::iterator it = sessit.begin(); it != sessit.end(); ++it) {
-+ pair<string,string> session(*it,*it);
-+ sessions.push_back(session);
-+ }
-+ }
- }
- }
-
---- a/app.cpp 2013-10-24 12:16:59.870111072 -0400
-+++ b/app.cpp 2013-10-24 12:29:59.899132910 -0400
-@@ -377,10 +377,6 @@
- LoginPanel->SetName(cfg->getOption("default_user") );
- }
-
-- if (firstloop) {
-- LoginPanel->SwitchSession();
-- }
--
- if (!AuthenticateUser(focuspass && firstloop)){
- panelclosed = 0;
- firstloop = false;
diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
deleted file mode 100644
index f116c5e..0000000
--- a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400
-+++ CMakeLists.txt.new 2013-10-17 09:41:41.602917345 -0400
-@@ -238,10 +238,6 @@
- install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
--# systemd service file
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-- install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system)
--endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- # themes directory
- subdirs(themes)
-
diff --git a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch b/x11-misc/slim/files/slim-1.3.6-systemd-session.patch
deleted file mode 100644
index 0639aeb..0000000
--- a/x11-misc/slim/files/slim-1.3.6-systemd-session.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/app.cpp 2013-10-23 16:19:57.074100282 -0400
-+++ b/app.cpp 2013-10-23 16:33:13.302122574 -0400
-@@ -829,8 +829,13 @@
-
- StopServer();
- RemoveLock();
-- while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
-- Run();
-+ if (force_nodaemon) {
-+ delete LoginPanel;
-+ exit(ERR_EXIT); /* use ERR_EXIT so that systemd's RESTART=on-failure works */
-+ } else {
-+ while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
-+ Run();
-+ }
- }
-
- void App::KillAllClients(Bool top) {
---- a/slim.service 2013-10-23 16:19:57.074100282 -0400
-+++ b/slim.service 2013-10-23 16:45:14.901142776 -0400
-@@ -4,6 +4,7 @@
-
- [Service]
- ExecStart=/usr/bin/slim -nodaemon -s
-+Restart=on-failure
-
- [Install]
- Alias=display-manager.service
-Common subdirectories: slim-1.3.6/themes and slim-1.3.6.new/themes
diff --git a/x11-misc/slim/files/slim.logrotate b/x11-misc/slim/files/slim.logrotate
deleted file mode 100644
index 8901530..0000000
--- a/x11-misc/slim/files/slim.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
- compress
- rotate 4
- weekly
- delaycompress
- copytruncate
- missingok
- notifempty
-}
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
deleted file mode 100644
index f6d2292..0000000
--- a/x11-misc/slim/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>desktop-misc</herd>
- <maintainer>
- <email>axs@gentoo.org</email>
- </maintainer>
- <use>
- <flag name='consolekit'>Enable native consolekit support</flag>
- </use>
-</pkgmetadata>
-
diff --git a/x11-misc/slim/slim-1.3.6-r99.ebuild b/x11-misc/slim/slim-1.3.6-r99.ebuild
deleted file mode 100644
index cb553f5..0000000
--- a/x11-misc/slim/slim-1.3.6-r99.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild,v 1.2 2014/02/28 15:52:09 axs Exp $
-
-EAPI=5
-
-CMAKE_MIN_VERSION="2.8.8"
-inherit cmake-utils pam eutils systemd versionator
-
-DESCRIPTION="Simple Login Manager"
-HOMEPAGE="http://slim.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
-
-RDEPEND="x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXft
- x11-libs/libXrandr
- media-libs/libpng:0=
- virtual/jpeg:=
- x11-apps/sessreg
- consolekit? ( sys-auth/consolekit
- sys-apps/dbus )
- pam? ( virtual/pam
- !x11-misc/slimlock )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-proto/xproto"
-PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-
-src_prepare() {
- # Our Gentoo-specific config changes
- epatch "${FILESDIR}"/${P}-config.diff
- epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
- epatch "${FILESDIR}"/${P}-honour-cflags.patch
- epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
- epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
- epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
- epatch "${FILESDIR}"/${P}-systemd-session.patch
- epatch "${FILESDIR}"/${P}-session-chooser.patch
- epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
- epatch "${FILESDIR}"/${P}-drop-zlib.patch
- epatch "${FILESDIR}"/${P}-add-missing-libgen_h.patch
-
- if use elibc_FreeBSD; then
- sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
- || die
- fi
-
- if use branding; then
- sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die
- fi
-}
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use pam USE_PAM)
- $(cmake-utils_use consolekit USE_CONSOLEKIT)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use pam ; then
- pamd_mimic system-local-login slim auth account session
- pamd_mimic system-local-login slimlock auth
- fi
-
- systemd_dounit slim.service
-
- insinto /usr/share/slim
- newins "${FILESDIR}/Xsession-r3" Xsession
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/slim.logrotate" slim
-
- dodoc xinitrc.sample ChangeLog README TODO THEMES
-}
-
-pkg_postinst() {
- # note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog
- elog "The configuration file is located at /etc/slim.conf."
- elog
- elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
- elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
- fi
- if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
- elog
- elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
- elog "support, as well as selection between sessions available in"
- elog "/etc/X11/Sessions/ at login by pressing [F1]."
- elog
- elog "The XSESSION environment variable is still supported as a default"
- elog "if no session has been specified by the user."
- elog
- elog "If you want to use .xinitrc in the user's home directory for session"
- elog "management instead, see README and xinitrc.sample in"
- elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
- elog "accordingly."
- elog
- ewarn "Please note that slim supports consolekit directly. Please do not use any "
- ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
- ewarn "and enable USE=\"consolekit\" instead."
- ewarn
- fi
- if ! use pam; then
- elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
- elog "the console when restarting your window manager. If this is not desired, then"
- elog "please remerge ${PN} with USE=\"pam\""
- elog
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-24 16:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-24 16:09 [gentoo-commits] proj/hardened-dev:musl commit in: dev-libs/openssl/files/, net-libs/liblockfile/, net-misc/radvd/files/, Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox