net-misc/openssh: Merge "Drop special settings for Gentoo/FreeBSD 9.0"
authorMichał Górny <mgorny@gentoo.org>
Sat, 31 Oct 2015 10:12:57 +0000 (11:12 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sat, 31 Oct 2015 10:12:57 +0000 (11:12 +0100)
Pull-Request: https://github.com/gentoo/gentoo/pull/309

309 files changed:
app-admin/apg/metadata.xml
app-admin/fleet/metadata.xml
app-admin/glance/glance-2015.1.1-r3.ebuild
app-admin/glance/glance-2015.1.2.ebuild
app-admin/glance/glance-2015.1.9999.ebuild
app-admin/glance/glance-2015.2.9999.ebuild
app-admin/puppet-agent/Manifest
app-admin/puppet-agent/puppet-agent-1.2.7.ebuild [new file with mode: 0644]
app-admin/syslog-ng/syslog-ng-3.7.1.ebuild
app-admin/ulogd/metadata.xml
app-admin/webapp-config/webapp-config-1.54-r1.ebuild
app-crypt/cryptkeeper/metadata.xml
app-doc/doxygen/doxygen-1.8.10-r1.ebuild
app-doc/pms/pms-5-r2.ebuild
app-doc/pms/pms-9999.ebuild
app-eselect/eselect-awk/eselect-awk-0.2.ebuild
app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild [new file with mode: 0644]
app-i18n/ibus-libpinyin/metadata.xml
app-misc/pwsafe/metadata.xml
app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild [deleted file]
app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
app-office/lyx/lyx-2.1.4.ebuild
app-office/mdbtools/metadata.xml
app-office/texstudio/texstudio-2.10.2.ebuild
app-portage/conf-update/conf-update-1.0.3.ebuild
app-portage/metagen/Manifest
app-portage/metagen/metagen-0.6.3.ebuild [new file with mode: 0644]
app-text/calibre/calibre-1.20.ebuild
app-text/calibre/calibre-1.47.ebuild
app-text/calibre/calibre-1.48-r1.ebuild
app-text/calibre/calibre-2.27.0.ebuild
app-text/calibre/calibre-2.31.0.ebuild
app-text/calibre/calibre-2.33.0.ebuild
app-text/calibre/calibre-2.34.0.ebuild
app-text/calibre/calibre-2.35.0.ebuild
app-text/calibre/metadata.xml
app-text/cuneiform/metadata.xml
app-text/dvisvgm/dvisvgm-1.10.ebuild
app-text/libexttextcat/libexttextcat-3.4.4.ebuild
app-text/linuxdoc-tools/metadata.xml
app-text/multitail/Manifest
app-text/multitail/multitail-6.4.2.ebuild [new file with mode: 0644]
dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
dev-java/groovy/metadata.xml
dev-java/javax-inject/Manifest
dev-java/javax-inject/javax-inject-1-r2.ebuild [new file with mode: 0644]
dev-java/jssc/Manifest [new file with mode: 0644]
dev-java/jssc/jssc-2.8.0.ebuild [new file with mode: 0644]
dev-java/jssc/metadata.xml [new file with mode: 0644]
dev-java/myfaces-api/Manifest [new file with mode: 0644]
dev-java/myfaces-api/metadata.xml [new file with mode: 0644]
dev-java/myfaces-api/myfaces-api-2.2.8.ebuild [new file with mode: 0644]
dev-java/myfaces-builder-annotations/Manifest [new file with mode: 0644]
dev-java/myfaces-builder-annotations/metadata.xml [new file with mode: 0644]
dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild [new file with mode: 0644]
dev-lang/R/Manifest
dev-lang/R/R-3.0.1.ebuild [deleted file]
dev-lang/R/R-3.0.3.ebuild [deleted file]
dev-lang/R/R-3.1.0.ebuild [deleted file]
dev-lang/R/R-3.1.1.ebuild [deleted file]
dev-lang/R/R-3.1.2.ebuild [deleted file]
dev-lang/R/R-3.2.0-r1.ebuild [deleted file]
dev-lang/R/R-3.2.2.ebuild
dev-lang/R/files/R-2.12.1-ldflags.patch [deleted file]
dev-lang/R/files/R-2.14.1-rmath-shared.patch [deleted file]
dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch [deleted file]
dev-lang/ekopath/Manifest
dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild [deleted file]
dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild [deleted file]
dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild [deleted file]
dev-lang/ekopath/ekopath-6.0.570_p20151029.ebuild [moved from dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild with 100% similarity]
dev-lang/php/Manifest
dev-lang/php/php-5.6.15.ebuild [new file with mode: 0644]
dev-lang/php/php-7.0.0_rc5.ebuild
dev-lang/python/python-2.7.10.ebuild
dev-lang/python/python-3.4.3.ebuild
dev-libs/cxxtools/cxxtools-1.4.8.ebuild
dev-libs/cxxtools/cxxtools-2.2.1.ebuild
dev-libs/elfutils/elfutils-0.163.ebuild
dev-libs/geoip/geoip-1.6.6.ebuild
dev-libs/libconfig/Manifest
dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch [deleted file]
dev-libs/libconfig/libconfig-1.4.9-r1.ebuild [deleted file]
dev-libs/libconfig/libconfig-1.5.ebuild
dev-libs/libebml/libebml-1.3.3.ebuild
dev-libs/libevent/libevent-2.1.5-r3.ebuild
dev-libs/libevent/libevent-2.1.5-r4.ebuild
dev-libs/libevent/libevent-2.1.5.ebuild
dev-libs/libevent/libevent-9999.ebuild
dev-libs/libmaxminddb/Manifest [new file with mode: 0644]
dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild [new file with mode: 0644]
dev-libs/libmaxminddb/metadata.xml [new file with mode: 0644]
dev-libs/libressl/libressl-2.2.4.ebuild
dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch [new file with mode: 0644]
dev-libs/libxml2/libxml2-2.9.2-r1.ebuild
dev-ml/menhir/Manifest
dev-ml/menhir/menhir-20151026.ebuild [new file with mode: 0644]
dev-ml/ocurl/Manifest
dev-ml/ocurl/ocurl-0.7.6.ebuild [new file with mode: 0644]
dev-python/dnspython/dnspython-1.11.1.ebuild
dev-python/dnspython/dnspython-1.12.0-r1.ebuild [deleted file]
dev-python/dnspython/dnspython-1.12.0-r200.ebuild [moved from dev-python/dnspython/dnspython-1.12.0.ebuild with 77% similarity]
dev-python/dnspython/dnspython-1.12.0-r300.ebuild [new file with mode: 0644]
dev-python/enable/enable-4.5.1.ebuild
dev-python/enable/files/enable-4.5.1-doc.patch [new file with mode: 0644]
dev-python/enable/files/enable-4.5.1-version.patch [new file with mode: 0644]
dev-python/formencode/formencode-1.3.0-r2.ebuild [moved from dev-python/formencode/formencode-1.3.0-r1.ebuild with 92% similarity]
dev-python/matplotlib/Manifest
dev-python/matplotlib/matplotlib-1.5.0.ebuild [new file with mode: 0644]
dev-python/plyr/metadata.xml
dev-python/pyfltk/pyfltk-1.3.3.ebuild
dev-python/pygments/Manifest
dev-python/pygments/files/2.0.2-shell-injection-backport.patch [new file with mode: 0644]
dev-python/pygments/files/2.0.2-shell-injection-backport2.patch [new file with mode: 0644]
dev-python/pygments/metadata.xml
dev-python/pygments/pygments-1.6.ebuild [deleted file]
dev-python/pygments/pygments-1.6_p20140324-r1.ebuild [deleted file]
dev-python/pygments/pygments-2.0.1-r1.ebuild [deleted file]
dev-python/pygments/pygments-2.0.1.ebuild [deleted file]
dev-python/pygments/pygments-2.0.2-r1.ebuild [moved from dev-python/pygments/pygments-2.0.2.ebuild with 80% similarity]
dev-python/pyparsing/Manifest
dev-python/pyparsing/pyparsing-2.0.5.ebuild [new file with mode: 0644]
dev-python/python-nbxmpp/Manifest
dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild [deleted file]
dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild [deleted file]
dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild [moved from dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild with 96% similarity]
dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild [deleted file]
dev-python/pywebkitgtk/metadata.xml
dev-python/simplejson/simplejson-3.8.1.ebuild
dev-python/twill/metadata.xml
dev-python/twill/twill-0.9-r1.ebuild
dev-python/versioneer/Manifest [new file with mode: 0644]
dev-python/versioneer/metadata.xml [new file with mode: 0644]
dev-python/versioneer/versioneer-0.15.ebuild [new file with mode: 0644]
dev-python/wxpython/wxpython-3.0.2.0.ebuild
dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild [moved from dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild with 83% similarity]
dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
dev-qt/qtlockedfile/qtlockedfile-2.4.1_p20150629.ebuild
dev-qt/qtsingleapplication/qtsingleapplication-2.6.1_p20150629.ebuild
dev-ros/rosbridge_server/files/backports-ssl.patch [new file with mode: 0644]
dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild [moved from dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild with 85% similarity]
dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
dev-ruby/daemons/daemons-1.2.3.ebuild
dev-ruby/gherkin3/Manifest [new file with mode: 0644]
dev-ruby/gherkin3/gherkin3-3.1.2.ebuild [new file with mode: 0644]
dev-ruby/gherkin3/metadata.xml [new file with mode: 0644]
dev-ruby/highline/highline-1.7.6.ebuild
dev-ruby/hoe/hoe-3.13.0-r1.ebuild
dev-ruby/netrc/Manifest
dev-ruby/netrc/netrc-0.11.0.ebuild [moved from dev-ruby/netrc/netrc-0.10.2.ebuild with 83% similarity]
dev-ruby/netrc/netrc-0.9.0-r1.ebuild [deleted file]
dev-ruby/rexical/rexical-1.0.5-r3.ebuild
dev-ruby/ruby-shadow/ruby-shadow-2.4.1.ebuild
dev-ruby/syntax/syntax-1.2.0-r1.ebuild
dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild
dev-tex/sketch/metadata.xml
dev-util/bcpp/Manifest
dev-util/bcpp/bcpp-20150811.ebuild [new file with mode: 0644]
dev-util/coccinelle/Manifest
dev-util/coccinelle/coccinelle-1.0.4.ebuild [new file with mode: 0644]
dev-util/pkgconf/pkgconf-0.9.11.ebuild
dev-vcs/hub/Manifest
dev-vcs/hub/hub-2.2.2.ebuild [new file with mode: 0644]
games-rpg/manaplus/Manifest
games-rpg/manaplus/manaplus-1.5.10.24.ebuild [new file with mode: 0644]
games-server/etqw-ded/etqw-ded-1.5.ebuild
media-gfx/optipng/optipng-0.7.5-r1.ebuild
media-libs/chromaprint/Manifest
media-libs/chromaprint/chromaprint-0.6.ebuild [deleted file]
media-libs/chromaprint/chromaprint-0.7.ebuild [deleted file]
media-libs/chromaprint/chromaprint-1.1.ebuild [deleted file]
media-libs/chromaprint/chromaprint-1.2-r1.ebuild [new file with mode: 0644]
media-libs/chromaprint/chromaprint-1.2.ebuild
media-libs/chromaprint/files/chromaprint-0.7-boost.patch [deleted file]
media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch [deleted file]
media-libs/chromaprint/files/chromaprint-0.7-libav9.patch [deleted file]
media-libs/chromaprint/files/chromaprint-1.0-libav9.patch [deleted file]
media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch [deleted file]
media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch [deleted file]
media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch [new file with mode: 0644]
media-libs/kvazaar/Manifest [new file with mode: 0644]
media-libs/kvazaar/kvazaar-0.7.1.ebuild [new file with mode: 0644]
media-libs/kvazaar/kvazaar-9999.ebuild [new file with mode: 0644]
media-libs/kvazaar/metadata.xml [new file with mode: 0644]
media-libs/libmatroska/libmatroska-1.4.4.ebuild
media-libs/libmpdclient/libmpdclient-2.10.ebuild
media-libs/libpng/libpng-1.6.18.ebuild
media-libs/libsdl/libsdl-1.2.15-r9.ebuild
media-libs/opencv/opencv-3.0.0.ebuild
media-libs/zimg/Manifest [new file with mode: 0644]
media-libs/zimg/metadata.xml [new file with mode: 0644]
media-libs/zimg/zimg-2.0.1.ebuild [new file with mode: 0644]
media-libs/zimg/zimg-9999.ebuild [new file with mode: 0644]
media-sound/audacity/audacity-2.0.5-r1.ebuild [new file with mode: 0644]
media-sound/mpc/mpc-0.27.ebuild
media-sound/mpd/mpd-0.19.10.ebuild
media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
media-sound/ogg2mp3/metadata.xml
media-sound/qjackctl/Manifest
media-sound/qjackctl/qjackctl-0.3.11.ebuild [deleted file]
media-sound/qjackctl/qjackctl-0.3.12.ebuild [deleted file]
media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild [moved from media-sound/qjackctl/qjackctl-0.3.13.ebuild with 68% similarity]
media-video/ffmpeg/Manifest
media-video/ffmpeg/ffmpeg-2.8-r1.ebuild [deleted file]
media-video/ffmpeg/ffmpeg-2.8.ebuild [deleted file]
media-video/ffmpeg/ffmpeg-9999.ebuild
media-video/ffmpeg/metadata.xml
net-analyzer/2ping/2ping-3.0.1.ebuild [moved from net-analyzer/2ping/2ping-3.0.0.ebuild with 100% similarity]
net-analyzer/2ping/Manifest
net-analyzer/argus/Manifest
net-analyzer/argus/argus-3.0.8.1.ebuild
net-analyzer/argus/argus-3.0.8.2_rc2.ebuild [moved from net-analyzer/argus/argus-3.0.8.ebuild with 85% similarity]
net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch [deleted file]
net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
net-analyzer/linkchecker/linkchecker-9999.ebuild
net-analyzer/namebench/namebench-1.3.1-r2.ebuild [moved from net-analyzer/namebench/namebench-1.3.1-r1.ebuild with 87% similarity]
net-analyzer/pmacct/metadata.xml
net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild [new file with mode: 0644]
net-analyzer/wireshark/Manifest
net-analyzer/wireshark/wireshark-2.0.0_rc2.ebuild [moved from net-analyzer/wireshark/wireshark-2.0.0_rc1-r1.ebuild with 100% similarity]
net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild [moved from net-dns/hash-slinger/hash-slinger-2.6.ebuild with 90% similarity]
net-dns/hash-slinger/metadata.xml
net-dns/noip-updater/metadata.xml
net-firewall/fwknop/metadata.xml
net-im/err/err-1.7.1-r1.ebuild [moved from net-im/err/err-1.7.1.ebuild with 94% similarity]
net-im/gajim/Manifest
net-im/gajim/gajim-0.16.3.ebuild [deleted file]
net-im/gajim/gajim-0.16.4.ebuild
net-im/gajim/gajim-0.16.ebuild [deleted file]
net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
net-mail/dovecot/dovecot-2.2.19-r1.ebuild
net-mail/dovecot/dovecot-2.2.19.ebuild
net-mail/mailman/mailman-2.1.20-r1.ebuild [new file with mode: 0644]
net-mail/mailman/mailman-2.1.20.ebuild
net-misc/axel/axel-2.4-r3.ebuild
net-misc/electrum/electrum-2.5.1.ebuild
net-misc/electrum/metadata.xml
net-misc/ptpd/metadata.xml
net-misc/vpnc/metadata.xml
net-misc/yandex-disk/yandex-disk-0.1.5.870_p1.ebuild
net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
net-wireless/bluez/bluez-5.35.ebuild
profiles/arch/hppa/use.mask
profiles/arch/sparc/package.mask
profiles/base/package.use.mask
profiles/default/linux/uclibc/mips/packages.build [new file with mode: 0644]
sci-biology/rebase/Manifest
sci-biology/rebase/rebase-1511.ebuild [new file with mode: 0644]
sci-libs/gts/gts-20121130.ebuild
sci-libs/itpp/Manifest
sci-libs/itpp/files/itpp-4.0.6-gcc44.patch [deleted file]
sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch [deleted file]
sci-libs/itpp/files/itpp-4.2-automake-1.12.patch [deleted file]
sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch [deleted file]
sci-libs/itpp/files/itpp-4.2-pkg-config.patch [deleted file]
sci-libs/itpp/files/itpp-4.2-test-fftw.patch [deleted file]
sci-libs/itpp/itpp-4.2-r1.ebuild [deleted file]
sci-libs/itpp/itpp-4.2-r2.ebuild [deleted file]
sci-libs/itpp/itpp-4.3.0.ebuild [deleted file]
sci-libs/itpp/itpp-4.3.1-r1.ebuild
sci-libs/itpp/itpp-4.3.1.ebuild [deleted file]
sci-libs/scipy/scipy-0.16.1.ebuild
sci-mathematics/rw/metadata.xml
sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
sys-apps/rng-tools/rng-tools-5-r2.ebuild
sys-apps/util-linux/util-linux-2.26.2.ebuild
sys-cluster/nova/nova-2015.1.1-r3.ebuild
sys-cluster/nova/nova-2015.1.2.ebuild
sys-cluster/nova/nova-2015.1.9999.ebuild
sys-cluster/nova/nova-2015.2.9999.ebuild
sys-cluster/swift/swift-2.3.0-r1.ebuild
sys-cluster/swift/swift-2.5.0-r1.ebuild [moved from sys-cluster/swift/swift-2.5.0.ebuild with 98% similarity]
sys-devel/distcc/distcc-3.2_rc1-r4.ebuild
sys-devel/gcc/gcc-4.9.3.ebuild
sys-devel/kgcc64/kgcc64-4.9.3.ebuild
sys-fs/bedup/Manifest
sys-fs/bedup/bedup-0.10.0.ebuild [new file with mode: 0644]
sys-fs/bedup/bedup-9999.ebuild
sys-fs/lvm2/lvm2-2.02.116.ebuild
sys-kernel/gentoo-sources/Manifest
sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild [new file with mode: 0644]
sys-kernel/linux-firmware/linux-firmware-20150812.ebuild
sys-libs/glibc/glibc-2.21-r1.ebuild
sys-process/procps/procps-3.3.10-r1.ebuild
virtual/dnspython/dnspython-1.ebuild [new file with mode: 0644]
virtual/dnspython/metadata.xml [new file with mode: 0644]
www-client/dillo/dillo-3.0.5.ebuild
www-client/google-chrome-beta/Manifest
www-client/google-chrome-beta/google-chrome-beta-47.0.2526.35_p1.ebuild [moved from www-client/google-chrome-beta/google-chrome-beta-47.0.2526.27_p1.ebuild with 100% similarity]
www-client/google-chrome-unstable/Manifest
www-client/google-chrome-unstable/google-chrome-unstable-48.0.2547.0_p1.ebuild [moved from www-client/google-chrome-unstable/google-chrome-unstable-48.0.2541.0_p1.ebuild with 100% similarity]
www-plugins/chrome-binary-plugins/Manifest
www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.35_beta1.ebuild [moved from www-plugins/chrome-binary-plugins/chrome-binary-plugins-47.0.2526.27_beta1.ebuild with 100% similarity]
www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2547.0_alpha1.ebuild [moved from www-plugins/chrome-binary-plugins/chrome-binary-plugins-48.0.2541.0_alpha1.ebuild with 100% similarity]
www-servers/monkeyd/Manifest
www-servers/monkeyd/monkeyd-1.6.5.ebuild [moved from www-servers/monkeyd/monkeyd-1.6.4.ebuild with 100% similarity]
www-servers/monkeyd/monkeyd-9999.ebuild
x11-libs/fltk/fltk-1.3.3-r3.ebuild
x11-misc/vym/vym-9999.ebuild [new file with mode: 0644]
x11-misc/xosview/Manifest
x11-misc/xosview/xosview-1.14.ebuild [deleted file]
x11-misc/xosview/xosview-1.16.ebuild
x11-themes/chameleon-xcursors/metadata.xml
x11-themes/clearlooks-phenix/metadata.xml
x11-themes/fvwm-crystal/metadata.xml
x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
x11-wm/dwm/metadata.xml

index 6569104ff6e8e2563802a0981f843354bd12dc24..9cf9bbc84c786d7c2dcf392c5629ebeb82e06ce3 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-       <email>gentoobugsie.20.dsurawicz@spamgourmet.com</email>
+       <email>DuPol@gmx.de</email>
        <name>Dustin Polke</name>
        <description>Proxy Maintainer. CC him on bugs.</description>
 </maintainer>
index a86664824b47a59e496c0786ef25d6ae86b819dd..6e88cbd11a99d74c18d1bee93c82a62c5ef13f7d 100644 (file)
@@ -6,7 +6,7 @@
     <name>Alex Brandt</name>
   </maintainer>
   <maintainer>
-    <email>code@stefanjunker.de</email>
+    <email>mail@stefanjunker.de</email>
     <name>Stefan Junker</name>
   </maintainer>
   <longdescription lang="en">
index 88ae90121528bb8d4b3248df281c77dc6509a399..f442c1aaad415aa68e1c0776ef19cf9c5907a06f 100644 (file)
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 user
 
-DESCRIPTION="Provides services for discovering, registering, and retrieving
+DESCRIPTION="Services for discovering, registering, and retrieving
 virtual machine images"
 HOMEPAGE="https://launchpad.net/glance"
 SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
index c024b2072b592e2ab8d1ae9b74226f3f97f02510..24084b1bfadd1a430debe270eb0fecc78ddbff68 100644 (file)
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 user
 
-DESCRIPTION="Provides services for discovering, registering, and retrieving
+DESCRIPTION="Services for discovering, registering, and retrieving
 virtual machine images"
 HOMEPAGE="https://launchpad.net/glance"
 SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
index 7b62377e0012ec4ed4356d71ccfd1443dfbd1d85..c6c822b90e78c4beec08e7ae381127492b77e6aa 100644 (file)
@@ -5,9 +5,9 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 git-2 user
+inherit distutils-r1 git-r3 user
 
-DESCRIPTION="Provides services for discovering, registering, and retrieving
+DESCRIPTION="Services for discovering, registering, and retrieving
 virtual machine images"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
index bc4768fcde24504ee0a2a56efcfd62370f3372b0..5b3031deff0734c37e6cc01c2fde6084cccb03a6 100644 (file)
@@ -5,9 +5,9 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_4 )
 
-inherit distutils-r1 git-2 user
+inherit distutils-r1 git-r3 user
 
-DESCRIPTION="Provides services for discovering, registering, and retrieving
+DESCRIPTION="Services for discovering, registering, and retrieving
 virtual machine images"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
index 7d29ce792b00d1bdb04112192b5f1d3c233fdc7f..e89ca8e8faa1a2320c808a2675ab54a70878e7aa 100644 (file)
@@ -6,3 +6,5 @@ DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1ba
 DIST puppet-agent_1.2.5-1wheezy_i386.deb 15122650 SHA256 f34a6e9c70b5276806dacf64fb2b41fd927e6875071d044f9901c5a8d9dacd1d SHA512 0989501ca3f011601bb301126ad58084571ee67eb961fbf1f5cf002eb9155bf4f8e838452ac62b45472f00c0a7538cb5c72c3e43c651675a7940d8ab9a1a309c WHIRLPOOL f9698e3154254d9931fdbccd9a75edccae8ab799f8add0e32995453d62a0d070001ad858449c5b816c1b1a448beb8b99b180558feea3b36fc84c0e730e2d5b7e
 DIST puppet-agent_1.2.6-1wheezy_amd64.deb 15187698 SHA256 3448a92d6761bc1c284b17508bf541b0a8c40394b03e7608826e4f2a900e40cc SHA512 b5e6e43f22728cd7d9f4d103aa4de8fa1eccb3159abc31a921fa8f387dd0436a8d0f915b38be8ce233e39448b94f30be90e18da4e2861d6aeda9ef8a312474d2 WHIRLPOOL eca0f32e11b29050e53d93d02a68e874cc5f0f90d823aa7ea5241599872ef39d65f45103542fac84083b40ec47cf09435f27c4fb91b5a5c9a4dee84aa50a2c41
 DIST puppet-agent_1.2.6-1wheezy_i386.deb 15122826 SHA256 271d62f7f6634b49632308d95c75519620335d176d3ee694a3cee42bb445d658 SHA512 3eae7b5a112baf1123c6d942e0b60ee07d76b02a8313a7122884b66f08077fbe430447857e5862182de7cf64ef90f931a49936d6967134937ccff84dd419ae4c WHIRLPOOL bce7ce95c3f6c21ca658d7ba25b3cb7b04c20e5af5499e3f4efb1df997dedd01e0982c67da332fcd8da901f06ce8683219baa6c7e02a7a4eed5ce20547bcfa35
+DIST puppet-agent_1.2.7-1wheezy_amd64.deb 15280016 SHA256 c250bcdeb22296ef3b0097da507b32f1503abbff332c68df10291dcb975243ed SHA512 f2e8d37415d9b6c260c8b4fdee44cc1b85ab784b57c944b856082cc9a65b3de32985527a65aac49ae3c3eea54736bf3c26e11af91c09fd6bfb3b065e98ca99d0 WHIRLPOOL e6b62d968dd0a10031b42afd052c2a280e5d50caae5d51f493a3f432cb4f74ff783db8c4cb77fd2bb6defb4fd1743ce220bf9143fa7c1c02a1b8dffe01a474b2
+DIST puppet-agent_1.2.7-1wheezy_i386.deb 15214412 SHA256 c2b9f51cfe3d3e43b3cdfb7a1c6c92abaeaf2c4ab26e9ceac5aba2b58cf1480e SHA512 6950e09c49da35c0cf463364b4ec468ba011f15d3caf9c59c58ef01a0cfd859cb5c97a3271d9a11c958a71c4c77ba45a8dab205124b92a80354da519dc1a2f3c WHIRLPOOL 12ce6f5ba23f00d1320d7cd40734485ac69bdddda8a9711e18f3549c12919592ca27394963578c5850400864e2b524e7034833e8b2985b15f06bb66f06df1b75
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.7.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.7.ebuild
new file mode 100644 (file)
index 0000000..7de77c5
--- /dev/null
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker
+
+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}
+
+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 823bf8c9f64a77763e233d3b32b74b526b14df8c..8847eec17611a9f5f804e776c34fe6b7587011d5 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="amqp caps dbi geoip ipv6 json mongodb pacct python redis smtp spoof-source systemd tcpd"
 RESTRICT="test"
 
index 0a868141b02f0c16360a13f91264f76c330544c7..7662d064012cd34f7c77614db153dd9bd7c3be84 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>proxy-maintainers</herd>
        <maintainer>
-               <email>itumaykin@gmail.com</email>
+               <email>itumaykin+gentoo@gmail.com</email>
        </maintainer>
        <use>
                <flag name='json'>Build JSON output plugin to save packets in JSON file format.</flag>
index 3194624bf16d5222ac142b806b903a88791ec946..54496a25d22c4ff817995508ee96c6351944131d 100644 (file)
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 inherit distutils-r1
 
 SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
 DESCRIPTION="Gentoo's installer for web-based applications"
 HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
index ad4f9bee6d8f7563f375cbb1766670a45c3e0470..085212f603158d102c6fb0409bd95814b7c40067 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-       <email>phobosk@kbfx.net</email>
+       <email>phobosk@fastmail.fm</email>
        <name>PhobosK</name>
        <description>Proxy maintainer. Assign bugs to him.</description>
 </maintainer>
index 3488feed685b849c105cf5e7ac8e39c90cb6c821..cca17f27aa5a8218378c785324313ba7f44e06ad 100644 (file)
@@ -10,10 +10,10 @@ if [[ ${PV} = *9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
        SRC_URI=""
-       KEYWORDS="amd64 hppa ppc64"
+       KEYWORDS="amd64 hppa ppc ppc64"
 else
        SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-       KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+       KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
index f0f73a7749bba2eefb9129087ec1d81b43b85390..8f7c7a22006d7e2f38ce1774e8394e994745edc6 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$
 
@@ -38,7 +38,8 @@ src_compile() {
 src_install() {
        dodoc pms.pdf eapi-cheatsheet.pdf
        if use html; then
-               dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+               docinto html
+               dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
                dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
        fi
 }
index 20ca87f6a0877c7f62e81c48c0a04de568ff1b37..10f044aa4c2ddc3aa02205efd9ca46e49226dd31 100644 (file)
@@ -36,7 +36,8 @@ src_compile() {
 src_install() {
        dodoc pms.pdf eapi-cheatsheet.pdf
        if use html; then
-               dohtml *.html pms.css $(shopt -s nullglob; echo *.png)
+               docinto html
+               dodoc *.html pms.css $(shopt -s nullglob; echo *.png)
                dosym {..,/usr/share/doc/${PF}/html}/eapi-cheatsheet.pdf
        fi
 }
index b19eeaf40f1f9863dfb40707d2778f0ffe18053a..8b9676f822231d076b87febf27b1a8d917527c7a 100644 (file)
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~ottxor/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-macos"
 IUSE=""
 
 src_install() {
diff --git a/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild b/app-eselect/eselect-maven/eselect-maven-0.2-r3.ebuild
new file mode 100644 (file)
index 0000000..1029d2d
--- /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
+
+DESCRIPTION="Manages Maven symlinks"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.8
+       !<dev-java/maven-bin-2.0.10-r1:2.1
+       !app-eselect/eselect-java"
+PDEPEND="
+|| (
+       dev-java/maven-bin:3.1
+       dev-java/maven-bin:3.2
+       dev-java/maven-bin:3.3
+)"
+
+src_install() {
+       insinto /usr/share/eselect/modules
+       newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \
+               || die "newins failed"
+}
index 5188ad1e2c5ca45f3d6dff94731a448c497eccd9..04783a72c06debf90f39d9a630dc9e47a095cd45 100644 (file)
@@ -4,7 +4,7 @@
   <herd>cjk</herd>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>graham.ramsey@gmail.com</email>
+    <email>ramsey.graham@ntlworld.com</email>
     <name>Graham Ramsey</name>
   </maintainer>
   <longdescription lang="en">
index 690806854e5115ef58086ae29c1b4a1984e8dcd9..bc5ec521530d811c8e8f8c113911e58a6fad6a2c 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-       <email>headch@gmail.com</email>
+       <email>chead@chead.ca</email>
        <name>Christopher Head</name>   
        <description>Proxy maintainer, assign bugs</description>
   </maintainer>
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
deleted file mode 100644 (file)
index 5d2c52c..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-       scm_eclass=git-r3
-       EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-       SRC_URI=""
-       KEYWORDS=""
-else
-       SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-       KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-       S="${WORKDIR}/${P/-server/}"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-       dev-libs/boost:=
-       x11-misc/shared-mime-info
-       qt4? (
-               >=dev-qt/qtcore-4.8.5:4
-               >=dev-qt/qtdbus-4.8.5:4
-               >=dev-qt/qtgui-4.8.5:4
-               >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-               >=dev-qt/qttest-4.8.5:4
-       )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtdbus:5
-               dev-qt/qtgui:5
-               dev-qt/qtnetwork:5
-               dev-qt/qtsql:5[mysql?,postgres?]
-               dev-qt/qttest:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtxml:5
-       )
-       sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-       dev-libs/libxslt
-       >=dev-util/automoc-0.9.88
-       test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-       postgres? ( dev-db/postgresql[server] )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               [[ $(gcc-major-version) -lt 4 ]] || \
-                       ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
-                       && die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
-       fi
-}
-
-pkg_setup() {
-       # Set default storage backend in order: MySQL, SQLite PostgreSQL
-       # reverse driver check to keep the order
-       if use postgres; then
-               DRIVER="QPSQL"
-               AVAILABLE+=" ${DRIVER}"
-       fi
-
-       if use sqlite; then
-               DRIVER="QSQLITE3"
-               AVAILABLE+=" ${DRIVER}"
-       fi
-
-       if use mysql; then
-               DRIVER="QMYSQL"
-               AVAILABLE+=" ${DRIVER}"
-       fi
-
-       # Notify about MySQL is recommend by upstream
-       if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-               ewarn
-               ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-               ewarn "user configuration. This is the backend recommended by KDE upstream."
-               ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
-               ewarn "backend anymore."
-               ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-               ewarn "Available drivers are:${AVAILABLE}"
-               ewarn
-       fi
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-               -DWITH_SOPRANO=FALSE
-               $(cmake-utils_use test AKONADI_BUILD_TESTS)
-               $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-               $(cmake-utils_use qt5 QT5_BUILD)
-       )
-
-       cmake-utils_src_configure
-}
-
-src_test() {
-       export $(dbus-launch)
-       cmake-utils_src_test
-}
-
-src_install() {
-       # Who knows, maybe it accidentally fixes our permission issues
-       cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-       insinto /usr/share/config/akonadi
-       doins "${T}"/akonadiserverrc
-
-       cmake-utils_src_install
-}
-
-pkg_postinst() {
-       elog "${DRIVER} has been set as your default akonadi storage backend."
-       elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-       elog "Available drivers are: ${AVAILABLE}"
-}
index 855eff1372b8c7dc0384636af3832c7b3c867573..b59b6115fdd4d22649f5d842dc305c5c43057268 100644 (file)
@@ -8,10 +8,10 @@ if [[ $PV = *9999* ]]; then
        scm_eclass=git-r3
        EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
        SRC_URI=""
-       KEYWORDS="ppc64"
+       KEYWORDS="ppc ppc64"
 else
        SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-       KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+       KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
        S="${WORKDIR}/${P/-server/}"
 fi
 
index eb70dd9ce3d25e4611f6ea797304b41b86eb0eac..2b66f17b1456d30e6252987a9f943e5210ffafe9 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x86-macos"
 IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
 
 LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
index 1e5bd8ecf4f3f83467a8642f7f60a1e03f19e809..433061b93a9436b88e0a389ce249fad943868d00 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>gingekerr@hotmail.com</email>
+    <email>chris.kerr@mykolab.ch</email>
     <name>Chris Kerr</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
index 4a6d581398c8884c9f18b8cf3fcd9c6e2d89d56f..d9d19650f9827ae0f18d1f552e64947c2fb7efcc 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ppc64 ~x86 ~x86-fbsd"
 IUSE="video qt4 +qt5"
 
 REQUIRED_USE="^^ ( qt4 qt5 )"
index 77f9b8d9e8b1aad3e0e56c3374135cf648f2f9c3..dd15e6e400e952892ad2e2e376143b7e099c41de 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="colordiff"
 
 RDEPEND=">=dev-libs/glib-2.6
index 18b28356ba3c892c8af3c9485a7ba258acd91874..59601888da74d42b39f5672f4d0fb063ff8fc4b9 100644 (file)
@@ -1 +1,2 @@
 DIST metagen-0.6.2.tar.gz 6100 SHA256 d1f6c7a24fa9f7f119c9309ed2ec217bc0fd3da48568417a46220a40e2c74201 SHA512 0ab8d7755259b870c995c471f366a976f4acc336dda4c2fa1c4e5b78b5aa701fb75d4dd88ac0ee069a231550b07b89b4a8f724c94ec791efe6c4c64b97ac19ff WHIRLPOOL fa6b85934e58cc5b73237fb619d64bd87df148b8f70fa5df2bbf94ef986f1ea3e693b7e3eb25b56cbe26fe35fff5102ba5787a22ec94800d3d328ccc9606473c
+DIST metagen-0.6.3.tar.bz2 6118 SHA256 655253786c3dafe2426a61d8585acfbbd4a560e0a2609331e230c72699b10494 SHA512 1a25e1ebd35ae97e0823aee2f929c09b9041c78496c2425cf5c0bf3d9f1747313dcf30b7e0a5d4e861cbd0caaf48b506f85eb5f25ab0b9e75a62514b0bb64ecd WHIRLPOOL 5e0c594ad728b6646a324d7c8115ad19f15304baad1922fb45e96a771355092e43ba3ae98f0f44e87f2c8e9d74af5ee75c09e86472329e1497dd81959467f927
diff --git a/app-portage/metagen/metagen-0.6.3.ebuild b/app-portage/metagen/metagen-0.6.3.ebuild
new file mode 100644 (file)
index 0000000..966e8e4
--- /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"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+       >=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+       distutils-r1_python_install
+       python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+       distutils-r1_python_install_all
+       doman docs/metagen.1
+}
+
+python_test() {
+       "${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
index 97e04cfb5b17622c51c3b8ba5b715e8565828b7a..7eb5fa02c2fa3bc8df3e1bc236f32f88b05cb293 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$
 
@@ -45,7 +45,7 @@ COMMON_DEPEND="
        dev-python/apsw
        >=dev-python/beautifulsoup-3.0.5:python-2
        dev-python/netifaces
-       >=dev-python/dnspython-1.6.0
+       >=dev-python/dnspython-1.6.0:0
        >=dev-python/cssselect-0.7.1
        >=dev-python/cssutils-0.9.9
        >=dev-python/dbus-python-0.82.2
index 0061c4181b7600da2ac76bfef0125bcaa73282ae..6126c17ada0d8591019ad544cb5f514c0912bcd6 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$
 
@@ -45,7 +45,7 @@ COMMON_DEPEND="
        >=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
        >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
        dev-python/netifaces[python_targets_python2_7(-)]
-       >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+       >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
        >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
        >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
        >=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
index 099fe1f113a68e4657941d93bfb6fad576243476..c247c51e5a3db935732e624cb304fde808d31d33 100644 (file)
@@ -49,7 +49,7 @@ COMMON_DEPEND="
        >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
        >=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
        >=dev-python/dbus-python-0.82.2[${PYTHON_USEDEP}]
-       >=dev-python/dnspython-1.6.0[${PYTHON_USEDEP}]
+       >=dev-python/dnspython-1.6.0:0[${PYTHON_USEDEP}]
        >=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
        >=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
        >=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
index d17a1202337cc95719ca226c2dde80028de9ea78..d2edbbbb5102dae29abba5e9142a9c140baf0766 100644 (file)
@@ -43,7 +43,7 @@ COMMON_DEPEND="
        >=dev-libs/icu-4.4:=
        >=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
        >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-       >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+       >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
        >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
        >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
        >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
index d17a1202337cc95719ca226c2dde80028de9ea78..d2edbbbb5102dae29abba5e9142a9c140baf0766 100644 (file)
@@ -43,7 +43,7 @@ COMMON_DEPEND="
        >=dev-libs/icu-4.4:=
        >=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
        >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-       >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+       >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
        >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
        >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
        >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
index 0706d00caf4122d5cd5f4d2dc3023870c545a692..d2585c90a9e505d50fe379d02e3c005bbc20ed6c 100644 (file)
@@ -42,7 +42,7 @@ COMMON_DEPEND="
        >=dev-libs/icu-4.4:=
        >=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
        >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-       >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+       >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
        >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
        >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
        >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
index 0706d00caf4122d5cd5f4d2dc3023870c545a692..d2585c90a9e505d50fe379d02e3c005bbc20ed6c 100644 (file)
@@ -42,7 +42,7 @@ COMMON_DEPEND="
        >=dev-libs/icu-4.4:=
        >=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
        >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-       >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+       >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
        >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
        >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
        >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
index 0706d00caf4122d5cd5f4d2dc3023870c545a692..8a2a6eeb5fc7ed1ecabff619f93e12c1fedf9184 100644 (file)
@@ -42,7 +42,10 @@ COMMON_DEPEND="
        >=dev-libs/icu-4.4:=
        >=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
        >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
-       >=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+       || (
+               >=dev-python/dnspython-1.6.0:0[python_targets_python2_7(-)]
+               virtual/dnspython[python_targets_python2_7(-)]
+       )
        >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
        >=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
        >=dev-python/dbus-python-1.2.0[python_targets_python2_7(-)]
index f372a0d645a2cfaa0d55d9ce2b4f452e218cdecf..459ff02ab7ee220c1c32f2232d548d5cba0b6dde 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
index 5c81a0d544aca5c1409a6585e06f5cba23471f0b..bcd97db180361772c515804187e22e7cb8f7cd09 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>proxy-maintainers</herd>
        <maintainer>
-               <email>yaleks@gentoo.ru</email>
+               <email>yaleks@gmail.com</email>
                <name>Aleksandr Yakimov</name>
        </maintainer>
        <maintainer>
index b90fc24db68477f97178314f2e0dce7b477b7dbe..d96094e121f5239f5f46e011ccc9706e52038fc5 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
index 212e49baf50b5393ad60f114f01bf5a669c66a2c..a4463e8e139936cebedb6377046e02d752b60996 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
index 50afcfdcf58791cb4aec30f965be67ae94a24978..e1eb7472269350ccee41b6751850bfc6d91ee4ba 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>proxy-maintainers</herd>
        <maintainer>
-               <email>itumaykin@gmail.com</email>
+               <email>itumaykin+gentoo@gmail.com</email>
                <name>Coacher</name>
        </maintainer>
        <longdescription>
index 72dc712e9acb99ca3226142b486cf2757ced1482..3a134546932f3d7a6868c5b223ef6c10f9233706 100644 (file)
@@ -1 +1,2 @@
 DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543
+DIST multitail-6.4.2.tgz 155757 SHA256 af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd WHIRLPOOL c74a85671f2772a6b5d8cc224481fc1793d851573e77e9b7cc4bc3e0569b4ba58ca63989f7f82e2e91dabc29363b87dd361305178b8c174fe2a7b250c86e731b
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
new file mode 100644 (file)
index 0000000..372f054
--- /dev/null
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="
+       sys-libs/ncurses:0=[unicode?]
+"
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+       epatch \
+               "${FILESDIR}"/${PN}-6.4.1-gentoo.patch
+
+       sed \
+               -e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+               -i Makefile || die
+
+       sed \
+               -e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+               -i xclip.c ${PN}.conf || die
+
+       tc-export CC PKG_CONFIG
+
+       use debug && append-flags "-D_DEBUG"
+}
+
+src_compile() {
+       emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install () {
+       dobin multitail
+
+       insinto /etc
+       doins multitail.conf
+
+       DOCS=( readme.txt thanks.txt )
+       HTML_DOCS=( manual.html )
+       einstalldocs
+
+       doman multitail.1
+
+       if use examples; then
+               docinto examples
+               dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+       fi
+}
+
+pkg_postinst() {
+       optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
index e1744ebda54f10ba66b3bec8ea90acc6e88dd07d..7978dfd0b7c216b80baaab0586b7238302b59cdf 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 IUSE="debug examples gcov static-libs"
 
 DEPEND="virtual/libmysqlclient:=
index 7b8ff2d0f24f2c8570094b71d381c2a4c3ac5c68..ada0209fa635e4861d7b1dd28c37d0df757071dd 100644 (file)
@@ -4,7 +4,7 @@
   <herd>java</herd>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>the.dmol@gmail.com</email>
+    <email>basiliscos@openmailbox.org</email>
     <name>Ivan Baidakou</name>
   </maintainer>
   <longdescription>
index d24bcf5991d3f7191f6a75861748bdd68a19d938..02ae8060380ed7e698aa6c3a9e98e9e98d9035e0 100644 (file)
@@ -1 +1,2 @@
 DIST javax.inject-1-bundle.jar 43323 SHA256 efe257736656de99747098ceafd64dae7b5722a585176eb79ee9dbf7cd995ee5 SHA512 397db77e3426a4539b895535557cbe9e1795c186a9bc397efa716b42d02b03c4403f20c4c13fb2b99b25e5a14abd3407e9d0d843cd4c3442a1386a2b30ba50e3 WHIRLPOOL 466ae846ad0c8abcc1279e314f79121bd17c627d3729e7dd1c144b5d67f161e0f5fdee278b51c689cdcdcc01ac5fe5f2c8b8b103d94e18413f2b37cfb1b4b7f7
+DIST javax.inject-1-sources.jar 10928 SHA256 c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b WHIRLPOOL 4ae44b7088d381f8875d910bafb74e99b724277bffc5274bde75588b614aa0defd66b43a0774957f9cba4d28435397b3e130d9373b0e68e3a29857f0a36cf18b
diff --git a/dev-java/javax-inject/javax-inject-1-r2.ebuild b/dev-java/javax-inject/javax-inject-1-r2.ebuild
new file mode 100644 (file)
index 0000000..ce059bb
--- /dev/null
@@ -0,0 +1,29 @@
+# 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="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Dependency injection for Java (JSR-330)"
+HOMEPAGE="https://code.google.com/p/atinject/"
+SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
+DEPEND="
+       ${CDEPEND}
+       >=virtual/jdk-1.6
+       app-arch/unzip"
diff --git a/dev-java/jssc/Manifest b/dev-java/jssc/Manifest
new file mode 100644 (file)
index 0000000..672d4f6
--- /dev/null
@@ -0,0 +1 @@
+DIST jssc-2.8.0-sources.jar 19489 SHA256 b5a9609b99b4543c88d20e0425a83461209d4851ef3ce312349c64b76ce1dc68 SHA512 7f3a8482d0982ed3e604b00217cbfa37ad442b5a2b562ff68805c186ee56423bd82706bbbe3b9f2705c8337009b7c71068ba7ebbb829ea3c96bc61f43b540b9d WHIRLPOOL 4c10ba9b373cb057c50c01564124a2258b15b335a059d2cb195b8d8b14b761cbe98a713020dc21118d17a3274f346357812a3dc64103eb12916052e1a1e37050
diff --git a/dev-java/jssc/jssc-2.8.0.ebuild b/dev-java/jssc/jssc-2.8.0.ebuild
new file mode 100644 (file)
index 0000000..ceed37a
--- /dev/null
@@ -0,0 +1,21 @@
+# 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="Apache MyFaces API - Core package"
+HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector"
+SRC_URI="http://repo1.maven.org/maven2/org/scream3r/${PN}/${PV}/${P}-sources.jar"
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+       app-arch/unzip"
diff --git a/dev-java/jssc/metadata.xml b/dev-java/jssc/metadata.xml
new file mode 100644 (file)
index 0000000..68b3052
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+         <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/myfaces-api/Manifest b/dev-java/myfaces-api/Manifest
new file mode 100644 (file)
index 0000000..acff61e
--- /dev/null
@@ -0,0 +1 @@
+DIST myfaces-api-2.2.8-sources.jar 949466 SHA256 f06c9242146ba641282ca2493d44a22a7cfd5371bde7503e59b5733b141212cb SHA512 2c6abd6bbed3d55ff58f18e12cb97dac5232b55b320893097513fdc11c183d52082838a2bdfab035abd927179fb308502440072752cca697cb8ce084a61b3ead WHIRLPOOL aee0a37bcf3dc24c13e84fc11f4a79738a34d7234ed015c11c26ec962fa15028fd9ac2f5695e30381c6308f153f6a2fa0474bc884f6ea57db620aef5e591c1a4
diff --git a/dev-java/myfaces-api/metadata.xml b/dev-java/myfaces-api/metadata.xml
new file mode 100644 (file)
index 0000000..250f2d1
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild b/dev-java/myfaces-api/myfaces-api-2.2.8.ebuild
new file mode 100644 (file)
index 0000000..deb9132
--- /dev/null
@@ -0,0 +1,45 @@
+# 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="Apache MyFaces API - Core package"
+HOMEPAGE="http://myfaces.apache.org/"
+SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/core/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="
+       dev-java/cdi-api:1.2
+       dev-java/javax-inject:0
+       dev-java/tomcat-jstl-spec:0
+       dev-java/validation-api:1.0
+       dev-java/tomcat-servlet-api:3.0
+       dev-java/myfaces-builder-annotations:0
+       "
+
+RDEPEND="
+       ${CDEPEND}
+       >=virtual/jre-1.6"
+
+DEPEND="
+       ${CDEPEND}
+       >=virtual/jdk-1.6
+       app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="
+       cdi-api-1.2
+       javax-inject
+       tomcat-jstl-spec
+       validation-api-1.0
+       tomcat-servlet-api-3.0
+       myfaces-builder-annotations
+"
diff --git a/dev-java/myfaces-builder-annotations/Manifest b/dev-java/myfaces-builder-annotations/Manifest
new file mode 100644 (file)
index 0000000..506f645
--- /dev/null
@@ -0,0 +1 @@
+DIST myfaces-builder-annotations-1.0.9-sources.jar 43051 SHA256 78c65366542fd91e7724aabec019e744255524b1a51db89da44386e25a76736b SHA512 09bf3f9faaaae0545544b2195c8070689431bf28497afc9e317010243617137528a61be82f47123237e114b1a7f5f174a5e2cc2190abdff8beb5188e38feec04 WHIRLPOOL f05a94714aedaf18d5bc2fdb0ca07de3464d862e0e0d70a7fb6e66b89d002857e30c68c3e0afb1938b0a2cb39e3a3c0368581938529de1a9e5e867505822ca48
diff --git a/dev-java/myfaces-builder-annotations/metadata.xml b/dev-java/myfaces-builder-annotations/metadata.xml
new file mode 100644 (file)
index 0000000..250f2d1
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild b/dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
new file mode 100644 (file)
index 0000000..3842b24
--- /dev/null
@@ -0,0 +1,22 @@
+# 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="Apache MyFaces API - Builder annotations package"
+HOMEPAGE="http://myfaces.apache.org/"
+SRC_URI="http://repo1.maven.org/maven2/org/apache/myfaces/buildtools/${PN}/${PV}/${P}-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+       app-arch/unzip"
index be5008e3cd4c451d46e71bf412b3a8bffd68b83e..a60e55e5549fb64b9f7586b9523ba40edf431540 100644 (file)
@@ -1,8 +1,2 @@
 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc
-DIST R-3.0.1.tar.gz 25508280 SHA256 af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134 SHA512 470edbf4a4fccf9310add110d7fa7f338e410e412b3ec84f6ea5f1253e94a435e185a7a1b62b22aee443293147ff7bcca139015b490a9271a502b1bfbf1426a2 WHIRLPOOL f45c960280f51cba3a4f3730fa79671808b3c07fd49f97b2cdce4a1de45986e62ac9bb24c6f764386a3ef1034a266b86f041a1a1652ec7f687a4db08a074d22e
-DIST R-3.0.3.tar.gz 28075821 SHA256 b97cfd9540f294ab786e846153f3dd8605610d7e27616bfb4296795bc4fde6d6 SHA512 881c9c0a8d866eb87218a5cdca72153c9ef0fa0a0f091595fc065bdcbc1ea8b0bd1a2fb3008457b12e1b5025a7e70bd7764de4286a57ad3f73226367b2fc4e83 WHIRLPOOL 076d041c0581dc211a4ee53cf5cad731dc0ece33bbb34f8c066dc660ef0c1f7dcfc1b3359c6a0cebfa2ccec9b689776965a530edcf9f81758c4e003242347225
-DIST R-3.1.0.tar.gz 28469975 SHA256 8a680390f84c58c01dcdefd682eaa0e90389f09e6d2f2e090c71af40065f5fe2 SHA512 bb21fc90c7d37a5328031ed784e7dcbd20259d1837c33db3b51c14a116939a53496683d5de142a1223e89fc12406294efc67bed3595131615e9607d5ffab5ce2 WHIRLPOOL b376180d700d18780eb344b737a3a1bfc8b40f67967032e0f34abf940d76c3ffd7694be9f2f10be985571e8f94d92a6970a3d1cba503280e3fcf6df7a5e4298e
-DIST R-3.1.1.tar.gz 28606569 SHA256 ce5c4d5e34414ce8f1ec2d5642861435fa1ddc4cd89bd336172bbe25a62c7a19 SHA512 a75d8b82645bd9486873669b802924448d591013076e3d7dc958502dc6f0dac7d7fb78f3921d34a1eac1383f141b6e800f4293f7fac09651e0176cf84c431af9 WHIRLPOOL ec05c70193a229cbaf15f3432853070c6666c3963a4e2719a6d8ff188bfc2cada0d1f2fe90a9dd6b43f46913138afed0be387ba73b7f9c4d87abc362cc8a5393
-DIST R-3.1.2.tar.gz 28655941 SHA256 bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a SHA512 fee20cd94d14bd46cc36fb265ed4d64f44eaa3929dd13c62d29a5883fde607aba63e28a4b0f265ede63f78788996deaee36acf6a70cc0bc90a705c9782be01a1 WHIRLPOOL f02d543c0fd7e89e63aba844b7c0f651a9a6bb5dbfcd58bdb64b49d08335c3270383eb62291b9f2f20ef6ec9f39eef5cf77ae1af3109296f8b1898227cca99d1
-DIST R-3.2.0.tar.gz 29124927 SHA256 f5ae953f18ba6f3d55b46556bbbf73441350f9fd22625402b723a2b81ff64f35 SHA512 c6041c854251d51dd936d3a3632c2958a0437c58488f93e5ba810e957fb7f2276e3fe4f615fb4705f2fc5a66aa50a828b54b5e4e7b4358c7fd465c71531b9828 WHIRLPOOL e21a65b9197a202691dbe903b441caf7d8b92efdffb86dcccdbf09d080177cfd472a54d381df1cca749937434ffb9c08ac74198457e320353207cd00837e1086
 DIST R-3.2.2.tar.gz 29772864 SHA256 9c9152e74134b68b0f3a1c7083764adc1cb56fd8336bec003fd0ca550cd2461d SHA512 71ba470875262b9f00fb6970f209788df4dad30e0a28373b824b60d8bc6401afb7786e65387663c6490c7ddcd2bfd7f808a270a3e63238f3d7565d5f93607138 WHIRLPOOL fea59929ada1d67dafc6ad89409d18ad173af7990384033f490a00e0f794d9919aecf7cd37089d105fe03b9cf64d079e5d148622571cec3eb924c1c5bd00081e
diff --git a/dev-lang/R/R-3.0.1.ebuild b/dev-lang/R/R-3.0.1.ebuild
deleted file mode 100644 (file)
index 26fd33c..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-       mirror://cran/src/base/R-3/${P}.tar.gz
-       bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-       app-arch/bzip2
-       app-text/ghostscript-gpl
-       dev-libs/libpcre
-       virtual/blas
-       cairo? ( x11-libs/cairo[X] x11-libs/pango )
-       icu? ( dev-libs/icu:= )
-       jpeg? ( virtual/jpeg:0 )
-       lapack? ( virtual/lapack )
-       perl? ( dev-lang/perl )
-       png? ( media-libs/libpng:0= )
-       readline? ( sys-libs/readline:0= )
-       tk? ( dev-lang/tk:0= )
-       X? ( x11-libs/libXmu x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-       doc? (
-                       virtual/latex-base
-                       dev-texlive/texlive-fontsrecommended
-                )"
-
-RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
-       app-arch/xz-utils
-       java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-       if use openmp; then
-               FORTRAN_NEED_OPENMP=1
-               tc-has-openmp || die "Please enable openmp support in your compiler"
-       fi
-       fortran-2_pkg_setup
-       filter-ldflags -Wl,-Bdirect -Bdirect
-       # avoid using existing R installation
-       unset R_HOME
-       # Temporary fix for bug #419761
-       if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-               append-flags -fno-ipa-cp-clone
-       fi
-}
-
-src_prepare() {
-       # gentoo bug #322965 (not applied upstream)
-       # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
-       epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
-
-       # respect ldflags (not applied upstream)
-       # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
-       epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
-
-       # gentoo bug #383431
-       # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
-       epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
-
-       # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
-       epatch "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-       # fix packages.html for doc (gentoo bug #205103)
-       sed -i \
-               -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-               src/library/tools/R/Rd.R || die
-
-       # fix Rscript path when installed (gentoo bug #221061)
-       sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-               src/unix/Makefile.in || die "sed unix Makefile failed"
-
-       # fix HTML links to manual (gentoo bug #273957)
-       sed -i \
-               -e 's:\.\./manual/:manual/:g' \
-               $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-       use lapack && \
-               export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-       if use X; then
-               export R_BROWSER="$(type -p xdg-open)"
-               export R_PDFVIEWER="$(type -p xdg-open)"
-       fi
-       use perl && \
-               export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-       # don't search /usr/local
-       sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-       # Fix for Darwin (OS X)
-       if use prefix; then
-               if [[ ${CHOST} == *-darwin* ]] ; then
-                       sed -i \
-                               -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-                               -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-                               -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-                               -e "/SHLIB_EXT/s/\.so/.dylib/" \
-                               configure.ac || die
-                       # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -i \
-                               -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-                               src/nmath/standalone/Makefile.in || die
-               else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-               fi
-       fi
-       AT_M4DIR=m4 eaclocal
-       eautoconf
-}
-
-src_configure() {
-       econf \
-               --enable-byte-compiled-packages \
-               --enable-R-shlib \
-               --disable-R-framework \
-               --with-system-zlib \
-               --with-system-bzlib \
-               --with-system-pcre \
-               --with-system-xz \
-               --without-blas \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable nls) \
-               $(use_enable openmp) \
-               $(use_enable profile R-profiling) \
-               $(use_enable profile memory-profiling) \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs R-static-lib) \
-               $(use_with cairo) \
-               $(use_with icu ICU) \
-               $(use_with jpeg jpeglib) \
-               $(use_with lapack) \
-               $(use_with !minimal recommended-packages) \
-               $(use_with png libpng) \
-               $(use_with readline) \
-               $(use_with tiff libtiff) \
-               $(use_with tk tcltk) \
-               $(use_with X x)
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       emake AR="$(tc-getAR)"
-       emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)"
-       use doc && emake info pdf
-}
-
-src_install() {
-       default
-       emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-       if use doc; then
-               emake DESTDIR="${D}" install-info install-pdf
-               dosym ../manual /usr/share/doc/${PF}/html/manual
-       fi
-
-       cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
-       EOF
-       doenvd 99R
-       use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-       # The buildsystem has a different understanding of install_names than what
-       # we require.  Since it builds modules like shared objects (wrong), many
-       # objects (all modules) get an incorrect install_name.  Fixing the build
-       # system here is not really trivial.
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               local mod
-               pushd "${ED}"/usr/lib/R > /dev/null
-               for mod in $(find . -name "*.dylib") ; do
-                       mod=${mod#./}
-                       install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-                               "${mod}"
-               done
-               popd > /dev/null
-       fi
-       docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-       if use java; then
-               einfo "Re-initializing java paths for ${P}"
-               R CMD javareconf
-       fi
-}
diff --git a/dev-lang/R/R-3.0.3.ebuild b/dev-lang/R/R-3.0.3.ebuild
deleted file mode 100644 (file)
index ec69959..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-       mirror://cran/src/base/R-3/${P}.tar.gz
-       bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-       app-arch/bzip2:0=
-       app-arch/xz-utils:0=
-       app-text/ghostscript-gpl
-       dev-libs/libpcre:3=
-       virtual/blas:0
-       || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-       cairo? ( x11-libs/cairo[X] x11-libs/pango )
-       icu? ( dev-libs/icu:= )
-       jpeg? ( virtual/jpeg:0 )
-       lapack? ( virtual/lapack:0 )
-       perl? ( dev-lang/perl )
-       png? ( media-libs/libpng:0= )
-       readline? ( sys-libs/readline:0= )
-       tiff? ( media-libs/tiff:0= )
-       tk? ( dev-lang/tk:0= )
-       X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-       doc? (
-               virtual/latex-base
-               dev-texlive/texlive-fontsrecommended
-       )"
-
-RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-       java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-       if use openmp; then
-               if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-                       ewarn "OpenMP is not available in your current selected gcc"
-                       die "need openmp capable gcc"
-               fi
-               FORTRAN_NEED_OPENMP=1
-       fi
-       fortran-2_pkg_setup
-       filter-ldflags -Wl,-Bdirect -Bdirect
-       # avoid using existing R installation
-       unset R_HOME
-       # Temporary fix for bug #419761
-       if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-               append-flags -fno-ipa-cp-clone
-       fi
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-               "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-               "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-       # fix packages.html for doc (gentoo bug #205103)
-       sed -i \
-               -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-               src/library/tools/R/Rd.R || die
-
-       # fix Rscript path when installed (gentoo bug #221061)
-       sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-               src/unix/Makefile.in || die "sed unix Makefile failed"
-
-       # fix HTML links to manual (gentoo bug #273957)
-       sed -i \
-               -e 's:\.\./manual/:manual/:g' \
-               $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-       use lapack && \
-               export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-       if use X; then
-               export R_BROWSER="$(type -p xdg-open)"
-               export R_PDFVIEWER="$(type -p xdg-open)"
-       fi
-       use perl && \
-               export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-       # don't search /usr/local
-       sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-       # Fix for Darwin (OS X)
-       if use prefix; then
-               if [[ ${CHOST} == *-darwin* ]] ; then
-                       sed -i \
-                               -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-                               -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-                               -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-                               -e "/SHLIB_EXT/s/\.so/.dylib/" \
-                               configure.ac || die
-                       # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -i \
-                               -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-                               src/nmath/standalone/Makefile.in || die
-               else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-               fi
-       fi
-       AT_M4DIR=m4 eaclocal
-       eautoconf
-}
-
-src_configure() {
-       econf \
-               --enable-byte-compiled-packages \
-               --enable-R-shlib \
-               --disable-R-framework \
-               --with-system-zlib \
-               --with-system-bzlib \
-               --with-system-pcre \
-               --with-system-xz \
-               --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable nls) \
-               $(use_enable openmp) \
-               $(use_enable profile R-profiling) \
-               $(use_enable profile memory-profiling) \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs R-static-lib) \
-               $(use_with cairo) \
-               $(use_with icu ICU) \
-               $(use_with jpeg jpeglib) \
-               $(use_with lapack) \
-               $(use_with !minimal recommended-packages) \
-               $(use_with png libpng) \
-               $(use_with readline) \
-               $(use_with tiff libtiff) \
-               $(use_with tk tcltk) \
-               $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-               $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-               $(use_with X x)
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       emake AR="$(tc-getAR)"
-       emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)"
-       use doc && emake info pdf
-}
-
-src_install() {
-       default
-       emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-       if use doc; then
-               emake DESTDIR="${D}" install-info install-pdf
-               dosym ../manual /usr/share/doc/${PF}/html/manual
-       fi
-
-       cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
-       EOF
-       doenvd 99R
-       use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-       # The buildsystem has a different understanding of install_names than what
-       # we require.  Since it builds modules like shared objects (wrong), many
-       # objects (all modules) get an incorrect install_name.  Fixing the build
-       # system here is not really trivial.
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               local mod
-               pushd "${ED}"/usr/lib/R > /dev/null
-               for mod in $(find . -name "*.dylib") ; do
-                       mod=${mod#./}
-                       install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-                               "${mod}"
-               done
-               popd > /dev/null
-       fi
-       docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-       if use java; then
-               einfo "Re-initializing java paths for ${P}"
-               R CMD javareconf
-       fi
-}
diff --git a/dev-lang/R/R-3.1.0.ebuild b/dev-lang/R/R-3.1.0.ebuild
deleted file mode 100644 (file)
index 7d9ebb0..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-       mirror://cran/src/base/R-3/${P}.tar.gz
-       bash-completion? ( https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-       app-arch/bzip2:0=
-       app-arch/xz-utils:0=
-       app-text/ghostscript-gpl
-       dev-libs/libpcre:3=
-       virtual/blas:0
-       || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-       cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-       icu? ( dev-libs/icu:= )
-       jpeg? ( virtual/jpeg:0 )
-       lapack? ( virtual/lapack:0 )
-       perl? ( dev-lang/perl )
-       png? ( media-libs/libpng:0= )
-       readline? ( sys-libs/readline:0= )
-       tiff? ( media-libs/tiff:0= )
-       tk? ( dev-lang/tk:0= )
-       X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-       doc? (
-               virtual/latex-base
-               dev-texlive/texlive-fontsrecommended
-       )"
-
-RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-       java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-       if use openmp; then
-               if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-                       ewarn "OpenMP is not available in your current selected gcc"
-                       die "need openmp capable gcc"
-               fi
-               FORTRAN_NEED_OPENMP=1
-       fi
-       fortran-2_pkg_setup
-       filter-ldflags -Wl,-Bdirect -Bdirect
-       # avoid using existing R installation
-       unset R_HOME
-       # Temporary fix for bug #419761
-       if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-               append-flags -fno-ipa-cp-clone
-       fi
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-               "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-               "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-       # fix packages.html for doc (gentoo bug #205103)
-       sed -i \
-               -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-               src/library/tools/R/Rd.R || die
-
-       # fix Rscript path when installed (gentoo bug #221061)
-       sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-               src/unix/Makefile.in || die "sed unix Makefile failed"
-
-       # fix HTML links to manual (gentoo bug #273957)
-       sed -i \
-               -e 's:\.\./manual/:manual/:g' \
-               $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-       use lapack && \
-               export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-       if use X; then
-               export R_BROWSER="$(type -p xdg-open)"
-               export R_PDFVIEWER="$(type -p xdg-open)"
-       fi
-       use perl && \
-               export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-       # don't search /usr/local
-       sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-       # Fix for Darwin (OS X)
-       if use prefix; then
-               if [[ ${CHOST} == *-darwin* ]] ; then
-                       sed -i \
-                               -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-                               -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-                               -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-                               -e "/SHLIB_EXT/s/\.so/.dylib/" \
-                               configure.ac || die
-                       # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -i \
-                               -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-                               src/nmath/standalone/Makefile.in || die
-               else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-               fi
-       fi
-       AT_M4DIR=m4 eaclocal
-       eautoconf
-}
-
-src_configure() {
-       #       --with-system-tre \
-       # tre is patched from upstream
-       econf \
-               --enable-byte-compiled-packages \
-               --enable-R-shlib \
-               --disable-R-framework \
-               --with-system-zlib \
-               --with-system-bzlib \
-               --with-system-pcre \
-               --with-system-xz \
-               --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable nls) \
-               $(use_enable openmp) \
-               $(use_enable profile R-profiling) \
-               $(use_enable profile memory-profiling) \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs R-static-lib) \
-               $(use_with cairo) \
-               $(use_with icu ICU) \
-               $(use_with jpeg jpeglib) \
-               $(use_with lapack) \
-               $(use_with !minimal recommended-packages) \
-               $(use_with png libpng) \
-               $(use_with readline) \
-               $(use_with tiff libtiff) \
-               $(use_with tk tcltk) \
-               $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-               $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-               $(use_with X x)
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       emake AR="$(tc-getAR)"
-       emake -C src/nmath/standalone \
-               shared $(use static-libs && echo static) AR="$(tc-getAR)"
-       use doc && emake info pdf
-}
-
-src_install() {
-       default
-       emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-       if use doc; then
-               emake DESTDIR="${D}" install-info install-pdf
-               dosym ../manual /usr/share/doc/${PF}/html/manual
-       fi
-
-       cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
-       EOF
-       doenvd 99R
-       use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN}
-       # The buildsystem has a different understanding of install_names than
-       # we require.  Since it builds modules like shared objects (wrong), many
-       # objects (all modules) get an incorrect install_name.  Fixing the build
-       # system here is not really trivial.
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               local mod
-               pushd "${ED}"/usr/lib/R > /dev/null
-               for mod in $(find . -name "*.dylib") ; do
-                       mod=${mod#./}
-                       install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-                               "${mod}"
-               done
-               popd > /dev/null
-       fi
-       docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-       if use java; then
-               einfo "Re-initializing java paths for ${P}"
-               R CMD javareconf
-       fi
-}
diff --git a/dev-lang/R/R-3.1.1.ebuild b/dev-lang/R/R-3.1.1.ebuild
deleted file mode 100644 (file)
index 7ab8cdd..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-       mirror://cran/src/base/R-3/${P}.tar.gz
-       https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-       app-arch/bzip2:0=
-       app-arch/xz-utils:0=
-       app-text/ghostscript-gpl
-       >=dev-libs/libpcre-8.35:3=
-       virtual/blas:0
-       || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-       cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-       icu? ( dev-libs/icu:= )
-       jpeg? ( virtual/jpeg:0 )
-       lapack? ( virtual/lapack:0 )
-       perl? ( dev-lang/perl )
-       png? ( media-libs/libpng:0= )
-       readline? ( sys-libs/readline:0= )
-       tiff? ( media-libs/tiff:0= )
-       tk? ( dev-lang/tk:0= )
-       X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-       doc? (
-               virtual/latex-base
-               dev-texlive/texlive-fontsrecommended
-       )"
-
-RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-       java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-       if use openmp; then
-               if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-                       ewarn "OpenMP is not available in your current selected gcc"
-                       die "need openmp capable gcc"
-               fi
-               FORTRAN_NEED_OPENMP=1
-       fi
-       fortran-2_pkg_setup
-       filter-ldflags -Wl,-Bdirect -Bdirect
-       # avoid using existing R installation
-       unset R_HOME
-       # Temporary fix for bug #419761
-       if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-               append-flags -fno-ipa-cp-clone
-       fi
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-               "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-               "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-       # fix packages.html for doc (gentoo bug #205103)
-       sed -i \
-               -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-               src/library/tools/R/Rd.R || die
-
-       # fix Rscript path when installed (gentoo bug #221061)
-       sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-               src/unix/Makefile.in || die "sed unix Makefile failed"
-
-       # fix HTML links to manual (gentoo bug #273957)
-       sed -i \
-               -e 's:\.\./manual/:manual/:g' \
-               $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-       use lapack && \
-               export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-       if use X; then
-               export R_BROWSER="$(type -p xdg-open)"
-               export R_PDFVIEWER="$(type -p xdg-open)"
-       fi
-       use perl && \
-               export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-       # don't search /usr/local
-       sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-       # Fix for Darwin (OS X)
-       if use prefix; then
-               if [[ ${CHOST} == *-darwin* ]] ; then
-                       sed -i \
-                               -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-                               -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-                               -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-                               -e "/SHLIB_EXT/s/\.so/.dylib/" \
-                               configure.ac || die
-                       # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -i \
-                               -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-                               src/nmath/standalone/Makefile.in || die
-               else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-               fi
-       fi
-       AT_M4DIR=m4 eaclocal
-       eautoconf
-}
-
-src_configure() {
-       #       --with-system-tre \
-       # tre is patched from upstream
-       econf \
-               --enable-byte-compiled-packages \
-               --enable-R-shlib \
-               --disable-R-framework \
-               --with-system-zlib \
-               --with-system-bzlib \
-               --with-system-pcre \
-               --with-system-xz \
-               --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable nls) \
-               $(use_enable openmp) \
-               $(use_enable profile R-profiling) \
-               $(use_enable profile memory-profiling) \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs R-static-lib) \
-               $(use_with cairo) \
-               $(use_with icu ICU) \
-               $(use_with jpeg jpeglib) \
-               $(use_with lapack) \
-               $(use_with !minimal recommended-packages) \
-               $(use_with png libpng) \
-               $(use_with readline) \
-               $(use_with tiff libtiff) \
-               $(use_with tk tcltk) \
-               $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-               $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-               $(use_with X x)
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       emake AR="$(tc-getAR)"
-       emake -C src/nmath/standalone \
-               shared $(use static-libs && echo static) AR="$(tc-getAR)"
-       use doc && emake info pdf
-}
-
-src_install() {
-       default
-       emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-       if use doc; then
-               emake DESTDIR="${D}" install-info install-pdf
-               dosym ../manual /usr/share/doc/${PF}/html/manual
-       fi
-
-       cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
-       EOF
-       doenvd 99R
-       newbashcomp "${WORKDIR}"/${BCP} ${PN}
-       # The buildsystem has a different understanding of install_names than
-       # we require.  Since it builds modules like shared objects (wrong), many
-       # objects (all modules) get an incorrect install_name.  Fixing the build
-       # system here is not really trivial.
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               local mod
-               pushd "${ED}"/usr/lib/R > /dev/null
-               for mod in $(find . -name "*.dylib") ; do
-                       mod=${mod#./}
-                       install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-                               "${mod}"
-               done
-               popd > /dev/null
-       fi
-       docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-       if use java; then
-               einfo "Re-initializing java paths for ${P}"
-               R CMD javareconf
-       fi
-}
diff --git a/dev-lang/R/R-3.1.2.ebuild b/dev-lang/R/R-3.1.2.ebuild
deleted file mode 100644 (file)
index 7ab8cdd..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-       mirror://cran/src/base/R-3/${P}.tar.gz
-       https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-       app-arch/bzip2:0=
-       app-arch/xz-utils:0=
-       app-text/ghostscript-gpl
-       >=dev-libs/libpcre-8.35:3=
-       virtual/blas:0
-       || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-       cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-       icu? ( dev-libs/icu:= )
-       jpeg? ( virtual/jpeg:0 )
-       lapack? ( virtual/lapack:0 )
-       perl? ( dev-lang/perl )
-       png? ( media-libs/libpng:0= )
-       readline? ( sys-libs/readline:0= )
-       tiff? ( media-libs/tiff:0= )
-       tk? ( dev-lang/tk:0= )
-       X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-       doc? (
-               virtual/latex-base
-               dev-texlive/texlive-fontsrecommended
-       )"
-
-RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-       java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-       if use openmp; then
-               if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-                       ewarn "OpenMP is not available in your current selected gcc"
-                       die "need openmp capable gcc"
-               fi
-               FORTRAN_NEED_OPENMP=1
-       fi
-       fortran-2_pkg_setup
-       filter-ldflags -Wl,-Bdirect -Bdirect
-       # avoid using existing R installation
-       unset R_HOME
-       # Temporary fix for bug #419761
-       if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-               append-flags -fno-ipa-cp-clone
-       fi
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-               "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-               "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch
-
-       # fix packages.html for doc (gentoo bug #205103)
-       sed -i \
-               -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-               src/library/tools/R/Rd.R || die
-
-       # fix Rscript path when installed (gentoo bug #221061)
-       sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-               src/unix/Makefile.in || die "sed unix Makefile failed"
-
-       # fix HTML links to manual (gentoo bug #273957)
-       sed -i \
-               -e 's:\.\./manual/:manual/:g' \
-               $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-       use lapack && \
-               export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-       if use X; then
-               export R_BROWSER="$(type -p xdg-open)"
-               export R_PDFVIEWER="$(type -p xdg-open)"
-       fi
-       use perl && \
-               export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-       # don't search /usr/local
-       sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-       # Fix for Darwin (OS X)
-       if use prefix; then
-               if [[ ${CHOST} == *-darwin* ]] ; then
-                       sed -i \
-                               -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-                               -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-                               -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-                               -e "/SHLIB_EXT/s/\.so/.dylib/" \
-                               configure.ac || die
-                       # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -i \
-                               -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-                               src/nmath/standalone/Makefile.in || die
-               else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-               fi
-       fi
-       AT_M4DIR=m4 eaclocal
-       eautoconf
-}
-
-src_configure() {
-       #       --with-system-tre \
-       # tre is patched from upstream
-       econf \
-               --enable-byte-compiled-packages \
-               --enable-R-shlib \
-               --disable-R-framework \
-               --with-system-zlib \
-               --with-system-bzlib \
-               --with-system-pcre \
-               --with-system-xz \
-               --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable nls) \
-               $(use_enable openmp) \
-               $(use_enable profile R-profiling) \
-               $(use_enable profile memory-profiling) \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs R-static-lib) \
-               $(use_with cairo) \
-               $(use_with icu ICU) \
-               $(use_with jpeg jpeglib) \
-               $(use_with lapack) \
-               $(use_with !minimal recommended-packages) \
-               $(use_with png libpng) \
-               $(use_with readline) \
-               $(use_with tiff libtiff) \
-               $(use_with tk tcltk) \
-               $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-               $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-               $(use_with X x)
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       emake AR="$(tc-getAR)"
-       emake -C src/nmath/standalone \
-               shared $(use static-libs && echo static) AR="$(tc-getAR)"
-       use doc && emake info pdf
-}
-
-src_install() {
-       default
-       emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-       if use doc; then
-               emake DESTDIR="${D}" install-info install-pdf
-               dosym ../manual /usr/share/doc/${PF}/html/manual
-       fi
-
-       cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
-       EOF
-       doenvd 99R
-       newbashcomp "${WORKDIR}"/${BCP} ${PN}
-       # The buildsystem has a different understanding of install_names than
-       # we require.  Since it builds modules like shared objects (wrong), many
-       # objects (all modules) get an incorrect install_name.  Fixing the build
-       # system here is not really trivial.
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               local mod
-               pushd "${ED}"/usr/lib/R > /dev/null
-               for mod in $(find . -name "*.dylib") ; do
-                       mod=${mod#./}
-                       install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-                               "${mod}"
-               done
-               popd > /dev/null
-       fi
-       docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-       if use java; then
-               einfo "Re-initializing java paths for ${P}"
-               R CMD javareconf
-       fi
-}
diff --git a/dev-lang/R/R-3.2.0-r1.ebuild b/dev-lang/R/R-3.2.0-r1.ebuild
deleted file mode 100644 (file)
index 9c874f3..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs
-
-BCP=${PN}-20130129.bash_completion
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="
-       mirror://cran/src/base/R-3/${P}.tar.gz
-       https://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
-REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
-
-CDEPEND="
-       app-arch/bzip2:0=
-       app-arch/xz-utils:0=
-       app-text/ghostscript-gpl
-       >=dev-libs/libpcre-8.35:3=
-       virtual/blas:0
-       || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath )
-       cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= )
-       icu? ( dev-libs/icu:= )
-       jpeg? ( virtual/jpeg:0 )
-       lapack? ( virtual/lapack:0 )
-       perl? ( dev-lang/perl )
-       png? ( media-libs/libpng:0= )
-       readline? ( sys-libs/readline:0= )
-       tiff? ( media-libs/tiff:0= )
-       tk? ( dev-lang/tk:0= )
-       X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-       virtual/pkgconfig
-       doc? (
-               virtual/latex-base
-               dev-texlive/texlive-fontsrecommended
-       )"
-
-RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
-       java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}"
-
-pkg_setup() {
-       if use openmp; then
-               if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-                       ewarn "OpenMP is not available in your current selected gcc"
-                       die "need openmp capable gcc"
-               fi
-               FORTRAN_NEED_OPENMP=1
-       fi
-       fortran-2_pkg_setup
-       filter-ldflags -Wl,-Bdirect -Bdirect
-       # avoid using existing R installation
-       unset R_HOME
-       # Temporary fix for bug #419761
-       if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then
-               append-flags -fno-ipa-cp-clone
-       fi
-}
-
-src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-               "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-               "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch \
-               "${FILESDIR}"/${PN}-3.2.0-omitted-extern-R_running_as_main_program.patch
-
-       # fix packages.html for doc (gentoo bug #205103)
-       sed -i \
-               -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
-               src/library/tools/R/Rd.R || die
-
-       # fix Rscript path when installed (gentoo bug #221061)
-       sed -i \
-               -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-               src/unix/Makefile.in || die "sed unix Makefile failed"
-
-       # fix HTML links to manual (gentoo bug #273957)
-       sed -i \
-               -e 's:\.\./manual/:manual/:g' \
-               $(grep -Flr ../manual/ doc) || die "sed for HTML links failed"
-
-       use lapack && \
-               export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-       if use X; then
-               export R_BROWSER="$(type -p xdg-open)"
-               export R_PDFVIEWER="$(type -p xdg-open)"
-       fi
-       use perl && \
-               export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-
-       # don't search /usr/local
-       sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die
-       # Fix for Darwin (OS X)
-       if use prefix; then
-               if [[ ${CHOST} == *-darwin* ]] ; then
-                       sed -i \
-                               -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \
-                               -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \
-                               -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \
-                               -e "/SHLIB_EXT/s/\.so/.dylib/" \
-                               configure.ac || die
-                       # sort of "undo" 2.14.1-rmath-shared.patch
-                       sed -i \
-                               -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
-                               src/nmath/standalone/Makefile.in || die
-               else
-                       append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
-               fi
-       fi
-       AT_M4DIR=m4 eaclocal
-       eautoconf
-}
-
-src_configure() {
-       #       --with-system-tre \
-       # tre is patched from upstream
-       econf \
-               --enable-byte-compiled-packages \
-               --enable-R-shlib \
-               --disable-R-framework \
-               --with-system-zlib \
-               --with-system-bzlib \
-               --with-system-pcre \
-               --with-system-xz \
-               --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-               rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
-               $(use_enable nls) \
-               $(use_enable openmp) \
-               $(use_enable profile R-profiling) \
-               $(use_enable profile memory-profiling) \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs R-static-lib) \
-               $(use_with cairo) \
-               $(use_with icu ICU) \
-               $(use_with jpeg jpeglib) \
-               $(use_with lapack) \
-               $(use_with !minimal recommended-packages) \
-               $(use_with png libpng) \
-               $(use_with readline) \
-               $(use_with tiff libtiff) \
-               $(use_with tk tcltk) \
-               $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \
-               $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \
-               $(use_with X x)
-}
-
-src_compile() {
-       export VARTEXFONTS="${T}/fonts"
-       emake AR="$(tc-getAR)"
-       emake -C src/nmath/standalone \
-               shared $(use static-libs && echo static) AR="$(tc-getAR)"
-       use doc && emake info pdf
-}
-
-src_install() {
-       default
-       emake -j1 -C src/nmath/standalone DESTDIR="${D}" install
-
-       if use doc; then
-               emake DESTDIR="${D}" install-info install-pdf
-               dosym ../manual /usr/share/doc/${PF}/html/manual
-       fi
-
-       cat > 99R <<-EOF
-               LDPATH=${R_DIR}/lib
-               R_HOME=${R_DIR}
-       EOF
-       doenvd 99R
-       newbashcomp "${WORKDIR}"/${BCP} ${PN}
-       # The buildsystem has a different understanding of install_names than
-       # we require.  Since it builds modules like shared objects (wrong), many
-       # objects (all modules) get an incorrect install_name.  Fixing the build
-       # system here is not really trivial.
-       if [[ ${CHOST} == *-darwin* ]] ; then
-               local mod
-               pushd "${ED}"/usr/lib/R > /dev/null
-               for mod in $(find . -name "*.dylib") ; do
-                       mod=${mod#./}
-                       install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \
-                               "${mod}"
-               done
-               popd > /dev/null
-       fi
-       docompress -x /usr/share/doc/${PF}/NEWS.rds
-}
-
-pkg_postinst() {
-       if use java; then
-               einfo "Re-initializing java paths for ${P}"
-               R CMD javareconf
-       fi
-}
index 9ad85722f96ee3ecf386f6aaec18bfff5e57649e..9229648b07e7e51f59b7eb35b4648fa5be347563 100644 (file)
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X"
 REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )"
 
@@ -45,7 +45,7 @@ DEPEND="${CDEPEND}
        )"
 
 RDEPEND="${CDEPEND}
-       ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) )
+       >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
        java? ( >=virtual/jre-1.5 )"
 
 RESTRICT="minimal? ( test )"
diff --git a/dev-lang/R/files/R-2.12.1-ldflags.patch b/dev-lang/R/files/R-2.12.1-ldflags.patch
deleted file mode 100644 (file)
index 2876ac3..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Respect ldflags on rscript
-Patch by Sebastien Fabbro
-https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
-
---- src/unix/Makefile.in.orig  2010-12-22 16:58:19.000000000 +0000
-+++ src/unix/Makefile.in       2010-12-22 16:54:16.000000000 +0000
-@@ -66,7 +66,7 @@
- ## we need to build at install time to capture the correct 'rhome'
- install-Rscript:
--      $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
-+      $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(LDFLAGS) -DR_HOME='"$(rhome)"' -o Rscript \
-         $(srcdir)/Rscript.c
-       @$(MKINSTALLDIRS) "$(DESTDIR)$(Rexecbindir)"
-       @$(INSTALL_PROGRAM) Rscript "$(DESTDIR)$(Rexecbindir)/Rscript"
diff --git a/dev-lang/R/files/R-2.14.1-rmath-shared.patch b/dev-lang/R/files/R-2.14.1-rmath-shared.patch
deleted file mode 100644 (file)
index c16f20e..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Link with libm to fix unresolved symbols when linked with as-needed
-and add a soname to the standalone math library
-Patch by Sebastien Fabbro
---- src/nmath/standalone/Makefile.in.orig      2010-03-17 14:43:22.000000000 +0000
-+++ src/nmath/standalone/Makefile.in   2012-01-02 17:40:13.000000000 +0000
-@@ -64,7 +64,8 @@
- Rexeclibdir_LTLIBRARIES = $(libRmath_la)
- libRmath_la_SOURCES = $(SOURCES)
- libRmath_la_OBJECTS = $(OBJECTS:.o=.lo)
--libRmath_la_LDFLAGS =
-+libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so
-+libRmath_la_LIBADD = $(LIBM)
- CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES)
- DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES)
-@@ -116,7 +117,7 @@
-       $(RANLIB) $@
- $(libRmath_la): $(libRmath_la_OBJECTS)
--      $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS)
-+      $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ 
- test: $(srcdir)/test.c
-       $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \
diff --git a/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch b/dev-lang/R/files/R-3.2.0-omitted-extern-R_running_as_main_program.patch
deleted file mode 100644 (file)
index eebe508..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
---- R-3.2.0-orig/src/include/Rinterface.h      2015-03-19 10:02:16.000000000 +1100
-+++ R-3.2.0/src/include/Rinterface.h   2015-05-01 23:02:17.541946810 +1000
-@@ -90,7 +90,8 @@
- void fpu_setup(Rboolean);
- /* in unix/system.c */
--int R_running_as_main_program; 
-+/* Gentoo bug 547478 R bug https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=15899 */
-+extern int R_running_as_main_program; 
- #ifdef CSTACK_DEFNS
- /* duplicating Defn.h */
index 6018d215bb5048b3d885d9ccc6dd3e20ea0b85d9..046151dd924cf9f14f05470b1ba1b84446df6e1f 100644 (file)
@@ -1,5 +1,2 @@
-DIST ekopath-2015-08-09-installer.run 58521154 SHA256 7ecd2a03012e36851f69ab35f18905793212e2feae5c242f48d8f26722c5c1ca SHA512 f7da95fa987b262aafa434487cfb64340b2be754b8e119729de998c0ccddde3bbea4f3994ecd1643dbf5e49f3a48e6173be9d0102f7eb29e41d14f0914893a5b WHIRLPOOL d9cabf4787229ff2027569f7f73095a37b40c654ed0e201478a0e100cfa091ff82f3478c6b41c992288c4711823690bb0958cb1a9209ac595bb4930aaa99af4b
-DIST ekopath-2015-08-11-installer.run 59150939 SHA256 31f491e3744257ae87b735be418287ac4530bf525cd4c61fdb0f2438f0600e4b SHA512 ada2dc774247e5ea76f35f6f9311d58d99ec599e41befc0820650affae88be6916a2dd50bf9e67e4920db2ab16fc185fb088e523c1abc75ed7bfc5ec261e0eb1 WHIRLPOOL 721deca6bb973bf64219709cd0fc95907a2c5cfb447a295e45410939f700244197fd2a382ae537a847c10368af44fcbc538ddc9529769cfa4613eab118362df7
-DIST ekopath-2015-09-10-installer.run 57138157 SHA256 fd4eca09107b9967ba01e508098c00fddbb809ba637e42aa1bb4b7518e947394 SHA512 67f99cbf74e1840de3ee4f1da810031b9e67c1ecfd7de6ff56c8303bdcdf6d9eedbb9eab975d7a6bb1ccbb3c5a65a3f60c7219f2321bd2eb4949f04979142148 WHIRLPOOL d41c1ca250b81d584d4f088ad8b03fe975bbb9fe5d6ef50c2d501904e0f187cefaf41e772c0cbd835106c1fed995a7e754a875fd621314b28bdde19a2a14fb88
-DIST ekopath-2015-09-21-installer.run 57536286 SHA256 a3aab3f1cc018222644a7d4e10d0ebe68d38626074e95638d54ae9b690721332 SHA512 3a98635f233055a81435f6dd0044f13efe7b97a7554ca5c9b50586b74a3e848076842ce0bc04c07283e8cbf92bf21fcc9b4ca36888c379ddd3190364fea9bc90 WHIRLPOOL 3bd6debddb33776ca85951a942ff87a869ca6ee0defcd493750f1682dc0f769f5c1e44820510323cd7a983b486cab07b34a955d65b890fe3d0e36171036e678d
 DIST ekopath-2015-10-10-installer.run 57723481 SHA256 0cd16e8c70d3e7938474e8885a721f0e50871a01a742b7a653dd1e6791e32baf SHA512 a4e33475b0fce0f3e9e0b744f1ba898983223cee15861491b6f7c3584c381b25c922fc17a7fd759f609f8c73ecbfbd53eeaaea38ddd9151d1cd7e46d0f1cf883 WHIRLPOOL 45744d16e34297ba47bc028382f1dc29cf0611cbff76a179640629ea89526818b4580c63e69d54541bbe915963c761b9abfe809ee2854be58e73ad80bc4e7143
+DIST ekopath-2015-10-29-installer.run 57559240 SHA256 eea8bba70f89ccaaf8f5eb48bdd7200d54a1af2d993ac850c5d08f39577eea50 SHA512 62cdb322def3bccfac5c4c12f9b3fb1eeaa5a8251a5a4ee59dfff8e7b30463f45fce04d482cc16abbb3b263a88bf845723f22858bae5933570fc43841f970667 WHIRLPOOL fa3a8dd365840c33dd4139bd139e902bf990b0d3ebc736c661060c4faf4e79f41c93c6961b7fd7b46e9aa20e38fbb4265480a006450f728825440392af228351
diff --git a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
deleted file mode 100644 (file)
index c886d13..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-       opt/${PN}/lib/${MY_PV}/x8664/*
-       opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-       cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-       chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-       cat > 99${PN} <<-EOF || die
-               PATH=${EROOT%/}/opt/${PN}/bin
-               ROOTPATH=${EROOT%/}/opt/${PN}/bin
-               LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-               MANPATH=${EROOT%/}/opt/${PN}/docs/man
-       EOF
-}
-
-src_install() {
-       # EI_PAX marking is obsolete and PT_PAX breaks the binary.
-       # We must use XT_PAX to run the installer.
-       if [[ ${PAX_MARKINGS} == "XT" ]]; then
-               pax-mark m "${INSTALLER}"
-       fi
-
-       ./"${INSTALLER}" \
-               --prefix "${ED%/}/opt/${PN}" \
-               --mode unattended || die
-
-       if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
-               local guess
-               cd "${ED%/}/opt/${PN}/lib" && guess=( * )
-
-               if [[ ${guess[@]} ]]; then
-                       die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-               else
-                       die "No libdir installed"
-               fi
-       fi
-       [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-       rm -r "${ED}/opt/${PN}"/uninstall* || die
-       doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
deleted file mode 100644 (file)
index c886d13..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-       opt/${PN}/lib/${MY_PV}/x8664/*
-       opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-       cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-       chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-       cat > 99${PN} <<-EOF || die
-               PATH=${EROOT%/}/opt/${PN}/bin
-               ROOTPATH=${EROOT%/}/opt/${PN}/bin
-               LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-               MANPATH=${EROOT%/}/opt/${PN}/docs/man
-       EOF
-}
-
-src_install() {
-       # EI_PAX marking is obsolete and PT_PAX breaks the binary.
-       # We must use XT_PAX to run the installer.
-       if [[ ${PAX_MARKINGS} == "XT" ]]; then
-               pax-mark m "${INSTALLER}"
-       fi
-
-       ./"${INSTALLER}" \
-               --prefix "${ED%/}/opt/${PN}" \
-               --mode unattended || die
-
-       if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
-               local guess
-               cd "${ED%/}/opt/${PN}/lib" && guess=( * )
-
-               if [[ ${guess[@]} ]]; then
-                       die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-               else
-                       die "No libdir installed"
-               fi
-       fi
-       [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-       rm -r "${ED}/opt/${PN}"/uninstall* || die
-       doenvd 99${PN}
-}
diff --git a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
deleted file mode 100644 (file)
index c886d13..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit versionator multilib pax-utils
-
-MY_PV=$(get_version_component_range 1-3)
-DATE=$(get_version_component_range 4)
-DATE=${DATE#p}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
-INSTALLER=${PN}-${DATE}-installer.run
-
-DESCRIPTION="PathScale EKOPath Compiler Suite"
-HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
-SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="!!app-arch/rpm"
-RDEPEND=""
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="
-       opt/${PN}/lib/${MY_PV}/x8664/*
-       opt/${PN}/bin/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
-       cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
-       chmod +x "${S}/${INSTALLER}" || die
-}
-
-src_prepare() {
-       cat > 99${PN} <<-EOF || die
-               PATH=${EROOT%/}/opt/${PN}/bin
-               ROOTPATH=${EROOT%/}/opt/${PN}/bin
-               LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
-               MANPATH=${EROOT%/}/opt/${PN}/docs/man
-       EOF
-}
-
-src_install() {
-       # EI_PAX marking is obsolete and PT_PAX breaks the binary.
-       # We must use XT_PAX to run the installer.
-       if [[ ${PAX_MARKINGS} == "XT" ]]; then
-               pax-mark m "${INSTALLER}"
-       fi
-
-       ./"${INSTALLER}" \
-               --prefix "${ED%/}/opt/${PN}" \
-               --mode unattended || die
-
-       if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
-               local guess
-               cd "${ED%/}/opt/${PN}/lib" && guess=( * )
-
-               if [[ ${guess[@]} ]]; then
-                       die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
-               else
-                       die "No libdir installed"
-               fi
-       fi
-       [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
-
-       rm -r "${ED}/opt/${PN}"/uninstall* || die
-       doenvd 99${PN}
-}
index 227fcb692878cc3684a7013801dba4ab62b18f65..a6664e31fe33c23baff71e0fa9a00fba887f3a62 100644 (file)
@@ -3,6 +3,7 @@ DIST php-5.5.29.tar.bz2 13698565 SHA256 fbcee579ecc77cad6960a541116aee669cf145c2
 DIST php-5.5.30.tar.bz2 13699702 SHA256 e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29 SHA512 9458126f579ace9e2aebdfa7ad7f8d097f1fd502f443d8fd66263ba3c542d579ca9c705e227725fae57e452649a3be7cb717a0330d339b93d3c6c94fa80dbc1f WHIRLPOOL 2aa6c61a48a231d81f6c746f94e42589d87b93d0526f02d6d15f731cbbca4aecdee84b443f7ec1891f2a524939c542ac6f94e15db90a23a8b19523463025d395
 DIST php-5.6.13.tar.bz2 14077633 SHA256 6358837c9cbab41b91ede59dbf0670ae0fb925a1369ecbc1a44a27212420f893 SHA512 80e89ae748255d40b466de6c61b4443432fd81ffb1510ae66f809ed0dd07eb4071ded5b7a975f997b2cb28553ac7e27c57b67734e268c894207e9efd78ae76bf WHIRLPOOL 9b0add1b05220f9ef60de2741dcd198d0b44a9813dc1a999e42700ddb1e879f3749056cdfb151a595bc7a14a65a38eca6d0f416ee36ebd013126a92878fd47db
 DIST php-5.6.14.tar.bz2 14073920 SHA256 36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0 SHA512 af0c7fa5c7be15839b1189b2544ff725b935228030087c206f83727e7885750030b10bf2bfbd27adea6f18af90d4ecd3ced9defec88c5f98f7ed26b4e4c57981 WHIRLPOOL 8e31fc3dbeb22fa2a59112d2dcbe28f8102c8d5a14fd716d17f909399c06d27a10ea32d43ebd1a12cea78d9fd949ae7c7882628ae0c3abd7354d165107fa0c9d
+DIST php-5.6.15.tar.bz2 14060562 SHA256 11a0645c4d4b749e256da1e0d6df89dd886b5b06b83c914d942653661dbd1c38 SHA512 3841b1b64bbe1b3bdbbbf2591f2ca81754f1e7391dae593f45302ea7a4157dd8032e0f525308a13769938aadbfca9e25cbe15ac9bf8eed1427263fefcbede2aa WHIRLPOOL 6d5a6b860d0db887c09d1bfb8304a39d44f1c5966bab3f881c277e3aa0331cd794f1bff02cbac2bdba23fd9bc4fe71a8e1d4b51cbb4c1dfe1ceadca15ec38665
 DIST php-7.0.0RC4.tar.bz2 13973356 SHA256 5475a6856b600a7a4f31a0276339725140d64da31a8a363e0cdb45ed233f27cd SHA512 02a55ce90d66f6ee2019461658eeb7ce7fd2c78c5c32869a3882f0f6fd6a54454b26f3440266ed8e850da740633243f697086a5c0cf0d616f0029e6ba4ddd1bf WHIRLPOOL 7695a9e3b54470c456104e29082479d27c47806e86f739d9d01ffe57580d28b1130d3aaadd3d78f205b457ed4d3207a3ad52a95996cef6b70898ed948b1373a5
 DIST php-7.0.0RC5.tar.bz2 13985797 SHA256 90e3f91c6781e6cdd198dd7b3f9bceff0c00be74a56ea0940b4ad9c6b312b4db SHA512 0deceb3bc33bf67076a9613cb150d5b036a4198429c46b49d92a172d0773980bd9df764e89c3f5c53f4e39069376f5cf6bca82b61851e138b30460087003b66b WHIRLPOOL a4228765601c28d88ecb5a298bb24c4b20d9f0559429c415a23dd4cb92847586223b124aecd958de718f6dfe45c314b82b63ed84d9143e94de9f967358be2d15
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15.ebuild
new file mode 100644 (file)
index 0000000..c6cc5ca
--- /dev/null
@@ -0,0 +1,770 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+function php_get_uri ()
+{
+       case "${1}" in
+               "php-pre")
+                       echo "http://downloads.php.net/dsp/${2}"
+               ;;
+               "php")
+                       echo "http://www.php.net/distributions/${2}"
+               ;;
+               "olemarkus")
+                       echo "https://dev.gentoo.org/~olemarkus/php/${2}"
+               ;;
+               "gentoo")
+                       echo "mirror://gentoo/${2}"
+               ;;
+               *)
+                       die "unhandled case in php_get_uri"
+               ;;
+       esac
+}
+
+PHP_MV="$(get_major_version)"
+SLOT="$(get_version_component_range 1-2)"
+
+# alias, so we can handle different types of releases (finals, rcs, alphas,
+# betas, ...) w/o changing the whole ebuild
+PHP_PV="${PV/_rc/RC}"
+PHP_PV="${PHP_PV/_alpha/alpha}"
+PHP_PV="${PHP_PV/_beta/beta}"
+PHP_RELEASE="php"
+[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
+[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
+PHP_P="${PN}-${PHP_PV}"
+
+PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
+
+PHP_FPM_CONF_VER="1"
+
+SRC_URI="${PHP_SRC_URI}"
+
+DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
+HOMEPAGE="http://php.net/"
+LICENSE="PHP-3"
+
+S="${WORKDIR}/${PHP_P}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+       ${SAPIS/cli/+cli}
+       threads"
+
+IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+       crypt +ctype curl debug
+       enchant exif frontbase +fileinfo +filter firebird
+       flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+       intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
+       mssql mysql libmysqlclient mysqli nls
+       oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+       readline recode selinux +session sharedmem
+       +simplexml snmp soap sockets spell sqlite ssl
+       sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
+       +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+DEPEND="
+       >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?]
+       >=dev-libs/libpcre-8.32[unicode]
+       apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+               <www-servers/apache-2.4[threads=] ) )
+       berkdb? ( =sys-libs/db-4* )
+       bzip2? ( app-arch/bzip2 )
+       cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+       cjk? ( !gd? (
+               virtual/jpeg:0
+               media-libs/libpng:0=
+               sys-libs/zlib
+       ) )
+       crypt? ( >=dev-libs/libmcrypt-2.4 )
+       curl? ( >=net-misc/curl-7.10.5 )
+       enchant? ( app-text/enchant )
+       exif? ( !gd? (
+               virtual/jpeg:0
+               media-libs/libpng:0=
+               sys-libs/zlib
+       ) )
+       firebird? ( dev-db/firebird )
+       gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+       gdbm? ( >=sys-libs/gdbm-1.8.0 )
+       gmp? ( dev-libs/gmp:0 )
+       iconv? ( virtual/libiconv )
+       imap? ( virtual/imap-c-client[ssl=] )
+       intl? ( dev-libs/icu:= )
+       iodbc? ( dev-db/libiodbc )
+       kerberos? ( virtual/krb5 )
+       ldap? ( >=net-nds/openldap-1.2.11 )
+       ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+       libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
+       mssql? ( dev-db/freetds[mssql] )
+       libmysqlclient? (
+               mysql? ( virtual/mysql )
+               mysqli? ( >=virtual/mysql-4.1 )
+       )
+       nls? ( sys-devel/gettext )
+       oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+       odbc? ( >=dev-db/unixODBC-1.8.13 )
+       postgres? ( dev-db/postgresql:* )
+       qdbm? ( dev-db/qdbm )
+       readline? ( sys-libs/readline:0 )
+       recode? ( app-text/recode )
+       sharedmem? ( dev-libs/mm )
+       simplexml? ( >=dev-libs/libxml2-2.6.8 )
+       snmp? ( >=net-analyzer/net-snmp-5.2 )
+       soap? ( >=dev-libs/libxml2-2.6.8 )
+       spell? ( >=app-text/aspell-0.50 )
+       sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+       ssl? ( dev-libs/openssl:0 )
+       sybase-ct? ( dev-db/freetds )
+       tidy? ( app-text/htmltidy )
+       truetype? (
+               =media-libs/freetype-2*
+               >=media-libs/t1lib-5.0.0
+               !gd? (
+                       virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
+       )
+       unicode? ( dev-libs/oniguruma )
+       vpx? ( media-libs/libvpx )
+       wddx? ( >=dev-libs/libxml2-2.6.8 )
+       xml? ( >=dev-libs/libxml2-2.6.8 )
+       xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+       xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+       xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+       xpm? (
+               x11-libs/libXpm
+               virtual/jpeg:0
+               media-libs/libpng:0= sys-libs/zlib
+       )
+       xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+       zip? ( sys-libs/zlib )
+       zlib? ( sys-libs/zlib )
+       virtual/mta
+"
+
+php="=${CATEGORY}/${PF}"
+
+REQUIRED_USE="
+       truetype? ( gd )
+       vpx? ( gd )
+       cjk? ( gd )
+       exif? ( gd )
+
+       xpm? ( gd )
+       gd? ( zlib )
+       simplexml? ( xml )
+       soap? ( xml )
+       wddx? ( xml )
+       xmlrpc? ( || ( xml iconv ) )
+       xmlreader? ( xml )
+       xslt? ( xml )
+       ldap-sasl? ( ldap )
+       mhash? ( hash )
+       phar? ( hash )
+       libmysqlclient? ( || (
+               mysql
+               mysqli
+               pdo
+       ) )
+
+       qdbm? ( !gdbm )
+       readline? ( !libedit )
+       recode? ( !imap !mysql !mysqli )
+       sharedmem? ( !threads )
+
+       !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
+
+RDEPEND="${DEPEND}"
+
+RDEPEND="${RDEPEND}
+       fpm? (
+               selinux? ( sec-policy/selinux-phpfpm )
+               systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${DEPEND}
+       sys-devel/flex
+       >=sys-devel/m4-1.4.3
+       >=sys-devel/libtool-1.5.18"
+
+# Allow users to install production version if they want to
+
+case "${PHP_INI_VERSION}" in
+       production|development)
+               ;;
+       *)
+               PHP_INI_VERSION="development"
+               ;;
+esac
+
+PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
+PHP_INI_FILE="php.ini"
+
+want_apache
+
+pkg_setup() {
+       depend.apache_pkg_setup
+}
+
+php_install_ini() {
+       local phpsapi="${1}"
+
+       # work out where we are installing the ini file
+       php_set_ini_dir "${phpsapi}"
+
+       local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+       cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
+
+       # default to /tmp for save_path, bug #282768
+       sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
+
+       # Set the extension dir
+       sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
+
+       # Set the include path to point to where we want to find PEAR packages
+       sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
+
+       dodir "${PHP_INI_DIR#${EPREFIX}}"
+       insinto "${PHP_INI_DIR#${EPREFIX}}"
+       newins "${phpinisrc}" "${PHP_INI_FILE}"
+
+       elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+       elog
+
+       dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+       dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+       if use_if_iuse opcache; then
+               elog "Adding opcache to $PHP_EXT_INI_DIR"
+               echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+               dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+       fi
+
+       # SAPI-specific handling
+
+       if [[ "${sapi}" == "fpm" ]] ; then
+               [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
+               einfo "Installing FPM CGI config file php-fpm.conf"
+               insinto "${PHP_INI_DIR#${EPREFIX}}"
+               newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
+
+               # Remove bogus /etc/php-fpm.conf.default (bug 359906)
+               [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
+       fi
+
+       # Install PHP ini files into /usr/share/php
+
+       dodoc php.ini-development
+       dodoc php.ini-production
+
+}
+
+php_set_ini_dir() {
+       PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+       PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+       PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+       # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
+       # ([empty session.save_path]/session_mm_[sapi][gid].sem)
+       # there is no easy way to circumvent that, all php calls during
+       # install use -n, so no php.ini file will be used.
+       # As such, this is the easiest way to get around
+       addpredict /session_mm_cli250.sem
+       addpredict /session_mm_cli0.sem
+
+       # Change PHP branding
+       # Get the alpha/beta/rc version
+       sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+               -i configure.in || die "Unable to change PHP branding"
+
+       # Patch PHP to show Gentoo as the server platform
+       sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+               -i configure.in || die "Failed to fix server platform name"
+
+       # Prevent PHP from activating the Apache config,
+       # as we will do that ourselves
+       sed -i \
+               -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+               -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+               configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
+
+       # Patch PHP to support heimdal instead of mit-krb5
+       if has_version "app-crypt/heimdal" ; then
+               sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+                       || die "Failed to fix heimdal libname"
+               sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+                       || die "Failed to fix heimdal crypt library reference"
+       fi
+
+       #Add user patches #357637
+       epatch_user
+
+       #force rebuilding aclocal.m4
+       rm aclocal.m4
+       eautoreconf
+
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # http://bugs.php.net/bug.php?id=48795, bug #343481
+               sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+       fi
+}
+
+src_configure() {
+       addpredict /usr/share/snmp/mibs/.index
+       addpredict /var/lib/net-snmp/mib_indexes
+
+       PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+       # This is a global variable and should be in caps. It isn't because the
+       # phpconfutils eclass relies on exactly this name...
+       # for --with-libdir see bug #327025
+       my_conf="
+               --prefix="${PHP_DESTDIR}"
+               --mandir="${PHP_DESTDIR}"/man
+               --infodir="${PHP_DESTDIR}"/info
+               --libdir="${PHP_DESTDIR}"/lib
+               --with-libdir=$(get_libdir)
+               --without-pear
+               $(use_enable threads maintainer-zts)"
+
+       #                             extension           USE flag        shared
+       my_conf+="
+       $(use_enable bcmath bcmath )
+       $(use_with bzip2 bz2 "${EPREFIX}"/usr)
+       $(use_enable calendar calendar )
+       $(use_enable ctype ctype )
+       $(use_with curl curl "${EPREFIX}"/usr)
+       $(use_enable xml dom )
+       $(use_with enchant enchant "${EPREFIX}"/usr)
+       $(use_enable exif exif )
+       $(use_enable fileinfo fileinfo )
+       $(use_enable filter filter )
+       $(use_enable ftp ftp )
+       $(use_with nls gettext "${EPREFIX}"/usr)
+       $(use_with gmp gmp "${EPREFIX}"/usr)
+       $(use_enable hash hash )
+       $(use_with mhash mhash "${EPREFIX}"/usr)
+       $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr))
+       $(use_enable intl intl )
+       $(use_enable ipv6 ipv6 )
+       $(use_enable json json )
+       $(use_with kerberos kerberos "${EPREFIX}"/usr)
+       $(use_enable xml libxml )
+       $(use_with xml libxml-dir "${EPREFIX}"/usr)
+       $(use_enable unicode mbstring )
+       $(use_with crypt mcrypt "${EPREFIX}"/usr)
+       $(use_with mssql mssql "${EPREFIX}"/usr)
+       $(use_with unicode onig "${EPREFIX}"/usr)
+       $(use_with ssl openssl "${EPREFIX}"/usr)
+       $(use_with ssl openssl-dir "${EPREFIX}"/usr)
+       $(use_enable pcntl pcntl )
+       $(use_enable phar phar )
+       $(use_enable pdo pdo )
+       $(use_enable opcache opcache )
+       $(use_with postgres pgsql "${EPREFIX}"/usr)
+       $(use_enable posix posix )
+       $(use_with spell pspell "${EPREFIX}"/usr)
+       $(use_with recode recode "${EPREFIX}"/usr)
+       $(use_enable simplexml simplexml )
+       $(use_enable sharedmem shmop )
+       $(use_with snmp snmp "${EPREFIX}"/usr)
+       $(use_enable soap soap )
+       $(use_enable sockets sockets )
+       $(use_with sqlite sqlite3 "${EPREFIX}"/usr)
+       $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
+       $(use_enable sysvipc sysvmsg )
+       $(use_enable sysvipc sysvsem )
+       $(use_enable sysvipc sysvshm )
+       $(use_with systemd fpm-systemd)
+       $(use_with tidy tidy "${EPREFIX}"/usr)
+       $(use_enable tokenizer tokenizer )
+       $(use_enable wddx wddx )
+       $(use_enable xml xml )
+       $(use_enable xmlreader xmlreader )
+       $(use_enable xmlwriter xmlwriter )
+       $(use_with xmlrpc xmlrpc)
+       $(use_with xslt xsl "${EPREFIX}"/usr)
+       $(use_enable zip zip )
+       $(use_with zlib zlib "${EPREFIX}"/usr)
+       $(use_enable debug debug )"
+
+       # DBA support
+       if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+               || use qdbm ; then
+               my_conf+=" --enable-dba${shared}"
+       fi
+
+       # DBA drivers support
+       my_conf+="
+       $(use_with cdb cdb)
+       $(use_with berkdb db4 ${EPREFIX}/usr)
+       $(use_enable flatfile flatfile )
+       $(use_with gdbm gdbm ${EPREFIX}/usr)
+       $(use_enable inifile inifile )
+       $(use_with qdbm qdbm ${EPREFIX}/usr)"
+
+       # Support for the GD graphics library
+       my_conf+="
+       $(use_with truetype freetype-dir ${EPREFIX}/usr)
+       $(use_with truetype t1lib ${EPREFIX}/usr)
+       $(use_enable cjk gd-jis-conv )
+       $(use_with gd jpeg-dir ${EPREFIX}/usr)
+       $(use_with gd png-dir ${EPREFIX}/usr)
+       $(use_with xpm xpm-dir ${EPREFIX}/usr)
+       $(use_with vpx vpx-dir ${EPREFIX}/usr)"
+       # enable gd last, so configure can pick up the previous settings
+       my_conf+="
+       $(use_with gd gd)"
+
+       # IMAP support
+       if use imap ; then
+               my_conf+="
+               $(use_with imap imap ${EPREFIX}/usr)
+               $(use_with ssl imap-ssl ${EPREFIX}/usr)"
+       fi
+
+       # Interbase/firebird support
+       my_conf+="
+       $(use_with firebird interbase ${EPREFIX}/usr)"
+
+       # LDAP support
+       if use ldap ; then
+               my_conf+="
+               $(use_with ldap ldap ${EPREFIX}/usr)
+               $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
+       fi
+
+       # MySQL support
+       local mysqllib="mysqlnd"
+       local mysqlilib="mysqlnd"
+       use libmysqlclient && mysqllib="${EPREFIX}/usr"
+       use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+       my_conf+=" $(use_with mysql mysql $mysqllib)"
+       my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
+
+       local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
+       if use mysql ; then
+               my_conf+="${mysqlsock}"
+       elif use mysqli ; then
+               my_conf+="${mysqlsock}"
+       fi
+
+       # ODBC support
+       my_conf+="
+       $(use_with odbc unixODBC ${EPREFIX}/usr)
+       $(use_with iodbc iodbc ${EPREFIX}/usr)"
+
+       # Oracle support
+       my_conf+="
+       $(use_with oci8-instant-client oci8)"
+
+       # PDO support
+       if use pdo ; then
+               my_conf+="
+               $(use_with mssql pdo-dblib )
+               $(use_with mysql pdo-mysql ${mysqllib})
+               $(use_with postgres pdo-pgsql )
+               $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
+               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)
+               $(use_with oci8-instant-client pdo-oci)"
+       fi
+
+       # readline/libedit support
+       my_conf+="
+       $(use_with readline readline ${EPREFIX}/usr)
+       $(use_with libedit libedit ${EPREFIX}/usr)"
+
+       # Session support
+       if use session ; then
+               my_conf+="
+               $(use_with sharedmem mm ${EPREFIX}/usr)"
+       else
+               my_conf+="
+               $(use_enable session session )"
+       fi
+
+       # Use pic for shared modules such as apache2's mod_php
+       my_conf+=" --with-pic"
+
+       # we use the system copy of pcre
+       # --with-pcre-regex affects ext/pcre
+       # --with-pcre-dir affects ext/filter and ext/zip
+       my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+
+       # Catch CFLAGS problems
+       # Fixes bug #14067.
+       # Changed order to run it in reverse for bug #32022 and #12021.
+       replace-cpu-flags "k6*" "i586"
+
+       # Support user-passed configuration parameters
+       my_conf+=" ${EXTRA_ECONF:-}"
+
+       # Support the Apache2 extras, they must be set globally for all
+       # SAPIs to work correctly, especially for external PHP extensions
+
+       mkdir -p "${WORKDIR}/sapis-build"
+       for one_sapi in $SAPIS ; do
+               use "${one_sapi}" || continue
+               php_set_ini_dir "${one_sapi}"
+
+               cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
+               cd "${WORKDIR}/sapis-build/${one_sapi}"
+
+               sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
+                       --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
+
+               for sapi in $SAPIS ; do
+                       case "$sapi" in
+                               cli|cgi|embed|fpm)
+                                       if [[ "${one_sapi}" == "${sapi}" ]] ; then
+                                               sapi_conf="${sapi_conf} --enable-${sapi}"
+                                       else
+                                               sapi_conf="${sapi_conf} --disable-${sapi}"
+                                       fi
+                                       ;;
+
+                               apache2)
+                                       if [[ "${one_sapi}" == "${sapi}" ]] ; then
+                                               sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
+                                       else
+                                               sapi_conf="${sapi_conf} --without-apxs2"
+                                       fi
+                                       ;;
+                       esac
+               done
+
+               econf ${sapi_conf}
+       done
+}
+
+src_compile() {
+       # snmp seems to run during src_compile, too (bug #324739)
+       addpredict /usr/share/snmp/mibs/.index
+       addpredict /var/lib/net-snmp/mib_indexes
+
+       for sapi in ${SAPIS} ; do
+               if use "${sapi}"; then
+                       cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+                       emake || die "emake failed"
+               fi
+       done
+}
+
+src_install() {
+       # see bug #324739 for what happens when we don't have that
+       addpredict /usr/share/snmp/mibs/.index
+
+       # grab the first SAPI that got built and install common files from there
+       local first_sapi=""
+       for sapi in $SAPIS ; do
+               if use $sapi ; then
+                       first_sapi=$sapi
+                       break
+               fi
+       done
+
+       # Makefile forgets to create this before trying to write to it...
+       dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+       # Install php environment (without any sapis)
+       cd "${WORKDIR}/sapis-build/$first_sapi"
+       emake INSTALL_ROOT="${D}" \
+               install-build install-headers install-programs \
+               || die "emake install failed"
+
+       local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+       # Create the directory where we'll put version-specific php scripts
+       keepdir /usr/share/php${PHP_MV}
+
+       local sapi="", file=""
+       local sapi_list=""
+
+       for sapi in ${SAPIS}; do
+               if use "${sapi}" ; then
+                       einfo "Installing SAPI: ${sapi}"
+                       cd "${WORKDIR}/sapis-build/${sapi}"
+
+                       if [[ "${sapi}" == "apache2" ]] ; then
+                               # We're specifically not using emake install-sapi as libtool
+                               # may cause unnecessary relink failures (see bug #351266)
+                               insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+                               newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
+                               keepdir "/usr/$(get_libdir)/apache2/modules"
+                       else
+                               # needed each time, php_install_ini would reset it
+                               local dest="${PHP_DESTDIR#${EPREFIX}}"
+                               into "${dest}"
+                               case "$sapi" in
+                                       cli)
+                                               source="sapi/cli/php"
+                                               ;;
+                                       cgi)
+                                               source="sapi/cgi/php-cgi"
+                                               ;;
+                                       fpm)
+                                               source="sapi/fpm/php-fpm"
+                                               ;;
+                                       embed)
+                                               source="libs/libphp${PHP_MV}$(get_libname)"
+                                               ;;
+                                       *)
+                                               die "unhandled sapi in src_install"
+                                               ;;
+                               esac
+
+                               if [[ "${source}" == *"$(get_libname)" ]]; then
+                                       dolib.so "${source}" || die "Unable to install ${sapi} sapi"
+                               else
+                                       dobin "${source}" || die "Unable to install ${sapi} sapi"
+                                       local name="$(basename ${source})"
+                                       dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+                               fi
+                       fi
+
+                       php_install_ini "${sapi}"
+
+                       # construct correct SAPI string for php-config
+                       # thanks to ferringb for the bash voodoo
+                       if [[ "${sapi}" == "apache2" ]]; then
+                               sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+                       else
+                               sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+                       fi
+               fi
+       done
+
+       # Installing opcache module
+       if use_if_iuse opcache ; then
+               dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
+       fi
+
+       # Install env.d files
+       newenvd "${FILESDIR}/20php5-envd" \
+               "20php${SLOT}"
+       sed -e "s|/lib/|/$(get_libdir)/|g" -i \
+               "${ED}/etc/env.d/20php${SLOT}"
+       sed -e "s|php5|php${SLOT}|g" -i \
+               "${ED}/etc/env.d/20php${SLOT}"
+
+       # set php-config variable correctly (bug #278439)
+       sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+               "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
+
+       if use fpm ; then
+               if use systemd; then
+                       systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
+               else
+                       systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
+               fi
+       fi
+}
+
+src_test() {
+       echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+       PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+       if [[ ! -x "${PHP_BIN}" ]] ; then
+               ewarn "Test phase requires USE=cli, skipping"
+               return
+       else
+               export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+       fi
+
+       if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+               export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+       fi
+
+       REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
+               "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
+
+       for name in ${EXPECTED_TEST_FAILURES}; do
+               mv "${name}.out" "${name}.out.orig" 2>/dev/null
+       done
+
+       local failed="$(find -name '*.out')"
+       if [[ ${failed} != "" ]] ; then
+               ewarn "The following test cases failed unexpectedly:"
+               for name in ${failed}; do
+                       ewarn "  ${name/.out/}"
+               done
+       else
+               einfo "No unexpected test failures, all fine"
+       fi
+
+       if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+               local passed=""
+               for name in ${EXPECTED_TEST_FAILURES}; do
+                       [[ -f "${name}.diff" ]] && continue
+                       passed="${passed} ${name}"
+               done
+               if [[ ${passed} != "" ]] ; then
+                       einfo "The following test cases passed unexpectedly:"
+                       for name in ${passed}; do
+                               ewarn "  ${passed}"
+                       done
+               else
+                       einfo "None of the known-to-fail tests passed, all fine"
+               fi
+       fi
+}
+
+pkg_postinst() {
+       # Output some general info to the user
+       if use apache2 ; then
+               APACHE2_MOD_DEFINE="PHP5"
+               APACHE2_MOD_CONF="70_mod_php5"  # actually provided by app-eselect/eselect-php
+               apache-module_pkg_postinst
+       fi
+
+       # Create the symlinks for php
+       for m in ${SAPIS}; do
+               [[ ${m} == 'embed' ]] && continue;
+               if use $m ; then
+                       local ci=$(eselect php show $m)
+                       if [[ -z $ci ]]; then
+                               eselect php set $m php${SLOT}
+                               einfo "Switched ${m} to use php:${SLOT}"
+                               einfo
+                       elif [[ $ci != "php${SLOT}" ]] ; then
+                               elog "To switch $m to use php:${SLOT}, run"
+                               elog "    eselect php set $m php${SLOT}"
+                               elog
+                       fi
+               fi
+       done
+
+       elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
+       elog "to compile extensions for the ${SLOT} ABI"
+       elog
+       if ! use readline && use cli ; then
+               ewarn "Note that in order to use php interactivly, you need to enable"
+               ewarn "the readline USE flag or php -a will hang"
+       fi
+       elog
+       elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
+       elog "You can choose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+       elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
+       elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
+
+       elog
+       elog "For more details on how minor version slotting works (PHP_TARGETS) please see the wiki:"
+       elog "https://wiki.gentoo.org/wiki/PHP"
+       elog
+}
+
+pkg_prerm() {
+       eselect php cleanup
+}
index c81046fe2af2c5b0ca2830c11886d701e8b6551c..3b7ea171dbbcfab715159b9c3364d7c7e86eb178 100644 (file)
@@ -99,7 +99,7 @@ DEPEND="
        firebird? ( dev-db/firebird )
        gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
        gdbm? ( >=sys-libs/gdbm-1.8.0 )
-       gmp? ( >=dev-libs/gmp-4.1.2 )
+       gmp? ( dev-libs/gmp:0 )
        iconv? ( virtual/libiconv )
        imap? ( virtual/imap-c-client[ssl=] )
        intl? ( dev-libs/icu:= )
@@ -111,9 +111,9 @@ DEPEND="
        nls? ( sys-devel/gettext )
        oci8-instant-client? ( dev-db/oracle-instantclient-basic )
        odbc? ( >=dev-db/unixODBC-1.8.13 )
-       postgres? ( dev-db/postgresql )
+       postgres? ( dev-db/postgresql:* )
        qdbm? ( dev-db/qdbm )
-       readline? ( sys-libs/readline )
+       readline? ( sys-libs/readline:0 )
        recode? ( app-text/recode )
        sharedmem? ( dev-libs/mm )
        simplexml? ( >=dev-libs/libxml2-2.6.8 )
@@ -121,7 +121,7 @@ DEPEND="
        soap? ( >=dev-libs/libxml2-2.6.8 )
        spell? ( >=app-text/aspell-0.50 )
        sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-       ssl? ( >=dev-libs/openssl-0.9.7 )
+       ssl? ( dev-libs/openssl:0 )
        tidy? ( app-text/htmltidy )
        truetype? (
                =media-libs/freetype-2*
@@ -384,7 +384,7 @@ src_configure() {
        # DBA support
        if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
                || use qdbm ; then
-               my_conf="${my_conf} --enable-dba${shared}"
+               my_conf+=" --enable-dba${shared}"
        fi
 
        # DBA drivers support
@@ -416,11 +416,8 @@ src_configure() {
        fi
 
        # Interbase/firebird support
-
-       if use firebird ; then
-               my_conf+="
-               $(use_with firebird interbase ${EPREFIX}/usr)"
-       fi
+       my_conf+="
+       $(use_with firebird interbase ${EPREFIX}/usr)"
 
        # LDAP support
        if use ldap ; then
@@ -443,21 +440,13 @@ src_configure() {
        fi
 
        # ODBC support
-       if use odbc ; then
-               my_conf+="
-               $(use_with odbc unixODBC ${EPREFIX}/usr)"
-       fi
-
-       if use iodbc ; then
-               my_conf+="
-               $(use_with iodbc iodbc ${EPREFIX}/usr)"
-       fi
+       my_conf+="
+       $(use_with odbc unixODBC ${EPREFIX}/usr)
+       $(use_with iodbc iodbc ${EPREFIX}/usr)"
 
        # Oracle support
-       if use oci8-instant-client ; then
-               my_conf+="
-               $(use_with oci8-instant-client oci8)"
-       fi
+       my_conf+="
+       $(use_with oci8-instant-client oci8)"
 
        # PDO support
        if use pdo ; then
@@ -465,11 +454,8 @@ src_configure() {
                $(use_with mysql pdo-mysql ${mysqllib})
                $(use_with postgres pdo-pgsql )
                $(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-               if use oci8-instant-client ; then
-                       my_conf+="
-                       $(use_with oci8-instant-client pdo-oci)"
-               fi
+               $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)
+               $(use_with oci8-instant-client pdo-oci)"
        fi
 
        # readline/libedit support
@@ -487,12 +473,12 @@ src_configure() {
        fi
 
        # Use pic for shared modules such as apache2's mod_php
-       my_conf="${my_conf} --with-pic"
+       my_conf+=" --with-pic"
 
        # we use the system copy of pcre
        # --with-pcre-regex affects ext/pcre
        # --with-pcre-dir affects ext/filter and ext/zip
-       my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
+       my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
 
        # Catch CFLAGS problems
        # Fixes bug #14067.
@@ -500,7 +486,7 @@ src_configure() {
        replace-cpu-flags "k6*" "i586"
 
        # Support user-passed configuration parameters
-       my_conf="${my_conf} ${EXTRA_ECONF:-}"
+       my_conf+=" ${EXTRA_ECONF:-}"
 
        # Support the Apache2 extras, they must be set globally for all
        # SAPIs to work correctly, especially for external PHP extensions
@@ -745,13 +731,13 @@ pkg_postinst() {
        fi
        elog
        elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-       elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
+       elog "You can choose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
        elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
        elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
 
        elog
-       elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-       elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml"
+       elog "For more details on how minor version slotting works (PHP_TARGETS) please see the wiki:"
+       elog "https://wiki.gentoo.org/wiki/PHP"
        elog
 }
 
index f1dd1b5bb0cec4406da28079ae51e2ac2cc827b8..1efdd258c3eaf496a6be676c2d2d3ac2144db64e 100644 (file)
@@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-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="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
index ec33422cae55103428c7613fc8f7ecffbfccdcd9..e82805238b157e2c6f396dbfc73abee868357b74 100644 (file)
@@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="3.4"
-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="build elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
index d1217cf3b29e29b706fe9ec9f23ff9ca383f6959..a3fb2b390e74fea9272f85b3a73ebab613b5dfb4 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=2
 inherit eutils
 
 DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.hms"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
 SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
index 40de822fce7c4487eab4d5bcea9e04b98aa10a3a..4e3d7ef2424c4610b69d7917fca863aea3b38bc9 100644 (file)
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
 DESCRIPTION="Collection of general purpose C++-classes"
-HOMEPAGE="http://www.tntnet.org/cxxtools.hms"
+HOMEPAGE="http://www.tntnet.org/cxxtools.html"
 SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
index 851a4260e36db73204b0be844bffa3a5de534d91..c426c9e0cf1859a42eaf28581a9f37ef149acacd 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
-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"
 IUSE="bzip2 lzma nls static-libs test +threads +utils zlib"
 
 # This pkg does not actually seem to compile currently in a uClibc
index 6e8d7aa252cbcf3f52617d385d0cbb58d7fbc676..6f9eb6010b29b2b2d9e72e0880bb42a9aa6af432 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="
 # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
 LICENSE="LGPL-2.1 GPL-2 MaxMind2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="static-libs"
 RESTRICT="test"
 
index dc45cf7cc4dba800b496dbe9630044c80d2ae7e7..e753ae70afa3cc9cfcbe38debe52de88c1a98c1c 100644 (file)
@@ -1,2 +1 @@
-DIST libconfig-1.4.9.tar.gz 688158 SHA256 09c8979252e60193e2969e9b0e1cd597f7820087867989b2f0939ad164473041 SHA512 49a4318c1b8a5f15dc0cefaf25c481f95008e413696420d5e8cacb7a6ce7e600b84c4b7e7365373cee62e392e14556ff31d65c1e084a9b7ab2153a55cbf787a7 WHIRLPOOL 3d64dfb7cfd21c769738791236d6f6f4b01d296d060c21767f441f644b0d0bba62b5782bd7129dcc2657377200e59a345a5f197a67b5579e2193447fdefc1d25
 DIST libconfig-1.5.tar.gz 644432 SHA256 e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6 SHA512 16bead52ee8c880b25fd1ee6fa83c115dc51830f2f7954389bd8b72cc0e6fc05fc63fe415bd929851894a9f3a1127d51cfc4223149514246e9566305556b7bcd WHIRLPOOL ef3718b1ec4485202d1fd03db035419b6c0179e4c4eb47e74ff93b467677c4f53cf9d70d5eb7aa6230dab7a4115e5fae0fc4ed191f1bfc6d0c3c252ee5d90944
diff --git a/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch b/dev-libs/libconfig/files/libconfig-1.4.9-out-of-source-build.patch
deleted file mode 100644 (file)
index fe7c2cc..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/libconfig-1.4.9/tests/Makefile.am
-+++ b/libconfig-1.4.9/tests/Makefile.am
-@@ -3,10 +3,10 @@
- libconfig_tests_SOURCES = tests.c
--libconfig_tests_CPPFLAGS = -I../tinytest -I../lib
-+libconfig_tests_CPPFLAGS = -I$(top_srcdir)/tinytest -I$(top_srcdir)/lib
--libconfig_tests_LDADD = -L../tinytest -ltinytest \
--      -L../lib/.libs -lconfig
-+libconfig_tests_LDADD = -L$(top_builddir)/tinytest -ltinytest \
-+      -L$(top_builddir)/lib/.libs -lconfig
- EXTRA_DIST = \
diff --git a/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild b/dev-libs/libconfig/libconfig-1.4.9-r1.ebuild
deleted file mode 100644 (file)
index 45b0e65..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="1"
-inherit eutils autotools-multilib
-
-DESCRIPTION="Libconfig is a simple library for manipulating structured configuration files"
-HOMEPAGE="http://www.hyperrealm.com/libconfig/libconfig.html"
-SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux"
-IUSE="+cxx examples static-libs"
-
-DEPEND="
-       sys-devel/libtool
-       sys-devel/bison"
-
-PATCHES=( "${FILESDIR}/${P}-out-of-source-build.patch" )
-
-src_prepare() {
-       sed -i configure.ac -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
-       autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-       local myeconfargs=(
-               $(use_enable cxx)
-               --disable-examples
-       )
-       autotools-utils_src_configure
-}
-
-multilib_src_test() {
-       # It responds to check but that does not work as intended
-       emake test
-}
-
-multilib_src_install_all() {
-       einstalldocs
-       prune_libtool_files
-
-       if use examples; then
-               find examples/ -name "Makefile.*" -delete || die
-               local dir
-               for dir in examples/c examples/c++; do
-                       insinto /usr/share/doc/${PF}/${dir}
-                       doins ${dir}/*
-               done
-       fi
-}
index 375104354e2aff8bb2118b89d88596fe93c33ea6..881dc0c0b565e8d7621f40ee70918d41e162be57 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="+cxx examples static-libs"
 
 DEPEND="
index 0acf6644aa5d1bee5825f44392d42f5a9aa51897..8bc30e24236e8b2cce3e4da25271b8cc7d348198 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="debug static-libs"
 
 src_prepare() {
index 95610a9f1b849ee0fa07b360bff715035ea3f3b5..5274496488659525e63ca1c6d18e33c29520333a 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 LICENSE="BSD"
 # libevent-2.1.so.5
 SLOT="0/2.1-5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 
 DEPEND="
index 16300fc49e95ffb87935cef03fb1ec50b78c5547..3f1ea4ae495ee458b3281a64ebb5774b770f8684 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 LICENSE="BSD"
 # libevent-2.1.so.5
 SLOT="0/2.1-5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug libressl +ssl static-libs test +threads"
 
 DEPEND="
@@ -37,9 +37,6 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
        elibtoolize
        epatch "${FILESDIR}/${PN}-2.1.5-event_signals_ordering.patch"
-       # don't waste time building tests
-       # https://github.com/libevent/libevent/pull/144
-       sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -48,10 +45,12 @@ multilib_src_configure() {
 
        ECONF_SOURCE="${S}" \
        econf \
+               --disable-samples \
                $(use_enable debug debug-mode) \
                $(use_enable debug malloc-replacement) \
                $(use_enable ssl openssl) \
                $(use_enable static-libs static) \
+               $(use_enable test libevent-regress) \
                $(use_enable threads thread-support)
 }
 
index 182be4feb273f91ee7b000d038e5996b42c81a2f..b4f0ea89adff07969ae39a17b4962e1c09d2f478 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +ssl static-libs test +threads"
 
 DEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )"
index 179af26b421f564a6ca66951e402cb37c2a6797e..c807cd329fc7cc8a2fee1f0fd074fa8b364b5cf6 100644 (file)
@@ -30,9 +30,6 @@ MULTILIB_WRAPPED_HEADERS=(
 
 src_prepare() {
        eautoreconf
-       # don't waste time building tests
-       # https://github.com/libevent/libevent/pull/144
-       sed -i -e '/^all:/s|tests||g' Makefile.nmake || die
 }
 
 multilib_src_configure() {
@@ -41,10 +38,12 @@ multilib_src_configure() {
 
        ECONF_SOURCE="${S}" \
        econf \
+               --disable-samples \
                $(use_enable debug debug-mode) \
                $(use_enable debug malloc-replacement) \
                $(use_enable ssl openssl) \
                $(use_enable static-libs static) \
+               $(use_enable test libevent-regress) \
                $(use_enable threads thread-support)
 }
 
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
new file mode 100644 (file)
index 0000000..8d08229
--- /dev/null
@@ -0,0 +1 @@
+DIST libmaxminddb-1.1.1.tar.gz 649467 SHA256 60060bc081573220d4633e4cbb26f999521c0f197304bc7f5ea700fc26ef2276 SHA512 0dffb0b4b43eb70b6c4e4899c5875658fb031f7f8d859c43ffc27df89f3aebe0e0291caa721efaab3d664fb1c919c7432e1e0df3140c4877ddfa3e61a288d132 WHIRLPOOL 7942cef1be122869f34742b8bae15114e183436829de2334f2bd1b7693b3422e571b58928e64c04f82e138365d10005640f3eb94ec784aa375cdfb5ce2790484
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.1.1.ebuild
new file mode 100644 (file)
index 0000000..aa93368
--- /dev/null
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="C library for the MaxMind DB file format"
+HOMEPAGE="https://github.com/maxmind/libmaxminddb"
+SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DOCS=( Changes.md )
+
+src_configure() {
+       econf $(use_enable static-libs static)
+}
diff --git a/dev-libs/libmaxminddb/metadata.xml b/dev-libs/libmaxminddb/metadata.xml
new file mode 100644 (file)
index 0000000..03aa50b
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>
index e3b97b5b90c26e4763885511ac0bdecf1c3802fa..68141da895b7753ae0a064a27d72ebba984c423f 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 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="+asm static-libs"
 
 RDEPEND="!dev-libs/openssl:0"
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.2-disable-tests.patch
new file mode 100644 (file)
index 0000000..86d5995
--- /dev/null
@@ -0,0 +1,59 @@
+do not build test programs as we don't install them
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,7 +10,7 @@
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
+-noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
++check_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
+                 testThreads testC14N testAutomata testRegexp \
+                 testReader testapi testModule runtest runsuite testchar \
+               testdict runxmlconf testrecurse testlimits
+@@ -170,7 +170,7 @@
+ testModule_DEPENDENCIES = $(DEPS)
+ testModule_LDADD= $(LDADDS)
+-noinst_LTLIBRARIES = testdso.la
++check_LTLIBRARIES = testdso.la
+ testdso_la_SOURCES = testdso.c
+ testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
+--- a/doc/examples/Makefile.am
++++ b/doc/examples/Makefile.am
+@@ -13,7 +13,7 @@
+ rebuild: examples.xml index.html
+ .PHONY: rebuild
+-examples.xml: index.py $(noinst_PROGRAMS:=.c)
++examples.xml: index.py $(check_PROGRAMS:=.c)
+       cd $(srcdir) && $(PYTHON) index.py
+       $(MAKE) Makefile
+@@ -49,7 +49,7 @@
+       xpath1.res \
+       xpath2.res
+-noinst_PROGRAMS = \
++check_PROGRAMS = \
+       io1 \
+       io2 \
+       parse1 \
+@@ -99,7 +99,7 @@
+ valgrind: 
+       $(MAKE) CHECKER='valgrind' tests
+-tests: $(noinst_PROGRAMS)
++tests: $(check_PROGRAMS)
+       test -f Makefile.am || test -f test1.xml || $(LN_S) $(srcdir)/test?.xml .
+       @(echo '## examples regression tests')
+       @(echo > .memdump)
+--- a/example/Makefile.am
++++ b/example/Makefile.am
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS       = gjobread
++check_PROGRAMS        = gjobread
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
+ AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
index a03df2448aafa4ed6f165e9d3f69abb8da5b2d97..99c6b6c2e4c2fce83c6ff701351597ea8baa0299 100644 (file)
@@ -75,6 +75,9 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
        epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
 
+       # Disable programs that we don't actually install.
+       epatch "${FILESDIR}"/${PN}-2.9.2-disable-tests.patch
+
        eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
 
 #      epunt_cxx # if we don't eautoreconf
index 92ea2ecbd24c1260c52316e233746ac22673d164..db3f1e657d1e412765e8f49ad52702d16bc98d94 100644 (file)
@@ -1,2 +1,3 @@
 DIST menhir-20151012.tar.gz 627290 SHA256 c7d4e8cf8e3b009577794c5c01f590379201c77fdc61a832e714beffe7cf22be SHA512 04c10a171fdc24078b6340484314c771b97967a91f506a882bdae741bcc2464ccf3e7f5982339f8cc836abdb0066dc7bcd58a38edbc730a89daf935979fee79c WHIRLPOOL 49b8b0ff0e094e6a5429d747d4ced5ee5515a2f77812f508bd9da872653539ff5540639f6a5a812e4999a7a815bb62b9a6534a71f476dc495a0297ef8f89d737
 DIST menhir-20151023.tar.gz 671810 SHA256 2dfb642ba08f95afbb75f71b9bbdcf6733c0e8f81d69406373f1420c5cfeca8a SHA512 0e53365400e88e39d0d595beb594d53bf5614061dc9b0149ec20c00cd3188dd1568ddcca15e1a08dddce20244bebd6263871ab83f761c68c2c62fbedb0d6c980 WHIRLPOOL 1e4b9a32959f2c9e98c92bb75436650c26430f1664d2b663fd572a369c0ce6d5225caa3ea28faa9cee18162fead6481a9777eabf99d6694b999179046b98c7a7
+DIST menhir-20151026.tar.gz 672165 SHA256 a735ebdfc3bc4ac132ea4f7c06814915576516915a80ae1c33c45a9368327355 SHA512 86fde7e955164861823dd5fac510235b0bb13f771528435495b3ff3a44bcd4837d2cd8085ba6c53e6e5eaf12f935749951cff09056cbb03a93cef062072fcf2a WHIRLPOOL 4327788dde765a4ea2c06637769626022a64352d36bee29fc615a07485efce2adeacb65267cb44f726203405ee23eea23affdde88e76109f1eb76bd3160dfcdc
diff --git a/dev-ml/menhir/menhir-20151026.ebuild b/dev-ml/menhir/menhir-20151026.ebuild
new file mode 100644 (file)
index 0000000..a8d4107
--- /dev/null
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+       if ! use ocamlopt ; then
+               export TARGET=byte
+       fi
+}
+
+src_compile() {
+       emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+       findlib_src_preinst
+       emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+       use examples && docompress -x /usr/share/doc/${PF}/demos
+       dodoc AUTHORS CHANGES
+}
index 8bf38d6461f8f034963ac592eafef0c6f2bbde46..8efc607897637d903a0cd850c68f33e2c9117243 100644 (file)
@@ -1,3 +1,4 @@
 DIST ocurl-0.6.1.tgz 101147 SHA256 c671d605d36a8051867f7483a9f7ec93b3985f5e4824073f1ceb85d19e09bad3 SHA512 2c82c9b8e8d6ee26a85add7a2698ab1f61478777f9c7b0b217cacb6491067b619f508b41c22eaa54cf249147d287a77c62a00aef3b19ee6c135426c4559ab7f3 WHIRLPOOL 921939801a1a8d73052954b3d6699c41d2e7f360fe7e1af41f8681f1179aef3d831f1f556cdc0f0c1cee2c9ef1f2bf4caa38923ddfdd57642b6791cb40089289
 DIST ocurl-0.7.4.tar.gz 104716 SHA256 51af1d4fc38a7be15cac38a1367f4e2dcd8c2014d8d2e545d96d25c8d2f0135e SHA512 1d3a92d89c55434028862dd97c6eb5d3d8d579e2dd44117be82b09658543c90a0800e9203892eb204ab18e6c8c6bfd18cfc355e32c7393daa1c7beb2c39e97da WHIRLPOOL eab3ff62c77181bb2a8e6906bd3de828cee3569cdfa952b930c8e7b704382ef071061727d4a8709438f2ff71aa40e5187e4473e3fa03f74f83da2470e7b05708
 DIST ocurl-0.7.5.tar.gz 103981 SHA256 a6432a2f0109525b4128337ac9708b0192a97ee8f958a5f65b6c8f25435f6cff SHA512 8deb2e353fae6667555d48f5694c0dec86f82f2702536a50842baae3d6bb0d37a24e4b8e39ff11d3d42feebdd412c92a3e43f27c9f551cd54994527fdcf71778 WHIRLPOOL 77a9866d97c07a8cb2bdd69743d0bf5f80a9cdbd5e20bd0b200ab59d03dd286ef712988bf098aba01d337448ee47e9f95b69872e0e377948c99810826c7cf833
+DIST ocurl-0.7.6.tar.gz 104088 SHA256 8eba235b74733f69d836e9b3167e90ea0a87f7ec4cb3fbd7c289a21109ab9743 SHA512 98c46ec4d1fd52c47f696b46a7252967038e6e04607526fae78a8538c57980134567d1ac71bd6c8beaa95f71f6e643dd092cfb787b58a8ff6c0dba5b15110b67 WHIRLPOOL 90af94e5893e86d264a429c44523dba798e8a703913345b5f16e23ee3deeac3ec2344cf9e25d608f41192a401d6efc35c9d1273e1282213552f61f4b9f19362c
diff --git a/dev-ml/ocurl/ocurl-0.7.6.ebuild b/dev-ml/ocurl/ocurl-0.7.6.ebuild
new file mode 100644 (file)
index 0000000..8998a82
--- /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
+
+inherit findlib
+
+DESCRIPTION="OCaml interface to the libcurl library"
+HOMEPAGE="http://forge.ocamlcore.org/projects/ocurl/"
+LICENSE="MIT"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1563/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="examples"
+
+RDEPEND=">=net-misc/curl-7.9.8
+       dev-ml/lwt:=
+       >=dev-lang/ocaml-3.12:=[ocamlopt]"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+KEYWORDS="~amd64 ~x86"
+
+src_compile()
+{
+       emake -j1 all
+}
+
+src_install()
+{
+       findlib_src_install
+       dodoc CHANGES.txt README
+       if use examples; then
+               dodoc -r examples
+               docompress -x /usr/share/doc/${PF}/examples
+       fi
+}
index ea07615a48866841ffbeeb8f4f9377f5040a8a22..3969929b281cb1d44bdf23531617a646bf6dd011 100644 (file)
@@ -17,7 +17,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd
 IUSE="examples test"
 
 DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/dnspython:py2
+       !dev-python/dnspython:py3
+"
 
 DOCS=( ChangeLog README )
 
diff --git a/dev-python/dnspython/dnspython-1.12.0-r1.ebuild b/dev-python/dnspython/dnspython-1.12.0-r1.ebuild
deleted file mode 100644 (file)
index 450cb03..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 distutils-r1 multilib
-
-PN3="${PN}3"
-P3="${PN3}-${PV}"
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
-SRC_URI="
-       http://www.dnspython.org/kits/${PV}/${P}.tar.gz
-       http://www.dnspython.org/kits3/${PV}/${P3}.zip"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="examples test"
-
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-       app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-S2="${S}"
-S3="${WORKDIR}/${P3}"
-
-# For testsuite
-DISTUTILS_IN_SOURCE_BUILD=1
-
-s_locator() {
-       if python_is_python3; then
-               einfo "Setting \${S} to ${S3}"
-               S="${S3}" $@
-       else
-               einfo "Setting \${S} to ${S2}"
-               S="${S2}" $@
-       fi
-}
-
-python_prepare() {
-       s_locator distutils-r1_python_prepare
-}
-
-python_compile() {
-       s_locator distutils-r1_python_compile
-}
-
-python_install(){
-       s_locator distutils-r1_python_install
-}
-
-my_test() {
-       pushd tests &> /dev/null
-       "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
-       einfo "Testsuite passed under ${EPYTHON}"
-}
-
-python_test() {
-       s_locator my_test
-}
-
-python_install() {
-       s_locator distutils-r1_python_install
-}
-
-python_install_all() {
-       use examples && local EXAMPLES=( examples/. )
-       distutils-r1_python_install_all
-}
similarity index 77%
rename from dev-python/dnspython/dnspython-1.12.0.ebuild
rename to dev-python/dnspython/dnspython-1.12.0-r200.ebuild
index 9edf38a91b37fe20cebadace1575a725e4045e4d..6bb0c4b92558ef6100c3b08798d2fbc0cd769631 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=( python2_7 )
 
 inherit distutils-r1
@@ -12,21 +13,23 @@ HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
 SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
-SLOT="0"
+SLOT="py2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples test"
 
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+       !dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+       !dev-python/dnspython:0
+       app-arch/unzip"
 
-# For tests
+# For testsuite
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_test() {
-       pushd "${BUILD_DIR}"/../tests &> /dev/null
+       cd tests || die
        "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
        einfo "Testsuite passed under ${EPYTHON}"
-       popd &> /dev/null
 }
 
 python_install_all() {
diff --git a/dev-python/dnspython/dnspython-1.12.0-r300.ebuild b/dev-python/dnspython/dnspython-1.12.0-r300.ebuild
new file mode 100644 (file)
index 0000000..a32c94a
--- /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
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+inherit distutils-r1
+
+MY_PN="${PN}3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="DNS toolkit for Python"
+HOMEPAGE="http://www.dnspython.org/ https://pypi.python.org/pypi/dnspython"
+SRC_URI="http://www.dnspython.org/kits3/${PV}/${MY_P}.zip"
+
+LICENSE="ISC"
+SLOT="py3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="examples test"
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+       !dev-python/dnspython:0"
+DEPEND="${RDEPEND}
+       !dev-python/dnspython:0
+       app-arch/unzip"
+
+S="${WORKDIR}/${MY_P}"
+
+# For testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+       cd tests || die
+       "${PYTHON}" utest.py || die "tests failed under ${EPYTHON}"
+       einfo "Testsuite passed under ${EPYTHON}"
+}
+
+python_install_all() {
+       use examples && local EXAMPLES=( examples/. )
+       distutils-r1_python_install_all
+}
index 300c03c337aae588575f077f47c6288e7e6e52c1..2865b67962457c4369e27cd2e9ca84cd040a85aa 100644 (file)
@@ -44,6 +44,8 @@ DISTUTILS_IN_SOURCE_BUILD=1
 PATCHES=(
        "${FILESDIR}"/${PN}-4.4.1-swig.patch
        "${FILESDIR}"/${P}-gcc-5.patch
+       "${FILESDIR}"/${P}-doc.patch
+       "${FILESDIR}"/${P}-version.patch
        )
 
 python_prepare_all() {
diff --git a/dev-python/enable/files/enable-4.5.1-doc.patch b/dev-python/enable/files/enable-4.5.1-doc.patch
new file mode 100644 (file)
index 0000000..c9cc1ff
--- /dev/null
@@ -0,0 +1,24 @@
+From 41134b03b96b741d95554846841c189313052265 Mon Sep 17 00:00:00 2001
+From: John Wiggins <jwiggins@enthought.com>
+Date: Thu, 1 Oct 2015 20:40:07 +0200
+Subject: [PATCH] Read the docs version directly from enable._version
+
+---
+ docs/source/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
+index 10b7552..995e315 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -41,8 +41,8 @@
+ # The default replacements for |version| and |release|, also used in various
+ # other places throughout the built documents.
+ d = {}
+-execfile(os.path.join('..', '..', 'enable', '__init__.py'), d)
+-version = release = d['__version__']
++execfile(os.path.join('..', '..', 'enable', '_version.py'), d)
++version = release = d['full_version']
+ # There are two options for replacing |today|: either, you set today to some
+ # non-false value, then it is used:
diff --git a/dev-python/enable/files/enable-4.5.1-version.patch b/dev-python/enable/files/enable-4.5.1-version.patch
new file mode 100644 (file)
index 0000000..1dd3fe4
--- /dev/null
@@ -0,0 +1,31 @@
+From f91c824ebad74e8c23e62fe3390842c5fe322aee Mon Sep 17 00:00:00 2001
+From: itziakos <ioannist@enthought.com>
+Date: Wed, 20 May 2015 22:52:42 +0100
+Subject: [PATCH] check the enable._version.py when installing from source
+
+---
+ setup.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index f765f51..3328b93 100644
+--- a/setup.py
++++ b/setup.py
+@@ -92,13 +92,14 @@ def write_version_py(filename):
+     fullversion = VERSION
+     if os.path.exists('.git'):
+         git_revision, dev_num = git_version()
+-    elif os.path.exists('kiva/_version.py'):
++    # All packages are synced with the enable version
++    elif os.path.exists('enable/_version.py'):
+         # must be a source distribution, use existing version file
+         try:
+-            from kiva._version import git_revision, full_version
++            from enable._version import git_revision, full_version
+         except ImportError:
+             raise ImportError("Unable to import git_revision. Try removing "
+-                              "kiva/_version.py and the build directory "
++                              "enable/_version.py and the build directory "
+                               "before building.")
+         match = re.match(r'.*?\.dev(?P<dev_num>\d+)', full_version)
similarity index 92%
rename from dev-python/formencode/formencode-1.3.0-r1.ebuild
rename to dev-python/formencode/formencode-1.3.0-r2.ebuild
index c65e3a69b9839d41d93c0bc7679c8bc6d6259d68..a81fffa4a0e4770752040a8a2c53b3d3a88da96d 100644 (file)
@@ -20,9 +20,10 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       test? ( dev-python/nose[${PYTHON_USEDEP}]
+       test? (
+               dev-python/nose[${PYTHON_USEDEP}]
                dev-python/pycountry[${PYTHON_USEDEP}]
-               >=dev-python/dnspython-1.12.0-r1[${PYTHON_USEDEP}] )"
+               virtual/dnspython[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 RESTRICT="test"
index a73396a88671bf2e5148f837337b108d27d0c5ea..ccfe5f43314417b6cc6cbecbe243ad65acc1bbeb 100644 (file)
@@ -1,2 +1,3 @@
 DIST matplotlib-1.4.2.tar.gz 50139344 SHA256 17a3c7154f152d8dfed1f37517c0a8c5db6ade4f6334f684989c36dab84ddb54 SHA512 3525f4e6414042fabf8d18ce9041d61197465dc07c766730c187a512277907ba33f56d49d5a468d82f65bce57217e8eb48ecfa143e55152a15607b79a7b25adc WHIRLPOOL ce6e5a15676b939bda7ad1be0f27766314f60ed44ebfba1e73d2c3d00a31d5492722cde73f943de72da038772519068602e60c830af9ffdf52710a24ce98fe7a
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
+DIST matplotlib-1.5.0.tar.gz 53962448 SHA256 67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646 SHA512 559a3ef031ca65b431157f0dd50f7d81f2d854f92150ee2b9de5e44b31d49615bfdc049a682667bc2e1399b8cd724dfcefec8f4de7e92848fe5756f93ddef5fa WHIRLPOOL b30a7299dd0690cd0355883cbe7d335d76314bab85f5b67b326b0e600b479db3cd5e7f48e9e68d3604832e9605f5025c70ff0006b1980b945aeaf22f78e3469f
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
new file mode 100644 (file)
index 0000000..f644ffe
--- /dev/null
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+       doc? ( ${PY2_FLAGS} )
+       excel? ( ${PY2_FLAGS} )
+       fltk? ( ${PY2_FLAGS} )
+       gtk? ( ${PY2_FLAGS} )
+       wxwidgets? ( ${PY2_FLAGS} )
+       test? (
+               cairo fltk latex pyside qt5 qt4 tk wxwidgets
+               || ( gtk gtk3 )
+               )"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+       dev-python/cycler[${PYTHON_USEDEP}]
+       >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+       dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+       dev-python/pytz[${PYTHON_USEDEP}]
+       >=dev-python/six-1.4[${PYTHON_USEDEP}]
+       media-fonts/stix-fonts
+       media-libs/freetype:2
+       media-libs/libpng:0
+       media-libs/qhull
+       gtk? (
+               dev-libs/glib:2=
+               x11-libs/gdk-pixbuf
+               x11-libs/gtk+:2
+               dev-python/pygtk[${PY2_USEDEP}] )
+       wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#      dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+       dev-python/versioneer[${PYTHON_USEDEP}]
+       virtual/pkgconfig
+       doc? (
+               app-text/dvipng
+               virtual/python-imaging[${PYTHON_USEDEP}]
+               dev-python/ipython[${PYTHON_USEDEP}]
+               dev-python/numpydoc[${PYTHON_USEDEP}]
+               dev-python/xlwt[${PYTHON_USEDEP}]
+               dev-python/sphinx[${PYTHON_USEDEP}]
+               dev-texlive/texlive-latexextra
+               dev-texlive/texlive-fontsrecommended
+               dev-texlive/texlive-latexrecommended
+               media-gfx/graphviz[cairo]
+       )
+       test? (
+               dev-python/mock[${PYTHON_USEDEP}]
+               >=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+               )"
+
+RDEPEND="${COMMON_DEPEND}
+       >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+       cairo? (
+               || (
+                       dev-python/pycairo[${PYTHON_USEDEP}]
+                       dev-python/cairocffi[${PYTHON_USEDEP}]
+                       )
+               )
+       excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+       fltk? (
+               $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' python2_7)
+               $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 'python3*')
+               )
+       gtk3? (
+               dev-python/pygobject:3[${PYTHON_USEDEP}]
+               x11-libs/gtk+:3[introspection] )
+       latex? (
+               virtual/latex-base
+               app-text/ghostscript-gpl
+               app-text/dvipng
+               app-text/poppler[utils]
+               dev-texlive/texlive-fontsrecommended
+               dev-texlive/texlive-latexextra
+               dev-texlive/texlive-xetex
+       )
+       pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+       qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+       qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+       "
+
+RESTRICT="mirror"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+       unset DISPLAY # bug #278524
+}
+
+use_setup() {
+       local uword="${2:-${1}}"
+       if use ${1}; then
+               echo "${uword} = True"
+               echo "${uword}agg = True"
+       else
+               echo "${uword} = False"
+               echo "${uword}agg = False"
+       fi
+}
+
+_PATCHES=(
+       "${FILESDIR}"/${P}-backport-GH5291-2462.patch
+)
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#      local PATCHES=(
+#              "${FILESDIR}"/${P}-unbundle-pycxx.patch
+#              "${FILESDIR}"/${P}-unbundle-agg.patch
+#      )
+#      rm -r agg24 CXX || die
+#      rm -r agg24 || die
+
+#      cat > lib/${PN}/externals/six.py <<-EOF
+#      from __future__ import absolute_import
+#      from six import *
+#      EOF
+
+       sed \
+               -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+               -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+               || die "sed pyparsing failed"
+
+       # suggested by upstream
+#      sed \
+#              -e '/tol/s:32:35:g' \
+#              -i lib/matplotlib/tests/test_mathtext.py || die
+
+       sed \
+               -e "s:/usr/:${EPREFIX}/usr/:g" \
+               -i setupext.py || die
+
+       export XDG_RUNTIME_DIR="${T}/runtime-dir"
+       mkdir "${XDG_RUNTIME_DIR}" || die
+       chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+       distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+       append-flags -fno-strict-aliasing
+       append-cppflags -DNDEBUG  # or get old trying to do triangulation
+       tc-export PKG_CONFIG
+}
+
+python_configure() {
+       mkdir -p "${BUILD_DIR}" || die
+
+       # create setup.cfg (see setup.cfg.template for any changes).
+
+       # common switches.
+       cat > "${BUILD_DIR}"/setup.cfg <<- EOF
+               [directories]
+               basedirlist = "${EPREFIX}/usr"
+               [provide_packages]
+               pytz = False
+               dateutil = False
+               [gui_support]
+               agg = True
+               $(use_setup cairo)
+               $(use_setup pyside)
+               $(use_setup qt4)
+               $(use_setup qt5)
+               $(use_setup tk)
+       EOF
+
+       if use gtk3 && use cairo; then
+               echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+       else
+               echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+       fi
+
+       if $(python_is_python3); then
+               cat >> "${BUILD_DIR}"/setup.cfg <<- EOF
+                       six = True
+                       fltk = False
+                       fltkagg = False
+                       gtk = False
+                       gtkagg = False
+                       wx = False
+                       wxagg = False
+               EOF
+       else
+               cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
+                       six = False
+                       $(use_setup fltk)
+                       $(use_setup gtk)
+                       $(use_setup gtk3)
+                       $(use_setup wxwidgets wx)
+               EOF
+       fi
+}
+
+wrap_setup() {
+       local MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+       export MPLSETUPCFG
+
+       # Note: remove build... if switching to out-of-source build
+       "${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+       wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+       if use doc; then
+               cd doc || die
+
+               # necessary for in-source build
+               local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+               VARTEXFONTS="${T}"/fonts \
+               "${PYTHON}" ./make.py --small html || die
+       fi
+}
+
+python_test() {
+       wrap_setup distutils_install_for_testing
+
+       #cd "${TMPDIR}" || die
+       VIRTUALX_COMMAND="${PYTHON}"
+       virtualmake -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)" || \
+               die "Tests fail with ${EPYTHON}"
+#      VIRTUALX_COMMAND=esetup.py
+#      virtualmake test
+}
+
+python_install() {
+       wrap_setup distutils-r1_python_install
+}
+
+python_install_all() {
+       use doc && local HTML_DOCS=( doc/build/html/. )
+
+       distutils-r1_python_install_all
+
+       if use examples; then
+               dodoc -r examples
+               docompress -x /usr/share/doc/${PF}/examples
+       fi
+}
index 27cb2ccc4b7bc4b11f907a2827d9dbaa6114ac58..0605aa6c43535a8f9ae74166652677828904c219 100644 (file)
@@ -8,7 +8,7 @@
   </maintainer>
   <maintainer>
     <email>wtold.pilat@gmail.com</email>
-    <name>Witold Pilat</name>
+    <name>Witold Piłat</name>
     <description>Proxy maintainer</description>
   </maintainer>
   <upstream>
index 3d8ee6900a58393ac71c176dd24a78548d355a8d..270c81173d0088e455095e46ee258b6147c93d9a 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
index 53ea331bf5c3d9149b910a12ad169acb526e26bf..35a8030e589c9e8722b2f404c5f6e4e9e2a7d78a 100644 (file)
@@ -1,5 +1 @@
-DIST Pygments-1.6.tar.gz 1423161 SHA256 799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 SHA512 552d0c2a1296773a5482122bd5cbec0ce91a497cd86ee105e1c5ddf2bfa9c206fcc7de504c6da480344c6e1bee30d7b26012fd061dcb2091d8b2b21bcd163bf0 WHIRLPOOL babf6e638529a902fab37c17fb1215aca3c04c3e2a00d00bdff7e8049ca6a46c238282c088e79816f7c6879fc9b13e3de9824ae93d3f184f4d9aae58af0c9c8d
-DIST Pygments-2.0.1.tar.gz 2739480 SHA256 5e039e1d40d232981ed58914b6d1ac2e453a7e83ddea22ef9f3eeadd01de45cb SHA512 7c11c7dc09f6a5d964a512eb4c31f34fc0422b29e3124bd4ed0f4ab594c750d39f990e86f65287f499ea1051a27c1087e445332f6b23ad021d6e2d41c6092f3e WHIRLPOOL 7f5d31f86183b230f54d1f08b5e4cb942d38f28d8868ed94b4d129601aa845864cd0f45d5edb2102f655c2800b2e54335d6f4f61975b2f3a8ceeb0b7e5e13217
 DIST Pygments-2.0.2.tar.gz 3462280 SHA256 7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51 SHA512 b58e2cc535ba3f1fda7cb147e12af128bc2755de56cf465f8f1d642730eaef50c06551cc4cc44f25f726b00f3f1c9c2078977233b11c0b6a7e1add6a4069c27e WHIRLPOOL 4c98134f27dd29c89e4d6157284bdeecaa81c53d823e089292be21a6c418ba4ccfd458ced50326d5a356a7b6cb761a1990440096f5f3d820f776bb19fc0da09d
-DIST pygments-1.6_p20140324.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be
-DIST pygments-2.0.1.tar.gz 1641814 SHA256 f762d1104ab38a4e870824113e3be3fedc918900622f1e73b9c34386ee7be14a SHA512 de84977f346b41a60a849e681581b36787712d39010e0e23624cc2d9741cb5afbbb0a4e860b5120e3cb77eb5fc68ddf11d0f6c1d15e0bb4d7c56d800017b19bf WHIRLPOOL 7531e7a2483f3c043967d32848694324007c5a1a7e206472a17f5515eb6960dc1bec774851d75bc4ccc4615594db0c5218713da22da6c2d1cbfdf995827746be
diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch
new file mode 100644 (file)
index 0000000..0a23adc
--- /dev/null
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Javantea <jvoss@altsci.com>
+# Date 1443460403 25200
+# Node ID 6b4baae517b6aaff7142e66f1dbadf7b9b871f61
+# Parent  655dbebddc23943b8047b3c139c51c22ef18fd91
+Fix Shell Injection in FontManager._get_nix_font_path
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -10,6 +10,7 @@
+ """
+ import sys
++import shlex
+ from pygments.formatter import Formatter
+ from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
+@@ -79,8 +80,8 @@
+             from commands import getstatusoutput
+         except ImportError:
+             from subprocess import getstatusoutput
+-        exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
+-                                    (name, style))
++        exit, out = getstatusoutput('fc-list %s file' % 
++                                    shlex.quote("%s:style=%s" % (name, style)))
+         if not exit:
+             lines = out.splitlines()
+             if lines:
diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch
new file mode 100644 (file)
index 0000000..78bf447
--- /dev/null
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User Tim Hatch <tim@timhatch.com>
+# Date 1445007300 25200
+# Node ID 0036ab1c99e256298094505e5e92fdacdfc5b0a8
+# Parent  c0c0d4049a7c325cd69b764c6ceb7747d319212d
+Avoid the shell entirely when finding fonts.
+
+Manually tested on OS X.
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -10,12 +10,13 @@
+ """
+ import sys
+-import shlex
+ from pygments.formatter import Formatter
+ from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
+     get_choice_opt, xrange
++import subprocess
++
+ # Import this carefully
+ try:
+     from PIL import Image, ImageDraw, ImageFont
+@@ -76,14 +77,11 @@
+             self._create_nix()
+     def _get_nix_font_path(self, name, style):
+-        try:
+-            from commands import getstatusoutput
+-        except ImportError:
+-            from subprocess import getstatusoutput
+-        exit, out = getstatusoutput('fc-list %s file' % 
+-                                    shlex.quote("%s:style=%s" % (name, style)))
+-        if not exit:
+-            lines = out.splitlines()
++        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
++                                stdout=subprocess.PIPE, stderr=None)
++        stdout, _ = proc.communicate()
++        if proc.returncode == 0:
++            lines = stdout.splitlines()
+             if lines:
+                 path = lines[0].strip().strip(':')
+                 return path
+@@ -198,7 +196,7 @@
+         bold and italic fonts will be generated.  This really should be a
+         monospace font to look sane.
+-        Default: "Bitstream Vera Sans Mono"
++        Default: "Bitstream Vera Sans Mono" on Windows, Courier New on *nix
+     `font_size`
+         The font size in points to be used.
index 10b24d26e8c28a6cab2d6c0bf4a486410fa3132a..f91efd2fd030a7ee06843f79bf0f15c5dbd8afe0 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>python</herd>
diff --git a/dev-python/pygments/pygments-1.6.ebuild b/dev-python/pygments/pygments-1.6.ebuild
deleted file mode 100644 (file)
index ae7b8a2..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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} pypy )
-
-inherit distutils-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               virtual/ttf-fonts
-               dev-texlive/texlive-latexrecommended
-       )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-       cp -r -l tests "${BUILD_DIR}"/ || die
-
-       if [[ ${EPYTHON} == python3.* ]]; then
-               # Notes:
-               #   -W is not supported by python3.1
-               #   -n causes Python to write into hardlinked files
-               2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-       fi
-
-       nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( docs/build/. )
-
-       distutils-r1_python_install_all
-}
diff --git a/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild b/dev-python/pygments/pygments-1.6_p20140324-r1.ebuild
deleted file mode 100644 (file)
index d781b67..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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 distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               virtual/ttf-fonts
-               dev-texlive/texlive-latexrecommended
-       )"
-
-#S="${WORKDIR}/${MY_P}"
-
-python_compile() {
-       distutils-r1_python_compile
-       if [[ ${EPYTHON} == python3.2 ]]; then
-               # python3.2 does not like u"" literals
-               2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-       fi
-}
-
-python_compile_all() {
-       use doc && emake -C doc html
-}
-
-python_test() {
-       cp -r -l tests "${BUILD_DIR}"/ || die
-
-       if python_is_python3; then
-               # Notes:
-               #   -W is not supported by python3.1
-               #   -n causes Python to write into hardlinked files
-               2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-       fi
-
-       nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( doc/_build/html/. )
-
-       distutils-r1_python_install_all
-       newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.0.1-r1.ebuild b/dev-python/pygments/pygments-2.0.1-r1.ebuild
deleted file mode 100644 (file)
index a232e44..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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 pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               virtual/ttf-fonts )"
-#              dev-texlive/texlive-latexrecommended
-# Removing / commenting out this dep. I can find no mention of it in tests other than
-# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
-# Tests pass without it
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-       use doc && emake -C doc html
-}
-
-python_test() {
-       cp -r -l tests "${BUILD_DIR}"/ || die
-       # With pypy3 there is 1 error out of 1556 tests when run as is and
-       # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-       nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( doc/_build/html/. )
-
-       distutils-r1_python_install_all
-       newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.0.1.ebuild b/dev-python/pygments/pygments-2.0.1.ebuild
deleted file mode 100644 (file)
index 6a0b475..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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 pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://bitbucket.org/birkenfeld/pygments-main/get/b839f47dbb3a10830db7dc3114f0ad4f470bcfa5.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? (
-               dev-python/nose[${PYTHON_USEDEP}]
-               virtual/ttf-fonts
-               dev-texlive/texlive-latexrecommended
-       )"
-
-python_compile() {
-       distutils-r1_python_compile
-       if [[ ${EPYTHON} == python3.2 ]]; then
-               # python3.2 does not like u"" literals
-               2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-       fi
-}
-
-python_compile_all() {
-       use doc && emake -C doc html
-}
-
-python_test() {
-       cp -r -l tests "${BUILD_DIR}"/ || die
-
-       if python_is_python3; then
-               # Notes:
-               #   -W is not supported by python3.1
-               #   -n causes Python to write into hardlinked files
-               2to3 --no-diffs -w "${BUILD_DIR}"/tests/*.py || die
-       fi
-
-       nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-       use doc && local HTML_DOCS=( doc/_build/html/. )
-
-       distutils-r1_python_install_all
-       newbashcomp external/pygments.bashcomp pygmentize
-}
similarity index 80%
rename from dev-python/pygments/pygments-2.0.2.ebuild
rename to dev-python/pygments/pygments-2.0.2-r1.ebuild
index cbb8a41571d65c756edb8541a220a841f4c7bc66..b2de0150b71c4c3aa9390ebc5788ea484e55c258 100644 (file)
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -33,6 +33,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+       "${FILESDIR}"/${PV}-shell-injection-backport.patch
+       "${FILESDIR}"/${PV}-shell-injection-backport2.patch
+)
+
 python_compile_all() {
        use doc && emake -C doc html
 }
index 59fbf3f7b0982a78e0d8abfb20d568871a39cf90..bcb24dac94b7fbacfa494fcf8f91fe86bfd3284e 100644 (file)
@@ -1,3 +1,4 @@
 DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 SHA512 614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8 WHIRLPOOL 278d37581a950a570ac3cca2a5f8b674c909220fddc47072d9d52c38b8dfc30b335530dffd3c522cd18e58e9bddcc5e48d9184cdaf4b09203bbba308607e24a4
 DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f
 DIST pyparsing-2.0.4.tar.gz 1140009 SHA256 c43c9f1395975bf2b032c20e6b149d6b698cdabf9291079bcaf0131709e95f59 SHA512 021d3610ead6b864b1e0227b6cad2393aae0c1f38a44c09dd7ac33d05be30cb4c75176a33ebd8c44e87ed9d54b58aaf27fab7ac8f3cdcb3ce4418b5b0d586b01 WHIRLPOOL 0fa3fe631c5c6fc79fb13f029fe8a32bd9651fd663e915c5be394225bcb1ea1f199d3edc2294e7a4b0732590e7a0cc3053effca9aa20155ca69d4c3908019e6d
+DIST pyparsing-2.0.5.tar.gz 1140072 SHA256 58756bf33e989d84ac72142e4ca558cf10c778a3233edb0a86632f271409ba9e SHA512 203c4520378302434078b49467369ee0ae70ef4807ca16b8e0ca361dbc3f555806e5e07f9e5005eec34452144b528ed0480f8892b1c61bae83512baa4e74b56e WHIRLPOOL 0da95e0d61a877669ff0f586e3688b0f8444baa5b857fdea8bb758b52af1ea8d6709effe2d1df031bf7d5940fb3b65582f44ca750adedaae12a36d5af105b6a6
diff --git a/dev-python/pyparsing/pyparsing-2.0.5.ebuild b/dev-python/pyparsing/pyparsing-2.0.5.ebuild
new file mode 100644 (file)
index 0000000..ef7c5b1
--- /dev/null
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy-to-use Python module for text parsing"
+HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples"
+
+RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# no contained in the tarball
+RESTRICT=test
+
+python_install_all() {
+       local HTML_DOCS=( HowToUsePyparsing.html )
+       if use doc; then
+               HTML_DOCS+=( htmldoc/. )
+               dodoc docs/*.pdf
+       fi
+       use examples && local EXAMPLES=( examples/. )
+       distutils-r1_python_install_all
+}
+
+python_test() {
+       ${PYTHON} unitTests.py || die
+}
index b3b061140ebb062c6e519a7faef4e0fbba6bad45..aa4860213680b2c91b3410cd53dfe5c3347f86ca 100644 (file)
@@ -1,3 +1 @@
-DIST python-nbxmpp-0.5.1.tar.gz 1514899 SHA256 2988dd2ae4e0dca76c1c7d75b1cac5bc31517a05959eba652ecad6e66604f929 SHA512 2bdcd89004202880b69728e0f5f23506016ce21a10960ff4c23d2d45037563f32441964688c6328d3f8e10cda2f39aeac647aff9fde0676ca27a4c8dde72405e WHIRLPOOL f994f172ba0b50e154ec2d4bda26d574b21639b412b1eb73d3b781bd5f897577a32eb47fc3b276f66bc2ac48b66442a0185bbd9a74f896446838e471ec082a1e
-DIST python-nbxmpp-0.5.2.tar.gz 1508734 SHA256 16d7d2114d9d2c7267d0d8fc5a5c868939fa37031b8d4ca1b11c2a7500bc5160 SHA512 0b8a063c421349c24f822f3da68e6627675731793eee8dad14ae298ed67a981ddaad54fa63a88de6d28f2755da259ee5768a587ed3242e3cb38b4886a069f102 WHIRLPOOL 376e9044a508183f586a5a11e5b5cb41f3065db185b4d89392b1613288f9ede874af1a8f5eafdf64552af8f2d6a2120a931833d5fea4aad5cffcaad380ca9a68
 DIST python-nbxmpp-0.5.3.tar.gz 1514066 SHA256 b79a6b25a2ed7ac792600544778238b27cf6eef6c8eab79b0bfa46df0c3a9935 SHA512 a55ce4c05683d46c12cf085c5436ba544044f0ab71ad7c87dbb25cba02c28109089131b617ff51191d294efe50e80171dd2305ead4052bec921b0ad5ad920e20 WHIRLPOOL 96d078df5972dde5704dac9fcac31c9ae734c06583c381f5d18d43fca26ae790cebc114991e07b916be35a5dcb24d9ccaad9fe69f22b9bd16099d5d248aea487
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.1.ebuild
deleted file mode 100644 (file)
index f6374a1..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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 distutils-r1
-
-TAG=6
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="http://python-nbxmpp.gajim.org/"
-SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.2.ebuild
deleted file mode 100644 (file)
index b95facb..0000000
+++ /dev/null
@@ -1,22 +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 python3_{3,4} )
-
-inherit distutils-r1
-
-TAG=7
-
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="http://python-nbxmpp.gajim.org/"
-SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}"/nbxmpp-${PV}
index db141c28b75b255297222a08856f1f45706a18e1..9fc77862239fbf7f83a01f6148d75a0504da84d0 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S="${WORKDIR}"/nbxmpp-${PV}
similarity index 96%
rename from dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
rename to dev-python/python-sipsimple/python-sipsimple-2.5.1-r3.ebuild
index 855904f594f1da4301d9b30f7535fed5aff64af2..e6c2594f70e0c7837437060802a74fcb1bf5b304 100644 (file)
@@ -30,7 +30,7 @@ CDEPEND="
        virtual/ffmpeg
 "
 RDEPEND="${CDEPEND}
-       dev-python/dnspython[${PYTHON_USEDEP}]
+       virtual/dnspython[${PYTHON_USEDEP}]
        dev-python/python-cjson[${PYTHON_USEDEP}]
        dev-python/python-dateutil[${PYTHON_USEDEP}]
        dev-python/python-eventlib[${PYTHON_USEDEP}]
diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild b/dev-python/python-sipsimple/python-sipsimple-2.5.1.ebuild
deleted file mode 100644 (file)
index 10e1c45..0000000
+++ /dev/null
@@ -1,47 +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 )
-
-inherit distutils-r1
-
-DESCRIPTION="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org"
-SRC_URI="http://download.ag-projects.com/SipClient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-       dev-db/sqlite:3
-       dev-libs/openssl:0
-       dev-python/python-application[${PYTHON_USEDEP}]
-       media-libs/alsa-lib
-       media-libs/libv4l
-       media-libs/libvpx
-       sys-apps/util-linux
-       virtual/ffmpeg
-"
-RDEPEND="${CDEPEND}
-       dev-python/dnspython[${PYTHON_USEDEP}]
-       dev-python/python-cjson[${PYTHON_USEDEP}]
-       dev-python/python-dateutil[${PYTHON_USEDEP}]
-       dev-python/python-eventlib[${PYTHON_USEDEP}]
-       dev-python/greenlet[${PYTHON_USEDEP}]
-       dev-python/python-gnutls[${PYTHON_USEDEP}]
-       dev-python/lxml[${PYTHON_USEDEP}]
-       dev-python/python-msrplib[${PYTHON_USEDEP}]
-       dev-python/python-xcaplib[${PYTHON_USEDEP}]
-       dev-python/twisted-core[${PYTHON_USEDEP}]
-       dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-       dev-python/cython[${PYTHON_USEDEP}]
-       virtual/pkgconfig
-"
index ee6dda9ab4b315f15e2a15c9312fb830342917c3..eabb6d236cdda482199872d45a52c53950fb20e6 100644 (file)
@@ -4,7 +4,7 @@
        <herd>python</herd>
        <herd>proxy-maintainers</herd>
        <maintainer>
-               <email>srinclan@gmail.com</email>
+               <email>sergio.rodriguez.inclan@gmail.com</email>
                <name>Sergio Rodriguez</name>
        </maintainer>
        <maintainer>
index 045593b2bbae5df998e59bcebf8bdfaf71e1a93b..2a26c77f94e850b0a2eaa91f4a7dc055db8a8b03 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
index 9d2a9281f413fff61868013696458d62c2165892..a67d0418f87b894c29da494ae0f9db9fc25f16b6 100644 (file)
@@ -6,4 +6,3 @@
                twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features.  twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python.
        </longdescription>
 </pkgmetadata>
-
index 1d397df7a63cf8b036c8b6a6d68f2d99c3628d23..d69c8f7477928a60d91c18935f05118fb1f68f9a 100644 (file)
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python2_7 pypy )
 
 inherit distutils-r1
@@ -19,18 +20,24 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="doc examples"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7)
-               $(python_gen_cond_dep 'dev-python/dnspython[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       doc? (
+               $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7)
+               || (
+                       dev-python/dnspython:0[${PYTHON_USEDEP}]
+                       virtual/dnspython:0[${PYTHON_USEDEP}]
+               )
+       )"
 
 S="${WORKDIR}/${MY_P}"
 
 python_compile_all() {
        if use doc; then
-               pushd doc > /dev/null
-               chmod +x make-epydoc.sh
-               ./make-epydoc.sh
-               popd> /dev/null
+               pushd doc > /dev/null || die
+               chmod +x make-epydoc.sh || die
+               ./make-epydoc.sh || die
+               popd> /dev/null || die
        fi
 }
 
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
new file mode 100644 (file)
index 0000000..68bf08c
--- /dev/null
@@ -0,0 +1 @@
+DIST versioneer-0.15.tar.gz 35408 SHA256 1252b9b9420fc3bc01036640da7928fe5d04519f463c5e960eb774c3ea80cd09 SHA512 b9d2f282f5dc681b0dafb0ae34352eb995e16b3184047bc29301b52acde9fc29b49e129c49c767827808a1e524315ece8c8fe02edf18a9d9cd20c34f345336e5 WHIRLPOOL fcc80ffe73bb3733733785587e84b0ab7de39a0916e5070c6cbdf499115e6da51a078f9d8176f4a15305c1b623cd59469385eaeeba33bbcb0116203f7c1704c7
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
new file mode 100644 (file)
index 0000000..ee7e8b2
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/versioneer/versioneer-0.15.ebuild b/dev-python/versioneer/versioneer-0.15.ebuild
new file mode 100644 (file)
index 0000000..2eab386
--- /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
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Easy VCS-based management of project version strings"
+HOMEPAGE="https://pypi.python.org/pypi/versioneer https://github.com/warner/python-versioneer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+       esetup.py make_versioneer
+       git config --global user.email "you@example.com"
+       git config --global user.name "Your Name"
+
+       ${PYTHON} test/git/test_git.py -v || die
+}
index 5715e71140defc0d8c38a642b45dc848aaf12440..bbea4f5b2e816191da76fab3444104d4d4302730 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
similarity index 83%
rename from dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild
rename to dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
index 22a0bfba010fc60db66a63b1c37c536d546f708f..c9cc7fab7fdd92a7a4531eff4b0fd61b21dd3e02 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$
 
@@ -19,8 +19,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
-RDEPEND="|| (
-               dev-python/dnspython[${PYTHON_USEDEP}]
+RDEPEND="
+       || (
+               virtual/dnspython[${PYTHON_USEDEP}]
                dev-python/pydns[${PYTHON_USEDEP}]
        )"
 DEPEND="${RDEPEND}
@@ -33,6 +34,6 @@ PATCHES=(
 )
 
 python_install_all() {
+       use doc && HTML_DOCS=( doc/. )
        distutils-r1_python_install_all
-       use doc && dohtml -A py -r doc/.
 }
index 49104c845a0e18e088c2e87af43d8e17f3628094..92fe198f5c4a56e1011bd571513f3490e2269e55 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
 IUSE="doc"
 
 RDEPEND="|| (
-               dev-python/dnspython
+               dev-python/dnspython:0
                dev-python/pydns
        )"
 DEPEND="${RDEPEND}
index 854c9eb18d8b28727e22c2b16add747869e55abc..e72281c05be8548c7caadac250d49f7158cc549a 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
index 9be4cc1bce96a68878e0a3aed7adfa496115c2ad..643015c77c3d92cfcfdfa39d12196437b76cc246 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="doc +qt4 qt5 X"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch
new file mode 100644 (file)
index 0000000..b8fc226
--- /dev/null
@@ -0,0 +1,13 @@
+Index: rosbridge_server/setup.py
+===================================================================
+--- rosbridge_server.orig/setup.py
++++ rosbridge_server/setup.py
+@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene
+ d = generate_distutils_setup(
+     packages=[
+         'rosbridge_server',
+-        'backports',
+-        'backports.ssl_match_hostname',
+         'tornado',
+         'tornado.platform'
+     ],
similarity index 85%
rename from dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
rename to dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
index 997490d73c419f9eec72ee7c487a8498a71b1781..cc30070be37210c26cb3e94be47bd84bc2d8b36e 100644 (file)
@@ -20,5 +20,7 @@ RDEPEND="
        dev-ros/rospy[${PYTHON_USEDEP}]
        dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
        dev-ros/rosauth[${PYTHON_USEDEP}]
+       dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
        "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/backports-ssl.patch" )
index 997490d73c419f9eec72ee7c487a8498a71b1781..cc30070be37210c26cb3e94be47bd84bc2d8b36e 100644 (file)
@@ -20,5 +20,7 @@ RDEPEND="
        dev-ros/rospy[${PYTHON_USEDEP}]
        dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
        dev-ros/rosauth[${PYTHON_USEDEP}]
+       dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
        "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/backports-ssl.patch" )
index d7a3d53f124651d8fad62525bd2a81172bc886d1..1f7aafba7ee24c1919a02a83f932c6549d764ae0 100644 (file)
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/thuehlinger/daemons"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples"
 
 all_ruby_install() {
diff --git a/dev-ruby/gherkin3/Manifest b/dev-ruby/gherkin3/Manifest
new file mode 100644 (file)
index 0000000..cfb0833
--- /dev/null
@@ -0,0 +1 @@
+DIST gherkin3-3.1.2.gem 28672 SHA256 1dc07216c9b19407518780036dd03c936d4391f0bb18a625d707f2ffb36555f1 SHA512 4476f6b87237293512edcdc131472b65e420a0675e837f473bdc0b938e3a38d428a5058637f421703dbf44a23aec856783e9fa1ecf259d7d63f9af78d96f13e4 WHIRLPOOL d497894ea741a71481b2b30a3d2c93b2098506f911291de4764c149970b9d14ab1deaa5b65bd0f9b8e3f0318fa0cff020336f2114e9d43faeedb01798debd4b4
diff --git a/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild b/dev-ruby/gherkin3/gherkin3-3.1.2.ebuild
new file mode 100644 (file)
index 0000000..857b290
--- /dev/null
@@ -0,0 +1,22 @@
+# 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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast Gherkin lexer and parser"
+HOMEPAGE="https://github.com/cucumber/gherkin3"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
+SLOT="3"
+IUSE=""
diff --git a/dev-ruby/gherkin3/metadata.xml b/dev-ruby/gherkin3/metadata.xml
new file mode 100644 (file)
index 0000000..270f0aa
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ruby</herd>
+  <upstream>
+    <remote-id type="github">cucumber/gherkin3</remote-id>
+  </upstream>
+</pkgmetadata>
index 8c728ebdf87e1daeab16c16f0cebe7339b17ef2c..98c76cdba83d0f23be1c403875b4185b59d9db66 100644 (file)
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/JEG2/highline"
 IUSE=""
 LICENSE="|| ( GPL-2 Ruby )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 all_ruby_prepare() {
        # fix up gemspec file not to call git
index bb452d4545017245d808bca9ef9bf7687d25a826..1a6e1c26bbcde78c6f1c8e3017967200686e4a40 100644 (file)
@@ -19,7 +19,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~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 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~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.3:5 )"
index cff42ac991f976f329c079095278de33ed411d20..f968c790a8f2852c4ec035dbfd74cc937c00917d 100644 (file)
@@ -1,3 +1,3 @@
-DIST netrc-0.10.2.gem 10752 SHA256 cd51a5780665bc3978fe2a33e1edd7e902218a7edefccc7a918e39f19cdec72d SHA512 044fd610ca9cbf4e7214492d0af7e147084b6349c646f7fb08a9bd2a053b705d4db8462671e11ff160a908bea0d2d3669794f83d7e591635b65dc762464eb003 WHIRLPOOL 27cd333510afee28e82460cd2758b3beedf912a274d8b093c083231ca8b73580f44d34b6db6c36937ec5dfbe19e7d565b6c9ac4d42150e698c711aa21cb116dd
 DIST netrc-0.10.3.gem 10752 SHA256 8fa24558ed46e2b2d9a58baa78fd7d11cb7efa3ec7e2ec89a057f76dc3abcce4 SHA512 ba51f2c03496b6b5ebfdcc3a9c1ff47c41961baa50f0aa9ffec487c67fdafe48b810fa28b16c17b9198104b86986b52f43d267c286be3a86018fc59e16481b11 WHIRLPOOL 4b1f70b7193143b77ef34b4163617a3b97c49a3b910dc2a1756da0c703e3ebcd0eaf583679865f3b889f84eff8c5ecf7a50ee66d02ddf51d77b869502e1bdf95
+DIST netrc-0.11.0.gem 10752 SHA256 de1ce33da8c99ab1d97871726cba75151113f117146becbe45aa85cb3dabee3f SHA512 7f0df3f79d92b891d40a49e9b893ca7131077195cf15453b155e37e68e29f8cd3810ba791a06338058262c8cb8fed56c87c295e450c133b428b3398eb99e683a WHIRLPOOL d80d76b038780d1b0acec19715e476658b5793116af1170f909a4f6b066688f77858eef075f43d4fd8a620406636ff0cd0cb1fdfb726af10ae7d1fedc131790d
 DIST netrc-0.9.0.gem 10240 SHA256 9c8726e3c166cb2f99421639feac44525ce0646c4b01ffb4b41962a63763721c SHA512 da90ef05f47aa956fddd4679f02a5a0c9397f37055efc2c7a738abfad51164a5c9301df7dbe27dbb28e0caaa291dfe5ad414cd2a1598d5803742c58adaca99fd WHIRLPOOL 42726b8ae33a0e53da476f390dec92563ded93e2d5e350467d63b6d88b125b25db2363d398834b8f615e9c110342b175ecdedbde67176ae93005119664de508b
similarity index 83%
rename from dev-ruby/netrc/netrc-0.10.2.ebuild
rename to dev-ruby/netrc/netrc-0.11.0.ebuild
index d50e4537a3d8623c4fa1d5fc097f1611e5aaa511..faafdd1e8e96b1de9a0247f870becaacdbb64d15 100644 (file)
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
 
@@ -24,5 +24,5 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-       ${RUBY} -S testrb test/test_*.rb || die
+       ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
 }
diff --git a/dev-ruby/netrc/netrc-0.9.0-r1.ebuild b/dev-ruby/netrc/netrc-0.9.0-r1.ebuild
deleted file mode 100644 (file)
index cd39914..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library reads and writes .netrc files"
-HOMEPAGE="https://github.com/geemus/netrc"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-       sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die
-}
-
-each_ruby_test() {
-       ${RUBY} -S testrb test/test_*.rb || die
-}
index 93e8dbcc6bbdd01b1a67560df83fb3d6c4c888cc..161e82a5a3fccffce5998a7959a936a8d910e0ad 100644 (file)
@@ -15,7 +15,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sparc 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 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
index 0892766b07ab421c73292b1d71a57dd09966ac09..fcbc0e3c4babacdd892632d5b9af6591663cd750 100644 (file)
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 hppa ppc ~sparc ~x86"
 IUSE=""
 
 each_ruby_configure() {
index 3eea4b12dc412fcfe33a72620a3272d73924d705..78f4642f2a4b9f019f1d9c8627edf4e3e8b609fc 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc 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 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test doc"
 
 RUBY_PATCHES=( "${P}-require-set.patch" )
index 6f1451ba679c30b8746b93cfb6a7943cfd6f4e6c..e000441902eb45dc5e9d9554b12341d01f930861 100644 (file)
@@ -27,7 +27,7 @@ HOMEPAGE="http://test-unit.rubyforge.org/"
 
 LICENSE="Ruby"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 all_ruby_compile() {
index cf72776fa56a060388df62597202df1297668d1f..b98516e1eabda295b0db160f357d444f321461db 100644 (file)
@@ -8,7 +8,7 @@
   <name>Alexis Ballier</name>
 </maintainer>
 <maintainer>
-  <email>dima@sphinx.net.ru</email>
+  <email>dima@dzhus.org</email>
   <name>Dmitry Dzhus</name>
 </maintainer>
 </pkgmetadata>
index ec0f0aeb89ccedf405dbc34de7f4c65198d1ec13..2db73d4cef7630f10a7a7b686ade37333f66c09d 100644 (file)
@@ -1,2 +1,3 @@
 DIST bcpp-20050725.tgz 132649 SHA256 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a SHA512 0ada3aee998fa6748e7492bfe2e0d6e5417640eaa19aa3342637ee1d162c907d2af4fd2d1ab24661f36798d2d51fa017d9c113b8499b32bf4d521e130aa75323 WHIRLPOOL fff51c65b60351c9a7c55d060754e3e09383b905820ab79aa2f371a894a82d8a3fa5a00b00a066380909c49487e262f99a832022b5f214d564e43b8939fcbdcb
 DIST bcpp-20090630.tgz 138757 SHA256 27b46ab3cef53a658605f350e3982862e17b523e703f23617530a57180200a34 SHA512 660d11c0d8a8d3ccc2a4c14ccb60164a43647fface79ffd86b8d99519e227e32a882fc213a5fef64fd3aee1c409c4bb0a871dfd6d6a09a8ad35e253baef6496b WHIRLPOOL 1fa68efd9874933de2097b87aab0dd586cbc29cf7fc3d4ba6d80984ecb289f01d8093e82fbca3f8077300887a8d1b1b970ed5bcabb0a766489bdcb23704f7ac2
+DIST bcpp-20150811.tgz 145969 SHA256 6a18d68a09c4a0e8bf62d23d13ed7c8a62c98664a655f9d648bc466240ce97c3 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9 WHIRLPOOL 959677314ce1bbd361b3060f7f8f028ad89cce8d7167ecc169f6d49a854ecfadc50177be2dd2ffdac838252f67af72d2a4c341b2666208bc8cef1aadcee867db
diff --git a/dev-util/bcpp/bcpp-20150811.ebuild b/dev-util/bcpp/bcpp-20150811.ebuild
new file mode 100644 (file)
index 0000000..10ebb2c
--- /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"
+
+inherit eutils
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="http://invisible-island.net/bcpp/"
+SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+       emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+       dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+               txtdocs/manual.txt || die "dodoc failed"
+
+       # Install our configuration files.
+       insinto /etc/bcpp
+       doins bcpp.cfg indent.cfg || die "doins failed"
+}
+
+pkg_postinst() {
+       elog "Check the documentation for more information on how to"
+       elog "Run bcpp.  Please note that in order to get help for"
+       elog "bcpp, please run bcpp -h and not the command by itself."
+       elog ""
+       elog "Configuration files are at /etc/bcpp."
+       elog "To use them, use the -c option followed by the filename."
+}
index 5184a3267234a1668ebc88d3daa1dfb3c9f9a87a..3e45afe4fe8d9c2a4df24bb941ca8d95d78b1a8c 100644 (file)
@@ -1,3 +1,4 @@
 DIST coccinelle-1.0.0.tgz 3427246 SHA256 e18b4c77964c6f623c385dc8b2fcb46beacd9811927617144620b12d93289e74 SHA512 0c59918dff3d33035f5c928b54de9cbe32f9146d9e4b82545d168140d1395ff5b3e446faff47f39dbb6fceb74f432b419e9c7322e834c11bb50b5fb5d4e4dd46 WHIRLPOOL 8714327d7156bd1ada0c6b0776fefcc4e46b9885354ca686d4de8b35c2dd1cf6372e91dfa3a04645295f411b40d57eee94d81cbd8dfe2c18f3dc3b15ff8e1926
 DIST coccinelle-1.0.1.tgz 2772730 SHA256 39caac46c1f80cbe5de21164c5b31a794e3befdb9cd7ef1d080d455ac171b526 SHA512 5a69476941a9582ca6e0663c468a87aba15b6e38243cbb532c517b75066c8fafe37cbe6d398d6183cc7a315c5680efdf425f0bc8cb2184dbf94e446879514a89 WHIRLPOOL 8b38b982b8d19c10c7e3ed77629b6883c4d6455da4da4d68251b492ce36490c5236573bf7c44a34e21887b8be0ca83b4efb39cf13b1c4c6db7db58979ee6a7bc
 DIST coccinelle-1.0.2.tgz 2790829 SHA256 4e45b904f42c9b84732168782d491c8c1ab23bb85db06c4b9ba2762bea8ac679 SHA512 83c8e250a7e19126ce3f95d0455892d60b2d7a688af3a066edcfb9a8cc146f8a9281c9e019896421e1bc546d366114effef3116105eae19617ad45c26f42c534 WHIRLPOOL 15b64abbad31f49883e4cacc2282ed28eb67f64d951636ee6b690a474b072e6a029c4131adb727f5f7a8d86628b871db0cff144ad8478514529c4c5d5dee9074
+DIST coccinelle-1.0.4.tgz 2484218 SHA256 7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d SHA512 1e7ad7adb700f2e0d844b3f5787c24fc40bc9a61354b5aefa0f957e524e74ba67a8bef594e837a479d3a5f3c8d89c2395e8636838e0451977de8bd3d588d7ce1 WHIRLPOOL 15759395a2253fa8322e034a02388b5f0f6cc0702e82d43e95c3c9ecc2fa5795cb4a3a3fbc48aa2104bd0173adfd58e046f804d63c3ccbe278796cbe4932f46e
diff --git a/dev-util/coccinelle/coccinelle-1.0.4.ebuild b/dev-util/coccinelle/coccinelle-1.0.4.ebuild
new file mode 100644 (file)
index 0000000..adc67ae
--- /dev/null
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib eutils python-single-r1 bash-completion-r1 elisp-common autotools
+
+MY_P="${P/_/-}"
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# ocaml enables ocaml scripting (uses findlib)
+CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+       dev-ml/sexplib:=[ocamlopt?]
+       dev-ml/menhir:=[ocamlopt?]
+       || ( dev-ml/camlp4:=[ocamlopt?] <dev-lang/ocaml-4.02.0 )
+       dev-ml/parmap:=[ocamlopt?]
+       emacs? ( virtual/emacs )
+       ocaml? ( dev-ml/findlib:= )
+       pcre? ( dev-ml/pcre-ocaml:=[ocamlopt?] )
+       python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="${CDEPEND}
+       vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+DEPEND="${CDEPEND}
+       virtual/pkgconfig
+       doc? (
+               virtual/latex-base
+               dev-texlive/texlive-latexextra
+               dev-texlive/texlive-fontsextra
+       )"
+
+REQUIRED_USE="test? ( ocaml python )"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+S=${WORKDIR}/${MY_P}
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       if use python ; then
+               # fix python install location
+               sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
+                       -i Makefile || die
+       fi
+
+       # This is regenerated by menhir, bundled version does not build with latest
+       # one...
+       rm -f parsing_cocci/parser_cocci_menhir.ml
+
+       epatch "${FILESDIR}"/${PN}-1.0.0_rc16-findtool.patch
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               $(use_enable python) \
+               $(use_enable ocaml) \
+               $(use_enable pcre) \
+               $(use_enable pcre pcre-syntax)
+}
+
+src_compile() {
+       emake depend
+       emake
+
+       use ocamlopt && emake opt
+
+       if use doc ; then
+               VARTEXFONTS="${T}"/fonts emake docs
+       fi
+
+       if use emacs ; then
+               elisp-compile editors/emacs/cocci.el || die
+       fi
+}
+
+src_test() {
+       source env.sh # needed for built in-place python plugin
+       ./spatch standard.h -parse_c -dir tests/ || die
+       yes | ./spatch -iso_file standard.iso -macro_file_builtins standard.h -testall || die
+       if use ocamlopt ; then
+               ./spatch.opt -iso_file standard.iso -macro_file_builtins standard.h -testall || die
+       fi
+}
+
+src_install() {
+       default
+
+       use doc && dodoc docs/manual/*.pdf
+       newbashcomp scripts/spatch.bash_completion spatch
+
+       if use emacs ; then
+               elisp-install ${PN} editors/emacs/*
+               elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+       fi
+
+       if use vim-syntax ; then
+               newdoc editors/vim/README README-vim
+               rm editors/vim/README || die
+               insinto /usr/share/vim/vimfiles
+               doins -r editors/vim/*
+       fi
+
+       use python && python_optimize
+
+       export STRIP_MASK='*/coccinelle/spatch'
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}
index 105e23d5e00fb81fe535607970c4647502438706..c099f111361dbb3fc34bb56e3485ce90e18e448f 100644 (file)
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
        inherit eutils multilib-minimal
        SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
-       KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+       KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
index 1a3621987e07d0f3d365a4117ee664323976bdc0..61fb1feeb24dab71c47d531ce6d214381620b760 100644 (file)
@@ -1,2 +1,3 @@
 DIST hub-1.12.4.tar.gz 76798 SHA256 b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117 SHA512 3c80592954f6f9bd9406adf8faaaf3e307a5387b623b07f06f574e6841899a7e253b67429417ba37c78b53064ddd0188b9f37e3e24130d899207c23bad389618 WHIRLPOOL 46c0870101add366c83d12ea92cfd1d434e841df58101ef8b1250e040cb0fe92590245b3e092780213b837cc2f9d9ad9bd9bff37a110bc608d63cddd7bbf4898
 DIST hub-2.2.0.tar.gz 301460 SHA256 2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1 SHA512 ad65cfd2a81ab92ab69d31ff7a068cf2da1557ca1d2f6e1b97b7f939249e9955bb2cace42b8900ec2d5b98970fbca27435edcd503af7ee3c05a79462e7734d8a WHIRLPOOL 83ea1d3b1086d7cdcebed6cb604027763cd41dd3f101dd56827c469ec61034a9e3a7b4cbd1111b5b7820707a13679a558704d80d58fed125f07573fb983dff9a
+DIST hub-2.2.2.tar.gz 311726 SHA256 610572ee903aea1fa8622c16ab7ddef2bd1bfec9f4854447ab8e0fbdbe6a0cae SHA512 27eb8d3b973b30ab16fa59649af55934a2543d74d5160337be881b9d6038efaac4d19e3b2d3295191e65daedafa93d36773f05b3e3a48eae312b711db34762c0 WHIRLPOOL e4274515eac18938c42b4bf71a5ed7ec0e1c66a4ea65db68559172c039bd2b7b252d0c0ffc7209545f966d4d8b0d7b89c6e075f589ac677e16340ba5c641f778
diff --git a/dev-vcs/hub/hub-2.2.2.ebuild b/dev-vcs/hub/hub-2.2.2.ebuild
new file mode 100644 (file)
index 0000000..253f5b6
--- /dev/null
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 readme.gentoo
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.5.1:="
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+src_compile() {
+       ./script/build || die
+}
+
+#src_test() {
+#      ./script/test || die
+#}
+
+src_install() {
+       readme.gentoo_create_doc
+
+       dobin hub
+
+       doman man/${PN}.1
+       dodoc README.md
+
+       # Broken with autoloader
+       # https://github.com/github/hub/issues/592
+       #newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+       insinto /usr/share/zsh/site-functions
+       newins etc/hub.zsh_completion _${PN}
+}
index ec4584916d8f633fee2e6c24cb4967069e04e9f9..6297ea16384ea51c1bcf79f9305343b3502aea15 100644 (file)
@@ -1,3 +1,4 @@
+DIST manaplus-1.5.10.24.tar.xz 9452988 SHA256 abc61f6a2d9867e674f2d41fd5418ac972ac27419550a38ac13744caa26f5dae SHA512 249f8b4fc8183259017ebfec41a7ea4b7dd2e952947a4cb2a42dfb88ae1449df60a8569d0823b1ab2b40ee4ef31858e2fd90d741077a1ed0702daf4c8559cdf2 WHIRLPOOL 206b81d3eb9ba9eb34c63e40ee2933289f3cd0c08b4875d1f36375464fa174d2efab1feb1279f232734b7e53123103739f568981887f4c998a725f75b8a0dd33
 DIST manaplus-1.5.6.20.tar.xz 9376348 SHA256 cee7ce82c730c3e2254bc335023eb5531a3bcb4434a926f8685e16a2651f5b7e SHA512 bec1a2f9e0c034f234ce66836454df7296ce366a55d635713f4ba6103b4ab12d5a0dfd5d00b6b67a935499226e50ed1d1750f37ac70f06017d047015ba3a3627 WHIRLPOOL 728621e395fdb6ba4491e35d25897346cd70676a459c729cb56d258aeb6b413e144e57f5f306a7084511f5c0cbe3425ac25b921f3c5367d7db3696e43e869365
 DIST manaplus-1.5.8.15.tar.xz 9399088 SHA256 c9ebf1c106fd04f8b192b4f07b15528a69bd3541f5eeee7cc5ecfa643a1dab9c SHA512 c99f5f782c794f0697242a2191b0eb5062964919abc6122cc88c2eb2bc32e4ce085b10c4d97d926ee72b0bac406db3130fc05d76cb8e6f1241579a115db8d44d WHIRLPOOL fc5600fe2e42f362abe507a99834bdf1810ef643709fba0005a78119728e4f204df8e7ef2672ba8548fd611f48ddb3b9a063a104b216f3c000b3ee52d83eacab
 DIST manaplus-1.5.9.26.tar.xz 9441816 SHA256 46efd357bc5e51311300e9239dead96f32a6a0a3c6407c091208e1b359d0151c SHA512 78cb38682fde6fb2fdb2f3805be45d69d926e2965bba3630c47f5f9ebc2d81b7dcae9dd08ae3bcaefd8837b02e09ec8da89b870052a232eb2ca8b9a9f8120413 WHIRLPOOL 4c2f153a79d71e6e69ec0b01419885453777e010c313fd4f86727cd39ec67d5eaeeeaa6237443b594ba3b42fba194e43f15f4fe5f4f43df4366aa2a85b4ce506
diff --git a/games-rpg/manaplus/manaplus-1.5.10.24.ebuild b/games-rpg/manaplus/manaplus-1.5.10.24.ebuild
new file mode 100644 (file)
index 0000000..f2ed73b
--- /dev/null
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl"
+
+RDEPEND="
+       >=dev-games/physfs-1.0.0
+       dev-libs/libxml2
+       media-libs/libpng:0=
+       media-libs/libsdl2[X,opengl?,video]
+       media-libs/sdl2-gfx
+       media-libs/sdl2-image[png]
+       media-libs/sdl2-mixer[vorbis]
+       media-libs/sdl2-net
+       media-libs/sdl2-ttf
+       net-misc/curl
+       sys-libs/zlib
+       x11-libs/libX11
+       x11-misc/xdg-utils
+       x11-apps/xmessage
+       media-fonts/dejavu
+       media-fonts/wqy-microhei
+       media-fonts/liberation-fonts
+       media-fonts/mplus-outline-fonts
+       nls? ( virtual/libintl )
+       opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )"
+
+src_prepare() {
+       sed -i \
+               -e '/^SUBDIRS/s/fonts//' \
+               data/Makefile.in || die
+}
+
+src_configure() {
+       CONFIG_SHELL=/bin/bash \
+       egamesconf \
+               --with-sdl2 \
+               --without-internalsdlgfx \
+               --localedir=/usr/share/locale \
+               --prefix="/usr" \
+               --bindir="${GAMES_BINDIR}" \
+               $(use_with opengl) \
+               $(use_enable nls)
+}
+
+src_install() {
+       default
+       dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+       dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
+       dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
+       dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+       dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
+       dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
+       dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
+       dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
+       dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
+       dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
+       dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
+
+       prepgamesdirs
+}
index 8c45c58f366ae5c5d17f59845a52ef3bcfc7cdec..729b4c6a45f4c3b88e1fe5be608ea9cf4dcb90fe 100644 (file)
@@ -21,8 +21,8 @@ RDEPEND="sys-libs/glibc"
 S=${WORKDIR}/data
 dir=${GAMES_PREFIX_OPT}/${PN}
 
-QA_TEXTRELS="${dir:1}/pb/*.so"
-QA_EXECSTACK="${dir:1}/*.x86
+QA_PREBUILT="${dir:1}/pb/*.so
+       ${dir:1}/*.x86
        ${dir:1}/*.so*"
 
 pkg_nofetch() {
@@ -30,9 +30,9 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-       tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
+       tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip || die
        unpack ./${A}.zip
-       rm -f ${A}.zip
+       rm -f ${A}.zip || die
 }
 
 src_install() {
index b3b452856b3015f387357d1d715bb5c2189848e8..7e089e4025f3098d89f8c956600266d665cdb063 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
index 11f85227bf5de0d1e979da720329d3617a782f76..fcdbdff6a0c288d4eaf0b3d3f7e3ef6915aecc8a 100644 (file)
@@ -1,4 +1 @@
-DIST chromaprint-0.6.tar.gz 542366 SHA256 5d9b82da226450c14e43482371a1b2a178e2604ab5b2e9259f33b1b461ee9d63 SHA512 8786c84877663d991d3114776c92b47eb4d813a338e312956a54c444ff07bca05692a019145c722bcbfadd8c2e4c2b6c5ccb0eb784d96d41f58b143e8d57db24 WHIRLPOOL 2ed6ccb8e36393afae971873455bb38bd801daf94912badeca067162a5ab467215799439bfb3afcb51bd302435bcd479b9a991d4f4db90c4783e6a43fe94b09f
-DIST chromaprint-0.7.tar.gz 543811 SHA256 4e52c3fd443c91a5c429557753d4ba3f9d31d183810412c0d8600892f3975501 SHA512 2ac03f80888d6c12dd05c20adc82e0f2c9e6bf5edc099d7c7b719b8cb353151fb04b78f5c7bca672d5fe8357a791e86fdea7b6952a0d64c346c079548ebfcd38 WHIRLPOOL 34c5cb7c38dc0e4924e068ff0a695e571fdd2233046ef6ea84e9e0e27e6bf9f5eaedceb79c2f8120e9ac6eb30ace3bc9e15ba59027cd498426e7f94536e2da84
-DIST chromaprint-1.1.tar.gz 542360 SHA256 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 SHA512 3d439dfca979e2babc8d2c171b5cb36fd0a5d3b7475e02a0f8bae436f7096e189674b640119f0dccf7cc2cd214bd8674d46b018952f1e3e93ddc0ba19b5155f9 WHIRLPOOL 726c7710f7bd1c138d7ebd1de263a0e214cbd79faf60e35034a60cfd68a9d3b4e52fc1cc93ce4dc7d39683e3a5ac1d7e9bd6c8046cdb5cece83b9c2fbf4971b5
 DIST chromaprint-1.2.tar.gz 529646 SHA256 822b8949a322ac04c6f8a3ed78f5e689bcc493c6ca0972bf627c913c8430031a SHA512 dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb WHIRLPOOL b2efb45c23e950b6a4d95c078bed15b03ef35e423b106428a7607034276b343b8c223ffa71e021846ed48f535663e062ae8042d281d769a04effc9afd8a600dd
diff --git a/media-libs/chromaprint/chromaprint-0.6.ebuild b/media-libs/chromaprint/chromaprint-0.6.ebuild
deleted file mode 100644 (file)
index 1399c0c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
-SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test tools"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=virtual/ffmpeg-0.6
-       tools? ( >=media-libs/taglib-1.6 )"
-DEPEND="${RDEPEND}
-       test? ( dev-cpp/gtest )
-       tools? ( dev-libs/boost )"
-
-DOCS="NEWS.txt README.txt"
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_build tools EXAMPLES)
-               $(cmake-utils_use_build test TESTS)
-               $(cmake-utils_use_build tools)
-               -DWITH_AVFFT=ON
-               )
-
-       cmake-utils_src_configure
-}
-
-src_test() {
-       cd "${CMAKE_BUILD_DIR}" || die
-       emake check
-}
-
-src_install() {
-       cmake-utils_src_install
-       use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect
-}
diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild
deleted file mode 100644 (file)
index 062c6e0..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
-SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="test tools"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND=">=virtual/ffmpeg-0.10
-       tools? ( >=media-libs/taglib-1.6 )"
-DEPEND="${RDEPEND}
-       test? (
-               dev-cpp/gtest
-               dev-libs/boost
-       )
-       tools? ( dev-libs/boost )"
-
-DOCS="NEWS.txt README.txt"
-
-PATCHES=( "${FILESDIR}"/${P}-boost.patch
-                 "${FILESDIR}"/${P}-ffmpeg.patch
-                 "${FILESDIR}"/${P}-libav9.patch )
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_build tools EXAMPLES)
-               $(cmake-utils_use_build test TESTS)
-               $(cmake-utils_use_build tools)
-               -DWITH_AVFFT=ON
-               )
-
-       cmake-utils_src_configure
-}
-
-src_test() {
-       cd "${CMAKE_BUILD_DIR}" || die
-       emake check
-}
-
-src_install() {
-       cmake-utils_src_install
-       use tools && dobin "${CMAKE_BUILD_DIR}"/tools/fpcollect
-}
diff --git a/media-libs/chromaprint/chromaprint-1.1.ebuild b/media-libs/chromaprint/chromaprint-1.1.ebuild
deleted file mode 100644 (file)
index 80080d9..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
-HOMEPAGE="http://acoustid.org/chromaprint"
-SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-fbsd"
-IUSE="test tools"
-
-# note: use ffmpeg instead of fftw because it's recommended and required for tools
-RDEPEND="
-       >=virtual/ffmpeg-0.10
-       tools? ( >=media-libs/taglib-1.6 )"
-DEPEND="${RDEPEND}
-       test? (
-               dev-cpp/gtest
-               dev-libs/boost
-       )
-       tools? ( dev-libs/boost )"
-
-DOCS="NEWS.txt README.txt"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-0.7-ffmpeg.patch
-       "${FILESDIR}"/${P}-gtest.patch
-       "${FILESDIR}"/${P}-ffmpeg2.patch
-       "${FILESDIR}"/${P}-libav_build_fix_for_tools.patch
-)
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_build tools EXAMPLES)
-               $(cmake-utils_use_build test TESTS)
-               $(cmake-utils_use_build tools)
-               -DWITH_AVFFT=ON
-               )
-       cmake-utils_src_configure
-}
-
-src_test() {
-       cd "${BUILD_DIR}" || die
-       emake check
-}
-
-src_install() {
-       cmake-utils_src_install
-       use tools && dobin "${BUILD_DIR}"/tools/fpcollect
-}
diff --git a/media-libs/chromaprint/chromaprint-1.2-r1.ebuild b/media-libs/chromaprint/chromaprint-1.2-r1.ebuild
new file mode 100644 (file)
index 0000000..5bbc7ec
--- /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 cmake-multilib
+
+DESCRIPTION="A client-side library that implements a custom algorithm for extracting fingerprints"
+HOMEPAGE="http://acoustid.org/chromaprint"
+SRC_URI="https://bitbucket.org/acoustid/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="libav test tools"
+
+# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
+RDEPEND="
+       libav? ( >=media-video/libav-11:0=[${MULTILIB_USEDEP}] )
+       !libav? ( >=media-video/ffmpeg-2.6:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+       test? (
+               dev-cpp/gtest[${MULTILIB_USEDEP}]
+               dev-libs/boost[${MULTILIB_USEDEP}]
+       )"
+
+DOCS="NEWS.txt README.md"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               "-DBUILD_EXAMPLES=$(multilib_native_usex tools ON OFF)"
+               "-DBUILD_TESTS=$(usex test ON OFF)"
+               -DWITH_AVFFT=ON
+               )
+       cmake-utils_src_configure
+}
+
+multilib_src_test() {
+       emake check
+}
index 670ff3859c7b90323da403488be50433692467f6..c0de492549fbe569b90f24eb983195c44c09d2e0 100644 (file)
@@ -17,7 +17,7 @@ IUSE="libav test tools"
 # note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
 RDEPEND="
        libav? ( media-video/libav:0= )
-       !libav? ( media-video/ffmpeg:0= )
+       !libav? ( >=media-video/ffmpeg-2.6:0= )
 "
 DEPEND="${RDEPEND}
        test? (
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 
 DOCS="NEWS.txt README.md"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.1-gtest.patch "${FILESDIR}"/${P}-ffmpeg29.patch )
 
 src_configure() {
        local mycmakeargs=(
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-boost.patch b/media-libs/chromaprint/files/chromaprint-0.7-boost.patch
deleted file mode 100644 (file)
index 46df857..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
---- chromaprint-0.7/tests/CMakeLists.txt
-+++ chromaprint-0.7/tests/CMakeLists.txt
-@@ -1,4 +1,5 @@
- include_directories(
-+      ${Boost_INCLUDE_DIRS}
-       ${GTEST_INCLUDE_DIRS}
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src
- )
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch b/media-libs/chromaprint/files/chromaprint-0.7-ffmpeg.patch
deleted file mode 100644 (file)
index f51e779..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=435856
-https://raw.github.com/pld-linux/chromaprint/master/chromaprint-ffmpeg.patch
-
---- chromaprint-0.7/src/ext/ffmpeg_decoder.h.orig      2012-09-05 20:05:36.000000000 +0200
-+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h   2012-10-10 17:59:58.632685943 +0200
-@@ -80,7 +80,7 @@
-               avcodec_close(m_codec_ctx);
-       }
-       if (m_format_ctx) {
--              av_close_input_file(m_format_ctx);
-+              avformat_close_input(&m_format_ctx);
-       }
-       //av_audio_convert_free(m_convert_ctx);
-       av_free(m_buffer2);
-@@ -89,12 +89,12 @@
- inline bool Decoder::Open()
- {
--      if (av_open_input_file(&m_format_ctx, m_file_name.c_str(), NULL, 0, NULL) != 0) {
-+      if (avformat_open_input(&m_format_ctx, m_file_name.c_str(), NULL, NULL) != 0) {
-               m_error = "Couldn't open the file." + m_file_name;
-               return false;
-       }
--      if (av_find_stream_info(m_format_ctx) < 0) {
-+      if (avformat_find_stream_info(m_format_ctx, NULL) < 0) {
-               m_error = "Couldn't find stream information in the file.";
-               return false;
-       }
-@@ -129,11 +129,11 @@
-               return false;
-       }
--      if (m_codec_ctx->sample_fmt != SAMPLE_FMT_S16) {
-+      if (m_codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
-               m_error = "Unsupported sample format.\n";
-               return false;
-       }
--      /*m_convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, 1,
-+      /*m_convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, 1,
-                                              m_codec_ctx->sample_fmt, 1,
-                                                                                  NULL, 0);
-       if (!m_convert_ctx) {
diff --git a/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch b/media-libs/chromaprint/files/chromaprint-0.7-libav9.patch
deleted file mode 100644 (file)
index c520970..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -burN chromaprint-0.7.orig//src/fft_lib_avfft.h chromaprint-0.7/src/fft_lib_avfft.h
---- chromaprint-0.7.orig//src/fft_lib_avfft.h  2012-09-05 20:05:36.000000000 +0200
-+++ chromaprint-0.7/src/fft_lib_avfft.h        2013-02-16 17:34:08.682624779 +0100
-@@ -25,6 +25,7 @@
- extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavcodec/avfft.h>
-+#include <libavutil/mem.h>
- }
- #include "combined_buffer.h"
-diff -burN chromaprint-0.7.orig/examples/fpcalc.c chromaprint-0.7/work/chromaprint-0.7/examples/fpcalc.c
---- chromaprint-0.7.orig/examples/fpcalc.c     2012-09-05 20:05:36.000000000 +0200
-+++ chromaprint-0.7/examples/fpcalc.c  2013-02-16 17:40:09.947611629 +0100
-@@ -42,7 +42,7 @@
-               goto done;
-       }
--      if (av_find_stream_info(format_ctx) < 0) {
-+      if (avformat_find_stream_info(format_ctx, NULL) < 0) {
-               fprintf(stderr, "ERROR: couldn't find stream information in the file\n");
-               goto done;
-       }
-@@ -65,7 +65,7 @@
-               goto done;
-       }
--      if (avcodec_open(codec_ctx, codec) < 0) {
-+      if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
-               fprintf(stderr, "ERROR: couldn't open the codec\n");
-               goto done;
-       }
-diff -burN chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h chromaprint-0.7/src/ext/ffmpeg_decoder.h
---- chromaprint-0.7.orig/src/ext/ffmpeg_decoder.h      2013-02-16 17:49:06.799592088 +0100
-+++ chromaprint-0.7/src/ext/ffmpeg_decoder.h   2013-02-16 17:49:54.037590369 +0100
-@@ -124,7 +124,7 @@
-               return false;
-       }
--      if (avcodec_open(m_codec_ctx, codec) < 0) {
-+      if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) {
-               m_error = "Couldn't open the codec.";
-               return false;
-       }
diff --git a/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch b/media-libs/chromaprint/files/chromaprint-1.0-libav9.patch
deleted file mode 100644 (file)
index e816790..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- chromaprint-1.0.orig/src/ext/ffmpeg_decoder.h      2013-11-03 17:32:04.347686878 +0800
-+++ chromaprint-1.0/src/ext/ffmpeg_decoder.h   2013-11-03 17:32:41.082686494 +0800
-@@ -124,7 +124,7 @@
-               return false;
-       }
--      if (avcodec_open(m_codec_ctx, codec) < 0) {
-+      if (avcodec_open2(m_codec_ctx, codec, NULL) < 0) {
-               m_error = "Couldn't open the codec.";
-               return false;
-       }
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch b/media-libs/chromaprint/files/chromaprint-1.1-ffmpeg2.patch
deleted file mode 100644 (file)
index 2a68de3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- chromaprint-1.1/src/ext/ffmpeg_decoder.h
-+++ chromaprint-1.1/src/ext/ffmpeg_decoder.h
-@@ -28,6 +28,10 @@
- }
- #include "audio_consumer.h"
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#  define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- class Decoder
- {
- public:
diff --git a/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch b/media-libs/chromaprint/files/chromaprint-1.1-libav_build_fix_for_tools.patch
deleted file mode 100644 (file)
index b53f798..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-http://bugs.gentoo.org/498194
-http://bitbucket.org/acoustid/chromaprint/commits/90822f6eee64da2941c9cbd9cd41a9664fead1d4
-
-From 90822f6eee64da2941c9cbd9cd41a9664fead1d4 Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Sat, 28 Dec 2013 09:47:31 +0100
-Subject: [PATCH] Build fpcalc if neither HAVE_SWRESAMPLE nor HAVE_AVRESAMPLE
- defined, issue #11.
-
----
- examples/fpcalc.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/examples/fpcalc.c b/examples/fpcalc.c
-index a4b0ff9..e73e358 100644
---- a/examples/fpcalc.c
-+++ b/examples/fpcalc.c
-@@ -33,6 +33,8 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
-       SwrContext *convert_ctx = NULL;
- #elif defined(HAVE_AVRESAMPLE)
-       AVAudioResampleContext *convert_ctx = NULL;
-+#else
-+      void *convert_ctx = NULL;
- #endif
-       int max_dst_nb_samples = 0, dst_linsize = 0;
-       uint8_t *dst_data[1] = { NULL };
-@@ -75,6 +77,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
-               goto done;
-       }
-+#if defined(HAVE_SWRESAMPLE) || defined(HAVE_AVRESAMPLE)
-       if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
-               int64_t channel_layout = codec_ctx->channel_layout;
-               if (!channel_layout) {
-@@ -111,6 +114,7 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
-               }
- #endif
-       }
-+#endif
-       if (stream->duration != AV_NOPTS_VALUE) {
-               *duration = stream->time_base.num * stream->duration / stream->time_base.den;
-@@ -155,10 +159,11 @@ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name
-                                               max_dst_nb_samples = frame->nb_samples;
-                                       }
- #if defined(HAVE_SWRESAMPLE)
--                                      if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0) {
-+                                      if (swr_convert(convert_ctx, dst_data, frame->nb_samples, (const uint8_t **)frame->data, frame->nb_samples) < 0)
- #elif defined(HAVE_AVRESAMPLE)
--                                      if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0) {
-+                                      if (avresample_convert(convert_ctx, dst_data, 0, frame->nb_samples, (uint8_t **)frame->data, 0, frame->nb_samples) < 0)
- #endif
-+                                      {
-                                               fprintf(stderr, "ERROR: couldn't convert the audio\n");
-                                               goto done;
-                                       }
--- 
-1.9.rc2.211.gd198f5d
-
diff --git a/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch b/media-libs/chromaprint/files/chromaprint-1.2-ffmpeg29.patch
new file mode 100644 (file)
index 0000000..6910f24
--- /dev/null
@@ -0,0 +1,48 @@
+commit 37092d380a28abcc63fa120499030a0f2b7df80f
+Author: Rodger Combs <rodger.combs@gmail.com>
+Date:   Fri Oct 2 14:48:01 2015 -0500
+
+    fpcalc: remove uses of deprecated lavc APIs
+
+Index: chromaprint-1.2/examples/fpcalc.c
+===================================================================
+--- chromaprint-1.2.orig/examples/fpcalc.c
++++ chromaprint-1.2/examples/fpcalc.c
+@@ -17,10 +17,6 @@
+ #define MAX(a, b) ((a) > (b) ? (a) : (b))
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
+-#define avcodec_free_frame av_freep
+-#endif
+-
+ int decode_audio_file(ChromaprintContext *chromaprint_ctx, const char *file_name, int max_length, int *duration)
+ {
+       int ok = 0, remaining, length, consumed, codec_ctx_opened = 0, got_frame, stream_index;
+@@ -131,7 +127,7 @@ int decode_audio_file(ChromaprintContext
+       remaining = max_length * codec_ctx->channels * codec_ctx->sample_rate;
+       chromaprint_start(chromaprint_ctx, codec_ctx->sample_rate, codec_ctx->channels);
+-      frame = avcodec_alloc_frame();
++      frame = av_frame_alloc();
+       while (1) {
+               if (av_read_frame(format_ctx, &packet) < 0) {
+@@ -139,7 +135,7 @@ int decode_audio_file(ChromaprintContext
+               }
+               if (packet.stream_index == stream_index) {
+-                      avcodec_get_frame_defaults(frame);
++                      av_frame_unref(frame);
+                       got_frame = 0;
+                       consumed = avcodec_decode_audio4(codec_ctx, frame, &got_frame, &packet);
+@@ -196,7 +192,7 @@ finish:
+ done:
+       if (frame) {
+-              avcodec_free_frame(&frame);
++              av_frame_free(&frame);
+       }
+       if (dst_data[0]) {
+               av_freep(&dst_data[0]);
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
new file mode 100644 (file)
index 0000000..23e738f
--- /dev/null
@@ -0,0 +1 @@
+DIST kvazaar-0.7.1.tar.gz 288339 SHA256 c3693f801f0e717b1dcab3494d3e18a1687861af1a2c33b8878b2f70bcf18164 SHA512 a7d0a68e4b898f7dbb4175ab8a005d88786f522e185c1814a36a48395d34398880fc18e6baeebe4fef0ea97829e937df2ec9f547e05a9a1b2fdb74e260390e2a WHIRLPOOL ad640f5cf4c8238c7fbda3d126e1d7d37b3619a3eb000737eabf75b464fbf37cbc1de11c643725fb8cfbbfe8aa21df12d2c7b7aed0df29f7d8774256e78818a0
diff --git a/media-libs/kvazaar/kvazaar-0.7.1.ebuild b/media-libs/kvazaar/kvazaar-0.7.1.ebuild
new file mode 100644 (file)
index 0000000..50c477d
--- /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
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-r3"
+       EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit multilib multilib-minimal ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+       SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2 static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+       abi_x86_32? ( ${ASM_DEP} )
+       abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+       multilib_copy_sources
+}
+
+multilib_src_compile() {
+       emake \
+               ARCH="${CHOST%%-*}" \
+               $(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \
+               lib-shared \
+               $(usex static-libs "lib-static" "") \
+               $(multilib_is_native_abi && echo cli)
+}
+
+multilib_src_install() {
+       emake \
+               DESTDIR="${D}" \
+               PREFIX="${EPREFIX}/usr" \
+               LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+               install-pc install-lib \
+               $(usex static-libs "install-static" "") \
+               $(multilib_is_native_abi && echo install-prog)
+}
+
+multilib_src_install_all() {
+       dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
new file mode 100644 (file)
index 0000000..50c477d
--- /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
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-r3"
+       EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit multilib multilib-minimal ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+       SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_avx2 static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${P}/src"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+       abi_x86_32? ( ${ASM_DEP} )
+       abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+       multilib_copy_sources
+}
+
+multilib_src_compile() {
+       emake \
+               ARCH="${CHOST%%-*}" \
+               $(usex cpu_flags_x86_avx2 "" "KVZ_DISABLE_AVX2=true") \
+               lib-shared \
+               $(usex static-libs "lib-static" "") \
+               $(multilib_is_native_abi && echo cli)
+}
+
+multilib_src_install() {
+       emake \
+               DESTDIR="${D}" \
+               PREFIX="${EPREFIX}/usr" \
+               LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+               install-pc install-lib \
+               $(usex static-libs "install-static" "") \
+               $(multilib_is_native_abi && echo install-prog)
+}
+
+multilib_src_install_all() {
+       dodoc "${WORKDIR}/${P}/README.md" "${WORKDIR}/${P}/CREDITS" "${WORKDIR}/${P}/doc/"*.txt
+}
diff --git a/media-libs/kvazaar/metadata.xml b/media-libs/kvazaar/metadata.xml
new file mode 100644 (file)
index 0000000..c572c7d
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
index 01bb8229a27c6bdf8c0dc238cd78db0eeaf7f18e..42718be8cbd5f72e126ffffe8f97a9722b707dfb 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/libebml-1.3.3:="
index 44b6330690da0a6923128aa3f1eb9d805dbe74d4..b6ecc2508cc309cca3dfffcb61c0874e0d1af059 100644 (file)
@@ -10,7 +10,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
index 1b0c3cefe3307c0cd6ee2bccf12afc6931bd08a6..9cebda830dc5d3c066b4590167006e7e08f0dd19 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 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"
+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}]
index efc93eac9ebc2c747fe30460b65204502a2ef7ed..0b51a9ece2a7e5ff9493d8ebe458437c808f38be 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 # WARNING:
 # If you turn on the custom-cflags use flag in USE and something breaks,
 # you pick up the pieces.  Be prepared for bug reports to be marked INVALID.
index e2d2c7527eaff263ef12dde61f668cdbb0797fb1..a101fc4a06b3cdc7fa9850306f7115376426d26e 100644 (file)
@@ -13,7 +13,7 @@ HOMEPAGE="http://opencv.org"
 SRC_URI="
        mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
        https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
-       contrib? ( https://github.com/Itseez/opencv_contrib/archive/172fdb315280325a617fbb9db5ec5631acd8180e.zip -> ${PN}_contrib.zip )" # commit from 6.8.2015
+       contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
 
 LICENSE="BSD"
 SLOT="0/3.0"
@@ -103,6 +103,9 @@ src_prepare() {
                -e '/add_subdirectory(.*3rdparty.*)/ d' \
                CMakeLists.txt cmake/*cmake || die
 
+       #removing broken sample bug #558104
+       rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp
+
        java-pkg-opt-2_src_prepare
 }
 
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
new file mode 100644 (file)
index 0000000..0bd2aca
--- /dev/null
@@ -0,0 +1 @@
+DIST zimg-2.0.1.tar.gz 174318 SHA256 be2557bf944dad07edbaf37d3fd5f1911627294b8d0992a8530048e84df082d8 SHA512 213952b2e51fad2f92d989104be188ff6cdc71b0910a1201a5f772e45b1fa90f522a62e85d8725037560e4505f40958a5497d731f3d03f7b890bfdaa5d0ae13c WHIRLPOOL 4918e22cc76a613a1641aba55f5f2d652186ef84a5719d250dfb499d0c8be8c7dd688dcf95d18e93f152479fad4a8543addf5c9a149fc030f354a090e741bcbb
diff --git a/media-libs/zimg/metadata.xml b/media-libs/zimg/metadata.xml
new file mode 100644 (file)
index 0000000..c572c7d
--- /dev/null
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>video</herd>
+  <maintainer>
+    <email>media-video@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-libs/zimg/zimg-2.0.1.ebuild b/media-libs/zimg/zimg-2.0.1.ebuild
new file mode 100644 (file)
index 0000000..73b4cb9
--- /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
+
+AUTOTOOLS_AUTORECONF=yes
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-r3"
+       EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+       SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64"
+       S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+       autotools-multilib_src_configure \
+               $(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-libs/zimg/zimg-9999.ebuild b/media-libs/zimg/zimg-9999.ebuild
new file mode 100644 (file)
index 0000000..73b4cb9
--- /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
+
+AUTOTOOLS_AUTORECONF=yes
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+       SCM="git-r3"
+       EGIT_REPO_URI="https://github.com/sekrit-twc/zimg"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Scaling, colorspace conversion, and dithering library"
+HOMEPAGE="https://github.com/sekrit-twc/zimg"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+       SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64"
+       S="${WORKDIR}/${PN}-release-${PV}/"
+fi
+
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="static-libs cpu_flags_x86_sse"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+       autotools-multilib_src_configure \
+               $(use_enable cpu_flags_x86_sse x86simd)
+}
diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild b/media-sound/audacity/audacity-2.0.5-r1.ebuild
new file mode 100644 (file)
index 0000000..50f9262
--- /dev/null
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+       >=app-arch/zip-2.3
+       >=media-libs/libsndfile-1.0.0
+       dev-libs/expat
+       libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+       !libsamplerate? ( media-libs/soxr )
+       vorbis? ( >=media-libs/libvorbis-1.0 )
+       mp3? ( >=media-libs/libmad-0.14.2b )
+       flac? ( >=media-libs/flac-1.2.0[cxx] )
+       id3tag? ( media-libs/libid3tag )
+       sbsms? ( media-libs/libsbsms )
+       soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+       vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+       twolame? ( media-sound/twolame )
+       ffmpeg? ( virtual/ffmpeg )
+       alsa? ( media-libs/alsa-lib )
+       jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#      lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+       mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+       app-arch/xz-utils
+       virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+       AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+       WX_GTK_VER="2.8"
+       need-wxwidgets unicode
+
+       # * always use system libraries if possible
+       # * options listed in the order that configure --help lists them
+       # * use libsoxr if libsamplerate is not requested
+       econf \
+               --enable-unicode \
+               --enable-nyquist \
+               --disable-dynamic-loading \
+               $(use_enable ladspa) \
+               --with-libsndfile=system \
+               --with-expat=system \
+               $(use_with libsamplerate) \
+               $(use_with !libsamplerate libsoxr) \
+               $(use_with vorbis libvorbis) \
+               $(use_with mp3 libmad) \
+               $(use_with flac libflac) \
+               $(use_with id3tag libid3tag) \
+               $(use_with sbsms) \
+               $(use_with soundtouch) \
+               $(use_with vamp libvamp) \
+               $(use_with twolame libtwolame) \
+               $(use_with ffmpeg) \
+               $(use_with midi) \
+               $(use_with alsa) \
+               $(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+       emake DESTDIR="${D}" install
+
+       # Remove bad doc install
+       rm -rf "${D}"/usr/share/doc
+
+       # Install our docs
+       dodoc README.txt
+}
index e3d4ecd13cf11b5acbd09ffa2609535c95445d78..a03e5c7a4c06b21b76d5fa0610bf46774603378b 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE="iconv"
 
 RDEPEND=">=media-libs/libmpdclient-2.2
index 97a8cd4947a7dd01a58c7c7077963bde716fc665..691f47ca075b1317d408c4037feffb7c8ca76b41 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
        +fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
        lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
index 7aa3e123d7d205c6dadf8d7f224688c4ee429c0b..84b2b43f2bac6603f786315b1ff9cbbb187c4e45 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
index d2247332ee950b50d099fac4569613b4755392a1..73b5b3c0e93c8c5fdd8ff7eb96cac4f42c945c3d 100644 (file)
@@ -9,7 +9,7 @@
     <name>Tony Vroon</name>
   </maintainer>
   <maintainer>
-    <email>james.ausmus.code@gmail.com</email>
+    <email>james.ausmus@gmail.com</email>
     <name>James Ausmus</name>
   </maintainer>
   <upstream>
index f99e5d8f61bf50c99b426c4782ebb12285d489a9..5beb48a471ec741fe269ed1681048a007be9f380 100644 (file)
@@ -1,5 +1,3 @@
 DIST qjackctl-0.3.10.tar.gz 487678 SHA256 5cdd937c44e5c737f3d2c2063ada015cac2fc8ed0cdbcb90d0ba747087270132 SHA512 1d7c310967cd112aad2caa79684b40b90070e5ce78fe2fd71f0a159ff835a8ccb4806dd140237c05d369ec782965472616aca67fc649cf1ba232535dc8b3104f WHIRLPOOL 7a6cb86992d4dafc0dc43bb8587285c0a2db64649c29fb9a4236f050f89ac9df4cd1d6b7083b980a6121bb508eb98da3b48b3d4eca96d655d75bf737e107f9ab
-DIST qjackctl-0.3.11.tar.gz 487451 SHA256 944393e87d193e8b495b0878ac3726882b5dc9a8cc596666f75a093bfacb5ff2 SHA512 4fd14cd8da30d9b04b9eac32cc13a4a145c1b695b833e7d97a12fc1609b1e96faf7ce451d6f9dea4f9f664ab4a9a27c7bc5e596f3d8432e0eefdc0181d7f7167 WHIRLPOOL 5083b5e16e86bea80b564b6732b80c5d37075db0cf37f7022a21290d670a4fa6480de4b28b329e348c2676dc1bd410ffba316bf0decccdfe2b5a901c23aceb04
-DIST qjackctl-0.3.12.tar.gz 496010 SHA256 8cff21f2b249d8960ddd8749ec1fa0ed0ec316014d2cf4a8939ac33109b3db93 SHA512 5afa61f4bef986601d9ee84d4c38128847f6160c827ca22abbe70c1a5b20fbd0e914ba00e0d4e16d118fb616d71618aa72d17507170dc9ca5bac6b5a8a2aa5a9 WHIRLPOOL a6fd4b5eeceec4d731fd9d9058ec462b8c247e8a5e62a0ec7ae93204dd4f05c62386b8cfea0082862fc5948420a14bb502353f0d50b9e9f54cc073af54a01e8d
-DIST qjackctl-0.3.13.tar.gz 498208 SHA256 11e0041ff38ac46df466968bd5e0e33986f76b7f099bd75a66fbf2a07c1b1295 SHA512 1e515783eea4cd628ee0195b9d711b2d1d5a2651f8a9c1c6077de06055053129019be0657b12bd01238ba7d39e38fd06a361128187ac32d52c16fe873bd50dea WHIRLPOOL abb926b3a06bd5e7e90a3dd6ab3a30b4387b61a2b58c34d04f66b078a634f45e4275e8526a7d020f3d958296299e416479761caa3455758c1d2c68785be6f5ae
 DIST qjackctl-0.4.0.tar.gz 500534 SHA256 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a SHA512 dff5d6bd153cc92149e7a16820ab061f70090eca7a15f8f79ac7b9316e7c279f61e800cfbfc7ec4ce0a13721e717f9f18b98611c22c2a134830111c865d3d001 WHIRLPOOL ae607775d75825355d405b6b3e41ae25793b4a698735d847c9617e6af2eef8dd73cf4ed104e7941c1d014ebeb02d48d128cb363241898ab9ffcb5752ae59464e
+DIST qjackctl-0.4.1.tar.gz 824293 SHA256 98024e1ea9f55ac16c290feda051d6494b2261e83f6a918f0fa583b509e2bfd1 SHA512 99de2de422a82a1dbc26dd2d2548afd31a50dc650f2dbe177a26edfe3808a2f66a2206120535edaec8314f3ef25b2dfe6fadfdfb11b814ffe311185c68252881 WHIRLPOOL bfe04a75ba323fd2cf7c8e715ba9a0623bcaadcc47ad74f387aff381036c77d8fec269bfa341783e17a4580fda8f652fa30f52deeb61c857eed817588ab21367
diff --git a/media-sound/qjackctl/qjackctl-0.3.11.ebuild b/media-sound/qjackctl/qjackctl-0.3.11.ebuild
deleted file mode 100644 (file)
index bb1c6ae..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-       >=media-sound/jack-audio-connection-kit-0.109.2
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4
-       alsa? ( media-libs/alsa-lib )
-       dbus? ( dev-qt/qtdbus:4 )
-       portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
-
-src_configure() {
-       econf \
-               $(use_enable alsa alsa-seq) \
-               $(use_enable dbus) \
-               $(use_enable debug) \
-               $(use_enable portaudio)
-
-       # Emulate what the Makefile does, so that we can get the correct
-       # compiler used.
-       eqmake4 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-       emake -f ${PN}.mak
-       lupdate ${PN}.pro || die "lupdate failed"
-}
diff --git a/media-sound/qjackctl/qjackctl-0.3.12.ebuild b/media-sound/qjackctl/qjackctl-0.3.12.ebuild
deleted file mode 100644 (file)
index bb1c6ae..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-       >=media-sound/jack-audio-connection-kit-0.109.2
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4
-       alsa? ( media-libs/alsa-lib )
-       dbus? ( dev-qt/qtdbus:4 )
-       portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
-
-src_configure() {
-       econf \
-               $(use_enable alsa alsa-seq) \
-               $(use_enable dbus) \
-               $(use_enable debug) \
-               $(use_enable portaudio)
-
-       # Emulate what the Makefile does, so that we can get the correct
-       # compiler used.
-       eqmake4 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-       emake -f ${PN}.mak
-       lupdate ${PN}.pro || die "lupdate failed"
-}
similarity index 68%
rename from media-sound/qjackctl/qjackctl-0.3.13.ebuild
rename to media-sound/qjackctl/qjackctl-0.4.1-r1.ebuild
index 9e4eede6137e3af0bb65e18b6316d76917c419aa..0306d52e9d92948aec549232206e11f6d96d4816 100644 (file)
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
-inherit qt4-r2
+inherit qmake-utils
 
 DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
 HOMEPAGE="http://qjackctl.sourceforge.net/"
@@ -14,12 +14,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="alsa dbus debug portaudio"
+IUSE="alsa dbus debug portaudio +qt5"
 
 RDEPEND="
        >=media-sound/jack-audio-connection-kit-0.109.2
-       dev-qt/qtcore:4
-       dev-qt/qtgui:4
+       qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
+       !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
        alsa? ( media-libs/alsa-lib )
        dbus? ( dev-qt/qtdbus:4 )
        portaudio? ( media-libs/portaudio )"
@@ -29,6 +29,8 @@ DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
 
 src_configure() {
        econf \
+               $(use_with !qt5 qt4 "$(qt4_get_bindir)/..") \
+               $(use_with qt5 qt5 "$(qt5_get_bindir)/..") \
                $(use_enable alsa alsa-seq) \
                $(use_enable dbus) \
                $(use_enable debug) \
@@ -36,10 +38,13 @@ src_configure() {
 
        # Emulate what the Makefile does, so that we can get the correct
        # compiler used.
-       eqmake4 ${PN}.pro -o ${PN}.mak
+       if use qt5 ; then
+               eqmake5 ${PN}.pro -o ${PN}.mak
+       else
+               eqmake4 ${PN}.pro -o ${PN}.mak
+       fi
 }
 
 src_compile() {
        emake -f ${PN}.mak
-       lupdate ${PN}.pro || die "lupdate failed"
 }
index 1b9dec92ae1038c8cd53d14ba1d289c68f89ffb6..8e0bc3c94cd2855ef4f9eab6bf7262f989df6b5f 100644 (file)
@@ -2,4 +2,3 @@ DIST ffmpeg-2.6.3.tar.bz2 7803314 SHA256 59eb98c1b5896ac29abc0385f7c875d1b4942d6
 DIST ffmpeg-2.6.4.tar.bz2 7811925 SHA256 184f49e6b359426c398ad6c67d89abd362558373a43d3d92f86e554571655a5d SHA512 76c8bb3b23f2d2bac73b1561ef31bb3d1da49b2e182d84a13bf0bf49ea84cd0d64566c9dfafc4ac9d660aa4cecc0f08272b9ee284d1d09776e4599b87920c308 WHIRLPOOL 2d68715fb284979d703905919289c897c5cb002c3d466aca6c9759ca9f93443b749a24747cf218d005d728680ad137990880ec99210b6fb49038587966dd79f4
 DIST ffmpeg-2.7.2.tar.bz2 8157217 SHA256 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 SHA512 cce58c63ae14dcbd3bdc4758af8427e18ac589f8bd4f2701e54b5e0e61669d5aab212e5829feb67a0fd33bc52b2d64adff93729c0696c44a0f6064a0752433dd WHIRLPOOL dd286393427b89be266ad2b122138dab578843d16bdf9b989b9546734f489c8c5c3d1ab0443ff5039b440a8430802ffe24f0fc38553688ec80984a1cce2ba2a3
 DIST ffmpeg-2.8.1.tar.bz2 8564488 SHA256 e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 SHA512 5c493f1eb84dd916f12a709a77ca0317a03ce88caaa1ee5e06b4e03c60ef4520ba58c8972841de25dcadb0da42e88592e6a87c3aca18dba62e246256c33fcf91 WHIRLPOOL f0f26375960dff80055fe257b63f11a1cc598bef9450d0da4a619bfc61ba6df185ea0dcf9c566810c7917159bb193d30a1009051c5b32ea1d746b289c782b8aa
-DIST ffmpeg-2.8.tar.bz2 8563832 SHA256 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8 SHA512 d642317954aeb66cc1ca19d3605561cb8b95bbb308fc1064e693a71842cea2ac94f82144e52cdb389ca00e7e55cbd0bae252df858f50a085f3b1189f36418911 WHIRLPOOL 98a9b3f0bc8aefac50fd812dcd4da4c846d086d3e07ab522582c859d710c6dce6b382a2f8e8da6ddd3885685c935486e5f5b1b0f68f4a8987c4424cf086824e1
diff --git a/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild b/media-video/ffmpeg/ffmpeg-2.8-r1.ebuild
deleted file mode 100644 (file)
index 6f3904f..0000000
+++ /dev/null
@@ -1,455 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=54.56.56
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-2"
-       EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-       SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-       SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-       !gpl? ( LGPL-2.1 )
-       gpl? ( GPL-2 )
-       amr? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       encode? (
-               aac? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-               amrenc? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-       )
-       samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-               +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
-               +hardcoded-tables +iconv lzma +network openssl +postproc
-               samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
-               xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-               # libavdevice options
-               cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-               opengl
-               # indevs
-               libv4l:libv4l2 pulseaudio:libpulse
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
-               modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
-               schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
-               libass truetype:libfreetype
-               # libswresample options
-               libsoxr
-               # Threads; we only support pthread for now but ffmpeg supports more
-               +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-       aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
-       aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora
-       twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265
-       xvid:libxvid
-)
-
-IUSE="
-       alsa +encode examples jack libressl oss pic static-libs test v4l
-       ${FFMPEG_FLAG_MAP[@]%:*}
-       ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
-MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-       bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-       bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-       encode? (
-               aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-               aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-               amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-               faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-               mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
-               theora? (
-                       >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-                       >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-               )
-               twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-               wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-               webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-               x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-               x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-               xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-       )
-       fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-       flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-       fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-       frei0r? ( media-plugins/frei0r-plugins )
-       fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-       gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-       gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-       iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-       iec61883? (
-               >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-       )
-       ieee1394? (
-               >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-       )
-       jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-       jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-       libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-       libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-       modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-       openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? (
-               !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-               libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-       )
-       opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-       librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-       schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-       sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-       vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-       vorbis? (
-               >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       )
-       vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-       !media-video/qt-faststart
-       postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-       >=sys-devel/make-3.81
-       doc? ( app-text/texi2html )
-       fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-       libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-       librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       test? ( net-misc/wget sys-devel/bc )
-       truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-       postproc? ( gpl )
-       frei0r? ( gpl )
-       cdio? ( gpl )
-       samba? ( gpl )
-       zvbi? ( gpl )
-       encode? (
-               x264? ( gpl )
-               x265? ( gpl )
-               xvid? ( gpl )
-               X? ( !xcb? ( gpl ) )
-       )
-"
-REQUIRED_USE="
-       libv4l? ( v4l )
-       fftools_cws2fws? ( zlib )
-       test? ( encode )
-       ${GPL_REQUIRED_USE}
-       ${CPU_REQUIRED_USE}"
-RESTRICT="
-       encode? ( faac? ( bindist ) aacplus? ( bindist ) )
-       gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       epatch_user
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl && use gpl && myconf+=( --enable-nonfree )
-       use samba && myconf+=( --enable-version3 )
-
-       # Encoders
-       if use encode ; then
-               ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-               # Licensing.
-               if use aac || use amrenc ; then
-                       myconf+=( --enable-version3 )
-               fi
-               if use aacplus || use faac ; then
-                       myconf+=( --enable-nonfree )
-               fi
-       else
-               myconf+=( --disable-encoders )
-       fi
-
-       # Indevs
-       use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-       for i in alsa oss jack ; do
-               use ${i} || myconf+=( --disable-indev=${i} )
-       done
-       use xcb || ffuse+=( X:x11grab )
-
-       # Outdevs
-       for i in alsa oss sdl ; do
-               use ${i} || myconf+=( --disable-outdev=${i} )
-       done
-
-       # Decoders
-       use amr && myconf+=( --enable-version3 )
-       use fdk && use gpl && myconf+=( --enable-nonfree )
-
-       for i in "${ffuse[@]#+}" ; do
-               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-       done
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       done
-
-       if use pic ; then
-               myconf+=( --enable-pic )
-               # disable asm code if PIC is required
-               # as the provided asm decidedly is not PIC for x86.
-               [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-       fi
-       [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-       # Try to get cpu type based on CFLAGS.
-       # Bug #172723
-       # We need to do this so that features of that CPU will be better used
-       # If they contain an unknown CPU it will not hurt since ffmpeg's configure
-       # will just ignore it.
-       for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
-               [[ ${i} = native ]] && i="host" # bug #273421
-               myconf+=( --cpu=${i} )
-               break
-       done
-
-       # Mandatory configuration
-       myconf=(
-               --enable-avfilter
-               --enable-avresample
-               --disable-stripping
-               "${myconf[@]}"
-       )
-
-       # cross compile support
-       if tc-is-cross-compiler ; then
-               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-               case ${CHOST} in
-                       *freebsd*)
-                               myconf+=( --target-os=freebsd )
-                               ;;
-                       mingw32*)
-                               myconf+=( --target-os=mingw32 )
-                               ;;
-                       *linux*)
-                               myconf+=( --target-os=linux )
-                               ;;
-               esac
-       fi
-
-       set -- "${S}/configure" \
-               --prefix="${EPREFIX}/usr" \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-               --mandir="${EPREFIX}/usr/share/man" \
-               --enable-shared \
-               --cc="$(tc-getCC)" \
-               --cxx="$(tc-getCXX)" \
-               --ar="$(tc-getAR)" \
-               --optflags=" " \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-       echo "${@}"
-       "${@}" || die
-}
-
-multilib_src_compile() {
-       emake V=1
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               emake V=1 tools/${i}
-                       fi
-               done
-       fi
-}
-
-multilib_src_install() {
-       emake V=1 DESTDIR="${D}" install install-man
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               dobin tools/${i}
-                       fi
-               done
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-       [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-       use doc && dohtml -r doc/*
-       if use examples ; then
-               dodoc -r doc/examples
-               docompress -x /usr/share/doc/${PF}/examples
-       fi
-}
-
-multilib_src_test() {
-       LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-               emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-2.8.ebuild b/media-video/ffmpeg/ffmpeg-2.8.ebuild
deleted file mode 100644 (file)
index 36041cf..0000000
+++ /dev/null
@@ -1,452 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=54.56.56
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SCM="git-2"
-       EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-       SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-       SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-       SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-       !gpl? ( LGPL-2.1 )
-       gpl? ( GPL-2 )
-       amr? (
-               gpl? ( GPL-3 )
-               !gpl? ( LGPL-3 )
-       )
-       encode? (
-               aac? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-               amrenc? (
-                       gpl? ( GPL-3 )
-                       !gpl? ( LGPL-3 )
-               )
-       )
-       samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-               +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
-               +hardcoded-tables +iconv lzma +network openssl +postproc
-               samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
-               xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-               # libavdevice options
-               cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-               opengl
-               # indevs
-               libv4l:libv4l2 pulseaudio:libpulse
-               # decoders
-               amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-               jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
-               modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
-               schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
-               zvbi:libzvbi
-               # libavfilter options
-               bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
-               libass truetype:libfreetype
-               # libswresample options
-               libsoxr
-               # Threads; we only support pthread for now but ffmpeg supports more
-               +threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-       aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
-       aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora
-       twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265
-       xvid:libxvid
-)
-
-IUSE="
-       alsa +encode examples jack oss pic static-libs test v4l
-       ${FFMPEG_FLAG_MAP[@]%:*}
-       ${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
-MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-       cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-       cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-       cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-       cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-       cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-       cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-       cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-       cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-       cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-       cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-       cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-       cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-       cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-       ${ARM_CPU_FEATURES[@]%:*}
-       ${MIPS_CPU_FEATURES[@]%:*}
-       ${PPC_CPU_FEATURES[@]%:*}
-       ${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-       ${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-       arm:ARM
-       arm64:ARM
-       mips:MIPS
-       ppc:PPC
-       ppc64:PPC
-       x86:X86
-       amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-       alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-       bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
-       bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-       bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-       cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-       celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-       encode? (
-               aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
-               aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
-               amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-               faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
-               mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-               snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
-               theora? (
-                       >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-                       >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-               )
-               twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-               wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-               webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
-               x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-               x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-               xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-       )
-       fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-       flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-       fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-       frei0r? ( media-plugins/frei0r-plugins )
-       fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-       gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-       gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
-       gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-       iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-       iec61883? (
-               >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-               >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-       )
-       ieee1394? (
-               >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-               >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-       )
-       jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
-       jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
-       libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
-       libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-       libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-       libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-       lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-       modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-       openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-       opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-       openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-       opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
-       librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-       samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-       schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-       sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
-       speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-       truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-       vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-       vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-       vorbis? (
-               >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       )
-       vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-       X? (
-               >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               !xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-       )
-       xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-       !media-video/qt-faststart
-       postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-       >=sys-devel/make-3.81
-       doc? ( app-text/texi2html )
-       fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-       libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-       librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       test? ( net-misc/wget sys-devel/bc )
-       truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
-       v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-       postproc? ( gpl )
-       frei0r? ( gpl )
-       cdio? ( gpl )
-       samba? ( gpl )
-       zvbi? ( gpl )
-       encode? (
-               x264? ( gpl )
-               x265? ( gpl )
-               xvid? ( gpl )
-               X? ( !xcb? ( gpl ) )
-       )
-"
-REQUIRED_USE="
-       libv4l? ( v4l )
-       fftools_cws2fws? ( zlib )
-       test? ( encode )
-       ${GPL_REQUIRED_USE}
-       ${CPU_REQUIRED_USE}"
-RESTRICT="
-       encode? ( faac? ( bindist ) aacplus? ( bindist ) )
-       gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-       if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-               export revision=git-N-${FFMPEG_REVISION}
-       fi
-       epatch_user
-}
-
-multilib_src_configure() {
-       local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-       local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-       use openssl && use gpl && myconf+=( --enable-nonfree )
-       use samba && myconf+=( --enable-version3 )
-
-       # Encoders
-       if use encode ; then
-               ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-               # Licensing.
-               if use aac || use amrenc ; then
-                       myconf+=( --enable-version3 )
-               fi
-               if use aacplus || use faac ; then
-                       myconf+=( --enable-nonfree )
-               fi
-       else
-               myconf+=( --disable-encoders )
-       fi
-
-       # Indevs
-       use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-       for i in alsa oss jack ; do
-               use ${i} || myconf+=( --disable-indev=${i} )
-       done
-       use xcb || ffuse+=( X:x11grab )
-
-       # Outdevs
-       for i in alsa oss sdl ; do
-               use ${i} || myconf+=( --disable-outdev=${i} )
-       done
-
-       # Decoders
-       use amr && myconf+=( --enable-version3 )
-       use fdk && use gpl && myconf+=( --enable-nonfree )
-
-       for i in "${ffuse[@]#+}" ; do
-               myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-       done
-
-       # (temporarily) disable non-multilib deps
-       if ! multilib_is_native_abi; then
-               for i in frei0r ; do
-                       myconf+=( --disable-${i} )
-               done
-       fi
-
-       # CPU features
-       for i in ${CPU_FEATURES_MAP} ; do
-               if [ "$(tc-arch)" = "${i%:*}" ] ; then
-                       local var="${i#*:}_CPU_FEATURES[@]"
-                       for j in ${!var} ; do
-                               use ${j%:*} || myconf+=( --disable-${j#*:} )
-                       done
-               fi
-       done
-
-       if use pic ; then
-               myconf+=( --enable-pic )
-               # disable asm code if PIC is required
-               # as the provided asm decidedly is not PIC for x86.
-               [[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-       fi
-       [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-       # Try to get cpu type based on CFLAGS.
-       # Bug #172723
-       # We need to do this so that features of that CPU will be better used
-       # If they contain an unknown CPU it will not hurt since ffmpeg's configure
-       # will just ignore it.
-       for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
-               [[ ${i} = native ]] && i="host" # bug #273421
-               myconf+=( --cpu=${i} )
-               break
-       done
-
-       # Mandatory configuration
-       myconf=(
-               --enable-avfilter
-               --enable-avresample
-               --disable-stripping
-               "${myconf[@]}"
-       )
-
-       # cross compile support
-       if tc-is-cross-compiler ; then
-               myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
-               case ${CHOST} in
-                       *freebsd*)
-                               myconf+=( --target-os=freebsd )
-                               ;;
-                       mingw32*)
-                               myconf+=( --target-os=mingw32 )
-                               ;;
-                       *linux*)
-                               myconf+=( --target-os=linux )
-                               ;;
-               esac
-       fi
-
-       set -- "${S}/configure" \
-               --prefix="${EPREFIX}/usr" \
-               --libdir="${EPREFIX}/usr/$(get_libdir)" \
-               --shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-               --mandir="${EPREFIX}/usr/share/man" \
-               --enable-shared \
-               --cc="$(tc-getCC)" \
-               --cxx="$(tc-getCXX)" \
-               --ar="$(tc-getAR)" \
-               --optflags=" " \
-               $(use_enable static-libs static) \
-               "${myconf[@]}"
-       echo "${@}"
-       "${@}" || die
-}
-
-multilib_src_compile() {
-       emake V=1
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               emake V=1 tools/${i}
-                       fi
-               done
-       fi
-}
-
-multilib_src_install() {
-       emake V=1 DESTDIR="${D}" install install-man
-
-       if multilib_is_native_abi; then
-               for i in "${FFTOOLS[@]}" ; do
-                       if use fftools_${i} ; then
-                               dobin tools/${i}
-                       fi
-               done
-       fi
-}
-
-multilib_src_install_all() {
-       dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-       [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-       use doc && dohtml -r doc/*
-       if use examples ; then
-               dodoc -r doc/examples
-               docompress -x /usr/share/doc/${PF}/examples
-       fi
-}
-
-multilib_src_test() {
-       LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-               emake V=1 fate
-}
index 14e3a3a9c7f7ddcf8fc4b4b3fc1a79ce854b5db7..5f63b0cebb5a30915e9a31f1b62a8322ffc8aa8f 100644 (file)
@@ -79,8 +79,9 @@ FFMPEG_FLAG_MAP=(
                schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
                zvbi:libzvbi
                # libavfilter options
-               bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
-               libass truetype:libfreetype rubberband:librubberband
+               bs2b:libbs2b chromaprint flite:libflite frei0r fribidi:libfribidi
+               fontconfig ladspa libass truetype:libfreetype rubberband:librubberband
+               zimg:libzimg
                # libswresample options
                libsoxr
                # Threads; we only support pthread for now but ffmpeg supports more
@@ -90,9 +91,9 @@ FFMPEG_FLAG_MAP=(
 # Same as above but for encoders, i.e. they do something only with USE=encode.
 FFMPEG_ENCODER_FLAG_MAP=(
        aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
-       aacplus:libaacplus faac:libfaac nvenc:nvenc openh264:libopenh264
-       snappy:libsnappy theora:libtheora twolame:libtwolame wavpack:libwavpack
-       webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+       aacplus:libaacplus faac:libfaac kvazaar:libkvazaar nvenc:nvenc
+       openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
+       wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
 )
 
 IUSE="
@@ -106,7 +107,7 @@ IUSE="
 ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
 MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
 PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
 X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
 X86_CPU_REQUIRED_USE="
        cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
@@ -114,6 +115,7 @@ X86_CPU_REQUIRED_USE="
        cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
        cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
        cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+       cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
        cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
        cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
        cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
@@ -159,11 +161,13 @@ RDEPEND="
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
        celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+       chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
        encode? (
                aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
                aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
                amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
                faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+               kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
                mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
                nvenc? ( >=media-video/nvenc-5 )
                openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
@@ -236,6 +240,7 @@ RDEPEND="
                >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
        )
        xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+       zimg? ( media-libs/zimg[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
        zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
        !media-video/qt-faststart
index d9a078ddb6c656b60333df224443746abf4c8d33..53adfacfd2d3c32677b5710c2c600edfdc143888 100644 (file)
@@ -17,6 +17,7 @@
        <flag name="bs2b">Enables <pkg>media-libs/libbs2b</pkg> based Bauer stereo-to-binaural filter.</flag>
        <flag name="cdio">Enables audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
        <flag name="celt">Adds Xiph CELT audio decoding support via <pkg>media-libs/celt</pkg></flag>
+       <flag name="chromaprint">Enables audio fingerprinting support with <pkg>media-libs/chromaprint</pkg>.</flag>
        <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
        <flag name="faac">Use external faac library for AAC encoding</flag>
        <flag name="fdk">Use external fdk-aac library for AAC encoding</flag>
@@ -27,6 +28,7 @@
        <flag name="gpl">Build GPL code. Should be enabled unless you require LGPL binaries.</flag>
        <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
        <flag name="iec61883"> Support for FireWire DV/HDV input device using <pkg>media-libs/libiec61883</pkg>.</flag>
+       <flag name="kvazaar">Enables <pkg>media-libs/kvazaar</pkg> based HEVC encoder.</flag>
        <flag name="librtmp">Enables Real Time Messaging Protocol using librtmp (<pkg>media-video/rtmpdump</pkg>) in addition to FFmpeg's native implementation.</flag>
        <flag name="libsoxr">Enables audio resampling through <pkg>media-libs/soxr</pkg>.</flag>
        <flag name="libv4l">Uses <pkg>media-libs/libv4l</pkg> for video4linux instead of direct calls. Adds support for more devices via the userspace library.</flag>
@@ -49,6 +51,7 @@
        <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
        <flag name="webp">Enables WebP encoding with <pkg>media-libs/libwebp</pkg>.</flag>
        <flag name="x265">Enables HEVC encoding with <pkg>media-libs/x265</pkg>.</flag>
+       <flag name="zimg">Enables <pkg>media-libs/zimg</pkg> based scale filter.</flag>
        <flag name="zvbi">Enables <pkg>media-libs/zvbi</pkg> based teletext decoder.</flag>
   </use>
 </pkgmetadata>
index 97412a9fc65db267cee32650f8a205264c1f5acc..970106079f5d0ca978524d5c740ede9025e11a5e 100644 (file)
@@ -1 +1 @@
-DIST 2ping-3.0.0.tar.gz 37263 SHA256 8a8f071ea87414a5a7b8503ee75529e81b04f4d6251f96f3ead2140998a10c31 SHA512 d3de3af124d926df4adcc1b937669bfec2dc1552958bfd72544e86fb6d189fa03885af40036cc4e5177da18e694ff3a349e20e87f82d740e924333108e637ef7 WHIRLPOOL 7562c4520c0c2ef656550eb8cfb479a1c415f6b525e5bcaad5d7ab2c056e6d52bb541bd9d9d451321deec962977a083e7384e6a4cbf797c5ec8892017446376c
+DIST 2ping-3.0.1.tar.gz 39752 SHA256 d6997cd1680151e6f7d5e60137d45cd41bf385d26029878afdaaf5dc4f63dcc4 SHA512 c5e8b26591a51bc3410db2ab572b17d6fddbce8f25c8cbfb4eb23cb738b28b12dae1cc395d26987e84191039193853178dffb748b1f951661e319ac2d5c053db WHIRLPOOL 1f90e57a5e5e6788cc832335213fa3c93d029b2bb82837e322dc65b41c1b2dbfe7aa824e38e1595f3378b2ea2978604915404351866cac245276beedef6cbf39
index de07ceb2906913145aa3131f793192ac780f34f0..94d556222984a3a80ed90920994d2e7f62e463a2 100644 (file)
@@ -1,2 +1,2 @@
 DIST argus-3.0.8.1.tar.gz 523375 SHA256 1fb921104c8bd843fb9f5a1c32b57b20bfe8cd8a103b3f1d9bb686b9e6c490a4 SHA512 d96332849df7ce2297aa0d81a9f22c12763d04b2936ffaffc0e4b1942535846cfbc41dadf28791eb88d1ffd0429bdc280d16dff44369c415c713064849b158f7 WHIRLPOOL 2c9495d585c2297b3f9951e74a8fd28840941be6b298c0178d44801242d1abda4bd08f9469e2dd1a4b802735611c9ff82bc028d838628b1ccb184ba80d5dc529
-DIST argus-3.0.8.tar.gz 1193140 SHA256 335d889d288763487ad3545c09b944d7d6aa2538630d1fd72eea3704a57bf6e3 SHA512 e4211bb09f442f4dc5c210b878d0f5a9527ff9c95030570e20520f2ca5c3053cc603aa3f0c4aad33363fee6ce02c3d5262bbfdecd2e2157dc00a34f333f14232 WHIRLPOOL 0a07f7f2e57bf7082af0d1ec203463cf0bedf0b682db89ae484e2162bb79f24b084a7c3d30da447d998885458444bc3799bb401c86e1a2b2dc6a7643127da0c9
+DIST argus-3.0.8.2.rc.2.tar.gz 525053 SHA256 a499154248fd32d0809599b78e5078353a97edbbf595ad48701c9646c2c5515f SHA512 c8272ae80f66114a4a83c365d9257d90ffe944cb648112ba9d756ad235d3d7231d09fe9de2dc31f2d72d5070e3e932b8de49661371806c5e1b21d7aea0aad3b1 WHIRLPOOL 80fc3d7c0c96fee1243903119a3d3d6391da6b42e0c3610b817d205d65776f6df93bd99e7a8900d3422dab48a75da5839efd4284cb6abada7bef6989534138b6
index b6ea865f2e6c28f971eec7a3d91ad33e2a227d06..6b6ba91deb030170768a4b063370a89afbfa2a08 100644 (file)
@@ -11,7 +11,7 @@ SRC_URI="http://qosient.com/argus/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
similarity index 85%
rename from net-analyzer/argus/argus-3.0.8.ebuild
rename to net-analyzer/argus/argus-3.0.8.2_rc2.ebuild
index 1010dcf1d59185c730faa59e8e072449bae8da86..e767e08860de83480a9c9665964af3b2369aeb50 100644 (file)
@@ -7,11 +7,11 @@ inherit autotools eutils user
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/src/${P}.tar.gz"
+SRC_URI="${HOMEPAGE}dev/${P/_rc/.rc.}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug sasl tcpd"
 
 RDEPEND="
@@ -27,7 +27,10 @@ DEPEND="
        >=sys-devel/flex-2.4.6
 "
 
+S=${WORKDIR}/${P/_rc/.rc.}
+
 src_prepare() {
+       find . -type f -execdir chmod +w {} \; #561360
        sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \
                -i argus/argus.c \
                -i support/Config/argus.conf \
@@ -39,7 +42,7 @@ src_prepare() {
                -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \
                        -i support/Config/argus.conf || die
        epatch \
-               "${FILESDIR}"/${PN}-3.0.4-disable-tcp-wrappers-automagic.patch \
+               "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \
                "${FILESDIR}"/${PN}-3.0.5-Makefile.patch \
                "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch
        eautoreconf
diff --git a/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus/files/argus-3.0.4-disable-tcp-wrappers-automagic.patch
deleted file mode 100644 (file)
index 77bde43..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -270,6 +270,11 @@
-    LIBS="$LIBS $V_PCAPDEP"
- fi
-+AC_ARG_WITH(wrappers,
-+   [  --with-wrappers         build with libwrappers suuport],
-+   with_wrappers="$withval",
-+   with_wrappers="yes")
-+if test "x$with_wrappers" != "xno"; then
- AC_QOSIENT_TCPWRAP(V_WRAPDEP, V_INCLS)
- if test ! -z "$V_WRAPDEP"; then
-    if test -f $V_WRAPDEP; then
-@@ -293,6 +298,7 @@
-    AC_DEFINE([HAVE_TCP_WRAPPER], [], [Using Tcp wrappers])
-    WRAPLIBS="$V_WRAPDEP"
- fi
-+fi
- AC_CHECK_FUNCS(xdrmem_create)
- if test "$ac_cv_func_xdrmem_create" = yes; then
index 8f1219fb881d171efaf5a09aa25b523a7b8c2cfb..a85d6a4b8e4d1740bd70bbfc7f28479aa0cf625d 100644 (file)
@@ -22,7 +22,10 @@ KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
 IUSE="gnome sqlite X"
 
 RDEPEND="
-       dev-python/dnspython[${PYTHON_USEDEP}]
+       || (
+               dev-python/dnspython:0[${PYTHON_USEDEP}]
+               virtual/dnspython[${PYTHON_USEDEP}]
+               )
        >=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
        gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
        X? (
index 7b9129b92e6ba2409433a860453462251449b3b9..bf7f343fbf468450ad053e54441885823fb7b48e 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$
 
@@ -22,7 +22,7 @@ KEYWORDS=""
 IUSE="gnome sqlite X"
 
 RDEPEND="
-       dev-python/dnspython[${PYTHON_USEDEP}]
+       virtual/dnspython[${PYTHON_USEDEP}]
        gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
        X? (
                dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
similarity index 87%
rename from net-analyzer/namebench/namebench-1.3.1-r1.ebuild
rename to net-analyzer/namebench/namebench-1.3.1-r2.ebuild
index c64b8e5f0338a93a612acd4d1363a5b970ed396c..b840a5e1117ef5d2358cb95ce8311758e7803758 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$
 
@@ -20,11 +20,12 @@ IUSE="X"
 # PYTHON_REQ_USE does not support X? ( tk ) syntax yet
 DEPEND="X? ( $(python_gen_cond_dep dev-lang/python:2.7[tk] python2_7) )"
 RDEPEND="${DEPEND}
-       >=dev-python/dnspython-1.8.0[${PYTHON_USEDEP}]
        >=dev-python/httplib2-0.6[${PYTHON_USEDEP}]
        >=dev-python/graphy-1.0[${PYTHON_USEDEP}]
        >=dev-python/jinja-2.2.1[${PYTHON_USEDEP}]
-       >=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]"
+       >=dev-python/simplejson-2.1.2[${PYTHON_USEDEP}]
+       virtual/dnspython[${PYTHON_USEDEP}]
+"
 
 python_prepare_all() {
        # don't include bundled libraries
index 12a9db3055358f0c1a4530c0e854d8bd07c1c021..8249714625ca7f62da0b71e404c8a9e314731669 100644 (file)
@@ -3,8 +3,9 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
+<flag name='geoipv2'>Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
 <flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
 <flag name='mongodb'>Add support for mongodb backend</flag>
-<flag name='ulog'>Enable ULOG support</flag>
+<flag name='ulog'>Enable support for ULOG in older kernels (deprecated)</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
new file mode 100644 (file)
index 0000000..e44303f
--- /dev/null
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A network tool to gather IP traffic information"
+HOMEPAGE="http://www.pmacct.net/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="64bit debug geoip geoipv2 ipv6 mongodb mysql postgres sqlite threads ulog"
+REQUIRED_USE="
+       ?? ( geoip geoipv2 )
+"
+
+RDEPEND="
+       net-libs/libpcap
+       geoip? ( dev-libs/geoip )
+       geoipv2? ( dev-libs/libmaxminddb )
+       mongodb? (
+               >=dev-libs/mongo-c-driver-0.8.1-r1
+               <dev-libs/mongo-c-driver-0.98
+       )
+       mysql? ( virtual/mysql )
+       postgres? ( dev-db/postgresql:* )
+       sqlite? ( =dev-db/sqlite-3* )
+"
+DEPEND="
+       ${RDEPEND}
+       virtual/pkgconfig
+"
+
+S="${WORKDIR}/pmacct-daily"
+
+DOCS=(
+       CONFIG-KEYS ChangeLog FAQS KNOWN-BUGS QUICKSTART README TODO TOOLS UPGRADE
+       docs/INTERNALS docs/PLUGINS docs/SIGNALS
+)
+
+src_configure() {
+       tc-export CC AR RANLIB
+
+       econf \
+               $(use_enable 64bit) \
+               $(use_enable debug) \
+               $(use_enable geoip) \
+               $(use_enable geoipv2) \
+               $(use_enable ipv6) \
+               $(use_enable mongodb) \
+               $(use_enable mysql) \
+               $(use_enable postgres pgsql) \
+               $(use_enable sqlite sqlite3) \
+               $(use_enable threads) \
+               $(use_enable ulog) \
+               $(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+               $(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
+               --disable-debug
+}
+
+src_install() {
+       default
+
+       for dirname in examples sql; do
+               docinto ${dirname}
+               dodoc -r ${dirname}/*
+       done
+
+       newinitd "${FILESDIR}"/pmacctd-init.d pmacctd
+       newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd
+
+       insinto /etc/pmacctd
+       newins examples/pmacctd-imt.conf.example pmacctd.conf
+}
index 975427865860e6551c634cba11c23d7f65bd763d..4eccaea7705e4d20fcf1ad49b91e66e3875b34f6 100644 (file)
@@ -1,3 +1,3 @@
 DIST wireshark-1.12.7.tar.bz2 29202490 SHA256 c74a1c14e72ce0f198a93d832e71742c7f312cbbe719e5def9ecef176860f92c SHA512 a4012fa56e8b99e5fb072c1fb82c783a547395ddb013a9473858fdf9fa99270313d6059f9ee210d56c00f420bbad9cab30bdd3c45e9ff07d4f5967c18d1d0f38 WHIRLPOOL 84c60871fb1d8022885108c97323a892bc9ee035fc421e1e96b76819291337e8d0026be6c77e62f03582fb854188535e5fceb50eb17830f5b1a3ff69b3474d4c
 DIST wireshark-1.12.8.tar.bz2 29216939 SHA256 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 SHA512 24ad130d9d0718e610f7def2a08e976871205032b4b4b5269c3ae54894c4121fa3b21a0bc6e45e9c2a41119f5553416d5c452dadf7b02f17e7803511d33809f5 WHIRLPOOL ede6a80e914c4694df9ef6753b65af09c7efadb7d6e3c193fa30871de9e673dac8f7a1f185c3b6ca0a316601d720e141dbe817af2a3a930ec870a75f67cde5a9
-DIST wireshark-2.0.0rc1.tar.bz2 30779877 SHA256 a201938913f770cb1f022165574d312b66b97efaa6ad7a9c90daf325f7806582 SHA512 95b1995a1d6684ab8a0a93c86cd1101c9df6ee1f6d0c76d663ec32396d3ad10d4765b598c19a068bd95994ac6568060c64461a3de58d1d582ebec8f953e868f9 WHIRLPOOL a64cd0be0a145e461c9c2e4b7e495f30a72521ef0069809b1bf5da048c2e75e08516eef49eff838e328fb8aad91c41c5814f3986af1641270ae6495d3b9647a6
+DIST wireshark-2.0.0rc2.tar.bz2 30838572 SHA256 b1d2139bd1e1b008337546059beece59e24387e7b96c3d691203f0ce1881b6c8 SHA512 120bad8bd75c37dc1b12f3878aee68669843f779b6f440e07f106faa354ba5a5b436d8076d9f8e68508c5f23e92e0e30c8e4ce094bca0954cad6502eb24f5451 WHIRLPOOL de476509e20ca457a7ea06e31f3e8708f085e6c7e584a91d88a81f5a6b43249fa612b5e01d464a18356b91da238dcb66d5529c8826277d0d1e2ba117a0d48eee
index 005802d7a12b285ae64b5ae3a8d4d898904942cc..39c94cb6f8febf740ed5135c34bac9ebd06bb090 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 ~x86"
 
 IUSE="scp shadow static-libs"
 
similarity index 90%
rename from net-dns/hash-slinger/hash-slinger-2.6.ebuild
rename to net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
index e3045b354142a02ec78dd4a98513ccb98278ff0a..8fb61bfb181d02157037e81708781aa3d61aa473 100644 (file)
@@ -5,6 +5,7 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
+
 inherit python-r1
 
 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
@@ -16,26 +17,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ipsec +openpgp +ssh"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 DEPEND=""
 RDEPEND="
        ${PYTHON_DEPS}
-       dev-python/dnspython[$PYTHON_USEDEP]
        dev-python/ipaddr[$PYTHON_USEDEP]
        dev-python/m2crypto[$PYTHON_USEDEP]
        net-dns/unbound[python,$PYTHON_USEDEP]
+       virtual/dnspython[$PYTHON_USEDEP]
        ipsec? ( net-misc/libreswan[dnssec] )
        openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
        ssh? ( net-misc/openssh )
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 src_install() {
        local tools
        tools="tlsa"
-       use ssh         && tools+=" sshfp"
+       use ssh && tools+=" sshfp"
        use openpgp && tools+=" openpgpkey"
-       use ipsec       && tools+=" ipseckey"
+       use ipsec && tools+=" ipseckey"
        for tool in $tools ; do
                doman ${tool}.1
                python_foreach_impl python_doscript ${tool}
index 4b0698ebfd3684894b9a879bc5f814c3a308bdb8..064d3c9a70327a3d1cd0a8fb00835a7b9eb88f06 100644 (file)
@@ -6,8 +6,8 @@
                <name>Marc Schiffbauer</name>
        </maintainer>
        <use>
-               <flag name='ipsec'>Enable support for IPSECKEY records (ipseckey)</flag>
-               <flag name='openpgp'>Enable support for OPENPGPKEY records (openpgpkey)</flag>
-               <flag name='ssh'>Enable support for SSHFP records (sshfp)</flag>
+               <flag name="ipsec">Enable support for IPSECKEY records (ipseckey)</flag>
+               <flag name="openpgp">Enable support for OPENPGPKEY records (openpgpkey)</flag>
+               <flag name="ssh">Enable support for SSHFP records (sshfp)</flag>
        </use>
 </pkgmetadata>
index e8f5cc43b3f57bd6572d26251c1b9167bc2675b7..94476e896b196d26ed841ebb7c28a69f69b08bcb 100644 (file)
@@ -3,10 +3,10 @@
 <pkgmetadata>
        <herd>proxy-maintainers</herd>
        <maintainer>
-                <email>influencedchaos@gmail.com</email>
-                <name>Francis Booth</name>
-                <description>Active Maintainer, Assign bugs</description>
-        </maintainer>
+               <email>boothfsec@gmail.com</email>
+               <name>Francis Booth</name>
+               <description>Active Maintainer, Assign bugs</description>
+       </maintainer>
        <longdescription lang="en">
                no-ip.com dynamic DNS updater
        </longdescription>
index 8b1bce7efec2ccf69e9f627d1e1bbe1894cf2d54..cc8a621efcdaf5f3e3f22b71ffffcbef4ea8aa3d 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>proxy-maintainers</herd>
        <maintainer>
-               <email>itumaykin@gmail.com</email>
+               <email>itumaykin+gentoo@gmail.com</email>
                <name>Coacher</name>
        </maintainer>
        <use>
similarity index 94%
rename from net-im/err/err-1.7.1.ebuild
rename to net-im/err/err-1.7.1-r1.ebuild
index 6e0d11ad0d8d6cc54c375be7037d08ee6f0c70ab..d48befef4a52ebbcf4d48b97d08e03003bb831e2 100644 (file)
@@ -1,29 +1,31 @@
-# 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=( python2_7 )
+
 inherit distutils-r1 eutils user
 
 DESCRIPTION="Plugin based XMPP chatbot designed to be easily deployable, extensible and maintainable"
 HOMEPAGE="https://gbin.github.com/err/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="irc qt4 +plugins"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]
+RDEPEND="
        dev-python/flask[${PYTHON_USEDEP}]
        dev-python/jinja[${PYTHON_USEDEP}]
        dev-python/pyfire[${PYTHON_USEDEP}]
        dev-python/python-daemon[${PYTHON_USEDEP}]
        dev-python/xmpppy
        dev-python/yapsy[${PYTHON_USEDEP}]
+       virtual/dnspython[${PYTHON_USEDEP}]
        irc? (
                dev-python/pyopenssl[${PYTHON_USEDEP}]
                dev-python/twisted-core[${PYTHON_USEDEP}]
index a579898f86f1720bb01b53453930871a803da4d7..075fcdc881efa287cb8d4299bb4d2c33b08c6de7 100644 (file)
@@ -1,3 +1 @@
-DIST gajim-0.16.3.tar.bz2 4596437 SHA256 a1c85879cb43f80a5a4ece91c5571012bb08c3878b28105db246599e1c4c4515 SHA512 815275c0abbc18ff7309a4142186952f4d46acedeb29c14ab90ab4e60935d427248eedcf6392cf6f197b24928763a58c0a52ccdfb112f28e9c9c727c3f3e45c9 WHIRLPOOL f6f7098ae5098d7f3ade834773002aa62a53d6e43a2c52d07cc1bad29e9b83741a616f1e50953063c060881f1d5a3e8cef87ea2ac0b0f667ee9b330bd995f827
 DIST gajim-0.16.4.tar.bz2 4593307 SHA256 2116ad3a5635c54b575ff53eed72fe4651fc50582f5094bfc6113d1cf0d1ce7f SHA512 e8c046aa711207d71080c83d4827400392354eaadb4b431a474fcd94d56bb0fac9f163606a6f7e8abd68c7509158f8e8101b0cc2ecb439443e2966deb707bfdb WHIRLPOOL c6a496f9c02fabbaf76b52e930e5d79f6fad2557e8b458654c538c82041b8ba65bb6f8d75f18438fbabb8aa0e52493494a5847833cc49b70444720b15d6d86a5
-DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be
diff --git a/net-im/gajim/gajim-0.16.3.ebuild b/net-im/gajim/gajim-0.16.3.ebuild
deleted file mode 100644 (file)
index edf6fd6..0000000
+++ /dev/null
@@ -1,127 +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="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-       http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#      test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}
-       libnotify? ( dbus )
-       avahi? ( dbus )
-       gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-       ${PYTHON_DEPS}
-       dev-python/pygtk:2[${PYTHON_USEDEP}]
-       x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-       >=dev-util/intltool-0.40.1
-       virtual/pkgconfig
-       >=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-       dev-python/pyasn1[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-       >=dev-python/python-nbxmpp-0.5.3[${PYTHON_USEDEP}]
-       crypt? (
-               app-crypt/gnupg
-               dev-python/pycrypto[${PYTHON_USEDEP}]
-               )
-       dbus? (
-               dev-python/dbus-python[${PYTHON_USEDEP}]
-               dev-libs/dbus-glib
-               libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-               avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-               )
-       gnome? (
-               dev-python/libgnome-python[${PYTHON_USEDEP}]
-               dev-python/egg-python[${PYTHON_USEDEP}]
-               )
-       gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-       idle? ( x11-libs/libXScrnSaver )
-       jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-       kde? ( kde-apps/kwalletmanager )
-       networkmanager? (
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-                       net-misc/networkmanager
-               )
-       spell? ( app-text/gtkspell:2 )
-       srv? (
-               || (
-                       dev-python/libasyncns-python[${PYTHON_USEDEP}]
-                       net-dns/bind-tools
-                       )
-               )
-       xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-0.16-desktop.patch
-       )
-
-src_prepare() {
-       autotools-utils_src_prepare
-       python_copy_sources
-}
-
-src_configure() {
-       configuration() {
-               local myeconfargs=(
-                       $(use_enable nls)
-                       $(use_with X x)
-                       --docdir="/usr/share/doc/${PF}"
-                       --libdir="$(python_get_sitedir)"
-                       --enable-site-packages
-               )
-               run_in_build_dir autotools-utils_src_configure
-       }
-       python_foreach_impl configuration
-}
-
-src_compile() {
-       compilation() {
-               run_in_build_dir autotools-utils_src_compile
-       }
-       python_foreach_impl compilation
-}
-
-src_test() {
-       testing() {
-               run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-       }
-       python_foreach_impl testing
-}
-
-src_install() {
-       installation() {
-               run_in_build_dir autotools-utils_src_install
-               python_optimize
-       }
-       python_foreach_impl installation
-
-       rm "${ED}/usr/share/doc/${PF}/README.html" || die
-       dohtml README.html
-}
index 5e8935f1dbdfc3fa6efbf2307f530dc1f709998c..aa4a0739e03828cf031b545cf18c243a9a06ad7e 100644 (file)
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
 
 REQUIRED_USE="
diff --git a/net-im/gajim/gajim-0.16.ebuild b/net-im/gajim/gajim-0.16.ebuild
deleted file mode 100644 (file)
index 3734230..0000000
+++ /dev/null
@@ -1,124 +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="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-       http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#      test? ( https://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}
-       libnotify? ( dbus )
-       avahi? ( dbus )
-       gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-       ${PYTHON_DEPS}
-       dev-python/pygtk:2[${PYTHON_USEDEP}]
-       x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-       >=dev-util/intltool-0.40.1
-       virtual/pkgconfig
-       >=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-       dev-python/pyasn1[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-       >=dev-python/python-nbxmpp-0.5.1[${PYTHON_USEDEP}]
-       crypt? (
-               app-crypt/gnupg
-               dev-python/pycrypto[${PYTHON_USEDEP}]
-               )
-       dbus? (
-               dev-python/dbus-python[${PYTHON_USEDEP}]
-               dev-libs/dbus-glib
-               libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-               avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-               )
-       gnome? (
-               dev-python/libgnome-python[${PYTHON_USEDEP}]
-               dev-python/egg-python[${PYTHON_USEDEP}]
-               )
-       gnome-keyring? ( dev-python/gnome-keyring-python[${PYTHON_USEDEP}] )
-       idle? ( x11-libs/libXScrnSaver )
-       jingle? ( net-libs/farstream:0.1[python,${PYTHON_USEDEP}] )
-       kde? ( kde-apps/kwalletmanager )
-       networkmanager? (
-                       dev-python/dbus-python[${PYTHON_USEDEP}]
-                       net-misc/networkmanager
-               )
-       spell? ( app-text/gtkspell:2 )
-       srv? (
-               || (
-                       dev-python/libasyncns-python[${PYTHON_USEDEP}]
-                       net-dns/bind-tools )
-               )
-       xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
-
-src_prepare() {
-       autotools-utils_src_prepare
-       python_copy_sources
-}
-
-src_configure() {
-       configuration() {
-               local myeconfargs=(
-                       $(use_enable nls)
-                       $(use_with X x)
-                       --docdir="/usr/share/doc/${PF}"
-                       --libdir="$(python_get_sitedir)"
-                       --enable-site-packages
-               )
-               run_in_build_dir autotools-utils_src_configure
-       }
-       python_foreach_impl configuration
-}
-
-src_compile() {
-       compilation() {
-               run_in_build_dir autotools-utils_src_compile
-       }
-       python_foreach_impl compilation
-}
-
-src_test() {
-       testing() {
-               run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-       }
-       python_foreach_impl testing
-}
-
-src_install() {
-       installation() {
-               run_in_build_dir autotools-utils_src_install
-               python_optimize
-       }
-       python_foreach_impl installation
-
-       rm "${ED}/usr/share/doc/${PF}/README.html" || die
-       dohtml README.html
-}
index b5c4fa80eac03f8a85e7a67819d93bab5e0420ec..dab353663b62c08c03bd0bb92dc3e0fa0e38456e 100644 (file)
@@ -11,7 +11,7 @@ HOMEPAGE="http://ninja.qoop.org/"
 SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
 IUSE="ncurses ipv6 ssl"
 
 RESTRICT="test"
index 0d1ca871ed6106d7eee77ecf96c869f121b800b1..2ae1c5e0846053475191e96741abfb5cfc844a23 100644 (file)
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
index 01f972513a506a0f60900005f1ff4c11ea662343..065a355811fb182a1ec9acbcf5ce4a8594c93718 100644 (file)
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-mail/mailman/mailman-2.1.20-r1.ebuild b/net-mail/mailman/mailman-2.1.20-r1.ebuild
new file mode 100644 (file)
index 0000000..41ffb9e
--- /dev/null
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib systemd user
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
+HOMEPAGE="http://www.list.org/"
+S="${WORKDIR}/${P/_p/-}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="selinux"
+
+DEPEND="
+       virtual/mta
+       virtual/cron
+       virtual/httpd-cgi
+       virtual/dnspython[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+       selinux? ( sec-policy/selinux-mailman )
+"
+
+pkg_setup() {
+       python-single-r1_pkg_setup
+       INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
+       VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
+       CGIUID=${MAILMAN_CGIUID:-apache}
+       CGIGID=${MAILMAN_CGIGID:-apache}
+       MAILUSR=${MAILMAN_MAILUSR:-mailman}
+       MAILUID=${MAILMAN_MAILUID:-280}
+       MAILGRP=${MAILMAN_MAILGRP:-mailman}
+       MAILGID=${MAILMAN_MAILGID:-280}
+
+       # Bug #58526: switch to enew{group,user}.
+       # need to add mailman here for compile process.
+       # Duplicated at pkg_postinst() for binary install.
+       enewgroup ${MAILGRP} ${MAILGID}
+       enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
+       epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
+}
+
+src_configure() {
+       econf \
+               --without-permcheck \
+               --prefix="${INSTALLDIR}" \
+               --with-mail-gid=${MAILGID} \
+               --with-cgi-gid=${CGIGID} \
+               --with-cgi-ext="${MAILMAN_CGIEXT}" \
+               --with-var-prefix="${VAR_PREFIX}" \
+               --with-username=${MAILUSR} \
+               --with-groupname=${MAILGRP} \
+               --with-python="${PYTHON}"
+}
+
+src_install () {
+       emake "DESTDIR=${D}" doinstall
+
+       insinto /etc/apache2/modules.d
+       newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
+       sed \
+               -e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
+               -e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
+               -e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
+               -i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
+
+       newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
+
+       dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
+               contrib/README.check_perms_grsecurity contrib/virtusertable
+
+       exeinto ${INSTALLDIR}/bin
+       doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+               contrib/mm-handler*
+
+       dodir /etc/mailman
+       mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
+       dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
+
+       # Save the old config for updates from pre-2.1.9-r2
+       # To be removed some distant day
+       for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
+               if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
+                       cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
+               fi
+       done
+
+       newinitd "${FILESDIR}/mailman.rc" mailman
+       cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
+       sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
+       systemd_dounit "${T}/mailman.service"
+
+       keepdir ${VAR_PREFIX}/logs
+       keepdir ${VAR_PREFIX}/locks
+       keepdir ${VAR_PREFIX}/spam
+       keepdir ${VAR_PREFIX}/archives/public
+       keepdir ${VAR_PREFIX}/archives/private
+       keepdir ${VAR_PREFIX}/lists
+       keepdir ${VAR_PREFIX}/qfiles
+
+       chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
+       chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
+       chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
+               "${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
+       chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
+       chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
+       chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
+
+       python_optimize ${INSTALLDIR}/bin/ ${INSTALLDIR}/Mailman \
+               ${INSTALLDIR}/Mailman/*/
+}
+
+pkg_postinst() {
+       enewgroup ${MAILGRP} ${MAILGID}
+       enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
+       echo
+       elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
+       elog "Setup information, mailman will NOT run unless you follow"
+       elog "those instructions!"
+       echo
+
+       elog "An example Mailman configuration file for Apache has been installed into:"
+       elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+       echo
+       elog "To enable, you will need to add \"-D MAILMAN\" to"
+       elog "/etc/conf.d/apache2."
+       echo
+
+       ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
+       ewarn "mailman with the following variables:"
+       ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
+       ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
+       ewarn "MAILMAN_CGIUID (default: apache)"
+       ewarn "MAILMAN_CGIGID (default: apache)"
+       ewarn "MAILMAN_CGIEXT (default: empty)"
+       ewarn "MAILMAN_MAILUSR (default: mailman)"
+       ewarn "MAILMAN_MAILUID (default: 280)"
+       ewarn "MAILMAN_MAILGRP (default: mailman)"
+       ewarn "MAILMAN_MAILGID (default: 280)"
+       ewarn
+       ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
+       ewarn
+       ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
+       ewarn "NEED to make a few manual updates to your system:"
+       ewarn
+       ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
+       ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
+       ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
+       ewarn
+       ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
+       ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
+       ewarn "archives/ directory to the new location, ensuring that the"
+       ewarn "permissions is correct.  See bug #208789 for a discussion."
+}
index 56d61cde04006ebc9110ba01e4da2a6ead42421d..33a25bc5f07d7ade85770377abf98fb3071085dc 100644 (file)
@@ -20,7 +20,10 @@ IUSE="selinux"
 DEPEND="virtual/mta
        virtual/cron
        virtual/httpd-cgi
-       dev-python/dnspython"
+       || (
+               dev-python/dnspython:0
+               virtual/dnspython
+       )"
 RDEPEND="${DEPEND}
        selinux? ( sec-policy/selinux-mailman )
 "
index ecf041c4c119b1453ac58e8f9b0d65cd9654aab4..e63c85a14139d248e4c5c4bc758bb8ec7478cf72 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
index dcc0ab64b22a90b3c653809e3a7634fd27a8dd36..a02b806820184a821275c4352467e4c9153f0742 100644 (file)
@@ -39,7 +39,6 @@ REQUIRED_USE="
 
 RDEPEND="
        dev-python/setuptools[${PYTHON_USEDEP}]
-       dev-python/dnspython[${PYTHON_USEDEP}]
        dev-python/ecdsa[${PYTHON_USEDEP}]
        dev-python/pbkdf2[${PYTHON_USEDEP}]
        dev-python/pyasn1[${PYTHON_USEDEP}]
@@ -51,6 +50,7 @@ RDEPEND="
        dev-python/socksipy[${PYTHON_USEDEP}]
        dev-python/tlslite[${PYTHON_USEDEP}]
        dev-libs/protobuf[python,${PYTHON_USEDEP}]
+       virtual/dnspython[${PYTHON_USEDEP}]
        qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
        gtk3? (
                dev-python/pygobject:3[${PYTHON_USEDEP}]
index 610c62e1351f2d91d1f1284d73027fe39c777811..7f347f631bf5bc4743fa69eed9a74d8d5715b7cb 100644 (file)
                <name>Emery Hemingway</name>
        </maintainer>
        <use>
-               <flag name='cli'>Enables the CLI interface</flag>
-               <flag name='cosign'>Enable plugin to support multisig wallets between multiple Electrum clients</flag>
-               <flag name='email'>Enable plugin to support emailing invoices</flag>
-               <flag name='fiat'>Enable plugin for looking up fiat values of bitcoin</flag>
-               <flag name='greenaddress_it'>Enable plugin to verify GreenAddress.it instant transactions</flag>
-               <flag name='gtk3'>Enable support for gtk+3</flag>
-               <flag name='qrcode'>Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
-               <flag name='sync'>Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
-               <flag name='trustedcoin_com'>Enable plugin to use two-factor service by TrustedCoin.com</flag>
-               <flag name='vkb'>Enable plugin for virtual keyboard</flag>
+               <flag name="cli">Enables the CLI interface</flag>
+               <flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
+               <flag name="email">Enable plugin to support emailing invoices</flag>
+               <flag name="fiat">Enable plugin for looking up fiat values of bitcoin</flag>
+               <flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
+               <flag name="gtk3">Enable support for gtk+3</flag>
+               <flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+               <flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
+               <flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
+               <flag name="vkb">Enable plugin for virtual keyboard</flag>
        </use>
 </pkgmetadata>
index a07e1da46b1a4ebeb5b706f12c765078dac1260a..d4d02bcdabba0a7113f67dd6cf4bb35da61dda77 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <herd>proxy-maintainers</herd>
        <maintainer>
-               <email>jan.breuer@jaybee.cz</email>
+               <email>honza.breuer@gmail.com</email>
                <name>Jan Breuer</name>
        </maintainer>
        <use>
index 0baeef4b3423d737b718f05f05b066471edc1a02..83185b999bbbd37bff4074bdb712e98b5c826409 100644 (file)
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>ljakab@ac.upc.edu</email>
-    <name>Loránd Jakab</name>
+    <email>lorand.jakab@schweiz.ch</email>
+    <name>Lorand Jakab</name>
   </maintainer>
   <maintainer>
     <email>mmokrejs@gmail.com</email>
index 6ce83a61e9ac8d359ac15020a2163fad67737180..9c840a9953d8c6fb5e4b61dc0e41f88c314406a3 100644 (file)
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="YDSLA"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 DEPEND=""
 RDEPEND="sys-libs/zlib"
index 7610ef908faa7345d5e93796eede6870f751f820..b305f4d1c3df457e10e22f0f38a9f13150a439ad 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~sparc ~x86"
 
 IUSE="ldap"
 
index 3737c26eb2827229e30669321d4a3f7877e256ef..286ec96e8777e8189c5a65766bea8ef8f05b4f6c 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 arm hppa ~mips ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~x86"
 IUSE="cups debug +obex +readline selinux systemd test +udev"
 
 CDEPEND="
index 8e4054baf698a739e8929bc793394ead323c0f22..59a4b52bb25765df42fd71a9d9aac6f90ddaa091 100644 (file)
@@ -7,11 +7,6 @@
 # HPPA has no NUMA support in the kernel
 numa
 
-# Julian Ospald <hasufell@gentoo.org> (20 Sep 2015)
-# no LibreSSL support yet
-curl_ssl_libressl
-libressl
-
 # Jeroen Roovers <jer@gentoo.org> (3 Feb 2015)
 # app-misc/geoclue has not been tested on HPPA
 geoclue
index 42415f28a687ad78ced37f8cca23a11c5a30e2f1..6421c9f3ed4c26e962d447ac54177ccb577993f5 100644 (file)
@@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Patrice Clement <monsieurp@gentoo.org> (30 Oct 2015)
+# Requires dependencies that are not stable on sparc yet.
+# See https://qa-reports.gentoo.org/output/gentoo-ci/7182f7a/5.html#l2294
+mail-mta/postfix
+
 # Raúl Porcel <armin76@gentoo.org> (17 Nov 2014)
 # Mask sys-devel/kgcc64 since >=gcc-4.4 can build 64bit kernels
 sys-devel/kgcc64
index e958abfc83871d64cced1f4daa5c2808ed86a34f..20235c59b89b75316474fe2ba1ddd88a9a1630aa 100644 (file)
@@ -152,10 +152,6 @@ www-apps/venus test
 # dev-java/sun-j2me-bin is going away.
 dev-java/proguard j2me
 
-# Christoph Junghans <ottxor@gentoo.org> (03 Apr 2015)
-# >=~sys-devel/dragonegg-3.6 is broken (bug #543644)
-sys-devel/byfl dragonegg
-
 # Lars Wendler <polynomial-c@gentoo.org> (19 Mar 2015)
 # >=games-strategy/freeciv-2.5.0 requires >=dev-lang/lua-5.2
 # No stable qt5 yet.
diff --git a/profiles/default/linux/uclibc/mips/packages.build b/profiles/default/linux/uclibc/mips/packages.build
new file mode 100644 (file)
index 0000000..8b4519b
--- /dev/null
@@ -0,0 +1,5 @@
+# Copyright 1999-2014 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+dev-libs/libintl
index e385613ad06005d0fd60e274a23127b66779a7be..7bc8b26873ee57c32f7624c1cff98ed4bdd60ff8 100644 (file)
@@ -1,3 +1,4 @@
 DIST rebase-1508.tar.xz 69944352 SHA256 579ef686b0efea32d88633f85411da9c1396572eec0d20bd163ca7bf615c7b04 SHA512 d5dc9eb704ce28ab7951ab2a8781de76dcbd7a4b6d6c6634abcd36766c8dce77b6d8a712789fe6293a6ddc66cd9103e17121b0ff52f0d3fbabfc5bf47c2f2100 WHIRLPOOL f082a3096cef636a61a176d3d3fe5b993bc83e3b332d134ebc20201d21f2f66e3400ffc5d561018c63fb3201c5fc0862126a32c17c5c96f118859b62a618d341
 DIST rebase-1509.tar.xz 81228428 SHA256 ffad3955197850b4383bf7b96278af357cb99bec129e7a00d7d601e76868870b SHA512 2d9f90c24ab977b29a1e1e790966f48274691375ab5f4b7a4f37c1e62dc8bd4d0b4409475e9b97bb63e3f481066f8407efc4d1314ee24c836f60b53d736d77ed WHIRLPOOL ab86576f037d142a285f3830f88e5b750a52f79c90f35bd117695a5de125c753747329522b1f514c503ff7e28e8aaaa2298bff3379f134db06fc270ec7364a52
 DIST rebase-1510.tar.xz 90412200 SHA256 0a33a34003c95f65d8ec8bbf11907bccad47d0bdddc39030a663df5ef2922f87 SHA512 c76b42df5a5bc64a951693b35a8664195a0fb1b84bdd64f80e8986a705ca1279e51c324153a83272ecb9b3dfb3fd565cb43c2b25c9e37655767c278e6320590e WHIRLPOOL 238841844c19ad028147a4a5a366a219e405b1ae1d0ae79767775518a0ecdabe37948a260724e4053af183ad00799c60da21d57dae84cdc6859e19a04aac314a
+DIST rebase-1511.tar.xz 95276416 SHA256 e8b0686ad02d15d833febf5f353cb66febfccb730fb7e92968b05739d8d4a494 SHA512 b7998763a092389be8d5eb4b9c59a7297859d4f03be6a4c3933288d5407fe1b64268d6fb03b7df0604ad0801991937ee345c2f932c9621ea7bab4d68c9c59261 WHIRLPOOL 53ce94b77fb5b1557b790bad48064066833f6800ebef29a33f80e3fa6b8dbf0666443dc0301521e88d4e9f38579011edc37979f12b95cd84ea8afb07f7e8ffc7
diff --git a/sci-biology/rebase/rebase-1511.ebuild b/sci-biology/rebase/rebase-1511.ebuild
new file mode 100644 (file)
index 0000000..1bfa8ba
--- /dev/null
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PV=${PV#1}
+
+DESCRIPTION="A restriction enzyme database"
+HOMEPAGE="http://rebase.neb.com"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emboss minimal"
+
+RDEPEND="emboss? ( >=sci-biology/emboss-5.0.0 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="binchecks strip"
+
+src_compile() {
+       if use emboss; then
+               echo; einfo "Indexing Rebase for usage with EMBOSS."
+               mkdir REBASE || die
+               EMBOSS_DATA="." rebaseextract -auto -infile withrefm.${MY_PV} \
+                               -protofile proto.${MY_PV} -equivalences \
+                               || die "Indexing Rebase failed."
+               echo
+       fi
+}
+
+src_install() {
+       if ! use minimal; then
+               insinto /usr/share/${PN}
+               doins withrefm.${MY_PV} proto.${MY_PV}
+       fi
+       newdoc REBASE.DOC README
+       if use emboss; then
+               insinto /usr/share/EMBOSS/data/REBASE
+               doins REBASE/embossre.{enz,ref,sup}
+               insinto /usr/share/EMBOSS/data
+               doins REBASE/embossre.equ
+       fi
+}
index 636bc656d7185cd3bd8031335e5318bc4ce81086..9fbd8c44898000cde8c3adf0f100496dac09e660 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI="http://gts.sourceforge.net/tarballs/${MYP}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 RDEPEND="dev-libs/glib:2"
index 9cead3b0979ada9d025000d6b9fcc6fef82703bd..880b00c664894b44ade1821412004bd7b9b79587 100644 (file)
@@ -1,3 +1 @@
-DIST itpp-4.2.tar.bz2 1050157 SHA256 732c7de212dddfd8669ef3e4d164d5d9a2f81302f3921ddd0176cfa8c49c556c SHA512 319296c5d929201fcdfb32ad59b3304d3620d921c1d08feb1d138fecb37305f71f825b4fc45d563ba817eb6ac92fb9223c32d4260013ef1d30a2e1e8edf52a2f WHIRLPOOL 4af9e5326b9a94013c173d650ac5c92105e21731ef6398e707808219831158bd995060a860d31d6874a56b96123bb5e646600f45ee6f4fb185d3e9c1b349ddc7
-DIST itpp-4.3.0.tar.bz2 1196432 SHA256 009b38929eef60be12abd6f516da535d9ea01872cd4b8ec537cfe40311ad5f64 SHA512 e2ad944cdb1325676465920d692577f86885252f9e9eb068084b0edaca17dffd33793e5c502572c21f77b47f8d8f45522ea6a945eb5548553305ab23904a04fa WHIRLPOOL 87a823313363806e894297f23b20bb0cdc11e72cf3388d25cf57c27820793f7c5c41e4a593a954dc431d2f473052defc5bedbdc9e547830d5ceb54f31cb0e6b0
 DIST itpp-4.3.1.tar.bz2 1289687 SHA256 50717621c5dfb5ed22f8492f8af32b17776e6e06641dfe3a3a8f82c8d353b877 SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd WHIRLPOOL e4791babcdb9e874a29b8f628af000e93fc316a7da0199713e7b840317d1b1109e4350c7582a3f88db3fe8be03ff8ee93b40712b77f61faa155acc668f39c0e0
diff --git a/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch b/sci-libs/itpp/files/itpp-4.0.6-gcc44.patch
deleted file mode 100644 (file)
index 6514363..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur itpp-4.0.6.orig/itpp/base/timing.cpp itpp-4.0.6/itpp/base/timing.cpp
---- itpp-4.0.6.orig/itpp/base/timing.cpp       2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/base/timing.cpp    2009-07-30 10:32:45.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
-+#include <cstdio>
-+
- #ifndef _MSC_VER
- #  include <itpp/config.h>
- #else
-diff -ur itpp-4.0.6.orig/itpp/base/vec.cpp itpp-4.0.6/itpp/base/vec.cpp
---- itpp-4.0.6.orig/itpp/base/vec.cpp  2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/base/vec.cpp       2009-07-30 10:35:45.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
-+#include <cstdio>
-+
- #include <itpp/base/vec.h>
- #include <itpp/base/converters.h>
- #include <limits>
-diff -ur itpp-4.0.6.orig/itpp/fixed/cfix.cpp itpp-4.0.6/itpp/fixed/cfix.cpp
---- itpp-4.0.6.orig/itpp/fixed/cfix.cpp        2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/cfix.cpp     2009-07-30 10:37:21.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
-+#include <cstdio>
-+
- #include <itpp/fixed/cfix.h>
- #include <itpp/base/itassert.h>
- #include <iostream>
-diff -ur itpp-4.0.6.orig/itpp/fixed/fix.cpp itpp-4.0.6/itpp/fixed/fix.cpp
---- itpp-4.0.6.orig/itpp/fixed/fix.cpp 2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/fix.cpp      2009-07-30 10:37:39.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
-+#include <cstdio>
-+
- #include <itpp/fixed/fix.h>
- #include <itpp/base/itassert.h>
- #include <iostream>
-diff -ur itpp-4.0.6.orig/itpp/fixed/fixed.cpp itpp-4.0.6/itpp/fixed/fixed.cpp
---- itpp-4.0.6.orig/itpp/fixed/fixed.cpp       2008-10-08 14:52:24.000000000 +0300
-+++ itpp-4.0.6/itpp/fixed/fixed.cpp    2009-07-30 10:37:03.000000000 +0300
-@@ -27,6 +27,8 @@
-  * -------------------------------------------------------------------------
-  */
-+#include <cstdio>
-+
- #include <itpp/fixed/fixed.h>
diff --git a/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch b/sci-libs/itpp/files/itpp-4.0.7-fastica-fix-endless-loop.patch
deleted file mode 100644 (file)
index 8d232a4..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ru libitpp-4.0.7/itpp/signal/fastica.cpp libitpp-4.0.7.patched/itpp/signal/fastica.cpp
---- libitpp-4.0.7/itpp/signal/fastica.cpp      2009-12-27 01:38:47.000000000 +0100
-+++ libitpp-4.0.7.patched/itpp/signal/fastica.cpp      2010-07-08 16:32:04.000000000 +0200
-@@ -90,7 +90,7 @@
- static mat mpower(const mat A, const double y);
- static ivec getSamples(const int max, const double percentage);
- static vec sumcol(const mat A);
--static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W);
-+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W);
- /*! @} */
- namespace itpp
-@@ -124,7 +124,7 @@
- }
- // Call main function
--void Fast_ICA::separate(void)
-+bool Fast_ICA::separate(void)
- {
-   int Dim = numOfIC;
-@@ -159,13 +159,14 @@
-   }
-+  bool result = true; 
-   if (PCAonly == false) {
-     Dim = whitesig.rows();
-     if (numOfIC > Dim) numOfIC = Dim;
--    fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-+    result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-     icasig = W * mixedSig;
-@@ -174,6 +175,7 @@
-   else { // PCA only : returns E as IcaSig
-     icasig = VecPr;
-   }
-+  return result; 
- }
- void Fast_ICA::set_approach(int in_approach) { approach = in_approach; if (approach == FICA_APPROACH_DEFL) finetune = true; }
-@@ -437,7 +439,7 @@
- }
--static void fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W)
-+static bool fpica(const mat X, const mat whiteningMatrix, const mat dewhiteningMatrix, const int approach, const int numOfIC, const int g, const int finetune, const double a1, const double a2, double myy, const int stabilization, const double epsilon, const int maxNumIterations, const int maxFinetune, const int initState, mat guess, double sampleSize, mat & A, mat & W)
- {
-   int vectorSize = X.rows();
-@@ -511,7 +513,7 @@
-         A = dewhiteningMatrix * B;
-         W = transpose(B) * whiteningMatrix;
--        return;
-+        return false;
-       }
-       B = B * mpower(transpose(B) * B , -0.5);
-@@ -769,7 +771,7 @@
-               } // IF round
--              break;
-+              return false;
-             } // IF numFailures > failureLimit
-@@ -990,5 +992,5 @@
-     } // While round <= numOfIC
-   } // ELSE Deflation
--
-+  return true; 
- } // FPICA
-diff -ru libitpp-4.0.7/itpp/signal/fastica.h libitpp-4.0.7.patched/itpp/signal/fastica.h
---- libitpp-4.0.7/itpp/signal/fastica.h        2009-12-27 01:38:47.000000000 +0100
-+++ libitpp-4.0.7.patched/itpp/signal/fastica.h        2010-07-08 16:24:37.000000000 +0200
-@@ -134,8 +134,9 @@
-     \brief Explicit launch of main FastICA function
-     Explicit launch of the Fast_ICA algorithm.
-+    \returns true if algorithm converged and false otherwise
-   */
--  void separate(void);
-+  bool separate(void);
-   /*!
-     \brief Set approach : FICA_APPROACH_DEFL or FICA_APPROACH_SYMM (default)
diff --git a/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch b/sci-libs/itpp/files/itpp-4.2-automake-1.12.patch
deleted file mode 100644 (file)
index f383d6f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
- configure.ac |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f06171..a1e8448 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,6 +27,8 @@ AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall -Werror])
-+AM_PROG_AR
-+
- # Shared library versioning
- GENERIC_LIBRARY_VERSION="7:0:0"
- #                        | | |
diff --git a/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch b/sci-libs/itpp/files/itpp-4.2-fastica-correct-dim.patch
deleted file mode 100644 (file)
index a852abc..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru itpp-4.2/itpp/signal/fastica.cpp itpp-4.2.new//itpp/signal/fastica.cpp
---- itpp-4.2/itpp/signal/fastica.cpp   2011-06-07 17:47:32.261000884 +0200
-+++ itpp-4.2.new//itpp/signal/fastica.cpp      2011-06-07 17:31:25.757000915 +0200
-@@ -147,6 +147,9 @@
-   whitenv(mixedSigC, E, diag(D), whitesig, whiteningMatrix, dewhiteningMatrix);
-+  Dim = whitesig.rows();
-+
-+  if (numOfIC > Dim) numOfIC = Dim;
-   ivec NcFirst = to_ivec(zeros(numOfIC));
-   vec NcVp = D;
-@@ -161,10 +164,6 @@
-   bool result = true; 
-   if (PCAonly == false) {
--    Dim = whitesig.rows();
--
--    if (numOfIC > Dim) numOfIC = Dim;
--
-     result = fpica(whitesig, whiteningMatrix, dewhiteningMatrix, approach, numOfIC, g, finetune, a1, a2, mu, stabilization, epsilon, maxNumIterations, maxFineTune, initState, guess, sampleSize, A, W);
-     icasig = W * mixedSig;
-Nur in itpp-4.2/itpp/signal: fastica.cpp.orig.
-Nur in itpp-4.2/itpp/signal: fastica.h.orig.
diff --git a/sci-libs/itpp/files/itpp-4.2-pkg-config.patch b/sci-libs/itpp/files/itpp-4.2-pkg-config.patch
deleted file mode 100644 (file)
index 5a18952..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
- configure.ac |    2 +-
- itpp.pc.in   |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f06171..d3d7b76 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -322,7 +322,7 @@ test "x$FFT_LIBS" != x && LIBS="$FFT_LIBS $LIBS"
- CPPFLAGS="`echo \"$CPPFLAGS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
- LDFLAGS="`echo \"$LDFLAGS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
- LIBS="`echo \"$LIBS\" | sed -e 's/  */ /g' -e 's/^ //' -e 's/ $//'`"
--LDLIBS="`echo \"$LDFLAGS $LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
-+LDLIBS="`echo \"$LIBS\" | sed -e 's/^ //' -e 's/ $//'`"
- if test $enable_explicit_deps = yes; then
-   EXPLICIT_LIBS=" $LDLIBS" # the leading space is important here...
-diff --git a/itpp.pc.in b/itpp.pc.in
-index 4018865..48a9543 100644
---- a/itpp.pc.in
-+++ b/itpp.pc.in
-@@ -9,4 +9,4 @@ Version: @PACKAGE_VERSION@
- URL: http://itpp.sourceforge.net/
- Libs: -L${libdir} -l@PACKAGE@@EXPLICIT_LIBS@
- Libs.private:@PRIVATE_LIBS@
--Cflags: -I${includedir} @CXXFLAGS_OPT@
-+Cflags: -I${includedir}
diff --git a/sci-libs/itpp/files/itpp-4.2-test-fftw.patch b/sci-libs/itpp/files/itpp-4.2-test-fftw.patch
deleted file mode 100644 (file)
index b7bb11d..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- itpp/branches/itpp-4-2/tests/Makefile.am   2010/09/21 18:23:47     1807
-+++ itpp/branches/itpp-4-2/tests/Makefile.am   2010/12/30 23:47:09     1837
-@@ -20,9 +20,9 @@
- OPTIM_TESTS = newton_search_test
--SIGNAL_TESTS = filter_test source_test window_test
-+SIGNAL_TESTS = filter_test source_test
- SIGNAL_LAP_TESTS = fastica_test poly_test
--SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test
-+SIGNAL_FFT_TESTS = freq_filt_test sigfun_test transforms_test window_test
- SIGNAL_LAP_FFT_TESTS = filter_design_test
- STAT_TESTS = histogram_test
diff --git a/sci-libs/itpp/itpp-4.2-r1.ebuild b/sci-libs/itpp/itpp-4.2-r1.ebuild
deleted file mode 100644 (file)
index a438f03..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="blas debug doc fftw lapack minimal static-libs"
-
-RDEPEND="
-       blas? ( virtual/blas lapack? ( virtual/lapack ) )
-       !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
-DEPEND="${RDEPEND}
-       blas? ( virtual/pkgconfig )
-       doc? ( app-doc/doxygen virtual/latex-base )
-       lapack? ( virtual/pkgconfig )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
-       "${FILESDIR}"/${P}-fastica-correct-dim.patch
-       "${FILESDIR}"/${P}-test-fftw.patch
-       )
-
-src_prepare() {
-       # turn off performance critical debug code
-       use debug || append-cppflags -DNDEBUG
-       sed \
-               -e 's:-pipe::g' \
-               -e 's:-Werror::g' \
-               -i configure* || die
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local blasconf="no"
-       use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
-       local lapackconf="no"
-       use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-
-       local myeconfargs=(
-               --docdir="${EPREFIX}/usr/share/doc/${PF}"
-               --enable-shared
-               $(use_enable doc html-doc)
-               $(use_enable debug)
-               $(use_enable !minimal comm)
-               $(use_enable !minimal fixed)
-               $(use_enable !minimal optim)
-               $(use_enable !minimal protocol)
-               $(use_enable !minimal signal)
-               $(use_enable !minimal srccode)
-               $(use_with fftw fft)
-               --with-blas="${blasconf}"
-               --with-lapack="${lapackconf}"
-       )
-       autotools-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.2-r2.ebuild b/sci-libs/itpp/itpp-4.2-r2.ebuild
deleted file mode 100644 (file)
index ee3ea76..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils flag-o-matic toolchain-funcs
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="blas debug doc fftw lapack minimal static-libs"
-
-RDEPEND="
-       blas? ( virtual/blas lapack? ( virtual/lapack ) )
-       !minimal? ( fftw? ( >=sci-libs/fftw-3 ) )"
-DEPEND="${RDEPEND}
-       >=sys-devel/automake-1.11.1
-       blas? ( virtual/pkgconfig )
-       doc? ( app-doc/doxygen virtual/latex-base )
-       lapack? ( virtual/pkgconfig )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-4.0.7-fastica-fix-endless-loop.patch
-       "${FILESDIR}"/${P}-fastica-correct-dim.patch
-       "${FILESDIR}"/${P}-test-fftw.patch
-       "${FILESDIR}"/${P}-automake-1.12.patch
-       "${FILESDIR}"/${P}-pkg-config.patch
-       )
-
-src_prepare() {
-       # turn off performance critical debug code
-       use debug || append-cppflags -DNDEBUG
-       sed \
-               -e 's:-pipe::g' \
-               -e 's:-Werror::g' \
-               -i configure* || die
-       autotools-utils_src_prepare
-}
-
-src_configure() {
-       local blasconf="no"
-       use blas && blasconf="$($(tc-getPKG_CONFIG) --libs blas)"
-       local lapackconf="no"
-       use lapack && lapackconf="$($(tc-getPKG_CONFIG) --libs blas lapack)"
-
-       local myeconfargs=(
-               --docdir="${EPREFIX}/usr/share/doc/${PF}"
-               --enable-shared
-               $(use_enable doc html-doc)
-               $(use_enable debug)
-               $(use_enable !minimal comm)
-               $(use_enable !minimal fixed)
-               $(use_enable !minimal optim)
-               $(use_enable !minimal protocol)
-               $(use_enable !minimal signal)
-               $(use_enable !minimal srccode)
-               $(use_with fftw fft)
-               --with-blas="${blasconf}"
-               --with-lapack="${lapackconf}"
-       )
-       autotools-utils_src_configure
-}
diff --git a/sci-libs/itpp/itpp-4.3.0.ebuild b/sci-libs/itpp/itpp-4.3.0.ebuild
deleted file mode 100644 (file)
index db31a1c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-       virtual/blas
-       virtual/lapack
-       >=sci-libs/fftw-3"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       doc? ( app-doc/doxygen virtual/latex-base )"
-
-DOCS=(ChangeLog NEWS AUTHORS README)
-
-src_prepare() {
-       # gentoo redefines the CMAKE_BUILD_TYPE
-       sed -i \
-               -e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \
-               CMakeLists.txt || die
-       # respect gentoo doc dir
-       sed -i \
-               -e "s:share/doc/itpp:share/doc/${PF}:" \
-               itpp/CMakeLists.txt || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DBLA_VENDOR=Generic
-               $(cmake-utils_use doc HTML_DOCS)
-       )
-       cmake-utils_src_configure
-}
index e97f4fa094d93d9096dee5814f029e8356f32681..de62b66f940ce3228ec668fe37edb42c932f72f1 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/itpp/itpp-4.3.1.ebuild b/sci-libs/itpp/itpp-4.3.1.ebuild
deleted file mode 100644 (file)
index 38ce5e1..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="C++ library of mathematical, signal processing and communication"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-       virtual/blas
-       virtual/lapack
-       >=sci-libs/fftw-3"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       doc? ( app-doc/doxygen virtual/latex-base )"
-
-DOCS=(ChangeLog NEWS AUTHORS README)
-
-src_prepare() {
-       # gentoo redefines the CMAKE_BUILD_TYPE
-       sed -i \
-               -e 's/CMAKE_BUILD_TYPE STREQUAL Release/NOT CMAKE_BUILD_TYPE STREQUAL Debug/' \
-               CMakeLists.txt || die
-       # respect gentoo doc dir
-       sed -i \
-               -e "s:share/doc/itpp:share/doc/${PF}:" \
-               itpp/CMakeLists.txt || die
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DBLA_VENDOR=Generic
-               $(cmake-utils_use doc HTML_DOCS)
-       )
-       cmake-utils_src_configure
-}
index 7e74f6e663d8ff39ba273db9fe6e3e9bf3f60cb0..de2289b7e7737dc57796b963a882197e8c510f58 100644 (file)
@@ -103,7 +103,6 @@ python_prepare_all() {
                "${FILESDIR}"/${PN}-0.12.0-blitz.patch
                "${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
                "${FILESDIR}"/${P}-glibc-2.22-backport.patch
-               "${FILESDIR}"/${P}-test-fix-backport.patch
        )
        distutils-r1_python_prepare_all
 }
index 29dcd6cef151064c0cd85b066eab76053302a01b..2487e63df0464baac888bcaa8c33fa43e593adec 100644 (file)
@@ -10,7 +10,7 @@
   </maintainer>
 
   <maintainer>
-    <email>francois.bissey@canterbury.ac.nz</email>
+    <email>fbissey@slingshot.co.nz</email>
     <name>François Bissey</name>
   </maintainer>
 
index 972d56f91d688f138158079dedbcd62ee9ece812..063c1a1577110dd3bce20badc60dc27a6f379680 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
index 79b46297d10c4c9a27e47c9d88f62187985184b4..f04175e91c69cfa6735e5e203bdd2f119fc0b5f5 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc x86"
 IUSE="selinux"
 
 DEPEND="dev-libs/libgcrypt:0
index 86d06c333447cd6e3af1dce70ab67a2808bfea49..02aa34536b4fd6eae785d4fc70d5f58833bb0b24 100644 (file)
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
        inherit git-2 autotools
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
-       KEYWORDS="~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"
        SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
index 71c40c861bd24ed03cf770206e02a9f0d3d64d47..0d738928522e9fd516a17f3836a5b34e26e869aa 100644 (file)
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils linux-info multilib user
 
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)"
 HOMEPAGE="https://launchpad.net/nova"
 SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 
index a7c01895b6ebfa1c7c4cde06e400889030418953..598ac281fcc6d05b44ef5949b98a0e6fb94353ec 100644 (file)
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils linux-info multilib user
 
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)"
 HOMEPAGE="https://launchpad.net/nova"
 SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 
index 4ea159cc988444befb474eb0dbc8f1c88ab04970..d19aca4b4d09c8cce8f7d24c54efceaf3b268814 100644 (file)
@@ -5,9 +5,9 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2 linux-info multilib user
+inherit distutils-r1 eutils git-r3 linux-info multilib user
 
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)"
 HOMEPAGE="https://launchpad.net/nova"
 EGIT_REPO_URI="https://github.com/openstack/nova.git"
 EGIT_BRANCH="stable/kilo"
index 1d514cc3a88c82e0d5ad1d9198ca57f59ae98b72..1a23f0844a0cb176eaf625cb75264a38d42c8252 100644 (file)
@@ -5,9 +5,9 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_4 )
 
-inherit distutils-r1 eutils git-2 linux-info multilib user
+inherit distutils-r1 eutils git-r3 linux-info multilib user
 
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system)"
 HOMEPAGE="https://launchpad.net/nova"
 SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/nova/liberty/nova.conf.sample -> liberty-nova.conf.sample"
 EGIT_REPO_URI="https://github.com/openstack/nova.git"
index 102fe94ff4be43bcf33dd014230663b271006584..285996a1b6ded4604d82533b9e7df6d0b2a9ce25 100644 (file)
@@ -38,7 +38,10 @@ DEPEND="
        )"
 
 RDEPEND="
-       >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+       || (
+               >=dev-python/dnspython-1.9.4:0[${PYTHON_USEDEP}]
+               virtual/dnspython[${PYTHON_USEDEP}]
+       )
        >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
        !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
        >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
similarity index 98%
rename from sys-cluster/swift/swift-2.5.0.ebuild
rename to sys-cluster/swift/swift-2.5.0-r1.ebuild
index a5018b981c3a511dfe12706ee237a74abc64b5c3..b67b7554da6c9c0e0aa88f6e736d9133189aebe1 100644 (file)
@@ -40,7 +40,7 @@ DEPEND="
 
 RDEPEND="
        ${CDEPEND}
-       >=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+       virtual/dnspython[${PYTHON_USEDEP}]
        >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
        !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
        >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
index dabf9de5f6ecd01c61fb315562fe25a7f793cde5..f37a7dbb7233861ef62234a5a02aed746475e97d 100644 (file)
@@ -15,7 +15,7 @@ SRC_URI="https://distcc.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="avahi crossdev gnome gssapi gtk hardened ipv6 selinux xinetd"
 
 RESTRICT="test"
index 9e92298eeb71d3e746a11f5c1ad0835614ba8fe1..fb820a77f9aeab10363f00746ef7ee59b5d35256 100644 (file)
@@ -22,7 +22,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
index 52d8d573d1a6e7d4670902793a4a2ff49310f1d8..c0c49e08a1bc6a259c0219764581e55e7b1259b9 100644 (file)
@@ -24,7 +24,7 @@ inherit eutils toolchain
 DESCRIPTION="64bit kernel compiler"
 
 # Works on mips and sparc; all other archs, refer to bug #228115
-KEYWORDS="~hppa ~mips"
+KEYWORDS="hppa ~mips"
 
 RDEPEND=">=dev-libs/gmp-4.3.2
        >=dev-libs/mpfr-2.4.2
index 039529ae13549a50d2844cd9bd38a18d1d4388f7..31aa2a22265d4bb84402235a2edc2724da07d6fe 100644 (file)
@@ -1 +1,2 @@
+DIST bedup-0.10.0.tar.gz 48058 SHA256 088b31821d8b770d6127ffd7a55e6d5cf21d43b36763e984030d16b677f52fe4 SHA512 6389f4f6d81062ebd3707a620f334278f7bb55449e1de6f0d56a3d2e87d7e2f1694fdfaf2f0b318487fd25db0344b704f297aa4410fac838a9f0ed7891cdcd62 WHIRLPOOL 14a6ed728eb1dfcca47b55b448711bd5c74ed83f7151eed49f10e8f1f06385b1660f2a4bbd85d512ed7574cc2ee2d9f581a8cc7fcba4f8b5c64ccc2632824e35
 DIST bedup-0.9.0_p20140413.tar.gz 48620 SHA256 f9c380074e3f13e42447c04a0fd5c1abca444487cf6ccb6400f09dcca14f90a6 SHA512 9a730dff2b2af239a6386d860881989de50f7a4fb6ae5b402c6dfe828308bbf4ccc2b6f616fdfc2b445fe23fbfcc302163b320813b50fa27940e578b5145345c WHIRLPOOL af4827f4514acc8380f312a72bb3208614f1f529e7373bca3bb610315e0474c9d7c7cbda1338d7019316e708f17ba73e71539092065041df588fd449f7639b54
diff --git a/sys-fs/bedup/bedup-0.10.0.ebuild b/sys-fs/bedup/bedup-0.10.0.ebuild
new file mode 100644 (file)
index 0000000..da05f0f
--- /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
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Btrfs file de-duplication tool"
+HOMEPAGE="https://github.com/g2p/bedup"
+SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz
+       -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# we need btrfs-progs with includes installed.
+DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}]
+       >=sys-fs/btrfs-progs-0.20_rc1_p358"
+RDEPEND="${DEPEND}
+       dev-python/alembic[${PYTHON_USEDEP}]
+       dev-python/pyxdg[${PYTHON_USEDEP}]
+       >=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]"
index 9f4323451a291494cc0b1c64724dbeb73d9fec0c..b5ae24edd7dda404d88f276286429912787e25cd 100644 (file)
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
 #if LIVE
 EGIT_REPO_URI="git://github.com/g2p/bedup.git
@@ -12,11 +12,12 @@ EGIT_REPO_URI="git://github.com/g2p/bedup.git
 inherit git-r3
 #endif
 
-inherit distutils-r1
+inherit distutils-r1 vcs-snapshot
 
 DESCRIPTION="Btrfs file de-duplication tool"
 HOMEPAGE="https://github.com/g2p/bedup"
-SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/g2p/${PN}/archive/v${PV}.tar.gz
+       -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -27,12 +28,13 @@ IUSE=""
 DEPEND=">=dev-python/cffi-0.5:=[${PYTHON_USEDEP}]
        >=sys-fs/btrfs-progs-0.20_rc1_p358"
 RDEPEND="${DEPEND}
-       <dev-python/alembic-0.7[${PYTHON_USEDEP}]
-       dev-python/contextlib2[${PYTHON_USEDEP}]
+       dev-python/alembic[${PYTHON_USEDEP}]
        dev-python/pyxdg[${PYTHON_USEDEP}]
        >=dev-python/sqlalchemy-0.8.2[sqlite,${PYTHON_USEDEP}]"
 
 #if LIVE
 SRC_URI=
 KEYWORDS=
+
+src_unpack() { git-r3_src_unpack; }
 #endif
index b715b839874bd5fb116b26db684843bb257decee..145d71fd5b385be92eef0e5fdc44798a7c2679c9 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
        systemd? ( udev )
index 928302afe7f7158f67e996c649f95088cc2724c3..008b10f1ec271f8135341d20601da70e1c98aee6 100644 (file)
@@ -17,6 +17,9 @@ DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b4
 DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2
 DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939
 DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0
+DIST genpatches-3.18-23.base.tar.xz 723664 SHA256 e2b851168cb14811a7cbbdf7cf6c6285948353729ff8a6d5d243607fcc0eff8a SHA512 7cf09b223927d656d19466bcfe2f4284301a409b0b680f21f2e949ba973706b5042eaa65378e1034ac1377cd887af5330dcb210262907bcb725d6601c61264cf WHIRLPOOL 4ed8f9c163f3cea84e7923066ea7002710980250362e18e231f0421872b212d7777a6d1f1273945784b0d720182044b842478b939af20f137e0bb9e26fff91d0
+DIST genpatches-3.18-23.experimental.tar.xz 61600 SHA256 f6335db1e0d3a35489ba7632669c47548414389d28fb25838457cea30375c430 SHA512 20b2fa1bd461fb1b7de7c7faa85533d2baa4681ae8a5144fcd9d8ccc34fe6643b491d9f419d4d4d25a5f81398d03af5cfbcce33e7ed18a185072ba11a39f3ebd WHIRLPOOL 62c73dd6833ab3cfd7c0999c68d910340c2652705f6cf075ada82a2db5efb37132255068833454d38bb91472e5ed06bb35ec945fa433ef6ac6f714da45073d75
+DIST genpatches-3.18-23.extras.tar.xz 16200 SHA256 c055d6c67161b7497cd6fb98d6143676efa506a06fd7d77c7db527f648cdbb29 SHA512 898c991f77e578ee4d8280038d65f446a309e154d26410741f4f6d6935e4c5c294d0befa4a627b248c109273725c5ca4a489ede6a8eae4c567a7725589fe6f20 WHIRLPOOL 47754319b9a2179c1ddec78647ab13b5ad862b7677a028fc307205d1c3c29d291da322c465d053938019f72efcd25311d5762fe55769ea87318de330a84a5a58
 DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
 DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
 DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.23.ebuild
new file mode 100644 (file)
index 0000000..f756341
--- /dev/null
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="23"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+       kernel-2_pkg_postinst
+       einfo "For more info on this patchset, and how to report problems, see:"
+       einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+       kernel-2_pkg_postrm
+}
index 6df5cc0cc0d0125b266a2b045b955006ce487fe9..8daf1bff06cf48bf5b8a300fba2bec5837ce493c 100644 (file)
@@ -9,10 +9,10 @@ if [[ ${PV} == 99999999* ]]; then
        inherit git-2
        SRC_URI=""
        EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-       KEYWORDS=""
+       KEYWORDS="hppa ppc64"
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz"
-       KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+       KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
index f9f7a3686924745d68f4185d55575c5b99a11e96..ffcb5be6fa114abab0010578085325df45f765c7 100644 (file)
@@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
index 7b6210399e06ee4fd3a29b069693011da2d381f1..2c6c59a4bfad514d096e4219828a4c94cf993fd7 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-ng-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="+ncurses modern-top nls selinux static-libs systemd test unicode"
 
 RDEPEND="!<sys-apps/sysvinit-2.88-r6
diff --git a/virtual/dnspython/dnspython-1.ebuild b/virtual/dnspython/dnspython-1.ebuild
new file mode 100644 (file)
index 0000000..0934c78
--- /dev/null
@@ -0,0 +1,23 @@
+# 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 python-r1
+
+DESCRIPTION="A virtual for dnspython, for Python 2 & 3"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="!dev-python/dnspython:0
+       $(python_gen_cond_dep 'dev-python/dnspython:py2[${PYTHON_USEDEP}]' python2*)
+       $(python_gen_cond_dep 'dev-python/dnspython:py3[${PYTHON_USEDEP}]' python3*)"
+DEPEND="!dev-python/dnspython:0"
diff --git a/virtual/dnspython/metadata.xml b/virtual/dnspython/metadata.xml
new file mode 100644 (file)
index 0000000..ee7e8b2
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+</pkgmetadata>
index 9db79ebd5f5277294d76afc212ccef10f0c81cdf..779b93db886d72988f5574f1f94a16dac9522e21 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://www.dillo.org/download/${P}.tar.bz2
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc +gif ipv6 +jpeg +png ssl"
 
 RDEPEND="
index a5742c5f6393e86aad85b1f76a16b403eea46e55..af3a5c5b07541fd110e215bba46734f611fc8e01 100644 (file)
@@ -1,2 +1,2 @@
-DIST google-chrome-beta_47.0.2526.27-1_amd64.deb 47182218 SHA256 24f6a0b6c5c7593f941b12874620ae39eefa796030c0c8a3e5d0b6f650af5e51 SHA512 5c84019746941f7c9adb6f147ec6db6b8aeb3147146a305b2464b1438733f292abe759e60b65dbebe57187a356e633a6110fc6ea6a9beef4136f57000b150a05 WHIRLPOOL e392759a3e5c24b04d15fc6acfc7c9352af9427a0c6ef91a364be24562bf9c0ed0d27d923bf990de239da698478d87687be6b2d34c674d7ab9402f907a7b795c
-DIST google-chrome-beta_47.0.2526.27-1_i386.deb 47207988 SHA256 70f70014f0b4c5529699c40171894e5aed0f575d79418399d8ad76bf9edc9f9d SHA512 8df2307d24ae19e2022cb12b8f1472701c06a0e5d743308a10c52cff84e5434d63d8e0da1b4dd41ae0819b8611c6c8eac283b0ca38b7e5b08b5ead093c00cb3e WHIRLPOOL a1374d6023a08b945f45ae902cc6e24e48f85730522e2679331ab405ece418c8fbd40edce2098844165e072d07c9dbe9ca842fb9fc0c1fad3d44df1b094a80a9
+DIST google-chrome-beta_47.0.2526.35-1_amd64.deb 47152890 SHA256 287e7bed84db2a833d2497e1a5d691ea4ac6f92dd97406a3d62c14da624d9a9f SHA512 aba35bd3d4e1bb4d1a48c1d52500af025de696012d6667f680252c00b1af1b1548c23e2f8b131e5a443d23aca35ba2cf4c4410bab6100344735c4a21626757cd WHIRLPOOL 392b3119e19df24f67832f8318fd5dea4071b16c1ab266a02eef9e0a4534b5c03e339ee5a8d36a415f7bedb56154d8192ae47577e342c6149dc6ca08e8fcec56
+DIST google-chrome-beta_47.0.2526.35-1_i386.deb 46829710 SHA256 b8083b7c666c1d639bce8b741d1c811ccec4fd7fdf823982b730c503afa448cd SHA512 e3cfebef29c568c57d93b97294d71805208c7ed82edd2141ca42599b7c93b06c6830495d28830c750741cab4d8c951917cef8b012494e9c8069ad8bceba3a787 WHIRLPOOL 644bddf0f66989dea7c74ab612c6cc3a7ea4c5f06ed8fb423113f6c7951c46be522c8768836cad3b2221c9b009476cbe4775d0cff4afd47fb80e776fb629b0fd
index 62aef2c9dd2363c52b58edbfa02652f882ef7119..78849219318709f50604dab86ca3b180f9937420 100644 (file)
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_48.0.2541.0-1_amd64.deb 47822896 SHA256 96561ef74947ec511e20bee51bf7dc94e42ccdbc51a2180d61effe6907865d05 SHA512 1e56c0489c0740fc7c4b095c66a35952cd1ea6374611498a302afc4cb9daa0553738cd80dfbb5bee7e66fe3bd12736a24e6ee0b9d94317f4f2b649a17bdfe092 WHIRLPOOL 4fb4d69e8422d486bc69460433ac442bea8c2fbe8c1b3b4c6fd3cf105aa75b2123f37879abf3625cd694c72fe292c4a5675049dbe3795330cfcc0f7d327e78cd
-DIST google-chrome-unstable_48.0.2541.0-1_i386.deb 47379976 SHA256 03576fef4165fe77ad32bf3faa4c787120fd342323b8ffb8098b381437fe6351 SHA512 7376c3a0e0ba48f5325195190495a7d45abf037446a8ef6710d5f4a309bed0c4cb7179592d0b06341bece887b525a5a9a6ddf3ab5f51e31259615acf32d02556 WHIRLPOOL 91bc6c30fb0b04b9d54c07afb16a769578d110439db547e32266ecb3e57a9a362bb756f4055f35e3266abed5f2143b9b577ef01d1508c4c1d669f417014d33b5
+DIST google-chrome-unstable_48.0.2547.0-1_amd64.deb 47606416 SHA256 8b7311ee78b3f710eccd8d655e58c67ffbc58b7b8af3fb997a458dce2fd272c6 SHA512 f2fcb3bd41557311c65fdf85b3acfaa5be61b44b094297fad988c7224cddb3f6630cb4c8f6d2930079715410622ba597e86dabe2cb2dd43748bcf7d694fb6527 WHIRLPOOL 3b7df0012186ad634dc4488dc03cb7720331c372a17cf3f70052adbe13e734515f57089d75ac2d358c4157a39130502bae8c6953c0cdf4311609752b0fc6d841
+DIST google-chrome-unstable_48.0.2547.0-1_i386.deb 47055758 SHA256 d9eb126aab595a57ed893fe57f3b14eb76d3593f19ba0925dfff7c10890df1e6 SHA512 b07a3069d6c9cc5a626398913498b4934065a13b22d3454cfa07eaf2f93c3f1f70b45bdf0a91d2a7547f81b7170fbec500212c91736a1e50bd724493c2b7564f WHIRLPOOL ea90e644fc93713d6588116b716c94b95fb0628ed93cae61d5db9cbfc13ce96139609cc9478b23fba94047ec6d20556753d61ea43d64376964637b163c3eb931
index f8489cd14f4032a901e5c1038083d169f03f675b..f3f6914eff5cfa3a8f72b44547ec53c00f2a9df9 100644 (file)
@@ -1,6 +1,6 @@
-DIST google-chrome-beta_47.0.2526.27-1_amd64.deb 47182218 SHA256 24f6a0b6c5c7593f941b12874620ae39eefa796030c0c8a3e5d0b6f650af5e51 SHA512 5c84019746941f7c9adb6f147ec6db6b8aeb3147146a305b2464b1438733f292abe759e60b65dbebe57187a356e633a6110fc6ea6a9beef4136f57000b150a05 WHIRLPOOL e392759a3e5c24b04d15fc6acfc7c9352af9427a0c6ef91a364be24562bf9c0ed0d27d923bf990de239da698478d87687be6b2d34c674d7ab9402f907a7b795c
-DIST google-chrome-beta_47.0.2526.27-1_i386.deb 47207988 SHA256 70f70014f0b4c5529699c40171894e5aed0f575d79418399d8ad76bf9edc9f9d SHA512 8df2307d24ae19e2022cb12b8f1472701c06a0e5d743308a10c52cff84e5434d63d8e0da1b4dd41ae0819b8611c6c8eac283b0ca38b7e5b08b5ead093c00cb3e WHIRLPOOL a1374d6023a08b945f45ae902cc6e24e48f85730522e2679331ab405ece418c8fbd40edce2098844165e072d07c9dbe9ca842fb9fc0c1fad3d44df1b094a80a9
+DIST google-chrome-beta_47.0.2526.35-1_amd64.deb 47152890 SHA256 287e7bed84db2a833d2497e1a5d691ea4ac6f92dd97406a3d62c14da624d9a9f SHA512 aba35bd3d4e1bb4d1a48c1d52500af025de696012d6667f680252c00b1af1b1548c23e2f8b131e5a443d23aca35ba2cf4c4410bab6100344735c4a21626757cd WHIRLPOOL 392b3119e19df24f67832f8318fd5dea4071b16c1ab266a02eef9e0a4534b5c03e339ee5a8d36a415f7bedb56154d8192ae47577e342c6149dc6ca08e8fcec56
+DIST google-chrome-beta_47.0.2526.35-1_i386.deb 46829710 SHA256 b8083b7c666c1d639bce8b741d1c811ccec4fd7fdf823982b730c503afa448cd SHA512 e3cfebef29c568c57d93b97294d71805208c7ed82edd2141ca42599b7c93b06c6830495d28830c750741cab4d8c951917cef8b012494e9c8069ad8bceba3a787 WHIRLPOOL 644bddf0f66989dea7c74ab612c6cc3a7ea4c5f06ed8fb423113f6c7951c46be522c8768836cad3b2221c9b009476cbe4775d0cff4afd47fb80e776fb629b0fd
 DIST google-chrome-stable_46.0.2490.80-1_amd64.deb 47267978 SHA256 307fac6999f68092c5aa65524e17f5bc9e9f7cbb7d0e09e601bb6f62eda15c85 SHA512 65d6b7e58213ab9902d4c301c8a3732037da90a9e93360fb3ee9ec4631afd2bb066692b647ff14695d4a6f4f22bd45525b9566b6877282cb54bec8916333c893 WHIRLPOOL 875013f114639867db4870d11afcf2a6fea2b76f24e1b650be7d9bf52afb971e10692224fd20f337229b356b7d268c8b737689bb74c48ef3116aacca5b57d221
 DIST google-chrome-stable_46.0.2490.80-1_i386.deb 46822720 SHA256 6d3fcd532b1483d961edc4bd65aef79980b41587e736857ff2869ad34732e6b1 SHA512 d8b4d09e5f359cb28c3fc0e35ae4a3bc81fba4b5c899718bab5255761260652f3471b502f5bdb0dd5ec77a5026cb717c9aa9a95c7a5b2050e2b2b1d5c55af427 WHIRLPOOL 397439d22c3912b8ce870edf907ebb285f442ef3a6a2a52114acc58b853fe422d58d9984b51f6b4253306b814adb1ce76e3d270560f674d5cf256843915a62ce
-DIST google-chrome-unstable_48.0.2541.0-1_amd64.deb 47822896 SHA256 96561ef74947ec511e20bee51bf7dc94e42ccdbc51a2180d61effe6907865d05 SHA512 1e56c0489c0740fc7c4b095c66a35952cd1ea6374611498a302afc4cb9daa0553738cd80dfbb5bee7e66fe3bd12736a24e6ee0b9d94317f4f2b649a17bdfe092 WHIRLPOOL 4fb4d69e8422d486bc69460433ac442bea8c2fbe8c1b3b4c6fd3cf105aa75b2123f37879abf3625cd694c72fe292c4a5675049dbe3795330cfcc0f7d327e78cd
-DIST google-chrome-unstable_48.0.2541.0-1_i386.deb 47379976 SHA256 03576fef4165fe77ad32bf3faa4c787120fd342323b8ffb8098b381437fe6351 SHA512 7376c3a0e0ba48f5325195190495a7d45abf037446a8ef6710d5f4a309bed0c4cb7179592d0b06341bece887b525a5a9a6ddf3ab5f51e31259615acf32d02556 WHIRLPOOL 91bc6c30fb0b04b9d54c07afb16a769578d110439db547e32266ecb3e57a9a362bb756f4055f35e3266abed5f2143b9b577ef01d1508c4c1d669f417014d33b5
+DIST google-chrome-unstable_48.0.2547.0-1_amd64.deb 47606416 SHA256 8b7311ee78b3f710eccd8d655e58c67ffbc58b7b8af3fb997a458dce2fd272c6 SHA512 f2fcb3bd41557311c65fdf85b3acfaa5be61b44b094297fad988c7224cddb3f6630cb4c8f6d2930079715410622ba597e86dabe2cb2dd43748bcf7d694fb6527 WHIRLPOOL 3b7df0012186ad634dc4488dc03cb7720331c372a17cf3f70052adbe13e734515f57089d75ac2d358c4157a39130502bae8c6953c0cdf4311609752b0fc6d841
+DIST google-chrome-unstable_48.0.2547.0-1_i386.deb 47055758 SHA256 d9eb126aab595a57ed893fe57f3b14eb76d3593f19ba0925dfff7c10890df1e6 SHA512 b07a3069d6c9cc5a626398913498b4934065a13b22d3454cfa07eaf2f93c3f1f70b45bdf0a91d2a7547f81b7170fbec500212c91736a1e50bd724493c2b7564f WHIRLPOOL ea90e644fc93713d6588116b716c94b95fb0628ed93cae61d5db9cbfc13ce96139609cc9478b23fba94047ec6d20556753d61ea43d64376964637b163c3eb931
index ec9f86a3ff50eaaa517675f244b0636b0b633e1c..a7d822412dc76920f0284705de98041b8da386c1 100644 (file)
@@ -1,2 +1,2 @@
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.4.tar.gz 2033295 SHA256 351a18a15f3ad8f64c75281105bb2f321da69d58a8034d23757b7ce29fdc9cb3 SHA512 0de83a47806529fa04d60bdf3f69c1f2e2e5980a03d82a8322bb146afff8db85f7f689add876f739133ed262951533382909cd1a3f0f51a8750dde4b15459d25 WHIRLPOOL 6498f74d122b46912065ea060a596d1badc0144069270ea4e949d6debad025ba309e66e1f4e28fb9c595d560c3a37e1a5f01e6ac5a00d31eb5909a31abe3c105
+DIST monkey-1.6.5.tar.gz 2033866 SHA256 5e24a782fe3d97f4a4e78cac54646ca13d8646b8c790ea63924be77235453ea5 SHA512 64b5a30e8636e9aaaf3f8fb207201282980a29449476e8905218b5e36da78c9a1754a5706eafb40d46c72458a32346899a1bf859b29c213bf7cc5e66f5d834b3 WHIRLPOOL 1573fd42dc87da294f56dc3ddea8968d9cabd9421788beda074968343e52ea94f2ec321ed2a73c778787337e4f0c4eff89b43026f7e495976eb1d0cddd6b6c19
index 2323b63db94be93deabea924cd99503ef9b249cf..add07dc76ee8cd2f0fabc0d88bbca0a2eccc8516 100644 (file)
@@ -59,7 +59,7 @@ pkg_setup() {
 src_prepare() {
        # Unconditionally get rid of the bundled jemalloc
        rm -rf "${S}"/deps
-       epatch "${FILESDIR}"/${P}-system-mbedtls.patch
+       epatch "${FILESDIR}"/${PN}-1.6.3-system-mbedtls.patch
 }
 
 src_configure() {
index 42587954a4879fa8b63e54bfbedbb0a166d03084..513c1b915934d516d431f7e44203ab1591e1a647 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
 
 SLOT="1"
 LICENSE="FLTK LGPL-2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama"
 
 RDEPEND="
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
new file mode 100644 (file)
index 0000000..d12bbab
--- /dev/null
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils git-r3
+
+DESCRIPTION="View Your Mind, a mindmap tool"
+HOMEPAGE="http://www.insilmaril.de/vym/"
+EGIT_REPO_URI="git://git.code.sf.net/p/vym/code"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dbus"
+
+VYM_LINGUAS=( cs_CZ de_DE es fr ia it pt_BR ru sv zh_CN zh_TW )
+IUSE+=" ${VYM_LINGUAS[@]/#/linguas_}"
+
+DEPEND="
+       dev-qt/qtgui:4[qt3support]
+       dev-qt/qtsvg:4
+       dbus? ( dev-qt/qtdbus:4 )
+"
+RDEPEND="
+       ${DEPEND}
+       app-arch/zip
+"
+
+DOCS=( README.txt )
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-2.3.22-arrowobj.patch
+
+       sed -i \
+               -e '/lang\/vym_en.ts/d' \
+               CMakeLists.txt || die
+       rm -r lang/vym_en.ts || die
+}
+
+src_configure() {
+       local lingua
+       for lingua in ${VYM_LINGUAS[@]}; do
+               if ! use linguas_${lingua}; then
+                       sed -i -e "/lang\/vym_${lingua}.ts/d" CMakeLists.txt || die
+                       rm -r lang/vym_${lingua}.ts || die
+               fi
+       done
+
+       local mycmakeargs=(
+               $(cmake-utils_use !dbus NO_DBUS)
+       )
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+       doman doc/vym.1.gz
+       make_desktop_entry vym vym /usr/share/vym/icons/vym.png Education
+}
index 57763a021473e81b99d19da17b89edb76358be4e..e4901b325d0f52b7bf4fe2c21121d9de014f5f79 100644 (file)
@@ -1,3 +1,2 @@
-DIST xosview-1.14.tar.gz 135178 SHA256 d2f8c0b9e25ad259d114963d64aa9d3c532398fcbbb4213f24a876a94fb23012 SHA512 0d3e2e17c000358183ca8438fef621d7ec10533171a7cf92db7ae9e9fc5e5dbde0dc81d82431e5b252322ba0d07b7917ec4462c1bc1364e17f12b1f0acaaf7e7 WHIRLPOOL e75e7caa439a768c85c850c419e8682e69e24cd3b89cb9f224ac6c0888f091b652c0b70109825d0ec5352b3b53abac2ed62871e78a4a8bcc7186eeeffd5c9129
 DIST xosview-1.16.tar.gz 137097 SHA256 8e9e130d1bbb30b68419d12f0d74609c10eeed4d6c6a85f35d9941ea3c7b23a0 SHA512 f83cddebd260a5468110418172623d1367a50eeb69cdce63bff8e93a1908a2d6d860978f7d96eac700e238b270984df1802788400080ccd27ad76c964534e1c2 WHIRLPOOL 36ab8fa63f3bea4b8d87fbd4559fa1d7a8df47f25a558f80c25065b62e7b7c51121aa91604fed4c095fd7fae853cfe37c911710faef5b7f1d0de6e2db7816879
 DIST xosview-1.17.tar.gz 143263 SHA256 640998e7bd23b875e2556a97b9149a4cca0ac255889f484489b13a888c19b3f1 SHA512 c1d34887aa75afd244d9b5399c00642e68e75f8b0aafc06555955200e13bca398080dfcc92421f72b0242dcfac1e41d05bfb031e49f1560196a8f6e33ce79df6 WHIRLPOOL 28530451395cfd2b971cfb1f62b21bc3a1cb08f1792f3be87cfb91b7735102cc5bc5b7d5c12f787674ce926a1bc143905db243187cc0ef7beaaa1d0354c05349
diff --git a/x11-misc/xosview/xosview-1.14.ebuild b/x11-misc/xosview/xosview-1.14.ebuild
deleted file mode 100644 (file)
index 3ff3262..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="X11 operating system viewer"
-HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
-SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="suid"
-
-COMMON_DEPS="x11-libs/libX11
-       x11-libs/libXpm
-       x11-libs/libXt"
-RDEPEND="${COMMON_DEPS}
-       media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPS}
-       x11-proto/xproto"
-
-src_prepare() {
-       sed -e 's:lib/X11/app:share/X11/app:g' \
-               -i xosview.1 || die
-       tc-export CXX
-}
-
-src_compile() {
-       emake OPTFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-       dobin ${PN}
-       use suid && fperms 4755 /usr/bin/${PN}
-       insinto /usr/share/X11/app-defaults
-       newins Xdefaults XOsview
-       doman *.1
-       dodoc CHANGES README.linux TODO
-}
-
-pkg_postinst() {
-       if ! use suid ; then
-               ewarn "If you want to use serial meters ${PN} needs to be executed as root."
-               ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
-       fi
-}
index bcbcdd4ba7f9f2e5f2ccf83bc0c67feb74b27c7e..0f29a11bac91650b49ef30f6094801bd36d9ecdc 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="suid"
 
 COMMON_DEPS="x11-libs/libX11
index 4367b75064e9413ff524ae82a00263a9b19c4cf1..a20e7b5433b8804ab382ecc16ceadbac2959932f 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-       <email>sterkrig@myopera.com</email>
+       <email>skrattaren@yandex.ru</email>
        <name>Nikolaj Sjujskij</name>
 </maintainer>
 <maintainer>
index 7c4df9f5ee39f858ae8e84e446a55a82f3f26fda..4c8b53e2b39d5533617e400b864f17fcfdd18b14 100644 (file)
@@ -7,7 +7,7 @@
                <name>Ian Delaney</name>
        </maintainer>
        <maintainer>
-               <email>geert.braekmans@gmail.com</email>
+               <email>brakarov@outlook.com</email>
                <name>Geert Braekmans</name>
                <description>Proxy maintainer</description>
        </maintainer>
index 729da74629f039ab2422b3601118c7650e2e3b1b..edb3c129e5310dbe26be3c1c8d1f47bec868b0a1 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-    <email>dominique.michel@vtxnet.ch</email>
+    <email>dominique.c.michel@gmail.com</email>
     <name>Dominique Michel</name>
   </maintainer>
   <longdescription>
index b873cfa22f8698c5c6d9a00190c063805f8f4d24..dd9014802629c9b1a78caf8882dbce3f5c76c043 100644 (file)
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="nls truetype debug"
 
 RDEPEND="x11-libs/libXft
index b6af2b7ba15ca755909fcc6f79ff2ef26b75b562..4f357a207350e33aa655344f2071cf4e7a387b62 100644 (file)
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
 <maintainer>
-       <email>michael.stahn.42@gmail.com</email>
+       <email>hm.stahl@web.de</email>
        <name>Michael Stahn</name>
        <description>Maintainer. Assign bugs to him</description>
 </maintainer>