From 9f1ed58d32390205a5491dd8a82b590e88527d1a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 5 Dec 2012 13:20:23 +0400 Subject: [PATCH] Sync with portage [Wed Dec 5 13:20:15 MSK 2012]. --- app-accessibility/festival/Manifest | 8 - app-admin/collectd/collectd-5.1.1-r1.ebuild | 4 +- app-admin/collectd/collectd-5.2.0.ebuild | 4 +- app-admin/conky/conky-1.9.0-r1.ebuild | 4 +- app-admin/conky/conky-1.9.0.ebuild | 4 +- app-admin/conky/metadata.xml | 2 +- app-admin/durep/durep-0.9-r4.ebuild | 4 +- .../localepurge-0.5.4-directorysum.patch | 20 + .../files/localepurge-0.5.4-parentdir.patch | 18 + ...5.4.ebuild => localepurge-0.5.4-r1.ebuild} | 6 +- app-arch/libpar2/libpar2-0.2.1.ebuild | 4 +- app-crypt/ssh-multiadd/metadata.xml | 2 +- app-doc/NaturalDocs/metadata.xml | 3 +- app-emulation/qemu/qemu-9999.ebuild | 6 +- app-emulation/virt-manager/metadata.xml | 4 +- .../virt-manager/virt-manager-0.9.4.ebuild | 14 +- .../virt-viewer/virt-viewer-0.5.4-r1.ebuild | 107 +++ .../virtualbox-bin/files/10-virtualbox.rules | 8 +- .../virtualbox-bin-4.2.2.ebuild | 15 +- .../virtualbox-bin-4.2.4.ebuild | 15 +- app-emulation/xen-pvgrub/Manifest | 1 + .../xen-pvgrub/files/newlib-implicits.patch | 149 ++++ .../files/xen-4-fix_dotconfig-gcc.patch | 37 + .../files/xen-4.2.0-externals.patch | 112 +++ .../xen-pvgrub/files/xen-4.2.0-newlib.patch | 12 + .../xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild | 8 +- .../xen-pvgrub/xen-pvgrub-4.1.2.ebuild | 6 +- .../xen-pvgrub/xen-pvgrub-4.2.0.ebuild | 110 +++ app-emulation/xen-tools/Manifest | 5 +- .../files/xen-4.2.0-anti-download.patch | 28 + .../xen-tools/files/xen-4.2.0-jserver.patch | 20 + .../xen-tools/files/xen-4.2.0-nostrip.patch | 37 + .../files/xen-tools-3.3.1-sandbox-fix.patch | 21 - .../xen-tools-3.4.2-fix-definitions.patch | 16 - .../files/xen-tools-3.4.2-fix-include.patch | 28 - .../xen-tools-3.4.2-ldflags-respect.patch | 31 - ...en-tools-3.4.2-remove-default-cflags.patch | 257 ------ .../xen-tools-3.4.2-werror-idiocy-v2.patch | 429 ---------- ...ls-4.1.1-upstream-23104-1976adbf2b80.patch | 731 ------------------ app-emulation/xen-tools/metadata.xml | 5 +- .../xen-tools/xen-tools-3.4.2-r3.ebuild | 241 ------ .../xen-tools/xen-tools-3.4.2-r5.ebuild | 253 ------ .../xen-tools/xen-tools-4.1.1-r6.ebuild | 13 +- .../xen-tools/xen-tools-4.1.2-r3.ebuild | 4 +- ....1-r5.ebuild => xen-tools-4.2.0-r1.ebuild} | 218 +++--- app-emulation/xen/Manifest | 1 + .../xen-3.3.0-unexported-target-fix.patch | 21 - .../xen/files/xen-3.4.2-CVE-2011-1583.patch | 87 --- ...en-3.4.2-dump_registers-watchdog-fix.patch | 19 - .../files/xen-3.4.2-fix-__addr_ok-limit.patch | 101 --- .../xen/files/xen-3.4.2-no-DMA.patch | 71 -- .../xen/files/xen-3.4.2-werror-idiocy.patch | 429 ---------- app-emulation/xen/metadata.xml | 5 +- app-emulation/xen/xen-4.1.1-r2.ebuild | 2 +- app-emulation/xen/xen-4.2.0.ebuild | 120 +++ app-laptop/radeontool/Manifest | 1 - .../files/radeontool-1.5-mmap.patch | 12 - .../files/radeontool-1.5-pagesize.patch | 33 - .../files/radeontool-1.5-vga-ati.patch | 11 - .../radeontool/radeontool-1.5-r3.ebuild | 42 - app-misc/reptyr/reptyr-0.4.ebuild | 4 +- app-misc/srm/metadata.xml | 3 +- app-office/libreoffice/Manifest | 3 + .../libreoffice/libreoffice-3.6.4.3.ebuild | 580 ++++++++++++++ .../libreoffice/libreoffice-4.0.9999.ebuild | 583 ++++++++++++++ app-portage/eix/Manifest | 1 + app-portage/eix/eix-0.27.5.ebuild | 69 ++ app-text/cedilla/metadata.xml | 3 +- app-vim/align/align-42.ebuild | 4 +- .../automatictexplugin-12.1.ebuild | 4 +- app-vim/dbext/dbext-16.0.ebuild | 4 +- app-vim/minibufexpl/minibufexpl-6.4.4.ebuild | 4 +- app-vim/perl-support/perl-support-4.14.ebuild | 6 +- app-vim/perl-support/perl-support-4.8.ebuild | 6 +- app-vim/perl-support/perl-support-5.1.ebuild | 4 +- app-vim/supertab/supertab-2.0.ebuild | 4 +- app-vim/vimpress/vimpress-3.2.0.ebuild | 4 +- .../wikipedia-syntax-20101113.ebuild | 4 +- .../zencoding-vim/zencoding-vim-0.74.ebuild | 4 +- app-vim/zoomwin/zoomwin-24.ebuild | 4 +- .../gstreamermm/gstreamermm-0.10.11.ebuild | 4 +- dev-cpp/tbb/Manifest | 1 - dev-cpp/tbb/tbb-4.1.20120718.ebuild | 120 --- dev-db/libzdb/libzdb-2.10.5.ebuild | 4 +- dev-games/clanlib/clanlib-2.3.6.ebuild | 4 +- dev-lang/niecza-bin/Manifest | 1 + dev-lang/niecza-bin/niecza-bin-24.ebuild | 34 + dev-lang/niecza/Manifest | 3 +- dev-lang/niecza/files/fix-bootstrap-24.patch | 13 + dev-lang/niecza/niecza-22.ebuild | 4 +- dev-lang/niecza/niecza-24.ebuild | 58 ++ dev-lang/orc/orc-0.4.16-r1.ebuild | 4 +- dev-lang/tk/files/tk-8.5.13-multilib.patch | 12 + dev-lang/tk/tk-8.5.13.ebuild | 5 +- dev-lang/vala/vala-0.10.4-r2.ebuild | 4 +- dev-lang/vala/vala-0.12.1-r1.ebuild | 4 +- dev-lang/vala/vala-0.14.2-r2.ebuild | 4 +- dev-lang/vala/vala-0.16.1-r2.ebuild | 4 +- dev-lang/vala/vala-0.18.0.ebuild | 4 +- dev-libs/bitset/Manifest | 1 + dev-libs/bitset/bitset-2.8.1.ebuild | 37 + dev-libs/bitset/metadata.xml | 19 + dev-libs/jthread/jthread-1.2.1.ebuild | 4 +- dev-libs/openct/openct-0.6.20-r3.ebuild | 4 +- .../vala-common/vala-common-0.18.0.ebuild | 4 +- dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild | 4 +- dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild | 4 +- .../django-pipeline-1.2.9.ebuild | 4 +- dev-python/django/django-1.4.1.ebuild | 4 +- dev-python/matplotlib/matplotlib-1.2.0.ebuild | 3 +- dev-python/pymongo/pymongo-2.4.ebuild | 4 +- .../python-exec/python-exec-0.1.1.ebuild | 4 +- dev-ruby/allison/allison-2.0.3-r1.ebuild | 4 +- dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild | 4 +- dev-ruby/ruby-oci8/metadata.xml | 2 +- dev-ruby/simple_oauth/Manifest | 1 + .../simple_oauth/simple_oauth-0.2.0.ebuild | 27 + dev-ruby/stringex/Manifest | 1 + dev-ruby/stringex/stringex-1.5.1.ebuild | 36 + dev-ruby/test-unit-rr/Manifest | 1 + .../test-unit-rr/test-unit-rr-1.0.2.ebuild | 28 + dev-tcltk/blt/blt-2.4z-r10.ebuild | 3 +- dev-tcltk/bwidget/Manifest | 2 - dev-tcltk/bwidget/bwidget-1.7.0.ebuild | 36 - dev-tcltk/bwidget/bwidget-1.8.0.ebuild | 36 - .../files/tkimg-1.4.20100510-boolean.patch | 12 - ...20100510-gentoo+use_bundled_libpng14.patch | 162 ---- dev-tcltk/tkimg/tkimg-1.4-r4.ebuild | 80 -- dev-tcltk/tkimg/tkimg-1.4-r5.ebuild | 81 -- dev-tcltk/tkimg/tkimg-1.4-r6.ebuild | 86 --- dev-tex/dvi2tty/metadata.xml | 2 +- dev-util/aap/aap-1.091-r1.ebuild | 34 + dev-util/catalyst/Manifest | 1 + dev-util/catalyst/catalyst-2.0.12.2.ebuild | 112 +++ dev-util/kdevelop-python/Manifest | 1 + .../kdevelop-python-1.4.1.ebuild | 55 ++ dev-util/kdevelop-python/metadata.xml | 5 + dev-util/rpmdevtools/Manifest | 2 +- ...ools-8.2.ebuild => rpmdevtools-8.3.ebuild} | 2 +- dev-util/skipfish/Manifest | 2 - dev-util/skipfish/skipfish-2.06_beta.ebuild | 56 -- dev-util/skipfish/skipfish-2.07_beta.ebuild | 56 -- dev-vcs/mercurial/mercurial-2.4-r1.ebuild | 3 +- dev-vcs/rcs/metadata.xml | 3 +- .../afternoonstalker-1.1.5.ebuild | 4 +- .../domination/domination-1.1.1.1.ebuild | 4 +- games-board/gnubg/Manifest | 1 + .../gnubg/files/gnubg-20121201-build.patch | 36 + games-board/gnubg/gnubg-20120806.ebuild | 4 +- games-board/gnubg/gnubg-20121201.ebuild | 97 +++ games-emulation/openmsx/openmsx-0.9.1.ebuild | 4 +- games-engines/frobtads/frobtads-1.2.2.ebuild | 4 +- games-engines/scummvm/scummvm-1.5.0.ebuild | 4 +- .../sauerbraten/sauerbraten-2010.07.28.ebuild | 4 +- games-fps/urbanterror/Manifest | 6 +- .../files/urbanterror-4.2.007-build.patch | 70 -- ....patch => urbanterror-4.2.008-build.patch} | 0 .../urbanterror/urbanterror-4.2.007.ebuild | 131 ---- ....006.ebuild => urbanterror-4.2.008.ebuild} | 11 +- games-puzzle/gweled/gweled-0.9.1.ebuild | 4 +- .../flightgear-2.8.0-fgpanel-linking.patch | 23 + .../flightgear/flightgear-2.8.0.ebuild | 20 +- games-simulation/flightgear/metadata.xml | 2 +- games-simulation/openttd/openttd-1.2.2.ebuild | 4 +- games-util/pyfa/Manifest | 2 +- .../pyfa/files/pyfa-1.1.11-import-pyfa.patch | 28 + games-util/pyfa/pyfa-1.1.11.ebuild | 96 +++ games-util/pyfa/pyfa-1.1.9-r1.ebuild | 86 --- licenses/baudline | 8 + licenses/tcltk | 39 + mail-filter/bogofilter/Manifest | 3 +- .../bogofilter/bogofilter-1.2.3.ebuild | 115 +++ mail-filter/maildrop/Manifest | 1 - .../files/maildrop-2.5.4-reformime.patch | 36 - mail-filter/maildrop/maildrop-2.5.5-r1.ebuild | 141 ---- media-gfx/pngcheck/Manifest | 2 +- media-gfx/pngcheck/pngcheck-2.3.0.ebuild | 9 +- media-gfx/povray/povray-3.7.0_rc6.ebuild | 3 +- media-gfx/xli/Manifest | 2 +- media-gfx/xli/xli-1.17.0-r4.ebuild | 6 +- media-libs/libmikmod/Manifest | 2 +- media-libs/libmikmod/libmikmod-3.2.0.ebuild | 7 +- media-libs/libv4l/Manifest | 1 - ...ibv4l-0.8.5-disable_fancy_upsampling.patch | 13 - media-libs/libv4l/libv4l-0.8.5-r1.ebuild | 45 -- media-libs/libv4l/libv4l-0.8.5.ebuild | 43 -- media-libs/opengl-apple/opengl-apple-3.ebuild | 6 +- media-libs/opengl-apple/opengl-apple-4.ebuild | 6 +- media-libs/opengtl/opengtl-0.9.17.ebuild | 4 +- .../sdl-terminal/sdl-terminal-1.1.3-r1.ebuild | 4 +- .../gst-plugins-jpeg-0.10.31.ebuild | 4 +- .../gst-plugins-jpeg-1.0.3.ebuild | 5 +- media-plugins/gst-plugins-libav/Manifest | 1 + .../gst-plugins-libav-1.0.3.ebuild | 60 ++ media-plugins/gst-plugins-libav/metadata.xml | 9 + media-plugins/gst-plugins-voaacenc/Manifest | 1 + .../gst-plugins-voaacenc-1.0.3.ebuild | 14 + .../gst-plugins-voaacenc/metadata.xml | 5 + .../gst-plugins-vorbis-0.10.36.ebuild | 6 +- media-sound/baudline/baudline-1.08-r1.ebuild | 4 +- .../fluidsynth/fluidsynth-1.1.6.ebuild | 4 +- media-sound/mangler/mangler-1.2.4.ebuild | 4 +- media-sound/podracer/Manifest | 2 +- media-sound/podracer/podracer-1.4.ebuild | 6 +- media-sound/skype-call-recorder/Manifest | 2 +- .../skype-call-recorder-0.8.ebuild | 6 +- media-sound/xmms2-scrobbler/Manifest | 2 +- .../xmms2-scrobbler-0.4.0.ebuild | 4 +- media-tv/v4l-utils/Manifest | 1 - media-tv/v4l-utils/v4l-utils-0.8.5.ebuild | 48 -- media-tv/v4l-utils/v4l-utils-0.8.8.ebuild | 48 -- .../vcdimager/vcdimager-0.7.23-r1.ebuild | 4 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../md5-cache/app-admin/collectd-5.1.1-r1 | 2 +- metadata/md5-cache/app-admin/collectd-5.2.0 | 2 +- metadata/md5-cache/app-admin/conky-1.9.0 | 6 +- metadata/md5-cache/app-admin/conky-1.9.0-r1 | 6 +- metadata/md5-cache/app-admin/durep-0.9-r4 | 4 +- ...localepurge-0.5.4 => localepurge-0.5.4-r1} | 2 +- metadata/md5-cache/app-arch/libpar2-0.2.1 | 4 +- metadata/md5-cache/app-emulation/qemu-9999 | 6 +- .../app-emulation/virt-manager-0.9.4 | 8 +- .../app-emulation/virt-viewer-0.5.4-r1 | 14 + .../app-emulation/virtualbox-bin-4.2.2 | 6 +- .../app-emulation/virtualbox-bin-4.2.4 | 6 +- metadata/md5-cache/app-emulation/xen-4.1.1-r2 | 2 +- metadata/md5-cache/app-emulation/xen-4.2.0 | 15 + .../app-emulation/xen-pvgrub-4.1.1-r1 | 2 +- .../md5-cache/app-emulation/xen-pvgrub-4.1.2 | 2 +- .../md5-cache/app-emulation/xen-pvgrub-4.2.0 | 13 + .../app-emulation/xen-tools-3.4.2-r3 | 13 - .../app-emulation/xen-tools-3.4.2-r5 | 13 - .../app-emulation/xen-tools-4.1.1-r5 | 13 - .../app-emulation/xen-tools-4.1.1-r6 | 8 +- .../app-emulation/xen-tools-4.1.2-r3 | 4 +- .../app-emulation/xen-tools-4.2.0-r1 | 15 + .../md5-cache/app-laptop/radeontool-1.5-r3 | 11 - metadata/md5-cache/app-misc/reptyr-0.4 | 4 +- .../md5-cache/app-office/libreoffice-3.6.4.3 | 15 + .../md5-cache/app-office/libreoffice-4.0.9999 | 14 + metadata/md5-cache/app-portage/eix-0.27.5 | 13 + metadata/md5-cache/app-vim/align-42 | 4 +- .../md5-cache/app-vim/automatictexplugin-12.1 | 4 +- metadata/md5-cache/app-vim/dbext-16.0 | 4 +- metadata/md5-cache/app-vim/minibufexpl-6.4.4 | 4 +- metadata/md5-cache/app-vim/perl-support-4.14 | 4 +- metadata/md5-cache/app-vim/perl-support-4.8 | 4 +- metadata/md5-cache/app-vim/perl-support-5.1 | 4 +- metadata/md5-cache/app-vim/supertab-2.0 | 4 +- metadata/md5-cache/app-vim/vimpress-3.2.0 | 4 +- .../app-vim/wikipedia-syntax-20101113 | 4 +- metadata/md5-cache/app-vim/zencoding-vim-0.74 | 4 +- metadata/md5-cache/app-vim/zoomwin-24 | 4 +- .../md5-cache/dev-cpp/gstreamermm-0.10.11 | 6 +- metadata/md5-cache/dev-cpp/tbb-4.1.20120718 | 12 - metadata/md5-cache/dev-db/libzdb-2.10.5 | 4 +- metadata/md5-cache/dev-games/clanlib-2.3.6 | 4 +- metadata/md5-cache/dev-lang/niecza-22 | 4 +- metadata/md5-cache/dev-lang/niecza-24 | 12 + metadata/md5-cache/dev-lang/niecza-bin-24 | 12 + metadata/md5-cache/dev-lang/orc-0.4.16-r1 | 4 +- metadata/md5-cache/dev-lang/tk-8.5.13 | 2 +- metadata/md5-cache/dev-lang/vala-0.10.4-r2 | 4 +- metadata/md5-cache/dev-lang/vala-0.12.1-r1 | 4 +- metadata/md5-cache/dev-lang/vala-0.14.2-r2 | 4 +- metadata/md5-cache/dev-lang/vala-0.16.1-r2 | 4 +- metadata/md5-cache/dev-lang/vala-0.18.0 | 4 +- metadata/md5-cache/dev-libs/bitset-2.8.1 | 14 + metadata/md5-cache/dev-libs/jthread-1.2.1 | 4 +- metadata/md5-cache/dev-libs/openct-0.6.20-r3 | 4 +- .../md5-cache/dev-libs/vala-common-0.18.0 | 4 +- metadata/md5-cache/dev-perl/Alien-SDL-1.436.0 | 4 +- .../md5-cache/dev-php/pecl-geoip-1.0.8-r1 | 4 +- metadata/md5-cache/dev-python/django-1.4.1 | 4 +- .../dev-python/django-pipeline-1.2.9 | 4 +- .../md5-cache/dev-python/matplotlib-1.2.0 | 2 +- metadata/md5-cache/dev-python/pymongo-2.4 | 2 +- .../md5-cache/dev-python/python-exec-0.1.1 | 4 +- metadata/md5-cache/dev-ruby/allison-2.0.3-r1 | 4 +- metadata/md5-cache/dev-ruby/ruby-augeas-0.4.1 | 4 +- .../md5-cache/dev-ruby/simple_oauth-0.2.0 | 14 + metadata/md5-cache/dev-ruby/stringex-1.5.1 | 14 + .../md5-cache/dev-ruby/test-unit-rr-1.0.2 | 14 + metadata/md5-cache/dev-tcltk/blt-2.4z-r10 | 2 +- metadata/md5-cache/dev-tcltk/bwidget-1.7.0 | 13 - metadata/md5-cache/dev-tcltk/bwidget-1.8.0 | 13 - metadata/md5-cache/dev-tcltk/tkimg-1.4-r4 | 14 - metadata/md5-cache/dev-tcltk/tkimg-1.4-r5 | 14 - metadata/md5-cache/dev-tcltk/tkimg-1.4-r6 | 14 - metadata/md5-cache/dev-util/aap-1.091-r1 | 12 + metadata/md5-cache/dev-util/catalyst-2.0.12.2 | 13 + .../md5-cache/dev-util/kdevelop-python-1.4.1 | 14 + .../{rpmdevtools-8.2 => rpmdevtools-8.3} | 4 +- .../md5-cache/dev-util/skipfish-2.06_beta | 13 - .../md5-cache/dev-util/skipfish-2.07_beta | 13 - metadata/md5-cache/dev-vcs/mercurial-2.4-r1 | 2 +- .../games-arcade/afternoonstalker-1.1.5 | 4 +- .../md5-cache/games-board/domination-1.1.1.1 | 4 +- metadata/md5-cache/games-board/gnubg-20120806 | 4 +- metadata/md5-cache/games-board/gnubg-20121201 | 13 + .../md5-cache/games-emulation/openmsx-0.9.1 | 4 +- .../md5-cache/games-engines/frobtads-1.2.2 | 4 +- .../md5-cache/games-engines/scummvm-1.5.0 | 4 +- .../games-fps/sauerbraten-2010.07.28 | 4 +- .../md5-cache/games-fps/urbanterror-4.2.006 | 14 - ...rbanterror-4.2.007 => urbanterror-4.2.008} | 6 +- metadata/md5-cache/games-puzzle/gweled-0.9.1 | 4 +- .../games-simulation/flightgear-2.8.0 | 8 +- .../md5-cache/games-simulation/openttd-1.2.2 | 4 +- metadata/md5-cache/games-util/pyfa-1.1.11 | 14 + metadata/md5-cache/games-util/pyfa-1.1.9-r1 | 13 - .../md5-cache/mail-filter/bogofilter-1.2.3 | 13 + .../md5-cache/mail-filter/maildrop-2.5.5-r1 | 14 - metadata/md5-cache/media-gfx/pngcheck-2.3.0 | 4 +- metadata/md5-cache/media-gfx/povray-3.7.0_rc6 | 2 +- metadata/md5-cache/media-gfx/xli-1.17.0-r4 | 4 +- metadata/md5-cache/media-libs/libmikmod-3.2.0 | 6 +- metadata/md5-cache/media-libs/libv4l-0.8.5 | 12 - metadata/md5-cache/media-libs/libv4l-0.8.5-r1 | 12 - metadata/md5-cache/media-libs/opengl-apple-3 | 4 +- metadata/md5-cache/media-libs/opengl-apple-4 | 4 +- metadata/md5-cache/media-libs/opengtl-0.9.17 | 4 +- .../media-libs/sdl-terminal-1.1.3-r1 | 4 +- .../media-plugins/gst-plugins-jpeg-0.10.31 | 6 +- .../media-plugins/gst-plugins-jpeg-1.0.3 | 6 +- .../media-plugins/gst-plugins-libav-1.0.3 | 13 + .../media-plugins/gst-plugins-voaacenc-1.0.3 | 13 + .../media-plugins/gst-plugins-vorbis-0.10.36 | 4 +- .../md5-cache/media-sound/baudline-1.08-r1 | 4 +- .../md5-cache/media-sound/fluidsynth-1.1.6 | 4 +- metadata/md5-cache/media-sound/mangler-1.2.4 | 4 +- metadata/md5-cache/media-sound/podracer-1.4 | 4 +- .../media-sound/skype-call-recorder-0.8 | 4 +- .../media-sound/xmms2-scrobbler-0.4.0 | 4 +- metadata/md5-cache/media-tv/v4l-utils-0.8.5 | 13 - metadata/md5-cache/media-tv/v4l-utils-0.8.8 | 13 - .../md5-cache/media-video/vcdimager-0.7.23-r1 | 4 +- metadata/md5-cache/net-analyzer/hydra-6.1 | 13 - metadata/md5-cache/net-analyzer/hydra-6.2 | 13 - metadata/md5-cache/net-analyzer/hydra-6.3 | 13 - metadata/md5-cache/net-analyzer/hydra-6.5 | 13 - metadata/md5-cache/net-analyzer/hydra-6.5-r1 | 13 - metadata/md5-cache/net-analyzer/hydra-7.0 | 13 - metadata/md5-cache/net-analyzer/hydra-7.1 | 13 - metadata/md5-cache/net-analyzer/hydra-7.2 | 13 - metadata/md5-cache/net-analyzer/hydra-7.3 | 4 +- .../md5-cache/net-analyzer/wireshark-1.6.12 | 4 +- .../md5-cache/net-analyzer/wireshark-1.8.4 | 4 +- .../net-dns/{bind-9.9.2 => bind-9.9.2_p1} | 6 +- .../{cifs-utils-5.8 => cifs-utils-5.8-r1} | 4 +- metadata/md5-cache/net-fs/ncpfs-2.2.6-r2 | 4 +- metadata/md5-cache/net-fs/nfs-utils-1.2.6 | 4 +- metadata/md5-cache/net-im/purple-events-0.2 | 4 +- metadata/md5-cache/net-irc/irker-1.14 | 12 + .../md5-cache/net-libs/libircclient-1.6-r1 | 4 +- metadata/md5-cache/net-mail/dbmail-3.0.2 | 4 +- metadata/md5-cache/net-mail/dovecot-2.1.12-r1 | 4 +- metadata/md5-cache/net-mail/metamail-2.7.53.3 | 11 - metadata/md5-cache/net-mail/mhonarc-2.6.18-r1 | 4 +- .../net-misc/freerdp-1.1.0_pre20121004-r1 | 4 +- metadata/md5-cache/net-misc/gogoc-1.2-r2 | 4 +- metadata/md5-cache/net-misc/npapi-sdk-0.27 | 6 +- .../net-misc/remmina-1.0.0_p20121004 | 4 +- metadata/md5-cache/net-misc/spice-gtk-0.11 | 13 - metadata/md5-cache/net-misc/spice-gtk-0.12 | 13 - metadata/md5-cache/net-misc/spice-gtk-0.13 | 13 - metadata/md5-cache/net-misc/spice-gtk-0.14-r1 | 14 + metadata/md5-cache/net-misc/spice-gtk-0.8 | 13 - metadata/md5-cache/net-proxy/c-icap-0.2.2 | 4 +- metadata/md5-cache/net-voip/ekiga-4.0.0 | 13 - metadata/md5-cache/net-voip/ekiga-4.0.0-r1 | 13 + .../md5-cache/net-wireless/ubertooth-9999 | 2 +- metadata/md5-cache/sci-libs/cbflib-0.9.0-r3 | 13 - metadata/md5-cache/sci-libs/cbflib-0.9.2.3 | 13 - metadata/md5-cache/sci-libs/cbflib-0.9.2.4 | 4 +- metadata/md5-cache/sci-libs/cqrlib-1.0.6 | 12 - metadata/md5-cache/sci-libs/cqrlib-1.1.2 | 12 - metadata/md5-cache/sci-libs/cqrlib-1.1.2-r1 | 4 +- metadata/md5-cache/sci-libs/djbfft-0.76-r1 | 4 +- metadata/md5-cache/sci-libs/gdal-1.9.1 | 6 +- metadata/md5-cache/sci-libs/hdf5-1.8.10 | 4 +- metadata/md5-cache/sci-libs/neartree-2.3.2 | 13 - metadata/md5-cache/sci-libs/neartree-3.1.1 | 13 - metadata/md5-cache/sci-libs/neartree-3.1.1-r3 | 4 +- .../md5-cache/sci-libs/shapelib-1.2.10-r1 | 11 - metadata/md5-cache/sci-libs/shapelib-1.3.0-r1 | 4 +- .../md5-cache/sci-mathematics/octave-3.6.3 | 6 +- metadata/md5-cache/sci-physics/bullet-2.77 | 13 - metadata/md5-cache/sci-physics/bullet-2.80 | 4 +- .../md5-cache/sci-visualization/epix-1.2.10 | 4 +- .../md5-cache/sci-visualization/epix-1.2.6 | 13 - .../md5-cache/sec-policy/selinux-base-9999 | 4 +- .../sec-policy/selinux-base-policy-9999 | 5 +- .../md5-cache/sec-policy/selinux-dirsrv-9999 | 10 + ...rvice-0.6.29 => accountsservice-0.6.29-r1} | 2 +- metadata/md5-cache/sys-apps/busybox-9999 | 2 +- metadata/md5-cache/sys-apps/coreutils-8.20 | 4 +- metadata/md5-cache/sys-apps/irqbalance-1.0.5 | 13 + metadata/md5-cache/sys-apps/portage-2.1.11.31 | 4 +- metadata/md5-cache/sys-apps/portage-2.1.11.33 | 4 +- metadata/md5-cache/sys-apps/portage-2.1.11.9 | 4 +- .../md5-cache/sys-apps/portage-2.2.0_alpha142 | 4 +- .../md5-cache/sys-apps/portage-2.2.0_alpha144 | 4 +- metadata/md5-cache/sys-apps/portage-9999 | 4 +- metadata/md5-cache/sys-apps/systemd-196 | 2 +- metadata/md5-cache/sys-auth/sssd-1.9.2 | 2 +- metadata/md5-cache/sys-block/mbuffer-20121111 | 13 + .../thin-provisioning-tools-0.1.5-r1 | 4 +- .../sys-cluster/util-vserver-0.30.216_pre3025 | 2 +- metadata/md5-cache/sys-firmware/vgabios-0.7a | 4 +- .../md5-cache/sys-fs/aufs3-3_p20120813-r1 | 4 +- metadata/md5-cache/sys-fs/extundelete-0.2.0 | 11 - .../md5-cache/sys-fs/extundelete-0.2.0-r2 | 12 + metadata/md5-cache/sys-fs/ncdu-1.9 | 4 +- .../md5-cache/sys-kernel/git-sources-3.7_rc8 | 15 + .../sys-kernel/linux-firmware-20120924 | 4 +- .../sys-kernel/vanilla-sources-3.0.54 | 15 + .../sys-kernel/vanilla-sources-3.4.21 | 15 + metadata/md5-cache/sys-libs/talloc-2.0.8 | 13 + metadata/md5-cache/sys-libs/tdb-1.2.11 | 13 + metadata/md5-cache/www-apps/owncloud-4.5.4 | 14 + .../md5-cache/www-client/luakit-2010.12.25_p2 | 4 +- .../md5-cache/www-client/luakit-2011.04.13 | 4 +- .../md5-cache/www-client/luakit-2011.04.13_p1 | 4 +- .../md5-cache/www-client/luakit-2011.07.22 | 4 +- .../md5-cache/www-client/luakit-2011.07.22_p1 | 4 +- .../md5-cache/www-client/luakit-2012.03.25 | 4 +- .../md5-cache/www-client/luakit-2012.09.13_p1 | 4 +- metadata/md5-cache/www-client/luakit-9999 | 4 +- .../md5-cache/www-client/seamonkey-2.14.1 | 4 +- metadata/md5-cache/www-servers/webfs-1.21-r2 | 7 +- .../md5-cache/x11-libs/qt-assistant-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-bearer-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-core-4.8.4 | 14 + metadata/md5-cache/x11-libs/qt-dbus-4.8.4 | 13 + .../md5-cache/x11-libs/qt-declarative-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-demo-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-gui-4.8.4 | 15 + .../md5-cache/x11-libs/qt-multimedia-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-opengl-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-openvg-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-phonon-4.8.4 | 13 + .../md5-cache/x11-libs/qt-qt3support-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-script-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-sql-4.8.4 | 14 + metadata/md5-cache/x11-libs/qt-svg-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-test-4.8.4 | 13 + metadata/md5-cache/x11-libs/qt-webkit-4.8.4 | 13 + .../md5-cache/x11-libs/qt-xmlpatterns-4.8.4 | 13 + .../x11-plugins/purple-libnotify-plus-1.99.2 | 4 +- .../x11-themes/ubuntu-wallpapers-0.34.1 | 4 +- ...7.0_alpha6 => enlightenment-0.17.0_alpha8} | 8 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-analyzer/hydra/Manifest | 7 - net-analyzer/hydra/files/hydra-6.5-fix.diff | 30 - net-analyzer/hydra/hydra-6.1.ebuild | 82 -- net-analyzer/hydra/hydra-6.2.ebuild | 82 -- net-analyzer/hydra/hydra-6.3.ebuild | 82 -- net-analyzer/hydra/hydra-6.5-r1.ebuild | 84 -- net-analyzer/hydra/hydra-6.5.ebuild | 82 -- net-analyzer/hydra/hydra-7.0.ebuild | 98 --- net-analyzer/hydra/hydra-7.1.ebuild | 100 --- net-analyzer/hydra/hydra-7.2.ebuild | 99 --- net-analyzer/hydra/hydra-7.3.ebuild | 4 +- .../wireshark/wireshark-1.6.12.ebuild | 4 +- net-analyzer/wireshark/wireshark-1.8.4.ebuild | 4 +- net-dns/bind/Manifest | 3 +- ...bind-9.9.2.ebuild => bind-9.9.2_p1.ebuild} | 30 +- ...ls-5.8.ebuild => cifs-utils-5.8-r1.ebuild} | 11 +- net-fs/ncpfs/Manifest | 2 +- net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild | 4 +- net-fs/nfs-utils/nfs-utils-1.2.6.ebuild | 4 +- net-im/purple-events/purple-events-0.2.ebuild | 4 +- net-irc/irker/Manifest | 1 + net-irc/irker/irker-1.14.ebuild | 28 + .../libircclient/libircclient-1.6-r1.ebuild | 4 +- net-mail/dbmail/dbmail-3.0.2.ebuild | 4 +- net-mail/dovecot/dovecot-2.1.12-r1.ebuild | 4 +- net-mail/metamail/metamail-2.7.53.3.ebuild | 45 -- net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild | 4 +- .../freerdp-1.1.0_pre20121004-r1.ebuild | 4 +- net-misc/gogoc/gogoc-1.2-r2.ebuild | 4 +- net-misc/npapi-sdk/npapi-sdk-0.27.ebuild | 6 +- .../remmina/remmina-1.0.0_p20121004.ebuild | 4 +- net-misc/spice-gtk/Manifest | 4 - net-misc/spice-gtk/spice-gtk-0.11.ebuild | 130 ---- net-misc/spice-gtk/spice-gtk-0.12.ebuild | 118 --- ...k-0.13.ebuild => spice-gtk-0.14-r1.ebuild} | 115 ++- net-misc/spice-gtk/spice-gtk-0.8.ebuild | 129 ---- net-proxy/c-icap/c-icap-0.2.2.ebuild | 4 +- ...iga-4.0.0.ebuild => ekiga-4.0.0-r1.ebuild} | 9 +- net-wireless/ubertooth/ubertooth-9999.ebuild | 4 +- profiles/base/package.mask | 3 +- profiles/base/package.use.force | 7 +- profiles/features/selinux/package.mask | 3 +- profiles/package.mask | 5 +- profiles/use.local.desc | 11 +- sci-libs/cbflib/Manifest | 4 - sci-libs/cbflib/cbflib-0.9.0-r3.ebuild | 93 --- sci-libs/cbflib/cbflib-0.9.2.3.ebuild | 68 -- sci-libs/cbflib/cbflib-0.9.2.4.ebuild | 4 +- sci-libs/cqrlib/Manifest | 1 - sci-libs/cqrlib/cqrlib-1.0.6.ebuild | 56 -- sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild | 4 +- sci-libs/cqrlib/cqrlib-1.1.2.ebuild | 56 -- sci-libs/djbfft/djbfft-0.76-r1.ebuild | 4 +- sci-libs/gdal/gdal-1.9.1.ebuild | 4 +- sci-libs/hdf5/hdf5-1.8.10.ebuild | 14 +- sci-libs/libsvm/files/3.14-makefile.patch | 4 +- sci-libs/neartree/Manifest | 1 - sci-libs/neartree/neartree-2.3.2.ebuild | 57 -- sci-libs/neartree/neartree-3.1.1-r3.ebuild | 4 +- sci-libs/neartree/neartree-3.1.1.ebuild | 55 -- sci-libs/shapelib/Manifest | 1 - sci-libs/shapelib/shapelib-1.2.10-r1.ebuild | 45 -- sci-libs/shapelib/shapelib-1.3.0-r1.ebuild | 4 +- sci-mathematics/octave/octave-3.6.3.ebuild | 5 +- sci-physics/bullet/Manifest | 1 - sci-physics/bullet/bullet-2.77.ebuild | 52 -- sci-physics/bullet/bullet-2.80.ebuild | 4 +- sci-physics/bullet/metadata.xml | 18 +- sci-visualization/epix/Manifest | 1 - sci-visualization/epix/epix-1.2.10.ebuild | 4 +- sci-visualization/epix/epix-1.2.6.ebuild | 69 -- sci-visualization/epix/metadata.xml | 4 +- sec-policy/selinux-base-policy/metadata.xml | 3 + .../selinux-base-policy-9999.ebuild | 22 +- sec-policy/selinux-base/metadata.xml | 1 + .../selinux-base/selinux-base-9999.ebuild | 16 +- sec-policy/selinux-dirsrv/Manifest | 0 sec-policy/selinux-dirsrv/metadata.xml | 6 + .../selinux-dirsrv/selinux-dirsrv-9999.ebuild | 14 + ...build => accountsservice-0.6.29-r1.ebuild} | 3 +- .../accountsservice-0.6.29-32bit-crash.patch | 30 + sys-apps/busybox/busybox-9999.ebuild | 26 +- sys-apps/busybox/files/klogd.confd | 9 + sys-apps/busybox/files/klogd.initd | 12 + sys-apps/busybox/files/ntpd.confd | 6 + sys-apps/busybox/files/ntpd.initd | 13 + sys-apps/busybox/files/syslogd.confd | 9 + sys-apps/busybox/files/syslogd.initd | 14 + sys-apps/busybox/files/watchdog.confd | 9 + sys-apps/busybox/files/watchdog.initd | 12 + sys-apps/coreutils/coreutils-8.20.ebuild | 4 +- sys-apps/irqbalance/Manifest | 1 + sys-apps/irqbalance/irqbalance-1.0.5.ebuild | 35 + sys-apps/portage/portage-2.1.11.31.ebuild | 5 +- sys-apps/portage/portage-2.1.11.33.ebuild | 5 +- sys-apps/portage/portage-2.1.11.9.ebuild | 5 +- .../portage/portage-2.2.0_alpha142.ebuild | 5 +- .../portage/portage-2.2.0_alpha144.ebuild | 5 +- sys-apps/portage/portage-9999.ebuild | 5 +- ...on-t-fail-with-missing-gcrypt-macros.patch | 31 + sys-apps/systemd/systemd-196.ebuild | 3 +- sys-auth/sssd/sssd-1.9.2.ebuild | 4 +- sys-block/mbuffer/Manifest | 7 +- ...er-20121111-resolv-multi-order-issue.patch | 21 + sys-block/mbuffer/mbuffer-20121111.ebuild | 37 + .../thin-provisioning-tools-0.1.5-r1.ebuild | 4 +- sys-cluster/util-vserver/Manifest | 4 +- .../util-vserver-0.30.216_pre3025.ebuild | 4 +- sys-firmware/vgabios/vgabios-0.7a.ebuild | 4 +- sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild | 4 +- sys-fs/extundelete/Manifest | 3 +- .../extundelete/extundelete-0.2.0-r2.ebuild | 30 + sys-fs/extundelete/extundelete-0.2.0.ebuild | 29 - sys-fs/extundelete/metadata.xml | 9 +- sys-fs/ncdu/ncdu-1.9.ebuild | 4 +- sys-kernel/git-sources/Manifest | 1 + .../git-sources/git-sources-3.7_rc8.ebuild | 35 + .../linux-firmware-20120924.ebuild | 4 +- sys-kernel/vanilla-sources/Manifest | 2 + .../vanilla-sources-3.0.54.ebuild | 19 + .../vanilla-sources-3.4.21.ebuild | 19 + sys-libs/talloc/Manifest | 1 + sys-libs/talloc/talloc-2.0.8.ebuild | 64 ++ sys-libs/tdb/Manifest | 1 + sys-libs/tdb/tdb-1.2.11.ebuild | 42 + www-apps/owncloud/Manifest | 1 + www-apps/owncloud/owncloud-4.5.4.ebuild | 47 ++ www-client/luakit/luakit-2010.12.25_p2.ebuild | 4 +- www-client/luakit/luakit-2011.04.13.ebuild | 4 +- www-client/luakit/luakit-2011.04.13_p1.ebuild | 4 +- www-client/luakit/luakit-2011.07.22.ebuild | 4 +- www-client/luakit/luakit-2011.07.22_p1.ebuild | 4 +- www-client/luakit/luakit-2012.03.25.ebuild | 4 +- www-client/luakit/luakit-2012.09.13_p1.ebuild | 4 +- www-client/luakit/luakit-9999.ebuild | 4 +- www-client/seamonkey/Manifest | 1 + www-client/seamonkey/seamonkey-2.14.1.ebuild | 4 +- .../lightspark-0.6.0.1-gcc-4.5_0001.patch | 38 + www-servers/webfs/webfs-1.21-r2.ebuild | 17 +- x11-libs/qt-assistant/Manifest | 1 + .../qt-assistant/qt-assistant-4.8.4.ebuild | 134 ++++ x11-libs/qt-bearer/Manifest | 1 + x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild | 58 ++ x11-libs/qt-core/Manifest | 1 + x11-libs/qt-core/qt-core-4.8.4.ebuild | 180 +++++ x11-libs/qt-dbus/Manifest | 1 + x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild | 52 ++ x11-libs/qt-declarative/Manifest | 1 + .../qt-declarative-4.8.4.ebuild | 77 ++ x11-libs/qt-demo/Manifest | 1 + x11-libs/qt-demo/qt-demo-4.8.4.ebuild | 114 +++ x11-libs/qt-gui/Manifest | 1 + x11-libs/qt-gui/qt-gui-4.8.4.ebuild | 252 ++++++ x11-libs/qt-multimedia/Manifest | 1 + .../qt-multimedia/qt-multimedia-4.8.4.ebuild | 60 ++ x11-libs/qt-opengl/Manifest | 1 + x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild | 64 ++ x11-libs/qt-openvg/Manifest | 1 + x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild | 62 ++ x11-libs/qt-phonon/Manifest | 1 + x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild | 56 ++ x11-libs/qt-qt3support/Manifest | 1 + .../qt-qt3support/qt-qt3support-4.8.4.ebuild | 46 ++ x11-libs/qt-script/Manifest | 1 + x11-libs/qt-script/qt-script-4.8.4.ebuild | 60 ++ x11-libs/qt-sql/Manifest | 1 + x11-libs/qt-sql/qt-sql-4.8.4.ebuild | 73 ++ x11-libs/qt-svg/Manifest | 1 + x11-libs/qt-svg/qt-svg-4.8.4.ebuild | 61 ++ x11-libs/qt-test/Manifest | 1 + x11-libs/qt-test/qt-test-4.8.4.ebuild | 45 ++ x11-libs/qt-webkit/Manifest | 1 + x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild | 85 ++ x11-libs/qt-xmlpatterns/Manifest | 1 + .../qt-xmlpatterns-4.8.4.ebuild | 48 ++ .../purple-libnotify-plus-1.99.2.ebuild | 4 +- .../ubuntu-wallpapers-0.34.1.ebuild | 4 +- x11-wm/enlightenment/Manifest | 2 +- ...ild => enlightenment-0.17.0_alpha8.ebuild} | 3 +- 636 files changed, 6878 insertions(+), 7406 deletions(-) create mode 100644 app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch create mode 100644 app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch rename app-admin/localepurge/{localepurge-0.5.4.ebuild => localepurge-0.5.4-r1.ebuild} (84%) create mode 100644 app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild create mode 100644 app-emulation/xen-pvgrub/files/newlib-implicits.patch create mode 100644 app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch create mode 100644 app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch create mode 100644 app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch create mode 100644 app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild create mode 100644 app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch create mode 100644 app-emulation/xen-tools/files/xen-4.2.0-jserver.patch create mode 100644 app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch delete mode 100644 app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch delete mode 100644 app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild delete mode 100644 app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild rename app-emulation/xen-tools/{xen-tools-4.1.1-r5.ebuild => xen-tools-4.2.0-r1.ebuild} (58%) delete mode 100644 app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch delete mode 100644 app-emulation/xen/files/xen-3.4.2-CVE-2011-1583.patch delete mode 100644 app-emulation/xen/files/xen-3.4.2-dump_registers-watchdog-fix.patch delete mode 100644 app-emulation/xen/files/xen-3.4.2-fix-__addr_ok-limit.patch delete mode 100644 app-emulation/xen/files/xen-3.4.2-no-DMA.patch delete mode 100644 app-emulation/xen/files/xen-3.4.2-werror-idiocy.patch create mode 100644 app-emulation/xen/xen-4.2.0.ebuild delete mode 100644 app-laptop/radeontool/files/radeontool-1.5-mmap.patch delete mode 100644 app-laptop/radeontool/files/radeontool-1.5-pagesize.patch delete mode 100644 app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch delete mode 100644 app-laptop/radeontool/radeontool-1.5-r3.ebuild create mode 100644 app-office/libreoffice/libreoffice-3.6.4.3.ebuild create mode 100644 app-office/libreoffice/libreoffice-4.0.9999.ebuild create mode 100644 app-portage/eix/eix-0.27.5.ebuild delete mode 100644 dev-cpp/tbb/tbb-4.1.20120718.ebuild create mode 100644 dev-lang/niecza-bin/niecza-bin-24.ebuild create mode 100644 dev-lang/niecza/files/fix-bootstrap-24.patch create mode 100644 dev-lang/niecza/niecza-24.ebuild create mode 100644 dev-lang/tk/files/tk-8.5.13-multilib.patch create mode 100644 dev-libs/bitset/Manifest create mode 100644 dev-libs/bitset/bitset-2.8.1.ebuild create mode 100644 dev-libs/bitset/metadata.xml create mode 100644 dev-ruby/simple_oauth/simple_oauth-0.2.0.ebuild create mode 100644 dev-ruby/stringex/stringex-1.5.1.ebuild create mode 100644 dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild delete mode 100644 dev-tcltk/bwidget/bwidget-1.7.0.ebuild delete mode 100644 dev-tcltk/bwidget/bwidget-1.8.0.ebuild delete mode 100644 dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch delete mode 100644 dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch delete mode 100644 dev-tcltk/tkimg/tkimg-1.4-r4.ebuild delete mode 100644 dev-tcltk/tkimg/tkimg-1.4-r5.ebuild delete mode 100644 dev-tcltk/tkimg/tkimg-1.4-r6.ebuild create mode 100644 dev-util/aap/aap-1.091-r1.ebuild create mode 100644 dev-util/catalyst/catalyst-2.0.12.2.ebuild create mode 100644 dev-util/kdevelop-python/Manifest create mode 100644 dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild create mode 100644 dev-util/kdevelop-python/metadata.xml rename dev-util/rpmdevtools/{rpmdevtools-8.2.ebuild => rpmdevtools-8.3.ebuild} (90%) delete mode 100644 dev-util/skipfish/skipfish-2.06_beta.ebuild delete mode 100644 dev-util/skipfish/skipfish-2.07_beta.ebuild create mode 100644 games-board/gnubg/files/gnubg-20121201-build.patch create mode 100644 games-board/gnubg/gnubg-20121201.ebuild delete mode 100644 games-fps/urbanterror/files/urbanterror-4.2.007-build.patch rename games-fps/urbanterror/files/{urbanterror-4.2.006-build.patch => urbanterror-4.2.008-build.patch} (100%) delete mode 100644 games-fps/urbanterror/urbanterror-4.2.007.ebuild rename games-fps/urbanterror/{urbanterror-4.2.006.ebuild => urbanterror-4.2.008.ebuild} (91%) create mode 100644 games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch create mode 100644 games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch create mode 100644 games-util/pyfa/pyfa-1.1.11.ebuild delete mode 100644 games-util/pyfa/pyfa-1.1.9-r1.ebuild create mode 100644 licenses/baudline create mode 100644 licenses/tcltk create mode 100644 mail-filter/bogofilter/bogofilter-1.2.3.ebuild delete mode 100644 mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch delete mode 100644 mail-filter/maildrop/maildrop-2.5.5-r1.ebuild delete mode 100644 media-libs/libv4l/files/libv4l-0.8.5-disable_fancy_upsampling.patch delete mode 100644 media-libs/libv4l/libv4l-0.8.5-r1.ebuild delete mode 100644 media-libs/libv4l/libv4l-0.8.5.ebuild create mode 100644 media-plugins/gst-plugins-libav/Manifest create mode 100644 media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild create mode 100644 media-plugins/gst-plugins-libav/metadata.xml create mode 100644 media-plugins/gst-plugins-voaacenc/Manifest create mode 100644 media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.0.3.ebuild create mode 100644 media-plugins/gst-plugins-voaacenc/metadata.xml delete mode 100644 media-tv/v4l-utils/v4l-utils-0.8.5.ebuild delete mode 100644 media-tv/v4l-utils/v4l-utils-0.8.8.ebuild rename metadata/md5-cache/app-admin/{localepurge-0.5.4 => localepurge-0.5.4-r1} (94%) create mode 100644 metadata/md5-cache/app-emulation/virt-viewer-0.5.4-r1 create mode 100644 metadata/md5-cache/app-emulation/xen-4.2.0 create mode 100644 metadata/md5-cache/app-emulation/xen-pvgrub-4.2.0 delete mode 100644 metadata/md5-cache/app-emulation/xen-tools-3.4.2-r3 delete mode 100644 metadata/md5-cache/app-emulation/xen-tools-3.4.2-r5 delete mode 100644 metadata/md5-cache/app-emulation/xen-tools-4.1.1-r5 create mode 100644 metadata/md5-cache/app-emulation/xen-tools-4.2.0-r1 delete mode 100644 metadata/md5-cache/app-laptop/radeontool-1.5-r3 create mode 100644 metadata/md5-cache/app-office/libreoffice-3.6.4.3 create mode 100644 metadata/md5-cache/app-office/libreoffice-4.0.9999 create mode 100644 metadata/md5-cache/app-portage/eix-0.27.5 delete mode 100644 metadata/md5-cache/dev-cpp/tbb-4.1.20120718 create mode 100644 metadata/md5-cache/dev-lang/niecza-24 create mode 100644 metadata/md5-cache/dev-lang/niecza-bin-24 create mode 100644 metadata/md5-cache/dev-libs/bitset-2.8.1 create mode 100644 metadata/md5-cache/dev-ruby/simple_oauth-0.2.0 create mode 100644 metadata/md5-cache/dev-ruby/stringex-1.5.1 create mode 100644 metadata/md5-cache/dev-ruby/test-unit-rr-1.0.2 delete mode 100644 metadata/md5-cache/dev-tcltk/bwidget-1.7.0 delete mode 100644 metadata/md5-cache/dev-tcltk/bwidget-1.8.0 delete mode 100644 metadata/md5-cache/dev-tcltk/tkimg-1.4-r4 delete mode 100644 metadata/md5-cache/dev-tcltk/tkimg-1.4-r5 delete mode 100644 metadata/md5-cache/dev-tcltk/tkimg-1.4-r6 create mode 100644 metadata/md5-cache/dev-util/aap-1.091-r1 create mode 100644 metadata/md5-cache/dev-util/catalyst-2.0.12.2 create mode 100644 metadata/md5-cache/dev-util/kdevelop-python-1.4.1 rename metadata/md5-cache/dev-util/{rpmdevtools-8.2 => rpmdevtools-8.3} (88%) delete mode 100644 metadata/md5-cache/dev-util/skipfish-2.06_beta delete mode 100644 metadata/md5-cache/dev-util/skipfish-2.07_beta create mode 100644 metadata/md5-cache/games-board/gnubg-20121201 delete mode 100644 metadata/md5-cache/games-fps/urbanterror-4.2.006 rename metadata/md5-cache/games-fps/{urbanterror-4.2.007 => urbanterror-4.2.008} (89%) create mode 100644 metadata/md5-cache/games-util/pyfa-1.1.11 delete mode 100644 metadata/md5-cache/games-util/pyfa-1.1.9-r1 create mode 100644 metadata/md5-cache/mail-filter/bogofilter-1.2.3 delete mode 100644 metadata/md5-cache/mail-filter/maildrop-2.5.5-r1 delete mode 100644 metadata/md5-cache/media-libs/libv4l-0.8.5 delete mode 100644 metadata/md5-cache/media-libs/libv4l-0.8.5-r1 create mode 100644 metadata/md5-cache/media-plugins/gst-plugins-libav-1.0.3 create mode 100644 metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.0.3 delete mode 100644 metadata/md5-cache/media-tv/v4l-utils-0.8.5 delete mode 100644 metadata/md5-cache/media-tv/v4l-utils-0.8.8 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-6.1 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-6.2 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-6.3 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-6.5 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-6.5-r1 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-7.0 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-7.1 delete mode 100644 metadata/md5-cache/net-analyzer/hydra-7.2 rename metadata/md5-cache/net-dns/{bind-9.9.2 => bind-9.9.2_p1} (81%) rename metadata/md5-cache/net-fs/{cifs-utils-5.8 => cifs-utils-5.8-r1} (93%) create mode 100644 metadata/md5-cache/net-irc/irker-1.14 delete mode 100644 metadata/md5-cache/net-mail/metamail-2.7.53.3 delete mode 100644 metadata/md5-cache/net-misc/spice-gtk-0.11 delete mode 100644 metadata/md5-cache/net-misc/spice-gtk-0.12 delete mode 100644 metadata/md5-cache/net-misc/spice-gtk-0.13 create mode 100644 metadata/md5-cache/net-misc/spice-gtk-0.14-r1 delete mode 100644 metadata/md5-cache/net-misc/spice-gtk-0.8 delete mode 100644 metadata/md5-cache/net-voip/ekiga-4.0.0 create mode 100644 metadata/md5-cache/net-voip/ekiga-4.0.0-r1 delete mode 100644 metadata/md5-cache/sci-libs/cbflib-0.9.0-r3 delete mode 100644 metadata/md5-cache/sci-libs/cbflib-0.9.2.3 delete mode 100644 metadata/md5-cache/sci-libs/cqrlib-1.0.6 delete mode 100644 metadata/md5-cache/sci-libs/cqrlib-1.1.2 delete mode 100644 metadata/md5-cache/sci-libs/neartree-2.3.2 delete mode 100644 metadata/md5-cache/sci-libs/neartree-3.1.1 delete mode 100644 metadata/md5-cache/sci-libs/shapelib-1.2.10-r1 delete mode 100644 metadata/md5-cache/sci-physics/bullet-2.77 delete mode 100644 metadata/md5-cache/sci-visualization/epix-1.2.6 create mode 100644 metadata/md5-cache/sec-policy/selinux-dirsrv-9999 rename metadata/md5-cache/sys-apps/{accountsservice-0.6.29 => accountsservice-0.6.29-r1} (97%) create mode 100644 metadata/md5-cache/sys-apps/irqbalance-1.0.5 create mode 100644 metadata/md5-cache/sys-block/mbuffer-20121111 delete mode 100644 metadata/md5-cache/sys-fs/extundelete-0.2.0 create mode 100644 metadata/md5-cache/sys-fs/extundelete-0.2.0-r2 create mode 100644 metadata/md5-cache/sys-kernel/git-sources-3.7_rc8 create mode 100644 metadata/md5-cache/sys-kernel/vanilla-sources-3.0.54 create mode 100644 metadata/md5-cache/sys-kernel/vanilla-sources-3.4.21 create mode 100644 metadata/md5-cache/sys-libs/talloc-2.0.8 create mode 100644 metadata/md5-cache/sys-libs/tdb-1.2.11 create mode 100644 metadata/md5-cache/www-apps/owncloud-4.5.4 create mode 100644 metadata/md5-cache/x11-libs/qt-assistant-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-bearer-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-core-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-dbus-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-declarative-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-demo-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-gui-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-multimedia-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-opengl-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-openvg-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-phonon-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-qt3support-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-script-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-sql-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-svg-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-test-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-webkit-4.8.4 create mode 100644 metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.4 rename metadata/md5-cache/x11-wm/{enlightenment-0.17.0_alpha6 => enlightenment-0.17.0_alpha8} (81%) delete mode 100644 net-analyzer/hydra/files/hydra-6.5-fix.diff delete mode 100644 net-analyzer/hydra/hydra-6.1.ebuild delete mode 100644 net-analyzer/hydra/hydra-6.2.ebuild delete mode 100644 net-analyzer/hydra/hydra-6.3.ebuild delete mode 100644 net-analyzer/hydra/hydra-6.5-r1.ebuild delete mode 100644 net-analyzer/hydra/hydra-6.5.ebuild delete mode 100644 net-analyzer/hydra/hydra-7.0.ebuild delete mode 100644 net-analyzer/hydra/hydra-7.1.ebuild delete mode 100644 net-analyzer/hydra/hydra-7.2.ebuild rename net-dns/bind/{bind-9.9.2.ebuild => bind-9.9.2_p1.ebuild} (95%) rename net-fs/cifs-utils/{cifs-utils-5.8.ebuild => cifs-utils-5.8-r1.ebuild} (92%) create mode 100644 net-irc/irker/irker-1.14.ebuild delete mode 100644 net-mail/metamail/metamail-2.7.53.3.ebuild delete mode 100644 net-misc/spice-gtk/spice-gtk-0.11.ebuild delete mode 100644 net-misc/spice-gtk/spice-gtk-0.12.ebuild rename net-misc/spice-gtk/{spice-gtk-0.13.ebuild => spice-gtk-0.14-r1.ebuild} (57%) delete mode 100644 net-misc/spice-gtk/spice-gtk-0.8.ebuild rename net-voip/ekiga/{ekiga-4.0.0.ebuild => ekiga-4.0.0-r1.ebuild} (94%) delete mode 100644 sci-libs/cbflib/cbflib-0.9.0-r3.ebuild delete mode 100644 sci-libs/cbflib/cbflib-0.9.2.3.ebuild delete mode 100644 sci-libs/cqrlib/cqrlib-1.0.6.ebuild delete mode 100644 sci-libs/cqrlib/cqrlib-1.1.2.ebuild delete mode 100644 sci-libs/neartree/neartree-2.3.2.ebuild delete mode 100644 sci-libs/neartree/neartree-3.1.1.ebuild delete mode 100644 sci-libs/shapelib/shapelib-1.2.10-r1.ebuild delete mode 100644 sci-physics/bullet/bullet-2.77.ebuild delete mode 100644 sci-visualization/epix/epix-1.2.6.ebuild create mode 100644 sec-policy/selinux-dirsrv/Manifest create mode 100644 sec-policy/selinux-dirsrv/metadata.xml create mode 100644 sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild rename sys-apps/accountsservice/{accountsservice-0.6.29.ebuild => accountsservice-0.6.29-r1.ebuild} (91%) create mode 100644 sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch create mode 100644 sys-apps/busybox/files/klogd.confd create mode 100644 sys-apps/busybox/files/klogd.initd create mode 100644 sys-apps/busybox/files/ntpd.confd create mode 100644 sys-apps/busybox/files/ntpd.initd create mode 100644 sys-apps/busybox/files/syslogd.confd create mode 100644 sys-apps/busybox/files/syslogd.initd create mode 100644 sys-apps/busybox/files/watchdog.confd create mode 100644 sys-apps/busybox/files/watchdog.initd create mode 100644 sys-apps/irqbalance/irqbalance-1.0.5.ebuild create mode 100644 sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch create mode 100644 sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch create mode 100644 sys-block/mbuffer/mbuffer-20121111.ebuild create mode 100644 sys-fs/extundelete/extundelete-0.2.0-r2.ebuild delete mode 100644 sys-fs/extundelete/extundelete-0.2.0.ebuild create mode 100644 sys-kernel/git-sources/git-sources-3.7_rc8.ebuild create mode 100644 sys-kernel/vanilla-sources/vanilla-sources-3.0.54.ebuild create mode 100644 sys-kernel/vanilla-sources/vanilla-sources-3.4.21.ebuild create mode 100644 sys-libs/talloc/talloc-2.0.8.ebuild create mode 100644 sys-libs/tdb/tdb-1.2.11.ebuild create mode 100644 www-apps/owncloud/owncloud-4.5.4.ebuild create mode 100644 www-plugins/lightspark/files/lightspark-0.6.0.1-gcc-4.5_0001.patch create mode 100644 x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild create mode 100644 x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild create mode 100644 x11-libs/qt-core/qt-core-4.8.4.ebuild create mode 100644 x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild create mode 100644 x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild create mode 100644 x11-libs/qt-demo/qt-demo-4.8.4.ebuild create mode 100644 x11-libs/qt-gui/qt-gui-4.8.4.ebuild create mode 100644 x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild create mode 100644 x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild create mode 100644 x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild create mode 100644 x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild create mode 100644 x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild create mode 100644 x11-libs/qt-script/qt-script-4.8.4.ebuild create mode 100644 x11-libs/qt-sql/qt-sql-4.8.4.ebuild create mode 100644 x11-libs/qt-svg/qt-svg-4.8.4.ebuild create mode 100644 x11-libs/qt-test/qt-test-4.8.4.ebuild create mode 100644 x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild create mode 100644 x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild rename x11-wm/enlightenment/{enlightenment-0.17.0_alpha6.ebuild => enlightenment-0.17.0_alpha8.ebuild} (95%) diff --git a/app-accessibility/festival/Manifest b/app-accessibility/festival/Manifest index 267935dcddb9..ab4ef9cd8420 100644 --- a/app-accessibility/festival/Manifest +++ b/app-accessibility/festival/Manifest @@ -1,18 +1,10 @@ -DIST festival-1.96-beta.tar.gz 731682 SHA256 4fa48d3525957762c83f289fba361063b8855f57ff50b7db22754d844aeadbee SHA512 3ab2d0f41d66f1ed20e549f3c4a4fd7e2a9a33ad7fc6cfb6b246ff8feabc0d46e4b6eaa2c4e876b02f220080a0f04a634b3288b2b87603abf64c05015fe5bf68 WHIRLPOOL 354223c334b5b31b172fc37e30e3d3bc05836cfc4d0887931984eb2f834195393357b69832cefc0804e3f29d7c29530c32879274022c893d953a73cfdfe5adbc DIST festival-2.1-release.tar.gz 787313 SHA256 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080 SHA512 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a WHIRLPOOL 0e90a9b3e673ea7ca63a4fdb7f60868db3a74347281267aad20a94548f385b8c1a66472145f0b7c7e4c02a30a695ca012e25443ffdb9ecbafd4cd3bac2f72568 DIST festlex_CMU.tar.gz 1925748 SHA256 c19430919bca45d5368cd4c82af6153fbcc96a487ebd30b78b5f3c08718b7c07 SHA512 c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b WHIRLPOOL 040094e7dcbfb280a18b5862927855cdde62a49f8eac8d63045c1f92f720cc0041f2991ebacb05d457cd77c4c471e935a808a6e185df28e7f87d0e1d08f21905 DIST festlex_OALD.tar.gz 1472516 SHA256 61afc02c4b9dee6322412958ea8be477ee451c3cdab789b88c4907e3e377ccd5 SHA512 0221c3d78140c6cb4e74f98edbdf0dbe5987a8efa3e7205844a5c01c31a98aaced3b20e4a42b09aaa4a3c93c9225d9f24d96df3fb5d963092e955d4cb4674aac WHIRLPOOL 12f96f04d0b7257a032e9e720136bb79e1377fa63f83cd5f3b35dbed5687da838dc4c11de183df89794a389d139c83ea1ea4df3ab6e7c87018c408ed9dbdf290 DIST festlex_POSLEX.tar.gz 242914 SHA256 5ef8cc5d35e9f2141b5a0a4774df82dc9731fe7e9800eb09ecf264f2f8503e7b SHA512 5c3857a195f5f5ebc4c366f37685437af41eb7e86a1a13b41b08cab91e536114ae4ddfa8b124acb40ec32c13b53d0dbf2c857d4c756b0720c9a363866ecb8c47 WHIRLPOOL 8c5b1ed51b89377bb56cfdb12cc0affb9646cdf57b8c908deb547c3bb08c66881c59bef5f04ed1973b6f00c8ce45e0f85b9339afddb2bc460599f5ca11b8f05e -DIST festvox_cmu_us_awb_arctic_hts.tar.gz 878090 SHA256 56b930028a14efdaa01b8b34add087bcde75b774b97b205d2f478413203d9a4d SHA512 78e923fb6b8f21361b19fb2f38b3c71f06bde14233c88ea10abad593e384641f0a6a8952a90badbffd5671a8be58eaca7b1cda1c3bfe313157316e09d5804891 WHIRLPOOL a97724c564ba47e5f1784d0ccce44b653728646dcac41b2db0c1eaac8f23887ba604d01c9c03e0793c6941e9fadde3bd1c3b2d41c4c1ccd2a70eae37be0c3556 DIST festvox_cmu_us_awb_cg.tar.gz 4452760 SHA256 f6010538b3e2f32152cc75741a62b8c7eecfaa3e51153c9db735723002807264 SHA512 b77174d2e9ab914ee3c4d6e0d83e29b64034bb45d3fe021acf3a6da13304acc819c4ac5b1046a6f022312e90aa23c73b585aaf11f927e80aee4533584b60356b WHIRLPOOL fe2aa698dfa917f8e72c49bb1399c3c430d65da2b3b072d53cb6810e6cde49b19de8c5b44e0ee23647a93ded1fc6a39c80eab059c25e3eb28805a7d9977f3539 -DIST festvox_cmu_us_bdl_arctic_hts.tar.gz 1060641 SHA256 caa679c728c8804f4a1dae6ab08e7b31f10b292e572598fb6432d0e18f40bd2b SHA512 c8ca253a15365b2f269c28cb82412581d63eef5ac21480c17871f6513bbddab7c4245a47b353c5e611272cebd5a5a050dd9d2fe72034f076d431bba1eaba9997 WHIRLPOOL eb0f5bea4cc85ceb53695baf1052d9642839079fd4e5b1d16dc9ddc877373d6f7bb08636183860f0b501afaca0bbb1e4d930c7f058ae667f149bc5ae8b04b75b -DIST festvox_cmu_us_jmk_arctic_hts.tar.gz 909045 SHA256 e4f623d1114922c8844ec266d46d558e1521e0ab3bc6e958cdf8f69c28bcc038 SHA512 66e2ea23af2c1efb19a0a039481c439c1b179fa5ad4205f5b4855682927cf772d36238cfe5c2fb681553a79635e4b902fce2ea521b4754efe3e13167a56ca634 WHIRLPOOL 8e396b1f9a9bafe7d6fdbc539741c34c33300ab4a5a1b03e3105d9494f070c0f77d8892fbe1da0c3d91d8ac78ff3800c22310a9bf7a606e52e51a0203c32d7c1 DIST festvox_cmu_us_rms_cg.tar.gz 5222226 SHA256 5f0ffc3181df76b63f3c13db3cdc6e67e02639a3982c6b6fa55bbbd2fe1cbc30 SHA512 a251fa27f6cabecb29cf4199cb040cb2ce512a6a447840d31b0d2055d26e6a86f4730bbe3e0f1612e413858f41fdbdd184f04575f9f64658d3f34171612ee172 WHIRLPOOL c9a5f712952c2c88d901e49cf33f03328d44fd6befaca16bcf5041a82beeb092bd6fd47751b7da9da6393c752a3b4b9ae52119a99a6ad1aca6b335cc78a8c2ae DIST festvox_cmu_us_slt_arctic_hts.tar.gz 955706 SHA256 adcc187fc7db39e17c119811936be57f0b788908f06c3d9b330856ad8357b128 SHA512 58908094c7e538118471ebd80d86d91f681d0958587f0c5ee6c3a00e1ad5f41519e7bb2a96353f9a68946aba343e11c2949fe2b1efafc53f0d8a6b20d7e3e1f8 WHIRLPOOL 2e87cedb571b4ece257e8c27ab9570fe183691ebc17ddb8fc4323201bd4fc2a449f30a5879a3ce8cc8f8673283c3162761235bf253c96a089d86796b898607a0 DIST festvox_kallpc16k.tar.gz 4104056 SHA256 9eb6336f35c202c8069d37e489fb009a7e9fd8539cd47644329db1e92c6aba83 SHA512 ad8d45e04cb704f31a01de8f4d1b3adb4530563728e8b331b0a730c762bd0c0590e5d49f893404a0199f51fb6afce4b786107ae1fdbc4d1b61c3139ce805267c WHIRLPOOL c0242c9abb733c30cbba75178de8aa825a0be17bc24a2851eff64147a080c2cbd0d374de1e6e4a8bce562f727474d1e80d26535efe12e8ed640d7eb7bce75832 -DIST festvox_kedlpc16k.tar.gz 4221528 SHA256 6b8f11424bda5c81ae8a58f7838e2a9d12fdb39cdfff6ed89f611305391b1a36 SHA512 9fc3665bb03484ba20bd1ad80f2acba6c3fa23cef8e23b2d3e3723415aa0ed57c5c184e5393783b3636af735188eff9f106d0993f46c89a2571b9fe8c48c86be WHIRLPOOL 3e252c3f283238d79a615a7f27a1d1781ad795ef4e5615466a079d1034aefea209d286d02839600624ad01c994f0be65b0e436606a5d57546df592935781d25b DIST festvox_rablpc16k.tar.gz 5369001 SHA256 54835837ca734e62c0210c0f9dd27380d2ad89819ae91ec6e8cfab4e515b7bdc SHA512 11539bfb822eec9c4803c8526364d3cf6ad735a0edfd018471e95df1447e0cd3e19fdee44faaf0f0fbceed281a06b21a971f0c2a3a3ff6c46ea8272202f53f11 WHIRLPOOL 08266d82182ebc939965f52ef591043de664ed8380105e42eb39b4a96f50bda5d8958d9b7850e963fe1e8324fd6a5d05a5d1d7ab41f4c88940e61fe783dbf557 -DIST festvox_us1.tar.gz 11040 SHA256 23b332513867d6e9c340dc888a7ce67843e5a3c03db328cd36975985057c8b8e SHA512 7ac318f700c8fade65da80f33b86b124cd8f71bb687aa7a7c355dc1087a3bd01a3b28fdef3a2eff6458836bbf8e90dd7802b58177f4c73eba3a737e6646a1f9d WHIRLPOOL d26dd836725ba14f2d21f8f8cbb19fab1df0dfd282fe6b14f3a768660c32f32c2472ef5dc066f952392c6fa53077c4d81c67f3794242288fef65180a61cbc69e -DIST festvox_us2.tar.gz 11037 SHA256 d27ad26213144d956815e804c06e5473191ac12afb44f6a1029b3842e3a3007c SHA512 73fcc610cc2eab225deebf6648895c2be3d4a604f88b171c75991136dac65a0d65f36d3e588188e96e7c70a341cdb3756c82573e6150a587099da54c8ce511a6 WHIRLPOOL 3bc8ee82f275a617335502bf90552aabdcb067fe948dc479276f773499dedb116964327a46e977229991fab282afb0b88d99c6cc7c00bdf5a9eeb28e596c845e -DIST festvox_us3.tar.gz 11220 SHA256 af9ca4d1832e1971aa6e52f6a3ff8f729bf970c7bee1de7e8ac0611ca01871b8 SHA512 e9e62e977fe462db0d2d7c5bbe6e871dddeec4bd7d240ecd1e5e5fddddecf177d21263fdb4ebb42a0aac36dea72c64f5cf42d38d838457c26821be46b7202aa7 WHIRLPOOL 503e16c239262526d4542e303149aa842559b1aba44d19fae0f8524d0a9dfe8fe4c676f571944afc92437a18c683b7d5b426df1c269b3e030778e4900cb0be40 DIST speech_tools-2.1-release.tar.gz 1681999 SHA256 ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9 SHA512 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 WHIRLPOOL 6df6ca5168462599fadf209827e367c963af5ca6be05277618c9d09aac34a3b151665b860a14fa4742482cc77246e372671ac94b23bdca63bbbb7b8c7b234644 diff --git a/app-admin/collectd/collectd-5.1.1-r1.ebuild b/app-admin/collectd/collectd-5.1.1-r1.ebuild index c3c45b1bc54c..f5f77b07f66b 100644 --- a/app-admin/collectd/collectd-5.1.1-r1.ebuild +++ b/app-admin/collectd/collectd-5.1.1-r1.ebuild @@ -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/app-admin/collectd/collectd-5.1.1-r1.ebuild,v 1.1 2012/12/03 20:49:27 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.1.1-r1.ebuild,v 1.2 2012/12/05 04:16:54 mr_bones_ Exp $ EAPI="4" @@ -351,4 +351,4 @@ pkg_postinst() { elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser," elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed." fi -} \ No newline at end of file +} diff --git a/app-admin/collectd/collectd-5.2.0.ebuild b/app-admin/collectd/collectd-5.2.0.ebuild index 6902a6b41782..377bf3b2c972 100644 --- a/app-admin/collectd/collectd-5.2.0.ebuild +++ b/app-admin/collectd/collectd-5.2.0.ebuild @@ -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/app-admin/collectd/collectd-5.2.0.ebuild,v 1.1 2012/12/03 20:57:02 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.2.0.ebuild,v 1.2 2012/12/05 04:16:54 mr_bones_ Exp $ EAPI="4" @@ -353,4 +353,4 @@ pkg_postinst() { elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser," elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed." fi -} \ No newline at end of file +} diff --git a/app-admin/conky/conky-1.9.0-r1.ebuild b/app-admin/conky/conky-1.9.0-r1.ebuild index 658d1b70b30a..f27e2d74b83e 100644 --- a/app-admin/conky/conky-1.9.0-r1.ebuild +++ b/app-admin/conky/conky-1.9.0-r1.ebuild @@ -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/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.6 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r1.ebuild,v 1.7 2012/12/04 20:58:53 billie Exp $ EAPI=4 @@ -26,7 +26,7 @@ DEPEND_COMMON=" >=dev-lua/toluapp-1.0.93 >=dev-lang/lua-5.1.4-r8 media-libs/imlib2 ) - nvidia? ( x11-drivers/nvidia-drivers[tools] ) + nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage diff --git a/app-admin/conky/conky-1.9.0.ebuild b/app-admin/conky/conky-1.9.0.ebuild index 05b062b3d2c1..0172d03929f5 100644 --- a/app-admin/conky/conky-1.9.0.ebuild +++ b/app-admin/conky/conky-1.9.0.ebuild @@ -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/app-admin/conky/conky-1.9.0.ebuild,v 1.9 2012/11/30 15:28:51 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0.ebuild,v 1.10 2012/12/04 20:58:53 billie Exp $ EAPI=4 @@ -26,7 +26,7 @@ DEPEND_COMMON=" >=dev-lua/toluapp-1.0.93 >=dev-lang/lua-5.1.4-r8 media-libs/imlib2 ) - nvidia? ( x11-drivers/nvidia-drivers[tools] ) + nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml index e33c22b67ce9..5df39140ebaa 100644 --- a/app-admin/conky/metadata.xml +++ b/app-admin/conky/metadata.xml @@ -23,7 +23,7 @@ enable monitoring of music played by media-sound/moc enable monitoring of music controlled by media-sound/mpd enable syntax highlighting for app-editors/nano - enable reading of nvidia card temperature sensors via x11-drivers/nvidia-drivers + enable reading of nvidia card temperature sensors via media-video/nvidia-settings enable support for tcp (ip4) port monitoring enable support for IBM/Lenovo notebooks enable support for metar weather service diff --git a/app-admin/durep/durep-0.9-r4.ebuild b/app-admin/durep/durep-0.9-r4.ebuild index 21c303d269f4..02b1ddd9e2f3 100644 --- a/app-admin/durep/durep-0.9-r4.ebuild +++ b/app-admin/durep/durep-0.9-r4.ebuild @@ -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/app-admin/durep/durep-0.9-r4.ebuild,v 1.2 2012/12/01 21:30:09 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/durep/durep-0.9-r4.ebuild,v 1.3 2012/12/04 10:43:58 blueness Exp $ EAPI=4 inherit eutils @@ -11,7 +11,7 @@ SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc ~x86" IUSE="" DEPEND="dev-lang/perl" diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch new file mode 100644 index 000000000000..f837d2845d54 --- /dev/null +++ b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch @@ -0,0 +1,20 @@ +--- localepurge.orig 2012-12-04 23:15:29.422756767 +0100 ++++ localepurge 2012-12-04 23:16:13.313756491 +0100 +@@ -198,7 +198,7 @@ + + if [ "$SHOWFREEDSPACE" = "enabled" ]; then + if test $SPACETMP -gt 0 ; then +- LOCALETOTAL=$SPACETMP ++ LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP)) + einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}" + fi + SPACETMP=0 +@@ -230,7 +230,7 @@ + + if [ "$SHOWFREEDSPACE" = "enabled" ]; then + if test $SPACETMP -gt 0 ; then +- MANTOTAL=$SPACETMP ++ MANTOTAL=$(($MANTOTAL + $SPACETMP)) + einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}" + fi + SPACETMP=0 diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch new file mode 100644 index 000000000000..2b052ddf4d99 --- /dev/null +++ b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch @@ -0,0 +1,18 @@ +--- localepurge.orig 2012-12-04 23:08:17.754765708 +0100 ++++ localepurge 2012-12-04 23:09:02.397765264 +0100 +@@ -165,7 +165,14 @@ + ${ACTION} `find ${REMOVEPATH} -type f -o -type l` + + if [ "$SHOWFREEDSPACE" = "enabled" ]; then +- SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}') ++ # if symlink, REMOVEPATH could be removed ++ # check from parentdir then ++ if [ -d ${REMOVEPATH} ]; then ++ SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}') ++ else ++ SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}') ++ fi ++ + SPACESUM=$(($SPACEBEFORE - $SPACEAFTER)) + + if test $SPACESUM -gt 0 ; then diff --git a/app-admin/localepurge/localepurge-0.5.4.ebuild b/app-admin/localepurge/localepurge-0.5.4-r1.ebuild similarity index 84% rename from app-admin/localepurge/localepurge-0.5.4.ebuild rename to app-admin/localepurge/localepurge-0.5.4-r1.ebuild index 566db004ec7f..e696a1b531c4 100644 --- a/app-admin/localepurge/localepurge-0.5.4.ebuild +++ b/app-admin/localepurge/localepurge-0.5.4-r1.ebuild @@ -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/app-admin/localepurge/localepurge-0.5.4.ebuild,v 1.1 2012/12/03 19:27:04 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.4-r1.ebuild,v 1.1 2012/12/04 22:36:49 hwoarang Exp $ EAPI=4 @@ -23,6 +23,10 @@ S=${WORKDIR}/${PN} src_prepare() { epatch "${FILESDIR}"/${P}-prefix.patch + # 164544 + epatch "${FILESDIR}"/${P}-directorysum.patch + # 445910 + epatch "${FILESDIR}"/${P}-parentdir.patch eprefixify ${PN} } diff --git a/app-arch/libpar2/libpar2-0.2.1.ebuild b/app-arch/libpar2/libpar2-0.2.1.ebuild index 78b61a2633a4..eb32cbe15e85 100644 --- a/app-arch/libpar2/libpar2-0.2.1.ebuild +++ b/app-arch/libpar2/libpar2-0.2.1.ebuild @@ -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/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.4 2012/11/29 20:33:50 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/libpar2/libpar2-0.2.1.ebuild,v 1.5 2012/12/04 11:24:38 ago Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV:0:3}/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="static-libs" RDEPEND="dev-libs/libsigc++:2" diff --git a/app-crypt/ssh-multiadd/metadata.xml b/app-crypt/ssh-multiadd/metadata.xml index 633b5daddbe3..44a8af7cc4d1 100644 --- a/app-crypt/ssh-multiadd/metadata.xml +++ b/app-crypt/ssh-multiadd/metadata.xml @@ -4,7 +4,7 @@ python proxy-maintainers - johneed@hotmail.com + idella4@gentoo.org Ian Delaney diff --git a/app-doc/NaturalDocs/metadata.xml b/app-doc/NaturalDocs/metadata.xml index 313ec1f9419b..bef41978a849 100644 --- a/app-doc/NaturalDocs/metadata.xml +++ b/app-doc/NaturalDocs/metadata.xml @@ -10,9 +10,8 @@ and high-quality generated output. - johneed@hotmail.com + idella4@gentoo.org Ian Delaney - Proxy maintainer, assign bugs titanofold@gentoo.org diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 4a400918c29d..bacb4593c4ca 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -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/app-emulation/qemu/qemu-9999.ebuild,v 1.34 2012/11/21 22:22:35 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $ EAPI="4" @@ -68,7 +68,7 @@ LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] ) seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] ) - spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] ) + spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] ) tls? ( net-libs/gnutls[static-libs(+)] ) uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] ) vde? ( net-misc/vde[static-libs(+)] ) @@ -88,7 +88,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) python? ( =dev-lang/python-2*[ncurses] ) sdl? ( media-libs/libsdl[X] ) smartcard? ( dev-libs/nss ) - spice? ( >=app-emulation/spice-protocol-0.8.1 ) + spice? ( >=app-emulation/spice-protocol-0.12.2 ) systemtap? ( dev-util/systemtap ) usbredir? ( >=sys-apps/usbredir-0.3.4 ) virtfs? ( sys-libs/libcap ) diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml index 28dcc7d8d2b8..57c6f5ecc633 100644 --- a/app-emulation/virt-manager/metadata.xml +++ b/app-emulation/virt-manager/metadata.xml @@ -8,7 +8,6 @@ required when using app-emulation/libvirt with PolicyKit authentication - Depend on the proper libraries needed to connect to SASL-enabled libvirtd instances (e.g. Kerberos-protected instances). @@ -16,5 +15,8 @@ Support connecting to SPICE-enabled virtual machines. + + Support connecting to VNC-enabled virtual machines. + diff --git a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild index 08896c389493..075c5db5bce7 100644 --- a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild +++ b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild @@ -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/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.2 2012/10/15 10:06:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.3 2012/12/04 23:16:49 cardoe Exp $ EAPI=4 @@ -34,20 +34,26 @@ DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)" HOMEPAGE="http://virt-manager.org/" LICENSE="GPL-2" SLOT="0" -IUSE="gnome-keyring policykit sasl spice" +IUSE="gnome-keyring policykit sasl +spice +vnc" RDEPEND=">=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] ${VIRTINSTDEP} >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] - >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) - spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )" + spice? ( + >=net-misc/spice-gtk-0.6[python,sasl?] + || ( + <=net-misc/spice-gtk-0.14[python,sasl?,-gtk3] + >=net-misc/spice-gtk-0.14-r1[python,sasl?] + ) + ) + vnc? ( >=net-libs/gtk-vnc-0.3.8[python,sasl?] )" # tui? ( >=dev-python/new_syrup-0.1.2 )" DEPEND="${RDEPEND} app-text/rarian diff --git a/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild b/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild new file mode 100644 index 000000000000..a04535fdc9b6 --- /dev/null +++ b/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild,v 1.1 2012/12/04 23:10:18 cardoe Exp $ + +EAPI=5 +inherit eutils gnome2 toolchain-funcs + +DESCRIPTION="Graphical console client for connecting to virtual machines" +HOMEPAGE="http://virt-manager.org/" +SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gtk3 nsplugin sasl +spice +vnc" + +RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?] + >=dev-libs/libxml2-2.6 + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( >=x11-libs/gtk+-2.18:2 ) + nsplugin? ( + >=dev-libs/nspr-4 + >=x11-libs/gtk+-2.18:2 + ) + spice? ( >=net-misc/spice-gtk-0.12.101[sasl?,gtk3=] ) + vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3=] )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35.0 + virtual/pkgconfig + nsplugin? ( =net-misc/npapi-sdk-0.27 ) + spice? ( >=app-emulation/spice-protocol-0.10.1 )" + +REQUIRED_USE="|| ( spice vnc )" + +GTK2_BUILDDIR="${WORKDIR}/${P}_nsplugin" +GTK3_BUILDDIR="${WORKDIR}/${P}_gtk" + +pkg_setup() { + G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)" + + GTK2_G2CONF="${G2CONF} $(use_enable nsplugin plugin)" + GTK2_G2CONF="${G2CONF} --with-gtk=2.0" + + GTK3_G2CONF="${G2CONF} --with-gtk=3.0" +} + +src_prepare() { + mkdir ${GTK2_BUILDDIR} || die + mkdir ${GTK3_BUILDDIR} || die + + epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch +} + +src_configure() { + if use nsplugin; then + export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)" + export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)" + fi + + export ECONF_SOURCE="${S}" + + cd ${GTK2_BUILDDIR} + echo "Running configure in ${GTK2_BUILDDIR}" + G2CONF="${GTK2_G2CONF}" gnome2_src_configure + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running configure in ${GTK3_BUILDDIR}" + G2CONF="${GTK3_G2CONF}" gnome2_src_configure + fi +} + +src_compile() { + cd ${GTK2_BUILDDIR} + echo "Running make in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running make in ${GTK3_BUILDDIR}" + default + fi +} + +src_test() { + cd ${GTK2_BUILDDIR} + echo "Running make check in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running make check in ${GTK3_BUILDDIR}" + default + fi +} + +src_install() { + cd ${GTK2_BUILDDIR} + echo "Running make install in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running make install in ${GTK3_BUILDDIR}" + default + fi +} diff --git a/app-emulation/virtualbox-bin/files/10-virtualbox.rules b/app-emulation/virtualbox-bin/files/10-virtualbox.rules index 8efff249f8fc..014c164a37f5 100644 --- a/app-emulation/virtualbox-bin/files/10-virtualbox.rules +++ b/app-emulation/virtualbox-bin/files/10-virtualbox.rules @@ -1,7 +1,7 @@ # create second tree of USB devices according to # http://www.virtualbox.org/ticket/7759#comment:5 -SUBSYSTEM=="usb_device", ACTION!="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" -SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/lib/udev/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb_device", ACTION!="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb", ACTION!="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" +SUBSYSTEM=="usb_device", ACTION=="remove", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor" +SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="%UDEVDIR%/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild index 23fca6d11ea0..73c45ede2bec 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.1 2012/10/24 04:41:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.2.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $ EAPI=2 -inherit eutils unpacker fdo-mime gnome2 pax-utils +inherit eutils unpacker fdo-mime gnome2 pax-utils udev MY_PV=${PV/beta/BETA} MY_PV=${MY_PV/rc/RC} @@ -307,11 +307,14 @@ src_install() { echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" doenvd "${T}/90virtualbox" - insinto /lib/udev/rules.d + local udevdir="$(udev_get_udevdir)" + insinto ${udevdir}/rules.d doins "${FILESDIR}"/10-virtualbox.rules - # move udev scripts into /lib/udev (bug #372491) - mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev - fperms 0750 /lib/udev/VBoxCreateUSBNode.sh + sed "s@%UDEVDIR%@${udevdir}@" \ + -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die + # move udev scripts into ${udevdir} (bug #372491) + mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh } pkg_postinst() { diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild index 7103010e75b7..b2217d8a768e 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.1 2012/11/10 21:08:38 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.2.4.ebuild,v 1.2 2012/12/04 09:40:13 polynomial-c Exp $ EAPI=2 -inherit eutils unpacker fdo-mime gnome2 pax-utils +inherit eutils unpacker fdo-mime gnome2 pax-utils udev MY_PV=${PV/beta/BETA} MY_PV=${MY_PV/rc/RC} @@ -307,11 +307,14 @@ src_install() { echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" doenvd "${T}/90virtualbox" - insinto /lib/udev/rules.d + local udevdir="$(udev_get_udevdir)" + insinto ${udevdir}/rules.d doins "${FILESDIR}"/10-virtualbox.rules - # move udev scripts into /lib/udev (bug #372491) - mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"/lib/udev - fperms 0750 /lib/udev/VBoxCreateUSBNode.sh + sed "s@%UDEVDIR%@${udevdir}@" \ + -i "${D}"${udevdir}/rules.d/10-virtualbox.rules || die + # move udev scripts into ${udevdir} (bug #372491) + mv "${D}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${D}"${udevdir} || die + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh } pkg_postinst() { diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index f4b5e33d5335..1214c3fe34b3 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -5,4 +5,5 @@ DIST ocaml-3.11 11661 SHA256 b919112964cf64bcae841301754402184ceee177ab6681e75bf DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566 +DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch new file mode 100644 index 000000000000..73c04931b31d --- /dev/null +++ b/app-emulation/xen-pvgrub/files/newlib-implicits.patch @@ -0,0 +1,149 @@ +diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c +--- newlib/libc/stdlib/wcstoull.c 2007-07-07 04:03:28.000000000 +0800 ++++ newlib/libc/stdlib/wcstoull.c 2012-12-02 14:19:40.905136553 +0800 +@@ -124,7 +124,7 @@ + #include + #include + #include +- ++#include + #ifndef _REENT_ONLY + + unsigned long long +diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c +newlib-1.16.0/newlib/doc/makedoc.c +--- newlib/doc/makedoc.c 2007-01-03 01:59:59.000000000 +0900 ++++ newlib/doc/makedoc.c 2012-12-02 16:53:42.700289294 +0800 +@@ -39,7 +39,7 @@ + #include + #include + #include +- ++#include + #define DEF_SIZE 5000 + #define STACK 50 + +diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c +--- newlib/libc/reent/lseek64r.c 2003-06-04 03:48:07.000000000 +0800 ++++ newlib/libc/reent/lseek64r.c 2012-12-02 18:29:45.435760985 +0800 +@@ -1,8 +1,8 @@ + /* Reentrant versions of lseek system call. */ + +-#include ++#include "../include/reent.h" + #include +-#include <_syslist.h> ++#include "../include/_syslist.h" + + /* Some targets provides their own versions of this functions. Those + targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ +diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c +--- newlib/libc/stdio64/fseeko64.c 2007-07-14 04:37:53.000000000 +0800 ++++ newlib/libc/stdio64/fseeko64.c 2012-12-02 18:26:29.955778906 +0800 +@@ -119,7 +119,7 @@ + ptr->_errno = EOVERFLOW; + return EOF; + } +- return (_off64_t) _fseeko_r (ptr, fp, offset, whence); ++ return (_off64_t) _fseeko64_r (ptr, fp, offset, whence); + } + + /* Make sure stdio is set up. */ + +diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c +--- newlib/libc/reent/fstat64r.c 2012-12-03 13:17:26.569703981 +0800 ++++ newlib/libc/reent/fstat64r.c 2003-06-04 03:48:07.000000000 +0800 +@@ -1,10 +1,10 @@ + /* Reentrant versions of fstat system call. This implementation just + calls the fstat system call. */ + +-#include ++#include "../include/reent.h"> + #include + #include +-#include <_syslist.h> ++#include "../include/_syslist.h" + + #ifdef __LARGE64_FILES + +diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c +--- libgloss/i386/cygmon-gmon.c 2002-10-26 03:18:46.000000000 +0800 ++++ libgloss/i386/cygmon-gmon.c 2012-12-03 14:38:41.454257066 +0800 +@@ -68,6 +68,9 @@ + + #include "cygmon-gmon.h" + ++#include ++#include ++#include + /* + * froms is actually a bunch of unsigned shorts indexing tos + */ +@@ -78,6 +78,8 @@ + static char *s_lowpc = 0; + static char *s_highpc = 0; + static unsigned long s_textsize = 0; ++extern void profil_write(int, char*, int); ++extern int moncontrol (int); + + static int ssiz; + static char *sbuf; +diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h +newlib-1.16.0/newlib/libc/include/_syslist.h +--- newlib/libc/include/_syslist.h 2005-08-23 05:13:35.000000000 +0800 ++++ newlib/libc/include/_syslist.h 2012-12-03 17:20:03.092369483 +0800 +@@ -2,6 +2,7 @@ + and only provide C names, so that we end up in violation of ANSI */ + #ifndef __SYSLIST_H + #define __SYSLIST_H ++#include + + #ifdef MISSING_SYSCALL_NAMES + #define _close close + +#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in +#--- newlib/libc/Makefile.in 2007-05-25 01:33:30.000000000 +0800 +#+++ newlib/libc/Makefile.in 2012-12-03 21:52:05.621873084 +0800 +diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c +--- newlib/libc/stdio64/ftello64.c 2007-07-14 04:37:53.000000000 +0800 ++++ newlib/libc/stdio64/ftello64.c 2012-12-04 18:34:46.491509484 +0800 +@@ -93,7 +93,7 @@ + + /* Only do 64-bit tell on large file. */ + if (!(fp->_flags & __SL64)) +- return (_off64_t) _ftello_r (ptr, fp); ++ return (_off64_t) _ftello64_r (ptr, fp); + + /* Ensure stdio is set up. */ + +diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c +--- newlib/libc/reent/open64r.c 2002-08-27 02:56:06.000000000 +0800 ++++ newlib/libc/reent/open64r.c 2012-12-04 20:06:10.044006769 +0800 +@@ -1,8 +1,8 @@ + /* Reentrant versions of open system call. */ + +-#include ++#include "../include/reent.h"> + #include +-#include ++#include + #include <_syslist.h> + + #ifdef __LARGE64_FILES +diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c +--- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800 ++++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800 +@@ -1,10 +1,10 @@ + /* Reentrant versions of syscalls need to support signal/raise. + These implementations just call the usual system calls. */ + +-#include ++#include "../include/reent.h" + #include + #include +-#include <_syslist.h> ++#include "../include/_syslist.h" + + /* Some targets provides their own versions of these functions. Those + targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ + diff --git a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch new file mode 100644 index 000000000000..78eb12b0fc64 --- /dev/null +++ b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch @@ -0,0 +1,37 @@ +# Fix gcc-4.6 +diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk +--- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800 ++++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800 +@@ -6,7 +6,7 @@ + + # Define some default flags. + # NB. '-Wcast-qual' is nasty, so I omitted it. +-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls ++DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls + DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) + DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) + DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline +diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile +--- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800 ++++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800 +@@ -73,7 +73,7 @@ + + -include $(XEN_TARGET_ARCH)/Makefile + +-CFLAGS += -Werror -Wmissing-prototypes ++CFLAGS += -Wmissing-prototypes + CFLAGS += -I. $(CFLAGS_xeninclude) + + # Needed for posix_fadvise64() in xc_linux.c +# Drop .config +diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk +--- Config.mk 2012-09-17 18:23:12.000000000 +0800 ++++ Config.mk 2012-12-05 14:01:10.641260261 +0800 +@@ -7,7 +7,6 @@ + # fallback for older make + realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))"))) + +--include $(XEN_ROOT)/.config + + # A debug build of Xen and tools? + debug ?= n diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch new file mode 100644 index 000000000000..70ff7da2f60f --- /dev/null +++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch @@ -0,0 +1,112 @@ +# Patch Makefile to patch insource newlib, +# Prevent internal downloading of external packages +diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile +--- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800 ++++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800 +@@ -8,30 +8,30 @@ + include $(XEN_ROOT)/Config.mk + + #ZLIB_URL?=http://www.zlib.net +-ZLIB_URL=$(XEN_EXTFILES_URL) ++ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir + ZLIB_VERSION=1.2.3 + + #LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils +-LIBPCI_URL?=$(XEN_EXTFILES_URL) ++LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir + LIBPCI_VERSION=2.2.9 + + #NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib +-NEWLIB_URL?=$(XEN_EXTFILES_URL) ++NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir + NEWLIB_VERSION=1.16.0 + + #LWIP_URL?=http://download.savannah.gnu.org/releases/lwip +-LWIP_URL?=$(XEN_EXTFILES_URL) ++LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir + LWIP_VERSION=1.3.0 + + #GRUB_URL?=http://alpha.gnu.org/gnu/grub +-GRUB_URL?=$(XEN_EXTFILES_URL) ++GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir + GRUB_VERSION=0.97 + +-#OCAML_URL?=$(XEN_EXTFILES_URL) ++#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir + OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11 + OCAML_VERSION=3.11.0 + +-WGET=wget -c ++WGET=cp -t . + + GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) + ifeq ($(XEN_TARGET_ARCH),x86_32) +@@ -95,12 +95,13 @@ + ############## + + newlib-$(NEWLIB_VERSION).tar.gz: +- $(WGET) $(NEWLIB_URL)/$@ ++# $(WGET) $(NEWLIB_URL)/$@ + + newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz + tar xzf $< + patch -d $@ -p0 < newlib.patch + patch -d $@ -p0 < newlib-chk.patch ++ patch -d $@ -p0 < newlib-implicits.patch + patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch + find $@ -type f | xargs perl -i.bak \ + -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' +@@ -112,7 +113,7 @@ + $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) + mkdir -p newlib-$(XEN_TARGET_ARCH) + ( cd newlib-$(XEN_TARGET_ARCH) && \ +- CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ ++ CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \ + $(CROSS_MAKE) && \ + $(CROSS_MAKE) install ) + +@@ -121,7 +122,7 @@ + ############ + + zlib-$(ZLIB_VERSION).tar.gz: +- $(WGET) $(ZLIB_URL)/$@ ++# $(WGET) $(ZLIB_URL)/$@ + + zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz + tar xzf $< +@@ -141,7 +142,7 @@ + ############## + + pciutils-$(LIBPCI_VERSION).tar.bz2: +- $(WGET) $(LIBPCI_URL)/$@ ++# $(WGET) $(LIBPCI_URL)/$@ + + pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 + tar xjf $< +@@ -169,7 +170,7 @@ + ###### + + lwip-$(LWIP_VERSION).tar.gz: +- $(WGET) $(LWIP_URL)/$@ ++# $(WGET) $(LWIP_URL)/$@ + + lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz + tar xzf $< +@@ -325,7 +326,7 @@ + ###### + + grub-$(GRUB_VERSION).tar.gz: +- $(WGET) $(GRUB_URL)/$@ ++#$(WGET) $(GRUB_URL)/$@ + + grub-upstream: grub-$(GRUB_VERSION).tar.gz + tar xzf $< +@@ -392,7 +393,7 @@ + $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" + +-install-grub: pv-grub ++install-grub: + $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" + $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" + diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch new file mode 100644 index 000000000000..6b184db2008e --- /dev/null +++ b/app-emulation/xen-pvgrub/files/xen-4.2.0-newlib.patch @@ -0,0 +1,12 @@ +diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile +--- stubdom/Makefile 2012-12-05 08:01:01.480241322 +0800 ++++ stubdom/Makefile 2012-12-05 08:01:37.432238026 +0800 +@@ -101,6 +101,7 @@ + tar xzf $< + patch -d $@ -p0 < newlib.patch + patch -d $@ -p0 < newlib-chk.patch ++ patch -d $@ -p0 < newlib-implicits.patch + patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch + find $@ -type f | xargs perl -i.bak \ + -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' + diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild index be76528bc5a9..ae03f0c27a0b 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild @@ -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/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.5 2012/04/24 09:49:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.1-r1.ebuild,v 1.7 2012/12/04 19:24:18 scarabeus Exp $ EAPI="2" @@ -17,7 +17,7 @@ SRC_URI=" $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 - $OCAML_URL/ocaml-3.11 + $OCAML_URL/ocaml-3.11 " S="${WORKDIR}/xen-${PV}" @@ -75,14 +75,14 @@ src_prepare() { ls -ld stubdom/zlib-1.2.3.tar.gz ls -ld stubdom/Makefile || die "stubdom/Makefile could not be adjusted" - sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \ + sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \ -e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \ -e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \ -e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \ -e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \ -e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \ -i stubdom/Makefile || die "stubdom/Makefile could not be adjusted" - einfo "1st Makefile adjusted" + einfo "1st Makefile adjusted" } src_compile() { diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild index d5240b79ac71..611aa97fa4ee 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild @@ -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/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.3 2012/04/24 09:49:47 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.4 2012/12/04 16:31:20 idella4 Exp $ EAPI="2" @@ -17,7 +17,7 @@ SRC_URI=" $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 - $OCAML_URL/ocaml-3.11 + $OCAML_URL/ocaml-3.11 " S="${WORKDIR}/xen-${PV}" @@ -73,7 +73,7 @@ src_prepare() { einfo "files copied to stubdom" - sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \ + sed -e 's:^\t$(WGET) $(LWIP_URL):#\t$(WGET) $(LWIP_URL):' \ -e 's:^\t$(WGET) $(NEWLIB_URL):#\t$(WGET) $(NEWLIB_URL):' \ -e 's:^\t$(WGET) $(ZLIB_URL):#\t$(WGET) $(ZLIB_URL):' \ -e 's:^\t$(WGET) $(LIBPCI_URL):#\t$(WGET) $(LIBPCI_URL):' \ diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild new file mode 100644 index 000000000000..01b7112774fc --- /dev/null +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2012 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.0.ebuild,v 1.1 2012/12/04 16:31:20 idella4 Exp $ + +EAPI="4" + +inherit flag-o-matic eutils multilib 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 +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" + +S="${WORKDIR}/xen-${PV}" + +DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem" +HOMEPAGE="http://xen.org/" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="custom-cflags" + +DEPEND="sys-devel/gettext + sys-devel/gcc" + +RDEPEND="=app-emulation/xen-${PV}" + +src_prepare() { + + # if the user *really* wants to use their own custom-cflags, let them + if use custom-cflags; then + einfo "User wants their own CFLAGS - removing defaults" + # try and remove all the default custom-cflags + find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ + -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ + -i {} \; + fi + + #Substitute for internal downloading + cp $DISTDIR/zlib-1.2.3.tar.gz \ + $DISTDIR/pciutils-2.2.9.tar.bz2 \ + $DISTDIR/lwip-1.3.0.tar.gz \ + $DISTDIR/newlib-1.16.0.tar.gz \ + $DISTDIR/grub-0.97.tar.gz \ + ./stubdom/ || die "files not coped to stubdom" + # Note: tip to patch grub gentoo style, for review soon. This is around 1/3. +# cp "${WORKDIR}"/patch/{00[3-6]_all_grub*,010_all_grub*,01[3-9]_all_grub*,0[6-7]0_all_grub*} \ +# "${WORKDIR}"/patch/{110_all_grub*,300_all_grub*} \ +# stubdom/grub.patches/ || die + einfo "files copied to stubdom" + + # Patch the unmergeable newlib, fix most of the leftover gcc QA issues + cp "${FILESDIR}"/newlib-implicits.patch stubdom || die + + # Patch stubdom/Makefile to patch insource newlib & prevent internal downloading + epatch "${FILESDIR}"/${P/-pvgrub/}-externals.patch + + # Drop .config and Fix gcc-4.6 + epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch +} + +src_compile() { + use custom-cflags || unset CFLAGS + if test-flag-CC -fno-strict-overflow; then + append-flags -fno-strict-overflow + fi + + emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include + + # TODO; fix those -j1 + if use x86; then + emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \ + XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub + elif use amd64; then + emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \ + XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub + if use multilib; then + multilib_toolchain_setup x86 + emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub + fi + fi +} + +src_install() { + if use x86; then + emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub + fi + if use amd64; then + emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub + if use multilib; then + emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub + fi + fi +} + +pkg_postinst() { + elog "Official Xen Guide and the unoffical wiki page:" + elog " http://www.gentoo.org/doc/en/xen-guide.xml" + elog " http://en.gentoo-wiki.com/wiki/Xen/" +} diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index 4dc432ecfc1d..8fa4a4b0f652 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,4 +1,7 @@ DIST ipxe-git-v1.0.0.tar.gz 1996881 SHA256 d3128bfda9a1542049c278755f85bbcbb8441da7bfd702d511ce237fcf86a723 SHA512 6921fb857ca615899a5912d5590ca36b6f46daf828b85edc75461c08a189d9fed71ee74a82e42724da7a1355e45070d28a0a61694b3a4872c3554390e4bb4147 WHIRLPOOL 160e24eea479c9d67a8a5c7c5182864904ee594167f061adc40a3e74974197b6befe2ecdb76af1c101ff1a5697b060dae71dd3f9f969c8e18054526584d57031 -DIST xen-3.4.2.tar.gz 11187726 SHA256 d17c33136041cc8da69214ccf527fc48637bee7a9ab4d68a88ec50e6a9d20b0b SHA512 a957390e91fb371155e61900f65b5d686a45b636b1c9bad1a1d942697a338d819898b605d5c3ed2ebe4b846cadfb982e711f822ad7c9c7bd2eaa2e3cfb88a55b WHIRLPOOL b073a999951da0bab3d0e8e5327d4040882335cbcb6cf78d18eb550462c73d39bb6bf8e59856ccb230601c376b0937a542073aadececf92189d8d3de9970ed22 +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.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566 +DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0 +DIST xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch 26848 SHA256 8654c4b587b350baaaea12cde3ef1737dc80088fba281556bf4c714fa4d8111f SHA512 1b2678f1cc0b4a9bf24b6b096ed40132a757594c1c5c877468d4cb0c2fba2193cc6bf5fb55d9a0f6cc81f1bf95913758c67898d8c4398210609a6e4412583df9 WHIRLPOOL 24d544c1c1d435879be8879a69eb096c451299a0d4e07c1407d6eaaa8910c2088f2ca0c618f8c6f02fbffbf745f06c9dd4faa5cc666a069e205a28024ddf77b4 diff --git a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch new file mode 100644 index 000000000000..95a1ce6f0659 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch @@ -0,0 +1,28 @@ +diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile +--- tools/firmware/etherboot/Makefile 2012-09-17 18:21:18.000000000 +0800 ++++ tools/firmware/etherboot/Makefile 2012-11-21 14:12:54.389536642 +0800 +@@ -28,13 +28,6 @@ + $(MAKE) -C $D/src bin/$(*F).rom + + $T: +- if ! wget -O _$T $(IPXE_TARBALL_URL); then \ +- $(GIT) clone $(IPXE_GIT_URL) $D.git; \ +- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \ +- $(IPXE_GIT_TAG) | gzip >../_$T); \ +- rm -rf $D.git; \ +- fi +- mv _$T $T + + $D/src/arch/i386/Makefile: $T Config + rm -rf $D +diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile +--- tools/firmware/Makefile 2012-09-17 18:21:18.000000000 +0800 ++++ tools/firmware/Makefile 2012-11-21 16:14:21.974868539 +0800 +@@ -18,7 +18,6 @@ + cp ovmf-makefile ovmf/Makefile; + + seabios-dir: +- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir + cp seabios-config seabios-dir/.config; + + .PHONY: all diff --git a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch new file mode 100644 index 000000000000..d42080c767d3 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch @@ -0,0 +1,20 @@ +diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile +--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 ++++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 +@@ -14,13 +14,13 @@ + .PHONY: blowfish.h + blowfish.h: + rm -f blowfish.bin +- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all ++ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all + (echo "static unsigned int blowfish32_code[] = {"; \ + od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ + echo "};") >$@ + rm -f blowfish.bin + ifeq ($(XEN_COMPILE_ARCH),x86_64) +- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all ++ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all + (echo "static unsigned int blowfish64_code[] = {"; \ + od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ + echo "};") >>$@ + diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch new file mode 100644 index 000000000000..de06279bd33c --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch @@ -0,0 +1,37 @@ +diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile +--- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800 ++++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800 +@@ -243,7 +243,7 @@ + install: all $(if $(BUILD_DOCS),install-doc) + mkdir -p "$(DESTDIR)$(bindir)" + ifneq ($(TOOLS),) +- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" + endif + ifneq ($(BLOBS),) + mkdir -p "$(DESTDIR)$(datadir)" +diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target +--- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800 ++++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800 +@@ -755,7 +755,7 @@ + + install: all install-hook + ifneq ($(PROGS),) +- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" ++ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" + endif + + # Include automatically generated dependency files +diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target +--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800 ++++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800 +@@ -437,9 +437,6 @@ + install: all + ifneq ($(PROGS),) + $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" +-ifneq ($(STRIP),) +- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) +-endif + endif + ifdef CONFIG_TRACE_SYSTEMTAP + ifdef CONFIG_TRACE_SYSTEMTAP diff --git a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch b/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch deleted file mode 100644 index be0527a7c8f8..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.3.1-sandbox-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urN xen-3.3.1/tools/ioemu-qemu-xen/xen-setup xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup ---- xen-3.3.1/tools/ioemu-qemu-xen/xen-setup 2009-01-05 04:36:22.000000000 -0700 -+++ xen-3.3.1-fix/tools/ioemu-qemu-xen/xen-setup 2009-04-25 17:55:03.000000000 -0600 -@@ -3,6 +3,8 @@ - - # git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/ - -+target=i386-dm -+ - rm -f $target/Makefile - rm -f $target/config.mak - rm -f config-host.mak -@@ -11,8 +13,6 @@ - - ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr - --target=i386-dm -- - if [ "x$XEN_ROOT" != x ]; then - echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak - fi diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch deleted file mode 100644 index 403d6124ad7b..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-definitions.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/blktap/lib/blktaplib.h.orig 2011-09-21 19:29:30.240868534 +0800 -+++ tools/blktap/lib/blktaplib.h 2011-09-21 19:34:21.184868372 +0800 -@@ -195,8 +195,13 @@ - pid_t pid; - } msg_pid_t; - -+#ifndef READ - #define READ 0 -+#endif -+ -+#ifndef WRITE - #define WRITE 1 -+#endif - - /*Control Messages between manager and tapdev*/ - #define CTLMSG_PARAMS 1 diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch deleted file mode 100644 index 2fe3f05c417e..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-fix-include.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:27:01.846896986 +0800 -+++ ./tools/blktap/drivers/blktapctrl.c 2011-09-20 00:29:09.910897067 +0800 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- ./tools/blktap/drivers/block-qcow2.c 2011-09-22 04:15:49.339854677 +0800 -+++ ./tools/blktap/drivers/block-qcow2.c 2009-11-10 23:12:55.000000000 +0800 -@@ -26,6 +26,7 @@ - #include "aes.h" - #include - #include -+#include - #include - #include - #include ---- ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:43:40.005898352 +0800 -+++ ./tools/ioemu-qemu-xen/block-qcow2.c 2011-09-19 23:26:53.979898723 +0800 -@@ -26,6 +26,7 @@ - #include - #include "aes.h" - #include -+#include - diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch deleted file mode 100644 index fd777126d498..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-ldflags-respect.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./tools/fs-back/Makefile 2011-09-26 23:14:30.454759297 +0800 -+++ ./tools/fs-back/Makefile 2011-09-27 16:37:57.445748680 +0800 -@@ -23,7 +23,7 @@ - all: $(IBIN) - - fs-backend: $(OBJS) fs-backend.c -- $(CC) $(CFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o fs-backend $(OBJS) $(LIBS) fs-backend.c - - install: all - $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR) ---- ./tools/libfsimage/common/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ ./tools/libfsimage/common/Makefile 2011-09-27 16:41:16.516748626 +0800 -@@ -6,7 +6,7 @@ - - LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS - LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU --LDFLAGS = $(LDFLAGS-y) -+#LDFLAGS = $(LDFLAGS-y) - - LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c - ---- ./tools/misc/lomount/Makefile 2011-09-27 14:23:26.596752233 +0800 -+++ ./tools/misc/lomount/Makefile 2011-09-27 16:37:57.445748680 +0800 -@@ -23,5 +23,5 @@ - $(RM) *.a *.so *.o *.rpm $(BIN) - - %: %.c $(HDRS) Makefile -- $(CC) $(CFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< - diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch deleted file mode 100644 index 8ca546b55190..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-remove-default-cflags.patch +++ /dev/null @@ -1,257 +0,0 @@ -Only in xen-3.4.2/: cflags.sh -diff -ur xen-3.4.2.orig//config/StdGNU.mk xen-3.4.2//config/StdGNU.mk ---- xen-3.4.2.orig//config/StdGNU.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//config/StdGNU.mk 2011-09-26 02:18:14.630771549 +0800 -@@ -48,7 +48,7 @@ - SHLIB_CFLAGS = -shared - - ifneq ($(debug),y) --CFLAGS += -O2 -fomit-frame-pointer -+CFLAGS += -fomit-frame-pointer - else - # Less than -O1 produces bad code and large stack frames - CFLAGS += -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -diff -ur xen-3.4.2.orig//config/SunOS.mk xen-3.4.2//config/SunOS.mk ---- xen-3.4.2.orig//config/SunOS.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//config/SunOS.mk 2011-09-26 02:18:14.640771549 +0800 -@@ -45,7 +45,7 @@ - SHLIB_CFLAGS = -R $(SunOS_LIBDIR) -shared - - ifneq ($(debug),y) --CFLAGS += -O2 -fno-omit-frame-pointer -+CFLAGS += -fno-omit-frame-pointer - else - # Less than -O1 produces bad code and large stack frames - CFLAGS += -O1 -fno-omit-frame-pointer -diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk ---- xen-3.4.2.orig//Config.mk 2011-09-26 02:17:29.221771569 +0800 -+++ xen-3.4.2//Config.mk 2011-09-26 02:18:14.686771549 +0800 -@@ -14,7 +14,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -diff -ur xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk xen-3.4.2//extras/mini-os/arch/ia64/arch.mk ---- xen-3.4.2.orig//extras/mini-os/arch/ia64/arch.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//extras/mini-os/arch/ia64/arch.mk 2011-09-26 02:18:14.689771549 +0800 -@@ -1,8 +1,8 @@ - - ARCH_CFLAGS := -mfixed-range=f2-f5,f12-f15,f32-f127 -mconstant-gp --ARCH_CFLAGS += -O2 -+#ARCH_CFLAGS += -O2 - ARCH_ASFLAGS := -x assembler-with-cpp --ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 -fomit-frame-pointer -+ARCH_ASFLAGS += -mfixed-range=f2-f5,f12-f15,f32-f127 - ARCH_ASFLAGS += -fno-builtin -fno-common -fno-strict-aliasing -mconstant-gp - - ARCH_LDFLAGS = -warn-common -diff -ur xen-3.4.2.orig//stubdom/grub.patches/00cvs xen-3.4.2//stubdom/grub.patches/00cvs ---- xen-3.4.2.orig//stubdom/grub.patches/00cvs 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//stubdom/grub.patches/00cvs 2011-09-26 02:18:14.549771549 +0800 -@@ -223,8 +223,8 @@ - +++ grub/configure.ac 2008-04-10 23:26:50.000000000 +0100 - @@ -86,13 +86,13 @@ if test "x$ac_cv_prog_gcc" = xyes; then - fi -- STAGE1_CFLAGS="-O2" -- GRUB_CFLAGS="-O2" -+ STAGE1_CFLAGS="" -+ GRUB_CFLAGSS="" - - AC_CACHE_CHECK([whether optimization for size works], size_flag, [ - + AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [ - saved_CFLAGS=$CFLAGS -@@ -237,7 +237,7 @@ - + if test "x$grub_cv_cc_Os" = xyes; then - STAGE2_CFLAGS="-Os" - else -- STAGE2_CFLAGS="-O2 -fno-strength-reduce -fno-unroll-loops" -+ STAGE2_CFLAGS=" -fno-strength-reduce -fno-unroll-loops" - @@ -100,16 +100,16 @@ if test "x$ac_cv_prog_gcc" = xyes; then - # OpenBSD has a GCC extension for protecting applications from - # stack smashing attacks, but GRUB doesn't want this feature. -diff -ur xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure ---- xen-3.4.2.orig//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/configure 2011-09-26 02:24:37.261771380 +0800 -@@ -1849,7 +1849,7 @@ - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" -+CFLAGS="" - echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 - echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_g+set}" = set; then -@@ -1898,15 +1898,15 @@ - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="" - else -- CFLAGS="-g" -+ CFLAGS="" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+# CFLAGS="-O2" - else -- CFLAGS= -+ CFLAGS="" - fi - fi - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -Only in xen-3.4.2//tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver: configure~ -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2011-09-26 02:17:29.223771569 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-26 02:22:14.583771444 +0800 -@@ -464,7 +464,7 @@ - - - # default flags for all hosts --CFLAGS="$CFLAGS -O2 -g -fno-strict-aliasing" -+CFLAGS="$CFLAGS -g -fno-strict-aliasing" - CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" - LDFLAGS="$LDFLAGS -g" - if test "$werror" = "yes" ; then -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/cris/Makefile 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/cris/Makefile 2011-09-26 02:18:14.264771549 +0800 -@@ -12,7 +12,7 @@ - OBJCOPY = $(CROSS)objcopy - - # we rely on GCC inline:ing the stuff we tell it to in many places here. --CFLAGS = -Winline -Wall -g -O2 -static -+CFLAGS = -Winline -Wall -g -static - NOSTDFLAGS = -nostartfiles -nostdlib - ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/cris/ - LDLIBS = -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/hello-mips.c 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/hello-mips.c 2011-09-26 02:18:14.669771549 +0800 -@@ -6,7 +6,7 @@ - * http://www.linux.com/howtos/Assembly-HOWTO/mips.shtml - * - * mipsel-linux-gcc -nostdlib -mno-abicalls -fno-PIC -mabi=32 \ --* -O2 -static -o hello-mips hello-mips.c -+* -static -o hello-mips hello-mips.c - * - */ - #define __NR_SYSCALL_BASE 4000 -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/tests/Makefile 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/tests/Makefile 2011-09-26 02:18:14.262771549 +0800 -@@ -2,7 +2,7 @@ - -include ../config-host.mak - VPATH=$(SRC_PATH)/tests - --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=-Wall -g -fno-strict-aliasing - #CFLAGS+=-msse2 - LDFLAGS= - -@@ -52,7 +52,7 @@ - - .PHONY: test-mmap - test-mmap: test-mmap.c -- $(CC) $(CFLAGS) -Wall -static -O2 $(LDFLAGS) -o $@ $< -+ $(CC) $(CFLAGS) -Wall -static $(LDFLAGS) -o $@ $< - -./test-mmap - -$(QEMU) ./test-mmap - -$(QEMU) -p 8192 ./test-mmap 8192 -@@ -88,17 +88,17 @@ - arm-linux-ld -o $@ $< - - hello-arm.o: hello-arm.c -- arm-linux-gcc -Wall -g -O2 -c -o $@ $< -+ arm-linux-gcc -Wall -g -c -o $@ $< - - test-arm-iwmmxt: test-arm-iwmmxt.s - cpp < $< | arm-linux-gnu-gcc -Wall -static -march=iwmmxt -mabi=aapcs -x assembler - -o $@ - - # MIPS test - hello-mips: hello-mips.c -- mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $< -+ mips-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $< - - hello-mipsel: hello-mips.c -- mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -O2 -o $@ $< -+ mipsel-linux-gnu-gcc -nostdlib -static -mno-abicalls -fno-PIC -mabi=32 -Wall -Wextra -g -o $@ $< - - # testsuite for the CRIS port. - test-cris: -diff -ur xen-3.4.2.orig//tools/libaio/src/Makefile xen-3.4.2//tools/libaio/src/Makefile ---- xen-3.4.2.orig//tools/libaio/src/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libaio/src/Makefile 2011-09-26 02:18:14.288771549 +0800 -@@ -6,7 +6,7 @@ - libdir=$(prefix)/lib - - ARCH := $(shell uname -m | sed -e s/i.86/i386/) --CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC -+CFLAGS = -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -fPIC - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= -diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist ---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2011-09-26 02:17:29.223771569 +0800 -+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-26 02:18:14.553771549 +0800 -@@ -22,7 +22,7 @@ - CFLAGS = -Iinclude \ - $(shell xml2-config --cflags) \ - $(shell curl-config --cflags) \ -- -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC -+ -W -Wall -Wmissing-prototypes -std=c99 -fPIC - - LDFLAGS = $(shell xml2-config --libs) \ - $(shell curl-config --libs) -diff -ur xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 ---- xen-3.4.2.orig//tools/vnet/vnet-module/Makefile-2.4 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/vnet-module/Makefile-2.4 2011-09-26 02:18:14.659771549 +0800 -@@ -62,7 +62,7 @@ - CFLAGS += -Wno-unused-parameter - - CFLAGS += -g --CFLAGS += -O2 -+#CFLAGS += -O2 - CFLAGS += -fno-strict-aliasing - CFLAGS += -fno-common - #CFLAGS += -fomit-frame-pointer -diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk ---- xen-3.4.2.orig//extras/mini-os/minios.mk 2011-09-26 02:29:41.869771248 +0800 -+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-26 02:33:55.708771108 +0800 -@@ -23,7 +23,7 @@ - DEF_CFLAGS += -DGNT_DEBUG - DEF_CFLAGS += -DGNTMAP_DEBUG - else --DEF_CFLAGS += -O3 -+#DEF_CFLAGS += -O3 - endif - - # Make the headers define our internal stuff -diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile ---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2011-09-26 02:29:41.872771248 +0800 -+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-26 02:37:59.835771029 +0800 -@@ -26,7 +26,7 @@ - - $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) - CFLAGS += -fno-strict-aliasing --CFLAGS += -O3 -+#CFLAGS += -O3 - #CFLAGS += -g - - MAJOR := 3.0 -diff -ur xen-3.4.2.orig//tools/vnet/vnetd/Makefile xen-3.4.2//tools/vnet/vnetd/Makefile ---- xen-3.4.2.orig//tools/vnet/vnetd/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/vnetd/Makefile 2011-09-26 02:37:59.834771029 +0800 -@@ -44,7 +44,7 @@ - CPPFLAGS += -D __ARCH_I386_ATOMIC__ - - #---------------------------------------------------------------------------- --CFLAGS += -O3 -+#CFLAGS += -O3 - CFLAGS += $(INCLUDES) $(LIBS) - - LDFLAGS += $(LIBS) \ No newline at end of file diff --git a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch b/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch deleted file mode 100644 index f9c746d6a631..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-3.4.2-werror-idiocy-v2.patch +++ /dev/null @@ -1,429 +0,0 @@ -diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk ---- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800 -+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800 -@@ -14,7 +14,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk ---- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800 -@@ -6,7 +6,7 @@ - - # Define some default flags. - # NB. '-Wcast-qual' is nasty, so I omitted it. --DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls -+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls - DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) - DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) - DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline -diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile ---- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800 -@@ -5,7 +5,7 @@ - QCOW_UTIL = img2qcow qcow2raw qcow-create - LIBAIO_DIR = ../../libaio/src - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -I../lib - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile ---- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800 -@@ -13,7 +13,7 @@ - SRCS := - SRCS += xenbus.c blkif.c xs_api.c - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -fPIC - # get asprintf(): -diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile ---- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800 -@@ -2,7 +2,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenstore) -diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile ---- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../../.. - include $(XEN_ROOT)/tools/Rules.mk - --#CFLAGS += -Werror -g -O0 -+#CFLAGS += -g -O0 - - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk ---- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800 -@@ -10,7 +10,7 @@ - CFLAGS += -DNDEBUG - endif - --CFLAGS += -Werror -+CFLAGS += - - # Disable PIE/SSP if GCC supports them. They can break us. - $(call cc-option-add,CFLAGS,CC,-nopie) -diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile ---- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800 -@@ -9,7 +9,7 @@ - SRCS := - SRCS += flask_op.c - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -fno-strict-aliasing - CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE) - -diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile ---- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800 -@@ -6,7 +6,7 @@ - LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask - - PROFILE=#-pg --BASECFLAGS=-Wall -g -Werror -+BASECFLAGS=-Wall -g - BASECFLAGS+= $(PROFILE) - #BASECFLAGS+= -I$(XEN_ROOT)/tools - BASECFLAGS+= $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile ---- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800 -@@ -5,7 +5,7 @@ - - IBIN = fs-backend - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800 -@@ -468,7 +468,7 @@ - CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" - LDFLAGS="$LDFLAGS -g" - if test "$werror" = "yes" ; then --CFLAGS="$CFLAGS -Werror" -+CFLAGS="$CFLAGS" - fi - - if test "$solaris" = "no" ; then -@@ -1150,7 +1150,7 @@ - echo "sparse enabled $sparse" - echo "profiler $profiler" - echo "static build $static" --echo "-Werror enabled $werror" -+ - if test "$darwin" = "yes" ; then - echo "Cocoa support $cocoa" - fi -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800 -@@ -26,7 +26,7 @@ - TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) - VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw - CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H --#CFLAGS+=-Werror -+#CFLAGS+= - LIBS= - # user emulator name - ifndef TARGET_ARCH2 -diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile ---- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800 -@@ -4,7 +4,7 @@ - HARNESS_SRCS:=main.c - # io_queue.c - --CFLAGS=-Wall -Werror -g -O -laio -+CFLAGS=-Wall -g -O -laio - #-lpthread -lrt - - all: $(PROGS) -diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk ---- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800 -@@ -1,6 +1,6 @@ - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ - LDFLAGS += -L../common/ - - PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile ---- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800 -+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800 -@@ -52,7 +52,7 @@ - - -include $(XEN_TARGET_ARCH)/Makefile - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include - - # Needed for posix_fadvise64() in xc_linux.c -diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist ---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800 -@@ -22,7 +22,7 @@ - CFLAGS = -Iinclude \ - $(shell xml2-config --cflags) \ - $(shell curl-config --cflags) \ -- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC -+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC - - LDFLAGS = $(shell xml2-config --libs) \ - $(shell curl-config --libs) -diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile ---- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - HDRS = $(wildcard *.h) - OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) -diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile ---- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - INCLUDES += -I $(XEN_XC) - INCLUDES += -I $(XEN_LIBXC) -diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py ---- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800 -@@ -3,7 +3,7 @@ - import os - import sys - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - XEN_ROOT = "../.." - -diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py ---- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800 -@@ -4,7 +4,7 @@ - - XEN_ROOT = "../.." - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - include_dirs = [ XEN_ROOT + "/tools/libxc", - XEN_ROOT + "/tools/xenstore", -diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile ---- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -fno-strict-aliasing - CFLAGS += -I. $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile ---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800 -@@ -25,7 +25,7 @@ - PIC_OBJS := $(LIB_SRCS:.c=.opic) - - $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) --CFLAGS += -Werror -fno-strict-aliasing -+CFLAGS += -fno-strict-aliasing - CFLAGS += -O3 - #CFLAGS += -g - -diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk ---- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800 -@@ -9,7 +9,7 @@ - TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - # General compiler flags --CFLAGS = -Werror -g3 -I. -+CFLAGS = -g3 -I. - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk ---- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800 -@@ -9,7 +9,7 @@ - TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - # General compiler flags --CFLAGS = -Werror -g3 -I. -+CFLAGS = -g3 -I. - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile ---- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800 -@@ -11,7 +11,7 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) - - PROGRAMS = xc_restore xc_save readnotes lsevtchn -diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile ---- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800 -@@ -13,7 +13,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -I $(XEN_XC) - CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile ---- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenstore) - LDFLAGS += $(LDFLAGS_libxenstore) - -diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile ---- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800 -@@ -34,7 +34,7 @@ - OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o - SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) - --WARN_FLAGS=-Wall -Werror -+WARN_FLAGS=-Wall - - CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE) - LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ -diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile ---- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800 -@@ -18,7 +18,7 @@ - all install xentop: - else - --CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) -+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT) - LDFLAGS += -L$(XEN_LIBXENSTAT) - LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) - CFLAGS += -DHOST_$(XEN_OS) -diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile ---- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800 -@@ -4,7 +4,7 @@ - MAJOR = 3.0 - MINOR = 0 - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -I. - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c ---- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800 -@@ -865,7 +865,7 @@ - { - unsigned int offset, datalen; - struct node *node; -- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */ -+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */ - char *name; - - /* Extra "strings" can be created by binary data. */ -diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile ---- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) -Only in xen-3.4.2/: Werror.sh -diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk ---- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800 -@@ -68,7 +68,7 @@ - CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK - endif - ifeq ($(no_warns),y) --CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized -+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized - endif - ifneq ($(vhpt_disable),y) - CFLAGS += -DVHPT_ENABLED=1 -diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk ---- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800 -@@ -8,7 +8,7 @@ - $(call cc-option-add,CFLAGS,CC,-fno-stack-protector) - $(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all) - --CFLAGS += -Werror -fno-builtin -msoft-float -+CFLAGS += -fno-builtin -msoft-float - - # NB. awk invocation is a portable alternative to 'head -n -1' - %.S: %.bin -diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk ---- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800 -@@ -17,7 +17,7 @@ - endif - - CFLAGS += -fno-builtin -fno-common --CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe -+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe - CFLAGS += -I$(BASEDIR)/include - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default diff --git a/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch b/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch deleted file mode 100644 index ef511a7db92c..000000000000 --- a/app-emulation/xen-tools/files/xen-tools-4.1.1-upstream-23104-1976adbf2b80.patch +++ /dev/null @@ -1,731 +0,0 @@ -# HG changeset patch -# User Keir Fraser -# Date 1311171934 -3600 -# Node ID 1976adbf2b807e505fdf0356c29ec0c0499ed533 -# Parent 411b38f8f90bc042a9e6839b6840dd57cbee4a8c -hvmloader: Switch to absolute addressing for calling hypercall stubs. - -This is clearer and less fragile than trying to make relative calls -work. In particular, the old approach failed if _start was not -== HVMLOADER_PHYSICAL_ADDRESS. This was the case for some modern -toolchains which reorder functions. - -Signed-off-by: Keir Fraser -xen-unstable changeset: 23730:dd5eecf739d1 -xen-unstable date: Wed Jul 20 15:02:16 2011 +0100 - - -hvmloader: Remove hard tabs from source files. - -Signed-off-by: Keir Fraser -xen-unstable changeset: 23729:4f1109af9c63 -xen-unstable date: Wed Jul 20 14:52:16 2011 +0100 - -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/hypercall.h ---- a/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/hypercall.h Wed Jul 20 15:25:34 2011 +0100 -@@ -35,147 +35,148 @@ - #include - #include "config.h" - --/* -- * NB. Hypercall address needs to be relative to a linkage symbol for -- * some version of ld to relocate the relative calls properly. -- */ --#define hypercall_pa "_start - " STR(HVMLOADER_PHYSICAL_ADDRESS) \ -- " + " STR(HYPERCALL_PHYSICAL_ADDRESS) -+#define hcall_addr(name) \ -+ ((unsigned long)HYPERCALL_PHYSICAL_ADDRESS + __HYPERVISOR_##name * 32) - --#define _hypercall0(type, name) \ --({ \ -- long __res; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res) \ -- : \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall0(type, name) \ -+({ \ -+ long __res; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res) \ -+ : "0" (hcall_addr(name)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall1(type, name, a1) \ --({ \ -- long __res, __ign1; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1) \ -- : "1" ((long)(a1)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall1(type, name, a1) \ -+({ \ -+ long __res, __ign1; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall2(type, name, a1, a2) \ --({ \ -- long __res, __ign1, __ign2; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ -- : "1" ((long)(a1)), "2" ((long)(a2)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall2(type, name, a1, a2) \ -+({ \ -+ long __res, __ign1, __ign2; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall3(type, name, a1, a2, a3) \ --({ \ -- long __res, __ign1, __ign2, __ign3; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -- "=d" (__ign3) \ -- : "1" ((long)(a1)), "2" ((long)(a2)), \ -- "3" ((long)(a3)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall3(type, name, a1, a2, a3) \ -+({ \ -+ long __res, __ign1, __ign2, __ign3; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -+ "=d" (__ign3) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)), \ -+ "3" ((long)(a3)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall4(type, name, a1, a2, a3, a4) \ --({ \ -- long __res, __ign1, __ign2, __ign3, __ign4; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -- "=d" (__ign3), "=S" (__ign4) \ -- : "1" ((long)(a1)), "2" ((long)(a2)), \ -- "3" ((long)(a3)), "4" ((long)(a4)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall4(type, name, a1, a2, a3, a4) \ -+({ \ -+ long __res, __ign1, __ign2, __ign3, __ign4; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -+ "=d" (__ign3), "=S" (__ign4) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)), \ -+ "3" ((long)(a3)), "4" ((long)(a4)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - --#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ --({ \ -- long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ -- asm volatile ( \ -- "call "hypercall_pa" + " STR(__HYPERVISOR_##name * 32) \ -- : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -- "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ -- : "1" ((long)(a1)), "2" ((long)(a2)), \ -- "3" ((long)(a3)), "4" ((long)(a4)), \ -- "5" ((long)(a5)) \ -- : "memory" ); \ -- (type)__res; \ -+#define _hypercall5(type, name, a1, a2, a3, a4, a5) \ -+({ \ -+ long __res, __ign1, __ign2, __ign3, __ign4, __ign5; \ -+ asm volatile ( \ -+ "call *%%eax" \ -+ : "=a" (__res), "=b" (__ign1), "=c" (__ign2), \ -+ "=d" (__ign3), "=S" (__ign4), "=D" (__ign5) \ -+ : "0" (hcall_addr(name)), \ -+ "1" ((long)(a1)), "2" ((long)(a2)), \ -+ "3" ((long)(a3)), "4" ((long)(a4)), \ -+ "5" ((long)(a5)) \ -+ : "memory" ); \ -+ (type)__res; \ - }) - - static inline int - hypercall_sched_op( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, sched_op, cmd, arg); -+ return _hypercall2(int, sched_op, cmd, arg); - } - - static inline int - hypercall_memory_op( -- unsigned int cmd, void *arg) -+ unsigned int cmd, void *arg) - { -- return _hypercall2(int, memory_op, cmd, arg); -+ return _hypercall2(int, memory_op, cmd, arg); - } - - static inline int - hypercall_multicall( -- void *call_list, int nr_calls) -+ void *call_list, int nr_calls) - { -- return _hypercall2(int, multicall, call_list, nr_calls); -+ return _hypercall2(int, multicall, call_list, nr_calls); - } - - static inline int - hypercall_event_channel_op( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, event_channel_op, cmd, arg); -+ return _hypercall2(int, event_channel_op, cmd, arg); - } - - static inline int - hypercall_xen_version( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, xen_version, cmd, arg); -+ return _hypercall2(int, xen_version, cmd, arg); - } - - static inline int - hypercall_console_io( -- int cmd, int count, char *str) -+ int cmd, int count, char *str) - { -- return _hypercall3(int, console_io, cmd, count, str); -+ return _hypercall3(int, console_io, cmd, count, str); - } - - static inline int - hypercall_vm_assist( -- unsigned int cmd, unsigned int type) -+ unsigned int cmd, unsigned int type) - { -- return _hypercall2(int, vm_assist, cmd, type); -+ return _hypercall2(int, vm_assist, cmd, type); - } - - static inline int - hypercall_vcpu_op( -- int cmd, int vcpuid, void *extra_args) -+ int cmd, int vcpuid, void *extra_args) - { -- return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); -+ return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args); - } - - static inline int - hypercall_hvm_op( -- int cmd, void *arg) -+ int cmd, void *arg) - { -- return _hypercall2(int, hvm_op, cmd, arg); -+ return _hypercall2(int, hvm_op, cmd, arg); - } - - #endif /* __HVMLOADER_HYPERCALL_H__ */ -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/pci_regs.h ---- a/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/pci_regs.h Wed Jul 20 15:25:34 2011 +0100 -@@ -1,69 +1,69 @@ - /* -- * pci_regs.h -+ * pci_regs.h - * -- * PCI standard defines -- * Copyright 1994, Drew Eckhardt -- * Copyright 1997--1999 Martin Mares -+ * PCI standard defines -+ * Copyright 1994, Drew Eckhardt -+ * Copyright 1997--1999 Martin Mares - * -- * For more information, please consult the following manuals (look at -- * http://www.pcisig.com/ for how to get them): -+ * For more information, please consult the following manuals (look at -+ * http://www.pcisig.com/ for how to get them): - * -- * PCI BIOS Specification -- * PCI Local Bus Specification -- * PCI to PCI Bridge Specification -- * PCI System Design Guide -+ * PCI BIOS Specification -+ * PCI Local Bus Specification -+ * PCI to PCI Bridge Specification -+ * PCI System Design Guide - */ - - #ifndef __HVMLOADER_PCI_REGS_H__ - #define __HVMLOADER_PCI_REGS_H__ - --#define PCI_VENDOR_ID 0x00 /* 16 bits */ --#define PCI_DEVICE_ID 0x02 /* 16 bits */ --#define PCI_COMMAND 0x04 /* 16 bits */ --#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ --#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ --#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */ --#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */ --#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */ --#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */ --#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */ --#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */ --#define PCI_COMMAND_SERR 0x100 /* Enable SERR */ --#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ -+#define PCI_VENDOR_ID 0x00 /* 16 bits */ -+#define PCI_DEVICE_ID 0x02 /* 16 bits */ -+#define PCI_COMMAND 0x04 /* 16 bits */ -+#define PCI_COMMAND_IO 0x1 /* Enable response in I/O space */ -+#define PCI_COMMAND_MEMORY 0x2 /* Enable response in Memory space */ -+#define PCI_COMMAND_MASTER 0x4 /* Enable bus mastering */ -+#define PCI_COMMAND_SPECIAL 0x8 /* Enable response to special cycles */ -+#define PCI_COMMAND_INVALIDATE 0x10 /* Use memory write and invalidate */ -+#define PCI_COMMAND_VGA_PALETTE 0x20 /* Enable palette snooping */ -+#define PCI_COMMAND_PARITY 0x40 /* Enable parity checking */ -+#define PCI_COMMAND_WAIT 0x80 /* Enable address/data stepping */ -+#define PCI_COMMAND_SERR 0x100 /* Enable SERR */ -+#define PCI_COMMAND_FAST_BACK 0x200 /* Enable back-to-back writes */ - #define PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */ - --#define PCI_STATUS 0x06 /* 16 bits */ --#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ --#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ --#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ --#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */ --#define PCI_STATUS_PARITY 0x100 /* Detected parity error */ --#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */ --#define PCI_STATUS_DEVSEL_FAST 0x000 --#define PCI_STATUS_DEVSEL_MEDIUM 0x200 --#define PCI_STATUS_DEVSEL_SLOW 0x400 --#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */ --#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */ --#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */ --#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */ --#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */ -+#define PCI_STATUS 0x06 /* 16 bits */ -+#define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ -+#define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ -+#define PCI_STATUS_UDF 0x40 /* Support User Definable Features [obsolete] */ -+#define PCI_STATUS_FAST_BACK 0x80 /* Accept fast-back to back */ -+#define PCI_STATUS_PARITY 0x100 /* Detected parity error */ -+#define PCI_STATUS_DEVSEL_MASK 0x600 /* DEVSEL timing */ -+#define PCI_STATUS_DEVSEL_FAST 0x000 -+#define PCI_STATUS_DEVSEL_MEDIUM 0x200 -+#define PCI_STATUS_DEVSEL_SLOW 0x400 -+#define PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */ -+#define PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */ -+#define PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */ -+#define PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */ -+#define PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */ - --#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ --#define PCI_REVISION_ID 0x08 /* Revision ID */ --#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ --#define PCI_CLASS_DEVICE 0x0a /* Device class */ -+#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ -+#define PCI_REVISION_ID 0x08 /* Revision ID */ -+#define PCI_CLASS_PROG 0x09 /* Reg. Level Programming Interface */ -+#define PCI_CLASS_DEVICE 0x0a /* Device class */ - --#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ --#define PCI_LATENCY_TIMER 0x0d /* 8 bits */ --#define PCI_HEADER_TYPE 0x0e /* 8 bits */ --#define PCI_HEADER_TYPE_NORMAL 0 --#define PCI_HEADER_TYPE_BRIDGE 1 --#define PCI_HEADER_TYPE_CARDBUS 2 -+#define PCI_CACHE_LINE_SIZE 0x0c /* 8 bits */ -+#define PCI_LATENCY_TIMER 0x0d /* 8 bits */ -+#define PCI_HEADER_TYPE 0x0e /* 8 bits */ -+#define PCI_HEADER_TYPE_NORMAL 0 -+#define PCI_HEADER_TYPE_BRIDGE 1 -+#define PCI_HEADER_TYPE_CARDBUS 2 - --#define PCI_BIST 0x0f /* 8 bits */ --#define PCI_BIST_CODE_MASK 0x0f /* Return result */ --#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ --#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ -+#define PCI_BIST 0x0f /* 8 bits */ -+#define PCI_BIST_CODE_MASK 0x0f /* Return result */ -+#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ -+#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ - - /* - * Base addresses specify locations in memory or I/O space. -@@ -71,38 +71,38 @@ - * 0xffffffff to the register, and reading it back. Only - * 1 bits are decoded. - */ --#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ --#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */ --#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */ --#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */ --#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */ --#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */ --#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */ --#define PCI_BASE_ADDRESS_SPACE_IO 0x01 --#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 --#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 --#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */ --#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ --#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ --#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ --#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) --#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) -+#define PCI_BASE_ADDRESS_0 0x10 /* 32 bits */ -+#define PCI_BASE_ADDRESS_1 0x14 /* 32 bits [htype 0,1 only] */ -+#define PCI_BASE_ADDRESS_2 0x18 /* 32 bits [htype 0 only] */ -+#define PCI_BASE_ADDRESS_3 0x1c /* 32 bits */ -+#define PCI_BASE_ADDRESS_4 0x20 /* 32 bits */ -+#define PCI_BASE_ADDRESS_5 0x24 /* 32 bits */ -+#define PCI_BASE_ADDRESS_SPACE 0x01 /* 0 = memory, 1 = I/O */ -+#define PCI_BASE_ADDRESS_SPACE_IO 0x01 -+#define PCI_BASE_ADDRESS_SPACE_MEMORY 0x00 -+#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06 -+#define PCI_BASE_ADDRESS_MEM_TYPE_32 0x00 /* 32 bit address */ -+#define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ -+#define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ -+#define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ -+#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) -+#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) - /* bit 1 is reserved if address_space = 1 */ - - /* Header type 0 (normal devices) */ --#define PCI_CARDBUS_CIS 0x28 --#define PCI_SUBSYSTEM_VENDOR_ID 0x2c --#define PCI_SUBSYSTEM_ID 0x2e --#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ --#define PCI_ROM_ADDRESS_ENABLE 0x01 --#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) -+#define PCI_CARDBUS_CIS 0x28 -+#define PCI_SUBSYSTEM_VENDOR_ID 0x2c -+#define PCI_SUBSYSTEM_ID 0x2e -+#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ -+#define PCI_ROM_ADDRESS_ENABLE 0x01 -+#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) - --#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ -+#define PCI_CAPABILITY_LIST 0x34 /* Offset of first capability list entry */ - - /* 0x35-0x3b are reserved */ --#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ --#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ --#define PCI_MIN_GNT 0x3e /* 8 bits */ --#define PCI_MAX_LAT 0x3f /* 8 bits */ -+#define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ -+#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ -+#define PCI_MIN_GNT 0x3e /* 8 bits */ -+#define PCI_MAX_LAT 0x3f /* 8 bits */ - - #endif /* __HVMLOADER_PCI_REGS_H__ */ -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/smbios_types.h ---- a/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/smbios_types.h Wed Jul 20 15:25:34 2011 +0100 -@@ -32,157 +32,157 @@ - between 0xf0000 and 0xfffff. - */ - struct smbios_entry_point { -- char anchor_string[4]; -- uint8_t checksum; -- uint8_t length; -- uint8_t smbios_major_version; -- uint8_t smbios_minor_version; -- uint16_t max_structure_size; -- uint8_t entry_point_revision; -- uint8_t formatted_area[5]; -- char intermediate_anchor_string[5]; -- uint8_t intermediate_checksum; -- uint16_t structure_table_length; -- uint32_t structure_table_address; -- uint16_t number_of_structures; -- uint8_t smbios_bcd_revision; -+ char anchor_string[4]; -+ uint8_t checksum; -+ uint8_t length; -+ uint8_t smbios_major_version; -+ uint8_t smbios_minor_version; -+ uint16_t max_structure_size; -+ uint8_t entry_point_revision; -+ uint8_t formatted_area[5]; -+ char intermediate_anchor_string[5]; -+ uint8_t intermediate_checksum; -+ uint16_t structure_table_length; -+ uint32_t structure_table_address; -+ uint16_t number_of_structures; -+ uint8_t smbios_bcd_revision; - } __attribute__ ((packed)); - - /* This goes at the beginning of every SMBIOS structure. */ - struct smbios_structure_header { -- uint8_t type; -- uint8_t length; -- uint16_t handle; -+ uint8_t type; -+ uint8_t length; -+ uint16_t handle; - } __attribute__ ((packed)); - - /* SMBIOS type 0 - BIOS Information */ - struct smbios_type_0 { -- struct smbios_structure_header header; -- uint8_t vendor_str; -- uint8_t version_str; -- uint16_t starting_address_segment; -- uint8_t release_date_str; -- uint8_t rom_size; -- uint8_t characteristics[8]; -- uint8_t characteristics_extension_bytes[2]; -- uint8_t major_release; -- uint8_t minor_release; -- uint8_t embedded_controller_major; -- uint8_t embedded_controller_minor; -+ struct smbios_structure_header header; -+ uint8_t vendor_str; -+ uint8_t version_str; -+ uint16_t starting_address_segment; -+ uint8_t release_date_str; -+ uint8_t rom_size; -+ uint8_t characteristics[8]; -+ uint8_t characteristics_extension_bytes[2]; -+ uint8_t major_release; -+ uint8_t minor_release; -+ uint8_t embedded_controller_major; -+ uint8_t embedded_controller_minor; - } __attribute__ ((packed)); - - /* SMBIOS type 1 - System Information */ - struct smbios_type_1 { -- struct smbios_structure_header header; -- uint8_t manufacturer_str; -- uint8_t product_name_str; -- uint8_t version_str; -- uint8_t serial_number_str; -- uint8_t uuid[16]; -- uint8_t wake_up_type; -- uint8_t sku_str; -- uint8_t family_str; -+ struct smbios_structure_header header; -+ uint8_t manufacturer_str; -+ uint8_t product_name_str; -+ uint8_t version_str; -+ uint8_t serial_number_str; -+ uint8_t uuid[16]; -+ uint8_t wake_up_type; -+ uint8_t sku_str; -+ uint8_t family_str; - } __attribute__ ((packed)); - - /* SMBIOS type 3 - System Enclosure */ - struct smbios_type_3 { -- struct smbios_structure_header header; -- uint8_t manufacturer_str; -- uint8_t type; -- uint8_t version_str; -- uint8_t serial_number_str; -- uint8_t asset_tag_str; -- uint8_t boot_up_state; -- uint8_t power_supply_state; -- uint8_t thermal_state; -- uint8_t security_status; -+ struct smbios_structure_header header; -+ uint8_t manufacturer_str; -+ uint8_t type; -+ uint8_t version_str; -+ uint8_t serial_number_str; -+ uint8_t asset_tag_str; -+ uint8_t boot_up_state; -+ uint8_t power_supply_state; -+ uint8_t thermal_state; -+ uint8_t security_status; - } __attribute__ ((packed)); - - /* SMBIOS type 4 - Processor Information */ - struct smbios_type_4 { -- struct smbios_structure_header header; -- uint8_t socket_designation_str; -- uint8_t processor_type; -- uint8_t processor_family; -- uint8_t manufacturer_str; -- uint32_t cpuid[2]; -- uint8_t version_str; -- uint8_t voltage; -- uint16_t external_clock; -- uint16_t max_speed; -- uint16_t current_speed; -- uint8_t status; -- uint8_t upgrade; -+ struct smbios_structure_header header; -+ uint8_t socket_designation_str; -+ uint8_t processor_type; -+ uint8_t processor_family; -+ uint8_t manufacturer_str; -+ uint32_t cpuid[2]; -+ uint8_t version_str; -+ uint8_t voltage; -+ uint16_t external_clock; -+ uint16_t max_speed; -+ uint16_t current_speed; -+ uint8_t status; -+ uint8_t upgrade; - } __attribute__ ((packed)); - - /* SMBIOS type 11 - OEM Strings */ - struct smbios_type_11 { -- struct smbios_structure_header header; -- uint8_t count; -+ struct smbios_structure_header header; -+ uint8_t count; - } __attribute__ ((packed)); - - /* SMBIOS type 16 - Physical Memory Array - * Associated with one type 17 (Memory Device). - */ - struct smbios_type_16 { -- struct smbios_structure_header header; -- uint8_t location; -- uint8_t use; -- uint8_t error_correction; -- uint32_t maximum_capacity; -- uint16_t memory_error_information_handle; -- uint16_t number_of_memory_devices; -+ struct smbios_structure_header header; -+ uint8_t location; -+ uint8_t use; -+ uint8_t error_correction; -+ uint32_t maximum_capacity; -+ uint16_t memory_error_information_handle; -+ uint16_t number_of_memory_devices; - } __attribute__ ((packed)); - - /* SMBIOS type 17 - Memory Device - * Associated with one type 19 - */ - struct smbios_type_17 { -- struct smbios_structure_header header; -- uint16_t physical_memory_array_handle; -- uint16_t memory_error_information_handle; -- uint16_t total_width; -- uint16_t data_width; -- uint16_t size; -- uint8_t form_factor; -- uint8_t device_set; -- uint8_t device_locator_str; -- uint8_t bank_locator_str; -- uint8_t memory_type; -- uint16_t type_detail; -+ struct smbios_structure_header header; -+ uint16_t physical_memory_array_handle; -+ uint16_t memory_error_information_handle; -+ uint16_t total_width; -+ uint16_t data_width; -+ uint16_t size; -+ uint8_t form_factor; -+ uint8_t device_set; -+ uint8_t device_locator_str; -+ uint8_t bank_locator_str; -+ uint8_t memory_type; -+ uint16_t type_detail; - } __attribute__ ((packed)); - - /* SMBIOS type 19 - Memory Array Mapped Address */ - struct smbios_type_19 { -- struct smbios_structure_header header; -- uint32_t starting_address; -- uint32_t ending_address; -- uint16_t memory_array_handle; -- uint8_t partition_width; -+ struct smbios_structure_header header; -+ uint32_t starting_address; -+ uint32_t ending_address; -+ uint16_t memory_array_handle; -+ uint8_t partition_width; - } __attribute__ ((packed)); - - /* SMBIOS type 20 - Memory Device Mapped Address */ - struct smbios_type_20 { -- struct smbios_structure_header header; -- uint32_t starting_address; -- uint32_t ending_address; -- uint16_t memory_device_handle; -- uint16_t memory_array_mapped_address_handle; -- uint8_t partition_row_position; -- uint8_t interleave_position; -- uint8_t interleaved_data_depth; -+ struct smbios_structure_header header; -+ uint32_t starting_address; -+ uint32_t ending_address; -+ uint16_t memory_device_handle; -+ uint16_t memory_array_mapped_address_handle; -+ uint8_t partition_row_position; -+ uint8_t interleave_position; -+ uint8_t interleaved_data_depth; - } __attribute__ ((packed)); - - /* SMBIOS type 32 - System Boot Information */ - struct smbios_type_32 { -- struct smbios_structure_header header; -- uint8_t reserved[6]; -- uint8_t boot_status; -+ struct smbios_structure_header header; -+ uint8_t reserved[6]; -+ uint8_t boot_status; - } __attribute__ ((packed)); - - /* SMBIOS type 127 -- End-of-table */ - struct smbios_type_127 { -- struct smbios_structure_header header; -+ struct smbios_structure_header header; - } __attribute__ ((packed)); - - #endif /* SMBIOS_TYPES_H */ -diff -r 411b38f8f90b -r 1976adbf2b80 tools/firmware/hvmloader/util.c ---- a/tools/firmware/hvmloader/util.c Wed Jul 20 15:24:09 2011 +0100 -+++ b/tools/firmware/hvmloader/util.c Wed Jul 20 15:25:34 2011 +0100 -@@ -125,11 +125,11 @@ - - int strncmp(const char *s1, const char *s2, uint32_t n) - { -- uint32_t ctr; -- for (ctr = 0; ctr < n; ctr++) -- if (s1[ctr] != s2[ctr]) -- return (int)(s1[ctr] - s2[ctr]); -- return 0; -+ uint32_t ctr; -+ for (ctr = 0; ctr < n; ctr++) -+ if (s1[ctr] != s2[ctr]) -+ return (int)(s1[ctr] - s2[ctr]); -+ return 0; - } - - void *memcpy(void *dest, const void *src, unsigned n) diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml index 209d937f8e7b..ccc822a3ea28 100644 --- a/app-emulation/xen-tools/metadata.xml +++ b/app-emulation/xen-tools/metadata.xml @@ -3,16 +3,13 @@ xen - johneed@hotmail.com + idella4@gentoo.org Ian 'idella4' Delaney - Proxy maintainer - Enable the ACM/sHype XSM module from IBM for xen-3 Build the C libxenapi bindings Enable the Flask XSM module from NSA Enable support for hardware based virtualization (VT-x,AMD-v) - Enable IOEMU support Enable IOEMU support via the use of qemu-dm Install the pygrub boot loader Enable support for running domain U console in an app-misc/screen session diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild deleted file mode 100644 index 5b9d0e9357f0..000000000000 --- a/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r3.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $ - -EAPI="3" - -inherit base flag-o-matic eutils multilib python - -# TPMEMUFILE=tpm_emulator-0.4.tar.gz - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" -# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )" -S="${WORKDIR}/xen-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc debug screen custom-cflags pygrub hvm api acm flask" - -CDEPEND="dev-lang/python[ncurses,threads] - sys-libs/zlib - hvm? ( media-libs/libsdl ) - acm? ( dev-libs/libxml2 ) - api? ( dev-libs/libxml2 net-misc/curl )" -# vtpm? ( dev-libs/gmp dev-libs/openssl ) - -DEPEND="${CDEPEND} - sys-devel/gettext - sys-devel/gcc - dev-lang/perl - dev-lang/python[ssl] - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - dev-texlive/texlive-latexextra - media-gfx/transfig - media-gfx/graphviz - ) - hvm? ( - x11-proto/xproto - sys-devel/dev86 - )" - -RDEPEND="${CDEPEND} - sys-apps/iproute2 - net-misc/bridge-utils - dev-python/pyxml - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( virtual/udev sys-apps/hotplug )" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - "${FILESDIR}/${PN}-3.3.0-nostrip.patch" - "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch" - "${FILESDIR}/${P}-as-needed.patch" - "${FILESDIR}/${P}-fix-definitions.patch" - "${FILESDIR}/${P}-fix-include.patch" - "${FILESDIR}/${P}-werror-idiocy-v2.patch" -) - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" -QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 - usr/share/xen/qemu/openbios-sparc64" - -pkg_setup() { - export "CONFIG_LOMOUNT=y" - - if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then - eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" - eerror "an amd64 multilib profile is required. Remove the hvm use flag" - eerror "to build xen-tools on your current profile." - die "USE=hvm is unsupported on this system." - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - -# use vtpm && export "VTPM_TOOLS=y" - use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - base_src_prepare - - # use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm - - # if the user *really* wants to use their own custom-cflags, let them - if use custom-cflags; then - einfo "User wants their own CFLAGS - removing defaults" - # try and remove all the default custom-cflags - find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ - -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ - -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ - -i {} \; - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - chmod 644 tools/check/check_x11_devel - sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk - sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile - fi - - if ! use pygrub; then - sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile - fi - - sed -e '/texi2html/ s/-number/&-sections/' \ - -i tools/ioemu-qemu-xen/Makefile || die #409333 -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - dodoc README docs/README.xen-bugtool docs/ChangeLog - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" - - dohtml -r docs/api/ - docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - rm -rf "${D}"/usr/share/doc/xen/ - - doman docs/man?/* - - newinitd "${FILESDIR}"/xend.initd-r1 xend \ - || die "Couldn't install xen.initd" - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \ - || die "Couldn't install xendomains.initd" - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '', see bug #141866" - ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 multilib system is required to build HVM support." - echo - elog "The ioemu use flag has been removed and replaced with hvm." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi - - python_mod_optimize $(use pygrub && echo grub) xen -} - -pkg_postrm() { - python_mod_cleanup $(use pygrub && echo grub) xen -} diff --git a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild b/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild deleted file mode 100644 index 87068922c0f3..000000000000 --- a/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.4.2-r5.ebuild,v 1.6 2012/12/02 22:48:42 ssuominen Exp $ - -EAPI="3" - -inherit base flag-o-matic eutils multilib python toolchain-funcs - -# TPMEMUFILE=tpm_emulator-0.4.tar.gz - -DESCRIPTION="Xend daemon and tools" -HOMEPAGE="http://xen.org/" -SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" -# vtpm? ( mirror://berlios/tpm-emulator/${TPMEMUFILE} )" -S="${WORKDIR}/xen-${PV}" -QA_PRESTRIPPED="/usr/share/xen/qemu/openbios-ppc \ - /usr/share/xen/qemu/openbios-sparc64 \ - /usr/share/xen/qemu/openbios-sparc32" -QA_WX_LOAD="${QA_PRESTRIPPED}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc debug screen custom-cflags pygrub hvm api acm flask" - -CDEPEND="dev-lang/python[ncurses,threads] - sys-libs/zlib - hvm? ( media-libs/libsdl ) - acm? ( dev-libs/libxml2 ) - api? ( dev-libs/libxml2 net-misc/curl )" -# vtpm? ( dev-libs/gmp dev-libs/openssl ) - -DEPEND="${CDEPEND} - sys-devel/gettext - sys-devel/gcc - dev-lang/perl - dev-lang/python[ssl] - app-misc/pax-utils - doc? ( - app-doc/doxygen - dev-tex/latex2html[png,gif] - media-gfx/transfig - media-gfx/graphviz - virtual/latex-base - dev-tex/latexmk - dev-texlive/texlive-latex - dev-texlive/texlive-pictures - dev-texlive/texlive-latexextra - dev-texlive/texlive-latexrecommended - ) - hvm? ( - x11-proto/xproto - sys-devel/dev86 - )" - -RDEPEND="${CDEPEND} - sys-apps/iproute2 - net-misc/bridge-utils - dev-python/pyxml - screen? ( - app-misc/screen - app-admin/logrotate - ) - || ( virtual/udev sys-apps/hotplug )" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch" - "${FILESDIR}/${PN}-3.3.0-nostrip.patch" - "${FILESDIR}/${PN}-3.3.1-sandbox-fix.patch" - "${FILESDIR}/${P}-as-needed.patch" - "${FILESDIR}/${P}-fix-definitions.patch" - "${FILESDIR}/${P}-fix-include.patch" - "${FILESDIR}/${P}-werror-idiocy-v2.patch" - "${FILESDIR}/${P}-ldflags-respect.patch" -) - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD="usr/lib/xen/boot/hvmloader" -QA_EXECSTACK="usr/share/xen/qemu/openbios-sparc32 - usr/share/xen/qemu/openbios-sparc64" - -pkg_setup() { - if [ -x /.config/ ]; then - die "the system has a dir /.config; this needs to be removed to allow the package to emerge" - fi - - export "CONFIG_LOMOUNT=y" - - if ! use x86 && ! has x86 $(get_all_abis) && use hvm; then - eerror "HVM (VT-x and AMD-v) cannot be built on this system. An x86 or" - eerror "an amd64 multilib profile is required. Remove the hvm use flag" - eerror "to build xen-tools on your current profile." - die "USE=hvm is unsupported on this system." - fi - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - else - die "Unsupported architecture!" - fi - fi - -# use vtpm && export "VTPM_TOOLS=y" - use api && export "LIBXENAPI_BINDINGS=y" - use acm && export "ACM_SECURITY=y" - use flask && export "FLASK_ENABLE=y" -} - -src_prepare() { - base_src_prepare - - # use vtpm && cp "${DISTDIR}"/${TPMEMUFILE} tools/vtpm - - # if the user *really* wants to use their own custom-cflags, let them - # Try and remove all the default custom-cflags - if use custom-cflags; then - epatch "${FILESDIR}/${P}-remove-default-cflags.patch" - fi - - # Disable hvm support on systems that don't support x86_32 binaries. - if ! use hvm; then - chmod 644 tools/check/check_x11_devel - sed -i -e '/^CONFIG_IOEMU := y$/d' "${S}"/config/*.mk - sed -i -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' "${S}"/tools/Makefile - fi - - if ! use pygrub; then - sed -i -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' "${S}"/tools/Makefile - fi - - sed -e '/texi2html/ s/-number/&-sections/' \ - -i tools/ioemu-qemu-xen/Makefile || die #409333 -} - -src_compile() { - export VARTEXFONTS="${T}/fonts" - local myopt - use debug && myopt="${myopt} debug=y" - - use custom-cflags || unset CFLAGS - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed" - - if use doc; then - sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" - fi - - emake -C docs man-pages || die "make man-pages failed" -} - -src_install() { - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" - - # Remove RedHat-specific stuff - rm -rf "${D}"/etc/sysconfig - - # Remove unneeded static-libs - rm "${D}"/usr/lib64/libxenctrl.a "${D}"/usr/lib64/libxenguest.a \ - "${D}"/usr/lib64/libflask.a "${D}"/usr/lib64/libxenstore.a \ - "${D}"/usr/lib64/libblktap.a "${D}"/usr/lib64/libxenapi.a - - dodoc README docs/README.xen-bugtool docs/ChangeLog - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" - - dohtml -r docs/api/ - docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html - fi - rm -rf "${D}"/usr/share/doc/xen/ - - doman docs/man?/* - - newinitd "${FILESDIR}"/xend.initd-r1 xend \ - || die "Couldn't install xen.initd" - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd-r1 xendomains \ - || die "Couldn't install xendomains.initd" - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ - keepdir /var/log/xen-consoles - fi - - # xend expects these to exist - keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen - - # for xendomains - keepdir /etc/xen/auto -} - -pkg_postinst() { - elog "Official Xen Guide and the unoffical wiki page:" - elog " http://www.gentoo.org/doc/en/xen-guide.xml" - elog " http://en.gentoo-wiki.com/wiki/Xen/" - - if [[ "$(scanelf -s __guard -q $(type -P python))" ]] ; then - echo - ewarn "xend may not work when python is built with stack smashing protection (ssp)." - ewarn "If 'xm create' fails with '', see bug #141866" - ewarn "This probablem may be resolved as of Xen 3.0.4, if not post in the bug." - fi - - if ! has_version "dev-lang/python[ncurses]"; then - echo - ewarn "NB: Your dev-lang/python is built without USE=ncurses." - ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py." - fi - - if has_version "sys-apps/iproute2[minimal]"; then - echo - ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking" - ewarn "will not work until you rebuild iproute2 without USE=minimal." - fi - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 multilib system is required to build HVM support." - echo - elog "The ioemu use flag has been removed and replaced with hvm." - fi - - if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then - echo - elog "xensv is broken upstream (Gentoo bug #142011)." - elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." - fi - - python_mod_optimize $(use pygrub && echo grub) xen -} - -pkg_postrm() { - python_mod_cleanup $(use pygrub && echo grub) xen -} diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild index d274e2983000..e32dc1011b34 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2012 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.1.1-r6.ebuild,v 1.5 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.1-r6.ebuild,v 1.8 2012/12/04 19:24:12 scarabeus Exp $ EAPI="3" +PATCH23104="http://dev.gentoo.org/~idella4/${P}-upstream-23104-1976adbf2b80.patch" + if [[ $PV == *9999 ]]; then KEYWORDS="" REPO="xen-unstable.hg" @@ -11,10 +13,11 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ - $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz" + $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz + $PATCH23104" S="${WORKDIR}/xen-${PV}" fi @@ -66,7 +69,7 @@ RDEPEND="${CDEPEND} app-misc/screen app-admin/logrotate ) - || ( virtual/udev sys-apps/hotplug )" + || ( sys-fs/udev sys-apps/hotplug )" # hvmloader is used to bootstrap a fully virtualized kernel # Approved by QA team in bug #144032 @@ -185,7 +188,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-4.1.1-libxl-tap.patch" # Patch from bug #382329 for hvmloader - epatch "${FILESDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch" + epatch "${DISTDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch" # Prevent the downloading of ipxe sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \ diff --git a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild index 8364d1f02cb8..c39c7d3a8cdf 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild @@ -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/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.2 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.1.2-r3.ebuild,v 1.3 2012/12/04 12:00:12 idella4 Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -78,7 +78,7 @@ RDEPEND="${CDEPEND} app-misc/screen app-admin/logrotate ) - || ( virtual/udev sys-apps/hotplug ) + || ( sys-fs/udev sys-apps/hotplug ) selinux? ( sec-policy/selinux-xen )" # hvmloader is used to bootstrap a fully virtualized kernel diff --git a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild similarity index 58% rename from app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild rename to app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild index d7de26992643..1e8e5e4909eb 100644 --- a/app-emulation/xen-tools/xen-tools-4.1.1-r5.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild @@ -1,8 +1,13 @@ # Copyright 1999-2012 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.1.1-r5.ebuild,v 1.7 2012/12/02 22:48:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild,v 1.1 2012/12/04 12:00:12 idella4 Exp $ -EAPI="3" +EAPI="4" +PYTHON_DEPEND="2" +PYTHON_USE_WITH="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" if [[ $PV == *9999 ]]; then KEYWORDS="" @@ -11,25 +16,32 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" live_eclass="mercurial" else - KEYWORDS="~amd64 x86" - XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles" - SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \ - $XEN_EXTFILES_URL/ipxe-git-v1.0.0.tar.gz" + KEYWORDS="~amd64 ~x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz + $IPXE_TARBALL_URL + $XEN_SEABIOS_URL" S="${WORKDIR}/xen-${PV}" fi - inherit flag-o-matic eutils multilib python toolchain-funcs ${live_eclass} DESCRIPTION="Xend daemon and tools" HOMEPAGE="http://xen.org/" +DOCS=( README docs/README.xen-bugtool ) LICENSE="GPL-2" SLOT="0" -IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen xend" +IUSE="api custom-cflags debug doc flask hvm qemu pygrub screen static-libs xend" + +REQUIRED_USE="hvm? ( qemu )" -CDEPEND="dev-lang/python +CDEPEND=" /dev/null + ln -s seabios-dir-remote seabios-dir || die + popd > /dev/null - # Patch to libxl bug #380343 - epatch "${FILESDIR}/${PN}-4.1.1-libxl-tap.patch" + # Fix bridge by idella4, bug #362575 + epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch" - # Patch from bug #382329 for hvmloader - epatch "${FILESDIR}/${PN}-4.1.1-upstream-23104-1976adbf2b80.patch" + # Don't build ipxe with pie on hardened, Bug #360805 + if gcc-specs-pie; then + epatch "${FILESDIR}/ipxe-nopie.patch" + fi - # Prevent the downloading of ipxe - sed -e 's:^\tif ! wget -O _$T:#\tif ! wget -O _$T:' \ - -e 's:^\tfi:#\tfi:' -i \ - -e 's:^\tmv _$T $T:#\tmv _$T $T:' \ - -i tools/firmware/etherboot/Makefile || die + # Prevent double stripping of files at install + epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch - sed -e '/texi2html/ s/-number/&-sections/' \ - -i tools/ioemu-qemu-xen/Makefile || die #409333 + # fix jobserver in Makefile + epatch "${FILESDIR}"/${P/-tools/}-jserver.patch } src_compile() { @@ -208,15 +212,16 @@ src_compile() { fi unset LDFLAGS - emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} || die "compile failed" + unset CFLAGS + emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools ${myopt} if use doc; then sh ./docs/check_pkgs || die "package check failed" - emake docs || die "compiling docs failed" - emake dev-docs || die "make dev-docs failed" + emake docs + emake dev-docs fi - emake -C docs man-pages || die "make man-pages failed" + emake -C docs man-pages } src_install() { @@ -224,11 +229,10 @@ src_install() { export INITD_DIR=/etc/init.d export CONFIG_LEAF_DIR=default - make DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools \ - || die "install failed" + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" XEN_PYTHON_NATIVE_INSTALL=y install-tools # Remove RedHat-specific stuff - rm -r "${D}"/etc/init.d/xen* "${D}"/etc/default || die + rm -rf "${ED}"/etc/init.d/xen* "${ED}"/etc/default || die # uncomment lines in xl.conf sed -e 's:^#autoballoon=1:autoballoon=1:' \ @@ -236,48 +240,55 @@ src_install() { -e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \ -i tools/examples/xl.conf || die - dodoc README docs/README.xen-bugtool docs/ChangeLog if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs \ - || die "install docs failed" + emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-docs dohtml -r docs/api/ docinto pdf - dodoc docs/api/tools/python/latex/refman.pdf - - [ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html + dodoc ${DOCS[@]} + [ -d "${ED}"/usr/share/doc/xen ] && mv "${ED}"/usr/share/doc/xen/* "${ED}"/usr/share/doc/${PF}/html fi - rm -rf "${D}"/usr/share/doc/xen/ + rm -rf "${ED}"/usr/share/doc/xen/ doman docs/man?/* if use xend; then newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd" fi - newconfd "${FILESDIR}"/xendomains.confd xendomains \ - || die "Couldn't install xendomains.confd" - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains \ - || die "Couldn't install xendomains.initd" - newinitd "${FILESDIR}"/xenstored.initd xenstored \ - || die "Couldn't install xenstored.initd" - newconfd "${FILESDIR}"/xenstored.confd xenstored \ - || die "Couldn't install xenstored.confd" - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled \ - || die "Couldn't install xenconsoled.initd" - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled \ - || die "Couldn't install xenconsoled.confd" + newconfd "${FILESDIR}"/xendomains.confd xendomains + newconfd "${FILESDIR}"/xenstored.confd xenstored + newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled + newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains + newinitd "${FILESDIR}"/xenstored.initd xenstored + newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ + cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die + cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die keepdir /var/log/xen-consoles fi + # For -static-libs wrt Bug 384355 + if ! use static-libs; then + rm -f ${ED}usr/$(get_libdir)/*.a ${ED}usr/$(get_libdir)/ocaml/*/*.a + fi + + #python_convert_shebangs -r 2 "${ED}" # xend expects these to exist keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen # for xendomains keepdir /etc/xen/auto + + # Temp QA workaround + mkdir -p "${ED}"$(get_libdir) + mv "${ED}"etc/udev "${ED}"$(get_libdir) + + # Remove files failing QA AFTER emake installs them, avoiding seeking absent files + rm -f $(find "${ED}" -name openbios-sparc32) \ + $(find "${ED}" -name openbios-sparc64) \ + $(find "${ED}" -name openbios-ppc) \ + $(find "${ED}" -name palcode-clipper) || die } pkg_postinst() { @@ -312,16 +323,17 @@ pkg_postinst() { echo elog "The qemu use flag has been removed and replaced with hvm." fi + if use xend; then echo elog "xend capability has been enabled and installed" fi + if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then echo elog "xensv is broken upstream (Gentoo bug #142011)." elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed." fi - python_mod_optimize $(use pygrub && echo grub) xen } diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 3dceea0847b2..c5a788d2b7c6 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,2 +1,3 @@ DIST xen-4.1.1.tar.gz 10355625 SHA256 246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b SHA512 0ec84db28af5b1206392b44e2c135859b3393d9c0eb1109f6a983492ba70622a145a08efce54f2943495feb06291d3fd5df9cc8ffea51e6e42aa69450edc87f2 WHIRLPOOL 58d83e71ac0a942830311d7eb5ebc5a7b34b118001f6f607ea7e5d7a959bafd72c9b8b6d010144fdef7417a238382602d948007be90f9ebf583b4d18897344c0 DIST xen-4.1.2.tar.gz 10365786 SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d SHA512 8f50f238b0b474ec5556279cbd51d704b4365033f2541a5d0376f287b26b7e8f0193172041109d97bb76d35ace3adf71e12f89f5766ff79a8ea861e7282f00d7 WHIRLPOOL 93a4bdd05125ef722464ef682798191c8b3db7228cbc0a27bcbe7932a7776491f90e727e1fcc4a9e7ec3eada7f56c567c07ad61cdda2f514109f702800fe5566 +DIST xen-4.2.0.tar.gz 15587687 SHA256 43f4a086e4e0330145a27b7ace8365c42b5afbc95cefadafe067be91bd3e5cfb SHA512 4fb56c79d722fb307bc657f16d02079c6636427e7650c4354193632d38d2d1db8e588f844ff0ca6e757c108ed639a528565ec9fc7c00bb4d5b6fbc9d122d8a70 WHIRLPOOL 369a109375864cb61920b56cf501522051d28513e738f0fd0e7b76244c3e08a8a0a6ff6cf245872d9bbd9c0f22c7da76c9cbc0f852bad6108ca25fd42dc677c0 diff --git a/app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch b/app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch deleted file mode 100644 index 89f91a49a0d4..000000000000 --- a/app-emulation/xen/files/xen-3.3.0-unexported-target-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru a/tools/ioemu-qemu-xen/xen-setup b/tools/ioemu-qemu-xen/xen-setup ---- a/tools/ioemu-qemu-xen/xen-setup 2008-08-22 17:56:41.000000000 +0800 -+++ b/tools/ioemu-qemu-xen/xen-setup 2009-02-20 10:55:37.000000000 +0800 -@@ -3,6 +3,8 @@ - - # git-clean -x -d && ./xen-setup && make prefix=/usr CMDLINE_CFLAGS='-O0 -g' -j4 && make install DESTDIR=`pwd`/dist/ prefix=/usr && rsync -a --stats --delete . thule:shadow/qemu-iwj.git/ && rsync -a --stats dist/. root@thule:/ - -+target=i386-dm -+ - rm -f $target/Makefile - rm -f $target/config.mak - rm -f config-host.mak -@@ -11,8 +13,6 @@ - - ./configure --disable-gfx-check --disable-gcc-check --disable-curses --disable-slirp "$@" --prefix=/usr - --target=i386-dm -- - if [ "x$XEN_ROOT" != x ]; then - echo "XEN_ROOT=$XEN_ROOT" >>config-host.mak - fi diff --git a/app-emulation/xen/files/xen-3.4.2-CVE-2011-1583.patch b/app-emulation/xen/files/xen-3.4.2-CVE-2011-1583.patch deleted file mode 100644 index f5cec4dbe709..000000000000 --- a/app-emulation/xen/files/xen-3.4.2-CVE-2011-1583.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- tools/libxc/xc_dom_bzimageloader.c 2009-11-10 23:12:56.000000000 +0800 -+++ tools/libxc/xc_dom_bzimageloader.c 2011-10-09 20:10:08.972815311 +0800 -@@ -308,19 +308,19 @@ - - extern struct xc_dom_loader elf_loader; - --static unsigned int payload_offset(struct setup_header *hdr) -+static int check_magic(struct xc_dom_image *dom, const void *magic, size_t len) - { -- unsigned int off; -+ if (len > dom->kernel_size) -+ return 0; -+ -+ return (memcmp(dom->kernel_blob, magic, len) == 0); -+ } - -- off = (hdr->setup_sects + 1) * 512; -- off += hdr->payload_offset; -- return off; --} -- --static int xc_dom_probe_bzimage_kernel(struct xc_dom_image *dom) -+static int check_bzimage_kernel(struct xc_dom_image *dom, int verbose) - { - struct setup_header *hdr; -- int ret; -+ uint64_t payload_offset, payload_length; -+ /* int ret; */ - - if ( dom->kernel_blob == NULL ) - { -@@ -352,20 +352,47 @@ - return -EINVAL; - } - -- dom->kernel_blob = dom->kernel_blob + payload_offset(hdr); -- dom->kernel_size = hdr->payload_length; -+ /* upcast to 64 bits to avoid overflow */ -+ /* setup_sects is u8 and so cannot overflow */ -+ payload_offset = (hdr->setup_sects + 1) * 512; -+ payload_offset += hdr->payload_offset; -+ payload_length = hdr->payload_length; - -- if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 ) -- { -+/* if ( memcmp(dom->kernel_blob, "\037\213", 2) == 0 ) -+ { - ret = xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size); -- if ( ret == -1 ) -+ if ( ret == -1 ) */ -+ if ( payload_offset >= dom->kernel_size ) -+ { -+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload offset overflow", -+ __FUNCTION__); -+ return -EINVAL; -+ } -+ if ( (payload_offset + payload_length) > dom->kernel_size ) -+ { -+ xc_dom_panic(XC_INVALID_KERNEL, "%s: payload length overflow", -+ __FUNCTION__); -+ } -+ -+ dom->kernel_blob = dom->kernel_blob + payload_offset; -+ dom->kernel_size = payload_length; -+ -+ if ( check_magic(dom, "\037\213", 2) ) -+ { -+ if ( xc_dom_try_gunzip(dom, &dom->kernel_blob, &dom->kernel_size) == -1 ) - { -- xc_dom_panic(XC_INVALID_KERNEL, -- "%s: unable to gzip decompress kernel\n", -- __FUNCTION__); -+ if ( verbose ) -+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unable to decompress kernel\$n", -+ __FUNCTION__); - return -EINVAL; - } - } -+ else -+ { -+ xc_dom_panic(XC_INVALID_KERNEL, "%s: unknown compression format\n", -+ __FUNCTION__); -+ return -EINVAL; -+ } - else if ( memcmp(dom->kernel_blob, "\102\132\150", 3) == 0 ) - { - ret = xc_try_bzip2_decode(dom, &dom->kernel_blob, &dom->kernel_size); diff --git a/app-emulation/xen/files/xen-3.4.2-dump_registers-watchdog-fix.patch b/app-emulation/xen/files/xen-3.4.2-dump_registers-watchdog-fix.patch deleted file mode 100644 index 7c8ff5b8a95d..000000000000 --- a/app-emulation/xen/files/xen-3.4.2-dump_registers-watchdog-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -r 784caad93325 xen/common/keyhandler.c ---- a/xen/common/keyhandler.c Tue Nov 10 15:03:52 2009 +0000 -+++ b/xen/common/keyhandler.c Tue Jan 05 10:47:49 2010 +0000 -@@ -106,6 +106,7 @@ - unsigned int cpu; - - /* We want to get everything out that we possibly can. */ -+ watchdog_disable(); - console_start_sync(); - - printk("'%c' pressed -> dumping registers\n", key); -@@ -125,6 +126,7 @@ - printk("\n"); - - console_end_sync(); -+ watchdog_enable(); - } - - static void dump_dom0_registers(unsigned char key) diff --git a/app-emulation/xen/files/xen-3.4.2-fix-__addr_ok-limit.patch b/app-emulation/xen/files/xen-3.4.2-fix-__addr_ok-limit.patch deleted file mode 100644 index 861600821f81..000000000000 --- a/app-emulation/xen/files/xen-3.4.2-fix-__addr_ok-limit.patch +++ /dev/null @@ -1,101 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - - Xen Security Advisory CVE-2011-2901 / XSA-4 - revision no.2 - Xen <= 3.3 DoS due to incorrect virtual address validation - -ISSUE DESCRIPTION -================= - -The x86_64 __addr_ok() macro intends to ensure that the checked -address is either in the positive half of the 48-bit virtual address -space, or above the Xen-reserved area. However, the current shift -count is off-by-one, allowing full access to the "negative half" too, -via certain hypercalls which ignore virtual-address bits [63:48]. -Vulnerable hypercalls exist only in very old versions of the -hypervisor. - -VULNERABLE SYSTEMS -================== - -All systems running a Xen 3.3 or earlier hypervisor with 64-bit PV -guests with untrusted administrators are vulnerable. - -IMPACT -====== - -A malicious guest administrator on a vulnerable system is able to -crash the host. - -There are no known further exploits but these have not been ruled out. - -RESOLUTION -========== - -The attached patch resolves the issue. - -Alternatively, users may choose to upgrade to a more recent hypervisor - -PATCHES -======= - -The following patch resolves this issue. - -Filename: fix-__addr_ok-limit.patch -SHA1: f18bde8d276110451c608a16f577865aa1226b4f -SHA256: 2da5aac72e1ac4849c34d38374ae456795905fd9512eef94b48fc31383c21636 - -This patch should apply cleanly, and fix the problem, for all affected -versions of Xen. - -It is harmless when applied to later hypervisors and will be included -in the Xen unstable branch in due course. - -VERSION HISTORY -=============== - -Analysis following version 1 of this advisory (sent out to the -predisclosure list during the embargo period) indicates that the -actual DoS vulnerability only exists in very old hypervisors, Xen 3.3 -and earlier, contrary to previous reports. - -This advisory is no longer embargoed. ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iQEcBAEBAgAGBQJOYLq2AAoJEIP+FMlX6CvZLegH/26/oJBkd/WM/yYhXkzlbnIP -MxF6Fgy96Omu8poQTanD7g1vEcM0TOLY+Kk3GGsfj4aDdEJ5Nq4ZOW8ooI0VnVcD -7VXQqFsXPxre+eZ6g+G0AsmzdsG45C3qujUTRfGKqzYwXqjWjt9nNsdIy1Mrz8/4 -zG1uLDkN0LXnBG2Te4q8ZckYwMq8gFXHHnH35RfQ5Besu6pvJmtK3rFXETdlP12A -JjBh7t5jsCfzvYWFQehVp8mJupuftiOBPClmVh4vrvN9gYd5rzEgB4Q9Ioiqz2qT -2bE1zegR8NeOKBOi9xriTU8F530OdFzeWAbo7D5gyEbYdc60eNwbadcgNGLbzMg= -=09T8 ------END PGP SIGNATURE----- - -Subject: XSA-4: xen: correct limit checking in x86_64 version of __addr_ok - -The x86_64 __addr_ok() macro intends to ensure that the checked -address is either in the positive half of the 48-bit virtual address -space, or above the Xen-reserved area. However, the current shift -count is off-by-one, allowing full access to the "negative half" -too. Guests may exploit this to gain access to off-limits ranges. - -This issue has been assigned CVE-2011-2901. - -Signed-off-by: Laszlo Ersek -Signed-off-by: Ian Campbell - -diff --git a/xen/include/asm-x86/x86_64/uaccess.h -b/xen/include/asm-x86/x86_64/uaccess.h ---- a/xen/include/asm-x86/x86_64/uaccess.h -+++ b/xen/include/asm-x86/x86_64/uaccess.h -@@ -34,7 +34,7 @@ - * non-canonical address (and thus fault) before ever reaching VIRT_START. - */ - #define __addr_ok(addr) \ -- (((unsigned long)(addr) < (1UL<<48)) || \ -+ (((unsigned long)(addr) < (1UL<<47)) || \ - ((unsigned long)(addr) >= HYPERVISOR_VIRT_END)) - - #define access_ok(addr, size) \ diff --git a/app-emulation/xen/files/xen-3.4.2-no-DMA.patch b/app-emulation/xen/files/xen-3.4.2-no-DMA.patch deleted file mode 100644 index f04d9e26f9b2..000000000000 --- a/app-emulation/xen/files/xen-3.4.2-no-DMA.patch +++ /dev/null @@ -1,71 +0,0 @@ -# HG changeset patch -# User Tim Deegan -# Date 1313145221 -3600 -# Node ID 84e3706df07a1963e23cd3875d8603917657d462 -# Parent cb22fa57ff252893b6adb1481e09b1287eacd990 -Passthrough: disable bus-mastering on any card that causes an IOMMU fault. - -This stops the card from raising back-to-back faults and live-locking -the CPU that handles them. - -Signed-off-by: Tim Deegan -Acked-by: Wei Wang2 -Acked-by: Allen M Kay - ---- a/xen/drivers/passthrough/vtd/iommu.c.orig Mon Jul 25 16:48:39 2011 +0100 -+++ b/xen/drivers/passthrough/vtd/iommu.c Fri Aug 12 11:33:41 2011 +0100 -@@ -733,7 +733,7 @@ - while (1) - { - u8 fault_reason; -- u16 source_id; -+ u16 source_id, cword; - u32 data; - u64 guest_addr; - int type; -@@ -766,6 +766,14 @@ - iommu_page_fault_do_one(iommu, type, fault_reason, - source_id, guest_addr); - -+ /* Tell the device to stop DMAing; we can't rely on the guest to -+ * control it for us. */ -+ cword = pci_conf_read16(PCI_BUS(source_id), PCI_SLOT(source_id), -+ PCI_FUNC(source_id), PCI_COMMAND); -+ pci_conf_write16(PCI_BUS(source_id), PCI_SLOT(source_id), -+ PCI_FUNC(source_id), PCI_COMMAND, -+ cword & ~PCI_COMMAND_MASTER); -+ - fault_index++; - if ( fault_index > cap_num_fault_regs(iommu->cap) ) - fault_index = 0; - ---- a/xen/drivers/passthrough/amd/iommu_init.c.orig Mon Jul 25 16:48:39 2011 +0100 -+++ b/xen/drivers/passthrough/amd/iommu_init.c Fri Aug 12 11:33:41 2011 +0100 -@@ -415,7 +415,7 @@ - - static void parse_event_log_entry(u32 entry[]) - { -- u16 domain_id, device_id; -+ u16 domain_id, device_id, bdf, cword; - u32 code; - u64 *addr; - char * event_str[] = {"ILLEGAL_DEV_TABLE_ENTRY", -@@ -449,6 +449,18 @@ - printk(XENLOG_ERR "AMD-Vi: " - "%s: domain = %d, device id = 0x%04x, fault address = 0x%"PRIx64"\n", - event_str[code-1], domain_id, device_id, *addr); -+ -+ /* Tell the device to stop DMAing; we can't rely on the guest to -+ * control it for us. */ -+ for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) -+ if ( get_dma_requestor_id(bdf) == device_id ) -+ { -+ cword = pci_conf_read16(PCI_BUS(bdf), PCI_SLOT(bdf), -+ PCI_FUNC(bdf), PCI_COMMAND); -+ pci_conf_write16(PCI_BUS(bdf), PCI_SLOT(bdf), -+ PCI_FUNC(bdf), PCI_COMMAND, -+ cword & ~PCI_COMMAND_MASTER); -+ } - } - } - diff --git a/app-emulation/xen/files/xen-3.4.2-werror-idiocy.patch b/app-emulation/xen/files/xen-3.4.2-werror-idiocy.patch deleted file mode 100644 index 7f5b3cb1c731..000000000000 --- a/app-emulation/xen/files/xen-3.4.2-werror-idiocy.patch +++ /dev/null @@ -1,429 +0,0 @@ -diff -ur xen-3.4.2.orig//Config.mk xen-3.4.2//Config.mk ---- xen-3.4.2.orig//Config.mk 2009-11-10 23:16:03.000000000 +0800 -+++ xen-3.4.2//Config.mk 2011-09-25 02:34:11.605793042 +0800 -@@ -14,7 +14,7 @@ - - # Tools to run on system hosting the build - HOSTCC = gcc --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist -diff -ur xen-3.4.2.orig//extras/mini-os/minios.mk xen-3.4.2//extras/mini-os/minios.mk ---- xen-3.4.2.orig//extras/mini-os/minios.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//extras/mini-os/minios.mk 2011-09-25 02:34:11.855793042 +0800 -@@ -6,7 +6,7 @@ - - # Define some default flags. - # NB. '-Wcast-qual' is nasty, so I omitted it. --DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls -+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls - DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,) - DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline) - DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline -diff -ur xen-3.4.2.orig//tools/blktap/drivers/Makefile xen-3.4.2//tools/blktap/drivers/Makefile ---- xen-3.4.2.orig//tools/blktap/drivers/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/blktap/drivers/Makefile 2011-09-25 02:34:11.750793042 +0800 -@@ -5,7 +5,7 @@ - QCOW_UTIL = img2qcow qcow2raw qcow-create - LIBAIO_DIR = ../../libaio/src - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -I../lib - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/blktap/lib/Makefile xen-3.4.2//tools/blktap/lib/Makefile ---- xen-3.4.2.orig//tools/blktap/lib/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/blktap/lib/Makefile 2011-09-25 02:34:11.748793042 +0800 -@@ -13,7 +13,7 @@ - SRCS := - SRCS += xenbus.c blkif.c xs_api.c - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -fPIC - # get asprintf(): -diff -ur xen-3.4.2.orig//tools/console/Makefile xen-3.4.2//tools/console/Makefile ---- xen-3.4.2.orig//tools/console/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/console/Makefile 2011-09-25 02:34:11.704793042 +0800 -@@ -2,7 +2,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - CFLAGS += $(CFLAGS_libxenstore) -diff -ur xen-3.4.2.orig//tools/debugger/xenitp/Makefile xen-3.4.2//tools/debugger/xenitp/Makefile ---- xen-3.4.2.orig//tools/debugger/xenitp/Makefile 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/debugger/xenitp/Makefile 2011-09-25 02:34:11.744793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../../.. - include $(XEN_ROOT)/tools/Rules.mk - --#CFLAGS += -Werror -g -O0 -+#CFLAGS += -g -O0 - - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/firmware/Rules.mk xen-3.4.2//tools/firmware/Rules.mk ---- xen-3.4.2.orig//tools/firmware/Rules.mk 2009-11-10 23:12:55.000000000 +0800 -+++ xen-3.4.2//tools/firmware/Rules.mk 2011-09-25 02:34:11.565793045 +0800 -@@ -10,7 +10,7 @@ - CFLAGS += -DNDEBUG - endif - --CFLAGS += -Werror -+CFLAGS += - - # Disable PIE/SSP if GCC supports them. They can break us. - $(call cc-option-add,CFLAGS,CC,-nopie) -diff -ur xen-3.4.2.orig//tools/flask/libflask/Makefile xen-3.4.2//tools/flask/libflask/Makefile ---- xen-3.4.2.orig//tools/flask/libflask/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/flask/libflask/Makefile 2011-09-25 02:34:11.657793042 +0800 -@@ -9,7 +9,7 @@ - SRCS := - SRCS += flask_op.c - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -fno-strict-aliasing - CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC) -I$(XEN_INCLUDE) - -diff -ur xen-3.4.2.orig//tools/flask/loadpolicy/Makefile xen-3.4.2//tools/flask/loadpolicy/Makefile ---- xen-3.4.2.orig//tools/flask/loadpolicy/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/flask/loadpolicy/Makefile 2011-09-25 02:34:11.660793042 +0800 -@@ -6,7 +6,7 @@ - LIBFLASK_ROOT = $(XEN_ROOT)/tools/flask/libflask - - PROFILE=#-pg --BASECFLAGS=-Wall -g -Werror -+BASECFLAGS=-Wall -g - BASECFLAGS+= $(PROFILE) - #BASECFLAGS+= -I$(XEN_ROOT)/tools - BASECFLAGS+= $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/fs-back/Makefile xen-3.4.2//tools/fs-back/Makefile ---- xen-3.4.2.orig//tools/fs-back/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/fs-back/Makefile 2011-09-25 02:34:11.637793042 +0800 -@@ -5,7 +5,7 @@ - - IBIN = fs-backend - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -Wno-unused - CFLAGS += -fno-strict-aliasing - CFLAGS += $(CFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/configure xen-3.4.2//tools/ioemu-qemu-xen/configure ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/configure 2009-11-05 19:44:56.000000000 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/configure 2011-09-25 02:34:11.888793042 +0800 -@@ -468,7 +468,7 @@ - CFLAGS="$CFLAGS -Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls" - LDFLAGS="$LDFLAGS -g" - if test "$werror" = "yes" ; then --CFLAGS="$CFLAGS -Werror" -+CFLAGS="$CFLAGS" - fi - - if test "$solaris" = "no" ; then -@@ -1150,7 +1150,7 @@ - echo "sparse enabled $sparse" - echo "profiler $profiler" - echo "static build $static" --echo "-Werror enabled $werror" -+ - if test "$darwin" = "yes" ; then - echo "Cocoa support $cocoa" - fi -diff -ur xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target ---- xen-3.4.2.orig//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:33:23.946793064 +0800 -+++ xen-3.4.2//tools/ioemu-qemu-xen/Makefile.target 2011-09-25 02:34:11.584793042 +0800 -@@ -26,7 +26,7 @@ - TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) - VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw - CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H --#CFLAGS+=-Werror -+#CFLAGS+= - LIBS= - # user emulator name - ifndef TARGET_ARCH2 -diff -ur xen-3.4.2.orig//tools/libaio/harness/Makefile xen-3.4.2//tools/libaio/harness/Makefile ---- xen-3.4.2.orig//tools/libaio/harness/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libaio/harness/Makefile 2011-09-25 02:34:11.674793042 +0800 -@@ -4,7 +4,7 @@ - HARNESS_SRCS:=main.c - # io_queue.c - --CFLAGS=-Wall -Werror -g -O -laio -+CFLAGS=-Wall -g -O -laio - #-lpthread -lrt - - all: $(PROGS) -diff -ur xen-3.4.2.orig//tools/libfsimage/Rules.mk xen-3.4.2//tools/libfsimage/Rules.mk ---- xen-3.4.2.orig//tools/libfsimage/Rules.mk 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libfsimage/Rules.mk 2011-09-25 02:34:11.566793044 +0800 -@@ -1,6 +1,6 @@ - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ -Werror -+CFLAGS += -I$(XEN_ROOT)/tools/libfsimage/common/ - LDFLAGS += -L../common/ - - PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y)) -diff -ur xen-3.4.2.orig//tools/libxc/Makefile xen-3.4.2//tools/libxc/Makefile ---- xen-3.4.2.orig//tools/libxc/Makefile 2011-09-25 02:33:23.987793064 +0800 -+++ xen-3.4.2//tools/libxc/Makefile 2011-09-25 02:34:11.687793042 +0800 -@@ -52,7 +52,7 @@ - - -include $(XEN_TARGET_ARCH)/Makefile - --CFLAGS += -Werror -Wmissing-prototypes -+CFLAGS += -Wmissing-prototypes - CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include - - # Needed for posix_fadvise64() in xc_linux.c -diff -ur xen-3.4.2.orig//tools/libxen/Makefile.dist xen-3.4.2//tools/libxen/Makefile.dist ---- xen-3.4.2.orig//tools/libxen/Makefile.dist 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/libxen/Makefile.dist 2011-09-25 02:34:11.593793042 +0800 -@@ -22,7 +22,7 @@ - CFLAGS = -Iinclude \ - $(shell xml2-config --cflags) \ - $(shell curl-config --cflags) \ -- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC -+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC - - LDFLAGS = $(shell xml2-config --libs) \ - $(shell curl-config --libs) -diff -ur xen-3.4.2.orig//tools/misc/lomount/Makefile xen-3.4.2//tools/misc/lomount/Makefile ---- xen-3.4.2.orig//tools/misc/lomount/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/misc/lomount/Makefile 2011-09-25 02:34:11.666793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - HDRS = $(wildcard *.h) - OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) -diff -ur xen-3.4.2.orig//tools/misc/Makefile xen-3.4.2//tools/misc/Makefile ---- xen-3.4.2.orig//tools/misc/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/misc/Makefile 2011-09-25 02:34:11.669793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - INCLUDES += -I $(XEN_XC) - INCLUDES += -I $(XEN_LIBXC) -diff -ur xen-3.4.2.orig//tools/pygrub/setup.py xen-3.4.2//tools/pygrub/setup.py ---- xen-3.4.2.orig//tools/pygrub/setup.py 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/pygrub/setup.py 2011-09-25 02:34:11.901793042 +0800 -@@ -3,7 +3,7 @@ - import os - import sys - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - XEN_ROOT = "../.." - -diff -ur xen-3.4.2.orig//tools/python/setup.py xen-3.4.2//tools/python/setup.py ---- xen-3.4.2.orig//tools/python/setup.py 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/python/setup.py 2011-09-25 02:34:11.897793042 +0800 -@@ -4,7 +4,7 @@ - - XEN_ROOT = "../.." - --extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] -+extra_compile_args = [ "-fno-strict-aliasing" ] - - include_dirs = [ XEN_ROOT + "/tools/libxc", - XEN_ROOT + "/tools/xenstore", -diff -ur xen-3.4.2.orig//tools/security/Makefile xen-3.4.2//tools/security/Makefile ---- xen-3.4.2.orig//tools/security/Makefile 2009-11-10 23:12:56.000000000 +0800 -+++ xen-3.4.2//tools/security/Makefile 2011-09-25 02:34:11.701793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -fno-strict-aliasing - CFLAGS += -I. $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/vnet/libxutil/Makefile xen-3.4.2//tools/vnet/libxutil/Makefile ---- xen-3.4.2.orig//tools/vnet/libxutil/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vnet/libxutil/Makefile 2011-09-25 02:34:11.694793042 +0800 -@@ -25,7 +25,7 @@ - PIC_OBJS := $(LIB_SRCS:.c=.opic) - - $(call cc-option-add,CFLAGS,CC,-fgnu89-inline) --CFLAGS += -Werror -fno-strict-aliasing -+CFLAGS += -fno-strict-aliasing - CFLAGS += -O3 - #CFLAGS += -g - -diff -ur xen-3.4.2.orig//tools/vtpm/Rules.mk xen-3.4.2//tools/vtpm/Rules.mk ---- xen-3.4.2.orig//tools/vtpm/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vtpm/Rules.mk 2011-09-25 02:34:11.563793044 +0800 -@@ -9,7 +9,7 @@ - TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - # General compiler flags --CFLAGS = -Werror -g3 -I. -+CFLAGS = -g3 -I. - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-3.4.2.orig//tools/vtpm_manager/Rules.mk xen-3.4.2//tools/vtpm_manager/Rules.mk ---- xen-3.4.2.orig//tools/vtpm_manager/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/vtpm_manager/Rules.mk 2011-09-25 02:34:11.562793042 +0800 -@@ -9,7 +9,7 @@ - TOOLS_INSTALL_DIR = $(DESTDIR)/usr/bin - - # General compiler flags --CFLAGS = -Werror -g3 -I. -+CFLAGS = -g3 -I. - - # Generic project files - HDRS = $(wildcard *.h) -diff -ur xen-3.4.2.orig//tools/xcutils/Makefile xen-3.4.2//tools/xcutils/Makefile ---- xen-3.4.2.orig//tools/xcutils/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xcutils/Makefile 2011-09-25 02:34:11.636793042 +0800 -@@ -11,7 +11,7 @@ - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) - - PROGRAMS = xc_restore xc_save readnotes lsevtchn -diff -ur xen-3.4.2.orig//tools/xenmon/Makefile xen-3.4.2//tools/xenmon/Makefile ---- xen-3.4.2.orig//tools/xenmon/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenmon/Makefile 2011-09-25 02:34:11.641793042 +0800 -@@ -13,7 +13,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -I $(XEN_XC) - CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) -diff -ur xen-3.4.2.orig//tools/xenpmd/Makefile xen-3.4.2//tools/xenpmd/Makefile ---- xen-3.4.2.orig//tools/xenpmd/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenpmd/Makefile 2011-09-25 02:34:11.656793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += $(CFLAGS_libxenstore) - LDFLAGS += $(LDFLAGS_libxenstore) - -diff -ur xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile xen-3.4.2//tools/xenstat/libxenstat/Makefile ---- xen-3.4.2.orig//tools/xenstat/libxenstat/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstat/libxenstat/Makefile 2011-09-25 02:34:11.681793042 +0800 -@@ -34,7 +34,7 @@ - OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o - SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR) - --WARN_FLAGS=-Wall -Werror -+WARN_FLAGS=-Wall - - CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE) -I$(XEN_INCLUDE) - LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/ -diff -ur xen-3.4.2.orig//tools/xenstat/xentop/Makefile xen-3.4.2//tools/xenstat/xentop/Makefile ---- xen-3.4.2.orig//tools/xenstat/xentop/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstat/xentop/Makefile 2011-09-25 02:34:11.684793042 +0800 -@@ -18,7 +18,7 @@ - all install xentop: - else - --CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT) -+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT) - LDFLAGS += -L$(XEN_LIBXENSTAT) - LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS) - CFLAGS += -DHOST_$(XEN_OS) -diff -ur xen-3.4.2.orig//tools/xenstore/Makefile xen-3.4.2//tools/xenstore/Makefile ---- xen-3.4.2.orig//tools/xenstore/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstore/Makefile 2011-09-25 02:34:11.640793042 +0800 -@@ -4,7 +4,7 @@ - MAJOR = 3.0 - MINOR = 0 - --CFLAGS += -Werror -+CFLAGS += - CFLAGS += -I. - CFLAGS += $(CFLAGS_libxenctrl) - -diff -ur xen-3.4.2.orig//tools/xenstore/xenstored_core.c xen-3.4.2//tools/xenstore/xenstored_core.c ---- xen-3.4.2.orig//tools/xenstore/xenstored_core.c 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xenstore/xenstored_core.c 2011-09-25 02:34:11.845793042 +0800 -@@ -865,7 +865,7 @@ - { - unsigned int offset, datalen; - struct node *node; -- char *vec[1] = { NULL }; /* gcc4 + -W + -Werror fucks code. */ -+ char *vec[1] = { NULL }; /* gcc4 + -W + fucks code. */ - char *name; - - /* Extra "strings" can be created by binary data. */ -diff -ur xen-3.4.2.orig//tools/xentrace/Makefile xen-3.4.2//tools/xentrace/Makefile ---- xen-3.4.2.orig//tools/xentrace/Makefile 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//tools/xentrace/Makefile 2011-09-25 02:34:11.745793042 +0800 -@@ -1,7 +1,7 @@ - XEN_ROOT=../.. - include $(XEN_ROOT)/tools/Rules.mk - --CFLAGS += -Werror -+CFLAGS += - - CFLAGS += $(CFLAGS_libxenctrl) - LDFLAGS += $(LDFLAGS_libxenctrl) -Only in xen-3.4.2/: Werror.sh -diff -ur xen-3.4.2.orig//xen/arch/ia64/Rules.mk xen-3.4.2//xen/arch/ia64/Rules.mk ---- xen-3.4.2.orig//xen/arch/ia64/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/ia64/Rules.mk 2011-09-25 02:34:11.570793042 +0800 -@@ -68,7 +68,7 @@ - CFLAGS += -DCONFIG_XEN_IA64_TLBFLUSH_CLOCK - endif - ifeq ($(no_warns),y) --CFLAGS += -Wa,--fatal-warnings -Werror -Wno-uninitialized -+CFLAGS += -Wa,--fatal-warnings -Wno-uninitialized - endif - ifneq ($(vhpt_disable),y) - CFLAGS += -DVHPT_ENABLED=1 -diff -ur xen-3.4.2.orig//xen/arch/x86/boot/build32.mk xen-3.4.2//xen/arch/x86/boot/build32.mk ---- xen-3.4.2.orig//xen/arch/x86/boot/build32.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/x86/boot/build32.mk 2011-09-25 02:34:11.914793042 +0800 -@@ -8,7 +8,7 @@ - $(call cc-option-add,CFLAGS,CC,-fno-stack-protector) - $(call cc-option-add,CFLAGS,CC,-fno-stack-protector-all) - --CFLAGS += -Werror -fno-builtin -msoft-float -+CFLAGS += -fno-builtin -msoft-float - - # NB. awk invocation is a portable alternative to 'head -n -1' - %.S: %.bin -diff -ur xen-3.4.2.orig//xen/arch/x86/Rules.mk xen-3.4.2//xen/arch/x86/Rules.mk ---- xen-3.4.2.orig//xen/arch/x86/Rules.mk 2009-11-10 23:12:57.000000000 +0800 -+++ xen-3.4.2//xen/arch/x86/Rules.mk 2011-09-25 02:34:11.572793042 +0800 -@@ -17,7 +17,7 @@ - endif - - CFLAGS += -fno-builtin -fno-common --CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe -+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe - CFLAGS += -I$(BASEDIR)/include - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic - CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default \ No newline at end of file diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml index 7e2e13c7619a..14e1dc0d7077 100644 --- a/app-emulation/xen/metadata.xml +++ b/app-emulation/xen/metadata.xml @@ -3,9 +3,8 @@ xen - johneed@hotmail.com - Ian 'idella4' Delaney - Proxy maintainer + idella4@gentoo.org + Ian Delaney Enable the Flask XSM module from NSA diff --git a/app-emulation/xen/xen-4.1.1-r2.ebuild b/app-emulation/xen/xen-4.1.1-r2.ebuild index 64639396ba56..cad38d8740a7 100644 --- a/app-emulation/xen/xen-4.1.1-r2.ebuild +++ b/app-emulation/xen/xen-4.1.1-r2.ebuild @@ -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/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.8 2012/06/01 00:12:36 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.1.1-r2.ebuild,v 1.10 2012/12/04 19:24:19 scarabeus Exp $ EAPI="4" diff --git a/app-emulation/xen/xen-4.2.0.ebuild b/app-emulation/xen/xen-4.2.0.ebuild new file mode 100644 index 000000000000..f436d0b49ffa --- /dev/null +++ b/app-emulation/xen/xen-4.2.0.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.0.ebuild,v 1.1 2012/12/04 12:35:44 idella4 Exp $ + +EAPI="4" + +if [[ $PV == *9999 ]]; then + KEYWORDS="" + REPO="xen-unstable.hg" + EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" + S="${WORKDIR}/${REPO}" + live_eclass="mercurial" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz" +fi + +inherit mount-boot flag-o-matic toolchain-funcs ${live_eclass} + +DESCRIPTION="The Xen virtual machine monitor" +HOMEPAGE="http://xen.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="custom-cflags debug flask pae xsm" + +RDEPEND="|| ( sys-boot/grub + sys-boot/grub-static )" +PDEPEND="~app-emulation/xen-tools-${PV}" + +RESTRICT="test" + +# Approved by QA team in bug #144032 +QA_WX_LOAD="boot/xen-syms-${PV}" + +REQUIRED_USE=" + flask? ( xsm ) + " + +pkg_setup() { + if [[ -z ${XEN_TARGET_ARCH} ]]; then + if use x86 && use amd64; then + die "Confusion! Both x86 and amd64 are set in your use flags!" + elif use x86; then + export XEN_TARGET_ARCH="x86_32" + elif use amd64; then + export XEN_TARGET_ARCH="x86_64" + else + die "Unsupported architecture!" + fi + fi + + if use flask ; then + export "XSM_ENABLE=y" + export "FLASK_ENABLE=y" + elif use xsm ; then + export "XSM_ENABLE=y" + fi +} + +src_prepare() { + + # Drop .config + sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" + + # if the user *really* wants to use their own custom-cflags, let them + if use custom-cflags; then + einfo "User wants their own CFLAGS - removing defaults" + # try and remove all the default custom-cflags + find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \ + -e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ + -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ + -i {} \; || die "failed to re-set custom-cflags" + fi + + # remove -Werror for gcc-4.6's sake + find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \ + xargs sed -i 's/ *-Werror */ /' + # not strictly necessary to fix this + sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py" +} + +src_configure() { + use debug && myopt="${myopt} debug=y" + use pae && myopt="${myopt} pae=y" + + if use custom-cflags; then + filter-flags -fPIE -fstack-protector + replace-flags -O3 -O2 + else + unset CFLAGS + fi +} + +src_compile() { + # Send raw LDFLAGS so that --as-needed works + emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} +} + +src_install() { + local myopt + use debug && myopt="${myopt} debug=y" + use pae && myopt="${myopt} pae=y" + + emake LDFLAGS="$(raw-ldflags)" DESTDIR="${ED}" -C xen ${myopt} install +} + +pkg_postinst() { + elog "Official Xen Guide and the unoffical wiki page:" + elog " http://www.gentoo.org/doc/en/xen-guide.xml" + elog " http://en.gentoo-wiki.com/wiki/Xen/" + + if use pae; then + echo + ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!" + fi +} diff --git a/app-laptop/radeontool/Manifest b/app-laptop/radeontool/Manifest index 34908eff8247..3dbccd59c988 100644 --- a/app-laptop/radeontool/Manifest +++ b/app-laptop/radeontool/Manifest @@ -1,2 +1 @@ -DIST radeontool-1.5.tar.gz 20869 SHA256 598190677279001fd8d2724ac28aae11820d3c01f850bc167ec0030c21577361 SHA512 985771cbaff3d6451563ac388b6b303410b7e1088c9a7404de63964c465f3708f9fede40fde7dfeaeb3779dff86a9007fcf982cced23cdc2f6bdd555494f78aa WHIRLPOOL 92cc22fd8575d6bc5c2feffa0900eeea7dec48ab031dbe1f22a31953666d17e6b19d39210b807085e72a178f0e1c76e109b7f353efbb12e5c404b5efb9a37bc4 DIST radeontool-1.6.3.tar.bz2 367487 SHA256 f73d1ec1a962822e681c2eefa77d9843a02ee0c63196ba0c1181cc1da016a76c SHA512 937ddf3e2b7dc35b9bc872d770b184303ac9e8199c0de6c17d187acfc5c398abc0cec2071c1af5ad16b0df2976418e06db8b1f90775fe59a8a80bdb3f8e2dca6 WHIRLPOOL 59a2542dbe865fa6e834eff2fbab9a05ef768849d575c260add0fc7b374cb084638f471a6df7d7be3c16c4d9223ee775b2eb47e286bf58c8d3ecf1b91e833ab8 diff --git a/app-laptop/radeontool/files/radeontool-1.5-mmap.patch b/app-laptop/radeontool/files/radeontool-1.5-mmap.patch deleted file mode 100644 index b05eb54bf412..000000000000 --- a/app-laptop/radeontool/files/radeontool-1.5-mmap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urp radeontool-1.5/radeontool.c radeontool-1.5-mmap/radeontool.c ---- radeontool-1.5/radeontool.c 2004-02-11 04:50:27.000000000 +0100 -+++ radeontool-1.5-mmap/radeontool.c 2005-01-20 13:12:50.000000000 +0100 -@@ -107,7 +107,7 @@ static unsigned char * map_devince_memor - mem_fd, - base - ); -- if ((long)device_mem < 0) { -+ if (device_mem == MAP_FAILED) { - if(debug) - fprintf(stderr,"mmap returned %d\n",(int)device_mem); - fatal("mmap error \n"); diff --git a/app-laptop/radeontool/files/radeontool-1.5-pagesize.patch b/app-laptop/radeontool/files/radeontool-1.5-pagesize.patch deleted file mode 100644 index caa8be42f883..000000000000 --- a/app-laptop/radeontool/files/radeontool-1.5-pagesize.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- radeontool.c.orig 2007-03-15 11:25:23.000000000 +0000 -+++ radeontool.c 2007-03-15 11:27:30.000000000 +0000 -@@ -21,7 +21,6 @@ - #include - #include - #include --#include - - #include "radeon_reg.h" - -@@ -87,6 +86,7 @@ - { - int mem_fd; - unsigned char *device_mem; -+ long page_size = sysconf(_SC_PAGESIZE); - - /* open /dev/mem */ - if ((mem_fd = open("/dev/mem", O_RDWR) ) < 0) { -@@ -94,11 +94,11 @@ - } - - /* mmap graphics memory */ -- if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) { -+ if ((device_mem = malloc(length + (page_size-1))) == NULL) { - fatal("allocation error \n"); - } -- if ((unsigned long)device_mem % PAGE_SIZE) -- device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE); -+ if ((unsigned long)device_mem % page_size) -+ device_mem += page_size - ((unsigned long)device_mem % page_size); - device_mem = (unsigned char *)mmap( - (caddr_t)device_mem, - length, diff --git a/app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch b/app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch deleted file mode 100644 index 8a1e9dd127d5..000000000000 --- a/app-laptop/radeontool/files/radeontool-1.5-vga-ati.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- radeontool-1.5/radeontool.c 2005-07-26 20:59:16.000000000 +0200 -+++ radeontool-1.5-ati-vga/radeontool.c 2005-07-26 20:59:48.000000000 +0200 -@@ -293,7 +293,7 @@ - if(fgets(line,sizeof(line),fp) == NULL) { /* if end of file */ - fatal("Radeon hardware not found in lspci output.\n"); - } -- if(strstr(line,"Radeon") || strstr(line,"ATI Tech")) { /* if line contains a "radeon" string */ -+ if(strstr(line,"Radeon") || strstr(line,"VGA compatible controller: ATI Tech")) { /* if line contains a "radeon" string */ - if(skip-- < 1) { - break; - } diff --git a/app-laptop/radeontool/radeontool-1.5-r3.ebuild b/app-laptop/radeontool/radeontool-1.5-r3.ebuild deleted file mode 100644 index d8c7e211fea7..000000000000 --- a/app-laptop/radeontool/radeontool-1.5-r3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.5-r3.ebuild,v 1.6 2009/10/16 18:53:02 bangert Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Control the backlight and external video output of ATI Radeon Mobility graphics cards" - -HOMEPAGE="http://fdd.com/software/radeon/" -SRC_URI="http://fdd.com/software/radeon/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -IUSE="" - -DEPEND="sys-apps/sed" -RDEPEND="sys-apps/pciutils" - -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${P}"-mmap.patch - epatch "${FILESDIR}/${P}"-vga-ati.patch - epatch "${FILESDIR}/${P}"-pagesize.patch - - sed -i \ - -e "s:-Wall -O2:${CFLAGS} ${LDFLAGS}:" \ - -e "s:gcc:$(tc-getCC):" \ - "${S}"/Makefile -} - -src_compile() { - emake || die "emake failed" -} - -src_install() { - dosbin radeontool - dodoc CHANGES -} diff --git a/app-misc/reptyr/reptyr-0.4.ebuild b/app-misc/reptyr/reptyr-0.4.ebuild index 0cc7b0a0afc1..97601448a2a8 100644 --- a/app-misc/reptyr/reptyr-0.4.ebuild +++ b/app-misc/reptyr/reptyr-0.4.ebuild @@ -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/app-misc/reptyr/reptyr-0.4.ebuild,v 1.2 2012/11/25 09:39:23 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/reptyr/reptyr-0.4.ebuild,v 1.3 2012/12/04 11:30:29 ago Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/nelhage/${PN}/tarball/${P} -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="" src_compile() { diff --git a/app-misc/srm/metadata.xml b/app-misc/srm/metadata.xml index 758e4b5d3b15..9dd77881a9b9 100644 --- a/app-misc/srm/metadata.xml +++ b/app-misc/srm/metadata.xml @@ -2,9 +2,8 @@ - johneed@hotmail.com + idella4@gentoo.org Ian Delaney - Proxy maintainer, assign bugs titanofold@gentoo.org diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 035f58650dc5..f4b7c1990955 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -8,10 +8,13 @@ DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 SHA256 64f8d DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b WHIRLPOOL fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5 DIST libreoffice-binfilter-3.5.7.2.tar.xz 6061416 SHA256 ba07bc9b488d0c5f0c207ac7ab04e1d86b47018bf3fa77ef7562e28937485374 SHA512 3824d3ec845a2f0fdd4dcff3db8c7981f46f3b5ef541fc43d7ad0843f6093dcfda92ddbb406b4c314ea980335d74c2ee76c4f491ae38506689486481fc1d6196 WHIRLPOOL 9a637f35233c5a297f3209ca6d4c9bb2654fca5f8f171f689048de79fd3537bd8071c252c6943b284a71876d0deace76e35e28fb27d89d39e333dd3993a357ef DIST libreoffice-binfilter-3.6.3.2.tar.xz 5979916 SHA256 65c27499468866ae06851f2686f904e991b0ae93abca3972e6a0202f624893b0 SHA512 4ae53b9aa61db7b741de47640c6d545e21b16021ffab2396c2593806c41909a0b8669cd37d13de03dd6e6858afee3f4835ec5846f7241561666f6e3608c6f5a5 WHIRLPOOL f3f905932b816f5ce849e97311f8fe50577e9487f06424fda281ec7b808740e8b01c8df5c6e127c6f2ac66c8c01b1adb370e21e92d52e679d8d118feb22c50dc +DIST libreoffice-binfilter-3.6.4.3.tar.xz 5979564 SHA256 309c6e59693a60622a4fc02e5408a81dd3f422b0721340767f7ff8271c32c788 SHA512 83ca29b8ce813b9a87e20afdac160f51b67b7849ecc4dfc6868c7a4eb2146757d4f65f2e568d12f7ab9ee2eefcf7bd076860dd8466564683511e73d694d8f3b7 WHIRLPOOL 4d1f916448a4707142a821a1821054c489ab52d0e1f85fa8fe2d2ac4c99fd21ead35be21c1bc09206d834e11e9cecd6a5c3e98f46e2aa9e48b896d989053df27 DIST libreoffice-branding-gentoo-0.5.tar.xz 150616 SHA256 91beaf63fca297914cb4390b760ffef52b03450ecb52affab0f124a2dbd63a63 SHA512 a915973e1566414fd8fdae67ccaf426a9543cfa4f2549b39e7da0146c975d568d2e222835a259f4bbe6d36979b956cf65a7d28c7a5b3a7b8858e8f731acf33d9 WHIRLPOOL c2beb6b4220a99820eade85784638b883ea3b9293f6714bcce65dcb91fd617a1712a19327377d5fa1c33ac7b402749e8a29daa72f9ea9672d24607ce27cb82fc DIST libreoffice-branding-gentoo-0.6.tar.xz 49756 SHA256 d5c2d12031a807d18e981a6df7e945e1787b96c7ee65fa3d9bb9eac17cf8ade9 SHA512 1126d92b6b8722fc8b7865ed42c98876922ce26c71ebff61faf03e07b338d5278ff41ba29ff296d281cbdee6a9a0965ccf8e2101fc0f4846eaddcf511ac74eed WHIRLPOOL 40f18619246ca0b6f91ff248d65e4a36639c6faee719a842fb57c6bd8fc871686156e1c991776877d5df0811088ca8f3f4390b60f10565deefa2739c99242c91 DIST libreoffice-branding-gentoo-0.7.tar.xz 72556 SHA256 57912157fe8874f9d628dd971cb68941ad605f2d8beba05327e7ce7a721080be SHA512 fdfd8190c1155e95a8874f07d6893d94e28dd7482b195e22f704f4b1621ef76ee99e5ae1fcdb41c392d2e37e05da32830c42d47b4e62e14a9526d67ffd2d279f WHIRLPOOL 6c1886dfc31b918180b78797a41c0dff042ef4ddab50f284d9f9ee7aca7733dc73795dcad35262cf6c5608a5f99cf8d85a3a0d23316e15bb6650bdc437a4226b DIST libreoffice-core-3.5.7.2.tar.xz 105115768 SHA256 de03ffe76e3b7c636755f8e08730f606cab62e95df6a17e6b2804e5233cc8fb1 SHA512 cfb5990117c210a4a85d4f127dba09037e7cc184ef80d4545be962ea67a245c6c07550a6c3f59866919c98145227669bc5ba3fcc2034a45cd2dc87bfecee5ba6 WHIRLPOOL ccece4e1ed5854fcf226b31504141120b4c38eb2bd8e8fccee02f82ef6d65e5c197033dcd94a6815b331c8c5b1ce9200713faef0ae98386007cae27c2e64df89 DIST libreoffice-core-3.6.3.2.tar.xz 107194308 SHA256 260d4cac0ea18a88af201ec8b2e39dfb950b9c06d378876118cff0f7f0ed6d78 SHA512 f91322a2dc548b6e898619457650c6df13e622f1cac823020eac722d50c434b3729e3727441264d5d7382dc9586f779c0aadb0f4a2e4fc79b2f9321535df9657 WHIRLPOOL d42aff70aba5194c0ef3be07a9d34af8f6b0a01b49269bc2f6a499e6793390e1d01c20deb55f54498c9072c6db925f4f76de21b349a78a66c5e0313b0e15f569 +DIST libreoffice-core-3.6.4.3.tar.xz 107228036 SHA256 8f72530cf153707ce29a8db578c64609678375f86930b640c472c7bb9ef699cc SHA512 ff80fd960ea07911969e99993fb530d37a194e3381bd398aad0bd64c7849132d5a5ff7b81a93eaab0e772f5ef4f776dc88d4ef7375dee546e5a537a7e4a9865b WHIRLPOOL 1a15e5012a20b3d701d20e89dffac560cf28667c2678cd21fc1a617c02b5e0b16ef55464b6fd6590974043b5b8c9be184050d15f920de394004868925ced67ec DIST libreoffice-help-3.5.7.2.tar.xz 1905872 SHA256 b8a645053eaf05195beaa9118f4ae59512d6dc7e76fbfaacd2c70dbce7965857 SHA512 000718aebad278bd1209130b873b16089c791db3ffabe95333dc4ba9d519f05d25950006417337d23d9ff7f983a4859d921b7e618598a4f0f4f9e13dbe8bc84b WHIRLPOOL 1eefaf8f4947659d39a3fbc4aa9e6d1e14b0b839ddf5a3e8589f125f127425bffc5cada82674a28f23598765ccf40d19008f311470c97871c1b42bef2315072a DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3d755a17fb3d68e5cba688313bbbdf8a500d2 SHA512 d9747a34d36fc5eb806c9cd294fef927b802185301f7f1a98b50ebae8411d3f9b2abe4b8d16514e14d3e8fe748e53a111c783120944161d24ca662da0b05de51 WHIRLPOOL 14ed04624657a095b8cbaa2cd07fa9f96faac1a3d2af45081b12beeb66948efa3868f9729095b57c3a55cc19cdc4bb4dc492df4e57dacacd70fc41d9230bda91 +DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8 diff --git a/app-office/libreoffice/libreoffice-3.6.4.3.ebuild b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild new file mode 100644 index 000000000000..a64ec5eb1c3a --- /dev/null +++ b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild @@ -0,0 +1,580 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $ + +EAPI=4 + +KDE_REQUIRED="optional" +QT_MINIMAL="4.7.4" +KDE_SCM="git" +CMAKE_REQUIRED="never" + +PYTHON_DEPEND="2" +PYTHON_USE_WITH="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + http://dev-builds.libreoffice.org/pre-releases/src + http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + http://download.documentfoundation.org/libreoffice/old/${PV}/ +" +EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" +ADDONS_URI="http://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.6.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="LibreOffice, a full office productivity suite." +HOMEPAGE="http://www.libreoffice.org" +SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +MODULES="core binfilter help" +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + for mod in ${MODULES}; do + if [[ ${mod} == binfilter ]]; then + SRC_URI+=" binfilter? ( ${i}/${PN}-${mod}-${PV}.tar.xz )" + else + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + fi + done + unset mod + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" +ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code +ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" +ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )" +ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino +ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable +SRC_URI+=" ${ADDONS_SRC}" + +unset ADDONS_URI +unset EXT_URI +unset ADDONS_SRC + +IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk +jemalloc kde mysql odk opengl postgres test +vba +webdav" + +LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +# report-builder: missing java packages +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + >=app-text/libexttextcat-3.2 + app-text/libwpd:0.9[tools] + app-text/libwpg:0.2 + >=app-text/libwps-0.2.2 + >=dev-cpp/clucene-2.3.3.4-r2 + >=dev-cpp/libcmis-0.2:0.2 + dev-db/unixODBC + dev-libs/expat + >=dev-libs/glib-2.28 + >=dev-libs/hyphen-2.7.1 + >=dev-libs/icu-4.8.1.1 + >=dev-libs/nspr-4.8.8 + >=dev-libs/nss-3.12.9 + >=dev-lang/perl-5.0 + >=dev-libs/openssl-1.0.0d + >=dev-libs/redland-1.0.14[ssl] + gnome-base/librsvg + media-gfx/graphite2 + >=media-libs/fontconfig-2.8.0 + media-libs/freetype:2 + media-libs/lcms:2 + >=media-libs/libpng-1.4 + >=media-libs/libcdr-0.0.5 + media-libs/libvisio + >=net-misc/curl-7.21.4 + sci-mathematics/lpsolve + >=sys-libs/db-4.8 + virtual/jpeg + >=x11-libs/cairo-1.10.0[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + cups? ( net-print/cups ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) + eds? ( gnome-extra/evolution-data-server ) + gnome? ( gnome-base/gconf:2 ) + gtk? ( + x11-libs/gdk-pixbuf[X] + >=x11-libs/gtk+-2.24:2 + ) + gstreamer? ( + >=media-libs/gstreamer-0.10:0.10 + >=media-libs/gst-plugins-base-0.10:0.10 + ) + jemalloc? ( dev-libs/jemalloc ) + libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] ) + libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + libreoffice_extensions_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) + mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) + opengl? ( + virtual/glu + virtual/opengl + ) + postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) + webdav? ( net-libs/neon ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !=virtual/jre-1.6 ) +" + +PDEPEND=" + =app-office/libreoffice-l10n-3.6* +" + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.46 + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + dev-util/cppunit + >=dev-util/gperf-3 + dev-util/intltool + dev-util/mdds + virtual/pkgconfig + net-misc/npapi-sdk + >=sys-apps/findutils-4.4.2 + sys-devel/bison + sys-apps/coreutils + sys-devel/flex + sys-devel/gettext + >=sys-devel/make-3.82 + sys-libs/zlib + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + >=virtual/jdk-1.6 + >=dev-java/ant-core-1.7 + ) + odk? ( app-doc/doxygen ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-3.6-system-pyuno.patch" + "${FILESDIR}/${PN}-3.6-separate-checks.patch" +) + +REQUIRED_USE=" + gnome? ( gtk ) + eds? ( gnome ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +S="${WORKDIR}/${PN}-core-${PV}" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 5 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.5 is not supported" + die "Too old gcc found." + fi + fi + + # ensure pg version + if use postgres; then + pgslot=$(postgresql-config show) + if [[ ${pgslot//.} < 90 ]] ; then + eerror "PostgreSQL slot must be set to 9.0 or higher." + eerror " postgresql-config set 9.0" + die "PostgreSQL slot is not set to 9.0 or higher." + fi + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + kde4-base_pkg_setup + + python_set_active_version 2 + python_pkg_setup + + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup +} + +src_unpack() { + local mod dest tmplfile tmplname mypv + + [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} + if use branding; then + unpack "${BRANDING}" + fi + + if [[ ${PV} != *9999* ]]; then + for mod in ${MODULES}; do + if [[ ${mod} == binfilter ]] && ! use binfilter; then + continue + fi + unpack "${PN}-${mod}-${PV}.tar.xz" + if [[ ${mod} != core ]]; then + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + else + for mod in ${MODULES}; do + if [[ ${mod} == binfilter ]] && ! use binfilter; then + continue + fi + mypv=${PV/.9999} + [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" + EGIT_PROJECT="${PN}/${mod}" + EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" + EGIT_NOUNPACK="true" + git-2_src_unpack + if [[ ${mod} != core ]]; then + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + fi +} + +src_prepare() { + # optimization flags + export ARCH_FLAGS="${CXXFLAGS}" + export LINKFLAGSOPTIMIZE="${LDFLAGS}" + export GMAKE_OPTIONS="${MAKEOPTS}" + + # patchset + if [[ -n ${PATCHSET} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + base_src_prepare + + # please no debug in binfilter, it blows up things insanely + if use binfilter && ! use binfilterdebug ; then + for name in $(find "${S}/binfilter" -name makefile.mk) ; do + sed -i -e '1i\CFLAGS+= -g0' $name || die + done + fi + + AT_M4DIR="m4" + eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + -i pyuno/source/module/uno.py \ + -i scripting/source/pyprov/officehelper.py || die +} + +src_configure() { + local java_opts + local internal_libs + local lo_ext + local ext_opts + local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + + # Workaround the boost header include issue for older gccs + if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; then + append-cppflags -DBOOST_NO_0X_HDR_TYPEINDEX + append-cppflags -DBOOST_NO_CXX11_HDR_TYPEINDEX + fi + + # recheck that there is some value in jobs + [[ -z ${jbs} ]] && jbs="1" + + # sane: just sane.h header that is used for scan in writer, not + # linked or anything else, worthless to depend on + # vigra: just uses templates from there + # it is serious pain in the ass for packaging + # should be replaced by boost::gil if someone interested + internal_libs+=" + --without-system-sane + --without-system-vigra + " + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" + done + + if use java; then + # hsqldb: system one is too new + # saxon: system one does not work properly + java_opts=" + --without-junit + --without-system-hsqldb + --without-system-saxon + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-java-target-version=$(java-pkg_get-target) + --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/" + " + + use libreoffice_extensions_scripting-beanshell && \ + java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + + if use libreoffice_extensions_wiki-publisher; then + java_opts+=" + --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) + --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) + --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) + --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) + --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) + " + fi + fi + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi + + # system headers/libs/...: enforce using system packages + # --enable-unix-qstart-libpng: use libpng splashscreen that is faster + # --enable-cairo: ensure that cairo is always required + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --disable-gnome-vfs: old gnome virtual fs support + # --disable-kdeab: kde3 adressbook + # --disable-kde: kde3 support + # --disable-ldap: ldap requires internal mozilla stuff, same like mozab + # --disable-mozilla: disable mozilla build that is used for adresbook, not + # affecting the nsplugin that is always ON + # --disable-pch: precompiled headers cause build crashes + # --disable-rpath: relative runtime path is not desired + # --disable-systray: quickstarter does not actually work at all so do not + # promote it + # --disable-zenity: disable build icon + # --enable-extension-integration: enable any extension integration support + # --with-{max-jobs,num-cpus}: ensuring parallel building + # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --without-stlport: disable deprecated extensions framework + # --disable-ext-report-builder: too much java packages pulled in + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ + --with-system-headers \ + --with-system-libs \ + --with-system-jars \ + --with-system-dicts \ + --enable-graphite \ + --enable-cairo-canvas \ + --enable-largefile \ + --enable-mergelibs \ + --enable-python=system \ + --enable-librsvg=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --enable-unix-qstart-libpng \ + --enable-xmlsec \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-ext-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-ldap \ + --disable-mozilla \ + --disable-nsplugin \ + --disable-online-update \ + --disable-pch \ + --disable-rpath \ + --disable-systray \ + --disable-zenity \ + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ + --with-build-version="Gentoo official package" \ + --enable-extension-integration \ + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-tar="${DISTDIR}" \ + --with-lang="" \ + --with-max-jobs=${jbs} \ + --with-num-cpus=${jbs} \ + --with-unix-wrapper=libreoffice \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-afms \ + --without-fonts \ + --without-myspell-dicts \ + --without-stlport \ + --without-system-mozilla \ + --without-help \ + --with-helppack-integration \ + --without-sun-templates \ + --disable-gtk3 \ + $(use_enable binfilter) \ + $(use_enable cups) \ + $(use_enable dbus) \ + $(use_enable eds evolution2) \ + $(use_enable gnome gconf) \ + $(use_enable gnome gio) \ + $(use_enable gnome lockdown) \ + $(use_enable gstreamer) \ + $(use_enable gtk) \ + $(use_enable kde kde4) \ + $(use_enable mysql ext-mysql-connector) \ + $(use_enable odk) \ + $(use_enable opengl) \ + $(use_enable postgres postgresql-sdbc) \ + $(use_enable test linkoo) \ + $(use_enable vba) \ + $(use_enable webdav neon) \ + $(use_with java) \ + $(use_with mysql system-mysql-cppconn) \ + $(use_with odk doxygen) \ + ${internal_libs} \ + ${java_opts} \ + ${ext_opts} +} + +src_compile() { + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + source "${S}/config_host.mk" 2&> /dev/null + + local path="${SOLARVER}/${INPATH}/res/img" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=icon-themes/galaxy/res/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." + ) + + # this is not a proper make script + make build || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # Fix bash completion placement + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} + rm -rf "${ED}"/etc/ + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + fi + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild new file mode 100644 index 000000000000..52d71dcbe59f --- /dev/null +++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild @@ -0,0 +1,583 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $ + +EAPI=4 + +KDE_REQUIRED="optional" +QT_MINIMAL="4.7.4" +KDE_SCM="git" +CMAKE_REQUIRED="never" + +PYTHON_DEPEND="3:3.3" +PYTHON_USE_WITH="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + http://dev-builds.libreoffice.org/pre-releases/src + http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + http://download.documentfoundation.org/libreoffice/old/${PV}/ +" +EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice" +ADDONS_URI="http://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.7.tar.xz" +# PATCHSET="${P}-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" +inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="LibreOffice, a full office productivity suite." +HOMEPAGE="http://www.libreoffice.org" +SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +MODULES="core help" +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + for mod in ${MODULES}; do + SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz" + done + unset mod + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" +ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code +ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" +ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it? +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all +ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino +ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable +SRC_URI+=" ${ADDONS_SRC}" + +unset ADDONS_URI +unset EXT_URI +unset ADDONS_SRC + +IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk +gtk3 jemalloc kde mysql nsplugin odk opengl pdfimport postgres +telepathy test +vba +webdav" + +LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher" +# Unpackaged separate extensions: +# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf? +# hunart: only on ooo extensions -> fubared download path somewhere on sf +# numbertext, typo, validator, watch-window: ^^ +# oooblogger: no homepage or anything +# Extensions that need extra work: +# report-builder: missing java packages +for lo_xt in ${LO_EXTS}; do + IUSE+=" libreoffice_extensions_${lo_xt}" +done +unset lo_xt + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + app-arch/zip + app-arch/unzip + >=app-text/hunspell-1.3.2-r3 + app-text/mythes + >=app-text/libexttextcat-3.2 + app-text/liblangtag + app-text/libmspub + app-text/libwpd:0.9[tools] + app-text/libwpg:0.2 + >=app-text/libwps-0.2.2 + >=dev-cpp/clucene-2.3.3.4-r2 + dev-cpp/libcmis:0.3 + dev-db/unixODBC + dev-libs/expat + >=dev-libs/hyphen-2.7.1 + >=dev-libs/icu-4.8.1.1 + >=dev-libs/liborcus-0.3 + >=dev-libs/nspr-4.8.8 + >=dev-libs/nss-3.12.9 + >=dev-lang/perl-5.0 + >=dev-libs/openssl-1.0.0d + >=dev-libs/redland-1.0.14[ssl] + media-gfx/graphite2 + >=media-libs/fontconfig-2.8.0 + media-libs/freetype:2 + media-libs/lcms:2 + >=media-libs/libpng-1.4 + >=media-libs/libcdr-0.0.5 + media-libs/libvisio + >=net-misc/curl-7.21.4 + net-nds/openldap + sci-mathematics/lpsolve + virtual/jpeg + >=x11-libs/cairo-1.10.0[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + cups? ( net-print/cups ) + dbus? ( >=dev-libs/dbus-glib-0.92 ) + eds? ( gnome-extra/evolution-data-server ) + gnome? ( gnome-base/gconf:2 ) + gtk? ( + x11-libs/gdk-pixbuf[X] + >=x11-libs/gtk+-2.24:2 + ) + gtk3? ( >=x11-libs/gtk+-3.2:3 ) + gstreamer? ( + >=media-libs/gstreamer-0.10:0.10 + >=media-libs/gst-plugins-base-0.10:0.10 + ) + jemalloc? ( dev-libs/jemalloc ) + libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + libreoffice_extensions_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) + mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) + nsplugin? ( net-misc/npapi-sdk ) + opengl? ( + virtual/glu + virtual/opengl + ) + pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] ) + postgres? ( >=dev-db/postgresql-base-9.0[kerberos] ) + telepathy? ( + dev-libs/glib:2 + >=net-libs/telepathy-glib-0.18.0 + ) + webdav? ( net-libs/neon ) +" + +RDEPEND="${COMMON_DEPEND} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !=virtual/jre-1.6 ) +" + +PDEPEND=" + =app-office/libreoffice-l10n-3.6* +" + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.46 + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + dev-util/cppunit + >=dev-util/gperf-3 + dev-util/intltool + dev-util/mdds + virtual/pkgconfig + net-misc/npapi-sdk + >=sys-apps/findutils-4.4.2 + sys-devel/bison + sys-apps/coreutils + sys-devel/flex + sys-devel/gettext + >=sys-devel/make-3.82 + sys-devel/ucpp + sys-libs/zlib + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + >=virtual/jdk-1.6 + >=dev-java/ant-core-1.7 + ) + odk? ( app-doc/doxygen ) + test? ( dev-util/cppunit ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-3.7-system-pyuno.patch" + "${FILESDIR}/${PN}-3.7-separate-checks.patch" +) + +REQUIRED_USE=" + bluetooth? ( dbus ) + gnome? ( gtk ) + eds? ( gnome ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) + nsplugin? ( gtk ) +" + +S="${WORKDIR}/${PN}-core-${PV}" + +CHECKREQS_MEMORY="512M" +CHECKREQS_DISK_BUILD="6G" + +pkg_pretend() { + local pgslot + + if [[ ${MERGE_TYPE} != binary ]]; then + check-reqs_pkg_pretend + + if [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + ; then + eerror "Compilation with gcc older than 4.6 is not supported" + die "Too old gcc found." + fi + fi + + # ensure pg version + if use postgres; then + pgslot=$(postgresql-config show) + if [[ ${pgslot//.} < 90 ]] ; then + eerror "PostgreSQL slot must be set to 9.0 or higher." + eerror " postgresql-config set 9.0" + die "PostgreSQL slot is not set to 9.0 or higher." + fi + fi +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + kde4-base_pkg_setup + + python_set_active_version 3 + python_pkg_setup + + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup +} + +src_unpack() { + local mod mod2 dest tmplfile tmplname mypv + + [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} + if use branding; then + unpack "${BRANDING}" + fi + + if [[ ${PV} != *9999* ]]; then + for mod in ${MODULES}; do + unpack "${PN}-${mod}-${PV}.tar.xz" + if [[ ${mod} != core ]]; then + mod2=${mod} + # mapping does not match on help + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + else + for mod in ${MODULES}; do + mypv=${PV/.9999} + [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" + EGIT_PROJECT="${PN}/${mod}" + EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" + EGIT_NOUNPACK="true" + git-2_src_unpack + if [[ ${mod} != core ]]; then + mod2=${mod} + # mapping does not match on help + [[ ${mod} == help ]] && mod2="helpcontent2" + mkdir -p "${S}/${mod2}/" || die + mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die + rm -rf "${WORKDIR}/${PN}-${mod}-${PV}" + fi + done + unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH + fi +} + +src_prepare() { + # optimization flags + export ARCH_FLAGS="${CXXFLAGS}" + export LINKFLAGSOPTIMIZE="${LDFLAGS}" + export GMAKE_OPTIONS="${MAKEOPTS}" + + # patchset + if [[ -n ${PATCHSET} ]]; then + EPATCH_FORCE="yes" \ + EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ + EPATCH_SUFFIX="patch" \ + epatch + fi + + base_src_prepare + + AT_M4DIR="m4" + eautoreconf + # hack in the autogen.sh + touch autogen.lastrun + + # system pyuno mess + sed \ + -e "s:%eprefix%:${EPREFIX}:g" \ + -e "s:%libdir%:$(get_libdir):g" \ + -i pyuno/source/module/uno.py \ + -i scripting/source/pyprov/officehelper.py || die +} + +src_configure() { + local java_opts + local internal_libs + local lo_ext + local ext_opts + local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}") + + # recheck that there is some value in jobs + [[ -z ${jbs} ]] && jbs="1" + + # sane: just sane.h header that is used for scan in writer, not + # linked or anything else, worthless to depend on + # vigra: just uses templates from there + # it is serious pain in the ass for packaging + # should be replaced by boost::gil if someone interested + internal_libs+=" + --without-system-sane + --without-system-vigra + " + + # libreoffice extensions handling + for lo_xt in ${LO_EXTS}; do + if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})" + else + ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})" + fi + done + + if use java; then + # hsqldb: system one is too new + java_opts=" + --without-junit + --without-system-hsqldb + --with-ant-home="${ANT_HOME}" + --with-jdk-home=$(java-config --jdk-home 2>/dev/null) + --with-java-target-version=$(java-pkg_get-target) + --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/" + " + + use libreoffice_extensions_scripting-beanshell && \ + java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + + if use libreoffice_extensions_wiki-publisher; then + java_opts+=" + --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) + --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) + --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) + --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar) + --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) + " + fi + fi + + if use branding; then + # hack... + mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + fi + + # system headers/libs/...: enforce using system packages + # --enable-unix-qstart-libpng: use libpng splashscreen that is faster + # --enable-cairo: ensure that cairo is always required + # --enable-graphite: disabling causes build breakages + # --enable-*-link: link to the library rather than just dlopen on runtime + # --enable-release-build: build the libreoffice as release + # --disable-fetch-external: prevent dowloading during compile phase + # --disable-gnome-vfs: old gnome virtual fs support + # --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now + # --disable-kdeab: kde3 adressbook + # --disable-kde: kde3 support + # --disable-mozilla: mozilla internal is for contact integration, never + # worked on linux + # --disable-pch: precompiled headers cause build crashes + # --disable-rpath: relative runtime path is not desired + # --disable-systray: quickstarter does not actually work at all so do not + # promote it + # --disable-zenity: disable build icon + # --enable-extension-integration: enable any extension integration support + # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs + # --without-stlport: disable deprecated extensions framework + # --disable-ext-report-builder: too much java packages pulled in + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/" \ + --with-system-headers \ + --with-system-libs \ + --with-system-jars \ + --with-system-dicts \ + --enable-cairo-canvas \ + --enable-graphite \ + --enable-largefile \ + --enable-mergelibs \ + --enable-python=system \ + --enable-randr \ + --enable-randr-link \ + --enable-release-build \ + --enable-unix-qstart-libpng \ + --disable-ccache \ + --disable-crashdump \ + --disable-dependency-tracking \ + --disable-epm \ + --disable-fetch-external \ + --disable-gnome-vfs \ + --disable-gstreamer \ + --disable-ext-report-builder \ + --disable-kdeab \ + --disable-kde \ + --disable-mozilla \ + --disable-online-update \ + --disable-pch \ + --disable-rpath \ + --disable-systray \ + --disable-zenity \ + --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ + --with-build-version="Gentoo official package" \ + --enable-extension-integration \ + --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \ + --with-external-tar="${DISTDIR}" \ + --with-lang="" \ + --with-parallelism=${jbs} \ + --with-system-ucpp \ + --with-unix-wrapper=libreoffice \ + --with-vendor="Gentoo Foundation" \ + --with-x \ + --without-afms \ + --without-fonts \ + --without-myspell-dicts \ + --without-stlport \ + --without-system-mozilla \ + --without-help \ + --with-helppack-integration \ + --without-sun-templates \ + $(use_enable bluetooth sdremote-bluetooth) \ + $(use_enable cups) \ + $(use_enable debug) \ + $(use_enable dbus) \ + $(use_enable eds evolution2) \ + $(use_enable gnome gconf) \ + $(use_enable gnome gio) \ + $(use_enable gnome lockdown) \ + $(use_enable gstreamer gstreamer-0-10) \ + $(use_enable gtk) \ + $(use_enable gtk3) \ + $(use_enable kde kde4) \ + $(use_enable mysql ext-mysql-connector) \ + $(use_enable nsplugin) \ + $(use_enable odk) \ + $(use_enable opengl) \ + $(use_enable pdfimport) \ + $(use_enable postgres postgresql-sdbc) \ + $(use_enable telepathy) \ + $(use_enable test linkoo) \ + $(use_enable vba) \ + $(use_enable webdav neon) \ + $(use_with java) \ + $(use_with mysql system-mysql-cppconn) \ + $(use_with odk doxygen) \ + ${internal_libs} \ + ${java_opts} \ + ${ext_opts} +} + +src_compile() { + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" + source "${T}/config_host.mk" 2&> /dev/null + + local path="${SOLARVER}/${INPATH}/res/img" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=icon-themes/galaxy/res/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug." + ) + + # this is not a proper make script + make build || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # Fix bash completion placement + newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} + rm -rf "${ED}"/etc/ + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + fi + + # symlink the nsplugin to proper location + use nsplugin && inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + # Remove desktop files for support to old installs that can't parse mime + rm -rf "${ED}"/usr/share/mimelnk/ +} + +pkg_preinst() { + # Cache updates - all handled by kde eclass for all environments + kde4-base_pkg_preinst +} + +pkg_postinst() { + kde4-base_pkg_postinst + + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin + + use java || \ + ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.' +} + +pkg_postrm() { + kde4-base_pkg_postrm +} diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest index 98b738d31d34..c5d59eee578f 100644 --- a/app-portage/eix/Manifest +++ b/app-portage/eix/Manifest @@ -1,3 +1,4 @@ DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0bf5b980afda65ea207b356 SHA512 ab84fdbf1ec671c02c5d5ef9e4d70f9d76035fe7e537a4afa78231321a1f3721561eec9b32d96153b045ea59917a214dbad79933b930c46b9ac1843acbe3c4fd WHIRLPOOL 13e009d6c2114e8d8e0dbb1151f96a7cd0fab40e1a59ce46cb03fbd68602129fd151917f2abe2d860082b8e9cb852136bca6c04709be8546251df9414c030f0d DIST eix-0.25.5.tar.xz 487608 SHA256 bc0ff803063e7a20ad6cd24763808f5a2b95600bf2b6525fff402e4e430606c6 SHA512 3a7898c5f320bfd52e606eb732701301c96bd63fb143c4a195343efdf4abb354fd6b20cdfa6d0a72fcb39b60bfe6f7a4fe7135c908b5464952f01f965820a7a0 WHIRLPOOL dd9d5a996506b2575754969117fce09539ecba41e925f17c330aa5ff22dd6e12d1908104000d9ce109151d8caf214c9eec46b85292456d7526ecbc4d98b91db4 DIST eix-0.27.4.tar.xz 513880 SHA256 3264c877d617fc9f6d63d2f8562e0029369c0d9f6b3f9dff095eb21e639273f8 SHA512 c93792ef08d2e6804252c94f82b7e6e046072137c22679cf547f82c9151a3e19cea8071d09b003f2c755ff37bc665ccb3703d0dc92bf1b4c6c916541ede00335 WHIRLPOOL d51ddbdebb2017e47c2618369179698bb1b997bc4f7f2057c183cf40dac3ec2b1e806328a3900928887697a9de94f0c7d2be6b5f85439c66da9245dd8931c04f +DIST eix-0.27.5.tar.xz 520536 SHA256 b7e8d809efa4af99c5013c005ecf88eabb9a3d3a32ad6bb12066e5dc82c01ebc SHA512 c62a1fa5107d108267e281ee693d7ed89d3e0d90705ecbdc305a095867d318b35611cdb2a1ba93ce0a64319c314f04304b6ce25bd5b0dcb4fa8c11c1ba8dc978 WHIRLPOOL acfe28eebbf6cfa747b244ffa9e0689cf1c53b7cc439955ba5f3a26eae2bb1b4df3a9cc6a9594d333c6d76ca34c109cb3828111b7fe01149f9543a1201e742f8 diff --git a/app-portage/eix/eix-0.27.5.ebuild b/app-portage/eix/eix-0.27.5.ebuild new file mode 100644 index 000000000000..9be5cef9bf6b --- /dev/null +++ b/app-portage/eix/eix-0.27.5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.27.5.ebuild,v 1.1 2012/12/04 21:46:28 axs Exp $ + +EAPI=5 + +PLOCALES="de ru" +inherit bash-completion-r1 eutils multilib l10n + +DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more" +HOMEPAGE="http://eix.berlios.de" +SRC_URI="mirror://berlios/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion" + +RDEPEND="app-shells/push + sqlite? ( >=dev-db/sqlite-3 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + app-arch/xz-utils + clang? ( sys-devel/clang ) + nls? ( sys-devel/gettext )" + +pkg_setup() { + if [[ ${REPLACING_VERSIONS//./} -lt 0253 ]]; then + local eixcache="${EROOT}"/var/cache/${PN} + [[ -f ${eixcache} ]] && rm -f "${eixcache}" + fi +} + +src_prepare() { + epatch_user + # consider inheriting autotools.eclass and adding eautoreconf here +} + +src_configure() { + econf $(use_with sqlite) $(use_with doc extra-doc) \ + $(use_with zsh-completion) \ + $(use_enable nls) $(use_enable tools separate-tools) \ + $(use_enable security) $(use_enable optimization) \ + $(use_enable strong-optimization) $(use_enable debug debugging) \ + $(use_with prefix always-accept-keywords) \ + $(use_with dep dep-default) \ + $(use_with clang nongnu-cxx clang++) \ + --with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \ + --with-portage-rootpath="${ROOTPATH}" \ + --with-eprefix-default="${EPREFIX}" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" +} + +src_install() { + default + dobashcomp bash/eix + keepdir "/var/cache/${PN}" + fowners portage:portage "/var/cache/${PN}" + fperms 775 "/var/cache/${PN}" +} + +pkg_postinst() { + # fowners in src_install doesn't work for owner/group portage: + # merging changes this owner/group back to root. + use prefix || chown portage:portage "${EROOT}var/cache/${PN}" + local obs="${EROOT}var/cache/eix.previous" + ! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it" +} diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml index 758e4b5d3b15..9dd77881a9b9 100644 --- a/app-text/cedilla/metadata.xml +++ b/app-text/cedilla/metadata.xml @@ -2,9 +2,8 @@ - johneed@hotmail.com + idella4@gentoo.org Ian Delaney - Proxy maintainer, assign bugs titanofold@gentoo.org diff --git a/app-vim/align/align-42.ebuild b/app-vim/align/align-42.ebuild index ebf6729b0b04..751bfa1266a1 100644 --- a/app-vim/align/align-42.ebuild +++ b/app-vim/align/align-42.ebuild @@ -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/app-vim/align/align-42.ebuild,v 1.2 2012/12/03 16:57:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/align/align-42.ebuild,v 1.4 2012/12/04 11:22:18 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: commands and maps to help produce aligned text" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=294" LICENSE="vim" -KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~sparc x86" IUSE="" RDEPEND="app-vim/cecutil" diff --git a/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild index e81ce513ad18..c96874f05614 100644 --- a/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild +++ b/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild @@ -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/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild,v 1.2 2012/12/03 16:58:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/automatictexplugin/automatictexplugin-12.1.ebuild,v 1.3 2012/12/04 11:22:30 ago Exp $ EAPI="4" VIM_PLUGIN_VIM_VERSION="7.3" @@ -12,7 +12,7 @@ DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files" HOMEPAGE="http://atp-vim.sourceforge.net/" SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz" LICENSE="GPL-3" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" S="${WORKDIR}" diff --git a/app-vim/dbext/dbext-16.0.ebuild b/app-vim/dbext/dbext-16.0.ebuild index 207252d3f6c4..9092e26d606c 100644 --- a/app-vim/dbext/dbext-16.0.ebuild +++ b/app-vim/dbext/dbext-16.0.ebuild @@ -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/app-vim/dbext/dbext-16.0.ebuild,v 1.2 2012/12/03 16:59:08 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/dbext/dbext-16.0.ebuild,v 1.3 2012/12/04 11:22:43 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: easy access to databases" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356" LICENSE="GPL-2" -KEYWORDS="amd64 ~mips ~ppc ~x86" +KEYWORDS="amd64 ~mips ~ppc x86" IUSE="" VIM_PLUGIN_HELPFILES="${PN}.txt" diff --git a/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild b/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild index aee79d85d8ed..eb2c3498f910 100644 --- a/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild +++ b/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild @@ -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/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.2 2012/12/03 16:59:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/minibufexpl/minibufexpl-6.4.4.ebuild,v 1.4 2012/12/04 11:22:55 ago Exp $ EAPI=4 @@ -11,7 +11,7 @@ DESCRIPTION="vim plugin: easily switch between buffers" HOMEPAGE="https://github.com/fholgado/minibufexpl.vim" SRC_URI="https://github.com/fholgado/${MY_PN}/tarball/${PV} -> ${P}.tar.gz" LICENSE="as-is" -KEYWORDS="amd64 ~mips ~ppc ~x86" +KEYWORDS="amd64 ~mips ppc x86" IUSE="" VIM_PLUGIN_HELPFILES="${PN}.txt" diff --git a/app-vim/perl-support/perl-support-4.14.ebuild b/app-vim/perl-support/perl-support-4.14.ebuild index 4cd1a35a9bfb..316764001182 100644 --- a/app-vim/perl-support/perl-support-4.14.ebuild +++ b/app-vim/perl-support/perl-support-4.14.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.14.ebuild,v 1.1 2011/11/01 19:44:58 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.14.ebuild,v 1.2 2012/12/04 08:33:02 radhermit Exp $ EAPI=4 @@ -10,7 +10,7 @@ MY_PN="${PN}.vim" DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556" SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz" -LICENSE="as-is" +LICENSE="GPL-2 GPL-2+" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="" diff --git a/app-vim/perl-support/perl-support-4.8.ebuild b/app-vim/perl-support/perl-support-4.8.ebuild index 5fa59fef0fcc..64194fc9a76a 100644 --- a/app-vim/perl-support/perl-support-4.8.ebuild +++ b/app-vim/perl-support/perl-support-4.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.8.ebuild,v 1.6 2011/05/29 16:09:01 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-4.8.ebuild,v 1.7 2012/12/04 08:33:02 radhermit Exp $ EAPI=3 @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556" SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=13075 -> ${P}.zip" -LICENSE="as-is" +LICENSE="GPL-2 GPL-2+" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="" diff --git a/app-vim/perl-support/perl-support-5.1.ebuild b/app-vim/perl-support/perl-support-5.1.ebuild index 6c29dc75d57c..2a98322b28b3 100644 --- a/app-vim/perl-support/perl-support-5.1.ebuild +++ b/app-vim/perl-support/perl-support-5.1.ebuild @@ -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/app-vim/perl-support/perl-support-5.1.ebuild,v 1.1 2012/08/05 23:56:04 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/perl-support/perl-support-5.1.ebuild,v 1.2 2012/12/04 08:33:02 radhermit Exp $ EAPI=4 @@ -8,7 +8,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=556" -LICENSE="as-is" +LICENSE="GPL-2 GPL-2+" KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="" diff --git a/app-vim/supertab/supertab-2.0.ebuild b/app-vim/supertab/supertab-2.0.ebuild index f841fdd40e5a..6c860f6185e5 100644 --- a/app-vim/supertab/supertab-2.0.ebuild +++ b/app-vim/supertab/supertab-2.0.ebuild @@ -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/app-vim/supertab/supertab-2.0.ebuild,v 1.2 2012/12/03 16:59:33 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/supertab/supertab-2.0.ebuild,v 1.4 2012/12/04 11:23:20 ago Exp $ EAPI="4" @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: enhanced Tab key functionality" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1643" LICENSE="BSD" -KEYWORDS="amd64 ~mips ~ppc ~x86" +KEYWORDS="amd64 ~mips ppc x86" IUSE="" VIM_PLUGIN_HELPFILES="supertab" diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0.ebuild index 082f155eaa6c..4976a8f0c018 100644 --- a/app-vim/vimpress/vimpress-3.2.0.ebuild +++ b/app-vim/vimpress/vimpress-3.2.0.ebuild @@ -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/app-vim/vimpress/vimpress-3.2.0.ebuild,v 1.2 2012/12/03 16:59:46 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/vimpress/vimpress-3.2.0.ebuild,v 1.3 2012/12/04 11:23:31 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: manage wordpress blogs from vim" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3510" LICENSE="vim" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] ) diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild index 45a192b91386..9bba6a379872 100644 --- a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild +++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild,v 1.6 2012/03/03 16:06:25 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/wikipedia-syntax/wikipedia-syntax-20101113.ebuild,v 1.7 2012/12/04 08:34:31 radhermit Exp $ inherit vim-plugin DESCRIPTION="vim plugin: Wikipedia syntax highlighting" HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim" -LICENSE="as-is" +LICENSE="CCPL-Attribution-ShareAlike-3.0" KEYWORDS="amd64 ~hppa ~mips ppc ppc64 x86" IUSE="" diff --git a/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild b/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild index a6a745317ec3..9486f06d7dc5 100644 --- a/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild +++ b/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild @@ -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/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild,v 1.2 2012/12/03 16:59:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/zencoding-vim/zencoding-vim-0.74.ebuild,v 1.3 2012/12/04 11:23:42 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: HTML and CSS hi-speed coding" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2981 http://mattn.github.com/zencoding-vim/" LICENSE="BSD" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" VIM_PLUGIN_HELPFILES="zencoding.txt" diff --git a/app-vim/zoomwin/zoomwin-24.ebuild b/app-vim/zoomwin/zoomwin-24.ebuild index a44bbf7ef733..ad7e0efb0cf8 100644 --- a/app-vim/zoomwin/zoomwin-24.ebuild +++ b/app-vim/zoomwin/zoomwin-24.ebuild @@ -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/app-vim/zoomwin/zoomwin-24.ebuild,v 1.2 2012/12/03 17:00:12 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-vim/zoomwin/zoomwin-24.ebuild,v 1.4 2012/12/04 11:23:56 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ inherit vim-plugin DESCRIPTION="vim plugin: brief-style window zooming" HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=508" LICENSE="vim" -KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ~sparc x86" IUSE="" VIM_PLUGIN_HELPFILES="zoomwin" diff --git a/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild b/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild index e7379448f310..4186e3406ab2 100644 --- a/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild +++ b/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild @@ -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/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild,v 1.1 2012/10/30 22:04:07 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gstreamermm/gstreamermm-0.10.11.ebuild,v 1.2 2012/12/04 10:12:45 tetromino Exp $ EAPI="5" GNOME2_LA_PUNT="yes" @@ -18,7 +18,7 @@ IUSE="test" RDEPEND=" >=media-libs/gstreamer-0.10.36:0.10 >=media-libs/gst-plugins-base-0.10.36:0.10 - >=dev-cpp/glibmm-2.28.0:2 + >=dev-cpp/glibmm-2.33.4:2 >=dev-cpp/libxmlpp-2.14:2.6 >=dev-libs/libsigc++-2:2 " diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest index 69825264e82c..d18601dbae5e 100644 --- a/dev-cpp/tbb/Manifest +++ b/dev-cpp/tbb/Manifest @@ -1,3 +1,2 @@ DIST tbb40_297oss_src.tgz 2097295 SHA256 2d1d10564e536c0ecf50d2db984f9fd9c615909bab13531936f0ca2c0e7cc2c2 SHA512 d41365eb13fdaab78fbdbc20d7d39681e3b6effc3e162c887dc2298307c1b7ad510133c1df50a458d6fd30f8b90f6af7be990180fd25695c2428d096097b9af5 WHIRLPOOL 05b471a23ea2f8c1f4f04bfe48abcf3156b06e5a2b405ae10f6767f10cc80268875802c1c4a140eaafdb17c44c102d6aff69c8296e650c6dbc42ea3487576e30 -DIST tbb41_20120718oss_src.tgz 2223581 SHA256 fb5c2082b6871eedc6c77ac7cec7d46f5ce7498b848f91808d954d93469115cb SHA512 3e7b2367db84c4c46dd2f7ecb1ac35068bd8ef8adf768ec11a5b37306c9e100e02d685c877521fbcc4928d612e7b2663574ba439f938011e6a0477de750d417a WHIRLPOOL 9b323f881d72940ae17ab42e6e8051dc2ecf704bce8d3da5ec4cb111bf432323232a1dacc62e4381977ac773bb14502f01261c8fcaff9aad465c296df6ab5595 DIST tbb41_20121003oss_src.tgz 2250789 SHA256 5383727b9582a54cf4c4adbf22186b70e8eba276fcd3be81d746a937c5b47afc SHA512 fada6e32a09be2a151746caf3a15729c9ec6043b17e2f0aeb1bd903542310cdc6fe9ad85017ff5b2cfb16ae955c81c8b39ad8cf97f871bfcbd19d4948ef1d821 WHIRLPOOL 6c2a094e1dc6efed7189903bf8a6bbb8688ab1b15134c9f3c09fd5ed6a72315140505f5df410c89b65cd160a896222d71e01b3bfcbcd933281fb18a69eaf33f1 diff --git a/dev-cpp/tbb/tbb-4.1.20120718.ebuild b/dev-cpp/tbb/tbb-4.1.20120718.ebuild deleted file mode 100644 index f3c1f1aeb1c2..000000000000 --- a/dev-cpp/tbb/tbb-4.1.20120718.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.1.20120718.ebuild,v 1.1 2012/09/13 22:37:22 bicatali Exp $ - -EAPI=4 -inherit eutils flag-o-matic multilib versionator toolchain-funcs - -# those 2 below change pretty much every release -# url number -MYU="77/188" -# release update -MYR="" - -PV1="$(get_version_component_range 1)" -PV2="$(get_version_component_range 2)" -PV3="$(get_version_component_range 3)" -MYP="${PN}${PV1}${PV2}_${PV3}oss" - -DESCRIPTION="High level abstract threading library" -HOMEPAGE="http://www.threadingbuildingblocks.org/" -SRC_URI="http://www.threadingbuildingblocks.org/uploads/${MYU}/${PV1}.${PV2}${MYR}/${MYP}_src.tgz" -LICENSE="GPL-2-with-exceptions" - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug doc examples" -# FIXME -# https://bugs.gentoo.org/show_bug.cgi?id=412675#c10 -# sep 12: still many tests are failing -# restricting test for stabilization -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-4.1.20120718-ldflags.patch \ - "${FILESDIR}"/${PN}-4.0.297-underlinking.patch - # use fully qualified compilers. do not force pentium4 for x86 users - sed -i \ - -e "s/-O2/${CXXFLAGS}/g" \ - -e "/CPLUS/s/g++/$(tc-getCXX)/g" \ - -e "/CONLY/s/gcc/$(tc-getCC)/g" \ - -e "s/shell gcc/shell $(tc-getCC)/g" \ - -e '/CPLUS_FLAGS +=/s/-march=pentium4//' \ - -e 's/-m64//g' \ - -e 's/-m32//g' \ - build/*.inc || die - # - Strip the $(shell ... >$(NUL) 2>$(NUL)) wrapping, leaving just the - # actual command. - # - Force generation of version_string.tmp immediately after the directory - # is created. This avoids a race when the user builds tbb and tbbmalloc - # concurrently. The choice of Makefile.tbb (instead of - # Makefile.tbbmalloc) is arbitrary. - #sed -i \ - # -e 's/^\t\$(shell \(.*\) >\$(NUL) 2>\$(NUL))\s*/\t\1/' \ - # -e 's!^\t@echo Created \$(work_dir)_\(debug\|release\).*$!&\n\t$(MAKE) -C "$(work_dir)_\1" -r -f $(tbb_root)/build/Makefile.tbb cfg=\1 tbb_root=$(tbb_root) version_string.tmp!' \ - # src/Makefile || die - find include -name \*.html -delete - - cat <<-EOF > ${PN}.pc - prefix=${EPREFIX}/usr - libdir=\${prefix}/$(get_libdir) - includedir=\${prefix}/include - Name: ${PN} - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -ltbb -ltbbmalloc - Cflags: -I\${includedir} - EOF -} - -src_compile() { - # wrt #418453#c3 - append-ldflags $(no-as-needed) - - if [[ $(tc-getCXX) == *g++ ]]; then - myconf="compiler=gcc" - elif [[ $(tc-getCXX) == *ic*c ]]; then - myconf="compiler=icc" - fi - local ccconf="${myconf}" - if use debug || use examples; then - ccconf="${ccconf} tbb_debug tbbmalloc_debug" - fi - emake -C src ${ccconf} tbb_release tbbmalloc_release -} - -src_test() { - local ccconf="${myconf}" - if use debug || use examples; then - ${ccconf}="${myconf} test_debug tbbmalloc_test_debug" - fi - emake -j1 -C src ${ccconf} test_release -} - -src_install(){ - local l - for l in $(find build -name lib\*.so.\*); do - dolib.so ${l} - local bl=$(basename ${l}) - dosym ${bl} /usr/$(get_libdir)/${bl%.*} - done - insinto /usr - doins -r include - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - dodoc README CHANGES doc/Release_Notes.txt - use doc && dohtml -r doc/html/* - - if use examples ; then - insinto /usr/share/doc/${PF}/examples/build - doins build/*.inc - insinto /usr/share/doc/${PF}/examples - doins -r examples - fi -} diff --git a/dev-db/libzdb/libzdb-2.10.5.ebuild b/dev-db/libzdb/libzdb-2.10.5.ebuild index b5f30f7ba918..eaf8f63da1c6 100644 --- a/dev-db/libzdb/libzdb-2.10.5.ebuild +++ b/dev-db/libzdb/libzdb-2.10.5.ebuild @@ -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/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.2 2012/10/24 09:58:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.3 2012/12/04 11:09:58 ago Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs" REQUIRED_USE=" || ( postgres mysql sqlite )" diff --git a/dev-games/clanlib/clanlib-2.3.6.ebuild b/dev-games/clanlib/clanlib-2.3.6.ebuild index a4aae8d86235..559ac67fc499 100644 --- a/dev-games/clanlib/clanlib-2.3.6.ebuild +++ b/dev-games/clanlib/clanlib-2.3.6.ebuild @@ -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/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.3 2012/11/03 12:32:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-2.3.6.ebuild,v 1.4 2012/12/04 11:16:08 ago Exp $ EAPI=4 inherit flag-o-matic eutils autotools-utils @@ -13,7 +13,7 @@ SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz" LICENSE="ZLIB" SLOT="2.3" -KEYWORDS="amd64 ~x86" #not big endian safe #82779 +KEYWORDS="amd64 x86" #not big endian safe #82779 IUSE="doc ipv6 mikmod opengl sound sqlite sse2 static-libs vorbis X" REQUIRED_USE="opengl? ( X )" diff --git a/dev-lang/niecza-bin/Manifest b/dev-lang/niecza-bin/Manifest index 551ec281bda2..efc813d7fdee 100644 --- a/dev-lang/niecza-bin/Manifest +++ b/dev-lang/niecza-bin/Manifest @@ -1,3 +1,4 @@ DIST niecza-20.zip 1878083 SHA256 2ca2542c563130c5d4b45d5bd251601472695457568fc63cab6b6cbe3969c0e7 SHA512 2d587029a1037fca3901c0c1caadd6f6e5d9951d6804c54ef0262b69a7429c13458bd4e6eeb83a823ecb02afe93a3e9d0364065f1ca37412c674533a290363a6 WHIRLPOOL 580a62dbfdec49546c19b567b477727f3ff41a355b5d8cf50afa0418feda7768012049bf86737e97eb489b7871432835169b007a7ec7f65d3ed1ef487a7d0c09 DIST niecza-21.zip 1895049 SHA256 4d91aa902e876f8477879356e7a5d3c4c2f5dba07a3bd87c39bf95d5b0fce438 SHA512 3ade8b851271ce6b422b3b1c64f44640e436f179a6cbbcda97b76ceeb60b73541799323a48e55fc30f09c0fe303aad7d9fa3090be3ca6a5a66e682ae6eb591b2 WHIRLPOOL afa42432602cad86720c838cc6b37d9423accbc8499acad5cc7cc446cb47a83fa445ce82cc392116b2d3c37424c7c4aa3443f8dd5a04c5a5fd70537943b5f520 DIST niecza-22.zip 1909281 SHA256 b4220bf2d12505ea576405e84b2402a9532af3e6e953d5f3f0b576f21114e6b0 SHA512 decfa04d7614f3d335e8991a0938821fe0ca26f2892a2d6d9d498ab8c84c11f2b6b620101633c7b27faf65e100775baefa23cb5c0072a34037803caa5dc4d800 WHIRLPOOL 67275813b182434853290d4abe2546c26691b67747b6be681fd9276310b720d36a86ab2a4f1ade23c5b3f551ca0e399c64242896e6bd7f332659f3821b1df302 +DIST niecza-24.zip 1577897 SHA256 182055b5c2c187e1bebb4dd3fe34c62ea39cdb67188b9548df6aa78864141af6 SHA512 f4fa5cf6aa98a102d193bbbcf14ab0079831a2344684fb9190bebd1ec25e93c0078a816a7ddb9bb17c3a017f2b34a1dcf32e9016cf26d7b1721ad94baeefafe7 WHIRLPOOL 635b415945ffd25f3b84af205f5edd428adb6776a8981954bd810400f364fb164d2f54bd076e0f379ef9f4d0a0b8b2d0350db47654084f639bf9f0fca2ee05f8 diff --git a/dev-lang/niecza-bin/niecza-bin-24.ebuild b/dev-lang/niecza-bin/niecza-bin-24.ebuild new file mode 100644 index 000000000000..5f63cf4d246d --- /dev/null +++ b/dev-lang/niecza-bin/niecza-bin-24.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza-bin/niecza-bin-24.ebuild,v 1.1 2012/12/05 07:08:47 patrick Exp $ + +EAPI=4 + +inherit eutils multilib + +DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations." +HOMEPAGE="https://github.com/sorear/niecza" + +MY_PN="niecza" +MY_P="${MY_PN}-${PV}" +SRC_URI="https://github.com/downloads/sorear/${MY_PN}/${MY_P}.zip" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-lang/mono" +DEPEND="${RDEPEND}" + +S=${WORKDIR} + +src_configure() { :; } + +src_compile() { :; } + +src_install() { + mkdir ${D}/opt/niecza-bin -p + cp -r ${WORKDIR}/* ${D}/opt/niecza-bin || die "Failed to copy" + einfo "The binary is installed to /opt/niecza-bin/run/Niecza.exe" +} diff --git a/dev-lang/niecza/Manifest b/dev-lang/niecza/Manifest index a81d6af25740..ace23986062a 100644 --- a/dev-lang/niecza/Manifest +++ b/dev-lang/niecza/Manifest @@ -1,3 +1,4 @@ DIST niecza-19.zip 728618 SHA256 b320a72e77531515bafb2c1e1588572f39f24e9c38305eb4cbe60569e87845e9 SHA512 3be02a89f9698724fd4a5d8aad0dd2946a5cb4ace9bf519d0ddb52d159596beeeb162884a8b98b4fcdf8b322149ae222b3dd11caeb369218d73afe3194ab186c WHIRLPOOL 5e627ce9d885ed059bda2a898518bce551d82ca7801f5239b010316d5ce2aaf7c70ca063c73b204f06b72825158650a30653092ba86156e25021ad4bc67569b5 DIST niecza-21.zip 737733 SHA256 b4d01a79137134d25e22c8085212571cdadcd7ea519bede42f161acd1d1dfdba SHA512 34c29fb8d427c5dc98ead5acd1e49becf5b67a4c34478b431975d975047c9601a5a7192d400088ff36cd907543bc0e32457000cfd565078d8c4c48c810d23c53 WHIRLPOOL 1b319fa101b93778b25e1d60a44462f026def9a0f3d0f7572c24abb6075e90da179c310f61e6d6c52a37bc13e201a79a11a99e65dae8b225e063cd75acde7251 -DIST niecza-22.zip 740724 SHA256 4c3be30c7df4d02318ad2da95180e69f07a36d6157aa6b9d08173bc785e30a20 SHA512 0e583fd9b20e872f2bb07066f5a770b2d53b44dedeac7e7e92cb482ed9b5ffa898221a1a856f8692be1e2aa5488a4685c3933d4d6c37003227fb88e5e913a329 WHIRLPOOL 477a396aba393b6397d093fa4aac42ef817c61101fdc328d8ce1f4db2c4d2ab4f36f4081d4c19d9e8682fb1889fecc1e337d14e4e17e66fdd9a6358d4a14309b +DIST niecza-22-src.zip 740724 SHA256 4c3be30c7df4d02318ad2da95180e69f07a36d6157aa6b9d08173bc785e30a20 SHA512 0e583fd9b20e872f2bb07066f5a770b2d53b44dedeac7e7e92cb482ed9b5ffa898221a1a856f8692be1e2aa5488a4685c3933d4d6c37003227fb88e5e913a329 WHIRLPOOL 477a396aba393b6397d093fa4aac42ef817c61101fdc328d8ce1f4db2c4d2ab4f36f4081d4c19d9e8682fb1889fecc1e337d14e4e17e66fdd9a6358d4a14309b +DIST niecza-24-src.zip 760567 SHA256 db296e7a15ec546f30478de5fa047b93a6f3e85edfcef4154d25ff87fc82837e SHA512 438791f61a417f846c525ec13199e61c83f95fc7f503e2f0f0fe805f168121f2d09f1a5507e92019ffba842b51ef7a2a33746903f097981be63c5631d6cf0582 WHIRLPOOL 3c08ff3a513f5145461007c9d7eff83460396d6c47f771002f85ee4dd51117eb1201e0e2d9e51e1872ff085cc92d7991b1e1a1d120fa3dcef63458cba1080fac diff --git a/dev-lang/niecza/files/fix-bootstrap-24.patch b/dev-lang/niecza/files/fix-bootstrap-24.patch new file mode 100644 index 000000000000..dc3c8467114c --- /dev/null +++ b/dev-lang/niecza/files/fix-bootstrap-24.patch @@ -0,0 +1,13 @@ +--- Makefile 2012-06-25 22:30:16.000000000 +0800 ++++ Makefile.new 2012-08-22 10:55:22.879717085 +0800 +@@ -41,10 +41,6 @@ + $(RUN_CLR) run/Kernel.dll -gen-app Niecza boot/obj + + .fetch-stamp: FETCH_URL +- -rm -rf boot/ +- mkdir boot +- $(WGET_O) boot/niecza.zip $$(cat FETCH_URL) +- cd boot && unzip niecza.zip + NIECZA_KEEP_IL=1 $(RUN_CLR) boot/run/Niecza.exe --obj-dir=run -C $(libunits) + $(CP) boot/run/Kernel.dll boot/obj/ + touch .fetch-stamp diff --git a/dev-lang/niecza/niecza-22.ebuild b/dev-lang/niecza/niecza-22.ebuild index 3eb4b3115716..1751e22f78c5 100644 --- a/dev-lang/niecza/niecza-22.ebuild +++ b/dev-lang/niecza/niecza-22.ebuild @@ -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/dev-lang/niecza/niecza-22.ebuild,v 1.1 2012/10/05 05:47:31 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-22.ebuild,v 1.2 2012/12/05 07:08:09 patrick Exp $ EAPI=4 @@ -10,7 +10,7 @@ GITHUB_CRAP="sorear-niecza-8d7386f" DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations." HOMEPAGE="https://github.com/sorear/niecza" -SRC_URI="https://github.com/sorear/niecza/zipball/v${PV} -> niecza-${PV}.zip" +SRC_URI="https://github.com/sorear/niecza/zipball/v${PV} -> niecza-${PV}-src.zip" LICENSE="Artistic-2" SLOT="0" diff --git a/dev-lang/niecza/niecza-24.ebuild b/dev-lang/niecza/niecza-24.ebuild new file mode 100644 index 000000000000..bf7abb867704 --- /dev/null +++ b/dev-lang/niecza/niecza-24.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-24.ebuild,v 1.1 2012/12/05 07:08:09 patrick Exp $ + +EAPI=4 + +inherit eutils multilib + +GITHUB_CRAP="sorear-niecza-287cfa1" + +DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations." +HOMEPAGE="https://github.com/sorear/niecza" +SRC_URI="https://github.com/sorear/niecza/zipball/v${PV} -> niecza-${PV}-src.zip" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-lang/mono" +DEPEND="${RDEPEND} + || ( dev-lang/niecza-bin dev-lang/niecza )" + +S=${WORKDIR}/${GITHUB_CRAP} + +src_prepare() { + epatch "${FILESDIR}"/fix-bootstrap-${PV}.patch || die "Failed to fix" + cd "${S}" + # bootstrap only works from git dirs? sigh :) + sed -i -e 's:@git describe --tags:echo "v${PV}":' Makefile + # silly workaround for stuff trying to write everywhere: copy the installed niecza here (sigh) + # since we have different installation paths for the bin version we need to check here + mkdir boot -p + if has_version dev-lang/niecza; then + cp -r /opt/niecza/* boot/ + else + cp -r /opt/niecza-bin/* boot/ + fi + mkdir -p boot/obj +} + +src_configure() { :; } + +src_compile() { + export XDG_DATA_HOME="${S}" + emake -j1 || die +} + +src_test() { + emake -j1 test || die +} + +src_install() { + mkdir -p "${D}"/opt/niecza + for i in docs lib obj run README.pod; do + cp -r "${S}"/$i "${D}"/opt/niecza/ || die "Failed to install" + done +} diff --git a/dev-lang/orc/orc-0.4.16-r1.ebuild b/dev-lang/orc/orc-0.4.16-r1.ebuild index 658c8ac45e91..c24603a82216 100644 --- a/dev-lang/orc/orc-0.4.16-r1.ebuild +++ b/dev-lang/orc/orc-0.4.16-r1.ebuild @@ -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/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.4 2012/11/14 19:06:54 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/orc/orc-0.4.16-r1.ebuild,v 1.5 2012/12/04 15:37:34 ago Exp $ EAPI=4 inherit autotools flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="http://code.entropywave.com/download/orc/${P}.tar.gz" LICENSE="BSD BSD-2" SLOT="0" -KEYWORDS="amd64 arm hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm hppa x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs examples" RDEPEND="" diff --git a/dev-lang/tk/files/tk-8.5.13-multilib.patch b/dev-lang/tk/files/tk-8.5.13-multilib.patch new file mode 100644 index 000000000000..db3d8cc00817 --- /dev/null +++ b/dev-lang/tk/files/tk-8.5.13-multilib.patch @@ -0,0 +1,12 @@ +diff -Naur tk8.4.11.orig/unix/configure.in tk8.4.11/unix/configure.in +--- tk8.4.11.orig/unix/configure.in 2005-06-30 01:43:10.000000000 +0900 ++++ tk8.4.11/unix/configure.in 2005-07-02 23:22:16.000000000 +0900 +@@ -393,7 +393,7 @@ + TCL_STUB_FLAGS="-DUSE_TCL_STUBS" + fi + +-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)' ++TK_LIBRARY='$(libdir)/tk$(VERSION)' + PRIVATE_INCLUDE_DIR='$(includedir)' + HTML_DIR='$(DISTDIR)/html' + TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)' diff --git a/dev-lang/tk/tk-8.5.13.ebuild b/dev-lang/tk/tk-8.5.13.ebuild index 8865fdf2d567..130ca7809dfd 100644 --- a/dev-lang/tk/tk-8.5.13.ebuild +++ b/dev-lang/tk/tk-8.5.13.ebuild @@ -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/dev-lang/tk/tk-8.5.13.ebuild,v 1.1 2012/11/29 15:23:01 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.13.ebuild,v 1.2 2012/12/05 07:42:09 jlec Exp $ EAPI=4 @@ -37,7 +37,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-8.5.11-fedora-xft.patch \ - "${FILESDIR}"/${PN}-8.4.11-multilib.patch + "${FILESDIR}"/${P}-multilib.patch epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch eprefixify unix/Makefile.in @@ -56,6 +56,7 @@ src_prepare() { -e "s:\:$(tc-getPKG_CONFIG):" \ -e 's:xft freetype2:xft freetype2 fontconfig:' \ -i unix/configure.in || die + rm -f unix/configure || die cd "${S}"/unix eautoreconf diff --git a/dev-lang/vala/vala-0.10.4-r2.ebuild b/dev-lang/vala/vala-0.10.4-r2.ebuild index fc1c8f8cc333..4005beedd8fb 100644 --- a/dev-lang/vala/vala-0.10.4-r2.ebuild +++ b/dev-lang/vala/vala-0.10.4-r2.ebuild @@ -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/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.7 2012/10/29 22:28:31 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.10.4-r2.ebuild,v 1.8 2012/12/04 10:36:53 ago Exp $ EAPI="4" GCONF_DEBUG="no" @@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" SLOT="0.10" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86" IUSE="test +vapigen" RDEPEND=">=dev-libs/glib-2.14:2 diff --git a/dev-lang/vala/vala-0.12.1-r1.ebuild b/dev-lang/vala/vala-0.12.1-r1.ebuild index cda5fd802dfb..c5f3b1a8c138 100644 --- a/dev-lang/vala/vala-0.12.1-r1.ebuild +++ b/dev-lang/vala/vala-0.12.1-r1.ebuild @@ -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/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.7 2012/10/29 22:28:31 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.12.1-r1.ebuild,v 1.8 2012/12/04 10:36:53 ago Exp $ EAPI="4" GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" SLOT="0.12" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-linux" IUSE="test +vapigen" RDEPEND=">=dev-libs/glib-2.16:2 diff --git a/dev-lang/vala/vala-0.14.2-r2.ebuild b/dev-lang/vala/vala-0.14.2-r2.ebuild index 2613b2564acb..c52bc8710ef9 100644 --- a/dev-lang/vala/vala-0.14.2-r2.ebuild +++ b/dev-lang/vala/vala-0.14.2-r2.ebuild @@ -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/dev-lang/vala/vala-0.14.2-r2.ebuild,v 1.6 2012/10/29 22:28:31 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.14.2-r2.ebuild,v 1.7 2012/12/04 10:36:53 ago Exp $ EAPI="4" GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" SLOT="0.14" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="test +vapigen" RDEPEND=">=dev-libs/glib-2.16:2 diff --git a/dev-lang/vala/vala-0.16.1-r2.ebuild b/dev-lang/vala/vala-0.16.1-r2.ebuild index 666af24777b5..9f244b154ce1 100644 --- a/dev-lang/vala/vala-0.16.1-r2.ebuild +++ b/dev-lang/vala/vala-0.16.1-r2.ebuild @@ -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/dev-lang/vala/vala-0.16.1-r2.ebuild,v 1.6 2012/10/29 22:28:31 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.16.1-r2.ebuild,v 1.7 2012/12/04 10:36:53 ago Exp $ EAPI="4" GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" SLOT="0.16" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="test +vapigen" RDEPEND=">=dev-libs/glib-2.16:2 diff --git a/dev-lang/vala/vala-0.18.0.ebuild b/dev-lang/vala/vala-0.18.0.ebuild index cd5c9bb61056..4d29488e0298 100644 --- a/dev-lang/vala/vala-0.18.0.ebuild +++ b/dev-lang/vala/vala-0.18.0.ebuild @@ -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/dev-lang/vala/vala-0.18.0.ebuild,v 1.7 2012/10/30 17:27:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/vala/vala-0.18.0.ebuild,v 1.8 2012/12/04 10:36:53 ago Exp $ EAPI="4" GCONF_DEBUG="no" @@ -13,7 +13,7 @@ HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" SLOT="0.18" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="test +vapigen" RDEPEND=">=dev-libs/glib-2.18:2 diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest new file mode 100644 index 000000000000..04b881c3842c --- /dev/null +++ b/dev-libs/bitset/Manifest @@ -0,0 +1 @@ +DIST bitset-2.8.1.tar.gz 348038 SHA256 3281b2a20cb195d2514805265ac4c6565b11b15c6cdefd61135bffed10aedabe SHA512 08d58f92b5e18db508f68ba65910156eec1db05e81661055f1b04cb1c7851434330ed3815539f3f408bd135fce7ef023468edeed5a48e0898137304918894add WHIRLPOOL 8c7207411673debad87c1ef8bab8db4f144d65d095f0d8390d3ab82948584581e6de19bb9c1435e5cc928ffb3ff2f8c7e52057eda640ea8f0c6091b27a605862 diff --git a/dev-libs/bitset/bitset-2.8.1.ebuild b/dev-libs/bitset/bitset-2.8.1.ebuild new file mode 100644 index 000000000000..cda522f28676 --- /dev/null +++ b/dev-libs/bitset/bitset-2.8.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/bitset-2.8.1.ebuild,v 1.1 2012/12/05 03:58:24 pinkbyte Exp $ + +EAPI="5" + +inherit eutils + +DESCRIPTION="A compressed bitset with supporting data structures and algorithms" +HOMEPAGE="http://github.com/chriso/bitset" +SRC_URI="mirror://github/chriso/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="jemalloc static-libs tcmalloc" +KEYWORDS="~amd64 ~x86" + +RDEPEND="tcmalloc? ( dev-util/google-perftools ) + jemalloc? ( >=dev-libs/jemalloc-3.2 )" +DEPEND="${RDEPEND}" + +REQUIRED_USE="tcmalloc? ( !jemalloc ) + jemalloc? ( !tcmalloc )" + +DOCS=( README.md ) + +src_configure() { + econf \ + $(use_with jemalloc) \ + $(use_with tcmalloc) \ + $(use_enable static-libs static) +} + +src_install() { + default + use static-libs || prune_libtool_files +} diff --git a/dev-libs/bitset/metadata.xml b/dev-libs/bitset/metadata.xml new file mode 100644 index 000000000000..a82436032836 --- /dev/null +++ b/dev-libs/bitset/metadata.xml @@ -0,0 +1,19 @@ + + + + proxy-maintainers + + bugs@bergstroem.nu + Johan Bergström + Maintainer. Assign bugs to him + + + pinkbyte@gentoo.org + Sergey Popov + Proxy maintainer. CC him on bugs + + + Use dev-libs/jemalloc for allocations + Use tcmalloc from dev-util/google-perftools for allocations + + diff --git a/dev-libs/jthread/jthread-1.2.1.ebuild b/dev-libs/jthread/jthread-1.2.1.ebuild index 75d2bb224209..1f08c26ddf0d 100644 --- a/dev-libs/jthread/jthread-1.2.1.ebuild +++ b/dev-libs/jthread/jthread-1.2.1.ebuild @@ -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/dev-libs/jthread/jthread-1.2.1.ebuild,v 1.3 2012/11/22 19:26:42 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/jthread/jthread-1.2.1.ebuild,v 1.4 2012/12/04 15:36:35 ago Exp $ DESCRIPTION="JThread provides some classes to make use of threads easy on different platforms." HOMEPAGE="http://research.edm.uhasselt.be/~jori/page/index.php?n=CS.Jthread" @@ -8,7 +8,7 @@ SRC_URI="http://research.edm.uhasselt.be/jori/${PN}/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" src_install() { diff --git a/dev-libs/openct/openct-0.6.20-r3.ebuild b/dev-libs/openct/openct-0.6.20-r3.ebuild index f2ac00a54d96..6a76bf8d7b05 100644 --- a/dev-libs/openct/openct-0.6.20-r3.ebuild +++ b/dev-libs/openct/openct-0.6.20-r3.ebuild @@ -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/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.4 2012/12/03 03:50:09 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.6 2012/12/04 13:18:50 blueness Exp $ EAPI=5 @@ -10,7 +10,7 @@ DESCRIPTION="library for accessing smart card terminals" HOMEPAGE="http://www.opensc-project.org/openct/" SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-libs/vala-common/vala-common-0.18.0.ebuild b/dev-libs/vala-common/vala-common-0.18.0.ebuild index e13592c84d88..2cc6c4b164f0 100644 --- a/dev-libs/vala-common/vala-common-0.18.0.ebuild +++ b/dev-libs/vala-common/vala-common-0.18.0.ebuild @@ -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/dev-libs/vala-common/vala-common-0.18.0.ebuild,v 1.6 2012/10/30 17:27:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/vala-common/vala-common-0.18.0.ebuild,v 1.7 2012/12/04 10:34:59 ago Exp $ EAPI="4" GNOME_ORG_MODULE="vala" @@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/Vala" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x64-macos" +KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x64-macos" IUSE="" # Previously ${PN} was part of dev-lang/vala diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild index 47f281202551..b9d4be872d48 100644 --- a/dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild +++ b/dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild @@ -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/dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild,v 1.3 2012/11/01 06:30:26 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Alien-SDL/Alien-SDL-1.436.0.ebuild,v 1.4 2012/12/04 11:12:48 ago Exp $ EAPI=4 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="building, finding and using SDL binaries" SLOT="0" -KEYWORDS="amd64 hppa ~x86" +KEYWORDS="amd64 hppa x86" IUSE="" # Archive::Extract, File::Fetch, File::Find, Test::More -> dev-lang/perl diff --git a/dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild index d5f55a1928a4..cc97bc314da4 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild @@ -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/dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild,v 1.2 2012/12/01 21:26:45 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-geoip/pecl-geoip-1.0.8-r1.ebuild,v 1.3 2012/12/04 10:57:53 ago Exp $ EAPI="4" @@ -13,7 +13,7 @@ USE_PHP="php5-3 php5-4" inherit php-ext-pecl-r2 -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="PHP extension to map IP address to geographic places" LICENSE="PHP-3" diff --git a/dev-python/django-pipeline/django-pipeline-1.2.9.ebuild b/dev-python/django-pipeline/django-pipeline-1.2.9.ebuild index cc7f0814a0d2..e599eef599d6 100644 --- a/dev-python/django-pipeline/django-pipeline-1.2.9.ebuild +++ b/dev-python/django-pipeline/django-pipeline-1.2.9.ebuild @@ -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/dev-python/django-pipeline/django-pipeline-1.2.9.ebuild,v 1.4 2012/11/17 13:01:31 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.2.9.ebuild,v 1.5 2012/12/04 15:39:33 ago Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -12,7 +12,7 @@ inherit distutils DESCRIPTION="An asset packaging library for Django" HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="amd64" +KEYWORDS="amd64 x86" IUSE="doc" LICENSE="MIT" diff --git a/dev-python/django/django-1.4.1.ebuild b/dev-python/django/django-1.4.1.ebuild index f2ff3cc47c74..4cd5942fb267 100644 --- a/dev-python/django/django-1.4.1.ebuild +++ b/dev-python/django/django-1.4.1.ebuild @@ -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/dev-python/django/django-1.4.1.ebuild,v 1.2 2012/11/17 13:01:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.1.ebuild,v 1.3 2012/12/04 15:39:48 ago Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -17,7 +17,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="doc mysql postgres sqlite test" RDEPEND="dev-python/imaging diff --git a/dev-python/matplotlib/matplotlib-1.2.0.ebuild b/dev-python/matplotlib/matplotlib-1.2.0.ebuild index 1324c0687169..f3babebc6e23 100644 --- a/dev-python/matplotlib/matplotlib-1.2.0.ebuild +++ b/dev-python/matplotlib/matplotlib-1.2.0.ebuild @@ -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/dev-python/matplotlib/matplotlib-1.2.0.ebuild,v 1.2 2012/11/29 15:32:08 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.0.ebuild,v 1.3 2012/12/05 04:19:43 mr_bones_ Exp $ EAPI="3" @@ -170,4 +170,3 @@ src_install() { doins -r examples || die fi } - diff --git a/dev-python/pymongo/pymongo-2.4.ebuild b/dev-python/pymongo/pymongo-2.4.ebuild index 7540041b3fc2..370cbd75cb19 100644 --- a/dev-python/pymongo/pymongo-2.4.ebuild +++ b/dev-python/pymongo/pymongo-2.4.ebuild @@ -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/dev-python/pymongo/pymongo-2.4.ebuild,v 1.1 2012/11/28 10:00:48 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.4.ebuild,v 1.2 2012/12/05 04:17:19 mr_bones_ Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -61,4 +61,4 @@ src_install() { pkg_postinst() { ewarn "Important changes on this release, make sure to read the changelog:" ewarn "http://api.mongodb.org/python/${PV}/changelog.html" -} \ No newline at end of file +} diff --git a/dev-python/python-exec/python-exec-0.1.1.ebuild b/dev-python/python-exec/python-exec-0.1.1.ebuild index f86157a72b58..8e1529b31e1a 100644 --- a/dev-python/python-exec/python-exec-0.1.1.ebuild +++ b/dev-python/python-exec/python-exec-0.1.1.ebuild @@ -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/dev-python/python-exec/python-exec-0.1.1.ebuild,v 1.5 2012/12/02 20:41:22 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-0.1.1.ebuild,v 1.6 2012/12/04 11:39:27 blueness Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" append_impl() { diff --git a/dev-ruby/allison/allison-2.0.3-r1.ebuild b/dev-ruby/allison/allison-2.0.3-r1.ebuild index 78cb778af298..c89e06404ed8 100644 --- a/dev-ruby/allison/allison-2.0.3-r1.ebuild +++ b/dev-ruby/allison/allison-2.0.3-r1.ebuild @@ -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/dev-ruby/allison/allison-2.0.3-r1.ebuild,v 1.9 2012/11/24 02:30:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/allison/allison-2.0.3-r1.ebuild,v 1.10 2012/12/04 15:39:06 ago Exp $ EAPI=2 USE_RUBY="ruby18 ruby19 ree18 jruby" @@ -18,7 +18,7 @@ HOMEPAGE="http://fauna.github.com/fauna/allison/files/README.html" LICENSE="AFL-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc ~x86 ~x86-solaris" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x86-solaris" IUSE="" all_ruby_install() { diff --git a/dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild b/dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild index a681370839e8..5f573fe61186 100644 --- a/dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild +++ b/dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild @@ -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/dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild,v 1.6 2012/10/30 20:46:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-augeas/ruby-augeas-0.4.1.ebuild,v 1.7 2012/12/04 11:15:20 ago Exp $ EAPI=3 # jruby -> native extentions @@ -17,7 +17,7 @@ SRC_URI="http://augeas.net/download/ruby/${P}.gem" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~hppa ppc ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc ~sparc x86" IUSE="" DEPEND="${DEPEND} >=app-admin/augeas-0.5.1 dev-libs/libxml2" diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml index 67d0e316fd80..1806a8e261fb 100644 --- a/dev-ruby/ruby-oci8/metadata.xml +++ b/dev-ruby/ruby-oci8/metadata.xml @@ -3,7 +3,7 @@ ruby - troy@dublan.net + troy@lump.net Troy Bowman Oracle Interface for Ruby, compatible with oracle 8, 9i, 10g and 11g. diff --git a/dev-ruby/simple_oauth/Manifest b/dev-ruby/simple_oauth/Manifest index 52ff3a432150..3a8ecd2f08a3 100644 --- a/dev-ruby/simple_oauth/Manifest +++ b/dev-ruby/simple_oauth/Manifest @@ -1 +1,2 @@ DIST simple_oauth-0.1.9.gem 11264 SHA256 723f19781f5562182e075a0f31bca11a955962d933064abb23bce98ed035602d SHA512 ebb5e82c56033dcd85b73e7a47fb7d764b8f864d15cd09091a1e2216257a9aeb9bd974da7777f220ea6f50110a9e99207b9c51a26d27b53aae1ee06585ec0de7 WHIRLPOOL ed2320c789ac5f0a09c70d7a4bc36d6c1e4ab267902e4f4a4f9a53b9392648bbe8b839ec4a2fcc726d066e073228c5eed8727dd8b4cb19fe868ce6cbc4f9aac6 +DIST simple_oauth-0.2.0.gem 11776 SHA256 2f76cd61c643086db19cbabacbd73b6f4a0c90e31036d2e52839b9b87c8752ef SHA512 86f785e271470fa1f160216f0bb85bbde2358c2e621ca028dcfef2aac01edc03a977a086122ad2bfdb40e385e9989c4f61f19f2a1605c29b40e3bdc8c9d448a2 WHIRLPOOL 061667b32d310b4f64f8a12dcbe33b919ee1ab2399601145a771419858ae6a48a726a5c339bbd5d7431ff6c3fb79e5b96e358f24b90aff2407531e8db119f589 diff --git a/dev-ruby/simple_oauth/simple_oauth-0.2.0.ebuild b/dev-ruby/simple_oauth/simple_oauth-0.2.0.ebuild new file mode 100644 index 000000000000..a73e1df08b98 --- /dev/null +++ b/dev-ruby/simple_oauth/simple_oauth-0.2.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/simple_oauth/simple_oauth-0.2.0.ebuild,v 1.1 2012/12/04 07:22:27 graaff Exp $ + +EAPI=5 + +USE_RUBY="ruby18 ruby19 ree18 jruby" + +RUBY_FAKEGEM_RECIPE_TEST="rspec" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="Simply builds and verifies OAuth headers." +HOMEPAGE="https://github.com/laserlemon/simple_oauth" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +each_ruby_test() { + export CI=true + each_fakegem_test +} diff --git a/dev-ruby/stringex/Manifest b/dev-ruby/stringex/Manifest index aa0eaf5d88ee..490fbf1c24a1 100644 --- a/dev-ruby/stringex/Manifest +++ b/dev-ruby/stringex/Manifest @@ -1 +1,2 @@ DIST stringex-1.4.0.gem 105984 SHA256 d1c4267991a95d08ede6f45f866a31bbb58ed34b915f9091c67abc1a8bf801c4 SHA512 d0650dba00205bad4bd55463706d7ff765cca7a0d8cbd541f3429fbb092acea1bb72e924f3525b8f6fa93298a201f09ecc2cc2b047e6d91da4cdf09b7eca996d WHIRLPOOL 8f4a84a9be8495f78fe37348e412ee338ddc1889a07cf3cb43680b8735d8d7b0ebc84fa364be5db96316098cca5037c051762a5efda79874c70be529298c5c59 +DIST stringex-1.5.1.gem 107520 SHA256 0c2cb7f06a35d5aff6fbc255482aa85856743f31e720344d4cae25c2df6f7ea2 SHA512 706596816cc6f092b57546c55c7eb2a5734b569dd1666f54c70f48e444e1322336c7f8dd4f959c5e7b72fd70790c0c2d30e844224baea340766af1e77cdd25d5 WHIRLPOOL 90e97906b808f1ea71d63151102310d3fb924b1ff2439a2fbf4516685b9c40b9f343b41e27a4cc52cd3d3031216173a471a6bce12a7acfe4e1b234fe6c805433 diff --git a/dev-ruby/stringex/stringex-1.5.1.ebuild b/dev-ruby/stringex/stringex-1.5.1.ebuild new file mode 100644 index 000000000000..10d957c88bd5 --- /dev/null +++ b/dev-ruby/stringex/stringex-1.5.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.5.1.ebuild,v 1.1 2012/12/05 07:15:11 graaff Exp $ + +EAPI=5 +USE_RUBY="ruby18 ruby19 ree18" + +RUBY_FAKEGEM_DOC_DIR="rdoc" +RUBY_FAKEGEM_EXTRADOC="README.rdoc" + +inherit ruby-fakegem + +DESCRIPTION="Extensions for Ruby's String class" +HOMEPAGE="http://github.com/rsl/stringex" +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +# we could rely on activerecord[sqlite3], but since we do not remove the +# sqlite3 adapter from activerecord when building -sqlite3, it's easier +# to just add another dependency, so the user doesn't have to change the +# USE flags at all. +ruby_add_bdepend " + test? ( + dev-ruby/activerecord + dev-ruby/sqlite3 + dev-ruby/redcloth + dev-ruby/test-unit:2 + )" + +each_ruby_test() { + # rake seems to break this + ruby-ng_testrb-2 -Ilib test/*_test.rb || die "tests failed" +} diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest index 9820d27e78e2..cc1c6932baef 100644 --- a/dev-ruby/test-unit-rr/Manifest +++ b/dev-ruby/test-unit-rr/Manifest @@ -1 +1,2 @@ DIST test-unit-rr-1.0.1.gem 13824 SHA256 f8e0041a12b7d69d2db705d786fc5dbcb406df72280e533a5cb9c25d5dd61333 SHA512 6ca7b02530f74c42b5cd2226450a533fadfa223056c29a8a7150a5d654f66e1705019d2bf2cc66d3f41ae043a8bb71dfff88b63738246161a6d6cb63b268f22a WHIRLPOOL 9313c259be73e3183d3733594fd7bcbcd287fbc22516ccd9496323b67d0e792956d476251cf5f4611bf22e5d53e64b7faf4f251099c1c48e91502e229ef617a3 +DIST test-unit-rr-1.0.2.gem 15360 SHA256 603b1837a04cb3a1d9131678055c0c168d94ba21d1490d2efdde3f92c674ac88 SHA512 60aa72d15b226f97ad58f7692262bd26171f9b3f0b4e58f27c82370551ef397d3f3740f83814d741417bca93c64e8df76161eb9f837b1cbd4e1913329751f1a1 WHIRLPOOL b66675926182b3675b76cb4205b194f7624059c65247b4a5b65ba3f51cc784d8b05091e110221b5c5da203de2b096a84d57a92600b23bfccd5b96818ad953a85 diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild new file mode 100644 index 000000000000..d589db34b5b4 --- /dev/null +++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit-rr/test-unit-rr-1.0.2.ebuild,v 1.1 2012/12/04 07:28:00 graaff Exp $ + +EAPI=5 + +USE_RUBY="ruby18 ruby19 jruby ree18" + +RUBY_FAKEGEM_TASK_TEST="" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="RR adapter for Test::Unit." +HOMEPAGE="http://rubyforge.org/projects/test-unit/" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/rr-1.0.2 >=dev-ruby/test-unit-2.5.2" + +each_ruby_test() { + ${RUBY} test/run-test.rb || die +} diff --git a/dev-tcltk/blt/blt-2.4z-r10.ebuild b/dev-tcltk/blt/blt-2.4z-r10.ebuild index 0371a2c2d976..583af60e708d 100644 --- a/dev-tcltk/blt/blt-2.4z-r10.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r10.ebuild @@ -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/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.14 2012/11/02 16:54:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r10.ebuild,v 1.15 2012/12/05 07:22:37 jlec Exp $ EAPI="3" @@ -44,6 +44,7 @@ src_prepare() { sed \ -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \ + -e "/RANLIB/s:ranlib:$(tc-getRANLIB):g" \ -i configure* || die "sed configure* failed" sed \ -e "/^scriptdir =/s:lib:$(get_libdir):" \ diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest index 7b6d301cc7b5..fd85aec1a165 100644 --- a/dev-tcltk/bwidget/Manifest +++ b/dev-tcltk/bwidget/Manifest @@ -1,3 +1 @@ -DIST BWidget-1.7.0.tar.gz 204095 SHA256 92d0552ecdc364ec973743784be9cc89949a73524b39f78c298440253986d734 SHA512 1bc18f947a8b923683f759a4a22781053905c499cda3f393972c080b5503f4f99b4d925cd34f9889c91852b361bc98a2ecd5a7a94ef9aadcfbc3a915a1f32b57 WHIRLPOOL 05cce7b8f027e0a8cd7258e24f9a659668e99f7dca43ff3c3f1266077c9e1c8a71be56024550b19c69ad2aa9ab40b2c0774bf49a441cfb4c3ddc1aff5e63dd7c -DIST BWidget-1.8.0.tar.gz 218530 SHA256 0094039a495e70699c44c9e3c27e31c6663447aae581a4350a040821baa067e3 SHA512 687b1b3c85f76eb1f164a30bfe5032fc230fa7f18f1883888b9499430edf11552ba433b60433fad86ed9fa302ec0ac172b5e754862d5e19b90a8c6df6be1ede7 WHIRLPOOL 9330e83138fbf4da009747f753d8d6e352f5e476080fdb903374ff14127f81405894c2256e2e83d5f389573756f988e6d8469d5080a68402cf773486f62f97b6 DIST BWidget-1.9.0.tar.gz 228171 SHA256 3135d1c748494c2a709a3f64b5669c9196ade7e9d062d9370309214f532c637e SHA512 4ef5e8d465beb76f5f5908c42bb45675efe4dd4a53d695fa4875cf2421d60b20ed426ee5113dc6fe35c3080b03aff53a7bbaf6969c37a771f622de47fa1d4627 WHIRLPOOL 38c3a8cb6a0e382a7695df6104b9fd3a1855af4ac976b2931a0cba04bce448ddbf18f59d73bc5ee30f6b42b60421a93322d6afdf043bb862c2b81d68d78460bd diff --git a/dev-tcltk/bwidget/bwidget-1.7.0.ebuild b/dev-tcltk/bwidget/bwidget-1.7.0.ebuild deleted file mode 100644 index abda208e9500..000000000000 --- a/dev-tcltk/bwidget/bwidget-1.7.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.7.0.ebuild,v 1.9 2012/07/17 11:42:08 jlec Exp $ - -EAPI=4 - -inherit eutils multilib - -MY_PN=${PN/bw/BW} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="High-level widget set for Tcl/Tk" -HOMEPAGE="http://tcllib.sourceforge.net/" -SRC_URI="mirror://sourceforge/tcllib/${MY_P}.tar.gz" - -LICENSE="BWidget" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" -IUSE="doc" - -DEPEND="dev-lang/tk" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_install() { - insinto /usr/$(get_libdir)/${P} - doins *.tcl - doins -r images lang - - insinto /usr/share/doc/${PF}/ - doins -r demo - dodoc ChangeLog README.txt - - use doc && dohtml BWman/* -} diff --git a/dev-tcltk/bwidget/bwidget-1.8.0.ebuild b/dev-tcltk/bwidget/bwidget-1.8.0.ebuild deleted file mode 100644 index ef3d24c3e220..000000000000 --- a/dev-tcltk/bwidget/bwidget-1.8.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/bwidget/bwidget-1.8.0.ebuild,v 1.5 2012/07/17 11:42:08 jlec Exp $ - -EAPI=4 - -inherit eutils multilib - -MY_PN=${PN/bw/BW} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="High-level widget set for Tcl/Tk" -HOMEPAGE="http://tcllib.sourceforge.net/" -SRC_URI="mirror://sourceforge/tcllib/${MY_P}.tar.gz" - -LICENSE="BWidget" -SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" -IUSE="doc" - -DEPEND="dev-lang/tk" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_install() { - insinto /usr/$(get_libdir)/${P} - doins *.tcl - doins -r images lang - - insinto /usr/share/doc/${PF}/ - doins -r demo - dodoc ChangeLog README.txt - - use doc && dohtml BWman/* -} diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch deleted file mode 100644 index 0ac51973a3a6..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-boolean.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/compat/libjpeg/jmorecfg.h b/compat/libjpeg/jmorecfg.h -index 4196885..d1eb675 100644 ---- a/compat/libjpeg/jmorecfg.h -+++ b/compat/libjpeg/jmorecfg.h -@@ -253,6 +253,7 @@ typedef unsigned int JDIMENSION; - #endif - - #ifndef HAVE_BOOLEAN -+#define HAVE_BOOLEAN - #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) - typedef unsigned char boolean; - #else diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch deleted file mode 100644 index f63b9bcaa2eb..000000000000 --- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo+use_bundled_libpng14.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h -index 834bd23..259e069 100644 ---- a/libpng/pngtclDecls.h -+++ b/libpng/pngtclDecls.h -@@ -309,7 +309,7 @@ PNGTCLAPI void png_data_freer(png_structp png_ptr, - png_uint_32 mask); - /* 98 */ - PNGTCLAPI png_voidp png_malloc_default(png_structp png_ptr, -- png_uint_32 size); -+ png_alloc_size_t size); - /* 99 */ - PNGTCLAPI void png_free_default(png_structp png_ptr, png_voidp ptr); - /* Slot 100 is reserved */ -@@ -1067,10 +1067,10 @@ typedef struct PngtclStubs { - void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */ - void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */ - void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */ -- void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */ -+/* void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */ - void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */ - void *reserved64; -- void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */ -+/* void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */ - void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */ - void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */ - void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */ -diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c -index f8d2d9b..3309ee9 100644 ---- a/libpng/pngtclStubInit.c -+++ b/libpng/pngtclStubInit.c -@@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = { - png_read_end, /* 59 */ - png_destroy_info_struct, /* 60 */ - png_destroy_read_struct, /* 61 */ -- png_read_destroy, /* 62 */ -+/* png_read_destroy, */ /* 62 */ - png_destroy_write_struct, /* 63 */ - NULL, /* 64 */ -- png_write_destroy, /* 65 */ -+/* png_write_destroy, */ /* 65 */ - png_set_crc_action, /* 66 */ - png_set_filter, /* 67 */ - #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED) -diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in -index 4592093..e32f5d2 100644 ---- a/libtiff/Makefile.in -+++ b/libtiff/Makefile.in -@@ -35,8 +35,8 @@ - - # tif_fax3sm is special. It is generated. - --PKG_SOURCES = @PKG_SOURCES@ tif_fax3sm.c --PKG_OBJECTS = @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT) -+PKG_SOURCES = tifftcl.c tifftclStubInit.c -+PKG_OBJECTS = tifftcl.o tifftclStubInit.o - - PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ - PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ -@@ -109,7 +109,7 @@ RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ - SHLIB_LD = @SHLIB_LD@ --SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -ltiff - STLIB_LD = @STLIB_LD@ - TCL_DEFS = @TCL_DEFS@ - TCL_BIN_DIR = @TCL_BIN_DIR@ -diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h -index b30485d..7dd700b 100644 ---- a/libtiff/tifftclDecls.h -+++ b/libtiff/tifftclDecls.h -@@ -24,8 +24,9 @@ - #undef INLINE - - #include "tifftclDeclsMask.h" --#include "../compat/libtiff/libtiff/tiffio.h" - #include "../compat/libtiff/libtiff/tiffiop.h" -+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h" -+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h" - #include "../compat/libtiff/libtiff/tif_predict.h" - #include "tifftclDeclsUnmask.h" - -diff --git a/tiff/tiff.c b/tiff/tiff.c -index a5d5949..826da9a 100644 ---- a/tiff/tiff.c -+++ b/tiff/tiff.c -@@ -17,6 +17,7 @@ - #include "tcl.h" - #include "tifftcl.h" - #include "zlibtcl.h" -+#include "init.c" - - #ifdef HAVE_STDLIB_H - #undef HAVE_STDLIB_H -@@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp); - #define MORE_INITIALIZATION \ - if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; } - --#include "init.c" - - #include "tiffInt.h" - -diff --git a/zlib/Makefile.in b/zlib/Makefile.in -index cb71481..eb51145 100644 ---- a/zlib/Makefile.in -+++ b/zlib/Makefile.in -@@ -33,8 +33,8 @@ - # $(srcdir) or in the generic, win or unix subdirectory. - #======================================================================== - --PKG_SOURCES = @PKG_SOURCES@ --PKG_OBJECTS = @PKG_OBJECTS@ -+PKG_SOURCES = zlibtcl.c zlibtclStubInit.c -+PKG_OBJECTS = zlibtcl.o zlibtclStubInit.o - - PKG_STUB_SOURCES = @PKG_STUB_SOURCES@ - PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@ -@@ -107,7 +107,7 @@ RANLIB = @RANLIB@ - RANLIB_STUB = @RANLIB_STUB@ - SHLIB_CFLAGS = @SHLIB_CFLAGS@ - SHLIB_LD = @SHLIB_LD@ --SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -+SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lz - STLIB_LD = @STLIB_LD@ - TCL_DEFS = @TCL_DEFS@ - TCL_BIN_DIR = @TCL_BIN_DIR@ -diff --git a/zlib/configure.in b/zlib/configure.in -index 292d3aa..bc045d6 100644 ---- a/zlib/configure.in -+++ b/zlib/configure.in -@@ -51,17 +51,12 @@ TEA_SETUP_COMPILER - #----------------------------------------------------------------------- - - TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c]) --TEA_ADD_SOURCES([../compat/zlib/adler32.c ../compat/zlib/compress.c ../compat/zlib/crc32.c]) --TEA_ADD_SOURCES([../compat/zlib/deflate.c ../compat/zlib/gzclose.c ../compat/zlib/gzlib.c]) --TEA_ADD_SOURCES([../compat/zlib/gzread.c ../compat/zlib/gzwrite.c ../compat/zlib/infback.c]) --TEA_ADD_SOURCES([../compat/zlib/inffast.c ../compat/zlib/inflate.c ../compat/zlib/inftrees.c]) --TEA_ADD_SOURCES([../compat/zlib/trees.c ../compat/zlib/uncompr.c ../compat/zlib/zutil.c]) - - TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h]) - TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h]) - - TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"]) --TEA_ADD_LIBS([]) -+TEA_ADD_LIBS([-lz]) - TEA_ADD_CFLAGS([]) - TEA_ADD_STUB_SOURCES([zlibtclStubLib.c]) - TEA_ADD_SOURCES([zlibtclStubLib.c]) -diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h -index c91496f..630abc7 100644 ---- a/zlib/zlibtclDecls.h -+++ b/zlib/zlibtclDecls.h -@@ -16,7 +16,7 @@ - - #include "tcl.h" - #include "zlibtclDeclsMask.h" --#include "../compat/zlib/zlib.h" -+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h" - #include "zlibtclDeclsUnmask.h" - - /* !BEGIN!: Do not edit below this line. */ diff --git a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild deleted file mode 100644 index f5331813981f..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.6 2012/06/07 20:46:43 zmedico Exp $ - -EAPI=3 - -VIRTUALX_USE=test - -inherit eutils multilib prefix virtualx - -MYP="${PN}${PV}" - -DESCRIPTION="Adds a lot of image formats to Tcl/Tk" -HOMEPAGE="http://tkimg.sourceforge.net/" -SRC_URI=" - http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz - mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2" - -IUSE="doc test" -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-lang/tk - >=dev-tcltk/tcllib-1.11 - media-libs/tiff:0 - media-libs/libpng:0 - sys-libs/zlib - virtual/jpeg" -DEPEND="${RDEPEND} - test? ( - x11-apps/xhost - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" - -# Fails with jpeg-turbo silently, #386253 -RESTRICT="test" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \ - "${FILESDIR}"/${P}-jbig.patch - find compat/{libjpeg,libpng,zlib} -delete - sed \ - -e 's:-O2 -fomit-frame-pointer::g' \ - -e 's: -pipe::g' \ - -i */configure || die - eprefixify */*.h -} - -src_test() { - Xemake test || die "Xmake failed" -} - -src_install() { - local l bl - - emake \ - DESTDIR="${D}" \ - INSTALL_ROOT="${D}" \ - install || die "emake install failed" - - # Make library links - for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do - bl=$(basename $l) - dosym Img1.4/${bl} /usr/$(get_libdir)/${bl} - done - - dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die - - if use doc; then - insinto /usr/share/doc/${PF} - doins demo.tcl || die - insinto /usr/share/doc/${PF}/html - doins -r doc/* || die - fi -} diff --git a/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild deleted file mode 100644 index 93f946a614bf..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r5.ebuild,v 1.3 2012/06/07 20:46:43 zmedico Exp $ - -EAPI=3 - -VIRTUALX_USE=test - -inherit eutils multilib prefix virtualx - -MYP="${PN}${PV}" - -DESCRIPTION="Adds a lot of image formats to Tcl/Tk" -HOMEPAGE="http://tkimg.sourceforge.net/" -SRC_URI=" - http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz - mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2" - -IUSE="doc test" -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-lang/tk - >=dev-tcltk/tcllib-1.11 - media-libs/tiff:0 - media-libs/libpng:0 - >=sys-libs/zlib-1.2.6 - virtual/jpeg" -DEPEND="${RDEPEND} - test? ( - x11-apps/xhost - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" - -# Fails with jpeg-turbo silently, #386253 -RESTRICT="test" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \ - "${FILESDIR}"/${P}-jbig.patch \ - "${FILESDIR}"/${P}-zlib-1.2.6.patch - find compat/{libjpeg,libpng,zlib} -delete - sed \ - -e 's:-O2 -fomit-frame-pointer::g' \ - -e 's: -pipe::g' \ - -i */configure || die - eprefixify */*.h -} - -src_test() { - Xemake test || die "Xmake failed" -} - -src_install() { - local l bl - - emake \ - DESTDIR="${D}" \ - INSTALL_ROOT="${D}" \ - install || die "emake install failed" - - # Make library links - for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do - bl=$(basename $l) - dosym Img1.4/${bl} /usr/$(get_libdir)/${bl} - done - - dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die - - if use doc; then - insinto /usr/share/doc/${PF} - doins demo.tcl || die - insinto /usr/share/doc/${PF}/html - doins -r doc/* || die - fi -} diff --git a/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild deleted file mode 100644 index d1ca5f5640ae..000000000000 --- a/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r6.ebuild,v 1.1 2012/07/07 14:05:46 jlec Exp $ - -EAPI=4 - -VIRTUALX_USE=test - -inherit eutils multilib prefix virtualx - -MYP="${PN}${PV}" - -DESCRIPTION="Adds a lot of image formats to Tcl/Tk" -HOMEPAGE="http://tkimg.sourceforge.net/" -SRC_URI=" - http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz - mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2" - -IUSE="doc test" -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-lang/tk - >=dev-tcltk/tcllib-1.11 - media-libs/tiff:0 - media-libs/libpng:0 - >=sys-libs/zlib-1.2.6 - virtual/jpeg" -DEPEND="${RDEPEND} - test? ( - x11-apps/xhost - media-fonts/font-misc-misc - media-fonts/font-cursor-misc )" - -# Fails with jpeg-turbo silently, #386253 -RESTRICT="test" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch \ - "${FILESDIR}"/${P}-jbig.patch \ - "${FILESDIR}"/${P}-zlib-1.2.6.patch \ - "${FILESDIR}"/${P}-libtiff.patch \ - "${FILESDIR}"/${P}-libtiff4.patch - - find compat/{libjpeg,libpng,zlib,libtiff} -delete - - sed \ - -e 's:-O2 -fomit-frame-pointer::g' \ - -e 's: -pipe::g' \ - -i */configure || die - - eprefixify */*.h -} - -src_test() { - Xemake test || die "Xmake failed" -} - -src_install() { - local l bl - - emake \ - DESTDIR="${D}" \ - INSTALL_ROOT="${D}" \ - install - - # Make library links - for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do - bl=$(basename $l) - dosym Img1.4/${bl} /usr/$(get_libdir)/${bl} - done - - dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE - - if use doc; then - insinto /usr/share/doc/${PF} - doins demo.tcl - insinto /usr/share/doc/${PF}/html - doins -r doc/* - fi -} diff --git a/dev-tex/dvi2tty/metadata.xml b/dev-tex/dvi2tty/metadata.xml index 2ee99e0dfda1..5e272f4cee56 100644 --- a/dev-tex/dvi2tty/metadata.xml +++ b/dev-tex/dvi2tty/metadata.xml @@ -4,7 +4,7 @@ tex proxy-maintainers - johneed@hotmail.com + idella4@gentoo.org Ian Delaney diff --git a/dev-util/aap/aap-1.091-r1.ebuild b/dev-util/aap/aap-1.091-r1.ebuild new file mode 100644 index 000000000000..acaad46d1fae --- /dev/null +++ b/dev-util/aap/aap-1.091-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/aap/aap-1.091-r1.ebuild,v 1.1 2012/12/05 06:02:22 ottxor Exp $ + +EAPI=4 + +IUSE="doc" + +DESCRIPTION="Bram Moolenaar's super-make program" +HOMEPAGE="http://www.a-a-p.org/" +SRC_URI="mirror://sourceforge/a-a-p/${P}.zip" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +DEPEND="app-arch/unzip" +RDEPEND="dev-lang/python" +S=${WORKDIR} + +src_install() { + rm doc/*.sgml doc/*.pdf || die + use doc && dohtml -r doc/*.html doc/images + rm -r doc/*.html doc/images || die + + dodoc doc/* + doman aap.1 + rm -r doc aap.1 || die + + # Move the remainder directly into the dest tree + dodir /usr/share/aap + cp -R * "${ED}"/usr/share/aap || die + + # Create a symbolic link for the executable + dosym ../share/aap/aap /usr/bin/aap +} diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest index 943a8d430719..bd58a7c7251d 100644 --- a/dev-util/catalyst/Manifest +++ b/dev-util/catalyst/Manifest @@ -1,3 +1,4 @@ DIST catalyst-2.0.11.tar.bz2 909191 SHA256 6fed91ac834179f676905f6fa544fb642b18b95ec1c89420432ef05fb9fde7da SHA512 935d42f72bc5e181ef0eff4862e414a52914b7ac82d6e75c2d80c1a4d055b428da2c2d255c35cf851bcb729aca1a9c8ee0301923433d4c7fedb03bc1f06d5ca3 WHIRLPOOL e91a01b2d0f17e2d7c371d05362a658e7ddc7142982ae84efb71db9327e933227651d6efaeb8c86b0d5305e350632a2adac0ff81fed888588fe6078cb049ab7b DIST catalyst-2.0.12.1.tar.bz2 908119 SHA256 91bc71a0140da9977fda4969a137a25ed04c3dd6fa2c038404806b7f562eda62 SHA512 1f448b4c849567d5097246f0c6e140e25781b0c3f093bec8c616cf83d2ad86af5dbebfaf4bafd1e240db41c3213e0f3ea9da77a22b1ee73480a0d1c39d6d0a8f WHIRLPOOL 9c2c3f491611c0cb99694aabb24af1f2b45576e6c5f056335fb5f028a93e9d91e1beba652bf7aaf3a93f54a1abb6bdb827624659845dfb01f8ea4bee6868e48e +DIST catalyst-2.0.12.2.tar.bz2 907893 SHA256 411d531b6de8c8c1bc9fa9502af3a4882e94e9db8b911bb48e4a0fcfc1efe7e8 SHA512 12349f6249363a94a72a71d05b2fe6ee13593b5ea67e1cb9a054c5ece896ff68f89d1af6341b98238ba6a6510e2737f81dcc2606649c10681235315663ab04ae WHIRLPOOL 1769a78f615c8e0eec2167dd9d6ab873e24801ecb5e4634037898933c6f5a1dbb189d967a628be6f8811f6769eadc91c5003ddbb6bd58eb05efbbd5110f740c7 DIST catalyst-2.0.12.tar.bz2 907241 SHA256 ef7cf9d8559f1cf94aabd67c5c3c1b99316e0534a4483a67a02b2db2cf6617a0 SHA512 77993afcaf2eec08e0c831c3d68e3578aab9a7f9805f00c67dd8f8db722e2eb59164373d42ebbf2396e02188d8508a327555a4b55490a150e706a8d3381f8177 WHIRLPOOL 4f713610b5929e5e724ca376f755b023fbb79260d1c7610962d875dc0ff7d1d72808849838bc06dfa38664ae5caa186ab2b8bb903389a238162d1acf190e0b4e diff --git a/dev-util/catalyst/catalyst-2.0.12.2.ebuild b/dev-util/catalyst/catalyst-2.0.12.2.ebuild new file mode 100644 index 000000000000..2e91bddb6890 --- /dev/null +++ b/dev-util/catalyst/catalyst-2.0.12.2.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.12.2.ebuild,v 1.1 2012/12/04 21:23:03 zerochaos Exp $ + +# catalyst-9999 -> latest Git +# catalyst-2.9999 -> catalyst_2 branch from Git +# catalyst-3.9999 -> catalyst_3 branch from Git +# catalyst-VER -> normal catalyst release + +EAPI=3 +PYTHON_DEPEND="2" + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git" + inherit git-2 + SRC_URI="" + S="${WORKDIR}/${PN}" + KEYWORDS="" + + case ${PV} in + 2.9999) EGIT_BRANCH="catalyst_2" ;; + 3.9999) EGIT_BRANCH="catalyst_3" ;; + esac +else + SRC_URI="mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2" + KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +fi +inherit eutils multilib python + +DESCRIPTION="release metatool used for creating releases based on Gentoo Linux" +HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/" + +LICENSE="GPL-2" +SLOT="0" +RESTRICT="" +IUSE="ccache kernel_linux" + +DEPEND="app-text/asciidoc" +RDEPEND="app-arch/lbzip2 + app-crypt/shash + virtual/cdrtools + ccache? ( dev-util/ccache ) + ia64? ( sys-fs/dosfstools ) + kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )" + +pkg_setup() { + if use ccache ; then + einfo "Enabling ccache support for catalyst." + else + ewarn "By default, ccache support for catalyst is disabled." + ewarn "If this is not what you intended," + ewarn "then you should add ccache to your USE." + fi + echo + einfo "The template spec files are now installed by default. You can find" + einfo "them under /usr/share/doc/${PF}/examples" + einfo "and they are considered to be the authorative source of information" + einfo "on catalyst." + echo + if [[ ${PV} == *9999* ]]; then + ewarn "The ${EGIT_BRANCH:-master} branch (what you get with this ${PV} ebuild) contains" + ewarn "work-in-progress code. Be aware that it's likely that it will not" + ewarn "be in a working state at any given point. Please do not file bugs" + ewarn "until you have posted on the gentoo-catalyst mailing list and we" + ewarn "have asked you to do so." + fi + python_set_active_version 2 +} + +src_prepare() { + python_convert_shebangs 2 catalyst modules/catalyst_lock.py +} + +src_install() { + insinto /usr/$(get_libdir)/${PN} + exeinto /usr/$(get_libdir)/${PN} + doexe catalyst || die "copying catalyst" + if [[ ${PV} == 3.9999* ]]; then + doins -r modules files || die "copying files" + else + doins -r arch modules livecd || die "copying files" + fi + for x in targets/*; do + exeinto /usr/$(get_libdir)/${PN}/$x + doexe $x/* || die "copying ${x}" + done + make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst + insinto /etc/catalyst + doins files/catalyst.conf files/catalystrc || die "copying configuration" + insinto /usr/share/doc/${PF}/examples + doins examples/* || die + dodoc README ChangeLog AUTHORS + doman files/catalyst.1 + # Here is where we actually enable ccache + use ccache && \ + dosed 's:options="autoresume kern:options="autoresume ccache kern:' \ + /etc/catalyst/catalyst.conf + dosed "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \ + /etc/catalyst/catalyst.conf +} + +pkg_postinst() { + einfo "You can find more information about catalyst by checking out the" + einfo "catalyst project page at:" + einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml" + echo + elog "update_seed syntax has changed to make it more flexible." + elog "This is an optional setting supported by stage1 that runs an emerge" + elog "command on the seed stage before starting the stage1 build. (example:" + elog "`--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`)" +} diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest new file mode 100644 index 000000000000..610c9221bf14 --- /dev/null +++ b/dev-util/kdevelop-python/Manifest @@ -0,0 +1 @@ +DIST kdev-python-v1.4.1.tar.bz2 4700296 SHA256 8743844c6bcf09b3f9db05891539973633049470eb7c046b75b3cfe4542da1e2 SHA512 537bfb1c0691c8c001a2061e1137593321936fcbc49cfe4f4188088954d7e9e6abb6fd57c646125a61994d20f741fb1e8d24f66316fcb867c40c30dd763d5213 WHIRLPOOL 779884a458850517745f573bcdc695faf0c04b9e063dd40a96e8580d6c163bdb79edec68ff81f0cbc1064e3cc2d1e3c917cd2b92ea8b51dce72cf50383f1087d diff --git a/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild new file mode 100644 index 000000000000..4e7f6a772817 --- /dev/null +++ b/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.1 2012/12/04 19:49:44 dastergon Exp $ + +EAPI=4 + +KDE_SCM="git" +KMNAME="kdev-python" +KDEVPLATFORM_VERSION="1.3.60" +PYTHON_DEPEND="2" + +inherit kde4-base python + +MY_PN="kdev-python" +MY_PV="v${PV}" +MY_P="${MY_PN}-${MY_PV}" + +if [[ $PV != *9999* ]]; then + SRC_URI="mirror://kde/stable/kdevelop/${MY_PN}/${PV}/src/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~x86" + S=${WORKDIR}/${MY_P} +else + EGIT_REPO_URI="git://anongit.kde.org/kdev-python.git" + KEYWORDS="" +fi + +DESCRIPTION="Python plugin for KDevelop 4" +HOMEPAGE="http://www.kdevelop.org" + +LICENSE="GPL-2" +SLOT="4" +IUSE="debug" + +DEPEND=" + >=dev-util/kdevelop-pg-qt-1.0.0 + dev-util/kdevelop +" +RDEPEND="${DEPEND}" + +RESTRICT="test" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup + + kde4-base_pkg_setup +} + +src_compile() { + pushd "${WORKDIR}"/${P}_build + emake parser + popd + + kde4-base_src_compile +} diff --git a/dev-util/kdevelop-python/metadata.xml b/dev-util/kdevelop-python/metadata.xml new file mode 100644 index 000000000000..a23f444b67d6 --- /dev/null +++ b/dev-util/kdevelop-python/metadata.xml @@ -0,0 +1,5 @@ + + + + kde + diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest index 0c1031bd9ad9..ebab92c5890d 100644 --- a/dev-util/rpmdevtools/Manifest +++ b/dev-util/rpmdevtools/Manifest @@ -1 +1 @@ -DIST rpmdevtools-8.2.tar.xz 101508 SHA256 b3df2b3b68d11a9234408510e9ff677422e0f1fdd9fb0b6dfdbd7a01b1ee47cf SHA512 f664f5a8f227e571653616303852fff02a03c2792641c5c29127a17c6b736803a4017ad2b7556a13c9edc9c6d254313459aebde20665ce37522618ea69d22f40 WHIRLPOOL 3825ede6854bea0dddcc0bbb94d939278545052bf813f013f49eccbc8074658ae1801e25c2d63f60bc752265b8d3655ec7ae024398e3359a38df981524d904d4 +DIST rpmdevtools-8.3.tar.xz 102040 SHA256 5f03dc5414e485ba8eb6c13480826fe80cc55d04df064a2117e63b4667fc42cf SHA512 9d3d79d30abf5f579a11068aa2788967dfdcaf87bcd6ec127baede1cbfd38295671ae24700cf4a5c5433ae8bf0c7b3ba2466078aa491067d35db7c56a6efd0f5 WHIRLPOOL f4a4345a646072162b9ac2dd2f05997483e10b0ff3c6ea40fa4ac260a9ae99745d03c1245cd8b7e49bf015a4df841b276d7cc0772c200b5e4e73c299edb257bc diff --git a/dev-util/rpmdevtools/rpmdevtools-8.2.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild similarity index 90% rename from dev-util/rpmdevtools/rpmdevtools-8.2.ebuild rename to dev-util/rpmdevtools/rpmdevtools-8.3.ebuild index c593e84d8935..4a8fe60b5d29 100644 --- a/dev-util/rpmdevtools/rpmdevtools-8.2.ebuild +++ b/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild @@ -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/dev-util/rpmdevtools/rpmdevtools-8.2.ebuild,v 1.1 2012/02/19 15:29:57 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/rpmdevtools/rpmdevtools-8.3.ebuild,v 1.1 2012/12/04 08:35:41 scarabeus Exp $ EAPI=4 diff --git a/dev-util/skipfish/Manifest b/dev-util/skipfish/Manifest index 6ba12353f2db..49af7b608c5c 100644 --- a/dev-util/skipfish/Manifest +++ b/dev-util/skipfish/Manifest @@ -1,3 +1 @@ -DIST skipfish-2.06b.tgz 216712 SHA256 d75ba72ef8a4c3587a10a16b58f5e6c4e26386aad76064f06f7746b5ff06ff06 SHA512 88370c96f1ad9beac1ca92c5cd88cea42894ba27f9e238b98d5044a2cde4d39cd384fb30cfa1b785b9ecce5cd9d9274a3d5f6d391a566b917c109372f7c207f0 WHIRLPOOL 8f132ef5e214c6272b99690a38c30112b7616310492e7f376e60d2e61131cf79df150b9f58cda00c50a083c3e458bc8b97b8e03cac69e7f6f361890b422fb49a -DIST skipfish-2.07b.tgz 213582 SHA256 eecfe8ecfd3dde191bae3dd31efde5d4c0d35fa5898d83865a4644031ae37d82 SHA512 182b68c194269c53aee1188393af0bd04027d4daa28674d6aee75a32c75f616ee8bfed1c6cefb31e29e7e1f42bf29ecbaee2547dda83eb547024b2e1148ad36f WHIRLPOOL 51b393d4a4d5c0b8094ec69229be72254b1bc46d7f065a7faee9c35eea5590d0588abefff92dde05288d562684bc621aeb4fd66a132b68e8433e4ff6469fb859 DIST skipfish-2.09b.tgz 235210 SHA256 12ea7c74ed8a3fa29668d95172f46c976997cd393c908a7704b97610bfcd350a SHA512 38897877a2354971e2a8d03f2bdd640f8bcc010b10f62d82daef7ae7570b54a88dd6d425c1f7beb054dc69a991aedcfd2ecb819be0c7e9918830940884f199d8 WHIRLPOOL 2952dcb66664fbd533b761858ed1ff1be55e131376af136be5d4394a88689bc39b0106fd05eae6586e2e476cdd6a730512551af091db849060074805c71b9ad7 diff --git a/dev-util/skipfish/skipfish-2.06_beta.ebuild b/dev-util/skipfish/skipfish-2.06_beta.ebuild deleted file mode 100644 index 503616b32b0b..000000000000 --- a/dev-util/skipfish/skipfish-2.06_beta.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/skipfish/skipfish-2.06_beta.ebuild,v 1.1 2012/05/14 16:21:54 pacho Exp $ - -EAPI=4 -inherit toolchain-funcs - -MY_P=${P/_beta/b} - -DESCRIPTION="A fully automated, active web application security reconnaissance tool" -HOMEPAGE="http://code.google.com/p/skipfish/" -SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz" - -LICENSE="Apache-2.0 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND="dev-libs/openssl:0 - net-dns/libidn - sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - sed -i \ - -e '/CFLAGS_GEN/s:-g -ggdb::' \ - -e '/CFLAGS_OPT/s:-O3::' \ - Makefile || die - - sed -i \ - -e "/ASSETS_DIR/s:assets:/usr/share/doc/${PF}/html:" \ - config.h || die -} - -src_compile() { - tc-export CC - - local _debug - use debug && _debug=debug - - emake ${_debug} -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - - insinto /usr/share/${PN}/dictionaries - doins dictionaries/*.wl - - dohtml assets/* - - dodoc ChangeLog dictionaries/README-FIRST README -} diff --git a/dev-util/skipfish/skipfish-2.07_beta.ebuild b/dev-util/skipfish/skipfish-2.07_beta.ebuild deleted file mode 100644 index 828ea793a9a8..000000000000 --- a/dev-util/skipfish/skipfish-2.07_beta.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/skipfish/skipfish-2.07_beta.ebuild,v 1.1 2012/06/05 17:44:48 xmw Exp $ - -EAPI=4 -inherit toolchain-funcs - -MY_P=${P/_beta/b} - -DESCRIPTION="A fully automated, active web application security reconnaissance tool" -HOMEPAGE="http://code.google.com/p/skipfish/" -SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz" - -LICENSE="Apache-2.0 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND="dev-libs/openssl:0 - net-dns/libidn - sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - sed -i \ - -e '/CFLAGS_GEN/s:-g -ggdb::' \ - -e '/CFLAGS_OPT/s:-O3::' \ - Makefile || die - - sed -i \ - -e "/ASSETS_DIR/s:assets:/usr/share/doc/${PF}/html:" \ - config.h || die -} - -src_compile() { - tc-export CC - - local _debug - use debug && _debug=debug - - emake ${_debug} -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - - insinto /usr/share/${PN}/dictionaries - doins dictionaries/*.wl - - dohtml assets/* - - dodoc ChangeLog dictionaries/README-FIRST README -} diff --git a/dev-vcs/mercurial/mercurial-2.4-r1.ebuild b/dev-vcs/mercurial/mercurial-2.4-r1.ebuild index c707f47ee784..60faa27449dc 100644 --- a/dev-vcs/mercurial/mercurial-2.4-r1.ebuild +++ b/dev-vcs/mercurial/mercurial-2.4-r1.ebuild @@ -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/dev-vcs/mercurial/mercurial-2.4-r1.ebuild,v 1.1 2012/11/24 22:42:49 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4-r1.ebuild,v 1.2 2012/12/04 07:54:28 grobian Exp $ EAPI=3 PYTHON_DEPEND="2" @@ -59,6 +59,7 @@ src_compile() { src_install() { distutils_src_install + python_convert_shebangs 2 contrib/hg-ssh newbashcomp contrib/bash_completion ${PN} || die diff --git a/dev-vcs/rcs/metadata.xml b/dev-vcs/rcs/metadata.xml index 4428c5b56753..36b9c241bdf8 100644 --- a/dev-vcs/rcs/metadata.xml +++ b/dev-vcs/rcs/metadata.xml @@ -2,9 +2,8 @@ - johneed@hotmail.com + idella4@gentoo.org Ian Delaney - Proxy maintainer, assign bugs titanofold@gentoo.org diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild index 56f4ad90da61..ad8ddd0b9d7c 100644 --- a/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild +++ b/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild @@ -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/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild,v 1.3 2012/10/18 10:39:17 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/afternoonstalker/afternoonstalker-1.1.5.ebuild,v 1.4 2012/12/04 10:56:21 ago Exp $ EAPI=2 inherit autotools games @@ -11,7 +11,7 @@ SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86 ~x86-fbsd" +KEYWORDS="amd64 ppc x86 ~x86-fbsd" IUSE="" RDEPEND=">=dev-games/flatzebra-0.1.6" diff --git a/games-board/domination/domination-1.1.1.1.ebuild b/games-board/domination/domination-1.1.1.1.ebuild index e6195cab21fc..191d76f415d2 100644 --- a/games-board/domination/domination-1.1.1.1.ebuild +++ b/games-board/domination/domination-1.1.1.1.ebuild @@ -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/games-board/domination/domination-1.1.1.1.ebuild,v 1.2 2012/10/30 12:01:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/domination/domination-1.1.1.1.ebuild,v 1.3 2012/12/04 11:13:49 ago Exp $ inherit eutils java-pkg-2 java-ant-2 games @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 x86 ~x86-fbsd" IUSE="" RDEPEND=">=virtual/jre-1.4" diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest index c92cec309325..b9c71a4ed68d 100644 --- a/games-board/gnubg/Manifest +++ b/games-board/gnubg/Manifest @@ -1,2 +1,3 @@ DIST gnubg-source-SNAPSHOT-20101126.tar.gz 14192800 SHA256 84936b5264d4789426370bd9d88e1920748a2c74ed700070310a68435b6933c7 SHA512 358b48ce9dc85893d5bb5dfc306d54eef1607cbf27e23a700f38c078340a7e74cda062b7467cbfcc4dc63bda1e42e7e39a597574848f868752f4f1c3ad39a58d WHIRLPOOL 8182f99cb2ab72c838fd377b6143f962fe7163f0c75e7b2e6789eacd899c4ccd87754914187a42b7a2e839aa15a6ecef82152bbb00797d49dad41be3280cf026 DIST gnubg-source-SNAPSHOT-20120806.tar.gz 14333498 SHA256 63dfefc80e4ff4ab3eb7866d42f90bef89ecca590bfeef82a2426a6ad90dd20d SHA512 b794b5b9f5cdc5a4c4e8caac12ed4be23c023ba6ba7f9a42757957659d95484e458959755f3e051daa6ceeeae7fec7c487b75b653bb341a15c816aa68291ed98 WHIRLPOOL 15aaba0c170c2a0b237379d6b177b69a2802b942092ee2a4e5533b3e05c912d764d2c03b7e6b6f8a517fbb2be7043207b55309aeb0987db959d30cbf9d48121d +DIST gnubg-source-SNAPSHOT-20121201.tar.gz 14335122 SHA256 3d01ca90e0cd0d99d69378519e5d9e5c753aff831eb642f459b0bb21d66f9b5d SHA512 ef0b84c97b07763ef4bc7b0a18a0ea98662f2869a8395345e9db4b1da83830a113d4e7b74fd0b32394c6bc3b93a2f0682d3c195554593670bacb5ec8f58b5d04 WHIRLPOOL 819352dcc786181b86d37054639d2585f9fac24f28d6314fc1d7d7d61f278c3a491bab3c6551d5105829ba70297d700d3f5901d5d3e808649b4e7d0b07567ff4 diff --git a/games-board/gnubg/files/gnubg-20121201-build.patch b/games-board/gnubg/files/gnubg-20121201-build.patch new file mode 100644 index 000000000000..2ada67ca7424 --- /dev/null +++ b/games-board/gnubg/files/gnubg-20121201-build.patch @@ -0,0 +1,36 @@ +diff -ru gnubg.orig/Makefile.am gnubg/Makefile.am +--- gnubg.orig/Makefile.am 2012-10-08 22:40:06.000000000 -0400 ++++ gnubg/Makefile.am 2012-12-04 15:39:12.871440413 -0500 +@@ -21,7 +21,7 @@ + AM_CPPFLAGS += @PYTHON_INCLUDES@ + endif + +-AM_CPPFLAGS += -DAC_DOCDIR='"$(datadir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"' ++AM_CPPFLAGS += -DAC_DOCDIR='"@docdir@"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"' + + OTHER_LIBS = + if WIN32 +diff -ru gnubg.orig/doc/Makefile.am gnubg/doc/Makefile.am +--- gnubg.orig/doc/Makefile.am 2011-08-16 04:27:54.000000000 -0400 ++++ gnubg/doc/Makefile.am 2012-12-04 15:39:58.373743258 -0500 +@@ -1,6 +1,6 @@ +-AM_CPPFLAGS = -DAC_DOCDIR='"$(datadir)/doc/gnubg/"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"' +-gnubg_helpdir = $(datadir)/doc/gnubg/ +-gnubg_imagedir = $(datadir)/doc/gnubg/images ++AM_CPPFLAGS = -DAC_DOCDIR='"@docdir@"' -DAC_DATADIR='"$(datadir)"' -DAC_PKGDATADIR='"$(datadir)/gnubg"' ++gnubg_helpdir = @docdir@ ++gnubg_imagedir = @docdir@/images + gnubg_help_DATA = gnubg.html allabout.html + gnubg_image_DATA = images/1540d81e.png images/16d7944c.png images/1805dc7d.png \ + images/20bc52ca.png images/20d56757.png images/234924dc.png images/26e34ea5.png \ +diff -ru gnubg.orig/pixmaps/Makefile.am gnubg/pixmaps/Makefile.am +--- gnubg.orig/pixmaps/Makefile.am 2012-10-07 22:40:05.000000000 -0400 ++++ gnubg/pixmaps/Makefile.am 2012-12-04 15:40:37.812274970 -0500 +@@ -1,5 +1,5 @@ +-gnubgiconsdir = $(datadir) +-gnubgpixmapsdir = $(pkgdatadir)/pixmaps ++gnubgiconsdir = /usr/share ++gnubgpixmapsdir = /usr/share/pixmaps + + ICONS_16_SCALABLE = icons/hicolor/16x16/apps/scalable/gnubg.svg + ICONS_16 = icons/hicolor/16x16/apps/gnubg.png diff --git a/games-board/gnubg/gnubg-20120806.ebuild b/games-board/gnubg/gnubg-20120806.ebuild index dc47017596e6..2451498250c5 100644 --- a/games-board/gnubg/gnubg-20120806.ebuild +++ b/games-board/gnubg/gnubg-20120806.ebuild @@ -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/games-board/gnubg/gnubg-20120806.ebuild,v 1.3 2012/11/15 10:28:48 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-20120806.ebuild,v 1.4 2012/12/04 15:38:03 ago Exp $ EAPI=4 PYTHON_DEPEND="python? 2" @@ -12,7 +12,7 @@ SRC_URI="http://www.gnubg.org/media/sources/${PN}-source-SNAPSHOT-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" IUSE="gtk opengl python threads" GTK_DEPS=" diff --git a/games-board/gnubg/gnubg-20121201.ebuild b/games-board/gnubg/gnubg-20121201.ebuild new file mode 100644 index 000000000000..a1e7ef18900f --- /dev/null +++ b/games-board/gnubg/gnubg-20121201.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-20121201.ebuild,v 1.1 2012/12/04 21:01:16 mr_bones_ Exp $ + +EAPI=4 +PYTHON_DEPEND="python? 2" +inherit autotools eutils python gnome2-utils games + +DESCRIPTION="GNU BackGammon" +HOMEPAGE="http://www.gnubg.org/" +SRC_URI="http://www.gnubg.org/media/sources/${PN}-source-SNAPSHOT-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +IUSE="gtk opengl python threads" + +GTK_DEPS=" + x11-libs/gtk+:2 + x11-libs/cairo + x11-libs/pango" +RDEPEND="dev-libs/glib:2 + media-libs/libpng:0 + dev-libs/libxml2 + media-libs/freetype:2 + media-libs/libcanberra + gtk? ( ${GTK_DEPS} ) + opengl? ( + ${GTK_DEPS} + x11-libs/gtkglext + >=media-libs/ftgl-2.1.2-r1 + ) + sys-libs/readline + python? ( dev-lang/python ) + media-fonts/ttf-bitstream-vera + virtual/libintl + dev-db/sqlite:3" +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/gettext" + +S=${WORKDIR}/${PN} + +pkg_setup() { + python_pkg_setup + games_pkg_setup + python_set_active_version 2 +} + +src_prepare() { + # use ${T} instead of /tmp for constructing credits (bug #298275) + sed -i -e 's:/tmp:${T}:' credits.sh || die + epatch "${FILESDIR}"/${P}-build.patch + python_convert_shebangs -r 2 python-config + eautoreconf + sed -i \ + -e 's#^localedir =.*$#localedir = @localedir@#' \ + -e 's#^gnulocaledir =.*$#gnulocaledir = @localedir@#' \ + po/Makefile.in.in || die +} + +src_configure() { + egamesconf \ + --disable-dependency-tracking \ + --localedir=/usr/share/locale \ + --docdir=/usr/share/doc/${PF}/html \ + $(use_enable threads) \ + $(use_with python) \ + $(use gtk || use opengl && echo --with-gtk) \ + $(use_with opengl board3d) +} + +src_install() { + emake DESTDIR="${D}" install + insinto "${GAMES_DATADIR}/${PN}" + doins ${PN}.weights *bd + dodoc AUTHORS README NEWS + rm -rf "${D}${GAMES_DATADIR}/${PN}/fonts" + dosym /usr/share/fonts/ttf-bitstream-vera "${GAMES_DATADIR}"/${PN}/fonts + newicon textures/logo.png gnubg.png + make_desktop_entry "gnubg -w" "GNU Backgammon" + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-emulation/openmsx/openmsx-0.9.1.ebuild b/games-emulation/openmsx/openmsx-0.9.1.ebuild index b5606b9823db..3d3d12b12852 100644 --- a/games-emulation/openmsx/openmsx-0.9.1.ebuild +++ b/games-emulation/openmsx/openmsx-0.9.1.ebuild @@ -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/games-emulation/openmsx/openmsx-0.9.1.ebuild,v 1.3 2012/11/22 10:33:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/openmsx/openmsx-0.9.1.ebuild,v 1.4 2012/12/04 15:41:36 ago Exp $ EAPI=2 inherit eutils games @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="" DEPEND="dev-lang/tcl diff --git a/games-engines/frobtads/frobtads-1.2.2.ebuild b/games-engines/frobtads/frobtads-1.2.2.ebuild index 1625bae0cbe5..b8800a8a3448 100644 --- a/games-engines/frobtads/frobtads-1.2.2.ebuild +++ b/games-engines/frobtads/frobtads-1.2.2.ebuild @@ -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/games-engines/frobtads/frobtads-1.2.2.ebuild,v 1.3 2012/11/14 19:07:28 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/frobtads/frobtads-1.2.2.ebuild,v 1.4 2012/12/04 15:38:48 ago Exp $ EAPI=4 inherit eutils flag-o-matic games @@ -11,7 +11,7 @@ SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz" LICENSE="TADS2 TADS3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug tads2compiler tads3compiler" RESTRICT="!tads3compiler? ( test )" diff --git a/games-engines/scummvm/scummvm-1.5.0.ebuild b/games-engines/scummvm/scummvm-1.5.0.ebuild index 8e5889b0b325..7ecb001d74ed 100644 --- a/games-engines/scummvm/scummvm-1.5.0.ebuild +++ b/games-engines/scummvm/scummvm-1.5.0.ebuild @@ -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/games-engines/scummvm/scummvm-1.5.0.ebuild,v 1.7 2012/11/14 23:12:11 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.5.0.ebuild,v 1.8 2012/12/04 15:40:28 ago Exp $ EAPI=2 inherit eutils flag-o-matic toolchain-funcs games @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/scummvm/${P/_/}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd" IUSE="aac alsa debug flac fluidsynth mp3 opengl truetype vorbis" RESTRICT="test" # it only looks like there's a test there #77507 diff --git a/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild b/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild index 5e548dfe906b..5b16f37002fa 100644 --- a/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild +++ b/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild @@ -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/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild,v 1.4 2012/11/18 15:59:33 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild,v 1.5 2012/12/04 15:37:45 ago Exp $ EAPI=2 inherit eutils flag-o-matic games @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sauerbraten/2010_07_19/sauerbraten_${PV//./_}_${ED LICENSE="ZLIB freedist" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug dedicated" DEPEND=" diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest index 1b5ed0b7360c..9b8b320254e3 100644 --- a/games-fps/urbanterror/Manifest +++ b/games-fps/urbanterror/Manifest @@ -1,8 +1,6 @@ -DIST UrbanTerror42_full_006.zip 1274689000 SHA256 12895a047cdf36aa50a04d808971320c3fccc243de3f73b8fd3540f05030aeee SHA512 99aef3c6d3521091fbb2772cd947e0d437c0ba6018f0a344432feef7494fda9beb27af6ed7c49b8cac12ee2106aa16faa1ccbe1ee9c40a7c6f087a4146a62b11 WHIRLPOOL cd6140d01c1375f4c3ca5edf40b6471c13f4569cb6a1900e366fce01597ecd0e36909f372bb622e6e3baa00154e6959029315d46cfa07ec030a539802fa813b3 -DIST UrbanTerror42_full_007.zip 1276681432 SHA256 f4133771b035e753a6103ed9abaf6c3fd29d5b69233ba078a99b70cdf1cca4b3 SHA512 50f4eb0b0cb95acd5f5399560def1b9fa5b29b818920a124e4294a8db303c3c421598d6f2b7bbbf90aaf6d51e4fb409ab912ee701f070db32c48144f541b0b67 WHIRLPOOL 16de23bc795cdb01ac839333ff8c147a252bec726baab645dd799d8279b6f600153ed401e5eb5734e92c626d70c05e85e5f6d0feb65594ff96a23c0243c4c85a +DIST UrbanTerror42_full_008.zip 1307943759 SHA256 f3e97c0c92001890df07ce3e8b1b345d35cc53e61ce9fab83e9bbcb5b062fe79 SHA512 a2fdde319ada4bb407e62dfcc15f5a1a846bc60c9820c42c0953fd748bc99ebd7ebf035f871b9ded859ca6d221ef479295ccc4ee682ba042d259cc5e5a9e8255 WHIRLPOOL 73aefa66441adc95879998ef663bb7d13b37120e0c7b85bbe1f5ee2e4068d9d52b402c8bbca4840a6e4f88849c4e87abd03ce7ecb4dfa57862f37b17e4d4290c DIST UrbanTerror_41_FULL.zip 754307397 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f SHA512 4ff729df5472b9bd3138e62fe2e03c794dd9293ba08106c026a120d6c9971ea2420c3e81abb99e2b2ae8a082a07e96468154958b36a770cce0e931f9a499e623 WHIRLPOOL 4752ff4455d2c69fcc732ee4035b097aed852e55bf1077c59e650297f69b87ea59ff53573b653f22843ffe7fe35e524eb66f1033049dcc364ca554bf875dad18 DIST ioq3-1807-urt-251210-git-nobumpy.tar.xz 276824 SHA256 9f14d629f2a9c8fe0a593b5a08d1ceadec6a22c387806d9e5f50e22a537c2b74 SHA512 e190f60d9c3275d285c75ba2947734cf9f555d373618a37f3b38464d10fa85a4af6460918676b18a96885fe7280c856f6c9877175dbbe82929f5f7c1704fc6a3 WHIRLPOOL 104960ca4066726cdd5dbd0d4d93998e6fc648c4e969109b3a1634232f6d4e3556c3107dd0f78860444ed3635bd3f4a979cb67d90a650b1dd8f51175b9b8e10d -DIST ioq3-for-UrbanTerror-4.2.002.tar.xz 14879152 SHA256 72238ca9de878a5f11f100683e60953520cdc73d74bcefd42c48f399e49be76c SHA512 cea6c4e486a6d9211a66dc6c56292594775990c83db542961b018a8ce36ce04489fdbc77e0f34f2dc0db69ac320c7cd1d7bbe34e674f1bf7dca8cf907e515b08 WHIRLPOOL dbe1b41b40cc18aea6d81cf228ac545e30fbab49652bdb472f9b9b82015152a945a8a9759a44c3c433200d36faf374fcd505f5785bd64f0ad92a22c3625420d5 DIST ioquake3-1807.tar.bz2 7054317 SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2 SHA512 5fe54b628c66bd8becab259d133825e762a0814c7060c8d1f48e2b662f07f80e50fba8c7ae0677b02e231eae59eba65e143eb802baa79a7de89a7a612ae9682d WHIRLPOOL 03ed102b386b33ceff1588966409f1d4c6be1d980b40cac0eda1d2a7e763e45b3cd21a9817f77d60157cf741f4d7479926aac118f5972bb7d5fd6bc72517faa8 -DIST release-4.2.006.tar.gz 26641871 SHA256 eff58e9a8cf394fa9dbbf15318f6946e976afdc8af824ee83fbb3489deaf849f SHA512 745c6090843ac690d45dcd0996e9bcf9945946a86ab7ea0dbb5df8bf3e398b89c4e480da9d9e40337b53e14894c826656eff60b0e7e2e812031365a7b3092cfb WHIRLPOOL 48e703387f0c1821919fb4fb74c0c7f01f275cf885a37793a826c8e7b93a79cabdf79c515c5bbfb48ec09e8db41b6433d4f44d68799cd5d88813954e45879941 +DIST release-4.2.007.tar.gz 26640879 SHA256 96f39ad2b952b38d1fc53dd04198352fe0b396eb2a3fb696a827199222902989 SHA512 1b57a94b986e159672b7befc49771df1c5cb1637757c4e4502ca276c6d067004cac047eee0de53ad15a68c87ffb2ad995517a028f66fe3c646f3335c74866802 WHIRLPOOL a8a54c586a3e533c0090d38d1708999212e6e1e338cd97b56b3cb4a9520fed7fd8b72c8fc898e8673097b0d46a98b62f42ddbcd02d6bb908bd7ce67a9e985101 DIST urbanterror.svg 1592 SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98 WHIRLPOOL 281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c diff --git a/games-fps/urbanterror/files/urbanterror-4.2.007-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.007-build.patch deleted file mode 100644 index 9221b671cbed..000000000000 --- a/games-fps/urbanterror/files/urbanterror-4.2.007-build.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- Makefile -+++ Makefile -@@ -213,7 +213,7 @@ - endif - endif - -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe -+ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL=1 -@@ -239,19 +239,15 @@ - BASE_CFLAGS += -I/usr/X11R6/include - endif - -- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer -+ OPTIMIZE = -ffast-math -funroll-loops - - ifeq ($(ARCH),x86_64) -- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ -- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ -- -fstrength-reduce -+ OPTIMIZE = -ffast-math -funroll-loops - # experimental x86_64 jit compiler! you need GNU as - HAVE_VM_COMPILED = true - else - ifeq ($(ARCH),i386) -- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ -- -funroll-loops -falign-loops=2 -falign-jumps=2 \ -- -falign-functions=2 -fstrength-reduce -+ OPTIMIZE = -ffast-math -funroll-loops - HAVE_VM_COMPILED=true - else - ifeq ($(ARCH),ppc) -@@ -265,7 +261,7 @@ - BASE_CFLAGS += -DNO_VM_COMPILED - endif - -- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) - - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - -@@ -274,7 +270,7 @@ - SHLIBLDFLAGS=-shared $(LDFLAGS) - - THREAD_LDFLAGS=-lpthread -- LDFLAGS=-ldl -lm -+ LDFLAGS+=-ldl -lm - - ifeq ($(USE_SDL),1) - CLIENT_LDFLAGS=$(shell sdl-config --libs) -@@ -1153,13 +1149,13 @@ - - $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ -- $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \ -+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) - - $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ -- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ -+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) - - ifneq ($(strip $(LIBSDLMAIN)),) - ifneq ($(strip $(LIBSDLMAINSRC)),) diff --git a/games-fps/urbanterror/files/urbanterror-4.2.006-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.008-build.patch similarity index 100% rename from games-fps/urbanterror/files/urbanterror-4.2.006-build.patch rename to games-fps/urbanterror/files/urbanterror-4.2.008-build.patch diff --git a/games-fps/urbanterror/urbanterror-4.2.007.ebuild b/games-fps/urbanterror/urbanterror-4.2.007.ebuild deleted file mode 100644 index 296077f3a885..000000000000 --- a/games-fps/urbanterror/urbanterror-4.2.007.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.007.ebuild,v 1.1 2012/11/18 01:04:09 hasufell Exp $ - -EAPI=4 - -inherit check-reqs eutils gnome2-utils games - -DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" -HOMEPAGE="http://www.urbanterror.info/home/" -SRC_URI="http://www.ftwgl.com/files/mirror/UrbanTerror42_full_${PV:4:3}.zip - https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.006.tar.gz - http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg" - -LICENSE="GPL-2 Q3AEULA" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl debug dedicated openal +sdl server smp vorbis" -RESTRICT="mirror" - -RDEPEND=" - !dedicated? ( - virtual/opengl - curl? ( net-misc/curl ) - openal? ( media-libs/openal ) - sdl? ( media-libs/libsdl[X,audio,joystick,opengl,video] ) - !sdl? ( x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86dga - x11-libs/libXxf86vm ) - vorbis? ( media-libs/libogg - media-libs/libvorbis ) - )" -DEPEND="${RDEPEND} - app-arch/unzip - dedicated? ( curl? ( net-misc/curl ) )" - -S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-4.2.006 -S_DATA=${WORKDIR}/UrbanTerror42 - -CHECKREQS_DISK_BUILD="2700M" -CHECKREQS_DISK_USR="1300M" - -pkg_pretend() { - check-reqs_pkg_pretend - - if ! use dedicated ; then - if ! use sdl && ! use openal ; then - ewarn - ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag." - ewarn - fi - fi -} - -src_unpack() { - # messed up zipball, let's hope they get it right next time - unpack release-4.2.006.tar.gz - mkdir "${S_DATA}" || die - cd "${S_DATA}" || die - unpack UrbanTerror42_full_${PV:4:3}.zip -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch -} - -src_compile() { - buildit() { use $1 && echo 1 || echo 0 ; } - nobuildit() { use $1 && echo 0 || echo 1 ; } - - emake \ - ARCH=$(usex amd64 "x86_64" "i386") \ - DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \ - BUILD_CLIENT=$(nobuildit dedicated) \ - BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \ - BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \ - USE_SDL=$(buildit sdl) \ - USE_OPENAL=$(buildit openal) \ - USE_OPENAL_DLOPEN=0 \ - USE_CURL=$(buildit curl) \ - USE_CURL_DLOPEN=0 \ - USE_CODEC_VORBIS=$(buildit vorbis) \ - USE_LOCAL_HEADERS=0 \ - Q="" \ - $(usex debug "debug" "release") -} - -src_install() { - local my_arch=$(usex amd64 "x86_64" "i386") - - doicon -s scalable "${DISTDIR}"/${PN}.svg - dodoc ChangeLog README md4-readme.txt "${S_DATA}"/readme42.txt - insinto "${GAMES_DATADIR}"/${PN}/q3ut4 - doins "${S_DATA}"/*.pk3 - - if use !dedicated ; then - newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN} - make_desktop_entry ${PN} "UrbanTerror" - fi - - if use dedicated || use server ; then - newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated - docinto examples - dodoc "${S_DATA}"/{server.cfg,mapcycle.txt} - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - if use openal && ! use dedicated ; then - einfo - elog "You might need to set:" - elog " seta s_useopenal \"1\"" - elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work." - einfo - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/urbanterror/urbanterror-4.2.006.ebuild b/games-fps/urbanterror/urbanterror-4.2.008.ebuild similarity index 91% rename from games-fps/urbanterror/urbanterror-4.2.006.ebuild rename to games-fps/urbanterror/urbanterror-4.2.008.ebuild index c0f65d095ce2..0aadc236c276 100644 --- a/games-fps/urbanterror/urbanterror-4.2.006.ebuild +++ b/games-fps/urbanterror/urbanterror-4.2.008.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.006.ebuild,v 1.1 2012/11/10 12:05:30 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.008.ebuild,v 1.1 2012/12/04 23:13:46 hasufell Exp $ -EAPI=4 +EAPI=5 inherit check-reqs eutils gnome2-utils games DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" HOMEPAGE="http://www.urbanterror.info/home/" SRC_URI="http://www.ftwgl.com/files/mirror/UrbanTerror42_full_${PV:4:3}.zip - http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz + https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg" LICENSE="GPL-2 Q3AEULA" @@ -35,7 +35,7 @@ DEPEND="${RDEPEND} app-arch/unzip dedicated? ( curl? ( net-misc/curl ) )" -S=${WORKDIR}/ioq3-for-UrbanTerror-4.2.002 +S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-4.2.007 S_DATA=${WORKDIR}/UrbanTerror42 CHECKREQS_DISK_BUILD="2700M" @@ -82,7 +82,8 @@ src_install() { local my_arch=$(usex amd64 "x86_64" "i386") doicon -s scalable "${DISTDIR}"/${PN}.svg - dodoc ChangeLog README md4-readme.txt "${S_DATA}"/readme42.txt + dodoc ChangeLog README md4-readme.txt + dodoc "${S_DATA}"/q3ut4/readme42.txt insinto "${GAMES_DATADIR}"/${PN}/q3ut4 doins "${S_DATA}"/q3ut4/*.pk3 diff --git a/games-puzzle/gweled/gweled-0.9.1.ebuild b/games-puzzle/gweled/gweled-0.9.1.ebuild index bd0691876683..7affa2b2cff4 100644 --- a/games-puzzle/gweled/gweled-0.9.1.ebuild +++ b/games-puzzle/gweled/gweled-0.9.1.ebuild @@ -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/games-puzzle/gweled/gweled-0.9.1.ebuild,v 1.4 2012/11/15 12:12:40 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gweled/gweled-0.9.1.ebuild,v 1.5 2012/12/04 11:16:46 ago Exp $ EAPI=2 inherit flag-o-matic games @@ -11,7 +11,7 @@ SRC_URI="http://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="x11-libs/gtk+:2 diff --git a/games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch b/games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch new file mode 100644 index 000000000000..3952b48cf0b5 --- /dev/null +++ b/games-simulation/flightgear/files/flightgear-2.8.0-fgpanel-linking.patch @@ -0,0 +1,23 @@ +X-Git-Url: http://mapserver.flightgear.org/git/gitweb.pl?p=flightgear;a=blobdiff_plain;f=CMakeModules%2FFindPLIB.cmake;h=99d2780cfc7396b17029b3b29b9d4c8ede276f45;hp=da5463612aaf72eb7dec88449058e8195979a2fb;hb=dd6c220fd705644faf8df71cded01492ff7af18a;hpb=779a9ae415c58f6d28332b0f9901522e93694129 + +diff --git a/CMakeModules/FindPLIB.cmake b/CMakeModules/FindPLIB.cmake +index da54636..99d2780 100644 +--- a/CMakeModules/FindPLIB.cmake ++++ b/CMakeModules/FindPLIB.cmake +@@ -132,7 +132,7 @@ if(${PLIB_LIBRARIES} STREQUAL "PLIB_LIBRARIES-NOTFOUND") + if (${c} STREQUAL "pu") + # handle MSVC confusion over pu/pui naming, by removing + # 'pu' and then adding it back +- list(REMOVE_ITEM outDeps "pu") ++ list(REMOVE_ITEM outDeps "pu" "fnt" "sg") + list(APPEND outDeps ${PUNAME} "fnt" "sg") + elseif (${c} STREQUAL "puaux") + list(APPEND outDeps ${PUNAME} "fnt" "sg") +@@ -144,7 +144,6 @@ if(${PLIB_LIBRARIES} STREQUAL "PLIB_LIBRARIES-NOTFOUND") + list(APPEND outDeps "ul") # everything needs ul + list(REMOVE_DUPLICATES outDeps) # clean up + +- + + # look for traditional static libraries + foreach(component ${outDeps}) diff --git a/games-simulation/flightgear/flightgear-2.8.0.ebuild b/games-simulation/flightgear/flightgear-2.8.0.ebuild index 92ff3deee5d0..a20b4d91f7d1 100644 --- a/games-simulation/flightgear/flightgear-2.8.0.ebuild +++ b/games-simulation/flightgear/flightgear-2.8.0.ebuild @@ -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/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.6 2012/12/02 22:41:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/flightgear/flightgear-2.8.0.ebuild,v 1.7 2012/12/04 22:58:35 reavertm Exp $ EAPI=4 @@ -13,12 +13,7 @@ SRC_URI="mirror://flightgear/Source/${P}.tar.bz2 mirror://flightgear/Shared/Flig LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="debug jpeg +jsbsim oldfdm subversion test +udev +yasim" -#fgpanel - disabled for now, doesn't link -#fgpanel? ( -# media-libs/freeglut -# media-libs/libpng -# ) +IUSE="debug fgpanel jpeg +jsbsim oldfdm subversion test +udev +yasim" COMMON_DEPEND=" >=dev-games/openscenegraph-3.0.1[png] @@ -26,6 +21,10 @@ COMMON_DEPEND=" sys-libs/zlib virtual/opengl udev? ( virtual/udev ) + fgpanel? ( + media-libs/freeglut + media-libs/libpng + ) " # Most entries below are just buildsystem bugs (deps unconditionally # inherited from static version of simgear) @@ -42,6 +41,10 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-fgpanel-linking.patch" +) + DOCS=(AUTHORS ChangeLog NEWS README Thanks) src_configure() { @@ -51,7 +54,7 @@ src_configure() { -DENABLE_RTI=OFF -DFG_DATA_DIR="${GAMES_DATADIR}"/${PN} -DSIMGEAR_SHARED=ON - -DWITH_FGPANEL=OFF + $(cmake-utils_use_with fgpanel) $(cmake-utils_use jpeg JPEG_FACTORY) $(cmake-utils_use_enable jsbsim) $(cmake-utils_use_enable oldfdm LARCSIM) @@ -62,7 +65,6 @@ src_configure() { $(cmake-utils_use udev EVENT_INPUT) $(cmake-utils_use_enable yasim) ) - #$(cmake-utils_use_with fgpanel) cmake-utils_src_configure } diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml index 7afe5ace9ce9..cacf124445d5 100644 --- a/games-simulation/flightgear/metadata.xml +++ b/games-simulation/flightgear/metadata.xml @@ -7,7 +7,7 @@ Maciej Mrozowski - + Enables standalone lightweight 2D-panel rendering utility Enables JSBSim Flight Dynamics Model (default) Enables deprecated Flight Dynamics Models (LaRCsim, UIUC) Enables terrasync scenery downloader diff --git a/games-simulation/openttd/openttd-1.2.2.ebuild b/games-simulation/openttd/openttd-1.2.2.ebuild index dbf293ae3572..10aae8a22f07 100644 --- a/games-simulation/openttd/openttd-1.2.2.ebuild +++ b/games-simulation/openttd/openttd-1.2.2.ebuild @@ -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/games-simulation/openttd/openttd-1.2.2.ebuild,v 1.4 2012/10/20 18:39:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.2.ebuild,v 1.5 2012/12/04 10:53:31 ago Exp $ EAPI=3 inherit eutils gnome2-utils games @@ -11,7 +11,7 @@ SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib" RESTRICT="test" # needs a graphics set in order to test diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest index 57337828cf3e..8a2492a90b7b 100644 --- a/games-util/pyfa/Manifest +++ b/games-util/pyfa/Manifest @@ -1,2 +1,2 @@ DIST pyfa-1.1.10-inferno-1.2-src.tar.bz2 4312159 SHA256 e611708967d9af491b5878acf31f72addc585176408667e7edbf5e26f9122103 SHA512 7896e2d2e9b9a3893843136218c76a57f2e2d8a3b80753c9501437ac0e599298c6321f325ea69cb71ee8212068aa6ba4459bd664c7b306211cfe3cd5333b4932 WHIRLPOOL 3be308740ed6c62ccf415e50a31fb7a331544bb1d4f945e714034955a6bfcae760a45d445e1707e015655580280708297b08ae04019ddbb797e6c67cdc838242 -DIST pyfa-1.1.9-inferno-1.2-src-r1.tar.bz2 4323345 SHA256 dc2c2d258ba9c4518f973ab59735987b41083db5296687b1eacc0c21a5934cc8 SHA512 6677e1d15c1cb466d0c7dd3043512810e4c84fcb221dfc39fff4f4ff0dcf906f482750ea0aae25e6655a0c00138b7a3c8402ab261ca09999e022efd90c0b8907 WHIRLPOOL 6ef331b5f939074300eb481ade6eedeea1be25da697ae0baca96006295453d5672c0b3e05d72e1b4098e342dc746803ac70cf80ac3c14038565340e99df07f48 +DIST pyfa-1.1.11-retribution-1.0-src.tar.bz2 4870595 SHA256 71af17ddb20b9432c643ad21d2d54ab2bba027ac9f2d143f4f542794f95567d2 SHA512 f8d423f00e53dc026e06cf5af11428f68784a7ca32283a08ca7e18c3a64ffd0a782002956f2bf2ec97272e783e46762956c57e4b7c92d56edd52348e8c2ab4ff WHIRLPOOL f6ac0c3848937cc3e3d0e74cc916fa6bb42ad0510227129a4719b6076b6fc0f58e1a18f65422236ffc59406267ea15bb93931ac4db16d12577fbeb4f4b205daf diff --git a/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch new file mode 100644 index 000000000000..8269080038f9 --- /dev/null +++ b/games-util/pyfa/files/pyfa-1.1.11-import-pyfa.patch @@ -0,0 +1,28 @@ +From f301dcd0df741514e889fc234811cd4770dca6c7 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Wed, 5 Dec 2012 00:48:12 -0500 +Subject: [PATCH] Append $(python_get_sitedir)/pyfa to import path + +Ensures that pyfa's import statements continue to work for systemwide +installation. +--- + pyfa.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pyfa.py b/pyfa.py +index 6992aaf..d66cb70 100755 +--- a/pyfa.py ++++ b/pyfa.py +@@ -63,6 +63,9 @@ if __name__ == "__main__": + parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False) + (options, args) = parser.parse_args() + ++ import os ++ sys.path.append(os.path.join("%%SITEDIR%%", "pyfa")) ++ + import config + # Configure paths + if options.rootsavedata is True: +-- +1.8.0 + diff --git a/games-util/pyfa/pyfa-1.1.11.ebuild b/games-util/pyfa/pyfa-1.1.11.ebuild new file mode 100644 index 000000000000..0d723c89c0c7 --- /dev/null +++ b/games-util/pyfa/pyfa-1.1.11.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.11.ebuild,v 1.1 2012/12/05 05:53:16 tetromino Exp $ + +EAPI="5" +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="sqlite,threads" + +inherit eutils gnome2-utils python-r1 + +if [[ ${PV/_rc*/} == ${PV} ]] ; then + MY_PV=${PV}-retribution-1.0-src + FOLDER=pyfa/stable/${PV} +else + MY_PV=${PV/_rc/-stable-RC}-src + FOLDER=pyfa/stable/${PV/*_rc/RC} +fi + +DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" +HOMEPAGE="http://www.evefit.org/static/pyfa" +SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2" + +LICENSE="GPL-3+ LGPL-2.1+ CCPL-Attribution-2.5 free-noncomm" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+graph" + +RDEPEND="dev-python/sqlalchemy + dev-python/wxpython:2.8 + graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy ) + ${PYTHON_DEPS}" +DEPEND="app-text/dos2unix + ${PYTHON_DEPS}" + +S=${WORKDIR}/${PN} + +src_prepare() { + # get rid of CRLF line endings introduced in 1.1.10 so patches work + dos2unix config.py pyfa.py service/settings.py || die + + # make staticPath settable from configforced again + epatch "${FILESDIR}/${PN}-1.1-staticPath.patch" + + # use correct slot of wxpython, http://trac.evefit.org/ticket/475 + epatch "${FILESDIR}/${PN}-1.1.4-wxversion.patch" + + # do not try to save exported html to python sitedir + epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" + + # fix import path in the main script for systemwide installation + epatch "${FILESDIR}/${PN}-1.1.11-import-pyfa.patch" + touch __init__.py + + pyfa_make_configforced() { + mkdir -p "${BUILD_DIR}" || die + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + -e "s:%%EPREFIX%%:${EPREFIX}:" \ + "${FILESDIR}/configforced.py" > "${BUILD_DIR}/configforced.py" + sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ + pyfa.py > "${BUILD_DIR}/pyfa" + } + python_foreach_impl pyfa_make_configforced +} + +src_install() { + pyfa_py_install() { + local packagedir=$(python_get_sitedir)/${PN} + insinto "${packagedir}" + doins -r eos gui icons service config*.py info.py __init__.py gpl.txt + doins "${BUILD_DIR}/configforced.py" + python_doscript "${BUILD_DIR}/pyfa" + python_optimize + } + python_foreach_impl pyfa_py_install + + insinto /usr/share/${PN} + doins -r staticdata + dodoc readme.txt + insinto /usr/share/icons/hicolor/32x32/apps + doins icons/pyfa.png + insinto /usr/share/icons/hicolor/64x64/apps + newins icons/pyfa64.png pyfa.png + domenu "${FILESDIR}/${PN}.desktop" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-util/pyfa/pyfa-1.1.9-r1.ebuild b/games-util/pyfa/pyfa-1.1.9-r1.ebuild deleted file mode 100644 index c6cf92d432e1..000000000000 --- a/games-util/pyfa/pyfa-1.1.9-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.9-r1.ebuild,v 1.2 2012/11/23 10:45:16 tetromino Exp $ - -EAPI="4" -PYTHON_DEPEND="2:2.6" -PYTHON_USE_WITH="sqlite threads" - -inherit eutils gnome2-utils python - -if [[ ${PV/_rc*/} == ${PV} ]] ; then - MY_PV=${PV}-inferno-1.2-src - FOLDER=pyfa/stable/${PV} -else - MY_PV=${PV/_rc/-stable-RC}-src - FOLDER=pyfa/stable/${PV/*_rc/RC} -fi - -DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online" -HOMEPAGE="http://www.evefit.org/static/pyfa" -SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2 -> pyfa-1.1.9-inferno-1.2-src-r1.tar.bz2" - -LICENSE="GPL-3+ LGPL-2.1+ CCPL-Attribution-2.5 free-noncomm" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+graph" - -RDEPEND="dev-python/sqlalchemy - dev-python/wxpython:2.8 - graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )" -DEPEND="" - -S=${WORKDIR}/${PN} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # make staticPath settable from configforced again - epatch "${FILESDIR}/${PN}-1.1-staticPath.patch" - - # use correct slot of wxpython, http://trac.evefit.org/ticket/475 - epatch "${FILESDIR}/${PN}-1.1.4-wxversion.patch" - - # do not try to save exported html to python sitedir - epatch "${FILESDIR}/${PN}-1.1.8-html-export-path.patch" - - chmod 755 pyfa.py || die "chmod failed" - python_convert_shebangs -r -x 2 . - sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \ - -e "s:%%EPREFIX%%:${EPREFIX}:" \ - "${FILESDIR}/configforced.py" > configforced.py -} - -src_install() { - local packagedir=$(python_get_sitedir)/${PN} - insinto "${packagedir}" - doins -r eos gui icons service config*.py info.py gpl.txt - exeinto "${packagedir}" - doexe ${PN}.py - dosym "${packagedir}/${PN}.py" /usr/bin/${PN} - insinto /usr/share/${PN} - doins -r staticdata - dodoc readme.txt - insinto /usr/share/icons/hicolor/32x32/apps - doins icons/pyfa.png - insinto /usr/share/icons/hicolor/64x64/apps - newins icons/pyfa64.png pyfa.png - domenu "${FILESDIR}/${PN}.desktop" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - python_mod_optimize ${PN} -} - -pkg_postrm() { - gnome2_icon_cache_update - python_mod_cleanup ${PN} -} diff --git a/licenses/baudline b/licenses/baudline new file mode 100644 index 000000000000..af71166e4802 --- /dev/null +++ b/licenses/baudline @@ -0,0 +1,8 @@ +License Agreement: + + This software is free and it comes with no warranty. + We are not liable for any damage caused by the use of this product. + You are not allowed to distribute this software. + You are not allowed to reverse engineer this software. + By downloading the baudline .tar package you agree to the terms of our license agreement. + If you desire a warranty on this product and you wish to purchase a support contract then please contact us. diff --git a/licenses/tcltk b/licenses/tcltk new file mode 100644 index 000000000000..2b3abd396d51 --- /dev/null +++ b/licenses/tcltk @@ -0,0 +1,39 @@ + + +The following terms apply to all files associated with the software +unless explicitly disclaimed in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest index d35c2fa4687e..8f6ad23506f7 100644 --- a/mail-filter/bogofilter/Manifest +++ b/mail-filter/bogofilter/Manifest @@ -1 +1,2 @@ -DIST bogofilter-1.2.2.tar.bz2 867043 RMD160 a522d0c7d2deae59d479c67f64e9bd9551b59096 SHA1 6d2860c1d919fe47a8efcfc7fd6de9433872f21d SHA256 d8cfd1e68375ac8131de8a6998a38ee5b3f7d1151e71efd2b436183545216039 +DIST bogofilter-1.2.2.tar.bz2 867043 SHA256 d8cfd1e68375ac8131de8a6998a38ee5b3f7d1151e71efd2b436183545216039 SHA512 916740b4d916c266c8645aa2c509a7e4e21ea0afe9ef89dfe64aa2e147158d48dd259ca53052c14ae8e422a7f364c9a12fcca67011a4e806581e4346e892a7e6 WHIRLPOOL 56f586212fe85fcb1bc9233a987c21ae581d9a5a7cb79e49664426a1e238d3ae3785367f6fec6e9be416a4469209ab2ad187494ed5db95bb435f1fca108ce200 +DIST bogofilter-1.2.3.tar.bz2 868902 SHA256 8ed85fc5ff03d9b07986ee2ce33e1149e30abe2ad8bae1d0c94503ccd2c92e76 SHA512 4b3bb4b1e0f12a88a5ec5421c88001ddeb242c39c55733000dfd38691dc4f5c34a5254de60399b20c63c9ee9e1e13ef73582e215fbabc3738871394b26924ca0 WHIRLPOOL d9177ac269349b1c10a3c8149bff126e927685232a644d4ea8db8060438dd23a1c9725831e0874b6eba185b385f4d329cf701277778608e094abc9135008b19d diff --git a/mail-filter/bogofilter/bogofilter-1.2.3.ebuild b/mail-filter/bogofilter/bogofilter-1.2.3.ebuild new file mode 100644 index 000000000000..69c33d32f486 --- /dev/null +++ b/mail-filter/bogofilter/bogofilter-1.2.3.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.3.ebuild,v 1.7 2012/12/05 00:51:52 blueness Exp $ + +EAPI=4 +inherit db-use eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed." +HOMEPAGE="http://bogofilter.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd" +IUSE="berkdb sqlite tokyocabinet" + +DEPEND="virtual/libiconv + berkdb? ( >=sys-libs/db-3.2 ) + !berkdb? ( + sqlite? ( >=dev-db/sqlite-3.6.22 ) + !sqlite? ( + tokyocabinet? ( dev-db/tokyocabinet ) + !tokyocabinet? ( >=sys-libs/db-3.2 ) + ) + ) + sci-libs/gsl" +# app-arch/pax" # only needed for bf_tar +RDEPEND="${DEPEND}" + +pkg_setup() { + has_version mail-filter/bogofilter || return 0 + if ( use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \ + ( ! use berkdb && has_version 'mail-filter/bogofilter[berkdb]' ) || \ + ( use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \ + ( ! use sqlite && has_version 'mail-filter/bogofilter[sqlite]' ) || \ + ( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \ + ( use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \ + ( ! use tokyocabinet && has_version 'mail-filter/bogofilter[tokyocabinet]' ) + ) ; then + ewarn + ewarn "If you want to switch the database backend, you must dump the wordlist" + ewarn "with the current version (old use flags) and load it with the new version!" + ewarn + fi +} + +src_configure() { + local myconf="" berkdb=true + myconf="--without-included-gsl" + + # determine backend: berkdb *is* default + if use berkdb && use sqlite ; then + elog "Both useflags berkdb and sqlite are in USE:" + elog "Using berkdb as database backend." + elif use berkdb && use tokyocabinet ; then + elog "Both useflags berkdb and tokyocabinet are in USE:" + elog "Using berkdb as database backend." + elif use sqlite && use tokyocabinet ; then + elog "Both useflags sqlite and tokyocabinet are in USE:" + elog "Using sqlite as database backend." + myconf="${myconf} --with-database=sqlite" + berkdb=false + elif use sqlite ; then + myconf="${myconf} --with-database=sqlite" + berkdb=false + elif use tokyocabinet ; then + myconf="${myconf} --with-database=tokyocabinet" + berkdb=false + elif ! use berkdb ; then + elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:" + elog "Using berkdb as database backend." + fi + + # Include the right berkdb headers for FreeBSD + if ${berkdb} ; then + append-cppflags "-I$(db_includedir)" + fi + + # bug #324405 + if [[ $(gcc-version) == "3.4" ]] ; then + epatch "${FILESDIR}"/${PN}-1.2.2-gcc34.patch + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + exeinto /usr/share/${PN}/contrib + doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \ + contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \ + contrib/{spamitarium,stripsearch}.pl + + insinto /usr/share/${PN}/contrib + doins contrib/{README.*,dot-qmail-bogofilter-default} \ + contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \ + contrib/vm-bogofilter.el \ + contrib/{trainbogo,scramble}.sh + + dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \ + doc/integrating-with-* doc/README.{db,sqlite} + + dohtml doc/*.html + + dodir /usr/share/doc/${PF}/samples + mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ + rmdir "${D}"/etc +} + +pkg_postinst() { + echo + elog "If you need \"${ROOT}usr/bin/bf_tar\" please install app-arch/pax." + echo +} diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest index a70fd8d78424..35a779783dd8 100644 --- a/mail-filter/maildrop/Manifest +++ b/mail-filter/maildrop/Manifest @@ -1,2 +1 @@ -DIST maildrop-2.5.5.tar.bz2 2158846 SHA256 7484382852075f452850a082454c8c47a65d52f00fe64e0b1a63ed7ccf25288c SHA512 ffafe3372739a5cc64a5b5bcad5e028539888d828a789698fb6962fe5394daa0bc8a8b637da855fb10890141ef18dd9a29c3bcc9ed0f2b49e1261cd0c34b9c7b WHIRLPOOL 5d26810eb4e23870cee8e4759e442f672b059188780efcdc1552691f68a7fbfa9101aadc65b8e782c00ab3fce60a6ab210cdc7bdfb1cc2826e529b0ade3e6df2 DIST maildrop-2.6.0.tar.bz2 2174922 SHA256 afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512 210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4 WHIRLPOOL c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80 diff --git a/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch b/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch deleted file mode 100644 index eea8ad9e372a..000000000000 --- a/mail-filter/maildrop/files/maildrop-2.5.4-reformime.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fixes segfault on some arches - bug #379101 -Index: rfc2045/reformime.c -=================================================================== ---- rfc2045/reformime.c (revision 102) -+++ rfc2045/reformime.c (working copy) -@@ -996,7 +996,7 @@ - case 's': - if (!optarg && argn < argc) - optarg=argv[argn++]; -- if (optarg && *optarg) section=optarg; -+ if (optarg && *optarg) section=strdup(optarg); - break; - case 'i': - doinfo=1; -Index: rfc2045/reformime.c -=================================================================== ---- rfc2045/reformime.c (revision 141) -+++ rfc2045/reformime.c (working copy) -@@ -1150,14 +1150,15 @@ - - if (doinfo) - { -- mimesection = strtok(section,","); -+ mimesection = section ? strtok(section, ","):NULL; - do { - print_info(p, mimesection); - if (do_extract) - extract_section(p, mimesection, - extract_filename, argc-argn, - argv+argn, do_extract); -- mimesection = strtok(NULL,","); -+ if (mimesection) -+ mimesection = strtok(NULL,","); - } while (mimesection != NULL); - } - else if (dodecode) diff --git a/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild b/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild deleted file mode 100644 index 22e8ecffde91..000000000000 --- a/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.5-r1.ebuild,v 1.9 2012/07/05 15:20:29 jer Exp $ - -EAPI=4 - -inherit eutils flag-o-matic autotools - -DESCRIPTION="Mail delivery agent/filter" -[[ -z ${PV/?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -[[ -z ${PV/?.?.?/} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" -[[ -z ${SRC_URI} ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2" -HOMEPAGE="http://www.courier-mta.org/maildrop/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" -IUSE="berkdb debug fam gdbm ldap mysql postgres static-libs authlib +tools trashquota" - -CDEPEND="!mail-mta/courier - net-mail/mailbase - dev-libs/libpcre - net-dns/libidn - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - mysql? ( net-libs/courier-authlib ) - postgres? ( net-libs/courier-authlib ) - ldap? ( net-libs/courier-authlib ) - authlib? ( net-libs/courier-authlib ) - fam? ( virtual/fam ) - !gdbm? ( - berkdb? ( >=sys-libs/db-3 ) - ) - tools? ( - !mail-mta/netqmail - !net-mail/courier-imap - !mail-mta/mini-qmail - )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - dev-lang/perl" -REQUIRED_USE="mysql? ( authlib ) - postgres? ( authlib ) - ldap? ( authlib )" - -S=${WORKDIR}/${P%%_pre} - -src_prepare() { - # Prefer gdbm over berkdb - if use gdbm ; then - use berkdb && elog "Both gdbm and berkdb selected. Using gdbm." - elif use berkdb ; then - epatch "${FILESDIR}"/${PN}-2.5.1-db.patch - fi - - if ! use fam ; then - epatch "${FILESDIR}"/${PN}-1.8.1-disable-fam.patch - fi - - # no need to error out if no default - it will be given to econf anyway - sed -i -e \ - 's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \ - "${S}"/maildrop/configure.in || die "sed failed" - epatch "${FILESDIR}"/${PN}-testsuite.patch - eautoreconf -} - -src_configure() { - local myconf - local mytrustedusers="apache dspam root mail fetchmail" - mytrustedusers+=" daemon postmaster qmaild mmdf vmail alias" - - # These flags make maildrop cry - replace-flags -Os -O2 - filter-flags -fomit-frame-pointer - - if use gdbm ; then - myconf="${myconf} --with-db=gdbm" - elif use berkdb ; then - myconf="${myconf} --with-db=db" - else - myconf="${myconf} --without-db" - fi - - if ! use mysql && ! use postgres && ! use ldap && ! use authlib ; then - myconf="${myconf} --disable-authlib" - fi - - # Default mailbox is $HOME/.maildir for Gentoo - maildrop_cv_SYS_INSTALL_MBOXDIR="./.maildir" econf \ - $(use_enable fam) \ - --disable-dependency-tracker \ - --with-devel \ - --disable-tempdir \ - --enable-syslog=1 \ - --enable-use-flock=1 \ - --enable-use-dotlock=1 \ - --enable-restrict-trusted=1 \ - --enable-trusted-users="${mytrustedusers}" \ - --enable-maildrop-uid=root \ - --enable-maildrop-gid=mail \ - --enable-sendmail=/usr/sbin/sendmail \ - --cache-file="${S}"/configuring.cache \ - $(use_enable static-libs static) \ - $(use_with trashquota) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - - fperms 4755 /usr/bin/maildrop - - dodoc AUTHORS ChangeLog INSTALL NEWS README \ - README.postfix UPGRADE maildroptips.txt - docinto unicode - dodoc unicode/README - docinto maildir - dodoc maildir/AUTHORS maildir/INSTALL maildir/README*.txt - - # bugs #61116 #374009 - if ! use tools ; then - for tool in "maildirmake" "deliverquota"; do - rm "${D}/usr/bin/${tool}" - rm "${D}/usr/share/man/man"[0-9]"/${tool}."[0-9] - rm "${D}/usr/share/maildrop/html/${tool}.html" - done - rm "${D}/usr/share/man/man5/maildir.5" - fi - - dodir "/usr/share/doc/${PF}" - mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/" || die - rm -rf "${D}"/usr/share/maildrop - - dohtml *.html maildir/*.html - - insinto /etc - doins "${FILESDIR}"/maildroprc - - use static-libs || find "${D}"/usr/lib* -name '*.la' -delete -} diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest index d2a790b5e71a..73cc71e5433b 100644 --- a/media-gfx/pngcheck/Manifest +++ b/media-gfx/pngcheck/Manifest @@ -1 +1 @@ -DIST pngcheck-2.3.0.tar.gz 59864 RMD160 6a132516eeaf787eefa4d02eaecb06834fe9d2be SHA1 e7f1535abbf2f809e036a9a43c759eeac5e39350 SHA256 77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f +DIST pngcheck-2.3.0.tar.gz 59864 SHA256 77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad WHIRLPOOL 21c097b90c87bfb1a7dd4324c4c8109adc4e4d1835b31bcb31ba21443ce16409947a3588619136890fb7600dab232c99903fa72c59e5e3a885230f5cd9ca6a4d diff --git a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild b/media-gfx/pngcheck/pngcheck-2.3.0.ebuild index f72654be2451..a03cd7d186c4 100644 --- a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild +++ b/media-gfx/pngcheck/pngcheck-2.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcheck/pngcheck-2.3.0.ebuild,v 1.6 2010/07/01 12:36:25 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngcheck/pngcheck-2.3.0.ebuild,v 1.7 2012/12/04 08:30:54 radhermit Exp $ EAPI=2 inherit toolchain-funcs @@ -9,12 +9,13 @@ DESCRIPTION="verifies the integrity of PNG, JNG and MNG files with internal chec HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html" SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz" -LICENSE="as-is GPL-2" +LICENSE="HPND GPL-2+" SLOT="0" KEYWORDS="amd64 x86" IUSE="" -DEPEND="sys-libs/zlib" +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" src_compile() { emake -f Makefile.unx \ diff --git a/media-gfx/povray/povray-3.7.0_rc6.ebuild b/media-gfx/povray/povray-3.7.0_rc6.ebuild index 86c0c4c9b6da..7fb1e264f774 100644 --- a/media-gfx/povray/povray-3.7.0_rc6.ebuild +++ b/media-gfx/povray/povray-3.7.0_rc6.ebuild @@ -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/media-gfx/povray/povray-3.7.0_rc6.ebuild,v 1.1 2012/11/30 10:00:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/povray/povray-3.7.0_rc6.ebuild,v 1.2 2012/12/04 11:37:05 jlec Exp $ EAPI=4 @@ -52,6 +52,7 @@ src_prepare() { -e 's:${povsysconfdir}/$PACKAGE/$VERSION_BASE:${povsysconfdir}/'${PN}':g' \ -e 's:${povdatadir}/$PACKAGE-$VERSION_BASE:${povdatadir}/'${PN}':g' \ -e 's:${povdatadir}/doc/$PACKAGE-$VERSION_BASE:${povdatadir}/doc/'${PF}':g' \ + -e 's:BOOST_THREAD_LIBS $LIBS:BOOST_THREAD_LIBS $LIBS -lboost_date_time:g' \ -i configure.ac || die sed \ diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest index 9046aba5ca12..10dcfa588bec 100644 --- a/media-gfx/xli/Manifest +++ b/media-gfx/xli/Manifest @@ -1 +1 @@ -DIST xli-2005-02-27.tar.gz 201011 RMD160 fc83fa5173befa73a0eeb56ad323dad148ef1426 SHA1 977d8ece0edd41f3ec606310496cf3231f046d88 SHA256 442dcf5ac75841e648c3bffed795d9301a6a485dc55f7998d0acfc2b8daad2bc +DIST xli-2005-02-27.tar.gz 201011 SHA256 442dcf5ac75841e648c3bffed795d9301a6a485dc55f7998d0acfc2b8daad2bc SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7 WHIRLPOOL 1d3b45be838d397fdbc2521c9c5a466e4141248591ae00016fa316f67a4ab44bc712896a59581e3f9a2e10cabb56f041ef7a3e21cc2a4f59733dc44d446e541b diff --git a/media-gfx/xli/xli-1.17.0-r4.ebuild b/media-gfx/xli/xli-1.17.0-r4.ebuild index f5c165f68386..819a2d0972ac 100644 --- a/media-gfx/xli/xli-1.17.0-r4.ebuild +++ b/media-gfx/xli/xli-1.17.0-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r4.ebuild,v 1.14 2010/11/08 23:05:18 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r4.ebuild,v 1.15 2012/12/04 08:27:25 radhermit Exp $ EAPI=1 inherit eutils @@ -10,7 +10,7 @@ DESCRIPTION="X Load Image: view images or load them to root window" HOMEPAGE="http://pantransit.reptiles.org/prog/" SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz" -LICENSE="MIT as-is" +LICENSE="HPND" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest index 10a2d56ee661..bfc654f72792 100644 --- a/media-libs/libmikmod/Manifest +++ b/media-libs/libmikmod/Manifest @@ -1,3 +1,3 @@ DIST libmikmod-3.1.12.tar.gz 618011 SHA256 891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32 -DIST libmikmod-3.2.0-beta2.tar.gz 760967 SHA256 857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03 +DIST libmikmod-3.2.0-beta2.tar.gz 760967 SHA256 857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03 SHA512 ef9f39a3a72f877099a635e6941121fcaaceeb6f1008b4f1abf39d2a7fc86e7ea030a580774515936b702763620b38c6c4518d58101c1db558e1235f0963be74 WHIRLPOOL 278b31ca54d0fae9247d5ac9761e373f7c6a542113b0c5ac0301ca83c8dec447ece33bee1e0e43a143328042f9b5984719e76531716c254f0152f257299cb47a DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3 diff --git a/media-libs/libmikmod/libmikmod-3.2.0.ebuild b/media-libs/libmikmod/libmikmod-3.2.0.ebuild index 9559a41b10ed..2f7b6ade951f 100644 --- a/media-libs/libmikmod/libmikmod-3.2.0.ebuild +++ b/media-libs/libmikmod/libmikmod-3.2.0.ebuild @@ -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/media-libs/libmikmod/libmikmod-3.2.0.ebuild,v 1.4 2012/12/02 14:38:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0.ebuild,v 1.5 2012/12/04 14:48:24 grobian Exp $ EAPI=5 inherit autotools eutils multilib @@ -12,9 +12,9 @@ SRC_URI="http://mikmod.shlomifish.org/files/${P}.tar.gz" LICENSE="LGPL-2+ LGPL-2.1" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="+alsa oss static-libs" +IUSE="+alsa coreaudio oss static-libs" -REQUIRED_USE="|| ( alsa oss )" +REQUIRED_USE="|| ( alsa oss coreaudio )" RDEPEND="alsa? ( media-libs/alsa-lib ) !${CATEGORY}/${PN}:2" @@ -32,6 +32,7 @@ src_configure() { econf \ $(use_enable alsa) \ --disable-nas \ + $(use_enable coreaudio osx) \ $(use_enable oss) \ $(use_enable static-libs static) } diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest index f1e13683043a..93df53e39d10 100644 --- a/media-libs/libv4l/Manifest +++ b/media-libs/libv4l/Manifest @@ -1,3 +1,2 @@ -DIST v4l-utils-0.8.5.tar.bz2 373882 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c SHA512 d84bea5658b350447741e2aae36458c2ba29f4d6beb8dd4965626a1f60ea1f0b7d12751cab9501c1c5cb3ba9872fc7ac237553e452b3c348f907c4a8274f954a WHIRLPOOL fa941a7e30792993144e7b55dc88cd10c09100e94142ed8c0c0f68bcaf8d12a0c57511f5698225ff9f057c0eb4696d0eff6d0d55fa46673c3db10f5bb9b4b6ca DIST v4l-utils-0.8.8.tar.bz2 420888 SHA256 5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f SHA512 4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4 WHIRLPOOL bcfac96bf78ee9da822ece69ad8f0a2da534ad3103170e07dd192f22c04cf48421769c9f62c6ab1ba8dc2894827e98dd2c1c1fc04b762063dab0f8f5a027f88a DIST v4l-utils-0.8.9.tar.bz2 460681 SHA256 3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e SHA512 3778dbd4d0bb44c6f4762a8551625c1f5bfcf7a10de33c71c2442483d496bc177aef979b747b327f4eca3229fc22eec484de7308588acf9fc48ae6d1d5edee40 WHIRLPOOL 346d2c23c5e8b8ac3128100cf660b1f4880ec5fffd3fa107accf7f536adeacc945cb9aadd61f2f99a6fd32bd7a44912680d2cf867f0a84f28c949707634c676f diff --git a/media-libs/libv4l/files/libv4l-0.8.5-disable_fancy_upsampling.patch b/media-libs/libv4l/files/libv4l-0.8.5-disable_fancy_upsampling.patch deleted file mode 100644 index 7f385df497b4..000000000000 --- a/media-libs/libv4l/files/libv4l-0.8.5-disable_fancy_upsampling.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/401865 -http://bugs.debian.org/647273 - ---- lib/libv4lconvert/jpeg.c -+++ lib/libv4lconvert/jpeg.c -@@ -390,6 +390,7 @@ - } - - data->cinfo.raw_data_out = TRUE; -+ data->cinfo.do_fancy_upsampling = FALSE; - jpeg_start_decompress(&data->cinfo); - /* Make libjpeg errors report that we've got some data */ - data->jerr_errno = EPIPE; diff --git a/media-libs/libv4l/libv4l-0.8.5-r1.ebuild b/media-libs/libv4l/libv4l-0.8.5-r1.ebuild deleted file mode 100644 index 063fc84520fb..000000000000 --- a/media-libs/libv4l/libv4l-0.8.5-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.5-r1.ebuild,v 1.2 2012/10/20 07:15:40 tetromino Exp $ - -EAPI=4 -inherit eutils linux-info multilib toolchain-funcs - -MY_P=v4l-utils-${PV} - -DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package" -HOMEPAGE="http://git.linuxtv.org/v4l-utils.git" -SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="virtual/jpeg" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.30-r1" - -S=${WORKDIR}/${MY_P} - -CONFIG_CHECK="~SHMEM" - -src_prepare() { - epatch "${FILESDIR}"/${P}-disable_fancy_upsampling.patch - - sed -i \ - -e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \ - -e "/^LIBDIR =/s:/lib:/$(get_libdir):" \ - -e "/^CFLAGS :=/d" \ - Make.rules || die - tc-export CC -} - -src_compile() { - emake -C lib -} - -src_install() { - emake -C lib DESTDIR="${D}" install - dodoc ChangeLog README.lib* TODO -} diff --git a/media-libs/libv4l/libv4l-0.8.5.ebuild b/media-libs/libv4l/libv4l-0.8.5.ebuild deleted file mode 100644 index 6b785d685473..000000000000 --- a/media-libs/libv4l/libv4l-0.8.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.5.ebuild,v 1.9 2012/10/20 07:15:40 tetromino Exp $ - -EAPI=4 -inherit linux-info multilib toolchain-funcs - -MY_P=v4l-utils-${PV} - -DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package" -HOMEPAGE="http://git.linuxtv.org/v4l-utils.git" -SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="virtual/jpeg" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.30-r1" - -S=${WORKDIR}/${MY_P} - -CONFIG_CHECK="~SHMEM" - -src_prepare() { - sed -i \ - -e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \ - -e "/^LIBDIR =/s:/lib:/$(get_libdir):" \ - -e "/^CFLAGS :=/d" \ - Make.rules || die - tc-export CC -} - -src_compile() { - emake -C lib -} - -src_install() { - emake -C lib DESTDIR="${D}" install - dodoc ChangeLog README.lib* TODO -} diff --git a/media-libs/opengl-apple/opengl-apple-3.ebuild b/media-libs/opengl-apple/opengl-apple-3.ebuild index 8fd0415ceb18..5c9a64c217cb 100644 --- a/media-libs/opengl-apple/opengl-apple-3.ebuild +++ b/media-libs/opengl-apple/opengl-apple-3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opengl-apple/opengl-apple-3.ebuild,v 1.5 2011/09/23 19:04:35 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opengl-apple/opengl-apple-3.ebuild,v 1.6 2012/12/04 08:08:05 grobian Exp $ EAPI="3" DESCRIPTION="Links to Apple's OpenGL X11 implementation" HOMEPAGE="http://www.apple.com/" -LICENSE="as-is" +LICENSE="public-domain" KEYWORDS="-* ~ppc-macos ~x64-macos ~x86-macos" SLOT=0 IUSE="" diff --git a/media-libs/opengl-apple/opengl-apple-4.ebuild b/media-libs/opengl-apple/opengl-apple-4.ebuild index 1d54a3a1dd3e..ebf739f7cc71 100644 --- a/media-libs/opengl-apple/opengl-apple-4.ebuild +++ b/media-libs/opengl-apple/opengl-apple-4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/opengl-apple/opengl-apple-4.ebuild,v 1.3 2011/09/23 19:04:35 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opengl-apple/opengl-apple-4.ebuild,v 1.4 2012/12/04 08:08:05 grobian Exp $ EAPI="3" @@ -8,7 +8,7 @@ inherit prefix DESCRIPTION="Links to Apple's OpenGL X11 implementation" HOMEPAGE="http://www.apple.com/" -LICENSE="as-is" +LICENSE="public-domain" KEYWORDS="-* ~ppc-macos ~x64-macos ~x86-macos" SLOT=0 IUSE="" diff --git a/media-libs/opengtl/opengtl-0.9.17.ebuild b/media-libs/opengtl/opengtl-0.9.17.ebuild index 056d4f37168b..212f50472410 100644 --- a/media-libs/opengtl/opengtl-0.9.17.ebuild +++ b/media-libs/opengtl/opengtl-0.9.17.ebuild @@ -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/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.2 2012/11/28 16:18:10 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.3 2012/12/04 15:39:18 ago Exp $ EAPI=4 @@ -14,7 +14,7 @@ SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug test" RDEPEND=" diff --git a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild index 989ad2c6c4fb..56c196cbfa01 100644 --- a/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild +++ b/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild @@ -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/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild,v 1.4 2012/11/16 22:15:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-terminal/sdl-terminal-1.1.3-r1.ebuild,v 1.5 2012/12/04 15:39:59 ago Exp $ EAPI=4 inherit base libtool @@ -12,7 +12,7 @@ SRC_URI="http://www.loria.fr/~rougier/pub/Software/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="static-libs" DEPEND="virtual/opengl diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild index b6a1460294ca..6a9125ab58e8 100644 --- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild +++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild @@ -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/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild,v 1.2 2012/12/02 17:42:36 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-0.10.31.ebuild,v 1.3 2012/12/04 16:20:40 eva Exp $ EAPI="5" @@ -11,5 +11,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND="virtual/jpeg - >=media-libs/gst-plugins-base-0.10.36" + >=media-libs/gst-plugins-base-0.10.36:${SLOT}" DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild index 9ff86f98c019..bedf66b7d398 100644 --- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild +++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild @@ -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/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild,v 1.1 2012/12/03 23:46:03 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.0.3.ebuild,v 1.2 2012/12/04 16:20:40 eva Exp $ EAPI="5" @@ -10,6 +10,5 @@ DESCRIPTION="GStreamer encoder/decoder for JPEG format" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" -RDEPEND="virtual/jpeg - >=media-libs/gst-plugins-base-0.10.36" +RDEPEND="virtual/jpeg" DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest new file mode 100644 index 000000000000..2bb69aa68d74 --- /dev/null +++ b/media-plugins/gst-plugins-libav/Manifest @@ -0,0 +1 @@ +DIST gst-libav-1.0.3.tar.xz 4235032 SHA256 5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959 SHA512 b59b2abe3e841712948b2f3b3b78ce49573e0623880a4f11089a636c89268d3f79863c1a0975cd7e5bf4bf40a86f0d2370cf03511e2751d2cd39887733524be8 WHIRLPOOL 8b98829ccb9f160c8209f22fd44c5776d156a6d7e9b3d5526149521ed4b02a319ef7cd4d9df550133714433d93eb2dba211dfe83e1c03776885844ae71c1e518 diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild new file mode 100644 index 000000000000..ae5503e2e82f --- /dev/null +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild,v 1.1 2012/12/05 07:57:36 eva Exp $ + +EAPI="5" + +inherit eutils flag-o-matic gst-plugins10 + +MY_PN="gst-libav" +DESCRIPTION="FFmpeg based gstreamer plugin" +HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html" +SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.${GST_TARBALL_SUFFIX}" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd" +IUSE="+orc" + +RDEPEND=" + media-libs/gst-plugins-base:1.0 + >=virtual/ffmpeg-0.10.3 + || ( + media-video/ffmpeg + >=media-video/libav-0.8.4 ) + orc? ( >=dev-lang/orc-0.4.16 ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + sed -e 's/sleep 15//' -i configure.ac configure || die +} + +src_configure() { + GST_PLUGINS_BUILD="" + # always use system ffmpeg/libav if possible + gst-plugins10_src_configure \ + --with-system-libav \ + $(use_enable orc) +} + +src_compile() { + default +} + +src_install() { + DOCS="AUTHORS ChangeLog NEWS README TODO" + default + prune_libtool_files --modules +} + +pkg_postinst() { + if has_version "media-video/ffmpeg"; then + elog "Please note that upstream uses media-video/libav" + elog "rather than media-video/ffmpeg. If you encounter any" + elog "issues try to move from ffmpeg to libav." + fi +} diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml new file mode 100644 index 000000000000..1e851910a311 --- /dev/null +++ b/media-plugins/gst-plugins-libav/metadata.xml @@ -0,0 +1,9 @@ + + + + gstreamer + + Use dev-lang/orc for runtime + optimisations + + diff --git a/media-plugins/gst-plugins-voaacenc/Manifest b/media-plugins/gst-plugins-voaacenc/Manifest new file mode 100644 index 000000000000..5d1988ef6e3d --- /dev/null +++ b/media-plugins/gst-plugins-voaacenc/Manifest @@ -0,0 +1 @@ +DIST gst-plugins-bad-1.0.3.tar.xz 3139308 SHA256 2eae746be0b4c7fa2f1e057c91bd36940d7c25593ab612b707904461360031f0 SHA512 b1306557234e5db178c7b1d0549a7ce9d82603286e1e8b07e6e1b55e149df430b64936cf2a727b4bbcc5a54edcf44e7d49bc69e24c83e51683027f5a4bce4be0 WHIRLPOOL b781a317e6100c2571e7dd375e5331847ee3a20da5f7d95515fd32f09e12cb3fbfee1861fdf9cb93aaa8e629e8f8a2cfdb3b0491afd70f50a559fa712660f649 diff --git a/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.0.3.ebuild b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.0.3.ebuild new file mode 100644 index 000000000000..97fb6a25aac8 --- /dev/null +++ b/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.0.3.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.0.3.ebuild,v 1.1 2012/12/05 08:01:10 eva Exp $ + +EAPI="5" + +inherit gst-plugins-bad + +DESCRIPTION="GStreamer plugin for encoding AAC" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=media-libs/vo-aacenc-0.1" +DEPEND="${RDEPEND}" diff --git a/media-plugins/gst-plugins-voaacenc/metadata.xml b/media-plugins/gst-plugins-voaacenc/metadata.xml new file mode 100644 index 000000000000..9e260ceca3e3 --- /dev/null +++ b/media-plugins/gst-plugins-voaacenc/metadata.xml @@ -0,0 +1,5 @@ + + + +gstreamer + diff --git a/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild index e5e127dd824f..be87628ca4e5 100644 --- a/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild +++ b/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild,v 1.2 2012/12/02 17:48:36 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-vorbis/gst-plugins-vorbis-0.10.36.ebuild,v 1.3 2012/12/04 11:26:46 grobian Exp $ EAPI="5" -inherit gst-plugins-base gst-plugins10 +inherit gst-plugins-base gst-plugins10 libtool KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos" IUSE="" @@ -17,4 +17,6 @@ src_prepare() { gst-plugins10_system_link \ gst-libs/gst/tag:gstreamer-tag \ gst-libs/gst/audio:gstreamer-audio + + elibtoolize # for Darwin bundles } diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r1.ebuild index 2944dce294fb..2d2fa5e4be12 100644 --- a/media-sound/baudline/baudline-1.08-r1.ebuild +++ b/media-sound/baudline/baudline-1.08-r1.ebuild @@ -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/media-sound/baudline/baudline-1.08-r1.ebuild,v 1.2 2012/07/20 06:39:01 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/baudline/baudline-1.08-r1.ebuild,v 1.3 2012/12/04 17:00:55 xmw Exp $ EAPI=3 @@ -13,7 +13,7 @@ SRC_URI="amd64? ( http://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz ) s390? ( http://www.baudline.com/${PN}_${PV}_linux_s390.tar.gz ) x86? ( http://www.baudline.com/baudline_1.08_linux_i686.tar.gz )" -LICENSE="as-is" +LICENSE="${PN}" SLOT="0" KEYWORDS="amd64 ~x86" IUSE="jack" diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild index 27bcae05138d..29d89421b4e4 100644 --- a/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild +++ b/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild @@ -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/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild,v 1.5 2012/11/29 14:57:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild,v 1.6 2012/12/04 15:41:01 ago Exp $ EAPI=4 inherit cmake-utils flag-o-matic @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE="alsa dbus debug examples jack ladspa lash portaudio pulseaudio readline sndfile" RDEPEND=">=dev-libs/glib-2.6.5:2 diff --git a/media-sound/mangler/mangler-1.2.4.ebuild b/media-sound/mangler/mangler-1.2.4.ebuild index 5e8f4adc8e15..10684f8cc3a1 100644 --- a/media-sound/mangler/mangler-1.2.4.ebuild +++ b/media-sound/mangler/mangler-1.2.4.ebuild @@ -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/media-sound/mangler/mangler-1.2.4.ebuild,v 1.2 2012/11/20 16:22:17 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.4.ebuild,v 1.3 2012/12/04 15:37:19 ago Exp $ EAPI=2 @@ -10,7 +10,7 @@ SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2" LICENSE="GPL-3 LGPL-2.1 ZLIB" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 x86" IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd" RDEPEND="dev-cpp/gtkmm:2.4 diff --git a/media-sound/podracer/Manifest b/media-sound/podracer/Manifest index 08aa42ff833b..d6b23aae4a6a 100644 --- a/media-sound/podracer/Manifest +++ b/media-sound/podracer/Manifest @@ -1 +1 @@ -DIST podracer-1.4.tar.bz2 14600 SHA256 93319054315ed5edeaa62b84eee9103036142d5b55b85ae6524297bc1e6412e0 +DIST podracer-1.4.tar.bz2 14600 SHA256 93319054315ed5edeaa62b84eee9103036142d5b55b85ae6524297bc1e6412e0 SHA512 f1a6946299b6e32d8a86a153b531c7e6d8ec9cf175719fb8fd2f1d9974ed29469e7b1a2548c4104d7e3e1991cb8138e2970a0b6a4208b7a537dde8c2ca425dd3 WHIRLPOOL 733333300ef3eae9c1f5cf4405e95dd5e3363513bfd9fbd376c9472ff8d5e772d7b2e563a6dfc8812a1b98ea98f8cae48895ac404d4fd196ff457f009ed7488a diff --git a/media-sound/podracer/podracer-1.4.ebuild b/media-sound/podracer/podracer-1.4.ebuild index 8008317ce8fe..a2b03e536a16 100644 --- a/media-sound/podracer/podracer-1.4.ebuild +++ b/media-sound/podracer/podracer-1.4.ebuild @@ -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/media-sound/podracer/podracer-1.4.ebuild,v 1.1 2012/01/16 16:35:48 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/podracer/podracer-1.4.ebuild,v 1.2 2012/12/04 16:22:08 ulm Exp $ # EAPI=4 is not allowed unless somone re-works the sample.subscriptions logic # (because it gets compressed with EAPI=4). To test this, start podracer without @@ -11,7 +11,7 @@ DESCRIPTION="A simple podcast aggregator, designed for cron" HOMEPAGE="http://podracer.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -LICENSE="as-is" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -22,7 +22,7 @@ RDEPEND="app-shells/bash src_install() { dobin podracer - sed -i -e "s:sample=/usr/share/doc/\$progname/sample.subscriptions:sample=/usr/share/doc/${PF}/sample.subscriptions:" ${D}/usr/bin/podracer || die + sed -i -e "s:sample=/usr/share/doc/\$progname/sample.subscriptions:sample=/usr/share/doc/${PF}/sample.subscriptions:" "${D}"/usr/bin/podracer || die dodoc CREDITS README ChangeLog TODO doman podracer.1.gz insinto /usr/share/doc/${PF} diff --git a/media-sound/skype-call-recorder/Manifest b/media-sound/skype-call-recorder/Manifest index 791e90b0694e..b402edcb6a02 100644 --- a/media-sound/skype-call-recorder/Manifest +++ b/media-sound/skype-call-recorder/Manifest @@ -1 +1 @@ -DIST skype-call-recorder-0.8.tar.gz 83842 RMD160 2c3971586054fba55186e35a14534c9064091473 SHA1 b8faade2d893628fd7a5deac5056d6dfaf7082c4 SHA256 b115f728e09602cca7aa51479faa868de1f9b7cf887ed3d7c82f4935309c32c6 +DIST skype-call-recorder-0.8.tar.gz 83842 SHA256 b115f728e09602cca7aa51479faa868de1f9b7cf887ed3d7c82f4935309c32c6 SHA512 f93b4aaf4f03b05bd74500485715b0ce97212f82ab9c9c1eeab57cc9589012ff4a96d81829f51605975328db27d0a6ab20c88e78c513ff61bb4e4b8038ca2b3c WHIRLPOOL 1f6fb8bce06bd98cca999fa86afaaa0bb0ba5970414d9fd90e247f95148d9afc7ba5a4a8d7292fc7064d624faa559636a0a5ddf79aa59a5eaeb04934166f81e0 diff --git a/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild b/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild index 1f987adfd994..4838ced93568 100644 --- a/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild +++ b/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild,v 1.1 2011/07/23 13:46:59 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild,v 1.2 2012/12/04 22:06:32 reavertm Exp $ EAPI="4" @@ -25,7 +25,7 @@ DEPEND=" >=x11-libs/qt-gui-4.4:4[dbus] " RDEPEND="${DEPEND} - net-im/skype[-qt-static] + net-im/skype[-qt-static(-)] " PATCHES=( diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest index efede48a8866..4f797e5b357d 100644 --- a/media-sound/xmms2-scrobbler/Manifest +++ b/media-sound/xmms2-scrobbler/Manifest @@ -1 +1 @@ -DIST xmms2-scrobbler-0.4.0.tar.gz 19831 RMD160 01ddeb2655a8a87c91666df7f222f858857eac82 SHA1 cf0c6f9828806340cff1012980a37e944b212b7d SHA256 7aed1670f381463e44466083f2e49119636e96005b9b93899edf79d613a2d2bc +DIST xmms2-scrobbler-0.4.0.tar.gz 19831 SHA256 7aed1670f381463e44466083f2e49119636e96005b9b93899edf79d613a2d2bc SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b WHIRLPOOL ee569f034e6ddfdf3b26b8a5d1185ea8af894275ea573d871460ec0eefe75774cf081196cf1e9ad21bfb640043cf10e4a181edb23798aaf3c89505945c377666 diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild index 809fe6a4aabd..c88a2c576c61 100644 --- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild +++ b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild @@ -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/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild,v 1.1 2012/03/03 17:49:34 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild,v 1.2 2012/12/04 19:38:57 slyfox Exp $ EAPI=4 @@ -10,7 +10,7 @@ DESCRIPTION="XMMS2 AudioScrobbler client" HOMEPAGE="http://code-monkey.de/pages/xmms2-scrobbler" SRC_URI="ftp://ftp.code-monkey.de/pub/${PN}/${P}.tar.gz" -LICENSE="as-is" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest index f1e13683043a..93df53e39d10 100644 --- a/media-tv/v4l-utils/Manifest +++ b/media-tv/v4l-utils/Manifest @@ -1,3 +1,2 @@ -DIST v4l-utils-0.8.5.tar.bz2 373882 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c SHA512 d84bea5658b350447741e2aae36458c2ba29f4d6beb8dd4965626a1f60ea1f0b7d12751cab9501c1c5cb3ba9872fc7ac237553e452b3c348f907c4a8274f954a WHIRLPOOL fa941a7e30792993144e7b55dc88cd10c09100e94142ed8c0c0f68bcaf8d12a0c57511f5698225ff9f057c0eb4696d0eff6d0d55fa46673c3db10f5bb9b4b6ca DIST v4l-utils-0.8.8.tar.bz2 420888 SHA256 5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f SHA512 4bc103e8431fa237612fcaa6addd63a03186ade64e306e83384192f0051e6c0f36b22771e66875062a984e1b0e0e255a945afe6dc0d1356560c140293c8d11c4 WHIRLPOOL bcfac96bf78ee9da822ece69ad8f0a2da534ad3103170e07dd192f22c04cf48421769c9f62c6ab1ba8dc2894827e98dd2c1c1fc04b762063dab0f8f5a027f88a DIST v4l-utils-0.8.9.tar.bz2 460681 SHA256 3e5511c252b3c320d0b03418f7ee19b42d00ed0871c6b525779007416e46d08e SHA512 3778dbd4d0bb44c6f4762a8551625c1f5bfcf7a10de33c71c2442483d496bc177aef979b747b327f4eca3229fc22eec484de7308588acf9fc48ae6d1d5edee40 WHIRLPOOL 346d2c23c5e8b8ac3128100cf660b1f4880ec5fffd3fa107accf7f536adeacc945cb9aadd61f2f99a6fd32bd7a44912680d2cf867f0a84f28c949707634c676f diff --git a/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild b/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild deleted file mode 100644 index fb40c2f09f4d..000000000000 --- a/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-0.8.5.ebuild,v 1.6 2012/10/26 17:45:48 tetromino Exp $ - -EAPI=4 -inherit toolchain-funcs qt4-r2 - -DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package" -HOMEPAGE="http://git.linuxtv.org/v4l-utils.git" -SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="qt4" - -RDEPEND=">=media-libs/libv4l-${PV} - qt4? ( x11-libs/qt-gui:4 ) - !media-tv/v4l2-ctl - ! Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s/-//' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSL -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake || die "make failed" - if use gtk ; then - cd hydra-gtk && \ - emake || die "emake hydra-gtk failed" - fi -} - -src_install() { - dobin hydra pw-inspector || die "dobin failed" - if use gtk ; then - dobin hydra-gtk/src/xhydra || die "gtk" - fi - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-6.2.ebuild b/net-analyzer/hydra/hydra-6.2.ebuild deleted file mode 100644 index 164ea19f7a8c..000000000000 --- a/net-analyzer/hydra/hydra-6.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-6.2.ebuild,v 1.1 2011/04/12 02:22:51 jer Exp $ - -EAPI="2" - -inherit toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk ssl" - -DEPEND=" - dev-libs/openssl - gtk? ( x11-libs/gtk+:2 ) - ssl? ( >=net-libs/libssh-0.4.0 ) -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s/-//' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSL -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake || die "make failed" - if use gtk ; then - cd hydra-gtk && \ - emake || die "emake hydra-gtk failed" - fi -} - -src_install() { - dobin hydra pw-inspector || die "dobin failed" - if use gtk ; then - dobin hydra-gtk/src/xhydra || die "gtk" - fi - dodoc CHANGES README TODO -} diff --git a/net-analyzer/hydra/hydra-6.3.ebuild b/net-analyzer/hydra/hydra-6.3.ebuild deleted file mode 100644 index 99b4796ecfee..000000000000 --- a/net-analyzer/hydra/hydra-6.3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-6.3.ebuild,v 1.1 2011/05/06 04:02:40 jer Exp $ - -EAPI="2" - -inherit toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk ssl" - -DEPEND=" - dev-libs/openssl - gtk? ( x11-libs/gtk+:2 ) - ssl? ( >=net-libs/libssh-0.4.0 ) -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s/-//' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSL -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake || die "make failed" - if use gtk ; then - cd hydra-gtk && \ - emake || die "emake hydra-gtk failed" - fi -} - -src_install() { - dobin hydra pw-inspector || die "dobin failed" - if use gtk ; then - dobin hydra-gtk/src/xhydra || die "gtk" - fi - dodoc CHANGES README TODO -} diff --git a/net-analyzer/hydra/hydra-6.5-r1.ebuild b/net-analyzer/hydra/hydra-6.5-r1.ebuild deleted file mode 100644 index 04cf14cfc790..000000000000 --- a/net-analyzer/hydra/hydra-6.5-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-6.5-r1.ebuild,v 1.2 2011/07/20 15:46:47 jer Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk ssl" - -DEPEND=" - dev-libs/openssl - gtk? ( x11-libs/gtk+:2 ) - ssl? ( >=net-libs/libssh-0.4.0 ) -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - epatch "${FILESDIR}"/${PN}-6.5-fix.diff - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/ -o /s:$(OPTS) $(LIBS):$(OPTS) $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSLNEW -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake - if use gtk ; then - cd hydra-gtk && \ - emake - fi -} - -src_install() { - dobin hydra pw-inspector - if use gtk ; then - dobin hydra-gtk/src/xhydra - fi - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-6.5.ebuild b/net-analyzer/hydra/hydra-6.5.ebuild deleted file mode 100644 index bd2d0fa6a2de..000000000000 --- a/net-analyzer/hydra/hydra-6.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-6.5.ebuild,v 1.2 2011/07/20 15:46:47 jer Exp $ - -EAPI="2" - -inherit toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="gtk ssl" - -DEPEND=" - dev-libs/openssl - gtk? ( x11-libs/gtk+:2 ) - ssl? ( >=net-libs/libssh-0.4.0 ) -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/ -o /s:$(OPTS) $(LIBS):$(OPTS) $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSLNEW -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake || die "make failed" - if use gtk ; then - cd hydra-gtk && \ - emake || die "emake hydra-gtk failed" - fi -} - -src_install() { - dobin hydra pw-inspector || die "dobin failed" - if use gtk ; then - dobin hydra-gtk/src/xhydra || die "gtk" - fi - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-7.0.ebuild b/net-analyzer/hydra/hydra-7.0.ebuild deleted file mode 100644 index 221fc2119c13..000000000000 --- a/net-analyzer/hydra/hydra-7.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.0.ebuild,v 1.3 2012/05/04 06:08:10 jdhore Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion" - -RDEPEND=" - dev-libs/openssl - firebird? ( dev-db/firebird ) - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - idn? ( net-dns/libidn ) - mysql? ( virtual/mysql ) - ncp? ( net-fs/ncpfs ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql-base ) - ssl? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSLNEW -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake - if use gtk ; then - cd hydra-gtk && \ - emake - fi -} - -src_install() { - dobin hydra pw-inspector - if use gtk ; then - dobin hydra-gtk/src/xhydra - fi - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-7.1.ebuild b/net-analyzer/hydra/hydra-7.1.ebuild deleted file mode 100644 index 0b20949dbaf4..000000000000 --- a/net-analyzer/hydra/hydra-7.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.1.ebuild,v 1.3 2012/05/04 06:08:10 jdhore Exp $ - -EAPI="4" - -inherit eutils toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion" - -RDEPEND=" - dev-libs/openssl - firebird? ( dev-db/firebird ) - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - idn? ( net-dns/libidn ) - mysql? ( virtual/mysql ) - ncp? ( net-fs/ncpfs ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql-base ) - ssl? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/^OPTS/{s|=|+=|;s| -O3||}' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - export OPTS="${CFLAGS}" - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSLNEW -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake - if use gtk ; then - cd hydra-gtk && \ - emake - fi -} - -src_install() { - dobin hydra pw-inspector - if use gtk ; then - dobin hydra-gtk/src/xhydra - fi - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-7.2.ebuild b/net-analyzer/hydra/hydra-7.2.ebuild deleted file mode 100644 index 5bd912211af0..000000000000 --- a/net-analyzer/hydra/hydra-7.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.2.ebuild,v 1.4 2012/06/11 11:17:25 ago Exp $ - -EAPI=4 -inherit eutils toolchain-funcs - -DESCRIPTION="Advanced parallized login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc ~x86" -IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion" - -RDEPEND=" - dev-libs/openssl - firebird? ( dev-db/firebird ) - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - idn? ( net-dns/libidn ) - mysql? ( virtual/mysql ) - ncp? ( net-fs/ncpfs ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql-base ) - ssl? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S=${WORKDIR}/${P}-src - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:-O2:$(CPPFLAGS) $(CFLAGS):g' \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/^OPTS/{s|=|+=|;s| -O3||}' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die "sed failed" -} - -src_configure() { - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - export OPTS="${CFLAGS}" - ./configure \ - --prefix=/usr \ - $(use gtk && echo --disable-xhydra) \ - || die "configure failed" - - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=-lcrypto:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - Makefile || die "pruning vars" - - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DLIBOPENSSLNEW -DLIBSSH:' \ - -e '/^XLIBS=/s:$: -lssl -lssh:' \ - Makefile || die "adding ssl" - fi - - if use gtk ; then - cd hydra-gtk && \ - econf || die "econf failed" - fi -} - -src_compile() { - tc-export CC - emake - if use gtk ; then - cd hydra-gtk && \ - emake - fi -} - -src_install() { - dobin hydra pw-inspector - if use gtk ; then - dobin hydra-gtk/src/xhydra - fi - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-7.3.ebuild b/net-analyzer/hydra/hydra-7.3.ebuild index 9b580f7f3efd..d890d887ee6e 100644 --- a/net-analyzer/hydra/hydra-7.3.ebuild +++ b/net-analyzer/hydra/hydra-7.3.ebuild @@ -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/net-analyzer/hydra/hydra-7.3.ebuild,v 1.3 2012/09/30 19:27:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-7.3.ebuild,v 1.4 2012/12/04 10:22:42 ago Exp $ EAPI=4 inherit eutils toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="http://freeworld.thc.org/releases/${P}-src.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion" RDEPEND=" diff --git a/net-analyzer/wireshark/wireshark-1.6.12.ebuild b/net-analyzer/wireshark/wireshark-1.6.12.ebuild index 0a5bd6f42b97..bf959c62b618 100644 --- a/net-analyzer/wireshark/wireshark-1.6.12.ebuild +++ b/net-analyzer/wireshark/wireshark-1.6.12.ebuild @@ -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/net-analyzer/wireshark/wireshark-1.6.12.ebuild,v 1.4 2012/12/03 20:56:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.6.12.ebuild,v 1.6 2012/12/04 13:41:29 ago Exp $ EAPI=4 PYTHON_DEPEND="python? 2" @@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE=" adns doc doc-pdf gtk ipv6 libadns lua gcrypt geoip kerberos profile +pcap portaudio python +caps selinux smi ssl threads zlib diff --git a/net-analyzer/wireshark/wireshark-1.8.4.ebuild b/net-analyzer/wireshark/wireshark-1.8.4.ebuild index bbca5d705d16..42025a4b9bf6 100644 --- a/net-analyzer/wireshark/wireshark-1.8.4.ebuild +++ b/net-analyzer/wireshark/wireshark-1.8.4.ebuild @@ -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/net-analyzer/wireshark/wireshark-1.8.4.ebuild,v 1.4 2012/12/03 20:56:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.8.4.ebuild,v 1.6 2012/12/04 13:37:52 ago Exp $ EAPI="4" PYTHON_DEPEND="python? 2" @@ -13,7 +13,7 @@ SRC_URI="http://www.wireshark.org/download/src/all-versions/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE=" adns +caps doc doc-pdf geoip gtk crypt ipv6 kerberos libadns lua +pcap portaudio profile python selinux smi ssl zlib diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index c1713271cab4..6c52ee1a6fb7 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -1,8 +1,9 @@ DIST bind-9.9.1-P4-geoip-1.3.patch 54332 SHA256 32e539377037cb4295b97acf7a24ae9814a4e25989ee3a539e06cc3a0f37d526 SHA512 b7117568710a322f46e7393f3f78cacec2cd29a9bb86ad352c74e301b6bd394b52b57725eae503d500ebd4b3f702dbf866f6aec5024e97b053e097a9a3c98e8f WHIRLPOOL a41d549bffc23945ed723d8338f9db0107dd23fb9379cfdbd10da18e48f7a8b89ed22664cbad86517910bd413e005ff0649eeaaf3b983dd190b29f6907149048 DIST bind-9.9.1-P4.tar.gz 7227655 SHA256 18f90727fd9566da037e71569d9b3a4834c96b04d9e75f9899eba0bc88c0868a SHA512 b40236c48ea05f52c637165c1a4cc528698542253d1268c571be0362d25457590c04202e70646d463d7ef7a2eea7ba7bb0a0d4e12bd1b36400dedbebeb776379 WHIRLPOOL 577f76fc6cc4ba02930e8c82dee94aed218acbd1f2a39fbd6d19901fba2409eed2bb62270317d53d3c701f4615de3febf7d85daa8ca84bbec6111de91abd1647 +DIST bind-9.9.2-P1.tar.gz 7277498 SHA256 4bce7c020402623333b655be5167ae8c52f30a6bfe9750caa3ab70da7d90219c SHA512 38bc2d878c7c75056d75c86d44a17815863064d3d69eb2eccaf9c3e1a4686045dc825352052ec1937d670bcb9a9b6ce6ddb6f87af56a2f1350dced55fa53ec15 WHIRLPOOL 4dc9ca276a5d955cef3c51129e44b3a8e092bbfcefc66c0088f4a1ee3987ec6ef8400f6a74e67a469a4f73bb788f4b25f3e54f8e6354969395731ed3ca597361 DIST bind-9.9.2-geoip-1.3.patch 54328 SHA256 0d87a1b547b42c775ffb591bc8104f92c18e99ebe2ab3a97e8c5bc5731be6fba SHA512 7673b3001bc7d64e80ee548c63ab083141affdd76edf6704da6980c26de341be7341d7566dd9bc8d3b02a0a08934ccd513bd61d2a426f61b3b47959ec14d21ae WHIRLPOOL f561baae427ff4141022b94ca557e2c3fba58434531f45c28b153ada537cadec2388694689b30c1a5b5db9c10e9cbaaad6c7a42797effc7c429c4403c6516404 -DIST bind-9.9.2.tar.gz 7285050 SHA256 7e6530b198d512e27a856bbd7426b1a3c47fd55d06d667adb66f760259009b48 SHA512 a64eec10ba69d1bc97524bdf003a3fc3721b0879e128b58fe1e8e181165cd613e7f9492f9a1dfab7a4e689adf743db70e85ec2bce4220ce8203e5fdb478e92f4 WHIRLPOOL cffc59ab3a0cc1113183e85d9b543f4b1d183b181d9b5ab5caea6698645adf919fc84a3b8820cd6d54ef3cb98a008f950e7599f685adbf516da17deb043d9ad8 DIST bind-geoip-1.3-readme.txt 10040 SHA256 380ce89f1a614f46571ad59bddf0f268275691aa2d7a7a7bf1c2a3ef4d26e845 SHA512 463b9c5178cd00b8c3626fafc32e2c4db5005b9442c364525a22a3bd20b6f3ff99fab32e9103355d08546b349398499e221109a96d8d073d1fbe9a1f3d385ae9 WHIRLPOOL a00f0e5564f37b434f84d152e797c249640913e13ab7f109e2ff0abc45c519a28ad24e4f6173fa587c4774653f4c9381f9b8ab33c5697f47b30fa139eed48569 DIST bind-sdb-ldap-1.1.0-fc14.patch.bz2 9477 SHA256 fe043a573ba187dcc8b0f7313d4408236e6916ec246b0443b7e71b33c8303ae9 SHA512 62690ef3471055e4ae3d8dcedd296c0a5c3a75a3be237c76fdea07aa879f2bb1df4c56b8ca1e3ed9b488a980d16f9c9a3a12a53ef3208607472d18c225916ac5 WHIRLPOOL da3683f815509c5adf0ef819cf1165b64ba35efc6c588fd46b1c6b3d0374766442acb02ecf19dd90bbad5afb174dd27fd3e0894166ea8e78901e95ae870f9f5e DIST dyndns-samples.tbz2 22866 SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac WHIRLPOOL 08d4e6a817f1d02597631e18152dbd55ea1bc4c82174be150cc77efc9e1f0f03b6471d1cefbe4229cd3161de752ef232a43ca274a07b78e9c974ceb04cfe99a2 DIST rl-9.9.1-P2.patch 80440 SHA256 99efd951582ce790e274082e0bedaea698b9b7f49cf1de387752583993cf2115 SHA512 7a6a7b588de68f2dc2ed4f19b55adc1d5083a80c672889c823016c92195b4b6f215cdb6328af5127c62ff616451f5991c11dcef5e54d9ca7d58e391c4db8823b WHIRLPOOL 896744688dac120bf93c0a340f04fed1fa6a67ec91fa10580bf3fab803805f87f1f279c87a52b7381f239941c40e9bfed84a771831a7ba42ae338796b4faa95b +DIST rl-9.9.2.patch 91993 SHA256 0bf1935ce77cfbc7cf6fa9bdb3798545c612d6fa30f6bb097ad23258ea83ac2d SHA512 9e1ace18b4dc41bf2f2e292eb0b56ee1d12a256ac2714bd8aebe9f8b249254aea450571009e2c95f96d6fa478f0508e89fc1273000ce1e09e58298578b53cd0c WHIRLPOOL 8cdd514f98241a055ed8bdcf8bc808a95c022e0c54af3c953e3d7372b1410f3b62bc39ee81a6a72ba568ba7b7ee41d7082465f29bbbbe063982cd0cff3428523 diff --git a/net-dns/bind/bind-9.9.2.ebuild b/net-dns/bind/bind-9.9.2_p1.ebuild similarity index 95% rename from net-dns/bind/bind-9.9.2.ebuild rename to net-dns/bind/bind-9.9.2_p1.ebuild index 30852d0c7fc3..aeb19f3d80f2 100644 --- a/net-dns/bind/bind-9.9.2.ebuild +++ b/net-dns/bind/bind-9.9.2_p1.ebuild @@ -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/net-dns/bind/bind-9.9.2.ebuild,v 1.7 2012/11/04 20:20:20 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.9.2_p1.ebuild,v 1.1 2012/12/04 19:52:03 idl0r Exp $ # Re dlz/mysql and threads, needs to be verified.. # MySQL uses thread local storage in its C api. Thus MySQL @@ -33,7 +33,7 @@ GEOIP_PATCH_A="${GEOIP_P}.patch" GEOIP_DOC_A="bind-geoip-1.3-readme.txt" GEOIP_SRC_URI_BASE="http://bind-geoip.googlecode.com/" -RRL_PV="9.9.1-P2" +RRL_PV="9.9.2" # GeoIP: http://bind-geoip.googlecode.com/ # DNS RRL: http://www.redbarn.org/dns/ratelimits/ @@ -47,16 +47,15 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz ${GEOIP_SRC_URI_BASE}/files/${GEOIP_PATCH_A} ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 - )" -# rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )" + ) + rrl? ( http://ss.vix.com/~vixie/rl-${RRL_PV}.patch )" LICENSE="ISC BSD BSD-2 HPND JNIC RSA openssl" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="berkdb caps dlz doc filter-aaaa geoip gost gssapi idn ipv6 ldap mysql odbc -postgres python rpz sdb-ldap selinux ssl static-libs threads urandom xml" +postgres python rpz rrl sdb-ldap selinux ssl static-libs threads urandom xml" # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 -# The rrl Patch does not apply against 9.9.2 yet REQUIRED_USE="postgres? ( dlz ) berkdb? ( dlz ) @@ -135,17 +134,22 @@ src_prepare() { if use geoip; then cp "${DISTDIR}"/${GEOIP_PATCH_A} "${S}" || die -# sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \ -# -e 's:RELEASEVER=:RELEASEVER=1:' \ -# ${GEOIP_PATCH_A} || die + sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \ + -e 's:RELEASEVER=:RELEASEVER=1:' \ + ${GEOIP_PATCH_A} || die # sed -i -e 's:RELEASEVER=2:RELEASEVER=3:' ${GEOIP_PATCH_A} || die epatch ${GEOIP_PATCH_A} fi -# if use rrl; then -# # Response Rate Limiting (DNS RRL) - bug 434650 -# epatch "${DISTDIR}/rl-${RRL_PV}.patch" -# fi + if use rrl; then + cp "${DISTDIR}"/rl-${RRL_PV}.patch "${S}" || die + sed -i -e 's:^ RELEASETYPE=: RELEASETYPE=-P:' \ + -e 's:^ RELEASEVER=: RELEASEVER=1:' \ + rl-${RRL_PV}.patch || die + + # Response Rate Limiting (DNS RRL) - bug 434650 + epatch rl-${RRL_PV}.patch + fi # Disable tests for now, bug 406399 sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die diff --git a/net-fs/cifs-utils/cifs-utils-5.8.ebuild b/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild similarity index 92% rename from net-fs/cifs-utils/cifs-utils-5.8.ebuild rename to net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild index 1f9f22e8e039..ba21c951a3db 100644 --- a/net-fs/cifs-utils/cifs-utils-5.8.ebuild +++ b/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild @@ -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/net-fs/cifs-utils/cifs-utils-5.8.ebuild,v 1.1 2012/11/25 12:24:43 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild,v 1.1 2012/12/04 07:23:02 dev-zero Exp $ EAPI=4 @@ -29,6 +29,8 @@ REQUIRED_USE="^^ ( caps caps-ng )" DOCS="doc/linux-cifs-client-guide.odt" pkg_setup() { + linux-info_pkg_setup + confutils_use_conflict caps caps-ng if ! linux_config_exists || ! linux_chkconfig_present CIFS; then ewarn "You must enable CIFS support in your kernel config, " @@ -54,6 +56,13 @@ src_configure() { --disable-cifsacl } +src_install() { + default + + # remove empty directory + use upcall || rmdir "${D}/usr/sbin" +} + pkg_postinst() { # Inform about set-user-ID bit of mount.cifs ewarn "setuid use flag was dropped due to multiple security implications" diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest index 4f7480d2f3f4..91c02a1f9ba9 100644 --- a/net-fs/ncpfs/Manifest +++ b/net-fs/ncpfs/Manifest @@ -1 +1 @@ -DIST ncpfs-2.2.6.tar.gz 2100545 RMD160 a02fcef8fff0f65f7ddbdd83b092a484a0372186 SHA1 00d83771ef14f2aeb039430a44201e33cd80a894 SHA256 2837046046bcdb46d77a80c1d17dbfd15e878700e879edab4cda9f080e0337f9 +DIST ncpfs-2.2.6.tar.gz 2100545 SHA256 2837046046bcdb46d77a80c1d17dbfd15e878700e879edab4cda9f080e0337f9 diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild index 158ddfc3aa5d..ff84249e1cc7 100644 --- a/net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild +++ b/net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild @@ -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/net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild,v 1.4 2012/06/11 09:20:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/ncpfs/ncpfs-2.2.6-r2.ebuild,v 1.5 2012/12/04 10:21:15 ago Exp $ EAPI="2" @@ -12,7 +12,7 @@ SRC_URI="ftp://platan.vc.cvut.cz/pub/linux/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="nls pam php" DEPEND="nls? ( sys-devel/gettext ) diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild index e498ff041c31..4acac488d59c 100644 --- a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild @@ -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/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.5 2012/12/02 11:32:13 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.6 2012/12/04 14:21:32 blueness Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -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" IUSE="caps ipv6 kerberos nfsdcld nfsidmap +nfsv4 nfsv41 selinux tcpd" RESTRICT="test" #315573 diff --git a/net-im/purple-events/purple-events-0.2.ebuild b/net-im/purple-events/purple-events-0.2.ebuild index e17121371518..7d188f769a57 100644 --- a/net-im/purple-events/purple-events-0.2.ebuild +++ b/net-im/purple-events/purple-events-0.2.ebuild @@ -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/net-im/purple-events/purple-events-0.2.ebuild,v 1.2 2012/10/31 17:30:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/purple-events/purple-events-0.2.ebuild,v 1.3 2012/12/04 15:41:14 ago Exp $ EAPI=4 @@ -10,7 +10,7 @@ SRC_URI="mirror://github/sardemff7/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="net-im/pidgin" diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest index ca1fa0e32298..f497f15eba21 100644 --- a/net-irc/irker/Manifest +++ b/net-irc/irker/Manifest @@ -1,2 +1,3 @@ DIST irker-1.12.tar.gz 31769 SHA256 c30621b4a2153b5eee3dd81c05fd69d8aef8d84e855d492ac86738023362e957 SHA512 10489664211146a40f15e9640d2708c907e7b66a2924664e4a84a879fbfa770b096ecef7941d3980e0e05b0d0fd2c6222aff5a075b597ebe75d09cbcff02e266 WHIRLPOOL 4ca29900ddaa03182d41f578c9d812e12746c2dc1abfffb1b7d9d6660cb4450f4f707c35fd600bd0f6702d54ac38c3ac4ebdff6fd4951ae060b45e93ac000fab DIST irker-1.13.tar.gz 31823 SHA256 e94a9c63035ba2a9c4bc092dac3c8a3c2c742a829960faf1f64289746ea5f221 SHA512 1ccf102f74bcacb7665c0fb73b501065d3fe550165ea64bbb68646bbde34eb395b42c4f1f2afd458f2226d900223bbaa1131eed519acb548d9ca9e7e56c673a9 WHIRLPOOL b54ca5706297bb52137dd51576ff51de51740cd12726bd4ca18458468a4f20e4416e46dcfecb1f4c2fb1026978a64b956bc87b11b1f65ccedd0876104f92479a +DIST irker-1.14.tar.gz 31999 SHA256 e660e2b26d36221a2031d9ff036a1546590f09f742fe159ccdfe51b3314734dd SHA512 c5132f55f202e9f7ee9a596288caea47a4cd96f06522696c9984a724ebda57fd8d3c3cb677247292be7e786c3652fb07517b360d522f37c3027a47024e8abac0 WHIRLPOOL 3716d4f80e8983e8ba25c9eb28485e934cb8d6e644b9679c050862547243de093b9bf2a0ba1070c747febaca64d8a5368170822d0439f7032f18bf6279024df5 diff --git a/net-irc/irker/irker-1.14.ebuild b/net-irc/irker/irker-1.14.ebuild new file mode 100644 index 000000000000..abd2832c3a74 --- /dev/null +++ b/net-irc/irker/irker-1.14.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/irker/irker-1.14.ebuild,v 1.1 2012/12/05 06:22:50 patrick Exp $ + +EAPI=4 + +inherit python + +DESCRIPTION="Submission tools for IRC notifications" +HOMEPAGE="http://www.catb.org/esr/irker/" +SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +DEPEND="app-text/docbook-xml-dtd:4.1.2 + app-text/xmlto" +RDEPEND="=dev-lang/python-2* + dev-python/irc" + +src_install() { + python_convert_shebangs 2 irkerd irkerhook.py + emake DESTDIR="${D}" install + # the irkerhook.py is not installed with the default makefile + dobin irkerhook.py + newinitd "${FILESDIR}/irker.init" irkerd + newconfd "${FILESDIR}/irker.conf.d" irkerd +} diff --git a/net-libs/libircclient/libircclient-1.6-r1.ebuild b/net-libs/libircclient/libircclient-1.6-r1.ebuild index af18d45315c6..53620d81ab62 100644 --- a/net-libs/libircclient/libircclient-1.6-r1.ebuild +++ b/net-libs/libircclient/libircclient-1.6-r1.ebuild @@ -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/net-libs/libircclient/libircclient-1.6-r1.ebuild,v 1.5 2012/10/20 19:09:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libircclient/libircclient-1.6-r1.ebuild,v 1.6 2012/12/04 10:55:00 ago Exp $ EAPI=4 inherit autotools eutils @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libircclient/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc ipv6 ssl static-libs threads" DEPEND="ssl? ( dev-libs/openssl )" diff --git a/net-mail/dbmail/dbmail-3.0.2.ebuild b/net-mail/dbmail/dbmail-3.0.2.ebuild index 81deacbb6fef..0feb5c0952b2 100644 --- a/net-mail/dbmail/dbmail-3.0.2.ebuild +++ b/net-mail/dbmail/dbmail-3.0.2.ebuild @@ -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/net-mail/dbmail/dbmail-3.0.2.ebuild,v 1.2 2012/10/24 09:58:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.0.2.ebuild,v 1.3 2012/12/04 11:10:35 ago Exp $ EAPI="4" inherit eutils multilib python versionator @@ -11,7 +11,7 @@ SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="ldap sieve +sqlite ssl static python" DEPEND="dev-db/libzdb diff --git a/net-mail/dovecot/dovecot-2.1.12-r1.ebuild b/net-mail/dovecot/dovecot-2.1.12-r1.ebuild index 11f7ce504d0b..070f79577eed 100644 --- a/net-mail/dovecot/dovecot-2.1.12-r1.ebuild +++ b/net-mail/dovecot/dovecot-2.1.12-r1.ebuild @@ -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/net-mail/dovecot/dovecot-2.1.12-r1.ebuild,v 1.1 2012/12/01 10:40:50 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.1.12-r1.ebuild,v 1.7 2012/12/05 02:21:19 blueness Exp $ EAPI=4 inherit eutils versionator ssl-cert systemd user multilib @@ -20,7 +20,7 @@ HOMEPAGE="http://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -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" IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail" IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox" diff --git a/net-mail/metamail/metamail-2.7.53.3.ebuild b/net-mail/metamail/metamail-2.7.53.3.ebuild deleted file mode 100644 index 2de6db6d05a6..000000000000 --- a/net-mail/metamail/metamail-2.7.53.3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.53.3.ebuild,v 1.10 2010/01/06 19:28:11 ranger Exp $ - -WANT_AUTOCONF="2.5" - -inherit eutils versionator autotools - -MY_PV=$(get_version_component_range 1-2) -DEB_PV=${MY_PV}-$(get_version_component_range 3) - -DESCRIPTION="Metamail (with Debian patches) - Generic MIME package" -HOMEPAGE="ftp://thumper.bellcore.com/pub/nsb/" -SRC_URI="ftp://thumper.bellcore.com/pub/nsb/mm${MY_PV}.tar.Z - mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" -IUSE="" - -DEPEND="sys-libs/ncurses - app-arch/sharutils - net-mail/mailbase" -RDEPEND="app-misc/mime-types - sys-apps/debianutils" - -S=${WORKDIR}/mm${MY_PV}/src - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${WORKDIR}"/metamail_${DEB_PV}.diff - epatch "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch - epatch "${FILESDIR}"/${P}-glibc-2.10.patch - eautoreconf - chmod +x "${S}"/configure -} - -src_install () { - make DESTDIR="${D}" install || die - dodoc COPYING CREDITS README - rm man/mmencode.1 - doman man/* debian/mimencode.1 debian/mimeit.1 -} diff --git a/net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild b/net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild index 8198c7801344..23b42a626585 100644 --- a/net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild +++ b/net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild @@ -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/net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild,v 1.3 2012/11/14 20:26:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.18-r1.ebuild,v 1.4 2012/12/04 11:24:25 ago Exp $ inherit perl-app @@ -10,7 +10,7 @@ SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~mips ~ppc ~sparc x86" IUSE="" RESTRICT="mirror" diff --git a/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild b/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild index 4b7b46122932..be30b7ef19c0 100644 --- a/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild +++ b/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild @@ -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/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild,v 1.5 2012/12/02 17:05:31 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_pre20121004-r1.ebuild,v 1.6 2012/12/04 15:36:53 ago Exp $ EAPI="4" @@ -10,7 +10,7 @@ if [[ ${PV} != 9999* ]]; then SRC_URI="mirror://github/FreeRDP/FreeRDP/${P}.tar.gz mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" else inherit git-2 SRC_URI="" diff --git a/net-misc/gogoc/gogoc-1.2-r2.ebuild b/net-misc/gogoc/gogoc-1.2-r2.ebuild index 11d555b0313e..077541cc968d 100644 --- a/net-misc/gogoc/gogoc-1.2-r2.ebuild +++ b/net-misc/gogoc/gogoc-1.2-r2.ebuild @@ -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/net-misc/gogoc/gogoc-1.2-r2.ebuild,v 1.3 2012/11/30 21:53:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/gogoc/gogoc-1.2-r2.ebuild,v 1.4 2012/12/04 15:40:12 ago Exp $ EAPI=4 @@ -20,7 +20,7 @@ SRC_URI="http://gogo6.com/downloads/${MY_P}.tar.gz" # GPL-2 for Gentoo init script LICENSE="MIT GPL-2" SLOT="0" -KEYWORDS="amd64 ~hppa ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~sparc x86" IUSE="debug" DEPEND="dev-libs/openssl" diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild index 3d777c484436..4f1335e6e60d 100644 --- a/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild +++ b/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild,v 1.10 2012/08/25 07:42:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/npapi-sdk/npapi-sdk-0.27.ebuild,v 1.11 2012/12/04 22:01:27 mgorny Exp $ EAPI=4 inherit autotools-utils DESCRIPTION="NPAPI headers bundle" -HOMEPAGE="https://github.com/mgorny/npapi-sdk/" -SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2" +HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/" +SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2" LICENSE="MPL-1.1" SLOT="0" diff --git a/net-misc/remmina/remmina-1.0.0_p20121004.ebuild b/net-misc/remmina/remmina-1.0.0_p20121004.ebuild index 442397d03ae4..f9666258568f 100644 --- a/net-misc/remmina/remmina-1.0.0_p20121004.ebuild +++ b/net-misc/remmina/remmina-1.0.0_p20121004.ebuild @@ -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/net-misc/remmina/remmina-1.0.0_p20121004.ebuild,v 1.4 2012/11/22 03:45:43 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.0.0_p20121004.ebuild,v 1.5 2012/12/04 15:37:05 ago Exp $ EAPI="4" @@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then SRC_URI="mirror://github/FreeRDP/Remmina/${P}.tar.gz mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~floppym/distfiles/${P}.tar.gz" - KEYWORDS="amd64 ~x86" + KEYWORDS="amd64 x86" else inherit git-2 SRC_URI="" diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest index fab3ca965061..c2cd2daf3121 100644 --- a/net-misc/spice-gtk/Manifest +++ b/net-misc/spice-gtk/Manifest @@ -1,6 +1,2 @@ -DIST spice-gtk-0.11.tar.bz2 868491 SHA256 7639876b49efc8bbe5e0668fdbadcd768acc9bbd5235b4856ae632235e784eba SHA512 a5e094e02a69c2b8503f6ee00e74bc0fb9c993ecbf5e0fe5f3c6dc1caa689778e1836970916b1d879f805568eaf450724f7e5460da21dd592d8f2de7f6497ef9 WHIRLPOOL f1224144ba14795361913f7ffc5cd77a5f02d628c30f03b1d4d35019f62dc421e61eb280516f86130c959df2a4d0dbbefb28fe4d352f32ae90f7e20acd6e1cb9 -DIST spice-gtk-0.12.tar.bz2 1134841 SHA256 5eea1622f351988eb6f2eb1a945fee6caba3d4038997a371eaf478ee9d3a00b3 SHA512 b8c2edd9ab511dd95d58dc648ad80a2ed96b8ff496dc567e30b0803c7cfeb90044f6f98d7258bde03dba4a1a774ced9cfb65458e562331a905a2cd44004dc53a WHIRLPOOL 2dc016f071362652437ea4d812b8c3e4ca610d544cb96a6cf54389b8a6ff511160ac1178f0ad994264833571997fa649dce1ff40c4cf042eacdbd3908bcfbe5f -DIST spice-gtk-0.13.tar.bz2 1164771 SHA256 d4a4155d013fb4e0d12750ae30ff92ebf25a47347450a3218106dec858671335 SHA512 8274737a255ea366d7c1939ee8a5109b8bcb09a58b5412720710c2034bf997d59ea245bc48f08fdf9ecc7c5ad12aa560cbbbe9336e8f1304420bceb34715ba67 WHIRLPOOL c99d79ed9d72e3fda3db364d16650c71e2e44719a24779122b2820ee6e290112b21de5ae2252bfa1d62e3fdd94b6db6b481ab69e3e2650687bce6f3ec2655703 DIST spice-gtk-0.14.tar.bz2 1204821 SHA256 a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5 SHA512 64510e098927d856ac8f05c6d9f07626ee280979fd792bb92f188ff11a15ff54b11acd0471a7e30c8f6fbc594a036c6642bd3369c0d231412ea9aece6d07bba1 WHIRLPOOL 16ce4c6cfb863c76026998239b5bbbd912cdeb5044afb8533020eaf255585863f41080bcc598b51efea3dc99b5e678508f1ece3f18a6dbae0d71e4bb81b513b9 DIST spice-gtk-0.7.159.tar.bz2 800551 SHA256 c154c28778cbf2afef4c3c7f023afe4d0de7d742a2aace38a7358eb56a2c3306 SHA512 5ca9e5a953ae6eb3dcbf994772a8b38a2f574fe173e6c075adb9831f5197270f923d2d9d8747737f79d802d19c191f1c9f332abcc2b0c5787f023960f82f08ae WHIRLPOOL 71556dd4e20091ce6c10b81bb1ae2461e3a939082247d3c77947db7722cf5f5ee6763a4d3957757f7403d0278b3dcea44c5ab84590483b85e704e1da1afe21d8 -DIST spice-gtk-0.8.tar.bz2 832151 SHA256 5d6607eeaace5773467ef881adb072481aca40fe1ac2ecf324ed48766cdb63b4 SHA512 b1a4f86252484eb6856ce3d9fa1dd3a03a83ee9cfa5eebe1458ab3632e87289ecd0bd6a8bce2e2dff7ca4f8d41a9fcd49fd37f8196d9dd145e310c12e38dc96d WHIRLPOOL a9208e446b9cd807d92ef87c5232992e044e6e588d54df75b9b37d108a5fd73ca9072461f6a175d316342a5508c72986179dabbcd2770cd0b1d0453bf24377a3 diff --git a/net-misc/spice-gtk/spice-gtk-0.11.ebuild b/net-misc/spice-gtk/spice-gtk-0.11.ebuild deleted file mode 100644 index d23393d68988..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.11.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.11.ebuild,v 1.7 2012/12/03 02:27:45 ssuominen Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit eutils python gnome2-utils - -PYTHON_DEPEND="python? 2" - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." -HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" -IUSE="doc gnome gstreamer gtk3 +introspection kde policykit +pulseaudio -python sasl smartcard static-libs usbredir vala" - -# TODO: check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - >=app-emulation/spice-protocol-0.10.1 - >=x11-libs/pixman-0.17.7 - >=media-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - gtk3? ( x11-libs/gtk+:3[introspection?] ) - !gtk3? ( x11-libs/gtk+:2[introspection?] ) - >=dev-libs/glib-2.26:2 - >=x11-libs/cairo-1.2 - virtual/jpeg - sys-libs/zlib - introspection? ( dev-libs/gobject-introspection ) - python? ( dev-python/pygtk:2 ) - sasl? ( dev-libs/cyrus-sasl ) - gnome? ( gnome-base/gconf ) - smartcard? ( app-emulation/libcacard ) - usbredir? ( - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.101 ) - virtual/libusb:1 - >=sys-apps/usbredir-0.4.2 - =sys-apps/usbredir-0.4.2 + virtual/libusb:1 + virtual/udev[gudev] policykit? ( sys-apps/acl >=sys-auth/polkit-0.101 ) - virtual/libusb:1 - >=sys-apps/usbredir-0.4.2 - =sys-devel/gettext-0.17 + virtual/pkgconfig + vala? ( dev-lang/vala:0.14 )" # Hard-deps while building from git: # dev-lang/vala:0.14 # dev-lang/perl # dev-perl/Text-CSV +GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2" +GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3" + pkg_setup() { python_set_active_version 2 python_pkg_setup - if use gstreamer && use pulseaudio ; then - ewarn "spice-gtk can use only one audio backend: pulseaudio will be used since you enabled both." - fi } src_prepare() { - epatch "${FILESDIR}/0.12-parallel-install.patch" + mkdir ${GTK2_BUILDDIR} || die + mkdir ${GTK3_BUILDDIR} || die + + epatch \ + "${FILESDIR}/0.12-parallel-install.patch" \ + "${FILESDIR}/${PV}-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch" eautoreconf } src_configure() { + local myconf local audio="no" - local gtk="2.0" use gstreamer && audio="gstreamer" use pulseaudio && audio="pulse" - # TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3 libs - use gtk3 && gtk="3.0" + if use vala ; then # force vala regen for MinGW, etc rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c fi - econf --disable-maintainer-mode \ - VALAC=$(type -P valac-0.14) \ - VAPIGEN=$(type -P vapigen-0.14) \ + myconf=" $(use_enable static-libs static) \ $(use_enable introspection) \ - --with-audio="${audio}" \ + --with-audio=${audio} \ $(use_with python) \ $(use_with sasl) \ $(use_enable smartcard) \ @@ -103,16 +107,69 @@ src_configure() { $(use_with usbredir usb-acl-helper-dir /usr/libexec) \ $(use_enable policykit polkit) \ $(use_enable vala) \ - --with-gtk="${gtk}" \ - --disable-werror + --disable-werror" + + cd ${GTK2_BUILDDIR} + echo "Running configure in ${GTK2_BUILDDIR}" + ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ + VALAC=$(type -P valac-0.14) \ + VAPIGEN=$(type -P vapigen-0.14) \ + --with-gtk=2.0 \ + ${myconf} + + if use gtk3; then + cd ${GTK3_BUILDDIR} + echo "Running configure in ${GTK3_BUILDDIR}" + ECONF_SOURCE="${S}" econf --disable-maintainer-mode \ + VALAC=$(type -P valac-0.14) \ + VAPIGEN=$(type -P vapigen-0.14) \ + --with-gtk=3.0 \ + ${myconf} + fi +} + +src_compile() { + cd ${GTK2_BUILDDIR} + einfo "Running make in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make in ${GTK3_BUILDDIR}" + default + fi +} + +src_test() { + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" + default + + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make check in ${GTK3_BUILDDIR}" + default + fi } src_install() { + cd ${GTK2_BUILDDIR} + einfo "Running make check in ${GTK2_BUILDDIR}" default - use static-libs || rm -rf "${D}"/usr/lib*/*.la - use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la - use doc || rm -rf "${D}/usr/share/gtk-doc" + if use gtk3; then + cd ${GTK3_BUILDDIR} + einfo "Running make install in ${GTK3_BUILDDIR}" + default + fi + + # Remove .la files if they're not needed + if ! use static-libs; then + find "${ED}" -name '*.la' -exec rm -f '{}' + || die + fi + + use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la + use doc || rm -rf "${ED}/usr/share/gtk-doc" make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;" } diff --git a/net-misc/spice-gtk/spice-gtk-0.8.ebuild b/net-misc/spice-gtk/spice-gtk-0.8.ebuild deleted file mode 100644 index 5feb9050467c..000000000000 --- a/net-misc/spice-gtk/spice-gtk-0.8.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.8.ebuild,v 1.6 2012/12/03 02:27:45 ssuominen Exp $ - -EAPI="4" -GCONF_DEBUG="no" - -inherit eutils python gnome2-utils - -PYTHON_DEPEND="python? 2" - -DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI." -HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk" - -LICENSE="LGPL-2.1" -SLOT="0" -SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" -IUSE="doc gnome gstreamer gtk3 +introspection kde policykit +pulseaudio -python sasl static-libs usbredir vala" - -# TODO: check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h -RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) - >=app-emulation/spice-protocol-0.10.1 - >=x11-libs/pixman-0.17.7 - >=media-libs/celt-0.5.1.1:0.5.1 - dev-libs/openssl - gtk3? ( x11-libs/gtk+:3[introspection?] ) - !gtk3? ( x11-libs/gtk+:2[introspection?] ) - >=dev-libs/glib-2.26:2 - >=x11-libs/cairo-1.2 - virtual/jpeg - sys-libs/zlib - introspection? ( dev-libs/gobject-introspection ) - python? ( dev-python/pygtk:2 ) - sasl? ( dev-libs/cyrus-sasl ) - gnome? ( gnome-base/gconf ) - usbredir? ( - policykit? ( - sys-apps/acl - >=sys-auth/polkit-0.96 ) - virtual/libusb:1 - >=sys-apps/usbredir-0.3.3 - =dev-libs/glib-2.24.0:2 >=dev-libs/boost-1.49 dev-libs/libxml2:2 >=net-libs/opal-3.10.9[audio,sip,video,debug=,h323?,xml] >=net-libs/ptlib-2.10.9[ldap?,stun,v4l?,video,wav,debug=,dtmf,pulseaudio?,xml] - >=x11-libs/gtk+-2.12.0:2 + >=x11-libs/gtk+-2.20.0:2 + >=x11-themes/gnome-icon-theme-3.0.0 avahi? ( >=net-dns/avahi-0.6[dbus] ) dbus? ( >=sys-apps/dbus-0.36 >=dev-libs/dbus-glib-0.36 ) eds? ( >=gnome-extra/evolution-data-server-1.2 ) gconf? ( >=gnome-base/gconf-2.6.0:2 ) - gnome? ( || ( >=x11-libs/gtk+-2.14:2 + gnome? ( || ( >=x11-libs/gtk+-2.20.0:2 ( >=gnome-base/libgnome-2.14.0 >=gnome-base/libgnomeui-2.14.0 ) ) ) gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 ) diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild index 4f9410314b5e..419ececcce33 100644 --- a/net-wireless/ubertooth/ubertooth-9999.ebuild +++ b/net-wireless/ubertooth/ubertooth-9999.ebuild @@ -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/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.16 2012/11/17 04:32:24 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ubertooth/ubertooth-9999.ebuild,v 1.17 2012/12/05 00:17:43 zerochaos Exp $ EAPI="4" @@ -31,7 +31,7 @@ RDEPEND="${DEPEND} >=dev-python/pyusb-1.0.0_alpha1 )" if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://ubertooth.git.sourceforge.net/gitroot/ubertooth/ubertooth" + EGIT_REPO_URI="http://git.code.sf.net/p/ubertooth/code" SRC_URI="" inherit git-2 KEYWORDS="" diff --git a/profiles/base/package.mask b/profiles/base/package.mask index 43c4e9d6cbca..e62ffe05021e 100644 --- a/profiles/base/package.mask +++ b/profiles/base/package.mask @@ -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/profiles/base/package.mask,v 1.49 2012/11/18 08:14:43 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.mask,v 1.50 2012/12/04 19:39:16 swift Exp $ # Diego Elio Pettenò (8 Feb 2011) # on behalf of QA team (4 Dec 2012) +# Force app-shells/bash[readline] in stage1 builds, so that compgen is +# available for sys-apps/portage (see bug #445576). +app-shells/bash readline # Michał Górny (14 Oct 2012) # Force-enable all PYTHON_TARGETS for python-exec to avoid using private diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index 660518452468..19a51659182b 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -1,4 +1,4 @@ -# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.37 2012/11/18 09:25:48 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/package.mask,v 1.38 2012/12/04 19:39:16 swift Exp $ # Zac Medico (09 Aug 2011) # Bug #377907 - Use package.mask for compatibility with PMS section 5.2.7, and @@ -81,6 +81,7 @@ -sec-policy/selinux-devicekit -sec-policy/selinux-dhcp -sec-policy/selinux-dictd +-sec-policy/selinux-dirsrv -sec-policy/selinux-distcc -sec-policy/selinux-djbdns -sec-policy/selinux-dkim diff --git a/profiles/package.mask b/profiles/package.mask index 59af3e3d6462..bb620f33204a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14273 2012/12/03 22:38:23 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14276 2012/12/05 03:57:41 yngwin 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 @@ -243,7 +243,7 @@ app-emulation/libvirt-sandbox dev-java/sbaz # Pacho Ramos (24 Nov 2012) -# Nothing in the tree needs it, upstream is dead and per fedora removal, +# Nothing in the tree needs it, upstream is dead and per fedora removal, # looks like people can use hfsutils and netatalk as replacements: # http://www.redhat.com/archives/fedora-maintainers/2006-August/msg00026.html # Removal in a month (#431298) @@ -520,6 +520,7 @@ app-i18n/ibus-table-yinma =x11-libs/gtk+-3.6*:3 =x11-themes/gnome-themes-standard-3.6* # Other stuff +>=dev-cpp/gstreamermm-0.10.11 =dev-libs/libxml2-2.9* >=dev-util/d-feet-0.3 diff --git a/profiles/use.local.desc b/profiles/use.local.desc index ef6960a50c64..febbc8d7b801 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -137,7 +137,7 @@ app-admin/conky:math - enable support for glibc's libm math library app-admin/conky:moc - enable monitoring of music played by media-sound/moc app-admin/conky:mpd - enable monitoring of music controlled by media-sound/mpd app-admin/conky:nano-syntax - enable syntax highlighting for app-editors/nano -app-admin/conky:nvidia - enable reading of nvidia card temperature sensors via x11-drivers/nvidia-drivers +app-admin/conky:nvidia - enable reading of nvidia card temperature sensors via media-video/nvidia-settings app-admin/conky:portmon - enable support for tcp (ip4) port monitoring app-admin/conky:thinkpad - enable support for IBM/Lenovo notebooks app-admin/conky:weather-metar - enable support for metar weather service @@ -523,6 +523,7 @@ app-emulation/vice:xrandr - Enable support for the X xrandr extension app-emulation/virt-manager:policykit - Enables sys-auth/polkit authentication support, required when using app-emulation/libvirt with PolicyKit authentication app-emulation/virt-manager:sasl - Depend on the proper libraries needed to connect to SASL-enabled libvirtd instances (e.g. Kerberos-protected instances). app-emulation/virt-manager:spice - Support connecting to SPICE-enabled virtual machines. +app-emulation/virt-manager:vnc - Support connecting to VNC-enabled virtual machines. app-emulation/virt-viewer:gtk3 - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 app-emulation/virt-viewer:spice - Support connecting to SPICE-enabled virtual machines. app-emulation/virt-viewer:vnc - Support connecting to VNC-enabled virtual machines. @@ -559,11 +560,9 @@ app-emulation/wine:win64 - Build a 64bit version of Wine (won't run Win32 binari app-emulation/xen:flask - Enable the Flask XSM module from NSA app-emulation/xen:pae - Enable support for PAE kernels (usually x86-32 with >4GB memory) app-emulation/xen:xsm - Enable the Xen Security Modules (XSM) -app-emulation/xen-tools:acm - Enable the ACM/sHype XSM module from IBM for xen-3 app-emulation/xen-tools:api - Build the C libxenapi bindings app-emulation/xen-tools:flask - Enable the Flask XSM module from NSA app-emulation/xen-tools:hvm - Enable support for hardware based virtualization (VT-x,AMD-v) -app-emulation/xen-tools:ioemu - Enable IOEMU support app-emulation/xen-tools:pygrub - Install the pygrub boot loader app-emulation/xen-tools:qemu - Enable IOEMU support via the use of qemu-dm app-emulation/xen-tools:screen - Enable support for running domain U console in an app-misc/screen session @@ -1323,6 +1322,8 @@ dev-libs/apr:uuid - Enable UUID support dev-libs/apr-util:nss - Install apr_crypto_nss module dev-libs/apr-util:openssl - Install apr_crypto_openssl module dev-libs/atk:introspection - Use dev-libs/gobject-introspection for introspection +dev-libs/bitset:jemalloc - Use dev-libs/jemalloc for allocations +dev-libs/bitset:tcmalloc - Use tcmalloc from dev-util/google-perftools for allocations dev-libs/blitz:boost - Enable usage of boost::serialization dev-libs/boost:debug - Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost. dev-libs/boost:doc - Install the full API documentation documentation. This takes over 200MB of extra disk space. @@ -2009,6 +2010,7 @@ games-rpg/nwn-data:hou - Install the Hordes of the Underdark expansion pack games-rpg/nwn-data:nowin - For those people who cant grab the 1.2 gigs of data files from a windows partition games-rpg/nwn-data:sou - Installs the Shadows of Undrentide expension pack games-rpg/sumwars:tools - Builds editor tools +games-simulation/flightgear:fgpanel - Enables standalone lightweight 2D-panel rendering utility games-simulation/flightgear:jsbsim - Enables JSBSim Flight Dynamics Model (default) games-simulation/flightgear:oldfdm - Enables deprecated Flight Dynamics Models (LaRCsim, UIUC) games-simulation/flightgear:subversion - Enables terrasync scenery downloader @@ -2842,6 +2844,7 @@ media-plugins/grilo-plugins:youtube - Build support for YouTube content discover media-plugins/gst-plugins-a52dec:orc - Use dev-lang/orc for runtime detection of CPU MMX/MMXEXT/3dNow! capabilities to pass down to a52dec library. media-plugins/gst-plugins-dts:orc - Use dev-lang/orc for runtime optimisations media-plugins/gst-plugins-ffmpeg:orc - Use dev-lang/orc for runtime optimisations +media-plugins/gst-plugins-libav:orc - Use dev-lang/orc for runtime optimisations media-plugins/gst-plugins-meta:http - Enable http streaming via net-libs/libsoup media-plugins/gst-plugins-meta:libvisual - Enable visualization effects via media-libs/libvisual media-plugins/gst-plugins-meta:vpx - Enables vp8 codec support using libvpx, required to play some HTML5 videos @@ -5218,6 +5221,8 @@ sci-visualization/veusz:fits - Add FITS format via dev-python/pyfits sec-policy/selinux-base:open_perms - Enable the open permissions for file object classes (SELinux policy capability). sec-policy/selinux-base:peer_perms - Enable the labeled networking peer permissions (SELinux policy capability). sec-policy/selinux-base:ubac - Enable User Based Access Control (UBAC) in the SELinux policy +sec-policy/selinux-base:unconfined - Enable support for the unconfined SELinux module +sec-policy/selinux-base-policy:unconfined - Enable support for the unconfined SELinux policy module sys-apps/accountsservice:introspection - Use dev-libs/gobject-introspection for introspection sys-apps/accountsservice:systemd - Use sys-apps/systemd instead of sys-auth/consolekit for session tracking sys-apps/accountsservice:vala - Enable bindings for dev-lang/vala diff --git a/sci-libs/cbflib/Manifest b/sci-libs/cbflib/Manifest index 09238d571cae..a7b8b3479d1a 100644 --- a/sci-libs/cbflib/Manifest +++ b/sci-libs/cbflib/Manifest @@ -1,5 +1 @@ -DIST CBFlib-0.9.0_14Feb10.tar.gz 4456643 SHA256 7f79d0de9b07b6c544f2da1bf66b83460006fca75a36eacbbc8f839694ff2eba SHA512 475e8eebdbb0d9e623025d3164cabecb1bc91ad6121a969660464171ede4d719a8e58cce8d2ad79b213a6fb97dca7d690059a1cf0e761b830ce026aafffc33a9 WHIRLPOOL 3d575e20e666bfb808425adf60840e9f676fda0e59aea7f814ce19068eb7bbdc735a0ea38bce2ab103cf7af5cf4292540748d27021da692ea2f75ac92e3f19a9 -DIST CBFlib-0.9.2.3.tar.gz 4553047 SHA256 e69169e0d15a018cfa96efc8d664d478e9231af69274db1250ca6d2a406bd4c7 SHA512 e0848ff390559b8fadfaaf6c4c7af779589db98a1fe3a89654a973162da018bb52c90830debd4015505a1a7fca98d55e5f271195b210ef41698057f04165553c WHIRLPOOL 626121cedab34cf76422225d67d490951b03e512f64cd39f130f46a09f9b3195b78862c52c745d9616c38d5c1f9113ca34e3e7e12cb776e69d7452693d283ffe DIST CBFlib-0.9.2.4.tar.gz 4564355 SHA256 c7d11a70e6454a6801e8f30d56db6639fa814aa25775bf54109325073c4a08c1 SHA512 e1ee1fe39b3d15e5d707d973c5666f198e3c9006b4c449fa56287032661a7ecfbeadad0fda528310f9cdd9f33856004333784a840d193a5c7db6c5c071fb07e5 WHIRLPOOL ded867cda1757196ad2188eda7a1a09999411a3d1a452172880fabdc5504aa346e44b2c8c25d921f674897ec7f8edf3da4de79d4843f68ecbb72634631ea43dd -DIST CBFlib_0.9.2_Data_Files_Input.tar.gz 17102003 SHA256 4414166a5a5b5ef6e4c460bb6941bd0aca53e7a41dbc9e5bdf0c6d44cf00d5ac SHA512 86689695155b822146e8cc1e310f4820292cde28c9cc240da34ef8259c429af7b182a055e1014078081528c505b0269367cd5e6e80278a53b448f0cc0dfcc3aa WHIRLPOOL a946dce8a6fa1a90a6fb3e7ec167a2ba41fdd5ef9435f4da083f9f9a7f5dfb94a2ebef1d1c36f5332fc486452b9b26c29161c7484ba337da83c24fbcd0334126 -DIST CBFlib_0.9.2_Data_Files_Output.tar.gz 36009958 SHA256 311cebff470b7d4f94b7888252cca879e6e0745f4e2eb6fa9e21cf84f984029b SHA512 fb08cbc5a68a73089c012c4c8da2a02ed7a216e02f23f2b24ba2e4dca7af834c7200868028921540e14326ea88e48028675e1be1f2c572eb3e962a79cf892002 WHIRLPOOL 386691e706dafacb9f5ee13f74fcf0f78c3a827d434ae18602fb2a8f805c178f9883e10658ed739a35bb7ceb58b628c1a9f1bbf89144efd793d13c7a62c3d05b diff --git a/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild b/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild deleted file mode 100644 index 494652d48af0..000000000000 --- a/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.0-r3.ebuild,v 1.8 2012/10/18 21:33:44 jlec Exp $ - -EAPI=3 - -PYTHON_DEPEND="python? 2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.*" - -inherit distutils eutils flag-o-matic fortran-2 toolchain-funcs - -PYTHON_MODNAME="pycbf.py" -MY_P1="CBFlib-${PV}" -MY_P2="CBFlib_${PV}" - -DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files" -HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" -#BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P1}_14Feb10.tar.gz" -# test? ( -# ${BASE_TEST_URI}/${MY_P2}_Data_Files_Input.tar.gz -# ${BASE_TEST_URI}/${MY_P2}_Data_Files_Output.tar.gz -# )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="doc python" - -S="${WORKDIR}/${MY_P1}" - -src_prepare(){ - rm -rf Py* drel* dRel* ply* - epatch "${FILESDIR}"/${PV}-Makefile.patch - edos2unix pycbf/setup.py - epatch "${FILESDIR}"/${PV}-python.patch - cp Makefile_LINUX_gcc42 Makefile - - append-fflags -fno-range-check - append-cflags -D_USE_XOPEN_EXTENDED - - sed \ - -e "s|^CC.*$|CC = $(tc-getCC)|" \ - -e "s|^C++.*$|C++ = $(tc-getCXX)|" \ - -e "s|C++|CXX|g" \ - -e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \ - -e "s|^F90C.*$|F90C = $(tc-getFC)|" \ - -e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \ - -e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \ - -e "s| /bin| ${EPREFIX}/bin|g" \ - -e "s|/usr|${EPREFIX}/usr|g" \ - -i Makefile || die -} - -src_compile() { - emake -j1 shared || die - - if use python; then - cd pycbf - distutils_src_compile - fi -} - -# test app is borked in this version -# produces buffer overflows -#src_test(){ -# emake -j1 tests || die -#} - -src_install() { - insinto /usr/include/${PN} - doins include/*.h || die - - dolib.so solib/lib* || die - - dodoc README || die - if use doc; then - dohtml -r README.html html_graphics doc || die - fi - if use python; then - cd pycbf - distutils_src_install - fi -} - -pkg_postinst() { - use python && distutils_pkg_postinst -} - -pkg_postrm() { - use python && distutils_pkg_postrm -} diff --git a/sci-libs/cbflib/cbflib-0.9.2.3.ebuild b/sci-libs/cbflib/cbflib-0.9.2.3.ebuild deleted file mode 100644 index 88499bb3a907..000000000000 --- a/sci-libs/cbflib/cbflib-0.9.2.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/sci-libs/cbflib/cbflib-0.9.2.3.ebuild,v 1.4 2012/10/18 21:33:44 jlec Exp $ - -EAPI=4 - -inherit eutils flag-o-matic fortran-2 toolchain-funcs - -MY_P1="CBFlib-${PV}" -#MY_P2="CBFlib_${PV}" -MY_P2="CBFlib_0.9.2" - -DESCRIPTION="Library providing a simple mechanism for accessing CBF files and imgCIF files" -HOMEPAGE="http://www.bernstein-plus-sons.com/software/CBF/" -BASE_TEST_URI="http://arcib.dowling.edu/software/CBFlib/downloads/version_${PV}/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz - test? ( - mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Input.tar.gz - mirror://sourceforge/${PN}/${MY_P2}_Data_Files_Output.tar.gz - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc test" - -S=${WORKDIR}/${MY_P1} - -src_prepare(){ - rm -rf Py* drel* dRel* ply* - epatch "${FILESDIR}"/${PV}-Makefile.patch - cp Makefile_LINUX_gcc42 Makefile - - append-fflags -fno-range-check - append-cflags -D_USE_XOPEN_EXTENDED -DCBF_DONT_USE_LONG_LONG - - sed \ - -e "s|^CC.*$|CC = $(tc-getCC)|" \ - -e "s|^C++.*$|C++ = $(tc-getCXX)|" \ - -e "s|C++|CXX|g" \ - -e "s|^CFLAGS.*$|CFLAGS = ${CFLAGS}|" \ - -e "s|^F90C.*$|F90C = $(tc-getFC)|" \ - -e "s|^F90FLAGS.*$|F90FLAGS = ${FFLAGS}|" \ - -e "s|^SOLDFLAGS.*$|SOLDFLAGS = -shared ${LDFLAGS}|g" \ - -e "s| /bin| ${EPREFIX}/bin|g" \ - -e "s|/usr|${EPREFIX}/usr|g" \ - -i Makefile || die -} - -src_compile() { - emake -j1 shared -} - -src_test(){ - emake -j1 basic -} - -src_install() { - insinto /usr/include/${PN} - doins include/*.h - - dolib.so solib/lib* - - dodoc README - if use doc; then - dohtml -r README.html html_graphics doc - fi -} diff --git a/sci-libs/cbflib/cbflib-0.9.2.4.ebuild b/sci-libs/cbflib/cbflib-0.9.2.4.ebuild index 71cab6bf700e..b2b21c9ffb87 100644 --- a/sci-libs/cbflib/cbflib-0.9.2.4.ebuild +++ b/sci-libs/cbflib/cbflib-0.9.2.4.ebuild @@ -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/sci-libs/cbflib/cbflib-0.9.2.4.ebuild,v 1.5 2012/11/01 11:50:45 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cbflib/cbflib-0.9.2.4.ebuild,v 1.6 2012/12/04 11:17:42 ago Exp $ EAPI=4 @@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P1}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="doc test" S=${WORKDIR}/${MY_P1} diff --git a/sci-libs/cqrlib/Manifest b/sci-libs/cqrlib/Manifest index f44ae17f5a04..18afb8a310d0 100644 --- a/sci-libs/cqrlib/Manifest +++ b/sci-libs/cqrlib/Manifest @@ -1,2 +1 @@ -DIST CQRlib-1.0.6.tar.gz 33746 SHA256 e670be2bf0972a3e7e6f2a34e7687c632796d27e979edd7866983bc62d24e697 SHA512 0f0e669fa4488ff00cc3c5a3e80eb67b38864587e181e525b43e031c55a22c8346eb12ac5000a129042043efb8eb3a71b341aebade7c1f226526af8e8ee7df39 WHIRLPOOL 5b3f905b25c98ddfa59975cdd90ca7867b486ebd2032b17bfd92ee6e4620f1c78779f4e2e93e14824ed411952d585b91063c2d8dfa269c85db9a9128999d5122 DIST CQRlib-1.1.2.tar.gz 43082 SHA256 af3cf2402974579f3c6efc6a6174a5da52786db4bfee9d38d504d93bc42410fd SHA512 41510d0a03ef48385896be6695b8ca328d56dc7d0ef82db2e46108913d814d3545febe76114589ee6fa3bfad75a2832d98120ec966e052245a3b4f0e684c2b9f WHIRLPOOL 2c1de60f88b5cfb9c5e406bc2b9f93617c7ef390ae290716bcec891b17ec8388bab37bf9bed4ed87c1796a6af2c6d0a6d95086fb4c971941306810f30849d3f5 diff --git a/sci-libs/cqrlib/cqrlib-1.0.6.ebuild b/sci-libs/cqrlib/cqrlib-1.0.6.ebuild deleted file mode 100644 index c080cc8330b6..000000000000 --- a/sci-libs/cqrlib/cqrlib-1.0.6.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/cqrlib-1.0.6.ebuild,v 1.5 2012/04/30 16:55:09 jlec Exp $ - -EAPI=4 - -inherit base flag-o-matic multilib toolchain-funcs versionator - -MY_PN=CQRlib -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="An ANSI C implementation of a utility library for quaternion arithmetic and quaternion rotation math" -HOMEPAGE="http://cqrlib.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="dev-libs/cvector" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PV}-gentoo.patch - ) - -src_compile() { - sed "s:GENTOOLIBDIR:$(get_libdir):g" -i Makefile || die - append-flags -ansi - emake \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CXXFLAGS} -DCQR_NOCCODE=1" \ - all -} - -src_test() { - emake -j1 \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - tests -} - -src_install() { - emake -j1 DESTDIR="${ED}" install - - rm -f "${ED}"/usr/$(get_libdir)/*.la || die - - dodoc README_CQRlib.txt - dohtml README_CQRlib.html -} diff --git a/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild b/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild index 4a14c57e259e..e7e5183e9324 100644 --- a/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild +++ b/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild @@ -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/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild,v 1.3 2012/11/11 15:18:19 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/cqrlib-1.1.2-r1.ebuild,v 1.4 2012/12/04 11:18:36 ago Exp $ EAPI=4 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-libs/cvector" diff --git a/sci-libs/cqrlib/cqrlib-1.1.2.ebuild b/sci-libs/cqrlib/cqrlib-1.1.2.ebuild deleted file mode 100644 index 9615a652c49c..000000000000 --- a/sci-libs/cqrlib/cqrlib-1.1.2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cqrlib/cqrlib-1.1.2.ebuild,v 1.4 2012/04/30 16:55:08 jlec Exp $ - -EAPI=4 - -inherit base flag-o-matic multilib toolchain-funcs versionator - -MY_PN=CQRlib -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="An ANSI C implementation of a utility library for quaternion arithmetic and quaternion rotation math" -HOMEPAGE="http://cqrlib.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="dev-libs/cvector" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/1.0.6-gentoo.patch - ) - -src_compile() { - sed "s:GENTOOLIBDIR:$(get_libdir):g" -i Makefile || die - append-flags -ansi - emake \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - CPPFLAGS="${CXXFLAGS} -DCQR_NOCCODE=1" \ - all -} - -src_test() { - emake -j1 \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - CFLAGS="${CFLAGS}" \ - tests -} - -src_install() { - emake -j1 DESTDIR="${ED}" install - - rm -f "${ED}"/usr/$(get_libdir)/*.la || die - - dodoc README_CQRlib.txt - dohtml README_CQRlib.html -} diff --git a/sci-libs/djbfft/djbfft-0.76-r1.ebuild b/sci-libs/djbfft/djbfft-0.76-r1.ebuild index 285560d34491..dad8273691cc 100644 --- a/sci-libs/djbfft/djbfft-0.76-r1.ebuild +++ b/sci-libs/djbfft/djbfft-0.76-r1.ebuild @@ -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/sci-libs/djbfft/djbfft-0.76-r1.ebuild,v 1.7 2012/11/30 04:45:44 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76-r1.ebuild,v 1.8 2012/12/04 15:40:43 ago Exp $ EAPI=4 inherit eutils flag-o-matic toolchain-funcs multilib @@ -11,7 +11,7 @@ SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="" src_prepare() { diff --git a/sci-libs/gdal/gdal-1.9.1.ebuild b/sci-libs/gdal/gdal-1.9.1.ebuild index 91d0a14102e9..b76371749572 100644 --- a/sci-libs/gdal/gdal-1.9.1.ebuild +++ b/sci-libs/gdal/gdal-1.9.1.ebuild @@ -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/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.5 2012/08/10 06:12:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.1.ebuild,v 1.6 2012/12/04 09:44:24 jlec Exp $ EAPI=4 @@ -24,7 +24,7 @@ RDEPEND=" media-libs/tiff sci-libs/libgeotiff ( || ( =sys-libs/zlib-1.2.5.1-r2[minizip] ) ) - armadillo? ( >=sci-libs/armadillo-3.0.2 ) + armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) diff --git a/sci-libs/hdf5/hdf5-1.8.10.ebuild b/sci-libs/hdf5/hdf5-1.8.10.ebuild index a2ba3a2d257a..cc1a4c200d6f 100644 --- a/sci-libs/hdf5/hdf5-1.8.10.ebuild +++ b/sci-libs/hdf5/hdf5-1.8.10.ebuild @@ -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/sci-libs/hdf5/hdf5-1.8.10.ebuild,v 1.1 2012/11/06 19:56:41 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.10.ebuild,v 1.2 2012/12/04 06:59:14 xarthisius Exp $ EAPI=4 @@ -101,3 +101,15 @@ src_install() { default use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + } + +pkg_postinst() { + if has_version "sci-libs/hdf5"; then + ewarn "You have upgraded hdf5 from previous version and the software" + ewarn "using it may start complaining about mismatch between headers" + ewarn "and library version. You have two options:" + ewarn " 1. export HDF5_DISABLE_VERSION_CHECK=2 to get rid of the" + ewarn " warning/error message" + ewarn " 2. re-emerge all reverse dependencies (type" + ewarn " 'emerge --depclean -pv sci-libs/hdf5' to get the list)" + fi +} diff --git a/sci-libs/libsvm/files/3.14-makefile.patch b/sci-libs/libsvm/files/3.14-makefile.patch index b8bdd9f82ba8..56e8bd2e091e 100644 --- a/sci-libs/libsvm/files/3.14-makefile.patch +++ b/sci-libs/libsvm/files/3.14-makefile.patch @@ -41,11 +41,11 @@ nov 2012 - bicatali@gentoo.org svm-scale: svm-scale.c - $(CXX) $(CFLAGS) svm-scale.c -o svm-scale + $(CC) $(CFLAGS) -c $@.c -o $@.o -+ $(CXX) $(LDFLAGS) $@.o svm.o -o $@ ++ $(CXX) $(LDFLAGS) $@.o -o $@ + svm.o: svm.cpp svm.h - $(CXX) $(CFLAGS) -c svm.cpp -+ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp ++ $(CXX) $(CXXFLAGS) $(PICFLAGS) -c svm.cpp -o $@ clean: - rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) + rm -f *~ svm.o svm-train svm-predict svm-scale libsvm.so.$(SHVER) libsvm.so diff --git a/sci-libs/neartree/Manifest b/sci-libs/neartree/Manifest index c1d0f06129e6..6a6335df6739 100644 --- a/sci-libs/neartree/Manifest +++ b/sci-libs/neartree/Manifest @@ -1,2 +1 @@ -DIST neartree-2.3.2.tar.gz 99412 SHA256 1bdb2f9e157008e2c99ffbbe031b36b0ccb95ef18cd6df5a1b06892c9a562f2c SHA512 6677fdec7d4c1f1cab066e3a1f82e21ffd03c50af2742ca1a22fb355e095c6d9be03fbccd058c4f442a1e8ffb033f5457b9e41835a24eeff1446341964cfafc6 WHIRLPOOL 7b0aebe415853c2ecfa1bc81bbd91865fb390b4da7dc3ae967dae7b48e662f04dfcefb139af9ac84fd4a049d534b1380a5047ed562101cd29634c9207799ae57 DIST neartree-3.1.1.tar.gz 124848 SHA256 5f26d0bef816f492d3939fbe06b8523a495a1fe4d06e9f8283f68a55436961ae SHA512 dca94cdc46610f3636f958cb361eecdc2b8ba7cf2192043810262f902b1999229eb4d00823cd96790f35c15305f6ecbef85710328776a2f1d306d9d3d4ca39eb WHIRLPOOL a16efe30e73ce07bb6ee149718db4b6a72f8edbc38a196867bb4a13e502919149cc1dace8eb4b84d8505d967752e8c2c4c691191f3761ccd68b55a431de572a7 diff --git a/sci-libs/neartree/neartree-2.3.2.ebuild b/sci-libs/neartree/neartree-2.3.2.ebuild deleted file mode 100644 index c2d1966f2d81..000000000000 --- a/sci-libs/neartree/neartree-2.3.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-2.3.2.ebuild,v 1.7 2012/03/01 20:04:27 ranger Exp $ - -EAPI=4 - -inherit base flag-o-matic multilib toolchain-funcs versionator - -MY_PN=NearTree -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem(known as the post office problem)" -HOMEPAGE="http://neartree.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND="dev-libs/cvector" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - epatch \ - "${FILESDIR}"/2.1.4-test.patch \ - "${FILESDIR}"/${PV}-gentoo.patch \ - "${FILESDIR}"/${PV}-notest.patch - - sed \ - -e "s:GENTOOLIBDIR:$(get_libdir):g" \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -i Makefile || die -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - all -} - -src_install() { - emake \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - DESTDIR="${D}" install - - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.{a,la} || die - fi - - dodoc README_NearTree.txt - dohtml *.html -} diff --git a/sci-libs/neartree/neartree-3.1.1-r3.ebuild b/sci-libs/neartree/neartree-3.1.1-r3.ebuild index eb3a3f7cfd3f..ad4211b1f6df 100644 --- a/sci-libs/neartree/neartree-3.1.1-r3.ebuild +++ b/sci-libs/neartree/neartree-3.1.1-r3.ebuild @@ -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/sci-libs/neartree/neartree-3.1.1-r3.ebuild,v 1.3 2012/11/01 11:48:42 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1-r3.ebuild,v 1.4 2012/12/04 11:19:23 ago Exp $ EAPI=4 @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="static-libs" RDEPEND="dev-libs/cvector" diff --git a/sci-libs/neartree/neartree-3.1.1.ebuild b/sci-libs/neartree/neartree-3.1.1.ebuild deleted file mode 100644 index 2110b27f395b..000000000000 --- a/sci-libs/neartree/neartree-3.1.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/neartree/neartree-3.1.1.ebuild,v 1.2 2011/12/15 21:39:19 jlec Exp $ - -EAPI=4 - -inherit base flag-o-matic multilib toolchain-funcs versionator - -MY_PN=NearTree -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Function library efficiently solving the Nearest Neighbor Problem(known as the post office problem)" -HOMEPAGE="http://neartree.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND="dev-libs/cvector" -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PV}-test.patch - "${FILESDIR}"/${PV}-gentoo.patch - "${FILESDIR}"/${PV}-notest.patch - ) - -src_prepare() { - base_src_prepare - sed \ - -e "s:GENTOOLIBDIR:$(get_libdir):g" \ - -e "s:/usr:${EPREFIX}/usr:g" \ - -i Makefile || die - - tc-export CC CXX -} - -src_compile() { - emake all -} - -src_install() { - default - - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/*.{a,la} || die - fi - - dodoc README_NearTree.txt - dohtml *.html -} diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest index 1486b9c27719..86aae200b2f3 100644 --- a/sci-libs/shapelib/Manifest +++ b/sci-libs/shapelib/Manifest @@ -1,2 +1 @@ -DIST shapelib-1.2.10.tar.gz 167219 SHA256 afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78 SHA512 c72cb637aaa2e09037f334edb9638b7af673fa965435b8e0d9beaa3391e9db958d0b16f59d98a5d6933136562556fb8c607fb89f3dd6d3c1696774bb11554cf6 WHIRLPOOL 37f12628fde626b3cc5a0279ac76854d739a2f8ac0d62fd4ca19fdfdc31cffd0e7695164ec4b7ee740776b22b075b68191d5a1c29f1390b39cde5043434dc543 DIST shapelib-1.3.0.tar.gz 156301 SHA256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f SHA512 286a9faf7d7a6d88db3cceffb4e0fe335e5d754244b4e83110862ba0f88904aa10dd2814aa0c93d7531781cb318052d3f683160c9644f83f93e7d20108ac3b60 WHIRLPOOL 79b44dac05f8ca5e10809f7af1e9d0d1f1f5a2c7009698aa5dd33260a362c75b7e7f09cf535d58b6510f355ff5dfb193f2a0c7d14ef913caa4a0d5b099ef3a5b diff --git a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild deleted file mode 100644 index 459209a8c0ba..000000000000 --- a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.8 2012/08/02 19:01:46 bicatali Exp $ - -EAPI=4 -inherit eutils toolchain-funcs multilib - -DESCRIPTION="Library for manipulating ESRI Shapefiles" -HOMEPAGE="http://shapelib.maptools.org/" -SRC_URI="http://dl.maptools.org/dl/shapelib//${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -DEPEND="" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/makefile-fix.patch - epatch "${FILESDIR}"/fix-shapelib-test.diff - epatch "${FILESDIR}"/stdlib_include_fix.patch - sed -i \ - -e "s:/usr/local/:\$(DESTDIR)/${EPREFIX}/usr/:g" \ - -e "s:/usr/lib:/usr/$(get_libdir):g" \ - -e "s:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=${PV}:g" \ - -e "s:-g:${CFLAGS}:" \ - -e "s:-g -O2:${CFLAGS}:g" \ - -e "s:link gcc :link $(tc-getCC) ${LDFLAGS}:" \ - Makefile || die "sed failed" -} - -src_compile() { - emake all - emake lib -} - -src_install() { - dobin shp{create,dump,test,add} dbf{create,dump,add} - emake DESTDIR="${D}" lib_install - dodoc ChangeLog - dohtml *.html - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a -} diff --git a/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild b/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild index 33174ef9a4ef..92f5fc8a9875 100644 --- a/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild +++ b/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild @@ -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/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild,v 1.9 2012/11/30 10:40:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.3.0-r1.ebuild,v 1.10 2012/12/04 11:37:08 blueness Exp $ EAPI=4 inherit eutils toolchain-funcs multilib versionator @@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="static-libs" DEPEND="" diff --git a/sci-mathematics/octave/octave-3.6.3.ebuild b/sci-mathematics/octave/octave-3.6.3.ebuild index 1901017511d1..60afd98b5ed5 100644 --- a/sci-mathematics/octave/octave-3.6.3.ebuild +++ b/sci-mathematics/octave/octave-3.6.3.ebuild @@ -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/sci-mathematics/octave/octave-3.6.3.ebuild,v 1.2 2012/11/22 19:46:15 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.3.ebuild,v 1.3 2012/12/04 18:45:04 bicatali Exp $ EAPI=4 @@ -35,7 +35,8 @@ RDEPEND=" opengl? ( media-libs/freetype:2 media-libs/fontconfig - >=x11-libs/fltk-1.3:1[opengl] ) + >=x11-libs/fltk-1.3:1[opengl] + virtual/glu ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) diff --git a/sci-physics/bullet/Manifest b/sci-physics/bullet/Manifest index 66e6d0912c34..fb6787586281 100644 --- a/sci-physics/bullet/Manifest +++ b/sci-physics/bullet/Manifest @@ -1,2 +1 @@ -DIST bullet-2.77.tgz 6444239 SHA256 011b110f1d274496b6a340269b48ef1581ca0b4ca4365b28f154c236f4afcbaa DIST bullet-2.80-rev2531.tgz 9561231 SHA256 464e2d79e3c5a5bdcad597ef6fca26d4244ad83628d8663e03be7c89d0342f36 SHA512 ca61182b20f692a0163aa230d6025b0dc1863ecdd5f6f3c80589a41997464a347ef1b1ab4923a2136a68d5b42ff864e98a9aa00da8bc493a1339bf309a876cca WHIRLPOOL 3186449ffea858b33cf606bee3c27e15dda4fb945d21d75b4ad4dfdf849181526bef06e0d3b35fc51b27815d229472a9b95f85b108b79315c251811105e0755a diff --git a/sci-physics/bullet/bullet-2.77.ebuild b/sci-physics/bullet/bullet-2.77.ebuild deleted file mode 100644 index 04adc9e298f8..000000000000 --- a/sci-physics/bullet/bullet-2.77.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.77.ebuild,v 1.6 2011/04/17 11:53:52 jlec Exp $ - -EAPI=2 - -inherit eutils cmake-utils - -DESCRIPTION="Continuous Collision Detection and Physics Library" -HOMEPAGE="http://www.bulletphysics.com/" -SRC_URI="http://bullet.googlecode.com/files/${P}.tgz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="doc double-precision examples extras" - -RDEPEND=" - media-libs/freeglut - virtual/opengl" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}"-{libdir,soversion}.patch - "${FILESDIR}"/${P}-gcc46.patch - ) - -src_configure() { - mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DBUILD_CPU_DEMOS=OFF - -DBUILD_DEMOS=OFF - -DINSTALL_LIBS=ON - -DINSTALL_EXTRA_LIBS=ON - $(cmake-utils_use_build extras EXTRAS) - $(cmake-utils_use_use double-precision DOUBLE_PRECISION) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc README ChangeLog AUTHORS - if use doc; then - insinto /usr/share/doc/${PF} - doins *.pdf || die - fi - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r Extras Demos || die - fi -} diff --git a/sci-physics/bullet/bullet-2.80.ebuild b/sci-physics/bullet/bullet-2.80.ebuild index 8df742617317..b0ada50429c9 100644 --- a/sci-physics/bullet/bullet-2.80.ebuild +++ b/sci-physics/bullet/bullet-2.80.ebuild @@ -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/sci-physics/bullet/bullet-2.80.ebuild,v 1.5 2012/11/25 10:54:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-physics/bullet/bullet-2.80.ebuild,v 1.6 2012/12/04 10:30:30 ago Exp $ EAPI=4 @@ -15,7 +15,7 @@ SRC_URI="http://bullet.googlecode.com/files/${MYP}.tgz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux" IUSE="doc double-precision examples extras" RDEPEND="virtual/opengl diff --git a/sci-physics/bullet/metadata.xml b/sci-physics/bullet/metadata.xml index 376edda44e0d..069a588853dc 100644 --- a/sci-physics/bullet/metadata.xml +++ b/sci-physics/bullet/metadata.xml @@ -1,17 +1,17 @@ -sci-physics - + sci-physics + Bullet is a professional open source multi-threaded 3D Collision Detection and Rigid Body Dynamics Library for games and animation. - - Build additional libraries - Build libraries in double precision - - - bullet - + + Build additional libraries + Build libraries in double precision + + + bullet + diff --git a/sci-visualization/epix/Manifest b/sci-visualization/epix/Manifest index c551e9882d83..bf94ea22afc6 100644 --- a/sci-visualization/epix/Manifest +++ b/sci-visualization/epix/Manifest @@ -1,2 +1 @@ DIST epix-1.2.10_withpdf.tar.bz2 1704245 SHA256 ff211a4a0b946a7bff81a1e96dadefbcccd8c7c92d04fbf739b7ff55ba534c5f SHA512 031d9f514217ff209691c2f6eed6fe91551f97443d12d7a6aff9fba8edbefda11735175ff60471f34247daf7d4d8abd1d846825ec0a93d28330799aec48deeac WHIRLPOOL 7bdc28ae2b1dd575c2b5a045c584e85ac06aacceb0ec5a06d99249c10af69c8f258eaf81b17f7853cb82a50bb2809c8769c059f5805a5b09f7f8bdacdf8fa187 -DIST epix-1.2.6_withpdf.tar.bz2 1736850 SHA256 9c377bcf8556bd91f46322e618a8e2d607ebc64e41b2cc57483aa87f414490db SHA512 ba0f657d892b978ca107ba1bb8271da81ba220ea7e3011a5a5ed2448a96cce251245af7c5ce4ebf18af78cee00b9511c0125f6781a0046064d646418407b402f WHIRLPOOL fd59b76313944249730b09e88a77f56fcc479371d3ea0448bdcf2dd873a58acdacda39534becfa657b57c166965f30c50864eb507ee0f6527d6d606b7b206500 diff --git a/sci-visualization/epix/epix-1.2.10.ebuild b/sci-visualization/epix/epix-1.2.10.ebuild index 78905243c7fc..8c1ebad2c358 100644 --- a/sci-visualization/epix/epix-1.2.10.ebuild +++ b/sci-visualization/epix/epix-1.2.10.ebuild @@ -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/sci-visualization/epix/epix-1.2.10.ebuild,v 1.7 2012/11/30 05:17:41 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.10.ebuild,v 1.8 2012/12/04 15:38:19 ago Exp $ EAPI=4 @@ -12,7 +12,7 @@ SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2" SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" IUSE="doc emacs examples" DEPEND=" diff --git a/sci-visualization/epix/epix-1.2.6.ebuild b/sci-visualization/epix/epix-1.2.6.ebuild deleted file mode 100644 index b1549e877690..000000000000 --- a/sci-visualization/epix/epix-1.2.6.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/epix/epix-1.2.6.ebuild,v 1.7 2012/11/10 09:49:50 jlec Exp $ - -EAPI=2 - -inherit elisp-common bash-completion-r1 autotools eutils - -DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)" -HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html" -SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="doc emacs examples" - -DEPEND=" - virtual/latex-base - dev-texlive/texlive-pstricks - dev-texlive/texlive-pictures - dev-texlive/texlive-latexextra - dev-tex/xcolor - emacs? ( virtual/emacs )" -RDEPEND="${DEPEND}" -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - # disable automatic install of doc and examples - epatch \ - "${FILESDIR}"/${P}-doc-gentoo.patch \ - "${FILESDIR}"/${P}-automake.patch - eautoreconf -} - -src_configure() { - econf \ - --docdir=/usr/share/doc/${PF} \ - --disable-epix-el -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - if use emacs; then - # do compilation here as the make install target will - # create the .el file - elisp-compile *.el || die "elisp-compile failed!" - elisp-install ${PN} *.elc *.el || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - dobashcomp bash_completions - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/*gz || die - fi - if use examples; then - cd samples - insinto /usr/share/doc/${PF}/examples - doins *.xp *.flx *c *h README || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sci-visualization/epix/metadata.xml b/sci-visualization/epix/metadata.xml index 99968f74811f..f946cb30e669 100644 --- a/sci-visualization/epix/metadata.xml +++ b/sci-visualization/epix/metadata.xml @@ -1,8 +1,8 @@ -sci - + sci + ePiX creates mathematically accurate figures, plots, and movies using easy-to-learn syntax. The output is expressly suitable for use with LaTeX; figures may be written in a LaTeX picture diff --git a/sec-policy/selinux-base-policy/metadata.xml b/sec-policy/selinux-base-policy/metadata.xml index 9f87a21d4a74..4adcb401b0bb 100644 --- a/sec-policy/selinux-base-policy/metadata.xml +++ b/sec-policy/selinux-base-policy/metadata.xml @@ -6,4 +6,7 @@ Gentoo SELinux base policy. This contains policy for a system at the end of system installation. There is no extra policy in this package. + + Enable support for the unconfined SELinux policy module + diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild index de6cc4601c29..728a75a5632a 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild @@ -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/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.1 2012/10/13 16:30:52 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild,v 1.2 2012/12/04 20:21:53 swift Exp $ EAPI="4" inherit eutils git-2 @@ -8,16 +8,17 @@ inherit eutils git-2 HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/" DESCRIPTION="SELinux policy for core modules" -IUSE="" +IUSE="unconfined" BASEPOL="9999" -RDEPEND="=sec-policy/selinux-base-9999" +RDEPEND="=sec-policy/selinux-base-9999 + unconfined? ( sec-policy/selinux-unconfined )" DEPEND="" EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/hardened-refpolicy.git" EGIT_SOURCEDIR="${WORKDIR}/refpolicy" KEYWORDS="" -MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg unconfined" +MODS="application authlogin bootloader clock consoletype cron dmesg fstools getty hostname hotplug init iptables libraries locallogin logging lvm miscfiles modutils mount mta netutils nscd portage raid rsync selinuxutil ssh staff storage su sysadm sysnetwork udev userdomain usermanage unprivuser xdg" LICENSE="GPL-2" SLOT="0" S="${WORKDIR}/" @@ -92,19 +93,10 @@ pkg_postinst() { done for i in ${POLICY_TYPES}; do - local LOCCOMMAND - local LOCMODS - if [[ "${i}" != "targeted" ]]; then - LOCCOMMAND=$(echo "${COMMAND}" | sed -e 's:-i unconfined.pp::g'); - LOCMODS=$(echo "${MODS}" | sed -e 's: unconfined::g'); - else - LOCCOMMAND="${COMMAND}" - LOCMODS="${MODS}" - fi - einfo "Inserting the following modules, with base, into the $i module store: ${LOCMODS}" + einfo "Inserting the following modules, with base, into the $i module store: ${MODS}" cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" - semodule -s ${i} -b base.pp ${LOCCOMMAND} || die "Failed to load in base and modules ${LOCMODS} in the $i policy store" + semodule -s ${i} -b base.pp ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" done } diff --git a/sec-policy/selinux-base/metadata.xml b/sec-policy/selinux-base/metadata.xml index 393f3bb02965..39f241587154 100644 --- a/sec-policy/selinux-base/metadata.xml +++ b/sec-policy/selinux-base/metadata.xml @@ -10,5 +10,6 @@ Enable the labeled networking peer permissions (SELinux policy capability). Enable the open permissions for file object classes (SELinux policy capability). Enable User Based Access Control (UBAC) in the SELinux policy + Enable support for the unconfined SELinux module diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild index c2c7084df1e9..d760869d5258 100644 --- a/sec-policy/selinux-base/selinux-base-9999.ebuild +++ b/sec-policy/selinux-base/selinux-base-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-9999.ebuild,v 1.1 2012/10/13 16:30:53 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-base/selinux-base-9999.ebuild,v 1.2 2012/12/04 20:21:53 swift Exp $ EAPI="4" inherit eutils git-2 -IUSE="+peer_perms +open_perms +ubac doc" +IUSE="+peer_perms +open_perms +ubac unconfined doc" DESCRIPTION="Gentoo base policy for SELinux" HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/" @@ -63,13 +63,15 @@ src_configure() { echo "DISTRO = gentoo" >> "${S}/refpolicy/build.conf" + # Prepare initial configuration + cd "${S}/refpolicy"; + make conf || die "Make conf failed" + # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". for i in ${POLICY_TYPES}; do cp -a "${S}/refpolicy" "${S}/${i}" - cd "${S}/${i}"; - make conf || die "Make conf in ${i} failed" #cp "${FILESDIR}/modules-2.20120215.conf" "${S}/${i}/policy/modules.conf" sed -i -e "/= module/d" "${S}/${i}/policy/modules.conf" @@ -89,6 +91,12 @@ src_configure() { "${S}/${i}/config/appconfig-standard/seusers" \ || die "targeted seusers setup failed." fi + + if [ "${i}" != "targeted" ] && [ "${i}" != "strict" ] && use unconfined; then + sed -i -e '/root/d' -e 's/user_u/unconfined_u/' \ + "${S}/${i}/config/appconfig-${i}/seusers" \ + || die "policy seusers setup failed." + fi done } diff --git a/sec-policy/selinux-dirsrv/Manifest b/sec-policy/selinux-dirsrv/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sec-policy/selinux-dirsrv/metadata.xml b/sec-policy/selinux-dirsrv/metadata.xml new file mode 100644 index 000000000000..c2abf9591f70 --- /dev/null +++ b/sec-policy/selinux-dirsrv/metadata.xml @@ -0,0 +1,6 @@ + + + + selinux + Gentoo SELinux policy for dirsrv + diff --git a/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild new file mode 100644 index 000000000000..a032bccdf6f1 --- /dev/null +++ b/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sec-policy/selinux-dirsrv/selinux-dirsrv-9999.ebuild,v 1.1 2012/12/04 19:42:05 swift Exp $ +EAPI="4" + +IUSE="" +MODS="dirsrv" +BASEPOL="9999" + +inherit selinux-policy-2 + +DESCRIPTION="SELinux policy for dirsrv" + +KEYWORDS="" diff --git a/sys-apps/accountsservice/accountsservice-0.6.29.ebuild b/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild similarity index 91% rename from sys-apps/accountsservice/accountsservice-0.6.29.ebuild rename to sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild index efb84d76e160..7c3d067993d5 100644 --- a/sys-apps/accountsservice/accountsservice-0.6.29.ebuild +++ b/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild @@ -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/sys-apps/accountsservice/accountsservice-0.6.29.ebuild,v 1.1 2012/11/30 22:38:12 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild,v 1.1 2012/12/04 08:14:58 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -42,6 +42,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch" + epatch "${FILESDIR}/${P}-32bit-crash.patch" # bug #445894, fixed in 0.6.30 use vala && vala_src_prepare gnome2_src_prepare } diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch b/sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch new file mode 100644 index 000000000000..1015072ef709 --- /dev/null +++ b/sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch @@ -0,0 +1,30 @@ +From 4d5166d1833e42d81b854374aa6e73f83a67a70e Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Tue, 27 Nov 2012 18:30:45 -0500 +Subject: [PATCH] Fix a crash on 32bit systems + +The login-frequency property of the User interface is defined +as uint64 type. Therefore, when setting it with g_object_set, +a 64bit value is collected, and passing an int might lead to +bad things. +https://bugs.freedesktop.org/show_bug.cgi?id=57343 +--- + src/daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/daemon.c b/src/daemon.c +index ed3a114..4d6f3ab 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -207,7 +207,7 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha + #ifdef HAVE_UTMPX_H + + typedef struct { +- int frequency; ++ guint64 frequency; + gint64 time; + GList *previous_logins; + } UserAccounting; +-- +1.8.0 + diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 25648d81ff82..c2bf8324f65b 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -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/sys-apps/busybox/busybox-9999.ebuild,v 1.7 2012/11/02 18:59:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.8 2012/12/04 12:10:35 blueness Exp $ EAPI="4" inherit eutils flag-o-matic savedconfig toolchain-funcs multilib @@ -81,6 +81,10 @@ busybox_config_option() { einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...) } +busybox_config_enabled() { + grep "^CONFIG_$1=y" -q .config +} + src_prepare() { unset KBUILD_OUTPUT #88088 append-flags -fno-strict-aliasing #310413 @@ -88,7 +92,7 @@ src_prepare() { # patches go here! epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/${P}-*.patch + #epatch "${FILESDIR}"/${P}-*.patch cp "${FILESDIR}"/ginit.c init/ || die # flag cleanup @@ -233,6 +237,24 @@ src_install() { dosym busybox /bin/vi fi + # add busybox daemon's, bug #444718 + if busybox_config_enabled FEATURE_NTPD_SERVER; then + newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" + newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" + fi + if busybox_config_enabled SYSLOGD; then + newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" + newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" + fi + if busybox_config_enabled KLOGD; then + newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" + newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" + fi + if busybox_config_enabled WATCHDOG; then + newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" + newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" + fi + # bundle up the symlink files for use later emake DESTDIR="${ED}" install rm _install/bin/busybox diff --git a/sys-apps/busybox/files/klogd.confd b/sys-apps/busybox/files/klogd.confd new file mode 100644 index 000000000000..4c16096a4e15 --- /dev/null +++ b/sys-apps/busybox/files/klogd.confd @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-sysklogd + +# run "/sbin/klogd --help" to see all possible options. + +# activate if you need remote logging +#rc_need="net" + +# send warnings and above to the console +KLOGD_OPTS="-c 3" diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd new file mode 100644 index 000000000000..0eba0cbfc68f --- /dev/null +++ b/sys-apps/busybox/files/klogd.initd @@ -0,0 +1,12 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/klogd.initd,v 1.1 2012/12/04 12:10:35 blueness Exp $ + +# Note: the klogd applet does not produce a pidfile +command="/bin/busybox klogd" +command_args="${KLOGD_OPTS}" + +depend() { + need clock hostname +} diff --git a/sys-apps/busybox/files/ntpd.confd b/sys-apps/busybox/files/ntpd.confd new file mode 100644 index 000000000000..f50d4c2e9179 --- /dev/null +++ b/sys-apps/busybox/files/ntpd.confd @@ -0,0 +1,6 @@ +# Config file for /etc/init.d/busybox-ntpd + +# run "/sbin/ntpd --help" to see all possible options. + +# Get time from specified server and run in background +NTPD_OPTS="-N -p pool.ntp.org" diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd new file mode 100644 index 000000000000..516e3a6888c6 --- /dev/null +++ b/sys-apps/busybox/files/ntpd.initd @@ -0,0 +1,13 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/ntpd.initd,v 1.1 2012/12/04 12:10:35 blueness Exp $ + +# Note: the ntpd applet does not produce a pidfile +command="/bin/busybox ntpd" +command_args="${NTPD_OPTS}" + +depend() { + use net dns logger + after ntp-client +} diff --git a/sys-apps/busybox/files/syslogd.confd b/sys-apps/busybox/files/syslogd.confd new file mode 100644 index 000000000000..7df6885cedbb --- /dev/null +++ b/sys-apps/busybox/files/syslogd.confd @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-sysklogd + +# run "/sbin/syslogd --help" to see all possible options. + +# activate if you need remote logging +#rc_need="net" + +# Log to shared mem buffer (use logread to read it) +SYSLOGD_OPTS="-C128" diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd new file mode 100644 index 000000000000..0f91fccf4227 --- /dev/null +++ b/sys-apps/busybox/files/syslogd.initd @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/syslogd.initd,v 1.1 2012/12/04 12:10:35 blueness Exp $ + +# Note: the syslogd pid file is hard coded +command="/bin/busybox syslogd" +command_args="${SYSLOGD_OPTS}" +pidfile="/var/run/syslogd.pid" + +depend() { + need clock hostname + provide logger +} diff --git a/sys-apps/busybox/files/watchdog.confd b/sys-apps/busybox/files/watchdog.confd new file mode 100644 index 000000000000..bd6aec0a7068 --- /dev/null +++ b/sys-apps/busybox/files/watchdog.confd @@ -0,0 +1,9 @@ +# Config file for /etc/init.d/busybox-watchdog + +# run "/sbin/watchdog --help" to see all possible options. + +# Periodically write to watchdog device +WATCHDOG_OPTS="/dev/watchdog" + +# optionally set the nice-level +#SSD_NICELEVEL="-20" diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd new file mode 100644 index 000000000000..737937d21e9d --- /dev/null +++ b/sys-apps/busybox/files/watchdog.initd @@ -0,0 +1,12 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/files/watchdog.initd,v 1.1 2012/12/04 12:10:35 blueness Exp $ + +# Note: the watchdog applet does not produce a pidfile +command="/bin/busybox watchdog" +command_args="${WATCHDOG_OPTS}" + +depend() { + provide watchdog +} diff --git a/sys-apps/coreutils/coreutils-8.20.ebuild b/sys-apps/coreutils/coreutils-8.20.ebuild index ad9eb021f5c5..5a5d229214e7 100644 --- a/sys-apps/coreutils/coreutils-8.20.ebuild +++ b/sys-apps/coreutils/coreutils-8.20.ebuild @@ -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/sys-apps/coreutils/coreutils-8.20.ebuild,v 1.5 2012/12/02 22:52:47 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.20.ebuild,v 1.6 2012/12/04 15:36:23 ago Exp $ EAPI="3" @@ -17,7 +17,7 @@ SRC_URI="mirror://gnu-alpha/coreutils/${P}.tar.xz LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd" IUSE="acl caps gmp nls selinux static userland_BSD vanilla xattr" LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest index c7d30f7b77d0..15ee9f4fce9e 100644 --- a/sys-apps/irqbalance/Manifest +++ b/sys-apps/irqbalance/Manifest @@ -4,3 +4,4 @@ DIST irqbalance-1.0.1.tar.gz 333094 SHA256 680e39a77695694d631a6bb27441d27059776 DIST irqbalance-1.0.2.tar.gz 335040 SHA256 7d4a2526403e4a60b6e36b14fcfba80c950a96c7c4426e1e514ea9f2c464b2ee DIST irqbalance-1.0.3.tar.gz 335534 SHA256 fd97b7d1570e807a134bc25a0bfb97ebed16ae7dbe2e3583db217c3a3960c7df SHA512 bec94cb91022495d0948aac1f73380a5800730c23bcdb156062d2faeb341caddaef71fe83500105f0f73a863bd6f391aa09ee9db1e5c5dd0bcb21b7e0007c246 WHIRLPOOL f4b40e4e896c8cf4068aba6ab28a2b179e5e766a4aff3a257f5de3208cabcb8ba452c5259370b9f388e29088ac4b699fd325088e21ebda2eb426c92f9c0f636b DIST irqbalance-1.0.4.tar.bz2 286985 SHA256 15725edf4a6f20258620cbd05ebf02d0c25aadd5ffa4871ef8507c9215021c43 SHA512 f61d7cd0690a80cfa2ff249a75db675179d4a945bc784b3af8293200a642b6ac0e0564b8c7b8fc0a63363caf8ebab2a7b50b6699cb53587fafd5b50cf73c0f11 WHIRLPOOL ab1a7717cd1c08ce17ac831d75f934aa0d48653f8c194cf683694c498532a90086de18ee3cc0ee7ad09e4cce442173c94dd98e919b8f169e716eb6ead5f593c6 +DIST irqbalance-1.0.5.tar.gz 350213 SHA256 1123e75224b9c0b63ac85892e920bc4a9c76211278ea3d5d4bcbbde44815685c SHA512 333587c16221532be6a353d628b5f8cc557f7917fb423cfac0092f9a5000cc82b042d37b9c3160f5d37d931e8e50a313278e8e30f2dc65f7db60fdf95664bc06 WHIRLPOOL 7fd5e93c0549011c593dbcad9fd9fe94706ac78d4e394a098b0eb63f6de33225f2358aaf84863c662fb392463dfa97777587753df69c041033dee06f91844aa8 diff --git a/sys-apps/irqbalance/irqbalance-1.0.5.ebuild b/sys-apps/irqbalance/irqbalance-1.0.5.ebuild new file mode 100644 index 000000000000..ba11a0cff664 --- /dev/null +++ b/sys-apps/irqbalance/irqbalance-1.0.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/irqbalance/irqbalance-1.0.5.ebuild,v 1.1 2012/12/04 15:45:35 cardoe Exp $ + +EAPI=4 + +inherit systemd + +DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system" +HOMEPAGE="http://irqbalance.googlecode.com/" +SRC_URI="http://irqbalance.googlecode.com/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="caps numa" + +RDEPEND="dev-libs/glib:2 + caps? ( sys-libs/libcap-ng ) + numa? ( sys-process/numactl )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + econf \ + $(use_with caps libcap-ng) \ + $(use_enable numa) +} + +src_install() { + default + newinitd "${FILESDIR}"/irqbalance.init.2 irqbalance + newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance + systemd_dounit "${FILESDIR}"/irqbalance.service +} diff --git a/sys-apps/portage/portage-2.1.11.31.ebuild b/sys-apps/portage/portage-2.1.11.31.ebuild index 4f05bc99c121..d7cd35eb56de 100644 --- a/sys-apps/portage/portage-2.1.11.31.ebuild +++ b/sys-apps/portage/portage-2.1.11.31.ebuild @@ -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/sys-apps/portage/portage-2.1.11.31.ebuild,v 1.6 2012/11/16 11:50:25 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.31.ebuild,v 1.8 2012/12/05 02:19:14 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -37,9 +37,10 @@ DEPEND="${python_dep} # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). +# For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 + || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) diff --git a/sys-apps/portage/portage-2.1.11.33.ebuild b/sys-apps/portage/portage-2.1.11.33.ebuild index 28caf8262b4c..c1c98f45a064 100644 --- a/sys-apps/portage/portage-2.1.11.33.ebuild +++ b/sys-apps/portage/portage-2.1.11.33.ebuild @@ -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/sys-apps/portage/portage-2.1.11.33.ebuild,v 1.1 2012/12/01 22:02:41 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.33.ebuild,v 1.3 2012/12/05 02:19:14 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -37,9 +37,10 @@ DEPEND="${python_dep} # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). +# For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 + || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) diff --git a/sys-apps/portage/portage-2.1.11.9.ebuild b/sys-apps/portage/portage-2.1.11.9.ebuild index 80079c5817c7..1d3de1f0b893 100644 --- a/sys-apps/portage/portage-2.1.11.9.ebuild +++ b/sys-apps/portage/portage-2.1.11.9.ebuild @@ -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/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.10 2012/09/01 21:10:02 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.11.9.ebuild,v 1.12 2012/12/05 02:19:14 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -37,9 +37,10 @@ DEPEND="${python_dep} # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). +# For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 + || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) diff --git a/sys-apps/portage/portage-2.2.0_alpha142.ebuild b/sys-apps/portage/portage-2.2.0_alpha142.ebuild index f502194ad839..6b527cc5edba 100644 --- a/sys-apps/portage/portage-2.2.0_alpha142.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha142.ebuild @@ -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/sys-apps/portage/portage-2.2.0_alpha142.ebuild,v 1.1 2012/10/26 20:00:58 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha142.ebuild,v 1.3 2012/12/05 02:19:14 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -37,9 +37,10 @@ DEPEND="${python_dep} # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). +# For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 + || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) diff --git a/sys-apps/portage/portage-2.2.0_alpha144.ebuild b/sys-apps/portage/portage-2.2.0_alpha144.ebuild index e85baec7d724..baeda7b8d5d1 100644 --- a/sys-apps/portage/portage-2.2.0_alpha144.ebuild +++ b/sys-apps/portage/portage-2.2.0_alpha144.ebuild @@ -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/sys-apps/portage/portage-2.2.0_alpha144.ebuild,v 1.1 2012/12/01 22:03:33 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha144.ebuild,v 1.3 2012/12/05 02:19:14 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -37,9 +37,10 @@ DEPEND="${python_dep} # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). +# For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 + || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index e5dbc06a8691..07eaa919f42d 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -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/sys-apps/portage/portage-9999.ebuild,v 1.60 2012/10/10 22:16:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.62 2012/12/05 02:19:14 zmedico Exp $ EAPI=3 inherit git-2 eutils python @@ -35,9 +35,10 @@ DEPEND="${python_dep} # to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so # for now, don't pull in xattr deps for other kernels. # For whirlpool hash, require python[ssl] or python-mhash (bug #425046). +# For compgen, require bash[readline] (bug #445576). RDEPEND="${python_dep} !build? ( >=sys-apps/sed-4.0.5 - >=app-shells/bash-3.2_p17 + || ( >=app-shells/bash-4.2_p37[readline] ( =app-shells/bash-3.2_p17 ) ) >=app-admin/eselect-1.2 || ( ${python_dep_ssl} dev-python/python-mhash ) ) diff --git a/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch b/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch new file mode 100644 index 000000000000..694d3ef01138 --- /dev/null +++ b/sys-apps/systemd/files/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch @@ -0,0 +1,31 @@ +From 94949efc89245ad8234d704ebb453e2f77605fd3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Tue, 4 Dec 2012 17:35:55 +0100 +Subject: [PATCH 2/2] Don't fail with missing gcrypt macros. + +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index d0003bb..e804fdc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -412,12 +412,14 @@ AC_ARG_ENABLE([gcrypt], + [have_gcrypt=auto]) + + if test "x${have_gcrypt}" != xno ; then ++m4_ifdef([AM_PATH_LIBGCRYPT], [ + AM_PATH_LIBGCRYPT( + [1.4.5], + [have_gcrypt=yes], + [if test "x$have_gcrypt" = xyes ; then + AC_MSG_ERROR([*** GCRYPT headers not found.]) + fi]) ++]) + + if test "x$have_gcrypt" = xyes ; then + GCRYPT_LIBS="$LIBGCRYPT_LIBS" +-- +1.8.0 + diff --git a/sys-apps/systemd/systemd-196.ebuild b/sys-apps/systemd/systemd-196.ebuild index a3e965ba3716..71ee768fbcc4 100644 --- a/sys-apps/systemd/systemd-196.ebuild +++ b/sys-apps/systemd/systemd-196.ebuild @@ -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/sys-apps/systemd/systemd-196.ebuild,v 1.1 2012/12/02 10:58:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.2 2012/12/04 16:55:11 mgorny Exp $ EAPI=4 @@ -75,6 +75,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}"/196-0001-Disable-udev-targets.patch + "${FILESDIR}"/196-0002-Don-t-fail-with-missing-gcrypt-macros.patch ) autotools-utils_src_prepare diff --git a/sys-auth/sssd/sssd-1.9.2.ebuild b/sys-auth/sssd/sssd-1.9.2.ebuild index 16f014f09037..31dd72c29da9 100644 --- a/sys-auth/sssd/sssd-1.9.2.ebuild +++ b/sys-auth/sssd/sssd-1.9.2.ebuild @@ -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/sys-auth/sssd/sssd-1.9.2.ebuild,v 1.1 2012/10/17 17:18:51 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/sssd/sssd-1.9.2.ebuild,v 1.2 2012/12/04 15:42:22 maksbotan Exp $ EAPI=4 @@ -119,7 +119,7 @@ src_install(){ if use python; then python_clean_installation_image - python_convert_shebangs 2 -r "${ED}$(python_get_sitedir)"/*.py + python_convert_shebangs -r 2 "${ED}$(python_get_sitedir)"/*.py fi newconfd "${FILESDIR}"/sssd.conf sssd } diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest index e9f32bf50d53..699830d56a6c 100644 --- a/sys-block/mbuffer/Manifest +++ b/sys-block/mbuffer/Manifest @@ -1,3 +1,4 @@ -DIST mbuffer-20090113.tgz 106584 RMD160 79592bc031ed8bbc7416a799583fd2fe528e9708 SHA1 7917d96ddf52b4744f8f91ec525fb10dc0d42d4e SHA256 f36988cafefe0489839ed183123a940ae688f5074a2bf97982f68df6d65314f0 -DIST mbuffer-20110724.tgz 117321 RMD160 2c75355f21a9a7de3a05fcd50a17f88dacba8af5 SHA1 1cdd01920320b14d7ad9b4cc6d3c96a2da000345 SHA256 7e69db02ce518f8583cd76c4c8b152c86d4b3527124518cbf450b7bc58cd3c74 -DIST mbuffer-20120505.tgz 117404 RMD160 6b56d790c6f41b4c9db70b29e50b33018d395ffd SHA1 5c0f56c5756efce541fcdc396f67571d521fb59d SHA256 c8e828056eef1237b08a0581ba4b99b72f850520e602ebfd03864cfdceefdd47 +DIST mbuffer-20090113.tgz 106584 SHA256 f36988cafefe0489839ed183123a940ae688f5074a2bf97982f68df6d65314f0 +DIST mbuffer-20110724.tgz 117321 SHA256 7e69db02ce518f8583cd76c4c8b152c86d4b3527124518cbf450b7bc58cd3c74 +DIST mbuffer-20120505.tgz 117404 SHA256 c8e828056eef1237b08a0581ba4b99b72f850520e602ebfd03864cfdceefdd47 SHA512 64fbd77e5ae95f500b3ecf9065fba4050e67e5063fc52b6316c41708b311ccdb3a8f7a82f0cc65db6448131664c29cae23f2928a9593d833cb247cca891a71e0 WHIRLPOOL 80af2313dbbdbe2162366ad6c038ec29cb640267f0c5914e9643c66869e22ea03d21240a26314ba69f05a5f58e856c00148d2f98817c56f277b149e8cef934b5 +DIST mbuffer-20121111.tgz 120137 SHA256 38359fc57ffbb874c787f337033c833ebf835bc15f430c59b0481dd1bb653c72 SHA512 0d1fce7d6ecbae48f9f782ad969dc742f5672a243b039a740c4be28f358160bf1dfd6d55f89d8562d9dced2eb33c47b25cb85203d39ac3ba4874d96b19b8e8ca WHIRLPOOL ba191cf461c383828439edf2381b55c62082fb1d7c0b941d93679131a570c00b3abad444c39ec71f5f4ba12563c4ff3325c7c70dfffb24ca146c9aad728b070b diff --git a/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch new file mode 100644 index 000000000000..08e0b83441b5 --- /dev/null +++ b/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch @@ -0,0 +1,21 @@ +diff -u mbuffer-20121111.orig/Makefile.in mbuffer-20121111/Makefile.in +--- mbuffer-20121111.orig/Makefile.in 2012-11-16 11:17:11.000000000 +0100 ++++ mbuffer-20121111/Makefile.in 2012-12-04 22:43:00.186863737 +0100 +@@ -77,7 +77,7 @@ + ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \ + sleep 1; \ + rm -f $@.tar; \ +- ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \ ++ ./mbuffer -i test.tar -o /dev/null -O 127.0.0.1:8000 -H; \ + wait + sync + diff $@.md5 test.md5 +@@ -92,7 +92,7 @@ + ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \ + sleep 1; \ + rm -f $@.tar; \ +- ./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \ ++ ./mbuffer -i test.tar -o /dev/null -6 -O ::1:8000 -o $@.tar -H; \ + wait + sync + diff $@.md5 test.md5 diff --git a/sys-block/mbuffer/mbuffer-20121111.ebuild b/sys-block/mbuffer/mbuffer-20121111.ebuild new file mode 100644 index 000000000000..31b2a6e3f50c --- /dev/null +++ b/sys-block/mbuffer/mbuffer-20121111.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/mbuffer/mbuffer-20121111.ebuild,v 1.3 2012/12/04 22:12:37 wschlich Exp $ + +EAPI="4" + +inherit eutils + +DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality" +HOMEPAGE="http://www.maier-komor.de/mbuffer.html" +SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug ssl" + +DEPEND="ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND}" + +src_prepare() { + ln -s "${DISTDIR}"/${P}.tgz test.tar #258881 + # work around "multi off" in /etc/host.conf and "::1 localhost" + # *not* being the *first* "localhost" entry in /etc/hosts + epatch "${FILESDIR}/${P}-resolv-multi-order-issue.patch" +} + +src_configure() { + econf \ + $(use_enable ssl md5) \ + $(use_enable debug) +} + +src_install() { + emake install DESTDIR="${D}" + dodoc AUTHORS INSTALL NEWS README ChangeLog +} diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5-r1.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5-r1.ebuild index be6c2ff5bf59..7c10f260ca07 100644 --- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5-r1.ebuild +++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5-r1.ebuild @@ -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/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5-r1.ebuild,v 1.5 2012/12/02 10:41:40 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.1.5-r1.ebuild,v 1.6 2012/12/04 15:38:35 ago Exp $ EAPI=4 @@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="dev-libs/expat" diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest index 95bd3eb10e41..491e2fa0e64b 100644 --- a/sys-cluster/util-vserver/Manifest +++ b/sys-cluster/util-vserver/Manifest @@ -1,2 +1,2 @@ -DIST util-vserver-0.30.216-pre2910.tar.bz2 714605 RMD160 b5e1c79207809bdc91700b5017a48fd08b4701e4 SHA1 bbfede97691778520d79be33e8e6a681146393b9 SHA256 a07b90442bb1de4cedac668fd505199eeb70aff53482e0bbd2535875cde46d06 -DIST util-vserver-0.30.216-pre3025.tar.bz2 760763 RMD160 9f67a4415031cc7b1d6ba0d0b22452a3b2472a2d SHA1 0108f2d121c0ec540d230fe3a33e27423487567d SHA256 6b6df2e96105361e7ede644d522e1cee60fd71ef72715b82e40a4a93ce7ea949 +DIST util-vserver-0.30.216-pre2910.tar.bz2 714605 SHA256 a07b90442bb1de4cedac668fd505199eeb70aff53482e0bbd2535875cde46d06 +DIST util-vserver-0.30.216-pre3025.tar.bz2 760763 SHA256 6b6df2e96105361e7ede644d522e1cee60fd71ef72715b82e40a4a93ce7ea949 SHA512 5d799a19c8c78b7c2222e0d17490010d065e02e2a49020fb4766a98fb85a59d889881d231a279012935ff3d108706edf71c1e8736390cb9a7ce9af969a716a56 WHIRLPOOL 06e30603ead7d6835b3f70fb2491698619d82b898980529e9190818df76a4a2575f28fc82bc18cda67def2ae43c0e8c4b8038b10f37caf29f41fd029cce8124c diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild index f8a2f5e720ba..9d8e2edcce6c 100644 --- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild +++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild @@ -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/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild,v 1.1 2012/02/18 16:57:17 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild,v 1.2 2012/12/05 06:03:49 patrick Exp $ EAPI=4 @@ -57,7 +57,7 @@ src_configure() { } src_compile() { - emake || die "emake failed!" + emake -j1 || die "emake failed!" } src_install() { diff --git a/sys-firmware/vgabios/vgabios-0.7a.ebuild b/sys-firmware/vgabios/vgabios-0.7a.ebuild index f9f451b225c5..d1e39d9bfa79 100644 --- a/sys-firmware/vgabios/vgabios-0.7a.ebuild +++ b/sys-firmware/vgabios/vgabios-0.7a.ebuild @@ -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/sys-firmware/vgabios/vgabios-0.7a.ebuild,v 1.2 2012/10/24 09:58:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-firmware/vgabios/vgabios-0.7a.ebuild,v 1.3 2012/12/04 11:14:36 ago Exp $ EAPI=4 @@ -17,7 +17,7 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tgz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug" DEPEND="amd64? ( sys-devel/dev86 ) diff --git a/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild index d95f7cd4c0a3..5a515d16802d 100644 --- a/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild +++ b/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild @@ -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/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild,v 1.5 2012/11/26 20:36:26 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild,v 1.6 2012/12/04 13:11:29 ago Exp $ EAPI=4 @@ -20,7 +20,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" DEPEND="dev-vcs/git" diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest index db9dd61be6e6..5c6e544abcbb 100644 --- a/sys-fs/extundelete/Manifest +++ b/sys-fs/extundelete/Manifest @@ -1 +1,2 @@ -DIST extundelete-0.2.0.tar.bz2 97851 RMD160 619cc4edf0f50e22008317bd0ff97a96ac2e0bea SHA1 f37fe490c002baed795ff01e9fa1659332811f0c SHA256 0f6a3004d8ddcafe63059a104c174f753c7fc95455081f3ff5aaf3b8c100f97b +DIST extundelete-0.2.0.tar.bz2 97851 SHA256 0f6a3004d8ddcafe63059a104c174f753c7fc95455081f3ff5aaf3b8c100f97b SHA512 2d4b18110795a5318fab5c5889a9b516360ea420215d0a3692322b30e87d5bb3954bbba725a067322cd76e7bba06466032a1405f9fc6dbc3f318723be238b317 WHIRLPOOL 5e79c5485eb323593289bc7b82a0960c9174e91f1491b9c64097c6095b7065b14dfafa3efe89030dbd3007d28ff54bb4d12814f5a5cf72920ceff63085c437a9 +DIST extundelete_0.2.0-2.1.debian.tar.gz 6862 SHA256 3e37f24ac60bd60a0d162184b2834b85bac0cd4cd2d055e1f687ed6a88f70f97 SHA512 37b74347a3017edfd28714731125f968f66beac1b7b7ebd1d44e3d3dff9da06216560433f330f4a544da24f7083f6e900fbe8a5c2930e8760405cb72e6a918e3 WHIRLPOOL e403d2f546d3d15032f6e49220cc0ca55bb9d7cfd0515030b57058e4d177f00ac34c378d08e5eb61245287322fa9d4d579d169e41e2b6b01e0109e112dff7642 diff --git a/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild b/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild new file mode 100644 index 000000000000..5c5ea8498ede --- /dev/null +++ b/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/extundelete/extundelete-0.2.0-r2.ebuild,v 1.2 2012/12/04 22:03:00 ssuominen Exp $ + +EAPI=5 +inherit eutils + +_UNDEL_DEB=2.1 +_UNDEL_E2FS=1.42.6 + +DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition" +HOMEPAGE="http://extundelete.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${_UNDEL_DEB}.debian.tar.gz" + +LICENSE="GPL-2" +SLOT=0 +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=sys-fs/e2fsprogs-${_UNDEL_E2FS} + >=sys-libs/e2fsprogs-libs-${_UNDEL_E2FS}" +DEPEND=${RDEPEND} + +DOCS=README + +src_prepare() { + local d=${WORKDIR}/debian/patches + EPATCH_SOURCE=${d} epatch $(<"${d}"/series) +} diff --git a/sys-fs/extundelete/extundelete-0.2.0.ebuild b/sys-fs/extundelete/extundelete-0.2.0.ebuild deleted file mode 100644 index 5561ccfd2c97..000000000000 --- a/sys-fs/extundelete/extundelete-0.2.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/extundelete/extundelete-0.2.0.ebuild,v 1.3 2011/06/19 13:59:20 maekke Exp $ - -EAPI=3 - -_E2FS=1.41.11 - -DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition" -HOMEPAGE="http://extundelete.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=">=sys-fs/e2fsprogs-${_E2FS} - >=sys-libs/e2fsprogs-libs-${_E2FS}" - -src_configure() { - econf \ - --disable-dependency-tracking -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc README -} diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml index c2d865517c00..e9e6c9bb5eb0 100644 --- a/sys-fs/extundelete/metadata.xml +++ b/sys-fs/extundelete/metadata.xml @@ -1,8 +1,9 @@ - - ssuominen@gentoo.org - Samuli Suominen - + base-system + + ssuominen@gentoo.org + Samuli Suominen + diff --git a/sys-fs/ncdu/ncdu-1.9.ebuild b/sys-fs/ncdu/ncdu-1.9.ebuild index 3673a682a713..f1a3bc3017d6 100644 --- a/sys-fs/ncdu/ncdu-1.9.ebuild +++ b/sys-fs/ncdu/ncdu-1.9.ebuild @@ -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/sys-fs/ncdu/ncdu-1.9.ebuild,v 1.5 2012/11/29 13:15:12 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/ncdu/ncdu-1.9.ebuild,v 1.6 2012/12/04 11:23:08 ago Exp $ EAPI=4 @@ -10,7 +10,7 @@ SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="" DEPEND="sys-libs/ncurses" diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest index d6433d64d280..e5185a5c5e30 100644 --- a/sys-kernel/git-sources/Manifest +++ b/sys-kernel/git-sources/Manifest @@ -6,3 +6,4 @@ DIST patch-3.7-rc4.bz2 16489034 SHA256 c4a7b1b88d7251981263004d13a66ff5cf264ee57 DIST patch-3.7-rc5.bz2 16509886 SHA256 6cb424c354b6b67a37511e75f279b9fbbbf61ecf375e0c175a905b6cf967bb26 SHA512 386f703d8a9cc24c0abe18983c30e2462d9c94ab90dfa01d26c325963cdad961f09607781c3bcd52eff8de61955e98a40e034074ac82c1d84a5193f62ea26de6 WHIRLPOOL b6f376e31c634c73aa827628e5fb737bdddab84292fe7321db497f2c3bcf8dabb4c7bddfeefbde2a4b882cf444c2bb31f1b89c16e375654715fec76f8e86c8a1 DIST patch-3.7-rc6.bz2 16523460 SHA256 bb5e402ac79cdfe8dbe361b32ff2bfe53741e1c8175bbece90e7093215b68edc SHA512 b731d7879c398322006f37b0163e8d19736a2007a960296aaa0c6bdfb8770e6f956904617f3aea7fdb6807886f0de2ed7107e826511ffcb80ccfef30c00a2a69 WHIRLPOOL 5bc33bab5cafb149faecee552f83fc1e5c0b750aa8488919279ba825cab65412c6c9d5e9f0b2be9ea3d1f4b11dc32480ec1811adeb89e8d820aeebe9fbc9c94d DIST patch-3.7-rc7.bz2 16526973 SHA256 a090d7164309b101925c2b2f0f45947270bc6fd4893301d1e4afd798b8e5c8d2 SHA512 e46ba4b26184a871cb7d4c13731c8a35a4621457519d87ad458aca42eeefd377d0a23ddad8d2a3d4ac47d5cc7bbf0bc4748bc891f284cd39ffbfdbaf632f92fe WHIRLPOOL 190e052446df0ca6caddcf9c6d92d899432c9262644101b20ae2e067fb605415cab41ea84821b0e346cee9d41d6bc68001bf5fa29dce1376aaa5c0e1132b226d +DIST patch-3.7-rc8.bz2 16551678 SHA256 9b262ceaae8bf0ec44fc043e4e354847d2999e722d58e00f94543f0aab332740 SHA512 1baddde540d354707c0964ed56ac905f550cc4b03f53e271e914c7fb5927ded0942c7800762e5ea15f6eff95871b714ae5a2ee1bf716df05c1e3af40d87614c7 WHIRLPOOL 90e78a2b2bd3d7d1afc2172abc15d6e3e6e96dd29fdf0080ae08d48c228e61bdad1455956bba1a659d35d6fa76b7adea8e0e3cafa4870372116e4fa2d4e88305 diff --git a/sys-kernel/git-sources/git-sources-3.7_rc8.ebuild b/sys-kernel/git-sources/git-sources-3.7_rc8.ebuild new file mode 100644 index 000000000000..24cc3a0ae9ed --- /dev/null +++ b/sys-kernel/git-sources/git-sources-3.7_rc8.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/git-sources/git-sources-3.7_rc8.ebuild,v 1.1 2012/12/04 18:41:00 ago Exp $ + +EAPI="4" +UNIPATCH_STRICTORDER="yes" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_NOUSEPR="yes" +K_SECURITY_UNSUPPORTED="yes" +K_DEBLOB_AVAILABLE=0 +ETYPE="sources" +CKV="${PVR/-r/-git}" + +# only use this if it's not an _rc/_pre release +[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}" +inherit kernel-2 +detect_version + +DESCRIPTION="The very latest -git version of the Linux kernel" +HOMEPAGE="http://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="" + +K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and +experimental nature. If you have any issues, try a matching vanilla-sources +ebuild -- if the problem is not there, please contact the upstream kernel +developers at http://bugzilla.kernel.org and on the linux-kernel mailing list to +report the problem so it can be fixed in time for the next kernel release." + +pkg_postinst() { + postinst_sources +} diff --git a/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild index 11cc30b55e85..4d916568a5ad 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild @@ -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/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild,v 1.3 2012/11/13 22:51:01 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild,v 1.4 2012/12/04 11:31:05 ago Exp $ EAPI=4 inherit savedconfig @@ -17,7 +17,7 @@ DESCRIPTION="Linux firmware files" HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" -KEYWORDS="amd64 arm ~ia64 ~x86" +KEYWORDS="amd64 arm ~ia64 x86" SLOT="0" IUSE="savedconfig" diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest index 47601209d5e1..33750f597bae 100644 --- a/sys-kernel/vanilla-sources/Manifest +++ b/sys-kernel/vanilla-sources/Manifest @@ -18,8 +18,10 @@ DIST linux-3.5.tar.bz2 80978443 SHA256 6ab82beb8cbb895b7523daed7ec3ec5850cf460b9 DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251 DIST patch-2.6.32.60.bz2 987764 SHA256 611dbc724cd43617baff4500b0c8470889e4c6071f6ab916bfee7d097783394c SHA512 8228a7a6f7264b1a20802411c13f0d194fd48f5f5965cb96bfac0410b2a945b53c8e458eddafa58247125d3ba04e17dd68636302b57654934046a8bc0538834f WHIRLPOOL 834a654a5cb261226c57295ea3c60f5e405b11197103c4cd8721ff78adb3bbc4ced2c757492ee3b70735c8c28dd0717bfafeb9181280034b764bae18f2ab47b0 DIST patch-3.0.53.bz2 771850 SHA256 861e8ef93b1f6bebf969ad0a66778dc221d66882ad9a1521df5fb6303a90fcb4 SHA512 720b264600c0eedba485157614a12192da44b6ddb69eebc2bf1cdce0a5701b7219777f15278ecc6019ac43901c6042d6c7c2a32d09fdf7b423b35847b278adc5 WHIRLPOOL aa61080f3885aaeb97a69a65dc39566cb898deea3975289a0a910cb835b7ea58bd053212f800460253266632d659451c6bae9b66431d938e7bfbbcdbf9ee2711 +DIST patch-3.0.54.bz2 778719 SHA256 f49644566f5579e6a61142038e444315fbafac3e8200753c4e22af85813f4ee0 SHA512 ddda86356ca75e51c9a797d37069f7a31249b429ded3b99d486d2a2080f0ee8fe5792bfe1aab69dbca233b28b860d691b8a26c134162704ceaf45123123d8486 WHIRLPOOL 5159fc110bcb6d56d2b4e5a0958614aee4ceb0672b1939e33305542df03540568ec8f9c9c93227eed93d72fd7477886ab3f41ad6ad331b39715664196ad166de DIST patch-3.2.34.bz2 686556 SHA256 13e09c64e76baf4b69937869a9c4b8fe714c5bd7b6f672c2f5d2745a544b3dee SHA512 88af2121330e8b42fe2bb8e560da729bc5c1e30c63066797b5f0c83268ff2f82853bd2c2e88941fe20b2f9809a0dd50a813f733df5896a1a874c777e9290f58c WHIRLPOOL 2cae2625a14f4f8b91306a856b087ab16b42ef771f2f3c4e0dd39cf54bbc0694b05b38cf258b9bce52d9eddd1ae498c4cbccf01eee0aaa06d0163258e783d764 DIST patch-3.4.20.bz2 435012 SHA256 faa175295845cfe80dbfaa0689dacde07e9f571a90e989b8b838b28079393bdd SHA512 c507516428a61e66d3e57fc56b6580d35c7453b055b39915018013ec3ee8c5ccbad1dd9934b84c8e4e557425830d2ca445c84b69a5a3cf33e8b68a64e4124161 WHIRLPOOL 159c629d376bdbecc2a850645c2b98ec691ab8f00ca1a0bef3043d5a7adffb9813531869a6a832650b65fcabecf7dfc7f82c616d13d64a7923094572aead9dd4 +DIST patch-3.4.21.bz2 446692 SHA256 b78c9c0e88ae5df85192f3e26a6f54015fc171c0d5bad3090bf5c0c0e248d4ff SHA512 486c39f4cf16915e2865e71629722b79de7b1162448bfe2ddcc05336342201624eec4c37c863269949ae6737170356e7e5169eca654a88dd5643f4d69efb3d90 WHIRLPOOL cdeb68830119489f5fdac0d669e221a27de44c4e5db29025a287ced4ebe3ab10ef9bf5ab404c1c7d48765eff5ff49da08e8e4c05ddb4c82eb221cc6ec1569c7b DIST patch-3.4.9.bz2 206198 SHA256 b60ee02e7fb560310cf7922cad3a8003f40b1a5735a1761a297d86f9ca3d4b1e SHA512 088c09c8ab961024cc693e78a2142571700b11ad5972d0b97dc5c5f800efda680626cd42828971b3e25bba6a925825943587a292b0d350b4654b75b18543ec26 WHIRLPOOL 58294a220d07f34efde24d9954dee0c1b944de2792463a36ac2135ad77957900b2d8d70f5a8445e1c6b63798dc8ecb95f386a468e5d24037bc83f914f769d002 DIST patch-3.5.7.bz2 241834 SHA256 c064888f2c815353b2ca483935a9e79572e2d033559b73971f7f32c8eaa4b66f SHA512 024bfbd23905805bf6ce8326b9e69b2d9cd539038cc8c00f3145b8a482caa6eec3993771c69800784ebab0d9c3d43910a9bd5e561012c67df44f663cfd61afc0 WHIRLPOOL 98239024aa4a702aa80fd53b2efb8614ab64eb23c2b35aeb75bc858ca3df4c05f986dd517f455c8fa04ce05079bd03ac1bc974b873e12f431fa773d7766f7015 DIST patch-3.6.4.bz2 114549 SHA256 8be8d0e3afbce44831bfef89472430bcc5bd656f9254a1ecc05bdc5b95323c5b SHA512 6117111928cec588e05d541b0c114edeca1ce6a4ccec1e87fa6ceb42b5cf84d999beade47562629b95ca5161346481a5c1349edbcd112d6de15d9720ea2ea7c3 WHIRLPOOL 452fe67ff82eb62197937c06616e8df18b758605c99588aa50a3af034fe800eeae212914e26871af40bb0f16450da9189ceec5ee957e101e2f8b9f5db2496e08 diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.0.54.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.0.54.ebuild new file mode 100644 index 000000000000..018a2addd707 --- /dev/null +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.0.54.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.0.54.ebuild,v 1.1 2012/12/04 18:51:18 ago Exp $ + +EAPI="2" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" +ETYPE="sources" +inherit kernel-2 +detect_version + +DESCRIPTION="Full sources for the Linux kernel" +HOMEPAGE="http://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="deblob" diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.4.21.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.4.21.ebuild new file mode 100644 index 000000000000..6be494d5af14 --- /dev/null +++ b/sys-kernel/vanilla-sources/vanilla-sources-3.4.21.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vanilla-sources/vanilla-sources-3.4.21.ebuild,v 1.1 2012/12/04 18:49:49 ago Exp $ + +EAPI="2" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_SECURITY_UNSUPPORTED="1" +K_DEBLOB_AVAILABLE="1" +ETYPE="sources" +inherit kernel-2 +detect_version + +DESCRIPTION="Full sources for the Linux kernel" +HOMEPAGE="http://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="deblob" diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest index 26bd4d837109..d0f4397b82fd 100644 --- a/sys-libs/talloc/Manifest +++ b/sys-libs/talloc/Manifest @@ -4,3 +4,4 @@ DIST talloc-2.0.0.tar.gz 241971 SHA256 349ac60bcc296aa56832ddfebe7d219d05fc3b8af DIST talloc-2.0.1.tar.gz 242426 SHA256 5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4 SHA512 5ff81eb89caca07b0e927bba3d630e33e66d03012d31336ee865653474d8738c6db0e57ac0306fe56d28065ccf3087e87af6ae6f916bc61fd4dab76a2617d17d WHIRLPOOL 84333059cf55b09c925d7a8b51e7b7a2b4c7d47c00814ab14ba49b2a58ec51cd89460bcc32a7b9c54069073be667e94f3c506bc50f1a684e7cb7337fbe465cb3 DIST talloc-2.0.5.tar.gz 365388 SHA256 b949eb0c4f3467ef26bb8f6af64da3b20df5e34b4243fe2a5a0c28435ba6b32a SHA512 8e08125b14dc3f18a16eeec2521f9431529946059c777e23f8a296c91360047a59a3e202b9d83e9eed29bd5eb1ff6dc9e22086ec27a9b47989afb4607781295d WHIRLPOOL 04518b9eb31d0d3107e7f182f09e680e9fa2967194a90f9636f397d712ceca260d1144576c5f4862df3d4658a6321ca04f125a43a5cb8cb93cdec96fc3d2c90b DIST talloc-2.0.7.tar.gz 370705 SHA256 59e1e8619b44eb820405cf76ab15607c35ac6e3460377016eb43f81bca22768a SHA512 b4384653f570b349d13352b3a2304bc3bc58d4d3e6369b049163c43d3125bbe29a8d3679691be04ef26a51a2820345fddf3c882d23ce629f8044b2aa043e2768 WHIRLPOOL 9709a5e92f07efd4e40f5e49a2c8e5c12b916780b57ae81c59f2076f7a75c08ed112e4fdc7f0cb9aee3952e599d01e9f93b38d35e1875ee148e9863338a6331e +DIST talloc-2.0.8.tar.gz 433489 SHA256 1ec11e635e0318dbbb014db38ff96e8dba3ce5f614eeb7d993b4a5b71c016783 SHA512 8e8e71d05443b7ea5d8ac432c1043840000b7b6ebeff6a2f621274f29a298e6c64ad5fb75b59c6138179c5602d6164695b85b57b5b310809150320b6eecd487f WHIRLPOOL 4cfaab8edbb7040ff0319ff7bce54657e3ecdfd27792b6ad0b5d789b38579116f69023def228e725d03a6c226ded768cfcdede920162930179704481160b9e81 diff --git a/sys-libs/talloc/talloc-2.0.8.ebuild b/sys-libs/talloc/talloc-2.0.8.ebuild new file mode 100644 index 000000000000..501a7b3a75c5 --- /dev/null +++ b/sys-libs/talloc/talloc-2.0.8.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.8.ebuild,v 1.1 2012/12/05 06:32:54 patrick Exp $ + +EAPI=3 +PYTHON_DEPEND="python? 2:2.6" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" +inherit waf-utils python multilib + +DESCRIPTION="Samba talloc library" +HOMEPAGE="http://talloc.samba.org/" +SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris" +IUSE="compat python" + +RDEPEND="!! +Date: Sun, 10 Jun 2012 19:32:22 +0200 +Subject: [PATCH] Restore NullRef instead of std::nullptr_t + +std::nullptr is ambiguos since it's acceptable also as Ref constructor + +This reverts commit 3d243ec18be069b27774b5cef10305b48156fc1c. +--- + src/smartrefs.h | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/smartrefs.h b/src/smartrefs.h +index d7f51bd..5087b2f 100644 +--- a/src/smartrefs.h ++++ b/src/smartrefs.h +@@ -119,15 +119,14 @@ class Ref + return Ref(a); + } + +-#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6) ++//#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 6) + /* Fallback for gcc < 4.6 not supporting nullptr */ + class NullRef_t {}; + extern NullRef_t NullRef; +-#else +-/* This is needed for MSVC and can be used on gcc >= 4.6 */ ++/*#else + typedef std::nullptr_t NullRef_t; + #define NullRef (nullptr) +-#endif ++#endif*/ + + template + class NullableRef +-- +1.7.10 + diff --git a/www-servers/webfs/webfs-1.21-r2.ebuild b/www-servers/webfs/webfs-1.21-r2.ebuild index 15e6747456ed..8002d2c9170a 100644 --- a/www-servers/webfs/webfs-1.21-r2.ebuild +++ b/www-servers/webfs/webfs-1.21-r2.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21-r2.ebuild,v 1.5 2012/07/29 18:15:51 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/webfs/webfs-1.21-r2.ebuild,v 1.6 2012/12/04 10:04:18 zmedico Exp $ +EAPI=4 inherit eutils DESCRIPTION="Lightweight HTTP server for static content" @@ -10,7 +11,7 @@ HOMEPAGE="http://linux.bytesex.org/misc/webfs.html" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc x86 ~x86-linux" IUSE="ssl threads" DEPEND="ssl? ( dev-libs/openssl )" @@ -18,9 +19,7 @@ DEPEND="ssl? ( dev-libs/openssl )" RDEPEND="${DEPEND} app-misc/mime-types" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/webfs-1.21-Variables.mk-dont-strip-binaries-on-install.patch" } @@ -29,15 +28,15 @@ src_compile() { use ssl || myconf="${myconf} USE_SSL=no" use threads && myconf="${myconf} USE_THREADS=yes" - emake prefix=/usr ${myconf} || die "emake failed" + emake prefix="${EPREFIX}/usr" ${myconf} } src_install() { local myconf use ssl || myconf="${myconf} USE_SSL=no" use threads && myconf="${myconf} USE_THREADS=yes" - einstall ${myconf} mandir="${D}/usr/share/man" || die "make install failed" - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} || die "newinitd failed" - newconfd "${FILESDIR}"/${PN}.confd ${PN} || die "newconfd failed" + einstall ${myconf} mandir="${ED}/usr/share/man" + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} dodoc README } diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest index 49b35fd9d7d5..af2f8618ade9 100644 --- a/x11-libs/qt-assistant/Manifest +++ b/x11-libs/qt-assistant/Manifest @@ -4,3 +4,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild new file mode 100644 index 000000000000..130189a3bf28 --- /dev/null +++ b/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.4.ebuild,v 1.1 2012/12/05 03:15:34 yngwin Exp $ + +EAPI=4 + +inherit eutils qt4-build + +DESCRIPTION="The Help module and Assistant application for the Qt toolkit" +SRC_URI+=" + compat? ( + ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz + http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz + )" + +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos" +fi +IUSE="compat doc +glib qt3support trace webkit" + +DEPEND=" + ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?] + ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite] + webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch" +) + +pkg_setup() { + # Pixeltool isn't really assistant related, but it relies on + # the assistant libraries. + QT4_TARGET_DIRECTORIES=" + tools/assistant + tools/pixeltool + tools/qdoc3" + QT4_EXTRACT_DIRECTORIES=" + tools + demos + examples + src + include + doc" + + use trace && QT4_TARGET_DIRECTORIES+=" tools/qttracereplay" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build_pkg_setup +} + +src_unpack() { + qt4-build_src_unpack + + # compat version + # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ + if use compat; then + unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \ + ${PN}-compat-headers-4.7.tar.gz + mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \ + "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die + fi +} + +src_prepare() { + qt4-build_src_prepare + + use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch + + # bug 401173 + use webkit || epatch "${FILESDIR}"/disable-webkit.patch + + # bug 348034 + sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die +} + +src_configure() { + myconf+=" + -no-xkb -no-fontconfig -no-xrandr + -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon + -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility + -no-fontconfig -no-multimedia -no-svg + $(qt_use qt3support) $(qt_use webkit)" + use glib || myconf+=" -no-glib" + + qt4-build_src_configure +} + +src_compile() { + # help libQtHelp find freshly built libQtCLucene (bug #289811) + export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}" + export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework" + + qt4-build_src_compile + + # ugly hack to build docs + qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" projects.pro || die + + if use doc; then + emake docs + elif [[ ${QT4_BUILD_TYPE} == release ]]; then + # live ebuild cannot build qch_docs, it will build them through emake docs + emake qch_docs + fi +} + +src_install() { + qt4-build_src_install + + emake INSTALL_ROOT="${D}" install_qchdocs + # do not compress .qch files + docompress -x "${QTDOCDIR}"/qch + + if use doc; then + emake INSTALL_ROOT="${D}" install_htmldocs + fi + + doicon tools/assistant/tools/assistant/images/assistant.png + make_desktop_entry assistant Assistant assistant 'Qt;Development' + + if use compat; then + insinto /usr/share/qt4/mkspecs/features + doins tools/assistant/compat/features/assistant.prf + fi +} diff --git a/x11-libs/qt-bearer/Manifest b/x11-libs/qt-bearer/Manifest index a8821df45b97..7b758dfdefcb 100644 --- a/x11-libs/qt-bearer/Manifest +++ b/x11-libs/qt-bearer/Manifest @@ -1,3 +1,4 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild new file mode 100644 index 000000000000..bc55407fc38e --- /dev/null +++ b/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/qt-bearer-4.8.4.ebuild,v 1.1 2012/12/05 03:16:22 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The network bearer plugins for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd" +fi +IUSE="connman networkmanager" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=] + connman? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) + networkmanager? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +pkg_setup() { + QT4_EXTRACT_DIRECTORIES=" + include/QtCore + include/QtDBus + include/QtNetwork + src/corelib + src/dbus + src/network + src/plugins/bearer + src/plugins/qpluginbase.pri" + + QT4_TARGET_DIRECTORIES=" + src/plugins/bearer/generic + $(use connman && echo src/plugins/bearer/connman) + $(use networkmanager && echo src/plugins/bearer/networkmanager)" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + $(use connman || use networkmanager || echo -no-dbus) + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg + -no-cups -no-gtkstyle -no-nas-sound -no-opengl + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-core/Manifest +++ b/x11-libs/qt-core/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-core/qt-core-4.8.4.ebuild b/x11-libs/qt-core/qt-core-4.8.4.ebuild new file mode 100644 index 000000000000..88eb6ef9d9c3 --- /dev/null +++ b/x11-libs/qt-core/qt-core-4.8.4.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.4.ebuild,v 1.1 2012/12/05 03:14:14 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+glib iconv icu qt3support ssl" + +DEPEND=" + sys-libs/zlib + glib? ( dev-libs/glib:2 ) + icu? ( >=dev-libs/icu-49 ) + ssl? ( dev-libs/openssl ) + !> "${S}"/src/plugins/codecs/${i}/${i}.pro + done + + qt4-build_src_prepare + + # bug 172219 + sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" + sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" + + # bug 427782 + sed -i -e "/^CPPFLAGS/s/-g//" \ + "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed" + sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \ + -e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \ + "${S}/configure" || die "sed configure setBootstrapVariable failed" +} + +src_configure() { + myconf+=" + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb + $(qt_use glib) + $(qt_use iconv) + $(qt_use icu) + $(use ssl && echo -openssl-linked || echo -no-openssl) + $(qt_use qt3support)" + + qt4-build_src_configure +} + +src_install() { + dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} + + install_directories src/{corelib,xml,network,plugins/codecs} + + emake INSTALL_ROOT="${D}" install_mkspecs + + # install private headers + insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private + find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} + + + # use freshly built libraries + local DYLD_FPATH= + [[ -d "${S}"/lib/QtCore.framework ]] \ + && DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done) + DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ + LD_LIBRARY_PATH="${S}/lib" \ + "${S}"/bin/lrelease translations/*.ts \ + || die "generating translations failed" + insinto "${QTTRANSDIR#${EPREFIX}}" + doins translations/*.qm + + setqtenv + fix_library_files + + # List all the multilib libdirs + local libdirs= + for libdir in $(get_all_libdirs); do + libdirs+=":${EPREFIX}/usr/${libdir}/qt4" + done + + cat <<-EOF > "${T}"/44qt4 + LDPATH="${libdirs:1}" + EOF + doenvd "${T}"/44qt4 + + dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo + mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ + || die "failed to move qconfig.pri" + + # Framework hacking + if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then + # TODO: do this better + sed -i -e '2a#include \n' \ + "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ + || die "sed for qconfig.h failed." + dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo + else + sed -i -e '2a#include \n' \ + "${D}${QTHEADERDIR}"/QtCore/qconfig.h \ + "${D}${QTHEADERDIR}"/Qt/qconfig.h \ + || die "sed for qconfig.h failed" + fi + + QCONFIG_DEFINE="QT_ZLIB" + install_qconfigs + + # remove .la files + prune_libtool_files + + keepdir "${QTSYSCONFDIR#${EPREFIX}}" + + # Framework magic + fix_includes +} diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-dbus/Manifest +++ b/x11-libs/qt-dbus/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild new file mode 100644 index 000000000000..f287976b060d --- /dev/null +++ b/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.8.4.ebuild,v 1.1 2012/12/05 03:17:33 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The DBus module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="" + +DEPEND=" + >=sys-apps/dbus-1.2 + ~x11-libs/qt-core-${PV}[aqua=,debug=] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch" +) + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/dbus + tools/qdbus/qdbus + tools/qdbus/qdbusxml2cpp + tools/qdbus/qdbuscpp2xml" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtCore + include/QtDBus + include/QtXml + src/corelib + src/xml" + + QCONFIG_ADD="dbus dbus-linked" + QCONFIG_DEFINE="QT_DBUS" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" -dbus-linked" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-declarative/Manifest +++ b/x11-libs/qt-declarative/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild new file mode 100644 index 000000000000..b5b2f81efee8 --- /dev/null +++ b/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.8.4.ebuild,v 1.1 2012/12/05 03:19:00 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The Declarative module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +fi +IUSE="+accessibility qt3support webkit" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] + ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support=] + ~x11-libs/qt-opengl-${PV}[aqua=,debug=,qt3support=] + ~x11-libs/qt-script-${PV}[aqua=,debug=] + ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=] + ~x11-libs/qt-svg-${PV}[accessibility=,aqua=,debug=] + ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] + qt3support? ( ~x11-libs/qt-qt3support-${PV}[accessibility=,aqua=,debug=] ) + webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=,debug=] ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/declarative + src/imports + src/plugins/qmltooling + tools/designer/src/plugins/qdeclarativeview + tools/qml + tools/qmlplugindump" + + if use webkit; then + QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative" + fi + + QT4_EXTRACT_DIRECTORIES=" + include + src + tools + translations" + + QCONFIG_ADD="declarative" + QCONFIG_DEFINE="QT_DECLARATIVE" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -declarative -no-gtkstyle + $(qt_use accessibility) + $(qt_use qt3support) + $(qt_use webkit)" + qt4-build_src_configure +} + +src_install() { + qt4-build_src_install + + # install private headers + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private + # ran for the 2nd time, need it for the updated headers + fix_includes + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private + fi + find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} + +} diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-demo/Manifest +++ b/x11-libs/qt-demo/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-demo/qt-demo-4.8.4.ebuild b/x11-libs/qt-demo/qt-demo-4.8.4.ebuild new file mode 100644 index 000000000000..968524a03a93 --- /dev/null +++ b/x11-libs/qt-demo/qt-demo-4.8.4.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.8.4.ebuild,v 1.1 2012/12/05 03:47:38 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="Demonstration module and examples for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" +fi +IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns" + +DEPEND=" + ~x11-libs/qt-assistant-${PV}:4[aqua=,debug=] + ~x11-libs/qt-core-${PV}:4[aqua=,debug=,qt3support?] + ~x11-libs/qt-gui-${PV}:4[aqua=,debug=,qt3support?] + ~x11-libs/qt-script-${PV}:4[aqua=,debug=] + ~x11-libs/qt-sql-${PV}:4[aqua=,debug=,qt3support?] + ~x11-libs/qt-svg-${PV}:4[aqua=,debug=] + ~x11-libs/qt-test-${PV}:4[aqua=,debug=] + dbus? ( ~x11-libs/qt-dbus-${PV}:4[aqua=,debug=] ) + declarative? ( ~x11-libs/qt-declarative-${PV}:4[aqua=,debug=,webkit?] ) + kde? ( media-libs/phonon[aqua=] ) + !kde? ( || ( + ~x11-libs/qt-phonon-${PV}:4[aqua=,debug=] + media-libs/phonon[aqua=] + ) ) + multimedia? ( ~x11-libs/qt-multimedia-${PV}:4[aqua=,debug=] ) + opengl? ( ~x11-libs/qt-opengl-${PV}:4[aqua=,debug=,qt3support?] ) + openvg? ( ~x11-libs/qt-openvg-${PV}:4[aqua=,debug=,qt3support?] ) + qt3support? ( ~x11-libs/qt-qt3support-${PV}:4[aqua=,debug=] ) + webkit? ( ~x11-libs/qt-webkit-${PV}:4[aqua=,debug=] ) + xmlpatterns? ( ~x11-libs/qt-xmlpatterns-${PV}:4[aqua=,debug=] ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.6-plugandpaint.patch" +) + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + demos + examples" + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + doc/src/images + src + include + tools" + + qt4-build_pkg_setup +} + +src_prepare() { + qt4-build_src_prepare + + # Array mapping USE flags to subdirs + local flags_subdirs_map=( + 'dbus' + 'declarative:declarative' + 'multimedia:spectrum' + 'opengl:boxes|glhypnotizer' + 'openvg' + 'webkit:browser' + 'xmlpatterns' + ) + + # Disable unwanted examples/demos + for flag in "${flags_subdirs_map[@]}"; do + if ! use ${flag%:*}; then + einfo "Disabling ${flag%:*} examples" + sed -i -e "/SUBDIRS += ${flag%:*}/d" \ + examples/examples.pro || die + + if [[ ${flag} == *:* ]]; then + einfo "Disabling ${flag%:*} demos" + sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \ + demos/demos.pro || die + fi + fi + done + + if ! use qt3support; then + einfo "Disabling qt3support examples" + sed -i -e '/QT_CONFIG, qt3support/d' \ + examples/graphicsview/graphicsview.pro || die + fi +} + +src_configure() { + myconf+=" + $(qt_use dbus) + $(qt_use declarative) + $(qt_use multimedia) + $(qt_use opengl) + $(qt_use openvg) + $(qt_use qt3support) + $(qt_use webkit) + $(qt_use xmlpatterns)" + + qt4-build_src_configure +} + +src_install() { + insinto "${QTDOCDIR#${EPREFIX}}"/src + doins -r doc/src/images + + qt4-build_src_install +} diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-gui/Manifest +++ b/x11-libs/qt-gui/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-gui/qt-gui-4.8.4.ebuild b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild new file mode 100644 index 000000000000..7185549f58c0 --- /dev/null +++ b/x11-libs/qt-gui/qt-gui-4.8.4.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.4.ebuild,v 1.1 2012/12/05 03:20:44 yngwin Exp $ + +EAPI=4 + +inherit eutils qt4-build + +DESCRIPTION="The GUI module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+accessibility cups dbus egl gif +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" + +REQUIRED_USE=" + gtkstyle? ( glib ) +" + +RDEPEND=" + app-admin/eselect-qtgraphicssystem + media-libs/fontconfig + media-libs/freetype:2 + media-libs/libpng:0 + sys-libs/zlib + virtual/jpeg + ~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] + ~x11-libs/qt-script-${PV}[aqua=,debug=] + !aqua? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + ) + cups? ( net-print/cups ) + dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) + egl? ( media-libs/mesa[egl] ) + gtkstyle? ( x11-libs/gtk+:2[aqua=] ) + mng? ( >=media-libs/libmng-1.0.9 ) + nas? ( >=media-libs/nas-1.5 ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${RDEPEND} + !aqua? ( + x11-proto/inputproto + x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + xv? ( x11-proto/videoproto ) + ) +" +PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )" + +PATCHES=( + "${FILESDIR}/${PN}-4.7.3-cups.patch" +) + +pkg_setup() { + # this belongs to pkg_pretend, we have to upgrade to EAPI 4 :) + # was planning to use a dep, but to reproduce this you have to + # clean-emerge qt-gui[gtkstyle] while having cairo[qt4] installed. + # no need to restrict normal first time users for that :) + if use gtkstyle && ! has_version x11-libs/qt-gui && has_version x11-libs/cairo[qt4]; then + echo + eerror "When building qt-gui[gtkstyle] from scratch with cairo present," + eerror "cairo must have the qt4 use flag disabled, otherwise the gtk" + eerror "style cannot be built." + ewarn + eerror "You have the following options:" + eerror " - rebuild cairo with -qt4 USE" + eerror " - build qt-gui with -gtkstyle USE" + ewarn + eerror "After you successfully install qt-gui, you'll be able to" + eerror "re-enable the disabled use flag and/or reinstall cairo." + ewarn + echo + die "can't build ${PN} with USE=gtkstyle if cairo has 'qt4' USE flag enabled" + fi + + QT4_TARGET_DIRECTORIES=" + src/gui + src/scripttools + tools/designer + tools/linguist/linguist + src/plugins/imageformats/gif + src/plugins/imageformats/ico + src/plugins/imageformats/jpeg + src/plugins/inputmethods" + + QT4_EXTRACT_DIRECTORIES=" + include + src + tools" + + use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" + use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" + use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" + use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" + use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" + + # mac version does not contain qtconfig? + [[ ${CHOST} == *-darwin* ]] || QT4_TARGET_DIRECTORIES+=" tools/qtconfig" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" + + qt4-build_pkg_setup +} + +src_prepare() { + qt4-build_src_prepare + + # Add -xvideo to the list of accepted configure options + sed -i -e 's:|-xinerama|:&-xvideo|:' configure + + # Don't build plugins this go around, because they depend on qt3support lib + sed -i -e 's:CONFIG(shared:# &:g' tools/designer/src/src.pro +} + +src_configure() { + export PATH="${S}/bin:${PATH}" + export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" + + myconf="$(qt_use accessibility) + $(qt_use cups) + $(use gif || echo -no-gif) + $(qt_use glib) + $(qt_use mng libmng system) + $(qt_use nas nas-sound system) + $(qt_use nis) + $(qt_use tiff libtiff system) + $(qt_use dbus qdbus) + $(qt_use dbus) + $(qt_use egl) + $(qt_use qt3support) + $(qt_use gtkstyle) + $(qt_use xinerama) + $(qt_use xv xvideo)" + + myconf+=" + -system-libpng -system-libjpeg + -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc + -sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb + -fontconfig -no-svg -no-webkit -no-phonon -no-opengl" + + [[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" #367045 + + qt4-build_src_configure + + if use gtkstyle; then + einfo "patching the Makefile to fix qgtkstyle compilation" + sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile || + die "sed failed" + fi + sed -i -e "s:-I/usr/include/qt4/QtGui ::" src/gui/Makefile || die "sed failed" +} + +src_install() { + QCONFIG_ADD=" + mitshm x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync + fontconfig gif png system-png jpeg system-jpeg + $(usev accessibility) + $(usev cups) + $(use mng && echo system-mng) + $(usev nas) + $(usev nis) + $(use tiff && echo system-tiff) + $(usev xinerama) + $(use xv && echo xvideo)" + QCONFIG_REMOVE="no-gif no-jpeg no-png" + QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) + $(use cups && echo QT_CUPS) + $(use egl && echo QT_EGL) + QT_FONTCONFIG + $(use gtkstyle && echo QT_STYLE_GTK) + QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG + $(use mng && echo QT_IMAGEFORMAT_MNG) + $(use nas && echo QT_NAS) + $(use nis && echo QT_NIS) + $(use tiff && echo QT_IMAGEFORMAT_TIFF) + QT_SESSIONMANAGER QT_SHAPE QT_XCURSOR QT_XFIXES + $(use xinerama && echo QT_XINERAMA) + QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC + $(use xv && echo QT_XVIDEO)" + + qt4-build_src_install + + # qt-creator + # some qt-creator headers are located + # under /usr/include/qt4/QtDesigner/private. + # those headers are just includes of the headers + # which are located under tools/designer/src/lib/* + # So instead of installing both, we create the private folder + # and drop tools/designer/src/lib/* headers in it. + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ + fi + doins "${S}"/tools/designer/src/lib/shared/* + doins "${S}"/tools/designer/src/lib/sdk/* + + # install private headers + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ + else + insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private + fi + find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + + + if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then + # rerun to get links to headers right + fix_includes + fi + + # touch the available graphics systems + dodir /usr/share/qt4/graphicssystems + echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die + touch "${ED}"/usr/share/qt4/graphicssystems/native || die + + doicon tools/designer/src/designer/images/designer.png + newicon tools/linguist/linguist/images/icons/linguist-128-32.png linguist.png + newicon tools/qtconfig/images/appicon.png qtconfig.png + use dbus && newicon tools/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png + make_desktop_entry designer Designer designer 'Qt;Development;GUIDesigner' + make_desktop_entry linguist Linguist linguist 'Qt;Development;Translation' + make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' +} + +pkg_postinst() { + # raster is the default graphicssystems, set it on first install + eselect qtgraphicssystem set raster --use-old + + elog "Starting with Qt 4.8, you may choose the active Qt Graphics System" + elog "by using a new eselect module called qtgraphicssystem." + elog "Run \`eselect qtgraphicssystem\` for more information." + + if use gtkstyle; then + # see bug 388551 + elog + elog "For Qt's GTK style to work, you need to either export" + elog "the following variable into your environment:" + elog ' GTK2_RC_FILES="$HOME/.gtkrc-2.0"' + elog "or alternatively install gnome-base/libgnomeui" + fi +} diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-multimedia/Manifest +++ b/x11-libs/qt-multimedia/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild new file mode 100644 index 000000000000..582a453b6796 --- /dev/null +++ b/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/qt-multimedia-4.8.4.ebuild,v 1.1 2012/12/05 03:21:46 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The Multimedia module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +fi +IUSE="alsa" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=] + ~x11-libs/qt-gui-${PV}[aqua=,debug=] + alsa? ( media-libs/alsa-lib ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.8.0-alsa.patch" +) + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/multimedia" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/Qt + include/QtCore + include/QtGui + include/QtMultimedia + src/src.pro + src/corelib + src/gui" + + QCONFIG_ADD="multimedia" + QCONFIG_DEFINE="QT_MULTIMEDIA" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -multimedia -audio-backend + $(qt_use alsa) + -no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend + -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-opengl/Manifest +++ b/x11-libs/qt-opengl/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild new file mode 100644 index 000000000000..19f7dedc8200 --- /dev/null +++ b/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.8.4.ebuild,v 1.1 2012/12/05 03:23:05 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The OpenGL module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="egl qt3support" + +DEPEND=" + virtual/opengl + ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] + ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl=,qt3support=] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/opengl + src/plugins/graphicssystems/opengl" + + QT4_EXTRACT_DIRECTORIES=" + include/QtCore + include/QtGui + include/QtOpenGL + src/corelib + src/gui + src/opengl + src/plugins + src/3rdparty" + + QCONFIG_ADD="opengl" + QCONFIG_DEFINE="QT_OPENGL" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -opengl + $(qt_use qt3support) + $(qt_use egl)" + + qt4-build_src_configure + + # Not building tools/designer/src/plugins/tools/view3d as it's + # commented out of the build in the source +} + +src_install() { + qt4-build_src_install + + # touch the available graphics systems + dodir /usr/share/qt4/graphicssystems + echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die +} diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest index a8821df45b97..7b758dfdefcb 100644 --- a/x11-libs/qt-openvg/Manifest +++ b/x11-libs/qt-openvg/Manifest @@ -1,3 +1,4 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild new file mode 100644 index 000000000000..f2dd4c8d1147 --- /dev/null +++ b/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/qt-openvg-4.8.4.ebuild,v 1.1 2012/12/05 03:24:06 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The OpenVG module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="qt3support" + +DEPEND=" + media-libs/mesa[egl,openvg] + ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] + ~x11-libs/qt-gui-${PV}[aqua=,debug=,egl,qt3support=] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/openvg + src/plugins/graphicssystems/openvg" + + QT4_EXTRACT_DIRECTORIES=" + include/QtCore + include/QtGui + include/QtOpenVG + src/corelib + src/gui + src/openvg + src/plugins + src/3rdparty" + + QCONFIG_ADD="openvg" + QCONFIG_DEFINE="QT_OPENVG" + + qt4-build_pkg_setup +} + +src_configure() { + gltype="desktop" + + myconf+=" + -openvg -egl + $(qt_use qt3support)" + + qt4-build_src_configure +} + +src_install() { + qt4-build_src_install + + # touch the available graphics systems + dodir /usr/share/qt4/graphicssystems + echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die +} diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-phonon/Manifest +++ b/x11-libs/qt-phonon/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild new file mode 100644 index 000000000000..ddb622d89d66 --- /dev/null +++ b/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.8.4.ebuild,v 1.1 2012/12/05 03:25:14 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The Phonon module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="dbus qt3support" + +DEPEND=" + ~x11-libs/qt-gui-${PV}[aqua=,debug=,qt3support=] + !kde-base/phonon-kde + !kde-base/phonon-xine + !media-libs/phonon + !media-sound/phonon + !aqua? ( media-libs/gstreamer:0.10 + media-plugins/gst-plugins-meta:0.10 ) + aqua? ( ~x11-libs/qt-opengl-${PV}[aqua,debug=,qt3support=] ) + dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/phonon + src/plugins/phonon + tools/designer/src/plugins/phononwidgets" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include + src + tools" + + QCONFIG_ADD="phonon" + QCONFIG_DEFINE="QT_PHONON + $(use !aqua && echo QT_GSTREAMER)" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -phonon -phonon-backend -no-opengl -no-svg + $(qt_use dbus qdbus) + $(qt_use qt3support)" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-qt3support/Manifest b/x11-libs/qt-qt3support/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-qt3support/Manifest +++ b/x11-libs/qt-qt3support/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild new file mode 100644 index 000000000000..559e352f351c --- /dev/null +++ b/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.8.4.ebuild,v 1.1 2012/12/05 03:26:29 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The Qt3 support module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+accessibility" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support] + ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=,qt3support] + ~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/qt3support + src/tools/uic3 + tools/designer/src/plugins/widgets + tools/porting" + + QT4_EXTRACT_DIRECTORIES=" + src + include + tools" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -qt3support + $(qt_use accessibility)" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-script/Manifest +++ b/x11-libs/qt-script/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-script/qt-script-4.8.4.ebuild b/x11-libs/qt-script/qt-script-4.8.4.ebuild new file mode 100644 index 000000000000..81c0f3b12aa8 --- /dev/null +++ b/x11-libs/qt-script/qt-script-4.8.4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.4.ebuild,v 1.1 2012/12/05 03:27:45 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The ECMAScript module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="iconv +jit" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/script" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/Qt + include/QtCore + include/QtScript + src/3rdparty/javascriptcore + src/corelib" + + QCONFIG_ADD="script" + QCONFIG_DEFINE="QT_SCRIPT" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + $(qt_use iconv) + $(qt_use jit javascript-jit) + -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama + -no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif + -no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff + -no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg + -no-gtkstyle" + + qt4-build_src_configure +} + +src_install() { + qt4-build_src_install + + # install private headers + insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private + find "${S}"/src/script -type f -name "*_p.h" -exec doins {} + +} diff --git a/x11-libs/qt-sql/Manifest b/x11-libs/qt-sql/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-sql/Manifest +++ b/x11-libs/qt-sql/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-sql/qt-sql-4.8.4.ebuild b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild new file mode 100644 index 000000000000..be586df6300f --- /dev/null +++ b/x11-libs/qt-sql/qt-sql-4.8.4.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-sql/qt-sql-4.8.4.ebuild,v 1.1 2012/12/05 03:29:08 yngwin Exp $ + +EAPI=4 + +inherit multilib qt4-build + +DESCRIPTION="The SQL module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite" + +REQUIRED_USE=" + || ( firebird freetds mysql oci8 odbc postgres sqlite ) +" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=,qt3support=] + firebird? ( dev-db/firebird ) + freetds? ( dev-db/freetds ) + mysql? ( virtual/mysql ) + oci8? ( dev-db/oracle-instantclient-basic ) + odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) ) + postgres? ( dev-db/postgresql-base ) + sqlite? ( dev-db/sqlite:3 ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/sql + src/plugins/sqldrivers" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/Qt + include/QtCore + include/QtSql + src/src.pro + src/corelib + src/plugins + src/tools/tools.pro" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + $(qt_use firebird sql-ibase plugin) + $(qt_use freetds sql-tds plugin) + $(qt_use mysql sql-mysql plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql") + $(qt_use oci8 sql-oci plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)") + $(qt_use odbc sql-odbc plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc") + $(qt_use postgres sql-psql plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql") + $(qt_use sqlite sql-sqlite plugin) $(use sqlite && echo -system-sqlite) + -no-sql-db2 + -no-sql-sqlite2 + -no-sql-symsql + $(qt_use qt3support) + -no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon + -no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative + -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl + -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl + -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes + -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb + -no-glib" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-svg/Manifest b/x11-libs/qt-svg/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-svg/Manifest +++ b/x11-libs/qt-svg/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-svg/qt-svg-4.8.4.ebuild b/x11-libs/qt-svg/qt-svg-4.8.4.ebuild new file mode 100644 index 000000000000..135fda66af67 --- /dev/null +++ b/x11-libs/qt-svg/qt-svg-4.8.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/qt-svg-4.8.4.ebuild,v 1.1 2012/12/05 03:42:20 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The SVG module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+accessibility" + +DEPEND=" + sys-libs/zlib + ~x11-libs/qt-core-${PV}[aqua=,debug=] + ~x11-libs/qt-gui-${PV}[accessibility=,aqua=,debug=] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/svg + src/plugins/imageformats/svg + src/plugins/iconengines/svgiconengine" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtSvg + include/Qt + include/QtGui + include/QtCore + include/QtXml + src/corelib + src/gui + src/plugins + src/xml + src/3rdparty" + + QCONFIG_ADD="svg" + QCONFIG_DEFINE="QT_SVG" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -svg + $(qt_use accessibility) + -no-xkb -no-xrender + -no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm + -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff + -no-fontconfig -no-glib -no-gtkstyle" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-test/Manifest b/x11-libs/qt-test/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-test/Manifest +++ b/x11-libs/qt-test/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-test/qt-test-4.8.4.ebuild b/x11-libs/qt-test/qt-test-4.8.4.ebuild new file mode 100644 index 000000000000..c38ea6188715 --- /dev/null +++ b/x11-libs/qt-test/qt-test-4.8.4.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-test/qt-test-4.8.4.ebuild,v 1.1 2012/12/05 03:46:28 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The testing framework module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/testlib" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtTest + include/QtCore + src/corelib" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" + -no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor + -no-xinerama -no-xshape -no-sm -no-opengl + -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng + -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon + -no-qt3support -no-xmlpatterns -no-freetype -no-libtiff + -no-accessibility -no-fontconfig -no-glib -no-svg" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-webkit/Manifest +++ b/x11-libs/qt-webkit/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild new file mode 100644 index 000000000000..c03726895953 --- /dev/null +++ b/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.4.ebuild,v 1.1 2012/12/05 03:44:04 yngwin Exp $ + +EAPI=4 + +inherit qt4-build flag-o-matic + +DESCRIPTION="The WebKit module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="+gstreamer icu +jit" + +# libxml2[!icu?] is needed for bugs 407315 and 411091 +DEPEND=" + dev-db/sqlite:3 + x11-libs/libX11 + x11-libs/libXrender + ~x11-libs/qt-core-${PV}[aqua=,debug=,ssl] + ~x11-libs/qt-gui-${PV}[aqua=,debug=] + ~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=] + gstreamer? ( + dev-libs/glib:2 + dev-libs/libxml2:2[!icu?] + media-libs/gstreamer:0.10 + media-libs/gst-plugins-base:0.10 + ) + icu? ( dev-libs/icu ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch" + "${FILESDIR}/4.8.2-javascriptcore-x32.patch" +) + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/3rdparty/webkit/Source/JavaScriptCore + src/3rdparty/webkit/Source/WebCore + src/3rdparty/webkit/Source/WebKit/qt + tools/designer/src/plugins/qwebview" + + QT4_EXTRACT_DIRECTORIES=" + include + src + tools" + + QCONFIG_ADD="webkit" + QCONFIG_DEFINE="QT_WEBKIT" + + qt4-build_pkg_setup +} + +src_prepare() { + # Fix version number in generated pkgconfig file, bug 406443 + sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \ + src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die + + # Remove -Werror from CXXFLAGS + sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \ + src/3rdparty/webkit/Source/WebKit.pri || die + + if use icu; then + sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \ + src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die + fi + + qt4-build_src_prepare +} + +src_configure() { + myconf+=" + -webkit + -system-sqlite + $(qt_use icu) + $(qt_use jit javascript-jit) + $(use gstreamer || echo -DENABLE_VIDEO=0)" + + qt4-build_src_configure +} diff --git a/x11-libs/qt-xmlpatterns/Manifest b/x11-libs/qt-xmlpatterns/Manifest index 842ceea2fd2b..124aeb85fd08 100644 --- a/x11-libs/qt-xmlpatterns/Manifest +++ b/x11-libs/qt-xmlpatterns/Manifest @@ -2,3 +2,4 @@ DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 SHA256 97195ebce8a46f99 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8 SHA512 a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 WHIRLPOOL 6f25aed57b4e1a4881c17a3e4b4400bc434fcd0dc29cef0537f9037fdcc3e501e82760cf70a2a06b123a6486847d205e36847e3609741ebcc37d2fae4a7e2341 DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 SHA256 921b2a2d060934ceda65ae4615edec474cea13d3c893e7df19ad1262e7dc2379 SHA512 42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 WHIRLPOOL 70c420e89d215e050567136a598911c3ccd8e609b3bb6d846aa0789c25b2daa65323d9c7564f894b2ff2829a7b34b356b708eb9c6e104f7a4c0fe76501ddb843 DIST qt-everywhere-opensource-src-4.8.3.tar.gz 233635127 SHA256 f1f72974f924861be04019f49f07cd43ab3c95056db2ba8f34b283487cccc728 SHA512 3791ffbea5e1e308d97339ca13638f3b48062119678158edd9fd2b8dc683ae915a9f158ab8ccde6a70c83a15453857cb093355a3087bb529a2556a79743c56d4 WHIRLPOOL 98ad3ddeccf5d4796c5af9ef456dc1c6d327e6ed5c39d0ce6a437bacb13d2a2325072b3c360706c9f05e2c4793e5c4d77c5409f9f6c5c6de2f7bf3cc39ae116b +DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79 diff --git a/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild new file mode 100644 index 000000000000..91b58707fb2b --- /dev/null +++ b/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/qt-xmlpatterns-4.8.4.ebuild,v 1.1 2012/12/05 03:45:15 yngwin Exp $ + +EAPI=4 + +inherit qt4-build + +DESCRIPTION="The XmlPatterns module for the Qt toolkit" +SLOT="4" +if [[ ${QT4_BUILD_TYPE} == live ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi +IUSE="" + +DEPEND=" + ~x11-libs/qt-core-${PV}[aqua=,debug=] +" +RDEPEND="${DEPEND}" + +pkg_setup() { + QT4_TARGET_DIRECTORIES=" + src/xmlpatterns + tools/xmlpatterns + tools/xmlpatternsvalidator" + + QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} + include/QtCore + include/QtNetwork + include/QtXml + include/QtXmlPatterns + src/network + src/xml + src/corelib" + + QCONFIG_ADD="xmlpatterns" + QCONFIG_DEFINE="QT_XMLPATTERNS" + + qt4-build_pkg_setup +} + +src_configure() { + myconf+=" -xmlpatterns" + + qt4-build_src_configure +} diff --git a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-1.99.2.ebuild b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-1.99.2.ebuild index 8234c2ce031d..07f82328411f 100644 --- a/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-1.99.2.ebuild +++ b/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-1.99.2.ebuild @@ -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/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-1.99.2.ebuild,v 1.2 2012/10/31 17:30:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-libnotify-plus/purple-libnotify-plus-1.99.2.ebuild,v 1.3 2012/12/04 15:41:21 ago Exp $ EAPI=4 @@ -10,7 +10,7 @@ SRC_URI="mirror://github/sardemff7/${PN}/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND=" diff --git a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild index 6a42288ac0e8..331ea985d3c7 100644 --- a/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild +++ b/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild @@ -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/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild,v 1.2 2012/10/12 18:37:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/ubuntu-wallpapers/ubuntu-wallpapers-0.34.1.ebuild,v 1.3 2012/12/04 11:12:05 ago Exp $ EAPI=4 @@ -9,7 +9,7 @@ HOMEPAGE="https://launchpad.net/ubuntu/+source/ubuntu-wallpapers" SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.tar.gz" LICENSE="CCPL-Attribution-ShareAlike-3.0" -KEYWORDS="amd64" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="" diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 781bf34df120..027d04fc75c3 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -5,5 +5,5 @@ DIST e16-1.0.6.tar.gz 2212263 SHA256 6ab09e326420982a3b828538bae3f1ea4a2e45b8d5f DIST e16-1.0.7.tar.gz 2223518 SHA256 d36cf57e4125b173608a6f4cbfa53d91f59f047579fe6a40939874293cfe71bc SHA512 ce9c6108e2d87fa669f774577ed48b9a35e5e9b52d0703f20563bfd23918a542b3833023fc5f98967cc1a3da864d47de4747bbd228c49e53b6e9dc505c3a6b0b WHIRLPOOL 33e0bd6cf6f36a7b1af60b92dd6fccb4805ea2ac9daa47d54902cfdba6338cb2a170d6f3afd0fa0f5a335e994c7d564e2a2eb1816ed6b32f6f53102a8ed35fc4 DIST e16-1.0.8.tar.gz 2243485 SHA256 794d842ec30a29e0d6a85a3bd40120151c27419d77d2fd5759b49862063be27f SHA512 f8d8687a40defdbec385ab007351501a2bd5d39addc6d096655ee57b0384e59aa374c9d1860fa81f5405751e706015b920712c9607b04182916d9a5b7bfe22e7 WHIRLPOOL a558555b955951c9ccd039898d6e8b2219ae284f839ca921fe89bfebbf1ae9257826187c65ab81564cb074b1cb17cfd75bddfea7e02492796be6d05be62c237c DIST e16-1.0.9.tar.gz 2256543 SHA256 d435840a4a429cb22f241d7889e82827061f6ef5ccd9bbc8720af51dee053d27 SHA512 75dc4c784bb70a22b5baa6462024164a10bcea325aa479d2c856f8d214910f36fba865f78017f5c71847991015e7164ecb3959b9ee6d8e531c1b938bd5f61d2a WHIRLPOOL 1c11956dee0905a5465bbc900c3e5fb5ded702b091d3e1bb93738101a82efda82270e5b1fb530e3980077a53fecdb6136bbc4b9c564136bf82ec475fc851cdbc -DIST enlightenment-0.17.0-alpha6.tar.bz2 20209688 SHA256 6c5d4e3743408c75854ba6c58ef84ee40f42a68b5c1e0d43f2f5604b7fd3bbc6 SHA512 22bb54040f4b1d6cea53195048d8f3b90ae8063ed42390e2ad077b819da753e6e9e8a63c5fbd90787ad4160002603f000191387d2bed15efb180e89672f985e1 WHIRLPOOL 3cfe215d0f5027bbb986c275039a9586143867576d79a3651c6c2ef503a8f6bd9897e7378892257d60cf4f5b70658f08270ce3648412c9639a66d6ff9711537c DIST enlightenment-0.17.0-alpha7.tar.bz2 20071362 SHA256 e4a20beff05cccc7a8bf68d657c269f9ac239fdaa6371a7cb1d5a41435d4e308 SHA512 476034c010a11da21097559a9a76c999c07f6ebcab5379fa5a02fd12a58f05f641bce5def1f8a0a00cf0ce01d3fb25805a131e3bbaed6353b03e8fd41113ce36 WHIRLPOOL 42dc1bf17507e7ff6d1dbfc16bf291bac6f943f091f049f733c4526ef1e072a390ef3baff1a8daa1b360ac3d3ffb6533bbe18c8df1766fd7d0e052322f18a55c +DIST enlightenment-0.17.0-alpha8.tar.bz2 21576196 SHA256 86d9363b80c0cfa4ddd3beee5a92b4647e7d7437bab74bbabcffc4c20a3699b4 SHA512 7f5add2a8b51364f572df2ab3f7a15ca85e942e3be308a13fabf14e8a90631a03d853aa2d8bbde842368e99fd7468bc5941a1bdff4da71a137c5b19d76771880 WHIRLPOOL fed9ea7219aee1aac3f0c5d98bbfb8d988e510e7bfadb1d779206559e04508ede91e88fefa78af4869ef90beabfd5ca79a1bb93169306670e2c76a076467fc3d diff --git a/x11-wm/enlightenment/enlightenment-0.17.0_alpha6.ebuild b/x11-wm/enlightenment/enlightenment-0.17.0_alpha8.ebuild similarity index 95% rename from x11-wm/enlightenment/enlightenment-0.17.0_alpha6.ebuild rename to x11-wm/enlightenment/enlightenment-0.17.0_alpha8.ebuild index 5b06360531f6..5e19554baa87 100644 --- a/x11-wm/enlightenment/enlightenment-0.17.0_alpha6.ebuild +++ b/x11-wm/enlightenment/enlightenment-0.17.0_alpha8.ebuild @@ -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/x11-wm/enlightenment/enlightenment-0.17.0_alpha6.ebuild,v 1.1 2012/11/27 20:15:36 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.17.0_alpha8.ebuild,v 1.2 2012/12/04 21:10:39 tommy Exp $ EAPI="2" @@ -42,6 +42,7 @@ RDEPEND=" >=dev-libs/e_dbus-1.7.1[libnotify,udev?] ukit? ( >=dev-libs/e_dbus-1.7.1[udev] ) enlightenment_modules_connman? ( >=dev-libs/e_dbus-1.7.1[connman] ) + enlightenment_modules_shot? ( >=dev-libs/ecore-1.7.1[curl] ) || ( >=media-libs/evas-1.7.1[eet,X,jpeg,png] >=media-libs/evas-1.7.1[eet,xcb,jpeg,png] ) >=dev-libs/eeze-1.7.1 x11-libs/xcb-util-keysyms"