From f28e165d86d4768116423bb15b98f2bffc2f710d Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Jun 2013 19:53:34 +0400 Subject: [PATCH] Sync with portage [Thu Jun 27 19:53:31 MSK 2013]. --- app-arch/tarsync/tarsync-0.2.1.ebuild | 25 - ....24.ebuild => backintime-1.0.24-r1.ebuild} | 10 +- .../files/xemacs-21.5.33-no-mule-build.patch | 33 + app-editors/xemacs/xemacs-21.5.33.ebuild | 14 +- ...ul-linux-x86-soundlibs-20130224-r2.ebuild} | 6 +- .../files/remove-native | 23 + app-emulation/q4wine/Manifest | 3 - app-emulation/q4wine/q4wine-0.121.ebuild | 44 - app-emulation/q4wine/q4wine-1.0-r1.ebuild | 59 - app-emulation/q4wine/q4wine-1.0-r2.ebuild | 59 - app-emulation/xen-pvgrub/Manifest | 1 + .../files/xen-4.2-CVE-2013-11-XSA-55.patch | 788 ----------- .../files/xen-4.2-CVE-2013-15-XSA-55.patch | 759 ----------- .../files/xen-4.2-CVE-2013-8-XSA-55.patch | 1196 ----------------- .../xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild | 50 +- .../xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild | 13 +- app-emulation/xen-tools/Manifest | 1 + .../files/xen-4.2-CVE-2013-11-XSA-55.patch | 788 ----------- .../files/xen-4.2-CVE-2013-15-XSA-55.patch | 759 ----------- .../files/xen-4.2-CVE-2013-8-XSA-55.patch | 1196 ----------------- .../xen-tools/xen-tools-4.2.1-r4.ebuild | 15 +- .../xen-tools/xen-tools-4.2.2-r2.ebuild | 16 +- app-emulation/xen/xen-4.2.1-r4.ebuild | 4 +- app-misc/gcalcli/Manifest | 1 + app-misc/gcalcli/gcalcli-2.4.2.ebuild | 29 + app-misc/gcalcli/metadata.xml | 9 + app-misc/ignuit/Manifest | 1 - app-misc/ignuit/ignuit-0.0.16.ebuild | 42 - app-misc/klavaro/Manifest | 1 + app-misc/klavaro/klavaro-1.9.7.ebuild | 28 + app-text/dvipsk/Manifest | 3 + app-text/dvipsk/dvipsk-5.993_p20130530.ebuild | 71 + .../llpp-9999-fz_drop_display_list.patch | 13 + .../files/llpp-9999-mupdf-split-headers.patch | 19 + app-text/llpp/llpp-9999.ebuild | 6 +- dev-db/mariadb/mariadb-5.5.28a.ebuild | 8 +- dev-db/mariadb/mariadb-5.5.29.ebuild | 8 +- dev-db/mariadb/mariadb-5.5.30.ebuild | 8 +- dev-db/mariadb/mariadb-5.5.31.ebuild | 2 +- dev-db/mysql/Manifest | 4 +- dev-db/mysql/mysql-5.1.70.ebuild | 265 ++++ dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild | 98 ++ dev-lang/fpc/Manifest | 8 + dev-lang/fpc/fpc-2.6.0-r1.ebuild | 161 +++ dev-lang/fpc/fpc-2.6.2.ebuild | 161 +++ dev-lang/lazarus/Manifest | 1 + dev-lang/lazarus/lazarus-1.0.10.ebuild | 73 + dev-lang/mercury-extras/Manifest | 2 + .../mercury-extras-13.05.1.ebuild | 194 +++ dev-lang/mercury/Manifest | 2 + dev-lang/mercury/mercury-13.05.1.ebuild | 197 +++ dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild | 4 +- .../UTF8Strings/UTF8Strings-1.14.0.ebuild | 4 +- .../Class-Inspector-1.280.0.ebuild | 4 +- dev-python/flask/files/docbuild.patch | 19 - dev-python/flask/flask-0.10.1.ebuild | 4 +- dev-python/flask/flask-9999.ebuild | 4 +- dev-python/google-api-python-client/Manifest | 1 + .../google-api-python-client-1.1.ebuild | 25 + .../google-api-python-client/metadata.xml | 9 + .../itsdangerous/itsdangerous-0.21.ebuild | 4 +- dev-python/python-ldap/Manifest | 4 +- dev-python/python-ldap/metadata.xml | 5 + .../python-ldap/python-ldap-2.3.13.ebuild | 8 +- .../python-ldap/python-ldap-2.4.10-r1.ebuild | 4 +- .../python-ldap/python-ldap-2.4.10.ebuild | 8 +- .../python-ldap/python-ldap-2.4.12.ebuild | 4 +- .../python-ldap/python-ldap-2.4.13.ebuild | 74 + .../python-ldap/python-ldap-2.4.3.ebuild | 68 - .../python-ldap/python-ldap-2.4.9.ebuild | 79 -- .../python-ldap/python-ldap-9999.ebuild | 74 + .../pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild | 4 +- dev-python/simplecv/Manifest | 1 + .../new-support-for-opencv-2.4.3-added.patch | 111 ++ .../simplecv/files/remove-failing-test.patch | 57 + .../simplecv/files/remove-failing-tests.patch | 301 +++++ dev-python/simplecv/metadata.xml | 10 + dev-python/simplecv/simplecv-1.3.ebuild | 49 + dev-python/werkzeug/werkzeug-0.9.1.ebuild | 10 +- dev-ruby/flog/Manifest | 1 + dev-ruby/flog/flog-3.2.3.ebuild | 28 + dev-tex/bibtexu/Manifest | 1 + dev-tex/bibtexu/bibtexu-3.71_p20130530.ebuild | 37 + dev-util/debhelper/Manifest | 1 + .../debhelper/debhelper-9.20130626.ebuild | 70 + dev-vcs/qgit/qgit-2.5.ebuild | 4 +- eclass/fcaps.eclass | 9 +- eclass/mysql-autotools.eclass | 60 +- eclass/mysql-cmake.eclass | 55 +- eclass/mysql-v2.eclass | 193 +-- games-engines/renpy/Manifest | 2 +- ....patch => renpy-6.15.7-multiple-abi.patch} | 235 ++-- ...enpy-6.15.5.ebuild => renpy-6.15.7.ebuild} | 2 +- media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild | 5 +- media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild | 5 +- .../audiofile/audiofile-0.3.6-r1.ebuild | 5 +- media-libs/flac/flac-1.2.1-r5.ebuild | 5 +- media-libs/flac/flac-1.3.0.ebuild | 5 +- media-libs/opencv/Manifest | 1 - media-libs/opencv/opencv-2.4.3.ebuild | 182 --- .../webrtc-audio-processing-0.1-r1.ebuild | 5 +- .../swh-plugins/swh-plugins-0.4.15-r1.ebuild | 72 - .../swh-plugins/swh-plugins-0.4.15.ebuild | 65 - media-sound/a2jmidid/Manifest | 3 - media-sound/a2jmidid/a2jmidid-4.ebuild | 29 - media-sound/a2jmidid/a2jmidid-5.ebuild | 29 - media-sound/a2jmidid/a2jmidid-6.ebuild | 36 - media-sound/audicle/audicle-1.0.0.7-r1.ebuild | 94 ++ media-sound/lmms/Manifest | 1 + media-sound/lmms/lmms-0.4.15.ebuild | 68 + .../miniaudicle/miniaudicle-0.1.3.8-r2.ebuild | 95 ++ media-video/ffdiaporama/Manifest | 1 + .../ffdiaporama/ffdiaporama-1.6.ebuild | 58 + metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/app-arch/tarsync-0.2.1 | 10 - ...backintime-1.0.24 => backintime-1.0.24-r1} | 6 +- .../md5-cache/app-cdr/cdrtools-3.01_alpha15 | 2 +- metadata/md5-cache/app-editors/xemacs-21.5.33 | 2 +- ...1 => emul-linux-x86-soundlibs-20130224-r2} | 4 +- metadata/md5-cache/app-emulation/q4wine-0.121 | 13 - .../md5-cache/app-emulation/q4wine-1.0-r1 | 13 - .../md5-cache/app-emulation/q4wine-1.0-r2 | 13 - .../md5-cache/app-emulation/qemu-1.2.2-r4 | 2 +- .../md5-cache/app-emulation/qemu-1.4.0-r1 | 2 +- metadata/md5-cache/app-emulation/qemu-1.4.1 | 2 +- metadata/md5-cache/app-emulation/qemu-1.4.2 | 2 +- metadata/md5-cache/app-emulation/qemu-9999 | 2 +- metadata/md5-cache/app-emulation/xen-4.2.1-r4 | 2 +- .../app-emulation/xen-pvgrub-4.2.1-r3 | 4 +- .../app-emulation/xen-pvgrub-4.2.2-r1 | 4 +- .../app-emulation/xen-tools-4.2.1-r4 | 6 +- .../app-emulation/xen-tools-4.2.2-r2 | 6 +- metadata/md5-cache/app-misc/gcalcli-2.4.2 | 12 + metadata/md5-cache/app-misc/ignuit-0.0.16 | 12 - metadata/md5-cache/app-misc/klavaro-1.9.7 | 12 + .../md5-cache/app-text/dvipsk-5.993_p20130530 | 13 + metadata/md5-cache/app-text/llpp-9999 | 2 +- metadata/md5-cache/dev-db/mariadb-5.1.66 | 8 +- metadata/md5-cache/dev-db/mariadb-5.1.67 | 8 +- metadata/md5-cache/dev-db/mariadb-5.2.13 | 8 +- metadata/md5-cache/dev-db/mariadb-5.2.14 | 8 +- metadata/md5-cache/dev-db/mariadb-5.3.11 | 8 +- metadata/md5-cache/dev-db/mariadb-5.3.12 | 8 +- metadata/md5-cache/dev-db/mariadb-5.5.28a | 10 +- metadata/md5-cache/dev-db/mariadb-5.5.29 | 10 +- metadata/md5-cache/dev-db/mariadb-5.5.30 | 10 +- metadata/md5-cache/dev-db/mariadb-5.5.31 | 10 +- metadata/md5-cache/dev-db/mysql-5.1.66 | 8 +- metadata/md5-cache/dev-db/mysql-5.1.66-r1 | 8 +- metadata/md5-cache/dev-db/mysql-5.1.67 | 8 +- metadata/md5-cache/dev-db/mysql-5.1.67-r1 | 8 +- metadata/md5-cache/dev-db/mysql-5.1.68 | 8 +- metadata/md5-cache/dev-db/mysql-5.1.69 | 8 +- metadata/md5-cache/dev-db/mysql-5.1.70 | 15 + metadata/md5-cache/dev-db/mysql-5.5.29 | 8 +- metadata/md5-cache/dev-db/mysql-5.5.29-r1 | 8 +- metadata/md5-cache/dev-db/mysql-5.5.30 | 8 +- metadata/md5-cache/dev-db/mysql-5.5.31 | 8 +- metadata/md5-cache/dev-db/mysql-5.5.32 | 8 +- metadata/md5-cache/dev-java/gcj-jdk-4.7.3 | 12 + metadata/md5-cache/dev-lang/fpc-2.6.0-r1 | 12 + metadata/md5-cache/dev-lang/fpc-2.6.2 | 12 + metadata/md5-cache/dev-lang/lazarus-1.0.10 | 13 + metadata/md5-cache/dev-lang/mercury-13.05.1 | 13 + .../md5-cache/dev-lang/mercury-extras-13.05.1 | 13 + metadata/md5-cache/dev-libs/MicroJSON-0.3.1 | 4 +- .../md5-cache/dev-libs/UTF8Strings-1.14.0 | 4 +- .../dev-perl/Class-Inspector-1.280.0 | 4 +- metadata/md5-cache/dev-python/flask-0.10.1 | 6 +- metadata/md5-cache/dev-python/flask-9999 | 6 +- .../dev-python/google-api-python-client-1.1 | 14 + .../md5-cache/dev-python/itsdangerous-0.21 | 4 +- .../md5-cache/dev-python/python-ldap-2.3.13 | 2 +- .../md5-cache/dev-python/python-ldap-2.4.10 | 2 +- .../dev-python/python-ldap-2.4.10-r1 | 2 +- .../md5-cache/dev-python/python-ldap-2.4.12 | 2 +- .../md5-cache/dev-python/python-ldap-2.4.13 | 14 + .../md5-cache/dev-python/python-ldap-2.4.3 | 13 - .../md5-cache/dev-python/python-ldap-2.4.9 | 13 - .../md5-cache/dev-python/python-ldap-9999 | 12 + .../md5-cache/dev-python/pywebkitgtk-1.1.8-r1 | 6 +- metadata/md5-cache/dev-python/simplecv-1.3 | 14 + metadata/md5-cache/dev-python/werkzeug-0.9.1 | 10 +- metadata/md5-cache/dev-ruby/flog-3.2.3 | 14 + .../md5-cache/dev-tex/bibtexu-3.71_p20130530 | 11 + .../md5-cache/dev-util/debhelper-9.20130626 | 13 + metadata/md5-cache/dev-vcs/qgit-2.5 | 4 +- .../{renpy-6.15.5 => renpy-6.15.7} | 4 +- .../md5-cache/gnome-base/gnome-keyring-3.6.3 | 2 +- .../md5-cache/gnome-base/gnome-keyring-3.8.1 | 2 +- .../md5-cache/gnome-base/gnome-keyring-3.8.2 | 2 +- .../md5-cache/media-libs/alsa-lib-1.0.27-r3 | 6 +- .../md5-cache/media-libs/alsa-lib-1.0.27.1 | 6 +- .../md5-cache/media-libs/audiofile-0.3.6-r1 | 6 +- metadata/md5-cache/media-libs/flac-1.2.1-r5 | 6 +- metadata/md5-cache/media-libs/flac-1.3.0 | 6 +- metadata/md5-cache/media-libs/opencv-2.4.3 | 13 - .../media-libs/webrtc-audio-processing-0.1-r1 | 4 +- .../media-plugins/swh-plugins-0.4.15 | 12 - .../media-plugins/swh-plugins-0.4.15-r1 | 12 - metadata/md5-cache/media-sound/a2jmidid-4 | 10 - metadata/md5-cache/media-sound/a2jmidid-5 | 10 - metadata/md5-cache/media-sound/a2jmidid-6 | 12 - .../md5-cache/media-sound/audicle-1.0.0.7-r1 | 14 + metadata/md5-cache/media-sound/lmms-0.4.15 | 13 + .../media-sound/miniaudicle-0.1.3.8-r2 | 14 + .../md5-cache/media-video/ffdiaporama-1.6 | 12 + .../md5-cache/net-analyzer/multimon-ng-1.0.0 | 12 + .../md5-cache/net-analyzer/multimon-ng-9999 | 10 + .../md5-cache/net-analyzer/wireshark-1.10.0 | 2 +- .../net-analyzer/wireshark-1.10.0-r1 | 2 +- .../md5-cache/net-analyzer/wireshark-1.6.16 | 2 +- .../md5-cache/net-analyzer/wireshark-1.8.8 | 2 +- .../md5-cache/net-firewall/ipt_netflow-1.8-r2 | 13 + metadata/md5-cache/net-libs/libkfbapi-1.0 | 13 + .../net-libs/libkfbapi-1.0_p20130209 | 13 - .../md5-cache/net-misc/iputils-20121221-r1 | 2 +- metadata/md5-cache/net-misc/iputils-99999999 | 2 +- .../md5-cache/net-misc/netkit-rsh-0.17-r10 | 2 +- metadata/md5-cache/net-misc/openssh-6.2_p2-r1 | 12 + .../md5-cache/net-misc/youtube-dl-2013.06.34 | 12 + metadata/md5-cache/net-print/cups-1.6.2-r3 | 16 - .../net-print/cups-filters-1.0.30-r1 | 13 - .../md5-cache/net-print/cups-filters-1.0.34 | 13 - .../net-wireless/hackrf-tools-2013.06.1-r1 | 12 + .../md5-cache/net-wireless/hackrf-tools-9999 | 6 +- .../md5-cache/net-wireless/rtl-sdr-0.5.0-r1 | 12 + metadata/md5-cache/net-wireless/rtl-sdr-9999 | 8 +- .../md5-cache/sci-electronics/xoscope-2.0 | 4 +- metadata/md5-cache/sci-libs/fftw-3.3.3-r1 | 6 +- metadata/md5-cache/sci-libs/fftw-3.3.3-r2 | 6 +- .../md5-cache/sci-physics/lammps-20130526 | 13 + metadata/md5-cache/sys-apps/findutils-4.5.11 | 2 +- metadata/md5-cache/sys-cluster/charm-6.5.0 | 14 + metadata/md5-cache/sys-libs/glibc-2.17 | 4 +- ... => google-chrome-29.0.1547.0_alpha208345} | 4 +- ...me-binary-plugins-29.0.1547.0_alpha208345} | 4 +- .../x11-drivers/radeon-ucode-20130626 | 11 + metadata/md5-cache/x11-libs/libXi-1.7.1.901 | 13 + metadata/md5-cache/x11-libs/libva-1.0.15 | 6 +- metadata/md5-cache/x11-libs/libva-1.0.16 | 6 +- metadata/md5-cache/x11-libs/libva-1.1.0 | 6 +- metadata/md5-cache/x11-libs/libva-1.1.1 | 6 +- metadata/md5-cache/x11-libs/libva-1.2.0 | 6 +- metadata/md5-cache/x11-libs/libva-9999 | 6 +- metadata/md5-cache/x11-misc/i3status-2.6 | 2 +- metadata/md5-cache/x11-misc/i3status-2.7 | 2 +- .../md5-cache/x11-misc/xdg-user-dirs-0.15 | 12 + .../xfce-extra/xfce4-equake-plugin-1.3.0 | 13 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-analyzer/multimon-ng/Manifest | 1 + net-analyzer/multimon-ng/metadata.xml | 12 + .../multimon-ng/multimon-ng-1.0.0.ebuild | 31 + .../multimon-ng/multimon-ng-9999.ebuild | 31 + .../files/ipt_netflow-1.8-pax-const.patch | 57 + .../ipt_netflow/ipt_netflow-1.8-r2.ebuild | 71 + net-firewall/ipt_netflow/metadata.xml | 3 + net-libs/libkfbapi/Manifest | 2 +- ..._p20130209.ebuild => libkfbapi-1.0.ebuild} | 8 +- net-misc/openssh/Manifest | 2 + net-misc/openssh/openssh-6.2_p2-r1.ebuild | 321 +++++ net-misc/youtube-dl/Manifest | 1 + .../youtube-dl/youtube-dl-2013.06.34.ebuild | 37 + net-print/cups-filters/Manifest | 1 - .../cups-filters-1.0.30-r1.ebuild | 107 -- .../cups-filters/cups-filters-1.0.34.ebuild | 100 -- .../files/cups-filters-1.0.29-openrc.patch | 41 - .../files/cups-filters-1.0.30-noavahi.patch | 35 - net-print/cups/cups-1.6.2-r3.ebuild | 304 ----- .../hackrf-tools/files/52-hackrf.rules | 1 + .../hackrf-tools-2013.06.1-r1.ebuild | 39 + .../hackrf-tools/hackrf-tools-9999.ebuild | 5 +- net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild | 48 + net-wireless/rtl-sdr/rtl-sdr-9999.ebuild | 15 +- profiles/package.mask | 66 +- profiles/use.local.desc | 9 + sci-electronics/xoscope/Manifest | 2 +- sci-electronics/xoscope/metadata.xml | 9 +- sci-electronics/xoscope/xoscope-2.0.ebuild | 17 +- sci-libs/fftw/fftw-3.3.3-r1.ebuild | 5 +- sci-libs/fftw/fftw-3.3.3-r2.ebuild | 5 +- sci-physics/lammps/Manifest | 1 + sci-physics/lammps/lammps-20130526.ebuild | 105 ++ sci-physics/lammps/metadata.xml | 31 + sys-apps/findutils/findutils-4.5.11.ebuild | 3 +- sys-cluster/charm/Manifest | 7 +- sys-cluster/charm/charm-6.5.0.ebuild | 178 +++ .../files/charm-6.5.0-charmc-gentoo.patch | 25 + sys-cluster/charm/metadata.xml | 6 + sys-libs/glibc/glibc-2.17.ebuild | 4 +- www-client/google-chrome/Manifest | 4 +- ...gle-chrome-29.0.1547.0_alpha208345.ebuild} | 2 +- www-plugins/chrome-binary-plugins/Manifest | 4 +- ...ry-plugins-29.0.1547.0_alpha208345.ebuild} | 2 +- x11-drivers/radeon-ucode/Manifest | 1 + .../radeon-ucode/radeon-ucode-20130626.ebuild | 42 + x11-libs/gtkdatabox/metadata.xml | 6 +- x11-libs/libXi/Manifest | 1 + x11-libs/libXi/libXi-1.7.1.901.ebuild | 38 + x11-libs/libva/libva-1.0.15.ebuild | 7 +- x11-libs/libva/libva-1.0.16.ebuild | 7 +- x11-libs/libva/libva-1.1.0.ebuild | 5 +- x11-libs/libva/libva-1.1.1.ebuild | 5 +- x11-libs/libva/libva-1.2.0.ebuild | 5 +- x11-libs/libva/libva-9999.ebuild | 5 +- x11-misc/sux/Manifest | 2 +- x11-misc/sux/metadata.xml | 2 +- x11-misc/x2vnc/Manifest | 4 +- x11-misc/x2vnc/metadata.xml | 2 +- x11-misc/xdg-user-dirs/Manifest | 1 + .../xdg-user-dirs/xdg-user-dirs-0.15.ebuild | 23 + xfce-extra/xfce4-equake-plugin/Manifest | 1 + xfce-extra/xfce4-equake-plugin/metadata.xml | 5 + .../xfce4-equake-plugin-1.3.0.ebuild | 34 + 318 files changed, 4955 insertions(+), 7776 deletions(-) delete mode 100644 app-arch/tarsync/tarsync-0.2.1.ebuild rename app-backup/backintime/{backintime-1.0.24.ebuild => backintime-1.0.24-r1.ebuild} (93%) create mode 100644 app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch rename app-emulation/emul-linux-x86-soundlibs/{emul-linux-x86-soundlibs-20130224-r1.ebuild => emul-linux-x86-soundlibs-20130224-r2.ebuild} (77%) delete mode 100644 app-emulation/q4wine/q4wine-0.121.ebuild delete mode 100644 app-emulation/q4wine/q4wine-1.0-r1.ebuild delete mode 100644 app-emulation/q4wine/q4wine-1.0-r2.ebuild delete mode 100644 app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-11-XSA-55.patch delete mode 100644 app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-15-XSA-55.patch delete mode 100644 app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-8-XSA-55.patch delete mode 100644 app-emulation/xen-tools/files/xen-4.2-CVE-2013-11-XSA-55.patch delete mode 100644 app-emulation/xen-tools/files/xen-4.2-CVE-2013-15-XSA-55.patch delete mode 100644 app-emulation/xen-tools/files/xen-4.2-CVE-2013-8-XSA-55.patch create mode 100644 app-misc/gcalcli/Manifest create mode 100644 app-misc/gcalcli/gcalcli-2.4.2.ebuild create mode 100644 app-misc/gcalcli/metadata.xml delete mode 100644 app-misc/ignuit/ignuit-0.0.16.ebuild create mode 100644 app-misc/klavaro/klavaro-1.9.7.ebuild create mode 100644 app-text/dvipsk/dvipsk-5.993_p20130530.ebuild create mode 100644 app-text/llpp/files/llpp-9999-fz_drop_display_list.patch create mode 100644 app-text/llpp/files/llpp-9999-mupdf-split-headers.patch create mode 100644 dev-db/mysql/mysql-5.1.70.ebuild create mode 100644 dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild create mode 100644 dev-lang/fpc/fpc-2.6.0-r1.ebuild create mode 100644 dev-lang/fpc/fpc-2.6.2.ebuild create mode 100644 dev-lang/lazarus/lazarus-1.0.10.ebuild create mode 100644 dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild create mode 100644 dev-lang/mercury/mercury-13.05.1.ebuild delete mode 100644 dev-python/flask/files/docbuild.patch create mode 100644 dev-python/google-api-python-client/Manifest create mode 100644 dev-python/google-api-python-client/google-api-python-client-1.1.ebuild create mode 100644 dev-python/google-api-python-client/metadata.xml create mode 100644 dev-python/python-ldap/python-ldap-2.4.13.ebuild delete mode 100644 dev-python/python-ldap/python-ldap-2.4.3.ebuild delete mode 100644 dev-python/python-ldap/python-ldap-2.4.9.ebuild create mode 100644 dev-python/python-ldap/python-ldap-9999.ebuild create mode 100644 dev-python/simplecv/Manifest create mode 100644 dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch create mode 100644 dev-python/simplecv/files/remove-failing-test.patch create mode 100644 dev-python/simplecv/files/remove-failing-tests.patch create mode 100644 dev-python/simplecv/metadata.xml create mode 100644 dev-python/simplecv/simplecv-1.3.ebuild create mode 100644 dev-ruby/flog/flog-3.2.3.ebuild create mode 100644 dev-tex/bibtexu/bibtexu-3.71_p20130530.ebuild create mode 100644 dev-util/debhelper/debhelper-9.20130626.ebuild rename games-engines/renpy/files/{renpy-6.15.5-multiple-abi.patch => renpy-6.15.7-multiple-abi.patch} (80%) rename games-engines/renpy/{renpy-6.15.5.ebuild => renpy-6.15.7.ebuild} (98%) delete mode 100644 media-libs/opencv/opencv-2.4.3.ebuild delete mode 100644 media-plugins/swh-plugins/swh-plugins-0.4.15-r1.ebuild delete mode 100644 media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild delete mode 100644 media-sound/a2jmidid/a2jmidid-4.ebuild delete mode 100644 media-sound/a2jmidid/a2jmidid-5.ebuild delete mode 100644 media-sound/a2jmidid/a2jmidid-6.ebuild create mode 100644 media-sound/audicle/audicle-1.0.0.7-r1.ebuild create mode 100644 media-sound/lmms/lmms-0.4.15.ebuild create mode 100644 media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild create mode 100644 media-video/ffdiaporama/ffdiaporama-1.6.ebuild delete mode 100644 metadata/md5-cache/app-arch/tarsync-0.2.1 rename metadata/md5-cache/app-backup/{backintime-1.0.24 => backintime-1.0.24-r1} (54%) rename metadata/md5-cache/app-emulation/{emul-linux-x86-soundlibs-20130224-r1 => emul-linux-x86-soundlibs-20130224-r2} (74%) delete mode 100644 metadata/md5-cache/app-emulation/q4wine-0.121 delete mode 100644 metadata/md5-cache/app-emulation/q4wine-1.0-r1 delete mode 100644 metadata/md5-cache/app-emulation/q4wine-1.0-r2 create mode 100644 metadata/md5-cache/app-misc/gcalcli-2.4.2 delete mode 100644 metadata/md5-cache/app-misc/ignuit-0.0.16 create mode 100644 metadata/md5-cache/app-misc/klavaro-1.9.7 create mode 100644 metadata/md5-cache/app-text/dvipsk-5.993_p20130530 create mode 100644 metadata/md5-cache/dev-db/mysql-5.1.70 create mode 100644 metadata/md5-cache/dev-java/gcj-jdk-4.7.3 create mode 100644 metadata/md5-cache/dev-lang/fpc-2.6.0-r1 create mode 100644 metadata/md5-cache/dev-lang/fpc-2.6.2 create mode 100644 metadata/md5-cache/dev-lang/lazarus-1.0.10 create mode 100644 metadata/md5-cache/dev-lang/mercury-13.05.1 create mode 100644 metadata/md5-cache/dev-lang/mercury-extras-13.05.1 create mode 100644 metadata/md5-cache/dev-python/google-api-python-client-1.1 create mode 100644 metadata/md5-cache/dev-python/python-ldap-2.4.13 delete mode 100644 metadata/md5-cache/dev-python/python-ldap-2.4.3 delete mode 100644 metadata/md5-cache/dev-python/python-ldap-2.4.9 create mode 100644 metadata/md5-cache/dev-python/python-ldap-9999 create mode 100644 metadata/md5-cache/dev-python/simplecv-1.3 create mode 100644 metadata/md5-cache/dev-ruby/flog-3.2.3 create mode 100644 metadata/md5-cache/dev-tex/bibtexu-3.71_p20130530 create mode 100644 metadata/md5-cache/dev-util/debhelper-9.20130626 rename metadata/md5-cache/games-engines/{renpy-6.15.5 => renpy-6.15.7} (96%) delete mode 100644 metadata/md5-cache/media-libs/opencv-2.4.3 delete mode 100644 metadata/md5-cache/media-plugins/swh-plugins-0.4.15 delete mode 100644 metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1 delete mode 100644 metadata/md5-cache/media-sound/a2jmidid-4 delete mode 100644 metadata/md5-cache/media-sound/a2jmidid-5 delete mode 100644 metadata/md5-cache/media-sound/a2jmidid-6 create mode 100644 metadata/md5-cache/media-sound/audicle-1.0.0.7-r1 create mode 100644 metadata/md5-cache/media-sound/lmms-0.4.15 create mode 100644 metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r2 create mode 100644 metadata/md5-cache/media-video/ffdiaporama-1.6 create mode 100644 metadata/md5-cache/net-analyzer/multimon-ng-1.0.0 create mode 100644 metadata/md5-cache/net-analyzer/multimon-ng-9999 create mode 100644 metadata/md5-cache/net-firewall/ipt_netflow-1.8-r2 create mode 100644 metadata/md5-cache/net-libs/libkfbapi-1.0 delete mode 100644 metadata/md5-cache/net-libs/libkfbapi-1.0_p20130209 create mode 100644 metadata/md5-cache/net-misc/openssh-6.2_p2-r1 create mode 100644 metadata/md5-cache/net-misc/youtube-dl-2013.06.34 delete mode 100644 metadata/md5-cache/net-print/cups-1.6.2-r3 delete mode 100644 metadata/md5-cache/net-print/cups-filters-1.0.30-r1 delete mode 100644 metadata/md5-cache/net-print/cups-filters-1.0.34 create mode 100644 metadata/md5-cache/net-wireless/hackrf-tools-2013.06.1-r1 create mode 100644 metadata/md5-cache/net-wireless/rtl-sdr-0.5.0-r1 create mode 100644 metadata/md5-cache/sci-physics/lammps-20130526 create mode 100644 metadata/md5-cache/sys-cluster/charm-6.5.0 rename metadata/md5-cache/www-client/{google-chrome-29.0.1541.2_alpha207000 => google-chrome-29.0.1547.0_alpha208345} (91%) rename metadata/md5-cache/www-plugins/{chrome-binary-plugins-29.0.1541.2_alpha207000 => chrome-binary-plugins-29.0.1547.0_alpha208345} (78%) create mode 100644 metadata/md5-cache/x11-drivers/radeon-ucode-20130626 create mode 100644 metadata/md5-cache/x11-libs/libXi-1.7.1.901 create mode 100644 metadata/md5-cache/x11-misc/xdg-user-dirs-0.15 create mode 100644 metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.0 create mode 100644 net-analyzer/multimon-ng/Manifest create mode 100644 net-analyzer/multimon-ng/metadata.xml create mode 100644 net-analyzer/multimon-ng/multimon-ng-1.0.0.ebuild create mode 100644 net-analyzer/multimon-ng/multimon-ng-9999.ebuild create mode 100644 net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch create mode 100644 net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild rename net-libs/libkfbapi/{libkfbapi-1.0_p20130209.ebuild => libkfbapi-1.0.ebuild} (64%) create mode 100644 net-misc/openssh/openssh-6.2_p2-r1.ebuild create mode 100644 net-misc/youtube-dl/youtube-dl-2013.06.34.ebuild delete mode 100644 net-print/cups-filters/cups-filters-1.0.30-r1.ebuild delete mode 100644 net-print/cups-filters/cups-filters-1.0.34.ebuild delete mode 100644 net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch delete mode 100644 net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch delete mode 100644 net-print/cups/cups-1.6.2-r3.ebuild create mode 100644 net-wireless/hackrf-tools/files/52-hackrf.rules create mode 100644 net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild create mode 100644 net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild create mode 100644 sci-physics/lammps/Manifest create mode 100644 sci-physics/lammps/lammps-20130526.ebuild create mode 100644 sci-physics/lammps/metadata.xml create mode 100644 sys-cluster/charm/charm-6.5.0.ebuild create mode 100644 sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch rename www-client/google-chrome/{google-chrome-29.0.1541.2_alpha207000.ebuild => google-chrome-29.0.1547.0_alpha208345.ebuild} (97%) rename www-plugins/chrome-binary-plugins/{chrome-binary-plugins-29.0.1541.2_alpha207000.ebuild => chrome-binary-plugins-29.0.1547.0_alpha208345.ebuild} (95%) create mode 100644 x11-drivers/radeon-ucode/radeon-ucode-20130626.ebuild create mode 100644 x11-libs/libXi/libXi-1.7.1.901.ebuild create mode 100644 x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild create mode 100644 xfce-extra/xfce4-equake-plugin/Manifest create mode 100644 xfce-extra/xfce4-equake-plugin/metadata.xml create mode 100644 xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.0.ebuild diff --git a/app-arch/tarsync/tarsync-0.2.1.ebuild b/app-arch/tarsync/tarsync-0.2.1.ebuild deleted file mode 100644 index 3c258ed2f9fa..000000000000 --- a/app-arch/tarsync/tarsync-0.2.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tarsync/tarsync-0.2.1.ebuild,v 1.6 2009/10/12 16:50:07 halcy0n Exp $ - -DESCRIPTION="Delta compression suite for using/generating binary patches" -HOMEPAGE="http://gentooexperimental.org/~ferringb/tarsync/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~hppa ppc x86 ~amd64" -IUSE="" - -S="${WORKDIR}/${PN}" - -DEPEND=">=dev-util/diffball-0.7" -RDEPEND="${DEPEND}" - -src_compile() { - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "failed installing" -} diff --git a/app-backup/backintime/backintime-1.0.24.ebuild b/app-backup/backintime/backintime-1.0.24-r1.ebuild similarity index 93% rename from app-backup/backintime/backintime-1.0.24.ebuild rename to app-backup/backintime/backintime-1.0.24-r1.ebuild index 74f36aa0d251..9a8dfc2d4488 100644 --- a/app-backup/backintime/backintime-1.0.24.ebuild +++ b/app-backup/backintime/backintime-1.0.24-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.24.ebuild,v 1.2 2013/06/25 20:54:48 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-backup/backintime/backintime-1.0.24-r1.ebuild,v 1.1 2013/06/27 13:15:42 xmw Exp $ EAPI=5 @@ -17,7 +17,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="kde gnome" -DEPEND=" +RDEPEND="dev-python/keyring + dev-python/notify-python net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 @@ -33,10 +34,9 @@ DEPEND=" dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk - ) - dev-python/notify-python" + )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" S=${WORKDIR} diff --git a/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch b/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch new file mode 100644 index 000000000000..17e572044fac --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch @@ -0,0 +1,33 @@ +diff -r a2912073be85 lisp/paragraphs.el +--- a/lisp/paragraphs.el Wed Jun 19 09:30:30 2013 -0600 ++++ b/lisp/paragraphs.el Sat Jun 22 13:27:48 2013 +0200 +@@ -180,7 +180,10 @@ + :type '(choice regexp (const :tag "Use default value" nil))) + (put 'sentence-end 'safe-local-variable 'string-or-null-p) + +-(defcustom sentence-end-base "[.?!][]\"'”)}]*" ++(defcustom sentence-end-base ++ (concat "[.?!][]\"'" ++ (if (featurep 'mule) (string (unicode-to-char #x201D)) "") ++ ")}]*") + "Regexp matching the basic end of a sentence, not including following space." + :group 'paragraphs + :type 'string +@@ -201,14 +204,14 @@ + in between. See Info node `(elisp)Standard Regexps'." + (or sentence-end + ;; We accept non-break space along with space. +- (concat (if sentence-end-without-period "\\w[ \u00a0][ \u00a0]\\|") ++ (concat (if sentence-end-without-period "\\w[ \240][ \240]\\|") + "\\(" + sentence-end-base + (if sentence-end-double-space +- "\\($\\|[ \u00a0]$\\|\t\\|[ \u00a0][ \u00a0]\\)" "\\($\\|[\t \u00a0]\\)") ++ "\\($\\|[ \240]$\\|\t\\|[ \240][ \240]\\)" "\\($\\|[\t \240]\\)") + "\\|[" sentence-end-without-space "]+" + "\\)" +- "[ \u00a0\t\n]*"))) ++ "[ \240\t\n]*"))) + + (defcustom page-delimiter "^\014" + "*Regexp describing line-beginnings that separate pages." diff --git a/app-editors/xemacs/xemacs-21.5.33.ebuild b/app-editors/xemacs/xemacs-21.5.33.ebuild index 7ebd424ec37f..e62e3e6fb4ff 100644 --- a/app-editors/xemacs/xemacs-21.5.33.ebuild +++ b/app-editors/xemacs/xemacs-21.5.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.33.ebuild,v 1.1 2013/06/02 09:18:02 matsl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.33.ebuild,v 1.2 2013/06/26 22:52:02 matsl Exp $ # Note: xemacs currently does not work with a hardened profile. If you # want to use xemacs on a hardened profile then compile with the @@ -63,6 +63,10 @@ src_unpack() { src_prepare() { use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ + + # Fix for no-mule build. + find "${S}"/lisp -name '*.elc' -exec rm {} \; || die + epatch "${FILESDIR}"/${P}-no-mule-build.patch } src_configure() { @@ -170,10 +174,10 @@ src_configure() { src_install() { emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ + mandir="${D}"/usr/share/man/man1 \ + infodir="${D}"/usr/share/info \ + libdir="${D}"/usr/$(get_libdir) \ + datadir="${D}"/usr/share \ install gzip-el || die # Rename some applications installed in bin so that it is clear diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r2.ebuild similarity index 77% rename from app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild rename to app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r2.ebuild index 9cb350e444e9..c1e0081024aa 100644 --- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild +++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r1.ebuild,v 1.1 2013/06/26 18:18:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224-r2.ebuild,v 1.2 2013/06/26 21:49:01 aballier Exp $ EAPI=5 inherit emul-linux-x86 @@ -18,6 +18,10 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] + >=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.1[abi_x86_32(-)] + >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] + >=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)] )" src_prepare() { diff --git a/app-emulation/emul-linux-x86-soundlibs/files/remove-native b/app-emulation/emul-linux-x86-soundlibs/files/remove-native index dc3e0c9f7687..0c13da5b0b88 100644 --- a/app-emulation/emul-linux-x86-soundlibs/files/remove-native +++ b/app-emulation/emul-linux-x86-soundlibs/files/remove-native @@ -21,3 +21,26 @@ usr/lib32/libvorbisfile.so.3.3.5 usr/lib32/pkgconfig/vorbis.pc usr/lib32/pkgconfig/vorbisenc.pc usr/lib32/pkgconfig/vorbisfile.pc +usr/lib32/libwebrtc_audio_processing.so +usr/lib32/libwebrtc_audio_processing.so.0 +usr/lib32/libwebrtc_audio_processing.so.0.0.0 +usr/lib32/pkgconfig/webrtc-audio-processing.pc +usr/lib32/libasound.so +usr/lib32/libasound.so.2 +usr/lib32/libasound.so.2.0.0 +usr/lib32/pkgconfig/alsa.pc +usr/lib32/alsa-lib/smixer/smixer-ac97.so +usr/lib32/alsa-lib/smixer/smixer-hda.so +usr/lib32/alsa-lib/smixer/smixer-sbase.so +usr/lib32/libFLAC++.so +usr/lib32/libFLAC++.so.6 +usr/lib32/libFLAC++.so.6.2.0 +usr/lib32/libFLAC.so +usr/lib32/libFLAC.so.8 +usr/lib32/libFLAC.so.8.2.0 +usr/lib32/pkgconfig/flac++.pc +usr/lib32/pkgconfig/flac.pc +usr/lib32/libaudiofile.so +usr/lib32/libaudiofile.so.1 +usr/lib32/libaudiofile.so.1.0.0 +usr/lib32/pkgconfig/audiofile.pc diff --git a/app-emulation/q4wine/Manifest b/app-emulation/q4wine/Manifest index e38d5e79fe80..1e5252f5945e 100644 --- a/app-emulation/q4wine/Manifest +++ b/app-emulation/q4wine/Manifest @@ -1,4 +1 @@ -DIST q4wine-0.121.tar.bz2 665208 SHA256 fc5a1a8c09d133a17a997a2b020ad03eaf06c81357863d9f69fd7206d86e3edc SHA512 2086b45a6ecc110b365b63317d6f3b0dd7c87fce548907167fd4ddb6ebffdaf01b3c86df6b54eb977cebb309e80e8786fdfd85c16ab98dcb3f829af74cf26132 WHIRLPOOL dbd47f6d5687500f14ac82af1a8f7335c50f8895cab4b61b7e3597754756e0a39fa84c66b78bb06e45744b093e9cb4146da4d76cbf1d6266ff6676dd62d9416b -DIST q4wine-1.0-r1.tar.bz2 858442 SHA256 a1020005ab4a71a0d11f37f65638dd8f97bd6f7b8d652f9b6042080046ba00a7 SHA512 bfb37c3bddf5cb6dacb08f71a2c278e977dc6b7bd0b8db1665be27316dc69a185282f9f4aa595eedc77df1ce9bdf386db8fa4b50ff43bc2276413216ea198c1d WHIRLPOOL 7b5ccc0e2cd52a6761517d09f05315a3cd865095de67cc81cde58937b5d0d81dfe5d0497a8c1029bade60322fab5b2c73a63ab75c421472f2b45fca7765fa1bc -DIST q4wine-1.0-r2.tar.bz2 876411 SHA256 c92a5e0f7ce8b6dd5d4d4f6f0ed38ad14ad93652387f513f0769ff6c7bc0be0e SHA512 1be57465c1d96c8250ab3a0ae74df822d6ec4d53e1eb5bf0666ae2340511718052e7471a94fe5bab0bf07e105c86c2064cf7799ece2d530a7ede8e3d8564e458 WHIRLPOOL 063641823f5449c8b22bd7dfc54dd1cc761ac98a36c2d076be231bd5c657ef01684ee662146e4d4d4f3aab77c367ebcff356f8fc221ce07c449bfc8a675499a4 DIST q4wine-1.0-r3.tar.bz2 889308 SHA256 9f1319dd0baff3834a3938e0a048c1529cb9ea521158370176b706fce0d4d2ff SHA512 df10a2fbf6874f4c4e02dd9c43031453a46c76f03d83321f2d6e9544d0540dd07da1bc9246767c5c91ce17d67d5d236227294efaed9de09f3d5a18afbd60b224 WHIRLPOOL 51b5b4cfc157da6b99154269ef4ef9f38ff91f861864158b789352505af485d8b523a21c6d4b59544804ed3c15cb1c6c756db3f3203c8e3ba55c8396c3630df3 diff --git a/app-emulation/q4wine/q4wine-0.121.ebuild b/app-emulation/q4wine/q4wine-0.121.ebuild deleted file mode 100644 index f5471cd76748..000000000000 --- a/app-emulation/q4wine/q4wine-0.121.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/app-emulation/q4wine/q4wine-0.121.ebuild,v 1.4 2013/03/02 19:25:09 hwoarang Exp $ - -EAPI="2" -inherit cmake-utils - -DESCRIPTION="Qt4 GUI configuration tool for Wine" -HOMEPAGE="http://q4wine.brezblock.org.ua/" -SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug +icoutils +wineappdb -dbus gnome kde" - -DEPEND="dev-qt/qtgui:4 - dev-qt/qtsql:4[sqlite] - dev-util/cmake" - -RDEPEND="dev-qt/qtgui:4 - dev-qt/qtsql:4[sqlite] - app-admin/sudo - app-emulation/wine - >=sys-apps/which-2.19 - icoutils? ( >=media-gfx/icoutils-0.26.0 ) - sys-fs/fuseiso - kde? ( kde-base/kdesu ) - gnome? ( x11-libs/gksu ) - dbus? ( dev-qt/qtdbus:4 )" - -DOCS="README AUTHORS ChangeLog" - -S="${WORKDIR}/${PF}" - -src_configure() { - mycmakeargs="${mycmakeargs} \ - $(cmake-utils_use debug DEBUG) \ - $(cmake-utils_use_with icoutils ICOUTILS) \ - $(cmake-utils_use_with wineappdb WINEAPPDB) \ - $(cmake-utils_use_with dbus DBUS)" - - cmake-utils_src_configure -} diff --git a/app-emulation/q4wine/q4wine-1.0-r1.ebuild b/app-emulation/q4wine/q4wine-1.0-r1.ebuild deleted file mode 100644 index d0c53e5cd16c..000000000000 --- a/app-emulation/q4wine/q4wine-1.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.0-r1.ebuild,v 1.2 2013/03/02 19:25:09 hwoarang Exp $ - -EAPI="4" -LANGS="cs de en es he it ru uk pl pt" - -inherit cmake-utils - -DESCRIPTION="Qt4 GUI configuration tool for Wine" -HOMEPAGE="http://q4wine.brezblock.org.ua/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${PV}/${PF}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +icoutils +wineappdb -dbus gnome kde" - -for x in ${LANGS}; do - IUSE+=" linguas_${x}" -done - -DEPEND="dev-qt/qtgui:4 - dev-qt/qtsql:4[sqlite] - dev-util/cmake" - -RDEPEND="dev-qt/qtgui:4 - dev-qt/qtsql:4[sqlite] - app-admin/sudo - app-emulation/wine - >=sys-apps/which-2.19 - icoutils? ( >=media-gfx/icoutils-0.26.0 ) - sys-fs/fuseiso - kde? ( kde-base/kdesu ) - gnome? ( x11-libs/gksu ) - dbus? ( dev-qt/qtdbus:4 )" - -DOCS="README AUTHORS ChangeLog" - -S="${WORKDIR}/${PF}" - -src_configure() { - mycmakeargs="${mycmakeargs} \ - $(cmake-utils_use debug DEBUG) \ - $(cmake-utils_use_with icoutils ICOUTILS) \ - $(cmake-utils_use_with wineappdb WINEAPPDB) \ - $(cmake-utils_use_with dbus DBUS)" - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - for x in ${LANGS}; do - if ! has ${x} ${LINGUAS}; then - find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \; - fi - done -} diff --git a/app-emulation/q4wine/q4wine-1.0-r2.ebuild b/app-emulation/q4wine/q4wine-1.0-r2.ebuild deleted file mode 100644 index 6fb05224a513..000000000000 --- a/app-emulation/q4wine/q4wine-1.0-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/q4wine/q4wine-1.0-r2.ebuild,v 1.1 2013/03/03 15:33:48 hwoarang Exp $ - -EAPI="4" -LANGS="cs de en es fa he it ru uk pl pt" - -inherit cmake-utils - -DESCRIPTION="Qt4 GUI configuration tool for Wine" -HOMEPAGE="http://q4wine.brezblock.org.ua/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PN}%20${PV}/${PF}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug +icoutils +wineappdb -dbus gnome kde" - -for x in ${LANGS}; do - IUSE+=" linguas_${x}" -done - -DEPEND="dev-qt/qtgui:4 - dev-qt/qtsql:4[sqlite] - dev-util/cmake" - -RDEPEND="dev-qt/qtgui:4 - dev-qt/qtsql:4[sqlite] - app-admin/sudo - app-emulation/wine - >=sys-apps/which-2.19 - icoutils? ( >=media-gfx/icoutils-0.26.0 ) - sys-fs/fuseiso - kde? ( kde-base/kdesu ) - gnome? ( x11-libs/gksu ) - dbus? ( dev-qt/qtdbus:4 )" - -DOCS="README AUTHORS ChangeLog" - -S="${WORKDIR}/${PF}" - -src_configure() { - mycmakeargs="${mycmakeargs} \ - $(cmake-utils_use debug DEBUG) \ - $(cmake-utils_use_with icoutils ICOUTILS) \ - $(cmake-utils_use_with wineappdb WINEAPPDB) \ - $(cmake-utils_use_with dbus DBUS)" - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - for x in ${LANGS}; do - if ! has ${x} ${LINGUAS}; then - find "${D}" -name "${PN}_${x}*.qm" -exec rm {} \; - fi - done -} diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index f4492da56856..e9a0e5825013 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -1,3 +1,4 @@ +DIST XSA-55patches.tar.gz 23888 SHA256 e86749d02ca5594ebcfdaea820a6cf1fe11015c7fdcc5836260498fae317d75b SHA512 ed1f321a1351df99cfb05e1dfc62dda1268544b0c0ceb7a01438805046e027fb9d59194d179b7a8c302b091a7bf444811b0b9359c4d42f7e902510515c275b6b WHIRLPOOL 5a611e5260f0fc97471f386da3499f7714e015c5c2556bd7199466558d8e375784d32655bdbe9ed4cbf492fa3b41091677d9fe6d3714b029c9a2b1dda6102edb DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5 DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f SHA512 1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d WHIRLPOOL 63bdd9eb70f168ba2006a8f4bbe166b68528abe8364b23cdc1d468ccc4b137bb3447bf90695920f016e09d53d3b93ccf6e3697b3c46840f00b794789cb424acc DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db diff --git a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-11-XSA-55.patch b/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-11-XSA-55.patch deleted file mode 100644 index 5ad78279b0db..000000000000 --- a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-11-XSA-55.patch +++ /dev/null @@ -1,788 +0,0 @@ -From cc8761371aac432318530c2ddfe2c8234bc0621f Mon Sep 17 00:00:00 2001 -From: Ian Jackson -Date: Fri, 14 Jun 2013 16:43:17 +0100 -Subject: [PATCH 11/23] libelf: check all pointer accesses - -We change the ELF_PTRVAL and ELF_HANDLE types and associated macros: - - * PTRVAL becomes a uintptr_t, for which we provide a typedef - elf_ptrval. This means no arithmetic done on it can overflow so - the compiler cannot do any malicious invalid pointer arithmetic - "optimisations". It also means that any places where we - dereference one of these pointers without using the appropriate - macros or functions become a compilation error. - - So we can be sure that we won't miss any memory accesses. - - All the PTRVAL variables were previously void* or char*, so - the actual address calculations are unchanged. - - * ELF_HANDLE becomes a union, one half of which keeps the pointer - value and the other half of which is just there to record the - type. - - The new type is not a pointer type so there can be no address - calculations on it whose meaning would change. Every assignment or - access has to go through one of our macros. - - * The distinction between const and non-const pointers and char*s - and void*s in libelf goes away. This was not important (and - anyway libelf tended to cast away const in various places). - - * The fields elf->image and elf->dest are renamed. That proves - that we haven't missed any unchecked uses of these actual - pointer values. - - * The caller may fill in elf->caller_xdest_base and _size to - specify another range of memory which is safe for libelf to - access, besides the input and output images. - - * When accesses fail due to being out of range, we mark the elf - "broken". This will be checked and used for diagnostics in - a following patch. - - We do not check for write accesses to the input image. This is - because libelf actually does this in a number of places. So we - simply permit that. - - * Each caller of libelf which used to set dest now sets - dest_base and dest_size. - - * In xc_dom_load_elf_symtab we provide a new actual-pointer - value hdr_ptr which we get from mapping the guest's kernel - area and use (checking carefully) as the caller_xdest area. - - * The STAR(h) macro in libelf-dominfo.c now uses elf_access_unsigned. - - * elf-init uses the new elf_uval_3264 accessor to access the 32-bit - fields, rather than an unchecked field access (ie, unchecked - pointer access). - - * elf_uval has been reworked to use elf_uval_3264. Both of these - macros are essentially new in this patch (although they are derived - from the old elf_uval) and need careful review. - - * ELF_ADVANCE_DEST is now safe in the sense that you can use it to - chop parts off the front of the dest area but if you chop more than - is available, the dest area is simply set to be empty, preventing - future accesses. - - * We introduce some #defines for memcpy, memset, memmove and strcpy: - - We provide elf_memcpy_safe and elf_memset_safe which take - PTRVALs and do checking on the supplied pointers. - - Users inside libelf must all be changed to either - elf_mem*_unchecked (which are just like mem*), or - elf_mem*_safe (which take PTRVALs) and are checked. Any - unchanged call sites become compilation errors. - - * We do _not_ at this time fix elf_access_unsigned so that it doesn't - make unaligned accesses. We hope that unaligned accesses are OK on - every supported architecture. But it does check the supplied - pointer for validity. - -This is part of the fix to a security issue, XSA-55. - -Signed-off-by: Ian Jackson ---- - tools/libxc/xc_dom_elfloader.c | 49 ++++++++-- - tools/libxc/xc_hvm_build_x86.c | 10 +- - xen/arch/x86/domain_build.c | 3 +- - xen/common/libelf/libelf-dominfo.c | 2 +- - xen/common/libelf/libelf-loader.c | 16 ++-- - xen/common/libelf/libelf-private.h | 13 +++ - xen/common/libelf/libelf-tools.c | 106 ++++++++++++++++++- - xen/include/xen/libelf.h | 198 +++++++++++++++++++++++++----------- - 8 files changed, 312 insertions(+), 85 deletions(-) - -diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c -index cc0f206..b82a08c 100644 ---- a/tools/libxc/xc_dom_elfloader.c -+++ b/tools/libxc/xc_dom_elfloader.c -@@ -130,20 +130,30 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - - if ( load ) - { -- size_t allow_size; /* will be used in a forthcoming XSA-55 patch */ -+ char *hdr_ptr; -+ size_t allow_size; -+ - if ( !dom->bsd_symtab_start ) - return 0; - size = dom->kernel_seg.vend - dom->bsd_symtab_start; -- hdr = xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size); -- *(int *)hdr = size - sizeof(int); -+ hdr_ptr = xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size); -+ elf->caller_xdest_base = hdr_ptr; -+ elf->caller_xdest_size = allow_size; -+ hdr = ELF_REALPTR2PTRVAL(hdr_ptr); -+ elf_store_val(elf, int, hdr, size - sizeof(int)); - } - else - { -+ char *hdr_ptr; -+ - size = sizeof(int) + elf_size(elf, elf->ehdr) + - elf_shdr_count(elf) * elf_size(elf, shdr); -- hdr = xc_dom_malloc(dom, size); -- if ( hdr == NULL ) -+ hdr_ptr = xc_dom_malloc(dom, size); -+ if ( hdr_ptr == NULL ) - return 0; -+ elf->caller_xdest_base = hdr_ptr; -+ elf->caller_xdest_size = size; -+ hdr = ELF_REALPTR2PTRVAL(hdr_ptr); - dom->bsd_symtab_start = elf_round_up(elf, dom->kernel_seg.vend); - } - -@@ -171,9 +181,32 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - ehdr->e_shoff = elf_size(elf, elf->ehdr); - ehdr->e_shstrndx = SHN_UNDEF; - } -- if ( elf_init(&syms, hdr + sizeof(int), size - sizeof(int)) ) -+ if ( elf->caller_xdest_size < sizeof(int) ) -+ { -+ DOMPRINTF("%s/%s: header size %"PRIx64" too small", -+ __FUNCTION__, load ? "load" : "parse", -+ (uint64_t)elf->caller_xdest_size); -+ return -1; -+ } -+ if ( elf_init(&syms, elf->caller_xdest_base + sizeof(int), -+ elf->caller_xdest_size - sizeof(int)) ) - return -1; - -+ /* -+ * The caller_xdest_{base,size} and dest_{base,size} need to -+ * remain valid so long as each struct elf_image does. The -+ * principle we adopt is that these values are set when the -+ * memory is allocated or mapped, and cleared when (and if) -+ * they are unmapped. -+ * -+ * Mappings of the guest are normally undone by xc_dom_unmap_all -+ * (directly or via xc_dom_release). We do not explicitly clear -+ * these because in fact that happens only at the end of -+ * xc_dom_boot_image, at which time all of these ELF loading -+ * functions have returned. No relevant struct elf_binary* -+ * escapes this file. -+ */ -+ - xc_elf_set_logfile(dom->xch, &syms, 1); - - symtab = dom->bsd_symtab_start + sizeof(int); -@@ -312,8 +345,10 @@ static int xc_dom_load_elf_kernel(struct xc_dom_image *dom) - { - struct elf_binary *elf = dom->private_loader; - int rc; -+ xen_pfn_t pages; - -- elf->dest = xc_dom_seg_to_ptr(dom, &dom->kernel_seg); -+ elf->dest_base = xc_dom_seg_to_ptr_pages(dom, &dom->kernel_seg, &pages); -+ elf->dest_size = pages * XC_DOM_PAGE_SIZE(dom); - rc = elf_load_binary(elf); - if ( rc < 0 ) - { -diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c -index 15b603d..ccfd8b5 100644 ---- a/tools/libxc/xc_hvm_build_x86.c -+++ b/tools/libxc/xc_hvm_build_x86.c -@@ -104,11 +104,12 @@ static int loadelfimage( - for ( i = 0; i < pages; i++ ) - entries[i].mfn = parray[(elf->pstart >> PAGE_SHIFT) + i]; - -- elf->dest = xc_map_foreign_ranges( -+ elf->dest_base = xc_map_foreign_ranges( - xch, dom, pages << PAGE_SHIFT, PROT_READ | PROT_WRITE, 1 << PAGE_SHIFT, - entries, pages); -- if ( elf->dest == NULL ) -+ if ( elf->dest_base == NULL ) - goto err; -+ elf->dest_size = pages * PAGE_SIZE; - - ELF_ADVANCE_DEST(elf, elf->pstart & (PAGE_SIZE - 1)); - -@@ -117,8 +118,9 @@ static int loadelfimage( - if ( rc < 0 ) - PERROR("Failed to load elf binary\n"); - -- munmap(elf->dest, pages << PAGE_SHIFT); -- elf->dest = NULL; -+ munmap(elf->dest_base, pages << PAGE_SHIFT); -+ elf->dest_base = NULL; -+ elf->dest_size = 0; - - err: - free(entries); -diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c -index 469d363..a655b21 100644 ---- a/xen/arch/x86/domain_build.c -+++ b/xen/arch/x86/domain_build.c -@@ -908,7 +908,8 @@ int __init construct_dom0( - write_ptbase(v); - - /* Copy the OS image and free temporary buffer. */ -- elf.dest = (void*)vkern_start; -+ elf.dest_base = (void*)vkern_start; -+ elf.dest_size = vkern_end - vkern_start; - rc = elf_load_binary(&elf); - if ( rc < 0 ) - { -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index b217f8f..98c80dc 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -254,7 +254,7 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - int len; - - h = parms->guest_info; --#define STAR(h) (*(h)) -+#define STAR(h) (elf_access_unsigned(elf, (h), 0, 1)) - while ( STAR(h) ) - { - elf_memset_unchecked(name, 0, sizeof(name)); -diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c -index 0fef84c..a3310e7 100644 ---- a/xen/common/libelf/libelf-loader.c -+++ b/xen/common/libelf/libelf-loader.c -@@ -24,23 +24,25 @@ - - /* ------------------------------------------------------------------------ */ - --int elf_init(struct elf_binary *elf, const char *image, size_t size) -+int elf_init(struct elf_binary *elf, const char *image_input, size_t size) - { - ELF_HANDLE_DECL(elf_shdr) shdr; - uint64_t i, count, section, offset; - -- if ( !elf_is_elfbinary(image) ) -+ if ( !elf_is_elfbinary(image_input) ) - { - elf_err(elf, "%s: not an ELF binary\n", __FUNCTION__); - return -1; - } - - elf_memset_unchecked(elf, 0, sizeof(*elf)); -- elf->image = image; -+ elf->image_base = image_input; - elf->size = size; -- elf->ehdr = (elf_ehdr *)image; -- elf->class = elf->ehdr->e32.e_ident[EI_CLASS]; -- elf->data = elf->ehdr->e32.e_ident[EI_DATA]; -+ elf->ehdr = ELF_MAKE_HANDLE(elf_ehdr, (elf_ptrval)image_input); -+ elf->class = elf_uval_3264(elf, elf->ehdr, e32.e_ident[EI_CLASS]); -+ elf->data = elf_uval_3264(elf, elf->ehdr, e32.e_ident[EI_DATA]); -+ elf->caller_xdest_base = NULL; -+ elf->caller_xdest_size = 0; - - /* Sanity check phdr. */ - offset = elf_uval(elf, elf->ehdr, e_phoff) + -@@ -300,7 +302,7 @@ int elf_load_binary(struct elf_binary *elf) - - ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr) - { -- return elf->dest + addr - elf->pstart; -+ return ELF_REALPTR2PTRVAL(elf->dest_base) + addr - elf->pstart; - } - - uint64_t elf_lookup_addr(struct elf_binary * elf, const char *symbol) -diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h -index 3ef753c..280dfd1 100644 ---- a/xen/common/libelf/libelf-private.h -+++ b/xen/common/libelf/libelf-private.h -@@ -86,6 +86,19 @@ do { strncpy((d),(s),sizeof((d))-1); \ - - #endif - -+#undef memcpy -+#undef memset -+#undef memmove -+#undef strcpy -+ -+#define memcpy MISTAKE_unspecified_memcpy -+#define memset MISTAKE_unspecified_memset -+#define memmove MISTAKE_unspecified_memmove -+#define strcpy MISTAKE_unspecified_strcpy -+ /* This prevents libelf from using these undecorated versions -+ * of memcpy, memset, memmove and strcpy. Every call site -+ * must either use elf_mem*_unchecked, or elf_mem*_safe. */ -+ - #endif /* __LIBELF_PRIVATE_H_ */ - - /* -diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c -index 3a0cde1..46ca553 100644 ---- a/xen/common/libelf/libelf-tools.c -+++ b/xen/common/libelf/libelf-tools.c -@@ -20,28 +20,100 @@ - - /* ------------------------------------------------------------------------ */ - --uint64_t elf_access_unsigned(struct elf_binary * elf, const void *ptr, -- uint64_t offset, size_t size) -+void elf_mark_broken(struct elf_binary *elf, const char *msg) - { -+ if ( elf->broken == NULL ) -+ elf->broken = msg; -+} -+ -+const char *elf_check_broken(const struct elf_binary *elf) -+{ -+ return elf->broken; -+} -+ -+static int elf_ptrval_in_range(elf_ptrval ptrval, uint64_t size, -+ const void *region, uint64_t regionsize) -+ /* -+ * Returns true if the putative memory area [ptrval,ptrval+size> -+ * is completely inside the region [region,region+regionsize>. -+ * -+ * ptrval and size are the untrusted inputs to be checked. -+ * region and regionsize are trusted and must be correct and valid, -+ * although it is OK for region to perhaps be maliciously NULL -+ * (but not some other malicious value). -+ */ -+{ -+ elf_ptrval regionp = (elf_ptrval)region; -+ -+ if ( (region == NULL) || -+ (ptrval < regionp) || /* start is before region */ -+ (ptrval > regionp + regionsize) || /* start is after region */ -+ (size > regionsize - (ptrval - regionp)) ) /* too big */ -+ return 0; -+ return 1; -+} -+ -+int elf_access_ok(struct elf_binary * elf, -+ uint64_t ptrval, size_t size) -+{ -+ if ( elf_ptrval_in_range(ptrval, size, elf->image_base, elf->size) ) -+ return 1; -+ if ( elf_ptrval_in_range(ptrval, size, elf->dest_base, elf->dest_size) ) -+ return 1; -+ if ( elf_ptrval_in_range(ptrval, size, -+ elf->caller_xdest_base, elf->caller_xdest_size) ) -+ return 1; -+ elf_mark_broken(elf, "out of range access"); -+ return 0; -+} -+ -+void elf_memcpy_safe(struct elf_binary *elf, elf_ptrval dst, -+ elf_ptrval src, size_t size) -+{ -+ if ( elf_access_ok(elf, dst, size) && -+ elf_access_ok(elf, src, size) ) -+ { -+ /* use memmove because these checks do not prove that the -+ * regions don't overlap and overlapping regions grant -+ * permission for compiler malice */ -+ elf_memmove_unchecked(ELF_UNSAFE_PTR(dst), ELF_UNSAFE_PTR(src), size); -+ } -+} -+ -+void elf_memset_safe(struct elf_binary *elf, elf_ptrval dst, int c, size_t size) -+{ -+ if ( elf_access_ok(elf, dst, size) ) -+ { -+ elf_memset_unchecked(ELF_UNSAFE_PTR(dst), c, size); -+ } -+} -+ -+uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, -+ uint64_t moreoffset, size_t size) -+{ -+ elf_ptrval ptrval = base + moreoffset; - int need_swap = elf_swap(elf); - const uint8_t *u8; - const uint16_t *u16; - const uint32_t *u32; - const uint64_t *u64; - -+ if ( !elf_access_ok(elf, ptrval, size) ) -+ return 0; -+ - switch ( size ) - { - case 1: -- u8 = ptr + offset; -+ u8 = (const void*)ptrval; - return *u8; - case 2: -- u16 = ptr + offset; -+ u16 = (const void*)ptrval; - return need_swap ? bswap_16(*u16) : *u16; - case 4: -- u32 = ptr + offset; -+ u32 = (const void*)ptrval; - return need_swap ? bswap_32(*u32) : *u32; - case 8: -- u64 = ptr + offset; -+ u64 = (const void*)ptrval; - return need_swap ? bswap_64(*u64) : *u64; - default: - return 0; -@@ -122,6 +194,28 @@ const char *elf_section_name(struct elf_binary *elf, - return elf_strval(elf, elf->sec_strtab + elf_uval(elf, shdr, sh_name)); - } - -+const char *elf_strval(struct elf_binary *elf, elf_ptrval start) -+{ -+ uint64_t length; -+ -+ for ( length = 0; ; length++ ) { -+ if ( !elf_access_ok(elf, start + length, 1) ) -+ return NULL; -+ if ( !elf_access_unsigned(elf, start, length, 1) ) -+ /* ok */ -+ return ELF_UNSAFE_PTR(start); -+ } -+} -+ -+const char *elf_strfmt(struct elf_binary *elf, elf_ptrval start) -+{ -+ const char *str = elf_strval(elf, start); -+ -+ if ( str == NULL ) -+ return "(invalid)"; -+ return str; -+} -+ - ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr) - { - return ELF_IMAGE_BASE(elf) + elf_uval(elf, shdr, sh_offset); -diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h -index af5b5c5..ddc3ed7 100644 ---- a/xen/include/xen/libelf.h -+++ b/xen/include/xen/libelf.h -@@ -57,8 +57,9 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - * on this. - * This replaces variables which were char*,void* - * and their const versions, so we provide four -- * different declaration macros: -+ * different obsolete declaration macros: - * ELF_PTRVAL_{,CONST}{VOID,CHAR} -+ * New code can simply use the elf_ptrval typedef. - * HANDLE A pointer to a struct. There is one of these types - * for each pointer type - that is, for each "structname". - * In the arguments to the various HANDLE macros, structname -@@ -67,54 +68,66 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - * pointers. In the current code attempts to do so will - * compile, but in the next patch this will become a - * compile error. -- * We provide two declaration macros for const and -- * non-const pointers. -+ * We also provide a second declaration macro for -+ * pointers which were to const; this is obsolete. - */ - --#define ELF_REALPTR2PTRVAL(realpointer) (realpointer) -+typedef uintptr_t elf_ptrval; -+ -+#define ELF_REALPTR2PTRVAL(realpointer) ((elf_ptrval)(realpointer)) - /* Converts an actual C pointer into a PTRVAL */ - --#define ELF_HANDLE_DECL_NONCONST(structname) structname * --#define ELF_HANDLE_DECL(structname) const structname * -+#define ELF_HANDLE_DECL_NONCONST(structname) structname##_handle /*obsolete*/ -+#define ELF_HANDLE_DECL(structname) structname##_handle - /* Provides a type declaration for a HANDLE. */ -- /* May only be used to declare ONE variable at a time */ - --#define ELF_PTRVAL_VOID void * --#define ELF_PTRVAL_CHAR char * --#define ELF_PTRVAL_CONST_VOID const void * --#define ELF_PTRVAL_CONST_CHAR const char * -- /* Provides a type declaration for a PTRVAL. */ -- /* May only be used to declare ONE variable at a time */ -+#define ELF_PTRVAL_VOID elf_ptrval /*obsolete*/ -+#define ELF_PTRVAL_CHAR elf_ptrval /*obsolete*/ -+#define ELF_PTRVAL_CONST_VOID elf_ptrval /*obsolete*/ -+#define ELF_PTRVAL_CONST_CHAR elf_ptrval /*obsolete*/ -+ -+#ifdef __XEN__ -+# define ELF_PRPTRVAL "lu" -+ /* -+ * PRIuPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, -+ * to "u", when in fact uintptr_t is an unsigned long. -+ */ -+#else -+# define ELF_PRPTRVAL PRIuPTR -+#endif -+ /* printf format a la PRId... for a PTRVAL */ - --#define ELF_DEFINE_HANDLE(structname) /* empty */ -+#define ELF_DEFINE_HANDLE(structname) \ -+ typedef union { \ -+ elf_ptrval ptrval; \ -+ const structname *typeonly; /* for sizeof, offsetof, &c only */ \ -+ } structname##_handle; - /* - * This must be invoked for each HANDLE type to define - * the actual C type used for that kind of HANDLE. - */ - --#define ELF_PRPTRVAL "p" -- /* printf format a la PRId... for a PTRVAL */ -- --#define ELF_MAKE_HANDLE(structname, ptrval) (ptrval) -+#define ELF_MAKE_HANDLE(structname, ptrval) ((structname##_handle){ ptrval }) - /* Converts a PTRVAL to a HANDLE */ - --#define ELF_IMAGE_BASE(elf) ((elf)->image) -+#define ELF_IMAGE_BASE(elf) ((elf_ptrval)(elf)->image_base) - /* Returns the base of the image as a PTRVAL. */ - --#define ELF_HANDLE_PTRVAL(handleval) ((void*)(handleval)) -+#define ELF_HANDLE_PTRVAL(handleval) ((handleval).ptrval) - /* Converts a HANDLE to a PTRVAL. */ - --#define ELF_OBSOLETE_VOIDP_CAST (void*)(uintptr_t) -+#define ELF_OBSOLETE_VOIDP_CAST /*empty*/ - /* -- * In some places the existing code needs to -+ * In some places the old code used to need to - * - cast away const (the existing code uses const a fair - * bit but actually sometimes wants to write to its input) - * from a PTRVAL. - * - convert an integer representing a pointer to a PTRVAL -- * This macro provides a suitable cast. -+ * Nowadays all of these re uintptr_ts so there is no const problem -+ * and no need for any casting. - */ - --#define ELF_UNSAFE_PTR(ptrval) ((void*)(uintptr_t)(ptrval)) -+#define ELF_UNSAFE_PTR(ptrval) ((void*)(elf_ptrval)(ptrval)) - /* - * Turns a PTRVAL into an actual C pointer. Before this is done - * the caller must have ensured that the PTRVAL does in fact point -@@ -122,18 +135,21 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - */ - - /* PTRVALs can be INVALID (ie, NULL). */ --#define ELF_INVALID_PTRVAL (NULL) /* returns NULL PTRVAL */ -+#define ELF_INVALID_PTRVAL ((elf_ptrval)0) /* returns NULL PTRVAL */ - #define ELF_INVALID_HANDLE(structname) /* returns NULL handle */ \ - ELF_MAKE_HANDLE(structname, ELF_INVALID_PTRVAL) --#define ELF_PTRVAL_VALID(ptrval) (ptrval) /* } */ --#define ELF_HANDLE_VALID(handleval) (handleval) /* } predicates */ --#define ELF_PTRVAL_INVALID(ptrval) ((ptrval) == NULL) /* } */ -+#define ELF_PTRVAL_VALID(ptrval) (!!(ptrval)) /* } */ -+#define ELF_HANDLE_VALID(handleval) (!!(handleval).ptrval) /* } predicates */ -+#define ELF_PTRVAL_INVALID(ptrval) (!ELF_PTRVAL_VALID((ptrval))) /* } */ -+ -+#define ELF_MAX_PTRVAL (~(elf_ptrval)0) -+ /* PTRVAL value guaranteed to compare > to any valid PTRVAL */ - - /* For internal use by other macros here */ - #define ELF__HANDLE_FIELD_TYPE(handleval, elm) \ -- typeof((handleval)->elm) -+ typeof((handleval).typeonly->elm) - #define ELF__HANDLE_FIELD_OFFSET(handleval, elm) \ -- offsetof(typeof(*(handleval)),elm) -+ offsetof(typeof(*(handleval).typeonly),elm) - - - /* ------------------------------------------------------------------------ */ -@@ -182,7 +198,7 @@ ELF_DEFINE_HANDLE(elf_note) - - struct elf_binary { - /* elf binary */ -- const char *image; -+ const void *image_base; - size_t size; - char class; - char data; -@@ -190,10 +206,16 @@ struct elf_binary { - ELF_HANDLE_DECL(elf_ehdr) ehdr; - ELF_PTRVAL_CONST_CHAR sec_strtab; - ELF_HANDLE_DECL(elf_shdr) sym_tab; -- ELF_PTRVAL_CONST_CHAR sym_strtab; -+ uint64_t sym_strtab; - - /* loaded to */ -- char *dest; -+ /* -+ * dest_base and dest_size are trusted and must be correct; -+ * whenever dest_size is not 0, both of these must be valid -+ * so long as the struct elf_binary is in use. -+ */ -+ char *dest_base; -+ size_t dest_size; - uint64_t pstart; - uint64_t pend; - uint64_t reloc_offset; -@@ -201,12 +223,22 @@ struct elf_binary { - uint64_t bsd_symtab_pstart; - uint64_t bsd_symtab_pend; - -+ /* -+ * caller's other acceptable destination -+ * -+ * Again, these are trusted and must be valid (or 0) so long -+ * as the struct elf_binary is in use. -+ */ -+ void *caller_xdest_base; -+ uint64_t caller_xdest_size; -+ - #ifndef __XEN__ - /* misc */ - elf_log_callback *log_callback; - void *log_caller_data; - #endif - int verbose; -+ const char *broken; - }; - - /* ------------------------------------------------------------------------ */ -@@ -224,22 +256,27 @@ struct elf_binary { - #define elf_lsb(elf) (ELFDATA2LSB == (elf)->data) - #define elf_swap(elf) (NATIVE_ELFDATA != (elf)->data) - --#define elf_uval(elf, str, elem) \ -- ((ELFCLASS64 == (elf)->class) \ -- ? elf_access_unsigned((elf), (str), \ -- offsetof(typeof(*(str)),e64.elem), \ -- sizeof((str)->e64.elem)) \ -- : elf_access_unsigned((elf), (str), \ -- offsetof(typeof(*(str)),e32.elem), \ -- sizeof((str)->e32.elem))) -+#define elf_uval_3264(elf, handle, elem) \ -+ elf_access_unsigned((elf), (handle).ptrval, \ -+ offsetof(typeof(*(handle).typeonly),elem), \ -+ sizeof((handle).typeonly->elem)) -+ -+#define elf_uval(elf, handle, elem) \ -+ ((ELFCLASS64 == (elf)->class) \ -+ ? elf_uval_3264(elf, handle, e64.elem) \ -+ : elf_uval_3264(elf, handle, e32.elem)) - /* - * Reads an unsigned field in a header structure in the ELF. - * str is a HANDLE, and elem is the field name in it. - */ - --#define elf_size(elf, str) \ -+ -+#define elf_size(elf, handle_or_handletype) ({ \ -+ typeof(handle_or_handletype) elf_size__dummy; \ - ((ELFCLASS64 == (elf)->class) \ -- ? sizeof((str)->e64) : sizeof((str)->e32)) -+ ? sizeof(elf_size__dummy.typeonly->e64) \ -+ : sizeof(elf_size__dummy.typeonly->e32)); \ -+}) - /* - * Returns the size of the substructure for the appropriate 32/64-bitness. - * str should be a HANDLE. -@@ -251,23 +288,37 @@ uint64_t elf_access_unsigned(struct elf_binary *elf, ELF_PTRVAL_CONST_VOID ptr, - - uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr); - -+const char *elf_strval(struct elf_binary *elf, elf_ptrval start); -+ /* may return NULL if the string is out of range etc. */ - --#define elf_strval(elf,x) ((const char*)(x)) /* may return NULL in the future */ --#define elf_strfmt(elf,x) ((const char*)(x)) /* will return (invalid) instead */ -+const char *elf_strfmt(struct elf_binary *elf, elf_ptrval start); -+ /* like elf_strval but returns "(invalid)" instead of NULL */ - --#define elf_memcpy_safe(elf, dst, src, sz) memcpy((dst),(src),(sz)) --#define elf_memset_safe(elf, dst, c, sz) memset((dst),(c),(sz)) -+void elf_memcpy_safe(struct elf_binary*, elf_ptrval dst, elf_ptrval src, size_t); -+void elf_memset_safe(struct elf_binary*, elf_ptrval dst, int c, size_t); - /* -- * Versions of memcpy and memset which will (in the next patch) -- * arrange never to write outside permitted areas. -+ * Versions of memcpy and memset which arrange never to write -+ * outside permitted areas. - */ - --#define elf_store_val(elf, type, ptr, val) (*(type*)(ptr) = (val)) -+int elf_access_ok(struct elf_binary * elf, -+ uint64_t ptrval, size_t size); -+ -+#define elf_store_val(elf, type, ptr, val) \ -+ ({ \ -+ typeof(type) elf_store__val = (val); \ -+ elf_ptrval elf_store__targ = ptr; \ -+ if (elf_access_ok((elf), elf_store__targ, \ -+ sizeof(elf_store__val))) { \ -+ elf_memcpy_unchecked((void*)elf_store__targ, &elf_store__val, \ -+ sizeof(elf_store__val)); \ -+ } \ -+ }) \ - /* Stores a value at a particular PTRVAL. */ - --#define elf_store_field(elf, hdr, elm, val) \ -- (elf_store_val((elf), ELF__HANDLE_FIELD_TYPE(hdr, elm), \ -- &((hdr)->elm), \ -+#define elf_store_field(elf, hdr, elm, val) \ -+ (elf_store_val((elf), ELF__HANDLE_FIELD_TYPE(hdr, elm), \ -+ ELF_HANDLE_PTRVAL(hdr) + ELF__HANDLE_FIELD_OFFSET(hdr, elm), \ - (val))) - /* Stores a 32/64-bit field. hdr is a HANDLE and elm is the field name. */ - -@@ -306,6 +357,10 @@ int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - /* xc_libelf_loader.c */ - - int elf_init(struct elf_binary *elf, const char *image, size_t size); -+ /* -+ * image and size must be correct. They will be recorded in -+ * *elf, and must remain valid while the elf is in use. -+ */ - #ifdef __XEN__ - void elf_set_verbose(struct elf_binary *elf); - #else -@@ -321,6 +376,9 @@ uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol); - - void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart); /* private */ - -+void elf_mark_broken(struct elf_binary *elf, const char *msg); -+const char *elf_check_broken(const struct elf_binary *elf); /* NULL means OK */ -+ - /* ------------------------------------------------------------------------ */ - /* xc_libelf_relocate.c */ - -@@ -395,16 +453,38 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms); - --#define elf_memcpy_unchecked memcpy --#define elf_memset_unchecked memset -+static inline void *elf_memcpy_unchecked(void *dest, const void *src, size_t n) -+ { return memcpy(dest, src, n); } -+static inline void *elf_memmove_unchecked(void *dest, const void *src, size_t n) -+ { return memmove(dest, src, n); } -+static inline void *elf_memset_unchecked(void *s, int c, size_t n) -+ { return memset(s, c, n); } - /* -- * Unsafe versions of memcpy and memset which take actual C -- * pointers. These are just like real memcpy and memset. -+ * Unsafe versions of memcpy, memmove memset which take actual C -+ * pointers. These are just like the real functions. -+ * We provide these so that in libelf-private.h we can #define -+ * memcpy, memset and memmove to undefined MISTAKE things. - */ - - --#define ELF_ADVANCE_DEST(elf, amount) elf->dest += (amount) -- /* Advances past amount bytes of the current destination area. */ -+/* Advances past amount bytes of the current destination area. */ -+static inline void ELF_ADVANCE_DEST(struct elf_binary *elf, uint64_t amount) -+{ -+ if ( elf->dest_base == NULL ) -+ { -+ elf_mark_broken(elf, "advancing in null image"); -+ } -+ else if ( elf->dest_size >= amount ) -+ { -+ elf->dest_base += amount; -+ elf->dest_size -= amount; -+ } -+ else -+ { -+ elf->dest_size = 0; -+ elf_mark_broken(elf, "advancing past end (image very short?)"); -+ } -+} - - - #endif /* __XEN_LIBELF_H__ */ --- -1.7.2.5 - diff --git a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-15-XSA-55.patch b/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-15-XSA-55.patch deleted file mode 100644 index f55701dae332..000000000000 --- a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-15-XSA-55.patch +++ /dev/null @@ -1,759 +0,0 @@ -From e673ca50127b6c1263727aa31de0b8bb966ca7a2 Mon Sep 17 00:00:00 2001 -From: Ian Jackson -Date: Fri, 14 Jun 2013 16:43:18 +0100 -Subject: [PATCH 15/23] libelf: use only unsigned integers - -Signed integers have undesirable undefined behaviours on overflow. -Malicious compilers can turn apparently-correct code into code with -security vulnerabilities etc. - -So use only unsigned integers. Exceptions are booleans (which we have -already changed) and error codes. - -We _do_ change all the chars which aren't fixed constants from our own -text segment, but not the char*s. This is because it is safe to -access an arbitrary byte through a char*, but not necessarily safe to -convert an arbitrary value to a char. - -As a consequence we need to compile libelf with -Wno-pointer-sign. - -It is OK to change all the signed integers to unsigned because all the -inequalities in libelf are in contexts where we don't "expect" -negative numbers. - -In libelf-dominfo.c:elf_xen_parse we rename a variable "rc" to -"more_notes" as it actually contains a note count derived from the -input image. The "error" return value from elf_xen_parse_notes is -changed from -1 to ~0U. - -grepping shows only one occurrence of "PRId" or "%d" or "%ld" in -libelf and xc_dom_elfloader.c (a "%d" which becomes "%u"). - -This is part of the fix to a security issue, XSA-55. - -For those concerned about unintentional functional changes, the -following rune produces a version of the patch which is much smaller -and eliminates only non-functional changes: - - GIT_EXTERNAL_DIFF=.../unsigned-differ git-diff .. - -where and are git refs for the code before and after -this patch, and unsigned-differ is this shell script: - - #!/bin/bash - set -e - - seddery () { - perl -pe 's/\b(?:elf_errorstatus|elf_negerrnoval)\b/int/g' - } - - path="$1" - in="$2" - out="$5" - - set +e - diff -pu --label "$path~" <(seddery <"$in") --label "$path" <(seddery <"$out") - rc=$? - set -e - if [ $rc = 1 ]; then rc=0; fi - exit $rc - -Signed-off-by: Ian Jackson ---- - tools/libxc/Makefile | 9 +++++- - tools/libxc/xc_dom.h | 7 +++-- - tools/libxc/xc_dom_elfloader.c | 42 ++++++++++++++++------------- - tools/xcutils/readnotes.c | 15 +++++----- - xen/common/libelf/Makefile | 2 + - xen/common/libelf/libelf-dominfo.c | 52 ++++++++++++++++++----------------- - xen/common/libelf/libelf-loader.c | 20 +++++++------- - xen/common/libelf/libelf-tools.c | 24 ++++++++-------- - xen/include/xen/libelf.h | 21 ++++++++------ - 9 files changed, 105 insertions(+), 87 deletions(-) - -diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile -index d8c6a60..a3fd90c 100644 ---- a/tools/libxc/Makefile -+++ b/tools/libxc/Makefile -@@ -52,8 +52,13 @@ endif - vpath %.c ../../xen/common/libelf - CFLAGS += -I../../xen/common/libelf - --GUEST_SRCS-y += libelf-tools.c libelf-loader.c --GUEST_SRCS-y += libelf-dominfo.c -+ELF_SRCS-y += libelf-tools.c libelf-loader.c -+ELF_SRCS-y += libelf-dominfo.c -+ -+GUEST_SRCS-y += $(ELF_SRCS-y) -+ -+$(patsubst %.c,%.o,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign -+$(patsubst %.c,%.opic,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign - - # new domain builder - GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c -diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h -index 9f8037e..0161459 100644 ---- a/tools/libxc/xc_dom.h -+++ b/tools/libxc/xc_dom.h -@@ -140,9 +140,10 @@ struct xc_dom_image { - - struct xc_dom_loader { - char *name; -- int (*probe) (struct xc_dom_image * dom); -- int (*parser) (struct xc_dom_image * dom); -- int (*loader) (struct xc_dom_image * dom); -+ /* Sadly the error returns from these functions are not consistent: */ -+ elf_negerrnoval (*probe) (struct xc_dom_image * dom); -+ elf_negerrnoval (*parser) (struct xc_dom_image * dom); -+ elf_errorstatus (*loader) (struct xc_dom_image * dom); - - struct xc_dom_loader *next; - }; -diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c -index 9ba64ae..62a0d3b 100644 ---- a/tools/libxc/xc_dom_elfloader.c -+++ b/tools/libxc/xc_dom_elfloader.c -@@ -84,7 +84,7 @@ static char *xc_dom_guest_type(struct xc_dom_image *dom, - /* ------------------------------------------------------------------------ */ - /* parse elf binary */ - --static int check_elf_kernel(struct xc_dom_image *dom, bool verbose) -+static elf_negerrnoval check_elf_kernel(struct xc_dom_image *dom, bool verbose) - { - if ( dom->kernel_blob == NULL ) - { -@@ -106,12 +106,12 @@ static int check_elf_kernel(struct xc_dom_image *dom, bool verbose) - return 0; - } - --static int xc_dom_probe_elf_kernel(struct xc_dom_image *dom) -+static elf_negerrnoval xc_dom_probe_elf_kernel(struct xc_dom_image *dom) - { - return check_elf_kernel(dom, 0); - } - --static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, -+static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, - struct elf_binary *elf, bool load) - { - struct elf_binary syms; -@@ -119,7 +119,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - xen_vaddr_t symtab, maxaddr; - ELF_PTRVAL_CHAR hdr; - size_t size; -- int h, count, type, i, tables = 0; -+ unsigned h, count, type, i, tables = 0; - - if ( elf_swap(elf) ) - { -@@ -140,13 +140,13 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - elf->caller_xdest_base = hdr_ptr; - elf->caller_xdest_size = allow_size; - hdr = ELF_REALPTR2PTRVAL(hdr_ptr); -- elf_store_val(elf, int, hdr, size - sizeof(int)); -+ elf_store_val(elf, unsigned, hdr, size - sizeof(unsigned)); - } - else - { - char *hdr_ptr; - -- size = sizeof(int) + elf_size(elf, elf->ehdr) + -+ size = sizeof(unsigned) + elf_size(elf, elf->ehdr) + - elf_shdr_count(elf) * elf_size(elf, shdr); - hdr_ptr = xc_dom_malloc(dom, size); - if ( hdr_ptr == NULL ) -@@ -157,15 +157,15 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - dom->bsd_symtab_start = elf_round_up(elf, dom->kernel_seg.vend); - } - -- elf_memcpy_safe(elf, hdr + sizeof(int), -+ elf_memcpy_safe(elf, hdr + sizeof(unsigned), - ELF_IMAGE_BASE(elf), - elf_size(elf, elf->ehdr)); -- elf_memcpy_safe(elf, hdr + sizeof(int) + elf_size(elf, elf->ehdr), -+ elf_memcpy_safe(elf, hdr + sizeof(unsigned) + elf_size(elf, elf->ehdr), - ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), - elf_shdr_count(elf) * elf_size(elf, shdr)); - if ( elf_64bit(elf) ) - { -- Elf64_Ehdr *ehdr = (Elf64_Ehdr *)(hdr + sizeof(int)); -+ Elf64_Ehdr *ehdr = (Elf64_Ehdr *)(hdr + sizeof(unsigned)); - ehdr->e_phoff = 0; - ehdr->e_phentsize = 0; - ehdr->e_phnum = 0; -@@ -174,22 +174,22 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - } - else - { -- Elf32_Ehdr *ehdr = (Elf32_Ehdr *)(hdr + sizeof(int)); -+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)(hdr + sizeof(unsigned)); - ehdr->e_phoff = 0; - ehdr->e_phentsize = 0; - ehdr->e_phnum = 0; - ehdr->e_shoff = elf_size(elf, elf->ehdr); - ehdr->e_shstrndx = SHN_UNDEF; - } -- if ( elf->caller_xdest_size < sizeof(int) ) -+ if ( elf->caller_xdest_size < sizeof(unsigned) ) - { - DOMPRINTF("%s/%s: header size %"PRIx64" too small", - __FUNCTION__, load ? "load" : "parse", - (uint64_t)elf->caller_xdest_size); - return -1; - } -- if ( elf_init(&syms, elf->caller_xdest_base + sizeof(int), -- elf->caller_xdest_size - sizeof(int)) ) -+ if ( elf_init(&syms, elf->caller_xdest_base + sizeof(unsigned), -+ elf->caller_xdest_size - sizeof(unsigned)) ) - return -1; - - /* -@@ -209,7 +209,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - - xc_elf_set_logfile(dom->xch, &syms, 1); - -- symtab = dom->bsd_symtab_start + sizeof(int); -+ symtab = dom->bsd_symtab_start + sizeof(unsigned); - maxaddr = elf_round_up(&syms, symtab + elf_size(&syms, syms.ehdr) + - elf_shdr_count(&syms) * elf_size(&syms, shdr)); - -@@ -255,7 +255,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - size = elf_uval(&syms, shdr, sh_size); - maxaddr = elf_round_up(&syms, maxaddr + size); - tables++; -- DOMPRINTF("%s: h=%d %s, size=0x%zx, maxaddr=0x%" PRIx64 "", -+ DOMPRINTF("%s: h=%u %s, size=0x%zx, maxaddr=0x%" PRIx64 "", - __FUNCTION__, h, - type == SHT_SYMTAB ? "symtab" : "strtab", - size, maxaddr); -@@ -294,10 +294,14 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - return 0; - } - --static int xc_dom_parse_elf_kernel(struct xc_dom_image *dom) -+static elf_errorstatus xc_dom_parse_elf_kernel(struct xc_dom_image *dom) -+ /* -+ * This function sometimes returns -1 for error and sometimes -+ * an errno value. ?!?! -+ */ - { - struct elf_binary *elf; -- int rc; -+ elf_errorstatus rc; - - rc = check_elf_kernel(dom, 1); - if ( rc != 0 ) -@@ -358,10 +362,10 @@ out: - return rc; - } - --static int xc_dom_load_elf_kernel(struct xc_dom_image *dom) -+static elf_errorstatus xc_dom_load_elf_kernel(struct xc_dom_image *dom) - { - struct elf_binary *elf = dom->private_loader; -- int rc; -+ elf_errorstatus rc; - xen_pfn_t pages; - - elf->dest_base = xc_dom_seg_to_ptr_pages(dom, &dom->kernel_seg, &pages); -diff --git a/tools/xcutils/readnotes.c b/tools/xcutils/readnotes.c -index d1f7a30..2ca7732 100644 ---- a/tools/xcutils/readnotes.c -+++ b/tools/xcutils/readnotes.c -@@ -70,7 +70,7 @@ static void print_numeric_note(const char *prefix, struct elf_binary *elf, - ELF_HANDLE_DECL(elf_note) note) - { - uint64_t value = elf_note_numeric(elf, note); -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - - printf("%s: %#*" PRIx64 " (%d bytes)\n", - prefix, 2+2*descsz, value, descsz); -@@ -79,7 +79,7 @@ static void print_numeric_note(const char *prefix, struct elf_binary *elf, - static void print_l1_mfn_valid_note(const char *prefix, struct elf_binary *elf, - ELF_HANDLE_DECL(elf_note) note) - { -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); - - /* XXX should be able to cope with a list of values. */ -@@ -99,10 +99,10 @@ static void print_l1_mfn_valid_note(const char *prefix, struct elf_binary *elf, - - } - --static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, ELF_HANDLE_DECL(elf_note) end) -+static unsigned print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, ELF_HANDLE_DECL(elf_note) end) - { - ELF_HANDLE_DECL(elf_note) note; -- int notes_found = 0; -+ unsigned notes_found = 0; - const char *this_note_name; - - for ( note = start; ELF_HANDLE_PTRVAL(note) < ELF_HANDLE_PTRVAL(end); note = elf_note_next(elf, note) ) -@@ -161,7 +161,7 @@ static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, - break; - default: - printf("unknown note type %#x\n", -- (int)elf_uval(elf, note, type)); -+ (unsigned)elf_uval(elf, note, type)); - break; - } - } -@@ -171,12 +171,13 @@ static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, - int main(int argc, char **argv) - { - const char *f; -- int fd,h,size,usize,count; -+ int fd; -+ unsigned h,size,usize,count; - void *image,*tmp; - struct stat st; - struct elf_binary elf; - ELF_HANDLE_DECL(elf_shdr) shdr; -- int notes_found = 0; -+ unsigned notes_found = 0; - - struct setup_header *hdr; - uint64_t payload_offset, payload_length; -diff --git a/xen/common/libelf/Makefile b/xen/common/libelf/Makefile -index 18dc8e2..5bf8f76 100644 ---- a/xen/common/libelf/Makefile -+++ b/xen/common/libelf/Makefile -@@ -2,6 +2,8 @@ obj-bin-y := libelf.o - - SECTIONS := text data $(SPECIAL_DATA_SECTIONS) - -+CFLAGS += -Wno-pointer-sign -+ - libelf.o: libelf-temp.o Makefile - $(OBJCOPY) $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s)) $< $@ - -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index 12b6c2a..cdd0d31 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -29,15 +29,15 @@ static const char *const elf_xen_feature_names[] = { - [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb", - [XENFEAT_dom0] = "dom0" - }; --static const int elf_xen_features = -+static const unsigned elf_xen_features = - sizeof(elf_xen_feature_names) / sizeof(elf_xen_feature_names[0]); - --int elf_xen_parse_features(const char *features, -+elf_errorstatus elf_xen_parse_features(const char *features, - uint32_t *supported, - uint32_t *required) - { -- char feature[64]; -- int pos, len, i; -+ unsigned char feature[64]; -+ unsigned pos, len, i; - - if ( features == NULL ) - return 0; -@@ -94,7 +94,7 @@ int elf_xen_parse_features(const char *features, - /* ------------------------------------------------------------------------ */ - /* xen elf notes */ - --int elf_xen_parse_note(struct elf_binary *elf, -+elf_errorstatus elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, - ELF_HANDLE_DECL(elf_note) note) - { -@@ -125,7 +125,7 @@ int elf_xen_parse_note(struct elf_binary *elf, - const char *str = NULL; - uint64_t val = 0; - unsigned int i; -- int type = elf_uval(elf, note, type); -+ unsigned type = elf_uval(elf, note, type); - - if ( (type >= sizeof(note_desc) / sizeof(note_desc[0])) || - (note_desc[type].name == NULL) ) -@@ -216,12 +216,14 @@ int elf_xen_parse_note(struct elf_binary *elf, - return 0; - } - --static int elf_xen_parse_notes(struct elf_binary *elf, -+#define ELF_NOTE_INVALID (~0U) -+ -+static unsigned elf_xen_parse_notes(struct elf_binary *elf, - struct elf_dom_parms *parms, - ELF_PTRVAL_CONST_VOID start, - ELF_PTRVAL_CONST_VOID end) - { -- int xen_elfnotes = 0; -+ unsigned xen_elfnotes = 0; - ELF_HANDLE_DECL(elf_note) note; - const char *note_name; - -@@ -237,7 +239,7 @@ static int elf_xen_parse_notes(struct elf_binary *elf, - if ( strcmp(note_name, "Xen") ) - continue; - if ( elf_xen_parse_note(elf, parms, note) ) -- return -1; -+ return ELF_NOTE_INVALID; - xen_elfnotes++; - } - return xen_elfnotes; -@@ -246,12 +248,12 @@ static int elf_xen_parse_notes(struct elf_binary *elf, - /* ------------------------------------------------------------------------ */ - /* __xen_guest section */ - --int elf_xen_parse_guest_info(struct elf_binary *elf, -+elf_errorstatus elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - ELF_PTRVAL_CONST_CHAR h; -- char name[32], value[128]; -- int len; -+ unsigned char name[32], value[128]; -+ unsigned len; - - h = parms->guest_info; - #define STAR(h) (elf_access_unsigned(elf, (h), 0, 1)) -@@ -334,13 +336,13 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - /* ------------------------------------------------------------------------ */ - /* sanity checks */ - --static int elf_xen_note_check(struct elf_binary *elf, -+static elf_errorstatus elf_xen_note_check(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - if ( (ELF_PTRVAL_INVALID(parms->elf_note_start)) && - (ELF_PTRVAL_INVALID(parms->guest_info)) ) - { -- int machine = elf_uval(elf, elf->ehdr, e_machine); -+ unsigned machine = elf_uval(elf, elf->ehdr, e_machine); - if ( (machine == EM_386) || (machine == EM_X86_64) ) - { - elf_err(elf, "%s: ERROR: Not a Xen-ELF image: " -@@ -378,7 +380,7 @@ static int elf_xen_note_check(struct elf_binary *elf, - return 0; - } - --static int elf_xen_addr_calc_check(struct elf_binary *elf, -+static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - if ( (parms->elf_paddr_offset != UNSET_ADDR) && -@@ -464,13 +466,13 @@ static int elf_xen_addr_calc_check(struct elf_binary *elf, - /* ------------------------------------------------------------------------ */ - /* glue it all together ... */ - --int elf_xen_parse(struct elf_binary *elf, -+elf_errorstatus elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - ELF_HANDLE_DECL(elf_shdr) shdr; - ELF_HANDLE_DECL(elf_phdr) phdr; -- int xen_elfnotes = 0; -- int i, count, rc; -+ unsigned xen_elfnotes = 0; -+ unsigned i, count, more_notes; - - elf_memset_unchecked(parms, 0, sizeof(*parms)); - parms->virt_base = UNSET_ADDR; -@@ -495,13 +497,13 @@ int elf_xen_parse(struct elf_binary *elf, - if (elf_uval(elf, phdr, p_offset) == 0) - continue; - -- rc = elf_xen_parse_notes(elf, parms, -+ more_notes = elf_xen_parse_notes(elf, parms, - elf_segment_start(elf, phdr), - elf_segment_end(elf, phdr)); -- if ( rc == -1 ) -+ if ( more_notes == ELF_NOTE_INVALID ) - return -1; - -- xen_elfnotes += rc; -+ xen_elfnotes += more_notes; - } - - /* -@@ -518,17 +520,17 @@ int elf_xen_parse(struct elf_binary *elf, - if ( elf_uval(elf, shdr, sh_type) != SHT_NOTE ) - continue; - -- rc = elf_xen_parse_notes(elf, parms, -+ more_notes = elf_xen_parse_notes(elf, parms, - elf_section_start(elf, shdr), - elf_section_end(elf, shdr)); - -- if ( rc == -1 ) -+ if ( more_notes == ELF_NOTE_INVALID ) - return -1; - -- if ( xen_elfnotes == 0 && rc > 0 ) -+ if ( xen_elfnotes == 0 && more_notes > 0 ) - elf_msg(elf, "%s: using notes from SHT_NOTE section\n", __FUNCTION__); - -- xen_elfnotes += rc; -+ xen_elfnotes += more_notes; - } - - } -diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c -index 0dccd4d..c3a9e51 100644 ---- a/xen/common/libelf/libelf-loader.c -+++ b/xen/common/libelf/libelf-loader.c -@@ -24,7 +24,7 @@ - - /* ------------------------------------------------------------------------ */ - --int elf_init(struct elf_binary *elf, const char *image_input, size_t size) -+elf_errorstatus elf_init(struct elf_binary *elf, const char *image_input, size_t size) - { - ELF_HANDLE_DECL(elf_shdr) shdr; - uint64_t i, count, section, offset; -@@ -114,7 +114,7 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback *log_callback, - elf->verbose = verbose; - } - --static int elf_load_image(struct elf_binary *elf, -+static elf_errorstatus elf_load_image(struct elf_binary *elf, - ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, - uint64_t filesz, uint64_t memsz) - { -@@ -129,9 +129,9 @@ void elf_set_verbose(struct elf_binary *elf) - elf->verbose = 1; - } - --static int elf_load_image(struct elf_binary *elf, ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, uint64_t filesz, uint64_t memsz) -+static elf_errorstatus elf_load_image(struct elf_binary *elf, ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, uint64_t filesz, uint64_t memsz) - { -- int rc; -+ elf_errorstatus rc; - if ( filesz > ULONG_MAX || memsz > ULONG_MAX ) - return -1; - /* We trust the dom0 kernel image completely, so we don't care -@@ -151,7 +151,7 @@ void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - { - uint64_t sz; - ELF_HANDLE_DECL(elf_shdr) shdr; -- int i, type; -+ unsigned i, type; - - if ( !ELF_HANDLE_VALID(elf->sym_tab) ) - return; -@@ -187,7 +187,7 @@ static void elf_load_bsdsyms(struct elf_binary *elf) - ELF_PTRVAL_VOID symbase; - ELF_PTRVAL_VOID symtab_addr; - ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; -- int i, type; -+ unsigned i, type; - - if ( !elf->bsd_symtab_pstart ) - return; -@@ -220,7 +220,7 @@ do { \ - elf_memcpy_safe(elf, ELF_HANDLE_PTRVAL(shdr), - ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), - sz); -- maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (unsigned long)maxva + sz); - - for ( i = 0; i < elf_shdr_count(elf); i++ ) - { -@@ -233,10 +233,10 @@ do { \ - elf_memcpy_safe(elf, maxva, elf_section_start(elf, shdr), sz); - /* Mangled to be based on ELF header location. */ - elf_hdr_elm(elf, shdr, sh_offset, maxva - symtab_addr); -- maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (unsigned long)maxva + sz); - } - shdr = ELF_MAKE_HANDLE(elf_shdr, ELF_HANDLE_PTRVAL(shdr) + -- (long)elf_uval(elf, elf->ehdr, e_shentsize)); -+ (unsigned long)elf_uval(elf, elf->ehdr, e_shentsize)); - } - - /* Write down the actual sym size. */ -@@ -273,7 +273,7 @@ void elf_parse_binary(struct elf_binary *elf) - __FUNCTION__, elf->pstart, elf->pend); - } - --int elf_load_binary(struct elf_binary *elf) -+elf_errorstatus elf_load_binary(struct elf_binary *elf) - { - ELF_HANDLE_DECL(elf_phdr) phdr; - uint64_t i, count, paddr, offset, filesz, memsz; -diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c -index fa58f76..46d4ab1 100644 ---- a/xen/common/libelf/libelf-tools.c -+++ b/xen/common/libelf/libelf-tools.c -@@ -122,19 +122,19 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, - - uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr) - { -- int elf_round = (elf_64bit(elf) ? 8 : 4) - 1; -+ uint64_t elf_round = (elf_64bit(elf) ? 8 : 4) - 1; - - return (addr + elf_round) & ~elf_round; - } - - /* ------------------------------------------------------------------------ */ - --int elf_shdr_count(struct elf_binary *elf) -+unsigned elf_shdr_count(struct elf_binary *elf) - { - return elf_uval(elf, elf->ehdr, e_shnum); - } - --int elf_phdr_count(struct elf_binary *elf) -+unsigned elf_phdr_count(struct elf_binary *elf) - { - return elf_uval(elf, elf->ehdr, e_phnum); - } -@@ -144,7 +144,7 @@ ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *n - uint64_t count = elf_shdr_count(elf); - ELF_HANDLE_DECL(elf_shdr) shdr; - const char *sname; -- int i; -+ unsigned i; - - for ( i = 0; i < count; i++ ) - { -@@ -156,7 +156,7 @@ ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *n - return ELF_INVALID_HANDLE(elf_shdr); - } - --ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, unsigned index) - { - uint64_t count = elf_shdr_count(elf); - ELF_PTRVAL_CONST_VOID ptr; -@@ -170,7 +170,7 @@ ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index) - return ELF_MAKE_HANDLE(elf_shdr, ptr); - } - --ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, unsigned index) - { - uint64_t count = elf_uval(elf, elf->ehdr, e_phnum); - ELF_PTRVAL_CONST_VOID ptr; -@@ -264,7 +264,7 @@ ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *sym - return ELF_INVALID_HANDLE(elf_sym); - } - --ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, unsigned index) - { - ELF_PTRVAL_CONST_VOID ptr = elf_section_start(elf, elf->sym_tab); - ELF_HANDLE_DECL(elf_sym) sym; -@@ -280,7 +280,7 @@ const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note - - ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; -+ unsigned namesz = (elf_uval(elf, note, namesz) + 3) & ~3; - - return ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz; - } -@@ -288,7 +288,7 @@ ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_ - uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { - ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - - switch (descsz) - { -@@ -306,7 +306,7 @@ uint64_t elf_note_numeric_array(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note - unsigned int unitsz, unsigned int idx) - { - ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - - if ( descsz % unitsz || idx >= descsz / unitsz ) - return 0; -@@ -324,8 +324,8 @@ uint64_t elf_note_numeric_array(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note - - ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; -- int descsz = (elf_uval(elf, note, descsz) + 3) & ~3; -+ unsigned namesz = (elf_uval(elf, note, namesz) + 3) & ~3; -+ unsigned descsz = (elf_uval(elf, note, descsz) + 3) & ~3; - - return ELF_MAKE_HANDLE(elf_note, ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz + descsz); - } -diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h -index 951430f..87e126a 100644 ---- a/xen/include/xen/libelf.h -+++ b/xen/include/xen/libelf.h -@@ -31,6 +31,9 @@ - - #include - -+typedef int elf_errorstatus; /* 0: ok; -ve (normally -1): error */ -+typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */ -+ - #undef ELFSIZE - #include "elfstructs.h" - #ifdef __XEN__ -@@ -328,12 +331,12 @@ bool elf_access_ok(struct elf_binary * elf, - /* ------------------------------------------------------------------------ */ - /* xc_libelf_tools.c */ - --int elf_shdr_count(struct elf_binary *elf); --int elf_phdr_count(struct elf_binary *elf); -+unsigned elf_shdr_count(struct elf_binary *elf); -+unsigned elf_phdr_count(struct elf_binary *elf); - - ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *name); --ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index); --ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, unsigned index); -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, unsigned index); - - const char *elf_section_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); /* might return NULL if inputs are invalid */ - ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); -@@ -343,7 +346,7 @@ ELF_PTRVAL_CONST_VOID elf_segment_start(struct elf_binary *elf, ELF_HANDLE_DECL( - ELF_PTRVAL_CONST_VOID elf_segment_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); - - ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *symbol); --ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, unsigned index); - - const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); /* may return NULL */ - ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -@@ -360,7 +363,7 @@ bool elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr - /* ------------------------------------------------------------------------ */ - /* xc_libelf_loader.c */ - --int elf_init(struct elf_binary *elf, const char *image, size_t size); -+elf_errorstatus elf_init(struct elf_binary *elf, const char *image, size_t size); - /* - * image and size must be correct. They will be recorded in - * *elf, and must remain valid while the elf is in use. -@@ -373,7 +376,7 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback*, - #endif - - void elf_parse_binary(struct elf_binary *elf); --int elf_load_binary(struct elf_binary *elf); -+elf_errorstatus elf_load_binary(struct elf_binary *elf); - - ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr); - uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol); -@@ -386,7 +389,7 @@ const char *elf_check_broken(const struct elf_binary *elf); /* NULL means OK */ - /* ------------------------------------------------------------------------ */ - /* xc_libelf_relocate.c */ - --int elf_reloc(struct elf_binary *elf); -+elf_errorstatus elf_reloc(struct elf_binary *elf); - - /* ------------------------------------------------------------------------ */ - /* xc_libelf_dominfo.c */ -@@ -420,7 +423,7 @@ struct elf_dom_parms { - char guest_ver[16]; - char xen_ver[16]; - char loader[16]; -- int pae; -+ int pae; /* some kind of enum apparently */ - bool bsd_symtab; - uint64_t virt_base; - uint64_t virt_entry; --- -1.7.2.5 - diff --git a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-8-XSA-55.patch b/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-8-XSA-55.patch deleted file mode 100644 index a9256b54444f..000000000000 --- a/app-emulation/xen-pvgrub/files/xen-4.2-CVE-2013-8-XSA-55.patch +++ /dev/null @@ -1,1196 +0,0 @@ -From 40020ab55a1e9a1674ddecdb70299fab4fe8579d Mon Sep 17 00:00:00 2001 -From: Ian Jackson -Date: Fri, 14 Jun 2013 16:43:17 +0100 -Subject: [PATCH 08/23] libelf: introduce macros for memory access and pointer handling - -We introduce a collection of macros which abstract away all the -pointer arithmetic and dereferences used for accessing the input ELF -and the output area(s). We use the new macros everywhere. - -For now, these macros are semantically identical to the code they -replace, so this patch has no functional change. - -elf_is_elfbinary is an exception: since it doesn't take an elf*, we -need to handle it differently. In a future patch we will change it to -take, and check, a length parameter. For now we just mark it with a -fixme. - -That this patch has no functional change can be verified as follows: - - 0. Copy the scripts "comparison-generate" and "function-filter" - out of this commit message. - 1. Check out the tree before this patch. - 2. Run the script ../comparison-generate .... ../before - 3. Check out the tree after this patch. - 4. Run the script ../comparison-generate .... ../after - 5. diff --exclude=\*.[soi] -ruN before/ after/ |less - -Expect these differences: - * stubdom/zlib-x86_64/ztest*.s2 - The filename of this test file apparently contains the pid. - * xen/common/version.s2 - The xen build timestamp appears in two diff hunks. - -Verification that this is all that's needed: - In a completely built xen.git, - find * -name .*.d -type f | xargs grep -l libelf\.h - Expect results in: - xen/arch/x86: Checked above. - tools/libxc: Checked above. - tools/xcutils/readnotes: Checked above. - tools/xenstore: Checked above. - xen/common/libelf: - This is the build for the hypervisor; checked in B above. - stubdom: - We have one stubdom which reads ELFs using our libelf, - pvgrub, which is checked above. - -I have not done this verification for ARM. - -This is part of the fix to a security issue, XSA-55. - -Signed-off-by: Ian Jackson -Acked-by: Ian Campbell -Reviewed-by: Konrad Rzeszutek Wilk - --8<- comparison-generate -8<- - #!/bin/bash - # usage: - # cd xen.git - # .../comparison-generate OUR-CONFIG BUILD-RUNE-PREFIX ../before|../after - # eg: - # .../comparison-generate ~/work/.config 'schroot -pc64 --' ../before - set -ex - - test $# = 3 || need-exactly-three-arguments - - our_config=$1 - build_rune_prefix=$2 - result_dir=$3 - - git clean -x -d -f - - cp "$our_config" . - - cat <>.config - debug_symbols=n - CFLAGS += -save-temps - END - - perl -i~ -pe 's/ -g / -g0 / if m/^CFLAGS/' xen/Rules.mk - - if [ -f ./configure ]; then - $build_rune_prefix ./configure - fi - - $build_rune_prefix make -C xen - $build_rune_prefix make -C tools/include - $build_rune_prefix make -C stubdom grub - $build_rune_prefix make -C tools/libxc - $build_rune_prefix make -C tools/xenstore - $build_rune_prefix make -C tools/xcutils - - rm -rf "$result_dir" - mkdir "$result_dir" - - set +x - for f in `find xen tools stubdom -name \*.[soi]`; do - mkdir -p "$result_dir"/`dirname $f` - cp $f "$result_dir"/${f} - case $f in - *.s) - ../function-filter <$f >"$result_dir"/${f}2 - ;; - esac - done - - echo ok. --8<- - --8<- function-filter -8<- - #!/usr/bin/perl -w - # function-filter - # script for massaging gcc-generated labels to be consistent - use strict; - our @lines; - my $sedderybody = "sub seddery () {\n"; - while (<>) { - push @lines, $_; - if (m/^(__FUNCTION__|__func__)\.(\d+)\:/) { - $sedderybody .= " s/\\b$1\\.$2\\b/__XSA55MANGLED__$1.$./g;\n"; - } - } - $sedderybody .= "}\n1;\n"; - eval $sedderybody or die $@; - foreach (@lines) { - seddery(); - print or die $!; - } --8<- ---- - tools/libxc/xc_dom_elfloader.c | 30 +++--- - tools/libxc/xc_hvm_build_x86.c | 2 +- - tools/xcutils/readnotes.c | 26 +++--- - xen/common/libelf/libelf-dominfo.c | 51 +++++----- - xen/common/libelf/libelf-loader.c | 84 +++++++++-------- - xen/common/libelf/libelf-tools.c | 94 +++++++++--------- - xen/include/xen/libelf.h | 188 +++++++++++++++++++++++++++++++----- - 7 files changed, 312 insertions(+), 163 deletions(-) - -diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c -index e82f6e9..cc0f206 100644 ---- a/tools/libxc/xc_dom_elfloader.c -+++ b/tools/libxc/xc_dom_elfloader.c -@@ -115,9 +115,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - struct elf_binary *elf, int load) - { - struct elf_binary syms; -- const elf_shdr *shdr, *shdr2; -+ ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; ELF_HANDLE_DECL(elf_shdr) shdr2; - xen_vaddr_t symtab, maxaddr; -- char *hdr; -+ ELF_PTRVAL_CHAR hdr; - size_t size; - int h, count, type, i, tables = 0; - -@@ -147,11 +147,11 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - dom->bsd_symtab_start = elf_round_up(elf, dom->kernel_seg.vend); - } - -- memcpy(hdr + sizeof(int), -- elf->image, -+ elf_memcpy_safe(elf, hdr + sizeof(int), -+ ELF_IMAGE_BASE(elf), - elf_size(elf, elf->ehdr)); -- memcpy(hdr + sizeof(int) + elf_size(elf, elf->ehdr), -- elf->image + elf_uval(elf, elf->ehdr, e_shoff), -+ elf_memcpy_safe(elf, hdr + sizeof(int) + elf_size(elf, elf->ehdr), -+ ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), - elf_shdr_count(elf) * elf_size(elf, shdr)); - if ( elf_64bit(elf) ) - { -@@ -189,7 +189,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - count = elf_shdr_count(&syms); - for ( h = 0; h < count; h++ ) - { -- shdr = elf_shdr_by_index(&syms, h); -+ shdr = ELF_OBSOLETE_VOIDP_CAST elf_shdr_by_index(&syms, h); - type = elf_uval(&syms, shdr, sh_type); - if ( type == SHT_STRTAB ) - { -@@ -205,9 +205,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - if ( i == count ) - { - if ( elf_64bit(&syms) ) -- *(Elf64_Off*)(&shdr->e64.sh_offset) = 0; -+ elf_store_field(elf, shdr, e64.sh_offset, 0); - else -- *(Elf32_Off*)(&shdr->e32.sh_offset) = 0; -+ elf_store_field(elf, shdr, e32.sh_offset, 0); - continue; - } - } -@@ -216,9 +216,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - { - /* Mangled to be based on ELF header location. */ - if ( elf_64bit(&syms) ) -- *(Elf64_Off*)(&shdr->e64.sh_offset) = maxaddr - symtab; -+ elf_store_field(elf, shdr, e64.sh_offset, maxaddr - symtab); - else -- *(Elf32_Off*)(&shdr->e32.sh_offset) = maxaddr - symtab; -+ elf_store_field(elf, shdr, e32.sh_offset, maxaddr - symtab); - size = elf_uval(&syms, shdr, sh_size); - maxaddr = elf_round_up(&syms, maxaddr + size); - tables++; -@@ -230,7 +230,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - if ( load ) - { - shdr2 = elf_shdr_by_index(elf, h); -- memcpy((void*)elf_section_start(&syms, shdr), -+ elf_memcpy_safe(elf, ELF_OBSOLETE_VOIDP_CAST elf_section_start(&syms, shdr), - elf_section_start(elf, shdr2), - size); - } -@@ -238,9 +238,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - - /* Name is NULL. */ - if ( elf_64bit(&syms) ) -- *(Elf64_Word*)(&shdr->e64.sh_name) = 0; -+ elf_store_field(elf, shdr, e64.sh_name, 0); - else -- *(Elf32_Word*)(&shdr->e32.sh_name) = 0; -+ elf_store_field(elf, shdr, e32.sh_name, 0); - } - - if ( tables == 0 ) -@@ -275,7 +275,7 @@ static int xc_dom_parse_elf_kernel(struct xc_dom_image *dom) - } - - /* Find the section-header strings table. */ -- if ( elf->sec_strtab == NULL ) -+ if ( ELF_PTRVAL_INVALID(elf->sec_strtab) ) - { - xc_dom_panic(dom->xch, XC_INVALID_KERNEL, "%s: ELF image" - " has no shstrtab", __FUNCTION__); -diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c -index cf5d7fb..15b603d 100644 ---- a/tools/libxc/xc_hvm_build_x86.c -+++ b/tools/libxc/xc_hvm_build_x86.c -@@ -110,7 +110,7 @@ static int loadelfimage( - if ( elf->dest == NULL ) - goto err; - -- elf->dest += elf->pstart & (PAGE_SIZE - 1); -+ ELF_ADVANCE_DEST(elf, elf->pstart & (PAGE_SIZE - 1)); - - /* Load the initial elf image. */ - rc = elf_load_binary(elf); -diff --git a/tools/xcutils/readnotes.c b/tools/xcutils/readnotes.c -index c926186..2af047d 100644 ---- a/tools/xcutils/readnotes.c -+++ b/tools/xcutils/readnotes.c -@@ -61,13 +61,13 @@ struct setup_header { - } __attribute__((packed)); - - static void print_string_note(const char *prefix, struct elf_binary *elf, -- const elf_note *note) -+ ELF_HANDLE_DECL(elf_note) note) - { - printf("%s: %s\n", prefix, (char*)elf_note_desc(elf, note)); - } - - static void print_numeric_note(const char *prefix, struct elf_binary *elf, -- const elf_note *note) -+ ELF_HANDLE_DECL(elf_note) note) - { - uint64_t value = elf_note_numeric(elf, note); - int descsz = elf_uval(elf, note, descsz); -@@ -98,12 +98,12 @@ static void print_l1_mfn_valid_note(const char *prefix, struct elf_binary *elf, - - } - --static int print_notes(struct elf_binary *elf, const elf_note *start, const elf_note *end) -+static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, ELF_HANDLE_DECL(elf_note) end) - { -- const elf_note *note; -+ ELF_HANDLE_DECL(elf_note) note; - int notes_found = 0; - -- for ( note = start; note < end; note = elf_note_next(elf, note) ) -+ for ( note = start; ELF_HANDLE_PTRVAL(note) < ELF_HANDLE_PTRVAL(end); note = elf_note_next(elf, note) ) - { - if (0 != strcmp(elf_note_name(elf, note), "Xen")) - continue; -@@ -170,7 +170,7 @@ int main(int argc, char **argv) - void *image,*tmp; - struct stat st; - struct elf_binary elf; -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - int notes_found = 0; - - struct setup_header *hdr; -@@ -257,7 +257,7 @@ int main(int argc, char **argv) - count = elf_phdr_count(&elf); - for ( h=0; h < count; h++) - { -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - phdr = elf_phdr_by_index(&elf, h); - if (elf_uval(&elf, phdr, p_type) != PT_NOTE) - continue; -@@ -269,8 +269,8 @@ int main(int argc, char **argv) - continue; - - notes_found = print_notes(&elf, -- elf_segment_start(&elf, phdr), -- elf_segment_end(&elf, phdr)); -+ ELF_MAKE_HANDLE(elf_note, elf_segment_start(&elf, phdr)), -+ ELF_MAKE_HANDLE(elf_note, elf_segment_end(&elf, phdr))); - } - - if ( notes_found == 0 ) -@@ -278,13 +278,13 @@ int main(int argc, char **argv) - count = elf_shdr_count(&elf); - for ( h=0; h < count; h++) - { -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - shdr = elf_shdr_by_index(&elf, h); - if (elf_uval(&elf, shdr, sh_type) != SHT_NOTE) - continue; - notes_found = print_notes(&elf, -- elf_section_start(&elf, shdr), -- elf_section_end(&elf, shdr)); -+ ELF_MAKE_HANDLE(elf_note, elf_section_start(&elf, shdr)), -+ ELF_MAKE_HANDLE(elf_note, elf_section_end(&elf, shdr))); - if ( notes_found ) - fprintf(stderr, "using notes from SHT_NOTE section\n"); - -@@ -292,7 +292,7 @@ int main(int argc, char **argv) - } - - shdr = elf_shdr_by_name(&elf, "__xen_guest"); -- if (shdr) -+ if (ELF_HANDLE_VALID(shdr)) - printf("__xen_guest: %s\n", (char*)elf_section_start(&elf, shdr)); - - return 0; -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index 523837f..7140d59 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -44,7 +44,7 @@ int elf_xen_parse_features(const char *features, - - for ( pos = 0; features[pos] != '\0'; pos += len ) - { -- memset(feature, 0, sizeof(feature)); -+ elf_memset_unchecked(feature, 0, sizeof(feature)); - for ( len = 0;; len++ ) - { - if ( len >= sizeof(feature)-1 ) -@@ -96,7 +96,7 @@ int elf_xen_parse_features(const char *features, - - int elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, -- const elf_note *note) -+ ELF_HANDLE_DECL(elf_note) note) - { - /* *INDENT-OFF* */ - static const struct { -@@ -215,15 +215,16 @@ int elf_xen_parse_note(struct elf_binary *elf, - - static int elf_xen_parse_notes(struct elf_binary *elf, - struct elf_dom_parms *parms, -- const void *start, const void *end) -+ ELF_PTRVAL_CONST_VOID start, -+ ELF_PTRVAL_CONST_VOID end) - { - int xen_elfnotes = 0; -- const elf_note *note; -+ ELF_HANDLE_DECL(elf_note) note; - - parms->elf_note_start = start; - parms->elf_note_end = end; -- for ( note = parms->elf_note_start; -- (void *)note < parms->elf_note_end; -+ for ( note = ELF_MAKE_HANDLE(elf_note, parms->elf_note_start); -+ ELF_HANDLE_PTRVAL(note) < parms->elf_note_end; - note = elf_note_next(elf, note) ) - { - if ( strcmp(elf_note_name(elf, note), "Xen") ) -@@ -241,45 +242,46 @@ static int elf_xen_parse_notes(struct elf_binary *elf, - int elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms) - { -- const char *h; -+ ELF_PTRVAL_CONST_CHAR h; - char name[32], value[128]; - int len; - - h = parms->guest_info; -- while ( *h ) -+#define STAR(h) (*(h)) -+ while ( STAR(h) ) - { -- memset(name, 0, sizeof(name)); -- memset(value, 0, sizeof(value)); -+ elf_memset_unchecked(name, 0, sizeof(name)); -+ elf_memset_unchecked(value, 0, sizeof(value)); - for ( len = 0;; len++, h++ ) - { - if ( len >= sizeof(name)-1 ) - break; -- if ( *h == '\0' ) -+ if ( STAR(h) == '\0' ) - break; -- if ( *h == ',' ) -+ if ( STAR(h) == ',' ) - { - h++; - break; - } -- if ( *h == '=' ) -+ if ( STAR(h) == '=' ) - { - h++; - for ( len = 0;; len++, h++ ) - { - if ( len >= sizeof(value)-1 ) - break; -- if ( *h == '\0' ) -+ if ( STAR(h) == '\0' ) - break; -- if ( *h == ',' ) -+ if ( STAR(h) == ',' ) - { - h++; - break; - } -- value[len] = *h; -+ value[len] = STAR(h); - } - break; - } -- name[len] = *h; -+ name[len] = STAR(h); - } - elf_msg(elf, "%s: %s=\"%s\"\n", __FUNCTION__, name, value); - -@@ -328,7 +330,8 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - static int elf_xen_note_check(struct elf_binary *elf, - struct elf_dom_parms *parms) - { -- if ( (parms->elf_note_start == NULL) && (parms->guest_info == NULL) ) -+ if ( (ELF_PTRVAL_INVALID(parms->elf_note_start)) && -+ (ELF_PTRVAL_INVALID(parms->guest_info)) ) - { - int machine = elf_uval(elf, elf->ehdr, e_machine); - if ( (machine == EM_386) || (machine == EM_X86_64) ) -@@ -457,12 +460,12 @@ static int elf_xen_addr_calc_check(struct elf_binary *elf, - int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms) - { -- const elf_shdr *shdr; -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - int xen_elfnotes = 0; - int i, count, rc; - -- memset(parms, 0, sizeof(*parms)); -+ elf_memset_unchecked(parms, 0, sizeof(*parms)); - parms->virt_base = UNSET_ADDR; - parms->virt_entry = UNSET_ADDR; - parms->virt_hypercall = UNSET_ADDR; -@@ -532,11 +535,11 @@ int elf_xen_parse(struct elf_binary *elf, - for ( i = 0; i < count; i++ ) - { - shdr = elf_shdr_by_name(elf, "__xen_guest"); -- if ( shdr ) -+ if ( ELF_HANDLE_VALID(shdr) ) - { - parms->guest_info = elf_section_start(elf, shdr); -- parms->elf_note_start = NULL; -- parms->elf_note_end = NULL; -+ parms->elf_note_start = ELF_INVALID_PTRVAL; -+ parms->elf_note_end = ELF_INVALID_PTRVAL; - elf_msg(elf, "%s: __xen_guest: \"%s\"\n", __FUNCTION__, - parms->guest_info); - elf_xen_parse_guest_info(elf, parms); -diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c -index ec0706b..0fef84c 100644 ---- a/xen/common/libelf/libelf-loader.c -+++ b/xen/common/libelf/libelf-loader.c -@@ -26,7 +26,7 @@ - - int elf_init(struct elf_binary *elf, const char *image, size_t size) - { -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - uint64_t i, count, section, offset; - - if ( !elf_is_elfbinary(image) ) -@@ -35,7 +35,7 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size) - return -1; - } - -- memset(elf, 0, sizeof(*elf)); -+ elf_memset_unchecked(elf, 0, sizeof(*elf)); - elf->image = image; - elf->size = size; - elf->ehdr = (elf_ehdr *)image; -@@ -65,7 +65,7 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size) - /* Find section string table. */ - section = elf_uval(elf, elf->ehdr, e_shstrndx); - shdr = elf_shdr_by_index(elf, section); -- if ( shdr != NULL ) -+ if ( ELF_HANDLE_VALID(shdr) ) - elf->sec_strtab = elf_section_start(elf, shdr); - - /* Find symbol table and symbol string table. */ -@@ -77,9 +77,9 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size) - continue; - elf->sym_tab = shdr; - shdr = elf_shdr_by_index(elf, elf_uval(elf, shdr, sh_link)); -- if ( shdr == NULL ) -+ if ( !ELF_HANDLE_VALID(shdr) ) - { -- elf->sym_tab = NULL; -+ elf->sym_tab = ELF_INVALID_HANDLE(elf_shdr); - continue; - } - elf->sym_strtab = elf_section_start(elf, shdr); -@@ -113,10 +113,11 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback *log_callback, - } - - static int elf_load_image(struct elf_binary *elf, -- void *dst, const void *src, uint64_t filesz, uint64_t memsz) -+ ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, -+ uint64_t filesz, uint64_t memsz) - { -- memcpy(dst, src, filesz); -- memset(dst + filesz, 0, memsz - filesz); -+ elf_memcpy_safe(elf, dst, src, filesz); -+ elf_memset_safe(elf, dst + filesz, 0, memsz - filesz); - return 0; - } - #else -@@ -126,16 +127,17 @@ void elf_set_verbose(struct elf_binary *elf) - elf->verbose = 1; - } - --static int elf_load_image(struct elf_binary *elf, -- void *dst, const void *src, uint64_t filesz, uint64_t memsz) -+static int elf_load_image(struct elf_binary *elf, ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, uint64_t filesz, uint64_t memsz) - { - int rc; - if ( filesz > ULONG_MAX || memsz > ULONG_MAX ) - return -1; -- rc = raw_copy_to_guest(dst, src, filesz); -+ /* We trust the dom0 kernel image completely, so we don't care -+ * about overruns etc. here. */ -+ rc = raw_copy_to_guest(ELF_UNSAFE_PTR(dst), ELF_UNSAFE_PTR(src), filesz); - if ( rc != 0 ) - return -1; -- rc = raw_clear_guest(dst + filesz, memsz - filesz); -+ rc = raw_clear_guest(ELF_UNSAFE_PTR(dst + filesz), memsz - filesz); - if ( rc != 0 ) - return -1; - return 0; -@@ -146,10 +148,10 @@ static int elf_load_image(struct elf_binary *elf, - void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - { - uint64_t sz; -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - int i, type; - -- if ( !elf->sym_tab ) -+ if ( !ELF_HANDLE_VALID(elf->sym_tab) ) - return; - - pstart = elf_round_up(elf, pstart); -@@ -166,7 +168,7 @@ void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - for ( i = 0; i < elf_shdr_count(elf); i++ ) - { - shdr = elf_shdr_by_index(elf, i); -- type = elf_uval(elf, (elf_shdr *)shdr, sh_type); -+ type = elf_uval(elf, shdr, sh_type); - if ( (type == SHT_STRTAB) || (type == SHT_SYMTAB) ) - sz = elf_round_up(elf, sz + elf_uval(elf, shdr, sh_size)); - } -@@ -177,10 +179,12 @@ void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - - static void elf_load_bsdsyms(struct elf_binary *elf) - { -- elf_ehdr *sym_ehdr; -+ ELF_HANDLE_DECL_NONCONST(elf_ehdr) sym_ehdr; - unsigned long sz; -- char *maxva, *symbase, *symtab_addr; -- elf_shdr *shdr; -+ ELF_PTRVAL_VOID maxva; -+ ELF_PTRVAL_VOID symbase; -+ ELF_PTRVAL_VOID symtab_addr; -+ ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; - int i, type; - - if ( !elf->bsd_symtab_pstart ) -@@ -189,18 +193,18 @@ static void elf_load_bsdsyms(struct elf_binary *elf) - #define elf_hdr_elm(_elf, _hdr, _elm, _val) \ - do { \ - if ( elf_64bit(_elf) ) \ -- (_hdr)->e64._elm = _val; \ -+ elf_store_field(_elf, _hdr, e64._elm, _val); \ - else \ -- (_hdr)->e32._elm = _val; \ -+ elf_store_field(_elf, _hdr, e32._elm, _val); \ - } while ( 0 ) - - symbase = elf_get_ptr(elf, elf->bsd_symtab_pstart); - symtab_addr = maxva = symbase + sizeof(uint32_t); - - /* Set up Elf header. */ -- sym_ehdr = (elf_ehdr *)symtab_addr; -+ sym_ehdr = ELF_MAKE_HANDLE(elf_ehdr, symtab_addr); - sz = elf_uval(elf, elf->ehdr, e_ehsize); -- memcpy(sym_ehdr, elf->ehdr, sz); -+ elf_memcpy_safe(elf, ELF_HANDLE_PTRVAL(sym_ehdr), ELF_HANDLE_PTRVAL(elf->ehdr), sz); - maxva += sz; /* no round up */ - - elf_hdr_elm(elf, sym_ehdr, e_phoff, 0); -@@ -209,37 +213,39 @@ do { \ - elf_hdr_elm(elf, sym_ehdr, e_phnum, 0); - - /* Copy Elf section headers. */ -- shdr = (elf_shdr *)maxva; -+ shdr = ELF_MAKE_HANDLE(elf_shdr, maxva); - sz = elf_shdr_count(elf) * elf_uval(elf, elf->ehdr, e_shentsize); -- memcpy(shdr, elf->image + elf_uval(elf, elf->ehdr, e_shoff), sz); -- maxva = (char *)(long)elf_round_up(elf, (long)maxva + sz); -+ elf_memcpy_safe(elf, ELF_HANDLE_PTRVAL(shdr), -+ ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), -+ sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); - - for ( i = 0; i < elf_shdr_count(elf); i++ ) - { - type = elf_uval(elf, shdr, sh_type); - if ( (type == SHT_STRTAB) || (type == SHT_SYMTAB) ) - { -- elf_msg(elf, "%s: shdr %i at 0x%p -> 0x%p\n", __func__, i, -+ elf_msg(elf, "%s: shdr %i at 0x%"ELF_PRPTRVAL" -> 0x%"ELF_PRPTRVAL"\n", __func__, i, - elf_section_start(elf, shdr), maxva); - sz = elf_uval(elf, shdr, sh_size); -- memcpy(maxva, elf_section_start(elf, shdr), sz); -+ elf_memcpy_safe(elf, maxva, elf_section_start(elf, shdr), sz); - /* Mangled to be based on ELF header location. */ - elf_hdr_elm(elf, shdr, sh_offset, maxva - symtab_addr); -- maxva = (char *)(long)elf_round_up(elf, (long)maxva + sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); - } -- shdr = (elf_shdr *)((long)shdr + -+ shdr = ELF_MAKE_HANDLE(elf_shdr, ELF_HANDLE_PTRVAL(shdr) + - (long)elf_uval(elf, elf->ehdr, e_shentsize)); - } - - /* Write down the actual sym size. */ -- *(uint32_t *)symbase = maxva - symtab_addr; -+ elf_store_val(elf, uint32_t, symbase, maxva - symtab_addr); - - #undef elf_ehdr_elm - } - - void elf_parse_binary(struct elf_binary *elf) - { -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - uint64_t low = -1; - uint64_t high = 0; - uint64_t i, count, paddr, memsz; -@@ -267,9 +273,9 @@ void elf_parse_binary(struct elf_binary *elf) - - int elf_load_binary(struct elf_binary *elf) - { -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - uint64_t i, count, paddr, offset, filesz, memsz; -- char *dest; -+ ELF_PTRVAL_VOID dest; - - count = elf_uval(elf, elf->ehdr, e_phnum); - for ( i = 0; i < count; i++ ) -@@ -282,9 +288,9 @@ int elf_load_binary(struct elf_binary *elf) - filesz = elf_uval(elf, phdr, p_filesz); - memsz = elf_uval(elf, phdr, p_memsz); - dest = elf_get_ptr(elf, paddr); -- elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n", -- __func__, i, dest, dest + filesz); -- if ( elf_load_image(elf, dest, elf->image + offset, filesz, memsz) != 0 ) -+ elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%"ELF_PRPTRVAL" -> 0x%"ELF_PRPTRVAL"\n", -+ __func__, i, dest, (ELF_PTRVAL_VOID)(dest + filesz)); -+ if ( elf_load_image(elf, dest, ELF_IMAGE_BASE(elf) + offset, filesz, memsz) != 0 ) - return -1; - } - -@@ -292,18 +298,18 @@ int elf_load_binary(struct elf_binary *elf) - return 0; - } - --void *elf_get_ptr(struct elf_binary *elf, unsigned long addr) -+ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr) - { - return elf->dest + addr - elf->pstart; - } - - uint64_t elf_lookup_addr(struct elf_binary * elf, const char *symbol) - { -- const elf_sym *sym; -+ ELF_HANDLE_DECL(elf_sym) sym; - uint64_t value; - - sym = elf_sym_by_name(elf, symbol); -- if ( sym == NULL ) -+ if ( !ELF_HANDLE_VALID(sym) ) - { - elf_err(elf, "%s: not found: %s\n", __FUNCTION__, symbol); - return -1; -diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c -index 2f54142..f1fd886 100644 ---- a/xen/common/libelf/libelf-tools.c -+++ b/xen/common/libelf/libelf-tools.c -@@ -67,10 +67,10 @@ int elf_phdr_count(struct elf_binary *elf) - return elf_uval(elf, elf->ehdr, e_phnum); - } - --const elf_shdr *elf_shdr_by_name(struct elf_binary *elf, const char *name) -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *name) - { - uint64_t count = elf_shdr_count(elf); -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - const char *sname; - int i; - -@@ -81,76 +81,80 @@ const elf_shdr *elf_shdr_by_name(struct elf_binary *elf, const char *name) - if ( sname && !strcmp(sname, name) ) - return shdr; - } -- return NULL; -+ return ELF_INVALID_HANDLE(elf_shdr); - } - --const elf_shdr *elf_shdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index) - { - uint64_t count = elf_shdr_count(elf); -- const void *ptr; -+ ELF_PTRVAL_CONST_VOID ptr; - - if ( index >= count ) -- return NULL; -+ return ELF_INVALID_HANDLE(elf_shdr); - -- ptr = (elf->image -+ ptr = (ELF_IMAGE_BASE(elf) - + elf_uval(elf, elf->ehdr, e_shoff) - + elf_uval(elf, elf->ehdr, e_shentsize) * index); -- return ptr; -+ return ELF_MAKE_HANDLE(elf_shdr, ptr); - } - --const elf_phdr *elf_phdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index) - { - uint64_t count = elf_uval(elf, elf->ehdr, e_phnum); -- const void *ptr; -+ ELF_PTRVAL_CONST_VOID ptr; - - if ( index >= count ) -- return NULL; -+ return ELF_INVALID_HANDLE(elf_phdr); - -- ptr = (elf->image -+ ptr = (ELF_IMAGE_BASE(elf) - + elf_uval(elf, elf->ehdr, e_phoff) - + elf_uval(elf, elf->ehdr, e_phentsize) * index); -- return ptr; -+ return ELF_MAKE_HANDLE(elf_phdr, ptr); - } - --const char *elf_section_name(struct elf_binary *elf, const elf_shdr * shdr) -+ -+const char *elf_section_name(struct elf_binary *elf, -+ ELF_HANDLE_DECL(elf_shdr) shdr) - { -- if ( elf->sec_strtab == NULL ) -+ if ( ELF_PTRVAL_INVALID(elf->sec_strtab) ) - return "unknown"; -+ - return elf->sec_strtab + elf_uval(elf, shdr, sh_name); - } - --const void *elf_section_start(struct elf_binary *elf, const elf_shdr * shdr) -+ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr) - { -- return elf->image + elf_uval(elf, shdr, sh_offset); -+ return ELF_IMAGE_BASE(elf) + elf_uval(elf, shdr, sh_offset); - } - --const void *elf_section_end(struct elf_binary *elf, const elf_shdr * shdr) -+ELF_PTRVAL_CONST_VOID elf_section_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr) - { -- return elf->image -+ return ELF_IMAGE_BASE(elf) - + elf_uval(elf, shdr, sh_offset) + elf_uval(elf, shdr, sh_size); - } - --const void *elf_segment_start(struct elf_binary *elf, const elf_phdr * phdr) -+ELF_PTRVAL_CONST_VOID elf_segment_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - { -- return elf->image + elf_uval(elf, phdr, p_offset); -+ return ELF_IMAGE_BASE(elf) -+ + elf_uval(elf, phdr, p_offset); - } - --const void *elf_segment_end(struct elf_binary *elf, const elf_phdr * phdr) -+ELF_PTRVAL_CONST_VOID elf_segment_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - { -- return elf->image -+ return ELF_IMAGE_BASE(elf) - + elf_uval(elf, phdr, p_offset) + elf_uval(elf, phdr, p_filesz); - } - --const elf_sym *elf_sym_by_name(struct elf_binary *elf, const char *symbol) -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *symbol) - { -- const void *ptr = elf_section_start(elf, elf->sym_tab); -- const void *end = elf_section_end(elf, elf->sym_tab); -- const elf_sym *sym; -+ ELF_PTRVAL_CONST_VOID ptr = elf_section_start(elf, elf->sym_tab); -+ ELF_PTRVAL_CONST_VOID end = elf_section_end(elf, elf->sym_tab); -+ ELF_HANDLE_DECL(elf_sym) sym; - uint64_t info, name; - - for ( ; ptr < end; ptr += elf_size(elf, sym) ) - { -- sym = ptr; -+ sym = ELF_MAKE_HANDLE(elf_sym, ptr); - info = elf_uval(elf, sym, st_info); - name = elf_uval(elf, sym, st_name); - if ( ELF32_ST_BIND(info) != STB_GLOBAL ) -@@ -159,33 +163,33 @@ const elf_sym *elf_sym_by_name(struct elf_binary *elf, const char *symbol) - continue; - return sym; - } -- return NULL; -+ return ELF_INVALID_HANDLE(elf_sym); - } - --const elf_sym *elf_sym_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index) - { -- const void *ptr = elf_section_start(elf, elf->sym_tab); -- const elf_sym *sym; -+ ELF_PTRVAL_CONST_VOID ptr = elf_section_start(elf, elf->sym_tab); -+ ELF_HANDLE_DECL(elf_sym) sym; - -- sym = ptr + index * elf_size(elf, sym); -+ sym = ELF_MAKE_HANDLE(elf_sym, ptr + index * elf_size(elf, sym)); - return sym; - } - --const char *elf_note_name(struct elf_binary *elf, const elf_note * note) -+const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- return (void *)note + elf_size(elf, note); -+ return ELF_HANDLE_PTRVAL(note) + elf_size(elf, note); - } - --const void *elf_note_desc(struct elf_binary *elf, const elf_note * note) -+ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { - int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; - -- return (void *)note + elf_size(elf, note) + namesz; -+ return ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz; - } - --uint64_t elf_note_numeric(struct elf_binary *elf, const elf_note * note) -+uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- const void *desc = elf_note_desc(elf, note); -+ ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); - int descsz = elf_uval(elf, note, descsz); - - switch (descsz) -@@ -200,10 +204,10 @@ uint64_t elf_note_numeric(struct elf_binary *elf, const elf_note * note) - } - } - --uint64_t elf_note_numeric_array(struct elf_binary *elf, const elf_note *note, -+uint64_t elf_note_numeric_array(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note, - unsigned int unitsz, unsigned int idx) - { -- const void *desc = elf_note_desc(elf, note); -+ ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); - int descsz = elf_uval(elf, note, descsz); - - if ( descsz % unitsz || idx >= descsz / unitsz ) -@@ -220,12 +224,12 @@ uint64_t elf_note_numeric_array(struct elf_binary *elf, const elf_note *note, - } - } - --const elf_note *elf_note_next(struct elf_binary *elf, const elf_note * note) -+ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { - int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; - int descsz = (elf_uval(elf, note, descsz) + 3) & ~3; - -- return (void *)note + elf_size(elf, note) + namesz + descsz; -+ return ELF_MAKE_HANDLE(elf_note, ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz + descsz); - } - - /* ------------------------------------------------------------------------ */ -@@ -234,10 +238,10 @@ int elf_is_elfbinary(const void *image) - { - const Elf32_Ehdr *ehdr = image; - -- return IS_ELF(*ehdr); -+ return IS_ELF(*ehdr); /* fixme unchecked */ - } - --int elf_phdr_is_loadable(struct elf_binary *elf, const elf_phdr * phdr) -+int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - { - uint64_t p_type = elf_uval(elf, phdr, p_type); - uint64_t p_flags = elf_uval(elf, phdr, p_flags); -diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h -index 38e490c..cefd3d3 100644 ---- a/xen/include/xen/libelf.h -+++ b/xen/include/xen/libelf.h -@@ -48,6 +48,97 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - - /* ------------------------------------------------------------------------ */ - -+/* Macros for accessing the input image and output area. */ -+ -+/* -+ * We abstract away the pointerness of these pointers, replacing -+ * various void*, char* and struct* with the following: -+ * PTRVAL A pointer to a byte; one can do pointer arithmetic -+ * on this. -+ * This replaces variables which were char*,void* -+ * and their const versions, so we provide four -+ * different declaration macros: -+ * ELF_PTRVAL_{,CONST}{VOID,CHAR} -+ * HANDLE A pointer to a struct. There is one of these types -+ * for each pointer type - that is, for each "structname". -+ * In the arguments to the various HANDLE macros, structname -+ * must be a single identifier which is a typedef. -+ * It is not permitted to do arithmetic on these -+ * pointers. In the current code attempts to do so will -+ * compile, but in the next patch this will become a -+ * compile error. -+ * We provide two declaration macros for const and -+ * non-const pointers. -+ */ -+ -+#define ELF_REALPTR2PTRVAL(realpointer) (realpointer) -+ /* Converts an actual C pointer into a PTRVAL */ -+ -+#define ELF_HANDLE_DECL_NONCONST(structname) structname * -+#define ELF_HANDLE_DECL(structname) const structname * -+ /* Provides a type declaration for a HANDLE. */ -+ /* May only be used to declare ONE variable at a time */ -+ -+#define ELF_PTRVAL_VOID void * -+#define ELF_PTRVAL_CHAR char * -+#define ELF_PTRVAL_CONST_VOID const void * -+#define ELF_PTRVAL_CONST_CHAR const char * -+ /* Provides a type declaration for a PTRVAL. */ -+ /* May only be used to declare ONE variable at a time */ -+ -+#define ELF_DEFINE_HANDLE(structname) /* empty */ -+ /* -+ * This must be invoked for each HANDLE type to define -+ * the actual C type used for that kind of HANDLE. -+ */ -+ -+#define ELF_PRPTRVAL "p" -+ /* printf format a la PRId... for a PTRVAL */ -+ -+#define ELF_MAKE_HANDLE(structname, ptrval) (ptrval) -+ /* Converts a PTRVAL to a HANDLE */ -+ -+#define ELF_IMAGE_BASE(elf) ((elf)->image) -+ /* Returns the base of the image as a PTRVAL. */ -+ -+#define ELF_HANDLE_PTRVAL(handleval) ((void*)(handleval)) -+ /* Converts a HANDLE to a PTRVAL. */ -+ -+#define ELF_OBSOLETE_VOIDP_CAST (void*)(uintptr_t) -+ /* -+ * In some places the existing code needs to -+ * - cast away const (the existing code uses const a fair -+ * bit but actually sometimes wants to write to its input) -+ * from a PTRVAL. -+ * - convert an integer representing a pointer to a PTRVAL -+ * This macro provides a suitable cast. -+ */ -+ -+#define ELF_UNSAFE_PTR(ptrval) ((void*)(uintptr_t)(ptrval)) -+ /* -+ * Turns a PTRVAL into an actual C pointer. Before this is done -+ * the caller must have ensured that the PTRVAL does in fact point -+ * to a permissible location. -+ */ -+ -+/* PTRVALs can be INVALID (ie, NULL). */ -+#define ELF_INVALID_PTRVAL (NULL) /* returns NULL PTRVAL */ -+#define ELF_INVALID_HANDLE(structname) /* returns NULL handle */ \ -+ ELF_MAKE_HANDLE(structname, ELF_INVALID_PTRVAL) -+#define ELF_PTRVAL_VALID(ptrval) (ptrval) /* } */ -+#define ELF_HANDLE_VALID(handleval) (handleval) /* } predicates */ -+#define ELF_PTRVAL_INVALID(ptrval) ((ptrval) == NULL) /* } */ -+ -+/* For internal use by other macros here */ -+#define ELF__HANDLE_FIELD_TYPE(handleval, elm) \ -+ typeof((handleval)->elm) -+#define ELF__HANDLE_FIELD_OFFSET(handleval, elm) \ -+ offsetof(typeof(*(handleval)),elm) -+ -+ -+/* ------------------------------------------------------------------------ */ -+ -+ - typedef union { - Elf32_Ehdr e32; - Elf64_Ehdr e64; -@@ -83,6 +174,12 @@ typedef union { - Elf64_Note e64; - } elf_note; - -+ELF_DEFINE_HANDLE(elf_ehdr) -+ELF_DEFINE_HANDLE(elf_shdr) -+ELF_DEFINE_HANDLE(elf_phdr) -+ELF_DEFINE_HANDLE(elf_sym) -+ELF_DEFINE_HANDLE(elf_note) -+ - struct elf_binary { - /* elf binary */ - const char *image; -@@ -90,10 +187,10 @@ struct elf_binary { - char class; - char data; - -- const elf_ehdr *ehdr; -- const char *sec_strtab; -- const elf_shdr *sym_tab; -- const char *sym_strtab; -+ ELF_HANDLE_DECL(elf_ehdr) ehdr; -+ ELF_PTRVAL_CONST_CHAR sec_strtab; -+ ELF_HANDLE_DECL(elf_shdr) sym_tab; -+ ELF_PTRVAL_CONST_CHAR sym_strtab; - - /* loaded to */ - char *dest; -@@ -135,45 +232,72 @@ struct elf_binary { - : elf_access_unsigned((elf), (str), \ - offsetof(typeof(*(str)),e32.elem), \ - sizeof((str)->e32.elem))) -+ /* -+ * Reads an unsigned field in a header structure in the ELF. -+ * str is a HANDLE, and elem is the field name in it. -+ */ - - #define elf_size(elf, str) \ - ((ELFCLASS64 == (elf)->class) \ - ? sizeof((str)->e64) : sizeof((str)->e32)) -+ /* -+ * Returns the size of the substructure for the appropriate 32/64-bitness. -+ * str should be a HANDLE. -+ */ - --uint64_t elf_access_unsigned(struct elf_binary *elf, const void *ptr, -+uint64_t elf_access_unsigned(struct elf_binary *elf, ELF_PTRVAL_CONST_VOID ptr, - uint64_t offset, size_t size); -+ /* Reads a field at arbitrary offset and alignemnt */ - - uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr); - -+ -+#define elf_memcpy_safe(elf, dst, src, sz) memcpy((dst),(src),(sz)) -+#define elf_memset_safe(elf, dst, c, sz) memset((dst),(c),(sz)) -+ /* -+ * Versions of memcpy and memset which will (in the next patch) -+ * arrange never to write outside permitted areas. -+ */ -+ -+#define elf_store_val(elf, type, ptr, val) (*(type*)(ptr) = (val)) -+ /* Stores a value at a particular PTRVAL. */ -+ -+#define elf_store_field(elf, hdr, elm, val) \ -+ (elf_store_val((elf), ELF__HANDLE_FIELD_TYPE(hdr, elm), \ -+ &((hdr)->elm), \ -+ (val))) -+ /* Stores a 32/64-bit field. hdr is a HANDLE and elm is the field name. */ -+ -+ - /* ------------------------------------------------------------------------ */ - /* xc_libelf_tools.c */ - - int elf_shdr_count(struct elf_binary *elf); - int elf_phdr_count(struct elf_binary *elf); - --const elf_shdr *elf_shdr_by_name(struct elf_binary *elf, const char *name); --const elf_shdr *elf_shdr_by_index(struct elf_binary *elf, int index); --const elf_phdr *elf_phdr_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *name); -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index); - --const char *elf_section_name(struct elf_binary *elf, const elf_shdr * shdr); --const void *elf_section_start(struct elf_binary *elf, const elf_shdr * shdr); --const void *elf_section_end(struct elf_binary *elf, const elf_shdr * shdr); -+const char *elf_section_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); -+ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); -+ELF_PTRVAL_CONST_VOID elf_section_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); - --const void *elf_segment_start(struct elf_binary *elf, const elf_phdr * phdr); --const void *elf_segment_end(struct elf_binary *elf, const elf_phdr * phdr); -+ELF_PTRVAL_CONST_VOID elf_segment_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); -+ELF_PTRVAL_CONST_VOID elf_segment_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); - --const elf_sym *elf_sym_by_name(struct elf_binary *elf, const char *symbol); --const elf_sym *elf_sym_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *symbol); -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index); - --const char *elf_note_name(struct elf_binary *elf, const elf_note * note); --const void *elf_note_desc(struct elf_binary *elf, const elf_note * note); --uint64_t elf_note_numeric(struct elf_binary *elf, const elf_note * note); --uint64_t elf_note_numeric_array(struct elf_binary *, const elf_note *, -+const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -+ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -+uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -+uint64_t elf_note_numeric_array(struct elf_binary *, ELF_HANDLE_DECL(elf_note), - unsigned int unitsz, unsigned int idx); --const elf_note *elf_note_next(struct elf_binary *elf, const elf_note * note); -+ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); - - int elf_is_elfbinary(const void *image); --int elf_phdr_is_loadable(struct elf_binary *elf, const elf_phdr * phdr); -+int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); - - /* ------------------------------------------------------------------------ */ - /* xc_libelf_loader.c */ -@@ -189,7 +313,7 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback*, - void elf_parse_binary(struct elf_binary *elf); - int elf_load_binary(struct elf_binary *elf); - --void *elf_get_ptr(struct elf_binary *elf, unsigned long addr); -+ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr); - uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol); - - void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart); /* private */ -@@ -221,9 +345,9 @@ struct xen_elfnote { - - struct elf_dom_parms { - /* raw */ -- const char *guest_info; -- const void *elf_note_start; -- const void *elf_note_end; -+ ELF_PTRVAL_CONST_CHAR guest_info; -+ ELF_PTRVAL_CONST_VOID elf_note_start; -+ ELF_PTRVAL_CONST_VOID elf_note_end; - struct xen_elfnote elf_notes[XEN_ELFNOTE_MAX + 1]; - - /* parsed */ -@@ -262,10 +386,22 @@ int elf_xen_parse_features(const char *features, - uint32_t *required); - int elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, -- const elf_note *note); -+ ELF_HANDLE_DECL(elf_note) note); - int elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms); - int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms); - -+#define elf_memcpy_unchecked memcpy -+#define elf_memset_unchecked memset -+ /* -+ * Unsafe versions of memcpy and memset which take actual C -+ * pointers. These are just like real memcpy and memset. -+ */ -+ -+ -+#define ELF_ADVANCE_DEST(elf, amount) elf->dest += (amount) -+ /* Advances past amount bytes of the current destination area. */ -+ -+ - #endif /* __XEN_LIBELF_H__ */ --- -1.7.2.5 - diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild index 8e924d4aec81..1d8fd861019c 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild,v 1.1 2013/06/26 16:16:38 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r3.ebuild,v 1.2 2013/06/27 05:32:10 idella4 Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -10,13 +10,16 @@ inherit flag-o-matic eutils multilib python toolchain-funcs XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci GRUB_URL=mirror://gnu-alpha/grub +XSAPATCHES="http://dev.gentoo.org/~idella4/" SRC_URI=" http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz $GRUB_URL/grub-0.97.tar.gz $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz $LIBPCI_URL/pciutils-2.2.9.tar.bz2 $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz" + $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz + $XSAPATCHES/patches/XSA-55patches.tar.gz + " S="${WORKDIR}/xen-${PV}" @@ -85,28 +88,29 @@ src_prepare() { #Sec patch epatch "${FILESDIR}"/${PN/-pvgrub/}-4-CVE-2012-6075-XSA-41.patch \ - "${FILESDIR}"/xen-4-CVE-2013-0215-XSA-38.patch \ - "${FILESDIR}"/xen-4-CVE-2013-1919-XSA-46.patch \ - "${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \ - "${FILESDIR}"/xen-4-CVE-2013-1952-XSA_49.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-1-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-2-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-8-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-11-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-15-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch - - #Substitute for internal downloading. pciutils copied only due to the only .bz2 + "${FILESDIR}"/xen-4-CVE-2013-0215-XSA-38.patch \ + "${FILESDIR}"/xen-4-CVE-2013-1919-XSA-46.patch \ + "${FILESDIR}"/xen-4-CVE-2013-1922-XSA-48.patch \ + "${FILESDIR}"/xen-4-CVE-2013-1952-XSA_49.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-1-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-2-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \ + "${FILESDIR}"/xen-4.2-CVE-2013-20to23-XSA-55.patch + + # Substitute for internal downloading. pciutils copied only due to the only .bz2 cp $DISTDIR/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom" + retar-externals || die "re-tar procedure failed" } diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild index a76dcfd40883..a7ddcaf295b4 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild,v 1.1 2013/06/26 16:16:38 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.2-r1.ebuild,v 1.2 2013/06/27 05:32:10 idella4 Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -10,13 +10,16 @@ inherit flag-o-matic eutils multilib python toolchain-funcs XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci GRUB_URL=mirror://gnu-alpha/grub +XSAPATCHES="http://dev.gentoo.org/~idella4/" SRC_URI=" http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz $GRUB_URL/grub-0.97.tar.gz $XEN_EXTFILES_URL/zlib-1.2.3.tar.gz $LIBPCI_URL/pciutils-2.2.9.tar.bz2 $XEN_EXTFILES_URL/lwip-1.3.0.tar.gz - $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz" + $XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz + $XSAPATCHES/patches/XSA-55patches.tar.gz + " S="${WORKDIR}/xen-${PV}" @@ -92,12 +95,12 @@ src_prepare() { "${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-8-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-11-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-15-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \ diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index da69dd059360..849cc8e4fcf6 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,3 +1,4 @@ +DIST XSA-55patches.tar.gz 23888 SHA256 e86749d02ca5594ebcfdaea820a6cf1fe11015c7fdcc5836260498fae317d75b SHA512 ed1f321a1351df99cfb05e1dfc62dda1268544b0c0ceb7a01438805046e027fb9d59194d179b7a8c302b091a7bf444811b0b9359c4d42f7e902510515c275b6b WHIRLPOOL 5a611e5260f0fc97471f386da3499f7714e015c5c2556bd7199466558d8e375784d32655bdbe9ed4cbf492fa3b41091677d9fe6d3714b029c9a2b1dda6102edb DIST ipxe.tar.gz 2867999 SHA256 632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c SHA512 c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4 WHIRLPOOL 58b7459aaf7323968e2f4d1cdcb563a04a0ee40d7d0e8fc600495baf6914127fbbbcddfb66199cd9f462eb59565b3d1ae90a05b3c771b8f13c2d2dcb6070eebc DIST seabios-0-20121121.tar.bz2 2199282 SHA256 f7f67181c6c0b4cea3a9db48e2569fdcbbc81b732a2f672079c42fb44153ee62 SHA512 4f886088ebaa911590b8cb19db5c5dbc8f1384d2d5a7c4bf04df083e177513b3123b1839dad744171670eded8b69ce092a774288aec1804d00aa32b1b6778599 WHIRLPOOL f2e62682d7213ee5eaecbc2590637ef36d9c86f746840c0ee758c0c153139f485032ea2cd098c87bb8a2b5f17f91375b8fb65599e3b71b45b1645df85a88887f DIST xen-4.2.1.tar.gz 15593695 SHA256 fb8df5827ce3e2d2d3b078d9e5afde502beb5e7ab9442e51a94087061bd450c6 SHA512 fe27a965e2b34035bd025482eda9fc4d4e82523c929323fd30813367d5ffbe2fa1ed3d7d4479f2632e8b5625972448b7bd6a7768e8dc1dcd1b6747d281cc1a9e WHIRLPOOL 226bbed059541e804f1a44e721023ffbc04bae43000653b1d7d6a9bfec0d9efbf7a48b1b0a7ad3fcb8e34f8b91e1c620c2a8eddf97baad487e9db37d49a58f37 diff --git a/app-emulation/xen-tools/files/xen-4.2-CVE-2013-11-XSA-55.patch b/app-emulation/xen-tools/files/xen-4.2-CVE-2013-11-XSA-55.patch deleted file mode 100644 index 5ad78279b0db..000000000000 --- a/app-emulation/xen-tools/files/xen-4.2-CVE-2013-11-XSA-55.patch +++ /dev/null @@ -1,788 +0,0 @@ -From cc8761371aac432318530c2ddfe2c8234bc0621f Mon Sep 17 00:00:00 2001 -From: Ian Jackson -Date: Fri, 14 Jun 2013 16:43:17 +0100 -Subject: [PATCH 11/23] libelf: check all pointer accesses - -We change the ELF_PTRVAL and ELF_HANDLE types and associated macros: - - * PTRVAL becomes a uintptr_t, for which we provide a typedef - elf_ptrval. This means no arithmetic done on it can overflow so - the compiler cannot do any malicious invalid pointer arithmetic - "optimisations". It also means that any places where we - dereference one of these pointers without using the appropriate - macros or functions become a compilation error. - - So we can be sure that we won't miss any memory accesses. - - All the PTRVAL variables were previously void* or char*, so - the actual address calculations are unchanged. - - * ELF_HANDLE becomes a union, one half of which keeps the pointer - value and the other half of which is just there to record the - type. - - The new type is not a pointer type so there can be no address - calculations on it whose meaning would change. Every assignment or - access has to go through one of our macros. - - * The distinction between const and non-const pointers and char*s - and void*s in libelf goes away. This was not important (and - anyway libelf tended to cast away const in various places). - - * The fields elf->image and elf->dest are renamed. That proves - that we haven't missed any unchecked uses of these actual - pointer values. - - * The caller may fill in elf->caller_xdest_base and _size to - specify another range of memory which is safe for libelf to - access, besides the input and output images. - - * When accesses fail due to being out of range, we mark the elf - "broken". This will be checked and used for diagnostics in - a following patch. - - We do not check for write accesses to the input image. This is - because libelf actually does this in a number of places. So we - simply permit that. - - * Each caller of libelf which used to set dest now sets - dest_base and dest_size. - - * In xc_dom_load_elf_symtab we provide a new actual-pointer - value hdr_ptr which we get from mapping the guest's kernel - area and use (checking carefully) as the caller_xdest area. - - * The STAR(h) macro in libelf-dominfo.c now uses elf_access_unsigned. - - * elf-init uses the new elf_uval_3264 accessor to access the 32-bit - fields, rather than an unchecked field access (ie, unchecked - pointer access). - - * elf_uval has been reworked to use elf_uval_3264. Both of these - macros are essentially new in this patch (although they are derived - from the old elf_uval) and need careful review. - - * ELF_ADVANCE_DEST is now safe in the sense that you can use it to - chop parts off the front of the dest area but if you chop more than - is available, the dest area is simply set to be empty, preventing - future accesses. - - * We introduce some #defines for memcpy, memset, memmove and strcpy: - - We provide elf_memcpy_safe and elf_memset_safe which take - PTRVALs and do checking on the supplied pointers. - - Users inside libelf must all be changed to either - elf_mem*_unchecked (which are just like mem*), or - elf_mem*_safe (which take PTRVALs) and are checked. Any - unchanged call sites become compilation errors. - - * We do _not_ at this time fix elf_access_unsigned so that it doesn't - make unaligned accesses. We hope that unaligned accesses are OK on - every supported architecture. But it does check the supplied - pointer for validity. - -This is part of the fix to a security issue, XSA-55. - -Signed-off-by: Ian Jackson ---- - tools/libxc/xc_dom_elfloader.c | 49 ++++++++-- - tools/libxc/xc_hvm_build_x86.c | 10 +- - xen/arch/x86/domain_build.c | 3 +- - xen/common/libelf/libelf-dominfo.c | 2 +- - xen/common/libelf/libelf-loader.c | 16 ++-- - xen/common/libelf/libelf-private.h | 13 +++ - xen/common/libelf/libelf-tools.c | 106 ++++++++++++++++++- - xen/include/xen/libelf.h | 198 +++++++++++++++++++++++++----------- - 8 files changed, 312 insertions(+), 85 deletions(-) - -diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c -index cc0f206..b82a08c 100644 ---- a/tools/libxc/xc_dom_elfloader.c -+++ b/tools/libxc/xc_dom_elfloader.c -@@ -130,20 +130,30 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - - if ( load ) - { -- size_t allow_size; /* will be used in a forthcoming XSA-55 patch */ -+ char *hdr_ptr; -+ size_t allow_size; -+ - if ( !dom->bsd_symtab_start ) - return 0; - size = dom->kernel_seg.vend - dom->bsd_symtab_start; -- hdr = xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size); -- *(int *)hdr = size - sizeof(int); -+ hdr_ptr = xc_dom_vaddr_to_ptr(dom, dom->bsd_symtab_start, &allow_size); -+ elf->caller_xdest_base = hdr_ptr; -+ elf->caller_xdest_size = allow_size; -+ hdr = ELF_REALPTR2PTRVAL(hdr_ptr); -+ elf_store_val(elf, int, hdr, size - sizeof(int)); - } - else - { -+ char *hdr_ptr; -+ - size = sizeof(int) + elf_size(elf, elf->ehdr) + - elf_shdr_count(elf) * elf_size(elf, shdr); -- hdr = xc_dom_malloc(dom, size); -- if ( hdr == NULL ) -+ hdr_ptr = xc_dom_malloc(dom, size); -+ if ( hdr_ptr == NULL ) - return 0; -+ elf->caller_xdest_base = hdr_ptr; -+ elf->caller_xdest_size = size; -+ hdr = ELF_REALPTR2PTRVAL(hdr_ptr); - dom->bsd_symtab_start = elf_round_up(elf, dom->kernel_seg.vend); - } - -@@ -171,9 +181,32 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - ehdr->e_shoff = elf_size(elf, elf->ehdr); - ehdr->e_shstrndx = SHN_UNDEF; - } -- if ( elf_init(&syms, hdr + sizeof(int), size - sizeof(int)) ) -+ if ( elf->caller_xdest_size < sizeof(int) ) -+ { -+ DOMPRINTF("%s/%s: header size %"PRIx64" too small", -+ __FUNCTION__, load ? "load" : "parse", -+ (uint64_t)elf->caller_xdest_size); -+ return -1; -+ } -+ if ( elf_init(&syms, elf->caller_xdest_base + sizeof(int), -+ elf->caller_xdest_size - sizeof(int)) ) - return -1; - -+ /* -+ * The caller_xdest_{base,size} and dest_{base,size} need to -+ * remain valid so long as each struct elf_image does. The -+ * principle we adopt is that these values are set when the -+ * memory is allocated or mapped, and cleared when (and if) -+ * they are unmapped. -+ * -+ * Mappings of the guest are normally undone by xc_dom_unmap_all -+ * (directly or via xc_dom_release). We do not explicitly clear -+ * these because in fact that happens only at the end of -+ * xc_dom_boot_image, at which time all of these ELF loading -+ * functions have returned. No relevant struct elf_binary* -+ * escapes this file. -+ */ -+ - xc_elf_set_logfile(dom->xch, &syms, 1); - - symtab = dom->bsd_symtab_start + sizeof(int); -@@ -312,8 +345,10 @@ static int xc_dom_load_elf_kernel(struct xc_dom_image *dom) - { - struct elf_binary *elf = dom->private_loader; - int rc; -+ xen_pfn_t pages; - -- elf->dest = xc_dom_seg_to_ptr(dom, &dom->kernel_seg); -+ elf->dest_base = xc_dom_seg_to_ptr_pages(dom, &dom->kernel_seg, &pages); -+ elf->dest_size = pages * XC_DOM_PAGE_SIZE(dom); - rc = elf_load_binary(elf); - if ( rc < 0 ) - { -diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c -index 15b603d..ccfd8b5 100644 ---- a/tools/libxc/xc_hvm_build_x86.c -+++ b/tools/libxc/xc_hvm_build_x86.c -@@ -104,11 +104,12 @@ static int loadelfimage( - for ( i = 0; i < pages; i++ ) - entries[i].mfn = parray[(elf->pstart >> PAGE_SHIFT) + i]; - -- elf->dest = xc_map_foreign_ranges( -+ elf->dest_base = xc_map_foreign_ranges( - xch, dom, pages << PAGE_SHIFT, PROT_READ | PROT_WRITE, 1 << PAGE_SHIFT, - entries, pages); -- if ( elf->dest == NULL ) -+ if ( elf->dest_base == NULL ) - goto err; -+ elf->dest_size = pages * PAGE_SIZE; - - ELF_ADVANCE_DEST(elf, elf->pstart & (PAGE_SIZE - 1)); - -@@ -117,8 +118,9 @@ static int loadelfimage( - if ( rc < 0 ) - PERROR("Failed to load elf binary\n"); - -- munmap(elf->dest, pages << PAGE_SHIFT); -- elf->dest = NULL; -+ munmap(elf->dest_base, pages << PAGE_SHIFT); -+ elf->dest_base = NULL; -+ elf->dest_size = 0; - - err: - free(entries); -diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c -index 469d363..a655b21 100644 ---- a/xen/arch/x86/domain_build.c -+++ b/xen/arch/x86/domain_build.c -@@ -908,7 +908,8 @@ int __init construct_dom0( - write_ptbase(v); - - /* Copy the OS image and free temporary buffer. */ -- elf.dest = (void*)vkern_start; -+ elf.dest_base = (void*)vkern_start; -+ elf.dest_size = vkern_end - vkern_start; - rc = elf_load_binary(&elf); - if ( rc < 0 ) - { -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index b217f8f..98c80dc 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -254,7 +254,7 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - int len; - - h = parms->guest_info; --#define STAR(h) (*(h)) -+#define STAR(h) (elf_access_unsigned(elf, (h), 0, 1)) - while ( STAR(h) ) - { - elf_memset_unchecked(name, 0, sizeof(name)); -diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c -index 0fef84c..a3310e7 100644 ---- a/xen/common/libelf/libelf-loader.c -+++ b/xen/common/libelf/libelf-loader.c -@@ -24,23 +24,25 @@ - - /* ------------------------------------------------------------------------ */ - --int elf_init(struct elf_binary *elf, const char *image, size_t size) -+int elf_init(struct elf_binary *elf, const char *image_input, size_t size) - { - ELF_HANDLE_DECL(elf_shdr) shdr; - uint64_t i, count, section, offset; - -- if ( !elf_is_elfbinary(image) ) -+ if ( !elf_is_elfbinary(image_input) ) - { - elf_err(elf, "%s: not an ELF binary\n", __FUNCTION__); - return -1; - } - - elf_memset_unchecked(elf, 0, sizeof(*elf)); -- elf->image = image; -+ elf->image_base = image_input; - elf->size = size; -- elf->ehdr = (elf_ehdr *)image; -- elf->class = elf->ehdr->e32.e_ident[EI_CLASS]; -- elf->data = elf->ehdr->e32.e_ident[EI_DATA]; -+ elf->ehdr = ELF_MAKE_HANDLE(elf_ehdr, (elf_ptrval)image_input); -+ elf->class = elf_uval_3264(elf, elf->ehdr, e32.e_ident[EI_CLASS]); -+ elf->data = elf_uval_3264(elf, elf->ehdr, e32.e_ident[EI_DATA]); -+ elf->caller_xdest_base = NULL; -+ elf->caller_xdest_size = 0; - - /* Sanity check phdr. */ - offset = elf_uval(elf, elf->ehdr, e_phoff) + -@@ -300,7 +302,7 @@ int elf_load_binary(struct elf_binary *elf) - - ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr) - { -- return elf->dest + addr - elf->pstart; -+ return ELF_REALPTR2PTRVAL(elf->dest_base) + addr - elf->pstart; - } - - uint64_t elf_lookup_addr(struct elf_binary * elf, const char *symbol) -diff --git a/xen/common/libelf/libelf-private.h b/xen/common/libelf/libelf-private.h -index 3ef753c..280dfd1 100644 ---- a/xen/common/libelf/libelf-private.h -+++ b/xen/common/libelf/libelf-private.h -@@ -86,6 +86,19 @@ do { strncpy((d),(s),sizeof((d))-1); \ - - #endif - -+#undef memcpy -+#undef memset -+#undef memmove -+#undef strcpy -+ -+#define memcpy MISTAKE_unspecified_memcpy -+#define memset MISTAKE_unspecified_memset -+#define memmove MISTAKE_unspecified_memmove -+#define strcpy MISTAKE_unspecified_strcpy -+ /* This prevents libelf from using these undecorated versions -+ * of memcpy, memset, memmove and strcpy. Every call site -+ * must either use elf_mem*_unchecked, or elf_mem*_safe. */ -+ - #endif /* __LIBELF_PRIVATE_H_ */ - - /* -diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c -index 3a0cde1..46ca553 100644 ---- a/xen/common/libelf/libelf-tools.c -+++ b/xen/common/libelf/libelf-tools.c -@@ -20,28 +20,100 @@ - - /* ------------------------------------------------------------------------ */ - --uint64_t elf_access_unsigned(struct elf_binary * elf, const void *ptr, -- uint64_t offset, size_t size) -+void elf_mark_broken(struct elf_binary *elf, const char *msg) - { -+ if ( elf->broken == NULL ) -+ elf->broken = msg; -+} -+ -+const char *elf_check_broken(const struct elf_binary *elf) -+{ -+ return elf->broken; -+} -+ -+static int elf_ptrval_in_range(elf_ptrval ptrval, uint64_t size, -+ const void *region, uint64_t regionsize) -+ /* -+ * Returns true if the putative memory area [ptrval,ptrval+size> -+ * is completely inside the region [region,region+regionsize>. -+ * -+ * ptrval and size are the untrusted inputs to be checked. -+ * region and regionsize are trusted and must be correct and valid, -+ * although it is OK for region to perhaps be maliciously NULL -+ * (but not some other malicious value). -+ */ -+{ -+ elf_ptrval regionp = (elf_ptrval)region; -+ -+ if ( (region == NULL) || -+ (ptrval < regionp) || /* start is before region */ -+ (ptrval > regionp + regionsize) || /* start is after region */ -+ (size > regionsize - (ptrval - regionp)) ) /* too big */ -+ return 0; -+ return 1; -+} -+ -+int elf_access_ok(struct elf_binary * elf, -+ uint64_t ptrval, size_t size) -+{ -+ if ( elf_ptrval_in_range(ptrval, size, elf->image_base, elf->size) ) -+ return 1; -+ if ( elf_ptrval_in_range(ptrval, size, elf->dest_base, elf->dest_size) ) -+ return 1; -+ if ( elf_ptrval_in_range(ptrval, size, -+ elf->caller_xdest_base, elf->caller_xdest_size) ) -+ return 1; -+ elf_mark_broken(elf, "out of range access"); -+ return 0; -+} -+ -+void elf_memcpy_safe(struct elf_binary *elf, elf_ptrval dst, -+ elf_ptrval src, size_t size) -+{ -+ if ( elf_access_ok(elf, dst, size) && -+ elf_access_ok(elf, src, size) ) -+ { -+ /* use memmove because these checks do not prove that the -+ * regions don't overlap and overlapping regions grant -+ * permission for compiler malice */ -+ elf_memmove_unchecked(ELF_UNSAFE_PTR(dst), ELF_UNSAFE_PTR(src), size); -+ } -+} -+ -+void elf_memset_safe(struct elf_binary *elf, elf_ptrval dst, int c, size_t size) -+{ -+ if ( elf_access_ok(elf, dst, size) ) -+ { -+ elf_memset_unchecked(ELF_UNSAFE_PTR(dst), c, size); -+ } -+} -+ -+uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, -+ uint64_t moreoffset, size_t size) -+{ -+ elf_ptrval ptrval = base + moreoffset; - int need_swap = elf_swap(elf); - const uint8_t *u8; - const uint16_t *u16; - const uint32_t *u32; - const uint64_t *u64; - -+ if ( !elf_access_ok(elf, ptrval, size) ) -+ return 0; -+ - switch ( size ) - { - case 1: -- u8 = ptr + offset; -+ u8 = (const void*)ptrval; - return *u8; - case 2: -- u16 = ptr + offset; -+ u16 = (const void*)ptrval; - return need_swap ? bswap_16(*u16) : *u16; - case 4: -- u32 = ptr + offset; -+ u32 = (const void*)ptrval; - return need_swap ? bswap_32(*u32) : *u32; - case 8: -- u64 = ptr + offset; -+ u64 = (const void*)ptrval; - return need_swap ? bswap_64(*u64) : *u64; - default: - return 0; -@@ -122,6 +194,28 @@ const char *elf_section_name(struct elf_binary *elf, - return elf_strval(elf, elf->sec_strtab + elf_uval(elf, shdr, sh_name)); - } - -+const char *elf_strval(struct elf_binary *elf, elf_ptrval start) -+{ -+ uint64_t length; -+ -+ for ( length = 0; ; length++ ) { -+ if ( !elf_access_ok(elf, start + length, 1) ) -+ return NULL; -+ if ( !elf_access_unsigned(elf, start, length, 1) ) -+ /* ok */ -+ return ELF_UNSAFE_PTR(start); -+ } -+} -+ -+const char *elf_strfmt(struct elf_binary *elf, elf_ptrval start) -+{ -+ const char *str = elf_strval(elf, start); -+ -+ if ( str == NULL ) -+ return "(invalid)"; -+ return str; -+} -+ - ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr) - { - return ELF_IMAGE_BASE(elf) + elf_uval(elf, shdr, sh_offset); -diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h -index af5b5c5..ddc3ed7 100644 ---- a/xen/include/xen/libelf.h -+++ b/xen/include/xen/libelf.h -@@ -57,8 +57,9 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - * on this. - * This replaces variables which were char*,void* - * and their const versions, so we provide four -- * different declaration macros: -+ * different obsolete declaration macros: - * ELF_PTRVAL_{,CONST}{VOID,CHAR} -+ * New code can simply use the elf_ptrval typedef. - * HANDLE A pointer to a struct. There is one of these types - * for each pointer type - that is, for each "structname". - * In the arguments to the various HANDLE macros, structname -@@ -67,54 +68,66 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - * pointers. In the current code attempts to do so will - * compile, but in the next patch this will become a - * compile error. -- * We provide two declaration macros for const and -- * non-const pointers. -+ * We also provide a second declaration macro for -+ * pointers which were to const; this is obsolete. - */ - --#define ELF_REALPTR2PTRVAL(realpointer) (realpointer) -+typedef uintptr_t elf_ptrval; -+ -+#define ELF_REALPTR2PTRVAL(realpointer) ((elf_ptrval)(realpointer)) - /* Converts an actual C pointer into a PTRVAL */ - --#define ELF_HANDLE_DECL_NONCONST(structname) structname * --#define ELF_HANDLE_DECL(structname) const structname * -+#define ELF_HANDLE_DECL_NONCONST(structname) structname##_handle /*obsolete*/ -+#define ELF_HANDLE_DECL(structname) structname##_handle - /* Provides a type declaration for a HANDLE. */ -- /* May only be used to declare ONE variable at a time */ - --#define ELF_PTRVAL_VOID void * --#define ELF_PTRVAL_CHAR char * --#define ELF_PTRVAL_CONST_VOID const void * --#define ELF_PTRVAL_CONST_CHAR const char * -- /* Provides a type declaration for a PTRVAL. */ -- /* May only be used to declare ONE variable at a time */ -+#define ELF_PTRVAL_VOID elf_ptrval /*obsolete*/ -+#define ELF_PTRVAL_CHAR elf_ptrval /*obsolete*/ -+#define ELF_PTRVAL_CONST_VOID elf_ptrval /*obsolete*/ -+#define ELF_PTRVAL_CONST_CHAR elf_ptrval /*obsolete*/ -+ -+#ifdef __XEN__ -+# define ELF_PRPTRVAL "lu" -+ /* -+ * PRIuPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, -+ * to "u", when in fact uintptr_t is an unsigned long. -+ */ -+#else -+# define ELF_PRPTRVAL PRIuPTR -+#endif -+ /* printf format a la PRId... for a PTRVAL */ - --#define ELF_DEFINE_HANDLE(structname) /* empty */ -+#define ELF_DEFINE_HANDLE(structname) \ -+ typedef union { \ -+ elf_ptrval ptrval; \ -+ const structname *typeonly; /* for sizeof, offsetof, &c only */ \ -+ } structname##_handle; - /* - * This must be invoked for each HANDLE type to define - * the actual C type used for that kind of HANDLE. - */ - --#define ELF_PRPTRVAL "p" -- /* printf format a la PRId... for a PTRVAL */ -- --#define ELF_MAKE_HANDLE(structname, ptrval) (ptrval) -+#define ELF_MAKE_HANDLE(structname, ptrval) ((structname##_handle){ ptrval }) - /* Converts a PTRVAL to a HANDLE */ - --#define ELF_IMAGE_BASE(elf) ((elf)->image) -+#define ELF_IMAGE_BASE(elf) ((elf_ptrval)(elf)->image_base) - /* Returns the base of the image as a PTRVAL. */ - --#define ELF_HANDLE_PTRVAL(handleval) ((void*)(handleval)) -+#define ELF_HANDLE_PTRVAL(handleval) ((handleval).ptrval) - /* Converts a HANDLE to a PTRVAL. */ - --#define ELF_OBSOLETE_VOIDP_CAST (void*)(uintptr_t) -+#define ELF_OBSOLETE_VOIDP_CAST /*empty*/ - /* -- * In some places the existing code needs to -+ * In some places the old code used to need to - * - cast away const (the existing code uses const a fair - * bit but actually sometimes wants to write to its input) - * from a PTRVAL. - * - convert an integer representing a pointer to a PTRVAL -- * This macro provides a suitable cast. -+ * Nowadays all of these re uintptr_ts so there is no const problem -+ * and no need for any casting. - */ - --#define ELF_UNSAFE_PTR(ptrval) ((void*)(uintptr_t)(ptrval)) -+#define ELF_UNSAFE_PTR(ptrval) ((void*)(elf_ptrval)(ptrval)) - /* - * Turns a PTRVAL into an actual C pointer. Before this is done - * the caller must have ensured that the PTRVAL does in fact point -@@ -122,18 +135,21 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - */ - - /* PTRVALs can be INVALID (ie, NULL). */ --#define ELF_INVALID_PTRVAL (NULL) /* returns NULL PTRVAL */ -+#define ELF_INVALID_PTRVAL ((elf_ptrval)0) /* returns NULL PTRVAL */ - #define ELF_INVALID_HANDLE(structname) /* returns NULL handle */ \ - ELF_MAKE_HANDLE(structname, ELF_INVALID_PTRVAL) --#define ELF_PTRVAL_VALID(ptrval) (ptrval) /* } */ --#define ELF_HANDLE_VALID(handleval) (handleval) /* } predicates */ --#define ELF_PTRVAL_INVALID(ptrval) ((ptrval) == NULL) /* } */ -+#define ELF_PTRVAL_VALID(ptrval) (!!(ptrval)) /* } */ -+#define ELF_HANDLE_VALID(handleval) (!!(handleval).ptrval) /* } predicates */ -+#define ELF_PTRVAL_INVALID(ptrval) (!ELF_PTRVAL_VALID((ptrval))) /* } */ -+ -+#define ELF_MAX_PTRVAL (~(elf_ptrval)0) -+ /* PTRVAL value guaranteed to compare > to any valid PTRVAL */ - - /* For internal use by other macros here */ - #define ELF__HANDLE_FIELD_TYPE(handleval, elm) \ -- typeof((handleval)->elm) -+ typeof((handleval).typeonly->elm) - #define ELF__HANDLE_FIELD_OFFSET(handleval, elm) \ -- offsetof(typeof(*(handleval)),elm) -+ offsetof(typeof(*(handleval).typeonly),elm) - - - /* ------------------------------------------------------------------------ */ -@@ -182,7 +198,7 @@ ELF_DEFINE_HANDLE(elf_note) - - struct elf_binary { - /* elf binary */ -- const char *image; -+ const void *image_base; - size_t size; - char class; - char data; -@@ -190,10 +206,16 @@ struct elf_binary { - ELF_HANDLE_DECL(elf_ehdr) ehdr; - ELF_PTRVAL_CONST_CHAR sec_strtab; - ELF_HANDLE_DECL(elf_shdr) sym_tab; -- ELF_PTRVAL_CONST_CHAR sym_strtab; -+ uint64_t sym_strtab; - - /* loaded to */ -- char *dest; -+ /* -+ * dest_base and dest_size are trusted and must be correct; -+ * whenever dest_size is not 0, both of these must be valid -+ * so long as the struct elf_binary is in use. -+ */ -+ char *dest_base; -+ size_t dest_size; - uint64_t pstart; - uint64_t pend; - uint64_t reloc_offset; -@@ -201,12 +223,22 @@ struct elf_binary { - uint64_t bsd_symtab_pstart; - uint64_t bsd_symtab_pend; - -+ /* -+ * caller's other acceptable destination -+ * -+ * Again, these are trusted and must be valid (or 0) so long -+ * as the struct elf_binary is in use. -+ */ -+ void *caller_xdest_base; -+ uint64_t caller_xdest_size; -+ - #ifndef __XEN__ - /* misc */ - elf_log_callback *log_callback; - void *log_caller_data; - #endif - int verbose; -+ const char *broken; - }; - - /* ------------------------------------------------------------------------ */ -@@ -224,22 +256,27 @@ struct elf_binary { - #define elf_lsb(elf) (ELFDATA2LSB == (elf)->data) - #define elf_swap(elf) (NATIVE_ELFDATA != (elf)->data) - --#define elf_uval(elf, str, elem) \ -- ((ELFCLASS64 == (elf)->class) \ -- ? elf_access_unsigned((elf), (str), \ -- offsetof(typeof(*(str)),e64.elem), \ -- sizeof((str)->e64.elem)) \ -- : elf_access_unsigned((elf), (str), \ -- offsetof(typeof(*(str)),e32.elem), \ -- sizeof((str)->e32.elem))) -+#define elf_uval_3264(elf, handle, elem) \ -+ elf_access_unsigned((elf), (handle).ptrval, \ -+ offsetof(typeof(*(handle).typeonly),elem), \ -+ sizeof((handle).typeonly->elem)) -+ -+#define elf_uval(elf, handle, elem) \ -+ ((ELFCLASS64 == (elf)->class) \ -+ ? elf_uval_3264(elf, handle, e64.elem) \ -+ : elf_uval_3264(elf, handle, e32.elem)) - /* - * Reads an unsigned field in a header structure in the ELF. - * str is a HANDLE, and elem is the field name in it. - */ - --#define elf_size(elf, str) \ -+ -+#define elf_size(elf, handle_or_handletype) ({ \ -+ typeof(handle_or_handletype) elf_size__dummy; \ - ((ELFCLASS64 == (elf)->class) \ -- ? sizeof((str)->e64) : sizeof((str)->e32)) -+ ? sizeof(elf_size__dummy.typeonly->e64) \ -+ : sizeof(elf_size__dummy.typeonly->e32)); \ -+}) - /* - * Returns the size of the substructure for the appropriate 32/64-bitness. - * str should be a HANDLE. -@@ -251,23 +288,37 @@ uint64_t elf_access_unsigned(struct elf_binary *elf, ELF_PTRVAL_CONST_VOID ptr, - - uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr); - -+const char *elf_strval(struct elf_binary *elf, elf_ptrval start); -+ /* may return NULL if the string is out of range etc. */ - --#define elf_strval(elf,x) ((const char*)(x)) /* may return NULL in the future */ --#define elf_strfmt(elf,x) ((const char*)(x)) /* will return (invalid) instead */ -+const char *elf_strfmt(struct elf_binary *elf, elf_ptrval start); -+ /* like elf_strval but returns "(invalid)" instead of NULL */ - --#define elf_memcpy_safe(elf, dst, src, sz) memcpy((dst),(src),(sz)) --#define elf_memset_safe(elf, dst, c, sz) memset((dst),(c),(sz)) -+void elf_memcpy_safe(struct elf_binary*, elf_ptrval dst, elf_ptrval src, size_t); -+void elf_memset_safe(struct elf_binary*, elf_ptrval dst, int c, size_t); - /* -- * Versions of memcpy and memset which will (in the next patch) -- * arrange never to write outside permitted areas. -+ * Versions of memcpy and memset which arrange never to write -+ * outside permitted areas. - */ - --#define elf_store_val(elf, type, ptr, val) (*(type*)(ptr) = (val)) -+int elf_access_ok(struct elf_binary * elf, -+ uint64_t ptrval, size_t size); -+ -+#define elf_store_val(elf, type, ptr, val) \ -+ ({ \ -+ typeof(type) elf_store__val = (val); \ -+ elf_ptrval elf_store__targ = ptr; \ -+ if (elf_access_ok((elf), elf_store__targ, \ -+ sizeof(elf_store__val))) { \ -+ elf_memcpy_unchecked((void*)elf_store__targ, &elf_store__val, \ -+ sizeof(elf_store__val)); \ -+ } \ -+ }) \ - /* Stores a value at a particular PTRVAL. */ - --#define elf_store_field(elf, hdr, elm, val) \ -- (elf_store_val((elf), ELF__HANDLE_FIELD_TYPE(hdr, elm), \ -- &((hdr)->elm), \ -+#define elf_store_field(elf, hdr, elm, val) \ -+ (elf_store_val((elf), ELF__HANDLE_FIELD_TYPE(hdr, elm), \ -+ ELF_HANDLE_PTRVAL(hdr) + ELF__HANDLE_FIELD_OFFSET(hdr, elm), \ - (val))) - /* Stores a 32/64-bit field. hdr is a HANDLE and elm is the field name. */ - -@@ -306,6 +357,10 @@ int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - /* xc_libelf_loader.c */ - - int elf_init(struct elf_binary *elf, const char *image, size_t size); -+ /* -+ * image and size must be correct. They will be recorded in -+ * *elf, and must remain valid while the elf is in use. -+ */ - #ifdef __XEN__ - void elf_set_verbose(struct elf_binary *elf); - #else -@@ -321,6 +376,9 @@ uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol); - - void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart); /* private */ - -+void elf_mark_broken(struct elf_binary *elf, const char *msg); -+const char *elf_check_broken(const struct elf_binary *elf); /* NULL means OK */ -+ - /* ------------------------------------------------------------------------ */ - /* xc_libelf_relocate.c */ - -@@ -395,16 +453,38 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms); - --#define elf_memcpy_unchecked memcpy --#define elf_memset_unchecked memset -+static inline void *elf_memcpy_unchecked(void *dest, const void *src, size_t n) -+ { return memcpy(dest, src, n); } -+static inline void *elf_memmove_unchecked(void *dest, const void *src, size_t n) -+ { return memmove(dest, src, n); } -+static inline void *elf_memset_unchecked(void *s, int c, size_t n) -+ { return memset(s, c, n); } - /* -- * Unsafe versions of memcpy and memset which take actual C -- * pointers. These are just like real memcpy and memset. -+ * Unsafe versions of memcpy, memmove memset which take actual C -+ * pointers. These are just like the real functions. -+ * We provide these so that in libelf-private.h we can #define -+ * memcpy, memset and memmove to undefined MISTAKE things. - */ - - --#define ELF_ADVANCE_DEST(elf, amount) elf->dest += (amount) -- /* Advances past amount bytes of the current destination area. */ -+/* Advances past amount bytes of the current destination area. */ -+static inline void ELF_ADVANCE_DEST(struct elf_binary *elf, uint64_t amount) -+{ -+ if ( elf->dest_base == NULL ) -+ { -+ elf_mark_broken(elf, "advancing in null image"); -+ } -+ else if ( elf->dest_size >= amount ) -+ { -+ elf->dest_base += amount; -+ elf->dest_size -= amount; -+ } -+ else -+ { -+ elf->dest_size = 0; -+ elf_mark_broken(elf, "advancing past end (image very short?)"); -+ } -+} - - - #endif /* __XEN_LIBELF_H__ */ --- -1.7.2.5 - diff --git a/app-emulation/xen-tools/files/xen-4.2-CVE-2013-15-XSA-55.patch b/app-emulation/xen-tools/files/xen-4.2-CVE-2013-15-XSA-55.patch deleted file mode 100644 index f55701dae332..000000000000 --- a/app-emulation/xen-tools/files/xen-4.2-CVE-2013-15-XSA-55.patch +++ /dev/null @@ -1,759 +0,0 @@ -From e673ca50127b6c1263727aa31de0b8bb966ca7a2 Mon Sep 17 00:00:00 2001 -From: Ian Jackson -Date: Fri, 14 Jun 2013 16:43:18 +0100 -Subject: [PATCH 15/23] libelf: use only unsigned integers - -Signed integers have undesirable undefined behaviours on overflow. -Malicious compilers can turn apparently-correct code into code with -security vulnerabilities etc. - -So use only unsigned integers. Exceptions are booleans (which we have -already changed) and error codes. - -We _do_ change all the chars which aren't fixed constants from our own -text segment, but not the char*s. This is because it is safe to -access an arbitrary byte through a char*, but not necessarily safe to -convert an arbitrary value to a char. - -As a consequence we need to compile libelf with -Wno-pointer-sign. - -It is OK to change all the signed integers to unsigned because all the -inequalities in libelf are in contexts where we don't "expect" -negative numbers. - -In libelf-dominfo.c:elf_xen_parse we rename a variable "rc" to -"more_notes" as it actually contains a note count derived from the -input image. The "error" return value from elf_xen_parse_notes is -changed from -1 to ~0U. - -grepping shows only one occurrence of "PRId" or "%d" or "%ld" in -libelf and xc_dom_elfloader.c (a "%d" which becomes "%u"). - -This is part of the fix to a security issue, XSA-55. - -For those concerned about unintentional functional changes, the -following rune produces a version of the patch which is much smaller -and eliminates only non-functional changes: - - GIT_EXTERNAL_DIFF=.../unsigned-differ git-diff .. - -where and are git refs for the code before and after -this patch, and unsigned-differ is this shell script: - - #!/bin/bash - set -e - - seddery () { - perl -pe 's/\b(?:elf_errorstatus|elf_negerrnoval)\b/int/g' - } - - path="$1" - in="$2" - out="$5" - - set +e - diff -pu --label "$path~" <(seddery <"$in") --label "$path" <(seddery <"$out") - rc=$? - set -e - if [ $rc = 1 ]; then rc=0; fi - exit $rc - -Signed-off-by: Ian Jackson ---- - tools/libxc/Makefile | 9 +++++- - tools/libxc/xc_dom.h | 7 +++-- - tools/libxc/xc_dom_elfloader.c | 42 ++++++++++++++++------------- - tools/xcutils/readnotes.c | 15 +++++----- - xen/common/libelf/Makefile | 2 + - xen/common/libelf/libelf-dominfo.c | 52 ++++++++++++++++++----------------- - xen/common/libelf/libelf-loader.c | 20 +++++++------- - xen/common/libelf/libelf-tools.c | 24 ++++++++-------- - xen/include/xen/libelf.h | 21 ++++++++------ - 9 files changed, 105 insertions(+), 87 deletions(-) - -diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile -index d8c6a60..a3fd90c 100644 ---- a/tools/libxc/Makefile -+++ b/tools/libxc/Makefile -@@ -52,8 +52,13 @@ endif - vpath %.c ../../xen/common/libelf - CFLAGS += -I../../xen/common/libelf - --GUEST_SRCS-y += libelf-tools.c libelf-loader.c --GUEST_SRCS-y += libelf-dominfo.c -+ELF_SRCS-y += libelf-tools.c libelf-loader.c -+ELF_SRCS-y += libelf-dominfo.c -+ -+GUEST_SRCS-y += $(ELF_SRCS-y) -+ -+$(patsubst %.c,%.o,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign -+$(patsubst %.c,%.opic,$(ELF_SRCS-y)): CFLAGS += -Wno-pointer-sign - - # new domain builder - GUEST_SRCS-y += xc_dom_core.c xc_dom_boot.c -diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h -index 9f8037e..0161459 100644 ---- a/tools/libxc/xc_dom.h -+++ b/tools/libxc/xc_dom.h -@@ -140,9 +140,10 @@ struct xc_dom_image { - - struct xc_dom_loader { - char *name; -- int (*probe) (struct xc_dom_image * dom); -- int (*parser) (struct xc_dom_image * dom); -- int (*loader) (struct xc_dom_image * dom); -+ /* Sadly the error returns from these functions are not consistent: */ -+ elf_negerrnoval (*probe) (struct xc_dom_image * dom); -+ elf_negerrnoval (*parser) (struct xc_dom_image * dom); -+ elf_errorstatus (*loader) (struct xc_dom_image * dom); - - struct xc_dom_loader *next; - }; -diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c -index 9ba64ae..62a0d3b 100644 ---- a/tools/libxc/xc_dom_elfloader.c -+++ b/tools/libxc/xc_dom_elfloader.c -@@ -84,7 +84,7 @@ static char *xc_dom_guest_type(struct xc_dom_image *dom, - /* ------------------------------------------------------------------------ */ - /* parse elf binary */ - --static int check_elf_kernel(struct xc_dom_image *dom, bool verbose) -+static elf_negerrnoval check_elf_kernel(struct xc_dom_image *dom, bool verbose) - { - if ( dom->kernel_blob == NULL ) - { -@@ -106,12 +106,12 @@ static int check_elf_kernel(struct xc_dom_image *dom, bool verbose) - return 0; - } - --static int xc_dom_probe_elf_kernel(struct xc_dom_image *dom) -+static elf_negerrnoval xc_dom_probe_elf_kernel(struct xc_dom_image *dom) - { - return check_elf_kernel(dom, 0); - } - --static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, -+static elf_errorstatus xc_dom_load_elf_symtab(struct xc_dom_image *dom, - struct elf_binary *elf, bool load) - { - struct elf_binary syms; -@@ -119,7 +119,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - xen_vaddr_t symtab, maxaddr; - ELF_PTRVAL_CHAR hdr; - size_t size; -- int h, count, type, i, tables = 0; -+ unsigned h, count, type, i, tables = 0; - - if ( elf_swap(elf) ) - { -@@ -140,13 +140,13 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - elf->caller_xdest_base = hdr_ptr; - elf->caller_xdest_size = allow_size; - hdr = ELF_REALPTR2PTRVAL(hdr_ptr); -- elf_store_val(elf, int, hdr, size - sizeof(int)); -+ elf_store_val(elf, unsigned, hdr, size - sizeof(unsigned)); - } - else - { - char *hdr_ptr; - -- size = sizeof(int) + elf_size(elf, elf->ehdr) + -+ size = sizeof(unsigned) + elf_size(elf, elf->ehdr) + - elf_shdr_count(elf) * elf_size(elf, shdr); - hdr_ptr = xc_dom_malloc(dom, size); - if ( hdr_ptr == NULL ) -@@ -157,15 +157,15 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - dom->bsd_symtab_start = elf_round_up(elf, dom->kernel_seg.vend); - } - -- elf_memcpy_safe(elf, hdr + sizeof(int), -+ elf_memcpy_safe(elf, hdr + sizeof(unsigned), - ELF_IMAGE_BASE(elf), - elf_size(elf, elf->ehdr)); -- elf_memcpy_safe(elf, hdr + sizeof(int) + elf_size(elf, elf->ehdr), -+ elf_memcpy_safe(elf, hdr + sizeof(unsigned) + elf_size(elf, elf->ehdr), - ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), - elf_shdr_count(elf) * elf_size(elf, shdr)); - if ( elf_64bit(elf) ) - { -- Elf64_Ehdr *ehdr = (Elf64_Ehdr *)(hdr + sizeof(int)); -+ Elf64_Ehdr *ehdr = (Elf64_Ehdr *)(hdr + sizeof(unsigned)); - ehdr->e_phoff = 0; - ehdr->e_phentsize = 0; - ehdr->e_phnum = 0; -@@ -174,22 +174,22 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - } - else - { -- Elf32_Ehdr *ehdr = (Elf32_Ehdr *)(hdr + sizeof(int)); -+ Elf32_Ehdr *ehdr = (Elf32_Ehdr *)(hdr + sizeof(unsigned)); - ehdr->e_phoff = 0; - ehdr->e_phentsize = 0; - ehdr->e_phnum = 0; - ehdr->e_shoff = elf_size(elf, elf->ehdr); - ehdr->e_shstrndx = SHN_UNDEF; - } -- if ( elf->caller_xdest_size < sizeof(int) ) -+ if ( elf->caller_xdest_size < sizeof(unsigned) ) - { - DOMPRINTF("%s/%s: header size %"PRIx64" too small", - __FUNCTION__, load ? "load" : "parse", - (uint64_t)elf->caller_xdest_size); - return -1; - } -- if ( elf_init(&syms, elf->caller_xdest_base + sizeof(int), -- elf->caller_xdest_size - sizeof(int)) ) -+ if ( elf_init(&syms, elf->caller_xdest_base + sizeof(unsigned), -+ elf->caller_xdest_size - sizeof(unsigned)) ) - return -1; - - /* -@@ -209,7 +209,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - - xc_elf_set_logfile(dom->xch, &syms, 1); - -- symtab = dom->bsd_symtab_start + sizeof(int); -+ symtab = dom->bsd_symtab_start + sizeof(unsigned); - maxaddr = elf_round_up(&syms, symtab + elf_size(&syms, syms.ehdr) + - elf_shdr_count(&syms) * elf_size(&syms, shdr)); - -@@ -255,7 +255,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - size = elf_uval(&syms, shdr, sh_size); - maxaddr = elf_round_up(&syms, maxaddr + size); - tables++; -- DOMPRINTF("%s: h=%d %s, size=0x%zx, maxaddr=0x%" PRIx64 "", -+ DOMPRINTF("%s: h=%u %s, size=0x%zx, maxaddr=0x%" PRIx64 "", - __FUNCTION__, h, - type == SHT_SYMTAB ? "symtab" : "strtab", - size, maxaddr); -@@ -294,10 +294,14 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - return 0; - } - --static int xc_dom_parse_elf_kernel(struct xc_dom_image *dom) -+static elf_errorstatus xc_dom_parse_elf_kernel(struct xc_dom_image *dom) -+ /* -+ * This function sometimes returns -1 for error and sometimes -+ * an errno value. ?!?! -+ */ - { - struct elf_binary *elf; -- int rc; -+ elf_errorstatus rc; - - rc = check_elf_kernel(dom, 1); - if ( rc != 0 ) -@@ -358,10 +362,10 @@ out: - return rc; - } - --static int xc_dom_load_elf_kernel(struct xc_dom_image *dom) -+static elf_errorstatus xc_dom_load_elf_kernel(struct xc_dom_image *dom) - { - struct elf_binary *elf = dom->private_loader; -- int rc; -+ elf_errorstatus rc; - xen_pfn_t pages; - - elf->dest_base = xc_dom_seg_to_ptr_pages(dom, &dom->kernel_seg, &pages); -diff --git a/tools/xcutils/readnotes.c b/tools/xcutils/readnotes.c -index d1f7a30..2ca7732 100644 ---- a/tools/xcutils/readnotes.c -+++ b/tools/xcutils/readnotes.c -@@ -70,7 +70,7 @@ static void print_numeric_note(const char *prefix, struct elf_binary *elf, - ELF_HANDLE_DECL(elf_note) note) - { - uint64_t value = elf_note_numeric(elf, note); -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - - printf("%s: %#*" PRIx64 " (%d bytes)\n", - prefix, 2+2*descsz, value, descsz); -@@ -79,7 +79,7 @@ static void print_numeric_note(const char *prefix, struct elf_binary *elf, - static void print_l1_mfn_valid_note(const char *prefix, struct elf_binary *elf, - ELF_HANDLE_DECL(elf_note) note) - { -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); - - /* XXX should be able to cope with a list of values. */ -@@ -99,10 +99,10 @@ static void print_l1_mfn_valid_note(const char *prefix, struct elf_binary *elf, - - } - --static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, ELF_HANDLE_DECL(elf_note) end) -+static unsigned print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, ELF_HANDLE_DECL(elf_note) end) - { - ELF_HANDLE_DECL(elf_note) note; -- int notes_found = 0; -+ unsigned notes_found = 0; - const char *this_note_name; - - for ( note = start; ELF_HANDLE_PTRVAL(note) < ELF_HANDLE_PTRVAL(end); note = elf_note_next(elf, note) ) -@@ -161,7 +161,7 @@ static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, - break; - default: - printf("unknown note type %#x\n", -- (int)elf_uval(elf, note, type)); -+ (unsigned)elf_uval(elf, note, type)); - break; - } - } -@@ -171,12 +171,13 @@ static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, - int main(int argc, char **argv) - { - const char *f; -- int fd,h,size,usize,count; -+ int fd; -+ unsigned h,size,usize,count; - void *image,*tmp; - struct stat st; - struct elf_binary elf; - ELF_HANDLE_DECL(elf_shdr) shdr; -- int notes_found = 0; -+ unsigned notes_found = 0; - - struct setup_header *hdr; - uint64_t payload_offset, payload_length; -diff --git a/xen/common/libelf/Makefile b/xen/common/libelf/Makefile -index 18dc8e2..5bf8f76 100644 ---- a/xen/common/libelf/Makefile -+++ b/xen/common/libelf/Makefile -@@ -2,6 +2,8 @@ obj-bin-y := libelf.o - - SECTIONS := text data $(SPECIAL_DATA_SECTIONS) - -+CFLAGS += -Wno-pointer-sign -+ - libelf.o: libelf-temp.o Makefile - $(OBJCOPY) $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s)) $< $@ - -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index 12b6c2a..cdd0d31 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -29,15 +29,15 @@ static const char *const elf_xen_feature_names[] = { - [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb", - [XENFEAT_dom0] = "dom0" - }; --static const int elf_xen_features = -+static const unsigned elf_xen_features = - sizeof(elf_xen_feature_names) / sizeof(elf_xen_feature_names[0]); - --int elf_xen_parse_features(const char *features, -+elf_errorstatus elf_xen_parse_features(const char *features, - uint32_t *supported, - uint32_t *required) - { -- char feature[64]; -- int pos, len, i; -+ unsigned char feature[64]; -+ unsigned pos, len, i; - - if ( features == NULL ) - return 0; -@@ -94,7 +94,7 @@ int elf_xen_parse_features(const char *features, - /* ------------------------------------------------------------------------ */ - /* xen elf notes */ - --int elf_xen_parse_note(struct elf_binary *elf, -+elf_errorstatus elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, - ELF_HANDLE_DECL(elf_note) note) - { -@@ -125,7 +125,7 @@ int elf_xen_parse_note(struct elf_binary *elf, - const char *str = NULL; - uint64_t val = 0; - unsigned int i; -- int type = elf_uval(elf, note, type); -+ unsigned type = elf_uval(elf, note, type); - - if ( (type >= sizeof(note_desc) / sizeof(note_desc[0])) || - (note_desc[type].name == NULL) ) -@@ -216,12 +216,14 @@ int elf_xen_parse_note(struct elf_binary *elf, - return 0; - } - --static int elf_xen_parse_notes(struct elf_binary *elf, -+#define ELF_NOTE_INVALID (~0U) -+ -+static unsigned elf_xen_parse_notes(struct elf_binary *elf, - struct elf_dom_parms *parms, - ELF_PTRVAL_CONST_VOID start, - ELF_PTRVAL_CONST_VOID end) - { -- int xen_elfnotes = 0; -+ unsigned xen_elfnotes = 0; - ELF_HANDLE_DECL(elf_note) note; - const char *note_name; - -@@ -237,7 +239,7 @@ static int elf_xen_parse_notes(struct elf_binary *elf, - if ( strcmp(note_name, "Xen") ) - continue; - if ( elf_xen_parse_note(elf, parms, note) ) -- return -1; -+ return ELF_NOTE_INVALID; - xen_elfnotes++; - } - return xen_elfnotes; -@@ -246,12 +248,12 @@ static int elf_xen_parse_notes(struct elf_binary *elf, - /* ------------------------------------------------------------------------ */ - /* __xen_guest section */ - --int elf_xen_parse_guest_info(struct elf_binary *elf, -+elf_errorstatus elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - ELF_PTRVAL_CONST_CHAR h; -- char name[32], value[128]; -- int len; -+ unsigned char name[32], value[128]; -+ unsigned len; - - h = parms->guest_info; - #define STAR(h) (elf_access_unsigned(elf, (h), 0, 1)) -@@ -334,13 +336,13 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - /* ------------------------------------------------------------------------ */ - /* sanity checks */ - --static int elf_xen_note_check(struct elf_binary *elf, -+static elf_errorstatus elf_xen_note_check(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - if ( (ELF_PTRVAL_INVALID(parms->elf_note_start)) && - (ELF_PTRVAL_INVALID(parms->guest_info)) ) - { -- int machine = elf_uval(elf, elf->ehdr, e_machine); -+ unsigned machine = elf_uval(elf, elf->ehdr, e_machine); - if ( (machine == EM_386) || (machine == EM_X86_64) ) - { - elf_err(elf, "%s: ERROR: Not a Xen-ELF image: " -@@ -378,7 +380,7 @@ static int elf_xen_note_check(struct elf_binary *elf, - return 0; - } - --static int elf_xen_addr_calc_check(struct elf_binary *elf, -+static elf_errorstatus elf_xen_addr_calc_check(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - if ( (parms->elf_paddr_offset != UNSET_ADDR) && -@@ -464,13 +466,13 @@ static int elf_xen_addr_calc_check(struct elf_binary *elf, - /* ------------------------------------------------------------------------ */ - /* glue it all together ... */ - --int elf_xen_parse(struct elf_binary *elf, -+elf_errorstatus elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms) - { - ELF_HANDLE_DECL(elf_shdr) shdr; - ELF_HANDLE_DECL(elf_phdr) phdr; -- int xen_elfnotes = 0; -- int i, count, rc; -+ unsigned xen_elfnotes = 0; -+ unsigned i, count, more_notes; - - elf_memset_unchecked(parms, 0, sizeof(*parms)); - parms->virt_base = UNSET_ADDR; -@@ -495,13 +497,13 @@ int elf_xen_parse(struct elf_binary *elf, - if (elf_uval(elf, phdr, p_offset) == 0) - continue; - -- rc = elf_xen_parse_notes(elf, parms, -+ more_notes = elf_xen_parse_notes(elf, parms, - elf_segment_start(elf, phdr), - elf_segment_end(elf, phdr)); -- if ( rc == -1 ) -+ if ( more_notes == ELF_NOTE_INVALID ) - return -1; - -- xen_elfnotes += rc; -+ xen_elfnotes += more_notes; - } - - /* -@@ -518,17 +520,17 @@ int elf_xen_parse(struct elf_binary *elf, - if ( elf_uval(elf, shdr, sh_type) != SHT_NOTE ) - continue; - -- rc = elf_xen_parse_notes(elf, parms, -+ more_notes = elf_xen_parse_notes(elf, parms, - elf_section_start(elf, shdr), - elf_section_end(elf, shdr)); - -- if ( rc == -1 ) -+ if ( more_notes == ELF_NOTE_INVALID ) - return -1; - -- if ( xen_elfnotes == 0 && rc > 0 ) -+ if ( xen_elfnotes == 0 && more_notes > 0 ) - elf_msg(elf, "%s: using notes from SHT_NOTE section\n", __FUNCTION__); - -- xen_elfnotes += rc; -+ xen_elfnotes += more_notes; - } - - } -diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c -index 0dccd4d..c3a9e51 100644 ---- a/xen/common/libelf/libelf-loader.c -+++ b/xen/common/libelf/libelf-loader.c -@@ -24,7 +24,7 @@ - - /* ------------------------------------------------------------------------ */ - --int elf_init(struct elf_binary *elf, const char *image_input, size_t size) -+elf_errorstatus elf_init(struct elf_binary *elf, const char *image_input, size_t size) - { - ELF_HANDLE_DECL(elf_shdr) shdr; - uint64_t i, count, section, offset; -@@ -114,7 +114,7 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback *log_callback, - elf->verbose = verbose; - } - --static int elf_load_image(struct elf_binary *elf, -+static elf_errorstatus elf_load_image(struct elf_binary *elf, - ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, - uint64_t filesz, uint64_t memsz) - { -@@ -129,9 +129,9 @@ void elf_set_verbose(struct elf_binary *elf) - elf->verbose = 1; - } - --static int elf_load_image(struct elf_binary *elf, ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, uint64_t filesz, uint64_t memsz) -+static elf_errorstatus elf_load_image(struct elf_binary *elf, ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, uint64_t filesz, uint64_t memsz) - { -- int rc; -+ elf_errorstatus rc; - if ( filesz > ULONG_MAX || memsz > ULONG_MAX ) - return -1; - /* We trust the dom0 kernel image completely, so we don't care -@@ -151,7 +151,7 @@ void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - { - uint64_t sz; - ELF_HANDLE_DECL(elf_shdr) shdr; -- int i, type; -+ unsigned i, type; - - if ( !ELF_HANDLE_VALID(elf->sym_tab) ) - return; -@@ -187,7 +187,7 @@ static void elf_load_bsdsyms(struct elf_binary *elf) - ELF_PTRVAL_VOID symbase; - ELF_PTRVAL_VOID symtab_addr; - ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; -- int i, type; -+ unsigned i, type; - - if ( !elf->bsd_symtab_pstart ) - return; -@@ -220,7 +220,7 @@ do { \ - elf_memcpy_safe(elf, ELF_HANDLE_PTRVAL(shdr), - ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), - sz); -- maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (unsigned long)maxva + sz); - - for ( i = 0; i < elf_shdr_count(elf); i++ ) - { -@@ -233,10 +233,10 @@ do { \ - elf_memcpy_safe(elf, maxva, elf_section_start(elf, shdr), sz); - /* Mangled to be based on ELF header location. */ - elf_hdr_elm(elf, shdr, sh_offset, maxva - symtab_addr); -- maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (unsigned long)maxva + sz); - } - shdr = ELF_MAKE_HANDLE(elf_shdr, ELF_HANDLE_PTRVAL(shdr) + -- (long)elf_uval(elf, elf->ehdr, e_shentsize)); -+ (unsigned long)elf_uval(elf, elf->ehdr, e_shentsize)); - } - - /* Write down the actual sym size. */ -@@ -273,7 +273,7 @@ void elf_parse_binary(struct elf_binary *elf) - __FUNCTION__, elf->pstart, elf->pend); - } - --int elf_load_binary(struct elf_binary *elf) -+elf_errorstatus elf_load_binary(struct elf_binary *elf) - { - ELF_HANDLE_DECL(elf_phdr) phdr; - uint64_t i, count, paddr, offset, filesz, memsz; -diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c -index fa58f76..46d4ab1 100644 ---- a/xen/common/libelf/libelf-tools.c -+++ b/xen/common/libelf/libelf-tools.c -@@ -122,19 +122,19 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, - - uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr) - { -- int elf_round = (elf_64bit(elf) ? 8 : 4) - 1; -+ uint64_t elf_round = (elf_64bit(elf) ? 8 : 4) - 1; - - return (addr + elf_round) & ~elf_round; - } - - /* ------------------------------------------------------------------------ */ - --int elf_shdr_count(struct elf_binary *elf) -+unsigned elf_shdr_count(struct elf_binary *elf) - { - return elf_uval(elf, elf->ehdr, e_shnum); - } - --int elf_phdr_count(struct elf_binary *elf) -+unsigned elf_phdr_count(struct elf_binary *elf) - { - return elf_uval(elf, elf->ehdr, e_phnum); - } -@@ -144,7 +144,7 @@ ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *n - uint64_t count = elf_shdr_count(elf); - ELF_HANDLE_DECL(elf_shdr) shdr; - const char *sname; -- int i; -+ unsigned i; - - for ( i = 0; i < count; i++ ) - { -@@ -156,7 +156,7 @@ ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *n - return ELF_INVALID_HANDLE(elf_shdr); - } - --ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, unsigned index) - { - uint64_t count = elf_shdr_count(elf); - ELF_PTRVAL_CONST_VOID ptr; -@@ -170,7 +170,7 @@ ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index) - return ELF_MAKE_HANDLE(elf_shdr, ptr); - } - --ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, unsigned index) - { - uint64_t count = elf_uval(elf, elf->ehdr, e_phnum); - ELF_PTRVAL_CONST_VOID ptr; -@@ -264,7 +264,7 @@ ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *sym - return ELF_INVALID_HANDLE(elf_sym); - } - --ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, unsigned index) - { - ELF_PTRVAL_CONST_VOID ptr = elf_section_start(elf, elf->sym_tab); - ELF_HANDLE_DECL(elf_sym) sym; -@@ -280,7 +280,7 @@ const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note - - ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; -+ unsigned namesz = (elf_uval(elf, note, namesz) + 3) & ~3; - - return ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz; - } -@@ -288,7 +288,7 @@ ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_ - uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { - ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - - switch (descsz) - { -@@ -306,7 +306,7 @@ uint64_t elf_note_numeric_array(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note - unsigned int unitsz, unsigned int idx) - { - ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); -- int descsz = elf_uval(elf, note, descsz); -+ unsigned descsz = elf_uval(elf, note, descsz); - - if ( descsz % unitsz || idx >= descsz / unitsz ) - return 0; -@@ -324,8 +324,8 @@ uint64_t elf_note_numeric_array(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note - - ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; -- int descsz = (elf_uval(elf, note, descsz) + 3) & ~3; -+ unsigned namesz = (elf_uval(elf, note, namesz) + 3) & ~3; -+ unsigned descsz = (elf_uval(elf, note, descsz) + 3) & ~3; - - return ELF_MAKE_HANDLE(elf_note, ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz + descsz); - } -diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h -index 951430f..87e126a 100644 ---- a/xen/include/xen/libelf.h -+++ b/xen/include/xen/libelf.h -@@ -31,6 +31,9 @@ - - #include - -+typedef int elf_errorstatus; /* 0: ok; -ve (normally -1): error */ -+typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */ -+ - #undef ELFSIZE - #include "elfstructs.h" - #ifdef __XEN__ -@@ -328,12 +331,12 @@ bool elf_access_ok(struct elf_binary * elf, - /* ------------------------------------------------------------------------ */ - /* xc_libelf_tools.c */ - --int elf_shdr_count(struct elf_binary *elf); --int elf_phdr_count(struct elf_binary *elf); -+unsigned elf_shdr_count(struct elf_binary *elf); -+unsigned elf_phdr_count(struct elf_binary *elf); - - ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *name); --ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index); --ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, unsigned index); -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, unsigned index); - - const char *elf_section_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); /* might return NULL if inputs are invalid */ - ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); -@@ -343,7 +346,7 @@ ELF_PTRVAL_CONST_VOID elf_segment_start(struct elf_binary *elf, ELF_HANDLE_DECL( - ELF_PTRVAL_CONST_VOID elf_segment_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); - - ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *symbol); --ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, unsigned index); - - const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); /* may return NULL */ - ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -@@ -360,7 +363,7 @@ bool elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr - /* ------------------------------------------------------------------------ */ - /* xc_libelf_loader.c */ - --int elf_init(struct elf_binary *elf, const char *image, size_t size); -+elf_errorstatus elf_init(struct elf_binary *elf, const char *image, size_t size); - /* - * image and size must be correct. They will be recorded in - * *elf, and must remain valid while the elf is in use. -@@ -373,7 +376,7 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback*, - #endif - - void elf_parse_binary(struct elf_binary *elf); --int elf_load_binary(struct elf_binary *elf); -+elf_errorstatus elf_load_binary(struct elf_binary *elf); - - ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr); - uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol); -@@ -386,7 +389,7 @@ const char *elf_check_broken(const struct elf_binary *elf); /* NULL means OK */ - /* ------------------------------------------------------------------------ */ - /* xc_libelf_relocate.c */ - --int elf_reloc(struct elf_binary *elf); -+elf_errorstatus elf_reloc(struct elf_binary *elf); - - /* ------------------------------------------------------------------------ */ - /* xc_libelf_dominfo.c */ -@@ -420,7 +423,7 @@ struct elf_dom_parms { - char guest_ver[16]; - char xen_ver[16]; - char loader[16]; -- int pae; -+ int pae; /* some kind of enum apparently */ - bool bsd_symtab; - uint64_t virt_base; - uint64_t virt_entry; --- -1.7.2.5 - diff --git a/app-emulation/xen-tools/files/xen-4.2-CVE-2013-8-XSA-55.patch b/app-emulation/xen-tools/files/xen-4.2-CVE-2013-8-XSA-55.patch deleted file mode 100644 index a9256b54444f..000000000000 --- a/app-emulation/xen-tools/files/xen-4.2-CVE-2013-8-XSA-55.patch +++ /dev/null @@ -1,1196 +0,0 @@ -From 40020ab55a1e9a1674ddecdb70299fab4fe8579d Mon Sep 17 00:00:00 2001 -From: Ian Jackson -Date: Fri, 14 Jun 2013 16:43:17 +0100 -Subject: [PATCH 08/23] libelf: introduce macros for memory access and pointer handling - -We introduce a collection of macros which abstract away all the -pointer arithmetic and dereferences used for accessing the input ELF -and the output area(s). We use the new macros everywhere. - -For now, these macros are semantically identical to the code they -replace, so this patch has no functional change. - -elf_is_elfbinary is an exception: since it doesn't take an elf*, we -need to handle it differently. In a future patch we will change it to -take, and check, a length parameter. For now we just mark it with a -fixme. - -That this patch has no functional change can be verified as follows: - - 0. Copy the scripts "comparison-generate" and "function-filter" - out of this commit message. - 1. Check out the tree before this patch. - 2. Run the script ../comparison-generate .... ../before - 3. Check out the tree after this patch. - 4. Run the script ../comparison-generate .... ../after - 5. diff --exclude=\*.[soi] -ruN before/ after/ |less - -Expect these differences: - * stubdom/zlib-x86_64/ztest*.s2 - The filename of this test file apparently contains the pid. - * xen/common/version.s2 - The xen build timestamp appears in two diff hunks. - -Verification that this is all that's needed: - In a completely built xen.git, - find * -name .*.d -type f | xargs grep -l libelf\.h - Expect results in: - xen/arch/x86: Checked above. - tools/libxc: Checked above. - tools/xcutils/readnotes: Checked above. - tools/xenstore: Checked above. - xen/common/libelf: - This is the build for the hypervisor; checked in B above. - stubdom: - We have one stubdom which reads ELFs using our libelf, - pvgrub, which is checked above. - -I have not done this verification for ARM. - -This is part of the fix to a security issue, XSA-55. - -Signed-off-by: Ian Jackson -Acked-by: Ian Campbell -Reviewed-by: Konrad Rzeszutek Wilk - --8<- comparison-generate -8<- - #!/bin/bash - # usage: - # cd xen.git - # .../comparison-generate OUR-CONFIG BUILD-RUNE-PREFIX ../before|../after - # eg: - # .../comparison-generate ~/work/.config 'schroot -pc64 --' ../before - set -ex - - test $# = 3 || need-exactly-three-arguments - - our_config=$1 - build_rune_prefix=$2 - result_dir=$3 - - git clean -x -d -f - - cp "$our_config" . - - cat <>.config - debug_symbols=n - CFLAGS += -save-temps - END - - perl -i~ -pe 's/ -g / -g0 / if m/^CFLAGS/' xen/Rules.mk - - if [ -f ./configure ]; then - $build_rune_prefix ./configure - fi - - $build_rune_prefix make -C xen - $build_rune_prefix make -C tools/include - $build_rune_prefix make -C stubdom grub - $build_rune_prefix make -C tools/libxc - $build_rune_prefix make -C tools/xenstore - $build_rune_prefix make -C tools/xcutils - - rm -rf "$result_dir" - mkdir "$result_dir" - - set +x - for f in `find xen tools stubdom -name \*.[soi]`; do - mkdir -p "$result_dir"/`dirname $f` - cp $f "$result_dir"/${f} - case $f in - *.s) - ../function-filter <$f >"$result_dir"/${f}2 - ;; - esac - done - - echo ok. --8<- - --8<- function-filter -8<- - #!/usr/bin/perl -w - # function-filter - # script for massaging gcc-generated labels to be consistent - use strict; - our @lines; - my $sedderybody = "sub seddery () {\n"; - while (<>) { - push @lines, $_; - if (m/^(__FUNCTION__|__func__)\.(\d+)\:/) { - $sedderybody .= " s/\\b$1\\.$2\\b/__XSA55MANGLED__$1.$./g;\n"; - } - } - $sedderybody .= "}\n1;\n"; - eval $sedderybody or die $@; - foreach (@lines) { - seddery(); - print or die $!; - } --8<- ---- - tools/libxc/xc_dom_elfloader.c | 30 +++--- - tools/libxc/xc_hvm_build_x86.c | 2 +- - tools/xcutils/readnotes.c | 26 +++--- - xen/common/libelf/libelf-dominfo.c | 51 +++++----- - xen/common/libelf/libelf-loader.c | 84 +++++++++-------- - xen/common/libelf/libelf-tools.c | 94 +++++++++--------- - xen/include/xen/libelf.h | 188 +++++++++++++++++++++++++++++++----- - 7 files changed, 312 insertions(+), 163 deletions(-) - -diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c -index e82f6e9..cc0f206 100644 ---- a/tools/libxc/xc_dom_elfloader.c -+++ b/tools/libxc/xc_dom_elfloader.c -@@ -115,9 +115,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - struct elf_binary *elf, int load) - { - struct elf_binary syms; -- const elf_shdr *shdr, *shdr2; -+ ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; ELF_HANDLE_DECL(elf_shdr) shdr2; - xen_vaddr_t symtab, maxaddr; -- char *hdr; -+ ELF_PTRVAL_CHAR hdr; - size_t size; - int h, count, type, i, tables = 0; - -@@ -147,11 +147,11 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - dom->bsd_symtab_start = elf_round_up(elf, dom->kernel_seg.vend); - } - -- memcpy(hdr + sizeof(int), -- elf->image, -+ elf_memcpy_safe(elf, hdr + sizeof(int), -+ ELF_IMAGE_BASE(elf), - elf_size(elf, elf->ehdr)); -- memcpy(hdr + sizeof(int) + elf_size(elf, elf->ehdr), -- elf->image + elf_uval(elf, elf->ehdr, e_shoff), -+ elf_memcpy_safe(elf, hdr + sizeof(int) + elf_size(elf, elf->ehdr), -+ ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), - elf_shdr_count(elf) * elf_size(elf, shdr)); - if ( elf_64bit(elf) ) - { -@@ -189,7 +189,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - count = elf_shdr_count(&syms); - for ( h = 0; h < count; h++ ) - { -- shdr = elf_shdr_by_index(&syms, h); -+ shdr = ELF_OBSOLETE_VOIDP_CAST elf_shdr_by_index(&syms, h); - type = elf_uval(&syms, shdr, sh_type); - if ( type == SHT_STRTAB ) - { -@@ -205,9 +205,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - if ( i == count ) - { - if ( elf_64bit(&syms) ) -- *(Elf64_Off*)(&shdr->e64.sh_offset) = 0; -+ elf_store_field(elf, shdr, e64.sh_offset, 0); - else -- *(Elf32_Off*)(&shdr->e32.sh_offset) = 0; -+ elf_store_field(elf, shdr, e32.sh_offset, 0); - continue; - } - } -@@ -216,9 +216,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - { - /* Mangled to be based on ELF header location. */ - if ( elf_64bit(&syms) ) -- *(Elf64_Off*)(&shdr->e64.sh_offset) = maxaddr - symtab; -+ elf_store_field(elf, shdr, e64.sh_offset, maxaddr - symtab); - else -- *(Elf32_Off*)(&shdr->e32.sh_offset) = maxaddr - symtab; -+ elf_store_field(elf, shdr, e32.sh_offset, maxaddr - symtab); - size = elf_uval(&syms, shdr, sh_size); - maxaddr = elf_round_up(&syms, maxaddr + size); - tables++; -@@ -230,7 +230,7 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - if ( load ) - { - shdr2 = elf_shdr_by_index(elf, h); -- memcpy((void*)elf_section_start(&syms, shdr), -+ elf_memcpy_safe(elf, ELF_OBSOLETE_VOIDP_CAST elf_section_start(&syms, shdr), - elf_section_start(elf, shdr2), - size); - } -@@ -238,9 +238,9 @@ static int xc_dom_load_elf_symtab(struct xc_dom_image *dom, - - /* Name is NULL. */ - if ( elf_64bit(&syms) ) -- *(Elf64_Word*)(&shdr->e64.sh_name) = 0; -+ elf_store_field(elf, shdr, e64.sh_name, 0); - else -- *(Elf32_Word*)(&shdr->e32.sh_name) = 0; -+ elf_store_field(elf, shdr, e32.sh_name, 0); - } - - if ( tables == 0 ) -@@ -275,7 +275,7 @@ static int xc_dom_parse_elf_kernel(struct xc_dom_image *dom) - } - - /* Find the section-header strings table. */ -- if ( elf->sec_strtab == NULL ) -+ if ( ELF_PTRVAL_INVALID(elf->sec_strtab) ) - { - xc_dom_panic(dom->xch, XC_INVALID_KERNEL, "%s: ELF image" - " has no shstrtab", __FUNCTION__); -diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c -index cf5d7fb..15b603d 100644 ---- a/tools/libxc/xc_hvm_build_x86.c -+++ b/tools/libxc/xc_hvm_build_x86.c -@@ -110,7 +110,7 @@ static int loadelfimage( - if ( elf->dest == NULL ) - goto err; - -- elf->dest += elf->pstart & (PAGE_SIZE - 1); -+ ELF_ADVANCE_DEST(elf, elf->pstart & (PAGE_SIZE - 1)); - - /* Load the initial elf image. */ - rc = elf_load_binary(elf); -diff --git a/tools/xcutils/readnotes.c b/tools/xcutils/readnotes.c -index c926186..2af047d 100644 ---- a/tools/xcutils/readnotes.c -+++ b/tools/xcutils/readnotes.c -@@ -61,13 +61,13 @@ struct setup_header { - } __attribute__((packed)); - - static void print_string_note(const char *prefix, struct elf_binary *elf, -- const elf_note *note) -+ ELF_HANDLE_DECL(elf_note) note) - { - printf("%s: %s\n", prefix, (char*)elf_note_desc(elf, note)); - } - - static void print_numeric_note(const char *prefix, struct elf_binary *elf, -- const elf_note *note) -+ ELF_HANDLE_DECL(elf_note) note) - { - uint64_t value = elf_note_numeric(elf, note); - int descsz = elf_uval(elf, note, descsz); -@@ -98,12 +98,12 @@ static void print_l1_mfn_valid_note(const char *prefix, struct elf_binary *elf, - - } - --static int print_notes(struct elf_binary *elf, const elf_note *start, const elf_note *end) -+static int print_notes(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) start, ELF_HANDLE_DECL(elf_note) end) - { -- const elf_note *note; -+ ELF_HANDLE_DECL(elf_note) note; - int notes_found = 0; - -- for ( note = start; note < end; note = elf_note_next(elf, note) ) -+ for ( note = start; ELF_HANDLE_PTRVAL(note) < ELF_HANDLE_PTRVAL(end); note = elf_note_next(elf, note) ) - { - if (0 != strcmp(elf_note_name(elf, note), "Xen")) - continue; -@@ -170,7 +170,7 @@ int main(int argc, char **argv) - void *image,*tmp; - struct stat st; - struct elf_binary elf; -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - int notes_found = 0; - - struct setup_header *hdr; -@@ -257,7 +257,7 @@ int main(int argc, char **argv) - count = elf_phdr_count(&elf); - for ( h=0; h < count; h++) - { -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - phdr = elf_phdr_by_index(&elf, h); - if (elf_uval(&elf, phdr, p_type) != PT_NOTE) - continue; -@@ -269,8 +269,8 @@ int main(int argc, char **argv) - continue; - - notes_found = print_notes(&elf, -- elf_segment_start(&elf, phdr), -- elf_segment_end(&elf, phdr)); -+ ELF_MAKE_HANDLE(elf_note, elf_segment_start(&elf, phdr)), -+ ELF_MAKE_HANDLE(elf_note, elf_segment_end(&elf, phdr))); - } - - if ( notes_found == 0 ) -@@ -278,13 +278,13 @@ int main(int argc, char **argv) - count = elf_shdr_count(&elf); - for ( h=0; h < count; h++) - { -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - shdr = elf_shdr_by_index(&elf, h); - if (elf_uval(&elf, shdr, sh_type) != SHT_NOTE) - continue; - notes_found = print_notes(&elf, -- elf_section_start(&elf, shdr), -- elf_section_end(&elf, shdr)); -+ ELF_MAKE_HANDLE(elf_note, elf_section_start(&elf, shdr)), -+ ELF_MAKE_HANDLE(elf_note, elf_section_end(&elf, shdr))); - if ( notes_found ) - fprintf(stderr, "using notes from SHT_NOTE section\n"); - -@@ -292,7 +292,7 @@ int main(int argc, char **argv) - } - - shdr = elf_shdr_by_name(&elf, "__xen_guest"); -- if (shdr) -+ if (ELF_HANDLE_VALID(shdr)) - printf("__xen_guest: %s\n", (char*)elf_section_start(&elf, shdr)); - - return 0; -diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c -index 523837f..7140d59 100644 ---- a/xen/common/libelf/libelf-dominfo.c -+++ b/xen/common/libelf/libelf-dominfo.c -@@ -44,7 +44,7 @@ int elf_xen_parse_features(const char *features, - - for ( pos = 0; features[pos] != '\0'; pos += len ) - { -- memset(feature, 0, sizeof(feature)); -+ elf_memset_unchecked(feature, 0, sizeof(feature)); - for ( len = 0;; len++ ) - { - if ( len >= sizeof(feature)-1 ) -@@ -96,7 +96,7 @@ int elf_xen_parse_features(const char *features, - - int elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, -- const elf_note *note) -+ ELF_HANDLE_DECL(elf_note) note) - { - /* *INDENT-OFF* */ - static const struct { -@@ -215,15 +215,16 @@ int elf_xen_parse_note(struct elf_binary *elf, - - static int elf_xen_parse_notes(struct elf_binary *elf, - struct elf_dom_parms *parms, -- const void *start, const void *end) -+ ELF_PTRVAL_CONST_VOID start, -+ ELF_PTRVAL_CONST_VOID end) - { - int xen_elfnotes = 0; -- const elf_note *note; -+ ELF_HANDLE_DECL(elf_note) note; - - parms->elf_note_start = start; - parms->elf_note_end = end; -- for ( note = parms->elf_note_start; -- (void *)note < parms->elf_note_end; -+ for ( note = ELF_MAKE_HANDLE(elf_note, parms->elf_note_start); -+ ELF_HANDLE_PTRVAL(note) < parms->elf_note_end; - note = elf_note_next(elf, note) ) - { - if ( strcmp(elf_note_name(elf, note), "Xen") ) -@@ -241,45 +242,46 @@ static int elf_xen_parse_notes(struct elf_binary *elf, - int elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms) - { -- const char *h; -+ ELF_PTRVAL_CONST_CHAR h; - char name[32], value[128]; - int len; - - h = parms->guest_info; -- while ( *h ) -+#define STAR(h) (*(h)) -+ while ( STAR(h) ) - { -- memset(name, 0, sizeof(name)); -- memset(value, 0, sizeof(value)); -+ elf_memset_unchecked(name, 0, sizeof(name)); -+ elf_memset_unchecked(value, 0, sizeof(value)); - for ( len = 0;; len++, h++ ) - { - if ( len >= sizeof(name)-1 ) - break; -- if ( *h == '\0' ) -+ if ( STAR(h) == '\0' ) - break; -- if ( *h == ',' ) -+ if ( STAR(h) == ',' ) - { - h++; - break; - } -- if ( *h == '=' ) -+ if ( STAR(h) == '=' ) - { - h++; - for ( len = 0;; len++, h++ ) - { - if ( len >= sizeof(value)-1 ) - break; -- if ( *h == '\0' ) -+ if ( STAR(h) == '\0' ) - break; -- if ( *h == ',' ) -+ if ( STAR(h) == ',' ) - { - h++; - break; - } -- value[len] = *h; -+ value[len] = STAR(h); - } - break; - } -- name[len] = *h; -+ name[len] = STAR(h); - } - elf_msg(elf, "%s: %s=\"%s\"\n", __FUNCTION__, name, value); - -@@ -328,7 +330,8 @@ int elf_xen_parse_guest_info(struct elf_binary *elf, - static int elf_xen_note_check(struct elf_binary *elf, - struct elf_dom_parms *parms) - { -- if ( (parms->elf_note_start == NULL) && (parms->guest_info == NULL) ) -+ if ( (ELF_PTRVAL_INVALID(parms->elf_note_start)) && -+ (ELF_PTRVAL_INVALID(parms->guest_info)) ) - { - int machine = elf_uval(elf, elf->ehdr, e_machine); - if ( (machine == EM_386) || (machine == EM_X86_64) ) -@@ -457,12 +460,12 @@ static int elf_xen_addr_calc_check(struct elf_binary *elf, - int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms) - { -- const elf_shdr *shdr; -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - int xen_elfnotes = 0; - int i, count, rc; - -- memset(parms, 0, sizeof(*parms)); -+ elf_memset_unchecked(parms, 0, sizeof(*parms)); - parms->virt_base = UNSET_ADDR; - parms->virt_entry = UNSET_ADDR; - parms->virt_hypercall = UNSET_ADDR; -@@ -532,11 +535,11 @@ int elf_xen_parse(struct elf_binary *elf, - for ( i = 0; i < count; i++ ) - { - shdr = elf_shdr_by_name(elf, "__xen_guest"); -- if ( shdr ) -+ if ( ELF_HANDLE_VALID(shdr) ) - { - parms->guest_info = elf_section_start(elf, shdr); -- parms->elf_note_start = NULL; -- parms->elf_note_end = NULL; -+ parms->elf_note_start = ELF_INVALID_PTRVAL; -+ parms->elf_note_end = ELF_INVALID_PTRVAL; - elf_msg(elf, "%s: __xen_guest: \"%s\"\n", __FUNCTION__, - parms->guest_info); - elf_xen_parse_guest_info(elf, parms); -diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c -index ec0706b..0fef84c 100644 ---- a/xen/common/libelf/libelf-loader.c -+++ b/xen/common/libelf/libelf-loader.c -@@ -26,7 +26,7 @@ - - int elf_init(struct elf_binary *elf, const char *image, size_t size) - { -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - uint64_t i, count, section, offset; - - if ( !elf_is_elfbinary(image) ) -@@ -35,7 +35,7 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size) - return -1; - } - -- memset(elf, 0, sizeof(*elf)); -+ elf_memset_unchecked(elf, 0, sizeof(*elf)); - elf->image = image; - elf->size = size; - elf->ehdr = (elf_ehdr *)image; -@@ -65,7 +65,7 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size) - /* Find section string table. */ - section = elf_uval(elf, elf->ehdr, e_shstrndx); - shdr = elf_shdr_by_index(elf, section); -- if ( shdr != NULL ) -+ if ( ELF_HANDLE_VALID(shdr) ) - elf->sec_strtab = elf_section_start(elf, shdr); - - /* Find symbol table and symbol string table. */ -@@ -77,9 +77,9 @@ int elf_init(struct elf_binary *elf, const char *image, size_t size) - continue; - elf->sym_tab = shdr; - shdr = elf_shdr_by_index(elf, elf_uval(elf, shdr, sh_link)); -- if ( shdr == NULL ) -+ if ( !ELF_HANDLE_VALID(shdr) ) - { -- elf->sym_tab = NULL; -+ elf->sym_tab = ELF_INVALID_HANDLE(elf_shdr); - continue; - } - elf->sym_strtab = elf_section_start(elf, shdr); -@@ -113,10 +113,11 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback *log_callback, - } - - static int elf_load_image(struct elf_binary *elf, -- void *dst, const void *src, uint64_t filesz, uint64_t memsz) -+ ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, -+ uint64_t filesz, uint64_t memsz) - { -- memcpy(dst, src, filesz); -- memset(dst + filesz, 0, memsz - filesz); -+ elf_memcpy_safe(elf, dst, src, filesz); -+ elf_memset_safe(elf, dst + filesz, 0, memsz - filesz); - return 0; - } - #else -@@ -126,16 +127,17 @@ void elf_set_verbose(struct elf_binary *elf) - elf->verbose = 1; - } - --static int elf_load_image(struct elf_binary *elf, -- void *dst, const void *src, uint64_t filesz, uint64_t memsz) -+static int elf_load_image(struct elf_binary *elf, ELF_PTRVAL_VOID dst, ELF_PTRVAL_CONST_VOID src, uint64_t filesz, uint64_t memsz) - { - int rc; - if ( filesz > ULONG_MAX || memsz > ULONG_MAX ) - return -1; -- rc = raw_copy_to_guest(dst, src, filesz); -+ /* We trust the dom0 kernel image completely, so we don't care -+ * about overruns etc. here. */ -+ rc = raw_copy_to_guest(ELF_UNSAFE_PTR(dst), ELF_UNSAFE_PTR(src), filesz); - if ( rc != 0 ) - return -1; -- rc = raw_clear_guest(dst + filesz, memsz - filesz); -+ rc = raw_clear_guest(ELF_UNSAFE_PTR(dst + filesz), memsz - filesz); - if ( rc != 0 ) - return -1; - return 0; -@@ -146,10 +148,10 @@ static int elf_load_image(struct elf_binary *elf, - void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - { - uint64_t sz; -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - int i, type; - -- if ( !elf->sym_tab ) -+ if ( !ELF_HANDLE_VALID(elf->sym_tab) ) - return; - - pstart = elf_round_up(elf, pstart); -@@ -166,7 +168,7 @@ void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - for ( i = 0; i < elf_shdr_count(elf); i++ ) - { - shdr = elf_shdr_by_index(elf, i); -- type = elf_uval(elf, (elf_shdr *)shdr, sh_type); -+ type = elf_uval(elf, shdr, sh_type); - if ( (type == SHT_STRTAB) || (type == SHT_SYMTAB) ) - sz = elf_round_up(elf, sz + elf_uval(elf, shdr, sh_size)); - } -@@ -177,10 +179,12 @@ void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart) - - static void elf_load_bsdsyms(struct elf_binary *elf) - { -- elf_ehdr *sym_ehdr; -+ ELF_HANDLE_DECL_NONCONST(elf_ehdr) sym_ehdr; - unsigned long sz; -- char *maxva, *symbase, *symtab_addr; -- elf_shdr *shdr; -+ ELF_PTRVAL_VOID maxva; -+ ELF_PTRVAL_VOID symbase; -+ ELF_PTRVAL_VOID symtab_addr; -+ ELF_HANDLE_DECL_NONCONST(elf_shdr) shdr; - int i, type; - - if ( !elf->bsd_symtab_pstart ) -@@ -189,18 +193,18 @@ static void elf_load_bsdsyms(struct elf_binary *elf) - #define elf_hdr_elm(_elf, _hdr, _elm, _val) \ - do { \ - if ( elf_64bit(_elf) ) \ -- (_hdr)->e64._elm = _val; \ -+ elf_store_field(_elf, _hdr, e64._elm, _val); \ - else \ -- (_hdr)->e32._elm = _val; \ -+ elf_store_field(_elf, _hdr, e32._elm, _val); \ - } while ( 0 ) - - symbase = elf_get_ptr(elf, elf->bsd_symtab_pstart); - symtab_addr = maxva = symbase + sizeof(uint32_t); - - /* Set up Elf header. */ -- sym_ehdr = (elf_ehdr *)symtab_addr; -+ sym_ehdr = ELF_MAKE_HANDLE(elf_ehdr, symtab_addr); - sz = elf_uval(elf, elf->ehdr, e_ehsize); -- memcpy(sym_ehdr, elf->ehdr, sz); -+ elf_memcpy_safe(elf, ELF_HANDLE_PTRVAL(sym_ehdr), ELF_HANDLE_PTRVAL(elf->ehdr), sz); - maxva += sz; /* no round up */ - - elf_hdr_elm(elf, sym_ehdr, e_phoff, 0); -@@ -209,37 +213,39 @@ do { \ - elf_hdr_elm(elf, sym_ehdr, e_phnum, 0); - - /* Copy Elf section headers. */ -- shdr = (elf_shdr *)maxva; -+ shdr = ELF_MAKE_HANDLE(elf_shdr, maxva); - sz = elf_shdr_count(elf) * elf_uval(elf, elf->ehdr, e_shentsize); -- memcpy(shdr, elf->image + elf_uval(elf, elf->ehdr, e_shoff), sz); -- maxva = (char *)(long)elf_round_up(elf, (long)maxva + sz); -+ elf_memcpy_safe(elf, ELF_HANDLE_PTRVAL(shdr), -+ ELF_IMAGE_BASE(elf) + elf_uval(elf, elf->ehdr, e_shoff), -+ sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); - - for ( i = 0; i < elf_shdr_count(elf); i++ ) - { - type = elf_uval(elf, shdr, sh_type); - if ( (type == SHT_STRTAB) || (type == SHT_SYMTAB) ) - { -- elf_msg(elf, "%s: shdr %i at 0x%p -> 0x%p\n", __func__, i, -+ elf_msg(elf, "%s: shdr %i at 0x%"ELF_PRPTRVAL" -> 0x%"ELF_PRPTRVAL"\n", __func__, i, - elf_section_start(elf, shdr), maxva); - sz = elf_uval(elf, shdr, sh_size); -- memcpy(maxva, elf_section_start(elf, shdr), sz); -+ elf_memcpy_safe(elf, maxva, elf_section_start(elf, shdr), sz); - /* Mangled to be based on ELF header location. */ - elf_hdr_elm(elf, shdr, sh_offset, maxva - symtab_addr); -- maxva = (char *)(long)elf_round_up(elf, (long)maxva + sz); -+ maxva = ELF_OBSOLETE_VOIDP_CAST elf_round_up(elf, (long)maxva + sz); - } -- shdr = (elf_shdr *)((long)shdr + -+ shdr = ELF_MAKE_HANDLE(elf_shdr, ELF_HANDLE_PTRVAL(shdr) + - (long)elf_uval(elf, elf->ehdr, e_shentsize)); - } - - /* Write down the actual sym size. */ -- *(uint32_t *)symbase = maxva - symtab_addr; -+ elf_store_val(elf, uint32_t, symbase, maxva - symtab_addr); - - #undef elf_ehdr_elm - } - - void elf_parse_binary(struct elf_binary *elf) - { -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - uint64_t low = -1; - uint64_t high = 0; - uint64_t i, count, paddr, memsz; -@@ -267,9 +273,9 @@ void elf_parse_binary(struct elf_binary *elf) - - int elf_load_binary(struct elf_binary *elf) - { -- const elf_phdr *phdr; -+ ELF_HANDLE_DECL(elf_phdr) phdr; - uint64_t i, count, paddr, offset, filesz, memsz; -- char *dest; -+ ELF_PTRVAL_VOID dest; - - count = elf_uval(elf, elf->ehdr, e_phnum); - for ( i = 0; i < count; i++ ) -@@ -282,9 +288,9 @@ int elf_load_binary(struct elf_binary *elf) - filesz = elf_uval(elf, phdr, p_filesz); - memsz = elf_uval(elf, phdr, p_memsz); - dest = elf_get_ptr(elf, paddr); -- elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n", -- __func__, i, dest, dest + filesz); -- if ( elf_load_image(elf, dest, elf->image + offset, filesz, memsz) != 0 ) -+ elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%"ELF_PRPTRVAL" -> 0x%"ELF_PRPTRVAL"\n", -+ __func__, i, dest, (ELF_PTRVAL_VOID)(dest + filesz)); -+ if ( elf_load_image(elf, dest, ELF_IMAGE_BASE(elf) + offset, filesz, memsz) != 0 ) - return -1; - } - -@@ -292,18 +298,18 @@ int elf_load_binary(struct elf_binary *elf) - return 0; - } - --void *elf_get_ptr(struct elf_binary *elf, unsigned long addr) -+ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr) - { - return elf->dest + addr - elf->pstart; - } - - uint64_t elf_lookup_addr(struct elf_binary * elf, const char *symbol) - { -- const elf_sym *sym; -+ ELF_HANDLE_DECL(elf_sym) sym; - uint64_t value; - - sym = elf_sym_by_name(elf, symbol); -- if ( sym == NULL ) -+ if ( !ELF_HANDLE_VALID(sym) ) - { - elf_err(elf, "%s: not found: %s\n", __FUNCTION__, symbol); - return -1; -diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c -index 2f54142..f1fd886 100644 ---- a/xen/common/libelf/libelf-tools.c -+++ b/xen/common/libelf/libelf-tools.c -@@ -67,10 +67,10 @@ int elf_phdr_count(struct elf_binary *elf) - return elf_uval(elf, elf->ehdr, e_phnum); - } - --const elf_shdr *elf_shdr_by_name(struct elf_binary *elf, const char *name) -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *name) - { - uint64_t count = elf_shdr_count(elf); -- const elf_shdr *shdr; -+ ELF_HANDLE_DECL(elf_shdr) shdr; - const char *sname; - int i; - -@@ -81,76 +81,80 @@ const elf_shdr *elf_shdr_by_name(struct elf_binary *elf, const char *name) - if ( sname && !strcmp(sname, name) ) - return shdr; - } -- return NULL; -+ return ELF_INVALID_HANDLE(elf_shdr); - } - --const elf_shdr *elf_shdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index) - { - uint64_t count = elf_shdr_count(elf); -- const void *ptr; -+ ELF_PTRVAL_CONST_VOID ptr; - - if ( index >= count ) -- return NULL; -+ return ELF_INVALID_HANDLE(elf_shdr); - -- ptr = (elf->image -+ ptr = (ELF_IMAGE_BASE(elf) - + elf_uval(elf, elf->ehdr, e_shoff) - + elf_uval(elf, elf->ehdr, e_shentsize) * index); -- return ptr; -+ return ELF_MAKE_HANDLE(elf_shdr, ptr); - } - --const elf_phdr *elf_phdr_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index) - { - uint64_t count = elf_uval(elf, elf->ehdr, e_phnum); -- const void *ptr; -+ ELF_PTRVAL_CONST_VOID ptr; - - if ( index >= count ) -- return NULL; -+ return ELF_INVALID_HANDLE(elf_phdr); - -- ptr = (elf->image -+ ptr = (ELF_IMAGE_BASE(elf) - + elf_uval(elf, elf->ehdr, e_phoff) - + elf_uval(elf, elf->ehdr, e_phentsize) * index); -- return ptr; -+ return ELF_MAKE_HANDLE(elf_phdr, ptr); - } - --const char *elf_section_name(struct elf_binary *elf, const elf_shdr * shdr) -+ -+const char *elf_section_name(struct elf_binary *elf, -+ ELF_HANDLE_DECL(elf_shdr) shdr) - { -- if ( elf->sec_strtab == NULL ) -+ if ( ELF_PTRVAL_INVALID(elf->sec_strtab) ) - return "unknown"; -+ - return elf->sec_strtab + elf_uval(elf, shdr, sh_name); - } - --const void *elf_section_start(struct elf_binary *elf, const elf_shdr * shdr) -+ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr) - { -- return elf->image + elf_uval(elf, shdr, sh_offset); -+ return ELF_IMAGE_BASE(elf) + elf_uval(elf, shdr, sh_offset); - } - --const void *elf_section_end(struct elf_binary *elf, const elf_shdr * shdr) -+ELF_PTRVAL_CONST_VOID elf_section_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr) - { -- return elf->image -+ return ELF_IMAGE_BASE(elf) - + elf_uval(elf, shdr, sh_offset) + elf_uval(elf, shdr, sh_size); - } - --const void *elf_segment_start(struct elf_binary *elf, const elf_phdr * phdr) -+ELF_PTRVAL_CONST_VOID elf_segment_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - { -- return elf->image + elf_uval(elf, phdr, p_offset); -+ return ELF_IMAGE_BASE(elf) -+ + elf_uval(elf, phdr, p_offset); - } - --const void *elf_segment_end(struct elf_binary *elf, const elf_phdr * phdr) -+ELF_PTRVAL_CONST_VOID elf_segment_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - { -- return elf->image -+ return ELF_IMAGE_BASE(elf) - + elf_uval(elf, phdr, p_offset) + elf_uval(elf, phdr, p_filesz); - } - --const elf_sym *elf_sym_by_name(struct elf_binary *elf, const char *symbol) -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *symbol) - { -- const void *ptr = elf_section_start(elf, elf->sym_tab); -- const void *end = elf_section_end(elf, elf->sym_tab); -- const elf_sym *sym; -+ ELF_PTRVAL_CONST_VOID ptr = elf_section_start(elf, elf->sym_tab); -+ ELF_PTRVAL_CONST_VOID end = elf_section_end(elf, elf->sym_tab); -+ ELF_HANDLE_DECL(elf_sym) sym; - uint64_t info, name; - - for ( ; ptr < end; ptr += elf_size(elf, sym) ) - { -- sym = ptr; -+ sym = ELF_MAKE_HANDLE(elf_sym, ptr); - info = elf_uval(elf, sym, st_info); - name = elf_uval(elf, sym, st_name); - if ( ELF32_ST_BIND(info) != STB_GLOBAL ) -@@ -159,33 +163,33 @@ const elf_sym *elf_sym_by_name(struct elf_binary *elf, const char *symbol) - continue; - return sym; - } -- return NULL; -+ return ELF_INVALID_HANDLE(elf_sym); - } - --const elf_sym *elf_sym_by_index(struct elf_binary *elf, int index) -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index) - { -- const void *ptr = elf_section_start(elf, elf->sym_tab); -- const elf_sym *sym; -+ ELF_PTRVAL_CONST_VOID ptr = elf_section_start(elf, elf->sym_tab); -+ ELF_HANDLE_DECL(elf_sym) sym; - -- sym = ptr + index * elf_size(elf, sym); -+ sym = ELF_MAKE_HANDLE(elf_sym, ptr + index * elf_size(elf, sym)); - return sym; - } - --const char *elf_note_name(struct elf_binary *elf, const elf_note * note) -+const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- return (void *)note + elf_size(elf, note); -+ return ELF_HANDLE_PTRVAL(note) + elf_size(elf, note); - } - --const void *elf_note_desc(struct elf_binary *elf, const elf_note * note) -+ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { - int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; - -- return (void *)note + elf_size(elf, note) + namesz; -+ return ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz; - } - --uint64_t elf_note_numeric(struct elf_binary *elf, const elf_note * note) -+uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { -- const void *desc = elf_note_desc(elf, note); -+ ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); - int descsz = elf_uval(elf, note, descsz); - - switch (descsz) -@@ -200,10 +204,10 @@ uint64_t elf_note_numeric(struct elf_binary *elf, const elf_note * note) - } - } - --uint64_t elf_note_numeric_array(struct elf_binary *elf, const elf_note *note, -+uint64_t elf_note_numeric_array(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note, - unsigned int unitsz, unsigned int idx) - { -- const void *desc = elf_note_desc(elf, note); -+ ELF_PTRVAL_CONST_VOID desc = elf_note_desc(elf, note); - int descsz = elf_uval(elf, note, descsz); - - if ( descsz % unitsz || idx >= descsz / unitsz ) -@@ -220,12 +224,12 @@ uint64_t elf_note_numeric_array(struct elf_binary *elf, const elf_note *note, - } - } - --const elf_note *elf_note_next(struct elf_binary *elf, const elf_note * note) -+ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note) - { - int namesz = (elf_uval(elf, note, namesz) + 3) & ~3; - int descsz = (elf_uval(elf, note, descsz) + 3) & ~3; - -- return (void *)note + elf_size(elf, note) + namesz + descsz; -+ return ELF_MAKE_HANDLE(elf_note, ELF_HANDLE_PTRVAL(note) + elf_size(elf, note) + namesz + descsz); - } - - /* ------------------------------------------------------------------------ */ -@@ -234,10 +238,10 @@ int elf_is_elfbinary(const void *image) - { - const Elf32_Ehdr *ehdr = image; - -- return IS_ELF(*ehdr); -+ return IS_ELF(*ehdr); /* fixme unchecked */ - } - --int elf_phdr_is_loadable(struct elf_binary *elf, const elf_phdr * phdr) -+int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr) - { - uint64_t p_type = elf_uval(elf, phdr, p_type); - uint64_t p_flags = elf_uval(elf, phdr, p_flags); -diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h -index 38e490c..cefd3d3 100644 ---- a/xen/include/xen/libelf.h -+++ b/xen/include/xen/libelf.h -@@ -48,6 +48,97 @@ typedef void elf_log_callback(struct elf_binary*, void *caller_data, - - /* ------------------------------------------------------------------------ */ - -+/* Macros for accessing the input image and output area. */ -+ -+/* -+ * We abstract away the pointerness of these pointers, replacing -+ * various void*, char* and struct* with the following: -+ * PTRVAL A pointer to a byte; one can do pointer arithmetic -+ * on this. -+ * This replaces variables which were char*,void* -+ * and their const versions, so we provide four -+ * different declaration macros: -+ * ELF_PTRVAL_{,CONST}{VOID,CHAR} -+ * HANDLE A pointer to a struct. There is one of these types -+ * for each pointer type - that is, for each "structname". -+ * In the arguments to the various HANDLE macros, structname -+ * must be a single identifier which is a typedef. -+ * It is not permitted to do arithmetic on these -+ * pointers. In the current code attempts to do so will -+ * compile, but in the next patch this will become a -+ * compile error. -+ * We provide two declaration macros for const and -+ * non-const pointers. -+ */ -+ -+#define ELF_REALPTR2PTRVAL(realpointer) (realpointer) -+ /* Converts an actual C pointer into a PTRVAL */ -+ -+#define ELF_HANDLE_DECL_NONCONST(structname) structname * -+#define ELF_HANDLE_DECL(structname) const structname * -+ /* Provides a type declaration for a HANDLE. */ -+ /* May only be used to declare ONE variable at a time */ -+ -+#define ELF_PTRVAL_VOID void * -+#define ELF_PTRVAL_CHAR char * -+#define ELF_PTRVAL_CONST_VOID const void * -+#define ELF_PTRVAL_CONST_CHAR const char * -+ /* Provides a type declaration for a PTRVAL. */ -+ /* May only be used to declare ONE variable at a time */ -+ -+#define ELF_DEFINE_HANDLE(structname) /* empty */ -+ /* -+ * This must be invoked for each HANDLE type to define -+ * the actual C type used for that kind of HANDLE. -+ */ -+ -+#define ELF_PRPTRVAL "p" -+ /* printf format a la PRId... for a PTRVAL */ -+ -+#define ELF_MAKE_HANDLE(structname, ptrval) (ptrval) -+ /* Converts a PTRVAL to a HANDLE */ -+ -+#define ELF_IMAGE_BASE(elf) ((elf)->image) -+ /* Returns the base of the image as a PTRVAL. */ -+ -+#define ELF_HANDLE_PTRVAL(handleval) ((void*)(handleval)) -+ /* Converts a HANDLE to a PTRVAL. */ -+ -+#define ELF_OBSOLETE_VOIDP_CAST (void*)(uintptr_t) -+ /* -+ * In some places the existing code needs to -+ * - cast away const (the existing code uses const a fair -+ * bit but actually sometimes wants to write to its input) -+ * from a PTRVAL. -+ * - convert an integer representing a pointer to a PTRVAL -+ * This macro provides a suitable cast. -+ */ -+ -+#define ELF_UNSAFE_PTR(ptrval) ((void*)(uintptr_t)(ptrval)) -+ /* -+ * Turns a PTRVAL into an actual C pointer. Before this is done -+ * the caller must have ensured that the PTRVAL does in fact point -+ * to a permissible location. -+ */ -+ -+/* PTRVALs can be INVALID (ie, NULL). */ -+#define ELF_INVALID_PTRVAL (NULL) /* returns NULL PTRVAL */ -+#define ELF_INVALID_HANDLE(structname) /* returns NULL handle */ \ -+ ELF_MAKE_HANDLE(structname, ELF_INVALID_PTRVAL) -+#define ELF_PTRVAL_VALID(ptrval) (ptrval) /* } */ -+#define ELF_HANDLE_VALID(handleval) (handleval) /* } predicates */ -+#define ELF_PTRVAL_INVALID(ptrval) ((ptrval) == NULL) /* } */ -+ -+/* For internal use by other macros here */ -+#define ELF__HANDLE_FIELD_TYPE(handleval, elm) \ -+ typeof((handleval)->elm) -+#define ELF__HANDLE_FIELD_OFFSET(handleval, elm) \ -+ offsetof(typeof(*(handleval)),elm) -+ -+ -+/* ------------------------------------------------------------------------ */ -+ -+ - typedef union { - Elf32_Ehdr e32; - Elf64_Ehdr e64; -@@ -83,6 +174,12 @@ typedef union { - Elf64_Note e64; - } elf_note; - -+ELF_DEFINE_HANDLE(elf_ehdr) -+ELF_DEFINE_HANDLE(elf_shdr) -+ELF_DEFINE_HANDLE(elf_phdr) -+ELF_DEFINE_HANDLE(elf_sym) -+ELF_DEFINE_HANDLE(elf_note) -+ - struct elf_binary { - /* elf binary */ - const char *image; -@@ -90,10 +187,10 @@ struct elf_binary { - char class; - char data; - -- const elf_ehdr *ehdr; -- const char *sec_strtab; -- const elf_shdr *sym_tab; -- const char *sym_strtab; -+ ELF_HANDLE_DECL(elf_ehdr) ehdr; -+ ELF_PTRVAL_CONST_CHAR sec_strtab; -+ ELF_HANDLE_DECL(elf_shdr) sym_tab; -+ ELF_PTRVAL_CONST_CHAR sym_strtab; - - /* loaded to */ - char *dest; -@@ -135,45 +232,72 @@ struct elf_binary { - : elf_access_unsigned((elf), (str), \ - offsetof(typeof(*(str)),e32.elem), \ - sizeof((str)->e32.elem))) -+ /* -+ * Reads an unsigned field in a header structure in the ELF. -+ * str is a HANDLE, and elem is the field name in it. -+ */ - - #define elf_size(elf, str) \ - ((ELFCLASS64 == (elf)->class) \ - ? sizeof((str)->e64) : sizeof((str)->e32)) -+ /* -+ * Returns the size of the substructure for the appropriate 32/64-bitness. -+ * str should be a HANDLE. -+ */ - --uint64_t elf_access_unsigned(struct elf_binary *elf, const void *ptr, -+uint64_t elf_access_unsigned(struct elf_binary *elf, ELF_PTRVAL_CONST_VOID ptr, - uint64_t offset, size_t size); -+ /* Reads a field at arbitrary offset and alignemnt */ - - uint64_t elf_round_up(struct elf_binary *elf, uint64_t addr); - -+ -+#define elf_memcpy_safe(elf, dst, src, sz) memcpy((dst),(src),(sz)) -+#define elf_memset_safe(elf, dst, c, sz) memset((dst),(c),(sz)) -+ /* -+ * Versions of memcpy and memset which will (in the next patch) -+ * arrange never to write outside permitted areas. -+ */ -+ -+#define elf_store_val(elf, type, ptr, val) (*(type*)(ptr) = (val)) -+ /* Stores a value at a particular PTRVAL. */ -+ -+#define elf_store_field(elf, hdr, elm, val) \ -+ (elf_store_val((elf), ELF__HANDLE_FIELD_TYPE(hdr, elm), \ -+ &((hdr)->elm), \ -+ (val))) -+ /* Stores a 32/64-bit field. hdr is a HANDLE and elm is the field name. */ -+ -+ - /* ------------------------------------------------------------------------ */ - /* xc_libelf_tools.c */ - - int elf_shdr_count(struct elf_binary *elf); - int elf_phdr_count(struct elf_binary *elf); - --const elf_shdr *elf_shdr_by_name(struct elf_binary *elf, const char *name); --const elf_shdr *elf_shdr_by_index(struct elf_binary *elf, int index); --const elf_phdr *elf_phdr_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_name(struct elf_binary *elf, const char *name); -+ELF_HANDLE_DECL(elf_shdr) elf_shdr_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_phdr) elf_phdr_by_index(struct elf_binary *elf, int index); - --const char *elf_section_name(struct elf_binary *elf, const elf_shdr * shdr); --const void *elf_section_start(struct elf_binary *elf, const elf_shdr * shdr); --const void *elf_section_end(struct elf_binary *elf, const elf_shdr * shdr); -+const char *elf_section_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); -+ELF_PTRVAL_CONST_VOID elf_section_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); -+ELF_PTRVAL_CONST_VOID elf_section_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_shdr) shdr); - --const void *elf_segment_start(struct elf_binary *elf, const elf_phdr * phdr); --const void *elf_segment_end(struct elf_binary *elf, const elf_phdr * phdr); -+ELF_PTRVAL_CONST_VOID elf_segment_start(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); -+ELF_PTRVAL_CONST_VOID elf_segment_end(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); - --const elf_sym *elf_sym_by_name(struct elf_binary *elf, const char *symbol); --const elf_sym *elf_sym_by_index(struct elf_binary *elf, int index); -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_name(struct elf_binary *elf, const char *symbol); -+ELF_HANDLE_DECL(elf_sym) elf_sym_by_index(struct elf_binary *elf, int index); - --const char *elf_note_name(struct elf_binary *elf, const elf_note * note); --const void *elf_note_desc(struct elf_binary *elf, const elf_note * note); --uint64_t elf_note_numeric(struct elf_binary *elf, const elf_note * note); --uint64_t elf_note_numeric_array(struct elf_binary *, const elf_note *, -+const char *elf_note_name(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -+ELF_PTRVAL_CONST_VOID elf_note_desc(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -+uint64_t elf_note_numeric(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); -+uint64_t elf_note_numeric_array(struct elf_binary *, ELF_HANDLE_DECL(elf_note), - unsigned int unitsz, unsigned int idx); --const elf_note *elf_note_next(struct elf_binary *elf, const elf_note * note); -+ELF_HANDLE_DECL(elf_note) elf_note_next(struct elf_binary *elf, ELF_HANDLE_DECL(elf_note) note); - - int elf_is_elfbinary(const void *image); --int elf_phdr_is_loadable(struct elf_binary *elf, const elf_phdr * phdr); -+int elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr); - - /* ------------------------------------------------------------------------ */ - /* xc_libelf_loader.c */ -@@ -189,7 +313,7 @@ void elf_set_log(struct elf_binary *elf, elf_log_callback*, - void elf_parse_binary(struct elf_binary *elf); - int elf_load_binary(struct elf_binary *elf); - --void *elf_get_ptr(struct elf_binary *elf, unsigned long addr); -+ELF_PTRVAL_VOID elf_get_ptr(struct elf_binary *elf, unsigned long addr); - uint64_t elf_lookup_addr(struct elf_binary *elf, const char *symbol); - - void elf_parse_bsdsyms(struct elf_binary *elf, uint64_t pstart); /* private */ -@@ -221,9 +345,9 @@ struct xen_elfnote { - - struct elf_dom_parms { - /* raw */ -- const char *guest_info; -- const void *elf_note_start; -- const void *elf_note_end; -+ ELF_PTRVAL_CONST_CHAR guest_info; -+ ELF_PTRVAL_CONST_VOID elf_note_start; -+ ELF_PTRVAL_CONST_VOID elf_note_end; - struct xen_elfnote elf_notes[XEN_ELFNOTE_MAX + 1]; - - /* parsed */ -@@ -262,10 +386,22 @@ int elf_xen_parse_features(const char *features, - uint32_t *required); - int elf_xen_parse_note(struct elf_binary *elf, - struct elf_dom_parms *parms, -- const elf_note *note); -+ ELF_HANDLE_DECL(elf_note) note); - int elf_xen_parse_guest_info(struct elf_binary *elf, - struct elf_dom_parms *parms); - int elf_xen_parse(struct elf_binary *elf, - struct elf_dom_parms *parms); - -+#define elf_memcpy_unchecked memcpy -+#define elf_memset_unchecked memset -+ /* -+ * Unsafe versions of memcpy and memset which take actual C -+ * pointers. These are just like real memcpy and memset. -+ */ -+ -+ -+#define ELF_ADVANCE_DEST(elf, amount) elf->dest += (amount) -+ /* Advances past amount bytes of the current destination area. */ -+ -+ - #endif /* __XEN_LIBELF_H__ */ --- -1.7.2.5 - diff --git a/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild index c1392c3e66ce..350d4c6fdc4a 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild,v 1.1 2013/06/26 14:41:37 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.1-r4.ebuild,v 1.3 2013/06/27 13:21:11 idella4 Exp $ EAPI=5 @@ -9,6 +9,7 @@ PYTHON_REQ_USE='xml,threads' IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2" +XSAPATCHES="http://dev.gentoo.org/~idella4/" if [[ $PV == *9999 ]]; then KEYWORDS="" @@ -20,7 +21,8 @@ else KEYWORDS="~amd64 ~x86" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz $IPXE_TARBALL_URL - $XEN_SEABIOS_URL" + $XEN_SEABIOS_URL + $XSAPATCHES/patches/XSA-55patches.tar.gz" S="${WORKDIR}/xen-${PV}" fi @@ -67,8 +69,7 @@ DEPEND="${CDEPEND} dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) - hvm? ( x11-proto/xproto ) - qemu? ( >=sys-apps/texinfo-5 )" + hvm? ( x11-proto/xproto )" RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils @@ -209,12 +210,12 @@ src_prepare() { "${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-8-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-11-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-15-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \ diff --git a/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild index 50dab2baa7a8..4723098039f3 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild,v 1.1 2013/06/26 14:41:37 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.2-r2.ebuild,v 1.3 2013/06/27 13:21:11 idella4 Exp $ EAPI=5 @@ -9,7 +9,7 @@ PYTHON_REQ_USE='xml,threads' IPXE_TARBALL_URL="http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz" XEN_SEABIOS_URL="http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2" - +XSAPATCHES="http://dev.gentoo.org/~idella4/" if [[ $PV == *9999 ]]; then KEYWORDS="" REPO="xen-unstable.hg" @@ -20,7 +20,8 @@ else KEYWORDS="~amd64 ~x86" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz $IPXE_TARBALL_URL - $XEN_SEABIOS_URL" + $XEN_SEABIOS_URL + $XSAPATCHES/patches/XSA-55patches.tar.gz" S="${WORKDIR}/xen-${PV}" fi @@ -68,8 +69,7 @@ DEPEND="${CDEPEND} dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) - hvm? ( x11-proto/xproto ) - qemu? ( >=sys-apps/texinfo-5 )" + hvm? ( x11-proto/xproto )" RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils @@ -208,12 +208,12 @@ src_prepare() { "${FILESDIR}"/xen-4.2-CVE-2013-3-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-4-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-5to7-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-8-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-8-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-9to10-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-11-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-11-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-12to13-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-14-XSA-55.patch \ - "${FILESDIR}"/xen-4.2-CVE-2013-15-XSA-55.patch \ + "${WORKDIR}"/files/xen-4.2-CVE-2013-15-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-16-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-17-XSA-55.patch \ "${FILESDIR}"/xen-4.2-CVE-2013-18to19-XSA-55.patch \ diff --git a/app-emulation/xen/xen-4.2.1-r4.ebuild b/app-emulation/xen/xen-4.2.1-r4.ebuild index db3194ea0ecd..9ae72f4a1af7 100644 --- a/app-emulation/xen/xen-4.2.1-r4.ebuild +++ b/app-emulation/xen/xen-4.2.1-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r4.ebuild,v 1.1 2013/06/26 06:35:38 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.1-r4.ebuild,v 1.2 2013/06/27 06:05:11 idella4 Exp $ EAPI=5 @@ -94,7 +94,7 @@ src_prepare() { "${FILESDIR}"/${PN}-4-CVE-2013-0153-XSA-36.patch \ "${FILESDIR}"/${PN}-4-CVE-2013-1917-XSA-44.patch \ "${FILESDIR}"/${PN}-4-CVE-2013-1918-XSA-45_[1-7].patch \ - "${FILESDIR}"/${PN}-4.2-2013-2076-XSA-52.patch + "${FILESDIR}"/${PN}-4.2-2013-2076-XSA-52to54.patch } src_configure() { diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest new file mode 100644 index 000000000000..99a1616b2b59 --- /dev/null +++ b/app-misc/gcalcli/Manifest @@ -0,0 +1 @@ +DIST gcalcli-2.4.2.tar.gz 1667739 SHA256 bcfaada7092fd988a23659cd285ec40919541bae2d9516daefcbd278f78bbc3b SHA512 ae0d4ddb4befa43df5ebbe434d44719522246725b2950549fcf43969038fcbab76012ee0855c02cb623bfd75351bf7b854ca6f74c34cbc57ca9a28e6d467bed1 WHIRLPOOL 2c58c276b6cc18d2768e9dd9dd88564a84427e6685f3f3809c66b9f0608bc2d60a3a81b961ea1dc6b1d4713ca200402a4cd3fbb5b5f34772cf4b012d364c2926 diff --git a/app-misc/gcalcli/gcalcli-2.4.2.ebuild b/app-misc/gcalcli/gcalcli-2.4.2.ebuild new file mode 100644 index 000000000000..a1099e7fb0f6 --- /dev/null +++ b/app-misc/gcalcli/gcalcli-2.4.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/gcalcli/gcalcli-2.4.2.ebuild,v 1.2 2013/06/27 03:15:21 robbat2 Exp $ + +EAPI=5 +# google-api-python-client only supports these +PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} ) + +inherit python-r1 + + +DESCRIPTION="Google Calendar Command Line Interface" +HOMEPAGE="https://github.com/insanum/gcalcli" +SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-python/python-dateutil + dev-python/google-api-python-client + dev-python/vobject" + +src_install() { + dodoc -r ChangeLog README.md docs + python_foreach_impl python_doscript ${PN} +} diff --git a/app-misc/gcalcli/metadata.xml b/app-misc/gcalcli/metadata.xml new file mode 100644 index 000000000000..3223a09302c9 --- /dev/null +++ b/app-misc/gcalcli/metadata.xml @@ -0,0 +1,9 @@ + + + + + robbat2@gentoo.org + Robin H. Johnson + + + diff --git a/app-misc/ignuit/Manifest b/app-misc/ignuit/Manifest index a4830954abe1..0d64423fde3c 100644 --- a/app-misc/ignuit/Manifest +++ b/app-misc/ignuit/Manifest @@ -1,2 +1 @@ -DIST ignuit-0.0.16.tar.gz 499016 SHA256 cfb4de8907662f35eb6044c60b8aa736ecc24bdae0a45fc4574ecb563824d846 SHA512 daf193a92b67dffcf1ff72c5a19a3caf2a4b4318ed90e406518ca1f598b6ebf2266578bdf730933ec6ec3b7ac8440719122a8327583b1ca697807d9a5cff7367 WHIRLPOOL f1f976df0229645004693cfa7318e0385fdea28a5dcb9470bfc98834673d7fa18c6a60c027c8b42e28476bd41fabaf5beef0db652d14b31d1f46a2b26e375520 DIST ignuit-2.20.0.tar.gz 541546 SHA256 5dc75cef0707677421c272c430cebf5c3730cbcfaeba6428fe14f6bd085d3630 SHA512 3d3a786ce87e252b1529ba427da52356d43554da6c23dfd3353f91b2c3962a83769431794c433c8ba8478ef48b8ef470a042416c5d2b2c0683711b09c959e106 WHIRLPOOL d93d2acb472bd23721c866f7231d301da8d9ee1f6894d51e1166bdc538ce0b99af2d3a79dd27ca72fd7ca6ab9a5a8b6aefd97d0219292e893ada9bdb7e8dd649 diff --git a/app-misc/ignuit/ignuit-0.0.16.ebuild b/app-misc/ignuit/ignuit-0.0.16.ebuild deleted file mode 100644 index dd55813e3c0b..000000000000 --- a/app-misc/ignuit/ignuit-0.0.16.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/ignuit/ignuit-0.0.16.ebuild,v 1.7 2013/06/14 12:38:03 pinkbyte Exp $ - -EAPI="2" - -DESCRIPTION="memorization aid based on the Leitner flashcard system" -HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit" -SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="examples" - -RDEPEND=">=gnome-base/libgnomeui-2.22.1 - gnome-base/gconf:2 - gnome-base/libglade:2.0 - dev-libs/glib:2 - x11-libs/gtk+:2 - >=media-libs/gstreamer-0.10.20:0.10 - dev-libs/libxslt - dev-libs/libxml2:2 - x11-libs/pango - app-text/dvipng - app-text/scrollkeeper - virtual/latex-base - >=app-text/gnome-doc-utils-0.3.2" - -DEPEND="${RDEPEND} - sys-devel/gettext - dev-util/intltool" - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS NEWS README TODO || die "dodoc failed" - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest index aba2253ece25..4ef4085b79b5 100644 --- a/app-misc/klavaro/Manifest +++ b/app-misc/klavaro/Manifest @@ -1 +1,2 @@ DIST klavaro-1.9.6.tar.bz2 773462 SHA256 6d7fc916eb83d0381b0719c1525c8ea13a5032abcadd438755c7451b9f071561 SHA512 487110b4abfd5be5503bee82b100be538881acea88f7fefa374aa9f1ec349016ac8c0200e9c6fc1669c110c718ae4f2477a844b169e72eca5dd5750ce933d2ab WHIRLPOOL e49237ad5c4d290f71503c5a27fb368ecd0167ae2e295917dafd2e215e9fdab090267274a99e47eb3ad3881f5ee6483c9a8a0edde85ad1fe26f45c96523a66f5 +DIST klavaro-1.9.7.tar.bz2 802138 SHA256 4ebe693639ae59e560e0bbc54077c804eae7c495f8a8436fb559cdbdf4e5c1c8 SHA512 1f27d2e1003e03644bc1ac765a56b9416314ce5a7088f8ece7e5abd450a3ac7c084caf7cdbdac4088edc5dedaf94540fc655781126050c1b14fe2939a78d503f WHIRLPOOL 9ef8d76ba8f4344313d3643a480f743c266dcff03e095b162143ce94aa212adb985cba8fa0330958a862adc22b4d9414b13df02f7652f90e56d8b480a54e3295 diff --git a/app-misc/klavaro/klavaro-1.9.7.ebuild b/app-misc/klavaro/klavaro-1.9.7.ebuild new file mode 100644 index 000000000000..61b8760dfe65 --- /dev/null +++ b/app-misc/klavaro/klavaro-1.9.7.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-1.9.7.ebuild,v 1.1 2013/06/27 13:21:04 xmw Exp $ + +EAPI=5 + +AUTOTOOLS_AUTORECONF=yes + +inherit autotools-utils + +DESCRIPTION="Another free touch typing tutor program" +HOMEPAGE="http://klavaro.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="net-misc/curl + x11-libs/gtk+:2 + x11-libs/gtkdatabox" + +DEPEND="${RDEPEND} + sys-devel/gettext + || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 )" + +PATCHES=( "${FILESDIR}"/${PN}-1.9.5-gold.patch ) diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest index f78439dc0cd7..e9e3a338274c 100644 --- a/app-text/dvipsk/Manifest +++ b/app-text/dvipsk/Manifest @@ -1,7 +1,10 @@ DIST texlive-20110705-source.tar.xz 131207904 SHA256 772d19795fd841737f5b00472810b49d98b3b62373fba67c12c757e95c510da2 SHA512 1efb5713bf80379f5104b41576911a4194d378ce35be5afb568c3b4aff6461b2b22e72fb34bc294021cf14a28d07bab083872f17752441f269f36c50f9363cc1 WHIRLPOOL 11cc5b53dedae8977b5d776f9141a849b23b877b836f56469336018e3529ebbf369c99d534c1d645aa99fe0750968f0089034a232dcf9401967e20afb5ce8dd5 DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57 +DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33 DIST texlive-core-upstream-patches-1.tar.xz 4316 SHA256 0a3eccc79ad608ea543e2ce04adcca0dbe968dbaebaa43014854f51d609659a5 SHA512 a559700fffbe2985b3eade84a9f8f539ba624ab5f92f2127769180073c6f05a9444c11599fef879d0f91aaa8ecbe76f6d4b4ebda2fae83da48074dc888eaa4b6 WHIRLPOOL f62e16fa7ab92c4f7800b48c82383d916f6450f08f6c39765672590e6c52088e252da398855d3b70a3c857a2f975d7b782ae045be083c4124fe84920dd0a4658 DIST texlive-module-dvips-2011.tar.xz 93692 SHA256 dbf5c731fa4a0b34db1854b6704f197607253f5716051538bda28db1044bd276 SHA512 9384e20e09c6ca23e17ef7ad220979f0df963b8029c42ca6cdcb2ad8236373ae79486576eac38fa6c7dd5358e15335b058f49fdbb4adcd0ec09ed2138d43c751 WHIRLPOOL f05f98c191bc79c1d8c213ea7583c8556c5720e962061fe628243e458724d8fe542cb906b6b0276b449eeb5709a4fcf35b47f16d205900ab9045b08e83bb3f03 DIST texlive-module-dvips-2012.tar.xz 95692 SHA256 9f12bb214eb245061bca42cd79fff999751725e35e972b2aa11439ced23f0d10 SHA512 cc5a5070fd04b501e2fae92864bfe027db2fb01cc5c0087fa62ba71ea044baa1166f5990d8545fc0b6ead130a069f825a6df243028ae1e8e7337d48936676d19 WHIRLPOOL 8c269d5242cb73cdeb83d6c304f9669fe3a7fbffa3faa67e765b5418c1ac8da8d1f3a2c20f9aea47b63734f813057aa99715c038de382f1ef3405e1cbf0a1b68 +DIST texlive-module-dvips-2013.tar.xz 114352 SHA256 cb3f058a3cfd139624d507f5b6cfdf8fd256978351d83148fa049e62f00f934e SHA512 816bb97b17548149435c5ce546cc84d11731be2c42a632e8146c8091367661be0b03dd939f244aca0d85d2d9706055dd82ca2bad66859043a8c7855b609b4991 WHIRLPOOL f5eabf48ba66113856db2baee6a5617bab35ffa09a4cca42b6c7fdb62b1adc14ae93fb53f8f45ce414bfa38d0630870f05b102e1450bc3b16e12a299a9b1de07 DIST texlive-module-dvips.doc-2011.tar.xz 483680 SHA256 15c98b215eb5bee39a4982f3e1d9ef67578f5381c6bb54bc3252bab68f02ec88 SHA512 725fcdc16687d8b67456da2e69a7d23b228339913497cfb0038b7d75e1add36665e4bdf437593772a3cc4488c34866e22ab139946f4dcb502ace63d3052ef72b WHIRLPOOL 0927805b8d53979f07e4478331642f06d6ecb7311326f24bc49ba2504a4e41306bbcd410f2d48a003f7dcbdd3d534d20e5ba8c2279345215ecc3c3541258c1c9 DIST texlive-module-dvips.doc-2012.tar.xz 484056 SHA256 247a738b46cd7283179de5bbd8e4ecf330fb145a886580b5ebd5547cee530e9c SHA512 05e0719edd98169982daa4fbf8b943b71b8bf8b4ae4f84ae70015bbff4e7ba2d55c7a4ed4a8ccf081193669ecceeb21dd05476d104d3742be0842b1bba84a4a5 WHIRLPOOL 3af98dc454152c1c0a6abfda19c43a29a8701a4dab3d155b530c2a0e0c0f81db7911de31b491c08b0cca4b8a06172a58796f54a2ea2184ab6371fede7b627edd +DIST texlive-module-dvips.doc-2013.tar.xz 484492 SHA256 76dfb96428aee66f6cac7ba1925f245f498e176028f4930c09b7fa7668c3374f SHA512 4886f1156b6984a146e0128b6ba627131dbd3281a9e084ac2852cf3929f1c4f6a302c54ad37734d0b97aae9e45a8193679405e6c33a54a1367fbb793f771c4e8 WHIRLPOOL 8941a5da4b375f9800153550aa32d8376e9519c1fea643a1f8ad24a0a20f81a1957bb0d5cbb8f56186fa12ef70c89ea3bac2af46d4e4d698a22ac78bf41d0943 diff --git a/app-text/dvipsk/dvipsk-5.993_p20130530.ebuild b/app-text/dvipsk/dvipsk-5.993_p20130530.ebuild new file mode 100644 index 000000000000..2667d2cd59ae --- /dev/null +++ b/app-text/dvipsk/dvipsk-5.993_p20130530.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/dvipsk/dvipsk-5.993_p20130530.ebuild,v 1.1 2013/06/27 14:16:33 aballier Exp $ + +EAPI=4 + +#TL_UPSTREAM_PATCHLEVEL="1" + +inherit texlive-common eutils + +DESCRIPTION="DVI-to-PostScript translator" +HOMEPAGE="http://tug.org/texlive/" +SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz" +#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz" + +TL_VERSION=2013 +EXTRA_TL_MODULES="dvips" +EXTRA_TL_DOC_MODULES="dvips.doc" + +for i in ${EXTRA_TL_MODULES} ; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz" +done + +SRC_URI="${SRC_URI} doc? ( " +for i in ${EXTRA_TL_DOC_MODULES} ; do + SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz" +done +SRC_URI="${SRC_URI} ) " + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc source" + +DEPEND=">=dev-libs/kpathsea-6.1.0_p20120701" +RDEPEND=" + !slinks); + } + page->freepage (page->u.ptr); +- fz_free_display_list (state.ctx, page->dlist); ++ fz_drop_display_list (state.ctx, page->dlist); + free (page); + } + diff --git a/app-text/llpp/files/llpp-9999-mupdf-split-headers.patch b/app-text/llpp/files/llpp-9999-mupdf-split-headers.patch new file mode 100644 index 000000000000..c62a58b48ad0 --- /dev/null +++ b/app-text/llpp/files/llpp-9999-mupdf-split-headers.patch @@ -0,0 +1,19 @@ +--- llpp-9999/work/llpp-9999/link.c ++++ llpp-9999/work/llpp-9999/link.c +@@ -30,12 +30,10 @@ + #include + #include + +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #include FT_FREETYPE_H + diff --git a/app-text/llpp/llpp-9999.ebuild b/app-text/llpp/llpp-9999.ebuild index 2d3a41911934..71e2f61e83be 100644 --- a/app-text/llpp/llpp-9999.ebuild +++ b/app-text/llpp/llpp-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.24 2013/06/16 22:26:39 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-9999.ebuild,v 1.25 2013/06/26 19:55:51 xmw Exp $ EAPI=5 @@ -39,7 +39,9 @@ RESTRICT="!ocamlopt? ( strip )" src_prepare() { epatch "${FILESDIR}"/${PN}-11-WM_CLASS.patch \ "${FILESDIR}"/${P}-mupdf_trailer.patch \ - "${FILESDIR}"/${P}-fz_new_text_page.patch + "${FILESDIR}"/${P}-fz_new_text_page.patch \ + "${FILESDIR}"/${P}-mupdf-split-headers.patch \ + "${FILESDIR}"/${P}-fz_drop_display_list.patch } src_compile() { diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild index bd208ea29bd2..8d315f57ffd9 100644 --- a/dev-db/mariadb/mariadb-5.5.28a.ebuild +++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $ EAPI="4" MY_EXTRAS_VER="20130120-0100Z" @@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}" # Please do not add a naive src_unpack to this ebuild # If you want to add a single patch, copy the ebuild to an overlay # and create your own mysql-extras tarball, looking at 000_index.txt -src_prepare() { - sed -i \ - -e '/^noinst_PROGRAMS/s/basic-t//g' \ - "${S}"/unittest/mytap/t/Makefile.am - mysql-v2_src_prepare -} # Official test instructions: # USE='berkdb -cluster embedded extraengine perl ssl community' \ diff --git a/dev-db/mariadb/mariadb-5.5.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild index 56e401235110..918ffec23298 100644 --- a/dev-db/mariadb/mariadb-5.5.29.ebuild +++ b/dev-db/mariadb/mariadb-5.5.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $ EAPI="4" MY_EXTRAS_VER="20130120-0100Z" @@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}" # Please do not add a naive src_unpack to this ebuild # If you want to add a single patch, copy the ebuild to an overlay # and create your own mysql-extras tarball, looking at 000_index.txt -src_prepare() { - sed -i \ - -e '/^noinst_PROGRAMS/s/basic-t//g' \ - "${S}"/unittest/mytap/t/Makefile.am - mysql-v2_src_prepare -} # Official test instructions: # USE='berkdb -cluster embedded extraengine perl ssl community' \ diff --git a/dev-db/mariadb/mariadb-5.5.30.ebuild b/dev-db/mariadb/mariadb-5.5.30.ebuild index 50b02812a189..1f0ddded8188 100644 --- a/dev-db/mariadb/mariadb-5.5.30.ebuild +++ b/dev-db/mariadb/mariadb-5.5.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.30.ebuild,v 1.1 2013/03/14 01:02:16 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.30.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $ EAPI="4" MY_EXTRAS_VER="20130120-0100Z" @@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}" # Please do not add a naive src_unpack to this ebuild # If you want to add a single patch, copy the ebuild to an overlay # and create your own mysql-extras tarball, looking at 000_index.txt -src_prepare() { - sed -i \ - -e '/^noinst_PROGRAMS/s/basic-t//g' \ - "${S}"/unittest/mytap/t/Makefile.am - mysql-v2_src_prepare -} # Official test instructions: # USE='berkdb -cluster embedded extraengine perl ssl community' \ diff --git a/dev-db/mariadb/mariadb-5.5.31.ebuild b/dev-db/mariadb/mariadb-5.5.31.ebuild index febec71cacd9..45e5b8edbb51 100644 --- a/dev-db/mariadb/mariadb-5.5.31.ebuild +++ b/dev-db/mariadb/mariadb-5.5.31.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.31.ebuild,v 1.1 2013/06/02 19:48:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.31.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $ EAPI="4" MY_EXTRAS_VER="20130602-1946Z" diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 42966adb4c25..4398811e6bb4 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -5,10 +5,11 @@ DIST mysql-5.1.66.tar.gz 24771341 SHA256 eb85e3fa152949670f5b6f4379bd1d700a5f472 DIST mysql-5.1.67.tar.gz 24781885 SHA256 8a5fa02a6db0fd167974c5fc4401ae05c6982e5331d93554a241a3ee2dbda406 SHA512 f0477ebd322d7e69c379bfacd2f4980cdca35c6903e67c44ac97aad5183033f1b791030d3b43c2946adf0154abbaab77add226f47de507d5f8050e6fa401f0cc WHIRLPOOL fd4e39d52b42c8a29ec06e153a5089aad23a042e0fe87653c5312884b8737ed72eb2ac914493dca3f9a7359b988dc9d1667c8249a88b20093b0660d7005cba4d DIST mysql-5.1.68.tar.gz 24655564 SHA256 25f02868dded24a46aeda7863008bcd9639c08fb5a31a137e19534629c65b517 SHA512 f5e68205f0f747c55e2a981055392e8403fcaae8b7470d1306f58653ad480b09fdabaa26ad2fb61a391276fe7fc77b3a17e6bfab07da91d19510cde17ee4d55a WHIRLPOOL 33eda1e6ef734a63799d4d1431281c371d5369b9dbfbfee275d3096a292224d240e7f9fb38ddff4dc3972c905ca10835a7ec4768cabf7331fa5d42f0f3d5c200 DIST mysql-5.1.69.tar.gz 23947181 SHA256 17a5a8a468a6e58cb3be6a16241246fdfd6248d8b5229e46fdb5ffcc070de929 SHA512 ff569f090f8fc0a7dc2fb787124da8ce5d153a2965c3f6b33007d452304b080d491f1a2dc19e0ed218c1ce319fa9c245380ef1a23d05d656641fe76dabbbd63f WHIRLPOOL ac7fb02169229b065c1f38cd99f95a5f92eebc71f753a22fa85420f699cbffe3dc5b5495f81446902d272072f677b06e57ebe9bcb58e53cbe510eb4e929d4e5f +DIST mysql-5.1.70.tar.gz 23984241 SHA256 9e03a343cf1b72b07f9c9bf7be24ffc808aa5c1a9daa590aaf2bc6a7a31f60ed SHA512 5d667af9e819bca85ff4d471cbb2792f47129146822a14cc93abb3f80a6fc6453ef06fc3dece091979003906d76002c1e680b3516747d29f5282827ec87a00e3 WHIRLPOOL 58dedd3b72621b339525338db717c399f04293bee5525856f2a275473f9730b3eafffcc3c29425047e4378ca519cb4da217a269269b0b43ad38178ce1e46f21d DIST mysql-5.5.29.tar.gz 24870769 SHA256 22b50c089038913b3468c7055fc288f7b5d973199ca37c563cd3a3292e812ae5 SHA512 167bc48c0d4e5351af342828d1f14c003b0d62f7388dd15b1b816df708cc4f06cfe8f7c4177af76fb1c1cbaba5adafe9cb884f76bf75d21a067da25896b29210 WHIRLPOOL 06b4e45c5ed6950d45d4a0623f7626af3b2a9d35656a96867b7cdc4bfc0534207c10afd9b3bcca703b826c67cea62e08992b2de99bdd8d661108c16071fb9773 DIST mysql-5.5.30.tar.gz 24499036 SHA256 909fe596e0044082a02d2757b742a33b8a3ff399b589603940494d3d3d975053 SHA512 f494fdf3f8132606ce45c4a1461d3670228e87f98d2a7269edd124c6afe37a22b7e7db5c83c14c0ddc5f68063ac5e7aec7243880dd9ba011010a049ba008bb08 WHIRLPOOL 29526df3d5b86dc7f48956ecb30e013e938d68299c87a3f34e94e42bb0a1dabd44e7d56879a51aac61d41ca728af9d3d78b7e712db6231338a95feb5a256d86b DIST mysql-5.5.31.tar.gz 24608323 SHA256 9cdd650b47e3ea864ab40d4ab23fa4a9fdfabc7fd018bf5c9cce30722c0abcea SHA512 2384e08cf78891718aaa8b962666f81c06d1762faff3facb1c0d59c476714416f86ff5186a8e443a78cd8654583241bb8e857cd5a9fb483e77cbb58ca9f7eae6 WHIRLPOOL 2ad859ef4119c8e7afc27075d5849b947a0ecbf1d506f0a47af145e32cfe50e6a0b4c157576e290da435591f0d488260d252f3aa8e42dc7d2761dd951b972657 -DIST mysql-5.5.32.tar.gz 24625029 SHA256 20930c3d934937f3863073af0a54cb014a4c6469e5460a81e2ff75062755377e SHA512 a286d57878c30d8c7ebe5879f7d67795f603952af2dfcfe16ac9caba510e4488d89c4fd9d33caa28dbb26076256f339cbc67bbd597cd386beb3cff63433c3e6b WHIRLPOOL 3329ef8d229f0a136231aacab2fd4ef4696c6eae7fb76e5a3ac37889fe6fe80a48517ce32aa85e5dbc2dba1d887d25438f5f3a7819b8ea426844b30cb9925f99 +DIST mysql-5.5.32.tar.gz 24589274 SHA256 babb19a1e58f6b285ff75e876f550a798d37fb72b5a548ffb411e8a4a51f6890 SHA512 78e9f0f47b3732e83e1261e8c021002288c0555b3aed7a51359511b038084eb9c7314a3960aa225eab46868fc4700f0f7a6301d1a0068c0f9ba038d41a5b7488 WHIRLPOOL fcf7291524fd8709eccdcef3deb32d132e9db0182aeb39c70b59f7086f49e09526d1bb055b3771915eb19271d7f2b86c0d0f65101dbd7a9d998fe95605cabdd3 DIST mysql-extras-20070105.tar.bz2 50005 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 SHA512 65e8fd1f9cc71083dbcfaffc331171e0d7deedbd784e416a4b629139f71cc102a84fa62c2d9e48310a18571ef7f06153911ee75c5d7bb6ba88807c287e7cbf34 WHIRLPOOL 3f858fbed6f57ffac863c29bef09a658e3d9f57cf4c6b5c62537973ae44f217344a8592ad311b14b1e7e8d475434b3c69339a8d2873c498ba712ff6f5e128cec DIST mysql-extras-20090228-2228Z.tar.bz2 254048 SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb SHA512 b347c0894d45cff2c10e26c12d7586c335811b607cd760b48e51743e74c55ace820d2d50fac2ce72543c14b9b4d15afce336bd956ea8a820df4a651f23e3b79f WHIRLPOOL 4d89a44791ec7e95baa3822bb62a3638c86d24bcfc777b9ff5a8d26020e7401159a3c03ebda9907fcbf02589b80726f2daa5bf2498d8e6e6e33540edf9b1d551 DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256 95e531799ed267c566da8b0759da78d0351d6004c7c8a45018054e287a989495 SHA512 0625e1f06e04c7841256955950dd7766a5f03d4ade2aee3c13335f08acff374933ed1fd7ddea214eaaa3531d7373ef094734f5c00530555347f058f5ec4d9d36 WHIRLPOOL f2c6e9387b38b609d3bfea83c6983c456d30a9dcf95c256a44402d4c63fa22543d55d6afa9b8dbf4238dcadf32fac3daec5031d50c8a4acf7a074d04fbede213 @@ -17,5 +18,6 @@ DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb0 DIST mysql-extras-20130120-2303Z.tar.bz2 1899548 SHA256 b8d0cf2a9016324796c3c054cd90b7dc4efb9016bdc793dfbaafaf124a072efe SHA512 748bb6577028332e9ca51cbccefd8859dc5cee65d0824da1ba3fee5387dc89b68b8789dd9db81e00ad8307c4de5ea3d84dca97a1cf65a9d988af3fb3246328c9 WHIRLPOOL 5f0931de21a14de5ad57898a8fdd34b5ff9666958f20c7bd8e4277e58fd00c3aa3ad9d15694410e2fd784064f960f264500015e146cdf3f346ea67f7f053e67c DIST mysql-extras-20130128-0054Z.tar.bz2 1900342 SHA256 31d6c5ba55b6640569956bb4558e9e8f63f1947e1b51d4f4537a18f5f5a88893 SHA512 dd35934c145eb7faa237f630f1d4b671a35f5fa0b6a83e60ce647c8a19acf0c974e7b86d92086151f5c11c365529214c659ed1f0b3174277d90e5b4fbe60a362 WHIRLPOOL b15be083feb3896e85d4a1f31cbcea71384a17d0c5fd413e1d95ce416603cd710c754c3f4b705846cedcb8e2de9d77e614c62fd4882b4ec1684e4343d6194e80 DIST mysql-extras-20130602-1946Z.tar.bz2 1478373 SHA256 843465190319464fdb035f4ddcf8a84ad3161780e3a81c1269c8f498b1524aab SHA512 95fc28f84618e11eeb2de22c12796eca5f8eff7b69ccc44d329d8f81aba4b015c834bad965a909f4e1e90a7f6012db98092ca21f31388ff5ab88268c8c1b60f3 WHIRLPOOL c04b1554663934969ab6b7773c96a5bd2388971dbea1eef138620014ef1e023904b5df326ff3e36538920be7bc50a2962e8f7a33435e42c1b5bdf5787ed2eb3a +DIST mysql-extras-20130626-0127Z.tar.bz2 1476503 SHA256 a3c791b7b95fe170c4071feed11699146fc8f9de6a9f2ffa67214c2e50644b4f SHA512 4ee19cb5960ba24f2db16e7c5b647d1b7bb9fadbc73bbd8125bbac7e926c569a9a585a4d1d92b851ea6653d9c15eeb00f1592880f104520dc040e5af19943ac7 WHIRLPOOL 739f5762fa24b0feb40848ddb83f2ed95fb650933920b3d9e55c5e90f907d4ac74dfb00e4b9189cda8f9af4317478f3132daf789d7c91196827f645dd3e37d61 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512 fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c WHIRLPOOL 05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf diff --git a/dev-db/mysql/mysql-5.1.70.ebuild b/dev-db/mysql/mysql-5.1.70.ebuild new file mode 100644 index 000000000000..c5c461eb76f1 --- /dev/null +++ b/dev-db/mysql/mysql-5.1.70.ebuild @@ -0,0 +1,265 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.70.ebuild,v 1.1 2013/06/27 01:59:07 robbat2 Exp $ + +EAPI="4" + +MY_EXTRAS_VER="20130626-0127Z" +# PBXT +PBXT_VERSION='1.0.11-6-pre-ga' +# XtraDB +PERCONA_VER='5.1.45-10' XTRADB_VER='1.0.6-10' + +# Build type +BUILD="autotools" + +inherit toolchain-funcs mysql-v2 + +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +# This is often broken still +EPATCH_EXCLUDE='' + +# Most of these are in the eclass +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + >=sys-devel/libtool-2.2.10" +RDEPEND="${RDEPEND}" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt +src_prepare() { + sed -i \ + -e '/^noinst_PROGRAMS/s/basic-t//g' \ + "${S}"/unittest/mytap/t/Makefile.am + mysql-v2_src_prepare +} + +# Official test instructions: +# USE='berkdb -cluster embedded extraengine perl ssl community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + emake check || die "make check failed" + if ! use "minimal" ; then + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + cd "${S}" + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + local retstatus_unit + local retstatus_ns + local retstatus_ps + local t + addpredict /this-dir-does-not-exist/t9.MYI + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + # archive_gis really sucks a lot, but it's only relevant for the + # USE=extraengines case + case ${PV} in + 5.0.42) + mysql-v2_disable_test "archive_gis" "Totally broken in 5.0.42" + ;; + + 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) + [ "$(tc-endian)" == "big" ] && \ + mysql-v2_disable_test \ + "archive_gis" \ + "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" + ;; + esac + + # This was a slight testcase breakage when the read_only security issue + # was fixed. + case ${PV} in + 5.0.54|5.0.51*) + mysql-v2_disable_test \ + "read_only" \ + "Broken in 5.0.51-54, output in wrong order" + ;; + esac + + # Ditto to read_only + [ "${PV}" == "5.0.51a" ] && \ + mysql-v2_disable_test \ + "view" \ + "Broken in 5.0.51, output in wrong order" + + # x86-specific, OOM issue with some subselects on low memory servers + [ "${PV}" == "5.0.54" ] && \ + [ "${ARCH/x86}" != "${ARCH}" ] && \ + mysql-v2_disable_test \ + "subselect" \ + "Testcase needs tuning on x86 for oom condition" + + # Broke with the YaSSL security issue that didn't affect Gentoo. + [ "${PV}" == "5.0.56" ] && \ + for t in openssl_1 rpl_openssl rpl_ssl ssl \ + ssl_8k_key ssl_compress ssl_connect ; do \ + mysql-v2_disable_test \ + "$t" \ + "OpenSSL tests broken on 5.0.56" + done + + # New test was broken in first time + # Upstream bug 41066 + # http://bugs.mysql.com/bug.php?id=41066 + [ "${PV}" == "5.0.72" ] && \ + mysql-v2_disable_test \ + "status2" \ + "Broken in 5.0.72, new test is broken, upstream bug #41066" + + # The entire 5.0 series has pre-generated SSL certificates, they have + # mostly expired now. ${S}/mysql-tests/std-data/*.pem + # The certs really SHOULD be generated for the tests, so that they are + # not expiring like this. We cannot do so ourselves as the tests look + # closely as the cert path data, and we do not have the CA key to regen + # ourselves. Alternatively, upstream should generate them with at least + # 50-year validity. + # + # Known expiry points: + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 + # + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be + # expired/invalid. + case ${PV} in + 5.0.*|5.1.*|5.4.*|5.5.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ + ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ + mysql-v2_disable_test \ + "$t" \ + "These OpenSSL tests break due to expired certificates" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade, main.information_schema, + # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + # + # main.not_partition: + # Failure reason unknown at this time, must resolve before package.mask + # removal FIXME + case ${PV} in + 5.1.*|5.4.*|5.5.*) + for t in main.mysql_client_test main.mysql_comments \ + main.mysql_upgrade \ + main.information_schema \ + main.not_partition funcs_1.is_columns_mysql \ + funcs_1.is_tables_mysql funcs_1.is_triggers; do + mysql-v2_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. + # These tests are picking up a 'connect-timeout' config from somewhere, + # which is not valid, and since it does not have 'loose-' in front of + # it, it's causing a failure + case ${PV} in + 5.1.5*|5.4.*|5.5.*|6*) + for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do + mysql-v2_disable_test "$t" \ + "False positives in Gentoo: connect-timeout" + done + ;; + esac + + use profiling && use community \ + || mysql-v2_disable_test main.profiling \ + "Profiling test needs profiling support" + + if [ "${PN}" == "mariadb" ]; then + for t in \ + parts.part_supported_sql_func_ndb \ + parts.partition_auto_increment_ndb ; do + mysql-v2_disable_test $t "ndb not supported in mariadb" + done + fi + + # This fail with XtraDB in place of normal InnoDB + # TODO: test if they are broken with the rest of the Percona patches + if xtradb_patch_available && use xtradb ; then + for t in main.innodb innodb.innodb_bug51378 \ + main.information_schema_db main.mysqlshow \ + main.innodb-autoinc main.innodb_bug21704 \ + main.innodb_bug44369 main.innodb_bug46000 \ + main.index_merge_innodb \ + innodb.innodb innodb.innodb_misc1 innodb.innodb_bug52663 \ + innodb.innodb-autoinc innodb.innodb-autoinc-44030 \ + innodb.innodb_bug21704 innodb.innodb_bug44369 \ + innodb.innodb_bug46000 innodb.innodb_bug48024 \ + innodb.innodb_bug49164 innodb.innodb_bug51920 \ + innodb.innodb_bug54044 \ + ; do + mysql-v2_disable_test $t "tests broken in xtradb" + done + fi + + if ! use extraengine ; then + # bug 332565 + for t in main.range ; do + mysql-v2_disable_test $t "Test $t requires USE=extraengine" + done + # bug 401673 + for t in federated.federated_plugin ; do + mysql-v2_disable_test $t "Test $t requires USE=extraengine (Need federated engine)" + done + fi + + # create directories because mysqladmin might make out of order + mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} + + # We run the test protocols seperately + emake test-unit + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" + retstatus_ns=$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" + retstatus_ps=$? + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + # TODO: + # When upstream enables the pr and nr testsuites, we need those as well. + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" + [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + else + einfo "Skipping server tests due to minimal build." + fi +} diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild new file mode 100644 index 000000000000..cd0679d13e18 --- /dev/null +++ b/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild,v 1.1 2013/06/27 10:52:04 tomwij Exp $ + +EAPI="5" + +inherit java-vm-2 multilib + +DESCRIPTION="Java wrappers around GCJ" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-linux" +SLOT="0" +IUSE="X" + +ECJ_GCJ_SLOT="3.6" + +RDEPEND=" + ~sys-devel/gcc-${PV}[gcj] + X? ( ~sys-devel/gcc-${PV}[gtk] ) + dev-java/ecj-gcj:${ECJ_GCJ_SLOT}" +DEPEND="${RDEPEND}" + +S="${WORKDIR}" + +src_install() { + # jre lib paths ... + local libarch="$(get_system_arch)" + local gcc_version=${PV} + local gccbin=$(gcc-config -B ${gcc_version}) + gccbin=${gccbin#"${EPREFIX}"} + local gcclib=$(gcc-config -L ${gcc_version} | cut -d':' -f1) + gcclib=${gcclib#"${EPREFIX}"} + local gcjhome="/usr/$(get_libdir)/${P}" + local gccchost="${CHOST}" + local gcjlibdir=$(echo "${EPREFIX}"/usr/$(get_libdir)/gcj-${gcc_version}-*) + gcjlibdir=${gcjlibdir#"${EPREFIX}"} + + # links + dodir ${gcjhome}/bin + dodir ${gcjhome}/jre/bin + dosym ${gccbin}/gij ${gcjhome}/bin/java + dosym ${gccbin}/gij ${gcjhome}/jre/bin/java + dosym ${gccbin}/gjar ${gcjhome}/bin/jar + dosym ${gccbin}/gjdoc ${gcjhome}/bin/javadoc + dosym ${gccbin}/grmic ${gcjhome}/bin/rmic + dosym ${gccbin}/gjavah ${gcjhome}/bin/javah + dosym ${gccbin}/jcf-dump ${gcjhome}/bin/javap + dosym ${gccbin}/gappletviewer ${gcjhome}/bin/appletviewer + dosym ${gccbin}/gjarsigner ${gcjhome}/bin/jarsigner + dosym ${gccbin}/grmiregistry ${gcjhome}/bin/rmiregistry + dosym ${gccbin}/grmiregistry ${gcjhome}/jre/bin/rmiregistry + dosym ${gccbin}/gkeytool ${gcjhome}/bin/keytool + dosym ${gccbin}/gkeytool ${gcjhome}/jre/bin/keytool + dosym ${gccbin}/gnative2ascii ${gcjhome}/bin/native2ascii + dosym ${gccbin}/gorbd ${gcjhome}/bin/orbd + dosym ${gccbin}/gorbd ${gcjhome}/jre/bin/orbd + dosym ${gccbin}/grmid ${gcjhome}/bin/rmid + dosym ${gccbin}/grmid ${gcjhome}/jre/bin/rmid + dosym ${gccbin}/gserialver ${gcjhome}/bin/serialver + dosym ${gccbin}/gtnameserv ${gcjhome}/bin/tnameserv + dosym ${gccbin}/gtnameserv ${gcjhome}/jre/bin/tnameserv + + dodir ${gcjhome}/jre/lib/${libarch}/client + dodir ${gcjhome}/jre/lib/${libarch}/server + dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/client/libjvm.so + dosym ${gcjlibdir}/libjvm.so ${gcjhome}/jre/lib/${libarch}/server/libjvm.so + use X && dosym ${gcjlibdir}/libjawt.so ${gcjhome}/jre/lib/${libarch}/libjawt.so + + dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-${gcc_version/_/-}.jar \ + ${gcjhome}/jre/lib/rt.jar + dodir ${gcjhome}/lib + dosym /usr/share/gcc-data/${gccchost}/${gcc_version}/java/libgcj-tools-${gcc_version/_/-}.jar \ + ${gcjhome}/lib/tools.jar + dosym ${gcclib}/include ${gcjhome} + + dosym /usr/bin/ecj-gcj-${ECJ_GCJ_SLOT} ${gcjhome}/bin/javac + + set_java_env +} + +pkg_postinst() { + # Do not set as system VM (see below) + # java-vm-2_pkg_postinst + + ewarn "gcj does not currently provide all the 1.5 APIs." + ewarn "See http://builder.classpath.org/japi/libgcj-jdk15.html" + ewarn "Check for existing bugs relating to missing APIs and file" + ewarn "new ones at http://gcc.gnu.org/bugzilla/" + ewarn + ewarn "Due to this and limited manpower, we currently cannot support" + ewarn "using gcj-jdk as a system VM. Its main purpose is to bootstrap" + ewarn "IcedTea without prior binary VM installation. To do that, execute:" + ewarn + ewarn "emerge -o icedtea && emerge icedtea" +} diff --git a/dev-lang/fpc/Manifest b/dev-lang/fpc/Manifest index 3c734a666944..30e26478d2df 100644 --- a/dev-lang/fpc/Manifest +++ b/dev-lang/fpc/Manifest @@ -29,9 +29,17 @@ DIST fpc-2.6.0.i386-linux.tar 44052480 SHA256 aefdd270b0032f9720495afe66000656b2 DIST fpc-2.6.0.powerpc-linux.tar 42199040 SHA256 6591475ef84693dd659cee96519b6e3ab63c30df9634b38d4efb4d2fd7896b4b SHA512 fbc9c252f4e8aeda495b0aa6921ba01242c43ff243825e55a25cc8579fd25a913ea7546f7833ae7e5684d2b60401fe55ff501385f06703490aa50cb259702ed7 WHIRLPOOL 15055086af362a394340ac8e94a6925809f4a5d3c532da36174ecfe141e81398162cbeaf39627ee3fc673604fba2283ff241582cff11ea004c7a8878f9fca1f2 DIST fpc-2.6.0.powerpc64-linux.tar 47319040 SHA256 3cc96210748d1528510e1b992be0694164ce650ce87847d13e9789a80c646992 SHA512 cfa1a23ead9591782fc62b671bec22285908d603bdfc241814073d4ed8f0485804a74c947541a84e222dffb4f03c947aa0ea189b7a4f64982c24d2e4fd1b514b WHIRLPOOL d61e20dd82135e60805d21d397d83affc570669adc34e84efde6e6abfea9c4e801e327f8adc9754873923b91927aeac192c21fad6b66a810bb1e074633e9e86f DIST fpc-2.6.0.x86_64-linux.tar 46295040 SHA256 9da2464c53536293493ff6434ca44097fb76ef164c92675d19c7a731cb893b4d SHA512 0121ea5ec9d339dc989b59aec92cd5c28047d86b1df84a3145f3076ba654414d260d725f524d9659facf1f01f0c63dd09b72e5655ede7b3019a623088595ecf4 WHIRLPOOL cb210e521e4a05ac5d6f2faff795f5e1e9d48a02f66faeb235fe8d93cdafe6d7fc6b1a640f4a52d8467f01847fc659fe407f5d395ec0c22102299a38fef342a3 +DIST fpc-2.6.2-doc-html.tar.gz 4716648 SHA256 2f30db4ad0687cfeb990bff1933aea6c644c8c49460051bafb1645863fd14005 SHA512 abefed1ac92e49d3ef18599c6d0e44c6963bda214a599f2d9c1df64c88f3bd43fc31baf1b7a032b626f4caedca225b55f99a06f1828b2da143cd07d8cd242999 WHIRLPOOL 4f4b13eb5e55aaf271be9ee93ec7ec425169940cd85d65b796c63e0b09b111ec381ae9274dcd8b671e9ff0b81f6b2abebbc99628e6791aa1682feb11d9aadf89 +DIST fpc-2.6.2-fpctoc.htx.bz2 124078 SHA256 de9b948c4d3d3f41f7a4c1eb1d0a022d6a0cd2cd3860d738dc8c0183c3207e78 SHA512 98f53ec7a2ddd6403696c5b0feb8c05797b1c267593adce0e3a50132238c0b5abd2f00886f0e68f73b449e0376ef7ebbf666ba3eb9362cffbb1f0fffd6886591 WHIRLPOOL 3dc2d0d633962635a9fa74e5c6f984d658ae5a7c5254b1ff0317d94820525262d3f741dec05a8af35844e2471cfa4939bed98a7fa3fb492cb9075fb6ebbbdf50 +DIST fpc-2.6.2.arm-linux.tar 32501760 SHA256 c961ea868ac2c7ea9a724a8ed5f5d4c3965e0ada61e97735e75252a50067e68e SHA512 c7f5a5b1938608cf3195549a3272c0932c08ee6601ffc516bab2cd7efd52145fbd6e03ad6664d1c876de02e89de63674cdc064dc23d228b73a621a5cd1e23220 WHIRLPOOL b0c8eacdac44615891a1fed574098a95e8616caaad4472c933b44e054d6f2237c79f66cc7e6a8f17d1d263d762ba723b94f41652b0ec0aaa0abaf9ae828dbeec +DIST fpc-2.6.2.i386-linux.tar 45905920 SHA256 d625a3dfdb248d1975a580ee01c43db3bfe05610248b2196bafddbb74579eac9 SHA512 741b01821cbc4eb1e2602bd69ccce58fac48640e06868ba29896a24376f77afe07a27ebd26a7936cc4bb813685b7151e7d64806ebe1bfce8988254a921015280 WHIRLPOOL 88ab9381c1f84f511770602f00148418e71daf6d107fbd6f341b61981809987b710f70761e0e840b40811b487389072ba53f3493f1fae7844afafd674c5b000a +DIST fpc-2.6.2.powerpc-linux.tar 44462080 SHA256 c2e7847c0a6d41820e3eb2da50122ac8fe5eade02157551f5857933d5a4e13c6 SHA512 a0894e56143115e35a00da48eb7cb11d90907b4474065b5092d2084cf5733c8d0ece74ec90f654dcf8b92e0cf016a7f5c6f48c8d02a2f85950f37a609583966a WHIRLPOOL db7b91f267d1321a49743ce682b4ed4f42699cb4b85bb15a3efbd1447e00e70fac1157ff21756bdf547528a6055221cf2296941efdb8bbdee6db6905730fcdc2 +DIST fpc-2.6.2.powerpc64-linux.tar 49336320 SHA256 b4870ad23405324dd3549f03fe6d8662b9dff17eafe681046b28d63be542989e SHA512 e5a8e75302b6281ac14a1b299ee208ffa3f447e87ed3e74113f82b0e99175ebc71a4431bcef26a0fb99ca8566748c743dc69f8d7bc756889f17a7b1e1cfd267b WHIRLPOOL b4725180d5de66ccb64408552a3449a88c7a6ba47213e81411dcef4a1fc14f756d4e73ec6f10082d7572183229fd1da3f7e802b3681cfa2f1b3280ee7c914bcc +DIST fpc-2.6.2.x86_64-linux.tar 48332800 SHA256 e05aed29318c250ce3c494c3938c905c7853620da8cbc4d66ba584160690e558 SHA512 3ac22bff975197b3ecc40bd76bb66093f71253290d6eb095e1bf014cb1cdf0354cf05212516bca008d9b525f906c173c1bf2067eda9015cb3db64a42b576a512 WHIRLPOOL b52d8ba4b97c83bba051a771d1b952839440828bfabd18004ca9b03ba3f1f3763b73396940c965aeeb4944ef05f7f968658629214c0ab777b9b3841286d7d40a DIST fpcbuild-2.2.0.tar.gz 35801603 SHA256 55c6fe8df0a09b15c1bc5cbf6c7df12ee955f86933fdf624f26fda59636d7a5f SHA512 bbc14ea79a9e16885170e47834f6c9ee27d646c483d27a99f844f7c06d80d2fa703a8f4816f97e1bd36a6f74704779109de32d6143427eb4c314cf8293f64d4a WHIRLPOOL e55e5547a6821e4817c0faf72e2c8f98a5afc62cbd3ba26ec69d2fecb33a8f3d9ef9a811c20fc9065e1b363b03aab2125d66319008d181cfb50fa7e6986a0e1d DIST fpcbuild-2.2.2.tar.gz 39186745 SHA256 0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1 SHA512 7869e9e50236a47503f4eaedaf5229cd7fcd13991404a314cc9b6ac297325b3016144637de3e731c89804e1dbf505a82dc6ad68e34926befaaec7eed304a9fbf WHIRLPOOL da1c218ea6e2b9e2235945d60d448ba508ec9274369a210e71910a5c180d9a5d601943c261f37b4f40f780c93ce873e476a79688913d2de3fd00334fe6ace75a DIST fpcbuild-2.2.4.tar.gz 39849184 SHA256 77a54f09e39f07ed723071784a86d9ac8ca08fb5aa6fe41c8e9970bea395b4cf SHA512 91085c7f0e5f991726cc4a8bd8bf54e2384eb7fa0a1d96f4a329691a668c9fd977fec31e265f5cb8a904e37d61158282e11a5485657f8c6fb59d8105217b5b92 WHIRLPOOL 9f487f9ef198e20e863ee4f69092b10416c21017b81fc2a02452c1d2c7b688413c02fa507a0ccdeb3263c3b201674ff8f0a056926c623d19e11e3031eb69af28 DIST fpcbuild-2.4.0.tar.gz 41769847 SHA256 b3abbeaa0f2c3427fd447759e715cbc19b920f2ccad2b40ae5ab47e9d4124fd4 SHA512 e167426460ff68d4ead5a5ed849c1e9bd3b46c45fdf826bf47a7dade448a77b31a2486a9976ffb8c32a5c2d0d7267de019a3815fb225d8aa1bdb8afa6636a1e1 WHIRLPOOL 8fd915afcddb4596be20b1aa8e585eeaef5ad26d0864cd8955d2b5a082bce8a6b0e5bc5f262005bea1d592ec478e642feec27f201ef0cc37b7dd76a471a7c9a9 DIST fpcbuild-2.4.4.tar.gz 48018719 SHA256 ecdbc150eecc33f5734e62f1a3507421db8eba6d9074c0c5519a8fc8ffe46924 SHA512 abdb4d10ea7626ab9ec6c9489e78cf0fe561ca44aed44450cb97a34219ae3d1ddc03de103b87ce32e24149416f10452c8775dd09a13a0ec41f76568865c36e00 WHIRLPOOL 284453ba80d48ace767da4d57833860093e4ac08ac501e8848fda5f4ab2e1af858a5d08b559caf54799d3e24ad9b301fa7882e1f34f242018fa5ed1287b5b29a DIST fpcbuild-2.6.0.tar.gz 50751193 SHA256 d788854faa373e59835d4e353133f9965993cce79c62d82e5c31837a9117beef SHA512 5139bde3490cbe4e25fb5031299412c372a29149a083180fe3828856c2fb371347f4201ec98ae4cf8b2d4c77101de843b63e27ceee644018901e156718d994cd WHIRLPOOL 3c0c9403983cfdbc97cc4b840aefbf6595c8f28a1c4759945ada7db436f939db3dfe6aa1380ef0e8cabb1051899adcc4a5c4321ec8bd64431fdfa28c0a47be87 +DIST fpcbuild-2.6.2.tar.gz 55198144 SHA256 75ad700ccc772b07304c286b0aae95f48a504b15fe890a36361d17dc8e92d83c SHA512 ecc28e8c63fd6bdd6a1b02b0aca4b7ac861bd4c0e815146ab34181fff63f3f60102c227e17317efdc30d6e97b6003b708ed9853f1d21f9e5faabcc89c85a91fe WHIRLPOOL 8614adf51cb71072dc1a4ed9b79acb1943b58decfcadbefd260dfbf20b07f9cba1b5c91c3b57ea78cf89ceb4de102e7cc4d0d93c54e7101bbfa3151b80c0af26 diff --git a/dev-lang/fpc/fpc-2.6.0-r1.ebuild b/dev-lang/fpc/fpc-2.6.0-r1.ebuild new file mode 100644 index 000000000000..e22764ab209c --- /dev/null +++ b/dev-lang/fpc/fpc-2.6.0-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.6.0-r1.ebuild,v 1.1 2013/06/26 22:47:51 hasufell Exp $ + +EAPI=5 + +HOMEPAGE="http://www.freepascal.org/" +DESCRIPTION="Free Pascal Compiler" +SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz + amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar ) + arm? ( mirror://sourceforge/freepascal/${P}.arm-linux.tar ) + ppc? ( mirror://sourceforge/freepascal/${P}.powerpc-linux.tar ) + ppc64? ( mirror://sourceforge/freepascal/${P}.powerpc64-linux.tar ) + sparc? ( mirror://sourceforge/freepascal/${PN}-2.2.4.sparc-linux.tar ) + x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar ) + doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz + http://dev.gentoo.org/~radhermit/distfiles/${P}-fpctoc.htx.bz2 )" + +SLOT="0" +LICENSE="GPL-2 LGPL-2.1-with-linking-exception" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="doc ide source" + +RDEPEND="ide? ( !dev-lang/fpc-ide )" + +RESTRICT="strip" #269221 + +S=${WORKDIR}/fpcbuild-${PV}/fpcsrc + +src_unpack() { + case ${ARCH} in + amd64) FPC_ARCH="x86_64" PV_BIN=${PV} ;; + arm) FPC_ARCH="arm" PV_BIN=${PV} ;; + ppc) FPC_ARCH="powerpc" PV_BIN=${PV} ;; + ppc64) FPC_ARCH="powerpc64" PV_BIN=${PV} ;; + sparc) FPC_ARCH="sparc" PV_BIN=2.2.4 ;; + x86) FPC_ARCH="i386" PV_BIN=${PV} ;; + *) die "This ebuild doesn't support ${ARCH}." ;; + esac + + unpack ${A} + + tar -xf ${P}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!" + tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!" +} + +src_prepare() { + find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die + + # let the pkg manager compress man files + sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die +} + +set_pp() { + case ${ARCH} in + amd64) FPC_ARCH="x64" ;; + arm) FPC_ARCH="arm" ;; + ppc) FPC_ARCH="ppc" ;; + ppc64) FPC_ARCH="ppc64" ;; + sparc) FPC_ARCH="sparc" ;; + x86) FPC_ARCH="386" ;; + *) die "This ebuild doesn't support ${ARCH}." ;; + esac + + case ${1} in + bootstrap) pp="${WORKDIR}"/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;; + new) pp="${S}"/compiler/ppc${FPC_ARCH} ;; + *) die "set_pp: unknown argument: ${1}" ;; + esac +} + +src_compile() { + local pp + + # Using the bootstrap compiler. + set_pp bootstrap + + emake -j1 PP="${pp}" compiler_cycle + + # Save new compiler from cleaning... + cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die + + # ...rebuild with current version... + emake -j1 PP="${S}"/ppc${FPC_ARCH}.new compiler_cycle + + # ..and clean up afterwards + rm "${S}"/ppc${FPC_ARCH}.new || die + + # Using the new compiler. + set_pp new + + emake -j1 PP="${pp}" rtl_clean + + emake -j1 PP="${pp}" rtl packages_all utils + + if use ide ; then + cd "${S}"/ide || die + emake -j1 PP="${pp}" + fi +} + +src_install() { + local pp + set_pp new + + set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/fpcmake" \ + INSTALL_PREFIX="${D}"/usr \ + INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \ + INSTALL_MANDIR="${D}"/usr/share/man \ + INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source + + emake -j1 "$@" compiler_install rtl_install packages_install utils_install + + dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH} + + cd "${S}"/../install/doc || die + emake -j1 "$@" installdoc + + cd "${S}"/../install/man || die + emake -j1 "$@" installman + + if use doc ; then + cd "${S}"/../../doc || die + dodoc -r * + newdoc "${WORKDIR}"/${P}-fpctoc.htx fpctoc.htx + docompress -x /usr/share/doc/${PF}/fpctoc.htx + fi + + if use ide ; then + cd "${S}"/ide + emake -j1 "$@" install + fi + + if use source ; then + cd "${S}" || die + shift + emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall + find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; + fi + + "${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die + + sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die + + if use ide ; then + sed -e "s:${D}::g" \ + -i "${D}"/etc/fppkg.cfg \ + -i "${D}"/etc/fppkg/* \ + -i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ + || die + fi + + rm -r "${D}"/usr/lib/fpc/lexyacc || die +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && use ide; then + einfo "To read the documentation in the fpc IDE, enable the doc USE flag" + einfo "and add /usr/share/doc/${PF}/fpctoc.htx to the Help Files list." + fi +} diff --git a/dev-lang/fpc/fpc-2.6.2.ebuild b/dev-lang/fpc/fpc-2.6.2.ebuild new file mode 100644 index 000000000000..debfddfe7d62 --- /dev/null +++ b/dev-lang/fpc/fpc-2.6.2.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/fpc/fpc-2.6.2.ebuild,v 1.1 2013/06/26 22:20:08 radhermit Exp $ + +EAPI=5 + +HOMEPAGE="http://www.freepascal.org/" +DESCRIPTION="Free Pascal Compiler" +SRC_URI="mirror://sourceforge/freepascal/fpcbuild-${PV}.tar.gz + amd64? ( mirror://sourceforge/freepascal/${P}.x86_64-linux.tar ) + arm? ( mirror://sourceforge/freepascal/${P}.arm-linux.tar ) + ppc? ( mirror://sourceforge/freepascal/${P}.powerpc-linux.tar ) + ppc64? ( mirror://sourceforge/freepascal/${P}.powerpc64-linux.tar ) + sparc? ( mirror://sourceforge/freepascal/${PN}-2.2.4.sparc-linux.tar ) + x86? ( mirror://sourceforge/freepascal/${P}.i386-linux.tar ) + doc? ( mirror://sourceforge/freepascal/Documentation/${PV}/doc-html.tar.gz -> ${P}-doc-html.tar.gz + http://dev.gentoo.org/~radhermit/distfiles/${P}-fpctoc.htx.bz2 )" + +SLOT="0" +LICENSE="GPL-2 LGPL-2.1-with-linking-exception" +KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="doc ide source" + +RDEPEND="ide? ( !dev-lang/fpc-ide )" + +RESTRICT="strip" #269221 + +S=${WORKDIR}/fpcbuild-${PV}/fpcsrc + +src_unpack() { + case ${ARCH} in + amd64) FPC_ARCH="x86_64" PV_BIN=${PV} ;; + arm) FPC_ARCH="arm" PV_BIN=${PV} ;; + ppc) FPC_ARCH="powerpc" PV_BIN=${PV} ;; + ppc64) FPC_ARCH="powerpc64" PV_BIN=${PV} ;; + sparc) FPC_ARCH="sparc" PV_BIN=2.2.4 ;; + x86) FPC_ARCH="i386" PV_BIN=${PV} ;; + *) die "This ebuild doesn't support ${ARCH}." ;; + esac + + unpack ${A} + + tar -xf ${P}.${FPC_ARCH}-linux/binary.${FPC_ARCH}-linux.tar || die "Unpacking binary.${FPC_ARCH}-linux.tar failed!" + tar -xzf base.${FPC_ARCH}-linux.tar.gz || die "Unpacking base.${FPC_ARCH}-linux.tar.gz failed!" +} + +src_prepare() { + find "${WORKDIR}" -name Makefile -exec sed -i -e 's/ -Xs / /g' {} + || die + + # let the pkg manager compress man files + sed -i '/find man.* gzip /d' "${WORKDIR}"/fpcbuild-${PV}/install/man/Makefile || die +} + +set_pp() { + case ${ARCH} in + amd64) FPC_ARCH="x64" ;; + arm) FPC_ARCH="arm" ;; + ppc) FPC_ARCH="ppc" ;; + ppc64) FPC_ARCH="ppc64" ;; + sparc) FPC_ARCH="sparc" ;; + x86) FPC_ARCH="386" ;; + *) die "This ebuild doesn't support ${ARCH}." ;; + esac + + case ${1} in + bootstrap) pp="${WORKDIR}"/lib/fpc/${PV_BIN}/ppc${FPC_ARCH} ;; + new) pp="${S}"/compiler/ppc${FPC_ARCH} ;; + *) die "set_pp: unknown argument: ${1}" ;; + esac +} + +src_compile() { + local pp + + # Using the bootstrap compiler. + set_pp bootstrap + + emake -j1 PP="${pp}" compiler_cycle + + # Save new compiler from cleaning... + cp "${S}"/compiler/ppc${FPC_ARCH} "${S}"/ppc${FPC_ARCH}.new || die + + # ...rebuild with current version... + emake -j1 PP="${S}"/ppc${FPC_ARCH}.new compiler_cycle + + # ..and clean up afterwards + rm "${S}"/ppc${FPC_ARCH}.new || die + + # Using the new compiler. + set_pp new + + emake -j1 PP="${pp}" rtl_clean + + emake -j1 PP="${pp}" rtl packages_all utils + + if use ide ; then + cd "${S}"/ide || die + emake -j1 PP="${pp}" + fi +} + +src_install() { + local pp + set_pp new + + set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/fpcmake" \ + INSTALL_PREFIX="${D}"/usr \ + INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \ + INSTALL_MANDIR="${D}"/usr/share/man \ + INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source + + emake -j1 "$@" compiler_install rtl_install packages_install utils_install + + dosym ../lib/fpc/${PV}/ppc${FPC_ARCH} /usr/bin/ppc${FPC_ARCH} + + cd "${S}"/../install/doc || die + emake -j1 "$@" installdoc + + cd "${S}"/../install/man || die + emake -j1 "$@" installman + + if use doc ; then + cd "${S}"/../../doc || die + dodoc -r * + newdoc "${WORKDIR}"/${P}-fpctoc.htx fpctoc.htx + docompress -x /usr/share/doc/${PF}/fpctoc.htx + fi + + if use ide ; then + cd "${S}"/ide + emake -j1 "$@" install + fi + + if use source ; then + cd "${S}" || die + shift + emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall + find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; + fi + + "${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die + + sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die + + if use ide ; then + sed -e "s:${D}::g" \ + -i "${D}"/etc/fppkg.cfg \ + -i "${D}"/etc/fppkg/* \ + -i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ + || die + fi + + rm -r "${D}"/usr/lib/fpc/lexyacc || die +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && use ide; then + einfo "To read the documentation in the fpc IDE, enable the doc USE flag" + einfo "and add /usr/share/doc/${PF}/fpctoc.htx to the Help Files list." + fi +} diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest index 20d4a827d375..fd1b4e48f4e5 100644 --- a/dev-lang/lazarus/Manifest +++ b/dev-lang/lazarus/Manifest @@ -1,3 +1,4 @@ DIST lazarus-0.9.26-0.tgz 12641854 SHA256 d4c2dc8e8c797049d45d0c01aff51ea94fcae489efab7d4529afb6aeca8066dd SHA512 6c2b1610e40bc55ecd69f56ebfa97304abb024d12fe38ae52a4f39937e6734aa800102c21fa460be060f867d0371c69fdcc972e30051f592b94c21d54f1f0c6e WHIRLPOOL 725fbf9612736a9a619f0fbc8f8c7508975bd41b7a8d16cbcbea7fdffbf712f65d4617e5bdccc7f6094d57c80511922a50bbe40b9ee26c30213591a453ca5301 DIST lazarus-0.9.28.2-src.tar.bz2 12933724 SHA256 5711372c6724d19624be6cb8f6c397d789f3ac6fd7f70f825817ee47bd0e4dfd SHA512 bde0ac39237d60311f0295eacf27b330fe8b0eef2b5a687a02d8a1aca9a2ad6d279aa3c2ea6ac1d67f0aca383eb17cd85f249a98d876745fe830c79db6c69a21 WHIRLPOOL 39f7ae728f05e8216ed426044d7cf67ff0c0549bce6745b1949522bd9b820f7f15f5a4876b8f3954c498abd2f0f7247a0752a2e04e1e0c2f3f1aef498f004d03 +DIST lazarus-1.0.10-0.tar.gz 47688266 SHA256 61fd508c832a9c6a27e624be42257493999fe7a3b2f2ab30b9eccd4a2b4d3758 SHA512 e55100531a57de3daf931cb501ca58f57a35f1d17fe9ace1a3c6cbe995b17ecb300cf46636a6609349e81f29ecc7356dcba4c2b3ae01d23650650553650b7677 WHIRLPOOL 3c6efef7e6ddc89bc6ad7255a5d5f302c6e0825dd799b5fb73f75ec2819577825b109f73bc2e860302e0a8ffafd2fee4954455f51a5df7a5b588e5c4574eb4d3 DIST lazarus-1.0.4-1.tar.gz 46146420 SHA256 e3a52fe5a1053d12fa2c6a4c89faf5487c3184ad584324b0c640db87b5b85744 SHA512 26d17f175f71f593543f63de7dddaf5a4dc674df17657e242968280618c21e623acb446b18d49643ca872b53f3f1b81b9a09fabaced2a6f7419935121ac4f1fa WHIRLPOOL 0aa61a385ab812b4dd1b0abc7a57c95519bfc27a9c56b375af8484de299d7f6e439e5fa5504da2b7571b0def5526e960f35b6bdf2ec9efc118d534ca290c5f8c diff --git a/dev-lang/lazarus/lazarus-1.0.10.ebuild b/dev-lang/lazarus/lazarus-1.0.10.ebuild new file mode 100644 index 000000000000..36733d545e18 --- /dev/null +++ b/dev-lang/lazarus/lazarus-1.0.10.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-1.0.10.ebuild,v 1.1 2013/06/26 20:14:11 hasufell Exp $ + +EAPI=2 + +inherit eutils + +RESTRICT="strip" #269221 + +FPCVER="2.6.0" + +SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND. +LICENSE="GPL-2 LGPL-2.1-with-linking-exception" +KEYWORDS="~amd64 ~ppc ~x86" +DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi." +HOMEPAGE="http://www.lazarus.freepascal.org/" +IUSE="" +SRC_URI="http://downloads.sourceforge.net/project/${PN}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/lazarus-1.0.10-0.tar.gz" + +DEPEND=">=dev-lang/fpc-${FPCVER}[source] + net-misc/rsync + x11-libs/gtk+:2" +RDEPEND="${DEPEND} + !=gnome-base/librsvg-2.16.1" +DEPEND="${DEPEND} + >=sys-devel/binutils-2.19.1-r1" + +S=${WORKDIR}/${PN} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch + + # Use default configuration (minus stripping) unless specifically requested otherwise + if ! test ${PPC_CONFIG_PATH+set} ; then + local FPCVER=$(fpc -iV) + export PPC_CONFIG_PATH="${WORKDIR}" + sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg | + sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die + #sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die + fi +} + +src_compile() { + LCL_PLATFORM=gtk2 emake -j1 || die "make failed!" +} + +src_install() { + diropts -m0755 + dodir /usr/share + # Using rsync to avoid unnecessary copies and cleaning... + # Note: *.o and *.ppu are needed + rsync -a \ + --exclude="CVS" --exclude=".cvsignore" \ + --exclude="*.ppw" --exclude="*.ppl" \ + --exclude="*.ow" --exclude="*.a"\ + --exclude="*.rst" --exclude=".#*" \ + --exclude="*.~*" --exclude="*.bak" \ + --exclude="*.orig" --exclude="*.rej" \ + --exclude=".xvpics" --exclude="*.compiled" \ + --exclude="killme*" --exclude=".gdb_hist*" \ + --exclude="debian" --exclude="COPYING*" \ + --exclude="*.app" \ + "${S}" "${D}"usr/share \ + || die "Unable to copy files!" + + dosym ../share/lazarus/startlazarus /usr/bin/startlazarus + dosym ../share/lazarus/startlazarus /usr/bin/lazarus + dosym ../share/lazarus/lazbuild /usr/bin/lazbuild + dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png + + make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!" +} diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index d639199b7b40..e9eeb0e8c5df 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -7,4 +7,6 @@ DIST mercury-extras-11.07.2-gentoo-patchset-3.tar.gz 5320 SHA256 c6d0e12325e4bff DIST mercury-extras-11.07.2.tar.gz 774067 SHA256 424cd1e642a49f4c463e20851ba185ce60186c7c46aed96c7f32f55e41ae482b SHA512 162358a22f020f61310c29aa61c480fee0a02aff2749a89956493bed43aafe89e92427578697eb1e8e43e73acde1d19f1b9bc85705ff448e5fa8cdaf92b749c5 WHIRLPOOL 24b7093a2ed72441aafd3a1ffa84c5b9458d5fddaedb1eb46dcb66e52cc21dc0dd5ded14067c0b0be040ae5de0a14ebf5341b5c87720390b5892a872f32e9d11 DIST mercury-extras-11.07.tar.gz 776589 SHA256 25eaf999666ceb4217cfe0f9fbcb38b892c57fb36efaa16099a471287a7a9019 SHA512 ea2c3231cbb32dc91f36d1d09a5bdac65b468bff64f79aab46baa0e7e9460f75fa5239c96b5b2a616aebb499954b62d8ac7acea93fa971df1e7d81955ca0c5ea WHIRLPOOL 9617163e15b44bf373d5e9204dd8882c4921ed56a38ec41aabd7a81eda1aebedade70e7cfa0eeb21d46349e64fc9ed565cb1eb12dd49c98b8d5dfacdb49fd229 DIST mercury-extras-13.05-gentoo-patchset-0.tar.gz 6333 SHA256 36d286a20f70e21262ac8d19004400df0a356ef7a85763027ef36f16d7de17cc SHA512 78c1391607e1a8a76c091deef112e9c4e0004fb63b9fe461c3100f2dd6ca03efe069036b081b4de8b4399052a1b10f0ef02188cc2def3d47f6aceb1b61c168c3 WHIRLPOOL 72b16b5948b2fb8048496f094e0c2343af0723f33ebbd024a7e8c0785fc949b2226f3ef78fba16a65903b1675f1280f6a3d35dab1d276203b845f140ccd3e4a7 +DIST mercury-extras-13.05.1-gentoo-patchset-0.tar.gz 3423 SHA256 b15b87c86313e9a038f6ab55c9b47bc9f8eaca51aedf578a9d9e6ab1dc785d9b SHA512 51ade5a5c99fdd0417afb8c0f78c6a5c77d2161091894b62d570ad8d614f2f614e07bb07cbdf5212fd2ca8b6d67778717856a7939e506c56b1597ec05d18c6c4 WHIRLPOOL 7ed609dcde3ac5a89ddebc99365f4e13f50eddb8d6685e40fdf227842b5edfbcaf0bf6a8621696d1484970666fb303e828c5a0d4877e98fb6df6cca147b73a70 +DIST mercury-srcdist-13.05.1.tar.gz 54558577 SHA256 a90de00fc5905a8421675b04dc3c9d5eda54bedaf8b2ebcefae4de551fbcfd2c SHA512 784069af3ba470e9618e5b7917873e8ad7f4e9dc27eb54afa74eb6d6e659dcfab7007ae93163937412f9eb1b997a327d4378dcd868810c08880d4fa4542dfade WHIRLPOOL ec7281a6e01523b296dcfce595189cb96ad693c9b36ab60cbc6b61672333f5c8d7d9def10cc3c5bba876fddf0eefea3e9c22c1b98ee577d1b6d6aab6d1267915 DIST mercury-srcdist-13.05.tar.gz 54533409 SHA256 71f1f97484eaecf2c2f91f6731e23afc5cee966e149b61a7525b2bd9a2712d55 SHA512 d76fd3a0c487b2c65168b19ec6a5ea6b792c96692e029afe0589f93132422fc39e0aec856ae02e676cc30dc83780f9c4d4e0ea5f71681442279b900146b58c47 WHIRLPOOL b2cc0f1b074d980701c6d364f30f8bb2dd2556cbc23dca5a982b7c16b71c6834d7c81ea76bfcea25e369f32d606698b77eea168e3b25d4850f924dfa4f6929f4 diff --git a/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild b/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild new file mode 100644 index 000000000000..f50f3c8be6b5 --- /dev/null +++ b/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-13.05.1.ebuild,v 1.1 2013/06/27 13:22:10 keri Exp $ + +EAPI=2 + +inherit eutils multilib + +PATCHSET_VER="0" +MY_P=mercury-srcdist-${PV} + +DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" +HOMEPAGE="http://www.mercurylang.org/index.html" +SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml" + +RDEPEND="~dev-lang/mercury-${PV} + cairo? ( >=x11-libs/cairo-1.10.0 ) + glut? ( media-libs/freeglut ) + odbc? ( dev-db/unixODBC ) + iodbc? ( !odbc? ( dev-db/libiodbc ) ) + ncurses? ( sys-libs/ncurses ) + opengl? ( virtual/opengl ) + tcl? ( tk? ( + dev-lang/tcl + dev-lang/tk + x11-libs/libX11 + x11-libs/libXmu ) )" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/${MY_P}/extras + +src_prepare() { + cd "${WORKDIR}" + + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} + + if use odbc; then + epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch + elif use iodbc; then + epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch + fi + + cd "${S}" + sed -i -e "s:references:references solver_types/library:" \ + -e "s:windows_installer_generator::" \ + Mmakefile || die "sed default packages failed" + + if use cairo; then + sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_cairo lex \\\\:" Mmakefile \ + || die "sed cairo failed" + fi + + if use glut; then + sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_glut lex \\\\:" Mmakefile \ + || die "sed glut failed" + fi + + if use opengl; then + sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_opengl lex \\\\:" Mmakefile \ + || die "sed opengl failed" + fi + + if use tcl && use tk; then + sed -i -e "s:lex[ \t]*\\\\:graphics/mercury_tcltk lex \\\\:" Mmakefile \ + || die "sed tcltk failed" + fi + + if use odbc || use iodbc; then + sed -i -e "s:moose:moose odbc:" Mmakefile \ + || die "sed odbc failed" + fi + + if use ncurses; then + sed -i -e "s:complex_numbers:complex_numbers curs curses:" Mmakefile \ + || die "sed ncurses failed" + fi + + if ! use xml; then + sed -i -e "s:xml::" Mmakefile \ + || die "sed xml failed" + fi + + sed -i -e "s:@libdir@:$(get_libdir):" \ + dynamic_linking/Mmakefile \ + || die "sed libdir failed" + + # disable broken packages + sed -i -e "s:references::" Mmakefile \ + || die "sed broken packages failed" +} + +src_compile() { + # Mercury dependency generation must be run single-threaded + mmake \ + -j1 depend || die "mmake depend failed" + + # Compiling Mercury submodules is not thread-safe + mmake -j1 \ + EXTRA_MLFLAGS=--no-strip \ + EXTRA_LDFLAGS="${LDFLAGS}" \ + EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ + || die "mmake failed" +} + +src_install() { + # Compiling Mercury submodules is not thread-safe + mmake -j1 \ + EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ + INSTALL_PREFIX="${D}"/usr \ + install || die "mmake install failed" + + find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm + + cd "${S}" + if use examples; then + insinto /usr/share/doc/${PF}/samples/base64 + doins base64/*.m || die + + insinto /usr/share/doc/${PF}/samples/complex_numbers + doins complex_numbers/samples/* || die + + insinto /usr/share/doc/${PF}/samples/dynamic_linking + doins dynamic_linking/hello.m || die + + insinto /usr/share/doc/${PF}/samples/error + doins error/* || die + + insinto /usr/share/doc/${PF}/samples/fixed + doins fixed/*.m || die + + insinto /usr/share/doc/${PF}/samples/gator + doins -r gator/* || die + + insinto /usr/share/doc/${PF}/samples/lex + doins lex/samples/* || die + + insinto /usr/share/doc/${PF}/samples/log4m + doins log4m/*.m || die + + insinto /usr/share/doc/${PF}/samples/monte + doins monte/*.m || die + + insinto /usr/share/doc/${PF}/samples/moose + doins moose/samples/* || die + + insinto /usr/share/doc/${PF}/samples/net + doins net/*.m || die + + if use ncurses; then + insinto /usr/share/doc/${PF}/samples/curs + doins curs/samples/* || die + + insinto /usr/share/doc/${PF}/samples/curses + doins curses/sample/* || die + fi + + if use X; then + insinto /usr/share/doc/${PF}/samples/graphics + doins graphics/easyx/samples/*.m || die + fi + + if use glut && use opengl; then + insinto /usr/share/doc/${PF}/samples/graphics + doins graphics/samples/calc/* || die + doins graphics/samples/gears/* || die + doins graphics/samples/maze/* || die + doins graphics/samples/pent/* || die + fi + + if use opengl && use tcl && use tk; then + insinto /usr/share/doc/${PF}/samples/graphics + doins graphics/samples/pent/*.m || die + fi + + if use ssl; then + insinto /usr/share/doc/${PF}/samples/mopenssl + doins mopenssl/*.m || die + fi + + rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS) + fi + + dodoc README || die +} diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 29dd0a36d901..5e25cb9efe7a 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -3,10 +3,12 @@ DIST mercury-11.07-gentoo-patchset-0.tar.gz 6889 SHA256 2fce2c95b6cb8b5819fb576d DIST mercury-11.07.1-gentoo-patchset-4.tar.gz 7336 SHA256 477cde26b06650b96accdc32da4bb7edb382b8ad8a2ed3908a985d895070ad4a SHA512 1ae54d05cac374ac02f7368b19ba98567d7c513d471fc98e27f0d794137ff920d42acf7105e6652e6610b4ffec74c3f5b282e81668735a626f8d762d8192d1c4 WHIRLPOOL 529f6e4675b0437dffa83f6cdc5daf4d8c7e9a59e81dc0f6c54cc35be7255fca0ddb6afca4257bc960ded245b50b80cbeaf80c9d2b589fc92564845884f218c5 DIST mercury-11.07.2-gentoo-patchset-0.tar.gz 7265 SHA256 d400e40ae62c5cb8e777c2409d70eee7f71f231733a95fd6549f82c6c2933500 SHA512 110e0aacd1ef274d9c7154b359267ec0277e680fe2bb9ec4942dfc167c4f02dfef85fbd205120875e485f1b186432157814891ea9f1d0d55f0cdf236b0a80257 WHIRLPOOL 9002362cc04943558399dc4350a9368d12ce6d9717afe42e7c150ad55c8b2fe326697bdea6e457c1b3611d448ecdf7b171219e23a123aec2d0e70f14ab443afa DIST mercury-13.05-gentoo-patchset-0.tar.gz 5947 SHA256 8af2076b571215e403079fab840bf4a769ff67ec1ebfdf7b92bf203a503acb99 SHA512 0662126b9802fe9cd6156b204dc28b4e02a7d55fc5f88e97717c7aeb764014ed537822c5a2d2a5520a6b78c092d2fe25b603f05e1e6d19821b7b2905aad53d0c WHIRLPOOL 56a10ac2503fe87099f29294d44a58902192c18a95d438908fbb31969050289ecd8461fc3188368309d1693bd89e1380c140e58d165d02bf5d8f10e4ccbf30e5 +DIST mercury-13.05.1-gentoo-patchset-0.tar.gz 6013 SHA256 d9cfe7017f234d361f51e0dad1a0f6cdcbf82bf841c312660ffd76d6cdada71a SHA512 8f0a8cd4bf814c8d6903843b4e264da4708cf352439116766a63d5d68ef1043543d53b5729f38e5fef0272c006913b3e6c839c37f1e3486fc6f8d382b280aaee WHIRLPOOL a89cf3170498af1f3ffbd5d56db216932f9c96109b4f2c1c267b51e3f81f1f9e0fe7e755a8d86e8a0cc7eb6c4487918ea2ae9738377a7dd4d369f328b3f7d208 DIST mercury-compiler-11.01.tar.gz 25122699 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0 SHA512 628eb95cc647a3334ed6cc9cdb19256dece544cac34600db2a495815215b494db74b1f196e3c48ba1cbb37b51404158d5a583caa20fd3e53488111927615b666 WHIRLPOOL 6720586514dfa954e8e777986d7b62fd2fb10ce1a309034bdc4e40431762c834cba98e93b129e69ba5a78451cd0f776fe916bce2b15996d1621cab59215481a6 DIST mercury-compiler-11.07.1.tar.gz 25308185 SHA256 f3f1d4f0fb34567a69aaa9fb6f4ecff52b97a66ab6c8a868c4e284eb61d3dc11 SHA512 c102a1f2c2ed4384919685e3e11ba3b7da0152f6fe8899c2124e9bbb056ab81a5e2fc1dbb07934ca011ed96e7c6af168308c64eb4901db7d247fffd2ff226c4f WHIRLPOOL 6df5a68a9c0adc6d5ae490bd909951d8330db2c4e0bb704ab9be0fe8cdf7177093cd0943256fcbea8d666793d3d53c20b8c703deca43121114d89f1a508f32d5 DIST mercury-compiler-11.07.2.tar.gz 25311504 SHA256 8afee5732d6d52343fbba8d6b9dd3f87b819673743a408a564eede17956ea659 SHA512 144f496cdfbdb88e15a18b3c295d326ebb1054055c42cb1a5fd634b79797c8dbd46ef5d1731f4c4cb1add02795e9b7d1d72e0426c39e672e208f10068e65df8b WHIRLPOOL a443bad02d714737aa2e1875205915db78bc776cf75f01f98e99efab992a5a542c86772615e9a4066b1143977e354441f07a033ef81a2d8f464226004f5de198 DIST mercury-compiler-11.07.tar.gz 25298643 SHA256 77940d03834a3967e4505c4a92253c19aaea0fed4650ee94e772078abd6be6a2 SHA512 671bebb67ceca8af0844c2ba0d9db538564d3b324a913141be29c7632adb7a343b93fe771533173d5460ac34d5a69fd18b3ef7f55b26c0d0ee70b7cc2e35f10d WHIRLPOOL 992f5f52292066b775b264401f25b5e8ef246ced9b79c0ec06701f715e22e068ad81a17dea49f62bd72bc9cc0539b2ef7beb9be1401391209e2ab1e3876d0bfc +DIST mercury-srcdist-13.05.1.tar.gz 54558577 SHA256 a90de00fc5905a8421675b04dc3c9d5eda54bedaf8b2ebcefae4de551fbcfd2c SHA512 784069af3ba470e9618e5b7917873e8ad7f4e9dc27eb54afa74eb6d6e659dcfab7007ae93163937412f9eb1b997a327d4378dcd868810c08880d4fa4542dfade WHIRLPOOL ec7281a6e01523b296dcfce595189cb96ad693c9b36ab60cbc6b61672333f5c8d7d9def10cc3c5bba876fddf0eefea3e9c22c1b98ee577d1b6d6aab6d1267915 DIST mercury-srcdist-13.05.tar.gz 54533409 SHA256 71f1f97484eaecf2c2f91f6731e23afc5cee966e149b61a7525b2bd9a2712d55 SHA512 d76fd3a0c487b2c65168b19ec6a5ea6b792c96692e029afe0589f93132422fc39e0aec856ae02e676cc30dc83780f9c4d4e0ea5f71681442279b900146b58c47 WHIRLPOOL b2cc0f1b074d980701c6d364f30f8bb2dd2556cbc23dca5a982b7c16b71c6834d7c81ea76bfcea25e369f32d606698b77eea168e3b25d4850f924dfa4f6929f4 DIST mercury-tests-11.01.tar.gz 1351134 SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad SHA512 7cd0c2a5f3ef2b05ea32ea8867f788c583a9da96b6e3b4ed9c2ec5705fc7384c0811da782ed50b6d7f60963680036e116684b5bcc3f5f72cf6f0b319480ad997 WHIRLPOOL 298a898b970da20f64530cf736b5f901cc61ef028117f2434135b9efc77223e120a71e97373d494cdb89b422ef9bbf02ef51db4be3c383ffd6facaabb2018c6a DIST mercury-tests-11.07.1.tar.gz 1648437 SHA256 01558a6ddd28d2f832d88da8bbf38fec542d091fc53b5adf92fac5e2564c2057 SHA512 1b8f3749091e6a3cd8d3f07ca7ff87c20d9c90761c6dbf35253f68f4cb4ccb42310d66ebc98742508a4e1f6fb4d6497e7e34f10b2601ffec73694702f1b363b5 WHIRLPOOL 66cd530de280d34a037cc191818abb6f11bf4ea8f6f3143629883ff2d885350bdd8841215b6076d5b6ea2102d6ef913a9324d997fd287af12eed0cbe708692b2 diff --git a/dev-lang/mercury/mercury-13.05.1.ebuild b/dev-lang/mercury/mercury-13.05.1.ebuild new file mode 100644 index 000000000000..18f0da6ecf19 --- /dev/null +++ b/dev-lang/mercury/mercury-13.05.1.ebuild @@ -0,0 +1,197 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-13.05.1.ebuild,v 1.1 2013/06/27 13:19:07 keri Exp $ + +EAPI=2 + +inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib + +PATCHSET_VER="0" +MY_P=${PN}-srcdist-${PV} + +DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" +HOMEPAGE="http://www.mercurylang.org/index.html" +SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug emacs erlang examples java minimal readline threads" + +DEPEND="!dev-libs/mpatrol + !dev-util/mono-debugger + readline? ( sys-libs/readline ) + erlang? ( dev-lang/erlang ) + java? ( >=virtual/jdk-1.5 )" + +RDEPEND="${DEPEND} + emacs? ( virtual/emacs )" + +S="${WORKDIR}"/${MY_P} + +SITEFILE=50${PN}-gentoo.el + +src_prepare() { + cd "${WORKDIR}" + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} + + sed -i -e "s/@libdir@/$(get_libdir)/" \ + "${S}"/scripts/Mmake.vars.in \ + || die "sed libdir failed" + + cd "${S}" + eautoconf +} + +src_configure() { + strip-flags + + local myconf + myconf="--libdir=/usr/$(get_libdir) \ + --disable-deep-profiler \ + --disable-dotnet-grades \ + --without-hwloc \ + $(use_enable erlang erlang-grade) \ + $(use_enable java java-grade) \ + $(use_enable debug debug-grades) \ + $(use_enable threads par-grades) \ + $(use_enable !minimal most-grades) \ + $(use_with readline)" + + econf ${myconf} +} + +src_compile() { + # Build Mercury using base llds grade + emake \ + PARALLEL=${MAKEOPTS} \ + MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ + EXTRA_LDFLAGS='${LDFLAGS}' \ + EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ + || die "emake failed" + + # We can now patch .m Mercury compiler files since we + # have just built mercury_compiler. + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV}-mmc + + sed -i -e "s/@libdir@/$(get_libdir)/" \ + "${S}"/compiler/file_util.m \ + "${S}"/compiler/make.program_target.m \ + || die "sed libdir failed" + + # Rebuild Mercury compiler using the just built mercury_compiler + emake \ + PARALLEL=${MAKEOPTS} \ + MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ + EXTRA_LDFLAGS='${LDFLAGS}' \ + EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ + MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + compiler || die "emake compiler failed" + + # The default Mercury grade may not be the same as the grade used to + # compile the llds base grade. Since src_test() is run before + # src_install() we compile the default grade now + emake \ + PARALLEL=${MAKEOPTS} \ + MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ + EXTRA_LDFLAGS='${LDFLAGS}' \ + EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ + MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + default_grade || die "emake default_grade failed" +} + +src_test() { + TEST_GRADE=`scripts/ml --print-grade` + if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then + TWS="${S}"/install_grade_dir.${TEST_GRADE} + cp runtime/mer_rt.init "${TWS}"/runtime/ + cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ + cp browser/mer_browser.init "${TWS}"/browser/ + else + TWS="${S}" + fi + + cd "${S}"/tests + sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \ + || die "sed WORKSPACE failed" + + # Mercury tests must be run in C locale since Mercury output is + # compared to hard-coded warnings/errors + LC_ALL="C" \ + PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \ + TERM="" \ + WORKSPACE="${TWS}" \ + WORKSPACE_FLAGS=yes \ + MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ + MMAKE_DIR="${TWS}"/scripts \ + MERCURY_SUPPRESS_STACK_TRACE=yes \ + GRADE=${TEST_GRADE} \ + MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \ + -I${TWS}/runtime \ + -I${TWS}/library" \ + mmake || die "mmake test failed" +} + +src_install() { + emake \ + PARALLEL=${MAKEOPTS} \ + MMAKEFLAGS="EXTRA_LDFLAGS='${LDFLAGS}' \ + EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ + MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + INSTALL_PREFIX="${D}"/usr \ + INSTALL_MAN_DIR="${D}"/usr/share/man \ + INSTALL_INFO_DIR="${D}"/usr/share/info \ + INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ + INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ + install || die "emake install failed" + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ + || die "elisp-site-file-install failed" + fi + + dodoc \ + BUGS HISTORY LIMITATIONS NEWS README README.Linux \ + README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ + RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die + + if use erlang; then + dodoc README.Erlang || die + fi + + if use java; then + dodoc README.Java || die + fi + + if use examples; then + insinto /usr/share/doc/${PF}/samples + doins samples/{*.m,README,Mmakefile} || die + doins -r samples/c_interface \ + samples/diff \ + samples/muz \ + samples/rot13 \ + samples/solutions \ + samples/solver_types || die + + if use java; then + doins -r samples/java_interface || die + fi + + rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \ + -name CVS -o -name .cvsignore) + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild b/dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild index eb10fc7c41d7..afbccbe656db 100644 --- a/dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild +++ b/dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild,v 1.1 2013/05/20 14:34:36 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/MicroJSON/MicroJSON-0.3.1.ebuild,v 1.3 2013/06/27 13:49:29 pinkbyte Exp $ EAPI="5" @@ -11,7 +11,7 @@ HOMEPAGE="http://grigory.info/${PN}.About.html" SRC_URI="http://grigory.info/distfiles/${P}.tar.bz2" LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" SLOT="0" RDEPEND=">=dev-libs/UTF8Strings-1.12.0" diff --git a/dev-libs/UTF8Strings/UTF8Strings-1.14.0.ebuild b/dev-libs/UTF8Strings/UTF8Strings-1.14.0.ebuild index b110ea58e7cc..685793a49d42 100644 --- a/dev-libs/UTF8Strings/UTF8Strings-1.14.0.ebuild +++ b/dev-libs/UTF8Strings/UTF8Strings-1.14.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/UTF8Strings/UTF8Strings-1.14.0.ebuild,v 1.1 2013/05/21 16:37:23 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/UTF8Strings/UTF8Strings-1.14.0.ebuild,v 1.2 2013/06/27 13:48:47 pinkbyte Exp $ EAPI="5" @@ -11,5 +11,5 @@ HOMEPAGE="http://grigory.info/${PN}.About.html" SRC_URI="http://grigory.info/distfiles/${P}.tar.bz2" LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" diff --git a/dev-perl/Class-Inspector/Class-Inspector-1.280.0.ebuild b/dev-perl/Class-Inspector/Class-Inspector-1.280.0.ebuild index 7d0f3f207942..442e4098519d 100644 --- a/dev-perl/Class-Inspector/Class-Inspector-1.280.0.ebuild +++ b/dev-perl/Class-Inspector/Class-Inspector-1.280.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Inspector/Class-Inspector-1.280.0.ebuild,v 1.2 2013/01/13 13:47:38 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Inspector/Class-Inspector-1.280.0.ebuild,v 1.4 2013/06/27 11:35:48 pinkbyte Exp $ EAPI=4 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Provides information about Classes" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" SRC_TEST="do" diff --git a/dev-python/flask/files/docbuild.patch b/dev-python/flask/files/docbuild.patch deleted file mode 100644 index c9675300a096..000000000000 --- a/dev-python/flask/files/docbuild.patch +++ /dev/null @@ -1,19 +0,0 @@ -Avoid un-needed objects.inv files drom d'loading for docs build -diff -ur Flask-0.9.orig/docs/conf.py Flask-0.9/docs/conf.py ---- docs/conf.py 2012-07-01 19:10:19.000000000 +0800 -+++ docs/conf.py 2013-06-09 00:21:57.757485401 +0800 -@@ -243,14 +243,6 @@ - # The depth of the table of contents in toc.ncx. - #epub_tocdepth = 3 - --intersphinx_mapping = { -- 'http://docs.python.org/dev': None, -- 'http://werkzeug.pocoo.org/docs/': None, -- 'http://www.sqlalchemy.org/docs/': None, -- 'http://wtforms.simplecodes.com/docs/0.5/': None, -- 'http://discorporate.us/projects/Blinker/docs/1.1/': None --} -- - pygments_style = 'flask_theme_support.FlaskyStyle' - - # fall back if theme is not there diff --git a/dev-python/flask/flask-0.10.1.ebuild b/dev-python/flask/flask-0.10.1.ebuild index e2f5e8030139..aa6e00011b6c 100644 --- a/dev-python/flask/flask-0.10.1.ebuild +++ b/dev-python/flask/flask-0.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1.ebuild,v 1.1 2013/06/16 22:52:40 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1.ebuild,v 1.2 2013/06/27 01:56:37 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_3} ) @@ -20,7 +20,7 @@ IUSE="examples test" RDEPEND="dev-python/blinker[${PYTHON_USEDEP}] >=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}] - >=dev-python/jinja-2.4[$(python_gen_usedep python{2_6,2_7} 'pypy*')] + >=dev-python/jinja-2.4[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild index c5b17f9ab6fb..fc70e0509756 100644 --- a/dev-python/flask/flask-9999.ebuild +++ b/dev-python/flask/flask-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-9999.ebuild,v 1.5 2013/06/16 22:52:40 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-9999.ebuild,v 1.6 2013/06/27 02:24:57 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_3} ) @@ -25,7 +25,7 @@ IUSE="examples test" RDEPEND="dev-python/blinker[${PYTHON_USEDEP}] >=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}] - >=dev-python/jinja-2.4[$(python_gen_usedep python{2_6,2_7} 'pypy*')] + >=dev-python/jinja-2.4[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest new file mode 100644 index 000000000000..ae56238afe7f --- /dev/null +++ b/dev-python/google-api-python-client/Manifest @@ -0,0 +1 @@ +DIST google-api-python-client-1.1.tar.gz 71178 SHA256 bc88cae1c40446f22d58923fc5a8dbac77da29d6efbe4ae2276cc2f30f724617 SHA512 750c482e90f83d0b2d53f7d655db9a476686158b5e380cab7a5e92af1b521b26871dcda08a2ee946cd09035f65ca50ad8dcffa8f766d3671fceae009fbdb831e WHIRLPOOL 62d2ebb7f51f58c76b45f748fe79b031cda5f11fd6088d8ea947e7ab9b9b754688e004773f99169cc65fdd2789002faa486bed7717fc07dea0b25994cbede0da diff --git a/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild new file mode 100644 index 000000000000..756394ee2333 --- /dev/null +++ b/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/google-api-python-client/google-api-python-client-1.1.ebuild,v 1.1 2013/06/27 03:12:32 robbat2 Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} ) + +inherit distutils-r1 + +DESCRIPTION="Google API Client for Python" +HOMEPAGE="http://code.google.com/p/google-api-python-client/" +SRC_URI="https://google-api-python-client.googlecode.com/files/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/python-gflags + >=dev-python/httplib2-0.8 + dev-python/simplejson + dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + + diff --git a/dev-python/google-api-python-client/metadata.xml b/dev-python/google-api-python-client/metadata.xml new file mode 100644 index 000000000000..3da7d2b1eec1 --- /dev/null +++ b/dev-python/google-api-python-client/metadata.xml @@ -0,0 +1,9 @@ + + + + +robbat2@gentoo.org +Robin H. Johnson + + + diff --git a/dev-python/itsdangerous/itsdangerous-0.21.ebuild b/dev-python/itsdangerous/itsdangerous-0.21.ebuild index 2722d1ca7648..3226ec507f3a 100644 --- a/dev-python/itsdangerous/itsdangerous-0.21.ebuild +++ b/dev-python/itsdangerous/itsdangerous-0.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.21.ebuild,v 1.1 2013/06/14 03:17:21 rafaelmartins Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/itsdangerous/itsdangerous-0.21.ebuild,v 1.2 2013/06/27 02:13:22 floppym Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} ) @@ -17,4 +17,4 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND="" -DEPEND="${RDEPEND}" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest index 3f8e20b4b4f8..4165159964b1 100644 --- a/dev-python/python-ldap/Manifest +++ b/dev-python/python-ldap/Manifest @@ -2,8 +2,6 @@ DIST python-ldap-2.3.13.tar.gz 112397 SHA256 417ae3f6e2f680461611dc60c95ac9fcb3c DIST python-ldap-2.3.9.tar.gz 108209 SHA256 62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4 SHA512 7470c476c44b0a8ae1498fddac5f0c6ba64bd305742df578ad204f21348dbcec61624b9da15d32c14c9120a2104137d37727e9df5ebf74e380ab607c496bbbe7 WHIRLPOOL dd7502911349e3ab31ef9f7e67616aee0fff1aae2e2527f2597ec79a65190768397b1fd688eaa5b32502f944f8d3f162333d8b5d97d9b47cee8754d1fabfb735 DIST python-ldap-2.4.10.tar.gz 134153 SHA256 67cc7801bf24c29386ab99966ceb68d6a60fa9e0566cc95a4fbb2c4695a8ce54 SHA512 9f59c87acec4cc8f958c7dbea0ca82aa30f46ef7ff44c5cc424bbc37ccb7a15bf669262ad96e209cdbe4da21e33f46aa85fea736ae76363adb98de915ecac380 WHIRLPOOL c28772aad5d2cfdefc8a6dc9dfe5a29259bdd219038e6e71d2ff35580254e6cb434e5ba485be5eddbc74490012d0046d45ff1d16e222e079b6efabb6f4bcca85 DIST python-ldap-2.4.12.tar.gz 135395 SHA256 8587f8007c603b09ea6aa72fd63f1619b8a0d7f97e81ce955a44e8f84c7c9088 SHA512 9cd5f35d374e1cdd6b01473e978a90478416dec46c566f3a347c44839b54f8a2aa255504acbc88a73e1ad0ac836445546830f28764542b10a6255f890052598e WHIRLPOOL 90bfe55e3ba91cf3bca7e4bf6812d5944a3a311b0652306a836bc2d26bc37882f481775ae713ea540165bcad73e6fe3d5c4634b2b4800e6f3289aea8f72b7681 -DIST python-ldap-2.4.3.tar.gz 125989 SHA256 88fb00ed5811e3df49d0f28317a48be2ae7e46252e473923005c7eb292d25e9d SHA512 30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd WHIRLPOOL ba1c65152d1dd6e8e64de1326b59a970829cb338e9f6b2c7f44345e96f7fed28ef5e515c75512f82d56431f2e79d63a22b6abe530ef61b3324f74aa39b91638b -DIST python-ldap-2.4.9.tar.gz 133453 SHA256 247c29f30faf016f0d1dbe702a5026a4633dfa9b8b90c7ef46de68a58424ee8b SHA512 ad32baed734e232d77994cdf01c6d263409b66a7cae5ff6cea3b1852c1999617e32643f06119d39b299b7c5f54f8a2a03c55a5a7dcc31cad6f4cdcdcba63ec26 WHIRLPOOL b011a5303437df6422047b525718c7b4bcf19c6a83cb956dcdc86bb333108f24cd1fa9b228b5349a9c389c68551bf39891e5f6427cad86036c08ff818ff2173e +DIST python-ldap-2.4.13.tar.gz 135550 SHA256 96853b9bbdacb341d6a3d60fdc89f8cb8acef47970ce8492ee3cbe975b9c7dbf SHA512 c77c487b48fa63b9bb9926fca0082834f6a2c6c7e9be89849e59b45a9e7c18146e4a7a982fe0a0504659ba680c39823eea29f349842a9f8df36acf8f10bab975 WHIRLPOOL 0c70cff4f7c41b514befb517fbe89e39bc426bd0fa0b7164781c82d14a99213d6da5d89bba371cdfd5c373d4152cee2f19c19f3e4e65d3aff8e79bcbb41320ae DIST python-ldap-docs-html-2.3.13.tar.gz 118531 SHA256 8ea9eee3135db006489268733e49ab1e80906ca2bc9e7960f19e548506ce08a4 SHA512 d4edca6b627b4c9449f1ddbda41ae793664924a41b05046b005909002a23cf8e830ab7178cc1173a373f6675e1e97af0e24232baf837ec9fa859888c8c4568f6 WHIRLPOOL f9117dc1bab2368b2976f97437bd03fba3870c5503492e73f1ef9cba4407cf777dbd91dea54f835d8ea4d01e592bb21c59ea7a52b9b8fb4d688915d37163e55e DIST python-ldap-docs-html-2.3.9.tar.gz 116913 SHA256 de8b4d91e1a35702d993f7d744fcc5a3e7cbf5be543d2d127791cda9df361124 SHA512 fe3259fbbc2620d88912e12d3d7c36776a9f2bc62bdfb704b1ff9671240badaf95bf28e5b93fcf738964f321c02c81f45deb6bb1f49d6d035a0b9990ee9d9279 WHIRLPOOL d85ebb31948c1b5baf7fd49340f1b9239a74c446ebf997e5800c5df7e4db0053ed5df356ea8697adf247b2b5fc34bf5fc92d3903b6f78408eec90b038761e092 -DIST python-ldap-docs-html-2.4.3.tar.gz 58672 SHA256 2f3a916453bc38d8644635a325eaed2944b265b3146710109e75cd6a3c518e26 SHA512 15c97fb90ee98d56d3b92bb225425bc964b208842a63bf916e76f25442b41958f6340c258cbde7a11eee2f22180b2fe1d8968b39c06e937ad9c477a2a1715cf3 WHIRLPOOL c26760e44af76b2354f15aa6d2d3efc3cc056fe4ac4dd5741efa66f6c52884758d85f2ade24ebd10781cc74742e2e89decd66b743ab0ed79a636bcd6ce35d20c diff --git a/dev-python/python-ldap/metadata.xml b/dev-python/python-ldap/metadata.xml index 72ad4032c311..c60eaa2fade6 100644 --- a/dev-python/python-ldap/metadata.xml +++ b/dev-python/python-ldap/metadata.xml @@ -2,6 +2,11 @@ python + + xmw@gentoo.org + Michael Weber + Upstream of the python3 port + python-ldap diff --git a/dev-python/python-ldap/python-ldap-2.3.13.ebuild b/dev-python/python-ldap/python-ldap-2.3.13.ebuild index 5c0450ed50c2..bcb3b624c354 100644 --- a/dev-python/python-ldap/python-ldap-2.3.13.ebuild +++ b/dev-python/python-ldap/python-ldap-2.3.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.13.ebuild,v 1.14 2012/11/14 08:17:33 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.13.ebuild,v 1.15 2013/06/27 14:29:10 xmw Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -34,10 +34,10 @@ PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap" src_prepare() { local rpath= # sloppy logic, maybe better check if compiler links with GNU-ld - [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2" + [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=\"${EPREFIX}\"/usr/$(get_libdir)/sasl2" # Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4 sed -e "s:^library_dirs =.*:library_dirs =:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ + -e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \ -e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \ -i setup.cfg || die "error fixing setup.cfg" diff --git a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild index 28e0c7ed0833..cd676f9a5861 100644 --- a/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild,v 1.3 2013/04/06 00:50:31 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10-r1.ebuild,v 1.4 2013/06/27 14:29:10 xmw Exp $ EAPI=5 @@ -29,7 +29,7 @@ DEPEND="${RDEPEND} python_prepare_all() { sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ + -e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \ -i setup.cfg || die "error fixing setup.cfg" local mylibs="ldap" diff --git a/dev-python/python-ldap/python-ldap-2.4.10.ebuild b/dev-python/python-ldap/python-ldap-2.4.10.ebuild index 9a0d26769f4f..63352e6cca5b 100644 --- a/dev-python/python-ldap/python-ldap-2.4.10.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10.ebuild,v 1.9 2012/12/27 09:24:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.10.ebuild,v 1.10 2013/06/27 14:29:10 xmw Exp $ EAPI=4 @@ -33,10 +33,10 @@ PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap" src_prepare() { local rpath= # sloppy logic, maybe better check if compiler links with GNU-ld - [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2" + [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=\"${EPREFIX}\"/usr/$(get_libdir)/sasl2" # Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4 sed -e "s:^library_dirs =.*:library_dirs =:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ + -e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \ -e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \ -i setup.cfg || die "error fixing setup.cfg" diff --git a/dev-python/python-ldap/python-ldap-2.4.12.ebuild b/dev-python/python-ldap/python-ldap-2.4.12.ebuild index c7c1d01625b1..244926f6a337 100644 --- a/dev-python/python-ldap/python-ldap-2.4.12.ebuild +++ b/dev-python/python-ldap/python-ldap-2.4.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.12.ebuild,v 1.1 2013/06/03 06:18:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.12.ebuild,v 1.2 2013/06/27 14:29:10 xmw Exp $ EAPI=5 @@ -29,7 +29,7 @@ DEPEND="${RDEPEND} python_prepare_all() { sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ + -e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \ -i setup.cfg || die "error fixing setup.cfg" local mylibs="ldap" diff --git a/dev-python/python-ldap/python-ldap-2.4.13.ebuild b/dev-python/python-ldap/python-ldap-2.4.13.ebuild new file mode 100644 index 000000000000..cfd15ed99768 --- /dev/null +++ b/dev-python/python-ldap/python-ldap-2.4.13.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.13.ebuild,v 1.2 2013/06/27 14:29:10 xmw Exp $ + +EAPI=5 + +# pypy: bug #458558 (wrong linker options due to not respecting CC) +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) + +inherit distutils-r1 multilib + +DESCRIPTION="Various LDAP-related Python modules" +HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris" +IUSE="doc examples sasl ssl" + +# If you need support for openldap-2.3.x, please use python-ldap-2.3.9. +# python team: Please do not remove python-ldap-2.3.9 from the tree. +RDEPEND=">=net-nds/openldap-2.4 + dev-python/pyasn1[${PYTHON_USEDEP}] + sasl? ( dev-libs/cyrus-sasl )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +python_prepare_all() { + sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ + -e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \ + -i setup.cfg || die "error fixing setup.cfg" + + local mylibs="ldap" + if use sasl; then + use ssl && mylibs="ldap_r" + mylibs="${mylibs} sasl2" + else + sed -e 's/HAVE_SASL//g' -i setup.cfg || die + fi + use ssl && mylibs="${mylibs} ssl crypto" + use elibc_glibc && mylibs="${mylibs} resolv" + + sed -e "s:^libs = .*:libs = lber ${mylibs}:" \ + -i setup.cfg || die "error setting up libs in setup.cfg" + + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + cd Doc || die + sphinx-build -b html -d _build/doctrees . _build/html || die + fi +} + +python_test() { + # XXX: the tests supposedly can start local slapd + # but it requires some manual config, it seems. + + "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( Doc/_build/html/. ) + + distutils-r1_python_install_all + + if use examples; then + dodoc -r Demo + docompress -x /usr/share/doc/${FP}/Demo + fi +} diff --git a/dev-python/python-ldap/python-ldap-2.4.3.ebuild b/dev-python/python-ldap/python-ldap-2.4.3.ebuild deleted file mode 100644 index 93b2e722897b..000000000000 --- a/dev-python/python-ldap/python-ldap-2.4.3.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.3.ebuild,v 1.6 2012/11/14 08:17:33 xarthisius Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -inherit distutils multilib - -DOC_P="${PN}-docs-html-${PV}" - -DESCRIPTION="Various LDAP-related Python modules" -HOMEPAGE="http://www.python-ldap.org/ http://pypi.python.org/pypi/python-ldap" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( http://www.python-ldap.org/doc/${DOC_P}.tar.gz )" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" -IUSE="doc examples sasl ssl" - -# If you need support for openldap-2.3.x, please use python-ldap-2.3.9. -# python team: Please do not remove python-ldap-2.3.9 from the tree. -RDEPEND=">=net-nds/openldap-2.4 - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${DEPEND} - dev-python/setuptools" - -DOCS="CHANGES README" -PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap" - -src_prepare() { - local rpath= - # sloppy logic, maybe better check if compiler links with GNU-ld - [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2" - # Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4 - sed -e "s:^library_dirs =.*:library_dirs =:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ - -e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \ - -i setup.cfg || die "error fixing setup.cfg" - - local mylibs="ldap" - if use sasl; then - use ssl && mylibs="ldap_r" - mylibs="${mylibs} sasl2" - fi - use ssl && mylibs="${mylibs} ssl crypto" - - sed -e "s:^libs = .*:libs = lber resolv ${mylibs}:" \ - -e "s:^compile.*:compile = 0:" \ - -e "s:^optimize.*:optimize = 0:" \ - -i setup.cfg || die "error setting up libs in setup.cfg" -} - -src_install() { - distutils_src_install - - if use doc; then - dohtml -r "${WORKDIR}/${DOC_P}"/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r Demo || die "doins failed" - fi -} diff --git a/dev-python/python-ldap/python-ldap-2.4.9.ebuild b/dev-python/python-ldap/python-ldap-2.4.9.ebuild deleted file mode 100644 index 20b8d35f153a..000000000000 --- a/dev-python/python-ldap/python-ldap-2.4.9.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.9.ebuild,v 1.3 2012/11/14 08:17:33 xarthisius Exp $ - -EAPI=4 - -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython" - -inherit distutils multilib - -DESCRIPTION="Various LDAP-related Python modules" -HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" -IUSE="doc examples sasl ssl" - -# If you need support for openldap-2.3.x, please use python-ldap-2.3.9. -# python team: Please do not remove python-ldap-2.3.9 from the tree. -RDEPEND=">=net-nds/openldap-2.4 - dev-python/pyasn1 - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${RDEPEND} - dev-python/setuptools - doc? ( dev-python/sphinx )" - -DOCS="CHANGES README" -PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap" - -src_prepare() { - local rpath= - # sloppy logic, maybe better check if compiler links with GNU-ld - [[ ${CHOST} != *-darwin* ]] && rpath="-Wl,-rpath=${EPREFIX}/usr/$(get_libdir)/sasl2" - # Note: we can't add /usr/lib and /usr/lib/sasl2 to library_dirs due to a bug in py2.4 - sed -e "s:^library_dirs =.*:library_dirs =:" \ - -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \ - -e "s:\(extra_compile_args =\).*:\1\nextra_link_args = ${rpath}:" \ - -i setup.cfg || die "error fixing setup.cfg" - - local mylibs="ldap" - if use sasl; then - use ssl && mylibs="ldap_r" - mylibs="${mylibs} sasl2" - else - sed -e 's/HAVE_SASL//g' -i setup.cfg || die - fi - use ssl && mylibs="${mylibs} ssl crypto" - - sed -e "s:^libs = .*:libs = lber resolv ${mylibs}:" \ - -e "s:^compile.*:compile = 0:" \ - -e "s:^optimize.*:optimize = 0:" \ - -i setup.cfg || die "error setting up libs in setup.cfg" -} - -src_compile() { - distutils_src_compile - if use doc; then - pushd Doc &> /dev/null - PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib*)" \ - sphinx-build -b html -d _build/doctrees . _build/html - popd Doc &> /dev/null - fi -} - -src_install() { - distutils_src_install - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r Demo - fi - - if use doc; then - dohtml -r Doc/_build/html/ - fi -} diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild new file mode 100644 index 000000000000..844e4839af5b --- /dev/null +++ b/dev-python/python-ldap/python-ldap-9999.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-9999.ebuild,v 1.1 2013/06/27 14:29:10 xmw Exp $ + +EAPI=5 + +# pypy: bug #458558 (wrong linker options due to not respecting CC) +PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} ) + +inherit distutils-r1 git-2 multilib + +DESCRIPTION="Various LDAP-related Python modules" +HOMEPAGE="http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap" +EGIT_REPO_URI="https://github.com/xmw/python-ldap.git" + +LICENSE="PSF-2" +SLOT="0" +KEYWORDS="" +IUSE="doc examples sasl ssl" + +# If you need support for openldap-2.3.x, please use python-ldap-2.3.9. +# python team: Please do not remove python-ldap-2.3.9 from the tree. +RDEPEND=">=net-nds/openldap-2.4 + dev-python/pyasn1[${PYTHON_USEDEP}] + sasl? ( dev-libs/cyrus-sasl )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +python_prepare_all() { + sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \ + -e "s:^include_dirs =.*:include_dirs = \"${EPREFIX}\"/usr/include \"${EPREFIX}\"/usr/include/sasl:" \ + -i setup.cfg || die "error fixing setup.cfg" + + local mylibs="ldap" + if use sasl; then + use ssl && mylibs="ldap_r" + mylibs="${mylibs} sasl2" + else + sed -e 's/HAVE_SASL//g' -i setup.cfg || die + fi + use ssl && mylibs="${mylibs} ssl crypto" + use elibc_glibc && mylibs="${mylibs} resolv" + + sed -e "s:^libs = .*:libs = lber ${mylibs}:" \ + -i setup.cfg || die "error setting up libs in setup.cfg" + + distutils-r1_python_prepare_all +} + +python_compile_all() { + if use doc; then + cd Doc || die + sphinx-build -b html -d _build/doctrees . _build/html || die + fi +} + +python_test() { + # XXX: the tests supposedly can start local slapd + # but it requires some manual config, it seems. + + "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( Doc/_build/html/. ) + + distutils-r1_python_install_all + + if use examples; then + dodoc -r Demo + docompress -x /usr/share/doc/${FP}/Demo + fi +} diff --git a/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild b/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild index 31da6c887146..570b5c9684d4 100644 --- a/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild +++ b/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild,v 1.5 2013/06/23 16:18:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pywebkitgtk/pywebkitgtk-1.1.8-r1.ebuild,v 1.6 2013/06/26 23:05:58 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -18,7 +18,7 @@ IUSE="test" RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] - dev-libs/libxslt[${PYTHON_USEDEP}] + dev-libs/libxslt >=net-libs/webkit-gtk-1.1.15:2" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/dev-python/simplecv/Manifest b/dev-python/simplecv/Manifest new file mode 100644 index 000000000000..ecdc747a25db --- /dev/null +++ b/dev-python/simplecv/Manifest @@ -0,0 +1 @@ +DIST simplecv-1.3.tar.gz 42860284 SHA256 3510727fa5e219c811cf89bce21ecf29647bdd4ef48a0a78aa29b10b9f583947 SHA512 47fa3c0bb41057ae17323aeb68711ef4716c4fe6607162218477af9070a1b1a03a7300f38b2c2a5c54ff69b916267504aeeac7c3108d6a45045a1469a93005b8 WHIRLPOOL 0206dfc06627b78e96aa7487b6c3450cde043e1527044e413b6111831aa48b32dd043fbebbb33c61ffb1aab7683187bf76db4f0a641cdcd0c3dbd6c8d36e1b18 diff --git a/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch new file mode 100644 index 000000000000..58f8639ea064 --- /dev/null +++ b/dev-python/simplecv/files/new-support-for-opencv-2.4.3-added.patch @@ -0,0 +1,111 @@ +From 164d39c1be66eb35b02fb7c30f65b5929c9e407d Mon Sep 17 00:00:00 2001 +From: Vijay Mahantesh SM +Date: Sat, 8 Dec 2012 01:55:24 +0530 +Subject: [PATCH] new support for opencv 2.4.3 added + +--- + SimpleCV/ImageClass.py | 52 ++++++++++++++++++++++++++++++++------------------ + 1 file changed, 33 insertions(+), 19 deletions(-) + +diff --git a/SimpleCV/ImageClass.py b/SimpleCV/ImageClass.py +index a545b50..6fab39a 100644 +--- a/SimpleCV/ImageClass.py ++++ b/SimpleCV/ImageClass.py +@@ -7610,11 +7610,12 @@ class Image: + new_version = 0 + #For OpenCV versions till 2.4.0, cv2.__versions__ are of the form "$Rev: 4557 $" + if not ver.startswith('$Rev:'): +- if int(ver.replace('.','0'))>=20400 : +- new_version = 1 +- if int(ver.replace('.','0'))>=20402 : +- new_version = 2 +- ++ if int(ver.replace('.','0'))>=20400: ++ new_version = 1 ++ if int(ver.replace('.','0'))>=20402: ++ new_version = 2 ++ if int(ver.replace('.','0'))>=20403: ++ new_version = 3 + except: + logger.warning("Can't run Keypoints without OpenCV >= 2.3.0") + return +@@ -7622,11 +7623,11 @@ class Image: + if( forceReset ): + self._mKeyPoints = None + self._mKPDescriptors = None +- +- if( self._mKeyPoints is None or self._mKPFlavor != flavor ): ++ ++ if( not(self._mKeyPoints) or self._mKPFlavor != flavor ): + if ( new_version == 0): + if( flavor == "SURF" ): +- surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) ++ surfer = cv2.SURF(thresh,_extended=highQuality,_upright=1) + self._mKeyPoints,self._mKPDescriptors = surfer.detect(self.getGrayNumpy(),None,False) + if( len(self._mKPDescriptors) == 0 ): + return None, None +@@ -7659,10 +7660,9 @@ class Image: + self._mKPDescriptors = None + self._mKPFlavor = "STAR" + del starer +- +- +- elif( new_version == 2 and flavor in ["SURF", "FAST"] ): +- if( flavor == "SURF" ): ++ ++ elif( new_version >= 2 and flavor in ["SURF", "FAST"] ): ++ if( flavor == "SURF" and new_version==2): + surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1) + #mask = self.getGrayNumpy() + #mask.fill(255) +@@ -7678,6 +7678,20 @@ class Image: + self._mKPFlavor = "SURF" + del surfer + ++ if( flavor == "SURF" and new_version==3): ++ surfer = cv2.SURF(hessianThreshold=thresh,extended=highQuality,upright=1) ++ self._mKeyPoints,self._mKPDescriptors = surfer.detectAndCompute(self.getGrayNumpy(),None,useProvidedKeypoints = False) ++ if( len(self._mKPDescriptors) == 0 ): ++ return None, None ++ ++ if( highQuality == 1 ): ++ self._mKPDescriptors = self._mKPDescriptors.reshape((-1,128)) ++ else: ++ self._mKPDescriptors = self._mKPDescriptors.reshape((-1,64)) ++ ++ self._mKPFlavor = "SURF" ++ del surfer ++ + elif( flavor == "FAST" ): + faster = cv2.FastFeatureDetector(threshold=int(thresh),nonmaxSuppression=True) + self._mKeyPoints = faster.detect(self.getGrayNumpy()) +@@ -7693,19 +7707,19 @@ class Image: + if( len(self._mKPDescriptors) == 0 ): + return None, None + self._mKPFlavor = flavor +- del FeatureDetector ++ del FeatureDetector + + elif( new_version >= 1 and flavor in ["FAST", "STAR", "MSER", "Dense"] ): + FeatureDetector = cv2.FeatureDetector_create(flavor) + self._mKeyPoints = FeatureDetector.detect(self.getGrayNumpy()) + self._mKPDescriptors = None + self._mKPFlavor = flavor +- del FeatureDetector +- +- else: +- logger.warning("ImageClass.Keypoints: I don't know the method you want to use") +- return None, None +- ++ del FeatureDetector ++ ++ else: ++ logger.warning("ImageClass.Keypoints: I don't know the method you want to use") ++ return None, None ++ + return self._mKeyPoints,self._mKPDescriptors + + def _getFLANNMatches(self,sd,td): +-- +1.8.1.5 + diff --git a/dev-python/simplecv/files/remove-failing-test.patch b/dev-python/simplecv/files/remove-failing-test.patch new file mode 100644 index 000000000000..7ee326df02a5 --- /dev/null +++ b/dev-python/simplecv/files/remove-failing-test.patch @@ -0,0 +1,57 @@ +From d8abe3346d7aa2b192d384476d5f2c89ca9c70e9 Mon Sep 17 00:00:00 2001 +From: Justin Bronder +Date: Fri, 14 Jun 2013 20:35:11 -0400 +Subject: [PATCH] remove failing test + +According to the docs, the UserWarning that is raised should not be an +issue. Ignore the failure during testings. +--- + SimpleCV/tests/tests.py | 32 -------------------------------- + 1 file changed, 32 deletions(-) + +diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py +index 94f4fc7..ce442e3 100644 +--- a/SimpleCV/tests/tests.py ++++ b/SimpleCV/tests/tests.py +@@ -1731,38 +1731,6 @@ def test_movement_feature(): + + pass + +-def test_keypoint_extraction(): +- try: +- import cv2 +- except: +- pass +- return +- +- img1 = Image("../sampleimages/KeypointTemplate2.png") +- img2 = Image("../sampleimages/KeypointTemplate2.png") +- img3 = Image("../sampleimages/KeypointTemplate2.png") +- +- kp1 = img1.findKeypoints() +- kp2 = img2.findKeypoints(highQuality=True) +- kp3 = img3.findKeypoints(flavor="STAR") +- kp1.draw() +- kp2.draw() +- kp3.draw() +- #TODO: Fix FAST binding +- #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10) +- if( len(kp1)==190 and +- len(kp2)==190 and +- len(kp3)==37 +- #~ and len(kp4)==521 +- ): +- pass +- else: +- assert False +- results = [img1,img2,img3] +- name_stem = "test_keypoint_extraction" +- perform_diff(results,name_stem,tolerance=3.0) +- +- + def test_keypoint_match(): + try: + import cv2 +-- +1.8.1.5 + diff --git a/dev-python/simplecv/files/remove-failing-tests.patch b/dev-python/simplecv/files/remove-failing-tests.patch new file mode 100644 index 000000000000..7b2e60da711e --- /dev/null +++ b/dev-python/simplecv/files/remove-failing-tests.patch @@ -0,0 +1,301 @@ +From 77a76251ac911367e94c3b035e1ec243d2846e38 Mon Sep 17 00:00:00 2001 +From: Justin Bronder +Date: Fri, 14 Jun 2013 20:06:49 -0400 +Subject: [PATCH] remove failing tests + +--- + SimpleCV/tests/tests.py | 250 ------------------------------------------------ + 1 file changed, 250 deletions(-) + +diff --git a/SimpleCV/tests/tests.py b/SimpleCV/tests/tests.py +index 94f4fc7..d8e79d8 100644 +--- a/SimpleCV/tests/tests.py ++++ b/SimpleCV/tests/tests.py +@@ -1649,39 +1649,6 @@ def test_blob_isa_methods(): + else: + assert False + +-def test_findKeypoints(): +- try: +- import cv2 +- except: +- pass +- return +- img = Image(testimage2) +- kp = img.findKeypoints() +- for k in kp: +- k.getObject() +- k.descriptor() +- k.quality() +- k.octave() +- k.flavor() +- k.angle() +- k.coordinates() +- k.draw() +- k.distanceFrom() +- k.meanColor() +- k.area() +- k.perimeter() +- k.width() +- k.height() +- k.radius() +- k.crop() +- +- kp.draw() +- results = [img] +- name_stem = "test_findKeypoints" +- #~ perform_diff(results,name_stem) +- +- pass +- + def test_movement_feature(): + current1 = Image("../sampleimages/flow_simple1.png") + prev = Image("../sampleimages/flow_simple2.png") +@@ -1731,96 +1698,6 @@ def test_movement_feature(): + + pass + +-def test_keypoint_extraction(): +- try: +- import cv2 +- except: +- pass +- return +- +- img1 = Image("../sampleimages/KeypointTemplate2.png") +- img2 = Image("../sampleimages/KeypointTemplate2.png") +- img3 = Image("../sampleimages/KeypointTemplate2.png") +- +- kp1 = img1.findKeypoints() +- kp2 = img2.findKeypoints(highQuality=True) +- kp3 = img3.findKeypoints(flavor="STAR") +- kp1.draw() +- kp2.draw() +- kp3.draw() +- #TODO: Fix FAST binding +- #~ kp4 = img.findKeypoints(flavor="FAST",min_quality=10) +- if( len(kp1)==190 and +- len(kp2)==190 and +- len(kp3)==37 +- #~ and len(kp4)==521 +- ): +- pass +- else: +- assert False +- results = [img1,img2,img3] +- name_stem = "test_keypoint_extraction" +- perform_diff(results,name_stem,tolerance=3.0) +- +- +-def test_keypoint_match(): +- try: +- import cv2 +- except: +- pass +- return +- +- template = Image("../sampleimages/KeypointTemplate2.png") +- match0 = Image("../sampleimages/kptest0.png") +- match1 = Image("../sampleimages/kptest1.png") +- match3 = Image("../sampleimages/kptest2.png") +- match2 = Image("../sampleimages/aerospace.jpg")# should be none +- +- fs0 = match0.findKeypointMatch(template)#test zero +- fs1 = match1.findKeypointMatch(template,quality=300.00,minDist=0.5,minMatch=0.2) +- fs3 = match3.findKeypointMatch(template,quality=300.00,minDist=0.5,minMatch=0.2) +- print "This should fail" +- fs2 = match2.findKeypointMatch(template,quality=500.00,minDist=0.2,minMatch=0.1) +- if( fs0 is not None and fs1 is not None and fs2 is None and fs3 is not None): +- fs0.draw() +- fs1.draw() +- fs3.draw() +- f = fs0[0] +- f.drawRect() +- f.draw() +- f.getHomography() +- f.getMinRect() +- f.meanColor() +- f.crop() +- f.x +- f.y +- f.coordinates() +- else: +- assert False +- +- results = [match0,match1,match2,match3] +- name_stem = "test_find_keypoint_match" +- perform_diff(results,name_stem) +- +- +-def test_draw_keypoint_matches(): +- try: +- import cv2 +- except: +- pass +- return +- template = Image("../sampleimages/KeypointTemplate2.png") +- match0 = Image("../sampleimages/kptest0.png") +- result = match0.drawKeypointMatches(template,thresh=500.00,minDist=0.15,width=1) +- +- results = [result] +- name_stem = "test_draw_keypoint_matches" +- perform_diff(results,name_stem,tolerance=4.0) +- +- +- pass +- +- + def test_basic_palette(): + img = Image(testimageclr) + img._generatePalette(10,False) +@@ -2303,29 +2180,6 @@ def test_blob_spatial_relationships(): + if( not center.contains(inside) ): + assert False + +-def test_get_aspectratio(): +- img = Image("../sampleimages/EdgeTest1.png") +- img2 = Image("../sampleimages/EdgeTest2.png") +- b = img.findBlobs() +- l = img2.findLines() +- c = img2.findCircle(thresh=200) +- c2 = img2.findCorners() +- kp = img2.findKeypoints() +- bb = b.aspectRatios() +- ll = l.aspectRatios() +- cc = c.aspectRatios() +- c22 = c2.aspectRatios() +- kp2 = kp.aspectRatios() +- +- if( len(bb) > 0 and +- len(ll) > 0 and +- len(cc) > 0 and +- len(c22) > 0 and +- len(kp2) > 0 ): +- pass +- else: +- assert False +- + def test_line_crop(): + img = Image("../sampleimages/EdgeTest2.png") + l = img.findLines().sortArea() +@@ -2391,74 +2245,6 @@ def test_save_kwargs(): + s80 = os.remove(l80) + s70 = os.remove(l70) + +-def test_on_edge(): +- img1 = "./../sampleimages/EdgeTest1.png" +- img2 = "./../sampleimages/EdgeTest2.png" +- imgA = Image(img1) +- imgB = Image(img2) +- imgC = Image(img2) +- imgD = Image(img2) +- imgE = Image(img2) +- +- blobs = imgA.findBlobs() +- circs = imgB.findCircle(thresh=200) +- corners = imgC.findCorners() +- kp = imgD.findKeypoints() +- lines = imgE.findLines() +- +- rim = blobs.onImageEdge() +- inside = blobs.notOnImageEdge() +- rim.draw(color=Color.RED) +- inside.draw(color=Color.BLUE) +- +- rim = circs.onImageEdge() +- inside = circs.notOnImageEdge() +- rim.draw(color=Color.RED) +- inside.draw(color=Color.BLUE) +- +- #rim = corners.onImageEdge() +- inside = corners.notOnImageEdge() +- #rim.draw(color=Color.RED) +- inside.draw(color=Color.BLUE) +- +- #rim = kp.onImageEdge() +- inside = kp.notOnImageEdge() +- #rim.draw(color=Color.RED) +- inside.draw(color=Color.BLUE) +- +- rim = lines.onImageEdge() +- inside = lines.notOnImageEdge() +- rim.draw(color=Color.RED) +- inside.draw(color=Color.BLUE) +- +- results = [imgA,imgB,imgC,imgD,imgE] +- name_stem = "test_onEdge_Features" +- #~ perform_diff(results,name_stem,tolerance=8.0) +- +-def test_feature_angles(): +- img = Image("../sampleimages/rotation2.png") +- img2 = Image("../sampleimages/rotation.jpg") +- img3 = Image("../sampleimages/rotation.jpg") +- b = img.findBlobs() +- l = img2.findLines() +- k = img3.findKeypoints() +- +- for bs in b: +- tl = bs.topLeftCorner() +- img.drawText(str(bs.angle()),tl[0],tl[1],color=Color.RED) +- +- for ls in l: +- tl = ls.topLeftCorner() +- img2.drawText(str(ls.angle()),tl[0],tl[1],color=Color.GREEN) +- +- for ks in k: +- tl = ks.topLeftCorner() +- img3.drawText(str(ks.angle()),tl[0],tl[1],color=Color.BLUE) +- +- results = [img,img2,img3] +- name_stem = "test_feature_angles" +- perform_diff(results,name_stem,tolerance=9.0) +- + def test_feature_angles_rotate(): + img = Image("../sampleimages/rotation2.png") + b = img.findBlobs() +@@ -2740,42 +2526,6 @@ def test_getSkintoneMask(): + name_stem = 'test_skintone' + perform_diff(masks,name_stem,tolerance=17) + +-def test_findKeypoints_all(): +- try: +- import cv2 +- except: +- pass +- return +- img = Image(testimage2) +- methods = ["ORB", "SIFT", "SURF","FAST", "STAR", "MSER", "Dense"] +- for i in methods : +- print i +- kp = img.findKeypoints(flavor = i) +- if kp!=None : +- for k in kp: +- k.getObject() +- k.descriptor() +- k.quality() +- k.octave() +- k.flavor() +- k.angle() +- k.coordinates() +- k.draw() +- k.distanceFrom() +- k.meanColor() +- k.area() +- k.perimeter() +- k.width() +- k.height() +- k.radius() +- k.crop() +- kp.draw() +- results = [img] +- name_stem = "test_findKeypoints" +- #~ perform_diff(results,name_stem,tolerance=8) +- pass +- +- + def test_upload_flickr(): + try: + import flickrapi +-- +1.8.1.5 + diff --git a/dev-python/simplecv/metadata.xml b/dev-python/simplecv/metadata.xml new file mode 100644 index 000000000000..4eb8773f2248 --- /dev/null +++ b/dev-python/simplecv/metadata.xml @@ -0,0 +1,10 @@ + + + + + jsbronder@gentoo.org + + + Enable the iPython SimpleCV shell + + diff --git a/dev-python/simplecv/simplecv-1.3.ebuild b/dev-python/simplecv/simplecv-1.3.ebuild new file mode 100644 index 000000000000..b193d803b8da --- /dev/null +++ b/dev-python/simplecv/simplecv-1.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/simplecv/simplecv-1.3.ebuild,v 1.1 2013/06/26 22:50:48 jsbronder Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 vcs-snapshot + +MY_PN=SimpleCV + +DESCRIPTION="Python interface to several powerful open source computer vision libraries." +HOMEPAGE="http://simplecv.org/" +SRC_URI="https://github.com/sightmachine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="shell test" + +DEPEND=" + test? ( dev-python/nose[${PYTHON_USEDEP}] )" + +RDEPEND=" + >=media-libs/opencv-2.2 + dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/imaging[${PYTHON_USEDEP}] + dev-python/pygame[${PYTHON_USEDEP}] + shell? ( dev-python/ipython[${PYTHON_USEDEP}] )" + +# 1. FeatureDetector being called with the wrong number of arguments +# 2. Remove test that according to docs shouldn't be an issue +PATCHES=( + "${FILESDIR}"/new-support-for-opencv-2.4.3-added.patch + "${FILESDIR}"/remove-failing-test.patch +) + +src_test() { + cd "${S}/SimpleCV/tests" + nosetests tests.py || die "tests failed" +} + +src_install() { + distutils-r1_src_install + if ! use shell; then + rm -rf "${D}"/usr/bin + fi +} diff --git a/dev-python/werkzeug/werkzeug-0.9.1.ebuild b/dev-python/werkzeug/werkzeug-0.9.1.ebuild index 6e3390c63b64..b54bbbc14baf 100644 --- a/dev-python/werkzeug/werkzeug-0.9.1.ebuild +++ b/dev-python/werkzeug/werkzeug-0.9.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.1.ebuild,v 1.1 2013/06/16 22:20:52 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/werkzeug/werkzeug-0.9.1.ebuild,v 1.2 2013/06/27 00:48:32 floppym Exp $ EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7,3_3} ) +PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy{1_9,2_0} ) inherit distutils-r1 @@ -17,11 +17,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="test" +IUSE="" RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/lxml[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" S="${WORKDIR}/${MY_P}" diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest index cfc2b793b2be..af7a76ac9306 100644 --- a/dev-ruby/flog/Manifest +++ b/dev-ruby/flog/Manifest @@ -1 +1,2 @@ DIST flog-2.5.3.gem 20480 SHA256 6e78f6de2bf2d216c3639585427c3ea0d3c4a84509a2a4bc934a23ee004ad788 SHA512 cff1c7cb95c02bd498644de0879bbab04f00ac606e5a920a7ebee89870909d2c93878ab354bdd2dc22635521cc8c0631489d33c780e44d2fec9aa0b4cc0992cd WHIRLPOOL 2d537d7a04b2db5df138e685fee65d554e0ec9c8cbe0647ecf97a1c8825187fd170d0294085f9f2b9cfa21f43a0f76818e9a2c451202ddf54cbc9da13618a926 +DIST flog-3.2.3.gem 22528 SHA256 eb215725d5700eff3e658cc96eb0972452f8a9265bae59d0391a5da44a82f457 SHA512 96d25ab52797362612d65eb318551864a34938ffd7ca2b5b3459be457a2d7bdec81c5f8a4cac2815cfa753bdc598ba13805f3997ca004934a703d5d2908cf4b2 WHIRLPOOL dd22f3eef2c6044dcfdad4ed354659133fc3af14a23b0efaea33fa8f93fa6e8fe06729c6ea0cce16092ed7243c48c8c07ca4420ca128fd173089e09eab77f0b3 diff --git a/dev-ruby/flog/flog-3.2.3.ebuild b/dev-ruby/flog/flog-3.2.3.ebuild new file mode 100644 index 000000000000..c89bde0cbc70 --- /dev/null +++ b/dev-ruby/flog/flog-3.2.3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/flog-3.2.3.ebuild,v 1.1 2013/06/27 06:33:52 graaff Exp $ + +EAPI=5 +USE_RUBY="ruby18 ruby19 jruby" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="History.txt README.txt" + +inherit ruby-fakegem + +DESCRIPTION="Flog reports the most tortured code in an easy to read pain report." +HOMEPAGE="http://ruby.sadi.st/" +LICENSE="MIT" + +KEYWORDS="~x86 ~amd64" +SLOT="0" +IUSE="" + +ruby_add_bdepend "test? ( dev-ruby/minitest )" + +ruby_add_rdepend "=dev-ruby/ruby_parser-3* >dev-ruby/ruby_parser-3.1.0 + =dev-ruby/sexp_processor-4*" + +each_ruby_test() { + ${RUBY} -Ilib test/test_flog.rb || die +} diff --git a/dev-tex/bibtexu/Manifest b/dev-tex/bibtexu/Manifest index 3fce1de8ea57..ac982646944e 100644 --- a/dev-tex/bibtexu/Manifest +++ b/dev-tex/bibtexu/Manifest @@ -1 +1,2 @@ DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57 +DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33 diff --git a/dev-tex/bibtexu/bibtexu-3.71_p20130530.ebuild b/dev-tex/bibtexu/bibtexu-3.71_p20130530.ebuild new file mode 100644 index 000000000000..b10c03d33dfd --- /dev/null +++ b/dev-tex/bibtexu/bibtexu-3.71_p20130530.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtexu/bibtexu-3.71_p20130530.ebuild,v 1.1 2013/06/27 13:15:19 aballier Exp $ + +EAPI=5 + +DESCRIPTION="8-bit Implementation of BibTeX 0.99 with a Very Large Capacity" +HOMEPAGE="http://tug.org/texlive/" +SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND=">=dev-libs/kpathsea-6.1.0_p20120701 + >=dev-libs/icu-4.4 + !=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]} +) + +RDEPEND=" + >=dev-lang/perl-5.10 + app-arch/dpkg + dev-perl/TimeDate + virtual/perl-Getopt-Long +" +DEPEND="${RDEPEND} + ${NLS_DEPEND} + test? ( dev-perl/Test-Pod ) +" + +S=${WORKDIR}/${PN} + +src_compile() { + tc-export CC + + local LANGS="" USE_NLS=no lingua + for lingua in ${DH_LINGUAS[@]}; do + if use linguas_${lingua}; then + LANGS+=" ${lingua}" + USE_NLS=yes + fi + done + + emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc doc/* debian/changelog + docinto examples + dodoc examples/* + local lingua + for manfile in *.1 *.7 ; do + for lingua in ${DH_LINGUAS[@]}; do + case ${manfile} in + *.${lingua}.?) + use linguas_${lingua} \ + && cp ${manfile} "${T}"/${manfile/.${lingua}/} \ + && doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/} + ;; + *) + doman ${manfile} + ;; + esac + done + done +} diff --git a/dev-vcs/qgit/qgit-2.5.ebuild b/dev-vcs/qgit/qgit-2.5.ebuild index a36450225082..d018d5ced281 100644 --- a/dev-vcs/qgit/qgit-2.5.ebuild +++ b/dev-vcs/qgit/qgit-2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qgit/qgit-2.5.ebuild,v 1.5 2013/03/02 21:08:50 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/qgit/qgit-2.5.ebuild,v 1.6 2013/06/27 03:29:57 pinkbyte Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://libre.tibirna.org/attachments/download/9/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="" DEPEND="dev-qt/qtgui:4" diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass index 00a4ef5ad890..76f3c35488fd 100644 --- a/eclass/fcaps.eclass +++ b/eclass/fcaps.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.7 2013/06/02 15:21:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fcaps.eclass,v 1.8 2013/06/27 01:18:57 vapier Exp $ # @ECLASS: fcaps.eclass # @MAINTAINER: @@ -162,9 +162,10 @@ fcaps() { ;; *"Operation not supported"*) local fstype=$(stat -f -c %T "${file}") - ewarn "Could not set caps on '${file}' due to missing filesystem support." - ewarn "Make sure you enable XATTR support for '${fstype}' in your kernel." - ewarn "You might also have to enable the relevant FS_SECURITY option." + ewarn "Could not set caps on '${file}' due to missing filesystem support:" + ewarn "* enable XATTR support for '${fstype}' in your kernel (if configurable)" + ewarn "* mount the fs with the user_xattr option (if not the default)" + ewarn "* enable the relevant FS_SECURITY option (if configurable)" break ;; *) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass index e00906be8eda..644c1e7489d2 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.17 2013/03/16 19:20:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-autotools.eclass,v 1.18 2013/06/26 19:31:49 jmbsvicetto Exp $ # @ECLASS: mysql-autotools.eclass # @MAINTAINER: @@ -51,14 +51,14 @@ mysql-autotools_disable_test() { # ${S}/mysql-tests/suite/ndb_team/t/disabled.def # ${S}/mysql-tests/suite/binlog/t/disabled.def # ${S}/mysql-tests/suite/innodb/t/disabled.def - if [ -n "${testsuite}" ]; then + if [[ -n ${testsuite} ]]; then for mysql_disable_file in \ ${S}/mysql-test/suite/${testsuite}/disabled.def \ ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ FAILED ; do - [ -f "${mysql_disable_file}" ] && break + [[ -f ${mysql_disable_file} ]] && break done - if [ "${mysql_disabled_file}" != "FAILED" ]; then + if [[ ${mysql_disabled_file} != "FAILED" ]]; then echo "${testname} : ${reason}" >> "${mysql_disable_file}" else ewarn "Could not find testsuite disabled.def location for ${rawtestname}" @@ -99,7 +99,7 @@ mysql-autotools_configure_minimal() { # MariaDB requires this flag in order to link to GPLv3 readline v6 or greater # A note is added to the configure output - if [[ "${PN}" == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then + if [[ ${PN} == "mariadb" ]] && mysql_version_is_at_least "5.1.61" ; then myconf="${myconf} --disable-distribution" fi } @@ -134,7 +134,7 @@ mysql-autotools_configure_common() { fi fi - if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then + if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." ewarn "You MUST file bugs without these variables set." @@ -220,7 +220,7 @@ mysql-autotools_configure_51() { # Not supporting as examples: example,daemon_example,ftexample plugins_sta="${plugins_sta} partition" - if [[ "${PN}" != "mariadb" ]] ; then + if [[ ${PN} != "mariadb" ]] ; then elog "Before using the Federated storage engine, please be sure to read" elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html" plugins_dyn="${plugins_dyn} federated" @@ -237,10 +237,10 @@ mysql-autotools_configure_51() { # - innobase, innodb_plugin # Build falcon if available for 6.x series. for i in innobase falcon ; do - [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}" + [[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}" done for i in innodb_plugin ; do - [ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}" + [[ -e ${S}/storage/${i} ]] && plugins_dyn="${plugins_dyn} ${i}" done # like configuration=max-no-ndb @@ -252,12 +252,12 @@ mysql-autotools_configure_51() { plugins_dis="${plugins_dis} ndbcluster" fi - if [[ "${PN}" == "mariadb" ]] ; then + if [[ ${PN} == "mariadb" ]] ; then # In MariaDB, InnoDB is packaged in the xtradb directory, so it's not # caught above. # This is not optional, without it several upstream testcases fail. # Also strongly recommended by upstream. - if [[ "${PV}" < "5.2.0" ]] ; then + if [[ ${PV} < "5.2.0" ]] ; then myconf="${myconf} --with-maria-tmp-tables" plugins_sta="${plugins_sta} maria" else @@ -265,11 +265,11 @@ mysql-autotools_configure_51() { plugins_sta="${plugins_sta} aria" fi - [ -e "${S}"/storage/innobase ] || [ -e "${S}"/storage/xtradb ] || + [[ ( -e ${S}/storage/innobase ) || ( -e ${S}/storage/xtradb ) ]] || die "The ${P} package doesn't provide innobase nor xtradb" for i in innobase xtradb ; do - [ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}" + [[ -e ${S}/storage/${i} ]] && plugins_sta="${plugins_sta} ${i}" done myconf="${myconf} $(use_with libevent)" @@ -300,7 +300,7 @@ mysql-autotools_configure_51() { fi fi - if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then + if pbxt_available && [[ ${PBXT_NEWSTYLE} == "1" ]]; then use pbxt \ && plugins_sta="${plugins_sta} pbxt" \ || plugins_dis="${plugins_dis} pbxt" @@ -311,7 +311,7 @@ mysql-autotools_configure_51() { plugins_dyn="" # Google MySQL, bundle what upstream supports - if [[ "${PN}" == "google-mysql" ]]; then + if [[ ${PN} == "google-mysql" ]]; then for x in innobase innodb_plugin innodb ; do plugins_sta="${plugins_sta//$x}" plugins_dyn="${plugins_dyn//$x}" @@ -389,7 +389,7 @@ mysql-autotools_src_prepare() { # last -fPIC fixup, per bug #305873 i="${S}"/storage/innodb_plugin/plug.in - [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" + [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" # Additional checks, remove bundled zlib rm -f "${S}/zlib/"*.[ch] @@ -417,21 +417,21 @@ mysql-autotools_src_prepare() { i="innobase" o="${WORKDIR}/storage-${i}.mysql-upstream" # Have we been here already? - [ -d "${o}" ] && rm -f "${i}" + [[ -d ${o} ]] && rm -f "${i}" # Or maybe we haven't - [ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}" + [[ ( -d ${i} ) && ! ( -d ${o} ) ]] && mv "${i}" "${o}" cp -ral "${WORKDIR}/${XTRADB_P}" "${i}" popd >/dev/null fi - if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then + if pbxt_patch_available && [[ ${PBXT_NEWSTYLE} == "1" ]] && use pbxt ; then einfo "Adding storage engine: PBXT" pushd "${S}"/storage >/dev/null i='pbxt' - [ -d "${i}" ] && rm -rf "${i}" + [[ -d ${i} ]] && rm -rf "${i}" cp -ral "${WORKDIR}/${PBXT_P}" "${i}" f="${WORKDIR}/mysql-extras/pbxt/fix-low-priority.patch" - [[ -f $f ]] && epatch "$f" + [[ -f $f ]] && epatch "$f" popd >/dev/null fi @@ -490,7 +490,7 @@ mysql-autotools_src_configure() { # implicitly. Upstream might be interested in this, exclude # -fno-implicit-templates for google-mysql for now. mysql_version_is_at_least "5.0" \ - && [[ "${PN}" != "google-mysql" ]] \ + && [[ ${PN} != "google-mysql" ]] \ && CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" export CXXFLAGS @@ -526,7 +526,7 @@ mysql-autotools_src_configure() { | xargs -0 -n100 sed -i \ -e 's|^pkglibdir *= *$(libdir)/mysql|pkglibdir = $(libdir)|;s|^pkgincludedir *= *$(includedir)/mysql|pkgincludedir = $(includedir)|' - if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then + if [[ $EAPI == 2 ]] && [[ ${PBXT_NEWSTYLE} != "1" ]]; then pbxt_patch_available && use pbxt && pbxt_src_configure fi } @@ -538,7 +538,7 @@ mysql-autotools_src_compile() { emake || die "emake failed" - if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then + if [[ ${PBXT_NEWSTYLE} != "1" ]]; then pbxt_patch_available && use pbxt && pbxt_src_compile fi } @@ -557,7 +557,7 @@ mysql-autotools_src_install() { testroot="${MY_SHAREDSTATEDIR}" \ || die "emake install failed" - if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then + if [[ ${PBXT_NEWSTYLE} != "1" ]]; then pbxt_patch_available && use pbxt && pbxt_src_install fi @@ -620,7 +620,7 @@ mysql-autotools_src_install() { # Empty directories ... diropts "-m0750" keepdir "${MY_DATADIR#${EPREFIX}}" - if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then + if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then chown -R mysql:mysql "${D}/${MY_DATADIR}" fi @@ -635,7 +635,7 @@ mysql-autotools_src_install() { # Docs einfo "Installing docs" for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do - [[ -f "$i" ]] && dodoc "$i" + [[ -f $i ]] && dodoc "$i" done doinfo "${S}"/Docs/mysql.info @@ -648,12 +648,12 @@ mysql-autotools_src_install() { "${S}"/support-files/magic \ "${S}"/support-files/ndb-config-2-node.ini do - [[ -f "$script" ]] && dodoc "${script}" + [[ -f $script ]] && dodoc "${script}" done docinto "scripts" for script in "${S}"/scripts/mysql* ; do - [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" + [[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}" done fi @@ -661,7 +661,7 @@ mysql-autotools_src_install() { mysql_lib_symlinks "${ED}" #Remove mytop if perl is not selected - [[ "${PN}" == "mariadb" ]] && ! use perl \ + [[ ${PN} == "mariadb" ]] && ! use perl \ && mysql_version_is_at_least "5.3" \ && rm -f "${ED}/usr/bin/mytop" diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index f47e5fd619ae..41cf20a5feea 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.15 2013/03/04 19:10:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.16 2013/06/26 19:31:49 jmbsvicetto Exp $ # @ECLASS: mysql-cmake.eclass # @MAINTAINER: @@ -36,29 +36,29 @@ mysql-cmake_disable_test() { for mysql_disabled_file in \ ${S}/mysql-test/disabled.def \ ${S}/mysql-test/t/disabled.def ; do - [ -f "${mysql_disabled_file}" ] && break + [[ -f ${mysql_disabled_file} ]] && break done #mysql_disabled_file="${S}/mysql-test/t/disabled.def" #einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}" echo ${testname} : ${reason} >> "${mysql_disabled_file}" - if [ -n "${testsuite}" ] && [ "${testsuite}" != "main" ]; then + if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then for mysql_disabled_file in \ ${S}/mysql-test/suite/${testsuite}/disabled.def \ ${S}/mysql-test/suite/${testsuite}/t/disabled.def \ FAILED ; do - [ -f "${mysql_disabled_file}" ] && break + [[ -f ${mysql_disabled_file} ]] && break done - if [ "${mysql_disabled_file}" != "FAILED" ]; then + if [[ ${mysql_disabled_file} != "FAILED" ]]; then echo "${testname} : ${reason}" >> "${mysql_disabled_file}" else for mysql_disabled_dir in \ ${S}/mysql-test/suite/${testsuite} \ ${S}/mysql-test/suite/${testsuite}/t \ FAILED ; do - [ -d "${mysql_disabled_dir}" ] && break + [[ -d ${mysql_disabled_dir} ]] && break done - if [ "${mysql_disabled_dir}" != "FAILED" ]; then + if [[ ${mysql_disabled_dir} != "FAILED" ]]; then echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def" else ewarn "Could not find testsuite disabled.def location for ${rawtestname}" @@ -72,7 +72,7 @@ mysql-cmake_disable_test() { # Helper function to configure locale cmake options configure_cmake_locale() { - if ! use minimal && [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then + if ! use minimal && [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." ewarn "You MUST file bugs without these variables set." @@ -151,7 +151,7 @@ configure_cmake_standard() { if use ssl; then mycmakeargs+=( -DWITH_SSL=system ) else - mycmakeargs+=( -DWITH_SSL=0 ) + mycmakeargs+=( -DWITH_SSL=bundled ) fi if mysql_version_is_at_least "5.5" && use jemalloc; then @@ -179,7 +179,7 @@ configure_cmake_standard() { mycmakeargs+=( $(cmake-utils_use_with pbxt PBXT_STORAGE_ENGINE) ) fi - if [ "${PN}" == "mariadb" ]; then + if [[ ${PN} == "mariadb" ]]; then mycmakeargs+=( $(cmake-utils_use_with oqgraph OQGRAPH_STORAGE_ENGINE) $(cmake-utils_use_with sphinx SPHINX_STORAGE_ENGINE) @@ -189,7 +189,12 @@ configure_cmake_standard() { if ! use pam ; then mycmakeargs+=( -DAUTH_PAM_DISABLED=1 ) fi - + fi + + if [[ ${PN} == "percona-server" ]]; then + mycmakeargs+=( + $(cmake-utils_use_with pam) + ) fi } @@ -218,7 +223,7 @@ mysql-cmake_src_prepare() { # last -fPIC fixup, per bug #305873 i="${S}"/storage/innodb_plugin/plug.in - [ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" + [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" rm -f "scripts/mysqlbug" epatch_user @@ -253,13 +258,13 @@ mysql-cmake_src_configure() { -DINSTALL_SQLBENCHDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql -DWITH_COMMENT="Gentoo Linux ${PF}" - -DWITHOUT_UNIT_TESTS=1 + $(cmake-utils_use_with test UNIT_TESTS) ) # Bug 412851 # MariaDB requires this flag to compile with GPLv3 readline linked # Adds a warning about redistribution to configure - if [[ "${PN}" == "mariadb" ]] ; then + if [[ ${PN} == "mariadb" ]] ; then mycmakeargs+=( -DNOT_FOR_DISTRIBUTION=1 ) fi @@ -274,12 +279,16 @@ mysql-cmake_src_configure() { # Bug #114895, bug #110149 filter-flags "-O" "-O[01]" - CXXFLAGS="${CXXFLAGS} -fno-exceptions -fno-strict-aliasing" + CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti" # Causes linkage failures. Upstream bug #59607 removes it if ! mysql_version_is_at_least "5.6" ; then CXXFLAGS="${CXXFLAGS} -fno-implicit-templates" fi + # As of 5.7, exceptions are used! + if ! mysql_version_is_at_least "5.7" ; then + CXXFLAGS="${CXXFLAGS} -fno-exceptions" + fi export CXXFLAGS # bug #283926, with GCC4.4, this is required to get correct behavior. @@ -316,6 +325,9 @@ mysql-cmake_src_install() { dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" + # Create a mariadb_config symlink + [[ ${PN} == "mariadb" ]] && dosym "/usr/bin/mysql_config" "/usr/bin/mariadb_config" + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir rm -Rf "${ED}/usr/data" @@ -341,7 +353,7 @@ mysql-cmake_src_install() { # Configuration stuff case ${MYSQL_PV_MAJOR} in 5.[1-4]*) mysql_mycnf_version="5.1" ;; - 5.[5-9]|6*|7*) mysql_mycnf_version="5.5" ;; + 5.[5-9]|6*|7*|8*|9*|10*) mysql_mycnf_version="5.5" ;; esac einfo "Building default my.cnf (${mysql_mycnf_version})" insinto "${MY_SYSCONFDIR#${EPREFIX}}" @@ -363,7 +375,7 @@ mysql-cmake_src_install() { einfo "Creating initial directories" # Empty directories ... diropts "-m0750" - if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then + if [[ ${PREVIOUS_DATADIR} != "yes" ]] ; then dodir "${MY_DATADIR#${EPREFIX}}" keepdir "${MY_DATADIR#${EPREFIX}}" chown -R mysql:mysql "${D}/${MY_DATADIR}" @@ -386,19 +398,16 @@ mysql-cmake_src_install() { "${S}"/support-files/magic \ "${S}"/support-files/ndb-config-2-node.ini.sh do - [[ -f "$script" ]] && dodoc "${script}" + [[ -f $script ]] && dodoc "${script}" done docinto "scripts" for script in "${S}"/scripts/mysql* ; do - [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" + [[ ( -f $script ) && ( ${script%.sh} == ${script} ) ]] && dodoc "${script}" done - fi - mysql_lib_symlinks "${ED}" - #Remove mytop if perl is not selected - [[ "${PN}" == "mariadb" ]] && ! use perl \ + [[ ${PN} == "mariadb" ]] && ! use perl \ && rm -f "${ED}/usr/bin/mytop" } diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index b13d22667f88..76dae6d5ce66 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.24 2013/02/13 00:40:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.25 2013/06/26 19:31:49 jmbsvicetto Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -11,7 +11,7 @@ # @BLURB: This eclass provides most of the functions for mysql ebuilds # @DESCRIPTION: # The mysql-v2.eclass is the base eclass to build the mysql and -# alternative projects (mariadb) ebuilds. +# alternative projects (mariadb and percona) ebuilds. # This eclass uses the mysql-autotools and mysql-cmake eclasses for the # specific bits related to the build system. # It provides the src_unpack, src_prepare, src_configure, src_compile, @@ -44,7 +44,7 @@ MYSQL_EXTRAS="" # @DESCRIPTION: # The version of the MYSQL_EXTRAS repo to use to build mysql # Use "none" to disable it's use -[[ "${MY_EXTRAS_VER}" == "live" ]] && MYSQL_EXTRAS="git-2" +[[ ${MY_EXTRAS_VER} == "live" ]] && MYSQL_EXTRAS="git-2" inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx versionator toolchain-funcs @@ -53,7 +53,7 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx # case "${EAPI:-0}" in - 3|4|5) ;; + 4|5) ;; *) die "Unsupported EAPI: ${EAPI}" ;; esac @@ -67,8 +67,8 @@ EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_ # and we will run a mysql server during test phase S="${WORKDIR}/mysql" -[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" -if [[ "${MY_EXTRAS_VER}" == "live" ]]; then +[[ ${MY_EXTRAS_VER} == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" +if [[ ${MY_EXTRAS_VER} == "live" ]]; then EGIT_PROJECT=mysql-extras EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" fi @@ -113,10 +113,10 @@ mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with # Designation by PERCONA for a MySQL version to apply an XTRADB release # Work out the default SERVER_URI correctly -if [ -z "${SERVER_URI}" ]; then - [ -z "${MY_PV}" ] && MY_PV="${PV//_/-}" - if [ "${PN}" == "mariadb" ]; then - MARIA_FULL_PV="$(replace_version_separator 3 '-' ${MY_PV})" +if [[ -z ${SERVER_URI} ]]; then + [[ -z ${MY_PV} ]] && MY_PV="${PV//_/-}" + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + MARIA_FULL_PV=$(replace_version_separator 3 '-' ${MY_PV}) MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" SERVER_URI=" http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz @@ -126,6 +126,16 @@ if [ -z "${SERVER_URI}" ]; then http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz " + if [[ ${PN} == "mariadb-galera" ]]; then + MY_SOURCEDIR="${PN%%-galera}-${MARIA_FULL_PV}" + fi + elif [[ ${PN} == "percona-server" ]]; then + PERCONA_PN="Percona-Server" + MIRROR_PV=$(get_version_component_range 1-2 ${PV}) + MY_PV=$(get_version_component_range 1-3 ${PV}) + MY_PATCH=$(get_version_component_range 4 ${PV}) + SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/LATEST/source/${PERCONA_PN}-${MY_PV}-rel30.${MY_PATCH}.tar.gz" +# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-rel30.2.tar.gz else URI_DIR="MySQL" URI_FILE="mysql" @@ -141,19 +151,28 @@ fi SRC_URI="${SERVER_URI}" # Gentoo patches to MySQL -[[ ${MY_EXTRAS_VER} != live ]] && [[ ${MY_EXTRAS_VER} != none ]] \ -&& SRC_URI="${SRC_URI} +if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then + SRC_URI="${SRC_URI} mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." HOMEPAGE="http://www.mysql.com/" -if [[ "${PN}" == "mariadb" ]]; then +if [[ ${PN} == "mariadb" ]]; then HOMEPAGE="http://mariadb.org/" DESCRIPTION="An enhanced, drop-in replacement for MySQL" fi +if [[ ${PN} == "mariadb-galera" ]]; then + HOMEPAGE="http://mariadb.org/" + DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" +fi +if [[ ${PN} == "percona-server" ]]; then + HOMEPAGE="http://www.percona.com/software/percona-server" + DESCRIPTION="An enhanced, drop-in replacement fro MySQL from the Percona team" +fi LICENSE="GPL-2" SLOT="0" @@ -172,34 +191,29 @@ IUSE="${IUSE} extraengine" IUSE="${IUSE} cluster" IUSE="${IUSE} max-idx-128" -IUSE="${IUSE} berkdb" IUSE="${IUSE} +community profiling" -[[ ${PN} == "mariadb" ]] \ -&& mysql_check_version_range "5.1.38 to 5.3.99" \ -&& IUSE="${IUSE} libevent" - -[[ ${PN} == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2" \ -&& IUSE="${IUSE} oqgraph" - -[[ ${PN} == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2.5" \ -&& IUSE="${IUSE} sphinx" - -[[ ${PN} == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2.10" \ -&& IUSE="${IUSE} pam" +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then + mysql_check_version_range "5.1.38 to 5.3.99" && IUSE="${IUSE} libevent" + mysql_version_is_at_least "5.2" && IUSE="${IUSE} oqgraph" + mysql_version_is_at_least "5.2.5" && IUSE="${IUSE} sphinx" + mysql_version_is_at_least "5.2.10" && IUSE="${IUSE} pam" +fi if mysql_version_is_at_least "5.5"; then REQUIRED_USE="tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc )" IUSE="${IUSE} jemalloc tcmalloc" fi -REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" +if mysql_version_is_at_least "5.5.7"; then + IUSE="${IUSE} systemtap" +fi -mysql_version_is_at_least "5.5.7" \ -&& IUSE="${IUSE} systemtap" +if [[ ${PN} == "percona-server" ]]; then + mysql_version_is_at_least "5.5.10" && IUSE="${IUSE} pam" +fi + +REQUIRED_USE="${REQUIRED_USE} minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )" # # DEPENDENCIES: @@ -216,42 +230,30 @@ DEPEND=" >=sys-libs/zlib-1.2.3 " -[[ ${PN} == mariadb ]] \ -&& mysql_check_version_range "5.1.38 to 5.3.99" \ -&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" + mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" + mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" + mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" + # Bug 441700 MariaDB >=5.3 include custom mytop + mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" +fi # Having different flavours at the same time is not a good idea -for i in "mysql" "mariadb" ; do +for i in "mysql" "mariadb" "mariadb-galera" "percona-server"; do [[ ${i} == ${PN} ]] || DEPEND="${DEPEND} !dev-db/${i}" done -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2" \ -&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" - -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2.5" \ -&& DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" - -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.2.10" \ -&& DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" - -# Bug 441700 MariaDB >=5.3 include custom mytop -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.3" \ -&& DEPEND="${DEPEND} perl? ( !dev-db/mytop )" - -mysql_version_is_at_least "5.5.7" \ -&& DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" \ -&& DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" - -mysql_version_is_at_least "5.5" \ -&& DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )" +if mysql_version_is_at_least "5.5" ; then + DEPEND="${DEPEND} jemalloc? ( dev-libs/jemalloc )" + DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )" +fi -mysql_version_is_at_least "5.5" \ -&& DEPEND="${DEPEND} tcmalloc? ( dev-util/google-perftools )" +if mysql_version_is_at_least "5.5.7" ; then + DEPEND="${DEPEND} systemtap? ( >=dev-util/systemtap-1.3 )" + DEPEND="${DEPEND} kernel_linux? ( dev-libs/libaio )" +fi # prefix: first need to implement something for #196294 RDEPEND="${DEPEND} @@ -259,14 +261,16 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql ) " -# Bug 455016 Add dependancies of mytop -[[ "${PN}" == "mariadb" ]] \ -&& mysql_version_is_at_least "5.3" \ -&& RDEPEND="${RDEPEND} perl? ( - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes ) " +if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then + # Bug 455016 Add dependencies of mytop + if mysql_version_is_at_least "5.3" ; then + RDEPEND="${RDEPEND} perl? ( + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) " + fi +fi DEPEND="${DEPEND} virtual/yacc @@ -278,8 +282,9 @@ DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )" DEPEND="${DEPEND} >=dev-util/cmake-2.4.3" # compile-time-only -mysql_version_is_at_least "5.5.8" \ -&& DEPEND="${DEPEND} >=dev-util/cmake-2.6.3" +if mysql_version_is_at_least "5.5.8" ; then + DEPEND="${DEPEND} >=dev-util/cmake-2.6.3" +fi # dev-perl/DBD-mysql is needed by some scripts installed by MySQL PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" @@ -295,13 +300,12 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}" # PBXT_VERSION means that we have a PBXT patch for this PV # PBXT was only introduced after 5.1.12 pbxt_patch_available() { - [[ ${PN} != "mariadb" ]] \ - && [[ -n "${PBXT_VERSION}" ]] + [[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" && ( -n "${PBXT_VERSION}" ) ]] return $? } pbxt_available() { - pbxt_patch_available || [[ ${PN} == "mariadb" ]] + pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] return $? } @@ -310,18 +314,16 @@ pbxt_available() { # XTRADB_VERS means that we have a XTRADB patch for this PV # XTRADB was only introduced after 5.1.26 xtradb_patch_available() { - [[ ${PN} != "mariadb" ]] \ - && [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]] + [[ ${PN} != "mariadb" && ${PN} != "mariadb-galera" + && ( -n "${XTRADB_VER}" ) && ( -n "${PERCONA_VER}" ) ]] return $? } - if pbxt_patch_available; then PBXT_P="pbxt-${PBXT_VERSION}" PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" - fi # PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins @@ -393,8 +395,7 @@ mysql-v2_pkg_setup() { fi # Check for USE flag problems in pkg_setup - if ! mysql_version_is_at_least "5.2" \ - && use debug ; then + if ! mysql_version_is_at_least "5.2" && use debug ; then # Also in package.use.mask die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51" fi @@ -496,13 +497,13 @@ mysql-v2_pkg_postinst() { docinto "scripts" for script in scripts/mysql* ; do - [[ -f "${script}" ]] \ - && [[ "${script%.sh}" == "${script}" ]] \ - && dodoc "${script}" + if [[ -f "${script}" && "${script%.sh}" == "${script}" ]]; then + dodoc "${script}" + fi done - if [ ${PN} == "mariadb" ] \ - && mysql_version_is_at_least "5.2.10" && use pam ; then + if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] \ + && mysql_version_is_at_least "5.2.10" && use pam ; then einfo elog "This install includes the PAM authentication plugin." elog "To activate and configure the PAM plugin, please read:" @@ -536,10 +537,6 @@ mysql-v2_pkg_postinst() { elog " PRIMARY KEY (name)" elog " ) CHARACTER SET utf8 COLLATE utf8_bin;" fi - - mysql_check_version_range "4.0 to 5.0.99.99" \ - && use berkdb \ - && elog "Berkeley DB support is deprecated and will be removed in future versions!" } # @FUNCTION: mysql-v2_getopt @@ -587,7 +584,7 @@ mysql-v2_pkg_config() { local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}" old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" - if [[ -d "${old_MY_DATADIR_s}" ]] && [[ "${old_MY_DATADIR_s}" != / ]]; then + if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then if [[ -d "${MY_DATADIR_s}" ]]; then ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" @@ -670,11 +667,11 @@ mysql-v2_pkg_config() { && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ || touch "${TMPDIR}/fill_help_tables.sql" help_tables="${TMPDIR}/fill_help_tables.sql" - + # Figure out which options we need to disable to do the setup helpfile="${TMPDIR}/mysqld-help" ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null - for opt in grant-tables host-cache name-resolve networking slave-start bdb \ + for opt in grant-tables host-cache name-resolve networking slave-start \ federated innodb ssl log-bin relay-log slow-query-log external-locking \ ndbcluster log-slave-updates \ ; do @@ -690,7 +687,7 @@ mysql-v2_pkg_config() { pushd "${TMPDIR}" &>/dev/null #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db - [ -f ${cmd} ] || cmd=${EROOT}usr/bin/mysql_install_db + [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}" einfo "Command: $cmd" eval $cmd \ @@ -716,6 +713,14 @@ mysql-v2_pkg_config() { einfo "Creating the mysql database and setting proper" einfo "permissions on it ..." + # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it + PID_DIR="${EROOT}/var/run/mysqld" + if [[ ! -d "${PID_DIR}" ]]; then + mkdir "${PID_DIR}" + chown mysql:mysql "${PID_DIR}" + chmod 755 "${PID_DIR}" + fi + local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock" local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid" local mysqld="${EROOT}/usr/sbin/mysqld \ @@ -763,7 +768,7 @@ mysql-v2_pkg_config() { mysql < "${sqltmp}" rc=$? eend $? - [ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!" + [[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!" # Stop the server and cleanup einfo "Stopping the server ..." diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest index 735d6beab4b6..ed78e0d25752 100644 --- a/games-engines/renpy/Manifest +++ b/games-engines/renpy/Manifest @@ -1,3 +1,3 @@ DIST renpy-6.14.1-source.tar.bz2 9806538 SHA256 18be3630d1956131a1f010732d15292cdcec14a2391210af27dc342fafd8197f SHA512 a1f13a5f860e66054012eab29bbd37715bd9721e2dc30fdd9c8d4d8c58dc672c35b3c813e962ad6878cb741502af5a181dff8a05f359892b6b60d2e15bc5a7bc WHIRLPOOL 54018731e136106f328bf2d028841f09424d8ffd8303821eec995c55918b2c8ac7eb97d9ed24785e95ad3d878b794f5bcf96cc9f783955f8d1ace086a3ca9b61 DIST renpy-6.15.4-source.tar.bz2 10393987 SHA256 1c32fef5fda6f14134ea5e18f4754934644f86bdd968b4600b03b373f2d8e9cb SHA512 d68d5d64b29bf3eb19a38aa9dc540278e0b054dc2629aaa01866fbf2976cc6a5ffb0027706004526112782b25d0a8aae76a6b3958b5bfdac8a62841ba223554a WHIRLPOOL 008e1e3986d97d24256b6438de00be7ae676c893a67d975037c8bbfc5bfbdb886cb70d28bed3dfbec5c6529906b66071cc990fc617c1b579f8d2f9f9afe20ca8 -DIST renpy-6.15.5-source.tar.bz2 10433241 SHA256 e174a61d9861144895a8a4334b6c0058c4c18c2405cd8cc7f9418380895c833b SHA512 8d1a1993fd90288a72e64d55d6e0da3f0fcfc513d2cdf63c6f4c3d84404ab7babdfb97db565c6063b057e6331f367c4662a4fc2151e8dc78c126cb19ecdfe893 WHIRLPOOL 71a0c8574f8a3b3c5008c16d20585da5a8e7f8532f66a6839ab1e2309441e70364ae45ac9e5e3088be21ad53c46e21728b1c25e893c392d1c26a200c3ae1406c +DIST renpy-6.15.7-source.tar.bz2 10421736 SHA256 b4280b62f7c8f730a37c7e567b16216b4578fc3640fbcdf5df7c65a73ae52e52 SHA512 d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6 WHIRLPOOL 202ddb045f440f9abd06f5ac02ebd92a7b0300b14f4755271f1fc4e91bdea21cda19a432f45516f68ba3ad7ead98d7491382ad5c633da277a674f799458795f3 diff --git a/games-engines/renpy/files/renpy-6.15.5-multiple-abi.patch b/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch similarity index 80% rename from games-engines/renpy/files/renpy-6.15.5-multiple-abi.patch rename to games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch index acd44aa3054a..c6b87ac868d7 100644 --- a/games-engines/renpy/files/renpy-6.15.5-multiple-abi.patch +++ b/games-engines/renpy/files/renpy-6.15.7-multiple-abi.patch @@ -1,95 +1,18 @@ -From: Julian Ospald -Date: Mon Feb 25 21:35:31 UTC 2013 -Subject: fix multiple abi support +commit ea0351d8bf6404f5e8db2ff872885a19bf8a3f92 +Author: hasufell +Date: Thu Jun 27 02:01:17 2013 +0200 ---- /dev/null -+++ renpy-6.15.2-source/renpy/common.py -@@ -0,0 +1,79 @@ -+# (the "Software"), to deal in the Software without restriction, -+# including without limitation the rights to use, copy, modify, merge, -+# publish, distribute, sublicense, and/or sell copies of the Software, -+# and to permit persons to whom the Software is furnished to do so, -+# subject to the following conditions: -+# -+# The above copyright notice and this permission notice shall be -+# included in all copies or substantial portions of the Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+import os -+import sys -+import warnings -+from distutils.sysconfig import get_python_lib -+ -+# Functions to be customized by distributors. ################################ -+ -+# Given the Ren'Py base directory (usually the directory containing -+# this file), this is expected to return the path to the common directory. -+def path_to_common(renpy_base): -+ return renpy_base + "/renpy/common" -+ -+# Given a directory holding a Ren'Py game, this is expected to return -+# the path to a directory that will hold save files. -+def path_to_saves(gamedir): -+ import renpy #@UnresolvedImport -+ -+ if not renpy.config.save_directory: -+ return gamedir + "/saves" -+ -+ # Search the path above Ren'Py for a directory named "Ren'Py Data". -+ # If it exists, then use that for our save directory. -+ path = renpy.config.renpy_base -+ -+ while True: -+ if os.path.isdir(path + "/Ren'Py Data"): -+ return path + "/Ren'Py Data/" + renpy.config.save_directory -+ -+ newpath = os.path.dirname(path) -+ if path == newpath: -+ break -+ path = newpath -+ -+ # Otherwise, put the saves in a platform-specific location. -+ if renpy.android: -+ return gamedir + "/saves" -+ -+ elif renpy.macintosh: -+ rv = "~/Library/RenPy/" + renpy.config.save_directory -+ return os.path.expanduser(rv) -+ -+ elif renpy.windows: -+ if 'APPDATA' in os.environ: -+ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory -+ else: -+ rv = "~/RenPy/" + renpy.config.save_directory -+ return os.path.expanduser(rv) -+ -+ else: -+ rv = "~/.renpy/" + renpy.config.save_directory -+ return os.path.expanduser(rv) -+ -+ -+# Returns the path to the Ren'Py base directory (containing common and -+# the launcher, usually.) -+def path_to_renpy_base(): -+ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0])) -+ renpy_base = get_python_lib() + "/renpy@SLOT@" -+ renpy_base = os.environ.get('RENPY_BASE', renpy_base) -+ renpy_base = os.path.abspath(renpy_base) -+ -+ return renpy_base ---- renpy-6.15.2-source/renpy.py -+++ renpy-6.15.2-source/renpy.py -@@ -25,64 +25,9 @@ + fix multiple abi support + +diff --git a/renpy.py b/renpy.py +index 4ec5324..d873750 100644 +--- a/renpy.py ++++ b/renpy.py +@@ -28,82 +28,9 @@ + import os import sys import warnings - +- -# Functions to be customized by distributors. ################################ - -# Given the Ren'Py base directory (usually the directory containing @@ -102,6 +25,26 @@ Subject: fix multiple abi support -def path_to_saves(gamedir): - import renpy #@UnresolvedImport - +- # Android. +- if renpy.android: +- paths = [ +- os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"), +- os.path.join(os.environ["ANDROID_PRIVATE"], "saves"), +- os.path.join(os.environ["ANDROID_PUBLIC"], "saves"), +- ] +- +- for rv in paths: +- if os.path.isdir(rv): +- break +- +- print "Using savedir", rv +- +- # We return the last path as the default. +- +- return rv +- +- +- # No save directory given. - if not renpy.config.save_directory: - return gamedir + "/saves" - @@ -119,10 +62,7 @@ Subject: fix multiple abi support - path = newpath - - # Otherwise, put the saves in a platform-specific location. -- if renpy.android: -- return gamedir + "/saves" -- -- elif renpy.macintosh: +- if renpy.macintosh: - rv = "~/Library/RenPy/" + renpy.config.save_directory - return os.path.expanduser(rv) - @@ -154,12 +94,12 @@ Subject: fix multiple abi support # The version of the Mac Launcher and py4renpy that we require. macos_version = (6, 14, 0) -@@ -97,21 +42,10 @@ +@@ -118,20 +45,9 @@ except: print "Ren'Py requires at least python 2.6." sys.exit(0) -android = ("ANDROID_PRIVATE" in os.environ) - +- -# Android requires us to add code to the main module, and to command some -# renderers. -if android: @@ -168,7 +108,6 @@ Subject: fix multiple abi support - __main__.path_to_common = path_to_common - __main__.path_to_saves = path_to_saves - os.environ["RENPY_RENDERER"] = "gl" -- os.environ["RENPY_GL_ENVIRON"] = "limited" - def main(): @@ -177,7 +116,7 @@ Subject: fix multiple abi support # Add paths. if os.path.exists(renpy_base + "/module"): -@@ -134,10 +68,6 @@ +@@ -154,10 +70,6 @@ def main(): print >>sys.stderr, "correctly, preserving the directory structure." raise @@ -188,9 +127,101 @@ Subject: fix multiple abi support renpy.bootstrap.bootstrap(renpy_base) if __name__ == "__main__": ---- renpy-6.15.2-source/renpy/main.py -+++ renpy-6.15.2-source/renpy/main.py -@@ -27,7 +27,7 @@ +diff --git a/renpy/common.py b/renpy/common.py +new file mode 100644 +index 0000000..475b7e8 +--- /dev/null ++++ b/renpy/common.py +@@ -0,0 +1,84 @@ ++# This file is part of Ren'Py. The license below applies to Ren'Py only. ++# Games and other projects that use Ren'Py may use a different license. ++ ++# Copyright 2004-2012 Tom Rothamel ++# ++# Permission is hereby granted, free of charge, to any person ++# obtaining a copy of this software and associated documentation files ++# (the "Software"), to deal in the Software without restriction, ++# including without limitation the rights to use, copy, modify, merge, ++# publish, distribute, sublicense, and/or sell copies of the Software, ++# and to permit persons to whom the Software is furnished to do so, ++# subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be ++# included in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++import os ++import sys ++import warnings ++from distutils.sysconfig import get_python_lib ++ ++# Functions to be customized by distributors. ################################ ++ ++# Given the Ren'Py base directory (usually the directory containing ++# this file), this is expected to return the path to the common directory. ++def path_to_common(renpy_base): ++ return renpy_base + "/renpy/common" ++ ++# Given a directory holding a Ren'Py game, this is expected to return ++# the path to a directory that will hold save files. ++def path_to_saves(gamedir): ++ import renpy #@UnresolvedImport ++ ++ # No save directory given. ++ if not renpy.config.save_directory: ++ return gamedir + "/saves" ++ ++ # Search the path above Ren'Py for a directory named "Ren'Py Data". ++ # If it exists, then use that for our save directory. ++ path = renpy.config.renpy_base ++ ++ while True: ++ if os.path.isdir(path + "/Ren'Py Data"): ++ return path + "/Ren'Py Data/" + renpy.config.save_directory ++ ++ newpath = os.path.dirname(path) ++ if path == newpath: ++ break ++ path = newpath ++ ++ # Otherwise, put the saves in a platform-specific location. ++ if renpy.macintosh: ++ rv = "~/Library/RenPy/" + renpy.config.save_directory ++ return os.path.expanduser(rv) ++ ++ elif renpy.windows: ++ if 'APPDATA' in os.environ: ++ return os.environ['APPDATA'] + "/RenPy/" + renpy.config.save_directory ++ else: ++ rv = "~/RenPy/" + renpy.config.save_directory ++ return os.path.expanduser(rv) ++ ++ else: ++ rv = "~/.renpy/" + renpy.config.save_directory ++ return os.path.expanduser(rv) ++ ++ ++# Returns the path to the Ren'Py base directory (containing common and ++# the launcher, usually.) ++def path_to_renpy_base(): ++ renpy_base = os.path.dirname(os.path.realpath(sys.argv[0])) ++ renpy_base = get_python_lib() + "/renpy@SLOT@" ++ renpy_base = os.environ.get('RENPY_BASE', renpy_base) ++ renpy_base = os.path.abspath(renpy_base) ++ ++ return renpy_base +diff --git a/renpy/main.py b/renpy/main.py +index 908e246..61027ec 100644 +--- a/renpy/main.py ++++ b/renpy/main.py +@@ -27,7 +27,7 @@ import time import zipfile import subprocess from cPickle import loads, dumps @@ -199,7 +230,7 @@ Subject: fix multiple abi support def save_persistent(): -@@ -147,7 +147,7 @@ +@@ -147,7 +147,7 @@ def main(): renpy.config.searchpath = [ renpy.config.gamedir ] # Find the common directory. @@ -208,7 +239,7 @@ Subject: fix multiple abi support if os.path.isdir(commondir): renpy.config.searchpath.append(commondir) -@@ -206,7 +206,7 @@ +@@ -210,7 +210,7 @@ def main(): # Find the save directory. if renpy.config.savedir is None: diff --git a/games-engines/renpy/renpy-6.15.5.ebuild b/games-engines/renpy/renpy-6.15.7.ebuild similarity index 98% rename from games-engines/renpy/renpy-6.15.5.ebuild rename to games-engines/renpy/renpy-6.15.7.ebuild index 24c4d8fc733f..add17bab9c98 100644 --- a/games-engines/renpy/renpy-6.15.5.ebuild +++ b/games-engines/renpy/renpy-6.15.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.5.ebuild,v 1.1 2013/06/05 12:27:29 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/renpy/renpy-6.15.7.ebuild,v 1.1 2013/06/27 00:07:22 hasufell Exp $ EAPI=5 PYTHON_COMPAT=( python2_6 python2_7 ) diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild index e0268da4368b..c2e566e5cb04 100644 --- a/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild,v 1.2 2013/05/06 13:50:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild,v 1.3 2013/06/26 20:09:37 aballier Exp $ EAPI=5 @@ -18,7 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6 IUSE="doc debug alisp python" RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} doc? ( >=app-doc/doxygen-1.2.6 )" diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild index f23dcdfb7074..66ad9d2d97b1 100644 --- a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.1 2013/05/27 13:42:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.2 2013/06/26 20:09:37 aballier Exp $ EAPI=5 @@ -19,7 +19,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6 IUSE="doc debug alisp python" RDEPEND="python? ( ${PYTHON_DEPS} ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} doc? ( >=app-doc/doxygen-1.2.6 )" diff --git a/media-libs/audiofile/audiofile-0.3.6-r1.ebuild b/media-libs/audiofile/audiofile-0.3.6-r1.ebuild index 689a82f512a8..87084a0e53ca 100644 --- a/media-libs/audiofile/audiofile-0.3.6-r1.ebuild +++ b/media-libs/audiofile/audiofile-0.3.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.6-r1.ebuild,v 1.1 2013/05/02 12:50:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.6-r1.ebuild,v 1.2 2013/06/26 20:31:26 aballier Exp $ EAPI=5 @@ -16,7 +16,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6 IUSE="flac static-libs test" RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" diff --git a/media-libs/flac/flac-1.2.1-r5.ebuild b/media-libs/flac/flac-1.2.1-r5.ebuild index 7ce455b8beef..092343977b69 100644 --- a/media-libs/flac/flac-1.2.1-r5.ebuild +++ b/media-libs/flac/flac-1.2.1-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r5.ebuild,v 1.3 2013/05/07 11:58:12 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r5.ebuild,v 1.4 2013/06/26 20:21:47 aballier Exp $ EAPI=5 @@ -19,7 +19,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6 IUSE="3dnow altivec +cxx debug ogg sse static-libs" RDEPEND="ogg? ( >=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) diff --git a/media-libs/flac/flac-1.3.0.ebuild b/media-libs/flac/flac-1.3.0.ebuild index 06c7b0fa17b0..e3ce26c7b36b 100644 --- a/media-libs/flac/flac-1.3.0.ebuild +++ b/media-libs/flac/flac-1.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0.ebuild,v 1.1 2013/05/29 08:30:22 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.3.0.ebuild,v 1.2 2013/06/26 20:21:47 aballier Exp $ EAPI=5 AUTOTOOLS_AUTORECONF=1 @@ -18,7 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6 IUSE="3dnow altivec +cxx debug ogg sse static-libs" RDEPEND="ogg? ( >=media-libs/libogg-1.1.3[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} app-arch/xz-utils abi_x86_32? ( dev-lang/nasm ) diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 09865c98750d..6fb1926a91ef 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -1,2 +1 @@ -DIST OpenCV-2.4.3.tar.bz2 67240491 SHA256 f8fbe985978d4eae73e8c3b526ed40a37d4761d2029a5b035233f58146f6f59b SHA512 5305e726089f3f43b2bac06b09e2b5f021c63421ba0b36eeb10e43a067a6954569fccb5a66ff8971e83ffb2c3829df222b74e6a33117f85286b3389e5add232e WHIRLPOOL a384e7d09ac31638bb4bc93c2c7c6b2bc88d0344a494d44d53110528a1abb84250b7979c46d3be55891b61b952ed780f10cee41478bdb906357d80bf52f52b57 DIST opencv-2.4.5.tar.gz 81884985 SHA256 d30beecf4b57977fbd1635af54c5ab3fc00113e9e59a9d58081732260fe06292 SHA512 2e0ab19203cc5d3a4d83633ee9762441d0d12128752edecb351b3c4abddc1714baf4b320b161f8b58e771933506bfa5a192d394a3b6b5b63d914923c6a767a08 WHIRLPOOL 117551edab5837a9382a6d84dec7f84fb693485e3cad7c08d38158baa22951381eb4958caaaa910dcef6ee2b78a0a494d732d0cac88cd18f1f6ebc2d30e3ddf0 diff --git a/media-libs/opencv/opencv-2.4.3.ebuild b/media-libs/opencv/opencv-2.4.3.ebuild deleted file mode 100644 index 53a3600a0e92..000000000000 --- a/media-libs/opencv/opencv-2.4.3.ebuild +++ /dev/null @@ -1,182 +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/opencv/opencv-2.4.3.ebuild,v 1.8 2013/04/06 10:17:50 dilfridge Exp $ - -EAPI=4 -PYTHON_DEPEND="2:2.6" - -inherit base toolchain-funcs cmake-utils python - -MY_P=OpenCV-${PV} - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" -HOMEPAGE="http://opencv.willowgarage.com" -SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux" -IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine" - -RDEPEND=" - app-arch/bzip2 - dev-python/numpy - sys-libs/zlib - cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) - eigen? ( dev-cpp/eigen:2 ) - ffmpeg? ( virtual/ffmpeg ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - ) - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - jpeg? ( virtual/jpeg ) - jpeg2k? ( media-libs/jasper ) - ieee1394? ( - media-libs/libdc1394 - sys-libs/libraw1394 - ) - ipp? ( sci-libs/ipp ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr ) - opengl? ( virtual/glu ) - png? ( media-libs/libpng:0 ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qttest:4 - opengl? ( dev-qt/qtopengl:4 ) - ) - threads? ( dev-cpp/tbb ) - tiff? ( media-libs/tiff ) - v4l? ( >=media-libs/libv4l-0.8.3 ) - xine? ( media-libs/xine-lib ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -# REQUIRED_USE="opengl? ( qt )" - -PATCHES=( - "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" - "${FILESDIR}/${PN}-2.4.3-gcc47.patch" - "${FILESDIR}/${PN}-2.4.2-cflags.patch" -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - base_src_prepare - - # remove bundled stuff - rm -rf 3rdparty - sed -i \ - -e '/add_subdirectory(3rdparty)/ d' \ - CMakeLists.txt || die -} - -src_configure() { - # please dont sort here, order is the same as in CMakeLists.txt - local mycmakeargs=( - # the optinal dependency libraries - $(cmake-utils_use_with ieee1394 1394) - -DWITH_AVFOUNDATION=OFF - -DWITH_CARBON=OFF - $(cmake-utils_use_with eigen) - $(cmake-utils_use_with ffmpeg) - $(cmake-utils_use_with gstreamer) - $(cmake-utils_use_with gtk) - $(cmake-utils_use_with ipp) - $(cmake-utils_use_with jpeg2k JASPER) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with opencl) - # $(cmake-utils_use_with opencl OPENCLAMDFFT) - # $(cmake-utils_use_with opencl OPENCLAMDBLAS) - $(cmake-utils_use_with openexr) - $(cmake-utils_use_with opengl) - -DWITH_OPENNI=OFF # not packaged - $(cmake-utils_use_with png) - -DWITH_PVAPI=OFF # not packaged - $(cmake-utils_use_with qt4 QT) - -DWITH_QUICKTIME=OFF - $(cmake-utils_use_with threads TBB) - $(cmake-utils_use_with tiff) - -DWITH_UNICAP=OFF # not packaged - $(cmake-utils_use_with v4l V4L) - -DWITH_VIDEOINPUT=OFF # windows only - -DWITH_XIMEA=OFF # windows only - $(cmake-utils_use_with xine) - # the build components - -DBUILD_SHARED_LIBS=ON - -DBUILD_ANDROID_EXAMPLES=OFF - $(cmake-utils_use_build doc DOCS) - $(cmake-utils_use_build examples) - -DBUILD_PERF_TESTS=OFF - $(cmake-utils_use_build testprograms TESTS) - # install examples - $(cmake-utils_use examples INSTALL_C_EXAMPLES) - # build options - $(cmake-utils_use_enable pch PRECOMPILED_HEADERS) - -DENABLE_OMIT_FRAME_POINTER=OFF # - -DENABLE_FAST_MATH=OFF # - -DENABLE_SSE=OFF # these options do nothing but - -DENABLE_SSE2=OFF # add params to CFLAGS - -DENABLE_SSE3=OFF - -DENABLE_SSSE3=OFF - -DENABLE_SSE41=OFF - -DENABLE_SSE42=OFF - -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic - ) - - if use cuda; then - if [[ "$(gcc-version)" > "4.6" ]]; then - ewarn "CUDA and >=sys-devel/gcc-4.7 do not play well together. Disabling CUDA support." - mycmakeargs+=( "-DWITH_CUDA=OFF" ) - mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) - mycmakeargs+=( "-DWITH_CUFFT=OFF" ) - else - mycmakeargs+=( "-DWITH_CUDA=ON" ) - mycmakeargs+=( "-DWITH_CUBLAS=ON" ) - mycmakeargs+=( "-DWITH_CUFFT=ON" ) - fi - else - mycmakeargs+=( "-DWITH_CUDA=OFF" ) - mycmakeargs+=( "-DWITH_CUBLAS=OFF" ) - mycmakeargs+=( "-DWITH_CUFFT=OFF" ) - fi - - if use examples; then - mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" ) - else - mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" ) - fi - - # things we want to be hard off or not yet figured out - mycmakeargs+=( - "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF" - "-DBUILD_LATEX_DOCS=OFF" - "-DBUILD_PACKAGE=OFF" - "-DENABLE_PROFILING=OFF" - ) - - # things we want to be hard enabled not worth useflag - mycmakeargs+=( - "-DCMAKE_SKIP_RPATH=ON" - "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}" - ) - - # hardcode cuda paths - mycmakeargs+=( - "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda" - ) - - cmake-utils_src_configure -} diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild index 37c68823ef72..947a8b0c088d 100644 --- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild +++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild,v 1.1 2013/05/03 13:40:12 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild,v 1.2 2013/06/26 20:08:00 aballier Exp $ EAPI=5 @@ -16,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" IUSE="static-libs" -RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DOCS=( AUTHORS NEWS README ) diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r1.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r1.ebuild deleted file mode 100644 index cd233c00d239..000000000000 --- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15-r1.ebuild,v 1.6 2013/05/08 12:06:39 aballier Exp $ - -inherit eutils autotools - -DESCRIPTION="Large collection of LADSPA audio plugins/effects" -HOMEPAGE="http://plugin.org.uk" -SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="3dnow nls sse" - -RDEPEND="media-libs/ladspa-sdk - media-sound/gsm - >=sci-libs/fftw-3" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-pic.patch" - epatch "${FILESDIR}/${P}-plugindir.patch" - epatch "${FILESDIR}/${P}-riceitdown.patch" - epatch "${FILESDIR}/${P}-gettext.patch" - - # Use system libgsm, bug #252890 - rm -rf gsm - epatch "${FILESDIR}/${P}-system_gsm.patch" - - # This is to update gettext macros, otherwise they are incompatible with - # recent libtools, bug #231767 - autopoint -f || die - - # it doesn't get updated otherwise - rm -f missing - - # Fix build with automake 1.13 - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die - - eautoreconf - elibtoolize -} - -src_compile() { - econf ${myconf} \ - $(use_enable sse) \ - $(use_enable 3dnow) \ - $(use_enable nls) \ - $(use_enable userland_Darwin darwin) \ - --enable-fast-install \ - --disable-dependency-tracking || die "econf failed" - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog README TODO -} - -pkg_postinst() { - ewarn "WARNING: You have to be careful when using the" - ewarn "swh plugins. Be sure to lower your sound volume" - ewarn "and then play around a bit with the plugins so" - ewarn "you get a feeling for it. Otherwise your speakers" - ewarn "won't like that." -} diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild deleted file mode 100644 index fd55fc719026..000000000000 --- a/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/swh-plugins/swh-plugins-0.4.15.ebuild,v 1.8 2012/05/05 08:27:15 jdhore Exp $ - -inherit eutils autotools - -DESCRIPTION="Large collection of LADSPA audio plugins/effects" -HOMEPAGE="http://plugin.org.uk" -SRC_URI="http://plugin.org.uk/releases/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ~ppc x86" -IUSE="3dnow nls sse" - -RDEPEND="media-libs/ladspa-sdk - >=sci-libs/fftw-3" -DEPEND="${RDEPEND} - sys-devel/gettext - dev-vcs/cvs - virtual/pkgconfig" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}-pic.patch" - epatch "${FILESDIR}/${P}-plugindir.patch" - epatch "${FILESDIR}/${P}-riceitdown.patch" - epatch "${FILESDIR}/${P}-gettext.patch" - - # This is to update gettext macros, otherwise they are incompatible with - # recent libtools, bug #231767 - autopoint -f || die - - # it doesn't get updated otherwise - rm -f missing - - eautoreconf - elibtoolize -} - -src_compile() { - econf ${myconf} \ - $(use_enable sse) \ - $(use_enable 3dnow) \ - $(use_enable nls) \ - $(use_enable userland_Darwin darwin) \ - --enable-fast-install \ - --disable-dependency-tracking || die "econf failed" - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog README TODO -} - -pkg_postinst() { - ewarn "WARNING: You have to be careful when using the" - ewarn "swh plugins. Be sure to lower your sound volume" - ewarn "and then play around a bit with the plugins so" - ewarn "you get a feeling for it. Otherwise your speakers" - ewarn "won't like that." -} diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest index fa445f4f437d..b54d4ba374e0 100644 --- a/media-sound/a2jmidid/Manifest +++ b/media-sound/a2jmidid/Manifest @@ -1,4 +1 @@ -DIST a2jmidid-4.tar.bz2 154695 SHA256 e3b5e2bee86abd800076c8d549a76510412a86bf1bb7142fd4e2c5b34aeb6b90 -DIST a2jmidid-5.tar.bz2 301960 SHA256 44536ed7a5906396500d561ecaf163653203c55eac307c8655ce71581a7c9c64 -DIST a2jmidid-6.tar.bz2 160021 SHA256 c158bd125a4d975b307c68876ba809a353c2ff4d27f2ecaba226a63da3d7a057 SHA512 273880b3dd8f5668689642903508ad6fcd4f1046d65654e56d660b961995e5d92395c1038108142a5fd4fdab63df7639695113067cc99921c236726c43636df5 WHIRLPOOL a18af93ed7fc08db560cfb4d040ccb0db3e60c7c8e53b1e95e186ffc03e6c1d66b3624004793c07c3b6b32902f9330bb25aab4f16dabdb2136277f05b719e812 DIST a2jmidid-8.tar.bz2 162764 SHA256 2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f SHA512 6182a295462ae587461ca395d85c956523bfecd113d031d0ae8a9f304fc3d41f6a5097b3a1a9fc06bd0eef7fe08a4b3c116a3361ff9e63468c3e40b736215592 WHIRLPOOL 04408b6eb3460a522da6009e142fa113fd95c20efbce6c1fcca30a2966478950fc3d5c061694bb533fd5f3261f2d26f22b507bff5fb73050f2fb57a23c6c8936 diff --git a/media-sound/a2jmidid/a2jmidid-4.ebuild b/media-sound/a2jmidid/a2jmidid-4.ebuild deleted file mode 100644 index bcedc8835377..000000000000 --- a/media-sound/a2jmidid/a2jmidid-4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/a2jmidid-4.ebuild,v 1.3 2012/05/05 08:02:52 mgorny Exp $ - -DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system." -HOMEPAGE="http://home.gna.org/a2jmidid/" -SRC_URI="http://download.gna.org/a2jmidid/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="media-libs/alsa-lib - media-sound/jack-audio-connection-kit - sys-apps/dbus" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-lang/python" - -src_compile() { - ./waf configure --prefix=/usr || die "failed to configure" - ./waf || die "failed to build" -} - -src_install() { - ./waf --destdir="${D}" install || die "install failed" - dodoc AUTHORS README NEWS internals.txt -} diff --git a/media-sound/a2jmidid/a2jmidid-5.ebuild b/media-sound/a2jmidid/a2jmidid-5.ebuild deleted file mode 100644 index 9d68851d3c9b..000000000000 --- a/media-sound/a2jmidid/a2jmidid-5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/a2jmidid/a2jmidid-5.ebuild,v 1.2 2012/05/05 08:02:52 mgorny Exp $ - -DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system." -HOMEPAGE="http://home.gna.org/a2jmidid/" -SRC_URI="http://download.gna.org/a2jmidid/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/alsa-lib - media-sound/jack-audio-connection-kit - sys-apps/dbus" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-lang/python" - -src_compile() { - ./waf configure --prefix=/usr || die "failed to configure" - ./waf || die "failed to build" -} - -src_install() { - ./waf --destdir="${D}" install || die "install failed" - dodoc AUTHORS README NEWS internals.txt -} diff --git a/media-sound/a2jmidid/a2jmidid-6.ebuild b/media-sound/a2jmidid/a2jmidid-6.ebuild deleted file mode 100644 index 307cbba7d107..000000000000 --- a/media-sound/a2jmidid/a2jmidid-6.ebuild +++ /dev/null @@ -1,36 +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/a2jmidid/a2jmidid-6.ebuild,v 1.3 2013/05/20 16:17:35 aballier Exp $ - -EAPI="4" -PYTHON_DEPEND="2" -NO_WAF_LIBDIR=1 - -inherit python toolchain-funcs waf-utils - -DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system." -HOMEPAGE="http://home.gna.org/a2jmidid/" -SRC_URI="http://download.gna.org/a2jmidid/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="media-libs/alsa-lib - media-sound/jack-audio-connection-kit - sys-apps/dbus" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=(AUTHORS README NEWS internals.txt) - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_install() { - waf-utils_src_install - python_convert_shebangs -r 2 "${ED}" -} diff --git a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild new file mode 100644 index 000000000000..d908fefdd7d3 --- /dev/null +++ b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/audicle/audicle-1.0.0.7-r1.ebuild,v 1.1 2013/06/27 07:09:40 pinkbyte Exp $ + +EAPI=5 +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality" +HOMEPAGE="http://audicle.cs.princeton.edu/" +SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa jack oss truetype" + +RDEPEND="jack? ( media-sound/jack-audio-connection-kit ) + alsa? ( >=media-libs/alsa-lib-0.9 ) + media-libs/libsndfile + media-libs/freeglut + virtual/opengl + virtual/glu + x11-libs/gtk+:2 + truetype? ( media-libs/ftgl + media-fonts/corefonts ) + app-admin/eselect-audicle" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + virtual/pkgconfig" + +REQUIRED_USE="|| ( alsa jack oss )" + +DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS ) +PATCHES=( + "${FILESDIR}/${PN}-1.0.0.6-font.patch" + "${FILESDIR}/${P}-hid-smc.patch" + "${FILESDIR}/${P}-gcc43.patch" + "${FILESDIR}/${P}-const.patch" +) + +src_prepare() { + epatch ${PATCHES[@]} + + sed -i \ + -e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \ + -e 's@../ftgl_lib/FTGL/mac/build@/usr/lib@' \ + -e 's/gcc -o/$(CC) -o/' \ + -e 's/-O3 -c/-c $(CFLAGS)/' \ + -e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \ + src/makefile.{alsa,jack,oss} || die "sed failed" + + epatch_user +} + +compile_backend() { + local backend="$1" + local config + use truetype && config="USE_FREETYPE_LIBS=1" + einfo "Compiling against ${backend}" + cd "${S}/src" + emake -f "makefile.${backend}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LEX=flex \ + YACC=bison ${config} + mv audicle{,-${backend}} + emake -f makefile clean +} + +src_compile() { + # when compile with athlon or athlon-xp flags + # audicle crashes on removing a shred with a double free or corruption + # it happens in Chuck_VM_Stack::shutdown() on the line + # SAFE_DELETE_ARRAY( stack ); + replace-cpu-flags athlon athlon-xp i686 + + use jack && compile_backend jack + use alsa && compile_backend alsa + use oss && compile_backend oss +} + +src_install() { + use jack && dobin src/audicle-jack + use alsa && dobin src/audicle-alsa + use oss && dobin src/audicle-oss + dodoc ${DOCS[@]} +} + +pkg_postinst() { + elog "Audicle now can use many audio engines, so you can specify audio engine" + elog "with audicle-{jack,alsa,oss}" + elog "Or you can use 'eselect audicle' to set the audio engine" + + einfo "Calling eselect audicle update..." + eselect audicle update --if-unset +} diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest index 53f433753dc1..7f4e3557ff45 100644 --- a/media-sound/lmms/Manifest +++ b/media-sound/lmms/Manifest @@ -1,2 +1,3 @@ DIST lmms-0.4.13.tar.bz2 14183574 SHA256 fca4d62f09dc31230870776dce048da51c5ffd4949934cf4bbcdfad65d952082 SHA512 07bb6cf23d96d95eb3482e2d802758b486ad5fa412a0d1093f4398b7034f4d95c6567eacff1d9b38bfb1b2dce310441abe50d00fac405531ff717e246fcadee7 WHIRLPOOL 14f7d84c109312e551132f4c7b4a8076046bfa8d8a5242e0790efb3f07fa61643070b6c37af2408f2ec027026c2a5c1c8e242ad42045fff21c792b7009f90b24 DIST lmms-0.4.14.tar.bz2 14213318 SHA256 2cdf65009682112107270be09e030fc9db4a467838b2ec39669cc39ade66ec69 SHA512 4b8724d3262d82f8fa02586a6c908bafa1b2631e0e91a9cbb6e6bf344d4c1e448ef9830048b8c55062fe7e88d326b65991712f36af79f92e73d37a33be24118f WHIRLPOOL f5bc3de1bca545a066cd9ccea2ff1ce68a6257daae9cafb9230d99717b87a4179d7a59fe4e8375f9e67cfadeb4520460af068db6dbf5e653f234a487284a1ad9 +DIST lmms-0.4.15.tar.bz2 14211150 SHA256 0104caaea8adf7b51b0fc4ff2ab26364d1da5751a8fcbf6772704c8ef57a020b SHA512 cb9ae23d25d301f3fcc3c075a2426569a234c32353bc256db8360fe52b8d422b519452c3bb3a97d6a7a90a8cbc7e6ad66141bcda59e683aab2f731d2a4ee4358 WHIRLPOOL 11cdde5c2f01eb6a65c74ebb3550ed5d9ce4451a2e777e62ae4340fdb6a8d00b6b4f0daa07655440163397e485e188582f05f1b6fcecb058bca2fd05a39b3163 diff --git a/media-sound/lmms/lmms-0.4.15.ebuild b/media-sound/lmms/lmms-0.4.15.ebuild new file mode 100644 index 000000000000..87faacc169d8 --- /dev/null +++ b/media-sound/lmms/lmms-0.4.15.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.15.ebuild,v 1.1 2013/06/27 13:23:23 aballier Exp $ + +EAPI="2" + +inherit eutils cmake-utils + +DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic" +HOMEPAGE="http://lmms.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst" + +RDEPEND="dev-qt/qtcore:4 + dev-qt/qtgui:4[accessibility] + >=media-libs/libsndfile-1.0.11 + >=media-libs/libsamplerate-0.1.7 + x11-libs/libXinerama + alsa? ( media-libs/alsa-lib ) + sci-libs/fftw:3.0 + >=x11-libs/fltk-1.3.0_rc3:1 + jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 ) + ogg? ( media-libs/libvorbis + media-libs/libogg ) + fluidsynth? ( media-sound/fluidsynth ) + portaudio? ( >=media-libs/portaudio-19_pre ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl + >=media-libs/sdl-sound-1.0.1 ) + stk? ( media-libs/stk ) + vst? ( app-emulation/wine )" +DEPEND="${RDEPEND} + >=dev-util/cmake-2.4.5" +RDEPEND="${RDEPEND} + media-plugins/swh-plugins + media-plugins/caps-plugins + media-plugins/tap-plugins + media-libs/ladspa-cmt" + +DOCS="README AUTHORS TODO" + +PATCHES=( "${FILESDIR}/${PN}-0.4.14-unembedfltk.patch" ) + +src_configure() { + mycmakeargs="${mycmakeargs} + -DWANT_SYSTEM_SR=TRUE + -DWANT_CAPS=FALSE + -DWANT_TAP=FALSE + -DWANT_SWH=FALSE + -DWANT_CMT=FALSE + -DWANT_CALF=TRUE + -DCMAKE_INSTALL_LIBDIR=$(get_libdir) + $(cmake-utils_use_want alsa ALSA) + $(cmake-utils_use_want jack JACK) + $(cmake-utils_use_want ogg OGGVORBIS) + $(cmake-utils_use_want portaudio PORTAUDIO) + $(cmake-utils_use_want pulseaudio PULSEAUDIO) + $(cmake-utils_use_want sdl SDL) + $(cmake-utils_use_want stk STK) + $(cmake-utils_use_want vst VST) + $(cmake-utils_use_want fluidsynth SF2)" + cmake-utils_src_configure +} diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild new file mode 100644 index 000000000000..5191e88ffd4e --- /dev/null +++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild,v 1.1 2013/06/27 09:01:01 pinkbyte Exp $ + +EAPI=5 +WX_GTK_VER=2.8 +inherit eutils toolchain-funcs flag-o-matic wxwidgets + +MY_P="${P/a/A}" + +DESCRIPTION="integrated development + performance environment for chuck" +HOMEPAGE="http://audicle.cs.princeton.edu/mini/" +SRC_URI="http://audicle.cs.princeton.edu/mini/release/files/${MY_P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa jack oss" + +RDEPEND="jack? ( media-sound/jack-audio-connection-kit ) + alsa? ( >=media-libs/alsa-lib-0.9 ) + media-libs/libsndfile + >=x11-libs/gtk+-2.10:2 + x11-libs/wxGTK:2.8[X] + app-admin/eselect-miniaudicle" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex" + +S="${WORKDIR}/${MY_P}" + +REQUIRED_USE="|| ( alsa jack oss )" + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-hid-smc.patch" \ + "${FILESDIR}/${P}-gcc44.patch" \ + "${FILESDIR}/${P}-void-to-int-cast.patch" + + sed -i -e 's/make -C/#make -C/' \ + -e 's/g++/$(CXX)/' \ + -e 's/-O3 -c/-c $(CFLAGS)/' \ + -e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \ + makefile.* || die "sed failed" + + # Respect LDFLAGS in bundled media-sound/chuck + # prevent underlinking with pthreads library + sed -i -e 's/$(LIBS)/$(LDFLAGS) $(LIBS) -lpthread/' \ + chuck/src/makefile.* || die "sed failed" + + epatch_user +} + +compile_backend() { + local backend="$1" + einfo "Compiling against ${backend}" + cd "${S}/chuck/src" + emake -f "makefile.${backend}" CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" + cd "${S}" + emake -f "makefile.${backend}" CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" + mv wxw/miniAudicle{,-${backend}} + emake -f "makefile.${backend}" clean + cd "${S}/chuck/src" + emake -f "makefile.${backend}" clean +} + +src_compile() { + # when compiled with -march=athlon or -march=athlon-xp + # miniaudicle crashes on removing a shred with a double free or corruption + # it happens in Chuck_VM_Stack::shutdown() on the line + # SAFE_DELETE_ARRAY( stack ); + replace-cpu-flags athlon athlon-xp i686 + + use jack && compile_backend jack + use alsa && compile_backend alsa + use oss && compile_backend oss +} + +src_install() { + use jack && dobin wxw/miniAudicle-jack + use alsa && dobin wxw/miniAudicle-alsa + use oss && dobin wxw/miniAudicle-oss + dodoc BUGS README.linux VERSIONS +} + +pkg_postinst() { + elog "miniAudicle now can use many audio engines, so you can specify audio engine" + elog "with miniAudicle-{jack,alsa,oss}" + elog "Or you can use 'eselect miniaudicle' to set the audio engine" + + einfo "Calling eselect miniaudicle update..." + eselect miniaudicle update --if-unset +} diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest index bbc57851133d..faa539addf3c 100644 --- a/media-video/ffdiaporama/Manifest +++ b/media-video/ffdiaporama/Manifest @@ -1,2 +1,3 @@ DIST ffdiaporama_1.4.tar.gz 14541141 SHA256 e9c61e32703e2d0b5f9e2a299782c5e437b6d8db2faa530271612195df8166ed SHA512 3d94754a72c03f27c392f989f99176d143861202731090ce716e341afb5e7d54bde66d5ae33e0f1a2b4974d8f60b09eb92c9512ff5b740e1f5be26c6c29f946f WHIRLPOOL eeb15e4ac624db9c843959dfc0cdd30615777d8f4526fd30376b6e2b51a58410a245d7fda70adec71349470f188b5db7c82c518f286e6a708a44e3656119e064 DIST ffdiaporama_1.5.tar.gz 14576632 SHA256 9a7090d57da3383b47d44347f519092cbd3a5a62ba84f7493b2fdeb551c951bd SHA512 59967f0a43d70e963eb104514fadd34e166e16519dcb7f58056ee8be10f4d08065fab30a94cbe75c39e796e39b387e9522d9616d3b317363e6ab332f2e3512ae WHIRLPOOL e08fdc5413d8fd23a7734056f9f338818f8263271404546613502043f85439155f73204fe8a1328dc256edd821ac057c5d57077291b7044d4a289340776b261e +DIST ffdiaporama_1.6.tar.gz 15708389 SHA256 b82c125b22f15c343cf87e5ad83e86e5278e25dc74385a9a39a5fe896d411d66 SHA512 5fa05afdb317531b13a8788e7b37816c780de0bc56b6c25a5d9d0ef4b5c6c8126b3af23d37d41d970c97c0ffe9a21d5ae87cfb99a414abc8d65be87262f8c436 WHIRLPOOL 3da97f9fa7fc4b1a483813e89f783d6490722900f104f817ad62aad5717f3ce16b5b0732bc990fbd2371b301433dfd00eea3ec374587a1687f2d7fca1516709f diff --git a/media-video/ffdiaporama/ffdiaporama-1.6.ebuild b/media-video/ffdiaporama/ffdiaporama-1.6.ebuild new file mode 100644 index 000000000000..fe4317e8b902 --- /dev/null +++ b/media-video/ffdiaporama/ffdiaporama-1.6.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffdiaporama/ffdiaporama-1.6.ebuild,v 1.1 2013/06/26 23:50:24 hasufell Exp $ + +EAPI=5 + +inherit eutils fdo-mime gnome2-utils qt4-r2 + +DESCRIPTION="Movie creator from photos and video clips" +HOMEPAGE="http://ffdiaporama.tuxfamily.org" +SRC_URI="http://download.tuxfamily.org/${PN}/Archives/${PN}_${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + media-gfx/exiv2 + media-libs/libsdl[audio] + media-libs/qimageblitz + media-libs/taglib + >=virtual/ffmpeg-9[encode]" +DEPEND="${RDEPEND}" + +DOCS=( authors.txt ) + +src_unpack() { + # S=${WORKDIR} would result in unremoved files in + # ${WORKDIR}/../build + mkdir ${P} || die + cd ${P} || die + unpack ${A} +} + +src_install() { + qt4-r2_src_install + doicon -s 32 ffdiaporama.png +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + gnome2_icon_cache_update +} diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 61ea14fb58f4..4aad5f128a93 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Wed, 26 Jun 2013 19:37:08 +0000 +Thu, 27 Jun 2013 14:36:56 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 61ea14fb58f4..4aad5f128a93 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Wed, 26 Jun 2013 19:37:08 +0000 +Thu, 27 Jun 2013 14:36:56 +0000 diff --git a/metadata/md5-cache/app-arch/tarsync-0.2.1 b/metadata/md5-cache/app-arch/tarsync-0.2.1 deleted file mode 100644 index c1e6cc63c3ab..000000000000 --- a/metadata/md5-cache/app-arch/tarsync-0.2.1 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=>=dev-util/diffball-0.7 -DESCRIPTION=Delta compression suite for using/generating binary patches -HOMEPAGE=http://gentooexperimental.org/~ferringb/tarsync/ -KEYWORDS=~hppa ppc x86 ~amd64 -LICENSE=GPL-2 -RDEPEND=>=dev-util/diffball-0.7 -SLOT=0 -SRC_URI=mirror://gentoo/tarsync-0.2.1.tar.bz2 -_md5_=b916bb63fc11acb8dfdea98626fab31f diff --git a/metadata/md5-cache/app-backup/backintime-1.0.24 b/metadata/md5-cache/app-backup/backintime-1.0.24-r1 similarity index 54% rename from metadata/md5-cache/app-backup/backintime-1.0.24 rename to metadata/md5-cache/app-backup/backintime-1.0.24-r1 index 3ef83aa3ad03..b73ca81caa97 100644 --- a/metadata/md5-cache/app-backup/backintime-1.0.24 +++ b/metadata/md5-cache/app-backup/backintime-1.0.24-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install postinst prepare setup -DEPEND=net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 kde-base/pykde4 kde-base/kompare kde-base/kdesu ) gnome? ( gnome-base/libglade dev-util/meld gnome-base/gnome-session dev-python/gnome-vfs-python dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk ) dev-python/notify-python +DEPEND=dev-python/keyring dev-python/notify-python net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 kde-base/pykde4 kde-base/kompare kde-base/kdesu ) gnome? ( gnome-base/libglade dev-util/meld gnome-base/gnome-session dev-python/gnome-vfs-python dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk ) DESCRIPTION=A simple backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4 EAPI=5 HOMEPAGE=http://backintime.le-web.org/ IUSE=kde gnome python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 -RDEPEND=net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 kde-base/pykde4 kde-base/kompare kde-base/kdesu ) gnome? ( gnome-base/libglade dev-util/meld gnome-base/gnome-session dev-python/gnome-vfs-python dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk ) dev-python/notify-python +RDEPEND=dev-python/keyring dev-python/notify-python net-misc/rsync[xattr,acl] kde? ( >=kde-base/kdelibs-4 kde-base/pykde4 kde-base/kompare kde-base/kdesu ) gnome? ( gnome-base/libglade dev-util/meld gnome-base/gnome-session dev-python/gnome-vfs-python dev-python/libgnome-python dev-python/pygobject:2 dev-python/pygtk ) SLOT=0 SRC_URI=http://backintime.le-web.org/wp-content/uploads/2009/03/backintime-1.0.24.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=f86929515d2a401a3b71add4386d2209 +_md5_=e964bc7dd5c9ff6317da900c33648d62 diff --git a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha15 b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha15 index 0c8c08d75283..ea1c07022261 100644 --- a/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha15 +++ b/metadata/md5-cache/app-cdr/cdrtools-3.01_alpha15 @@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1 CDDL-Schily RDEPEND=acl? ( virtual/acl ) nls? ( virtual/libintl ) !app-cdr/cdrkit SLOT=0 SRC_URI=ftp://ftp.berlios.de/pub/cdrecord/alpha//cdrtools-3.01a15.tar.bz2 -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=fb9d7b3eb91b191ca18e93bf9de56c38 diff --git a/metadata/md5-cache/app-editors/xemacs-21.5.33 b/metadata/md5-cache/app-editors/xemacs-21.5.33 index 8f35081dfba3..96af221b6f22 100644 --- a/metadata/md5-cache/app-editors/xemacs-21.5.33 +++ b/metadata/md5-cache/app-editors/xemacs-21.5.33 @@ -11,4 +11,4 @@ RDEPEND=berkdb? ( >=sys-libs/db-4 !!=sys-libs/gdbm-1.8 SLOT=0 SRC_URI=http://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.33.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=be8a6e7a744fbe5ff750dabc79739468 +_md5_=92ca5c8bb7d6925927bc638a222351d8 diff --git a/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20130224-r1 b/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20130224-r2 similarity index 74% rename from metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20130224-r1 rename to metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20130224-r2 index 150dc38c6f35..b94d26239d5a 100644 --- a/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20130224-r1 +++ b/metadata/md5-cache/app-emulation/emul-linux-x86-soundlibs-20130224-r2 @@ -6,9 +6,9 @@ HOMEPAGE=http://dev.gentoo.org/~pacho/emul.html IUSE=abi_x86_32 alsa +development KEYWORDS=-* ~amd64 LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain -RDEPEND=~app-emulation/emul-linux-x86-baselibs-20130224 ~app-emulation/emul-linux-x86-medialibs-20130224 !>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] !>=sci-libs/fftw-3.3.3-r1[abi_x86_32] abi_x86_32? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] ) +RDEPEND=~app-emulation/emul-linux-x86-baselibs-20130224 ~app-emulation/emul-linux-x86-medialibs-20130224 !>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] !>=sci-libs/fftw-3.3.3-r1[abi_x86_32] abi_x86_32? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)] >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)] >=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.1[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)] ) RESTRICT=strip SLOT=0 SRC_URI=http://dev.gentoo.org/~pacho/emul/emul-linux-x86-soundlibs-20130224.tar.xz _eclasses_=emul-linux-x86 c34950dbcd2b4725fa3d91047c677902 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=5efefdc8d13b713b69a3e8a8873981f1 +_md5_=79b6e9f380a3632235c02c4426e5293e diff --git a/metadata/md5-cache/app-emulation/q4wine-0.121 b/metadata/md5-cache/app-emulation/q4wine-0.121 deleted file mode 100644 index 982ccd0910d5..000000000000 --- a/metadata/md5-cache/app-emulation/q4wine-0.121 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Qt4 GUI configuration tool for Wine -EAPI=2 -HOMEPAGE=http://q4wine.brezblock.org.ua/ -IUSE=debug +icoutils +wineappdb -dbus gnome kde -KEYWORDS=amd64 x86 -LICENSE=GPL-3 -RDEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] app-admin/sudo app-emulation/wine >=sys-apps/which-2.19 icoutils? ( >=media-gfx/icoutils-0.26.0 ) sys-fs/fuseiso kde? ( kde-base/kdesu ) gnome? ( x11-libs/gksu ) dbus? ( dev-qt/qtdbus:4 ) -SLOT=0 -SRC_URI=mirror://sourceforge/q4wine/q4wine-0.121.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=a38f1ba3a489fda6e6d30beaa94a40a0 diff --git a/metadata/md5-cache/app-emulation/q4wine-1.0-r1 b/metadata/md5-cache/app-emulation/q4wine-1.0-r1 deleted file mode 100644 index d7b48e298669..000000000000 --- a/metadata/md5-cache/app-emulation/q4wine-1.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Qt4 GUI configuration tool for Wine -EAPI=4 -HOMEPAGE=http://q4wine.brezblock.org.ua/ -IUSE=debug +icoutils +wineappdb -dbus gnome kde linguas_cs linguas_de linguas_en linguas_es linguas_he linguas_it linguas_ru linguas_uk linguas_pl linguas_pt -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3 -RDEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] app-admin/sudo app-emulation/wine >=sys-apps/which-2.19 icoutils? ( >=media-gfx/icoutils-0.26.0 ) sys-fs/fuseiso kde? ( kde-base/kdesu ) gnome? ( x11-libs/gksu ) dbus? ( dev-qt/qtdbus:4 ) -SLOT=0 -SRC_URI=mirror://sourceforge/q4wine/q4wine/q4wine%201.0/q4wine-1.0-r1.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=df76918bf9e8744eb1668a0a16b49152 diff --git a/metadata/md5-cache/app-emulation/q4wine-1.0-r2 b/metadata/md5-cache/app-emulation/q4wine-1.0-r2 deleted file mode 100644 index 01854ed4e5fa..000000000000 --- a/metadata/md5-cache/app-emulation/q4wine-1.0-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) -DESCRIPTION=Qt4 GUI configuration tool for Wine -EAPI=4 -HOMEPAGE=http://q4wine.brezblock.org.ua/ -IUSE=debug +icoutils +wineappdb -dbus gnome kde linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_he linguas_it linguas_ru linguas_uk linguas_pl linguas_pt -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-3 -RDEPEND=dev-qt/qtgui:4 dev-qt/qtsql:4[sqlite] app-admin/sudo app-emulation/wine >=sys-apps/which-2.19 icoutils? ( >=media-gfx/icoutils-0.26.0 ) sys-fs/fuseiso kde? ( kde-base/kdesu ) gnome? ( x11-libs/gksu ) dbus? ( dev-qt/qtdbus:4 ) -SLOT=0 -SRC_URI=mirror://sourceforge/q4wine/q4wine/q4wine%201.0/q4wine-1.0-r2.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=701505b94f678b8013298ea5edc4ad31 diff --git a/metadata/md5-cache/app-emulation/qemu-1.2.2-r4 b/metadata/md5-cache/app-emulation/qemu-1.2.2-r4 index 42f685d47a13..4fa8731ff57d 100644 --- a/metadata/md5-cache/app-emulation/qemu-1.2.2-r4 +++ b/metadata/md5-cache/app-emulation/qemu-1.2.2-r4 @@ -10,5 +10,5 @@ RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib a REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr ) SLOT=0 SRC_URI=mirror://sourceforge/kvm/qemu-kvm/qemu-kvm-1.2.0.tar.gz http://dev.gentoo.org/~cardoe/distfiles/qemu-kvm-1.2.0-7c9a3a87.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=20a6a51173c374f880960586599813ee diff --git a/metadata/md5-cache/app-emulation/qemu-1.4.0-r1 b/metadata/md5-cache/app-emulation/qemu-1.4.0-r1 index 1052b6b57023..ca1a9c74fd3c 100644 --- a/metadata/md5-cache/app-emulation/qemu-1.4.0-r1 +++ b/metadata/md5-cache/app-emulation/qemu-1.4.0-r1 @@ -10,5 +10,5 @@ RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib > REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr ) SLOT=0 SRC_URI=http://wiki.qemu-project.org/download//qemu-1.4.0.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.4.0-4114896d.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=d1a027a9bef3fb601c90c87e8f86c87c diff --git a/metadata/md5-cache/app-emulation/qemu-1.4.1 b/metadata/md5-cache/app-emulation/qemu-1.4.1 index f3bd250d0dd8..46112d17ce0f 100644 --- a/metadata/md5-cache/app-emulation/qemu-1.4.1 +++ b/metadata/md5-cache/app-emulation/qemu-1.4.1 @@ -10,5 +10,5 @@ RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib > REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr ) SLOT=0 SRC_URI=http://wiki.qemu-project.org/download//qemu-1.4.1.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.4.1-a2231a9d.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=5b46bcb06cf902260d34a6942453caa7 diff --git a/metadata/md5-cache/app-emulation/qemu-1.4.2 b/metadata/md5-cache/app-emulation/qemu-1.4.2 index 75b7223c94fe..f7831b9a86c5 100644 --- a/metadata/md5-cache/app-emulation/qemu-1.4.2 +++ b/metadata/md5-cache/app-emulation/qemu-1.4.2 @@ -10,5 +10,5 @@ RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib > REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr ) SLOT=0 SRC_URI=http://wiki.qemu-project.org/download/qemu-1.4.2.tar.bz2 http://dev.gentoo.org/~cardoe/distfiles/qemu-1.4.2-6b5934f9.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=2960f2d92d04e79dca7584ea3421accb diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999 index 75b3ebd20aec..111f4beef9d9 100644 --- a/metadata/md5-cache/app-emulation/qemu-9999 +++ b/metadata/md5-cache/app-emulation/qemu-9999 @@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2 BSD-2 RDEPEND=!static-softmmu? ( >=dev-libs/glib-2.0 sys-apps/pciutils sys-libs/zlib >=x11-libs/pixman-0.28.0 aio? ( dev-libs/libaio ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.0 ) jpeg? ( virtual/jpeg ) ncurses? ( sys-libs/ncurses ) png? ( media-libs/libpng ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( >=media-libs/libsdl-1.2.11 ) seccomp? ( >=sys-libs/libseccomp-1.0.1 ) spice? ( >=app-emulation/spice-0.12.0 ) tls? ( net-libs/gnutls ) uuid? ( >=sys-apps/util-linux-2.16.0 ) vde? ( net-misc/vde ) xattr? ( sys-apps/attr ) xfs? ( sys-fs/xfsprogs ) ) !app-emulation/kqemu qemu_softmmu_targets_i386? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) qemu_softmmu_targets_x86_64? ( sys-firmware/ipxe sys-firmware/seabios sys-firmware/sgabios sys-firmware/vgabios ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) accessibility? ( app-accessibility/brltty ) iscsi? ( net-libs/libiscsi ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_5? ( dev-lang/python:2.5[ncurses,readline] ) python_targets_python2_6? ( dev-lang/python:2.6[ncurses,readline] ) python_targets_python2_7? ( dev-lang/python:2.7[ncurses,readline] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sdl? ( media-libs/libsdl[X] ) selinux? ( sec-policy/selinux-qemu ) 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 ) REQUIRED_USE=|| ( qemu_softmmu_targets_i386 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mipsel qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_or32 qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_s390x qemu_softmmu_targets_unicore32 qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb ) python? ( || ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) ) static? ( static-softmmu static-user ) static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl ) virtfs? ( xattr ) SLOT=0 -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=633c450f2d2f93ae19c04416ff357211 diff --git a/metadata/md5-cache/app-emulation/xen-4.2.1-r4 b/metadata/md5-cache/app-emulation/xen-4.2.1-r4 index 34be0300ac8a..9b6be85200f0 100644 --- a/metadata/md5-cache/app-emulation/xen-4.2.1-r4 +++ b/metadata/md5-cache/app-emulation/xen-4.2.1-r4 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de mount-boot 02dd3bb4c5f025fef0fc3ade0f27c217 multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=90ba69b110bb19026e572fdfc0eb9bb3 +_md5_=c5010bd739e66497ef2c8002d6333558 diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r3 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r3 index 827564f823ba..e2e8ec4b7431 100644 --- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r3 +++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r3 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 RDEPEND=>=app-emulation/xen-4.2.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) SLOT=0 -SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz +SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://dev.gentoo.org/~idella4//patches/XSA-55patches.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=11a3c82a413bdd27f26b0437ddda7dc0 +_md5_=1ec8fa7750205d5cfaecef2fda413170 diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.2-r1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.2-r1 index 53fb5d0c1933..7a1578487455 100644 --- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.2-r1 +++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.2-r1 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 RDEPEND=>=app-emulation/xen-4.2.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) SLOT=0 -SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.2/xen-4.2.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz +SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.2/xen-4.2.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://dev.gentoo.org/~idella4//patches/XSA-55patches.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=638e3080ece9bac7fdbafa59852a7a73 +_md5_=ac3ccaac5f2d443dce484bc06a7ce238 diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r4 b/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r4 index 2708bdb41939..0fe3d2475f62 100644 --- a/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r4 +++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.1-r4 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst prepare setup -DEPEND=dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl ocaml? ( dev-ml/findlib ) hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) qemu? ( >=sys-apps/texinfo-5 ) virtual/pkgconfig +DEPEND=dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl ocaml? ( dev-ml/findlib ) hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) virtual/pkgconfig DESCRIPTION=Xend daemon and tools EAPI=5 HOMEPAGE=http://xen.org/ @@ -10,6 +10,6 @@ RDEPEND=dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_target REQUIRED_USE=hvm? ( qemu ) RESTRICT=test SLOT=0 -SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2 +SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2 http://dev.gentoo.org/~idella4//patches/XSA-55patches.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=f3e43753248a3c19d20fb6613e429fab +_md5_=3d7a6f49f8ebb6102c4e1996c595ca0e diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r2 index 4d27016ff995..c42c506ef596 100644 --- a/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r2 +++ b/metadata/md5-cache/app-emulation/xen-tools-4.2.2-r2 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile install postinst prepare setup -DEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) qemu? ( >=sys-apps/texinfo-5 ) virtual/pkgconfig +DEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pypam[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-python/pyxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-libs/zlib sys-power/iasl dev-ml/findlib hvm? ( media-libs/libsdl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] api? ( dev-libs/libxml2 net-misc/curl ) python_single_target_python2_6? ( dev-lang/python:2.6[xml,threads] ) python_single_target_python2_7? ( dev-lang/python:2.7[xml,threads] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] pygrub? ( python_single_target_python2_6? ( dev-lang/python:2.6[ncurses] ) python_single_target_python2_7? ( dev-lang/python:2.7[ncurses] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) sys-devel/bin86 sys-devel/dev86 dev-lang/perl app-misc/pax-utils doc? ( app-doc/doxygen dev-tex/latex2html[png,gif] media-gfx/transfig media-gfx/graphviz dev-tex/xcolor dev-texlive/texlive-latexextra virtual/latex-base dev-tex/latexmk dev-texlive/texlive-latex dev-texlive/texlive-pictures dev-texlive/texlive-latexrecommended ) hvm? ( x11-proto/xproto ) virtual/pkgconfig DESCRIPTION=Xend daemon and tools EAPI=5 HOMEPAGE=http://xen.org/ @@ -10,6 +10,6 @@ RDEPEND=dev-libs/lzo:2 dev-libs/yajl dev-python/lxml[python_targets_python2_6(-) REQUIRED_USE=hvm? ( qemu ) RESTRICT=test SLOT=0 -SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.2/xen-4.2.2.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2 +SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.2/xen-4.2.2.tar.gz http://dev.gentoo.org/~idella4/tarballs/ipxe.tar.gz http://dev.gentoo.org/~idella4/tarballs/seabios-0-20121121.tar.bz2 http://dev.gentoo.org/~idella4//patches/XSA-55patches.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=d36a5b4f13cf89db6500ace3cc8b71fa +_md5_=9fe4b20a77d3e06faa80f8b598df7aba diff --git a/metadata/md5-cache/app-misc/gcalcli-2.4.2 b/metadata/md5-cache/app-misc/gcalcli-2.4.2 new file mode 100644 index 000000000000..861da56059f5 --- /dev/null +++ b/metadata/md5-cache/app-misc/gcalcli-2.4.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install +DESCRIPTION=Google Calendar Command Line Interface +EAPI=5 +HOMEPAGE=https://github.com/insanum/gcalcli +IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 +KEYWORDS=~amd64 ~x86 +LICENSE=MIT +RDEPEND=dev-python/python-dateutil dev-python/google-api-python-client dev-python/vobject +SLOT=0 +SRC_URI=https://github.com/insanum/gcalcli/archive/v2.4.2.tar.gz -> gcalcli-2.4.2.tar.gz +_eclasses_=multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f +_md5_=d64c4ace2d213dc570a53750341b3996 diff --git a/metadata/md5-cache/app-misc/ignuit-0.0.16 b/metadata/md5-cache/app-misc/ignuit-0.0.16 deleted file mode 100644 index 7cb4f23ab2ba..000000000000 --- a/metadata/md5-cache/app-misc/ignuit-0.0.16 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=install -DEPEND=>=gnome-base/libgnomeui-2.22.1 gnome-base/gconf:2 gnome-base/libglade:2.0 dev-libs/glib:2 x11-libs/gtk+:2 >=media-libs/gstreamer-0.10.20:0.10 dev-libs/libxslt dev-libs/libxml2:2 x11-libs/pango app-text/dvipng app-text/scrollkeeper virtual/latex-base >=app-text/gnome-doc-utils-0.3.2 sys-devel/gettext dev-util/intltool -DESCRIPTION=memorization aid based on the Leitner flashcard system -EAPI=2 -HOMEPAGE=http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit -IUSE=examples -KEYWORDS=amd64 ppc ppc64 x86 -LICENSE=GPL-3 -RDEPEND=>=gnome-base/libgnomeui-2.22.1 gnome-base/gconf:2 gnome-base/libglade:2.0 dev-libs/glib:2 x11-libs/gtk+:2 >=media-libs/gstreamer-0.10.20:0.10 dev-libs/libxslt dev-libs/libxml2:2 x11-libs/pango app-text/dvipng app-text/scrollkeeper virtual/latex-base >=app-text/gnome-doc-utils-0.3.2 -SLOT=0 -SRC_URI=http://homepages.ihug.co.nz/~trmusson/stuff/ignuit-0.0.16.tar.gz -_md5_=9560645b3aa30f1864aedcd8612bce4b diff --git a/metadata/md5-cache/app-misc/klavaro-1.9.7 b/metadata/md5-cache/app-misc/klavaro-1.9.7 new file mode 100644 index 000000000000..bc2d1bf75445 --- /dev/null +++ b/metadata/md5-cache/app-misc/klavaro-1.9.7 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=net-misc/curl x11-libs/gtk+:2 x11-libs/gtkdatabox sys-devel/gettext || ( dev-util/gtk-builder-convert <=x11-libs/gtk+-2.24.10:2 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Another free touch typing tutor program +EAPI=5 +HOMEPAGE=http://klavaro.sourceforge.net/ +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=net-misc/curl x11-libs/gtk+:2 x11-libs/gtkdatabox +SLOT=0 +SRC_URI=mirror://sourceforge/klavaro/klavaro-1.9.7.tar.bz2 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=23e3b148997c33c162815574eaed7e54 diff --git a/metadata/md5-cache/app-text/dvipsk-5.993_p20130530 b/metadata/md5-cache/app-text/dvipsk-5.993_p20130530 new file mode 100644 index 000000000000..0272c970b545 --- /dev/null +++ b/metadata/md5-cache/app-text/dvipsk-5.993_p20130530 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst postrm +DEPEND=>=dev-libs/kpathsea-6.1.0_p20120701 +DESCRIPTION=DVI-to-PostScript translator +EAPI=4 +HOMEPAGE=http://tug.org/texlive/ +IUSE=doc source +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=!=dev-libs/kpathsea-6.1.0_p20120701 +SLOT=0 +SRC_URI=mirror://gentoo/texlive-20130530-source.tar.xz mirror://gentoo/texlive-module-dvips-2013.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2013.tar.xz ) +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 texlive-common 04b9b0d6ae9d9855e9221a0dbf4acd9e toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=fd3fee5f470f576d7039d02e8f39e37a diff --git a/metadata/md5-cache/app-text/llpp-9999 b/metadata/md5-cache/app-text/llpp-9999 index 999baf96ed3f..bedbc154cc45 100644 --- a/metadata/md5-cache/app-text/llpp-9999 +++ b/metadata/md5-cache/app-text/llpp-9999 @@ -9,4 +9,4 @@ RDEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-9999:= media-libs/openjpeg:2 m RESTRICT=!ocamlopt? ( strip ) SLOT=0 _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=f7fc0252968e6a3ca4e5360cf89cbebe +_md5_=fc45f5ea0efd82a54acc73bb79a23158 diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.66 b/metadata/md5-cache/dev-db/mariadb-5.1.66 index 113df0a7716c..e8bcbeb35016 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.1.66 +++ b/metadata/md5-cache/dev-db/mariadb-5.1.66 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling libevent pbxt +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling libevent pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://maria.llarian.net/download/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.66.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.66/kvm-tarbake-jaunty-x86/mariadb-5.1.66.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=10b53dd13d8e2096860bd19439bb33a6 diff --git a/metadata/md5-cache/dev-db/mariadb-5.1.67 b/metadata/md5-cache/dev-db/mariadb-5.1.67 index 58c278ca943d..ab712543c6ec 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.1.67 +++ b/metadata/md5-cache/dev-db/mariadb-5.1.67 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling libevent pbxt +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling libevent pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://maria.llarian.net/download/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.67.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.67/kvm-tarbake-jaunty-x86/mariadb-5.1.67.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=81dbbd2b8294ed732092d6a69c52ecfb diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.13 b/metadata/md5-cache/dev-db/mariadb-5.2.13 index f1d96231f3d9..53f6490cc09b 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.2.13 +++ b/metadata/md5-cache/dev-db/mariadb-5.2.13 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling libevent oqgraph sphinx pam pbxt +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling libevent oqgraph sphinx pam pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.2 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://maria.llarian.net/download/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.13.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.13/kvm-tarbake-jaunty-x86/mariadb-5.2.13.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=2ae196fa561430bec618403ec088c43b diff --git a/metadata/md5-cache/dev-db/mariadb-5.2.14 b/metadata/md5-cache/dev-db/mariadb-5.2.14 index 6d27b1351208..761a1f8f4436 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.2.14 +++ b/metadata/md5-cache/dev-db/mariadb-5.2.14 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling libevent oqgraph sphinx pam pbxt +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling libevent oqgraph sphinx pam pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.2 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://maria.llarian.net/download/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.14.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.14/kvm-tarbake-jaunty-x86/mariadb-5.2.14.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=eb3a149860c2363cc9e1fa3856a365a0 diff --git a/metadata/md5-cache/dev-db/mariadb-5.3.11 b/metadata/md5-cache/dev-db/mariadb-5.3.11 index 96dc88e3a220..35b232dbd3bc 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.3.11 +++ b/metadata/md5-cache/dev-db/mariadb-5.3.11 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling libevent oqgraph sphinx pam pbxt +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling libevent oqgraph sphinx pam pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.3 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://maria.llarian.net/download/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://launchpad.net/maria/5.3/ongoing/+download/mariadb-5.3.11.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.3.11/kvm-tarbake-jaunty-x86/mariadb-5.3.11.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=4df1e6cb265d598640e91ce4426560f8 diff --git a/metadata/md5-cache/dev-db/mariadb-5.3.12 b/metadata/md5-cache/dev-db/mariadb-5.3.12 index bbae65a7c390..401f39962e8f 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.3.12 +++ b/metadata/md5-cache/dev-db/mariadb-5.3.12 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling libevent oqgraph sphinx pam pbxt +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling libevent oqgraph sphinx pam pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.3 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://maria.llarian.net/download/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://launchpad.net/maria/5.3/ongoing/+download/mariadb-5.3.12.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.3.12/kvm-tarbake-jaunty-x86/mariadb-5.3.12.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=83d6d6b3ea04c29e09796b88b50541d0 diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.28a b/metadata/md5-cache/dev-db/mariadb-5.5.28a index e03485a45696..91379d82592f 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.5.28a +++ b/metadata/md5-cache/dev-db/mariadb-5.5.28a @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz http://maria.llarian.net/download/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz http://launchpad.net/maria/5.5/ongoing/+download/mariadb-5.5.28a.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.5.28a/kvm-tarbake-jaunty-x86/mariadb-5.5.28a.tar.gz mirror://gentoo/mysql-extras-20130120-0100Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130120-0100Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=fc6304e5efba70a086ff92907028e0ca +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=2943a52c0c84f9077ee441ff742bce4f diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.29 b/metadata/md5-cache/dev-db/mariadb-5.5.29 index b7db97413226..b999446aed2c 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.5.29 +++ b/metadata/md5-cache/dev-db/mariadb-5.5.29 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.29/kvm-tarbake-jaunty-x86/mariadb-5.5.29.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.5.29/kvm-tarbake-jaunty-x86/mariadb-5.5.29.tar.gz http://maria.llarian.net/download/mariadb-5.5.29/kvm-tarbake-jaunty-x86/mariadb-5.5.29.tar.gz http://launchpad.net/maria/5.5/ongoing/+download/mariadb-5.5.29.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.29/kvm-tarbake-jaunty-x86/mariadb-5.5.29.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.5.29/kvm-tarbake-jaunty-x86/mariadb-5.5.29.tar.gz mirror://gentoo/mysql-extras-20130120-0100Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130120-0100Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=bf2d374c64b5ff5ee9c8860ddf02f61a +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=0437f4c739bf0f9ad801bd8187674331 diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.30 b/metadata/md5-cache/dev-db/mariadb-5.5.30 index cd50f7b924a5..676836fb24e1 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.5.30 +++ b/metadata/md5-cache/dev-db/mariadb-5.5.30 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.30/kvm-tarbake-jaunty-x86/mariadb-5.5.30.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.5.30/kvm-tarbake-jaunty-x86/mariadb-5.5.30.tar.gz http://maria.llarian.net/download/mariadb-5.5.30/kvm-tarbake-jaunty-x86/mariadb-5.5.30.tar.gz http://launchpad.net/maria/5.5/ongoing/+download/mariadb-5.5.30.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.30/kvm-tarbake-jaunty-x86/mariadb-5.5.30.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.5.30/kvm-tarbake-jaunty-x86/mariadb-5.5.30.tar.gz mirror://gentoo/mysql-extras-20130120-0100Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130120-0100Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=cb2f24c6731bae8cfc18f677d42bdd26 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=33f9f0d7e96972459578715f4c1c5323 diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.31 b/metadata/md5-cache/dev-db/mariadb-5.5.31 index 1792fc1bb3bb..ebeafd252cd9 100644 --- a/metadata/md5-cache/dev-db/mariadb-5.5.31 +++ b/metadata/md5-cache/dev-db/mariadb-5.5.31 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=An enhanced, drop-in replacement for MySQL EAPI=4 HOMEPAGE=http://mariadb.org/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam jemalloc tcmalloc systemtap pbxt KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) SLOT=0 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.31/kvm-tarbake-jaunty-x86/mariadb-5.5.31.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.5.31/kvm-tarbake-jaunty-x86/mariadb-5.5.31.tar.gz http://maria.llarian.net/download/mariadb-5.5.31/kvm-tarbake-jaunty-x86/mariadb-5.5.31.tar.gz http://launchpad.net/maria/5.5/ongoing/+download/mariadb-5.5.31.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.31/kvm-tarbake-jaunty-x86/mariadb-5.5.31.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.5.31/kvm-tarbake-jaunty-x86/mariadb-5.5.31.tar.gz mirror://gentoo/mysql-extras-20130602-1946Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130602-1946Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=7c30f2feca1c89e153598e62a11835a4 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=7616ccd54989d9b02abf5d60ffe24448 diff --git a/metadata/md5-cache/dev-db/mysql-5.1.66 b/metadata/md5-cache/dev-db/mysql-5.1.66 index cf5ce6404cb6..9d5048a45ca9 100644 --- a/metadata/md5-cache/dev-db/mysql-5.1.66 +++ b/metadata/md5-cache/dev-db/mysql-5.1.66 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.66.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.66.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=6ca8d61b9f8fde6e48f91d7623fe281a diff --git a/metadata/md5-cache/dev-db/mysql-5.1.66-r1 b/metadata/md5-cache/dev-db/mysql-5.1.66-r1 index 69f4527568d6..8fd620098272 100644 --- a/metadata/md5-cache/dev-db/mysql-5.1.66-r1 +++ b/metadata/md5-cache/dev-db/mysql-5.1.66-r1 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.66.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.66.tar.gz mirror://gentoo/mysql-extras-20130128-0054Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130128-0054Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=bca1ffc3775456ee00e65c23ff865ad0 diff --git a/metadata/md5-cache/dev-db/mysql-5.1.67 b/metadata/md5-cache/dev-db/mysql-5.1.67 index 1e3cb4be5342..304a15976069 100644 --- a/metadata/md5-cache/dev-db/mysql-5.1.67 +++ b/metadata/md5-cache/dev-db/mysql-5.1.67 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.67.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.67.tar.gz mirror://gentoo/mysql-extras-20121101-2319Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20121101-2319Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20121101-2319Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=b9416eb9a6b73222e3614b589483017d diff --git a/metadata/md5-cache/dev-db/mysql-5.1.67-r1 b/metadata/md5-cache/dev-db/mysql-5.1.67-r1 index a82a043bf794..f8ba4fdebdf4 100644 --- a/metadata/md5-cache/dev-db/mysql-5.1.67-r1 +++ b/metadata/md5-cache/dev-db/mysql-5.1.67-r1 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.67.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.67.tar.gz mirror://gentoo/mysql-extras-20130128-0054Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130128-0054Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=b769531827086fad41940c87e2ab53bb diff --git a/metadata/md5-cache/dev-db/mysql-5.1.68 b/metadata/md5-cache/dev-db/mysql-5.1.68 index 700d126da69f..bc1f82f320db 100644 --- a/metadata/md5-cache/dev-db/mysql-5.1.68 +++ b/metadata/md5-cache/dev-db/mysql-5.1.68 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.68.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.68.tar.gz mirror://gentoo/mysql-extras-20130128-0054Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130128-0054Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130128-0054Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=909ddf8b4cf395aa751dd202520647f6 diff --git a/metadata/md5-cache/dev-db/mysql-5.1.69 b/metadata/md5-cache/dev-db/mysql-5.1.69 index 1afa8ad2fd1e..b88db9488cdb 100644 --- a/metadata/md5-cache/dev-db/mysql-5.1.69 +++ b/metadata/md5-cache/dev-db/mysql-5.1.69 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling pbxt xtradb +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.69.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.69.tar.gz mirror://gentoo/mysql-extras-20130602-1946Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130602-1946Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools 488f8c5bb34d6a3165237f1312511ce6 mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=1df959830ab5364f3ea93c824d2c44f0 diff --git a/metadata/md5-cache/dev-db/mysql-5.1.70 b/metadata/md5-cache/dev-db/mysql-5.1.70 new file mode 100644 index 000000000000..65ab6c03783c --- /dev/null +++ b/metadata/md5-cache/dev-db/mysql-5.1.70 @@ -0,0 +1,15 @@ +DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 +DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. +EAPI=4 +HOMEPAGE=http://www.mysql.com/ +IUSE=big-tables debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling pbxt xtradb +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris +LICENSE=GPL-2 +PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.1 +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +REQUIRED_USE=minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) pbxt? ( !embedded ) xtradb? ( !embedded ) +SLOT=0 +SRC_URI=http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.70.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.70.tar.gz mirror://gentoo/mysql-extras-20130626-0127Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130626-0127Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130626-0127Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130626-0127Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz ) +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 mysql-autotools a8fb1b6cc04b4818cad19ef1777e7c5a mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=1b2a029e04b7f98351464844d47cfc3d diff --git a/metadata/md5-cache/dev-db/mysql-5.5.29 b/metadata/md5-cache/dev-db/mysql-5.5.29 index bba88a0b7625..cda4ace427d2 100644 --- a/metadata/md5-cache/dev-db/mysql-5.5.29 +++ b/metadata/md5-cache/dev-db/mysql-5.5.29 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling jemalloc tcmalloc systemtap +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.29.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.29.tar.gz mirror://gentoo/mysql-extras-20130120-0100Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130120-0100Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130120-0100Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=b6da65cdf392a4a404702e5535af85d8 diff --git a/metadata/md5-cache/dev-db/mysql-5.5.29-r1 b/metadata/md5-cache/dev-db/mysql-5.5.29-r1 index 2d64ba17126c..57154660e290 100644 --- a/metadata/md5-cache/dev-db/mysql-5.5.29-r1 +++ b/metadata/md5-cache/dev-db/mysql-5.5.29-r1 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling jemalloc tcmalloc systemtap +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.29.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.29.tar.gz mirror://gentoo/mysql-extras-20130120-2303Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130120-2303Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130120-2303Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130120-2303Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=16125322d272655d4dd6c342f82236ef diff --git a/metadata/md5-cache/dev-db/mysql-5.5.30 b/metadata/md5-cache/dev-db/mysql-5.5.30 index 36a8820fad0f..f6ce5ceece94 100644 --- a/metadata/md5-cache/dev-db/mysql-5.5.30 +++ b/metadata/md5-cache/dev-db/mysql-5.5.30 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling jemalloc tcmalloc systemtap +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.30.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.30.tar.gz mirror://gentoo/mysql-extras-20130120-2303Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130120-2303Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130120-2303Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130120-2303Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=f68f01ca2cdec2164282ae1d5076a267 diff --git a/metadata/md5-cache/dev-db/mysql-5.5.31 b/metadata/md5-cache/dev-db/mysql-5.5.31 index ce7592140ebc..0d2138507b0b 100644 --- a/metadata/md5-cache/dev-db/mysql-5.5.31 +++ b/metadata/md5-cache/dev-db/mysql-5.5.31 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling jemalloc tcmalloc systemtap +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.31.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.31.tar.gz mirror://gentoo/mysql-extras-20130602-1946Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130602-1946Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=dc2ef301ecef5327a4cbf835f54ae6fc diff --git a/metadata/md5-cache/dev-db/mysql-5.5.32 b/metadata/md5-cache/dev-db/mysql-5.5.32 index 62bc9a5488dd..5c3dc7d5ec71 100644 --- a/metadata/md5-cache/dev-db/mysql-5.5.32 +++ b/metadata/md5-cache/dev-db/mysql-5.5.32 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test unpack -DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 +DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server. EAPI=4 HOMEPAGE=http://www.mysql.com/ -IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 berkdb +community profiling jemalloc tcmalloc systemtap +IUSE=debug embedded minimal +perl selinux ssl static test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux LICENSE=GPL-2 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) =virtual/mysql-5.5 -RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) +RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc ) tcmalloc? ( dev-util/google-perftools ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl ) SLOT=0 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.32.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.32.tar.gz mirror://gentoo/mysql-extras-20130602-1946Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20130602-1946Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20130602-1946Z.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake 80d64846e4d8814e6d4f927da84ecbca mysql-v2 00edd88f5e58ea0618e5b1d235935d8b mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnuconfig ee02e61d6c68cee478e2e69214b7caef multilib 892e597faee02a5b94eb02ab512e7622 mysql-cmake b1775f412bc38847a89cfb492efcac66 mysql-v2 23d80e222542a6ff9565b20a3251a252 mysql_fx f783e104c8bbd017eefc5359f327975b prefix 21058c21ca48453d771df15500873ede toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=ad7ad21e6d3abc65c26a29393e9dd0eb diff --git a/metadata/md5-cache/dev-java/gcj-jdk-4.7.3 b/metadata/md5-cache/dev-java/gcj-jdk-4.7.3 new file mode 100644 index 000000000000..2008f37ec769 --- /dev/null +++ b/metadata/md5-cache/dev-java/gcj-jdk-4.7.3 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm prerm setup +DEPEND=~sys-devel/gcc-4.7.3[gcj] X? ( ~sys-devel/gcc-4.7.3[gtk] ) dev-java/ecj-gcj:3.6 =dev-java/java-config-2* || ( app-admin/eselect-java fpc-2.6.0-doc-html.tar.gz http://dev.gentoo.org/~radhermit/distfiles/fpc-2.6.0-fpctoc.htx.bz2 ) +_md5_=9b51294a34855fa8a7c42c647622d4ec diff --git a/metadata/md5-cache/dev-lang/fpc-2.6.2 b/metadata/md5-cache/dev-lang/fpc-2.6.2 new file mode 100644 index 000000000000..b76f10fd2e19 --- /dev/null +++ b/metadata/md5-cache/dev-lang/fpc-2.6.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile install postinst prepare unpack +DESCRIPTION=Free Pascal Compiler +EAPI=5 +HOMEPAGE=http://www.freepascal.org/ +IUSE=doc ide source +KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 +LICENSE=GPL-2 LGPL-2.1-with-linking-exception +RDEPEND=ide? ( !dev-lang/fpc-ide ) +RESTRICT=strip +SLOT=0 +SRC_URI=mirror://sourceforge/freepascal/fpcbuild-2.6.2.tar.gz amd64? ( mirror://sourceforge/freepascal/fpc-2.6.2.x86_64-linux.tar ) arm? ( mirror://sourceforge/freepascal/fpc-2.6.2.arm-linux.tar ) ppc? ( mirror://sourceforge/freepascal/fpc-2.6.2.powerpc-linux.tar ) ppc64? ( mirror://sourceforge/freepascal/fpc-2.6.2.powerpc64-linux.tar ) sparc? ( mirror://sourceforge/freepascal/fpc-2.2.4.sparc-linux.tar ) x86? ( mirror://sourceforge/freepascal/fpc-2.6.2.i386-linux.tar ) doc? ( mirror://sourceforge/freepascal/Documentation/2.6.2/doc-html.tar.gz -> fpc-2.6.2-doc-html.tar.gz http://dev.gentoo.org/~radhermit/distfiles/fpc-2.6.2-fpctoc.htx.bz2 ) +_md5_=ed9ea0c5ae6ffff85764b25cb77e1fc3 diff --git a/metadata/md5-cache/dev-lang/lazarus-1.0.10 b/metadata/md5-cache/dev-lang/lazarus-1.0.10 new file mode 100644 index 000000000000..c7dc9c3cd3f2 --- /dev/null +++ b/metadata/md5-cache/dev-lang/lazarus-1.0.10 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=>=dev-lang/fpc-2.6.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1 +DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi. +EAPI=2 +HOMEPAGE=http://www.lazarus.freepascal.org/ +KEYWORDS=~amd64 ~ppc ~x86 +LICENSE=GPL-2 LGPL-2.1-with-linking-exception +RDEPEND=>=dev-lang/fpc-2.6.0[source] net-misc/rsync x11-libs/gtk+:2 !=gnome-base/librsvg-2.16.1 +RESTRICT=strip +SLOT=0 +SRC_URI=http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%201.0.10/lazarus-1.0.10-0.tar.gz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=7fca12772218c317152fe25b3434abc3 diff --git a/metadata/md5-cache/dev-lang/mercury-13.05.1 b/metadata/md5-cache/dev-lang/mercury-13.05.1 new file mode 100644 index 000000000000..8695d58063b9 --- /dev/null +++ b/metadata/md5-cache/dev-lang/mercury-13.05.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) +DESCRIPTION=Mercury is a modern general-purpose logic/functional programming language +EAPI=2 +HOMEPAGE=http://www.mercurylang.org/index.html +IUSE=debug emacs erlang examples java minimal readline threads elibc_FreeBSD java +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 LGPL-2 +RDEPEND=!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 ) +SLOT=0 +SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.1.tar.gz mirror://gentoo/mercury-13.05.1-gentoo-patchset-0.tar.gz +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 elisp-common 090a78f3eaf8f79b5c038c950c6fbaf7 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 52b7cfbf4f7225fcea7e7f18b6d83328 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=5f4bdb49d5b6a2836b160d959b59b92a diff --git a/metadata/md5-cache/dev-lang/mercury-extras-13.05.1 b/metadata/md5-cache/dev-lang/mercury-extras-13.05.1 new file mode 100644 index 000000000000..7200743c6f59 --- /dev/null +++ b/metadata/md5-cache/dev-lang/mercury-extras-13.05.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare +DEPEND=~dev-lang/mercury-13.05.1 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) tcl? ( tk? ( dev-lang/tcl dev-lang/tk x11-libs/libX11 x11-libs/libXmu ) ) +DESCRIPTION=Additional libraries and tools that are not part of the Mercury standard library +EAPI=2 +HOMEPAGE=http://www.mercurylang.org/index.html +IUSE=X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 LGPL-2 +RDEPEND=~dev-lang/mercury-13.05.1 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses ) opengl? ( virtual/opengl ) tcl? ( tk? ( dev-lang/tcl dev-lang/tk x11-libs/libX11 x11-libs/libXmu ) ) +SLOT=0 +SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-13.05.1.tar.gz mirror://gentoo/mercury-extras-13.05.1-gentoo-patchset-0.tar.gz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=03cfbe23796c1db9f565bc91963def94 diff --git a/metadata/md5-cache/dev-libs/MicroJSON-0.3.1 b/metadata/md5-cache/dev-libs/MicroJSON-0.3.1 index c47a47990e02..c7e3f4abf041 100644 --- a/metadata/md5-cache/dev-libs/MicroJSON-0.3.1 +++ b/metadata/md5-cache/dev-libs/MicroJSON-0.3.1 @@ -3,10 +3,10 @@ DEPEND=>=dev-libs/UTF8Strings-1.12.0 sys-devel/make >=dev-util/cmake-2.8.9 userl DESCRIPTION=Small and simple to use JSON generation and parsing library. EAPI=5 HOMEPAGE=http://grigory.info/MicroJSON.About.html -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux LICENSE=GPL-3 RDEPEND=>=dev-libs/UTF8Strings-1.12.0 SLOT=0 SRC_URI=http://grigory.info/distfiles/MicroJSON-0.3.1.tar.bz2 _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=9f1dcb8083f83bd0c6ad5eba0bb8287e +_md5_=e9ba5c8557bde79dbaaacafc0ddb5ac3 diff --git a/metadata/md5-cache/dev-libs/UTF8Strings-1.14.0 b/metadata/md5-cache/dev-libs/UTF8Strings-1.14.0 index 645934090b48..d82338674dce 100644 --- a/metadata/md5-cache/dev-libs/UTF8Strings-1.14.0 +++ b/metadata/md5-cache/dev-libs/UTF8Strings-1.14.0 @@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutil DESCRIPTION=C++ library that provides ability to work natively with UTF8 strings in a very simple way. EAPI=5 HOMEPAGE=http://grigory.info/UTF8Strings.About.html -KEYWORDS=~amd64 ~x86 +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=GPL-3 SLOT=0 SRC_URI=http://grigory.info/distfiles/UTF8Strings-1.14.0.tar.bz2 _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=c4d8704019c1ebe7321621664e96be05 +_md5_=3383b0ffced46e19ba70684008cb1d19 diff --git a/metadata/md5-cache/dev-perl/Class-Inspector-1.280.0 b/metadata/md5-cache/dev-perl/Class-Inspector-1.280.0 index 2f0b01792823..282e864493ce 100644 --- a/metadata/md5-cache/dev-perl/Class-Inspector-1.280.0 +++ b/metadata/md5-cache/dev-perl/Class-Inspector-1.280.0 @@ -3,10 +3,10 @@ DEPEND=dev-lang/perl[-build] DESCRIPTION=Provides information about Classes EAPI=4 HOMEPAGE=http://search.cpan.org/dist/Class-Inspector/ -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris +KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 ) RDEPEND=dev-lang/perl[-build] SLOT=0 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/Class-Inspector-1.28.tar.gz _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 perl-module ba21eba2562fc2643deeea95fd28665d toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=7fab36fb2b1841e138101ba686af7960 +_md5_=4691d9f53cdd1405ccf90f42348358d9 diff --git a/metadata/md5-cache/dev-python/flask-0.10.1 b/metadata/md5-cache/dev-python/flask-0.10.1 index 086765748eb4..4f1e8bb5dfc7 100644 --- a/metadata/md5-cache/dev-python/flask-0.10.1 +++ b/metadata/md5-cache/dev-python/flask-0.10.1 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] +DEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions EAPI=5 HOMEPAGE=http://pypi.python.org/pypi/Flask IUSE=examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 KEYWORDS=~amd64 ~x86 LICENSE=BSD -RDEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] +RDEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 ) RESTRICT=test SLOT=0 SRC_URI=mirror://pypi/F/Flask/Flask-0.10.1.tar.gz _eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=4e1ff60a8ceed2df7e4ab4291d3e74ff +_md5_=843ce0629541597ce99d0c66d4f61b22 diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999 index 3b9a4037689a..abf70e54bf2d 100644 --- a/metadata/md5-cache/dev-python/flask-9999 +++ b/metadata/md5-cache/dev-python/flask-9999 @@ -1,12 +1,12 @@ DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-vcs/git +DEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-vcs/git DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions EAPI=5 HOMEPAGE=http://pypi.python.org/pypi/Flask IUSE=examples test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 LICENSE=BSD -RDEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] +RDEPEND=dev-python/blinker[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/itsdangerous-0.21[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] >=dev-python/werkzeug-0.7[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 ) SLOT=0 _eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 git-2 e92e09651292b1bef5656592364550f7 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=bb476dd6e73570b46c6148be466b2aa3 +_md5_=667562f226e865af963c1460db795ca1 diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.1 b/metadata/md5-cache/dev-python/google-api-python-client-1.1 new file mode 100644 index 000000000000..18b86ee3c861 --- /dev/null +++ b/metadata/md5-cache/dev-python/google-api-python-client-1.1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-python/python-gflags >=dev-python/httplib2-0.8 dev-python/simplejson dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] +DESCRIPTION=Google API Client for Python +EAPI=5 +HOMEPAGE=http://code.google.com/p/google-api-python-client/ +IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 +KEYWORDS=~amd64 ~x86 +LICENSE=Apache-2.0 +RDEPEND=dev-python/python-gflags >=dev-python/httplib2-0.8 dev-python/simplejson dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] +REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 ) +SLOT=0 +SRC_URI=https://google-api-python-client.googlecode.com/files/google-api-python-client-1.1.tar.gz +_eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=3ed9fea839774f72599d1f80610fb147 diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.21 b/metadata/md5-cache/dev-python/itsdangerous-0.21 index 7bdacce80b8b..d79f32f673fe 100644 --- a/metadata/md5-cache/dev-python/itsdangerous-0.21 +++ b/metadata/md5-cache/dev-python/itsdangerous-0.21 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] +DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] DESCRIPTION=Various helpers to pass trusted data to untrusted environments and back. EAPI=5 HOMEPAGE=http://pythonhosted.org/itsdangerous/ http://pypi.python.org/pypi/itsdangerous @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe SLOT=0 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.21.tar.gz _eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=5079d92150922fbef9d329399adc4b2d +_md5_=502c7059ec07879cf776d3c6c48d90ac diff --git a/metadata/md5-cache/dev-python/python-ldap-2.3.13 b/metadata/md5-cache/dev-python/python-ldap-2.3.13 index b902740116b3..2c4cc22e62da 100644 --- a/metadata/md5-cache/dev-python/python-ldap-2.3.13 +++ b/metadata/md5-cache/dev-python/python-ldap-2.3.13 @@ -10,4 +10,4 @@ RDEPEND=>=net-nds/openldap-2.4 sasl? ( dev-libs/cyrus-sasl ) =dev-lang/python-2* SLOT=0 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.3.13.tar.gz doc? ( http://dev.gentoo.org/~xarthisius/distfiles/python-ldap-docs-html-2.3.13.tar.gz ) _eclasses_=distutils 77fc6005d2dfcc7bdb5ec363a49d9912 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=606f1c4188985c545e02dc14f4873059 +_md5_=9c1dc21ef73e4ec483c8d9d1ac325d1a diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.10 b/metadata/md5-cache/dev-python/python-ldap-2.4.10 index 39a7927472a1..5a5efd75a1c8 100644 --- a/metadata/md5-cache/dev-python/python-ldap-2.4.10 +++ b/metadata/md5-cache/dev-python/python-ldap-2.4.10 @@ -10,4 +10,4 @@ RDEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1 sasl? ( dev-libs/cyrus-sasl ) d SLOT=0 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.10.tar.gz _eclasses_=distutils 77fc6005d2dfcc7bdb5ec363a49d9912 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=0ee90eaa7201ebe7bc22d6ce427af93b +_md5_=91e3dd25ee7d676cfc23e0c2a6370d21 diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1 b/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1 index e78b5412f779..da587ad4bd88 100644 --- a/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1 +++ b/metadata/md5-cache/dev-python/python-ldap-2.4.10-r1 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targe SLOT=0 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.10.tar.gz _eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=79f838a20b278b2c5b7d766e3a07b125 +_md5_=b2708c52409e9554bb9214c28dabeea4 diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.12 b/metadata/md5-cache/dev-python/python-ldap-2.4.12 index 4927583cb476..5043fbe80faa 100644 --- a/metadata/md5-cache/dev-python/python-ldap-2.4.12 +++ b/metadata/md5-cache/dev-python/python-ldap-2.4.12 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targe SLOT=0 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.12.tar.gz _eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=8993048deb91c2ba63dc1deca5bcce72 +_md5_=f905bcf7acdf612a36404c6f7882d177 diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.13 b/metadata/md5-cache/dev-python/python-ldap-2.4.13 new file mode 100644 index 000000000000..276f4f29dcce --- /dev/null +++ b/metadata/md5-cache/dev-python/python-ldap-2.4.13 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sasl? ( dev-libs/cyrus-sasl ) dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] +DESCRIPTION=Various LDAP-related Python modules +EAPI=5 +HOMEPAGE=http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap +IUSE=doc examples sasl ssl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 +KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris +LICENSE=PSF-2 +RDEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] sasl? ( dev-libs/cyrus-sasl ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] +REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 ) +SLOT=0 +SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.13.tar.gz +_eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=7bf59717a1e3b51e94d65e7f64be27e0 diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.3 b/metadata/md5-cache/dev-python/python-ldap-2.4.3 deleted file mode 100644 index b0d36f8872b0..000000000000 --- a/metadata/md5-cache/dev-python/python-ldap-2.4.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare -DEPEND=dev-python/setuptools =dev-lang/python-2* -DESCRIPTION=Various LDAP-related Python modules -EAPI=3 -HOMEPAGE=http://www.python-ldap.org/ http://pypi.python.org/pypi/python-ldap -IUSE=doc examples sasl ssl -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris -LICENSE=PSF-2 -RDEPEND=>=net-nds/openldap-2.4 sasl? ( dev-libs/cyrus-sasl ) =dev-lang/python-2* -SLOT=0 -SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.3.tar.gz doc? ( http://www.python-ldap.org/doc/python-ldap-docs-html-2.4.3.tar.gz ) -_eclasses_=distutils 77fc6005d2dfcc7bdb5ec363a49d9912 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=180cbb201f502edcea7c59e7bb7b0777 diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.9 b/metadata/md5-cache/dev-python/python-ldap-2.4.9 deleted file mode 100644 index 53d1e0bf5141..000000000000 --- a/metadata/md5-cache/dev-python/python-ldap-2.4.9 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm prepare setup -DEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1 sasl? ( dev-libs/cyrus-sasl ) dev-python/setuptools doc? ( dev-python/sphinx ) dev-lang/python -DESCRIPTION=Various LDAP-related Python modules -EAPI=4 -HOMEPAGE=http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap -IUSE=doc examples sasl ssl -KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris -LICENSE=PSF-2 -RDEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1 sasl? ( dev-libs/cyrus-sasl ) dev-lang/python -SLOT=0 -SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.9.tar.gz -_eclasses_=distutils 77fc6005d2dfcc7bdb5ec363a49d9912 multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=1f0f90a7fa9d341bdeba2e24fdffce66 diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999 new file mode 100644 index 000000000000..ad98100959a9 --- /dev/null +++ b/metadata/md5-cache/dev-python/python-ldap-9999 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] sasl? ( dev-libs/cyrus-sasl ) dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] doc? ( dev-python/sphinx[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-vcs/git +DESCRIPTION=Various LDAP-related Python modules +EAPI=5 +HOMEPAGE=http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap +IUSE=doc examples sasl ssl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 +LICENSE=PSF-2 +RDEPEND=>=net-nds/openldap-2.4 dev-python/pyasn1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] sasl? ( dev-libs/cyrus-sasl ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] +REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 ) +SLOT=0 +_eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 git-2 e92e09651292b1bef5656592364550f7 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=1cd54bf4608002f2c7dd82dc82f173e6 diff --git a/metadata/md5-cache/dev-python/pywebkitgtk-1.1.8-r1 b/metadata/md5-cache/dev-python/pywebkitgtk-1.1.8-r1 index 31e16e0f0f03..404c877e4b4f 100644 --- a/metadata/md5-cache/dev-python/pywebkitgtk-1.1.8-r1 +++ b/metadata/md5-cache/dev-python/pywebkitgtk-1.1.8-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxslt[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=net-libs/webkit-gtk-1.1.15:2 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +DEPEND=dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxslt >=net-libs/webkit-gtk-1.1.15:2 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) DESCRIPTION=Python bindings for the WebKit GTK+ port EAPI=5 HOMEPAGE=http://code.google.com/p/pywebkitgtk/ IUSE=test python_targets_python2_6 python_targets_python2_7 test KEYWORDS=~amd64 ~ppc ~sparc ~x86 LICENSE=LGPL-2 -RDEPEND=dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxslt[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=net-libs/webkit-gtk-1.1.15:2 +RDEPEND=dev-python/pygobject:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-libs/libxslt >=net-libs/webkit-gtk-1.1.15:2 SLOT=0 SRC_URI=http://pywebkitgtk.googlecode.com/files/pywebkitgtk-1.1.8.tar.gz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=2bcf6c181b1cce7c10a8f09a893e9339 +_md5_=e4243a7ba68e1bd1689372e69b8b22ec diff --git a/metadata/md5-cache/dev-python/simplecv-1.3 b/metadata/md5-cache/dev-python/simplecv-1.3 new file mode 100644 index 000000000000..33ff62cdef80 --- /dev/null +++ b/metadata/md5-cache/dev-python/simplecv-1.3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] +DESCRIPTION=Python interface to several powerful open source computer vision libraries. +EAPI=5 +HOMEPAGE=http://simplecv.org/ +IUSE=shell test python_targets_python2_7 +KEYWORDS=~amd64 ~x86 +LICENSE=BSD +RDEPEND=>=media-libs/opencv-2.2 dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/imaging[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] shell? ( dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] +REQUIRED_USE=|| ( python_targets_python2_7 ) +SLOT=0 +SRC_URI=https://github.com/sightmachine/SimpleCV/archive/1.3.tar.gz -> simplecv-1.3.tar.gz +_eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 vcs-snapshot 3facff03591093044e38f21285a02129 +_md5_=c37c0a26f579d1ce353c358845cd4e5e diff --git a/metadata/md5-cache/dev-python/werkzeug-0.9.1 b/metadata/md5-cache/dev-python/werkzeug-0.9.1 index a74698a07862..2a6072c5437b 100644 --- a/metadata/md5-cache/dev-python/werkzeug-0.9.1 +++ b/metadata/md5-cache/dev-python/werkzeug-0.9.1 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] test? ( dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] +DEPEND=dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] DESCRIPTION=Collection of various utilities for WSGI applications EAPI=5 HOMEPAGE=http://werkzeug.pocoo.org/ http://pypi.python.org/pypi/Werkzeug -IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 +IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos LICENSE=BSD -RDEPEND=dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] -REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 ) +RDEPEND=dev-python/simplejson[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] +REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 ) SLOT=0 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.9.1.tar.gz _eclasses_=distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=759b6ef2882b96f8731e75de5518b697 +_md5_=1dc5b62f854e98ef72d62bd59fa539eb diff --git a/metadata/md5-cache/dev-ruby/flog-3.2.3 b/metadata/md5-cache/dev-ruby/flog-3.2.3 new file mode 100644 index 000000000000..fac952dbaf6b --- /dev/null +++ b/metadata/md5-cache/dev-ruby/flog-3.2.3 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/minitest[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/minitest[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( =dev-ruby/ruby_parser-3*[ruby_targets_ruby18] >dev-ruby/ruby_parser-3.1.0[ruby_targets_ruby18] =dev-ruby/sexp_processor-4*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/ruby_parser-3*[ruby_targets_ruby19] >dev-ruby/ruby_parser-3.1.0[ruby_targets_ruby19] =dev-ruby/sexp_processor-4*[ruby_targets_ruby19] ) ruby_targets_jruby? ( =dev-ruby/ruby_parser-3*[ruby_targets_jruby] >dev-ruby/ruby_parser-3.1.0[ruby_targets_jruby] =dev-ruby/sexp_processor-4*[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rdoc[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) ) +DESCRIPTION=Flog reports the most tortured code in an easy to read pain report. +EAPI=5 +HOMEPAGE=http://ruby.sadi.st/ +IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby doc test test +KEYWORDS=~x86 ~amd64 +LICENSE=MIT +RDEPEND=ruby_targets_ruby18? ( =dev-ruby/ruby_parser-3*[ruby_targets_ruby18] >dev-ruby/ruby_parser-3.1.0[ruby_targets_ruby18] =dev-ruby/sexp_processor-4*[ruby_targets_ruby18] ) ruby_targets_ruby19? ( =dev-ruby/ruby_parser-3*[ruby_targets_ruby19] >dev-ruby/ruby_parser-3.1.0[ruby_targets_ruby19] =dev-ruby/sexp_processor-4*[ruby_targets_ruby19] ) ruby_targets_jruby? ( =dev-ruby/ruby_parser-3*[ruby_targets_jruby] >dev-ruby/ruby_parser-3.1.0[ruby_targets_jruby] =dev-ruby/sexp_processor-4*[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) +REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby ) +SLOT=0 +SRC_URI=mirror://rubygems/flog-3.2.3.gem +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 java-utils-2 52b7cfbf4f7225fcea7e7f18b6d83328 multilib 892e597faee02a5b94eb02ab512e7622 ruby-fakegem 6e366daedf25d7020291916549562bbf ruby-ng 69c01a1b984ed066bc91b4397b002f6a toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=0091c394f84560bfb07568a4f26c6c14 diff --git a/metadata/md5-cache/dev-tex/bibtexu-3.71_p20130530 b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20130530 new file mode 100644 index 000000000000..027cb1932d27 --- /dev/null +++ b/metadata/md5-cache/dev-tex/bibtexu-3.71_p20130530 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure install +DEPEND=>=dev-libs/kpathsea-6.1.0_p20120701 >=dev-libs/icu-4.4 !=dev-libs/kpathsea-6.1.0_p20120701 >=dev-libs/icu-4.4 !=dev-lang/perl-5.10 app-arch/dpkg dev-perl/TimeDate virtual/perl-Getopt-Long linguas_de? ( >=app-text/po4a-0.24 ) linguas_es? ( >=app-text/po4a-0.24 ) linguas_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod ) +DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules +EAPI=5 +HOMEPAGE=http://packages.qa.debian.org/d/debhelper.html http://joeyh.name/code/debhelper/ +IUSE=test linguas_de linguas_es linguas_fr +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux +LICENSE=GPL-2 +RDEPEND=>=dev-lang/perl-5.10 app-arch/dpkg dev-perl/TimeDate virtual/perl-Getopt-Long +SLOT=0 +SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_9.20130626.tar.gz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=c1e5a5d2dc0726704fa7db0bd9d62813 diff --git a/metadata/md5-cache/dev-vcs/qgit-2.5 b/metadata/md5-cache/dev-vcs/qgit-2.5 index 1f6f21623f3d..e8ec8ef96f04 100644 --- a/metadata/md5-cache/dev-vcs/qgit-2.5 +++ b/metadata/md5-cache/dev-vcs/qgit-2.5 @@ -3,10 +3,10 @@ DEPEND=dev-qt/qtgui:4 DESCRIPTION=Qt4 GUI for git repositories EAPI=4 HOMEPAGE=http://libre.tibirna.org/projects/qgit/wiki/QGit -KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos +KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos LICENSE=GPL-2 RDEPEND=dev-qt/qtgui:4 >=dev-vcs/git-1.6 SLOT=2 SRC_URI=http://libre.tibirna.org/attachments/download/9/qgit-2.5.tar.gz _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 qt4-r2 ce0c9abfee272185e03ab73f09f5fd69 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=23f643fec9953429439ddd50fe1db040 +_md5_=f0c7d21d8fec74e36ed3b4bcc26bd593 diff --git a/metadata/md5-cache/games-engines/renpy-6.15.5 b/metadata/md5-cache/games-engines/renpy-6.15.7 similarity index 96% rename from metadata/md5-cache/games-engines/renpy-6.15.5 rename to metadata/md5-cache/games-engines/renpy-6.15.7 index 93c500a50f35..dc7d02e72100 100644 --- a/metadata/md5-cache/games-engines/renpy-6.15.5 +++ b/metadata/md5-cache/games-engines/renpy-6.15.7 @@ -9,6 +9,6 @@ LICENSE=MIT RDEPEND=>=app-admin/eselect-renpy-0.2 dev-libs/fribidi dev-python/pygame[X,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/python-exec-0.3[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] media-libs/glew media-libs/libpng:0 media-libs/libsdl[X,video] media-libs/freetype:2 sys-libs/zlib virtual/ffmpeg virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] REQUIRED_USE=examples? ( development ) || ( python_targets_python2_6 python_targets_python2_7 ) SLOT=6.15 -SRC_URI=http://www.renpy.org/dl/6.15.5/renpy-6.15.5-source.tar.bz2 +SRC_URI=http://www.renpy.org/dl/6.15.7/renpy-6.15.7-source.tar.bz2 _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 distutils-r1 6950481ecc2ad548f2d9d116a0936fb8 eutils 63afaaed8aa819fdcb814c7cd39495a2 games 0fb7637597e0869f6c8be79b11d0135a gnome2-utils 794d2847b4af390a1e020924876c8297 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 094dc7421f9aea7525b85b899f67e62a python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=74d16b1170577e76ebf1b80d6d10c3df +_md5_=01b5a0b515b23369500544b0ee16e11b diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.6.3 b/metadata/md5-cache/gnome-base/gnome-keyring-3.6.3 index 9a858c345e06..a36264774a86 100644 --- a/metadata/md5-cache/gnome-base/gnome-keyring-3.6.3 +++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.6.3 @@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/libgnome-keyring-3.1.92 RDEPEND=>=app-crypt/gcr-3.5.3:= >=dev-libs/glib-2.32.0:2 >=x11-libs/gtk+-3.0:3 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:= >=sys-apps/dbus-1.0 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) SLOT=0 SRC_URI=mirror://gnome/sources/gnome-keyring/3.6/gnome-keyring-3.6.3.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 7976d3f4d0c0816c67033d3dcd4d9472 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 7976d3f4d0c0816c67033d3dcd4d9472 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 _md5_=2bb1d39841de18467391dcd330f61119 diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.8.1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.8.1 index 8bfd33eb7240..4366a22e78fe 100644 --- a/metadata/md5-cache/gnome-base/gnome-keyring-3.8.1 +++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.8.1 @@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/libgnome-keyring-3.1.92 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.32.0:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) SLOT=0 SRC_URI=mirror://gnome/sources/gnome-keyring/3.8/gnome-keyring-3.8.1.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 7976d3f4d0c0816c67033d3dcd4d9472 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 7976d3f4d0c0816c67033d3dcd4d9472 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 _md5_=947f149608fe3c0292eade58fa4df66b diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.8.2 b/metadata/md5-cache/gnome-base/gnome-keyring-3.8.2 index 1e1cf53c3845..9ff5c8f9c349 100644 --- a/metadata/md5-cache/gnome-base/gnome-keyring-3.8.2 +++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.8.2 @@ -10,5 +10,5 @@ PDEPEND=>=gnome-base/libgnome-keyring-3.1.92 RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.32.0:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) SLOT=0 SRC_URI=mirror://gnome/sources/gnome-keyring/3.8/gnome-keyring-3.8.2.tar.xz -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 7976d3f4d0c0816c67033d3dcd4d9472 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 7976d3f4d0c0816c67033d3dcd4d9472 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 _md5_=5dc0b9abfe3ec50092159616d3f7e776 diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.27-r3 b/metadata/md5-cache/media-libs/alsa-lib-1.0.27-r3 index d1209ab4dff7..22b7b2cb6dac 100644 --- a/metadata/md5-cache/media-libs/alsa-lib-1.0.27-r3 +++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.27-r3 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare setup test -DEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=Advanced Linux Sound Architecture Library EAPI=5 HOMEPAGE=http://www.alsa-project.org/ IUSE=doc debug alisp python abi_x86_32 abi_x86_64 abi_x86_x32 python_targets_python2_7 python_single_target_python2_7 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux LICENSE=LGPL-2.1 -RDEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) +RDEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) SLOT=0 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multilib-minimal 70d90bda3149c94f02fa594ff1657ec0 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=1c12f60a59ff1e4731baefba78891390 +_md5_=6d065437a5f40ed0f3438312d0487a6b diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1 b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1 index 1cf727c61a11..a7e78c4df7e4 100644 --- a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1 +++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare setup test -DEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=Advanced Linux Sound Architecture Library EAPI=5 HOMEPAGE=http://www.alsa-project.org/ IUSE=doc debug alisp python abi_x86_32 abi_x86_64 abi_x86_x32 python_targets_python2_7 python_single_target_python2_7 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux LICENSE=LGPL-2.1 -RDEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) +RDEPEND=python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) SLOT=0 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.1.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multilib-minimal 70d90bda3149c94f02fa594ff1657ec0 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=222da4b7e751a797a27120f09c2651a0 +_md5_=0671979b14ff7450737ce064cef6749a diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.6-r1 b/metadata/md5-cache/media-libs/audiofile-0.3.6-r1 index 4802140486df..edb46c95850b 100644 --- a/metadata/md5-cache/media-libs/audiofile-0.3.6-r1 +++ b/metadata/md5-cache/media-libs/audiofile-0.3.6-r1 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=flac? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) virtual/pkgconfig test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils +DEPEND=flac? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) virtual/pkgconfig test? ( dev-cpp/gtest[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils DESCRIPTION=An elegant API for accessing audio files EAPI=5 HOMEPAGE=http://www.68k.org/~michael/audiofile/ IUSE=flac static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris LICENSE=GPL-2 LGPL-2.1 -RDEPEND=flac? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) +RDEPEND=flac? ( >=media-libs/flac-1.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) SLOT=0/1 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.6.tar.xz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 gnome.org 8fef8f967214f56e08fa92d61163d891 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=c40fcb027da1a4ac1306b1eed2a0e922 +_md5_=bbf8c50af6da1f3a83828105b42d4294 diff --git a/metadata/md5-cache/media-libs/flac-1.2.1-r5 b/metadata/md5-cache/media-libs/flac-1.2.1-r5 index 8ffa1565e79f..7490ac12a3db 100644 --- a/metadata/md5-cache/media-libs/flac-1.2.1-r5 +++ b/metadata/md5-cache/media-libs/flac-1.2.1-r5 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=free lossless audio encoder and decoder EAPI=5 HOMEPAGE=http://flac.sourceforge.net IUSE=3dnow altivec +cxx debug ogg sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1 -RDEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) +RDEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) SLOT=0 SRC_URI=mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-m4.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=4bf19faac8f808cf4a521d5394ae7e5d +_md5_=be169cdd93f1a1435ed79135f438ca2d diff --git a/metadata/md5-cache/media-libs/flac-1.3.0 b/metadata/md5-cache/media-libs/flac-1.3.0 index 6750f40a2fae..c552f1c65dbc 100644 --- a/metadata/md5-cache/media-libs/flac-1.3.0 +++ b/metadata/md5-cache/media-libs/flac-1.3.0 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) app-arch/xz-utils abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) app-arch/xz-utils abi_x86_32? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=free lossless audio encoder and decoder EAPI=5 HOMEPAGE=http://flac.sourceforge.net IUSE=3dnow altivec +cxx debug ogg sse static-libs abi_x86_32 abi_x86_64 abi_x86_x32 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1 -RDEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) +RDEPEND=ogg? ( >=media-libs/libogg-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) SLOT=0 SRC_URI=http://downloads.xiph.org/releases/flac/flac-1.3.0.tar.xz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=2fae2388d4b0cee38f53f60679619f61 +_md5_=fea956296cea85e8f464bca705494e7f diff --git a/metadata/md5-cache/media-libs/opencv-2.4.3 b/metadata/md5-cache/media-libs/opencv-2.4.3 deleted file mode 100644 index ef363fcb13bf..000000000000 --- a/metadata/md5-cache/media-libs/opencv-2.4.3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup test unpack -DEPEND=app-arch/bzip2 dev-python/numpy sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/glu ) png? ( media-libs/libpng:0 ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -DESCRIPTION=A collection of algorithms and sample code for various computer vision problems -EAPI=4 -HOMEPAGE=http://opencv.willowgarage.com -IUSE=cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl pch png qt4 testprograms threads tiff v4l xine -KEYWORDS=amd64 ppc x86 ~amd64-linux -LICENSE=BSD -RDEPEND=app-arch/bzip2 dev-python/numpy sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2 ) eigen? ( dev-cpp/eigen:2 ) ffmpeg? ( virtual/ffmpeg ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/glu ) png? ( media-libs/libpng:0 ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff ) v4l? ( >=media-libs/libv4l-0.8.3 ) xine? ( media-libs/xine-lib ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) -SLOT=0 -SRC_URI=mirror://sourceforge/opencvlibrary/OpenCV-2.4.3.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=22e8b4898fde199e50a125915757bc0e diff --git a/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1 b/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1 index 7ee968608b9a..709b461106b3 100644 --- a/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1 +++ b/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1 @@ -5,8 +5,8 @@ HOMEPAGE=http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing/ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 KEYWORDS=~amd64 ~x86 ~amd64-linux LICENSE=BSD -RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) +RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) SLOT=0 SRC_URI=http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-0.1.tar.xz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=7cf8e7796bcadc191c351b2837948d50 +_md5_=837a88867c542906dac53c6702d4a418 diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15 deleted file mode 100644 index 129da01884ef..000000000000 --- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst unpack -DEPEND=media-libs/ladspa-sdk >=sci-libs/fftw-3 sys-devel/gettext dev-vcs/cvs virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Large collection of LADSPA audio plugins/effects -HOMEPAGE=http://plugin.org.uk -IUSE=3dnow nls sse -KEYWORDS=amd64 ~ppc x86 -LICENSE=GPL-2 -RDEPEND=media-libs/ladspa-sdk >=sci-libs/fftw-3 -SLOT=0 -SRC_URI=http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=d27f790837282a36feb1d7501305d164 diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1 deleted file mode 100644 index 9bff3f0d9d27..000000000000 --- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst unpack -DEPEND=media-libs/ladspa-sdk media-sound/gsm >=sci-libs/fftw-3 sys-devel/gettext virtual/pkgconfig || ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=Large collection of LADSPA audio plugins/effects -HOMEPAGE=http://plugin.org.uk -IUSE=3dnow nls sse -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux -LICENSE=GPL-2 -RDEPEND=media-libs/ladspa-sdk media-sound/gsm >=sci-libs/fftw-3 -SLOT=0 -SRC_URI=http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=16c491085b014f7fa3673463bcfdbd1f diff --git a/metadata/md5-cache/media-sound/a2jmidid-4 b/metadata/md5-cache/media-sound/a2jmidid-4 deleted file mode 100644 index eb03f77fb2b9..000000000000 --- a/metadata/md5-cache/media-sound/a2jmidid-4 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sys-apps/dbus virtual/pkgconfig dev-lang/python -DESCRIPTION=Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system. -HOMEPAGE=http://home.gna.org/a2jmidid/ -KEYWORDS=amd64 x86 -LICENSE=GPL-2 -RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sys-apps/dbus -SLOT=0 -SRC_URI=http://download.gna.org/a2jmidid/a2jmidid-4.tar.bz2 -_md5_=6c4ab344448746a804c8a2be1a7ee53e diff --git a/metadata/md5-cache/media-sound/a2jmidid-5 b/metadata/md5-cache/media-sound/a2jmidid-5 deleted file mode 100644 index 2c45f0978ec7..000000000000 --- a/metadata/md5-cache/media-sound/a2jmidid-5 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sys-apps/dbus virtual/pkgconfig dev-lang/python -DESCRIPTION=Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system. -HOMEPAGE=http://home.gna.org/a2jmidid/ -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sys-apps/dbus -SLOT=0 -SRC_URI=http://download.gna.org/a2jmidid/a2jmidid-5.tar.bz2 -_md5_=f08f7d543a17c092235b3438c5199de6 diff --git a/metadata/md5-cache/media-sound/a2jmidid-6 b/metadata/md5-cache/media-sound/a2jmidid-6 deleted file mode 100644 index ea4f6ae4022e..000000000000 --- a/metadata/md5-cache/media-sound/a2jmidid-6 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup unpack -DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sys-apps/dbus virtual/pkgconfig =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads] -DESCRIPTION=Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system. -EAPI=4 -HOMEPAGE=http://home.gna.org/a2jmidid/ -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sys-apps/dbus =dev-lang/python-2* -SLOT=0 -SRC_URI=http://download.gna.org/a2jmidid/a2jmidid-6.tar.bz2 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python dd56675d8e9f7e85d815a28c87383141 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 waf-utils 681b3e9181d1a20ad8d0c186333ddcf7 -_md5_=f75d4407c236c087215855736bb1561a diff --git a/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1 b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1 new file mode 100644 index 000000000000..725e46b12cf7 --- /dev/null +++ b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst prepare +DEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-admin/eselect-audicle sys-devel/bison sys-devel/flex virtual/pkgconfig +DESCRIPTION=A Context-sensitive, On-the-fly Audio Programming Environ/mentality +EAPI=5 +HOMEPAGE=http://audicle.cs.princeton.edu/ +IUSE=+alsa jack oss truetype +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-admin/eselect-audicle +REQUIRED_USE=|| ( alsa jack oss ) +SLOT=0 +SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.7.tgz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=5823857e54cb4d749792585a8c081bac diff --git a/metadata/md5-cache/media-sound/lmms-0.4.15 b/metadata/md5-cache/media-sound/lmms-0.4.15 new file mode 100644 index 000000000000..88660f38a08b --- /dev/null +++ b/metadata/md5-cache/media-sound/lmms-0.4.15 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.7 x11-libs/libXinerama alsa? ( media-libs/alsa-lib ) sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 ) ogg? ( media-libs/libvorbis media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) stk? ( media-libs/stk ) vst? ( app-emulation/wine ) >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=Free alternative to popular programs such as Fruityloops, Cubase and Logic +EAPI=2 +HOMEPAGE=http://lmms.sourceforge.net/ +IUSE=alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 LGPL-2 +RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.7 x11-libs/libXinerama alsa? ( media-libs/alsa-lib ) sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 ) ogg? ( media-libs/libvorbis media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) stk? ( media-libs/stk ) vst? ( app-emulation/wine ) media-plugins/swh-plugins media-plugins/caps-plugins media-plugins/tap-plugins media-libs/ladspa-cmt +SLOT=0 +SRC_URI=mirror://sourceforge/lmms/lmms-0.4.15.tar.bz2 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=79ad2d516f69366c9965dbf87f14d1cf diff --git a/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r2 b/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r2 new file mode 100644 index 000000000000..f38bc2cd6490 --- /dev/null +++ b/metadata/md5-cache/media-sound/miniaudicle-0.1.3.8-r2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst prepare +DEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile >=x11-libs/gtk+-2.10:2 x11-libs/wxGTK:2.8[X] app-admin/eselect-miniaudicle sys-devel/bison sys-devel/flex +DESCRIPTION=integrated development + performance environment for chuck +EAPI=5 +HOMEPAGE=http://audicle.cs.princeton.edu/mini/ +IUSE=+alsa jack oss +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile >=x11-libs/gtk+-2.10:2 x11-libs/wxGTK:2.8[X] app-admin/eselect-miniaudicle +REQUIRED_USE=|| ( alsa jack oss ) +SLOT=0 +SRC_URI=http://audicle.cs.princeton.edu/mini/release/files/miniAudicle-0.1.3.8.tgz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 wxwidgets fb1a306837717dfa2af841ecdf929565 +_md5_=fc0d2605001e83dfef04ac50f03174ce diff --git a/metadata/md5-cache/media-video/ffdiaporama-1.6 b/metadata/md5-cache/media-video/ffdiaporama-1.6 new file mode 100644 index 000000000000..e3220761608e --- /dev/null +++ b/metadata/md5-cache/media-video/ffdiaporama-1.6 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack +DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[audio] media-libs/qimageblitz media-libs/taglib >=virtual/ffmpeg-9[encode] >=sys-apps/sed-4 +DESCRIPTION=Movie creator from photos and video clips +EAPI=5 +HOMEPAGE=http://ffdiaporama.tuxfamily.org +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 media-gfx/exiv2 media-libs/libsdl[audio] media-libs/qimageblitz media-libs/taglib >=virtual/ffmpeg-9[encode] +SLOT=0 +SRC_URI=http://download.tuxfamily.org/ffdiaporama/Archives/ffdiaporama_1.6.tar.gz +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 multilib 892e597faee02a5b94eb02ab512e7622 qt4-r2 ce0c9abfee272185e03ab73f09f5fd69 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=dbf67e81ce4dd10a62f0ab7c1e2ee89c diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-1.0.0 b/metadata/md5-cache/net-analyzer/multimon-ng-1.0.0 new file mode 100644 index 000000000000..495546c63ec4 --- /dev/null +++ b/metadata/md5-cache/net-analyzer/multimon-ng-1.0.0 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare unpack +DEPEND=media-sound/pulseaudio x11-libs/libX11 +DESCRIPTION=a fork of multimon, decodes multiple digital transmission modes +EAPI=5 +HOMEPAGE=https://github.com/EliasOenal/multimonNG +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=media-sound/pulseaudio x11-libs/libX11 +SLOT=0 +SRC_URI=https://github.com/EliasOenal/multimonNG/archive/1.0.0.tar.gz -> multimon-ng-1.0.0.tar.gz +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 qt4-r2 ce0c9abfee272185e03ab73f09f5fd69 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=7c3ea5c48260eb5e7012002286971285 diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-9999 b/metadata/md5-cache/net-analyzer/multimon-ng-9999 new file mode 100644 index 000000000000..90bd240c268e --- /dev/null +++ b/metadata/md5-cache/net-analyzer/multimon-ng-9999 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile configure install prepare unpack +DEPEND=media-sound/pulseaudio x11-libs/libX11 dev-vcs/git +DESCRIPTION=a fork of multimon, decodes multiple digital transmission modes +EAPI=5 +HOMEPAGE=https://github.com/EliasOenal/multimonNG +LICENSE=GPL-2 +RDEPEND=media-sound/pulseaudio x11-libs/libX11 +SLOT=0 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 qt4-r2 ce0c9abfee272185e03ab73f09f5fd69 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=f15fd046939ea492695b007730f96212 diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.10.0 b/metadata/md5-cache/net-analyzer/wireshark-1.10.0 index c8ee93ccc99c..84164ea39093 100644 --- a/metadata/md5-cache/net-analyzer/wireshark-1.10.0 +++ b/metadata/md5-cache/net-analyzer/wireshark-1.10.0 @@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( > REQUIRED_USE=ssl? ( crypt ) SLOT=0/1.10.0 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.10.0.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=a268d5827245a9cf3da04ec72b9cbe45 diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.10.0-r1 b/metadata/md5-cache/net-analyzer/wireshark-1.10.0-r1 index 8461320ee866..5880e18b734d 100644 --- a/metadata/md5-cache/net-analyzer/wireshark-1.10.0-r1 +++ b/metadata/md5-cache/net-analyzer/wireshark-1.10.0-r1 @@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( > REQUIRED_USE=ssl? ( crypt ) gtk? ( !qt4 ) SLOT=0/1.10.0 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.10.0.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=aaccdbc7d035dfd11b01d36f28a9cc99 diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.6.16 b/metadata/md5-cache/net-analyzer/wireshark-1.6.16 index 36b5e6ecc587..cf15d6593308 100644 --- a/metadata/md5-cache/net-analyzer/wireshark-1.6.16 +++ b/metadata/md5-cache/net-analyzer/wireshark-1.6.16 @@ -9,5 +9,5 @@ LICENSE=GPL-2 RDEPEND=>=dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( =dev-libs/glib-2.14:2 adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) caps REQUIRED_USE=ssl? ( crypt ) SLOT=0/1.8.8 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.8.8.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=48881370488272cca91504a270b4cf25 diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-1.8-r2 b/metadata/md5-cache/net-firewall/ipt_netflow-1.8-r2 new file mode 100644 index 000000000000..3359d43b94a2 --- /dev/null +++ b/metadata/md5-cache/net-firewall/ipt_netflow-1.8-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup +DEPEND=net-firewall/iptables virtual/linux-sources virtual/pkgconfig kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) +DESCRIPTION=Netflow iptables module +EAPI=5 +HOMEPAGE=http://sourceforge.net/projects/ipt-netflow +IUSE=pax_kernel kernel_linux +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=net-firewall/iptables kernel_linux? ( virtual/modutils ) +SLOT=0 +SRC_URI=mirror://sourceforge/ipt-netflow/ipt_netflow-1.8.tgz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 linux-mod c9d4931960ba253061ad823a8508bff5 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=08fe85f9ae223e4f8a6eb9f5bbdbd296 diff --git a/metadata/md5-cache/net-libs/libkfbapi-1.0 b/metadata/md5-cache/net-libs/libkfbapi-1.0 new file mode 100644 index 000000000000..b271a7c0d267 --- /dev/null +++ b/metadata/md5-cache/net-libs/libkfbapi-1.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack +DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] dev-libs/libxslt dev-libs/qjson >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] +DESCRIPTION=Library for accessing Facebook services based on KDE technology +EAPI=5 +HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libkfbapi +IUSE=debug linguas_ar linguas_be linguas_bs linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hi linguas_hu linguas_it linguas_ja linguas_kk linguas_km linguas_lt linguas_mai linguas_mr linguas_nb linguas_nds linguas_nl linguas_nn linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_TW aqua +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] dev-libs/libxslt dev-libs/qjson >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_ar? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_be? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_be(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hi? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hi(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_nn? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nn(+)] ) linguas_oc? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_oc(+)] ) linguas_pa? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_TW? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_TW(+)] ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] +SLOT=4 +SRC_URI=mirror://kde/stable/libkfbapi/1.0/src/libkfbapi-1.0.tar.bz2 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 2cedb58982ff5f6a497a00d05779530a kde4-functions 597dae8331dc9b795e3a5797bf7da048 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_md5_=314f830e66209a3e3c25f63bc8565f4e diff --git a/metadata/md5-cache/net-libs/libkfbapi-1.0_p20130209 b/metadata/md5-cache/net-libs/libkfbapi-1.0_p20130209 deleted file mode 100644 index 5e9dcf227d66..000000000000 --- a/metadata/md5-cache/net-libs/libkfbapi-1.0_p20130209 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack -DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] dev-libs/libxslt dev-libs/qjson >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] -DESCRIPTION=Library for accessing Facebook services based on KDE technology -EAPI=5 -HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libkfbapi -IUSE=debug aqua -KEYWORDS=~amd64 ~x86 -LICENSE=|| ( LGPL-2 LGPL-3 ) -RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=] dev-libs/libxslt dev-libs/qjson >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] -SLOT=4 -SRC_URI=http://dev.gentoo.org/~creffett/distfiles/libkfbapi-1.0_p20130209.tar.xz -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 2cedb58982ff5f6a497a00d05779530a kde4-functions 597dae8331dc9b795e3a5797bf7da048 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=8f79e89395574ae96e677e642b281186 diff --git a/metadata/md5-cache/net-misc/iputils-20121221-r1 b/metadata/md5-cache/net-misc/iputils-20121221-r1 index dc9d9286eaad..448412ca2b58 100644 --- a/metadata/md5-cache/net-misc/iputils-20121221-r1 +++ b/metadata/md5-cache/net-misc/iputils-20121221-r1 @@ -9,5 +9,5 @@ LICENSE=BSD RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) SLOT=0 SRC_URI=http://www.skbuff.net/iputils/iputils-s20121221.tar.bz2 mirror://gentoo/iputils-s20121221-manpages.tar.bz2 -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=ee9648b1fc69fbb5b2a0aafa4cf6af6c diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999 index 7bde558dafee..ec7bb089813e 100644 --- a/metadata/md5-cache/net-misc/iputils-99999999 +++ b/metadata/md5-cache/net-misc/iputils-99999999 @@ -7,5 +7,5 @@ IUSE=caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static +filecaps LICENSE=BSD RDEPEND=!net-misc/rarpd !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn ) ipv6? ( gnutls? ( net-libs/gnutls ) ssl? ( dev-libs/openssl:0 ) ) ) SLOT=0 -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=9a47d5b0d8dfcde37f2390b3ef13ffd9 diff --git a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10 b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10 index e07684d87242..07d23b56ab80 100644 --- a/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10 +++ b/metadata/md5-cache/net-misc/netkit-rsh-0.17-r10 @@ -9,5 +9,5 @@ LICENSE=BSD RDEPEND=>=sys-libs/ncurses-5.2 pam? ( >=sys-auth/pambase-20080219.1 ) SLOT=0 SRC_URI=ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-0.17.tar.gz mirror://gentoo/rexec-1.5.tar.gz mirror://gentoo/netkit-rsh-0.17-patches-3.tar.lzma -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 _md5_=d91a6bfd2f6103c7cf36a0481202ae30 diff --git a/metadata/md5-cache/net-misc/openssh-6.2_p2-r1 b/metadata/md5-cache/net-misc/openssh-6.2_p2-r1 new file mode 100644 index 000000000000..5b9280557eef --- /dev/null +++ b/metadata/md5-cache/net-misc/openssh-6.2_p2-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install postinst preinst prepare setup test +DEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( 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(+)] tcpd? ( >=sys-apps/tcp-wrappers-7.6[static-libs(+)] ) 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 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig +DESCRIPTION=Port of OpenBSD's free SSH release +EAPI=4 +HOMEPAGE=http://www.openssh.org/ +IUSE=bindist +hpn kerberos ldap ldns libedit pam selinux skey static tcpd X X509 +LICENSE=BSD GPL-2 +RDEPEND=!static? ( selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d:0[bindist=] dev-libs/openssl >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ldns? ( !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth ) +SLOT=0 +SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-6.2p2.tar.gz hpn? ( mirror://gentoo/openssh-6.2p2-hpn13v14.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-6.2p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.5/openssh-6.2p2+x509-7.5.diff.gz ) +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 systemd 3421a5715404244e4827acd1cf8ce654 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=6d05e3616ad7dbf4327179f08cb07f0e diff --git a/metadata/md5-cache/net-misc/youtube-dl-2013.06.34 b/metadata/md5-cache/net-misc/youtube-dl-2013.06.34 new file mode 100644 index 000000000000..06569b1228b3 --- /dev/null +++ b/metadata/md5-cache/net-misc/youtube-dl-2013.06.34 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare setup +DEPEND=test? ( dev-python/nose[coverage(+)] ) +DESCRIPTION=Download videos from YouTube.com (and mores sites...) +EAPI=5 +HOMEPAGE=http://rg3.github.com/youtube-dl/ +IUSE=offensive test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7 +KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris +LICENSE=public-domain +SLOT=0 +SRC_URI=http://youtube-dl.org/downloads/2013.06.34/youtube-dl-2013.06.34.tar.gz +_eclasses_=bash-completion-r1 5deec68e4713fd23ce30d4d9ed712908 eutils 63afaaed8aa819fdcb814c7cd39495a2 multilib 892e597faee02a5b94eb02ab512e7622 python-single-r1 7e219c03c7f3c029a5d1030f38aeafef python-utils-r1 9aa9cecaaf78644be7c0b8b8dc814dce toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=95eddc54266de4ad125fa9b7b1abbad4 diff --git a/metadata/md5-cache/net-print/cups-1.6.2-r3 b/metadata/md5-cache/net-print/cups-1.6.2-r3 deleted file mode 100644 index 6934d1f1d906..000000000000 --- a/metadata/md5-cache/net-print/cups-1.6.2-r3 +++ /dev/null @@ -1,16 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) kerberos? ( virtual/krb5 ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( net-dns/avahi ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) virtual/pkgconfig -DESCRIPTION=The Common Unix Printing System -EAPI=5 -HOMEPAGE=http://www.cups.org/ -IUSE=acl dbus debug +filters gnutls java kerberos lprng-compat pam python selinux +ssl static-libs +threads usb X xinetd zeroconf +linguas_ca +linguas_es +linguas_fr +linguas_ja +linguas_ru elibc_FreeBSD java -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd -LICENSE=GPL-2 -PDEPEND=app-text/ghostscript-gpl[cups] app-text/poppler[utils] >=net-print/cups-filters-1.0.30 filters? ( net-print/foomatic-filters ) -RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) kerberos? ( virtual/krb5 ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-cups ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( net-dns/avahi ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) -REQUIRED_USE=gnutls? ( ssl ) -RESTRICT=test -SLOT=0 -SRC_URI=mirror://easysw/cups/1.6.2/cups-1.6.2-source.tar.bz2 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic d900015de4e092f26d8c0a18b6bd60de gnome2-utils 794d2847b4af390a1e020924876c8297 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 52b7cfbf4f7225fcea7e7f18b6d83328 libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pam 5c1a9ef4892062f9ec25c8ef7c1f1e52 python dd56675d8e9f7e85d815a28c87383141 systemd 3421a5715404244e4827acd1cf8ce654 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=b3d59df203c50d993c1eb3fbc3f73d01 diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.30-r1 b/metadata/md5-cache/net-print/cups-filters-1.0.30-r1 deleted file mode 100644 index 93919f96b1c4..000000000000 --- a/metadata/md5-cache/net-print/cups-filters-1.0.30-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test unpack -DEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig -DESCRIPTION=Cups PDF filters -EAPI=5 -HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat -IUSE=jpeg perl png static-libs tiff zeroconf -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd -LICENSE=MIT GPL-2 -RDEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) -SLOT=0 -SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.30.tar.xz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 perl-module ba21eba2562fc2643deeea95fd28665d systemd 3421a5715404244e4827acd1cf8ce654 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=9c390d7eddc205f17a70e61a581d621a diff --git a/metadata/md5-cache/net-print/cups-filters-1.0.34 b/metadata/md5-cache/net-print/cups-filters-1.0.34 deleted file mode 100644 index ddbcf0824c28..000000000000 --- a/metadata/md5-cache/net-print/cups-filters-1.0.34 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare test unpack -DEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig -DESCRIPTION=Cups PDF filters -EAPI=5 -HOMEPAGE=http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat -IUSE=jpeg perl png static-libs tiff zeroconf -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd -LICENSE=MIT GPL-2 -RDEPEND=app-text/ghostscript-gpl app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] >=app-text/qpdf-3.0.2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >net-print/cups-1.5.9999 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib jpeg? ( virtual/jpeg ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff ) zeroconf? ( net-dns/avahi ) -SLOT=0 -SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.0.34.tar.xz -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 perl-module ba21eba2562fc2643deeea95fd28665d systemd 3421a5715404244e4827acd1cf8ce654 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=725d2f333d6aacc3bad03e8ab24a2bb9 diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-2013.06.1-r1 b/metadata/md5-cache/net-wireless/hackrf-tools-2013.06.1-r1 new file mode 100644 index 000000000000..013141de0ee5 --- /dev/null +++ b/metadata/md5-cache/net-wireless/hackrf-tools-2013.06.1-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test unpack +DEPEND=virtual/libusb:1 net-libs/libhackrf:= sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig +DESCRIPTION=library for communicating with HackRF SDR platform +EAPI=5 +HOMEPAGE=http://greatscottgadgets.com/hackrf/ +KEYWORDS=~amd64 ~arm ~ppc ~x86 +LICENSE=BSD +RDEPEND=virtual/libusb:1 net-libs/libhackrf:= +SLOT=0 +SRC_URI=mirror://sourceforge/hackrf/hackrf-2013.06.1.tar.xz +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=547dc8796ab121d607950e636b8b75a0 diff --git a/metadata/md5-cache/net-wireless/hackrf-tools-9999 b/metadata/md5-cache/net-wireless/hackrf-tools-9999 index e28c17c0fb7f..517b274d474f 100644 --- a/metadata/md5-cache/net-wireless/hackrf-tools-9999 +++ b/metadata/md5-cache/net-wireless/hackrf-tools-9999 @@ -1,10 +1,10 @@ DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=virtual/libusb:1 net-libs/libhackrf:= sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-vcs/git +DEPEND=virtual/libusb:1 net-libs/libhackrf:= sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) virtual/pkgconfig dev-vcs/git DESCRIPTION=library for communicating with HackRF SDR platform EAPI=5 HOMEPAGE=http://greatscottgadgets.com/hackrf/ LICENSE=BSD RDEPEND=virtual/libusb:1 net-libs/libhackrf:= SLOT=0 -_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=21de963fc280f71fc022907257da9f2e +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 66012c9c0ee3c91534d0eb257ff9b95c eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de git-2 e92e09651292b1bef5656592364550f7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=dfe2b01bb213008253f27e602696022d diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.5.0-r1 b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.0-r1 new file mode 100644 index 000000000000..b65019bda34c --- /dev/null +++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.5.0-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare unpack +DEPEND=virtual/libusb:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig +DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver +EAPI=5 +HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr +KEYWORDS=~amd64 ~arm ~x86 +LICENSE=GPL-2 +RDEPEND=virtual/libusb:1 +SLOT=0 +SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/rtl-sdr-0.5.0.tar.xz +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de +_md5_=bff99ac1e68ed54a9d7de6ca190d5332 diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999 index 83b9edbf439c..fc4aa3ff4a66 100644 --- a/metadata/md5-cache/net-wireless/rtl-sdr-9999 +++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999 @@ -1,10 +1,10 @@ -DEFINED_PHASES=postinst prepare unpack -DEPEND=virtual/libusb:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DEFINED_PHASES=install prepare unpack +DEPEND=virtual/libusb:1 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig dev-vcs/git DESCRIPTION=turns your Realtek RTL2832 based DVB dongle into a SDR receiver EAPI=5 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/rtl-sdr LICENSE=GPL-2 RDEPEND=virtual/libusb:1 SLOT=0 -_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 git-2 e92e09651292b1bef5656592364550f7 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=d35eacfd4b1b65fdf7e12317412d7fda +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 git-2 e92e09651292b1bef5656592364550f7 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f udev a9a8d051efb42bfe884c1db82ce161de +_md5_=6347bdc6954176a06ba05f6da0fc73d7 diff --git a/metadata/md5-cache/sci-electronics/xoscope-2.0 b/metadata/md5-cache/sci-electronics/xoscope-2.0 index 2d763450ca19..b208f092140e 100644 --- a/metadata/md5-cache/sci-electronics/xoscope-2.0 +++ b/metadata/md5-cache/sci-electronics/xoscope-2.0 @@ -1,7 +1,7 @@ DEFINED_PHASES=compile prepare setup DEPEND=x11-libs/gtkdatabox virtual/man virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool DESCRIPTION=Soundcard Oscilloscope for X -EAPI=4 +EAPI=5 HOMEPAGE=http://xoscope.sourceforge.net KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 @@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtkdatabox virtual/man SLOT=0 SRC_URI=mirror://sourceforge/xoscope/xoscope-2.0.tgz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=dd63314b899472a5a0e2d34fbe42f00f +_md5_=36efa4c678da758124877590bac38cd2 diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.3-r1 b/metadata/md5-cache/sci-libs/fftw-3.3.3-r1 index 1d0bae3c571c..02a5d07293a4 100644 --- a/metadata/md5-cache/sci-libs/fftw-3.3.3-r1 +++ b/metadata/md5-cache/sci-libs/fftw-3.3.3-r1 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test -DEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) test? ( dev-lang/perl ) fortran? ( virtual/fortran ) +DEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) test? ( dev-lang/perl ) fortran? ( virtual/fortran ) DESCRIPTION=Fast C library for the Discrete Fourier Transform EAPI=5 HOMEPAGE=http://www.fftw.org/ IUSE=altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos LICENSE=GPL-2 -RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) fortran? ( virtual/fortran ) +RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) fortran? ( virtual/fortran ) REQUIRED_USE=amd64? ( abi_x86_32? ( !mpi !quad ) ) SLOT=3.0 SRC_URI=http://www.fftw.org/fftw-3.3.3.tar.gz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de fortran-2 ea80967500d9deda5468aed13b0bfca8 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=5f984476762684f308eb9e56471c004f +_md5_=4b6807602c6d335d9f4ced4f3dbba6d6 diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.3-r2 b/metadata/md5-cache/sci-libs/fftw-3.3.3-r2 index efebba8ec4fc..41f1962b75ef 100644 --- a/metadata/md5-cache/sci-libs/fftw-3.3.3-r2 +++ b/metadata/md5-cache/sci-libs/fftw-3.3.3-r2 @@ -1,14 +1,14 @@ DEFINED_PHASES=compile configure install prepare setup test -DEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) test? ( dev-lang/perl ) fortran? ( virtual/fortran ) +DEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) test? ( dev-lang/perl ) fortran? ( virtual/fortran ) DESCRIPTION=Fast C library for the Discrete Fourier Transform EAPI=5 HOMEPAGE=http://www.fftw.org/ IUSE=altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos LICENSE=GPL-2 -RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) fortran? ( virtual/fortran ) +RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) fortran? ( virtual/fortran ) REQUIRED_USE=amd64? ( abi_x86_32? ( !mpi !quad ) ) SLOT=3.0 SRC_URI=http://www.fftw.org/fftw-3.3.3.tar.gz _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de fortran-2 ea80967500d9deda5468aed13b0bfca8 libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=e114af055e1080861f0c24061c7bd5a1 +_md5_=f88bf1f3aae2a3e235d0b43d6dc46661 diff --git a/metadata/md5-cache/sci-physics/lammps-20130526 b/metadata/md5-cache/sci-physics/lammps-20130526 new file mode 100644 index 000000000000..69d4f1d8a582 --- /dev/null +++ b/metadata/md5-cache/sci-physics/lammps-20130526 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install setup +DEPEND=mpi? ( virtual/mpi ) package-meam? ( virtual/fortran ) +DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator +EAPI=5 +HOMEPAGE=http://lammps.sandia.gov/ +IUSE=doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid +KEYWORDS=~amd64 +LICENSE=GPL-2 +RDEPEND=mpi? ( virtual/mpi ) package-meam? ( virtual/fortran ) +SLOT=0 +SRC_URI=http://lammps.sandia.gov/tars/lammps-26May13.tar.gz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fortran-2 ea80967500d9deda5468aed13b0bfca8 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=23d3f9e9b3d85383020e78d3c174976a diff --git a/metadata/md5-cache/sys-apps/findutils-4.5.11 b/metadata/md5-cache/sys-apps/findutils-4.5.11 index 23c36de25972..3dc196a5925f 100644 --- a/metadata/md5-cache/sys-apps/findutils-4.5.11 +++ b/metadata/md5-cache/sys-apps/findutils-4.5.11 @@ -10,4 +10,4 @@ RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) SLOT=0 SRC_URI=mirror://gnu-alpha/findutils/findutils-4.5.11.tar.gz _eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=d6c32332f8f4b4f5d77c8ad9f834c4c1 +_md5_=03e9d476d93f880af7c7bf989015f8a5 diff --git a/metadata/md5-cache/sys-cluster/charm-6.5.0 b/metadata/md5-cache/sys-cluster/charm-6.5.0 new file mode 100644 index 000000000000..a961718a8584 --- /dev/null +++ b/metadata/md5-cache/sys-cluster/charm-6.5.0 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst prepare setup test +DEPEND=mpi? ( virtual/mpi ) doc? ( >=app-text/poppler-0.12.3-r3[utils] dev-tex/latex2html virtual/tex-base ) virtual/fortran +DESCRIPTION=Message-passing parallel language and runtime system +EAPI=5 +HOMEPAGE=http://charm.cs.uiuc.edu/ +IUSE=charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp +KEYWORDS=~amd64 ~x86 +LICENSE=charm +RDEPEND=mpi? ( virtual/mpi ) virtual/fortran +REQUIRED_USE=cmkopt? ( !charmdebug !charmtracing ) charmproduction? ( !charmdebug !charmtracing ) +SLOT=0 +SRC_URI=http://charm.cs.uiuc.edu/distrib/charm-6.5.0.tar.gz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de fortran-2 ea80967500d9deda5468aed13b0bfca8 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=b24c257e4a843f8aec3576df0e180f67 diff --git a/metadata/md5-cache/sys-libs/glibc-2.17 b/metadata/md5-cache/sys-libs/glibc-2.17 index 2d734abfb5f0..7695ee320e21 100644 --- a/metadata/md5-cache/sys-libs/glibc-2.17 +++ b/metadata/md5-cache/sys-libs/glibc-2.17 @@ -3,11 +3,11 @@ DEPEND=>=app-misc/pax-utils-0.1.10 !=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:stable RESTRICT=bindist mirror strip SLOT=unstable -SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1541.2-r207000_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1541.2-r207000_i386.deb ) +SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1547.0-r208345_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1547.0-r208345_i386.deb ) _eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils 63afaaed8aa819fdcb814c7cd39495a2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 pax-utils 2424f959506320f5196de8f79fa05297 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f unpacker 658a981a81fd7cb0767315a541bab01d user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=88f7212297892b3abf283d9b54726e5b +_md5_=cc6f55665d0f1b74015b333758adf935 diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345 similarity index 78% rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000 rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345 index 4be654001d60..d0ae5a137ae4 100644 --- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000 +++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345 @@ -8,6 +8,6 @@ LICENSE=google-chrome RDEPEND=www-client/chromium !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable RESTRICT=bindist mirror strip SLOT=unstable -SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1541.2-r207000_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1541.2-r207000_i386.deb ) +SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1547.0-r208345_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_29.0.1547.0-r208345_i386.deb ) _eclasses_=multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f unpacker 658a981a81fd7cb0767315a541bab01d -_md5_=cdaa0e7730f8993ba05e0df3d40caeca +_md5_=d00d1f6ffb69c3dee13adfe17060110b diff --git a/metadata/md5-cache/x11-drivers/radeon-ucode-20130626 b/metadata/md5-cache/x11-drivers/radeon-ucode-20130626 new file mode 100644 index 000000000000..791925eec02a --- /dev/null +++ b/metadata/md5-cache/x11-drivers/radeon-ucode-20130626 @@ -0,0 +1,11 @@ +DEFINED_PHASES=install postinst setup +DESCRIPTION=IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs +EAPI=5 +HOMEPAGE=http://people.freedesktop.org/~agd5f/radeon_ucode/ +KEYWORDS=~amd64 ~x86 +LICENSE=radeon-ucode +RDEPEND=!sys-kernel/linux-firmware[-savedconfig] +SLOT=0 +SRC_URI=mirror://gentoo/radeon-ucode-20130626.tar.xz +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 linux-info dd8fdcccc30f117673b4cba4ed4f74a7 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=40d0a27dc028ea4ca6f9f34a60949ec7 diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.1.901 b/metadata/md5-cache/x11-libs/libXi-1.7.1.901 new file mode 100644 index 000000000000..a954f3f3794b --- /dev/null +++ b/metadata/md5-cache/x11-libs/libXi-1.7.1.901 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXfixes-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.17 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) +DESCRIPTION=X.Org Xi library +EAPI=5 +HOMEPAGE=http://xorg.freedesktop.org/ +IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 static-libs doc +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=MIT +RDEPEND=>=x11-libs/libX11-1.4.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXext-1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-libs/libXfixes-5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/inputproto-2.2.99.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xproto-7.0.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] >=x11-proto/xextproto-7.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-xlibs-20130224 ) +SLOT=0 +SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.1.901.tar.bz2 +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 autotools-multilib a8b79e56608d2732028fc442ab15ffa2 autotools-utils 40663e8518211ef0f236bd75da8cf0c1 eutils 63afaaed8aa819fdcb814c7cd39495a2 flag-o-matic d900015de4e092f26d8c0a18b6bd60de libtool b1c8688e60f9580bcb9bb46e08737eb1 multibuild c2f33b0eedd7bcfd5bc226baa8da7837 multilib 892e597faee02a5b94eb02ab512e7622 multilib-build 2f24bbf5311ec79274331abba1a6fbd6 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 xorg-2 647bf09b251366e5d15095e1c7a7dda4 +_md5_=b34d60c9bce6de6a5eef38f88409c6e3 diff --git a/metadata/md5-cache/x11-libs/libva-1.0.15 b/metadata/md5-cache/x11-libs/libva-1.0.15 index 38c76c29e1c7..ea24299e7ba0 100644 --- a/metadata/md5-cache/x11-libs/libva-1.0.15 +++ b/metadata/md5-cache/x11-libs/libva-1.0.15 @@ -3,12 +3,12 @@ DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=3 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=opengl video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=opengl vdpau video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux LICENSE=MIT -PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( x11-libs/libva-intel-driver ) +PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( x11-libs/libva-intel-driver ) RDEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) SLOT=0 SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.15.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=ba137c8ae7da86b47f6e76cee4a4f82a +_md5_=fbd929fab7637f8f2783e6f7eeaff0c1 diff --git a/metadata/md5-cache/x11-libs/libva-1.0.16 b/metadata/md5-cache/x11-libs/libva-1.0.16 index 9f0b21c34874..ba2b606b2fe4 100644 --- a/metadata/md5-cache/x11-libs/libva-1.0.16 +++ b/metadata/md5-cache/x11-libs/libva-1.0.16 @@ -3,12 +3,12 @@ DEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=3 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=opengl video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=opengl vdpau video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=MIT -PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) +PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) RDEPEND=>=x11-libs/libdrm-2.4 video_cards_dummy? ( virtual/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) SLOT=0 SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.16.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=8a9969c5e91281b9676e3557d7deb13e +_md5_=96db61624a2b915aa16fa1e9fa9675a5 diff --git a/metadata/md5-cache/x11-libs/libva-1.1.0 b/metadata/md5-cache/x11-libs/libva-1.1.0 index 5f6271f13a0b..5f4db127c21d 100644 --- a/metadata/md5-cache/x11-libs/libva-1.1.0 +++ b/metadata/md5-cache/x11-libs/libva-1.1.0 @@ -3,13 +3,13 @@ DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libX DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=4 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=MIT -PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) +PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-0.95.0 ) REQUIRED_USE=opengl? ( X ) SLOT=0 SRC_URI=http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.1.0.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 eutils 63afaaed8aa819fdcb814c7cd39495a2 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=a1597ab591a26b46bcd53c56b2e1a3d0 +_md5_=85892429ba68c57a80190b1a0aef57b4 diff --git a/metadata/md5-cache/x11-libs/libva-1.1.1 b/metadata/md5-cache/x11-libs/libva-1.1.1 index 02dec28ade4e..a9fa441ff536 100644 --- a/metadata/md5-cache/x11-libs/libva-1.1.1 +++ b/metadata/md5-cache/x11-libs/libva-1.1.1 @@ -3,13 +3,13 @@ DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libX DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=4 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=+drm egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=MIT -PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) +PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) REQUIRED_USE=opengl? ( X ) SLOT=0 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.1.1.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=4529816fdafda037280678fb099e337e +_md5_=ba73f4f757228029a5c9519f98226e7e diff --git a/metadata/md5-cache/x11-libs/libva-1.2.0 b/metadata/md5-cache/x11-libs/libva-1.2.0 index 3e5ffcd46abe..28cda7bce2f6 100644 --- a/metadata/md5-cache/x11-libs/libva-1.2.0 +++ b/metadata/md5-cache/x11-libs/libva-1.2.0 @@ -3,13 +3,13 @@ DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libX DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=4 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=+drm egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=MIT -PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) +PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) REQUIRED_USE=opengl? ( X ) SLOT=0 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.2.0.tar.bz2 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=a38222f90ab32eb1bb59f7d4a7d81911 +_md5_=b5771c15c2f3457dfae88a32deab3d9b diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999 index beccda512855..013372d38007 100644 --- a/metadata/md5-cache/x11-libs/libva-9999 +++ b/metadata/md5-cache/x11-libs/libva-9999 @@ -3,11 +3,11 @@ DEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libX DESCRIPTION=Video Acceleration (VA) API for Linux EAPI=4 HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -IUSE=+drm egl opengl wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx +IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx LICENSE=MIT -PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) +PDEPEND=video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) RDEPEND=>=x11-libs/libdrm-2.4 X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) egl? ( media-libs/mesa[egl] ) opengl? ( virtual/opengl ) wayland? ( >=dev-libs/wayland-1 ) REQUIRED_USE=opengl? ( X ) SLOT=0 _eclasses_=autotools 16761a2f972abd686713e5967ff3c754 git-2 e92e09651292b1bef5656592364550f7 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f -_md5_=6c7eabd9bbd0374f9104c50a18cee17b +_md5_=90e4442da631642c2ac308eaefd3d785 diff --git a/metadata/md5-cache/x11-misc/i3status-2.6 b/metadata/md5-cache/x11-misc/i3status-2.6 index 0772df0b4c00..b27034496821 100644 --- a/metadata/md5-cache/x11-misc/i3status-2.6 +++ b/metadata/md5-cache/x11-misc/i3status-2.6 @@ -9,5 +9,5 @@ LICENSE=BSD RDEPEND=dev-libs/confuse >=dev-libs/yajl-2.0.2 media-libs/alsa-lib net-wireless/wireless-tools SLOT=0 SRC_URI=http://i3wm.org/i3status/i3status-2.6.tar.bz2 -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=f8c68c7af1a42d720ae107c0a636b865 diff --git a/metadata/md5-cache/x11-misc/i3status-2.7 b/metadata/md5-cache/x11-misc/i3status-2.7 index b164d9e46499..f0adba2ed169 100644 --- a/metadata/md5-cache/x11-misc/i3status-2.7 +++ b/metadata/md5-cache/x11-misc/i3status-2.7 @@ -9,5 +9,5 @@ LICENSE=BSD RDEPEND=dev-libs/confuse >=dev-libs/yajl-2.0.2 media-libs/alsa-lib net-wireless/wireless-tools SLOT=0 SRC_URI=http://i3wm.org/i3status/i3status-2.7.tar.bz2 -_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 310b84a3fee3bb17f91526bf6f6206f3 multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_eclasses_=eutils 63afaaed8aa819fdcb814c7cd39495a2 fcaps 832d0c7d930e7df835c19b5d0a5f6f4b multilib 892e597faee02a5b94eb02ab512e7622 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 _md5_=95fbf65cfd0a0d9f1e4f98d3919b8fcf diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.15 b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.15 new file mode 100644 index 000000000000..fcdd2fc74772 --- /dev/null +++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.15 @@ -0,0 +1,12 @@ +DEFINED_PHASES=- +DEPEND=dev-libs/libxslt sys-devel/gettext +DESCRIPTION=A tool to help manage 'well known' user directories +EAPI=5 +HOMEPAGE=http://www.freedesktop.org/wiki/Software/xdg-user-dirs +IUSE=gtk +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris +LICENSE=GPL-2 +PDEPEND=gtk? ( x11-misc/xdg-user-dirs-gtk ) +SLOT=0 +SRC_URI=http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.15.tar.gz +_md5_=207a27aa56d067800a6b6c70938c0402 diff --git a/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.0 b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.0 new file mode 100644 index 000000000000..a6ff3150673a --- /dev/null +++ b/metadata/md5-cache/xfce-extra/xfce4-equake-plugin-1.3.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack +DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfcegui4-4.10 >=xfce-base/xfce4-panel-4.10 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 +DESCRIPTION=Panel plug-in that displays information about earthquakes at regular intervals +EAPI=5 +HOMEPAGE=http://www.e-quake.org/ +IUSE=debug +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3 +RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libX11 >=xfce-base/libxfce4util-4.10 >=xfce-base/libxfcegui4-4.10 >=xfce-base/xfce4-panel-4.10 +SLOT=0 +SRC_URI=http://www.e-quake.org/wp-uploads/2013/06/xfce4-equake-plugin-1.3.0.tar.gz +_eclasses_=autotools 16761a2f972abd686713e5967ff3c754 base ec46b36a6f6fd1d0b505a33e0b74e413 eutils 63afaaed8aa819fdcb814c7cd39495a2 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 libtool b1c8688e60f9580bcb9bb46e08737eb1 multilib 892e597faee02a5b94eb02ab512e7622 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 7ffd28a8c7eea27218865352bfd3ab2f user d0a4d0735a6c0183d707ca919bd72f28 xfconf ba58c6f43e7fdfc116752aa58b488d83 +_md5_=30d6f8e4aa2b9ed11845a6912dab04a2 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index ac6373119b03..859429412a40 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Wed, 26 Jun 2013 19:37:10 +0000 +Thu, 27 Jun 2013 14:36:58 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 518734db5a57..1c1fc0c6296c 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Wed Jun 26 19:37:08 UTC 2013 +Thu Jun 27 14:36:56 UTC 2013 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index a5c4dda6ee1f..0f41b7763943 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Wed, 26 Jun 2013 20:00:01 +0000 +Thu, 27 Jun 2013 15:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 6737807cd993..102afe587f23 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1372275301 Wed Jun 26 19:35:01 2013 UTC +1372343701 Thu Jun 27 14:35:01 2013 UTC diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest new file mode 100644 index 000000000000..b23677c16e91 --- /dev/null +++ b/net-analyzer/multimon-ng/Manifest @@ -0,0 +1 @@ +DIST multimon-ng-1.0.0.tar.gz 67095 SHA256 521bad293288c0c7c0c1934a36d54c6ea87f0557b197920ff32a2782627e132b SHA512 0fa475c7908bc24a9558c5a7e0aa4737fca117ff323a012b4316ad02840eb97f917a02d1daec50645729c2ca834068467ddc409cbc36af9cd5ffb9e8f6e5e3e9 WHIRLPOOL bb560c0329e61b171e8110f5fd13fde0273b64f2b44e40d5785ee163a604719845a3b38a190399187d31ebab08206c327b906aa073529aa8afc11176d46c1be7 diff --git a/net-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml new file mode 100644 index 000000000000..044f12194316 --- /dev/null +++ b/net-analyzer/multimon-ng/metadata.xml @@ -0,0 +1,12 @@ + + + + +zerochaos@gentoo.org +Rick Farina + +radio + + + + diff --git a/net-analyzer/multimon-ng/multimon-ng-1.0.0.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.0.0.ebuild new file mode 100644 index 000000000000..54bf7ef34b6d --- /dev/null +++ b/net-analyzer/multimon-ng/multimon-ng-1.0.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/multimon-ng/multimon-ng-1.0.0.ebuild,v 1.1 2013/06/26 23:59:41 zerochaos Exp $ + +EAPI=5 + +inherit qt4-r2 + +DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" +HOMEPAGE="https://github.com/EliasOenal/multimonNG" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git" + KEYWORDS="" +else + SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND="media-sound/pulseaudio + x11-libs/libX11" +RDEPEND="${DEPEND}" + +src_install() { + dobin ${PN} +} diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild new file mode 100644 index 000000000000..e5652d65a581 --- /dev/null +++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/multimon-ng/multimon-ng-9999.ebuild,v 1.1 2013/06/26 23:59:41 zerochaos Exp $ + +EAPI=5 + +inherit qt4-r2 + +DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" +HOMEPAGE="https://github.com/EliasOenal/multimonNG" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git" + KEYWORDS="" +else + SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +DEPEND="media-sound/pulseaudio + x11-libs/libX11" +RDEPEND="${DEPEND}" + +src_install() { + dobin ${PN} +} diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch new file mode 100644 index 000000000000..792b68279d0f --- /dev/null +++ b/net-firewall/ipt_netflow/files/ipt_netflow-1.8-pax-const.patch @@ -0,0 +1,57 @@ +Patch by Jeremy Drake, https://bugs.gentoo.org/show_bug.cgi?id=466430 + +Adds support for building with PaX hardened kernel + +--- ipt_NETFLOW.c.orig 2013-06-26 23:02:17.000000000 +0400 ++++ ipt_NETFLOW.c 2013-06-26 23:04:52.000000000 +0400 +@@ -371,14 +371,13 @@ + static int hsize_procctl(ctl_table *ctl, int write, BEFORE2632(struct file *filp,) + void __user *buffer, size_t *lenp, loff_t *fpos) + { +- void *orig = ctl->data; ++ ctl_table_no_const lctl = *ctl; + int ret, hsize; + + if (write) +- ctl->data = &hsize; +- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos); ++ lctl.data = &hsize; ++ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos); + if (write) { +- ctl->data = orig; + if (hsize < 1) + return -EPERM; + return set_hashsize(hsize)?:ret; +@@ -391,6 +390,7 @@ + { + int ret; + struct ipt_netflow_sock *usock; ++ ctl_table_no_const lctl = *ctl; + + read_lock(&sock_lock); + if (list_empty(&usock_list)) { +@@ -401,8 +401,8 @@ + sndbuf = usock->sock->sk->sk_sndbuf; + read_unlock(&sock_lock); + +- ctl->data = &sndbuf; +- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos); ++ lctl.data = &sndbuf; ++ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos); + if (!write) + return ret; + if (sndbuf < SOCK_MIN_SNDBUF) +@@ -451,10 +451,11 @@ + { + int ret; + int val; ++ ctl_table_no_const lctl = *ctl; + + val = 0; +- ctl->data = &val; +- ret = proc_dointvec(ctl, write, BEFORE2632(filp,) buffer, lenp, fpos); ++ lctl.data = &val; ++ ret = proc_dointvec(&lctl, write, BEFORE2632(filp,) buffer, lenp, fpos); + + if (!write) + return ret; diff --git a/net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild b/net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild new file mode 100644 index 000000000000..ec68ef03317d --- /dev/null +++ b/net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipt_netflow/ipt_netflow-1.8-r2.ebuild,v 1.1 2013/06/27 03:52:41 pinkbyte Exp $ + +EAPI="5" + +inherit eutils linux-info linux-mod multilib toolchain-funcs + +DESCRIPTION="Netflow iptables module" +HOMEPAGE="http://sourceforge.net/projects/ipt-netflow" +SRC_URI="mirror://sourceforge/ipt-netflow/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="pax_kernel" + +RDEPEND="net-firewall/iptables" +DEPEND="${RDEPEND} + virtual/linux-sources + virtual/pkgconfig" + +BUILD_TARGETS="all" +CONFIG_CHECK="~IP_NF_IPTABLES" +MODULE_NAMES="ipt_NETFLOW(ipt_netflow:${S})" + +IPT_LIB="/usr/$(get_libdir)/xtables" + +src_prepare() { + sed -i -e 's:-I$(KDIR)/include::' \ + -e 's:gcc -O2:$(CC) $(CFLAGS) $(LDFLAGS):' \ + -e 's:gcc:$(CC) $(CFLAGS) $(LDFLAGS):' Makefile.in || die 'sed on Makefile.in failed' + sed -i -e '/IPT_NETFLOW_VERSION/s/1.7.2/1.8/' ipt_NETFLOW.c || die 'sed on ipt_NETFLOW.c failed' + + # bug #455984 + epatch "${FILESDIR}"/${PN}-1.8-configure.patch + + # bug #466430 + if use pax_kernel; then + epatch "${FILESDIR}"/${PN}-1.8-pax-const.patch + fi + + epatch_user +} + +src_configure() { + local IPT_VERSION="$($(tc-getPKG_CONFIG) --modversion xtables)" + # econf can not be used, cause configure script fails when see unknown parameter + # ipt-src need to be defined, see bug #455984 + ./configure \ + --ipt-lib="${IPT_LIB}" \ + --ipt-src="/usr/" \ + --ipt-ver="${IPT_VERSION}" \ + --kdir="${KV_DIR}" \ + --kver="${KV_FULL}" \ + || die 'configure failed' +} + +src_compile() { + local ARCH="$(tc-arch-kernel)" + emake CC="$(tc-getCC)" all +} + +src_install() { + linux-mod_src_install + exeinto "${IPT_LIB}" + doexe libipt_NETFLOW.so + doheader ipt_NETFLOW.h + dodoc README* +} diff --git a/net-firewall/ipt_netflow/metadata.xml b/net-firewall/ipt_netflow/metadata.xml index 7b47a3a9c4a9..a15e0edcfcfd 100644 --- a/net-firewall/ipt_netflow/metadata.xml +++ b/net-firewall/ipt_netflow/metadata.xml @@ -6,4 +6,7 @@ pinkbyte@gentoo.org Sergey Popov + + Apply patch needed for pax enabled kernels + diff --git a/net-libs/libkfbapi/Manifest b/net-libs/libkfbapi/Manifest index 41b759c295cc..39641b6251d3 100644 --- a/net-libs/libkfbapi/Manifest +++ b/net-libs/libkfbapi/Manifest @@ -1 +1 @@ -DIST libkfbapi-1.0_p20130209.tar.xz 26132 SHA256 8e69f3e2cb034b16f0822cb404a14dda0549ca1a8c6fd2aafa9237ee9fdf8b19 SHA512 62b1cce524bfcc9c77ff9e0aa2d2c03edd120aec1d77cc06c94c68b13bc230e1d81bb98648b657d305f90ee5585e4240dd0593ab7adbb2b3233a2baf55966193 WHIRLPOOL c2debedac69a4c2afa7dca053b18ab41d43c210e0fffdee5f52de5c6062b6e5931c1c1dec6b18d8e4f06773e0dd0ba347815c9ed009c838910bff34fecf791ac +DIST libkfbapi-1.0.tar.bz2 53930 SHA256 6edd25730367d3969910481a5b9021c6ed4eff8e4c92ac5b60a9035121008ebc SHA512 d9587752008aeecd061e27fa1415920b938cc71d117d59673ea9f0fe985be68fdf682ed9caf5caf8528b9486ad44d832b06e59c545a349aad1416f49df7d6a85 WHIRLPOOL b7387934425034c97a96be7156583daf3cde44d2cbad79ca9f0be267038980bf7917d375e79fba696cdd6a7a71937b1915aad7ccbbdf00524c1c336a760199f0 diff --git a/net-libs/libkfbapi/libkfbapi-1.0_p20130209.ebuild b/net-libs/libkfbapi/libkfbapi-1.0.ebuild similarity index 64% rename from net-libs/libkfbapi/libkfbapi-1.0_p20130209.ebuild rename to net-libs/libkfbapi/libkfbapi-1.0.ebuild index 9e0675fc6d4a..631e8aeb9d79 100644 --- a/net-libs/libkfbapi/libkfbapi-1.0_p20130209.ebuild +++ b/net-libs/libkfbapi/libkfbapi-1.0.ebuild @@ -1,16 +1,18 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libkfbapi/libkfbapi-1.0_p20130209.ebuild,v 1.1 2013/05/12 16:43:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libkfbapi/libkfbapi-1.0.ebuild,v 1.1 2013/06/26 20:35:31 johu Exp $ EAPI=5 +KDE_LINGUAS="ar be bs cs da de el en_GB eo es et fi fr ga gl hi hu it ja kk km +lt mai mr nb nds nl nn oc pa pl pt pt_BR ro ru sk sl sv tr ug uk zh_TW" inherit kde4-base DESCRIPTION="Library for accessing Facebook services based on KDE technology" -SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz" HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkfbapi" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" -LICENSE="|| ( LGPL-2 LGPL-3 )" +LICENSE="GPL-2" SLOT="4" KEYWORDS="~amd64 ~x86" IUSE="debug" diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest index 25005be278bd..8c730a56cfee 100644 --- a/net-misc/openssh/Manifest +++ b/net-misc/openssh/Manifest @@ -9,7 +9,9 @@ DIST openssh-6.1p1+x509-7.2.1.diff.gz 208071 SHA256 02d3703d419fc72be819a4e7fc8c DIST openssh-6.1p1-hpn13v11.diff.bz2 19999 SHA256 08bfc1f3c582f23b3ce386e78baf37be4af03645fc6eef87f1ef819cc273ecc7 SHA512 4e21384ef4d0b7539c9b7aecb158748b959db7ec84fa023f7969c2db50794e1f68bab375cdea9c2ae8fe16b759650e250aa21d6b8772a1c671d2e1e59adef08a WHIRLPOOL 3918c2c118908e67de4523c8d1f142ca4b2d2d7c045c2337b2f7914096108cf1a138009a838519d292e53fec454ced3a9590bbddf93096bd377196bd7d73ed55 DIST openssh-6.1p1.tar.gz 1134820 SHA256 d1c157f6c0852e90c191cc7c9018a583b51e3db4035489cb262639d337a1c411 SHA512 1cd58f18b047fa92a3155fa215d69c04e1f03914488a21bcda5434899df6055567e59f77063f0080b0cb437bb2396d3bf4050ed0c5ea2d1dc20d6fd928d5a76c WHIRLPOOL a1ecf33e8c4048c59e55d38cc8bb3f89357ac8fb74fdbb57e24e111e1749620fe6f7e329a744e3cfc9ced3e445539ce85926c7877a0f12475ccf14f124f9234b DIST openssh-6.2p2+x509-7.5.diff.gz 218099 SHA256 bde2471a22f3ddee86a2c176fe30321b73d68a0097aaaa554f59c96fc58e9019 SHA512 a48c4b3563de94b5ce86b8f6b5c0bf7ee5f4ab43e917fd37fdbe75aa21901073dfa4e96f158449d7ea47916d70cface8215f369f5fe3c700008d2c72d91afdc6 WHIRLPOOL 2acc67c150657cda93c4a982f35a7ed88a5e268e9b980e3f9e9aee8333899f88cc63a24e3a463dd3d2c95d35a5d3a8f8fdad087ae2f16b295c42a566524554b2 +DIST openssh-6.2p2-hpn13v14.diff.bz2 17773 SHA256 d8d2d91dd7752717f496550e861895c5a7781624bab22860f189ebd5fd002efe SHA512 8ed3054dce6587db783154f5e6d9d161b2127ddd78c0df0c6dc97ca95bef52b5b079b4bdb2a9408716145db0120e75e561cb4c0582aefb22a789ba7f77eb32e7 WHIRLPOOL 51cac43e488304b159064caa5e1f9da900217bdfa8688129916e3f404d1dc5b9d7ffe1b060b7f9c5d5f55a04163de1dda810246109dbccb65b20fd053b5825d4 DIST openssh-6.2p2.tar.gz 1182922 SHA256 7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b SHA512 80c8fb6bb25e86e8261cc7c6671773cdc0d9b0da9c9ebca33b3d5278c44197734fe32e878e1f444b693c4b49b0a525458aa07e57c231cefafc23a9c6975b05df WHIRLPOOL 84cca243e84548cf0cf1880e89c8d41745cde9c58fb7c153a5f0e1670bc6e251b385e44e5d05f9f2043044f81fc2904484320ab24ef142aadd5f696ee7880855 DIST openssh-lpk-5.9p1-0.3.14.patch.gz 18335 SHA256 1a922d57a2e7020bf597135437a57080d7d046c9f41a7a53559945ddddbe0892 SHA512 eb4641d30e221eaa409d22ab423e38c1a31dd9dfeacbf978c94827194cb838cc0f832bf96aa4c494a71a5d5d1b90fc6789e8469e35d82ffcaf54305f07ccdb9b WHIRLPOOL 6748426d6d0cda07729744d8993d96a762134a61acf757afc1618ada5cbd9752d9211a89be831e5a4f1744f70cc4fc643b5f745d1f785b53a4e1dbf9d7c92680 DIST openssh-lpk-6.0p1-0.3.14.patch.gz 18401 SHA256 d0f3d55fd92ecc45aa6120d6ea919c903e4828ce0c2b07612c742a2aa7648beb SHA512 ebf680b90bc289c0d69c22fd6fd666032cdcf4c3850ecdf03e264200d60c50a12f4a5254907c6ab850727216e7837176be5564ae22b68d9b80a67c62f372a9dd WHIRLPOOL 4f8b32c77fc2a9205d283109ccd787a3f37757c18060da39c63147ff09f6b922f4a57ca1ba8d0cdc692f3f1eaba3e5e88eb4287f728ddaaf544d2d425c0cca91 DIST openssh-lpk-6.1p1-0.3.14.patch.gz 18458 SHA256 2d0e40116e021913668519a42743f89b8fb77f8d5beed863d620cc79999b0b79 SHA512 9cfd83e650cedbc3950b8cf80d0b36fbb7dff8fbe7d017378f9a2ae18189fa6e459e323dae6cd1fa1d82ff948f628563892d0a0f30113b3a8ba5269fe051e784 WHIRLPOOL c1ee5570f0bfb3191c602d575e0e05cabe7d42183bd78c07cac19a2743a59f110728e309fcee6f0b6abc7b141ae8c701d92d010d2b7737739b4cac92406552fa +DIST openssh-lpk-6.2p2-0.3.14.patch.gz 18171 SHA256 d5294c97b98b0da75f90bdf5c9b8a7ff342292b5370111c798662d9a2c440607 SHA512 a6d8643f90e87746afd0a383057feb1df05d908fc8e23759a84088be2632c6364146c10d566d927467a412a32a40af8e143134ad254d7a483c484d44b0c979b5 WHIRLPOOL 8617704fcc78b84d600bb452ec175dfbd949e427c0f70d9621acbcbfb5ec8c947022824ef970cb61a8bb1c50f123265a165041e69307bdf80291e716b0db828f diff --git a/net-misc/openssh/openssh-6.2_p2-r1.ebuild b/net-misc/openssh/openssh-6.2_p2-r1.ebuild new file mode 100644 index 000000000000..074a3b79e3a0 --- /dev/null +++ b/net-misc/openssh/openssh-6.2_p2-r1.ebuild @@ -0,0 +1,321 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.2_p2-r1.ebuild,v 1.1 2013/06/27 08:54:02 radhermit 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="${PARCH}-hpn13v14.diff.bz2" +LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz" +X509_VER="7.5" 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 + ${HPN_PATCH:+hpn? ( mirror://gentoo/${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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="bindist ${HPN_PATCH:++}hpn kerberos ldap ldns libedit pam selinux skey static tcpd X X509" + +LIB_DEPEND="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(+)] + tcpd? ( >=sys-apps/tcp-wrappers-7.6[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}-5.9_p1-sshd-gssapi-multihomed.patch #378361 + if use X509 ; then + pushd .. >/dev/null + epatch "${FILESDIR}"/${PN}-6.2_p2-x509-glue.patch + popd >/dev/null + epatch "${WORKDIR}"/${X509_PATCH%.*} + epatch "${FILESDIR}"/${PN}-6.2_p2-x509-hpn-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 + if [[ -n ${HPN_PATCH} ]] && use hpn; then + epatch "${WORKDIR}"/${HPN_PATCH%.*} + epatch "${FILESDIR}"/${PN}-6.0_p1-hpn-progressmeter.patch + save_version HPN + # The AES-CTR multithreaded variant is broken, and causes random hangs + # when combined background threading and control sockets. To avoid + # this, we change the internal table to use the non-multithread version + # for the meantime. Do NOT remove this in new versions. See bug #354113 + # comment #6 for testcase. + # Upstream reference: http://www.psc.edu/networking/projects/hpn-ssh/ + ## Additionally, the MT-AES-CTR mode cipher replaces the default ST-AES-CTR mode + ## cipher. Be aware that if the client process is forked using the -f command line + ## option the process will hang as the parent thread gets 'divorced' from the key + ## generation threads. This issue will be resolved as soon as possible + sed -i -r \ + -e 's:(aes(...)-ctr.*SSH_CIPHER_SSH2.*)evp_aes_ctr_mt:\1EVP_aes_\2_ctr:' \ + cipher.c || die + 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::' + ) + sed -i "${sed_args[@]}" configure{,.ac} || die + + 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="${myconf} --disable-utmp --disable-wtmp --disable-wtmpx" + append-ldflags -lutil + fi + + econf \ + --with-ldflags="${LDFLAGS}" \ + --disable-strip \ + --with-pid-dir="${EPREFIX}"/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 /usr) \ + ${LDAP_PATCH:+$(use X509 || ( use ldap && use_with ldap ))} \ + $(use_with ldns) \ + $(use_with libedit) \ + $(use_with selinux) \ + $(use_with skey) \ + $(use_with tcpd tcp-wrappers) \ + ${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 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 - perl-module_src_prep - perl-module_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_install - fixlocalpod - popd > /dev/null - fi - - prune_libtool_files --all - - use zeroconf && newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed - use zeroconf && systemd_dounit "${FILESDIR}/cups-browsed.service" -} - -pkg_postinst() { - perl-module_pkg_postinst - - if use zeroconf; then - elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers" - elog "remote queues via avahi and adds them to your cups configuration. You may want" - elog "to add it to your default runlevel. Not much tested so far, though." - fi -} diff --git a/net-print/cups-filters/cups-filters-1.0.34.ebuild b/net-print/cups-filters/cups-filters-1.0.34.ebuild deleted file mode 100644 index 6fe72b3da9c5..000000000000 --- a/net-print/cups-filters/cups-filters-1.0.34.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.34.ebuild,v 1.1 2013/05/11 11:47:47 dilfridge Exp $ - -EAPI=5 - -GENTOO_DEPEND_ON_PERL=no - -inherit base eutils perl-module autotools systemd - -if [[ "${PV}" == "9999" ]] ; then - inherit bzr - EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" - KEYWORDS="" -else - SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" -fi -DESCRIPTION="Cups PDF filters" -HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat" - -LICENSE="MIT GPL-2" -SLOT="0" -IUSE="jpeg perl png static-libs tiff zeroconf" - -RDEPEND=" - app-text/ghostscript-gpl - app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)] - >=app-text/qpdf-3.0.2 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/lcms:2 - >net-print/cups-1.5.9999 - !<=net-print/cups-1.5.9999 - sys-devel/bc - sys-libs/zlib - jpeg? ( virtual/jpeg ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff ) - zeroconf? ( net-dns/avahi ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - base_src_prepare - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable zeroconf avahi) \ - $(use_enable static-libs static) \ - --with-fontdir="fonts/conf.avail" \ - --with-pdftops=pdftops \ - --enable-imagefilters \ - $(use_with jpeg) \ - $(use_with png) \ - $(use_with tiff) \ - --with-rcdir=no \ - --with-browseremoteprotocols=DNSSD,CUPS \ - --without-php -} - -src_compile() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_prep - perl-module_src_compile - popd > /dev/null - fi -} - -src_install() { - default - - if use perl; then - pushd "${S}/scripting/perl" > /dev/null - perl-module_src_install - fixlocalpod - popd > /dev/null - fi - - prune_libtool_files --all - - newinitd "${FILESDIR}"/cups-browsed.init.d cups-browsed - systemd_dounit "${FILESDIR}/cups-browsed.service" -} - -pkg_postinst() { - perl-module_pkg_postinst - - elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers" - elog "remote queues via avahi or cups-1.5 browsing protocol and adds them to your cups" - elog "configuration. You may want to add it to your default runlevel." -} diff --git a/net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch b/net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch deleted file mode 100644 index 3c56c3b1e3b2..000000000000 --- a/net-print/cups-filters/files/cups-filters-1.0.29-openrc.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN cups-filters-1.0.29.orig/Makefile.am cups-filters-1.0.29/Makefile.am ---- cups-filters-1.0.29.orig/Makefile.am 2013-01-02 19:12:39.000000000 +0100 -+++ cups-filters-1.0.29/Makefile.am 2013-02-02 21:18:22.000000000 +0100 -@@ -602,7 +602,7 @@ - # UTILS - # ===== - --EXTRA_DIST += utils/cups-browsed.in -+# EXTRA_DIST += utils/cups-browsed.in - sbin_PROGRAMS = - if ENABLE_AVAHI - sbin_PROGRAMS += \ -@@ -655,28 +655,9 @@ - rm -rf *.cache *~ - - install-data-hook: --if ENABLE_AVAHI --if RCLINKS -- for level in $(RCLEVELS); do \ -- $(INSTALL) -d -m 755 $(DESTDIR)$(INITDIR)/rc$${level}.d; \ -- $(LN_S) ../init.d/cups-browsed $(DESTDIR)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups-browsed; \ -- $(LN_S) ../init.d/cups-browsed $(DESTDIR)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups-browsed; \ -- done; \ -- $(INSTALL) -d -m 755 $(DESTDIR)$(INITDIR)/rc0.d; \ -- $(LN_S) ../init.d/cups-browsed $(DESTDIR)$(INITDIR)/rc0.d/K$(RCSTOP)cups-browsed; --endif --endif - $(LN_S) pdf.utf-8.simple \ - $(DESTDIR)$(pkgcharsetdir)/pdf.utf-8 - - - uninstall-hook: --if ENABLE_AVAHI --if RCLINKS -- if test "x$(INITDIR)" != x; then \ -- $(RM) $(DESTDIR)$(BUILDROOT)$(INITDIR)/rc?.d/[SK]??cups-browsed || :; \ -- rmdir $(DESTDIR)$(BUILDROOT)$(INITDIR)/rc?.d || :;\ -- fi --endif --endif - $(RM) $(DESTDIR)$(pkgcharsetdir)/pdf.utf-8 diff --git a/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch b/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch deleted file mode 100644 index 1177f4d8f99e..000000000000 --- a/net-print/cups-filters/files/cups-filters-1.0.30-noavahi.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ruN cups-filters-1.0.30.orig/configure.ac cups-filters-1.0.30/configure.ac ---- cups-filters-1.0.30.orig/configure.ac 2013-03-07 19:19:51.000000000 +0100 -+++ cups-filters-1.0.30/configure.ac 2013-03-17 16:34:35.000000000 +0100 -@@ -204,6 +204,10 @@ - dnl Check for pkg-config, which is used for some other tests later on... - AC_PATH_PROG(PKGCONFIG, pkg-config) - -+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2]) -+AC_SUBST(GLIB_CFLAGS) -+AC_SUBST(GLIB_LIBS) -+ - dnl Avahi for cups-browsed - AVAHI_LIBS="" - AVAHI_CFLAGS="" -@@ -229,6 +233,8 @@ - AVAHI_CFLAGS="$AVAHI_CFLAGS `$PKGCONFIG --cflags avahi-client`" - AVAHI_LIBS="$AVAHI_LIBS `$PKGCONFIG --libs avahi-client`" - AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library]) -+ -+ PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib]) - else - AC_MSG_RESULT(no) - fi -@@ -237,11 +243,6 @@ - AC_SUBST(AVAHI_LIBS) - AC_SUBST(AVAHI_CFLAGS) - --PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30.2]) --AC_SUBST(GLIB_CFLAGS) --AC_SUBST(GLIB_LIBS) -- --PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib]) - AC_SUBST(AVAHI_GLIB_CFLAGS) - AC_SUBST(AVAHI_GLIB_LIBS) - diff --git a/net-print/cups/cups-1.6.2-r3.ebuild b/net-print/cups/cups-1.6.2-r3.ebuild deleted file mode 100644 index a41b3653f5fa..000000000000 --- a/net-print/cups/cups-1.6.2-r3.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/net-print/cups/cups-1.6.2-r3.ebuild,v 1.4 2013/05/14 16:04:04 scarabeus Exp $ - -EAPI=5 - -PYTHON_DEPEND="python? 2:2.5" - -inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd - -MY_P=${P/_beta/b} -MY_PV=${PV/_beta/b} - -if [[ "${PV}" != "9999" ]]; then - SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -else - inherit subversion - ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk" - KEYWORDS="" -fi - -DESCRIPTION="The Common Unix Printing System" -HOMEPAGE="http://www.cups.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="acl dbus debug +filters gnutls java kerberos lprng-compat pam - python selinux +ssl static-libs +threads usb X xinetd zeroconf" - -LANGS="ca es fr ja ru" -for X in ${LANGS} ; do - IUSE="${IUSE} +linguas_${X}" -done - -RDEPEND=" - app-text/libpaper - acl? ( - kernel_linux? ( - sys-apps/acl - sys-apps/attr - ) - ) - dbus? ( sys-apps/dbus ) - java? ( >=virtual/jre-1.6 ) - kerberos? ( virtual/krb5 ) - !lprng-compat? ( !net-print/lprng ) - pam? ( virtual/pam ) - selinux? ( sec-policy/selinux-cups ) - ssl? ( - gnutls? ( - dev-libs/libgcrypt - net-libs/gnutls - ) - !gnutls? ( >=dev-libs/openssl-0.9.8g ) - ) - usb? ( virtual/libusb:0 ) - X? ( x11-misc/xdg-utils ) - xinetd? ( sys-apps/xinetd ) - zeroconf? ( net-dns/avahi ) -" - -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -PDEPEND=" - app-text/ghostscript-gpl[cups] - app-text/poppler[utils] - >=net-print/cups-filters-1.0.30 - filters? ( net-print/foomatic-filters ) -" - -REQUIRED_USE="gnutls? ( ssl )" - -# upstream includes an interactive test which is a nono for gentoo -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" - "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" - "${FILESDIR}/${PN}-1.4.4-nostrip.patch" - "${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch" # systemd support - "${FILESDIR}/${PN}-1.6.2-statedir.patch" -) - -pkg_setup() { - enewgroup lp - enewuser lp -1 -1 -1 lp - enewgroup lpadmin 106 - - # python 3 is no-go - if use python; then - python_set_active_version 2 - python_pkg_setup - fi - - if use kernel_linux; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Can't check the linux kernel configuration." - ewarn "You might have some incompatible options enabled." - else - # recheck that we don't have usblp to collide with libusb - if use usb; then - if linux_chkconfig_present USB_PRINTER; then - eerror "Your usb printers will be managed via libusb. In this case, " - eerror "${P} requires the USB_PRINTER support disabled." - eerror "Please disable it:" - eerror " CONFIG_USB_PRINTER=n" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " USB support --->" - eerror " [ ] USB Printer support" - eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." - fi - else - #here we should warn user that he should enable it so he can print - if ! linux_chkconfig_present USB_PRINTER; then - ewarn "If you plan to use USB printers you should enable the USB_PRINTER" - ewarn "support in your kernel." - ewarn "Please enable it:" - ewarn " CONFIG_USB_PRINTER=y" - ewarn "in /usr/src/linux/.config or" - ewarn " Device Drivers --->" - ewarn " USB support --->" - ewarn " [*] USB Printer support" - ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." - fi - fi - fi - fi -} - -src_prepare() { - base_src_prepare - AT_M4DIR=config-scripts eaclocal - eautoconf -} - -src_configure() { - export DSOFLAGS="${LDFLAGS}" - - einfo LANGS=\"${LANGS}\" - einfo LINGUAS=\"${LINGUAS}\" - - local myconf - if use ssl ; then - myconf+=" - $(use_enable gnutls) - $(use_enable !gnutls openssl) - " - else - myconf+=" - --disable-gnutls - --disable-openssl - " - fi - - econf \ - --libdir=/usr/$(get_libdir) \ - --localstatedir=/var \ - --with-cups-user=lp \ - --with-cups-group=lp \ - --with-docdir=/usr/share/cups/html \ - --with-languages="${LINGUAS}" \ - --with-system-groups=lpadmin \ - $(use_enable acl) \ - $(use_enable zeroconf avahi) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable debug debug-guards) \ - $(use_enable kerberos gssapi) \ - $(use_enable pam) \ - $(use_enable static-libs static) \ - $(use_enable threads) \ - $(use_enable usb libusb) \ - --disable-dnssd \ - $(use_with java) \ - --without-perl \ - --without-php \ - $(use_with python) \ - $(use_with xinetd xinetd /etc/xinetd.d) \ - --enable-libpaper \ - --with-systemdsystemunitdir="$(systemd_get_unitdir)" \ - ${myconf} - - # install in /usr/libexec always, instead of using /usr/lib/cups, as that - # makes more sense when facing multilib support. - sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die - sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die - sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die -} - -src_install() { - # Fix install-sh, posix sh does not have 'function'. - sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" - - emake BUILDROOT="${D}" install - dodoc {CHANGES,CREDITS,README}.txt - - # move the default config file to docs - dodoc "${ED}"/etc/cups/cupsd.conf.default - rm -f "${ED}"/etc/cups/cupsd.conf.default - - # clean out cups init scripts - rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} - - # install our init script - local neededservices - use zeroconf && neededservices+=" avahi-daemon" - use dbus && neededservices+=" dbus" - [[ -n ${neededservices} ]] && neededservices="need${neededservices}" - cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die - sed -i \ - -e "s/@neededservices@/$neededservices/" \ - "${T}"/cupsd || die - doinitd "${T}"/cupsd - - # install our pam script - pamd_mimic_system cups auth account - - if use xinetd ; then - # correct path - sed -i \ - -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ - "${ED}"/etc/xinetd.d/cups-lpd || die - # it is safer to disable this by default, bug #137130 - grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ - { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } - # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" - else - rm -rf "${ED}"/etc/xinetd.d - fi - - keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ - /var/cache/cups /var/cache/cups/rss /var/log/cups \ - /var/spool/cups/tmp - - keepdir /etc/cups/{interfaces,ppd,ssl} - - use X || rm -r "${ED}"/usr/share/applications - - # create /etc/cups/client.conf, bug #196967 and #266678 - echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf - - # the following files are now provided by cups-filters: - rm -r "${ED}"/usr/share/cups/banners || die - rm -r "${ED}"/usr/share/cups/data/testprint || die - - # for the special case of running lprng and cups together, bug 467226 - if use lprng-compat ; then - rm -fv "${ED}"/usr/bin/lp* - rm -fv "${ED}"/usr/sbin/lp* - rm -fv "${ED}"/usr/share/man/man1/lp* - rm -fv "${ED}"/usr/share/man/man8/lp* - ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." - ewarn "Unless you plan to install an exotic server setup, you most likely" - ewarn "do not want this. Disable the useflag then and all will be fine." - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - # Update desktop file database and gtk icon cache (bug 370059) - gnome2_icon_cache_update - fdo-mime_desktop_database_update - - # not slotted - at most one value - if ! [[ "${REPLACING_VERSIONS}" ]]; then - echo - elog "For information about installing a printer and general cups setup" - elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" - echo - fi - - if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then - echo - elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes" - elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"." - elog "You will have to find printers using zeroconf/avahi instead, enter" - elog "the location manually, or run cups-browsed from net-print/cups-filters" - elog "which re-adds that functionality as a separate daemon." - echo - elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then - echo - elog "Starting with net-print/cups-filters-1.0.30, that package provides" - elog "a daemon cups-browsed which implements printer discovery via the" - elog "Cups-1.5 protocol. Not much tested so far though." - echo - fi -} - -pkg_postrm() { - # Update desktop file database and gtk icon cache (bug 370059) - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/net-wireless/hackrf-tools/files/52-hackrf.rules b/net-wireless/hackrf-tools/files/52-hackrf.rules new file mode 100644 index 000000000000..1ebb20db569c --- /dev/null +++ b/net-wireless/hackrf-tools/files/52-hackrf.rules @@ -0,0 +1 @@ +ATTR{idVendor}=="1d50", ATTR{idProduct}=="604b", SYMLINK+="hackrf-%k", MODE="660", GROUP="plugdev" diff --git a/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild new file mode 100644 index 000000000000..9134d422e325 --- /dev/null +++ b/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild,v 1.1 2013/06/27 04:46:10 zerochaos Exp $ + +EAPI=5 + +inherit cmake-utils udev + +DESCRIPTION="library for communicating with HackRF SDR platform" +HOMEPAGE="http://greatscottgadgets.com/hackrf/" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/mossmann/hackrf.git" + inherit git-2 + KEYWORDS="" + EGIT_SOURCEDIR="${WORKDIR}/hackrf" + S="${WORKDIR}/hackrf/host/hackrf-tools" +else + S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools" + SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="" + +DEPEND="virtual/libusb:1 + net-libs/libhackrf:=" +RDEPEND="${DEPEND}" + +src_install() { + cmake-utils_src_install + if [[ ${PV} != "9999" ]] ; then + insinto /lib/firmware + newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_usb_rom_to_ram.bin" hackrf_usb_rom_to_ram-${PV}.bin + fi + udev_dorules "${FILESDIR}"/52-hackrf.rules +} diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild index bef56a40168f..f23dfe2e6cd3 100644 --- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild +++ b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild,v 1.3 2013/06/11 03:52:29 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild,v 1.4 2013/06/27 04:41:49 zerochaos Exp $ EAPI=5 -inherit cmake-utils +inherit cmake-utils udev DESCRIPTION="library for communicating with HackRF SDR platform" HOMEPAGE="http://greatscottgadgets.com/hackrf/" @@ -35,4 +35,5 @@ src_install() { insinto /lib/firmware newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_usb_rom_to_ram.bin" hackrf_usb_rom_to_ram-${PV}.bin fi + udev_dorules 52-hackrf.rules } diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild new file mode 100644 index 000000000000..d19a712873a7 --- /dev/null +++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild,v 1.1 2013/06/27 04:25:33 zerochaos Exp $ + +EAPI=5 + +inherit autotools udev + +DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" +HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr" + +if [[ ${PV} == 9999* ]]; then + inherit git-2 + SRC_URI="" + EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" + KEYWORDS="" +else + SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND="virtual/libusb:1" +DEPEND="${RDEPEND}" + +DOCS=( ${PN}.rules ) + +src_unpack() { + if [[ ${PV} == 9999* ]]; then + git-2_src_unpack + else + default + mv ${PN} ${P} || die + fi +} + +src_prepare() { + eautoreconf +} + +src_install() { + udev_dorules rtl-sdr.rules + default + rm "${ED}"/usr/share/doc/${PF}/rtl-sdr.rules +} diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild index 564a33b6c1dc..db1ec5b5da33 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild,v 1.4 2013/06/05 02:30:45 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild,v 1.5 2013/06/27 04:25:33 zerochaos Exp $ EAPI=5 -inherit autotools + +inherit autotools udev DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr" @@ -40,10 +41,8 @@ src_prepare() { eautoreconf } -pkg_postinst() { - local rulesfiles=( "${EPREFIX}"/etc/udev/rules.d/*${PN}.rules ) - if [[ ! -f ${rulesfiles} ]]; then - elog "In order to allow users outside the usb group to capture samples, install" - elog "${PN}.rules from the documentation directory to ${EPREFIX}/etc/udev/rules.d/" - fi +src_install() { + udev_dorules rtl-sdr.rules + default + rm "${ED}"/usr/share/doc/${PF}/rtl-sdr.rules } diff --git a/profiles/package.mask b/profiles/package.mask index 58351b5589af..671e6d3ef77c 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,6 +1,6 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14866 2013/06/26 19:04:11 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14871 2013/06/27 13:21:35 aballier Exp $ # # When you add an entry to the top of this file, add your name, the date, and # an explanation of why something is getting masked. Please be extremely @@ -32,6 +32,61 @@ #--- END OF EXAMPLES --- +# Alexis Ballier (27 Jun 2013) +# TeX Live 2013 mask. +# kpathsea has to be there because it has config files without /usr/share/texmf +# and thus will break anything before TeX Live 2013. +>=dev-libs/kpathsea-6.1.1_p20130530 +>=app-text/texlive-core-2013 +>=dev-tex/luatex-0.74 +>=app-text/texlive-2013 +>=dev-tex/bibtexu-3.71_p20130530 +>=dev-texlive/texlive-fontsextra-2013 +>=dev-texlive/texlive-langother-2013 +>=dev-texlive/texlive-latexrecommended-2013 +>=dev-texlive/texlive-formatsextra-2013 +>=dev-texlive/texlive-games-2013 +>=dev-texlive/texlive-langcyrillic-2013 +>=dev-texlive/texlive-pstricks-2013 +>=dev-texlive/texlive-langportuguese-2013 +>=dev-texlive/texlive-omega-2013 +>=dev-texlive/texlive-langspanish-2013 +>=dev-texlive/texlive-langczechslovak-2013 +>=dev-texlive/texlive-basic-2013 +>=dev-texlive/texlive-langindic-2013 +>=dev-texlive/texlive-langpolish-2013 +>=dev-texlive/texlive-luatex-2013 +>=dev-texlive/texlive-plainextra-2013 +>=dev-texlive/texlive-langafrican-2013 +>=dev-texlive/texlive-fontutils-2013 +>=dev-texlive/texlive-genericextra-2013 +>=dev-texlive/texlive-latexextra-2013 +>=dev-texlive/texlive-latex-2013 +>=dev-texlive/texlive-mathextra-2013 +>=dev-texlive/texlive-langgreek-2013 +>=dev-texlive/texlive-langenglish-2013 +>=dev-texlive/texlive-fontsrecommended-2013 +>=dev-texlive/texlive-science-2013 +>=dev-texlive/texlive-langarabic-2013 +>=dev-texlive/texlive-metapost-2013 +>=dev-texlive/texlive-xetex-2013 +>=dev-texlive/texlive-langgerman-2013 +>=dev-texlive/texlive-music-2013 +>=dev-texlive/texlive-langitalian-2013 +>=dev-texlive/texlive-langcjk-2013 +>=dev-texlive/texlive-langeuropean-2013 +>=dev-texlive/texlive-langfrench-2013 +>=dev-texlive/texlive-bibtexextra-2013 +>=dev-texlive/texlive-humanities-2013 +>=dev-texlive/texlive-context-2013 +>=dev-texlive/texlive-pictures-2013 +>=dev-texlive/texlive-genericrecommended-2013 +>=dev-texlive/texlive-publishers-2013 + +# Alexis Ballier (26 Jun 2013) +# New major release. Rev. deps need to be checked first. +>=media-libs/flac-1.3.0 + # Alexis Ballier (26 Jun 2013) # These break build of the other drivers (x11-libs/libva-vdpau-driver and # x11-libs/xvba-video) @@ -508,14 +563,10 @@ app-text/cuneiform # Samuli Suominen (16 Mar 2013) # Waiting for new emul-linux-x86-{media,sound}libs without # the duplicate files. ->=media-libs/audiofile-0.3.6-r1 ->=media-libs/alsa-lib-1.0.27-r3 ->=media-libs/flac-1.2.1-r5 >=media-libs/libmikmod-3.2.0-r1 >=media-libs/libsamplerate-0.1.8-r1 >=media-libs/libsndfile-1.0.25-r1 >=media-libs/libv4l-0.9.5-r1 ->=media-libs/webrtc-audio-processing-0.1-r1 >=media-sound/portaudio-19_pre20111121-r1 >=media-sound/twolame-0.3.13-r1 >=media-sound/wavpack-4.60.1-r1 @@ -622,11 +673,6 @@ media-gfx/yafaray # very few improvements. Should be replaced by dev-python/charade eventually. =dev-python/chardet-2.1.1 -# Alexis Ballier -# Not really compatible with TeX Live 2012, breaks texdoc, produces some non -# fatal errors in some documents, mask until fixed or TeX Live 2013 is out. ->=dev-tex/luatex-0.74 - # Jeroen Roovers (09 Jan 2013) # Testing branch, unstable upstream >net-nntp/tin-2.1 diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 3e73d0a968e2..d307e752f2c1 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1803,6 +1803,7 @@ dev-python/rdflib:redland - enable support for Redland triplestore dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython dev-python/scrapy:boto - Add support for Amazon S3 via dev-python/boto dev-python/scrapy:ibl - Use Instace Based Learning alrogirithm for automatic extraction +dev-python/simplecv:shell - Enable the iPython SimpleCV shell dev-python/spyder:ipython - Add support for dev-python/ipython dev-python/spyder:matplotlib - Add support for dev-python/matplotlib dev-python/spyder:numpy - Add support for dev-python/numpy @@ -4129,6 +4130,7 @@ net-firewall/ipsec-tools:idea - Enable support for the IDEA algorithm net-firewall/ipsec-tools:nat - Enable NAT-Traversal net-firewall/ipsec-tools:rc5 - Enable support for the patented RC5 algorithm net-firewall/ipsec-tools:stats - Enable statistics reporting +net-firewall/ipt_netflow:pax_kernel - Apply patch needed for pax enabled kernels net-firewall/iptables:netlink - Build against libnfnetlink which enables the nfnl_osf util net-firewall/nufw:nfconntrack - Use netfilter_conntrack net-firewall/nufw:nfqueue - Use NFQUEUE instead of QUEUE @@ -5618,6 +5620,10 @@ sci-physics/geant:raytracerx - Enable raytracing for physics events sci-physics/geant:vrml - Enable output of geant4 in vrml formats sci-physics/hepmc:cm - Build with cm instead of default mm for length units sci-physics/hepmc:gev - Build with GeV instead of default MeV for momentum units +sci-physics/lammps:lammps-memalign - Enables the use of the posix_memalign() call instead of malloc() when large chunks or memory are allocated by LAMMPS +sci-physics/lammps:package-dipole - point dipole particles +sci-physics/lammps:package-meam - modified EAM potential +sci-physics/lammps:package-rigid - rigid bodies sci-physics/lhapdf:octave - Add bindings for sci-mathematics/octave sci-physics/meep:mpb - Enable build against sci-physics/mpb sci-physics/pythia:hepmc - Adds support for High Energy Physics Monte Carlo Generators sci-physics/hepmc @@ -5853,6 +5859,9 @@ sys-boot/plymouth:pango - Adds support for printing text on splash screen and te sys-cluster/ceph:fuse - Build fuse client sys-cluster/ceph:libatomic - Use libatomic instead of builtin atomic operations sys-cluster/ceph:radosgw - Add radosgw support +sys-cluster/charm:charmdebug - Enable the charm debugger +sys-cluster/charm:charmproduction - Optimize performance of Charm++ runtime +sys-cluster/charm:charmtracing - Enable tracing support in Charm++ sys-cluster/charm:cmkopt - Enable CMK optimisation sys-cluster/charm:tcp - Use TCP (instead of UPD) for socket communication sys-cluster/cluster-glue:large-cluster - Extend messages length limits for resource heavy clusters diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest index 19d80430d0d3..20e837e9a8a2 100644 --- a/sci-electronics/xoscope/Manifest +++ b/sci-electronics/xoscope/Manifest @@ -1 +1 @@ -DIST xoscope-2.0.tgz 334875 RMD160 65d0e128e3d0c12bd12a424a621d7acf9237ee96 SHA1 3f38afa9220c2682b7fe57689261aa60789b830a SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 +DIST xoscope-2.0.tgz 334875 SHA256 a8a3027971dd1bd902861ea8f099ea003a19b6e86f87ae97a4811aeef1deb403 SHA512 8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70 WHIRLPOOL 4afd660cb05a9a70ce49a5553c4f08d5877f32a85adcf86ada1014d7d90c358817cdb6da7f4b2d08edfb406375848434f679ea976c15ad16bf3ca2b8691a944c diff --git a/sci-electronics/xoscope/metadata.xml b/sci-electronics/xoscope/metadata.xml index 5b80fb94c393..39a02bbf0f98 100644 --- a/sci-electronics/xoscope/metadata.xml +++ b/sci-electronics/xoscope/metadata.xml @@ -1,8 +1,9 @@ - -xmw@gentoo.org -Michael Weber - + sci-electronics + + xmw@gentoo.org + Michael Weber + diff --git a/sci-electronics/xoscope/xoscope-2.0.ebuild b/sci-electronics/xoscope/xoscope-2.0.ebuild index f17b77d49a1e..42b4a52701ab 100644 --- a/sci-electronics/xoscope/xoscope-2.0.ebuild +++ b/sci-electronics/xoscope/xoscope-2.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xoscope/xoscope-2.0.ebuild,v 1.3 2012/05/04 07:10:19 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/xoscope/xoscope-2.0.ebuild,v 1.4 2013/06/27 12:55:39 xmw Exp $ -EAPI=4 +EAPI=5 -inherit autotools linux-info +inherit autotools eutils linux-info DESCRIPTION="Soundcard Oscilloscope for X" HOMEPAGE="http://xoscope.sourceforge.net" @@ -24,10 +24,11 @@ CONFIG_CHECK="~!SND_PCM_OSS" ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input via /dev/dsp" src_prepare() { - epatch "${FILESDIR}"/${P}-remove_bundled_gtkdatabox.patch - epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch - epatch "${FILESDIR}"/${P}-implicit_decls.patch - epatch "${FILESDIR}"/${P}-comedi_compile.patch + epatch \ + "${FILESDIR}"/${P}-remove_bundled_gtkdatabox.patch \ + "${FILESDIR}"/${P}-man_no_-Tutf8.patch \ + "${FILESDIR}"/${P}-implicit_decls.patch \ + "${FILESDIR}"/${P}-comedi_compile.patch eautoreconf } diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild index fe270f6d74ac..9c192d6e6606 100644 --- a/sci-libs/fftw/fftw-3.3.3-r1.ebuild +++ b/sci-libs/fftw/fftw-3.3.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.4 2013/05/01 13:33:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.5 2013/06/27 14:30:29 aballier Exp $ EAPI=5 @@ -22,7 +22,8 @@ IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" RDEPEND="mpi? ( virtual/mpi ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} test? ( dev-lang/perl )" diff --git a/sci-libs/fftw/fftw-3.3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3.3-r2.ebuild index 25b71b98ba07..254109334a14 100644 --- a/sci-libs/fftw/fftw-3.3.3-r2.ebuild +++ b/sci-libs/fftw/fftw-3.3.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.2 2013/05/01 13:33:43 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.3 2013/06/27 14:30:29 aballier Exp $ EAPI=5 @@ -23,7 +23,8 @@ REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )" RDEPEND=" mpi? ( virtual/mpi ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )" + abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 + !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} test? ( dev-lang/perl )" diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest new file mode 100644 index 000000000000..67115900774d --- /dev/null +++ b/sci-physics/lammps/Manifest @@ -0,0 +1 @@ +DIST lammps-26May13.tar.gz 46937785 SHA256 c3568846ac818857e9cb131f16a7298becd4bc26237a8c4423fb403fbf54d6c0 SHA512 71424d8a422424105a95c63bcdbdafca68f97beb0f7e4a4d8ac4df927191ea3003a73c94c19047953d278151bc6d59120cae49fa11b81e2ab23c719dbc26ca01 WHIRLPOOL b150311fef0d55ea4c046d9138512344ba4add646a712cf86ec1569302e7d96d1d166f67b2b6f452d4a0573b501bd3f25d1f4fb175d2daa261530a843da19d05 diff --git a/sci-physics/lammps/lammps-20130526.ebuild b/sci-physics/lammps/lammps-20130526.ebuild new file mode 100644 index 000000000000..4793d83055a1 --- /dev/null +++ b/sci-physics/lammps/lammps-20130526.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20130526.ebuild,v 1.1 2013/06/26 23:53:11 ottxor Exp $ + +EAPI=5 + +FORTRAN_NEEDED="package-meam" + +inherit eutils fortran-2 + +convert_month() { + case $1 in + 01) echo Jan + ;; + 02) echo Feb + ;; + 03) echo Mar + ;; + 04) echo Apr + ;; + 05) echo May + ;; + 06) echo Jun + ;; + 07) echo Jul + ;; + 08) echo Aug + ;; + 09) echo Sep + ;; + 10) echo Oct + ;; + 11) echo Nov + ;; + 12) echo Dec + ;; + *) echo unknown + ;; + esac +} + +MY_P=${PN}-$((${PV:6:2}))$(convert_month ${PV:4:2})${PV:2:2} + +DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator" +HOMEPAGE="http://lammps.sandia.gov/" +SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples gzip lammps-memalign mpi package-dipole package-meam package-rigid" + +DEPEND="mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +lmp_emake() { + local LAMMPS_INCLUDEFLAGS="$(usex gzip '-DLAMMPS_GZIP' '')" + LAMMPS_INCLUDEFLAGS+="$(usex lammps-memalign ' -DLAMMPS_MEMALIGN' '')" + + # Note: The lammps makefile uses CC to indicate the C++ compiler. + emake \ + ARCHIVE=$(tc-getAR) \ + CC=$(usex mpi "mpic++" "$(tc-getCXX)") \ + F90=$(usex mpi "mpif90" "$(tc-getFC)") \ + LINK=$(usex mpi "mpic++" "$(tc-getCXX)") \ + CCFLAGS="${CXXFLAGS}" \ + F90FLAGS="${FCFLAGS}" \ + LINKFLAGS="${LDFLAGS}" \ + LMP_INC="${LAMMPS_INCLUDEFLAGS}" \ + MPI_INC=$(usex mpi '' "-I../STUBS") \ + MPI_PATH=$(usex mpi '' '-L../STUBS') \ + MPI_LIB=$(usex mpi '' '-lmpi_stubs') \ + "$@" +} + +src_compile() { + # Compile stubs for serial version. + use mpi || lmp_emake -C src stubs + + # Build optional packages. + if use package-meam; then + lmp_emake -C src yes-meam + lmp_emake -j1 -C lib/meam -f Makefile.gfortran + fi + use package-dipole && emake -C src yes-dipole + use package-rigid && emake -C src yes-rigid + + # Compile. + lmp_emake -C src serial +} + +src_install() { + newbin "src/lmp_serial" "lmp" + if use examples; then + insinto "/usr/share/doc/${PF}" + doins -r examples + fi + dodoc README + if use doc; then + dodoc doc/Manual.pdf + dohtml -r doc/* + fi +} diff --git a/sci-physics/lammps/metadata.xml b/sci-physics/lammps/metadata.xml new file mode 100644 index 000000000000..1acfbc73e30b --- /dev/null +++ b/sci-physics/lammps/metadata.xml @@ -0,0 +1,31 @@ + + + + + LAMMPS is a classical molecular dynamics code, and an acronym for + Large-scale Atomic/Molecular Massively Parallel Simulator. + + LAMMPS has potentials for soft materials (biomolecules, polymers) and + solid-state materials (metals, semiconductors) and coarse-grained or + mesoscopic systems. It can be used to model atoms or, more generically, + as a parallel particle simulator at the atomic, meso, or continuum + scale. + + LAMMPS runs on single processors or in parallel using message-passing + techniques and a spatial-decomposition of the simulation domain. The + code is designed to be easy to modify or extend with new functionality. + + + Enables the use of the posix_memalign() + call instead of malloc() when large chunks or memory are allocated + by LAMMPS + modified EAM potential + point dipole particles + rigid bodies + + sci-physics + + nicolasbock@gmail.com + + + diff --git a/sys-apps/findutils/findutils-4.5.11.ebuild b/sys-apps/findutils/findutils-4.5.11.ebuild index 0cfc99db2ad1..645bbc2149b0 100644 --- a/sys-apps/findutils/findutils-4.5.11.ebuild +++ b/sys-apps/findutils/findutils-4.5.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.11.ebuild,v 1.5 2013/06/19 04:59:42 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.5.11.ebuild,v 1.6 2013/06/27 05:50:42 vapier Exp $ EAPI="3" @@ -42,6 +42,7 @@ src_configure() { --with-packager-bug-reports="http://bugs.gentoo.org/" \ --program-prefix=${program_prefix} \ $(use_enable nls) \ + $(use_with selinux) \ --libexecdir='$(libdir)'/find } diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest index ce341e409ae5..43873ef84fab 100644 --- a/sys-cluster/charm/Manifest +++ b/sys-cluster/charm/Manifest @@ -1,3 +1,4 @@ -DIST charm-5.9.tar.gz 7580639 RMD160 ebc3a8515fd918c6e0fc0fd9963a22b3ae5d057d SHA1 8b34d083486e6350ddf31a71e7476d6027ef9c0f SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89 -DIST charm-6.1.2_src.tar.gz 24177223 RMD160 bdd6e88a8596139303025d5ecd484a4634811dc9 SHA1 0e6cee877f22794cb647ab22ef5651048abcbbd0 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366 -DIST charm-6.2.0_src.tar.gz 17107602 RMD160 4188a66c26db8c5fc4929f89a5a826a8ac897dff SHA1 a74a7baf7783885bd00531d75074eb02ff35c4a9 SHA256 3ad35154be829ed5eb66b75aa50a9431a8bdf4ae502dbeabd6ec6839afbf9260 +DIST charm-5.9.tar.gz 7580639 SHA256 b5f8d53f0b447dbd720a0f2607a0e7902c227c7377326bf279e448ed570dcc89 +DIST charm-6.1.2_src.tar.gz 24177223 SHA256 cc8a522ddf495fdd44f8134d82dfe0a17b72c2cf5962960688463d3115e8e366 +DIST charm-6.2.0_src.tar.gz 17107602 SHA256 3ad35154be829ed5eb66b75aa50a9431a8bdf4ae502dbeabd6ec6839afbf9260 +DIST charm-6.5.0.tar.gz 19215019 SHA256 2f9b8a92a532924f056a398b46779d58a7f9cd58380ba32d22823a63065c8719 SHA512 5826cb83e7cf377c463d51c6206a48ad2d416f7d17cbfe5289980ee20005b3e20ad617f726114294e796a393abbdc60066ca5e2cd63c0f24f26c05b9a5dacce7 WHIRLPOOL 8f0ab920202acb48f1e5a4cc5ab1902c1f58c7cc61627c6637012743f011d12f131369b598071598afaf33ce53a407d167d06778a9de9c52f22877a4b1d4f25e diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild new file mode 100644 index 000000000000..25982f85a5d4 --- /dev/null +++ b/sys-cluster/charm/charm-6.5.0.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.5.0.ebuild,v 1.1 2013/06/26 23:58:38 ottxor Exp $ + +EAPI=5 + +inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs + +DESCRIPTION="Message-passing parallel language and runtime system" +HOMEPAGE="http://charm.cs.uiuc.edu/" +SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" + +LICENSE="charm" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp" + +RDEPEND="mpi? ( virtual/mpi )" +DEPEND=" + ${RDEPEND} + doc? ( + >=app-text/poppler-0.12.3-r3[utils] + dev-tex/latex2html + virtual/tex-base + )" + +REQUIRED_USE=" + cmkopt? ( !charmdebug !charmtracing ) + charmproduction? ( !charmdebug !charmtracing )" + +FORTRAN_STANDARD="90" + +src_prepare() { + # Build shared libraries by default. + CHARM_OPTS="--build-shared" + if use charmproduction; then + CHARM_OPTS+=" --with-production" + else + if use charmdebug; then + CHARM_OPTS+=" --with-charmdebug" + fi + + if use charmtracing; then + CHARM_OPTS+=" --with-tracing --with-tracing-commthread" + fi + fi + + # TCP instead of default UDP for socket comunication + # protocol + CHARM_OPTS+="$(usex tcp ' tcp' '')" + + # enable direct SMP support using shared memory + CHARM_OPTS+="$(usex smp ' smp' '')" + + # CMK optimization + use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 + + sed \ + -e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ + -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ + -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ + -e '/CMK_F90_MODINC/s:-p:-I:g' \ + -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ + -i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die + + sed \ + -e "s:-o conv-cpm:${LDFLAGS} &:g" \ + -e "s:-o charmxi:${LDFLAGS} &:g" \ + -e "s:-o charmrun-silent:${LDFLAGS} &:g" \ + -e "s:-o charmrun-notify:${LDFLAGS} &:g" \ + -e "s:-o charmrun:${LDFLAGS} &:g" \ + -e "s:-o charmd_faceless:${LDFLAGS} &:g" \ + -e "s:-o charmd:${LDFLAGS} &:g" \ + -i \ + src/scripts/Makefile \ + src/arch/net/charmrun/Makefile || die + + einfo "charm opts: ${CHARM_OPTS}" +} + +src_compile() { + # Build charmm++ first. + ./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \ + ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++" + + # make pdf/html docs + if use doc; then + cd "${S}"/doc + make doc || die "failed to create pdf/html docs" + fi +} + +src_test() { + make -C tests/charm++ test TESTOPTS="++local" || die +} + +src_install() { + # Make charmc play well with gentoo before we move it into /usr/bin. + epatch "${FILESDIR}/charm-6.5.0-charmc-gentoo.patch" + + sed -e "s|gentoo-include|${P}|" \ + -e "s|gentoo-libdir|$(get_libdir)|g" \ + -e "s|VERSION|${P}/VERSION|" \ + -i ./src/scripts/charmc || die "failed patching charmc script" + + # In the following, some of the files are symlinks to ../tmp which we need + # to dereference first (see bug 432834). + + local i + + # Install binaries. + for i in bin/*; do + if [[ -L ${i} ]]; then + i=$(readlink -e "${i}") || die + fi + dobin "${i}" + done + + # Install headers. + insinto /usr/include/${P} + for i in include/*; do + if [[ -L ${i} ]]; then + i=$(readlink -e "${i}") || die + fi + doins "${i}" + done + + # Install static libs. Charm has a lot of .o "libs" that it requires at + # runtime. + if use static-libs; then + for i in lib/*.{a,o}; do + if [[ -L ${i} ]]; then + i=$(readlink -e "${i}") || die + fi + dolib "${i}" + done + fi + + # Install shared libs. + for i in lib_so/*; do + if [[ -L ${i} ]]; then + i=$(readlink -e "${i}") || die + fi + dolib.so "${i}" + done + + # Basic docs. + dodoc CHANGES README + + # Install examples. + if use examples; then + find examples/ -name 'Makefile' | xargs sed \ + -r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \ + die "Failed to fix examples" + find examples/ -name 'Makefile' | xargs sed \ + -r "s:./charmrun:./charmrun ++local:" -i || \ + die "Failed to fix examples" + insinto /usr/share/doc/${PF}/examples + doins -r examples/charm++/* + fi + + # Install pdf/html docs + if use doc; then + cd "${S}"/doc + # Install pdfs. + insinto /usr/share/doc/${PF}/pdf + doins doc/pdf/* + # Install html. + docinto html + dohtml -r doc/html/* + fi +} + +pkg_postinst() { + einfo "Please test your charm installation by copying the" + einfo "content of /usr/share/doc/${PF}/examples to a" + einfo "temporary location and run 'make test'." +} diff --git a/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch b/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch new file mode 100644 index 000000000000..34923e3f78d3 --- /dev/null +++ b/sys-cluster/charm/files/charm-6.5.0-charmc-gentoo.patch @@ -0,0 +1,25 @@ +--- src/scripts/charmc.old 2013-05-30 10:18:02.261819771 -0600 ++++ src/scripts/charmc 2013-05-30 10:19:50.839661634 -0600 +@@ -361,19 +361,9 @@ + PROG_EXT=".exe" + fi + +-CHARMLIB="$CHARMBIN/../lib" +-CHARMINC="$CHARMBIN/../include" +-CHARMLIBSO= +-if test -d "$CHARMBIN/../lib_so" +-then +- CHARMLIBSO=`cd $CHARMBIN/../lib_so 2>/dev/null && pwd` +- #getting absolute path is harder than thought because of symbolic links and .. +- #ksh needs cd -P to resolve werid symbolic links, however -P is not portable +- #csh is ok too if it exists +- test -z "$CHARMLIBSO" && CHARMLIBSO=`cd -P $CHARMBIN/../lib_so 2>/dev/null && pwd` +- test -z "$CHARMLIBSO" && CHARMLIBSO=`csh -c "cd $CHARMBIN/../lib_so >& /dev/null && pwd"` +- test -z "$CHARMLIBSO" && echo "$CHARMBIN/../lib_so: not found" && exit 1 +-fi ++CHARMLIB="/usr/gentoo-libdir" ++CHARMINC="/usr/include/gentoo-include" ++CHARMLIBSO="/usr/gentoo-libdir" + + ############################################################################## + # diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml index f555a9f50c29..ea5896e21a07 100644 --- a/sys-cluster/charm/metadata.xml +++ b/sys-cluster/charm/metadata.xml @@ -2,7 +2,13 @@ sci + + nicolasbock@gmail.com + + Enable the charm debugger + Optimize performance of Charm++ runtime + Enable tracing support in Charm++ Enable CMK optimisation Use TCP (instead of UPD) for socket communication diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild index da3eba8c6e7c..a2666c67e37b 100644 --- a/sys-libs/glibc/glibc-2.17.ebuild +++ b/sys-libs/glibc/glibc-2.17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.15 2013/06/26 16:49:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.16 2013/06/27 12:19:41 jer Exp $ inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib unpacker multiprocessing @@ -8,7 +8,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="http://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" RESTRICT="strip" # strip ourself #46186 EMULTILIB_PKG="true" diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index f4fa3e2c37f0..d736456f3086 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -2,5 +2,5 @@ DIST google-chrome-beta_28.0.1500.52-r207119_amd64.deb 43247666 SHA256 66a5b4224 DIST google-chrome-beta_28.0.1500.52-r207119_i386.deb 40998676 SHA256 5d9fa1d30afc769d33224feea3f16f46c94681bb820513ca949189e2a7bcaa3a SHA512 b171b69ad3cb988bb37f6972f6928939d6460063db3b1fae2c4c5e8f8ec3a1b59bdb5716dea677b412e464929a9e547c7f0eacda37eda7ea16e1568875442670 WHIRLPOOL 121ea077581674c4876c4a104c7c2eda66e0978862069f78c4dbcc86005d6dd79b863c01cc12d404758069e4f105618c8f0963d69e41c1572d5727c122fa4711 DIST google-chrome-stable_28.0.1500.52-r207119_amd64.deb 43266352 SHA256 dc9e1d327f398473ffc19f79b85eb224a5faee8bb79210b0ec82dfa156a7bf4f SHA512 19929cfce9dd282e802611f19e44dce2deb6b0730985dcd1a8f028bb917e4ec299c7122aba038946be1262e91301db03f042f17a0999195b5a588ffd400839a7 WHIRLPOOL 61976c700dbed01c9f5098477b45c8b4d563040d07cfb145a683cb990d4df9f15aaa76788d0c58b1349a68120a5029aeafa5b9958383190a5b301ddfc2230b59 DIST google-chrome-stable_28.0.1500.52-r207119_i386.deb 41004584 SHA256 281fb34ecff7329eb6210688ac584e78bc2862bdd2fcd16a510852fd9dee73b5 SHA512 66562f377687e949aa9ed46b08b629581c925930561ad6483ee05ac64bb46015a0d4ffc6eb03d0f590414560db34fedfdf907be1f66d40ff1686776712b5d92b WHIRLPOOL 0be723589c6070301a004f5ff89c4799224a06adaca8feaf85720e1778d890e39715661e7f0bae9d7e69634b20c4583ee85c764bc98715ad14af4e012d7525ea -DIST google-chrome-unstable_29.0.1541.2-r207000_amd64.deb 44127430 SHA256 a3277c508a1be58d35334a76fdfbc1bdb63ed771ad89764da418af09bdc6feb5 SHA512 f004f2bc01e0d9aabdb08b03f2da49447878aab4cfc9158750e2702228db7d6088cf0ff084236cb7fd1ac3b60a44618e465665e01ede90960c9150d4a4f03ce7 WHIRLPOOL c66eda00faa0644acd9373dc59efa7fdd814eee8598a3ac74ed253fa179aaea47de0c9bbceb34255408ab33027573ef49de8424a5f5d3342e2232dd5d5d22d5f -DIST google-chrome-unstable_29.0.1541.2-r207000_i386.deb 41887260 SHA256 0b74937355712920c0a5c8c6cfce7215125bfa4e7faa6101e381c568f7582ba0 SHA512 8a7685495953cbae1034db291031f4d82c4c643e14814745af038f816efa9d6e0c377ddcf9e36e1140221608481cad3bd6fa53843bb051aaf7acd1f9570b50ff WHIRLPOOL 868c95293fa201c7e3c62dfa46b0704f6ab3876c2ff2055a316e8f983e7591f72b829510ab8e08530775229da74c3fc451651b3e7d1aaca357d99b3c08106a74 +DIST google-chrome-unstable_29.0.1547.0-r208345_amd64.deb 44033646 SHA256 1821659a489e1653b01f0631c706f5b140253afc5c942fab8ecc44bd340c9819 SHA512 2d9aed93cb0f95546358ccb8e30244116f4eb82a82d1617f3fbdf36154e4dc7b579fd95b6d1e2edf8f5c59415e26735f97fb4eee8c24d6820dd2a2f4c147d1cb WHIRLPOOL 27f38bbb42c38e631e25b046c618e68bc2a8c2e83ca17040cdf9685c3d9d81750e60e88766ad1538d1708dca04d5d95835c312ec3be78c6df1be145c16b91bb2 +DIST google-chrome-unstable_29.0.1547.0-r208345_i386.deb 41839224 SHA256 6e77b65de915f96266a1e86f934816edd89580deab5732359218ddc32f735167 SHA512 51a7601a449b5fcd920521d8adf49a0d610f8c7e24c85957872f1cc7306e33f9601bd6a8742d91e37fbb376023c06e9462ff6836b69dcfd05fa0770597293e81 WHIRLPOOL 6902d8c49d70981eeeb479bd87d8b4245b70377e6a70024288c8abd78831856d6780521802068449fe09406e2e3b4ccfb88097cd51ff12ea26fec0e1d31c8a1e diff --git a/www-client/google-chrome/google-chrome-29.0.1541.2_alpha207000.ebuild b/www-client/google-chrome/google-chrome-29.0.1547.0_alpha208345.ebuild similarity index 97% rename from www-client/google-chrome/google-chrome-29.0.1541.2_alpha207000.ebuild rename to www-client/google-chrome/google-chrome-29.0.1547.0_alpha208345.ebuild index e998f49fdaf3..74b6e0f036e2 100644 --- a/www-client/google-chrome/google-chrome-29.0.1541.2_alpha207000.ebuild +++ b/www-client/google-chrome/google-chrome-29.0.1547.0_alpha208345.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-29.0.1541.2_alpha207000.ebuild,v 1.1 2013/06/19 02:53:13 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-29.0.1547.0_alpha208345.ebuild,v 1.1 2013/06/26 23:14:43 floppym Exp $ EAPI="4" diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index f4fa3e2c37f0..d736456f3086 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -2,5 +2,5 @@ DIST google-chrome-beta_28.0.1500.52-r207119_amd64.deb 43247666 SHA256 66a5b4224 DIST google-chrome-beta_28.0.1500.52-r207119_i386.deb 40998676 SHA256 5d9fa1d30afc769d33224feea3f16f46c94681bb820513ca949189e2a7bcaa3a SHA512 b171b69ad3cb988bb37f6972f6928939d6460063db3b1fae2c4c5e8f8ec3a1b59bdb5716dea677b412e464929a9e547c7f0eacda37eda7ea16e1568875442670 WHIRLPOOL 121ea077581674c4876c4a104c7c2eda66e0978862069f78c4dbcc86005d6dd79b863c01cc12d404758069e4f105618c8f0963d69e41c1572d5727c122fa4711 DIST google-chrome-stable_28.0.1500.52-r207119_amd64.deb 43266352 SHA256 dc9e1d327f398473ffc19f79b85eb224a5faee8bb79210b0ec82dfa156a7bf4f SHA512 19929cfce9dd282e802611f19e44dce2deb6b0730985dcd1a8f028bb917e4ec299c7122aba038946be1262e91301db03f042f17a0999195b5a588ffd400839a7 WHIRLPOOL 61976c700dbed01c9f5098477b45c8b4d563040d07cfb145a683cb990d4df9f15aaa76788d0c58b1349a68120a5029aeafa5b9958383190a5b301ddfc2230b59 DIST google-chrome-stable_28.0.1500.52-r207119_i386.deb 41004584 SHA256 281fb34ecff7329eb6210688ac584e78bc2862bdd2fcd16a510852fd9dee73b5 SHA512 66562f377687e949aa9ed46b08b629581c925930561ad6483ee05ac64bb46015a0d4ffc6eb03d0f590414560db34fedfdf907be1f66d40ff1686776712b5d92b WHIRLPOOL 0be723589c6070301a004f5ff89c4799224a06adaca8feaf85720e1778d890e39715661e7f0bae9d7e69634b20c4583ee85c764bc98715ad14af4e012d7525ea -DIST google-chrome-unstable_29.0.1541.2-r207000_amd64.deb 44127430 SHA256 a3277c508a1be58d35334a76fdfbc1bdb63ed771ad89764da418af09bdc6feb5 SHA512 f004f2bc01e0d9aabdb08b03f2da49447878aab4cfc9158750e2702228db7d6088cf0ff084236cb7fd1ac3b60a44618e465665e01ede90960c9150d4a4f03ce7 WHIRLPOOL c66eda00faa0644acd9373dc59efa7fdd814eee8598a3ac74ed253fa179aaea47de0c9bbceb34255408ab33027573ef49de8424a5f5d3342e2232dd5d5d22d5f -DIST google-chrome-unstable_29.0.1541.2-r207000_i386.deb 41887260 SHA256 0b74937355712920c0a5c8c6cfce7215125bfa4e7faa6101e381c568f7582ba0 SHA512 8a7685495953cbae1034db291031f4d82c4c643e14814745af038f816efa9d6e0c377ddcf9e36e1140221608481cad3bd6fa53843bb051aaf7acd1f9570b50ff WHIRLPOOL 868c95293fa201c7e3c62dfa46b0704f6ab3876c2ff2055a316e8f983e7591f72b829510ab8e08530775229da74c3fc451651b3e7d1aaca357d99b3c08106a74 +DIST google-chrome-unstable_29.0.1547.0-r208345_amd64.deb 44033646 SHA256 1821659a489e1653b01f0631c706f5b140253afc5c942fab8ecc44bd340c9819 SHA512 2d9aed93cb0f95546358ccb8e30244116f4eb82a82d1617f3fbdf36154e4dc7b579fd95b6d1e2edf8f5c59415e26735f97fb4eee8c24d6820dd2a2f4c147d1cb WHIRLPOOL 27f38bbb42c38e631e25b046c618e68bc2a8c2e83ca17040cdf9685c3d9d81750e60e88766ad1538d1708dca04d5d95835c312ec3be78c6df1be145c16b91bb2 +DIST google-chrome-unstable_29.0.1547.0-r208345_i386.deb 41839224 SHA256 6e77b65de915f96266a1e86f934816edd89580deab5732359218ddc32f735167 SHA512 51a7601a449b5fcd920521d8adf49a0d610f8c7e24c85957872f1cc7306e33f9601bd6a8742d91e37fbb376023c06e9462ff6836b69dcfd05fa0770597293e81 WHIRLPOOL 6902d8c49d70981eeeb479bd87d8b4245b70377e6a70024288c8abd78831856d6780521802068449fe09406e2e3b4ccfb88097cd51ff12ea26fec0e1d31c8a1e diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345.ebuild similarity index 95% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345.ebuild index 6ab218be722e..9dcf390cfc37 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1541.2_alpha207000.ebuild,v 1.1 2013/06/19 02:53:46 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-29.0.1547.0_alpha208345.ebuild,v 1.1 2013/06/26 23:15:15 floppym Exp $ EAPI=4 diff --git a/x11-drivers/radeon-ucode/Manifest b/x11-drivers/radeon-ucode/Manifest index 6d5f97dc64ca..2e9062922067 100644 --- a/x11-drivers/radeon-ucode/Manifest +++ b/x11-drivers/radeon-ucode/Manifest @@ -60,3 +60,4 @@ DIST radeon-ucode-20130402.tar.xz 325340 SHA256 912fc3fcad0420b12edebcda17b9cb56 DIST radeon-ucode-20130411.tar.xz 325432 SHA256 5af589a40387d20a52fc56b1aa66b162e4d0ad341fecaa4e31b308444ef11ca5 SHA512 ab475a74b3b03d26ca932ce66cdefd527c873be072701fa2a2ae7cdfc0e99a51f0493e365ca5b8c7408edee33290caaf779c7f13a908ad2a149045e4373be882 WHIRLPOOL 3e418cfa42a4eebdaa6e4f64b6ef615f17f290f6ffc8a41fe8ba58e6c1c2e6626bb1ab610e4195536d0611088c8b3082fd1461cd73c359c287e5db6c6c9671cc DIST radeon-ucode-20130513.tar.xz 325852 SHA256 50f45fd8c5d7ddb6264d6b283b8ccf7db52f150a3eb3dcf230cc6f5aadf6560e SHA512 c71c11f3e11ecfcba0ca076c4ddcf6395adb8d70be695772ba7ac98c04f843d48abfb1497287b2cbf23ac21af7768a0c34492bdbd455ae9961c41fe42d45b2a5 WHIRLPOOL 13951aa6bb40be2d7185ef8b36006172b1fefd995c87493cae6bc38a7f6568c7abd6f5d05c4781d7bb2c7d0de5d2a08275f91a89a99b072de3b57cef56acae17 DIST radeon-ucode-20130625.tar.xz 410856 SHA256 a36824e59b70a98921d7710b237b5f965428cbe6da4b13f694aad095a4a6e4f1 SHA512 e3090724e0a4cef7aafa8560559088162f4c05bb4397d4db2c5f7c6d0c25f1da3b3d369fb79c166cff55c6fde3e59f58ddc4a6c5b099ab96b058c5ef49b9178a WHIRLPOOL 3604f78479d2a342e2b6e2e401179979f14a385d9b5045a4db21de7bfc459f71efcc46d4b78e57a268f0d65da63159e15783a1e17c3ad90a2827ee006fa064e4 +DIST radeon-ucode-20130626.tar.xz 418868 SHA256 1c339bb08b7f23386d0aa3749e0a9e532a9fc976df52051c45e35d967484b069 SHA512 c3eb1911cb7ab646ae4afc9120fb227328d0cabfbaf1124e472a2451541295572660db0357013cf738308d2e2aa033740cf91b4561ead6915a87ba4670dc147a WHIRLPOOL c7d7873027a77f469039ac44f05073dd41548a881d355a92a8bb97cdf23b171c97677a9c685da4ecb3a135ee7381622b8be6c48b4d46371fc06ae7766d977a3b diff --git a/x11-drivers/radeon-ucode/radeon-ucode-20130626.ebuild b/x11-drivers/radeon-ucode/radeon-ucode-20130626.ebuild new file mode 100644 index 000000000000..4befe6f87dd8 --- /dev/null +++ b/x11-drivers/radeon-ucode/radeon-ucode-20130626.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/radeon-ucode/radeon-ucode-20130626.ebuild,v 1.1 2013/06/26 23:17:29 chithanh Exp $ + +EAPI=5 + +inherit linux-info + +DESCRIPTION="IRQ microcode for r6xx/r7xx/Evergreen/N.Islands/S.Islands Radeon GPUs and APUs" +HOMEPAGE="http://people.freedesktop.org/~agd5f/radeon_ucode/" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="radeon-ucode" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="!sys-kernel/linux-firmware[-savedconfig]" + +S=${WORKDIR}/${PN/-/_} + +src_install() { + insinto /lib/firmware/radeon + FILES=( *.bin ) + doins ${FILES[@]} || die "doins failed" +} + +pkg_postinst() { + if linux_config_exists && linux_chkconfig_builtin DRM_RADEON; then + if ! linux_chkconfig_present FIRMWARE_IN_KERNEL || \ + ! [[ "$(linux_chkconfig_string EXTRA_FIRMWARE)" == *_rlc.bin* ]]; then + ewarn "Your kernel has radeon DRM built-in but not the IRQ microcode." + ewarn "For kernel modesetting to work, please set in kernel config" + ewarn "CONFIG_FIRMWARE_IN_KERNEL=y" + ewarn "CONFIG_EXTRA_FIRMWARE_DIR=\"/lib/firmware\"" + ewarn "CONFIG_EXTRA_FIRMWARE=\"${FILES[@]/#/radeon/}\"" + ewarn "You may skip microcode files for which no hardware is installed." + ewarn "More information at http://wiki.x.org/wiki/radeonBuildHowTo and" + ewarn "http://www.gentoo.org/doc/en/xorg-config.xml" + fi + fi +} diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml index 6d3420d33081..8fe2fcc4c1c4 100644 --- a/x11-libs/gtkdatabox/metadata.xml +++ b/x11-libs/gtkdatabox/metadata.xml @@ -1,11 +1,13 @@ + sci-electronics - maintainer-needed@gentoo.org + xmw@gentoo.org + Michael Weber Gtk+ Widgets for live display fluctuating numerical data - Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget + Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest index 6bbf270d5d4c..b785a44e4499 100644 --- a/x11-libs/libXi/Manifest +++ b/x11-libs/libXi/Manifest @@ -1,4 +1,5 @@ DIST libXi-1.6.1.tar.bz2 427062 SHA256 f2e3627d7292ec5eff488ab58867fba14a62f06e72a8d3337ab6222c09873109 SHA512 054687f595a31ec3af424ee7a6bb168d071cad2d94fef3c7d7ba54216f16d9b8ab4175fa93126348e9a8a2dd8e5f0e8722cfa212b20d7c9341f7dcde9f5722c5 WHIRLPOOL 91b02d20388f4a1965c8a0846a07556379fe2a3feac59bc627ec5f1c8b39b34ea5bff1bf8ca2f67eeb8c0e35b690ef9f98c743c7459f72962a089dff1f674256 DIST libXi-1.6.2.tar.bz2 428938 SHA256 3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058 SHA512 876321f9c5fb7679645f776bc03015ac0f18c77aaba463f4deac457cc841c0ee21919f37026d232a4aebe940f8eb929670311db4d7ff47a108d483aeaf4d2627 WHIRLPOOL 905b0c748d0f7b1080da42956191a9442e197b96ec86d2afa0f7f3bb3e62df9521d8e1ea458d6f1ab4d2d40f5312be1382ca492e4a7590f8dc43c8ade235874d +DIST libXi-1.7.1.901.tar.bz2 441364 SHA256 5248b643fc0b76fff978eefc0acdeee278407983cf7b6e371242e1b53ba32f7c SHA512 24584ec84d7cbc3b121d0723b4321a34f7e77a3ca238172b7a29d14e73c614702cce1e185eb65bb5c858488b2eb47f2a5444b6b16c31a767d433a7edd29b7a1f WHIRLPOOL f120a003ce3aad85ff98dd472bd3977d6553a898a86b7542d3e740178f5eedce0b8e41f0897a17cff0c0224a3435eaabc4124021e61d33f900833ebff47f0424 DIST libXi-1.7.1.tar.bz2 434569 SHA256 e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5 SHA512 f897bb9ca0bc98b4e5ad7ff770bbafabdc7880122ec50ecbafbcc0e0d4b299cf792484bed6cf87608b652baedd3928341b1bdf110d240a02ac1ac930bab05927 WHIRLPOOL 7259d5a1ccc97068fc8cf35e03e72b937926f250922c519b456c6617f855a4663781f76e4e98049f5c41f261a0217569b021e632cfbed2d0d9ab32f82ecaef85 DIST libXi-1.7.tar.bz2 433745 SHA256 4ebcf2b02c16ff51e41e9d045de01416d6430b6a4af6a82b17b6bfa4d6f9cbfc SHA512 0a191c274eee357a45680a33461e6ddde2147454fe5145b430da6f3fbbba88b5b1ad0650871806357475c56b6b738e764fda34e4e38aaf12f37d25fcd51ea8b3 WHIRLPOOL e75f324546a71b7c127de94de49d421d7539c8487a4e9b17c5832dd3b1e7286ff7b74e2c28ac0b4fe2e6a212a09885135772ce209c557a62a6232ab98a8c3e46 diff --git a/x11-libs/libXi/libXi-1.7.1.901.ebuild b/x11-libs/libXi/libXi-1.7.1.901.ebuild new file mode 100644 index 000000000000..4de46cb9a6c3 --- /dev/null +++ b/x11-libs/libXi/libXi-1.7.1.901.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.7.1.901.ebuild,v 1.1 2013/06/27 13:56:12 chithanh Exp $ + +EAPI=5 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-2 + +DESCRIPTION="X.Org Xi library" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND=">=x11-libs/libX11-1.4.99.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5[${MULTILIB_USEDEP}] + >=x11-proto/inputproto-2.2.99.1[${MULTILIB_USEDEP}] + >=x11-proto/xproto-7.0.13[${MULTILIB_USEDEP}] + >=x11-proto/xextproto-7.0.3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +src_configure() { + XORG_CONFIGURE_OPTIONS=( + $(use_enable doc specs) + $(use_with doc xmlto) + $(use_with doc asciidoc) + --without-fop + ) + xorg-2_src_configure +} + +pkg_postinst() { + xorg-2_pkg_postinst + + ewarn "Some special keys and keyboard layouts may stop working." + ewarn "To fix them, recompile xorg-server." +} diff --git a/x11-libs/libva/libva-1.0.15.ebuild b/x11-libs/libva/libva-1.0.15.ebuild index 3ac4709da5bd..c3a9530c1d72 100644 --- a/x11-libs/libva/libva-1.0.15.ebuild +++ b/x11-libs/libva/libva-1.0.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.15.ebuild,v 1.6 2012/12/02 22:16:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.15.ebuild,v 1.7 2013/06/27 13:59:58 aballier Exp $ EAPI="3" @@ -29,7 +29,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="opengl" +IUSE="opengl vdpau" VIDEO_CARDS="dummy nvidia intel fglrx" for x in ${VIDEO_CARDS}; do @@ -46,6 +46,7 @@ RDEPEND=">=x11-libs/libdrm-2.4 DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) + vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( x11-libs/libva-intel-driver ) " diff --git a/x11-libs/libva/libva-1.0.16.ebuild b/x11-libs/libva/libva-1.0.16.ebuild index 11880e7bd30e..8381e4cd38f4 100644 --- a/x11-libs/libva/libva-1.0.16.ebuild +++ b/x11-libs/libva/libva-1.0.16.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.16.ebuild,v 1.3 2012/12/02 22:16:11 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.0.16.ebuild,v 1.4 2013/06/27 13:59:58 aballier Exp $ EAPI="3" @@ -29,7 +29,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="opengl" +IUSE="opengl vdpau" VIDEO_CARDS="dummy nvidia intel fglrx" for x in ${VIDEO_CARDS}; do @@ -46,6 +46,7 @@ RDEPEND=">=x11-libs/libdrm-2.4 DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) + vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) " diff --git a/x11-libs/libva/libva-1.1.0.ebuild b/x11-libs/libva/libva-1.1.0.ebuild index 604ebcc857a7..f46f1ecd25aa 100644 --- a/x11-libs/libva/libva-1.1.0.ebuild +++ b/x11-libs/libva/libva-1.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.0.ebuild,v 1.7 2013/02/14 19:07:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.0.ebuild,v 1.8 2013/06/27 13:59:58 aballier Exp $ EAPI=4 @@ -29,7 +29,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="egl opengl wayland X" +IUSE="egl opengl vdpau wayland X" VIDEO_CARDS="dummy nvidia intel fglrx" for x in ${VIDEO_CARDS}; do @@ -49,6 +49,7 @@ RDEPEND=">=x11-libs/libdrm-2.4 DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) + vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) " diff --git a/x11-libs/libva/libva-1.1.1.ebuild b/x11-libs/libva/libva-1.1.1.ebuild index b5636ce450ee..53569828df84 100644 --- a/x11-libs/libva/libva-1.1.1.ebuild +++ b/x11-libs/libva/libva-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1.ebuild,v 1.2 2013/06/19 19:34:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1.ebuild,v 1.3 2013/06/27 13:59:58 aballier Exp $ EAPI=4 @@ -29,7 +29,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="+drm egl opengl wayland X" +IUSE="+drm egl opengl vdpau wayland X" REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx" @@ -50,6 +50,7 @@ RDEPEND=">=x11-libs/libdrm-2.4 DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) + vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) " diff --git a/x11-libs/libva/libva-1.2.0.ebuild b/x11-libs/libva/libva-1.2.0.ebuild index 7f86d0af66dd..d882c4fba7f6 100644 --- a/x11-libs/libva/libva-1.2.0.ebuild +++ b/x11-libs/libva/libva-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0.ebuild,v 1.1 2013/06/26 19:06:36 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0.ebuild,v 1.2 2013/06/27 13:59:58 aballier Exp $ EAPI=4 @@ -29,7 +29,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="+drm egl opengl wayland X" +IUSE="+drm egl opengl vdpau wayland X" REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx" @@ -50,6 +50,7 @@ RDEPEND=">=x11-libs/libdrm-2.4 DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) + vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) " diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild index 38b6c516a9a3..f9e00bbad0f1 100644 --- a/x11-libs/libva/libva-9999.ebuild +++ b/x11-libs/libva/libva-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.16 2013/06/26 19:06:36 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.17 2013/06/27 13:59:58 aballier Exp $ EAPI=4 @@ -29,7 +29,7 @@ if [ "${PV%9999}" = "${PV}" ] ; then else KEYWORDS="" fi -IUSE="+drm egl opengl wayland X" +IUSE="+drm egl opengl vdpau wayland X" REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx" @@ -50,6 +50,7 @@ RDEPEND=">=x11-libs/libdrm-2.4 DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver ) + vdpau? ( x11-libs/libva-vdpau-driver ) video_cards_fglrx? ( x11-libs/xvba-video ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 ) " diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest index 11018215528e..b9115869c911 100644 --- a/x11-misc/sux/Manifest +++ b/x11-misc/sux/Manifest @@ -1 +1 @@ -DIST sux 9403 RMD160 0160991bed96d0a933931fac812204edce46b2fc SHA1 0eb18221f03871f78b13e218e7dfe4b8e75bf276 SHA256 98a2e66d105e06f95d67312f40f928fb2885084ff46fad248c6d6cd25904efd1 +DIST sux 9403 SHA256 98a2e66d105e06f95d67312f40f928fb2885084ff46fad248c6d6cd25904efd1 diff --git a/x11-misc/sux/metadata.xml b/x11-misc/sux/metadata.xml index 55f2a055c4b8..497c310b0dcd 100644 --- a/x11-misc/sux/metadata.xml +++ b/x11-misc/sux/metadata.xml @@ -3,6 +3,6 @@ desktop-misc - phosphan@gentoo.org + maintainer-needed@gentoo.org diff --git a/x11-misc/x2vnc/Manifest b/x11-misc/x2vnc/Manifest index a4742217b2ed..15f8dc19d151 100644 --- a/x11-misc/x2vnc/Manifest +++ b/x11-misc/x2vnc/Manifest @@ -1,2 +1,2 @@ -DIST x2vnc-1.6.1.tar.gz 62297 RMD160 090d771318ddde725313c11f52ecb6eebb667221 SHA1 db0030bad0a066e4f1ea49087742c304a163c5e1 SHA256 2019f74ce10a3818f65b3196cad6bc18554892495d1a4b1047981d70c20f839d -DIST x2vnc-1.7.2.tar.gz 82258 RMD160 a656365f2b09dd328594d092c1269fcc5c4841c6 SHA1 aa1ed718e04e6beb3e7db94325198fdf330d8d1e SHA256 dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001 +DIST x2vnc-1.6.1.tar.gz 62297 SHA256 2019f74ce10a3818f65b3196cad6bc18554892495d1a4b1047981d70c20f839d +DIST x2vnc-1.7.2.tar.gz 82258 SHA256 dc076dc0dad1ae4ebf5bc95bf792812b2639e92e127efb9c68de6a53874c7001 diff --git a/x11-misc/x2vnc/metadata.xml b/x11-misc/x2vnc/metadata.xml index 55f2a055c4b8..497c310b0dcd 100644 --- a/x11-misc/x2vnc/metadata.xml +++ b/x11-misc/x2vnc/metadata.xml @@ -3,6 +3,6 @@ desktop-misc - phosphan@gentoo.org + maintainer-needed@gentoo.org diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest index 48f49595f78a..1c7b12dc4cba 100644 --- a/x11-misc/xdg-user-dirs/Manifest +++ b/x11-misc/xdg-user-dirs/Manifest @@ -1 +1,2 @@ DIST xdg-user-dirs-0.14.tar.gz 228994 SHA256 5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255 SHA512 a3532d237d551145ac8d8e3b28c39471192e1e01f5ae97e26e2cfceedaab07d3f531528020246fb1d62755a14fce6ebb1ed01ad78ab5169558b95a460ec0180d WHIRLPOOL c6069147129f028d900b1437c67b680cd56b75bea3af4845cca3008e9389ebfb7657fa74398134ba3fc41a2a016e6977d9a4f29802d00315937422aec1305504 +DIST xdg-user-dirs-0.15.tar.gz 243747 SHA256 20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786 SHA512 2365003d4c116326357755dbeb462d5d7a4fd1391fe0b4ced5597db1017dff230676773aa8cd4bdd9dbb1bfb59c1c71d08ed860a047e0e9c2ab2487c814c7ca9 WHIRLPOOL 12de27ae0c386f4db740ea5104233d6782d65686fb3df74f9c516d47d253e49f41ed25b75f2bcf9667b1f8e6e6fec66030ccdc6cadb1eb6a5f1a90ab9fe12e3b diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild new file mode 100644 index 000000000000..4b13ccf4a2e9 --- /dev/null +++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild,v 1.1 2013/06/27 10:39:28 ssuominen Exp $ + +EAPI=5 + +DESCRIPTION="A tool to help manage 'well known' user directories" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs" +SRC_URI="http://user-dirs.freedesktop.org/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="gtk" + +RDEPEND="" +# libxslt is mandatory because 0.15 tarball is broken, re: +# http://bugs.freedesktop.org/show_bug.cgi?id=66251 +DEPEND="dev-libs/libxslt + sys-devel/gettext" +PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )" + +DOCS=( AUTHORS ChangeLog NEWS ) diff --git a/xfce-extra/xfce4-equake-plugin/Manifest b/xfce-extra/xfce4-equake-plugin/Manifest new file mode 100644 index 000000000000..900a4020bb1c --- /dev/null +++ b/xfce-extra/xfce4-equake-plugin/Manifest @@ -0,0 +1 @@ +DIST xfce4-equake-plugin-1.3.0.tar.gz 478633 SHA256 75ec2fa2dc751dfb39d605fd9221dde1b0b5c58118662315b7cfa57f47dc6752 SHA512 1a32141f8f558aab557c1bd9b673d986d047f342ed2fe007ba061e3807ac2cfee7a892d41cf065496f203d558d2e6f88c3b2936445773fea91638b0013e8084a WHIRLPOOL 9a6855d6bb2c45f349724b7bec1348a3a672743a9b366a38a3d47c6625cda7786ec1a674767d4bcc96542a933ce78374c29f90c0d3def8470c9616f4e2aa2899 diff --git a/xfce-extra/xfce4-equake-plugin/metadata.xml b/xfce-extra/xfce4-equake-plugin/metadata.xml new file mode 100644 index 000000000000..d56729e92f8e --- /dev/null +++ b/xfce-extra/xfce4-equake-plugin/metadata.xml @@ -0,0 +1,5 @@ + + + + xfce + diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.0.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.0.ebuild new file mode 100644 index 000000000000..850282036dbd --- /dev/null +++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.0.ebuild,v 1.1 2013/06/27 12:33:55 ssuominen Exp $ + +EAPI=5 +inherit xfconf + +DESCRIPTION="Panel plug-in that displays information about earthquakes at regular intervals" +HOMEPAGE="http://www.e-quake.org/" +SRC_URI="http://www.e-quake.org/wp-uploads/2013/06/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=">=dev-libs/glib-2 + x11-libs/gtk+:2 + x11-libs/libX11 + >=xfce-base/libxfce4util-4.10 + >=xfce-base/libxfcegui4-4.10 + >=xfce-base/xfce4-panel-4.10" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +pkg_setup() { + XFCONF=( + $(xfconf_use_debug) + ) + + DOCS=( AUTHORS ChangeLog NEWS README ) +}