Merge remote-tracking branch 'remotes/tomboy-64/idea-ultimate'
authorIan Delaney <idella4@gentoo.org>
Sat, 5 Dec 2015 14:20:03 +0000 (22:20 +0800)
committerIan Delaney <idella4@gentoo.org>
Sat, 5 Dec 2015 14:23:40 +0000 (22:23 +0800)
Review by jlec, adjustments made accordingly

Pull request: https://github.com/gentoo/gentoo/pull/428

227 files changed:
app-admin/puppet-agent/Manifest
app-admin/puppet-agent/puppet-agent-1.3.2.ebuild [new file with mode: 0644]
app-admin/puppetdb/Manifest
app-admin/puppetdb/puppetdb-3.2.2.ebuild [new file with mode: 0644]
app-admin/testdisk/testdisk-7.0-r1.ebuild [deleted file]
app-admin/testdisk/testdisk-7.0.ebuild [deleted file]
app-arch/dpkg/Manifest
app-arch/dpkg/dpkg-1.17.26.ebuild
app-arch/dpkg/dpkg-1.18.2.ebuild [deleted file]
app-editors/dhex/dhex-0.68.ebuild
app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch [new file with mode: 0644]
app-emulation/libvirt/libvirt-9999.ebuild
app-emulation/xen-pvgrub/Manifest
app-emulation/xen-pvgrub/xen-pvgrub-4.2.5.ebuild [deleted file]
app-emulation/xen-pvgrub/xen-pvgrub-4.5.1.ebuild [deleted file]
app-emulation/xen-tools/xen-tools-4.5.2-r1.ebuild
app-emulation/xen-tools/xen-tools-4.6.0-r3.ebuild
app-emulation/xen/xen-4.6.0-r2.ebuild
app-portage/flaggie/flaggie-0.2.1.ebuild
app-portage/flaggie/flaggie-9999.ebuild
app-text/blogc/Manifest
app-text/blogc/blogc-0.5.1.ebuild [moved from app-text/blogc/blogc-0.5.ebuild with 100% similarity]
dev-embedded/arduino/arduino-1.0.5-r1.ebuild
dev-java/ant-eclipse-ecj/Manifest
dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild [new file with mode: 0644]
dev-java/ant-eclipse-ecj/files/ecj-4.5 [new file with mode: 0644]
dev-java/cofoja/cofoja-1.2.ebuild
dev-java/cortado/cortado-0.6.0-r1.ebuild [new file with mode: 0644]
dev-java/eclipse-ecj/Manifest
dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild [new file with mode: 0644]
dev-java/jaffl/jaffl-0.5.11-r1.ebuild [new file with mode: 0644]
dev-java/jamvm/Manifest
dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch [deleted file]
dev-java/jamvm/files/jamvm-1.5.4-env.file [deleted file]
dev-java/jamvm/jamvm-1.5.4-r2.ebuild [deleted file]
dev-java/jamvm/jamvm-2.0.0-r1.ebuild
dev-java/jnr-netdb/Manifest
dev-java/jnr-netdb/jnr-netdb-1.0.1.ebuild [deleted file]
dev-java/jnr-x86asm/Manifest
dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild [new file with mode: 0644]
dev-java/log4j/Manifest
dev-java/log4j/log4j-1.2.16.ebuild [deleted file]
dev-java/log4j/log4j-1.2.17-r2.ebuild [deleted file]
dev-java/log4j/log4j-1.2.17-r3.ebuild
dev-java/log4j/metadata.xml
dev-java/mchange-commons/mchange-commons-0.2.10.ebuild
dev-java/mimepull/Manifest
dev-java/mimepull/mimepull-1.9.6.ebuild [new file with mode: 0644]
dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild [new file with mode: 0644]
dev-java/simplyhtml/simplyhtml-0.13.1-r1.ebuild
dev-java/simplyhtml/simplyhtml-0.13.1.ebuild [deleted file]
dev-java/stringtemplate/files/3.2.1-test-fixes.patch [new file with mode: 0644]
dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild [new file with mode: 0644]
dev-java/stringtemplate/stringtemplate-3.2.1.ebuild [deleted file]
dev-java/tomcat-servlet-api/Manifest
dev-java/tomcat-servlet-api/files/4.0-build.xml [new file with mode: 0644]
dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild [new file with mode: 0644]
dev-java/validation-api/Manifest
dev-java/validation-api/validation-api-1.1.0.ebuild [new file with mode: 0644]
dev-libs/libpcre/libpcre-8.38.ebuild
dev-libs/libressl/Manifest
dev-libs/libressl/files/libressl-2.2.4-clientcert.patch [new file with mode: 0644]
dev-libs/libressl/libressl-2.2.4-r1.ebuild [moved from dev-libs/libressl/libressl-2.2.4.ebuild with 91% similarity]
dev-libs/libressl/libressl-2.3.1-r1.ebuild [new file with mode: 0644]
dev-libs/libressl/metadata.xml
dev-libs/nspr/Manifest
dev-libs/nspr/nspr-4.11.ebuild [new file with mode: 0644]
dev-perl/SDL/SDL-2.546.ebuild
dev-php/pecl-timezonedb/Manifest
dev-php/pecl-timezonedb/pecl-timezonedb-2015.7.ebuild [new file with mode: 0644]
dev-php/xdebug-client/Manifest
dev-php/xdebug-client/xdebug-client-2.4.0_rc2.ebuild [new file with mode: 0644]
dev-php/xdebug/Manifest
dev-php/xdebug/xdebug-2.4.0_rc2.ebuild [new file with mode: 0644]
dev-python/apsw/Manifest
dev-python/apsw/apsw-3.9.2_p1.ebuild [new file with mode: 0644]
dev-python/astroid/astroid-1.4.1.ebuild
dev-python/pygments/files/2.0.2-bytes-decode.patch [new file with mode: 0644]
dev-python/pygments/pygments-2.0.2-r2.ebuild [moved from dev-python/pygments/pygments-2.0.2-r1.ebuild with 97% similarity]
dev-python/unidecode/unidecode-0.04.18.ebuild
dev-ros/sound_play/files/test.patch [new file with mode: 0644]
dev-ros/sound_play/sound_play-0.2.9.ebuild
dev-ruby/celluloid-io/celluloid-io-0.16.2.ebuild
dev-ruby/celluloid/celluloid-0.16.0.ebuild
dev-ruby/crack/Manifest
dev-ruby/crack/crack-0.4.3.ebuild [new file with mode: 0644]
dev-ruby/d3_rails/Manifest
dev-ruby/d3_rails/d3_rails-3.5.10.ebuild [moved from dev-ruby/d3_rails/d3_rails-3.5.5.ebuild with 86% similarity]
dev-ruby/hitimes/hitimes-1.2.2.ebuild
dev-ruby/httparty/httparty-0.13.7.ebuild
dev-ruby/listen/listen-2.8.6.ebuild
dev-ruby/mime-types/mime-types-1.25.1.ebuild
dev-ruby/mime-types/mime-types-2.6.2.ebuild
dev-ruby/mixlib-shellout/Manifest
dev-ruby/mixlib-shellout/mixlib-shellout-2.2.5.ebuild [new file with mode: 0644]
dev-ruby/nio4r/nio4r-1.1.0.ebuild
dev-ruby/nokogumbo/Manifest
dev-ruby/nokogumbo/nokogumbo-1.4.6.ebuild [moved from dev-ruby/nokogumbo/nokogumbo-1.4.2.ebuild with 75% similarity]
dev-ruby/timers/timers-4.0.1.ebuild
dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild [new file with mode: 0644]
dev-util/dialog/dialog-1.2.20150920.ebuild
eclass/java-utils-2.eclass
eclass/perl-app.eclass
eclass/perl-functions.eclass
games-fps/alienarena/Manifest
games-fps/alienarena/alienarena-20130827.ebuild [new file with mode: 0644]
mail-client/mutt/mutt-1.5.23-r5.ebuild
mail-client/mutt/mutt-1.5.23-r7.ebuild
mail-client/mutt/mutt-1.5.23-r8.ebuild
mail-client/mutt/mutt-1.5.24-r1.ebuild
mail-client/mutt/mutt-1.5.24-r2.ebuild
media-gfx/darktable/Manifest
media-gfx/darktable/darktable-1.6.6.ebuild [deleted file]
media-gfx/darktable/darktable-1.6.7.ebuild [deleted file]
media-gfx/darktable/darktable-1.6.8.ebuild [deleted file]
media-gfx/darktable/darktable-2.0_rc3.ebuild [moved from media-gfx/darktable/darktable-2.0_rc2.ebuild with 99% similarity]
media-gfx/darktable/darktable-9999.ebuild
media-gfx/fontforge/fontforge-20150612-r1.ebuild
media-gfx/gimp/Manifest
media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch [new file with mode: 0644]
media-gfx/gimp/files/gimp-2.9.2-version.patch [new file with mode: 0644]
media-gfx/gimp/gimp-2.8.16.ebuild [new file with mode: 0644]
media-gfx/gimp/gimp-2.9.2.ebuild [new file with mode: 0644]
media-libs/babl/Manifest
media-libs/babl/babl-0.1.14.ebuild [new file with mode: 0644]
media-libs/gd/gd-2.1.1-r1.ebuild
media-libs/gd/gd-2.1.1.ebuild
media-libs/gegl/Manifest
media-libs/gegl/files/gegl-0.3.4-endian.patch [new file with mode: 0644]
media-libs/gegl/gegl-0.3.2.ebuild [new file with mode: 0644]
media-libs/gegl/gegl-0.3.4.ebuild [new file with mode: 0644]
media-libs/gegl/gegl-9999.ebuild
media-libs/gexiv2/gexiv2-0.10.3.ebuild
media-libs/lensfun/lensfun-0.3.1.ebuild
media-libs/libpng/Manifest
media-libs/libpng/libpng-1.2.55.ebuild [moved from media-libs/libpng/libpng-1.2.52.ebuild with 82% similarity]
media-libs/libpng/libpng-1.5.25.ebuild [moved from media-libs/libpng/libpng-1.5.21.ebuild with 72% similarity]
media-libs/libpng/libpng-1.6.20.ebuild [new file with mode: 0644]
media-libs/libsndfile/libsndfile-1.0.26.ebuild
media-radio/fldigi/Manifest
media-radio/fldigi/fldigi-3.23.00.ebuild [deleted file]
media-radio/fldigi/fldigi-3.23.01.ebuild [deleted file]
media-radio/fldigi/fldigi-3.23.06.ebuild [moved from media-radio/fldigi/fldigi-3.23.03.ebuild with 94% similarity]
media-sound/ncmpcpp/Manifest
media-sound/ncmpcpp/ncmpcpp-0.7.ebuild [moved from media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild with 100% similarity]
media-sound/spotify/Manifest
media-sound/spotify/spotify-1.0.19.106.ebuild [moved from media-sound/spotify/spotify-1.0.17.75.ebuild with 99% similarity]
media-video/minitube/metadata.xml
net-firewall/ipsec-tools/files/racoon.service
net-firewall/ipsec-tools/ipsec-tools-0.8.2-r3.ebuild [moved from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild with 100% similarity]
net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
net-libs/libmicrohttpd/Manifest
net-libs/libmicrohttpd/libmicrohttpd-0.9.46.ebuild [new file with mode: 0644]
net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild [new file with mode: 0644]
net-misc/chrony/chrony-2.2-r1.ebuild [new file with mode: 0644]
net-misc/chrony/chrony-9999.ebuild
net-misc/chrony/files/chronyd.init-r1 [new file with mode: 0644]
net-misc/stunnel/Manifest
net-misc/stunnel/stunnel-5.20.ebuild [deleted file]
net-misc/stunnel/stunnel-5.27.ebuild [moved from net-misc/stunnel/stunnel-5.23.ebuild with 96% similarity]
profiles/arch/x86/package.use.mask
profiles/features/selinux/package.use.mask
profiles/package.mask
profiles/updates/4Q-2015
sci-calculators/units/units-2.12.ebuild
sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.1-libpng15.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.2-configure.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch [deleted file]
sci-geosciences/grass/files/grass-6.4.2-libav-9.patch [deleted file]
sci-geosciences/grass/files/grass-7.0.1-soname.patch [new file with mode: 0644]
sci-geosciences/grass/files/grass-pkgconf.patch [deleted file]
sci-geosciences/grass/grass-7.0.1-r4.ebuild [moved from sci-geosciences/grass/grass-7.0.1-r3.ebuild with 98% similarity]
sci-geosciences/grass/metadata.xml
sys-apps/busybox/busybox-1.24.1.ebuild
sys-apps/kmod/Manifest
sys-apps/kmod/kmod-22.ebuild [new file with mode: 0644]
sys-apps/openrc/Manifest
sys-apps/openrc/openrc-0.19.ebuild [new file with mode: 0644]
sys-cluster/ceph/Manifest
sys-cluster/ceph/ceph-10.0.0.ebuild [new file with mode: 0644]
sys-cluster/ceph/ceph-9.0.3.ebuild [new file with mode: 0644]
sys-firmware/iwl3160-7260-bt-ucode/Manifest
sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild [new file with mode: 0644]
sys-firmware/iwl3160-ucode/Manifest
sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild [new file with mode: 0644]
sys-firmware/iwl7260-ucode/Manifest
sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild [new file with mode: 0644]
sys-kernel/mips-sources/Manifest
sys-kernel/mips-sources/mips-sources-4.2.6.ebuild
www-client/google-chrome-beta/Manifest
www-client/google-chrome-beta/google-chrome-beta-48.0.2564.23_p1.ebuild [moved from www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.10_p1.ebuild with 100% similarity]
www-client/google-chrome-unstable/Manifest
www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.22_p1.ebuild [moved from www-client/google-chrome-beta/google-chrome-beta-47.0.2526.73_p1.ebuild with 95% similarity]
www-client/opera-beta/Manifest
www-client/opera-beta/opera-beta-34.0.2036.24.ebuild [moved from www-client/opera-beta/opera-beta-34.0.2036.3.ebuild with 100% similarity]
www-client/vivaldi/Manifest
www-client/vivaldi/vivaldi-1.0.340.7_p1.ebuild [moved from www-client/vivaldi/vivaldi-1.0.330.3_p1.ebuild with 100% similarity]
www-plugins/chrome-binary-plugins/Manifest
www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.22_alpha1.ebuild [moved from www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.73_beta1.ebuild with 100% similarity]
www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.23_beta1.ebuild [moved from www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2564.10_alpha1.ebuild with 100% similarity]
www-servers/tomcat/Manifest
www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch [new file with mode: 0644]
www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild [new file with mode: 0644]
x11-drivers/nvidia-drivers/Manifest
x11-drivers/nvidia-drivers/nvidia-drivers-304.131.ebuild
x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild
x11-drivers/nvidia-drivers/nvidia-drivers-352.63.ebuild
x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild [moved from x11-drivers/nvidia-drivers/nvidia-drivers-358.13.ebuild with 98% similarity]
x11-misc/growl-for-linux/growl-for-linux-0.6.7-r1.ebuild [new file with mode: 0644]
x11-misc/growl-for-linux/growl-for-linux-0.6.7.ebuild
x11-misc/growl-for-linux/growl-for-linux-9999.ebuild
x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild [new file with mode: 0644]
x11-misc/qterm/qterm-0.5.12-r1.ebuild
x11-misc/sent/Manifest [new file with mode: 0644]
x11-misc/sent/metadata.xml [new file with mode: 0644]
x11-misc/sent/sent-0.2.ebuild [new file with mode: 0644]
x11-misc/synergy/synergy-1.7.4.ebuild
x11-misc/synergy/synergy-1.7.5-r1.ebuild [new file with mode: 0644]
x11-misc/vdpauinfo/Manifest
x11-misc/vdpauinfo/vdpauinfo-0.0.6.ebuild [deleted file]
x11-misc/vdpauinfo/vdpauinfo-0.1.ebuild [deleted file]
x11-misc/vdpauinfo/vdpauinfo-0.9-r1.ebuild [deleted file]
x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild [new file with mode: 0644]

index afec2c51cc50e773b9f0c83b22409bacaf3507c6..b9b401ccf4044b53d1ef6cb172c47e29e071cd15 100644 (file)
@@ -12,3 +12,5 @@ DIST puppet-agent_1.3.0-1wheezy_amd64.deb 18018964 SHA256 dd107d96f674100e399f1e
 DIST puppet-agent_1.3.0-1wheezy_i386.deb 17960480 SHA256 eda86599bd647e1367874636aedb9e2812540043b6bf3f0f614efb00b7f727b8 SHA512 d2a3555c9298c9a14ea9342e787f4971a0e6fbe0ea37a2ca8a6f8ee4863fb8eb21dd5cb45c493ad0bffdc85e239baa6aaec95c778fb697e6ec5fe65ba592ea84 WHIRLPOOL f77446c30aaf56e529ecec2dfbd00d438407ed58bfa460f147cc59c403eeafa4fbb62697d84696173501c349156d0b0c0a0166760dc2bdf1f133371bc9ee1d98
 DIST puppet-agent_1.3.1-1wheezy_amd64.deb 18079810 SHA256 c7df7a99ac0ee08564e60596ec4547f4208010d196c7e229f54fe8c8939cf7fd SHA512 c205c24a2c8aee1f57ddb9c1e0b09172455e953de8b51452c274e43edd95e3d5999c8ff74d00935b3a3b3221532d264bd4e9917a994095e9deee8430e91cc572 WHIRLPOOL fb492b8f6e98565e664bfb14dcb8b06fcae20b5bcefb9a04abd064099271fbae8d21c47b6605e32e0efce7fb6bcceeb9e3e330c1e7338491b700e66945870c5b
 DIST puppet-agent_1.3.1-1wheezy_i386.deb 18015662 SHA256 7a6df5b1ff33ab6791c76d7080fc2b8174e6efdf701c774d7945238f3be28e5a SHA512 3960327559ef9b7f58b6b0997789ec89b74afab2628c8067383556e66cdbfe5a5951ddf5c11840bf0fc76052a8548500f2608dc823ae757c669272ee10a22af5 WHIRLPOOL 9c8c50401e3388af6114a24b70753b6ee96beee5f73e9fbb50ff1e6c63ae6e94ae4110ad197558288f4d310ef36714ca9132d08ff0f122aab8a4885b4ab682cc
+DIST puppet-agent_1.3.2-1wheezy_amd64.deb 18316012 SHA256 9d36e5d2902e8ffa9cb19a51c0df26bfe9e15fa28daaff8fc7724185df460ae6 SHA512 d63a52a9e5cf6a0cb1438715ed3f1c8edddaf4c21335aac80771b283c577151519bfbf73028c3d6af702d03372220964b052c4b45190f838a0a7e5ade247923a WHIRLPOOL 789b9316dc0edf701da9ef73c6034501b261e71db86c29db2d4f737719a3d37a53ef71f5eb43d8b7c5d2ff465d44ab59f4f744a39ed20b6a7600624e5ef4b993
+DIST puppet-agent_1.3.2-1wheezy_i386.deb 18248404 SHA256 7e6570f592a712c342c192643cacfb74ca103efea26191cb8b8baa0f359b0fca SHA512 66a092cd7579af5aff89e3c45897c2f3d036fc2fb6e35be3492bdfb273d33c356e4d5ff53362d303eead6b3c53aeef9e82da1371b3555c94f67f11a65f0f5b6d WHIRLPOOL 8cf9f5ddad6815511f2c09d76e66d456aa15c68af0485dfda86a081fa3f6ecbdeeaf4815838c2f6113a65890532164bbba1fb12fb9607c5d1fa8c95d4df14217
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
new file mode 100644 (file)
index 0000000..696bcc7
--- /dev/null
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+       amd64? ( ${SRC_BASE}_amd64.deb )
+       x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+       !app-admin/mcollective
+       !app-admin/puppet
+       !dev-ruby/hiera
+       !dev-ruby/facter
+       !app-emulation/virt-what"
+
+DEPEND="
+       ${CDEPEND}"
+RDEPEND="${CDEPEND}
+       sys-apps/dmidecode
+       selinux? (
+               sys-libs/libselinux[ruby]
+               sec-policy/selinux-puppet
+       )
+       puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+       /opt/puppetlabs/puppet
+       /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+       /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+       /opt/puppetlabs/puppet/lib/engines/*
+       /opt/puppetlabs/puppet/lib/virt-what/*
+       /opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+       enewgroup puppet
+       enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+       # conf.d
+       doconfd etc/default/puppet
+       doconfd etc/default/mcollective
+       # logrotate.d
+       insinto /etc/logrotate.d
+       doins etc/logrotate.d/mcollective
+       # puppet itself
+       insinto /etc/puppetlabs
+       doins -r etc/puppetlabs/*
+       # logdir for systemd
+       dodir var/log/puppetlabs/puppet/
+       fperms 0750 var/log/puppetlabs/puppet/
+       # the rest
+       insinto /opt
+       dodir opt/puppetlabs/puppet/cache
+       doins -r opt/*
+       fperms 0750 /opt/puppetlabs/puppet/cache
+       # init
+       newinitd "${FILESDIR}/puppet.initd" puppet
+       newinitd "${FILESDIR}/mcollective.initd" mcollective
+       systemd_dounit "${FILESDIR}/puppet.service"
+       systemd_dounit "${FILESDIR}/mcollective.service"
+       systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+       # symlinks
+       chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+       chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+       dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+       dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+       dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+       dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+       dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+       dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+       dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+       dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+       dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
index 1781d09e67166ea8c9a2d89cc8f3d3c864944c3a..3c4be16c6527afbdf37e7f5103e3605337e3d537 100644 (file)
@@ -2,3 +2,4 @@ DIST puppetdb-3.0.1.tar.gz 24693952 SHA256 b5e86d36845c62d75c078816cffd5d38d97f0
 DIST puppetdb-3.0.2.tar.gz 24698063 SHA256 976ef25948b206ad9a0abfee1ac8a4e737e87b7d8b26c3af24bc3237d1dd757b SHA512 9bf8ed30f2156bd7e544899d0e135aeaa0a30b3df76245878ce27f3a195bb4a6356a143b65a7ba1bb8c8382e64d1d616131ffe7dbeea15d2d1b5bdd34a93fc8e WHIRLPOOL e55c7405b814ab39e7e58941c3c71ea31f7ebd42bb23de2d98f722a99382f50999fa83105b3d730d49188d137aee1bdf7ed63fc30f8a879809b6e4762ba00873
 DIST puppetdb-3.1.0.tar.gz 25250202 SHA256 e341de9cf9c2a698bb68fef75ef366fbd4760595131bdced3cd925f439d67535 SHA512 95dd5119e198f481f79f83fd7071932bf266b14e21730b5e4b5b19cf43bb1643d82f0c478da725da677f6dc58cfdd10ab4658481638fd48348c4113777e2a564 WHIRLPOOL cd338cf9ebd0a3ce4ec917ce7450a85e1c5dc8bb3c0fb7482bf62aceacbf2dab7d7fa3ddd83e1689f20dc022460ceb4bda231b436fa09c511dc307207cacfc28
 DIST puppetdb-3.2.0.tar.gz 25274763 SHA256 09527c4c4d70d14079f57dacf4744ecbfc1459ce10db0e2277909c37255adcc1 SHA512 71b68866ddb9c25d2903a30653c6e411464cbe2202f32d2d46edf6d72988ff00331a791d863f2c5f9dc3195038e35f753855c37ce68ac0a2b65a559d245c1ad6 WHIRLPOOL c7b7670b5571f6dcfcda74d091c1172e81f80705b9add1598a6687d2024f72f00ec21312e53209fbfda693f406d63a40616f3cb567c7cda873375fcac6f4b10d
+DIST puppetdb-3.2.2.tar.gz 25273184 SHA256 c6ed59055ef54a3af0fc571fae54f23a99e4f4781783c0a9be4ef0df1012b2dd SHA512 5fdd22c3a14e447a997bf223e7147be22c51e8dd44d636ab51bf35c44c813ac2898fbfe72efba3896189244d56abd9cbac3782c7c8ab2f1648b6b1f01b53de45 WHIRLPOOL e138e39a277fad9a0dc56a2c573515ca257b272356381ed5e4d031743e014c3605c9754bf07307389192bee8ed057d02697096102300c15c5ed83990171c61e0
diff --git a/app-admin/puppetdb/puppetdb-3.2.2.ebuild b/app-admin/puppetdb/puppetdb-3.2.2.ebuild
new file mode 100644 (file)
index 0000000..512445a
--- /dev/null
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.7.0"
+DEPEND+=""
+
+pkg_setup() {
+       enewgroup puppetdb
+       enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+       sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+       sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+       sed -i 's/sysconfig/conf\.d/g' install.sh || die
+       sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+       sed -i 's/var\/run/run/g' install.sh || die
+}
+
+src_compile() {
+               einfo "not compiling"
+}
+
+src_install() {
+       dodir /opt/puppetlabs/server/data/puppetdb
+       insinto /opt/puppetlabs/server/apps/puppetdb
+       insopts -m0744
+       doins ext/ezbake-functions.sh
+       insopts -m0644
+       doins ext/ezbake.manifest
+       doins puppetdb.jar
+       insinto /etc/puppetlabs/puppetdb
+       doins ext/config/logback.xml
+       doins ext/config/bootstrap.cfg
+       doins ext/config/request-logging.xml
+       insinto /etc/puppetlabs/puppetdb/conf.d
+       doins ext/config/conf.d/jetty.ini
+       doins ext/config/conf.d/repl.ini
+       doins ext/config/conf.d/database.ini
+       doins ext/config/conf.d/config.ini
+       insopts -m0755
+       insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+       doins install.sh
+       insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+       doins ext/cli/foreground
+       doins ext/cli/ssl-setup
+       doins ext/cli/export
+       doins ext/cli/config-migration
+       doins ext/cli/foreground
+       doins ext/cli/anonymize
+       doins ext/cli/import
+       insinto /opt/puppetlabs/server/apps/puppetdb/bin
+       doins ext/bin/puppetdb
+       insopts -m0644
+       dodir /opt/puppetlabs/server/bin
+       dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+       dodir /opt/puppetlabs/bin
+       dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+       dosym /opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+       # init type tasks
+       newconfd ext/default puppetdb
+       systemd_dounit ext/redhat/puppetdb.service
+       systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+       newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+       # misc
+       insinto /etc/logrotate.d
+       newins ext/puppetdb.logrotate.conf puppetdb
+       fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+       fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+       elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+       elog
+       elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/testdisk/testdisk-7.0-r1.ebuild b/app-admin/testdisk/testdisk-7.0-r1.ebuild
deleted file mode 100644 (file)
index 6b9540c..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="jpeg ntfs reiserfs static"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-               static? (
-                       sys-apps/util-linux[static-libs]
-                       >=sys-libs/ncurses-5.2[static-libs]
-                       jpeg? ( virtual/jpeg:*[static-libs] )
-                       ntfs? ( <=sys-fs/ntfs3g-2013.1.13[static-libs] )
-                       reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-                       >=sys-fs/e2fsprogs-1.35[static-libs]
-                       sys-libs/zlib[static-libs]
-                       )
-               !static? (
-                       sys-apps/util-linux
-                       >=sys-libs/ncurses-5.2
-                       jpeg? ( virtual/jpeg:* )
-                       ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
-                       reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-                       >=sys-fs/e2fsprogs-1.35
-                       sys-libs/zlib
-                       )"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-PATCHES=( "${FILESDIR}/install-gentoo.patch" )
-
-src_configure() {
-       local myconf
-
-       # this is static method is the same used by upstream for their 'static' make
-       # target, but better, as it doesn't break.
-       use static && append-ldflags -static
-
-       # --with-foo are broken, any use of --with/--without disable the
-       # functionality.
-       # The following variation must be used.
-       use reiserfs || myconf+=" --without-reiserfs"
-       use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
-       use jpeg || myconf+=" --without-jpeg"
-
-       econf \
-               --docdir "${ROOT}/usr/share/doc/${P}" \
-               --disable-qt \
-               --without-ewf \
-               --enable-sudo \
-               ${myconf}
-
-       # perform safety checks for NTFS, REISERFS and JPEG
-       if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-               die "Failed to find either NTFS or NTFS-3G library."
-       fi
-       if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-               die "Failed to find reiserfs library."
-       fi
-       if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-               die "Failed to find jpeg library."
-       fi
-}
diff --git a/app-admin/testdisk/testdisk-7.0.ebuild b/app-admin/testdisk/testdisk-7.0.ebuild
deleted file mode 100644 (file)
index c2c69f9..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="jpeg ntfs reiserfs static"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-               static? (
-                       sys-apps/util-linux[static-libs]
-                       >=sys-libs/ncurses-5.2[static-libs]
-                       jpeg? ( virtual/jpeg:*[static-libs] )
-                       ntfs? ( <=sys-fs/ntfs3g-2013.1.13[static-libs] )
-                       reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-                       >=sys-fs/e2fsprogs-1.35[static-libs]
-                       sys-libs/zlib[static-libs]
-                       )
-               !static? (
-                       sys-apps/util-linux
-                       >=sys-libs/ncurses-5.2
-                       jpeg? ( virtual/jpeg:* )
-                       ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
-                       reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-                       >=sys-fs/e2fsprogs-1.35
-                       sys-libs/zlib
-                       )"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-PATCHES=( "${FILESDIR}/install-gentoo.patch" )
-
-src_configure() {
-       local myconf
-
-       # this is static method is the same used by upstream for their 'static' make
-       # target, but better, as it doesn't break.
-       use static && append-ldflags -static
-
-       # --with-foo are broken, any use of --with/--without disable the
-       # functionality.
-       # The following variation must be used.
-       use reiserfs || myconf+=" --without-reiserfs"
-       use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
-       use jpeg || myconf+=" --without-jpeg"
-
-       econf \
-               --disable-qt \
-               --without-ewf \
-               --enable-sudo \
-               ${myconf}
-
-       # perform safety checks for NTFS, REISERFS and JPEG
-       if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-               die "Failed to find either NTFS or NTFS-3G library."
-       fi
-       if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-               die "Failed to find reiserfs library."
-       fi
-       if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-               die "Failed to find jpeg library."
-       fi
-}
index 2c66da2144f488e5eae8610cc5c820636f5c09f0..e5008464b77c6ecf303b83d7fba33ae888c8481d 100644 (file)
@@ -1,4 +1,3 @@
 DIST dpkg_1.17.25.tar.xz 4407792 SHA256 07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa SHA512 6a4b45c0f59cd11fc104d954ab790dd7e11e650cd6dde303a664023a04bf6fbc49c878eaf00e27dd7f9bf5e79a92b3a5f5923d003942436758a3027364a0b7c7 WHIRLPOOL 6ed2d8a645787a83f431803214cce9b1c7516c4083ffe651deb7c2f8b641b85d3a17271030286155a985dfd0046fbd584d2d750ab8954e8e5af74085d7651bd2
 DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
-DIST dpkg_1.18.2.tar.xz 4345224 SHA256 11484f2a73d027d696e720a60380db71978bb5c06cd88fe30c291e069ac457a4 SHA512 cd84ba53a0a8d6f8c9a79d1b3e4c7716249e6dbf8b92635f4691cc31c9896bc156f6ea5a42de419210133497d05c41eb00208b3ec02d44a177015d23873003af WHIRLPOOL 2f4a60e8127c3514ba9ee51723e4057724b8b8a99caea6812d80bca5617cd6f3971a80c219162fd16059e08bd0914d15a39e618fd115bb6dcb8a6b402c64be42
 DIST dpkg_1.18.3.tar.xz 4359884 SHA256 a40ffe38d7f36d858a752189a306433cfc52c7d15d7b98f61d9f9dd49e0e4807 SHA512 f9f06b7b629b88504a219d48f3d041e72fb41468bc9d7bba59a255660bf0d169b050ce816d4ddbee8da85ac3901e55cfc4301eadf94d42ab6038dcacde89f8fc WHIRLPOOL a4e372c162df514beb102fcae1ff0ab7788eaa09e07542e8a66ad0242942a0689a22f761d9932935db5c189d439b5ac7f65c1db8d0dd609442be3fe475ef30f3
index ac420a7b74f497118a3c95631bdef7ad8c837593..980678252bf63a12e8266bc2b9f4863c7c46fadd 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-arch/dpkg/dpkg-1.18.2.ebuild b/app-arch/dpkg/dpkg-1.18.2.ebuild
deleted file mode 100644 (file)
index 808e52f..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="+bzip2 +lzma nls selinux test unicode +update-alternatives +zlib"
-
-RDEPEND="
-       >=dev-lang/perl-5.6.0:=
-       dev-perl/TimeDate
-       >=sys-libs/ncurses-5.2-r7
-       bzip2? ( app-arch/bzip2 )
-       lzma? ( app-arch/xz-utils )
-       selinux? ( sys-libs/libselinux )
-       zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-       ${RDEPEND}
-       app-arch/xz-utils
-       sys-devel/flex
-       virtual/pkgconfig
-       nls? (
-               app-text/po4a
-               >=sys-devel/gettext-0.18.2
-       )
-       test? (
-               dev-perl/DateTime-Format-DateParse
-               dev-perl/IO-String
-               dev-perl/Test-Pod
-               virtual/perl-Test-Harness
-       )
-"
-
-DOCS=( ChangeLog THANKS TODO )
-
-src_prepare() {
-       # do not expect Debian's gzip --rsyncable extension
-       epatch "${FILESDIR}"/${PN}-1.17.0-gzip-rsyncable.patch
-
-       epatch "${FILESDIR}"/${PN}-1.17.1-flags.patch
-
-       # Force the use of the running bash for get-version (this file is never
-       # installed, so no need to worry about hardcoding a temporary bash)
-       sed -i -e '1c\#!'"${BASH}" get-version || die
-
-       if [[ ${CHOST} == mips64*-linux-gnu ]] ; then
-               # Debian targets use custom full tuples.  Map the default one
-               # based on the ABI we're using.
-               local abi
-               if [[ ${ABI} == "n64" ]] ; then
-                       abi="mips64"
-               else
-                       abi="mipsn32"
-               fi
-               printf "gnu-linux-mips64 ${abi}\ngnu-linux-mips64el ${abi}el\n" >> triplettable
-       fi
-
-       use nls && strip-linguas -i po
-
-       eautoreconf
-}
-
-src_configure() {
-       tc-export CC
-       econf \
-               $(use_enable nls) \
-               $(use_enable unicode) \
-               $(use_enable update-alternatives) \
-               $(use_with bzip2 bz2) \
-               $(use_with lzma liblzma) \
-               $(use_with selinux) \
-               $(use_with zlib) \
-               --disable-compiler-warnings \
-               --disable-dselect \
-               --disable-silent-rules \
-               --disable-start-stop-daemon \
-               --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-       emake AR=$(tc-getAR)
-}
-
-src_install() {
-       default
-
-       keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-       keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}
index c8f3f05aa651fb631d5be55511de32cc79c75da9..c2887641967bfa44d8cccd350ccfa64398bbbeda 100644 (file)
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~mips x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,9 @@ src_prepare() {
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)"
+       emake \
+               CC="$(tc-getCC)" \
+               LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_install() {
diff --git a/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch b/app-emulation/libvirt/files/libvirt-1.2.22-do_not_use_sysconf.patch
new file mode 100644 (file)
index 0000000..3296513
--- /dev/null
@@ -0,0 +1,100 @@
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index be1b5a9..5ce0e1e 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -385,9 +385,7 @@ uninstall-logrotate:
+       rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
+ install-sysconfig:
+-      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-      $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \
+-        $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
++
+ uninstall-sysconfig:
+       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd
+       rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
+diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
+index 9e67e43..68a32f8 100644
+--- a/daemon/libvirtd.service.in
++++ b/daemon/libvirtd.service.in
+@@ -12,8 +12,7 @@ Documentation=http://libvirt.org
+ [Service]
+ Type=notify
+-EnvironmentFile=-/etc/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7219f7c..c474a23 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2473,11 +2473,6 @@ EXTRA_DIST += \
+       logging/virtlogd.sysconf
+ install-sysconfig:
+-      $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+-      $(INSTALL_DATA) $(srcdir)/locking/virtlockd.sysconf \
+-        $(DESTDIR)$(sysconfdir)/sysconfig/virtlockd
+-      $(INSTALL_DATA) $(srcdir)/logging/virtlogd.sysconf \
+-        $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
+ uninstall-sysconfig:
+       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/virtlogd
+diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
+index 57089b0..ace0c83 100644
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -5,8 +5,7 @@ Documentation=man:virtlockd(8)
+ Documentation=http://libvirt.org
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 9180564..e72d5f4 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -293,7 +293,7 @@ uninstall-local: uninstall-init uninstall-systemd
+ install-sysconfig:
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
+       $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
+-        $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
++        $(DESTDIR)$(sysconfdir)/libvirt/libvirt-guests.conf
+ uninstall-sysconfig:
+       rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
+diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
+index c31f663..71cb79d 100644
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -5,7 +5,7 @@ Documentation=man:libvirtd(8)
+ Documentation=http://libvirt.org
+ [Service]
+-EnvironmentFile=-/etc/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
+index 2770056..accd4f5 100644
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,10 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
++
+ # URIs to check for running guests
+ # example: URIS='default xen:/// vbox+tcp://host/system lxc:///'
+ #URIS=default
index 724342a1bb13e31531df01356f5ccfb809476867..928b9d519a4117a5e91eebb4d176cf486547521d 100644 (file)
@@ -218,7 +218,7 @@ src_prepare() {
        fi
 
        epatch \
-               "${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
+               "${FILESDIR}"/${PN}-1.2.22-do_not_use_sysconf.patch \
                "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
                "${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
 
index 1851d042adcfe479ebd648051acd0592e4bac05e..83297a8a64499ea35a5ebd7a194f6b12ff8f19be 100644 (file)
@@ -3,8 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe182
 DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
 DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
-DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
-DIST xen-4.5.1.tar.gz 18410400 SHA256 668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 SHA512 9436243e26bc64bc836a179abdc3a6b1b6fa9d3f2170453092c18be71fa62e18cd4465a9154c0f28a7ac8d69d08361ba1defef240a51197f058c012c3855ba04 WHIRLPOOL 71d8559f86683dd9fb3eb09d3f602de227f281fbd3c8cc258bfdb67c425d9e7c4d21cb0284c123e4263262c1b821fea6d28109861ce60d627f6426d352808d99
 DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.5.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.5.ebuild
deleted file mode 100644 (file)
index 6362385..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic eutils multilib python-single-r1 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
-
-UPSTREAM_VER=
-GENTOO_VER=
-
-[[ -n ${UPSTREAM_VER} ]] && \
-       UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-[[ -n ${GENTOO_VER} ]] && \
-       GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-gentoo-patches-${GENTOO_VER}.tar.xz"
-
-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
-               ${UPSTREAM_PATCHSET_URI}
-               ${GENTOO_PATCHSET_URI}
-               "
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-       sys-devel/bin86"
-
-RDEPEND=">=app-emulation/xen-4.2.1"
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-}
-
-retar-externals() {
-       # Purely to unclutter src_prepare
-       local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz"
-
-       # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-       sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-               -i "${WORKDIR}"/zlib-1.2.3/configure
-       sed -e 's:^AR=ar rc:AR=ar:' \
-               -e s':$(AR) $@:$(AR) rc $@:' \
-               -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
-       einfo "zlib Makefile edited"
-
-       cd "${WORKDIR}"
-       tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
-       tar czp grub-0.97 -f grub-0.97.tar.gz
-       tar czp lwip -f lwip-1.3.0.tar.gz
-       tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
-       mv $set "${S}"/stubdom/
-       einfo "tarballs moved to source"
-}
-
-src_prepare() {
-       # Upstream's patchset
-       if [[ -n ${UPSTREAM_VER} ]]; then
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-                       epatch "${WORKDIR}"/patches-upstream
-       fi
-
-       # Gentoo's patchset
-       if [[ -n ${GENTOO_VER} ]]; then
-               EPATCH_SUFFIX="patch" \
-               EPATCH_FORCE="yes" \
-                       epatch "${WORKDIR}"/patches-gentoo
-       fi
-
-       # 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
-
-       # 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}"/${PN/-pvgrub/}-4.2.1-externals.patch
-
-       # Drop .config and Fix gcc-4.6
-       epatch  "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
-
-       # fix jobserver in Makefile
-       epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
-
-       # gcc warnings/QA fix
-       epatch "${FILESDIR}"/${PN}-4.2.3-qa.patch
-
-       #Substitute for internal downloading. pciutils copied only due to the only .bz2
-       cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-       retar-externals || die "re-tar procedure failed"
-}
-
-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)" AR="$(tc-getAR)" -C tools/include
-
-       if use x86; then
-               emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-               XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-       elif use amd64; then
-               emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-               XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-               if has_multilib_profile; then
-                       multilib_toolchain_setup x86
-                       emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-                       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 has_multilib_profile; then
-                       emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-               fi
-       fi
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://www.gentoo.org/doc/en/xen-guide.xml"
-       elog "http://wiki.xen.org/wiki/Main_Page"
-}
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.5.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.5.1.ebuild
deleted file mode 100644 (file)
index 8e1c138..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic eutils multilib python-single-r1 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
-               $XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-       sys-devel/bin86
-       sys-apps/texinfo"
-
-RDEPEND=">=app-emulation/xen-4.2.1"
-
-pkg_setup() {
-       python-single-r1_pkg_setup
-}
-
-retar-externals() {
-       # Purely to unclutter src_prepare
-       local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-       # epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-       sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-               -i "${WORKDIR}"/zlib-1.2.3/configure
-       sed -e 's:^AR=ar rc:AR=ar:' \
-               -e s':$(AR) $@:$(AR) rc $@:' \
-               -i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
-       einfo "zlib Makefile edited"
-
-       cd "${WORKDIR}"
-       tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
-       tar czp grub-0.97 -f grub-0.97.tar.gz
-       tar czp lwip -f lwip-1.3.0.tar.gz
-       tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
-       tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
-       mv $set "${S}"/stubdom/
-       einfo "tarballs moved to source"
-}
-
-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
-
-       # 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}"/${PN/-pvgrub/}-4.3-externals.patch
-
-       # fix jobserver in Makefile
-       epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
-
-       #Substitute for internal downloading. pciutils copied only due to the only .bz2
-       cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-       retar-externals || die "re-tar procedure failed"
-}
-
-src_configure() {
-       local myconf="--prefix=${PREFIX}/usr \
-               --libdir=${PREFIX}/usr/$(get_libdir) \
-               --libexecdir=${PREFIX}/usr/libexec \
-               --disable-werror \
-               --disable-xen"
-
-       econf ${myconf}
-}
-
-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)" AR="$(tc-getAR)" -C tools/include
-
-       if use x86; then
-               emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-               XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-       elif use amd64; then
-               emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-               XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-               if has_multilib_profile; then
-                       multilib_toolchain_setup x86
-                       emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-                       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 has_multilib_profile; then
-                       emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-               fi
-       fi
-}
-
-pkg_postinst() {
-       elog "Official Xen Guide and the offical wiki page:"
-       elog "https://wiki.gentoo.org/wiki/Xen"
-       elog "http://wiki.xen.org/wiki/Main_Page"
-}
index 9a90ca47d5361d853ac2b60c6b36791df26abe32..86df54d5a79b8e53464d53c1ab6f14844f61ad67 100644 (file)
@@ -96,9 +96,9 @@ DEPEND="${COMMON_DEPEND}
                sys-power/iasl )
        dev-lang/perl
        app-misc/pax-utils
-       dev-python/markdown[${PYTHON_USEDEP}]
        doc? (
                app-doc/doxygen
+               dev-python/markdown[${PYTHON_USEDEP}]
                dev-tex/latex2html[png,gif]
                media-gfx/graphviz
                dev-tex/xcolor
index d13b307f58cbf2008a8d2b415b5ff441242d15ce..b35cabeaae72f44b1d6667ad0fd9bb168cdfc56e 100644 (file)
@@ -51,7 +51,7 @@ else
        S="${WORKDIR}/xen-${MY_PV}"
 fi
 
-inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs ${live_eclass}
 
 DESCRIPTION="Xend daemon and tools"
 HOMEPAGE="http://xen.org/"
@@ -95,9 +95,9 @@ DEPEND="${COMMON_DEPEND}
                sys-power/iasl )
        dev-lang/perl
        app-misc/pax-utils
-       dev-python/markdown[${PYTHON_USEDEP}]
        doc? (
                app-doc/doxygen
+               dev-python/markdown[${PYTHON_USEDEP}]
                dev-tex/latex2html[png,gif]
                media-gfx/graphviz
                dev-tex/xcolor
@@ -125,8 +125,7 @@ RDEPEND="${COMMON_DEPEND}
        screen? (
                app-misc/screen
                app-admin/logrotate
-       )
-       virtual/udev"
+       )"
 
 # hvmloader is used to bootstrap a fully virtualized kernel
 # Approved by QA team in bug #144032
@@ -425,11 +424,6 @@ src_install() {
        # for xendomains
        keepdir /etc/xen/auto
 
-       # Temp QA workaround
-       dodir "$(get_udevdir)"
-       mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
-       rm -rf "${D}"/etc/udev
-
        # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
        find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
                -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
index 76febbcf48dde281cd523b8ab38bd0608c4820ad..337751158d499cb271ac9c6bcf701b5a431eca8a 100644 (file)
@@ -28,7 +28,8 @@ else
        SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/${MY_P}.tar.gz
                ${UPSTREAM_PATCHSET_URI}
                ${SECURITY_PATCHSET_URI}
-               ${GENTOO_PATCHSET_URI}"
+               ${GENTOO_PATCHSET_URI}
+               https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches.tar.gz"
 fi
 
 inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
@@ -41,7 +42,7 @@ IUSE="custom-cflags debug efi flask xsm"
 
 DEPEND="${PYTHON_DEPS}
        efi? ( >=sys-devel/binutils-2.22[multitarget] )
-       !efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
+       !efi? ( >=sys-devel/binutils-2.22 )"
 RDEPEND=""
 PDEPEND="~app-emulation/xen-tools-${PV}"
 
@@ -151,6 +152,8 @@ src_configure() {
                replace-flags -O3 -O2
        else
                unset CFLAGS
+               unset LDFLAGS
+               unset ASFLAGS
        fi
 }
 
index 291ad98f543273d45f670483695800c526e170e0..936c68f9a68f5c7292c4c57f8b8ae9f5e51d4863 100644 (file)
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit bash-completion-r1 distutils-r1
index fc2a5724cb31a8cb4bc8cefbd30465fbfb1b0016..9e56ddd8eaf8d4d1c155667bc3c993050cb8a1a3 100644 (file)
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit bash-completion-r1 distutils-r1
 
index bad70cc981beaac0918a06bf1be0d9a8f3d8aec4..9eb96946aee516d49b5b2aef1c6619b84d261013 100644 (file)
@@ -1 +1 @@
-DIST blogc-0.5.tar.xz 248328 SHA256 0c73758dfee9d8a55c3b222449575266b015fd7d81a3f37cdac6e36607d62b45 SHA512 ff8a995738957b9e80cc1cc511d951ef51bfbb20777978369710f44a19d6dafea06977f5e3e919cb2d9829572419fafd18a26634ed75639ceddc1dead8dbb6ce WHIRLPOOL 305b26214501baaab08512e9bf77123c695c96fd6eaa567c732a7e18bbfa84dea6922d3726109519217d4ac156507c794ebe086c13aff28c6889ed7581ad2b26
+DIST blogc-0.5.1.tar.xz 248380 SHA256 c1d3d8cb735f0dea06410a0045b78bec57adeef1c0b3c7dbc2ade9276bfefaec SHA512 9a2e5b0858f8f7ac3d54fc9e61dcdb45617ee9ce74c4c9d975ca34181c7aa9ce554f865daffe64036d71571cca78543dafd74d134a20f9c359bfb0a7ef0d6fa3 WHIRLPOOL ac7271eaeecdc1b7268ed7ebde93417c041901335f3cd46e7a60197dbc3ecb68758bda60f9dc33f633b37ef661087011db6bf528120beb22ae4c91f079d6f073
index 73583c83345acc3f7649ba4f2080bf7e33ff7cf1..c4fe5647751a5ac6512fb17f9d43ab6842780616 100644 (file)
@@ -64,7 +64,7 @@ src_install() {
 
        if use examples; then
                java-pkg_doexamples examples
-               docompress -x /usr/share/doc/${P}/examples/
+               docompress -x /usr/share/doc/${PF}/examples/
        fi
 
        if use doc; then
index 875bb75838877328eab1d2c888ce57bb4d42bc48..6255e04232f434b952e609e1fb14883598ea0d1c 100644 (file)
@@ -1,3 +1,4 @@
 DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
+DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
new file mode 100644 (file)
index 0000000..5954842
--- /dev/null
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-201509040015"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.5"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+       >=dev-java/ant-core-1.7"
+RDEPEND="${CDEPEND}
+       >=virtual/jre-1.7"
+DEPEND="${CDEPEND}
+       app-arch/unzip
+       >=virtual/jdk-1.7"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+java_prepare() {
+       # Remove everything but the Ant component.
+       find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+       rm build.xml || die
+}
+
+src_compile() {
+       java-pkg-simple_src_compile
+       find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+       java-pkg-simple_src_install
+       insinto /usr/share/java-config-2/compiler
+       doins "${FILESDIR}/ecj-${SLOT}"
+       eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.5 b/dev-java/ant-eclipse-ecj/files/ecj-4.5
new file mode 100644 (file)
index 0000000..e0a0eb3
--- /dev/null
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.5"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.5*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.5,ant-eclipse-ecj-4.5"
+GENERATION="2"
index 8fcefc94202eab7689939f9611e905d90cc8aaff..11c634c3e2608e29878635fd6fe43def23ac8166 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -20,10 +20,14 @@ IUSE=""
 RESTRICT="test"
 
 CDEPEND="dev-java/asm:4"
-DEPEND=">=virtual/jdk-1.6
-       ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.6
-       ${CDEPEND}"
+
+DEPEND="
+       ${CDEPEND}
+       >=virtual/jdk-1.6"
+
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
new file mode 100644 (file)
index 0000000..e7e72b0
--- /dev/null
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multimedia framework for Java written by Fluendo"
+HOMEPAGE="http://www.theora.org/cortado/"
+SRC_URI="http://downloads.xiph.org/releases/cortado/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+       app-arch/unzip"
+
+EANT_BUILD_TARGET="stripped"
+
+src_prepare() {
+       echo "#!/bin/sh" > scripts/get-revision
+       echo "echo ${PV}"    >> scripts/get-revision
+}
+
+src_install() {
+       java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
+       dodoc ChangeLog HACKING NEWS README RELEASE TODO \
+               || die "dodoc failed"
+}
index 875bb75838877328eab1d2c888ce57bb4d42bc48..6255e04232f434b952e609e1fb14883598ea0d1c 100644 (file)
@@ -1,3 +1,4 @@
 DIST ecjsrc-3.7.2.jar 1366333 SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b SHA512 53b9800a53d494330ef517983c756d622eaab242552586775f85a694142faa43d348131f9b49ec6ba41066c7d19dcb339eab3140302d46ccbcc7a2edd30e9d32 WHIRLPOOL 399d971251b022cea47d6db2ddea6f6b0a325789c5a09661782d7fad2b29840863b406f1c2b5f49b8b34b55ff3283519e63a76aed09305fe92b3a0ec866c6d97
 DIST ecjsrc-4.2.1.jar 1417043 SHA256 d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf WHIRLPOOL 3f91bbf654d8ce0621e3ce21b5a1fce5058c86ad1dd24f89269aba6716945bff8686b6e1829c602864c15f62b45c65f5d5fe0430052dd2419da7e0c0225c95d5
 DIST ecjsrc-4.4.2.jar 1764959 SHA256 ad3daf77ab710268f88c41fba87218dcdf502b423217a3799b5227ddf03b5858 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20 WHIRLPOOL 5c4e40e482b8c30143bb7043822935eac9ff6f425a9d4f175ef5968ebe0bf0cf219f0f5d8046bfc9b77e067a6ff62166bdb7f7c51f887e5675064a2ca85fe721
+DIST ecjsrc-4.5.1.jar 1809543 SHA256 101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553 WHIRLPOOL 739746de8dfb3c9b9ad40925e99ed58de1f594d6d4e20fd71ce07394a99f2f3f51984daf27c32a76ae5c4a25abf99c6dfb012b62858806d91a5f584d3a4da9f7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
new file mode 100644 (file)
index 0000000..a690ae1
--- /dev/null
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-201509040015"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.5"
+IUSE="+ant"
+
+COMMON_DEP="
+       app-eselect/eselect-java"
+RDEPEND="${COMMON_DEP}
+       >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+       >=virtual/jdk-1.7
+       app-arch/unzip"
+PDEPEND="
+       ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+java_prepare() {
+       # These have their own package.
+       rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+       rm -r org/eclipse/jdt/internal/antadapter || die
+
+       # JavaCore is not distributed in the jar
+       sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+               -e 's|JavaCore.getOptions()||g' \
+               org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+       java-pkg-simple_src_compile
+       find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+       java-pkg-simple_src_install
+       java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+               org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+       einfo "To select between slots of ECJ..."
+       einfo " # eselect ecj"
+
+       eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+       eselect ecj update
+}
diff --git a/dev-java/jaffl/jaffl-0.5.11-r1.ebuild b/dev-java/jaffl/jaffl-0.5.11-r1.ebuild
new file mode 100644 (file)
index 0000000..8600087
--- /dev/null
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 versionator
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="http://kenai.com/projects/jaffl"
+SRC_URI="https://github.com/jnr/jnr-ffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+       dev-java/asm:3
+       dev-java/jffi:1.2
+       dev-java/jnr-x86asm:1.0"
+
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
+
+DEPEND="
+       ${CDEPEND}
+       app-arch/unzip
+       >=virtual/jdk-1.6
+       test? (
+               dev-java/junit:4
+               dev-java/ant-junit:0
+               dev-java/hamcrest-core:0
+       )"
+
+JAR_VERSION=$(get_version_component_range 1-2)
+
+src_unpack() {
+       default
+       mv * "${P}" || die
+}
+
+java_prepare() {
+       # Don't choke on errors from generating the Javadoc
+       cd "${S}" || die
+
+       epatch "${FILESDIR}"/${P}-library-path.patch
+       epatch "${FILESDIR}"/${P}-GNUmakefile.patch
+
+       rm -vf lib/{.,junit*}/*.jar || die
+
+       java-ant_xml-rewrite -f ./nbproject/build-impl.xml \
+                                                -c -e javadoc \
+                                                -a failonerror \
+                                                -v no
+
+       java-pkg_jar-from --into lib jffi-1.2
+       java-pkg_jar-from --into lib jnr-x86asm-1.0
+       java-pkg_jar-from --into lib asm-3 asm.jar asm-3.2.jar
+       java-pkg_jar-from --into lib asm-3 asm-analysis.jar asm-analysis-3.2.jar
+       java-pkg_jar-from --into lib asm-3 asm-commons.jar asm-commons-3.2.jar
+       java-pkg_jar-from --into lib asm-3 asm-tree.jar asm-tree-3.2.jar
+       java-pkg_jar-from --into lib asm-3 asm-util.jar asm-utils-3.2.jar
+       java-pkg_jar-from --into lib asm-3 asm-xml.jar asm-xml-3.2.jar
+}
+
+EANT_EXTRA_ARGS="-Dreference.jffi.jar=lib/jffi.jar \
+       -Dreference.jnr-x86asm.jar=lib/jnr-x86asm.jar \
+       -Dproject.jffi=\"${S}\" \
+       -Dproject.jnr-x86asm=\"${S}\"
+       -D\"already.built.${S}\"=true"
+
+src_test() {
+       local paths="$(java-config -di jnr-x86asm-1.0,jffi-1.2):${S}/build"
+
+       ANT_TASKS="ant-junit ant-nodeps" eant test \
+               -Drun.jvmargs="-Djava.library.path=${paths}" \
+               -Dlibs.junit_4.classpath="$(java-pkg_getjars junit-4,hamcrest-core)" ${EANT_EXTRA_ARGS}
+}
+
+src_install() {
+       java-pkg_newjar dist/${PN}-${JAR_VERSION}.jar
+
+       use doc && java-pkg_dojavadoc dist/javadoc
+       use source && java-pkg_dosrc src/*
+}
index 144c16d459a913ce1e6522a0e1590c8cab48e1c2..7aa2e6bb089f47851932b9780fcae72cec886064 100644 (file)
@@ -1,2 +1 @@
-DIST jamvm-1.5.4.tar.gz 656283 SHA256 7865693698bc4322cabe1014a4b7ebdec1bc1daf45f1a4457b6e908a4446b124 SHA512 a4a7a2917881262fee19b6aedd9dc50a78463c5e4b02bda4b8184aef49797e3476f8ec8671047a01ba246af7d84cbe58f57ee84bb198817738c79d9f62c1ddbc WHIRLPOOL 615d94ab3a8359c8d6d0a2347d836c0a6adceaeda03a72d105b094f4ffb3161a5f3abbd4c12aa75703823da203d1cee91591e829a796813f82fcfbf2703068f2
 DIST jamvm-2.0.0.tar.gz 741459 SHA256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d WHIRLPOOL 7e80be683fafb444cd417502b96089ce4f6879a049ca49e33691b4d5d6755814654ab4ed7626b666dd48f9d6101567b2a12de43b916055ea1d067c5d4df06443
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch
deleted file mode 100644 (file)
index 57d046a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac
---- jamvm-1.5.0.old/configure.ac       2008-03-03 17:31:46.000000000 +0200
-+++ jamvm-1.5.0/configure.ac   2008-03-03 17:36:14.000000000 +0200
-@@ -208,6 +208,7 @@
-     install_dir=$prefix
- fi
- AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
-+AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
- AC_ARG_ENABLE(zip,
-     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
-diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
---- jamvm-1.5.0.old/src/class.h        2008-03-03 17:31:46.000000000 +0200
-+++ jamvm-1.5.0/src/class.h    2008-03-03 17:36:51.000000000 +0200
-@@ -39,10 +39,10 @@
-    separate class files in a directory structure */
- #ifdef USE_ZIP
--#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
-+#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
- #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
- #else
--#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
-+#define JAMVM_CLASSES PKGDATADIR"/classes"
- #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
- #endif
diff --git a/dev-java/jamvm/files/jamvm-1.5.4-env.file b/dev-java/jamvm/files/jamvm-1.5.4-env.file
deleted file mode 100644 (file)
index 85c551e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-VERSION="JamVM JRE @PV@"
-JAVA_HOME="/usr/@LIBDIR@/@PN@"
-BOOTCLASSPATH="${JAVA_HOME}/classes.zip:${JAVA_HOME}/lib/rt.jar"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin"
-ROOTPATH="${JAVA_HOME}/bin"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.5"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JAVAC PATH"
-LDPATH="${JAVA_HOME}/lib"
diff --git a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild
deleted file mode 100644 (file)
index 03dccea..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic multilib java-vm-2 autotools
-
-DESCRIPTION="An extremely small and specification-compliant virtual machine"
-HOMEPAGE="http://jamvm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug libffi"
-
-CLASSPATH_SLOT=0.98
-DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT}
-       libffi? ( virtual/libffi )
-       amd64? ( virtual/libffi )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-       "${FILESDIR}"/"${P}-classes-location.patch"
-)
-
-src_prepare() {
-       # without this patch, classes.zip is not found at runtime
-       epatch "${PATCHES[@]}"
-       eautoreconf
-
-       # These come precompiled.
-       # configure script uses detects the compiler
-       # from PATH. I guess we should compile this from source.
-       # Then just make sure not to hit
-       # https://bugs.gentoo.org/show_bug.cgi?id=163801
-       #rm -v lib/classes.zip || die
-}
-
-CLASSPATH_DIR="/usr/gnu-classpath-${CLASSPATH_SLOT}"
-
-src_configure() {
-       # Keep libjvm.so out of /usr
-       # https://bugs.gentoo.org/show_bug.cgi?id=181896
-       INSTALL_DIR="/usr/$(get_libdir)/${PN}"
-
-       filter-flags "-fomit-frame-pointer"
-
-       if use amd64 || use libffi; then
-               append-cflags "$(pkg-config --cflags-only-I libffi)"
-       fi
-
-       local fficonf="--enable-ffi"
-       use !amd64 && fficonf="$(use_enable libffi ffi)"
-
-       econf ${fficonf} \
-               --disable-dependency-tracking \
-               $(use_enable debug trace) \
-               --prefix=${INSTALL_DIR} \
-               --datadir=/usr/$(get_libdir) \
-               --bindir=/usr/bin \
-               --libdir=${INSTALL_DIR}/lib \
-               --with-classpath-install-dir=${CLASSPATH_DIR}
-}
-
-create_launcher() {
-       local script="${D}/${INSTALL_DIR}/bin/${1}"
-       cat > "${script}" <<-EOF
-               #!/bin/sh
-               exec /usr/bin/jamvm \
-                       -Xbootclasspath/p:"${CLASSPATH_DIR}/share/classpath/tools.zip" \
-                       gnu.classpath.tools.${1}.Main "\$@"
-       EOF
-       chmod +x "${script}"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-
-       dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README
-
-       set_java_env "${FILESDIR}/${P}-env.file"
-
-       dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java
-       dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar
-       dosym ${CLASSPATH_DIR}/share/classpath/tools.zip ${INSTALL_DIR}/lib/tools.jar
-       for file in ${CLASSPATH_DIR}/bin/*; do
-               base=$(basename ${file})
-               create_launcher ${base#g}
-       done
-}
index 878fd1b711eec75bea5d9311ddfbb5cae768ce59..e6d9c12f03ecccbde3deafd76c648ec969f9aa95 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc ~x86"
+KEYWORDS="amd64 ppc ppc x86"
 IUSE="debug libffi"
 
 DEPEND="dev-java/gnu-classpath:0.98
index 47737614da0dba6f045cb7d0055887d01af70086..770c7b89dc96baab81b08731903ce3e213d3d29d 100644 (file)
@@ -1,2 +1 @@
-DIST jnr-netdb-1.0.1.tar.gz 670834 SHA256 654360f56c4a0131df293b6dcaa96618dfa9ded549180284dbaa20e6305d8906 SHA512 d62718de9e9b0a0bb1463f6bf9dc22ca00d5d107f22fea77af0b5cf77ffb6d681d0ea345cad0301e0f9053f797fd0a502325c71b3bf8aea989232f73e3f18cbc WHIRLPOOL f4e0493a0df380fd372e407d2e5014c40dda88e832ab6324fc579d6a2469cad9a3aed98f268c43aaa35b966324de7b746287fb075a16ddd58068b5fa00f04523
 DIST jnr-netdb-1.1.4.tar.gz 648347 SHA256 d67327943c8ca59432bda152bd4a8611ff1eab099f2d4bf08a743dfd5f963c69 SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195 WHIRLPOOL 0319025334a12e59df01da1f13e74401373ec7e7e2ea30db549e9e19e226d74cdc74b62e9c5c78d74374d05f98adcc3d18bdfc40a8e760a4c5f2b5fa3c7d4a76
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.0.1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.0.1.ebuild
deleted file mode 100644 (file)
index 67611b2..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-JAVA_PKG_IUSE="doc source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Network services database access for java"
-HOMEPAGE="https://github.com/wmeissner/jnr-netdb"
-SRC_URI="https://github.com/wmeissner/jnr-netdb/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-COMMON_DEP=">=dev-java/jaffl-0.5.1:0"
-
-RDEPEND=">=virtual/jre-1.5
-       ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-       ${COMMON_DEP}
-       test?
-       (
-               dev-java/ant-junit4:0
-               dev-java/hamcrest-core:0
-               java-virtuals/jdk-with-com-sun:0
-       )"
-
-src_unpack() {
-       unpack ${A}
-       mv w* "${P}" || die
-}
-
-src_prepare() {
-       mkdir -p lib
-       find . -iname 'junit*.jar' -delete
-       sed -i -e "s|run.test.classpath=|run.test.classpath=lib/hamcrest-core.jar:|g" nbproject/project.properties
-       java-pkg_jar-from --into lib jaffl jaffl.jar
-}
-
-EANT_EXTRA_ARGS="-Dreference.jaffl.jar=lib/jaffl.jar \
-       -Dproject.jaffl=\"${S}\" \
-       -D\"already.built.${S}\"=true"
-
-src_test() {
-       java-pkg_jar-from --build-only --into lib/junit_4 junit-4 \
-               junit.jar junit-4.5.jar
-       java-pkg_jar-from --build-only --into lib hamcrest-core \
-               hamcrest-core.jar
-       sed -i -e \
-       "s_\${file.reference.jffi-complete.jar}_$(java-pkg_getjars --build-only --with-dependencies jaffl)_" \
-               nbproject/project.properties
-
-       ANT_TASKS="ant-junit4 ant-nodeps" eant test \
-               ${EANT_EXTRA_ARGS} \
-               -Djava.library.path="$(java-config -di jaffl)"
-}
-
-src_install() {
-       java-pkg_dojar "dist/${PN}.jar"
-       use doc && java-pkg_dojavadoc dist/javadoc
-       use source && java-pkg_dosrc src/*
-}
index c44100b6261d594780797322aed70572f107e0ca..cfe700a092280fe6316772f79e04a1cc30f79c87 100644 (file)
@@ -1,3 +1,4 @@
 DIST jnr-x86asm-0.1.tar.gz 83289 SHA256 31c0fbcc1fa3eb9b51a2644bf302dc88afdbbac78537020488403012af552eca SHA512 c2d2f8e60b1ec3940aea641edb98bb391f70fadf33a9ae782df0b24b8442d39a12880393e13fab305a8875a8802f7621e012472f40841e0fae24e16ea96f8043 WHIRLPOOL e49536a1268882c6de24ff5193cf9bc3da0eeb8f48f1b181e99309f5d003c4482808f2a30a32fe86091aab09ef13efb5f9a749dc6df3018f9dad40b8204b795d
 DIST jnr-x86asm-1.0.1.tar.gz 114159 SHA256 7528e5f7103ab1a40e0473cff377eb2c14e616d17c69010a8366658ed2da3f0c SHA512 812bae9acc69d403e188e833e1060786fa17c2807c62e4213b9207d22c388217b7840f7c3fa9b16ae042e293cd821051a69e34ec118af9944fef13bec091774a WHIRLPOOL 8c6bcb2d170eb9aa65944a75a359e828b05efc6695cb7727d112fd84a13366fadbad091e25ca3793ab2ba0138fe71287ab8ab808ca0a67baa413fcd19c868708
 DIST jnr-x86asm-1.0.2.tar.gz 114165 SHA256 2846693c3af607b1b89eba23e290f9dfd0668b45755cfa6f0708714d7a0ccdae SHA512 50ee91cd8931c4310b95276347f7860256843251dd36562350a10e34728e001d9e387ac4c230b4341f602bd9fe7fa8813a46e248b835c7e08801f5a3da04e11e WHIRLPOOL 8b5a5519f756be8c47bfdf6742653f883eed1e78b93abcad32081f18c97d09e855d58384920e731e9d65ef7d5c0135e0398cbc7c5d0abcda9fe7290ee0f998b6
+DIST jnr-x86asm-1.0.2.zip 180046 SHA256 a4af22b926cfb4e2880ff15da014b8c0c6d915050ce59ddca40cde85cbb988e2 SHA512 e77124b7f0074dcd8b17ba200a1c99350827e6a3c641d6caa33b6bd900c95af9140f8ab716a5299bc591969f295158709b381f9b45faddbd6b75355949e4f463 WHIRLPOOL c8b4f649b696f10ba659b499e62480f10f61b4282032e0c129ad067d6470a53beb760589354510bee0132893b7dedf87c5fe6de7e1ce43586cf8f095571c1a4e
diff --git a/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild b/dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r1.ebuild
new file mode 100644 (file)
index 0000000..cfcad57
--- /dev/null
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A pure-java port of asmjit"
+HOMEPAGE="https://github.com/jnr/jnr-x86asm"
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_ANT_ENCODING="UTF-8"
index 7fc2d24a38334ca869a0b65de8b9770ebbe38d1f..b68b117ba4bfad2260f18a2d6dbc465d6edf12af 100644 (file)
@@ -1,2 +1 @@
-DIST apache-log4j-1.2.16.tar.gz 2791979 SHA256 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89 SHA512 d519c761579ce632a388164d9e492cf0327c4ed96522c92e3d9addfdb2c3a12b4a63a6ff7fc7455236bda61e265c1521ddf39cd8dfeac3e8c808ca982acaee97 WHIRLPOOL 07c67669d8670e7a624f14f3757b2be595a5f05b59e4c98b6ac0af12ead0a52b9608dc1068ef4737aee8cb653f3a81ca0a96fdcf7efb36f06e51a2b30f33d969
 DIST log4j-1.2.17.tar.gz 2864448 SHA256 a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663 SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 WHIRLPOOL 1fc1b420e78bb56ca05282c81f12d5911f8966228194a8f5090a32cfa0403332b36589c7841b06c3bfd602f0f13cdf8342e678de01446e4260cffd8a57a6c175
diff --git a/dev-java/log4j/log4j-1.2.16.ebuild b/dev-java/log4j/log4j-1.2.16.ebuild
deleted file mode 100644 (file)
index 88f4d8e..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-JAVA_PKG_IUSE="doc javamail jms jmx source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-${P}"
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-# jikes support disabled: bug #108819
-IUSE="doc javamail jms jmx source"
-
-CDEPEND="javamail? ( java-virtuals/javamail java-virtuals/jaf )
-               jmx? ( dev-java/sun-jmx:0 )
-               jms? ( java-virtuals/jms )"
-
-RDEPEND=">=virtual/jre-1.4
-               ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-               ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-       rm -rf dist/
-       java-pkg_filter-compiler jikes
-       rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-EANT_EXTRA_ARGS="-Djaxp-present=true"
-EANT_DOC_TARGET=""
-
-src_compile() {
-       if use javamail; then
-               EANT_GENTOO_CLASSPATH+="javamail,jaf"
-               EANT_EXTRA_ARGS+=" -Djavamail-present=true"
-       fi
-       if use jmx; then
-               use javamail && EANT_GENTOO_CLASSPATH+=","
-               EANT_GENTOO_CLASSPATH+="sun-jmx"
-               EANT_EXTRA_ARGS+=" -Djmx-present=true"
-       fi
-       if use jms; then
-               EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-       fi
-       java-pkg-2_src_compile
-}
-
-src_install() {
-       # the build still builds files with older version in name
-       java-pkg_newjar dist/lib/${PN}-1.2.15.jar ${PN}.jar
-
-       if use doc ; then
-               java-pkg_dohtml -r site/*
-               rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-               java-pkg_dojavadoc --symlink apidocs site/apidocs
-       fi
-       use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/log4j/log4j-1.2.17-r2.ebuild b/dev-java/log4j/log4j-1.2.17-r2.ebuild
deleted file mode 100644 (file)
index f20c311..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://logging.apache.org/log4j/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="javamail jms"
-
-CDEPEND="javamail? (
-                       dev-java/oracle-javamail:0
-                       java-virtuals/jaf:0
-               )
-               jms? (
-                       java-virtuals/jms:0
-               )"
-
-RDEPEND=">=virtual/jre-1.6
-               ${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-               ${CDEPEND}"
-
-MY_P="apache-${P}"
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-       rm -rf dist || die
-       java-pkg_filter-compiler jikes
-       rm -v *.jar || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="log4j.jar"
-EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
-EANT_DOC_TARGET=""
-
-src_compile() {
-       if use javamail; then
-               EANT_GENTOO_CLASSPATH+="javamail,jaf"
-               EANT_EXTRA_ARGS+=" -Djavamail-present=true"
-       fi
-       if use jms; then
-               EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
-       fi
-
-       java-pkg-2_src_compile
-}
-
-src_install() {
-       java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
-
-       if use doc ; then
-               java-pkg_dohtml -r site/*
-               rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
-               java-pkg_dojavadoc --symlink apidocs site/apidocs
-       fi
-
-       if use source; then
-               java-pkg_dosrc src/main/java/*
-       fi
-}
index 1da34e9694ef8373e6c7d40d4458907ebe21f04d..6727a503b469aa80d279159d00f5d090572547f1 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://logging.apache.org/log4j/"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="javamail jms"
 
 CDEPEND="javamail? (
index 1b3f29e1f2a733d5dd04c9dfa8045963f29941bc..d5511ab42436416a9ab69b7ccd32622b07edae14 100644 (file)
@@ -5,6 +5,5 @@
   <use>
     <flag name="javamail">Build the SMTPAppender</flag>
     <flag name="jms">Build the JMSAppender</flag>
-    <flag name="jmx">Build org.apace.log4j.jmx</flag>
   </use>
 </pkgmetadata>
index 545c48201527dbe9b385de1e7fccacede0cb3a7d..5c1d374e8dc95d9809cbfdaa8670093a913ed0b0 100644 (file)
@@ -25,13 +25,20 @@ CDEPEND="
        dev-java/slf4j-api:0
        dev-java/typesafe-config:0"
 
-RDEPEND=">=virtual/jre-1.6
-       ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
+
+DEPEND="
+       ${CDEPEND}
        app-arch/zip
-       ${CDEPEND}"
+       >=virtual/jdk-1.6"
 
 S="${WORKDIR}/${MY_PN}-${MY_P}"
 
 JAVA_SRC_DIR="src/main"
-JAVA_GENTOO_CLASSPATH="log4j,slf4j-api,typesafe-config"
+
+JAVA_GENTOO_CLASSPATH="
+       log4j
+       slf4j-api
+       typesafe-config"
index 283e95831b129e18b6a682029d0490892ee1a9bc..cd0d7cef7aa7b38014e093aabd8604538e438089 100644 (file)
@@ -1 +1,2 @@
 DIST mimepull-1.8.tar.bz2 48841 SHA256 357f3c2b558a755c4f3d7b71056d8973d723cd2b8529ed54014fa8d164378702 SHA512 60de5b888ccdf89ffdeba0a5ccd98e77f7497e57c6b3c71049446dab0293836f8f2b84a39354602e9073fb6fef880dbc11c80323413f8ed15f0a3af68086ae07 WHIRLPOOL a7a9f58210b47eb37f5994233339773672f1ff12f6e0aa2fcc04873b6e29aecd3181a28131ca45d5e275bb111d1a990ef6d8545d3eab8919a7db73d91c903b09
+DIST mimepull-1.9.6.jar 68382 SHA256 615b78d220c74b6c924ed09d51698628ad098786cedb5646bf411aae60f50301 SHA512 528eb77d6edbbfb1b1d8aebb617f9d20c84b9c18f7ab763163ea136c3898319519bbfa8a8e204bd0697a4eac9b964eaf3fb2ee214555efcb3da152ebf467ae64 WHIRLPOOL c38827897a903642eb5c6a79b876265f665412aff09219e06692bdec9ee1489394a9398534e3240d6bdef1b18e6e1caefee5048d800b77c453064fa0da0073de
diff --git a/dev-java/mimepull/mimepull-1.9.6.ebuild b/dev-java/mimepull/mimepull-1.9.6.ebuild
new file mode 100644 (file)
index 0000000..ee87e37
--- /dev/null
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Pull API for parsing MIME messages"
+HOMEPAGE="http://java.net/projects/mimepull"
+SRC_URI="https://repo1.maven.org/maven2/org/jvnet/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+       >=virtual/jdk-1.6"
+
+RDEPEND="
+       >=virtual/jre-1.6"
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0-r1.ebuild
new file mode 100644 (file)
index 0000000..30ac8b1
--- /dev/null
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
+HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
+SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+       >=virtual/jre-1.6"
+
+DEPEND="
+       >=virtual/jdk-1.6
+       app-arch/unzip"
+
+JAVA_SRC_DIR="OSGI-OPT/src"
+
+java_prepare() {
+       rm -r org || die
+}
index 5bf7b92faf19720513e52ab42b0b2b2d08a47801..e24ce3fad0457188fc9ddb79823c3a653a2c5b47 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,17 +14,20 @@ HOMEPAGE="http://simplyhtml.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_src_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE=""
 
-CDEPEND="dev-java/javahelp:0
+CDEPEND="
+       dev-java/javahelp:0
        dev-java/gnu-regexp:1"
 
-DEPEND=">=virtual/jdk-1.6
-       ${CDEPEND}"
+DEPEND="
+       ${CDEPEND}
+       >=virtual/jdk-1.6"
 
-RDEPEND=">=virtual/jre-1.6
-       ${CDEPEND}"
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-java/simplyhtml/simplyhtml-0.13.1.ebuild b/dev-java/simplyhtml/simplyhtml-0.13.1.ebuild
deleted file mode 100644 (file)
index 2b8d08c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2 versionator
-
-MY_PN="SimplyHTML"
-MY_PV="$(replace_all_version_separators _)"
-#MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Text processing application based on HTML and CSS files"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_src_${MY_PV}.tar.gz"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-COMMON_DEP="dev-java/javahelp
-       dev-java/gnu-regexp"
-DEPEND=">=virtual/jdk-1.4
-       ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-       ${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}-${MY_PV}/src"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-java_prepare() {
-       # it wants to copy lib jars
-       sed -i '/copy file/d' build.xml || die
-}
-
-src_compile() {
-       local cp="$(java-pkg_getjars javahelp,gnu-regexp-1)"
-       eant -Dclasspath="${cp}" jar $(use_doc)
-}
-
-src_install() {
-       cd ..
-       java-pkg_dojar dist/lib/${MY_PN}*.jar
-
-       dodoc readme.txt || die
-
-       use doc && java-pkg_dojavadoc dist/api
-       use source && java-pkg_dosrc src/com src/de
-}
diff --git a/dev-java/stringtemplate/files/3.2.1-test-fixes.patch b/dev-java/stringtemplate/files/3.2.1-test-fixes.patch
new file mode 100644 (file)
index 0000000..fd625ab
--- /dev/null
@@ -0,0 +1,53 @@
+https://github.com/antlr/stringtemplate3/pull/3
+
+--- test/org/antlr/stringtemplate/test/TestStringTemplate.java.orig    2015-09-18 22:04:18.131902875 +0100
++++ test/org/antlr/stringtemplate/test/TestStringTemplate.java 2015-09-18 22:04:21.651848456 +0100
+@@ -36,6 +36,10 @@
+ import java.text.SimpleDateFormat;
+ import java.util.*;
++import org.junit.FixMethodOrder;
++import org.junit.runners.MethodSorters;
++
++@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+ public class TestStringTemplate extends TestCase {
+     static final String newline = System.getProperty("line.separator");
+@@ -87,7 +91,7 @@
+               assertEquals(expecting,I.toString());
+       }
+-      public void testNoGroupLoader() throws Exception {
++      public void testAaaNoGroupLoader() throws Exception {
+               // this also tests the group loader
+               StringTemplateErrorListener errors = new ErrorBuffer();
+               String tmpdir = System.getProperty("java.io.tmpdir");
+@@ -2214,8 +2218,12 @@
+               s.add("2");
+               s.add("3");
+               st.setAttribute("items", s);
+-              expecting = "<li>3</li><li>2</li><li>1</li>";
+-              assertEquals(expecting, st.toString());
++              String[] split = st.toString().split("(</?li>){1,2}");
++              Arrays.sort(split);
++              assertEquals("",  split[0]);
++              assertEquals("1", split[1]);
++              assertEquals("2", split[2]);
++              assertEquals("3", split[3]);
+       }
+       public void testDumpMapAndSet() throws Exception {
+@@ -2235,8 +2243,11 @@
+               s.add("2");
+               s.add("3");
+               st.setAttribute("items", s);
+-              expecting = "3,2,1";
+-              assertEquals(expecting, st.toString());
++              String[] split = st.toString().split(",");
++              Arrays.sort(split);
++              assertEquals("1", split[0]);
++              assertEquals("2", split[1]);
++              assertEquals("3", split[2]);
+       }
+       public class Connector3 {
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
new file mode 100644 (file)
index 0000000..1179a5b
--- /dev/null
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java template engine"
+HOMEPAGE="http://www.stringtemplate.org/"
+SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+RDEPEND="${CDEPEND}
+       >=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+       >=virtual/jdk-1.6
+       test? ( >=dev-java/junit-4.11:4 )"
+
+S="${WORKDIR}/${P}"
+JAVA_GENTOO_CLASSPATH="antlr"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+       # https://github.com/antlr/stringtemplate3/pull/3
+       epatch "${FILESDIR}/${PV}-test-fixes.patch"
+
+       java-pkg_clean
+}
+
+src_compile() {
+       local G; for G in action template angle.bracket.template eval group interface; do # from build.xml
+               antlr -o src/org/antlr/stringtemplate/language/{,${G}.g} || die
+       done
+
+       java-pkg-simple_src_compile
+}
+
+src_install() {
+       java-pkg-simple_src_install
+       dodoc {CHANGES,README}.txt
+}
+
+src_test() {
+       cd test || die
+       local CP=".:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
+
+       local TESTS=$(find * -name "Test*.java")
+       TESTS="${TESTS//.java}"
+       TESTS="${TESTS//\//.}"
+
+       ejavac -classpath "${CP}" $(find -name "*.java")
+       ejunit4 -classpath "${CP}" ${TESTS}
+}
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1.ebuild
deleted file mode 100644 (file)
index 130dbca..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_beta/b}"
-S_PV="${PV/_beta/.b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A Java template engine"
-HOMEPAGE="http://www.stringtemplate.org/"
-SRC_URI="http://www.stringtemplate.org/download/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND=">=dev-java/antlr-2.7.7:0[java]"
-
-RDEPEND=">=virtual/jre-1.5
-       ${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-       test? ( dev-java/junit:4 )
-       ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${S_PV}"
-
-java_prepare() {
-       find . -name "*.class" -print -delete || die "Failed deleting precompiled classes"
-       find . -name "*.jar" -print -delete || die "Failed deleting prebuilt classes"
-}
-
-antlr2() {
-       java -cp $(java-pkg_getjars antlr) antlr.Tool "${@}" || die "antlr2 failed"
-}
-
-src_compile() {
-       einfo "Generate from grammars"
-       cd src/org/antlr/stringtemplate/language || die
-       # order same as in pom.xml
-       antlr2 template.g
-       antlr2 angle.bracket.template.g
-       antlr2 action.g
-       antlr2 eval.g
-       antlr2 group.g
-       antlr2 interface.g
-
-       cd "${S}" || die
-       find src -name "*.java" >> "${T}/sources" || die
-       ejavac -d target/classes -cp $(java-pkg_getjars antlr) "@${T}/sources"
-
-       # create javadoc
-       if use doc; then
-               javadoc -classpath $(java-pkg_getjars antlr) -d javadoc "@${T}/sources" || die "Javadoc failed"
-       fi
-
-       # jar things up
-       cd target/classes || die
-       find -type f >> "${T}/classes" || die
-       jar cf ${PN}.jar "@${T}/classes" || die "jar failed"
-}
-
-src_install() {
-       java-pkg_dojar target/classes/${PN}.jar
-       dodoc README.txt CHANGES.txt || die
-       use source && java-pkg_dosrc src/*
-       use doc && java-pkg_dojavadoc javadoc
-}
-
-src_test() {
-       find test -name "*.java" >> "${T}/test-sources" || die
-       ejavac -cp target/classes:$(java-pkg_getjars antlr,junit-4) -d target/test-classes "@${T}/test-sources"
-       ejunit4 -cp target/classes:target/test-classes org.antlr.stringtemplate.test.TestStringTemplate
-}
index 12c7c21ec5ec39de4ecd3bb8d9c530ee0af710c8..b49cd5ace2fc83ce5c7017177cee8bd76bd97a9b 100644 (file)
@@ -12,4 +12,5 @@ DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acf
 DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
 DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
 DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/files/4.0-build.xml b/dev-java/tomcat-servlet-api/files/4.0-build.xml
new file mode 100644 (file)
index 0000000..ea0ef87
--- /dev/null
@@ -0,0 +1,93 @@
+
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.7"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 3.1 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/annotation/*" />
+        <include name="javax/servlet/descriptor/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.3 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.3 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild
new file mode 100644 (file)
index 0000000..d48b296
--- /dev/null
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_alpha/.M}"
+MY_A="apache-${PN}-${MY_PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+       cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+       rm -fR */*/build.xml
+       einfo "Removing bundled jars and classes"
+       find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+       java-pkg_dojar "${S}"/output/build/lib/*.jar
+       use source && java-pkg_dosrc java/javax/servlet/
+}
index 3c761aceae70827bd3c6784f9467bea037a47793..a46a315f8571dfe284d9f4d9a72e829a5f690bc7 100644 (file)
@@ -1 +1,2 @@
 DIST validation-api-1.0.0.GA-sources.jar 65220 SHA256 a394d52a9b7fe2bb14f0718d2b3c8308ffe8f37e911956012398d55c9f9f9b54 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0 WHIRLPOOL 9eef9230c08a712ddcdb81c85961fb3be7661bce3276adc77b91f274ba2df2edd7c919fad38e2499ccd58287477ca75cff55d4f86bc8d86c6c6020900e08cf6c
+DIST validation-api-1.1.0.jar 94671 SHA256 30c421ac184ae6204961304b60cd06db5fde3db5159e81430bcdcb386cf19470 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8 WHIRLPOOL 69b5a70aa4e358d85b43d60857413744a62bf0215473c1d97ca0307f98f3a0626a21b4643ab1cb73ba8746ed237e6db3787e86334bc5bef346f99ede3ef658a8
diff --git a/dev-java/validation-api/validation-api-1.1.0.ebuild b/dev-java/validation-api/validation-api-1.1.0.ebuild
new file mode 100644 (file)
index 0000000..3529c2f
--- /dev/null
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bean Validation (JSR-303) API"
+HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+SRC_URI="https://repo1.maven.org/maven2/javax/validation/${PN}/${PV}.Final/${P}.Final-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+
+DEPEND=">=virtual/jdk-1.5
+       app-arch/unzip"
index 0581cd51c23e4681ff1717ee721289fc1c15c31d..1ffd978916006c4b58360cc6e0fdc8fd613a3b88 100644 (file)
@@ -19,7 +19,7 @@ fi
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
 REQUIRED_USE="readline? ( !libedit )
        libedit? ( !readline )"
index b6de3188d8f86b8f3a47419459cdfde425ed72ea..000ae30d74c797af874b094466532580b973190d 100644 (file)
@@ -1 +1,2 @@
 DIST libressl-2.2.4.tar.gz 2966157 SHA256 6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5 WHIRLPOOL 44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43
+DIST libressl-2.3.1.tar.gz 3014881 SHA256 410b58db4ebbcab43c3357612e591094f64fb9339269caa2e68728e36f8d589e SHA512 ac70d2f09035d63765bb980422c6c6b55ef07f6af4a93fce54748ff3621cf08ef87acfd438797d562dc21ab9b4862992876792deef9310aafdb927e20e27d453 WHIRLPOOL 52f46016cf07e598b7117de1cc90617982de0ad020b55c4a2b402de317d8b52f8a381c9ebdff787421dccd3e47294305863ceb9f2c1c2a9080818fec16e7e177
diff --git a/dev-libs/libressl/files/libressl-2.2.4-clientcert.patch b/dev-libs/libressl/files/libressl-2.2.4-clientcert.patch
new file mode 100644 (file)
index 0000000..ac2f88e
--- /dev/null
@@ -0,0 +1,35 @@
+untrusted comment: signature from openbsd 5.8 base secret key
+RWQNNZXtC/MqP8u13/pPZfTpPeHhU93PG0DBihXvQ7lB0CvONLwoTfHr9f40s515bidPGcGLAH4xu+yz3skT6b3tKETEWZw8BgA=
+
+OpenBSD 5.8 errata 9, Dec 3, 2015:
+
+CVE-2015-3194 - NULL pointer dereference in client certificate validation
+
+Apply by doing:
+    signify -Vep /etc/signify/openbsd-58-base.pub -x 009_clientcert.patch.sig \
+        -m - | (cd /usr/src && patch -p0)
+
+And then rebuild and install libcrypto:
+    cd /usr/src/lib/libcrypto
+    make obj
+    make depend
+    make
+    make install
+
+Index: lib/libssl/src/crypto/rsa/rsa_ameth.c
+===================================================================
+RCS file: /cvs/src/lib/libssl/src/crypto/rsa/rsa_ameth.c,v
+retrieving revision 1.14
+retrieving revision 1.14.6.1
+diff -u -p -u -p -r1.14 -r1.14.6.1
+--- lib/libssl/src/crypto/rsa/rsa_ameth.c      11 Feb 2015 04:05:14 -0000      1.14
++++ lib/libssl/src/crypto/rsa/rsa_ameth.c      4 Dec 2015 04:13:43 -0000       1.14.6.1
+@@ -298,7 +298,7 @@ rsa_pss_decode(const X509_ALGOR *alg, X5
+       if (pss->maskGenAlgorithm) {
+               ASN1_TYPE *param = pss->maskGenAlgorithm->parameter;
+               if (OBJ_obj2nid(pss->maskGenAlgorithm->algorithm) == NID_mgf1 &&
+-                  param->type == V_ASN1_SEQUENCE) {
++                  param && param->type == V_ASN1_SEQUENCE) {
+                       p = param->value.sequence->data;
+                       plen = param->value.sequence->length;
+                       *pmaskHash = d2i_X509_ALGOR(NULL, &p, plen);
similarity index 91%
rename from dev-libs/libressl/libressl-2.2.4.ebuild
rename to dev-libs/libressl/libressl-2.2.4-r1.ebuild
index 68141da895b7753ae0a064a27d72ebba984c423f..cbbcb2bc27abb5b6ac1e1a04ac3b06b1bb515c98 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
 
 LICENSE="ISC openssl"
 SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="+asm static-libs"
 
 RDEPEND="!dev-libs/openssl:0"
@@ -22,6 +22,8 @@ PDEPEND="app-misc/ca-certificates"
 src_prepare() {
        touch crypto/Makefile.in
 
+       epatch "${FILESDIR}"/${P}-clientcert.patch
+
        sed -i \
                -e '/^[ \t]*CFLAGS=/s#-g ##' \
                -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
diff --git a/dev-libs/libressl/libressl-2.3.1-r1.ebuild b/dev-libs/libressl/libressl-2.3.1-r1.ebuild
new file mode 100644 (file)
index 0000000..660a329
--- /dev/null
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/"
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+SLOT="0/36" # reflects ABI of libcrypto.so and libssl.so
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+       touch crypto/Makefile.in
+
+       epatch "${FILESDIR}"/${PN}-2.2.4-clientcert.patch
+
+       sed -i \
+               -e '/^[ \t]*CFLAGS=/s#-g ##' \
+               -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+               -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+               -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+               -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+               -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+               configure || die "fixing CFLAGS failed"
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" econf \
+               $(use_enable asm) \
+               $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+       emake check
+}
+
+multilib_src_install_all() {
+       einstalldocs
+       prune_libtool_files
+}
index 116564b894176cb9c82045f06ac935febc255a69..19c3b5a9f7ac7e6355644ddd341f6f76cadd2ca0 100644 (file)
@@ -5,6 +5,10 @@
                <email>hasufell@gentoo.org</email>
                <name>Julian Ospald</name>
        </maintainer>
+       <maintainer>
+               <email>blueness@gentoo.org</email>
+               <name>Anthony G. Basile</name>
+       </maintainer>
        <natural-name>LibreSSL</natural-name>
        <longdescription lang="en">
                LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in
index 3a7fb0460bc368c74a6d5f46680bc302f8e759e4..aa8726c10104003632b88d78b1149cd36a2136ca 100644 (file)
@@ -1,2 +1,3 @@
 DIST nspr-4.10.10.tar.gz 1134164 SHA256 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 SHA512 60e035c4bd037bbf4bfacc97e2b1097ea78a179969fccead6a964069d826e917f07aaa35a26f123b7297521910728c11e27556fc9bbc09e385c1e8aef9dbf376 WHIRLPOOL db63a6d1e0c9d57dfa059aecf8eeff8e36d0385f598290665d525a85eb6fe173cd899bba017c82b26815d894d8ea6e728dbb7a77483036551c06c78c900d7ee3
 DIST nspr-4.10.8.tar.gz 1131130 SHA256 507ea57c525c0c524dae4857a642b4ef5c9d795518754c7f83422d22fe544a15 SHA512 f14e3bd46cd1dee9d7163adbf3b09a450ea8c6c65499c5b6696eba7e85b6b12d3f90561a1dfe0dc0dc5fe1b14758b4191e546d9f0e29a66f33c69dd6ed6f50d9 WHIRLPOOL 67be897d54e2446d563cfe505047b23880025bd3f1ea5492964f8d286f56776e41a8e63bd9d197d3115efae0d63bd0c7005fb9fc56abdfce0702c27e6a9e872c
+DIST nspr-4.11.tar.gz 1134106 SHA256 cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2 SHA512 26c47ba618f5a7748cacc5152348b6fd37bdcc82806bbff485ed4d485aecad13d202270a837c735670030e96380ec3177f3bc8a47e0dca359cfb097a84242c02 WHIRLPOOL f8707154d1981a09140d31d359d5a40867eaad447620a4731a11c770cae13b8e9a64ef45c82123083e37e2effedfb0c367cc57969a3baf65628ff1e9ccf41517
diff --git a/dev-libs/nspr/nspr-4.11.ebuild b/dev-libs/nspr/nspr-4.11.ebuild
new file mode 100644 (file)
index 0000000..17c82b2
--- /dev/null
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.5"
+
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal
+
+MIN_PV="$(get_version_component_range 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="http://archive.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND="
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+       )"
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/nspr-config
+)
+
+src_prepare() {
+       cd "${S}"/nspr || die
+       epatch "${FILESDIR}"/${PN}-4.7.0-prtime.patch
+       epatch "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+       epatch "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+       epatch "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+       epatch "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+       # We do not need to pass -L$libdir via nspr-config --libs
+       epatch "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+       # https://bugzilla.mozilla.org/show_bug.cgi?id=1128029
+       epatch "${FILESDIR}"/${PN}-4.10.10-musl-support.patch
+
+       # rename configure.in to configure.ac for new autotools compatibility
+       if [[ -e "${S}"/nspr/configure.in ]] ; then
+               einfo "Renaming configure.in to configure.ac"
+               mv "${S}"/nspr/configure.{in,ac} || die
+       fi
+       # We must run eautoconf to regenerate configure
+       eautoconf
+
+       # make sure it won't find Perl out of Prefix
+       sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+       # Respect LDFLAGS
+       sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+               "${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+       # We use the standard BUILD_xxx but nspr uses HOST_xxx
+       tc-export_build_env BUILD_CC
+       export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+       tc-export AR CC CXX RANLIB
+       [[ ${CBUILD} != ${CHOST} ]] \
+               && export CROSS_COMPILE=1 \
+               || unset CROSS_COMPILE
+
+       local myconf=()
+
+       # The configure has some fancy --enable-{{n,x}32,64bit} switches
+       # that trigger some code conditional to platform & arch. This really
+       # matters for the few common arches (x86, ppc) but we pass a little
+       # more of them to be future-proof.
+
+       # use ABI first, this will work for most cases
+       case "${ABI}" in
+               alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+               n32) myconf+=( --enable-n32 );;
+               x32) myconf+=( --enable-x32 );;
+               s390x|*64) myconf+=( --enable-64bit );;
+               default) # no abi actually set, fall back to old check
+                       einfo "Running a short build test to determine 64bit'ness"
+                       echo > "${T}"/test.c || die
+                       ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+                       case $(file "${T}"/test.o) in
+                               *32-bit*x86-64*) myconf+=( --enable-x32 );;
+                               *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+                               *32-bit*|*ppc*|*i386*) ;;
+                               *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+                       esac ;;
+               *) ;;
+       esac
+
+       # Ancient autoconf needs help finding the right tools.
+       LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+       ac_cv_path_AR="${AR}" \
+       econf \
+               --libdir="${EPREFIX}/usr/$(get_libdir)" \
+               $(use_enable debug) \
+               $(use_enable !debug optimize) \
+               "${myconf[@]}"
+}
+
+multilib_src_install() {
+       # Their build system is royally confusing, as usual
+       MINOR_VERSION=${MIN_PV} # Used for .so version
+       emake DESTDIR="${D}" install
+
+       einfo "removing static libraries as upstream has requested!"
+       rm -f "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+       # install nspr-config
+       dobin config/nspr-config
+
+       # Remove stupid files in /usr/bin
+       rm "${ED}"/usr/bin/prerr.properties || die
+
+       # This is used only to generate prerr.c and prerr.h at build time.
+       # No other projects use it, and we don't want to depend on perl.
+       # Talked to upstream and they agreed w/punting.
+       rm "${ED}"/usr/bin/compile-et.pl || die
+}
index ec3d47b3a968453dd39c22ac5fd4e37d3289fea1..055a8cf882b717146786fe99270d068581d23c27 100644 (file)
@@ -11,7 +11,7 @@ HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.c
 
 LICENSE="GPL-2 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/Alien-SDL-1.434
index eaa0a98d0eb62172bd6022222bcb2dcbfa383892..11be8b19823a940816264d53b7bd138591053b93 100644 (file)
@@ -1 +1,2 @@
 DIST timezonedb-2014.7.tgz 196808 SHA256 76e1fba9ea263621810a220ffe280c8ca227a12fd497c9ce430537fbd13357a7 SHA512 4032581f87a9b5eb5d85d0f6f5ddbd3711d2b93aabbfd37462d548bac4bb1276bb6a8cb7cd0f1fbe92d8ad104aa6e624491512cf677478f37a7c6c43b02b3918 WHIRLPOOL d6c31d9f463bec166706ff0ca54764a4efc1f51841eaa19a2213ba773688b0fb9aaad5da85aa7ab0ca4b65078f14133295f57fbcb7829cd3dddf7c866ce7b3ef
+DIST timezonedb-2015.7.tgz 415259 SHA256 16f59dc2314acc7f870c7a48212db430c17d3aa52f5fd76a1cf1dfacf8d84722 SHA512 5c53fdb415016c1d3ab967fb8ac28cce8d39e9ccacd29dc382234b371ccd6e5ee672f6ba8b748dedd4cfca8979a136dac7eddd4f9aff1a8e0eb72cbb3e09d1c2 WHIRLPOOL 33e9ee96f676bbf25747049c2af4f8ca7009024ab6be9b5402d2518b51d7bfbb51575f7964d8dc76484d2e2672f93ac2176cce0a75670821369f4b6e2c9ac226
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2015.7.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2015.7.ebuild
new file mode 100644 (file)
index 0000000..bc9240a
--- /dev/null
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php5-5 php7-0"
+
+inherit php-ext-pecl-r2
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
index 5b848b3d2691694fd2747d0ff55506ca5bcd98f7..2ffa9b7ed0c1b924e842a412c1b67a76e0eeff80 100644 (file)
@@ -5,4 +5,5 @@ DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9f
 DIST xdebug-2.2.7.tgz 256437 SHA256 4fce7fc794ccbb1dd0b961191cd0323516e216502fe7209b03711fc621642245 SHA512 ddbf2b2c4086962e1e51767ebf0ab61f6199a2aad8d85be40c3fb731247a93744365757803cc6e3f190dc130282cbf7f01a6f9f8acac277011e7d767a24b2ba3 WHIRLPOOL d050dfa80a6f6be845a5a201164b508020c2ca492cad520f92fe470205d3bdd6f1721c16c0ed02614da28f9c7c0bb56c6567dc95c65e45352a9738bb14d2aa86
 DIST xdebug-2.3.1.tgz 266218 SHA256 b50365896089c76d6d64924b66428cc5ef6b4802371e3d422581b3c34d3ca64c SHA512 aca3ce1546f8b99482f55c0f09e532addecff7db4cc81818260b2d3524fd6888e05c15ed0f98f25a139c40e011540705f02aab56f4c52d90212a843459493bd2 WHIRLPOOL 69e4545c1489f240a23ba4ee70afec754471e5cbffdd48a1d5f5db1eace13982807b1e30ae2efd541f79b658613e770ad2dea1ca016a67037e5b5b59ce08fb9c
 DIST xdebug-2.3.3.tgz 268381 SHA256 b27bd09b23136d242dbc94f4503c98f012a521d5597002c9d463a63c6b0cdfe3 SHA512 212604e87caa67b3734befa0f57580532b0edd346ed871bbaba72ba8319ba60eb8d66649cb5716df250f28ef1cd2384ccc6f651b90ab4936dbcb45ef6c5f7438 WHIRLPOOL f228a2527dc9f2a166bdd4f2920537d5bc66e00f528f21ca05b7038ca535fb3011f3f39a39871c5ac0a62d46d3c3f3eb4a76d33e9c33c79b633be252e89af23e
+DIST xdebug-2.4.0RC2.tgz 263506 SHA256 d09bf890f50178d083291288d9dea34a90a95bd8e9cbc9755d14a8e7ebe9d6d0 SHA512 fa719d13e13a912c7425318f31fb0baa9440b8d52dbaed7fff43afcec98b0c0fd3ead627bed1c31c4dd1b41315f76cec093fd5521ad657cf5514afa5eb284d67 WHIRLPOOL 107978033e15b11e9a708a2042cf6debeeee2a4785dc45cd69381dce5adde9b41e1203511a56cf1d32f211bec11f4d8bb9d2589dbab1a2f839ee3d30abb48456
 DIST xdebug-2.4.0beta1.tgz 269305 SHA256 7936814fff7cae80bdf4106e9cc9e7c350d236f5a58a1d6ddd28d1829ae99acf SHA512 8d0e9ae9544f930c965e06713a89e5f0e64b43aaa78055805541641106b136c7ff1d1bd675e671147e32fbec0d4c45f0efed9676486dd89fb287f97f75d75464 WHIRLPOOL 955e24a2f27313ffc4765eeb2d6dc67ef6ed77cb2f337e650566ec357334db24ab31cb100cbee1fef45bda3b183e92a656b9014b6b60f8b17b6168f7311d6a7d
diff --git a/dev-php/xdebug-client/xdebug-client-2.4.0_rc2.ebuild b/dev-php/xdebug-client/xdebug-client-2.4.0_rc2.ebuild
new file mode 100644 (file)
index 0000000..ae3be6a
--- /dev/null
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+       econf $(use_with libedit)
+}
+
+src_install() {
+       newbin debugclient xdebug
+}
index b03925a6778d8e8634f3520c09641629f25e139c..f2184ec9cc3f3bd2b0d422a4d8be0253b7e8687b 100644 (file)
@@ -2,4 +2,5 @@ DIST xdebug-2.2.6.tgz 256161 SHA256 6dd1cba0605e75009331aa3625a19ef49ade5a75aa9f
 DIST xdebug-2.2.7.tgz 256437 SHA256 4fce7fc794ccbb1dd0b961191cd0323516e216502fe7209b03711fc621642245 SHA512 ddbf2b2c4086962e1e51767ebf0ab61f6199a2aad8d85be40c3fb731247a93744365757803cc6e3f190dc130282cbf7f01a6f9f8acac277011e7d767a24b2ba3 WHIRLPOOL d050dfa80a6f6be845a5a201164b508020c2ca492cad520f92fe470205d3bdd6f1721c16c0ed02614da28f9c7c0bb56c6567dc95c65e45352a9738bb14d2aa86
 DIST xdebug-2.3.1.tgz 266218 SHA256 b50365896089c76d6d64924b66428cc5ef6b4802371e3d422581b3c34d3ca64c SHA512 aca3ce1546f8b99482f55c0f09e532addecff7db4cc81818260b2d3524fd6888e05c15ed0f98f25a139c40e011540705f02aab56f4c52d90212a843459493bd2 WHIRLPOOL 69e4545c1489f240a23ba4ee70afec754471e5cbffdd48a1d5f5db1eace13982807b1e30ae2efd541f79b658613e770ad2dea1ca016a67037e5b5b59ce08fb9c
 DIST xdebug-2.3.3.tgz 268381 SHA256 b27bd09b23136d242dbc94f4503c98f012a521d5597002c9d463a63c6b0cdfe3 SHA512 212604e87caa67b3734befa0f57580532b0edd346ed871bbaba72ba8319ba60eb8d66649cb5716df250f28ef1cd2384ccc6f651b90ab4936dbcb45ef6c5f7438 WHIRLPOOL f228a2527dc9f2a166bdd4f2920537d5bc66e00f528f21ca05b7038ca535fb3011f3f39a39871c5ac0a62d46d3c3f3eb4a76d33e9c33c79b633be252e89af23e
+DIST xdebug-2.4.0RC2.tgz 263506 SHA256 d09bf890f50178d083291288d9dea34a90a95bd8e9cbc9755d14a8e7ebe9d6d0 SHA512 fa719d13e13a912c7425318f31fb0baa9440b8d52dbaed7fff43afcec98b0c0fd3ead627bed1c31c4dd1b41315f76cec093fd5521ad657cf5514afa5eb284d67 WHIRLPOOL 107978033e15b11e9a708a2042cf6debeeee2a4785dc45cd69381dce5adde9b41e1203511a56cf1d32f211bec11f4d8bb9d2589dbab1a2f839ee3d30abb48456
 DIST xdebug-2.4.0beta1.tgz 269305 SHA256 7936814fff7cae80bdf4106e9cc9e7c350d236f5a58a1d6ddd28d1829ae99acf SHA512 8d0e9ae9544f930c965e06713a89e5f0e64b43aaa78055805541641106b136c7ff1d1bd675e671147e32fbec0d4c45f0efed9676486dd89fb287f97f75d75464 WHIRLPOOL 955e24a2f27313ffc4765eeb2d6dc67ef6ed77cb2f337e650566ec357334db24ab31cb100cbee1fef45bda3b183e92a656b9014b6b60f8b17b6168f7311d6a7d
diff --git a/dev-php/xdebug/xdebug-2.4.0_rc2.ebuild b/dev-php/xdebug/xdebug-2.4.0_rc2.ebuild
new file mode 100644 (file)
index 0000000..ee76ecd
--- /dev/null
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+
+USE_PHP="php7-0 php5-6 php5-5"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r2
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+               ~dev-php/xdebug-client-${PV}"
+
+src_install() {
+       dodoc README.rst CREDITS
+       php-ext-source-r2_src_install
+
+       php-ext-source-r2_addtoinifiles "xdebug.auto_trace" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.trace_output_dir" '"/tmp"'
+       php-ext-source-r2_addtoinifiles "xdebug.trace_output_name" '"trace.%c"'
+       php-ext-source-r2_addtoinifiles "xdebug.trace_format" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.trace_options" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.collect_includes" '"1"'
+       php-ext-source-r2_addtoinifiles "xdebug.collect_params" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.collect_return" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.collect_vars" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.default_enable" '"1"'
+       php-ext-source-r2_addtoinifiles "xdebug.extended_info" '"1"'
+       php-ext-source-r2_addtoinifiles "xdebug.manual_url" '"http://www.php.net"'
+       php-ext-source-r2_addtoinifiles "xdebug.max_nesting_level" '"100"'
+       php-ext-source-r2_addtoinifiles "xdebug.show_exception_trace" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.show_local_vars" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.show_mem_delta" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.COOKIE" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.ENV" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.FILES" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.GET" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.POST" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.REQUEST" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.SERVER" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump.SESSION" '"NULL"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump_globals" '"1"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump_once" '"1"'
+       php-ext-source-r2_addtoinifiles "xdebug.dump_undefined" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.profiler_enable" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.profiler_output_dir" '"/tmp"'
+       php-ext-source-r2_addtoinifiles "xdebug.profiler_output_name" '"cachegrind.out.%p"'
+       php-ext-source-r2_addtoinifiles "xdebug.profiler_enable_trigger" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.profiler_append" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.profiler_aggregate" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_enable" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_handler" '"dbgp"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_host" '"localhost"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_mode" '"req"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_port" '"9000"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_autostart" '"0"'
+       php-ext-source-r2_addtoinifiles "xdebug.remote_log" '""'
+       php-ext-source-r2_addtoinifiles "xdebug.idekey" '""'
+       php-ext-source-r2_addtoinifiles "xdebug.var_display_max_data" '"512"'
+       php-ext-source-r2_addtoinifiles "xdebug.var_display_max_depth" '"2"'
+       php-ext-source-r2_addtoinifiles "xdebug.var_display_max_children" '"128"'
+
+}
+
+pkg_postinst() {
+       ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+       ewarn "installed as a dependency, and not all users will want xdebug to be"
+       ewarn "enabled by default. If you want to enable it, you should edit the"
+       ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+       ewarn "call xdebug_enable() in your code."
+}
index 35499ddf87c997c7bd4f83a9b53302b01ea80045..4adc939511af800181052b20408d32bdb861e5da 100644 (file)
@@ -1,3 +1,4 @@
 DIST apsw-3.8.10.1_p1.tar.gz 307142 SHA256 af20221e1a65f593b47d83f1f8a136afc6d2199a22bc014251a44e31e7b0ca17 SHA512 1f997c6c88ca65995c8b5d894135d5900a4d2f56f877f74f0e99eab4ede0d06be5730ce282a5d99358318ca076eec75f2afe271574b6c02aaabf4bef181d0bda WHIRLPOOL 3e9b609a19ee39edda9af8140982c74d53d3e2b4c0bd05ea53974cb7a3c2f12f13ab4acf1d51ac5b50ee738f5380dc83b819e0ed11bf28107f903f0a52eb5949
 DIST apsw-3.8.11.1_p1.tar.gz 307797 SHA256 f4dc653aca10dfae8578c8bf1125600f77d0d8dcc85b4185754388aa87ae0997 SHA512 4ca857d32f423475b17e81130d4919627d581b80dd6f3f120d95906ddad657d6f52eb69fb211612e15f5eaee0211c0ad992391c93068a463e72670d49f69c61e WHIRLPOOL 15a58a83e1e5f3ee4afc470a0d58e29f5ee5cf416897b1c83ad021fb9c47f0533a5e01417aa59fb74e7b33ad9e5f1a74b40c0cbffcee4cf01617006dbad3dc2a
 DIST apsw-3.8.7.1_p1.tar.gz 303446 SHA256 7aee29cc170332aa1a16fb80753152e809208bbc91823f64178e4afc32526fec SHA512 104aad3a8cec07647b71c77814cc069587daf84450b41f992d0b3c752c476105351b28912768a29f7952bfd75e9b2d3fcd8e6ae758b3bab8b986bf8e1300c256 WHIRLPOOL cc95728b07e384ee88002afce4b68abcfb259a62188cc77bad1154a83bf3e1979fec8761fe8a3c9e5ae35d5027cdf42c1b4a4b7749ad76d7935e032e253c8167
+DIST apsw-3.9.2_p1.tar.gz 308216 SHA256 6fae3f701f5cadca47195d814a02cec016f813f35d9d44d39596d293f5067577 SHA512 530940debc738e0902af266ccd14567c7ec6afe5866dcc2d66ace939cb681ea30da6b34e688ab986531266833e691a0233ad0c19bc4a105bb9e8c05f97adb537 WHIRLPOOL d44be5fa9245faea35c2f9fce894e62eac676957cdcce75673f3a671a01a3dd05c1bbfeca9b85f227419a1a46921324585675cbcc65cc83eb364520e5cf4a4b7
diff --git a/dev-python/apsw/apsw-3.9.2_p1.ebuild b/dev-python/apsw/apsw-3.9.2_p1.ebuild
new file mode 100644 (file)
index 0000000..e556884
--- /dev/null
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="https://github.com/rogerbinns/apsw/"
+SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
+
+python_compile() {
+       if ! python_is_python3; then
+               local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+               export CFLAGS
+       fi
+       distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+       "${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+       "${PYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+# Docs build is presently non-functional due to upstream issues
+# See https://github.com/rogerbinns/apsw/issues/198
index 489fcb92ba22a01f442013282b18dc310daf17ff..3ea11164c7a3c0e630247ad084b700b7dc62c723 100644 (file)
@@ -38,7 +38,5 @@ DEPEND="
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_test() {
-       pushd build/lib > /dev/null || die
-       PYTHONPATH=. pytest --verbose || die "Tests fail with ${EPYTHON}"
-       popd > /dev/null || die
+       ${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
 }
diff --git a/dev-python/pygments/files/2.0.2-bytes-decode.patch b/dev-python/pygments/files/2.0.2-bytes-decode.patch
new file mode 100644 (file)
index 0000000..35f2e26
--- /dev/null
@@ -0,0 +1,16 @@
+ pygments/formatters/img.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+index db5bee3..12d53cd 100644
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -84,7 +84,7 @@ class FontManager(object):
+         if not exit:
+             lines = out.splitlines()
+             if lines:
+-                path = lines[0].strip().strip(':')
++                path = lines[0].decode().strip().strip(':')
+                 return path
+     def _create_nix(self):
similarity index 97%
rename from dev-python/pygments/pygments-2.0.2-r1.ebuild
rename to dev-python/pygments/pygments-2.0.2-r2.ebuild
index b2de0150b71c4c3aa9390ebc5788ea484e55c258..adef7afa90f1650fcf2353697bbb41577c7c118c 100644 (file)
@@ -36,6 +36,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
        "${FILESDIR}"/${PV}-shell-injection-backport.patch
        "${FILESDIR}"/${PV}-shell-injection-backport2.patch
+       "${FILESDIR}"/${PV}-bytes-decode.patch
 )
 
 python_compile_all() {
index 3e4525b6f3ec30743be565a33b8dc7b9f8180308..dde591a81460e4633e34d4e12e301312ba4a9e47 100644 (file)
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-ros/sound_play/files/test.patch b/dev-ros/sound_play/files/test.patch
new file mode 100644 (file)
index 0000000..e23490a
--- /dev/null
@@ -0,0 +1,26 @@
+commit ecdde483c81fb89e35f025ee3aacba7cd45528ab
+Author: Alexis Ballier <aballier@gentoo.org>
+Date:   Fri Dec 4 12:38:42 2015 +0100
+
+    sound_play: Fix build with -DCATKIN_ENABLE_TESTING=OFF.
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=567466
+
+diff --git a/sound_play/CMakeLists.txt b/sound_play/CMakeLists.txt
+index ada0b07..3f9604c 100644
+--- a/sound_play/CMakeLists.txt
++++ b/sound_play/CMakeLists.txt
+@@ -16,9 +16,11 @@ generate_messages(DEPENDENCIES actionlib_msgs)
+ catkin_package(CATKIN_DEPENDS message_runtime actionlib_msgs
+                INCLUDE_DIRS include)
+-catkin_add_nosetests(scripts/test)
++if(CATKIN_ENABLE_TESTING)
++    catkin_add_nosetests(scripts/test)
+-add_subdirectory(test)
++    add_subdirectory(test)
++endif()
+ install(PROGRAMS
+    scripts/playbuiltin.py
index c4b4cb101276703aedbc192a4e88ab2efd9f16eb..be4ac3e90ddc0d6633acda2c52d40c4f2bd8c013 100644 (file)
@@ -33,3 +33,4 @@ RDEPEND="${RDEPEND}
        media-libs/gst-plugins-good:0.10
        media-libs/gst-plugins-base:0.10
 "
+PATCHES=( "${FILESDIR}/test.patch" )
index dccb010f1e272d61b29d5aa7a72df8a7d620fa52..f97e97f472ba5ecefb519a02762d6849aaa89b30 100644 (file)
@@ -17,7 +17,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend ">=dev-ruby/celluloid-0.16.0
        >=dev-ruby/nio4r-1.1.0"
index d32eddae028f10a6c9671f454c1bd047893e0b2d..e50a99e7ad4bc10543cb1646e76afa4d2e28028e 100644 (file)
@@ -23,7 +23,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RUBY_PATCHES=( "${P}-call-private-methods.patch" )
 
index 067b1cf8cce464ef746ba041e010466f06895592..25a61d2d03c6f37c0ee3b0acd357225fe808283e 100644 (file)
@@ -1 +1,2 @@
 DIST crack-0.4.2.gem 37376 SHA256 ea4c34f052106f571235f627f561d28309151c09b841130bb7627c2d522589c6 SHA512 0c1adfe9cbcf6c5bdabba20819c7ed7dce0a8e360695564927bab447c3d66d786bd9267066efb08732b0fc4687d9dc3ac74c650eb8cec17575926aa9a24f7723 WHIRLPOOL 71ef6176576f897ab46ae431bafba512cacdeb5fbfdf1bcafbef24c9d4dcb8abb242b8722a75ae4db891fb8c86dd7a9e7d05a0fdcb86958ac5d0a6d4a873a49f
+DIST crack-0.4.3.gem 574976 SHA256 5318ba8cd9cf7e0b5feb38948048503ba4b1fdc1b6ff30a39f0a00feb6036b29 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386 WHIRLPOOL 7a27a200e0662fa8fc512164286e3342be2da4b5839b4308e50fd8307afb6f1957ca1083f03b2a64ef365a12e3ddbbdd6d1c3ec40261f8197df8bdad88b0ea0d
diff --git a/dev-ruby/crack/crack-0.4.3.ebuild b/dev-ruby/crack/crack-0.4.3.ebuild
new file mode 100644 (file)
index 0000000..f6ff5a3
--- /dev/null
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md History"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+ruby_add_rdepend ">=dev-ruby/safe_yaml-1.0.0"
+
+each_ruby_prepare() {
+       # Remove tests which fail when run by portage but pass when run by hand
+       sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
+       sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
+       sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
+}
+
+each_ruby_test() {
+       ${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
+}
index 2bdc154593fb1326e4f5d41050ba1b9dc95494e4..91a497e7f209d9d3f751a2c5c4165c40e2f1a9d5 100644 (file)
@@ -1,2 +1,2 @@
-DIST d3_rails-3.5.5.gem 133632 SHA256 8fedd753f9accdd3587753d4a89de901e5bd7d9e2ba1a5e91c52f564300eecfd SHA512 52a2aebe1422847ffc04e4209eb343bcc5651d659dbbb59bb1d17bd26b4b5cb6134641d23b91779a58f04829fa2baaafda6936d0d451cdd2b714588e7ca8473c WHIRLPOOL 57eef6744f6f0ef873213486819cc72093f4ea94a279ea86f54f635e3ab2ca9abec1bf35dcf2665f94ec71b6771560ae7c8eae987afb2f99fc584fb6cee5c36f
+DIST d3_rails-3.5.10.gem 134656 SHA256 ac04dedf5d0a5aad2d467f898fe161ec69d8e90416613e63918f53c8c5bb9456 SHA512 aad51fcabcc7ec120ed99eebbbce33d92319d2e6654a76d06e0b01fb16c7f687b1c146afd83391ed5c945f2dd4cac8f65025ac4db7c7efd9e7ae24abccb62397 WHIRLPOOL fc066f61679b483a747beba632c9cad4af6451ede4e1be34bb530f71462f7f68a8feb3894931c5666082935e9ad8dee1455974d09572226725a3fb4825bffbd6
 DIST d3_rails-3.5.6.gem 134144 SHA256 556304fd34eace3008231e151df6ad8ed5870c59ecffc639ee1f810859225f39 SHA512 3a04a8886ec3cec21f9a880a69db539ba37247eaa4fe1aa053a0f408fbd0fbd78351d4218e2edabc7b5f8cd48ca28dfce5bc1bb64a1c62cc8623fd4ffc1e3d82 WHIRLPOOL a5c05049f848d17465a0835de69e21150e77b9a4da0b8d28144b02e57e3dfb90a1d4c3281e6832695ca4915152fc1caa61c657d3bd33700a77297948b4d348ec
similarity index 86%
rename from dev-ruby/d3_rails/d3_rails-3.5.5.ebuild
rename to dev-ruby/d3_rails/d3_rails-3.5.10.ebuild
index a4dd92c84a9c7cca18a27dbe35d22f616fbb5b0f..143a6b10786c5f29212025a4264616fc537fd3d7 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -20,4 +20,4 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/railties-3.1"
+ruby_add_rdepend ">=dev-ruby/railties-3.1:*"
index bfce40db091a46d14d33dab3b3d26ee2d6916fcc..b61194f711254ec976882a6e5095533d3136a1a7 100644 (file)
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/copiousfreetime/hitimes"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
index a26eba971324b2ef06c38035546d959d2835ba3d..a48ad9d2aebbd05b1f07b45fedf9e9c04b071ee1 100644 (file)
@@ -6,9 +6,7 @@ EAPI=5
 
 USE_RUBY="ruby19 ruby20 ruby21"
 
-# We have a custom test function, but don't null this out so that the
-# deps are still added
-RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md History"
@@ -25,7 +23,7 @@ IUSE=""
 
 ruby_add_rdepend '>=dev-ruby/json-1.8:0 >=dev-ruby/multi_xml-0.5.2'
 
-ruby_add_bdepend 'dev-ruby/rspec:3 dev-ruby/fakeweb'
+ruby_add_bdepend 'test? ( dev-ruby/fakeweb )'
 
 all_ruby_prepare() {
        # Remove bundler
@@ -41,10 +39,6 @@ all_ruby_prepare() {
                -e '1i require "cgi"' spec/spec_helper.rb || die
 }
 
-each_ruby_test() {
-       ${RUBY} -S rake spec || die
-}
-
 all_ruby_install() {
        all_fakegem_install
 
index b5fff685734047d1e5263d9ad2aff793dfa7e70e..433c0a75385938149cc4a0952140aecb036c765b 100644 (file)
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Block on other packages trying to install a /usr/bin/listen
index 0b09409050935fdf40b329cf5b295ac874aaec96..fec9f86dfece5e9d31af44e5a55afc9b683dcd43 100644 (file)
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/halostatue/mime-types/"
 
 LICENSE="MIT Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
index 1ff8df2daa8e82165d5d1f1dc1933dbc91ed03a6..a8313be0e837a95d02e2b6ea59c1ebbf423cd40a 100644 (file)
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT Artistic GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
index 4e5d53168d2ab9ce1e452eb508ccaa7451b7809f..c6be047fb2be6679fc2d69880ea04bbcfbc11c23 100644 (file)
@@ -1,3 +1,4 @@
 DIST mixlib-shellout-2.2.1.tar.gz 33307 SHA256 68e70a5ba15eca9ebf737f1ed21b3b90744b83f2856bf69e93f7b66348f67d03 SHA512 c9f9724b0929e07ba56a90508b167d6a6971aa7dabcecd320b8abd60a80dd0542e86b0570f3a9db5a76057ad8c4e1f9ec6ff38460a76ccd745a4996f1d69e297 WHIRLPOOL 29ad017b470312651e4c7c4a9f782184107c5e1527d8babf6de9c8a5040c094bb713dbd28bacdeeb5757ab37cb7a55025d137e022aeea9c8a81a9f4f28928b8b
 DIST mixlib-shellout-2.2.2.tar.gz 33495 SHA256 ecd1b4612465ab650b568c85af05c26cdea874d1bf00586b2c76830dd040bae6 SHA512 8ae64988347786c11c208f648a6b65d3e4b70822175ead4081e0073287baa1a61956193e82d48e7fe03f03c58c5b8678716579d70abb576f5531d32fba50e4c5 WHIRLPOOL f818fea924d616e2a64eb718dd3329e15bb304736985ce8eaa0a223c36db20a18a2e464dbe983292c6cebe1b3c4ddeb8683155c89d95985f79e91e645f4b8a60
 DIST mixlib-shellout-2.2.3.tar.gz 34093 SHA256 8a2929ebf8b87f7a1d9c117d2fd6c45cba1db7da7a79cf38edbf240207393fa6 SHA512 133b7dce0ae944be365f40a7a6277a5bfd735e6b72a8828c44c532d297a23a0244c2eb80407ba935079a2b1b23e496b253fd0ab863af6f3987e630184162729f WHIRLPOOL dce7f5a1787c1c5a50c95362617c78f761c2971dec346ec3de471fa08053949b3b02dec7495ff82270077a6eeaa5b39649ba92df1df7df41597ade2ec8999761
+DIST mixlib-shellout-2.2.5.tar.gz 34197 SHA256 7ae14c18731359e823ecadece612480cb7097e4d73a0f07158452dd46c86d7c7 SHA512 5d65c3665ef2a51fe9468268efc595cded6a798cd8a1879f12a3e7712be718cad0706a2602406683d039f1e4675a8e023f2cce8d9d4e3af8e95d7597c8381826 WHIRLPOOL 813395d956296b70bfc97e26fcbce047acf228664cada0642bff504d29d65b460daa3cb7ce6eb7e8fa2af5be7034123fc4e5d839ac01aae25fa8e6937eb575bb
diff --git a/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.5.ebuild b/dev-ruby/mixlib-shellout/mixlib-shellout-2.2.5.ebuild
new file mode 100644 (file)
index 0000000..1948abe
--- /dev/null
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRA_DOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Run external commands on Unix or Windows"
+HOMEPAGE="https://github.com/opscode/mixlib-shellout"
+SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+each_ruby_prepare() {
+       # Make sure we actually use the right interpreter for testing
+       sed -i -e "/ruby_eval/ s:ruby :${RUBY} :" spec/mixlib/shellout_spec.rb || die
+}
index 5185243fa3f89e7b4751c7ffb1c61d7852c41974..ef39ae30f689aaf9077ced3f514390ad61ee1afb 100644 (file)
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/celluloid/nio4r"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 # Note that nio4r bundles a patched copy of libev, and without these
index 90784886f1d7d7bccdbf3b3e176e5654a78612d5..432803ff8595276d5c14bcd4b842dca746dcca3b 100644 (file)
@@ -1,2 +1,2 @@
 DIST nokogumbo-1.4.1.gem 232448 SHA256 a2143a68c6eec9b45c554d3eaf10291344961743314cfbde429a55ec76938768 SHA512 41a6a11ebc9431d4b1bec251dab3a81ecaa85741edb95cabc4b3f040df26391efdad48dca5ac5710f20b72e34507ec992c21fdf1afcffaf0fc83ad49dc687f7b WHIRLPOOL 33fa7659dd3df1741f5b3443def1e781ae8dc58c3c7237edba6009eff12bf9c477c5de9f684f59c4331031ba37ca8cdba419c3ac58d3c64a88384c82adbdab28
-DIST nokogumbo-1.4.2.gem 222208 SHA256 8ab7734ec2576a77a77582a25e2658e242bc0710e3ab303643261620fc6cdce0 SHA512 eb9389e678d3f7356ee381a8315485c4aba751b75ec76f43176e996d8f978299716652258dcad9a6135d67b0dace0d01a521b45837a7c98da4ce8b1da49c0efe WHIRLPOOL d350cd99f425619799b84347ba671b52bf174537f756b1c45b7ad1b633ef5fa6f8ee7db69ba72cc87ba7b72c055b189ef5b6da092307fdbfd5ee5df791788683
+DIST nokogumbo-1.4.6.gem 227328 SHA256 310261b82baa7c740544d0c1244338d8fa83864785910fe836734de53bd34c9a SHA512 e80cea26b41147787675dafe03d0f5e88f90c7c7212a95e3ee9090419c4b71c9701dd8b69917aaf66eafe4f1206f7d7165ca4918ad2e8ff12cc6be3265550b08 WHIRLPOOL 9f816a1da6218f840576ba384de297e9dde3e5c85660513b5568b42dffbf45fb5cabefc58e7a604f4af35ad81bfa3f099872caa8fe0dbba804130d3d311ef470
similarity index 75%
rename from dev-ruby/nokogumbo/nokogumbo-1.4.2.ebuild
rename to dev-ruby/nokogumbo/nokogumbo-1.4.6.ebuild
index 986ecaf580629b29cf3c859d65454d72562c3599..290d24e523f9632292c0cd3aec1eb0ec83bf43a4 100644 (file)
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -25,6 +25,11 @@ RDEPEND+=">=dev-libs/gumbo-0.10"
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.5-r1"
 
+all_ruby_prepare() {
+       # We compile without rpath support by default so add that back in for this specific case.
+       sed -i -e '/gentoo-release/,/end/ s/+= " /+= " -Wl,-R -Wl,#{nokogiri_ext} /' ext/nokogumboc/extconf.rb || die
+}
+
 each_ruby_configure() {
        ${RUBY} -Cext/nokogumboc extconf.rb || die
 }
index 33b904bf3c56553c34aa2b5b888f99a2b74c98fe..477fb12a42d15c8dc8b0ac7d9b279a8eaf62ef69 100644 (file)
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/tarcieri/timers"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/hitimes"
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23-r1.ebuild
new file mode 100644 (file)
index 0000000..f5ee877
--- /dev/null
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils user udev
+
+MY_P="android-sdk_r${PV}-linux"
+
+DESCRIPTION="Open Handset Alliance's Android SDK"
+HOMEPAGE="http://developer.android.com"
+SRC_URI="https://dl.google.com/android/${MY_P}.tgz"
+IUSE=""
+RESTRICT="mirror"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/tar
+               app-arch/gzip"
+RDEPEND=">=virtual/jdk-1.5
+       >=dev-java/ant-core-1.6.5
+       || ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
+       sys-libs/zlib[abi_x86_32(-)]
+"
+
+ANDROID_SDK_DIR="/opt/${PN}"
+QA_FLAGS_IGNORED_x86="
+       ${ANDROID_SDK_DIR/\/}/tools/emulator
+       ${ANDROID_SDK_DIR/\/}/tools/adb
+       ${ANDROID_SDK_DIR/\/}/tools/mksdcard
+       ${ANDROID_SDK_DIR/\/}/tools/sqlite3
+       ${ANDROID_SDK_DIR/\/}/tools/hprof-conv
+       ${ANDROID_SDK_DIR/\/}/tools/zipalign
+       ${ANDROID_SDK_DIR/\/}/tools/dmtracedump
+"
+QA_FLAGS_IGNORED_amd64="${QA_FLAGS_IGNORED_x86}"
+
+QA_PREBUILT="${ANDROID_SDK_DIR/\/}/tools/*"
+
+S="${WORKDIR}/android-sdk-linux"
+
+pkg_setup() {
+       enewgroup android
+}
+
+src_prepare(){
+       rm -rf tools/lib/x86*
+}
+
+src_install(){
+       dodoc tools/NOTICE.txt "SDK Readme.txt"
+       rm -f tools/NOTICE.txt "SDK Readme.txt"
+
+       dodir "${ANDROID_SDK_DIR}/tools"
+       cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
+
+       # Maybe this is needed for the tools directory too.
+       dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
+
+       fowners -R root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+       fperms -R 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+
+       echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
+
+       SWT_PATH=
+       SWT_VERSIONS="3.7 3.6"
+       for version in $SWT_VERSIONS; do
+               # redirecting stderr to /dev/null
+               # not sure if this is best, but avoids misleading error messages
+               SWT_PATH="`dirname \`java-config -p swt-\$version 2>/dev/null\` 2>/dev/null`"
+               if [ $SWT_PATH ]; then
+                       einfo "SWT_PATH=$SWT_PATH selecting version $version of SWT."
+                       break
+               fi
+       done
+
+       echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
+       echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
+
+       doenvd "${T}/80${PN}"
+
+       echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
+
+       insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
+
+       udev_dorules "${FILESDIR}"/80-android.rules || die
+       domenu "${FILESDIR}"/android-sdk-update-manager.desktop
+}
+
+pkg_postinst() {
+       elog "The Android SDK now uses its own manager for the development      environment."
+       elog "Run 'android' to download the full SDK, including some of the platform tools."
+       elog "You must be in the android group to manage the development environment."
+       elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
+       elog "See http://developer.android.com/sdk/adding-components.html for more"
+       elog "information."
+       elog "If you have problems downloading the SDK, see https://code.google.com/p/android/issues/detail?id=4406"
+       elog "You need to run env-update and source /etc/profile in any open shells"
+       elog "if you get an SWT error."
+}
index 285a771765df552b7c0f1f32015be3d5823e8ac6..16d108ed816a9e88a8229df858060125e7fdf3b4 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
index f7a6a86a7529d3977e041916b388dad37e2b9c3d..1a7dd7dc01712474156abdfdea9073069a7ceae7 100644 (file)
@@ -1802,8 +1802,8 @@ ejunit_() {
        if [[ "${junit}" == "junit-4" ]] ; then
                runner=org.junit.runner.JUnitCore
        fi
-       debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
-       java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
+       debug-print "Calling: java -cp \"${cp}\" -Djava.io.tmpdir=\"${T}\" -Djava.awt.headless=true ${runner} ${@}"
+       java -cp "${cp}" -Djava.io.tmpdir="${T}/" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
 }
 
 # @FUNCTION: ejunit
index eb109f9c67aa4cecd459420f01c91befff553d81..2ad9bdca468925a344df9ec142459c556b138351 100644 (file)
@@ -9,6 +9,17 @@
 : ${GENTOO_DEPEND_ON_PERL_SUBSLOT:="no"}
 inherit perl-module
 
+case "${EAPI:-0}" in
+       5)
+               ;;
+       6)
+               die "EAPI=${EAPI} is not supported by perl-app.eclass. Please use perl-module.eclass instead."
+               ;;
+       *)
+               die "EAPI=${EAPI} is not supported by perl-app.eclass"
+               ;;
+esac
+
 # @FUNCTION: perl-app_src_prep
 # @USAGE: perl-app_src_prep
 # @DESCRIPTION:
index 7ba47d15f8bcb3d41c1251445cebd72636537ccf..c38ed6c4a6518463506d3d7919bd8a8aa7727852 100644 (file)
@@ -18,7 +18,7 @@
 [[ ${CATEGORY} == "perl-core" ]] && inherit alternatives
 
 case "${EAPI:-0}" in
-       5)
+       5|6)
                ;;
        *)
                die "EAPI=${EAPI} is not supported by perl-functions.eclass"
index 02bd8ef9f2ed6f8c972df8363244835974af3866..23e54360c0120dd0c5abe9e2469e6e6d76112403 100644 (file)
@@ -1,2 +1,3 @@
 DIST alienarena-7.60-linux20120629.tar.gz 510316326 SHA256 05e4ce83574996e20ab8047dc30a20bf3fae72c39727a3a0bcc04a25bf746e04 SHA512 ec16e2546f34115e31ab24de3b5100c014910c773d200fdaf4302cf2b6930a1487aeffa504bed10a8310d62e15fed1ff67c3d679c1abd5a9750e34cfcac55ffd WHIRLPOOL b0df1c364db4b3d3ae4b603d3c7b3f9cdea416b0cbd7bbc71a573291df2f5c35e6147efa4406fcb9d57829407280d79b0b30581a03f23ac253c7c026060e3810
 DIST alienarena-7.65-linux20130207.tar.gz 598262165 SHA256 ef4594897afde951aa66cc972b4bf21aadc6ac545a432000c85cd72e2ad9d60e SHA512 43f22666835cf71ce5806432dd5df7464a3757fffee0968788fc2be9ed8fe6a1273d01021b803102b738b5b74e2a611c629f641de11d0d63c4d0f9e07e085fa0 WHIRLPOOL fe2f67cc9f68fb6e57acd5c8d31ba43f45e6872464cfdbaa63fec383a08d931959883025aa6b4d14132e29761ed781073268d0f48b7fecdd61cfd3119e88ba19
+DIST alienarena-7.66-linux20130827.tar.gz 617636649 SHA256 29086098eacb18319e6dcc9156355c44db4b1aa8a4f7b0bb63e6856d8128b012 SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3 WHIRLPOOL 986774a9eb97c6ee0b325cc23801a5320c541ea201b51bf90aa8e13a37c03c24251f8d9f2f1efb2c33a8ff3257926265d440200984087264fee666691f1ee55b
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827.ebuild
new file mode 100644 (file)
index 0000000..0ff3910
--- /dev/null
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+MY_PN=alienarena-7.66
+DESCRIPTION="Fast-paced multiplayer deathmatch game"
+HOMEPAGE="http://red.planetarena.org/"
+SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz"
+
+LICENSE="GPL-2 free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated +dga +vidmode +zlib"
+
+UIRDEPEND="virtual/jpeg:0
+       media-libs/openal
+       media-libs/libvorbis
+       media-libs/freetype:2
+       virtual/glu
+       virtual/opengl
+       dga? ( x11-libs/libXxf86dga )
+       vidmode? ( x11-libs/libXxf86vm )
+       zlib? ( sys-libs/zlib )
+       net-misc/curl"
+UIDEPEND="dga? ( x11-proto/xf86dgaproto )
+       vidmode? ( x11-proto/xf86vidmodeproto )"
+RDEPEND="!dedicated? ( ${UIRDEPEND} )"
+DEPEND="${RDEPEND}
+       !dedicated? ( ${UIDEPEND} )
+       virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN/_/.}
+
+src_configure() {
+       egamesconf \
+               --with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
+               --without-system-libode \
+               --disable-documents \
+               $(use_enable !dedicated client) \
+               $(use_with zlib) \
+               $(use_with vidmode xf86vm) \
+               $(use_with dga xf86dga)
+}
+
+src_install() {
+       DOCS="docs/README.txt README" default
+       if ! use dedicated ; then
+               make_desktop_entry ${PN} "Alien Arena"
+       fi
+       prepgamesdirs
+}
+
+pkg_preinst() {
+       games_pkg_preinst
+       gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       games_pkg_postinst
+       gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       gnome2_icon_cache_update
+}
index cff736b0bd910853d96e7c4ac2cfc9eeb45e3b16..877cd5bddbe92d294510d1a5b9190439078a40f7 100644 (file)
@@ -11,7 +11,7 @@ PATCHSET_REV="-r5"
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-       mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
        ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
        mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
        https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
index 4b3222766a36417a765d8770f35e889bf4bfeb7e..da0cf15d5156965713344c1bebd40e456fea38a0 100644 (file)
@@ -11,7 +11,7 @@ PATCHSET_REV="-r7"
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-       mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
        ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
        mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
        https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
index 9123d1404f926f88643ba603692d44d0ccb91b65..49771a22e73c726dbc2857fa89fe0d46a90fdeb5 100644 (file)
@@ -11,7 +11,7 @@ PATCHSET_REV="-r8"
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-       mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
        ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
        mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
        https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
index a7b9a1c57a97d212beddd88c598eb811fa37ea54..3860e132d1a97c4cd4b6b2d5d59e76d03222edc5 100644 (file)
@@ -11,7 +11,7 @@ PATCHSET_REV="-r1"
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-       mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
        ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
        mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
        https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
index 306d9b56353e442ea71843a26582472e42b56881..e722791e8636dd719f8847a1b7f1ae6e9c72b8cb 100644 (file)
@@ -11,7 +11,7 @@ PATCHSET_REV="-r1"
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-       mirror://bitbucket/${PN}/${PN}/downloads/${P}.tar.gz
+       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
        ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
        mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
        https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
index d9e2946791aed73579a4d0e80d30c9b3aa7fbc56..2a5a5c9583825ec782344873d67430255f99e70c 100644 (file)
@@ -1,6 +1,3 @@
-DIST darktable-1.6.6.tar.xz 3097760 SHA256 f85e4b8219677eba34f5a41e1a0784cc6ec06576326a99f04e460a4f41fd21a5 SHA512 96f0371c0044c40e22c0cf729076032e487fd0af30d27d28ed42ea8bcc3e29971b09d9f628e3b734147265b02fa0243217e687a8e6237b2c0c14b9db330df09c WHIRLPOOL d04e77777fdcfdd5933d7c915375b7418647918af7ef4a5b19703724a113ee5fdfe8db6bb839e9638eecca6c0c9c7542088d12b45634fca57d3b453fa120d7f6
-DIST darktable-1.6.7.tar.xz 3113804 SHA256 a75073b49df0a30cd2686624feeb6210bc083bc37112ae6e045f8523db4c4c98 SHA512 6fadc62dc9ac0dd8b11d7d1a1ef1c23bd07abb7e66159d0bd26dd4bb9b36162e390c4f1559dd7c433c18dd55ebff98157234137567e12467995f7f26915b0ea0 WHIRLPOOL 69228b8c734b53b17483ae453df8cd73caf78b5fcbcee6b5cae5f8396c5dd1038ba6036048ab50e15c85cc35adeac0bd49de03f3acb30dbcb822fae2e02b73bf
-DIST darktable-1.6.8.tar.xz 3118776 SHA256 b676f81bd8cc661a8f76e03ad449da4444f770b6bec3e9accf013c636f690905 SHA512 8811e8f931299b4fb86d3611696061404253985328178231902e749dc55b4f02d5193ce2e2eaf8c6351f9f7374870bcbdc55b145dfb75cd7669556494b457bbb WHIRLPOOL acfe83ebcc697904246a11583d0ff521365639d2006629e76123db93c35ea7ed39cbd7fed54470e5ed0e27cc6b28d70559738d68f36c31be63391c539c5323cb
 DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
-DIST darktable-2.0.rc2.tar.xz 2946020 SHA256 9349eaf45f6aa4682a7c7d3bb8721b55ad9d643cc9bd6036cb82c7654ad7d1b1 SHA512 a6cdec0a5a8957df3ab55c2a4420b7e702519e28af1c91bbe893914dbda9bd22f8c58197aa684ad19f0f843bc75c594185d9b3dca13075843772861d33833bde WHIRLPOOL 49794626a1f9f665f6d785e0221dfd58812eb959ccb0f35bd33497a0444ffe6addeeb7bae5b6de5be6dc810e07635c3e89aec2e3cc616a63aede00b9d4121cf5
+DIST darktable-2.0.rc3.tar.xz 2953088 SHA256 4d81527350e6f722da484bdcd3f620918321b0e15b1fdad219821abbf23c2c89 SHA512 46bc286b3743001f09d2f1646c95dc76c7a3a5bf54e576eefaa8c151d46650040a12bcbf7520e917934f81edbb5c68250e36d6d97d46a3be4b8100ee8711c7d3 WHIRLPOOL 9635c94a9f9b7dba7c1d930a0e5a457f6b4be543c0958672341d5da465188ad7c51193dd5338c801543cb47bd911e369dc59d8b92ce87c4ba8eba68d90f86718
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
diff --git a/media-gfx/darktable/darktable-1.6.6.ebuild b/media-gfx/darktable/darktable-1.6.6.ebuild
deleted file mode 100644 (file)
index 9bf8f07..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="1.6.0"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
-       doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
-${LANGS// / linguas_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-       dev-db/sqlite:3
-       >=dev-libs/glib-2.28:2
-       dev-libs/libxml2:2
-       gnome-base/librsvg:2
-       media-gfx/exiv2:0=[xmp]
-       media-libs/lcms:2
-       >=media-libs/lensfun-0.2.3
-       media-libs/libpng:0=
-       media-libs/tiff:0
-       net-misc/curl
-       virtual/jpeg:0
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       x11-libs/pango
-       colord? ( x11-misc/colord:0= )
-       flickr? ( media-libs/flickcurl )
-       geo? ( net-libs/libsoup:2.4 )
-       gphoto2? ( media-libs/libgphoto2:= )
-       graphicsmagick? ( media-gfx/graphicsmagick )
-       jpeg2k? ( media-libs/openjpeg:0 )
-       libsecret? (
-               >=app-crypt/libsecret-0.18
-               dev-libs/json-glib
-       )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       slideshow? (
-               media-libs/libsdl
-               virtual/glu
-               virtual/opengl
-       )
-       web-services? ( dev-libs/json-glib )
-       webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-       x11-themes/gtk-engines:2
-       kde? ( kde-apps/kwalletd:4 )"
-DEPEND="${CDEPEND}
-       dev-util/intltool
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-pkg_pretend() {
-       if use openmp ; then
-               tc-has-openmp || die "Please switch to an openmp compatible compiler"
-       fi
-}
-
-src_prepare() {
-       use cpu_flags_x86_sse3 && append-flags -msse3
-
-       sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-               -e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-               -e "s:LICENSE::" \
-               -i doc/CMakeLists.txt || die
-
-       cmake-utils_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_use colord COLORD)
-               $(cmake-utils_use_use flickr FLICKR)
-               $(cmake-utils_use_use geo GEO)
-               $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-               $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-               $(cmake-utils_use_use jpeg2k OPENJPEG)
-               $(cmake-utils_use_use kde KWALLET)
-               $(cmake-utils_use_use libsecret LIBSECRET)
-               $(cmake-utils_use_use libsecret GLIBJSON)
-               $(cmake-utils_use_use nls NLS)
-               $(cmake-utils_use_use opencl OPENCL)
-               $(cmake-utils_use_use openexr OPENEXR)
-               $(cmake-utils_use_use openmp OPENMP)
-               $(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
-               $(cmake-utils_use_use squish SQUISH)
-               $(cmake-utils_use_build slideshow SLIDESHOW)
-               $(cmake-utils_use_use web-services GLIBJSON)
-               $(cmake-utils_use_use webp WEBP)
-               -DUSE_LUA=OFF
-               -DCUSTOM_CFLAGS=ON
-               -DINSTALL_IOP_EXPERIMENTAL=ON
-               -DINSTALL_IOP_LEGACY=ON
-       )
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-       use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-       for lang in ${LANGS} ; do
-               use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
-       done
-
-       if use pax_kernel && use opencl ; then
-               pax-mark Cm "${ED}"/usr/bin/${PN} || die
-               eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-               eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-               eqawarn "must be modified and this *may* lead to breakage! If"
-               eqawarn "you suspect that ${PN} is broken by this modification,"
-               eqawarn "please open a bug."
-       fi
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-1.6.7.ebuild b/media-gfx/darktable/darktable-1.6.7.ebuild
deleted file mode 100644 (file)
index 9bf8f07..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="1.6.0"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
-       doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
-${LANGS// / linguas_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-       dev-db/sqlite:3
-       >=dev-libs/glib-2.28:2
-       dev-libs/libxml2:2
-       gnome-base/librsvg:2
-       media-gfx/exiv2:0=[xmp]
-       media-libs/lcms:2
-       >=media-libs/lensfun-0.2.3
-       media-libs/libpng:0=
-       media-libs/tiff:0
-       net-misc/curl
-       virtual/jpeg:0
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       x11-libs/pango
-       colord? ( x11-misc/colord:0= )
-       flickr? ( media-libs/flickcurl )
-       geo? ( net-libs/libsoup:2.4 )
-       gphoto2? ( media-libs/libgphoto2:= )
-       graphicsmagick? ( media-gfx/graphicsmagick )
-       jpeg2k? ( media-libs/openjpeg:0 )
-       libsecret? (
-               >=app-crypt/libsecret-0.18
-               dev-libs/json-glib
-       )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       slideshow? (
-               media-libs/libsdl
-               virtual/glu
-               virtual/opengl
-       )
-       web-services? ( dev-libs/json-glib )
-       webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-       x11-themes/gtk-engines:2
-       kde? ( kde-apps/kwalletd:4 )"
-DEPEND="${CDEPEND}
-       dev-util/intltool
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-pkg_pretend() {
-       if use openmp ; then
-               tc-has-openmp || die "Please switch to an openmp compatible compiler"
-       fi
-}
-
-src_prepare() {
-       use cpu_flags_x86_sse3 && append-flags -msse3
-
-       sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-               -e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-               -e "s:LICENSE::" \
-               -i doc/CMakeLists.txt || die
-
-       cmake-utils_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_use colord COLORD)
-               $(cmake-utils_use_use flickr FLICKR)
-               $(cmake-utils_use_use geo GEO)
-               $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-               $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-               $(cmake-utils_use_use jpeg2k OPENJPEG)
-               $(cmake-utils_use_use kde KWALLET)
-               $(cmake-utils_use_use libsecret LIBSECRET)
-               $(cmake-utils_use_use libsecret GLIBJSON)
-               $(cmake-utils_use_use nls NLS)
-               $(cmake-utils_use_use opencl OPENCL)
-               $(cmake-utils_use_use openexr OPENEXR)
-               $(cmake-utils_use_use openmp OPENMP)
-               $(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
-               $(cmake-utils_use_use squish SQUISH)
-               $(cmake-utils_use_build slideshow SLIDESHOW)
-               $(cmake-utils_use_use web-services GLIBJSON)
-               $(cmake-utils_use_use webp WEBP)
-               -DUSE_LUA=OFF
-               -DCUSTOM_CFLAGS=ON
-               -DINSTALL_IOP_EXPERIMENTAL=ON
-               -DINSTALL_IOP_LEGACY=ON
-       )
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-       use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-       for lang in ${LANGS} ; do
-               use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
-       done
-
-       if use pax_kernel && use opencl ; then
-               pax-mark Cm "${ED}"/usr/bin/${PN} || die
-               eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-               eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-               eqawarn "must be modified and this *may* lead to breakage! If"
-               eqawarn "you suspect that ${PN} is broken by this modification,"
-               eqawarn "please open a bug."
-       fi
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-1.6.8.ebuild b/media-gfx/darktable/darktable-1.6.8.ebuild
deleted file mode 100644 (file)
index 9bf8f07..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="1.6.0"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${P}.tar.xz
-       doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services webp
-${LANGS// / linguas_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-       dev-db/sqlite:3
-       >=dev-libs/glib-2.28:2
-       dev-libs/libxml2:2
-       gnome-base/librsvg:2
-       media-gfx/exiv2:0=[xmp]
-       media-libs/lcms:2
-       >=media-libs/lensfun-0.2.3
-       media-libs/libpng:0=
-       media-libs/tiff:0
-       net-misc/curl
-       virtual/jpeg:0
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/gtk+:2
-       x11-libs/pango
-       colord? ( x11-misc/colord:0= )
-       flickr? ( media-libs/flickcurl )
-       geo? ( net-libs/libsoup:2.4 )
-       gphoto2? ( media-libs/libgphoto2:= )
-       graphicsmagick? ( media-gfx/graphicsmagick )
-       jpeg2k? ( media-libs/openjpeg:0 )
-       libsecret? (
-               >=app-crypt/libsecret-0.18
-               dev-libs/json-glib
-       )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr:0= )
-       slideshow? (
-               media-libs/libsdl
-               virtual/glu
-               virtual/opengl
-       )
-       web-services? ( dev-libs/json-glib )
-       webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-       x11-themes/gtk-engines:2
-       kde? ( kde-apps/kwalletd:4 )"
-DEPEND="${CDEPEND}
-       dev-util/intltool
-       virtual/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-pkg_pretend() {
-       if use openmp ; then
-               tc-has-openmp || die "Please switch to an openmp compatible compiler"
-       fi
-}
-
-src_prepare() {
-       use cpu_flags_x86_sse3 && append-flags -msse3
-
-       sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-               -e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-               -e "s:LICENSE::" \
-               -i doc/CMakeLists.txt || die
-
-       cmake-utils_src_prepare
-}
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_use colord COLORD)
-               $(cmake-utils_use_use flickr FLICKR)
-               $(cmake-utils_use_use geo GEO)
-               $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-               $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-               $(cmake-utils_use_use jpeg2k OPENJPEG)
-               $(cmake-utils_use_use kde KWALLET)
-               $(cmake-utils_use_use libsecret LIBSECRET)
-               $(cmake-utils_use_use libsecret GLIBJSON)
-               $(cmake-utils_use_use nls NLS)
-               $(cmake-utils_use_use opencl OPENCL)
-               $(cmake-utils_use_use openexr OPENEXR)
-               $(cmake-utils_use_use openmp OPENMP)
-               $(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
-               $(cmake-utils_use_use squish SQUISH)
-               $(cmake-utils_use_build slideshow SLIDESHOW)
-               $(cmake-utils_use_use web-services GLIBJSON)
-               $(cmake-utils_use_use webp WEBP)
-               -DUSE_LUA=OFF
-               -DCUSTOM_CFLAGS=ON
-               -DINSTALL_IOP_EXPERIMENTAL=ON
-               -DINSTALL_IOP_LEGACY=ON
-       )
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-       use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-       for lang in ${LANGS} ; do
-               use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
-       done
-
-       if use pax_kernel && use opencl ; then
-               pax-mark Cm "${ED}"/usr/bin/${PN} || die
-               eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-               eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-               eqawarn "must be modified and this *may* lead to breakage! If"
-               eqawarn "you suspect that ${PN} is broken by this modification,"
-               eqawarn "please open a bug."
-       fi
-}
-
-pkg_preinst() {
-       gnome2_icon_savelist
-}
-
-pkg_postinst() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-       gnome2_icon_cache_update
-       fdo-mime_desktop_database_update
-}
similarity index 99%
rename from media-gfx/darktable/darktable-2.0_rc2.ebuild
rename to media-gfx/darktable/darktable-2.0_rc3.ebuild
index c2703201f1c60ceeefe2b39ef46531c6dfc8ac17..07a9ae20fbf4179df5991c36c54611e602af7adf 100644 (file)
@@ -36,7 +36,7 @@ CDEPEND="
        gnome-base/librsvg:2
        media-gfx/exiv2:0=[xmp]
        media-libs/lcms:2
-       >=media-libs/lensfun-0.2.3
+       >=media-libs/lensfun-0.2.3:0=
        media-libs/libpng:0=
        media-libs/tiff:0
        net-misc/curl
index c22ec310665e63e1b1389e94d0e6d6074060a164..124851ec3d59c6d72e4a5432a08846c86e761dcf 100644 (file)
@@ -31,7 +31,7 @@ CDEPEND="
        gnome-base/librsvg:2
        media-gfx/exiv2:0=[xmp]
        media-libs/lcms:2
-       >=media-libs/lensfun-0.2.3
+       >=media-libs/lensfun-0.2.3:0=
        media-libs/libpng:0=
        media-libs/tiff:0
        net-misc/curl
index d3ff57d9f7c4ba0ed09ebf6f10729b67e8744b27..9ee683a0a8d56e1c291477d3d096ec031adc3efc 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline tiff svg unicode X"
 
 REQUIRED_USE="
index 6a2af6b6fef17e864dcf855c573dea156c81eefd..3fe6b5b8867bb272509e54c2089ae58cabd928c9 100644 (file)
@@ -1,2 +1,4 @@
 DIST gimp-2.8.10.tar.bz2 20343461 SHA256 e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6 SHA512 21c96832ce61ecb2dad5276b454e7965263b6733add7e4a95cfc5f308fca681bceab21c1b77921332e0725d0e514e06868a4698ca9d7e4b30a28a07c7356a3a8 WHIRLPOOL 16b0a7e8a4197db41da29832977bee917e65d5cbbf308dde1ba73c150742c70c52cd60d449d0fd0269b0ed5db0378461d3277a2350898c3a5e07b1f3cf8bdf47
 DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b
+DIST gimp-2.8.16.tar.bz2 20847212 SHA256 95e3857bd0b5162cf8d1eda8c78b741eef968c3e3ac6c1195aaac2a4e2574fb7 SHA512 480b49a7fc7775aa924bf2e7a5a5165b94df1318fc8439faf2e4263dd26efbca9d1d8ccc5b9b52114c33d2363e087d5a364fab86077c27bc19e58383880b13fd WHIRLPOOL 26e8e26cea15a4689a2efbecbaf1425f0bb645b9cf4f380ad2047e52606bb8d5f64261cd12b40d603a86f0d5e253dffcac18990a461c601294931a3a87e1d334
+DIST gimp-2.9.2.tar.bz2 21370301 SHA256 85bed436b868b2e45ffab48d1bf5743006932770e8cca3322e345aefc000e29e SHA512 5c870a36d62de5fde0c7799dd28b78daca2d349bb7fdbc7b940db89ab00fc025256408b581ba6b4d795d6db9bc25672cf6a45552b22c3eae053ce94a2201fa37 WHIRLPOOL cfa5300659f97c75b7b4f4fbc6f3ad3d03a7c0e97153749d224859b8b618d041f8cbe9232578d720803589d8a48bc7ea9a785294991b626ba7b458512a3d4b2e
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
new file mode 100644 (file)
index 0000000..441298a
--- /dev/null
@@ -0,0 +1,50 @@
+From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 5 Dec 2015 01:14:37 +0100
+Subject: [PATCH] Do not disable deprecated APIs
+
+---
+ configure.ac | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4de6e53..8528e87 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;"
+ AC_SUBST(MIME_TYPES)
+-#########################
+-# Disable deprecated APIs
+-#########################
+-
+-CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+-
+-# Make sure not to disable deprecated APIs for unreleased versions.
+-# We must build without problems with future releases of libraries
+-# and disabling deprecated API risks breaking the build
+-
+-if test "x$have_glib_2_43" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gtk_2_26" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_gdk_pixbuf_2_31" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
+-fi
+-
+-if test "x$have_pango_1_32" != "xyes"; then
+-  CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
+-fi
+-
+-
+ ############################
+ # Require multihead safe API
+ ############################
+-- 
+2.6.3
+
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch
new file mode 100644 (file)
index 0000000..e486144
--- /dev/null
@@ -0,0 +1,28 @@
+From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 5 Dec 2015 01:15:22 +0100
+Subject: [PATCH] Sync version string
+
+.. with
+m4_define([gimp_micro_version], [2])
+above
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8528e87..21d86a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ m4_define([gimp_binary_age],
+           [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
+ # For overriding the version string. Comment out if not needed.
+-# m4_define([gimp_version], [2.9.1])
++# m4_define([gimp_version], [2.9.2])
+ # This is the X.Y used in -lgimp-X.Y
+ m4_define([gimp_api_version], [2.0])
+-- 
+2.6.3
+
diff --git a/media-gfx/gimp/gimp-2.8.16.ebuild b/media-gfx/gimp/gimp-2.8.16.ebuild
new file mode 100644 (file)
index 0000000..9bf60d8
--- /dev/null
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
+
+for lang in ${LANGS}; do
+       IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+       >=dev-libs/atk-2.2.0
+       >=x11-libs/gtk+-2.24.10:2
+       >=x11-libs/gdk-pixbuf-2.24.1:2
+       >=x11-libs/cairo-1.10.2
+       >=x11-libs/pango-1.29.4
+       xpm? ( x11-libs/libXpm )
+       >=media-libs/freetype-2.1.7
+       >=media-libs/fontconfig-2.2.0
+       sys-libs/zlib
+       dev-libs/libxml2
+       dev-libs/libxslt
+       x11-themes/hicolor-icon-theme
+       >=media-libs/babl-0.1.10
+       >=media-libs/gegl-0.2.0:0
+       aalib? ( media-libs/aalib )
+       alsa? ( media-libs/alsa-lib )
+       aqua? ( x11-libs/gtk-mac-integration )
+       curl? ( net-misc/curl )
+       dbus? ( dev-libs/dbus-glib )
+       gnome? ( gnome-base/gvfs )
+       webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
+       jpeg? ( virtual/jpeg:0 )
+       jpeg2k? ( media-libs/jasper )
+       exif? ( >=media-libs/libexif-0.6.15 )
+       lcms? ( >=media-libs/lcms-2.2:2 )
+       mng? ( media-libs/libmng )
+       pdf? ( >=app-text/poppler-0.12.4[cairo] )
+       png? ( >=media-libs/libpng-1.2.37:0 )
+       python? (
+               ${PYTHON_DEPS}
+               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+       )
+       tiff? ( >=media-libs/tiff-3.5.7:0 )
+       svg? ( >=gnome-base/librsvg-2.36.0:2 )
+       wmf? ( >=media-libs/libwmf-0.2.8 )
+       x11-libs/libXcursor
+       sys-libs/zlib
+       bzip2? ( app-arch/bzip2 )
+       postscript? ( app-text/ghostscript-gpl )
+       udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+       sys-apps/findutils
+       virtual/pkgconfig
+       >=dev-util/intltool-0.40.1
+       >=sys-devel/gettext-0.19
+       doc? ( >=dev-util/gtk-doc-1 )
+       >=sys-devel/libtool-2.2
+       >=sys-devel/automake-1.11
+       dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+       G2CONF="--enable-default-binary \
+               --disable-silent-rules \
+               $(use_with !aqua x) \
+               $(use_with aalib aa) \
+               $(use_with alsa) \
+               $(use_enable altivec) \
+               $(use_with bzip2) \
+               $(use_with curl libcurl) \
+               $(use_with dbus) \
+               $(use_with gnome gvfs) \
+               $(use_with webkit) \
+               $(use_with jpeg libjpeg) \
+               $(use_with jpeg2k libjasper) \
+               $(use_with exif libexif) \
+               $(use_with lcms lcms lcms2) \
+               $(use_with postscript gs) \
+               $(use_enable cpu_flags_x86_mmx mmx) \
+               $(use_with mng libmng) \
+               $(use_with pdf poppler) \
+               $(use_with png libpng) \
+               $(use_enable python) \
+               $(use_enable smp mp) \
+               $(use_enable cpu_flags_x86_sse sse) \
+               $(use_with svg librsvg) \
+               $(use_with tiff libtiff) \
+               $(use_with udev gudev) \
+               $(use_with wmf) \
+               --with-xmc \
+               $(use_with xpm libxpm) \
+               --without-xvfb-run"
+
+       if use python; then
+               python-single-r1_pkg_setup
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
+       epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
+       epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
+       sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+       eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+       gnome2_src_prepare
+}
+
+_clean_up_locales() {
+       einfo "Cleaning up locales..."
+       for lang in ${LANGS}; do
+               use "linguas_${lang}" && {
+                       einfo "- keeping ${lang}"
+                       continue
+               }
+               rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+       done
+}
+
+src_test() {
+       Xemake check
+}
+
+src_install() {
+       gnome2_src_install
+
+       if use python; then
+               python_optimize
+       fi
+
+       # Workaround for bug #321111 to give GIMP the least
+       # precedence on PDF documents by default
+       mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+       prune_libtool_files --all
+
+       # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+       local gimp_app_version=$(get_version_component_range 1-2)
+       mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+       _clean_up_locales
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.9.2.ebuild b/media-gfx/gimp/gimp-2.9.2.ebuild
new file mode 100644 (file)
index 0000000..5f50d59
--- /dev/null
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
+
+for lang in ${LANGS}; do
+       IUSE+=" linguas_${lang}"
+done
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+       >=dev-libs/atk-2.2.0
+       >=x11-libs/gtk+-2.24.10:2
+       dev-util/gtk-update-icon-cache
+       >=x11-libs/gdk-pixbuf-2.31:2
+       >=x11-libs/cairo-1.12.2
+       >=x11-libs/pango-1.29.4
+       xpm? ( x11-libs/libXpm )
+       >=media-libs/freetype-2.1.7
+       >=media-libs/harfbuzz-0.9.19
+       >=media-libs/gexiv2-0.6.1
+       >=media-libs/fontconfig-2.2.0
+       sys-libs/zlib
+       dev-libs/libxml2
+       dev-libs/libxslt
+       x11-themes/hicolor-icon-theme
+       >=media-libs/babl-0.1.14
+       >=media-libs/gegl-0.3.4:0.3
+       >=dev-libs/glib-2.43
+       aalib? ( media-libs/aalib )
+       alsa? ( media-libs/alsa-lib )
+       aqua? ( x11-libs/gtk-mac-integration )
+       dev-util/gdbus-codegen
+       gnome? ( gnome-base/gvfs )
+       webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
+       virtual/jpeg:0
+       jpeg2k? ( media-libs/jasper )
+       >=media-libs/lcms-2.2:2
+       mng? ( media-libs/libmng )
+       openexr? ( >=media-libs/openexr-1.6.1 )
+       pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
+       >=media-libs/libpng-1.2.37:0
+       python? (
+               ${PYTHON_DEPS}
+               >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
+       )
+       tiff? ( >=media-libs/tiff-3.5.7:0 )
+       svg? ( >=gnome-base/librsvg-2.36.0:2 )
+       wmf? ( >=media-libs/libwmf-0.2.8 )
+       x11-libs/libXcursor
+       sys-libs/zlib
+       app-arch/bzip2
+       >=app-arch/xz-utils-5.0.0
+       postscript? ( app-text/ghostscript-gpl )
+       udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+       sys-apps/findutils
+       virtual/pkgconfig
+       >=dev-util/intltool-0.40.1
+       >=sys-devel/gettext-0.19
+       doc? ( >=dev-util/gtk-doc-1 )
+       >=sys-devel/libtool-2.2
+       >=sys-devel/automake-1.11
+       dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+       G2CONF="--enable-default-binary \
+               --disable-silent-rules \
+               $(use_with !aqua x) \
+               --without-libmypaint \
+               $(use_with aalib aa) \
+               $(use_with alsa) \
+               $(use_enable altivec) \
+               $(use_with webkit) \
+               $(use_with jpeg2k libjasper) \
+               $(use_with postscript gs) \
+               $(use_enable cpu_flags_x86_mmx mmx) \
+               $(use_with mng libmng) \
+               $(use_with openexr) \
+               $(use_with pdf poppler) \
+               $(use_enable python) \
+               $(use_enable smp mp) \
+               $(use_enable cpu_flags_x86_sse sse) \
+               $(use_with svg librsvg) \
+               $(use_with tiff libtiff) \
+               $(use_with udev gudev) \
+               $(use_with wmf) \
+               --with-xmc \
+               $(use_with xpm libxpm) \
+               --without-xvfb-run"
+
+       if use python; then
+               python-single-r1_pkg_setup
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-2.9.2-version.patch
+       epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch  # bug 395695, comment 9 and 16
+       sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+       eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+       gnome2_src_prepare
+}
+
+_clean_up_locales() {
+       einfo "Cleaning up locales..."
+       for lang in ${LANGS}; do
+               use "linguas_${lang}" && {
+                       einfo "- keeping ${lang}"
+                       continue
+               }
+               rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+       done
+}
+
+src_test() {
+       Xemake check
+}
+
+src_install() {
+       gnome2_src_install
+
+       if use python; then
+               python_optimize
+       fi
+
+       # Workaround for bug #321111 to give GIMP the least
+       # precedence on PDF documents by default
+       mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+       prune_libtool_files --all
+
+       # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+       local gimp_app_version=$(get_version_component_range 1-2)
+       mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+       _clean_up_locales
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+       gnome2_pkg_postrm
+}
index b8463b932da6acc3911c9ee814384edf30a7331c..e0313e5f20558eea3e662e217410b9b3aa5a075e 100644 (file)
@@ -1,2 +1,3 @@
 DIST babl-0.1.10.tar.bz2 449537 SHA256 943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4 SHA512 2950d94c255ee05d405e003a46138da0f4e0cad65e2d2a882089b788c2deac0524014f7c5758c3097253bdbebaded433caf0447c7d218c9cc96798df9e6f0c92 WHIRLPOOL a71907a531bc71c7ac0c84a197a559c50321a5d96b5d846083935390890ef116780d49bd458577aef0e948395dc14897e6fbbc75478b2a59d57d4381cf7f8db8
 DIST babl-0.1.12.tar.bz2 642234 SHA256 2f802b7f1a17b72c10bf0fe1e69b7a888cf7ce62b7cf1537b030f7f88d55a407 SHA512 b69c8e3870f25372b2223aa4a716383af30342822461fc847039af964cdd194603dbc327a5c3547369d64b206b54280a5a9a227197ca6b7bcfbfa8e2e560df6a WHIRLPOOL b1a170492f1c1e6f030f418cc66c3be02cd2bd7e10896a416b5feaf2d7aa82de4fa15c9d2a65e6e1038ab6822e4dc3333f96102e18d757a6b1e07f4017b4beba
+DIST babl-0.1.14.tar.bz2 718238 SHA256 e6dcb112c8f8f75471823fdcc5a6a65f753b4d0e96e377979ea01a5d6fad7d4f SHA512 fb7c48738b968c2cf01aab20b50c7768501b73c8c34957ef500cf7a77bb2dce519ede34463a8a100037533d5f3566e1cd23d898c41eb29fc01620a0dde131398 WHIRLPOOL e85a868e751f490a9dee002bd93214033f0fbaab7dbd65c0062c55f98af810be83e6899804bdd2c4e45f2625f2e75a36784890c950e34b35baf0104c69bd2a79
diff --git a/media-libs/babl/babl-0.1.14.ebuild b/media-libs/babl/babl-0.1.14.ebuild
new file mode 100644 (file)
index 0000000..ce739ef
--- /dev/null
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+if [[ ${PV} == *9999* ]]; then
+       inherit autotools git-r3
+       EGIT_REPO_URI="git://git.gnome.org/babl"
+       SRC_URI=""
+else
+       SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+       >=sys-devel/libtool-2.2
+       virtual/pkgconfig
+"
+
+src_prepare() {
+       epatch_user
+       [[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+       # Automagic rsvg support is just for website generation we do not call,
+       #     so we don't need to fix it
+       # w3m is used for dist target thus no issue for us that it is automagically
+       #     detected
+       econf \
+               --disable-docs \
+               --disable-static \
+               --disable-maintainer-mode \
+               $(use_enable altivec) \
+               $(use_enable cpu_flags_x86_mmx mmx) \
+               $(use_enable cpu_flags_x86_sse sse) \
+               $(use_enable cpu_flags_x86_sse sse2)
+}
+
+src_install() {
+       default
+       prune_libtool_files --all
+}
index 5e62731d649f71f8d9e868437ce2d06f762f5efc..2be673fa27eeb6730bcf2bc969f5ccbe4c347cd3 100644 (file)
@@ -8,7 +8,7 @@ inherit libtool multilib-minimal eutils autotools
 
 DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="mirror://bitbucket/libgd/gd-libgd/downloads/lib${P}.tar.xz"
+SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
index a888450fb255b0b05b81b2735b43aa3bf4db7cee..0d365a85adaab2fee42ce92ca8075969f9de303e 100644 (file)
@@ -8,7 +8,7 @@ inherit libtool multilib-minimal eutils
 
 DESCRIPTION="A graphics library for fast image creation"
 HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="mirror://bitbucket/libgd/gd-libgd/downloads/lib${P}.tar.xz"
+SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
index c9bb6efb732f0b182a126aa6fbadfb8c8cc69f78..1ff8e833ecec1fb3408e0f1b181cb90e2ed965d0 100644 (file)
@@ -1,2 +1,4 @@
 DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 WHIRLPOOL 74e9c18b095526b1d053f0700b3c3776197a5c1066cb77adb7c83f154aae9087319f7b7f0379fb9e895a5ef3ac62ebf05e2158c1d18180bafcef41dff096c01d
 DIST gegl-0.3.0.tar.bz2 5463571 SHA256 f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc80cf899a846484da693bbf7 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 WHIRLPOOL 4827d6e40025c36d4ef869b5856f4def1e93cc195757f430cfd2980742ce6b37c79833283d17ec51e93b569a144548aaf7021854b9bcdb241b90049b1321a99b
+DIST gegl-0.3.2.tar.bz2 5325146 SHA256 b82f6e07e977dd7c2b6e671e9e029614840a66f0ca58defb22c0b05ed3ea485c SHA512 207d23a62cc447b0f6837e1901410114a63fe1a1b92a08d3c92941bfb461d04e320e02332e013ce26383641fdf1011fb4d3f4b6ce0370030c3fe770a49634a51 WHIRLPOOL 74105180350a621e9f445bcc0040f712f8129792199c4e9be086008854866d0bf4b369dd7f5c96acb2ac4454d34cff7ed4edf4460bc5e632109d1ed294e330eb
+DIST gegl-0.3.4.tar.bz2 5328192 SHA256 846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec SHA512 7fe14c1534d61cfc253bce54cc707f93882ad96302068fe672e6cdcb613430e835ee5d39a5398537f845a6d101eed6fd3d1ff7e4204d51bc9ab5a59c9e09d2ec WHIRLPOOL 046af673b5a21a050555fabf5e52532b5de7af289922991f0c15cc39a09d32302a6a98483bd4ff2cee3a37356d0cf0e267c87f524f3b6678eb61fcaab6d6735c
diff --git a/media-libs/gegl/files/gegl-0.3.4-endian.patch b/media-libs/gegl/files/gegl-0.3.4-endian.patch
new file mode 100644 (file)
index 0000000..3df13e6
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/operations/external/tiff-load.c
++++ b/operations/external/tiff-load.c
+@@ -505,7 +505,7 @@
+       GeglRectangle line = { 0, p->height - row - 1, p->width, 1 };
+ #if G_BYTE_ORDER != G_LITTLE_ENDIAN
+       guint row_start = row * p->width;
+-      guint row end = row * p->width + p->width;
++      guint row_end = row * p->width + p->width;
+       guint i;
+       for (i = row_start; i < row_end; i++)
diff --git a/media-libs/gegl/gegl-0.3.2.ebuild b/media-libs/gegl/gegl-0.3.2.ebuild
new file mode 100644 (file)
index 0000000..4fca26c
--- /dev/null
@@ -0,0 +1,183 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_MIN_API_VERSION=0.20
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+       inherit autotools git-r3
+       EGIT_REPO_URI="git://git.gnome.org/gegl"
+       SRC_URI=""
+else
+       SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_IUSE="
+       svg? ( cairo )
+       vala? ( introspection )
+"
+
+RDEPEND="
+       >=dev-libs/glib-2.36:2
+       dev-libs/json-glib
+       >=media-libs/babl-0.1.14
+       sys-libs/zlib
+       >=x11-libs/gdk-pixbuf-2.18:2
+       x11-libs/pango
+
+       cairo? ( x11-libs/cairo )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
+       introspection? ( >=dev-libs/gobject-introspection-1.32 )
+       jpeg? ( virtual/jpeg:0= )
+       jpeg2k? ( >=media-libs/jasper-1.900.1 )
+       lcms? ( >=media-libs/lcms-2.2:2 )
+       lensfun? ( >=media-libs/lensfun-0.2.5 )
+       openexr? ( media-libs/openexr )
+       png? ( media-libs/libpng:0= )
+       raw? ( >=media-libs/libraw-0.15.4 )
+       sdl? ( media-libs/libsdl )
+       svg? ( >=gnome-base/librsvg-2.14:2 )
+       tiff? ( >=media-libs/tiff-4:0 )
+       umfpack? ( sci-libs/umfpack )
+       v4l? ( >=media-libs/libv4l-1.0.1 )
+       webp? ( media-libs/libwebp )
+"
+DEPEND="${RDEPEND}
+       >=dev-util/gtk-doc-am-1
+       >=dev-util/intltool-0.40.1
+       dev-lang/perl
+       virtual/pkgconfig
+       >=sys-devel/libtool-2.2
+       test? ( introspection? (
+               $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+       vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+       use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       # FIXME: the following should be proper patch sent to upstream
+       # fix OSX loadable module filename extension
+       sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+       # don't require Apple's OpenCL on versions of OSX that don't have it
+       if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+               sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+       fi
+
+       #epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+       # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+       sed -e '/clones.xml/d' \
+               -e '/composite-transform.xml/d' \
+               -i tests/compositions/Makefile.am || die
+
+       epatch_user
+       eautoreconf
+
+       use vala && vala_src_prepare
+}
+
+src_configure() {
+       # never enable altering of CFLAGS via profile option
+       # libspiro: not in portage main tree
+       # disable documentation as the generating is bit automagic
+       #    if anyone wants to work on it just create bug with patch
+
+       # Also please note that:
+       #
+       #  - Some auto-detections are not patched away since the docs are
+       #    not built (--disable-docs, lack of --enable-gtk-doc) and these
+       #    tools affect re-generation of docs, only
+       #    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+       #
+       #  - Parameter --with-exiv2 compiles a noinst-app only, no use
+       #
+       #  - Parameter --disable-workshop disables any use of Lua, effectivly
+       #
+       #  - v4l support does not work with our media-libs/libv4l-0.8.9,
+       #    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+       #
+       #  - There are two checks for dot, one controllable by --with(out)-graphviz
+       #    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+       #
+       #  - mrg is not in tree and gexiv2 support only has effect when mrg support
+       #    is enabled
+       #
+       # So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+       # https://bugs.gentoo.org/show_bug.cgi?id=451136
+       #
+       econf \
+               --disable-docs \
+               --disable-profile \
+               --disable-silent-rules \
+               --disable-workshop \
+               --program-suffix=-${SLOT} \
+               --with-gdk-pixbuf \
+               --with-pango \
+               --without-libspiro \
+               $(use_enable cpu_flags_x86_mmx mmx) \
+               $(use_enable cpu_flags_x86_sse sse) \
+               $(use_enable debug) \
+               $(use_with cairo) \
+               $(use_with cairo pangocairo) \
+               --without-exiv2 \
+               $(use_with ffmpeg libavformat) \
+               --without-gexiv2 \
+               --without-graphviz \
+               $(use_with jpeg libjpeg) \
+               $(use_with jpeg2k jasper) \
+               $(use_with lcms) \
+               $(use_with lensfun) \
+               --without-lua \
+               --without-mrg \
+               $(use_with openexr) \
+               $(use_with png libpng) \
+               $(use_with raw libraw) \
+               $(use_with sdl) \
+               $(use_with svg librsvg) \
+               $(use_with tiff libtiff) \
+               $(use_with umfpack) \
+               $(use_with v4l libv4l) \
+               $(use_with v4l libv4l2) \
+               $(use_enable introspection) \
+               $(use_with vala) \
+               $(use_with webp)
+}
+
+src_test() {
+       gnome2_environment_reset  # sandbox issues
+       default
+}
+
+src_compile() {
+       gnome2_environment_reset  # sandbox issues (bug #396687)
+       default
+
+       [[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+       default
+       prune_libtool_files --all
+}
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild
new file mode 100644 (file)
index 0000000..ce3348c
--- /dev/null
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_MIN_API_VERSION=0.20
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+       inherit autotools git-r3
+       EGIT_REPO_URI="git://git.gnome.org/gegl"
+       SRC_URI=""
+else
+       SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_IUSE="
+       svg? ( cairo )
+       vala? ( introspection )
+"
+
+RDEPEND="
+       >=dev-libs/glib-2.36:2
+       dev-libs/json-glib
+       >=media-libs/babl-0.1.14
+       sys-libs/zlib
+       >=x11-libs/gdk-pixbuf-2.18:2
+       x11-libs/pango
+
+       cairo? ( x11-libs/cairo )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
+       introspection? ( >=dev-libs/gobject-introspection-1.32 )
+       jpeg? ( virtual/jpeg:0= )
+       jpeg2k? ( >=media-libs/jasper-1.900.1 )
+       lcms? ( >=media-libs/lcms-2.2:2 )
+       lensfun? ( >=media-libs/lensfun-0.2.5 )
+       openexr? ( media-libs/openexr )
+       png? ( media-libs/libpng:0= )
+       raw? ( >=media-libs/libraw-0.15.4 )
+       sdl? ( media-libs/libsdl )
+       svg? ( >=gnome-base/librsvg-2.14:2 )
+       tiff? ( >=media-libs/tiff-4:0 )
+       umfpack? ( sci-libs/umfpack )
+       v4l? ( >=media-libs/libv4l-1.0.1 )
+       webp? ( media-libs/libwebp )
+"
+DEPEND="${RDEPEND}
+       >=dev-util/gtk-doc-am-1
+       >=dev-util/intltool-0.40.1
+       dev-lang/perl
+       virtual/pkgconfig
+       >=sys-devel/libtool-2.2
+       test? ( introspection? (
+               $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+       vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+       use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-0.3.4-endian.patch
+
+       # FIXME: the following should be proper patch sent to upstream
+       # fix OSX loadable module filename extension
+       sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+       # don't require Apple's OpenCL on versions of OSX that don't have it
+       if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+               sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+       fi
+
+       #epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+       # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+       sed -e '/clones.xml/d' \
+               -e '/composite-transform.xml/d' \
+               -i tests/compositions/Makefile.am || die
+
+       epatch_user
+       eautoreconf
+
+       use vala && vala_src_prepare
+}
+
+src_configure() {
+       # never enable altering of CFLAGS via profile option
+       # libspiro: not in portage main tree
+       # disable documentation as the generating is bit automagic
+       #    if anyone wants to work on it just create bug with patch
+
+       # Also please note that:
+       #
+       #  - Some auto-detections are not patched away since the docs are
+       #    not built (--disable-docs, lack of --enable-gtk-doc) and these
+       #    tools affect re-generation of docs, only
+       #    (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+       #
+       #  - Parameter --with-exiv2 compiles a noinst-app only, no use
+       #
+       #  - Parameter --disable-workshop disables any use of Lua, effectivly
+       #
+       #  - v4l support does not work with our media-libs/libv4l-0.8.9,
+       #    upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+       #
+       #  - There are two checks for dot, one controllable by --with(out)-graphviz
+       #    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
+       #
+       #  - mrg is not in tree and gexiv2 support only has effect when mrg support
+       #    is enabled
+       #
+       # So that's why USE="exif graphviz lua v4l" got resolved.  More at:
+       # https://bugs.gentoo.org/show_bug.cgi?id=451136
+       #
+       econf \
+               --disable-docs \
+               --disable-profile \
+               --disable-silent-rules \
+               --disable-workshop \
+               --program-suffix=-${SLOT} \
+               --with-gdk-pixbuf \
+               --with-pango \
+               --without-libspiro \
+               $(use_enable cpu_flags_x86_mmx mmx) \
+               $(use_enable cpu_flags_x86_sse sse) \
+               $(use_enable debug) \
+               $(use_with cairo) \
+               $(use_with cairo pangocairo) \
+               --without-exiv2 \
+               $(use_with ffmpeg libavformat) \
+               --without-gexiv2 \
+               --without-graphviz \
+               $(use_with jpeg libjpeg) \
+               $(use_with jpeg2k jasper) \
+               $(use_with lcms) \
+               $(use_with lensfun) \
+               --without-lua \
+               --without-mrg \
+               $(use_with openexr) \
+               $(use_with png libpng) \
+               $(use_with raw libraw) \
+               $(use_with sdl) \
+               $(use_with svg librsvg) \
+               $(use_with tiff libtiff) \
+               $(use_with umfpack) \
+               $(use_with v4l libv4l) \
+               $(use_with v4l libv4l2) \
+               $(use_enable introspection) \
+               $(use_with vala) \
+               $(use_with webp)
+}
+
+src_test() {
+       gnome2_environment_reset  # sandbox issues
+       default
+}
+
+src_compile() {
+       gnome2_environment_reset  # sandbox issues (bug #396687)
+       default
+
+       [[ ${PV} == *9999* ]] && emake ./ChangeLog  # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+       default
+       prune_libtool_files --all
+}
index 59a46cd16d71bcf283480356de4019ed262f7105..4fca26cf55c74aecb62be692a5695462aa36af5e 100644 (file)
@@ -27,13 +27,16 @@ HOMEPAGE="http://www.gegl.org/"
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0.3"
 
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
-REQUIRED_IUSE="vala? ( introspection )"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_IUSE="
+       svg? ( cairo )
+       vala? ( introspection )
+"
 
 RDEPEND="
        >=dev-libs/glib-2.36:2
        dev-libs/json-glib
-       >=media-libs/babl-0.1.12
+       >=media-libs/babl-0.1.14
        sys-libs/zlib
        >=x11-libs/gdk-pixbuf-2.18:2
        x11-libs/pango
@@ -50,9 +53,10 @@ RDEPEND="
        lensfun? ( >=media-libs/lensfun-0.2.5 )
        openexr? ( media-libs/openexr )
        png? ( media-libs/libpng:0= )
-       raw? ( =media-libs/libopenraw-0.0.9 )
+       raw? ( >=media-libs/libraw-0.15.4 )
        sdl? ( media-libs/libsdl )
        svg? ( >=gnome-base/librsvg-2.14:2 )
+       tiff? ( >=media-libs/tiff-4:0 )
        umfpack? ( sci-libs/umfpack )
        v4l? ( >=media-libs/libv4l-1.0.1 )
        webp? ( media-libs/libwebp )
@@ -88,15 +92,6 @@ src_prepare() {
                -e '/composite-transform.xml/d' \
                -i tests/compositions/Makefile.am || die
 
-       # commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
-       # for the new CIE conversions
-       sed -e '/test-image-compare/d' \
-               -i tests/simple/Makefile.am || die
-
-       # Skip broken test with >=dev-python/pygobject-3.14
-       sed -e '/test_buffer/ i\    @unittest.skip("broken")\' \
-               -i tests/python/test-gegl-format.py || die
-
        epatch_user
        eautoreconf
 
@@ -126,6 +121,9 @@ src_configure() {
        #  - There are two checks for dot, one controllable by --with(out)-graphviz
        #    which toggles HAVE_GRAPHVIZ that is not used anywhere.  Yes.
        #
+       #  - mrg is not in tree and gexiv2 support only has effect when mrg support
+       #    is enabled
+       #
        # So that's why USE="exif graphviz lua v4l" got resolved.  More at:
        # https://bugs.gentoo.org/show_bug.cgi?id=451136
        #
@@ -145,17 +143,20 @@ src_configure() {
                $(use_with cairo pangocairo) \
                --without-exiv2 \
                $(use_with ffmpeg libavformat) \
+               --without-gexiv2 \
                --without-graphviz \
                $(use_with jpeg libjpeg) \
                $(use_with jpeg2k jasper) \
                $(use_with lcms) \
                $(use_with lensfun) \
                --without-lua \
+               --without-mrg \
                $(use_with openexr) \
                $(use_with png libpng) \
-               $(use_with raw libopenraw) \
+               $(use_with raw libraw) \
                $(use_with sdl) \
                $(use_with svg librsvg) \
+               $(use_with tiff libtiff) \
                $(use_with umfpack) \
                $(use_with v4l libv4l) \
                $(use_with v4l libv4l2) \
index c7cf51ee86dd78b7db57e10374c2525817054168..1a91f0a5b828f672e7ce0afacc7bfcdccca85347 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="introspection python static-libs"
 
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
index f266bac65f734afbe9deeee03a1c09e1068d7a50..089bc787ac2f38ba4ee5ac60477dd8891085c8fd 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
 
 RDEPEND=">=dev-libs/glib-2.28
index 7b2ef4bd534a25b708d10a92b0743853252440e3..26bcdd9ba03fb888ec20322794c378ea4b4bcca8 100644 (file)
@@ -1,11 +1,13 @@
 DIST libpng-1.2.51.tar.xz 562940 SHA256 c7d7b813b022afd70474f78bcc3655c7bb54edbf28dd4652e5521cbb6da56d4a SHA512 63ba0df5eff78b254d53f6cfd4075d3ea93ee9445e37678fc7d29fa116137b2a7c441eda23851638f9185166e408f42c51d0678c466c8376a1de356c7db760f2 WHIRLPOOL d829b07e950c64a8de37591ac5d40211f8e762feff8ff6f98db35714293997304b3eb063ea69a87064e6c66530a4fa2531dadcb1a0bb412066c558a5ff2f679c
-DIST libpng-1.2.52.tar.xz 566088 SHA256 d4fb0fbf14057ad6d0319034188fc2aecddb493da8e3031b7b072ed28f510ec0 SHA512 5890daec6aaf619e3eab32ee8105182f220ffce9e945a5129148ff6918d3749ddb3e9f60c25d6e8457184d5a2622b07d154640d13afb92f5ce9c48873e956a42 WHIRLPOOL dfa6870e7d5e4ca05ba74bd9cd599bcbc301046c7bde7042cd2d1ec4c706f4754dd40a10bd3d753ab169cc3365152a6c1f0f8fa33bcd0e0812019c670c49194a
 DIST libpng-1.2.54.tar.xz 571448 SHA256 cf85516482780f2bc2c5b5073902f12b1519019d47bf473326c2018bdff1d272 SHA512 3fde161bae1c61c0c099344518a59a312ac5bcd6063d7d01be156fd4e048fdaafed8a27e10bf2750d4ef678389e2782137c9e6540b7fd0859b820bb8d9443497 WHIRLPOOL fd985ebc9982e20ec37b9a8889890406a334005648f90e429e71eae02c7308c8d64ff0f34e5a31fc817521d44a45f0740bc221bf73c00ade1ef2e2974fd22b9d
-DIST libpng-1.5.21-apng.patch.gz 9511 SHA256 8a4fffa885f1a1a34a7bdcaa2d1b8f1e025f6e1cf9c5bf17224672d2a6948d94 SHA512 b3369d97b19ebeae06e1f2874c2a3cc8f42421fb4be76f913be359630c5483c31cad6643f7c0a4edd3a952406d6acbffdd4a6cbfc9a09df07094bf6c6d9fbe15 WHIRLPOOL 5403fef0c1233c2e82785690d619f0e917d98a0056058064ddba446ed9987d05a4fe608b4883196f035f4b2de2650d858906014d13e5aed4d275d9e5e42ffb3d
-DIST libpng-1.5.21.tar.xz 734356 SHA256 b5151c64bc70489997790a492e1094d106be90a22b2958c43eee25a70dffdba7 SHA512 dd27d250271b72c33b9ea6282b549ad2a7a638334f97a218a00cde3136d97faf37544e304f84b966a064f9117e4681dde4f888ad63ecab41473d176066f3f5b4 WHIRLPOOL 4768c55e4d62a32d490b29285262f2dfb160c7a35afdd0e8f8d14a70348b4020c6f57dd97a9015b912c49c3dd73b660e0905c74df3674c0549fc3add5358899e
+DIST libpng-1.2.55.tar.xz 655728 SHA256 5e5227345676fabbba28558f4396514bb06a239eaf69adba12f3669a1650797e SHA512 d0bc9ebbbcff1c258c333d9ca64c15074d0e01df49b1d937242509b42307aebe22169ae322aa75dc6c60c0c31d29318d184ef8b1b87ae2c9e4d3d4f4c8a4dd45 WHIRLPOOL 49c2c3dcd142c5fd377a99495d74950440f4f662af9bf246570d0e99425f2b977c5b1b6b7f407dbc2efef0f93ffb5e1d7c3c25d9ef1dfaeab8ab2f0744e5427b
 DIST libpng-1.5.24-apng.patch.gz 10318 SHA256 7493734793803598a57f83274258118e9a31f6ec9a20b83a4d851cf359ed966a SHA512 647bb8a780947b72c7aad1ffc2b2114ed43f22e6c3885621c83694875bcec4516e49b00856fabffd568bfed90748e96117d42e3817e83a25fcb25089e32225ea WHIRLPOOL 38e6616930865bdaf8fa1ecf35bb8af8916f8bc3a9af9e9621455e378d7913b393f8ab3dd823bcc811974021dfdc24f5da95bfb14c3249cf67dc31fe037f80af
 DIST libpng-1.5.24.tar.xz 749016 SHA256 b92e3474f3136b5d9443ba92822154ebc2573fc6feead90d364ee9ebc3741be2 SHA512 d6faaba4844de0fbb0786e141265a17128387dd73dfdb5cbd1ab2915430578cd73f3f5efadcaaab966429f1a4908568b60829db63b00aadb320bf0f4a8ff9e78 WHIRLPOOL 14631ce41756faf2ec00315d7279a39fd06b488288db24a1d81345ec484a7289d187a579823b1be471e975041d5a1b4f0fbdc763a1a64cfdc29dd4ca71cc789a
+DIST libpng-1.5.25-apng.patch.gz 10305 SHA256 32c706498b9edde98b8b55374c2188b0d1dce6b60048b167a6d99f97bef2595f SHA512 602998b5e922cf1e547c5dad79a2a4f2ae81a86f7a3f4693e09e118417508629d66b734317a842d43ac13f213f79ef24a264d6790514d3383cd32eaf40a12b9b WHIRLPOOL 8b2a24181c3c1b47a408283febf5d69cf485cd0665e26721d34873fce2bfb462383e3b40d51edcbfd62308241b1567aa5b4aa649d6343653162047bbba964116
+DIST libpng-1.5.25.tar.xz 748268 SHA256 1224db3a8df90ce1b07ee67327e6846484450d05b9315a1d56fcc9772c0a51ca SHA512 41663d277a4a0e59c0a797e34c9cbe17990333b3a93c008fbf449274053847d157ea12b2e93e941661e3921a0c202c395ba334474dd77b7f4d8dd85a76628a48 WHIRLPOOL 60afcc4f08855724f11a5ce146c40852b593f4fa3fb6eb2dcee129e59160f5e1fe572842f13434edb849d5f32f72ab02c031c66636585104c966107d57f666c5
 DIST libpng-1.6.18-apng.patch.gz 9940 SHA256 1d595b3b33c09529dddf869ca69f386528dfe1b991d2679377082e2acbca7009 SHA512 ebf8e2d11b18afc0943502be069076fbe07792e8056058551de0b1cf07987a6cf423edaa5de7aefb318115054235d984059a83aad93b06bed1a56002a0b6bd9b WHIRLPOOL d177ef6a4846956e8a2768b5beb5e18a6e9db2d03ef32e6ff21f79994f8274175b8bba01def0f85af4cd6640050173291e7a54c148076cbb8397e886257f83b8
 DIST libpng-1.6.18.tar.xz 932324 SHA256 2e10c13b7949883ac961db6177c516d778184432d440317e9f0391305c360963 SHA512 7ae286f728844da31699c3097cfb2167d4a57f740c749f0251de86ae481824716b3edaafc1b5673116623e729396ccc720a346439d3b20c5b6a7b06e1d129f74 WHIRLPOOL 1f9662073172eb2fa11924f79efd4d7dd0979696359f48f67addf5325148d898982d361879892acaa60441dd4fe42cd38ae68affc08302fa5ffc2b6731731a88
 DIST libpng-1.6.19-apng.patch.gz 10330 SHA256 5ec713a51c35c25d5e53dd61270a6fd5313b26872b382f0fbaed41a0743768a2 SHA512 2d412a74d657d366d395d13bc301d71363011fbcafbbf815dba565baca4069629450a97dfaab0ddeec7c7f646a6eddeac559d24f6910a34b072aa4a208dc4e16 WHIRLPOOL 4e093bcddbf114dda0c33eddac70b245f91c659f378d129731d3e486db3f6d232684bde1ad8f69109c7db726b53b8317f989d8b5c5a50198ab645eb7a869e7f9
 DIST libpng-1.6.19.tar.xz 941280 SHA256 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 SHA512 166377ce4f8abfcae0e76bafbdbe94aebef60b9a12c1820eda392e63a8ba7a9e8d7ef4840d8d4853cd487418edd2c4515a889cd9f830d4223a13315e1db4c3b8 WHIRLPOOL 8cdb5ffc7ecfafd064ae816b3bd1c7572799fc54c701e74d9c1f66ccac592fe460c1f22f1774329a8a1f177247f0fde8a22f8dc26892805a0bed64c0690967ae
+DIST libpng-1.6.20-apng.patch.gz 10304 SHA256 ed7bc9d03bc7390c477623e1abff42977395c75ed3e69e8308ea25bc3871774d SHA512 764bfb5a7cff395bbd6aeb6b5a53a9963f7074c41ae39dd9832d1dfd1e4eb0b6210d2cf9a1af63c8db8959ee4f0691d2fa288b0a0ecc63b61d131c7a708b38a4 WHIRLPOOL 8673db8f8b47704493d925d436f07822b3b92c0e251649670efe1f0db6cd4ecb9c38fd0c2d5153503c02f4afc677a25be835d12878ee0e0fbfa5a5027278e766
+DIST libpng-1.6.20.tar.xz 942672 SHA256 55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b SHA512 bbf7d9a21a13eb1fd1fa06f9761df72c0b37bd62da7049afe20ec4e63c02c3708aca8a2c2b7f2d7332f3941469b4aca1653cc8423c7fea6de8084201cb8b5f5f WHIRLPOOL fe745030bc7d09e41b20c11f26ed4b1ba1b49cd2f3d0bbafab181fbb28aa0a87165ef10f66d734314e7a73343d6c38bfedbe176fdc7b03c1273ec13d4f3f0953
similarity index 82%
rename from media-libs/libpng/libpng-1.2.52.ebuild
rename to media-libs/libpng/libpng-1.2.55.ebuild
index edcf187d0d5be6f1355cb850d055a168af412b08..db9ef0f39ce9ae31bb073ef5da7861bb4cf75196 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="libpng"
 SLOT="1.2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
similarity index 72%
rename from media-libs/libpng/libpng-1.5.21.ebuild
rename to media-libs/libpng/libpng-1.5.25.ebuild
index 3d68450c3cb474b7ac78252068be78082c4a9253..f0df0eb92c198b746dd37319789e656b80491ee0 100644 (file)
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="1.5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
@@ -34,6 +34,9 @@ pkg_setup() {
 
 src_prepare() {
        if use apng; then
+               # fix windows path in patch file. Please check for each release if this can be removed again.
+               sed 's@scripts\\symbols.def@scripts/symbols.def@' \
+                       -i "${WORKDIR}"/${PN}-*-apng.patch || die
                epatch "${WORKDIR}"/${PN}-*-apng.patch
                # Don't execute symbols check with apng patch wrt #378111
                sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
diff --git a/media-libs/libpng/libpng-1.6.20.ebuild b/media-libs/libpng/libpng-1.6.20.ebuild
new file mode 100644 (file)
index 0000000..55f0347
--- /dev/null
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils libtool multilib-minimal
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+       apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
+
+LICENSE="libpng"
+SLOT="0/16"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
+       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+       app-arch/xz-utils"
+
+src_prepare() {
+       if use apng; then
+               epatch "${WORKDIR}"/${PN}-*-apng.patch
+               # Don't execute symbols check with apng patch wrt #378111
+               sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+       fi
+       elibtoolize
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" econf \
+               $(use_enable static-libs static) \
+               --enable-arm-neon=$(usex neon)
+}
+
+multilib_src_install_all() {
+       dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+       prune_libtool_files --all
+}
index d49406743fe5d8db57cf11251086a2160f8daa1e..0e85d4a3ffcb416be62336deb4b2a40781c0d112 100644 (file)
@@ -21,7 +21,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa minimal sqlite static-libs test"
 
 RDEPEND="
index 66f7be429e3a05b74fa96a3556c170a953556afa..8720de4bb60337a7dd0e11104c04c13b0dba3bd6 100644 (file)
@@ -1,6 +1,4 @@
 DIST fldigi-3.22.13.tar.gz 2909523 SHA256 f055b607dd28bde847541bd4518e5ceac49e0eccf4bda97c4c589d598c4a3baf SHA512 ef4d4cccf24a6c7f7ad6657af89cfbc617655c9852150ac45b92178549a91a8aed6d6d6d4737ac69ded64e85bfbc727697f16f64b5d24e4eb756a8c1ca11a57c WHIRLPOOL a8a175d59e656df86b321b9753a7656e10403c8921dc7081859e088a6868324594f2807a20b09c91eb3ec616404dc1a7ce0f721881e27ff27958c545d9fbf0b6
-DIST fldigi-3.23.00.tar.gz 2950875 SHA256 34585f3755a51552bf2c65cc5c74db4b739a9c3239202f9dd5b3e0e3805a598b SHA512 83982feea33332e2365d6c2a5e840dd1ff815ced4ad9a7b8f31277dd3d92c08bbdadbb1614200d756b00e870be2d5f1bec845be388d9c1740664ed9377bfae67 WHIRLPOOL 1599b32a1781e575d55402c90d152209201b5dd0b699ed68c858327e35f8c6bf549725fd7c4001f485ac97a1e76e067d3f852ba2162a81023855a0e116239eed
-DIST fldigi-3.23.01.tar.gz 2950969 SHA256 2daf2cca7c2abc9106e791cea28137a77b8b4e4e4c397efc8af350f208e357c3 SHA512 7ef3d9d614b188c593df704f96f5f238f08e02335f27ce819f1483d1c79bf32007e10750a63d842bd132bb7b8a8ec08509740a62b8810ea55d0d94b477029e45 WHIRLPOOL c195e986beb591bd5b7aff663938b14ba8bdfc4e52432b192ebec064b8f106a1a280a69b5b196e2c356949e2f5ee8412d77b81a0026d5843632f0181fa0a14dd
-DIST fldigi-3.23.03.tar.gz 2951727 SHA256 b308ceb0581e7668eedf83042baf6f9ae4af938648436cd1857655cad8fe978e SHA512 fde20fd72bc86a5f61a1bf4becad645ac23b672cf801731004909fd2a77c1f2bb409e562a77ba5ca6a6fdc9cf954e958125a59b66fb5ea7d7344a142eea1c338 WHIRLPOOL b914bb13f9adecf2c79b06e04535321858400d055efce787f095c90431f54d7bd32006bdec52cd27cac61b1d0390f0ba2fb2d703d46f2bcfaef0dde9528eccf4
 DIST fldigi-3.23.04.tar.gz 2959610 SHA256 1fcc8b125dd8c1f61277e0d14a55fa4f69fe3bcc468ff51af29d4fbceec4b001 SHA512 af332e0da86300e5a18adec8841dabad3ceaea8cf0352b49a88a3387bf53422b4d19e73894352eb0f454f47f6612f37a5476f32dd25ddc49a80f287e345aeb3b WHIRLPOOL c87fd0340cfaa567752af3818083ceaaa657307cf27b71cef679c65ae6393041fd96d865efe59912101ee7837a3655a0e28feb51f2d43180b573c5369c66b675
 DIST fldigi-3.23.05.tar.gz 2967919 SHA256 6e24501ac3ce94a303e0ed006e0159fc19b8f6c379fde9c86d1daed7163cbb58 SHA512 499a192f150dbf95aab2a9d05a230fcf652f7a5787da6e2ce9594cf6328055bb2d3de33f9a4e1d2fc9bda291c62f45fe6f3d9f1340967d967d6fe47707e4c4e0 WHIRLPOOL 4ddedb13e82546ca812e6ac9f41346c37399ed4bd946734695c6814468a50f02efa7ec7b82154d3930a7668de5d5c064165c0fd05191748b3a0b73421e759f88
+DIST fldigi-3.23.06.tar.gz 2970900 SHA256 4c21a92f8f7a4070a2fc3687ab7cf0895ff105dfdef7a84efe4a9b4519e6cc21 SHA512 18c07304eb424be4d72301630e748a14ce4efa2868293489f15fa9e36e2ac3ed1de16513b2cdf73f2733798632669008d85f621dee0facf5c1d4391dbe67df16 WHIRLPOOL ebc957d2d3303a681b9638061918875125ce99a5ca277e2717d8bbb1e9d009267554813fa3bf47c391c5e138446b46db50bff989be806270d1e394d76d02de65
diff --git a/media-radio/fldigi/fldigi-3.23.00.ebuild b/media-radio/fldigi/fldigi-3.23.00.ebuild
deleted file mode 100644 (file)
index 84204b0..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-       media-libs/libsamplerate
-       media-libs/libpng:0
-       x11-misc/xdg-utils
-       dev-perl/RPC-XML
-       dev-perl/Term-ReadLine-Perl
-       hamlib? ( media-libs/hamlib )
-       portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-       pulseaudio? ( media-sound/pulseaudio )
-       sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-       nls? ( sys-devel/gettext )
-       virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-       econf $(use_with sndfile) \
-               $(use_with portaudio) \
-               $(use_with hamlib) \
-               $(use_enable nls) \
-               $(use_with pulseaudio) \
-               --disable-silent-rules \
-               --without-asciidoc
-}
diff --git a/media-radio/fldigi/fldigi-3.23.01.ebuild b/media-radio/fldigi/fldigi-3.23.01.ebuild
deleted file mode 100644 (file)
index 84204b0..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls portaudio pulseaudio sndfile"
-
-RDEPEND="x11-libs/fltk:1[threads,xft]
-       media-libs/libsamplerate
-       media-libs/libpng:0
-       x11-misc/xdg-utils
-       dev-perl/RPC-XML
-       dev-perl/Term-ReadLine-Perl
-       hamlib? ( media-libs/hamlib )
-       portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-       pulseaudio? ( media-sound/pulseaudio )
-       sndfile? ( >=media-libs/libsndfile-1.0.10 )"
-DEPEND="${RDEPEND}
-       nls? ( sys-devel/gettext )
-       virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-       econf $(use_with sndfile) \
-               $(use_with portaudio) \
-               $(use_with hamlib) \
-               $(use_enable nls) \
-               $(use_with pulseaudio) \
-               --disable-silent-rules \
-               --without-asciidoc
-}
similarity index 94%
rename from media-radio/fldigi/fldigi-3.23.03.ebuild
rename to media-radio/fldigi/fldigi-3.23.06.ebuild
index 84204b08b9539e64dc33c4765d6a29c2e11a23c9..f7c21c7c178a43c3e1ae3c911ea88c5fdcc43c93 100644 (file)
@@ -6,7 +6,7 @@ EAPI=5
 
 DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
index 2c6b747f0d317701959bc1abf8689b40d5e0ae3c..c41c2054251f86b7570d4c0d723ba51e67b4221c 100644 (file)
@@ -1,3 +1,3 @@
 DIST ncmpcpp-0.6.7.tar.bz2 429687 SHA256 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b SHA512 2161a9799c218fe506aa7645338c6e5b32bc6fcb8ee5bcdc76484a068242ae39fd884ece845e1c2f895305d2e6867a3074c266548322f80766c1b8dfeb5d39bb WHIRLPOOL 9f1e4cda03fcb36c79c34a921e8bd272d1875b96a497c2af0a68f2928e82d0ecce208cd08c89a79643106c284757b85eb0f57bcd241f213c3f5d1bdbad087247
 DIST ncmpcpp-0.6.8.tar.bz2 431213 SHA256 ee81f3fdb2a4b670b5e2617f6489f154e69a552e68fc550b1e20ad85f526e692 SHA512 e474bd4122212c34d7043adf7b68aeaaa2e9b5a999840b7e8632d251bdab17f5314fca03bdf2b8eee5de2572d3e5c602d87a1f89889ab7c747321e4272f63ebc WHIRLPOOL 98b7f67246943970018a94c4225540d48ffad7208b77c805bd05d0469423c329daf55480b9caf66538136f5fa198b7fdb65659d90a4f9bae956c0cdee0a6c684
-DIST ncmpcpp-0.7_beta1.tar.bz2 440532 SHA256 5d84fca070e19461524bdfcf46245e9ee4d445f1966984b7c48c71115e408065 SHA512 48ae63971c336960ef6493dbaf8c30571c804691989da7cce4e4334afcff7f85134d8d997950f0ef3d360856167db6492bf4bdfa4fe4126ae0b3dd1f9b770c7c WHIRLPOOL 63a7b5640395a7273dbc72caf0554bde550b1d7963374ee8fcb0550135375f223a04d054194481d1fce11efeb19595080352d56e36cc9f59b20c817b2251ca9b
+DIST ncmpcpp-0.7.tar.bz2 442319 SHA256 50924ff0502c9b90ce1b679638769122defd03bc85eb8a95924c62c8d303ff77 SHA512 00477a9044e46c5d0ce4687b16d59d81fc31323a9c23eeebb6701e20c2fe3c50e3e56030844b68bdcf319af04c1f1a3bd50d0732cc9b4614488a918165c2f112 WHIRLPOOL 2bc6ba5935bef72e46b568a98f49a87720d48c0d9699ab35abf3f2f7ed250bc331fc165372d3f352ed5f16ae16da614c3b6c1c6e309a2d1b8d94abefb5e66a0b
index 046ed5861ff8fa66d686d058330dcf102f717715..9dfbe0e3dc6559dac1389a425b174c202b624b56 100644 (file)
@@ -1,3 +1,3 @@
 DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
-DIST spotify-client_1.0.17.75.g8f111100_amd64.deb 68928916 SHA256 65ad49871a5f281aa7248690c0379fc18c17c063ab640590bbfa7edc02cb223f SHA512 6f8038f41bb613c600d8ad42c65cf93e28bb60e60ee3a239b583fd9ff45234cdcc5934ed5a93e9e3b0307e49e1a8a40dba918636a45bc6b7efdab6f4b49451d8 WHIRLPOOL 458ecd30d843eee10345300e35b4ebba941f942a19fdbeba4d82bd122a7d585d7861b4c034b8564d97a5b7136b605101096a0be4d116542d3ab96ef70df8b381
-DIST spotify-client_1.0.17.75.g8f111100_i386.deb 73966036 SHA256 480d8791d4de95f43ba95e4c5d31fc5a02662c6e041c3eb45f481a5ef6bd39b0 SHA512 05c1c6d60835b880a75e01af77abc327c678d1974d851531eab52b02159ede3921ecd2fc375b429d36309050a2f99942cb33b026892c9c3e4ca2f5c9c54244b2 WHIRLPOOL afc278efd6230b21d49a2716184ae98412f312d9fa8a7acf8e4876e2c8541e525b9d23869c31d3d8d5609fdd70d25590af76ed588e96a32f885c957cdd7aa005
+DIST spotify-client_1.0.19.106.gb8a7150f_amd64.deb 68109944 SHA256 be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be SHA512 f5d8b5ae860a5e429e14f4541cd9e12e8f7edf864d2a41c2d6acb19af7c00c3f6a813f3666e9bd73f3e0bf1619f63cc03ab9f520d7f0713a036b5cee6a409fea WHIRLPOOL 7d19213e40b85aaf11722a09b8021cdae4ce4a5c8f91e9b5aa5c6a50c1b2862d5bc41c031d486b08141543e2ff4c16b684575e81e8cd6f1cc12b64633aef74ce
+DIST spotify-client_1.0.19.106.gb8a7150f_i386.deb 73060616 SHA256 128b5d04dda8a052802fb9e664a996250569696fac359e94ea35043472f5dbcb SHA512 adb5816ceba1e1976429b1985569e1bfaa03fe015904bb3c66676b384205bbe24c3851a9cfcd366124a11470549574086cf289106c0b68e3f124f594b80ff04c WHIRLPOOL ae57091f18c54c2c61252e1bbbffa3228e7621df6dc185bd6821112deec6b78f9a7c269b01d2dd1f595c5751549b8c804732119d8dfd115ddcaee38c977fb4cd
similarity index 99%
rename from media-sound/spotify/spotify-1.0.17.75.ebuild
rename to media-sound/spotify/spotify-1.0.19.106.ebuild
index ca28e216e69c08f23b01802aba43d449e7bda25d..b75a4ec2647ad753571f688f5058ca2be18479a4 100644 (file)
@@ -7,7 +7,7 @@ inherit eutils fdo-mime gnome2-utils pax-utils unpacker
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV="${PV}.g8f111100"
+MY_PV="${PV}.gb8a7150f"
 MY_P="${PN}-client_${MY_PV}"
 SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
 SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
index 1eef459cfc706df638520ae342da3f7e24902661..8bb01305ca16467da51872bb09b2c20399764648 100644 (file)
@@ -3,10 +3,6 @@
 <pkgmetadata>
        <herd>qt</herd>
        <herd>video</herd>
-       <maintainer>
-               <email>hwoarang@gentoo.org</email>
-               <name>Markos Chandras</name>
-       </maintainer>
        <use>
                <flag name="download">Enable support for downloading YouTube videos</flag>
        </use>
index dd72827d7ecc63115d16e146c260f234ca2403bf..df7f1bb8f8c0bd71c7a4d0ea5701718e519cb3a3 100644 (file)
@@ -1,7 +1,7 @@
 [Unit]
 Description=Racoon IKEv1 key management daemon for IPSEC
 After=syslog.target network.target
-Requires=ipsec.service
+Requires=ipsec-tools.service
 
 [Service]
 Type=forking
index f31b2c6f3abd96b05065a2b7f6b596cdc8283161..af96e904b0fa69948336427f32e93f657bb47724 100644 (file)
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
        kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
        linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
index 959c5c9643795343079532a9f0abb048474f491c..78b6b6d8d8514b23c934cf895b532773908d1d79 100644 (file)
@@ -1,2 +1,4 @@
 DIST libmicrohttpd-0.9.42.tar.gz 1232516 SHA256 00352073367003da40607319e4090a6a8308748b59246ae80e9871f34dad7d5b SHA512 6516f545a5b81aa23bb0d22582f6d7e7f028069d94e0d33d9d6f929e111a3c0e0432eb43b26b4eec87860e8b9f50de38f1b5e6e20cd8faf30512e4891f29b9f3 WHIRLPOOL 9d42c08ee37042debf2e16ddd244c91375e4cecb9843e08d58581a9838677148d90d469bcd4890d4a0680a62e691c659394067da1c7060f7c4e49b309be4417c
 DIST libmicrohttpd-0.9.45.tar.gz 1246332 SHA256 1075def48da9327be22441f4a3460d24159fae2bf4bcfb4ab6e7ca5e95e54a69 SHA512 670d1d1f47ea8657d389302c9bfa8b6d8d12658fb28ce6ed7549db0d4483b1023e7e7d419651f38cef5b024f853d83f336b365624a346b811c2d94ab0d84fb01 WHIRLPOOL 691c1577fd17f6db4bd1990dcfbe4f20cb8944dd51014b349d26bfc8844e367c337eb03c91342b2d9e9923979e36e7464530ed6808636085a2daa006c5295bf6
+DIST libmicrohttpd-0.9.46.tar.gz 1249529 SHA256 06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979 SHA512 d45cd6e8ca1fb0e4d42110fa6ae5b49823d1b2ce66dd82d8b68757b79bf441e4103301af9437886b2c5d3296102ed8da17933a573da9649e7359305f8e678e46 WHIRLPOOL 09413fd2f39d1da727dc8756b7487dcfd7d7d143af27ac3add70c302b6a8fe5454c328a8a341a5bd69a6a0d52c4153c1dbaad3157f731bf35e4e67a0a2b512a3
+DIST libmicrohttpd-0.9.47.tar.gz 1075636 SHA256 96bdab4352a09fd3952a346bc01898536992f50127d0adea1c3096a8ec9f658c SHA512 c6a0d8602246c72bdec63140310fa72f1e73b569ffec5a46bddd92b8be434b334c74f9afb2fab828dd3e0387f02ac5f518580d13c5e7548dc0367e43233196c7 WHIRLPOOL 0087f9856ffd9fae983b7c82d82254f5dc3c416c0cdd9d2b8318793a0d727eb3f1dd038f4d222817cb665d17e912dbbc2f765ae3a06c010d35e53b0d332c108e
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.46.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.46.ebuild
new file mode 100644 (file)
index 0000000..a988b4a
--- /dev/null
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+               dev-libs/libgcrypt:0=
+               net-libs/gnutls
+       )"
+
+# We disable tests below because they're broken,
+# but if enabled, we'll need this.
+DEPEND="${RDEPEND}
+       test?   (
+               ssl? ( net-misc/curl[ssl] )
+       )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+       econf \
+               --enable-bauth \
+               --enable-dauth \
+               --disable-examples \
+               --disable-spdy \
+               --enable-postprocessor \
+               --runstatedir=/run \
+               $(use_enable epoll) \
+               $(use_enable test curl) \
+               $(use_enable messages) \
+               $(use_enable ssl https) \
+               $(use_with ssl gnutls) \
+               $(use_enable static-libs static)
+}
+
+# tests are broken in the portage environment.
+src_test() {
+       :
+}
+
+src_install() {
+       default
+
+       use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
new file mode 100644 (file)
index 0000000..a988b4a
--- /dev/null
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="${P/_/}"
+
+DESCRIPTION="A small C library that makes it easy to run an HTTP server as part of another application"
+HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="epoll messages ssl static-libs test"
+
+RDEPEND="ssl? (
+               dev-libs/libgcrypt:0=
+               net-libs/gnutls
+       )"
+
+# We disable tests below because they're broken,
+# but if enabled, we'll need this.
+DEPEND="${RDEPEND}
+       test?   (
+               ssl? ( net-misc/curl[ssl] )
+       )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="AUTHORS NEWS README ChangeLog"
+
+src_configure() {
+       econf \
+               --enable-bauth \
+               --enable-dauth \
+               --disable-examples \
+               --disable-spdy \
+               --enable-postprocessor \
+               --runstatedir=/run \
+               $(use_enable epoll) \
+               $(use_enable test curl) \
+               $(use_enable messages) \
+               $(use_enable ssl https) \
+               $(use_with ssl gnutls) \
+               $(use_enable static-libs static)
+}
+
+# tests are broken in the portage environment.
+src_test() {
+       :
+}
+
+src_install() {
+       default
+
+       use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-misc/chrony/chrony-2.2-r1.ebuild b/net-misc/chrony/chrony-2.2-r1.ebuild
new file mode 100644 (file)
index 0000000..04ce021
--- /dev/null
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+       ?? ( libedit readline )
+"
+
+CDEPEND="
+       caps? ( sys-libs/libcap )
+       libedit? ( dev-libs/libedit )
+       readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+       ${CDEPEND}
+       sys-apps/texinfo
+"
+RDEPEND="
+       ${CDEPEND}
+       selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+       sed -i \
+               -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+               -e 's:/var/run:/run:g' \
+               conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+       tc-export CC
+
+       local CHRONY_EDITLINE
+       # ./configure legend:
+       # --disable-readline : disable line editing entirely
+       # --without-readline : do not use sys-libs/readline (enabled by default)
+       # --without-editline : do not use dev-libs/libedit (enabled by default)
+       if ! use readline && ! use libedit; then
+               CHRONY_EDITLINE='--disable-readline'
+       else
+               CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+               CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+       fi
+
+       # not an autotools generated script
+       local CHRONY_CONFIGURE="
+       ./configure \
+               $(usex caps '' --disable-linuxcaps) \
+               $(usex cmdmon '' --disable-cmdmon) \
+               $(usex ipv6 '' --disable-ipv6) \
+               $(usex ntp '' --disable-ntp) \
+               $(usex phc '' --disable-phc) \
+               $(usex pps '' --disable-pps) \
+               $(usex rtc '' --disable-rtc) \
+               $(usex refclock '' --disable-refclock) \
+               $(usex adns '' --disable-asyncdns) \
+               ${CHRONY_EDITLINE} \
+               ${EXTRA_ECONF} \
+               --docdir=/usr/share/doc/${PF} \
+               --chronysockdir=/run/chrony \
+               --infodir=/usr/share/info \
+               --mandir=/usr/share/man \
+               --prefix=/usr \
+               --sysconfdir=/etc/chrony \
+               --disable-sechash \
+               --without-nss \
+               --without-tomcrypt
+       "
+
+       # print the ./configure call to aid in future debugging
+       einfo ${CHRONY_CONFIGURE}
+       bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+       emake all docs
+}
+
+src_install() {
+       default
+
+       doinfo chrony.info*
+
+       newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+       newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+       insinto /etc/${PN}
+       newins examples/chrony.conf.example1 chrony.conf
+
+       dodoc examples/*.example*
+
+       keepdir /var/{lib,log}/chrony
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+       systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+       systemd_enable_ntpunit 50-chrony chronyd.service
+}
index 2dae405291b1b82ed5c4ae12b71fcf4e97ef9d5a..13709c01b0b11b317ee578dd036dce91ec3c3c40 100644 (file)
@@ -96,7 +96,7 @@ src_install() {
 
        doinfo chrony.info*
 
-       newinitd "${FILESDIR}"/chronyd.init chronyd
+       newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
        newconfd "${FILESDIR}"/chronyd.conf chronyd
 
        insinto /etc/${PN}
diff --git a/net-misc/chrony/files/chronyd.init-r1 b/net-misc/chrony/files/chronyd.init-r1
new file mode 100644 (file)
index 0000000..80ec855
--- /dev/null
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+       use dns
+}
+
+checkconfig() {
+       # Note that /etc/chrony/chrony.keys is *NOT* checked. This
+       # is because the user may have specified another key
+       # file, and we don't want to force the user to use that
+       # exact name for the key file.
+       if [ ! -f "${CFGFILE}" ] ; then
+               eerror "Please create ${CFGFILE} and the"
+               eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+               eerror "by using the"
+               eerror ""
+               eerror "        chrony.conf.example"
+               eerror "        chrony.keys.example"
+               eerror ""
+               eerror "files (from the documentation directory)"
+               eerror "as templates."
+               return 1
+       else
+               # Actually, I tried it, and chrony seems to ignore the pidfile
+               # option. I'm going to leave it here anyway, since you never
+               # know if it might be handy
+               PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+       fi
+       return 0
+}
+
+setxtrarg() {
+       if [ -c /dev/rtc ]; then
+               grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+       fi
+       grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+       return 0
+}
+
+start() {
+       checkconfig || return $?
+       setxtrarg
+
+       [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+       ebegin "Starting chronyd"
+       start-stop-daemon \
+               --start \
+               --quiet \
+               --exec /usr/sbin/chronyd \
+               --pidfile "${PIDFILE}" \
+               -- -f "${CFGFILE}" ${ARGS}
+       eend $? "Failed to start chronyd"
+}
+
+stop() {
+       checkconfig || return $?
+
+       [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+       ebegin "Stopping chronyd"
+       start-stop-daemon \
+               --stop \
+               --quiet \
+               --pidfile "${PIDFILE}"
+       eend $? "Failed to stop chronyd"
+}
index 6ead2ef471ce54f2cb45c6f4a97c18987ced6632..2dbfbc7597ea205fed5f81814f9b26184f356f87 100644 (file)
@@ -1,4 +1,3 @@
-DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26
-DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819
 DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64
 DIST stunnel-5.26.tar.gz 635710 SHA256 2c90d469011eed8dc94f003013e3c055de6fdb687ef1e71fa004281d7f7c2726 SHA512 8ac0ed96618855e1361cd0956dbd5b89e08ce7808751c0b3d1c3e74b0bbfb567e1da8ac058544a15ab431598e916214b2c8d411b2c9d2456c9c850eb4935854e WHIRLPOOL 5e278f74c09c270e2de8b8c7fecac07dc9c48c6a147d925bf6d1c29eb7058c58adf58ec9ecf04627f00a826d69cf9cc59ccd41b6d74fb69bb254a5ca567e4fb1
+DIST stunnel-5.27.tar.gz 636704 SHA256 7474e986710e88a5cc3330b6b1762f9449f01eccf826fa0f97e56d064c05ead3 SHA512 9dc57f6d2bfb8156de3a1cd3d52e0050498503bddcc02a810ebf798c66e6527bc79dd6b02e3eaf5333131772b9cf0f6d044ee4be3564719d496b07fbeeaeeefa WHIRLPOOL 907ff7f9bda3ac83efeceb66c9d8f2ea83a50be81f1b883f2d7843cb5e984aaff1f16867c909a00bcbba52e41357a375ed21d17500c2aae6294106c5a551d939
diff --git a/net-misc/stunnel/stunnel-5.20.ebuild b/net-misc/stunnel/stunnel-5.20.ebuild
deleted file mode 100644 (file)
index 89f4130..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-       http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-       http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-       http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-       http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-       http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-       ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-       dev-libs/openssl:="
-RDEPEND="${DEPEND}
-       stunnel3? ( dev-lang/perl )
-       selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-       enewgroup stunnel
-       enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-       # Hack away generation of certificate
-       sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-               tools/Makefile.in || die "sed failed"
-
-       echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
-       econf \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               $(use_enable ipv6) \
-               $(use_enable tcpd libwrap) \
-               --with-ssl="${EPREFIX}"/usr \
-               --disable-fips
-}
-
-src_install() {
-       emake DESTDIR="${D}" install
-       rm -rf "${ED}"/usr/share/doc/${PN}
-       rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-               "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-       use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-       # The binary was moved to /usr/bin with 4.21,
-       # symlink for backwards compatibility
-       dosym ../bin/stunnel /usr/sbin/stunnel
-
-       dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-       dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-               tools/importCA.html
-
-       insinto /etc/stunnel
-       doins "${FILESDIR}"/stunnel.conf
-       doinitd "${FILESDIR}"/stunnel
-
-       doenvd "${T}"/20stunnel
-
-       systemd_dounit "${S}/tools/stunnel.service"
-       systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-       if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-               install_cert /etc/stunnel/stunnel
-               chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-               chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-       fi
-
-       einfo "If you want to run multiple instances of stunnel, create a new config"
-       einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-       einfo "\'pid= \' with a unique filename."
-}
similarity index 96%
rename from net-misc/stunnel/stunnel-5.23.ebuild
rename to net-misc/stunnel/stunnel-5.27.ebuild
index ba38b4ad468d7ba58ae4ed34854c5dcf84faa415..d75157cf5747be74204c3486d7c3a42a55dddf7b 100644 (file)
@@ -19,10 +19,11 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 selinux stunnel3 tcpd"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-       dev-libs/openssl:0"
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )"
 RDEPEND="${DEPEND}
        stunnel3? ( dev-lang/perl )
        selinux? ( sec-policy/selinux-stunnel )"
index b564989010faec47f9d46785f43e32daa5f73edf..ceaf2443e910211197f2cc3b8bee294f22710ad7 100644 (file)
@@ -6,10 +6,9 @@
 
 # Ian Delaney <idella4@gentoo.org> (02 Dec 2015)
 # mask revdeps of xen that emply a hypervisor in arch x86
-app-emulation/xen-pvgrub -abi_x86_32
-app-emulation/libvirt -abi_x86_32
-sys-cluster/nova -abi_x86_32
-app-emulation/ganeti -abi_x86_32
+app-emulation/libvirt xen
+sys-cluster/nova xen
+app-emulation/ganeti xen
 
 # Nathan Phillip Brink <binki@gentoo.org> (26 Sep 2015)
 # git useflag requires dev-libs/libgit2 which few arches support
index 0c3be437f3047a608d5465c3a555d8e8dd05cb12..429738c592a18e0208be6d0b2cd900b781ee897f 100644 (file)
@@ -13,6 +13,7 @@ app-portage/gentoolkit python_targets_pypy python_targets_pypy3
 app-portage/layman python_targets_pypy python_targets_pypy3
 app-admin/webapp-config python_targets_pypy python_targets_pypy3
 app-portage/diffmask python_targets_pypy python_targets_pypy3
+app-portage/flaggie python_targets_pypy python_targets_pypy3
 
 # Jason Zaman <perfinion@gentoo.org> (27 Jun 2015)
 # SystemD has no support in the SELinux policy at the moment.
index 78df3aae3432327a0cf6b7621c7b4fdb01be8722..ede0f5fced6b86cc45bed4cdfb600d3a46a6578a 100644 (file)
 
 #--- END OF EXAMPLES ---
 
+# Patrice Clement <monsieurp@gentoo.org> (05 Dec 2015)
+# Upstream dead: no update since 2007.
+# Masked for removal in 30 days. See bug #567580.
+dev-java/jpf
+dev-java/jpfcodegen
+
+# Robin H. Johnson <robbat2@gentoo.org> (04 Dec 2015)
+# Much early testing needed
+>=sys-cluster/ceph-9
+
 # Patrice Clement <monsieurp@gentoo.org> (03 Dec 2015)
 # Broken and outdated. Let's see off these 3 packages.
 # Masked for removal in 30 days. See bug #567326.
@@ -183,12 +193,6 @@ app-eselect/eselect-esd
 # Dead for years, see bug #248489. Removal in a month.
 dev-tex/latex-unicode
 
-# MichaÅ‚ Górny <mgorny@gentoo.org> (08 Nov 2015)
-# Masked for testing (and 4.0.1 binpkg build).
->=dev-python/pypy-4.0.0
->=dev-python/pypy-bin-4.0.0
->=virtual/pypy-4.0.0
-
 # Patrice Clement <monsieurp@gentoo.org> (07 Nov 2015)
 # Duplicate package since it already exists as virtual/perl-Parse-CPAN-meta.
 # Masked for removal in 30 days.
index fbf24d89ae021b75ba88488807c5dbd1a6034a3e..c9003257eace4c41e9708846c0d87b18f30c7b08 100644 (file)
@@ -12,3 +12,4 @@ move virtual/pmw virtual/python-pmw
 move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
 slotmove =dev-ruby/rack-cache-1.3.0 1.3 1.2
 move dev-perl/module-info dev-perl/Module-Info
+slotmove sci-geosciences/grass-7* 7 0
index 99d7d7658d76afad446d19b6b8e93416f03a4a88..e422505514ffc8ae6c076d710aeeb7e709755110 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units_cur"
 
 DEPEND="
diff --git a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
deleted file mode 100644 (file)
index a5afd0d..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- tools/build_html_index.sh.old      2010-06-16 23:07:37.000000000 +0200
-+++ tools/build_html_index.sh  2010-06-16 23:10:00.000000000 +0200
-@@ -135,7 +135,6 @@
-        </ul>
-        <ul>
--        <li><a href=\"nviz.html\">nviz</a> 3D visualization and animation tool</li>
-         <li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>
-        </ul></td>
-     </tr>
-@@ -245,11 +244,11 @@
- #copy over CSS:
- cp -f grassdocs.css $HTMLDIR/
- mkdir -p $HTMLDIR/nviz/
--cp -f grassdocs.css $HTMLDIR/nviz/
-+#cp -f grassdocs.css $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css
- #copy over GRASS logo:
- cp -f grass_logo.png $HTMLDIR/
--cp -f grass_logo.png $HTMLDIR/nviz/
-+#cp -f grass_logo.png $HTMLDIR/nviz/
- chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png
- if [ "$MACOSX" ] ; then
-   cp -f grass_icon.png $HTMLDIR/
-@@ -302,7 +301,7 @@
- echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#v\">v.*</a> </td><td>vector commands</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> "$FULLINDEX"
--echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX"
-+#echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"wxGUI.html\">wxGUI</a> </td><td>wxPython-based GUI frontend</td></tr>" >> "$FULLINDEX"
- echo "<tr><td>&nbsp;&nbsp;<a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> "$FULLINDEX"
- echo "</table>" >> "$FULLINDEX"
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch b/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
deleted file mode 100644 (file)
index 4864d88..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-Adjust Grass 6.4.1 to work with ffmpeg 8.
-
-2011-11-17 Fabio Erculiani
-2011-12-08 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/390827
-https://bugs.gentoo.org/392371
-
---- grass-6.4.1.orig/lib/ogsf/gsd_img_mpeg.c
-+++ grass-6.4.1/lib/ogsf/gsd_img_mpeg.c
-@@ -66,7 +66,7 @@ static AVStream *add_video_stream(AVForm
-     c = st->codec;
-     c->codec_id = codec_id;
--    c->codec_type = CODEC_TYPE_VIDEO;
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
-     /* put sample parameters */
-     c->bit_rate = 400000;
-@@ -215,7 +215,7 @@ static void write_video_frame(AVFormatCo
-       av_init_packet(&pkt);
--      pkt.flags |= PKT_FLAG_KEY;
-+      pkt.flags |= AV_PKT_FLAG_KEY;
-       pkt.stream_index = st->index;
-       pkt.data = (uint8_t *) picture;
-       pkt.size = sizeof(AVPicture);
-@@ -236,7 +236,7 @@ static void write_video_frame(AVFormatCo
-               av_rescale_q(c->coded_frame->pts, c->time_base,
-                            st->time_base);
-           if (c->coded_frame->key_frame)
--              pkt.flags |= PKT_FLAG_KEY;
-+              pkt.flags |= AV_PKT_FLAG_KEY;
-           pkt.stream_index = st->index;
-           pkt.data = video_outbuf;
-           pkt.size = out_size;
-@@ -301,10 +301,10 @@ int gsd_init_mpeg(const char *filename)
-     av_register_all();
-     /* auto detect the output format from the name. default is mpeg. */
--    fmt = guess_format(NULL, filename, NULL);
-+    fmt = av_guess_format(NULL, filename, NULL);
-     if (!fmt) {
-       G_warning(_("Unable to deduce output format from file extension: using MPEG"));
--      fmt = guess_format("mpeg", NULL, NULL);
-+      fmt = av_guess_format("mpeg", NULL, NULL);
-     }
-     if (!fmt) {
-       G_warning(_("Unable to find suitable output format"));
-@@ -312,7 +312,7 @@ int gsd_init_mpeg(const char *filename)
-     }
-     /* allocate the output media context */
--    oc = av_alloc_format_context();
-+    oc = av_malloc(sizeof(AVFormatContext));
-     if (!oc) {
-       G_warning(_("Out of memory"));
-       return (-1);
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
deleted file mode 100644 (file)
index 3c040e7..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- raster/r.out.png/r.out.png.c
-+++ raster/r.out.png/r.out.png.c
-@@ -261,9 +261,6 @@
-     png_info_init(info_ptr);
- #endif
-     png_init_io(png_ptr, fp);
--    info_ptr->width = win.cols;
--    info_ptr->height = win.rows;
--    info_ptr->bit_depth = depth;
-     /* explicit filter-type (or none) required */
-     if ((filter >= 0) && (filter <= 4)) {
-@@ -302,10 +299,13 @@
-       /*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */
-       if (TRUE) {
-+          int color_type;
-           if (do_alpha)
--              info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+              color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-           else
--              info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-+              color_type = PNG_COLOR_TYPE_RGB;
-+
-+          png_set_IHDR(png_ptr, info_ptr, win.cols, win.rows, depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-           /* write the png-info struct */
-           png_write_info(png_ptr, info_ptr);
diff --git a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
deleted file mode 100644 (file)
index 75f173a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur grass-6.4.1.orig/gui/wxpython/Makefile grass-6.4.1/gui/wxpython/Makefile
---- grass-6.4.1.orig/gui/wxpython/Makefile
-+++ grass-6.4.1/gui/wxpython/Makefile
-@@ -11,7 +11,7 @@
- ETCDIR = $(ETC)/wxpython
- SRCFILES := $(wildcard compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README
--DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
-+DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES))
- default: install_scripts
-       $(MAKE) parsubdirs
diff --git a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch
deleted file mode 100644 (file)
index 7c25094..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/timer/Makefile.orig  2011-11-14 18:58:13.000000000 -0800
-+++ tools/timer/Makefile       2011-11-14 19:00:41.000000000 -0800
-@@ -8,8 +8,8 @@
- default: $(ETC)/$(PGM)
- $(ETC)/$(PGM): main.c
--      $(CC) -c $<
--      $(CC) -o $(ETC)/$(PGM) $<
-+      $(CC) $(CFLAGS) -c $<
-+      $(CC) $(LDFLAGS) -o $(ETC)/$(PGM) $<
- clean:
-       \rm -f $(ETC)/$(PGM) main.o
diff --git a/sci-geosciences/grass/files/grass-6.4.2-configure.patch b/sci-geosciences/grass/files/grass-6.4.2-configure.patch
deleted file mode 100644 (file)
index 37b7516..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
---- grass-6.4.2.orig/configure.in      2012-02-06 11:16:07.000000000 +0100
-+++ grass-6.4.2/configure.in   2013-01-17 23:25:41.126387684 +0100
-@@ -1110,9 +1110,9 @@
- LOC_CHECK_INC_PATH(ffmpeg, FFMPEG, FFMPEGINCPATH)
--LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH)
--LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH)
--LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH)
-+LOC_CHECK_INCLUDES(libavcodec/avcodec.h,FFMPEG,$FFMPEGINCPATH)
-+LOC_CHECK_INCLUDES(libavformat/avformat.h,FFMPEG,$FFMPEGINCPATH)
-+LOC_CHECK_INCLUDES(libswscale/swscale.h,FFMPEG,$FFMPEGINCPATH)
- AC_DEFINE(HAVE_FFMPEG)
-@@ -1125,8 +1125,8 @@
- LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
- LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
--LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
--LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-+LOC_CHECK_LIBS(avcodec, avcodec_open2, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
-+LOC_CHECK_LIBS(avformat, av_write_frame, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
- fi # $USE_FFMPEG
diff --git a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
deleted file mode 100644 (file)
index ec26ae2..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-Fix build with ffmpeg-1.
-Part of https://bugs.gentoo.org/show_bug.cgi?id=443264
-
-Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
-===================================================================
---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c
-+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
-@@ -26,7 +26,8 @@
- /* FFMPEG stuff */
- #ifdef HAVE_FFMPEG
--#include <avformat.h>
-+#include <libavformat/avformat.h>
-+#include <libavformat/avio.h>
- /* 5 seconds stream duration */
- #define STREAM_DURATION   5.0
-@@ -58,7 +59,7 @@ static AVStream *add_video_stream(AVForm
-     AVCodecContext *c;
-     AVStream *st;
--    st = av_new_stream(oc, 0);
-+    st = avformat_new_stream(oc, 0);
-     if (!st) {
-       G_warning(_("Unable to allocate stream"));
-       return NULL;
-@@ -97,7 +98,7 @@ static AVStream *add_video_stream(AVForm
-       c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-     c->flags |= CODEC_FLAG_QSCALE;
--    c->global_quality = st->quality = FF_QP2LAMBDA * 10;
-+    c->global_quality = FF_QP2LAMBDA * 10;
-     return st;
- }
-@@ -332,13 +333,7 @@ int gsd_init_mpeg(const char *filename)
-           add_video_stream(oc, fmt->video_codec, (r - l + 1), (t - b + 1));
-     }
--    /* set the output parameters (must be done even if no parameters). */
--    if (av_set_parameters(oc, NULL) < 0) {
--      G_warning(_("Invalid output format parameters"));
--      return (-1);
--    }
--
--    dump_format(oc, 0, filename, 1);
-+    av_dump_format(oc, 0, filename, 1);
-     /* now that all the parameters are set, we can open the audio and
-        video codecs and allocate the necessary encode buffers */
-@@ -347,14 +342,17 @@ int gsd_init_mpeg(const char *filename)
-     /* open the output file, if needed */
-     if (!(fmt->flags & AVFMT_NOFILE)) {
--      if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) {
-+      if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) {
-           G_warning(_("Unable to open <%s>"), filename);
-           return (-1);
-       }
-     }
-     /* write the stream header, if any */
--    av_write_header(oc);
-+    if (avformat_write_header(oc, NULL) < 0) {
-+      G_warning(_("Failed to write header"));
-+      return (-1);
-+    }
- #else
-@@ -439,7 +437,7 @@ int gsd_close_mpeg(void)
- #if (LIBAVFORMAT_VERSION_INT>>16) < 52
-       url_fclose(&oc->pb);
- #else
--      url_fclose(oc->pb);
-+      avio_close(oc->pb);
- #endif
-     }
diff --git a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
deleted file mode 100644 (file)
index 7fbe325..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c   2013-01-18 02:11:37.570025278 +0100
-+++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c        2013-01-18 02:13:01.663022218 +0100
-@@ -159,7 +159,7 @@
-     }
-     /* open the codec */
--    if (avcodec_open(c, codec) < 0) {
-+    if (avcodec_open2(c, codec, NULL) < 0) {
-       G_warning(_("Unable to open codec"));
-       return;
-     }
diff --git a/sci-geosciences/grass/files/grass-7.0.1-soname.patch b/sci-geosciences/grass/files/grass-7.0.1-soname.patch
new file mode 100644 (file)
index 0000000..3f3442c
--- /dev/null
@@ -0,0 +1,26 @@
+Index: aclocal.m4
+===================================================================
+--- aclocal.m4 (revision 66647)
++++ aclocal.m4 (working copy)
+@@ -488,7 +488,7 @@
+     case $host in
+         *-linux-* | *-gnu* | *-kfreebsd*-gnu)
+           SHLIB_CFLAGS="-fPIC"
+-            SHLIB_LD_FLAGS=""
++            SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])"
+           SHLIB_SUFFIX=".so"
+           SHLIB_LD="${CC} -shared"
+             LDFLAGS="-Wl,--export-dynamic"
+Index: configure
+===================================================================
+--- configure  (revision 66647)
++++ configure  (working copy)
+@@ -1481,7 +1481,7 @@
+     case $host in
+         *-linux-* | *-gnu* | *-kfreebsd*-gnu)
+           SHLIB_CFLAGS="-fPIC"
+-            SHLIB_LD_FLAGS=""
++            SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)"
+           SHLIB_SUFFIX=".so"
+           SHLIB_LD="${CC} -shared"
+             LDFLAGS="-Wl,--export-dynamic"
diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch
deleted file mode 100644 (file)
index 5c00b9d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- grass.pc.in.old    2010-06-13 10:53:46.747474687 +0200
-+++ grass.pc.in        2010-06-13 10:54:45.957349463 +0200
-@@ -1,12 +1,13 @@
- # Package Information for pkg-config
--prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
--exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
--libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
--includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
-+prefix=@prefix@
-+exec_prefix=@prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+grassdir=@libdir@/grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@
- Name: GRASS
- Description: GRASS GIS
- Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
--Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
--Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
-+Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
-+Cflags: -I${includedir}/grass
similarity index 98%
rename from sci-geosciences/grass/grass-7.0.1-r3.ebuild
rename to sci-geosciences/grass/grass-7.0.1-r4.ebuild
index e4dd7e6afeaa1e0c71a3c7b9a7342d659c4fe672..1c6a17bd844d57bc59e04cf04b4f278c69950b15 100644 (file)
@@ -19,8 +19,8 @@ HOMEPAGE="http://grass.osgeo.org/"
 SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="X blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype"
 
 RDEPEND="${PYTHON_DEPS}
@@ -84,6 +84,7 @@ PATCHES=(
        "${FILESDIR}/${P}"-include-errno.patch
        "${FILESDIR}/${P}"-declare-inespg.patch
        "${FILESDIR}/${PV}"-sec-format.patch
+       "${FILESDIR}/${P}"-soname.patch
 )
 
 pkg_setup() {
@@ -125,6 +126,8 @@ src_prepare() {
        sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
                -i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
 
+       epatch "${PATCHES[@]}"
+
        epatch_user
        eautoconf
 
@@ -264,4 +267,4 @@ pkg_postrm() {
                fdo-mime_desktop_database_update
                gnome2_icon_cache_update
        fi
-}
\ No newline at end of file
+}
index 3dc849adaf0a3393498b4a1b465b563316272894..8a0d685237b6f47284689b10a0fd15c72bd69261 100644 (file)
@@ -12,12 +12,8 @@ Army Corp of Engineers, now an active open source GIS. See the GRASS Documentati
 Project for more info http://grass.itc.it/gdp/index.php
 </longdescription>
        <use>
-               <flag name="gdal">Use <pkg>sci-libs/gdal</pkg> for import and export 
-               of most external raster and vector map formats</flag>
                <flag name="geos">Use <pkg>sci-libs/geos</pkg> for v.buffer and adds
                extended options to the v.select module</flag>
-               <flag name="gmath">Enable gmath wrapper for BLAS/Lapack 
-               (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
                <flag name="liblas">Include support for LAS and LAZ encoded LiDAR
                files through <pkg>sci-geosciences/liblas</pkg></flag>
                <flag name="opencl">Enable OpenCL support</flag>
index 562c6c7c154a92b3e93d50e6e71eff38c1de3d0e..238af51a2c5af7b51e62ca7421754cce1ba4543b 100644 (file)
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
        MY_P=${PN}-${PV/_/-}
        SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-       KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+       KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
index 7421ceb3810c780fac3ef467b95e5a3827f3b3a7..f452a5e5f838ff9eabea1ac20f9e3856754b9824 100644 (file)
@@ -1,2 +1,3 @@
 DIST kmod-20.tar.xz 437880 SHA256 89c1a1a2193c31f9ebe582640bfa2bd401341dc24119f5a7f702588116fadaa0 SHA512 1026d80486e6c823fc74a439d15a8b1e4a501140f67568165904b43a73130133d6c84075ec8a7981a5d4a187d5fbd21afd197de4e81cc05a66506711865edf96 WHIRLPOOL 938d1ea4d153c04231b89701c7a7f602d31166e5c85bb6f2798ba0a7c22a4961f05bdd8631d985785212e5bf359d1cd12c4088fd9c2a07d8b6b9a77599e84a39
 DIST kmod-21.tar.xz 446460 SHA256 160a9448af74cf75b08d089f37a3e8d1fafa75cce92d1cbe869a753b670d95c0 SHA512 93d9c7eda3a04ed94c6531087614d92b5a65a2e642bd3af017a3a8a458a78a5a57acb1707e35bf3a0aa8f22ab0fa99d34cf4e7dd568f202a18eb49fb52bf78c1 WHIRLPOOL 78aa8c086ed8129b3a686f3b7d46e224c09f018fc85cda041bfac253afa8056e3e403eedbedb81be4c2354075040dcb6a526c2295cc3b393a76cb3896491cea3
+DIST kmod-22.tar.xz 449724 SHA256 ba3b1ddea33228b473189fcb05b809024a3b86e9a7cf37d420cae06beb749f82 SHA512 e021bacebb07ba4a178215ca1d1e091195fed1d289a76ec3ddb309182a90b6eab19d98eb1331772bc739f73ed6f540d92213b8088a573df13cd28ebd333a8876 WHIRLPOOL ed5b338698f250a0cb344da0789099a4fcdd098a1d64ed0f912fbb361ee91eaf13ceffec28e95757778a687ed8ed8acce16c0717000c598237e01abda256ca1c
diff --git a/sys-apps/kmod/kmod-22.ebuild b/sys-apps/kmod/kmod-22.ebuild
new file mode 100644 (file)
index 0000000..ee2b045
--- /dev/null
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit bash-completion-r1 eutils multilib python-r1
+
+if [[ ${PV} == 9999* ]]; then
+       EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+       inherit autotools git-2
+else
+       SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+       inherit libtool
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc lzma python static-libs +tools zlib"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+RDEPEND="!sys-apps/module-init-tools
+       !sys-apps/modutils
+       !<sys-apps/openrc-0.13.8
+       !<sys-apps/systemd-216-r3
+       lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+       python? ( ${PYTHON_DEPS} )
+       zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+       doc? ( dev-util/gtk-doc )
+       lzma? ( virtual/pkgconfig )
+       python? (
+               dev-python/cython[${PYTHON_USEDEP}]
+               virtual/pkgconfig
+               )
+       zlib? ( virtual/pkgconfig )"
+if [[ ${PV} == 9999* ]]; then
+       DEPEND="${DEPEND}
+               dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS="NEWS README TODO"
+
+src_prepare() {
+       if [ ! -e configure ]; then
+               if use doc; then
+                       gtkdocize --copy --docdir libkmod/docs || die
+               else
+                       touch libkmod/docs/gtk-doc.make
+               fi
+               eautoreconf
+       else
+               elibtoolize
+       fi
+
+       # Restore possibility of running --enable-static wrt #472608
+       sed -i \
+               -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+               configure || die
+}
+
+src_configure() {
+       local myeconfargs=(
+               --bindir="${EPREFIX}/bin"
+               --with-rootlibdir="${EPREFIX}/$(get_libdir)"
+               --enable-shared
+               $(use_enable static-libs static)
+               $(use_enable tools)
+               $(use_enable debug)
+               $(use_enable doc gtk-doc)
+               $(use_with lzma xz)
+               $(use_with zlib)
+               --with-bashcompletiondir="$(get_bashcompdir)"
+       )
+
+       local ECONF_SOURCE="${S}"
+
+       kmod_configure() {
+               mkdir -p "${BUILD_DIR}" || die
+               run_in_build_dir econf "${myeconfargs[@]}" "$@"
+       }
+
+       BUILD_DIR="${WORKDIR}/build"
+       kmod_configure --disable-python
+
+       if use python; then
+               python_foreach_impl kmod_configure --enable-python
+       fi
+}
+
+src_compile() {
+       emake -C "${BUILD_DIR}"
+
+       if use python; then
+               local native_builddir=${BUILD_DIR}
+
+               python_compile() {
+                       emake -C "${BUILD_DIR}" -f Makefile -f - python \
+                               VPATH="${native_builddir}:${S}" \
+                               native_builddir="${native_builddir}" \
+                               libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+                               <<< 'python: $(pkgpyexec_LTLIBRARIES)'
+               }
+
+               python_foreach_impl python_compile
+       fi
+}
+
+src_install() {
+       emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+       einstalldocs
+
+       if use python; then
+               local native_builddir=${BUILD_DIR}
+
+               python_install() {
+                       emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+                               VPATH="${native_builddir}:${S}" \
+                               install-pkgpyexecLTLIBRARIES \
+                               install-dist_pkgpyexecPYTHON
+               }
+
+               python_foreach_impl python_install
+       fi
+
+       prune_libtool_files --modules
+
+       if use tools; then
+               local bincmd sbincmd
+               for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
+                       dosym /bin/kmod /sbin/${sbincmd}
+               done
+
+               # These are also usable as normal user
+               for bincmd in lsmod modinfo; do
+                       dosym kmod /bin/${bincmd}
+               done
+       fi
+
+       cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+       softdep uhci_hcd pre: ehci_hcd
+       softdep ohci_hcd pre: ehci_hcd
+       EOF
+
+       insinto /lib/modprobe.d
+       doins "${T}"/usb-load-ehci-first.conf #260139
+
+       newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+       if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+               ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+               rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
+       fi
+
+       # Add kmod to the runlevel automatically if this is the first install of this package.
+       if [[ -z ${REPLACING_VERSIONS} ]]; then
+               if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
+                       mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
+               fi
+               if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
+                       ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+               fi
+       fi
+
+       if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
+               if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+                       ewarn
+                       ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+                       ewarn "kernel modules to have required static nodes!"
+                       ewarn "Run this command:"
+                       ewarn "\trc-update add kmod-static-nodes sysinit"
+               fi
+       fi
+}
index 628418443091c916382de4a808b7f4ec4a121505..a7b5caa4cf85b646fbdd4f9ed2a02e8e5e18613f 100644 (file)
@@ -10,3 +10,4 @@ DIST openrc-0.16.tar.bz2 157924 SHA256 969ce450bb095a406ef14362572633b14c8696b57
 DIST openrc-0.17.tar.bz2 160533 SHA256 45818d9ef4659e8dd924a1468a091255c305daee5417f94d9515f0e125298b30 SHA512 6e69b036d113f066b0dd0bfe55e019328e0e77cff6c93f0a3e55751aa0a72411aa3b1efe8b4327e156a9612e4155863b0a81c9eda043c12904bb36e861b71399 WHIRLPOOL de45daf6f4aebe632ea9fcb46408e63f0aed6c9b9129fb5510f348f20cf1c62aa42e7dce47a7f19a441696596fa57494642e7334a42c415fdbc865cb80a18eff
 DIST openrc-0.18.3.tar.bz2 159104 SHA256 891478b28b3d2b964276b35a3cdf538a7f3d9cfdc41f455eb7453c881f629837 SHA512 49edd83c578d99b2df57b85a1db236748310ee012fee9c7220ad657e1543c04004817117c05060268b8493e95c294894124d3e958cdb01389cfd30a85cde3644 WHIRLPOOL 2b0c7f70c689c3d2851e1c78c1e4285fb60dde689624487b9cedf920882e7285b6c4bf7e37564f1995a8ee6f4106a77aedf69933c11f04af53f5d402e4b22bfb
 DIST openrc-0.18.4.tar.bz2 157237 SHA256 2c8bf1c6f52fcf4c1f6945a2836ba2551a7d93015aa63ba5a2e1d2851c2942e4 SHA512 13f5dbc1292ce94c2e42a35e582bbba12e4bba943640952ea4cecc7ff5c60175d362055a4f5e213f218236ab4a040a5dff01a47c8bc007237554744d8a89a48a WHIRLPOOL f1f44effad80863276339af5bce1b3a9068d9c5ae7f7c3b571fb883b376c9083c207980c6d05170b0a18c0902ad1e2d76a1bafb0f11721b0522308e2cb7c67b4
+DIST openrc-0.19.tar.bz2 159647 SHA256 55d0dfa0462d4d4729af2b182c1208405cc30130d76d7b734728c56146036935 SHA512 e193cb5e12fae54712cb7df5a2ce8eb18ac99850cad6399d14ce43be763b9d92b9fe0d11af1d3664db882efaa7257a81cf7fe75d0a32acfd448fe2d06d79ca1d WHIRLPOOL 61dac1e2d1350084080bcdc2881627fa66d6c05b3ae2f95f660e331121acbf1f35e8a4e1ae2eaae11e6c0d6c4918769cb0cd2d71918b49af75771864b4ac31a7
diff --git a/sys-apps/openrc/openrc-0.19.ebuild b/sys-apps/openrc/openrc-0.19.ebuild
new file mode 100644 (file)
index 0000000..bf25fc4
--- /dev/null
@@ -0,0 +1,348 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
+       inherit git-r3
+else
+       SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+       tools unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+       elibc_glibc? ( >=sys-libs/glibc-2.5 )
+       ncurses? ( sys-libs/ncurses:0= )
+       pam? (
+               sys-auth/pambase
+               virtual/pam
+       )
+       tools? ( dev-lang/perl )
+       audit? ( sys-process/audit )
+       kernel_linux? (
+               sys-process/psmisc
+               !<sys-process/procps-3.3.9-r2
+       )
+       selinux? (
+               sys-apps/policycoreutils
+               sys-libs/libselinux
+       )
+       !<sys-apps/baselayout-2.1-r1
+       !<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+       virtual/os-headers
+       ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+       !prefix? (
+               kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+               kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+       )
+       selinux? (
+               sec-policy/selinux-base-policy
+               sec-policy/selinux-openrc
+       )
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+       sed -i 's:0444:0644:' mk/sys.mk || die
+
+       if [[ ${PV} == "9999" ]] ; then
+               local ver="git-${EGIT_VERSION:0:6}"
+               sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+       fi
+
+       # Allow user patches to be applied without modifying the ebuild
+       epatch_user
+}
+
+src_compile() {
+       unset LIBDIR #266688
+
+       MAKE_ARGS="${MAKE_ARGS}
+               LIBNAME=$(get_libdir)
+               LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+               MKNET=$(usex newnet)
+               MKSELINUX=$(usex selinux)
+               MKAUDIT=$(usex audit)
+               MKPAM=$(usev pam)
+               MKSTATICLIBS=$(usex static-libs)
+               MKTOOLS=$(usex tools)"
+
+       local brand="Unknown"
+       if use kernel_linux ; then
+               MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+               brand="Linux"
+       elif use kernel_FreeBSD ; then
+               MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+               brand="FreeBSD"
+       fi
+       export BRANDING="Gentoo ${brand}"
+       use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+       export DEBUG=$(usev debug)
+       export MKTERMCAP=$(usev ncurses)
+
+       tc-export CC AR RANLIB
+       emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+       local file="${ED}/$1" var=$2 val com
+       eval "${@:5}" && val=$3 || val=$4
+       [[ ${val} == "#" ]] && com="#" && val='\2'
+       sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+       set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+       emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+       # move the shared libs back to /usr so ldscript can install
+       # more of a minimal set of files
+       # disabled for now due to #270646
+       #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+       #gen_usr_ldscript -a einfo rc
+       gen_usr_ldscript libeinfo.so
+       gen_usr_ldscript librc.so
+
+       if ! use kernel_linux; then
+               keepdir /$(get_libdir)/rc/init.d
+       fi
+       keepdir /$(get_libdir)/rc/tmp
+
+       # Backup our default runlevels
+       dodir /usr/share/"${PN}"
+       cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+       rm -rf "${ED}"/etc/runlevels
+
+       # Setup unicode defaults for silly unicode users
+       set_config_yes_no /etc/rc.conf unicode use unicode
+
+       # Cater to the norm
+       set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+       # On HPPA, do not run consolefont by default (bug #222889)
+       if use hppa; then
+               rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+       fi
+
+       # Support for logfile rotation
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/openrc.logrotate openrc
+
+       # install the gentoo pam.d file
+       newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+
+       # install documentation
+       dodoc ChangeLog *.md
+       if use newnet; then
+               dodoc README.newnet
+       fi
+}
+
+add_boot_init() {
+       local initd=$1
+       local runlevel=${2:-boot}
+       # if the initscript is not going to be installed and is not
+       # currently installed, return
+       [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+               || return
+       [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+       # if runlevels dont exist just yet, then create it but still flag
+       # to pkg_postinst that it needs real setup #277323
+       if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+               mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+               touch "${EROOT}"etc/runlevels/.add_boot_init.created
+       fi
+
+       elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+       ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+       local config=$1 initd=$2
+       if [[ -e ${EROOT}${config} ]] ; then
+               if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+                       add_boot_init ${initd}
+               fi
+       fi
+}
+
+pkg_preinst() {
+       local f LIBDIR=$(get_libdir)
+
+       # avoid default thrashing in conf.d files when possible #295406
+       if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+               (
+               unset hostname HOSTNAME
+               source "${EROOT}"etc/conf.d/hostname
+               : ${hostname:=${HOSTNAME}}
+               [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+               )
+       fi
+
+       # set default interactive shell to sulogin if it exists
+       set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+       # termencoding was added in 0.2.1 and needed in boot
+       has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+       # swapfiles was added in 0.9.9 and needed in boot (february 2012)
+       has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+       if ! has_version ">=sys-apps/openrc-0.11"; then
+               add_boot_init sysfs sysinit
+       fi
+
+       if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+               migrate_udev_mount_script
+               add_boot_init tmpfiles.setup boot
+       fi
+
+       # these were added in 0.12.
+       if ! has_version ">=sys-apps/openrc-0.12"; then
+               add_boot_init loopback
+               add_boot_init tmpfiles.dev sysinit
+
+               # ensure existing /etc/conf.d/net is not removed
+               # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+               # this needs to stay in openrc ebuilds for a long time. :(
+               # Added in 0.12.
+               if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+                       einfo "Modifying conf.d/net to keep it from being removed"
+                       cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+               fi
+       fi
+       has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+       if ! has_version ">=sys-apps/openrc-0.18.3"; then
+               add_boot_init mtab
+               if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+                       ewarn "${EROOT}etc/mtab will be replaced with a"
+                       ewarn "symbolic link to /proc/self/mounts on the next"
+                       ewarn "reboot."
+                       ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+                       ewarn "if you do not want this to happen."
+               fi
+       fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+       if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+               ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+               add_boot_init udev-mount sysinit
+       fi
+       return 0
+}
+
+pkg_postinst() {
+       local LIBDIR=$(get_libdir)
+
+       # Make our runlevels if they don't exist
+       if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+               einfo "Copying across default runlevels"
+               cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+               rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+       else
+               if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+                       mkdir -p "${EROOT}"etc/runlevels/sysinit
+                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+                               "${EROOT}"etc/runlevels/sysinit
+               fi
+               if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+                       mkdir -p "${EROOT}"etc/runlevels/shutdown
+                       cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+                               "${EROOT}"etc/runlevels/shutdown
+               fi
+       fi
+
+       if use hppa; then
+               elog "Setting the console font does not work on all HPPA consoles."
+               elog "You can still enable it by running:"
+               elog "# rc-update add consolefont boot"
+       fi
+
+       # Handle the conf.d/local.{start,stop} -> local.d transition
+       if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+               elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+               elog "files to ${EROOT}etc/local.d"
+               mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+               mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+               chmod +x "${EROOT}"etc/local.d/*{start,stop}
+       fi
+
+       if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+               if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+                       ewarn "The dependency data could not be migrated to /run/openrc."
+                       ewarn "This means you need to reboot your system."
+               fi
+       fi
+
+       # update the dependency tree after touching all files #224171
+       [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+       if ! use newnet && ! use netifrc; then
+               ewarn "You have emerged OpenRc without network support. This"
+               ewarn "means you need to SET UP a network manager such as"
+               ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+               ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+               ewarn "Or, you have the option of emerging openrc with the newnet"
+               ewarn "use flag and configuring /etc/conf.d/network and"
+               ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+               ewarn
+       fi
+
+       if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+               ewarn "Please add the network service to your boot runlevel"
+               ewarn "as soon as possible. Not doing so could leave you with a system"
+               ewarn "without networking."
+               ewarn
+       fi
+
+       ewarn "In this version of OpenRC, the loopback interface no longer"
+       ewarn "satisfies the net virtual."
+       ewarn "If you have services now which do not start because of this,"
+       ewarn "They can be fixed by adding rc_need=\"!net\""
+       ewarn "to the ${EROOT}etc/conf.d/<servicename> file."
+       ewarn "You should also file a bug against the service asking that"
+       ewarn "need net be dropped from the dependencies."
+       ewarn "The bug you file should block the following tracker:"
+       ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092"
+       ewarn
+
+       # Updated for 0.13.2.
+       ewarn "Bug https://bugs.gentoo.org/show_bug.cgi?id=427996 was not"
+       ewarn "fixed correctly in earlier versions of OpenRC."
+       ewarn "The correct fix is implemented in this version, but that"
+       ewarn "means netmount needs to be added to the default runlevel if"
+       ewarn "you are using nfs file systems."
+       ewarn
+
+       elog "You should now update all files in /etc, using etc-update"
+       elog "or equivalent before restarting any services or this host."
+}
index 86aee4b568b76f33aafe2eb4f8930cdc8bc9564e..a4df18b3d2fcfc52280b92d16b2e5a21a5e398d4 100644 (file)
@@ -1,3 +1,5 @@
 DIST ceph-0.80.10.tar.bz2 4136018 SHA256 a7ca8a3d0710ab88adcd5c52aebe0a8ee573e247c1ccf5d84eea8a9ff07a51fa SHA512 7823a489b7654457512d300050410b4a91d615fbb467d341c76e76b77364d6a2afa763bceb2c6cd8ed05a45d7b0aef4c3baf80155cc3223e940b439e0571f3c9 WHIRLPOOL a03fc3a4ca8c49157ff3b51528418ca62c3520c4141e402863cf3475a11b240be5297f731bf1a4e77a01a476e80f5e06c0722d688fbb8ad2db26ef1975a450da
 DIST ceph-0.94.4.tar.bz2 7082496 SHA256 09b3a134c4eb06f770a72769d2aec3900c2c7f1d25092f93b0e8e73ab17e577c SHA512 3ae714d110d63717e7e49d07ac5523cbbd06b8fa140b842576f6afea780aec2408ccd053c109bf5e011018ff1c544366113e83e09ea79925e32d46e7360317ab WHIRLPOOL 8b53fb0410e6168d6385360005b29b919d7d4f255e06cc874fcbb35f1dc5566c0e97bbce50ec7ea2da479a0f068bf254abec474d155186085d500a0f4ea9eb01
 DIST ceph-0.94.5.tar.bz2 7084809 SHA256 7658bec8cf6e6c8f5ceb1e85116c4df2582c497ae686295abebc6fc82ec79211 SHA512 8bf57eceda37ec058bd7b9cf98ba0eda11c361156da4cea0aa99a3059d61fc2120ebb27f1bb07bae42e13836b57a5db8f3888401481e9125780a6df21ca90529 WHIRLPOOL cfedf299f86e19ff87615e851e4639d4045c0e26756d8896498e2e6eb8304808bc78837ec68b01936abd7fd2563aafe973109ba72d66b368304c38e38fc680f5
+DIST ceph-10.0.0.tar.gz 10429823 SHA256 fd92052e0de135e1f35ea2add44b5b8add28a2a8235639d69c33cced06a4a357 SHA512 f0e36bf83c97d1dc0328fbba96897e583c6d29b11dc54ea7fa0186ffaa1cf4d26519f336083825d64dda70bd290dc45bd6f3f17ff67ada33322caee5f2f3ce07 WHIRLPOOL f443ab25ab8f89455d76f509f215b55519f9338d3b9daec318b097de4dffff7009a01521da0d963c4b5549485b6aebca1c0a705746cf2e64fef8e9f5e66676cf
+DIST ceph-9.0.3.tar.bz2 7082795 SHA256 98ad66b35d3747d56e04fcf32a5387b765f86f43c6f09393fe9c7f17e4ae5418 SHA512 fdaebf26076490394229ef1716278ae82e6397651e25b911553db9f93b0d7ba8849320d770aef1363952e7c8e672616f5e61523fc4b79642fe81f1d2d71c4225 WHIRLPOOL cc11218246efe1d1f0a095ddc3466eacc64ffd032093cc0642a420ed9eb7fdd956b25693cc46e2dace216a6ec577c1c4d26457cf86f0319fe71c5a1125342128
diff --git a/sys-cluster/ceph/ceph-10.0.0.ebuild b/sys-cluster/ceph/ceph-10.0.0.ebuild
new file mode 100644 (file)
index 0000000..e2936b9
--- /dev/null
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV = *9999* ]]; then
+       scm_eclass=git-r3
+       EGIT_REPO_URI="
+               git://github.com/ceph/ceph.git
+               https://github.com/ceph/ceph.git"
+       SRC_URI=""
+else
+       SRC_URI="http://ceph.com/download/${P}.tar.gz"
+fi
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
+
+CDEPEND="
+       app-arch/snappy
+       dev-libs/boost:=[threads]
+       dev-libs/fcgi
+       dev-libs/libaio
+       dev-libs/libedit
+       dev-libs/leveldb[snappy]
+       nss? ( dev-libs/nss )
+       cryptopp? ( dev-libs/crypto++ )
+       sys-apps/keyutils
+       sys-apps/util-linux
+       dev-libs/libxml2
+       babeltrace? ( dev-util/babeltrace )
+       fuse? ( sys-fs/fuse )
+       libatomic? ( dev-libs/libatomic_ops )
+       xfs? ( sys-fs/xfsprogs )
+       zfs? ( sys-fs/zfs )
+       gtk? (
+               x11-libs/gtk+:2
+               dev-cpp/gtkmm:2.4
+               gnome-base/librsvg
+       )
+       radosgw? (
+               dev-libs/fcgi
+               dev-libs/expat
+               net-misc/curl
+       )
+       jemalloc? ( dev-libs/jemalloc )
+       !jemalloc? ( dev-util/google-perftools )
+       lttng? ( dev-util/lttng-ust )
+       ${PYTHON_DEPS}
+       "
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       sys-apps/hdparm
+       dev-python/flask[${PYTHON_USEDEP}]
+       dev-python/requests[${PYTHON_USEDEP}]
+       "
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       ^^ ( nss cryptopp )
+       ?? ( jemalloc tcmalloc )
+       "
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.79-libzfs.patch
+)
+CHECKREQS_DISK_BUILD="1400M"
+
+check-reqs_export_vars() {
+       # check-reqs does not support use flags, and there is a lot of variability
+       # in Ceph.
+       # 16G     /var/tmp/portage/sys-cluster/ceph-9999-r1/work/ceph-9999
+       # 6.7G    /var/tmp/portage/sys-cluster/ceph-9999-r1/image/usr
+       # 23G     /var/tmp/portage/sys-cluster/ceph-9999-r1
+       # Size requirements tested for Hammer & Jewel releases
+       if use debug; then
+               export CHECKREQS_DISK_BUILD="23G"
+               export CHECKREQS_DISK_USR="7G"
+       else
+               export CHECKREQS_DISK_BUILD="1400M"
+               export CHECKREQS_DISK_USR="450M"
+       fi
+}
+
+pkg_setup() {
+       python_setup
+       check-reqs_export_vars
+       check-reqs_pkg_setup
+}
+
+src_prepare() {
+       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+       epatch_user
+       eautoreconf
+}
+
+pkg_pretend() {
+       check-reqs_export_vars
+       check-reqs_pkg_pretend
+}
+
+src_configure() {
+       local myeconfargs=(
+               --without-hadoop
+               --docdir="${EPREFIX}/usr/share/doc/${PF}"
+               --includedir=/usr/include
+               $(use_with debug)
+               $(use_with fuse)
+               $(use_with libaio)
+               $(use_with libatomic libatomic-ops)
+               $(use_with nss)
+               $(use_with cryptopp)
+               $(use_with radosgw)
+               $(use_with gtk gtk2)
+               $(use_enable static-libs static)
+               $(use_with jemalloc)
+               $(use_with xfs libxfs)
+               $(use_with zfs libzfs)
+               --without-kinetic
+               --without-librocksdb
+               $(use_with lttng )
+               $(use_with babeltrace)
+       )
+
+       use jemalloc || \
+               myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
+
+       PYTHON="${EPYTHON}" \
+               econf "${myeconfargs[@]}"
+}
+
+src_install() {
+       default
+
+       prune_libtool_files --all
+
+       exeinto /usr/$(get_libdir)/ceph
+       newexe src/init-ceph ceph_init.sh
+
+       insinto /etc/logrotate.d/
+       newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+       chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
+
+       keepdir /var/lib/${PN}
+       keepdir /var/lib/${PN}/tmp
+       keepdir /var/log/${PN}/stat
+
+       newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+       newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+       systemd_dounit           "${FILESDIR}/ceph.target"
+       systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
+       systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+       systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
+       systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+       systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
+       systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
+
+       python_fix_shebang \
+               "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+               "${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+       #install udev rules
+       udev_dorules udev/50-rbd.rules
+       udev_dorules udev/95-ceph-osd.rules
+
+       readme.gentoo_create_doc
+}
diff --git a/sys-cluster/ceph/ceph-9.0.3.ebuild b/sys-cluster/ceph/ceph-9.0.3.ebuild
new file mode 100644 (file)
index 0000000..c50d81a
--- /dev/null
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+if [[ $PV = *9999* ]]; then
+       scm_eclass=git-r3
+       EGIT_REPO_URI="
+               git://github.com/ceph/ceph.git
+               https://github.com/ceph/ceph.git"
+       SRC_URI=""
+else
+       SRC_URI="http://ceph.com/download/${P}.tar.bz2"
+fi
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="http://ceph.com/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
+
+CDEPEND="
+       app-arch/snappy
+       dev-libs/boost:=[threads]
+       dev-libs/fcgi
+       dev-libs/libaio
+       dev-libs/libedit
+       dev-libs/leveldb[snappy]
+       nss? ( dev-libs/nss )
+       cryptopp? ( dev-libs/crypto++ )
+       sys-apps/keyutils
+       sys-apps/util-linux
+       dev-libs/libxml2
+       babeltrace? ( dev-util/babeltrace )
+       fuse? ( sys-fs/fuse )
+       libatomic? ( dev-libs/libatomic_ops )
+       xfs? ( sys-fs/xfsprogs )
+       zfs? ( sys-fs/zfs )
+       gtk? (
+               x11-libs/gtk+:2
+               dev-cpp/gtkmm:2.4
+               gnome-base/librsvg
+       )
+       radosgw? (
+               dev-libs/fcgi
+               dev-libs/expat
+               net-misc/curl
+       )
+       jemalloc? ( dev-libs/jemalloc )
+       !jemalloc? ( dev-util/google-perftools )
+       lttng? ( dev-util/lttng-ust )
+       ${PYTHON_DEPS}
+       "
+DEPEND="${CDEPEND}
+       virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+       sys-apps/hdparm
+       dev-python/flask[${PYTHON_USEDEP}]
+       dev-python/requests[${PYTHON_USEDEP}]
+       "
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       ^^ ( nss cryptopp )
+       ?? ( jemalloc tcmalloc )
+       "
+
+STRIP_MASK="/usr/lib*/rados-classes/*"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.79-libzfs.patch
+)
+CHECKREQS_DISK_BUILD="1400M"
+
+check-reqs_export_vars() {
+       # check-reqs does not support use flags, and there is a lot of variability
+       # in Ceph.
+       # 16G     /var/tmp/portage/sys-cluster/ceph-9999-r1/work/ceph-9999
+       # 6.7G    /var/tmp/portage/sys-cluster/ceph-9999-r1/image/usr
+       # 23G     /var/tmp/portage/sys-cluster/ceph-9999-r1
+       # Size requirements tested for Hammer & Jewel releases
+       if use debug; then
+               export CHECKREQS_DISK_BUILD="23G"
+               export CHECKREQS_DISK_USR="7G"
+       else
+               export CHECKREQS_DISK_BUILD="1400M"
+               export CHECKREQS_DISK_USR="450M"
+       fi
+}
+
+pkg_setup() {
+       python_setup
+       check-reqs_export_vars
+       check-reqs_pkg_setup
+}
+
+src_prepare() {
+       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+
+       epatch_user
+       eautoreconf
+}
+
+pkg_pretend() {
+       check-reqs_export_vars
+       check-reqs_pkg_pretend
+}
+
+src_configure() {
+       local myeconfargs=(
+               --without-hadoop
+               --docdir="${EPREFIX}/usr/share/doc/${PF}"
+               --includedir=/usr/include
+               $(use_with debug)
+               $(use_with fuse)
+               $(use_with libaio)
+               $(use_with libatomic libatomic-ops)
+               $(use_with nss)
+               $(use_with cryptopp)
+               $(use_with radosgw)
+               $(use_with gtk gtk2)
+               $(use_enable static-libs static)
+               $(use_with jemalloc)
+               $(use_with xfs libxfs)
+               $(use_with zfs libzfs)
+               --without-kinetic
+               --without-librocksdb
+               $(use_with lttng )
+               $(use_with babeltrace)
+       )
+
+       use jemalloc || \
+               myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
+
+       PYTHON="${EPYTHON}" \
+               econf "${myeconfargs[@]}"
+}
+
+src_install() {
+       default
+
+       prune_libtool_files --all
+
+       exeinto /usr/$(get_libdir)/ceph
+       newexe src/init-ceph ceph_init.sh
+
+       insinto /etc/logrotate.d/
+       newins "${FILESDIR}"/ceph.logrotate ${PN}
+
+       chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
+
+       keepdir /var/lib/${PN}
+       keepdir /var/lib/${PN}/tmp
+       keepdir /var/log/${PN}/stat
+
+       newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+       newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+       newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+
+       systemd_dounit           "${FILESDIR}/ceph.target"
+       systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
+       systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+       systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
+       systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+       systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
+       systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
+
+       python_fix_shebang \
+               "${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
+               "${ED}"/usr/bin/{ceph,ceph-rest-api}
+
+       #install udev rules
+       udev_dorules udev/50-rbd.rules
+       udev_dorules udev/95-ceph-osd.rules
+
+       readme.gentoo_create_doc
+}
index 4a4d4ae71dbbc1017a9928141a64e160bf404b24..da47a7187356ae287990bd0d44cb65493844afbf 100644 (file)
@@ -1,2 +1,3 @@
 DIST iwl3160-7260-bt-ucode-37.8.10.tgz 21750 SHA256 74be75b38f2280aefcbafb8d5fc1cb6732e47bc7d380a30eb063e690ba9dfa59 SHA512 a0f81382cd7ce9077e8efd75566220a3b2ab0077897ce2d292091f6942b12832819335fe53d007a06797d0f79ef18463282b714e8a148dcc57898313e8f627ba WHIRLPOOL 4e9b2a8fd350eec89f6f32fdf47e95b7faeaea62292a6e3b7b7f73e25bcf6832db81b17259409b37d436faf100184d9881dc6f58633a95eb9a112e3fefba5745
 DIST iwl3160-7260-bt-ucode-37.8.10_p1.tgz 51854 SHA256 beff2a842970f987658062cd36b788aca6ebf4c232d8fb38fecb61dba18ecb58 SHA512 84bcaad82db9588d41ab446c2c5ff9c3f323c15b8dc6b627317edafc80c5ac5c0290a8eea9b5cb5ceafa817d398fb957385cddd715787e3abfb598cf3392774c WHIRLPOOL f251925224b67049d4d2bd75f19223dbcaad18ecffd3c903272ba44310789f4c825fdbcd32f3bccbbc0fb0211492c9285cd5a6a4fcb15b7a1d845a223cc933d1
+DIST iwl3160-7260-bt-ucode-37.8.10_p2.tgz 78372 SHA256 2a7ef1afb37e944a7e005f150bb7fc615ff846e189dcf14c0e30217d96158ea3 SHA512 73399fcfd58972b9099cad6014f686f74ed4aedc2278d1389d1e815fb08d2af43f3f6defa70d409ecc0b388fba0710dc8fe26627d3149c79db8e8792576047e5 WHIRLPOOL 18dcb462f3463340c0de7d877dc9b872ba5413dd97fd1e3709a1f0db1d51f6bab526e0a3899464a1d3bc4dd3dcafc485d56555f325eb8e72938808755f7b7bef
diff --git a/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild b/sys-firmware/iwl3160-7260-bt-ucode/iwl3160-7260-bt-ucode-37.8.10_p2.ebuild
new file mode 100644 (file)
index 0000000..9dc211e
--- /dev/null
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info
+
+DESCRIPTION="Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the Intel (R) Wireless 3160, 7260, 7265 firmware"
+
+pkg_pretend() {
+       if kernel_is lt 3 10 0; then
+               ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+               ewarn "This microcode image requires a kernel >= 3.10.0."
+       fi
+}
+
+src_install() {
+       insinto /lib/firmware
+       doins -r "${S}/intel"
+}
index 64949b7cc80027442d2af6aeeeac6ab6c31eee11..7122ca1f9a742dac4c6be8b8728c984407cb0c5e 100644 (file)
@@ -1,6 +1,7 @@
 DIST iwl3160-ucode-0.10.11.23.tgz 334243 SHA256 b5adfb05dc81fdfa773a34f8d752ce690777f898bb1a3697ce651cf4bf7b5746 SHA512 14aeedd0e7069d5f65d388f36b7d30bb0e3f90c2c721a582e761aa2a27402f6ad8616dd07c44812b8e62bfa0c6eabb57adae71aa2a48053cf85757fbb6548432 WHIRLPOOL 8cefd369781f015bc7763d777b61e8c0e8276027602e6a706a8679627af62113d4e64753f0a01b38809bcf38ab45d34d3cfb623ecce98071651bb260cc199548
 DIST iwl3160-ucode-0.10.15.23.tgz 335313 SHA256 5e9639b1abb809e5507d562dda677140751946f37706119c262307ad80563da4 SHA512 a939cba5dbfb73c3178844e6045d0c6b70e75df4bb1bdfc6a3ce34c82de2521f598fbb402ebd4961fbab8e33878172f156e4641c9e02566f7ab754087d857b9b WHIRLPOOL 12ef58326d170950aa5ed95d57e8fa792b3546a5f1bba3bcdd97bb99e4a95573973dc4835a264a43c023885079e6bbd07c1d1a77bdd2af9b51f595af16dccac5
 DIST iwl3160-ucode-0.12.16.25.tgz 337890 SHA256 84ba0b93efb085ec72e574095f550b7e2e508fad7bb1d725b2938989c407d595 SHA512 247906e813e5fc49889a02532cc5813f204ccdeaa9600f856d66904e3491471e9a881daffed4ed1e08f8cae14238802773c0820785d05a90406bd9f2f8df31dd WHIRLPOOL a23546e44c8e7116fac1885a15b3729600335fc501391df3d4da998ee9ad00e8b7e3c6a2072ba6f91be2395543d88dcba9c6605a2e664d963f2b33f83bea43d6
+DIST iwl3160-ucode-0.15.227938.tgz 467773 SHA256 86908a5ff37163f18972205a0fe7633f85f91e0dc0c2e9096314c52610ed7b10 SHA512 88ad510667adf3895b1906e51373cda420cde2165b37cff72ffbe0d159eeb82de60ab3741e16437384e9db4b245d0a927be680fcb9f784af425f0554ee039798 WHIRLPOOL 5a33deaba66b89516a9c07a652ce4dc4e89b49076fae47354b1d366fdb6604dfa2ad9dda247b6dbed829509d1dc43da62771677d362ff90a04b02bc2384cc1e1
 DIST iwl3160-ucode-0.7.1.22.tgz 332285 SHA256 6350d23db66e7f5346a716fb74bb853ae798b70ad56f20f134ac99dd4941d561 SHA512 5f379edc87d0cb743bd91cecd5a1879edfd18033c02d29269ea55e046663fa47c3363a19441d0edb52ea99c58e757c81872545c8ece634459675d927f46a4392 WHIRLPOOL 35d80a4f6901bdce4ec1c34fcc3ad38a0f869f5fddebcd4c29866e5eb0fd65cebbc37fce966400d15eb3053a4f7902cd9c2397a8eaf8a857ad444a0ebc115bd2
 DIST iwl3160-ucode-0.8.15.22.tgz 328351 SHA256 101a0466a4411f5e1492dd8e559f549f1196de045b084718354ece3896c7b370 SHA512 33e8842068c285bd62cd58629855c4be82a5b19129bcaefc4ac622245562085ec4ae155dba719937f71767d3f26e0d309553c9362fe7995943f2e95a9bc5d1fd WHIRLPOOL 5c6be623389b28c585f89e370a3202874d364d7daf9b61b7c95c7824c5b4243280a723b94848c47a1b449545162e8cb6cd073a1a4f748a100310e472ec911e10
 DIST iwl3160-ucode-0.8.24.22.tgz 334306 SHA256 44082d3b70e3101343702d614e4785e498c5596117bb144e167ea8a11b5c63cb SHA512 afa9d1c081f21ec8cb3d427be79475853c9f078fb4f3d60ada154df0c58fe3dec4655dc2f54095dc395cf064563e0de9f69d55478b28ee07b7f19c0b93fb6097 WHIRLPOOL 8a18b409e5211d69d0df80498caa7b572d0d9f462417e6101c159185194db203627019fa6caea9ba3cb3c478c2975e362e3011be21d58f4f572c5c6bee77ca1b
diff --git a/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild b/sys-firmware/iwl3160-ucode/iwl3160-ucode-0.15.227938.ebuild
new file mode 100644 (file)
index 0000000..e410e78
--- /dev/null
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="2"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+       !sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+       if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+               ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+               ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+               ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+       fi
+}
+
+src_install() {
+       insinto /lib/firmware
+       doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+       dodoc README*
+}
index 1c50a78c15e40c4482461f605f39ddf51c2e3176..5d65a799477254136683b3b649f3dac0455224ac 100644 (file)
@@ -1,6 +1,7 @@
 DIST iwl7260-ucode-0.10.11.23.tgz 347295 SHA256 4a1feba4436bc48c77e3494114e3b0d2a9d6e9208990c52b16c30c38da3c3cb5 SHA512 8e8e14be7e2f3f97a40bcfa16065d55418e42c10d7e4987b956a55775a8b0dfe75127296b97e6bcb9becf53133cd3f052e2691c05421804b6d3e11fc951d1a6f WHIRLPOOL cf55616de4653029bc3b178d24720d9ddfea3fa08342d0d80ac6602e3fd328cbb3540e4dffa22df243f600e214e0c6f206d5d63569ecafc48028a33ab4587319
 DIST iwl7260-ucode-0.10.15.23.tgz 348549 SHA256 8ad0c1457b694a6a84754619a40d826e6755de65efed8b8d1b273eb6560777e5 SHA512 a40efc2610a981b1e0de2a88d16afa760f5bcb116987034769a1a9adcc716b1ea84103e9a7c372172e98690e729c4d6e34b5857e2c9097439184b3b473f168a8 WHIRLPOOL 3836fb407fcec2b9e9ce64a83d18ccb40f1c031f166820f8921b06df7828bb94aad3e02eef11d159a41bc236c1d0f0f63829759a5671744acab5967fe5056e2b
 DIST iwl7260-ucode-0.12.16.25.tgz 353537 SHA256 d747e20bf4127357b162b583dbbf2067d2c034fadba1a2063de7aa94885b4f3e SHA512 efedee8f6d4078865b45962a8297c6c1022504653360ee6a23cc7f1eb4cfb1a34c5ee6685cf9819a61f439d445579e1eb14da84f3e28bcf45f89a5a66fbdfa07 WHIRLPOOL b4f913e9a4e92f61bb557da2254de8dc5c7c0d293c0d1948c2f84760a34dec56243e179e90aed74380bd8cdaed031994d193b8f62cb38d8e7c286831a99dcbd6
+DIST iwl7260-ucode-0.15.227938.tgz 493590 SHA256 e9308d39fed1a9dc01237bd725640c8a45e013dcdc29ef3d5579de714502a202 SHA512 44e17c425be6c354983e80d6681c459c36b278c18ad12325675abbd8f94d1f1f3b4ea9961d26a7396e1e8a42ebc36ecfba80d20fd75fab9ba1669d0c8ecc0c8d WHIRLPOOL 9b1923751f59a8314b2a404b1ce42d57267807f145bf4bc089d7ba2737b8f684e3be6aaab6c9adb51d214b96d164dc081bdcb7c102bb3bbd96e90bef8596eb13
 DIST iwl7260-ucode-0.7.1.22.tgz 341956 SHA256 1ecc335e2a81a4f6d19422a5e707a93ef56351030a4e95d698e064fe51ba6154 SHA512 c6ae43ec84e5d0df85b6fc1962c5d6052be9352e453b53807a3c45eebc334892dae51c84a053fd197afa66a77bac5b5c349de8d566c071f15f2e76c370a36880 WHIRLPOOL 91ed3469604377462701ac921f06bd0269e032f04a1523ecc9e550d94cfd0fc1fee5caa484f0d46cd5d41ad25bc041fe953a7cd6c2dc0b8e3cbd39705b08119d
 DIST iwl7260-ucode-0.8.15.22.tgz 342953 SHA256 7ef7010705b26ab182c45f3810243cc814c0bec7a0c3dad21f0cdd22019ee7ec SHA512 7f6105c547dde559280444e1d729928c33d55ca4f5df1036d40ced735d7863277f2291a27c36ac544bb0c4278883b345be087268124d22af85155b0b4a57bb96 WHIRLPOOL 2ceea1c21749af78748652c8ce12df520621e0f54eff3c80307f0e038b23f730c9eccbadd1a4152276b8e99a447e7f1e38641d161334c197a5e86c5ce9e9e37e
 DIST iwl7260-ucode-0.8.24.22.tgz 346691 SHA256 11ef671652ade65fc6c7c843f56d19873b5a91b2e65676bd6df9ec39642b7cff SHA512 a8a81030bdec074b6370a6bb7f3b22fd8389b76c00b9b27902acfb34be2263662adf5b7eee6e8817c22dead54528607ccb93194073bd509191561a15ce88a3e8 WHIRLPOOL 205af365e22f9f28a95a5e3bef0cff59d301d03f60a21daac79a0f039c35fadfcbaca97b68082ecebead3396576d93bd372655c730cef87524a1dc382331a8d5
diff --git a/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild b/sys-firmware/iwl7260-ucode/iwl7260-ucode-0.15.227938.ebuild
new file mode 100644 (file)
index 0000000..e410e78
--- /dev/null
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit linux-info versionator
+
+DEV_N="${PN:3:4}"
+vc=($(get_all_version_components "${PV}"))
+MY_PV="${vc[2]}.${vc[4]}.${vc[0]}"
+MY_PN="iwlwifi-${DEV_N}-ucode"
+
+DV_MAJOR="4"
+DV_MINOR="2"
+DV_PATCH="0"
+
+DESCRIPTION="Firmware for Intel (R) Dual Band Wireless-AC ${DEV_N}"
+HOMEPAGE="https://wireless.kernel.org/en/users/Drivers/iwlwifi"
+SRC_URI="https://wireless.wiki.kernel.org/_media/en/users/drivers/${MY_PN}-${MY_PV}.tgz -> ${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="${vc[2]}"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluetooth"
+
+DEPEND=""
+RDEPEND="bluetooth? ( sys-firmware/iwl3160-7260-bt-ucode )
+       !sys-kernel/linux-firmware[-savedconfig]"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CONFIG_CHECK="~IWLMVM"
+ERROR_IWLMVM="CONFIG_IWLMVM is required to be enabled in /usr/src/linux/.config for the kernel to be able to load the ${DEV_N} firmware"
+
+pkg_pretend() {
+       if kernel_is lt "${DV_MAJOR}" "${DV_MINOR}" "${DV_PATCH}"; then
+               ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}."
+               ewarn "This microcode image requires a kernel >= ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}."
+               ewarn "For kernel versions < ${DV_MAJOR}.${DV_MINOR}.${DV_PATCH}, you may install older SLOTS"
+       fi
+}
+
+src_install() {
+       insinto /lib/firmware
+       doins "${S}/iwlwifi-${DEV_N}-${vc[2]}.ucode"
+       dodoc README*
+}
index a8ed5c10dc0d5f38f3dc9e43812b6d96a31b9d56..f24d55e3547586688f6f63697706755ce2dd6b17 100644 (file)
@@ -2,6 +2,6 @@ DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b
 DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
 DIST mips-sources-4.2.0-patches-v4.tar.xz 156096 SHA256 171594c765df5beeb21170d1934fd0652eb58a6b5164694e946608acd94bc6e4 SHA512 8ca6bc5ff25576a7d4d9c79fab22520a5b4a6cc4b1dfe6fd254fb150eb6aabcfa4131c558b6fcfc490e4c6910c78042c1d94452e68b791bfd09f1b7b7b2f49d0 WHIRLPOOL 02842d4aca54c6c4f3eefe968317bc9da7748bb84ff5df7215ac2d775aae9e532661fe14b20fcde9ee431f12d812783ab62189b8b1424d6e68aad59e10989486
 DIST mips-sources-4.3.0-patches-v1.tar.xz 151104 SHA256 a08b5180eda10b71e229a9cb1da577412b64bba0dee12748754cbe1dcbb5c79c SHA512 33c216a2923b82778a36cc77bcd49b985974551c81b4102c8783119bbf72a23cfb6e6e3e7c9412fff0fd5310f289956e313ee72da6797e1d1e42111d971662d5 WHIRLPOOL 6c80f80718f11815e72f9a4eb3e812d0c1bfb13831ef638e5fe4f27182ddd3ea858f398289527e2c5a7f647b763f2ec7361f3159d602468fbb828d01f22d33de
-DIST mipsgit-4.2.0-20151004.diff.xz 6668 SHA256 343e2d894502837980aa062ff1482d1672f943189da5fff789d144003542ea0c SHA512 ecc17f94e3c04f29bc38f9041262f725a33f68952dcc413ea1e211e4ac11721e228c3359cf4a285ee57367eee12229e2b0cf86cf4845371fa4d062b35264ce05 WHIRLPOOL e394055be7d9bee386f58aa2e8fbed4d6f18a206f1c98d815c333f0df16b295e69d7defff5abc6a94cbd00ef469bd47e169671f59cb7666b72770aa67ff2845b
+DIST mipsgit-4.2.0-20151126.diff.xz 6308 SHA256 a6f71ddc5f22008f4e3fdd57fa457dc5b9a1bbfc4e66b064bc02c9b04e0f0916 SHA512 58311ed6a6d3292d5f977c7514ae7357c77b96c98282ba5e9a2425b2278c9d8a90599393413cf640ec5b538707e23d06f9b46c158f8685c9ce96fcb99a9f9be2 WHIRLPOOL ca5b63ec1bd817689bb564ed63ed32f0295f926c0f64c69b1342bf357e50105a9c16d0489b2d4a8d3c6aa519bb35461ec1f948adb12909297377e4aab5e01fc1
 DIST mipsgit-4.3.0-20151126.diff.xz 2184 SHA256 a919800a221e0fdb4cffca8a24eb42b156818eec2ea666d126866c3effab9938 SHA512 fb50654f0727e031aa7e37b39e4054cedf80d1be5f81f69d03e39c07181f35c95727a637436237f1f75afadaa8af5f5ec3090809adc14b49b5054de89b9daf23 WHIRLPOOL dd61d9727600fe30834f4d6c3a8e12e5848b90580b1b24f30c769df08f72582c012fae9c3e08fcbbe846216e2cb6d36502f79c7ce9a592017609839155d5683a
 DIST patch-4.2.6.xz 210240 SHA256 419f91fa4a6bb0d2c160ef6812341e5aac7e776550efe1d0958ae3b1ce0ea8ce SHA512 bc5414945ba11cc82f1007a7432f682253bc04babb4bd1d40c8f79bad9c9923ca088687caa6b7ec6d5a0b52b9a4d932e15f939b5af9f823e38bb6ad2df2faf4f WHIRLPOOL 99ca0c517cfbd0cf39cf4a2016557dfaeec3aa60854fb1135ddfa8d43b9b55679c92d25999a6d1ac8b92ad8541401f2f29735ad149b5931ccf00d81787d0ae0b
index d1e8f5c1c6c191b577028deca7bfcb7f91201273..0e93e52b746ee24e6cba5a6f6db7ceb2d550b1ff 100644 (file)
@@ -8,7 +8,7 @@ EAPI="5"
 #//------------------------------------------------------------------------------
 
 # Version Data
-GITDATE="20151004"                     # Date of diff between kernel.org and lmo GIT
+GITDATE="20151126"                     # Date of diff between kernel.org and lmo GIT
 GENPATCHREV="4"                                # Tarball revision for patches
 
 # Directories
index 706ecbcd0df6a9dcc80d0f50cb484764da7595f4..6bec5fd9275a996185a2ae4d2d21739ebbbae3ea 100644 (file)
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_47.0.2526.73-1_amd64.deb 47708488 SHA256 e082291981558160b13e853cbdfef11b5f014dddf9e4eb461e5c6bf8cf28911a SHA512 1be8eb243a1fa9f73a86030d9f8653c43e9a571ab6f38c628f477e3749a70c8dc5887ffc4701546b062a177c0aea05cc5a325873d2da3e9af7ecc6888ed07e0c WHIRLPOOL 505870733e29709d56693e657619a43e01b8ad167ba3ed8f9b432674b67df3c9a44a27801645c27691cadb3476f26bae7695f6f580d55afce75f97133ef5b515
-DIST google-chrome-beta_47.0.2526.73-1_i386.deb 47277520 SHA256 87b8f05fd02e5b8ee2f38b25790e3440c8cad331967cb9ed7d9dc6c86a0f3f81 SHA512 0b57f85542def7d22f3db5e50f2c495563b084629e7637412f43a67e94475f23a8046dc43ad2670753f61447fe36c42cdeaf6fd53309f6e92be16a09bf062faa WHIRLPOOL 56ec2ad52844f5d77f1faf7ae492ddb4a3d80bcbb2c948a41d694554880e2d77adcd34949a6207b4a0f83c21f6f650e3a050f33c6230131a4e8d74ff3b2eefa8
+DIST google-chrome-beta_48.0.2564.23-1_amd64.deb 47863964 SHA256 9e76bb280ea6bbab0e578627fc44b35a6c16cba4939e92edc3f2c57723317934 SHA512 25ac25f708507aa82afcbafaed3362959b2c45f4ca93f9546b0b5c6faa201a4cc356ff6e1bb808acc5b6ce38226abd5ae91068366a7ca16a683398a8f1817407 WHIRLPOOL f616ac9d35ac7734a76f2688367956564493036c0fe32cb4f5f66e001b5136c3533a5831db8ce6d5cff31b799fdb99c109fa3e03240c746a650d967e0bbbfa08
+DIST google-chrome-beta_48.0.2564.23-1_i386.deb 47396134 SHA256 9fb85ccd05cdadbda79def35b6dff3e7cc7d164cccad6b7cf945ec6f3603639c SHA512 ef2750f2277cde83a9c8a79b6e50cecdd19896c637dea1f2ef19057127d299b74ae3fca024343ef71f41c9e1a69c4b054e8819d05d502abedd4c582cbafc3a21 WHIRLPOOL 0f6520c5b2a4754735abf4b94dfd5fa7e554b61704f4aec3befa81ce21eb0ecb2b7895c46c8a1682f47679ef32793bca26ac97da863b0bfaf48a55c408a6efd5
index 61376eb1b85a9149116a11fd79eb95858fcc5819..53c272eae482673d9646170e1b411d8fcdeb859e 100644 (file)
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c
-DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127
+DIST google-chrome-unstable_48.0.2564.22-1_amd64.deb 47875664 SHA256 2bbc4cdd18e427532ba58c13d32ab1999e2a51ed3100f11a0fd3de4997107c28 SHA512 770d52be5819991a3f8d4ff758c0737cd3f75bda9bc8c460b615eb7896e4edd9b06c117cf479b95eb4b730e973b3f4e09bb598f8eae8dfe34891776c4a275ba1 WHIRLPOOL 321e20874ac09f49408a980a36b5a3d729cce4a04fc85815a74cadcef713713029867dfac43b356428428defd8bcde7115ac66d6772e8e4031f1abcc4a8194b0
+DIST google-chrome-unstable_48.0.2564.22-1_i386.deb 47390304 SHA256 7767b203616c7c50faf4c205f7580862c22f619e581eda1d11d65e3bd05a20ac SHA512 c8d7f727f88e978b5845510be4c26d159957a522108946fbeeb1b35917ceb163dd33bf49875ab6f398a954f4ee88dc5dac25fdaff2a19cd1a13ef73f93ac05ba WHIRLPOOL 9a2a7c7d5c54b838752d8f40df7a1c38fd1c4138b41ae5b59d4fa13abf503ccc6c7681da864db057bf0d408ef4bb6304a3839cd47d3a17999fdaddc307ffffa2
similarity index 95%
rename from www-client/google-chrome-beta/google-chrome-beta-47.0.2526.73_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-48.0.2564.22_p1.ebuild
index e8b0bfaff40c29bfe058385467444bad44e0e52b..b8bb8a192b27ec7cad99d483745591d87ef360de 100644 (file)
@@ -36,6 +36,7 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="+plugins"
 RESTRICT="bindist mirror strip"
 
+DEPEND="app-admin/chrpath"
 RDEPEND="
        app-arch/bzip2
        app-misc/ca-certificates
@@ -89,7 +90,7 @@ are not displayed properly:
 Depending on your desktop environment, you may need
 to install additional packages to get icons on the Downloads page.
 
-For KDE, the required package is kde-base/oxygen-icons.
+For KDE, the required package is kde-frameworks/oxygen-icons.
 
 For other desktop environments, try one of the following:
 - x11-themes/gnome-icon-theme
@@ -126,6 +127,9 @@ src_install() {
                newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
        done
 
+       # Work around RPATH=$ORIGIN QA check
+       chrpath -d "${CHROME_HOME}/chrome-sandbox" || die
+
        insinto /
        doins -r opt usr
 
index 3b2e7ebb9838b991f79dd1eb12c30836138afdb0..b5b68568b6cf2ad4e9dddd3db2906ed1ec6c8677 100644 (file)
@@ -1,2 +1,2 @@
 DIST opera-beta_34.0.2036.16_amd64.deb 45548026 SHA256 10fda2dfba7dc7520be293ca99e1341078ef7d5550e0db4b6b571458cacb8720 SHA512 1a1108d59e7fca1453d1898a08a09b9ef5d52f2a8e46fd0de1bd8ef16f9d5e12b7d2fd28ae8d9eb89b7c905c47da81b49270b88ddaab4aebd46f4b48c2708a6a WHIRLPOOL 3e802f0e4e6c2d03a7b26a5d910845e76fee5c383d69dff2e793401eaaa5d1467881cad5dbb036894297f9947c58b28ff8b1c3f01df2da0f604ae1373d38115b
-DIST opera-beta_34.0.2036.3_amd64.deb 45601600 SHA256 ba0fdc667284c2fc5d76ee2fca223fec43f20c732f12d5af800b883215be0549 SHA512 67e6794318694470e4596fe4f1b5a9b4f67c5b2e0396c4b755c82cf0585ed38922181f918f3653a9a41621b8bfb6cdb6c37e712fb7544561b01b5f54bb9cc25b WHIRLPOOL f2ec8037133ff664ba1f218ef90eb96fbc40d7c6696cad32aa05a2b84c5fa37d99cdeb40986be2104dfe44366686d1f070ebea81e03e5ad4f3367dae6533c9e0
+DIST opera-beta_34.0.2036.24_amd64.deb 44714292 SHA256 0d6bd569c1ab9913eae583735a74c3349fda5f00f3fae698c8d8535bab4580b7 SHA512 bc90703a4ed8852e5817fb01611cad10e13616d4b8d5075fd8ac23ece87aabbfb9d736ec3eea9ea6a948bac4441c64589e930b81c880289f7c67664e5872bf6b WHIRLPOOL 4cfba8ee39c3519115ea492170e36208e6f10a948d0e6a9bdf8d8d6d3e5abf64b74682ea5a7184578f2efa408187eb30bbfc4125a06b4ebbb828a2d0b51ab119
index 058c7878aa57a92e95d3701473a1f33976eb3d8d..98e1e4986545232ea1b8ee4d842cc2272230fe1c 100644 (file)
@@ -1,4 +1,4 @@
-DIST vivaldi-1.0.330.3_p1-amd64.deb 42560200 SHA256 f66e5b787416fd65eadf55098a94ac18e01d97ba81e1d76160dc697500b97bb5 SHA512 311fc23566819ccd366b9d4efa2cfab9b09df6dbf511e671e3dbbd4f55e2120844d48437dd79ea8d4a19b73847bd2792cfabc7b5ffa3811fb50fa5724db882bb WHIRLPOOL 7f8d0f4ab629be77788edbdf20a8d9dc9ccf28440885d0c009051d9c65217625a73691cb86c8e88bd258fd267047563db80f538fa768ea8ecea3fea82afd42cc
-DIST vivaldi-1.0.330.3_p1-i386.deb 43058486 SHA256 3eb3143139716685eea430cc4846841eb1da5774e3a9f1d6c3113595a7632d6b SHA512 27069eb34cd6a9b9a06aea78d52a5525fb5042704a0f56df1e59cd043d36acf63794b63b39562d8d74ad5f6b4272bbd10edc176472f7d3003c8cdf0724c38677 WHIRLPOOL fd233ae70ace95e9cf8ffa5fe9528e088e9753310ce059ec6acdc3dbfc65af01feb73aa06e8df052a09dc1941176abc6109f5a114f544df491a8a2a704c6e290
 DIST vivaldi-1.0.334.3_p1-amd64.deb 42644326 SHA256 fda4bacabb0088e30b8c54c1285fa9e3712273b0058e18229969322c121e3df9 SHA512 67c54d4b124c78c04831ee8a31d70d7e4e6fa6b704ea775b17ed8d010041d0faeb7f1c1ec1a8ecb09b1efe654611168d8e28d48b3bcc93c82692f1208ee2af5c WHIRLPOOL c6279d3ae9097a23bd12f4ed20e7b58efb020fcf3b2020bec5ebf63c9f496fec5d1c05815a0615762dc3f370a5657fe81ee006ea35f5be35465b83ec2ce37915
 DIST vivaldi-1.0.334.3_p1-i386.deb 43093198 SHA256 15cbee335155d1025a22937663109d820d35e4fd43cb59bb1a2ace4335364b3f SHA512 5d6c6390cf633f7ee44b9ab4b754b81c54dc3cf1aa3773cd82d9107c9a67f7f8a256072418efe453b859e6b052764b3ce117584b33317368f36a739293d804f7 WHIRLPOOL 5557e0ed4adafe3879fd21e44b83b7e9eaa1bc585499b92eb7b4fc03f83f6d7bc4a5c9b1c98c98bb177ee9bc98356669b187a7b0618f15ef2b31eb33f01f48d8
+DIST vivaldi-1.0.340.7_p1-amd64.deb 42622326 SHA256 8281fbbd682d55ff1b48955bbecd7dd78e62b82e1c691e121a6e4e4b5944dd52 SHA512 5021174f888836912a679922dc341c01497aca6552d93c9a33c72ca1692f6352d7a42c293e81fefd4798024bc287fff565dc53c105d6551665d7d8e5b9d053ee WHIRLPOOL 00e908801b722b9cd6f3d3b69b2c4df2d6ab164ddb7e0d6c9e9b1107dba1b2967dc95c5b78b609228f452370767db441bef3f426b451f264ef8c746bfa78f57f
+DIST vivaldi-1.0.340.7_p1-i386.deb 43103506 SHA256 15c38ff908fa908bac4f5913641b98625d5f03ea7d53a3c8abc5d861f013b907 SHA512 3c57d68324e9c3a98c9bf4ee8271901e91f1ace356c5d4d75d7d0f7ad5814e7bef803f96117f2bbabbec6706eb079765f850667c6602cf475bd1ccc0133643f3 WHIRLPOOL 775c370b73a2080866a50861abb154c0b97c52df43f4c6f8a26f3f4df206270cb9bd3f0e91500551cc627129fe823f6f7e2dd7e57df4aa64198e22fa771b4ba8
index f2488c9be691e4e4b1a0d1a78620156408e7a008..8244545f7d00da3b14fc53ccfd3943655305d882 100644 (file)
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_47.0.2526.73-1_amd64.deb 47708488 SHA256 e082291981558160b13e853cbdfef11b5f014dddf9e4eb461e5c6bf8cf28911a SHA512 1be8eb243a1fa9f73a86030d9f8653c43e9a571ab6f38c628f477e3749a70c8dc5887ffc4701546b062a177c0aea05cc5a325873d2da3e9af7ecc6888ed07e0c WHIRLPOOL 505870733e29709d56693e657619a43e01b8ad167ba3ed8f9b432674b67df3c9a44a27801645c27691cadb3476f26bae7695f6f580d55afce75f97133ef5b515
-DIST google-chrome-beta_47.0.2526.73-1_i386.deb 47277520 SHA256 87b8f05fd02e5b8ee2f38b25790e3440c8cad331967cb9ed7d9dc6c86a0f3f81 SHA512 0b57f85542def7d22f3db5e50f2c495563b084629e7637412f43a67e94475f23a8046dc43ad2670753f61447fe36c42cdeaf6fd53309f6e92be16a09bf062faa WHIRLPOOL 56ec2ad52844f5d77f1faf7ae492ddb4a3d80bcbb2c948a41d694554880e2d77adcd34949a6207b4a0f83c21f6f650e3a050f33c6230131a4e8d74ff3b2eefa8
+DIST google-chrome-beta_48.0.2564.23-1_amd64.deb 47863964 SHA256 9e76bb280ea6bbab0e578627fc44b35a6c16cba4939e92edc3f2c57723317934 SHA512 25ac25f708507aa82afcbafaed3362959b2c45f4ca93f9546b0b5c6faa201a4cc356ff6e1bb808acc5b6ce38226abd5ae91068366a7ca16a683398a8f1817407 WHIRLPOOL f616ac9d35ac7734a76f2688367956564493036c0fe32cb4f5f66e001b5136c3533a5831db8ce6d5cff31b799fdb99c109fa3e03240c746a650d967e0bbbfa08
+DIST google-chrome-beta_48.0.2564.23-1_i386.deb 47396134 SHA256 9fb85ccd05cdadbda79def35b6dff3e7cc7d164cccad6b7cf945ec6f3603639c SHA512 ef2750f2277cde83a9c8a79b6e50cecdd19896c637dea1f2ef19057127d299b74ae3fca024343ef71f41c9e1a69c4b054e8819d05d502abedd4c582cbafc3a21 WHIRLPOOL 0f6520c5b2a4754735abf4b94dfd5fa7e554b61704f4aec3befa81ce21eb0ecb2b7895c46c8a1682f47679ef32793bca26ac97da863b0bfaf48a55c408a6efd5
 DIST google-chrome-stable_47.0.2526.73-1_amd64.deb 47712248 SHA256 ea9f04f0cd586e48c5fb28a8226222080d8c2a5822f546e0b6a13956a6fd00f8 SHA512 74a7652e5ae64c970c946f633446fb32274904ecb0cf4f4d100f9b732430ee7049b2759231cd4e44e78d3a27e2f6278b50a08800f8fd2cc262706117b32a3397 WHIRLPOOL a2b6e9eeca7c9c91579085068efeb8c59598d4991a6570f48863ab3408fab15be98d58528cb7f3a74d027bfcb830136433d587f46b732904ee45e0ef0730edb0
 DIST google-chrome-stable_47.0.2526.73-1_i386.deb 47268134 SHA256 fe29be58d067b817678986d49789650a6062bfcecf6840c1b956f58034092ff9 SHA512 c48dd9397f7a6826539f23a97a63c1326c8f94754d59adb6282c9abdf91960391d94923f073bd88f7ddacdd03dc00951338bfba4c088c995f93037ef1cf2898a WHIRLPOOL d192f0456ccdf88cc95044ab529b05300a5f13f755856da00a82d24f302ed831e46c8cb19c63f2aaa9ae9a0380d66c59c1bc5b2642d00fd2aea9849578c50745
-DIST google-chrome-unstable_48.0.2564.10-1_amd64.deb 48350814 SHA256 76cd3d1e687746a9088634cf351b4d260e75ec93bdb8bd607c2c05ed8e8a9039 SHA512 67b3e2f8089f6e8f9bb7cb9234093a4d33d5b3bfa0d1bff118c16473aa98350fa5b90924addaa8c7b155c11cca5117723c87122191852eebe8b26b333628f27a WHIRLPOOL d2f3f9cb89895e0d82d881cb1d5b200084b4981d6704bbcecb9f9481edc083a6897c23069991f791032571824fb11db72ead95b158678874176890aa2512c62c
-DIST google-chrome-unstable_48.0.2564.10-1_i386.deb 47447038 SHA256 44f2c74148e6aa5e2c344356e88e2b39db9a0b76cf9d27db3e23d6dae56fe4b6 SHA512 7bea046e025fc62fe6b3d7ecc895965d297d7d5b4df6e4d8f25ef9c688291097ecce893fd1545e61be4c4b176d44e10a5b82aab1e17baba54af1d85494d02ba1 WHIRLPOOL 4d454321e82cea21e1934028628217b221e2bdaf212b566ea4c24f39e7ef74976b090548f73381271d388f83519580ad43fcf0bd837630c2e8eefe6893780127
+DIST google-chrome-unstable_48.0.2564.22-1_amd64.deb 47875664 SHA256 2bbc4cdd18e427532ba58c13d32ab1999e2a51ed3100f11a0fd3de4997107c28 SHA512 770d52be5819991a3f8d4ff758c0737cd3f75bda9bc8c460b615eb7896e4edd9b06c117cf479b95eb4b730e973b3f4e09bb598f8eae8dfe34891776c4a275ba1 WHIRLPOOL 321e20874ac09f49408a980a36b5a3d729cce4a04fc85815a74cadcef713713029867dfac43b356428428defd8bcde7115ac66d6772e8e4031f1abcc4a8194b0
+DIST google-chrome-unstable_48.0.2564.22-1_i386.deb 47390304 SHA256 7767b203616c7c50faf4c205f7580862c22f619e581eda1d11d65e3bd05a20ac SHA512 c8d7f727f88e978b5845510be4c26d159957a522108946fbeeb1b35917ceb163dd33bf49875ab6f398a954f4ee88dc5dac25fdaff2a19cd1a13ef73f93ac05ba WHIRLPOOL 9a2a7c7d5c54b838752d8f40df7a1c38fd1c4138b41ae5b59d4fa13abf503ccc6c7681da864db057bf0d408ef4bb6304a3839cd47d3a17999fdaddc307ffffa2
index 0ea45d7111b22c06074ff77d954f5b96cde08390..5132be6107a4610638ef06833ae6ff03de9114da 100644 (file)
@@ -5,3 +5,4 @@ DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd646
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
 DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
 DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha1-build.xml.patch
new file mode 100644 (file)
index 0000000..f5d49c7
--- /dev/null
@@ -0,0 +1,266 @@
+diff --git a/apache-tomcat-9.0.0.M1-src/build.xml b/apache-tomcat-9.0.0.M1-src/build.xml
+index eab0c45..63ac495 100644
+--- a/apache-tomcat-9.0.0.M1-src/build.xml
++++ b/apache-tomcat-9.0.0.M1-src/build.xml
+@@ -711,24 +711,30 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+     <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1002,14 +1008,14 @@
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1069,7 +1075,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1103,7 +1109,7 @@
+     </javac>
+   </target>
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1118,7 +1124,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1222,10 +1228,11 @@
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
+-
++-->
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+          that needs to add entries. If there is more than one a more complex
+          solution will be required. -->
+@@ -1606,7 +1613,7 @@
+   <target name="extras-commons-logging-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+@@ -1745,7 +1752,7 @@
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1940,6 +1947,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1998,6 +2006,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2028,15 +2037,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+       docencoding="UTF-8"
+       charset="UTF-8"
+       additionalparam="-breakiterator -notimestamp"
+-      maxmemory="256m" >
++      maxmemory="512m" >
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2775,7 +2786,7 @@ skip.installer property in build.properties" />
+   </target>
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" />
+   </target>
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2866,7 +2877,7 @@ skip.installer property in build.properties" />
+   </target>
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+@@ -2892,18 +2903,18 @@ skip.installer property in build.properties" />
+   <!-- =============== Utility Targets to support downloads ================ -->
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2915,7 +2926,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2945,7 +2956,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2963,7 +2974,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2996,7 +3007,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3007,7 +3018,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3018,7 +3029,7 @@ skip.installer property in build.properties" />
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha1.ebuild
new file mode 100644 (file)
index 0000000..881e9a9
--- /dev/null
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_PV="${PV/_alpha/.M}"
+MY_P="apache-${PN}-${MY_PV}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+       dev-java/oracle-javamail:0
+       dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+       !<dev-java/tomcat-native-1.1.24
+       >=virtual/jre-1.8"
+DEPEND="${COMMON_DEP}
+       app-admin/pwgen
+       >=virtual/jdk-1.8
+       test? (
+               >=dev-java/ant-junit-1.9:0
+               dev-java/easymock:3.2
+       )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+       java-pkg-2_pkg_setup
+       enewgroup tomcat 265
+       enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+       find -name '*.jar' -type f -delete -print || die
+
+       # Remove bundled javamail, servlet-api
+       rm -rv java/javax/{el,mail,servlet} || die
+
+       epatch "${FILESDIR}/${P}-build.xml.patch"
+
+       # For use of catalina.sh in netbeans
+       sed -i -e "/^# ----- Execute The Requested Command/ a\
+               CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+               bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+       EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+       java-pkg-2_src_compile
+}
+
+src_test() {
+       java-pkg-2_src_test
+}
+
+src_install() {
+       local dest="/usr/share/${PN}-${SLOT}"
+
+       java-pkg_jarinto "${dest}"/bin
+       java-pkg_dojar output/build/bin/*.jar
+       exeinto "${dest}"/bin
+       doexe output/build/bin/*.sh
+
+       java-pkg_jarinto "${dest}"/lib
+       java-pkg_dojar output/build/lib/*.jar
+
+       dodoc RELEASE-NOTES RUNNING.txt
+       use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+       use source && java-pkg_dosrc java/*
+
+       ### Webapps ###
+
+       # add missing docBase
+       local apps="host-manager manager"
+       for app in ${apps}; do
+               sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+                       output/build/webapps/${app}/META-INF/context.xml || die
+       done
+
+       insinto "${dest}"/webapps
+       doins -r output/build/webapps/{host-manager,manager,ROOT}
+       use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+       ### Config ###
+
+       # create "logs" directory in $CATALINA_BASE
+       # and set correct perms, see #458890
+       dodir "${dest}"/logs
+       fperms 0750 "${dest}"/logs
+
+       # replace the default pw with a random one, see #92281
+       local randpw="$(pwgen -s -B 15 1)"
+       sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+       # prepend gentoo.classpath to common.loader, see #453212
+       sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+       insinto "${dest}"
+       doins -r output/build/conf
+
+       ### rc ###
+
+       cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+       eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+       sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+       insinto "${dest}"/gentoo
+       doins "${T}"/tomcat.conf
+       exeinto "${dest}"/gentoo
+       newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+       newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+       elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+       elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+       elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+       elog "To manage Tomcat instances, run:"
+       elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+       ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+       ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#      einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
index 682d052416cda6787c6a4a2618dc9e82caa64c83..5d0dd99e079b125024d7724246186b61c5a405a7 100644 (file)
@@ -7,6 +7,7 @@ DIST NVIDIA-FreeBSD-x86-346.96.tar.gz 58010757 SHA256 a27d7b79c053702bf6524b2c47
 DIST NVIDIA-FreeBSD-x86-352.55.tar.gz 55222267 SHA256 e06dc59876172be35a7b9210d0d84a96f46f6ee1cdcbfd7d01e5e89338d700c3 SHA512 d35e758ee7611e3d8a7fa773600d32b3d8945480166c607644cb1d375370f2ad05bb3234b5a7c51a3cec190346623db72fe5a2156a7b67333972f6bd0f15e530 WHIRLPOOL 240218a39d3798ef73e4c1c175fbb9dd16033bccc91367a6770f6fbd295f746977ea0d6cce79d949825a48b43d8ff25254c47c0202ec8cca2a4e6c460865ad24
 DIST NVIDIA-FreeBSD-x86-352.63.tar.gz 55368686 SHA256 1d290a9d583b6e99addb4888c2b1c568bbcec712fd98c034be2448a0d1228313 SHA512 b2cb33f6e3a2ef69dd7759217f8d2eac4197940bda5007a3d755e8769df70a197485a1df6186bb5eb5e8c2a70117a2bdcbe10b9f0e02f6eb2ca30180c4ee49bb WHIRLPOOL 695e2daff45a532e3217612d28dc102b88554c775cf67af39f413871427bfbf895901ad582e78f7581f32a571b1425d3de6e74696282f8be9eec81b556357058
 DIST NVIDIA-FreeBSD-x86-355.11.tar.gz 56832647 SHA256 3d4d5d8fcf558a8f5f1a88846161b1a89bd7fc66c0268b40613c7e3457f5ce7b SHA512 744d9b8c48b82bac0bfeea5e8b2b2bbaa0e6a183cbd1f5d4f782fa7b21a6f6c5b252e556a8b2161c3b5d43938ef8fabf6cb36f995ee823fbf792f3c9a92b87e1 WHIRLPOOL 43bceb8e8d3b00789cf2c8163a055b1d2405ef93e471fda4c4e2146093289891557f4ec8debfe6bca89ad6ed6dc2e389f1d3060759a71e8949df343bc31b85b9
+DIST NVIDIA-FreeBSD-x86-358.16.tar.gz 58548165 SHA256 2257d9a2b3661d024be0864e2fe192de34fdf8e206073930541e0fa6f232016e SHA512 e1d84c2cc3473253b31aa3df8e2ad7418da5789e31d6f71f07e6bf5e712ffcb6417cf8931c16e5e5a19d0f4cdaebf229e4edbee53d5613bea1ff6b4e4c6657cc WHIRLPOOL 15b760556d978c9e82b063c1135089e1b1222460285ab2c40d450cf26820e701ff5d7ebdd04815f80a68a07eea0e622fa621b8369883f4168af5b45d4edde62d
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.128.tar.gz 35481444 SHA256 ee38635fb02eb598dd0cdfdbc9014096774104d75ba42fee7688126e531fed8f SHA512 36b045bd556512c83fc841e5d379b1af70b47df99f7042b64d3ed009f3dadb8e7a06e34506b839d0e936de06064c343aac370dad3fe96ea53aa3e25322eda0ff WHIRLPOOL bc53f009da857ca34396f6d49e9c8774e0062cfb437a1b711256b3c0bbbd50d49bb4691697ce7bee347533aeb150d7fe6d061170c1ca9ced6a694694399542c8
 DIST NVIDIA-FreeBSD-x86_64-304.131.tar.gz 35812363 SHA256 e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a SHA512 0df69d11c79cfd66f40f5adf091f9c3ad494b89fbe9200a1a01fef8cb2d2591ffdeb703d82a263e050384d39ef81af3a717ac24716f96b1fd8386d1758bcf45b WHIRLPOOL a7e01ac4646d52229efb1d22df9b4db98bfd6bc30c79fc4c65273001b1cd09c4db823a0141a060f8c53926ae23a33fe66e27aec805879228d64bf3f45aa66bcd
@@ -16,6 +17,7 @@ DIST NVIDIA-FreeBSD-x86_64-346.96.tar.gz 58774970 SHA256 89daaff29afe92d825ec8c0
 DIST NVIDIA-FreeBSD-x86_64-352.55.tar.gz 56869851 SHA256 b8e29e23619382bf470bd899223b290d58920abaee1b3fe58a1ae600b8965b7f SHA512 36f4ef497d5871e0eee3918a867194142afb869d04ef78ddd3fc591fc543fa50b2099b23392a1b1168c7bd558bf79e057f4f0e2c5fc5badb1f45741e6ba5d49d WHIRLPOOL 02e972f11b992ef4f3abe29961b2f6da4bf46fceab93f732ff5f02eb1378472f319ff9425fb5c5f389d0a6b634b34a0ba21b37d23861cec09cc7e6b8329002a4
 DIST NVIDIA-FreeBSD-x86_64-352.63.tar.gz 57026971 SHA256 ac2e3926df50f6c0a020b359b29dee0f81a9474d7d68944edf9026c73f672cb6 SHA512 7ef75124b4cdd2de67f3001a74d0fb8f13f4c767c806615cb993749a54e7932d1a9f45b162bcde5dd1d617764950290cd240aa71cd3b0bf11384606986449d91 WHIRLPOOL c9a69476b8d73fa242b2f667b2eb7e40d9ec88f2a8dc65cdd6259573f53f7573e28f12845837be9b50210808536e5591b5853963348b0ccb896fc70a53ed5258
 DIST NVIDIA-FreeBSD-x86_64-355.11.tar.gz 54031364 SHA256 3637a879905bb541bf02f9bcdfe37c242a52ec6071671a0ba33581efdce1504e SHA512 84add7d90c7f45d19d736ee70c1c4a6434be1c512bafa29cbbf9221e99a31fc383971696dce99da5a77a171eb3537c98cfec7005ff061411ac9c310fa219c906 WHIRLPOOL d8ade5d63c3ef78fa92f9dc07934eed8fdd4ead1e40f1820ad95feb166264a95a800879e1fc6374bf2deef419b0838b4864796d9f81a81110d06ccd9b65c459d
+DIST NVIDIA-FreeBSD-x86_64-358.16.tar.gz 55338634 SHA256 29b62c266bb96604e82c5a514aebea86b65057fa59ba37f91bd01cd870a0725c SHA512 2e5aef35d5c4aa605ebe18a23ab132fe373c9b87a915ada005ecd28d75a476d6ac9d978394f8c63123f98a408dcc97d624b5deda5f242faea7304fc8ddf76d0d WHIRLPOOL bc8ee78214209fdeb0c6fc196cbc3acc244c777df8a83b5a5489959a73b744ecc125d7a9be6ca2f08d43b6a080898b1090eca45e627c96210dcfeb6207512c8e
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.128.run 40607927 SHA256 f6aa695b3375473e3444412e4a3b7ef6bd8b13e3f3678f4cbe7a3649b5129068 SHA512 9822b61872ae28751cd5c41714048612f7ddf0fd9f02e6340598150afbea43dddeba88482a8c88bcf893b015d14b2a2cf5157ed60583da57fdfe183ecb620c90 WHIRLPOOL 6ffb8d0638af82c3a844f699c57379863fbef3a79b1308bb382c38015fbf26889e41f911f327b63a955586c1c636ecc4ad399fc12db189739d9e80fd63ed1390
 DIST NVIDIA-Linux-x86-304.131.run 40893199 SHA256 d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8 SHA512 3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e WHIRLPOOL 88e9cc0270a4fc64ed8475a217c7c8c50e6ea21fe14b5b5beb16f494bd62bf5ada2f47e26e5380dd3d0bc678091e29f0e26937eef1ee3c7bdc5805153201bae3
@@ -25,6 +27,7 @@ DIST NVIDIA-Linux-x86-346.96.run 40751579 SHA256 8a299ddce7d34389206599a306a41d3
 DIST NVIDIA-Linux-x86-352.55.run 42435938 SHA256 1d2f237b0885e0492f068786a5c3612f5e9751542826c4c7d51612193d9dd841 SHA512 8bcd612ddced33936f0f148420f847d5ea9c1596b9f4305e666131d84cc3c81753ca9ef7a6547e15b8739b11667389669b2dc27f7dd03cc5764de51dfca0a84f WHIRLPOOL 771e334c85bb91a8be499df7fa46bdab159321679f16371f11aba8fe94c68d3b33ada5af5e8613f1be6ac337cde020719479ecfe53c7f5854ac019c9f918b53e
 DIST NVIDIA-Linux-x86-352.63.run 42983438 SHA256 484442dd5163c3249e86736b1e297cb4b500f60eeeaa2ac6f570335fa1e8b96f SHA512 499e9949d0221e40c8050a589e5d174d8c38108152948876cd9e523ce9d3b7f85646c40c76d2af032ead848d6508189afaa27226100d72b0484ce3634d3434a8 WHIRLPOOL 79424e46ba2a4a3fafd01364230779c567b5a002e4bbe9056415d6cce6ac8492e88e0676d64cb9deb24eefb5be61221c32b4a432224ce835a884f93c55929fe5
 DIST NVIDIA-Linux-x86-355.11.run 43569515 SHA256 94ce6b879581b931b84d83a9111040b9a5aa9306b012b4380cd93f6ffede3066 SHA512 450caea472c5e1b3d7098adba28d18c1221cf809c6bd0071466ff2a946dd0eca6555475f5f6bc044fb19a21c8939b1020357d4aeb0ce47d0edfcda071a66fd46 WHIRLPOOL 3a95e83ab3f46e64150caf1489aa3173aae69919bf432eabcdd0501de8bcdee5402cdb33e149a4d5d429ccb85e4b4af9b30bec5516ad7b7f091ae42f6093d26f
+DIST NVIDIA-Linux-x86-358.16.run 43972195 SHA256 d3a2842cbfb1163e20c658fbfaf5a235d5c9f035cd2d657f15df8a14b3fe80b1 SHA512 a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20 WHIRLPOOL 336e56827619ad53622c3fbf9fb3e9895a08b8500b81f3830514a34913180e3dc5c6f170f14675fa628e2c9658a084d7f9c45f47213d28335ecfee53c8110907
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.128.run 69091465 SHA256 e301342b93af24a6676519cb3a7fbe5d557b6a23a588ef121478b7fbab8a495f SHA512 493b6c9647122c9fda5ac3146f3e8f60000d3efd09e93762d49d70266baffeba493479fb046cf2f6465b2ce9e53a8699254cbd165b5a3efcefee5fca9fb11056 WHIRLPOOL fe9735282f91e8e68c50325a4c0506d18347b53fb11f0328a6d0fc1f395ec3d2ea48a510b90f3c05f1c447b40db94216a0445eadac220ff500c5864439845b1b
@@ -35,5 +38,5 @@ DIST NVIDIA-Linux-x86_64-346.96.run 73538317 SHA256 229b28a6b65965a248d07223d941
 DIST NVIDIA-Linux-x86_64-352.55.run 77698379 SHA256 d8c9b5a15c1e4712ae6c081a0bda2c09fdabae516798351fc7f70c28df7e1c5e SHA512 4b27e532c2b099aaf049d0931a677519d7432c9703799af5e9f7370031abb69898cd61524f84063f128250f35f15432860ac773af8b1b6afefd46cad63a28854 WHIRLPOOL 74d635cb1c0b310d37369b13147a88e695bc2ceb3faec2aa121453d0cc3a3ca8869fd42c22bca0ee74ad9226525a8413dfcf1e133230ba014438fd504f5092ed
 DIST NVIDIA-Linux-x86_64-352.63.run 77647248 SHA256 3705a122fbd4fe04f4077dea7ba8b1127f1a9b40e92f3abc7afa91964e817e2a SHA512 37b38be1e9394aa8bdd33cfbdf3c16ed62b16f852f76e013fb5573803e057ac51f6728ff594f7d48008871d9503fe64bb6e2dfc00b4415a62894f7f26c6ad719 WHIRLPOOL df8debfe7655982a7ca2194cdd833e8dcdb69250077c18551a0b93c31eadeea793b21118ecdc7b9f59721ab0f8431a0442152d3d685a1afac87587dbed3ec816
 DIST NVIDIA-Linux-x86_64-355.11.run 76490009 SHA256 a59b425381add9d9058dc2d987bf3087ab59c43224b5eb04c3f273f5886451ed SHA512 bfc7ab7741183408aa0226dc29176c8ffe08566fbea7cebf78f4aa30627dc27ddf90bb82951c99006b34bc481be15712b4f5867ef543a32bfe3fe81a8e6ddeae WHIRLPOOL bb5d3397a855a53c2cd7e48056564085b906550f856207932e4670fef995030a3a7bcc0a9b97fee2e60aaff9b41c4a954afc57585441f5dec92c795358da810a
-DIST NVIDIA-Linux-x86_64-358.13.run 76695266 SHA256 d0f280ee1ecfd24a8ad527eb600dbc788122eb21b494ab7611630c053a4e4a7c SHA512 0e438d561422faac633731346768cda33dcd51ad3ade0425071a2065ae18ec673bb74cfd34f2cabb7a4b6d703ec1b00bd1b6f75b3fd4e7e8f94d7e01f8c3b59f WHIRLPOOL 2dc8290195c5eb11b4f04cc00c7092831e990685f1c86a783c913964d50a33a054c136b88c76ad6d5e3f1bc4f588139ef694bfb9581456a49318b31be0c63f24
+DIST NVIDIA-Linux-x86_64-358.16.run 77353969 SHA256 a942cdb29ed715ff1ce25beb06b6c2490126b98ef8bee5d9973967b557596bf2 SHA512 4ae43f5e8c311d6c97eb89b02504bf52e3a947c71662f30641988a78eb9fe083370124aeee3b89db74f8ee50f454338db98dc7abeb35a242ba5729fefccead77 WHIRLPOOL 3dd0dcd4b455fcac12d55f40cfb8db0536af82d90c32b8471528b44a9fa1b3f3706ac26558d7395f82649c37550fded17b48d75d5584b3a41390c94bb1135c48
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
index 7d0a1a4a7af19d2e35c4b7f4189b5d039e90def2..c66e684f120ba0faaf5dd20343f9bf58f8b175c7 100644 (file)
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r1"
 SLOT="0/304"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
index e597dd3aa6fe2ae7f94f6a3916f3a258f9ae1df9..cba0fdda652ab1f96028dfd36c0c70806e0add34 100644 (file)
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/340"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X uvm"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
index b2335ec15471d77b33b6516fac4794b10f82c739..ac01d43db3b83e25c400ea9cbf5c4e19f424ff25 100644 (file)
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/352"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
similarity index 98%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.13.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
index 1f46ba149018a65f407352afd5666d0237ae4dbc..44a9162ac84925c2aae5854103f7ce289c559293 100644 (file)
@@ -16,12 +16,15 @@ AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 DESCRIPTION="NVIDIA Accelerated Graphics Driver"
 HOMEPAGE="http://www.nvidia.com/"
 SRC_URI="
+       amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
        amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
 "
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/358"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
diff --git a/x11-misc/growl-for-linux/growl-for-linux-0.6.7-r1.ebuild b/x11-misc/growl-for-linux/growl-for-linux-0.6.7-r1.ebuild
new file mode 100644 (file)
index 0000000..69103e2
--- /dev/null
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils
+
+DESCRIPTION="Growl Implementation For Linux"
+HOMEPAGE="https://mattn.github.com/growl-for-linux/"
+SRC_URI="mirror://github/mattn/growl-for-linux/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="dev-db/sqlite:3
+       dev-libs/dbus-glib
+       dev-libs/glib:2
+       dev-libs/libxml2
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
+       net-misc/curl
+       x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+       local myeconfargs=(
+               LIBS=-lgthread-2.0
+               --disable-static
+       )
+       autotools-utils_src_configure
+}
+
+src_install() {
+       autotools-utils_src_install
+       prune_libtool_files --modules
+}
index c406ebeeff83a4b32ec41cc8487281b1e5f2ed37..10f7e1ed8c666fab9495e55604e2841dbb9bedad 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ RDEPEND="dev-db/sqlite:3
        dev-libs/dbus-glib
        dev-libs/glib:2
        dev-libs/libxml2
-       dev-libs/openssl
+       dev-libs/openssl:0
        net-misc/curl
        x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
index 5787e8dcfe0964905f499894c94a4f50447bd861..4d78169060445d66e65ce98b5a2a54ac7c4857db 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,12 +14,14 @@ HOMEPAGE="https://mattn.github.com/growl-for-linux/"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
+IUSE="libressl"
 
 RDEPEND="dev-db/sqlite:3
        dev-libs/dbus-glib
        dev-libs/glib:2
        dev-libs/libxml2
-       dev-libs/openssl
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
        net-misc/curl
        x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..605afb1
--- /dev/null
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit versionator
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
+https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+       branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="ayatana branding"
+
+COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
+       x11-libs/gtk+:3
+       >=x11-misc/lightdm-1.2.2"
+
+DEPEND="${COMMON_DEPEND}
+       sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+       x11-themes/gnome-themes-standard
+       || ( >=x11-themes/adwaita-icon-theme-3.14.1 x11-themes/gnome-icon-theme )"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+       # Ok, this has to be fixed in the tarball but I am too lazy to do it.
+       # I will fix this once I decide to update the tarball with a new gentoo
+       # background
+       # Bug #404467
+       if use branding; then
+               sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
+                       "${WORKDIR}"/${PN}.conf || die
+       fi
+}
+
+src_configure() {
+       econf --enable-kill-on-sigterm \
+               $(use_enable ayatana libindicator)
+}
+
+src_install() {
+       default
+
+       if use branding; then
+               insinto /etc/lightdm/
+               doins "${WORKDIR}"/${PN}.conf
+               insinto /usr/share/lightdm/backgrounds/
+               doins "${WORKDIR}"/${GENTOO_BG}
+               sed -i -e \
+                       "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+                       "${D}"/etc/lightdm/${PN}.conf || die
+               newdoc "${WORKDIR}"/README.txt README-background.txt
+       fi
+}
index ff3f0daf4bc6c3aabb4247117cbe42e536829100..3edb3b1f2d74268801b2eafaa5cbe110187c6c5e 100644 (file)
@@ -13,14 +13,15 @@ SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="libressl"
 
 RDEPEND="
        >=dev-qt/qtcore-4.5:4
        >=dev-qt/qtdbus-4.5:4
        >=dev-qt/qtgui-4.5:4[qt3support]
        >=dev-qt/qtscript-4.5:4
-       dev-libs/openssl:0
+       !libressl? ( dev-libs/openssl:0 )
+       libressl? ( dev-libs/libressl )
        x11-libs/libX11
 "
 DEPEND="${RDEPEND}
diff --git a/x11-misc/sent/Manifest b/x11-misc/sent/Manifest
new file mode 100644 (file)
index 0000000..99bdf08
--- /dev/null
@@ -0,0 +1 @@
+DIST sent-0.2.tar.gz 13479 SHA256 53b961f9d92a277a6408df7025b4a6deae6b655a797383c93442290e45391076 SHA512 22c1e1e1bb7dbdaacb75a71a34ab533ca17b632e505ff96a351a907b861009b748502f7ad2934397f40842bef11e3072e814952a6abb141d470d0bb2e34a1540 WHIRLPOOL d8f83dc259722b0a20d90e76ae77d5013ebc91974848c7b53a520e3ace563844a6fcf5a81c4664e35cae6a9dd8199a9425699f8817d52d05ba882c8154ca78dd
diff --git a/x11-misc/sent/metadata.xml b/x11-misc/sent/metadata.xml
new file mode 100644 (file)
index 0000000..ef0483f
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/sent/sent-0.2.ebuild b/x11-misc/sent/sent-0.2.ebuild
new file mode 100644 (file)
index 0000000..aeb1433
--- /dev/null
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="Simple plaintext presentation tool"
+HOMEPAGE="http://tools.suckless.org/sent/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+       media-libs/fontconfig
+       media-libs/libpng:*
+       x11-libs/libX11
+       x11-libs/libXft
+"
+
+DEPEND="
+       ${RDEPEND}
+
+"
+
+src_prepare() {
+       sed -i \
+               -e 's|^ @|  |g' \
+               -e 's|@${CC}|$(CC)|g' \
+               -e '/^  echo/d' \
+               Makefile || die
+
+       restore_config config.def.h
+}
+
+src_compile() {
+       emake CC=$(tc-getCC)
+}
+
+src_install() {
+       emake DESTDIR="${D}" PREFIX="/usr" install
+}
index 9b2e2c032aa7007d15e06ab6f8695fe35d37d425..5c7762eaa4c1acb9d3eda863d7729ef77cfcb754 100644 (file)
@@ -20,7 +20,7 @@ IUSE="qt4 test"
 S=${WORKDIR}/${P}-stable
 
 COMMON_DEPEND="
-       dev-libs/openssl
+       dev-libs/openssl:*
        x11-libs/libICE
        x11-libs/libSM
        x11-libs/libX11
diff --git a/x11-misc/synergy/synergy-1.7.5-r1.ebuild b/x11-misc/synergy/synergy-1.7.5-r1.ebuild
new file mode 100644 (file)
index 0000000..363c22b
--- /dev/null
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/synergy/synergy"
+SRC_URI="
+       https://github.com/${PN}/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
+       https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="libressl qt4 test"
+
+S=${WORKDIR}/${P}-stable
+
+COMMON_DEPEND="
+       !libressl? ( dev-libs/openssl:* )
+       libressl? ( dev-libs/libressl )
+       x11-libs/libICE
+       x11-libs/libSM
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXi
+       x11-libs/libXinerama
+       x11-libs/libXrandr
+       x11-libs/libXtst
+       qt4? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4
+               net-dns/avahi[mdnsresponder-compat]
+       )
+"
+DEPEND="
+       ${COMMON_DEPEND}
+       test? ( >=dev-cpp/gmock-1.6.0 )
+       x11-proto/kbproto
+       x11-proto/randrproto
+       x11-proto/xextproto
+       x11-proto/xineramaproto
+       x11-proto/xproto
+"
+RDEPEND="
+       ${COMMON_DEPEND}
+       qt4? ( !x11-misc/qsynergy )
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
+       "${FILESDIR}"/${PN}-1.4.17_p2055-test.patch
+       "${FILESDIR}"/${PN}-1.7.5-gentoo.patch
+)
+
+src_prepare() {
+       cmake-utils_src_prepare
+}
+
+src_configure() {
+       local mycmakeargs=(
+               "$(cmake-utils_use_with test GENTOO_TEST)"
+       )
+       cmake-utils_src_configure
+
+       if use qt4 ; then
+               cd src/gui || die
+               qt4-r2_src_configure
+       fi
+}
+
+src_compile() {
+       cmake-utils_src_compile
+
+       if use qt4 ; then
+               cd src/gui || die
+               qt4-r2_src_compile
+       fi
+}
+
+src_test() {
+       local exe fail
+       for exe in bin/integtests bin/unittests; do
+               ${exe} || fail+=" ${exe}"
+       done
+       [[ ${fail} ]] && ewarn "${fail} failed"
+}
+
+src_install () {
+       dobin bin/${PN}{c,s} bin/syntool
+
+       if use qt4 ; then
+               newbin bin/${PN} qsynergy
+               newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
+               make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
+       fi
+
+       insinto /etc
+       newins doc/synergy.conf.example synergy.conf
+
+       newman doc/${PN}c.man ${PN}c.1
+       newman doc/${PN}s.man ${PN}s.1
+
+       dodoc README doc/synergy.conf.example* ChangeLog
+}
+
+pkg_preinst() {
+       use qt4 && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+       use qt4 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+       use qt4 && gnome2_icon_cache_update
+}
index ec47c055b6695ec34284e27637025f6b93bc1f2a..2b5e646fc0be0630f2f0c77045033bc10172dee9 100644 (file)
@@ -1,4 +1 @@
-DIST vdpauinfo-0.0.6.tar.gz 77375 SHA256 52bb5d817b16984aca2d410584150cd35551bdfd6346688a377d406e25a65454 SHA512 d6dca1908e522227441f108052c9bfe8201bf907ffb7d6d86b1a701f815411f7063454ca7d9beb643a1ed7634f178ebd47218d2e445585f6f1c2c70b6c29c867 WHIRLPOOL dd7d37dfb9880c68a2ccc2deaea6ddacfaa687ddd0800b94adf12fe5e89314604bc13b31b629a642e33e6a0880380a080757730fd768556ebaf3403ee35e76c6
-DIST vdpauinfo-0.1.tar.gz 82732 SHA256 b0c856a6933e306f3f783717a29124c7d145d6027a3175e197249696f5d5019f SHA512 f72e05b5b7189aa431ab6e6a6e7d976cbf6072ab16d1aa6a06cef12d0aaa6778e4d38619d08da7784968b5a709b209d6584ec3f9d52f6fbdd2e81b1bf21d1f17 WHIRLPOOL 3461b637cc5ad1c182a6d0c325583148a4365234110c1a07c9cd88221f364dbc79355c0cb90696b870974de7968e5f86f480cc745c23bd607de95cd012608f50
-DIST vdpauinfo-0.9.tar.gz 87887 SHA256 a040fe3682db4cb6076179185a68559a62b908cd01f0aee086838eaf2923c8e3 SHA512 dc54db4778d53704814b25d37ee05ee3c0b1e20aca701e695a5e87ad90ae609c5ad778f2571f3637af9cfe0cb0fa5f829ef19cfb7b28d16120db50da2b763fe2 WHIRLPOOL 359411d9f9599aa221bcdb4e85990b86d20520add4ba752f2eb8e8a8e049534708bf820047574b3e15f4d9c63af45103b4777605439c26989e9ef0f5b1f9e8c8
 DIST vdpauinfo-1.0.tar.gz 88567 SHA256 4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4 SHA512 54c177424bdae65374a13c0546ecda0e25e7357f9e779fb48dc018a9c11593039f87715ea18b320684dca22455df9b41a4eea6b0f977956efb6ab85b8b99297e WHIRLPOOL 5d43539332773a328c1a5a12b5ec0e1d2729217fda056a6fc5427fdcb228a8da4a674599c8d9e21f71e8d2378c1d9e47f132de44e60f670559a78003fb9c5722
diff --git a/x11-misc/vdpauinfo/vdpauinfo-0.0.6.ebuild b/x11-misc/vdpauinfo/vdpauinfo-0.0.6.ebuild
deleted file mode 100644 (file)
index bbb6d7d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-               x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-               virtual/pkgconfig
-               x11-proto/xproto"
diff --git a/x11-misc/vdpauinfo/vdpauinfo-0.1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-0.1.ebuild
deleted file mode 100644 (file)
index f534615..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-               x11-libs/libvdpau"
-DEPEND="${RDEPEND}
-               virtual/pkgconfig
-               x11-proto/xproto"
diff --git a/x11-misc/vdpauinfo/vdpauinfo-0.9-r1.ebuild b/x11-misc/vdpauinfo/vdpauinfo-0.9-r1.ebuild
deleted file mode 100644 (file)
index 909aa7d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Displays info about your card's VDPAU support"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
-SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-               >=x11-libs/libvdpau-0.9"
-DEPEND="${RDEPEND}
-               virtual/pkgconfig
-               x11-proto/xproto"
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r2.ebuild
new file mode 100644 (file)
index 0000000..86cdb6f
--- /dev/null
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib multilib systemd
+
+DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
+HOMEPAGE="http://www.virtualgl.org/"
+
+MY_PN="VirtualGL"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl ssl"
+
+RDEPEND="
+       ssl? (
+               !libressl? ( dev-libs/openssl:0[${MULTILIB_USEDEP}] )
+               libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+       )
+       media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
+       x11-libs/libX11[${MULTILIB_USEDEP}]
+       x11-libs/libXext[${MULTILIB_USEDEP}]
+       x11-libs/libXv[${MULTILIB_USEDEP}]
+       virtual/glu[${MULTILIB_USEDEP}]
+       virtual/opengl[${MULTILIB_USEDEP}]
+       amd64? ( abi_x86_32? (
+               >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
+               >=x11-libs/libX11-1.6.2[abi_x86_32]
+               >=x11-libs/libXext-1.3.2[abi_x86_32]
+               >=x11-libs/libXv-1.0.10[abi_x86_32]
+               >=virtual/glu-9.0-r1[abi_x86_32]
+               >=virtual/opengl-7.0-r1[abi_x86_32]
+       ) )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       # Use /var/lib, bug #428122
+       sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
+               server/vglrun.in server/vglgenkey server/vglserver_config || die
+
+       default
+}
+
+src_configure() {
+       abi_configure() {
+               local mycmakeargs=(
+                       $(cmake-utils_use ssl VGL_USESSL)
+                       -DVGL_DOCDIR=/usr/share/doc/"${PF}"
+                       -DTJPEG_INCLUDE_DIR=/usr/include
+                       -DVGL_LIBDIR=/usr/$(get_libdir)
+                       -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
+                       -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+                       -DVGL_FAKELIBDIR=/usr/fakelib/${ABI}
+               )
+               cmake-utils_src_configure
+       }
+       multilib_parallel_foreach_abi abi_configure
+}
+
+src_install() {
+       cmake-multilib_src_install
+
+       # Make config dir
+       dodir /var/lib/VirtualGL
+       fowners root:video /var/lib/VirtualGL
+       fperms 0750 /var/lib/VirtualGL
+       newinitd "${FILESDIR}/vgl.initd-r2" vgl
+       newconfd "${FILESDIR}/vgl.confd-r2" vgl
+
+       exeinto /usr/libexec
+       doexe "${FILESDIR}/vgl-helper.sh"
+       systemd_dounit "${FILESDIR}/vgl.service"
+
+       # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
+       mv "${D}"/usr/bin/{,v}glxinfo || die
+
+       # Remove license files, bug 536284
+       rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
+}