summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/conky/Manifest1
-rw-r--r--app-admin/conky/conky-1.10.1.ebuild180
-rw-r--r--app-admin/ulogd/ulogd-2.0.5-r2.ebuild8
-rw-r--r--app-admin/ulogd/ulogd-2.0.5-r3.ebuild18
-rw-r--r--app-arch/unace/Manifest1
-rw-r--r--app-arch/unace/unace-2.5-r4.ebuild31
-rw-r--r--app-backup/backintime/backintime-1.1.4.ebuild2
-rw-r--r--app-cdr/cdrtools/Manifest1
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild265
-rw-r--r--app-crypt/gentoo-keys/Manifest2
-rw-r--r--app-crypt/gentoo-keys/gentoo-keys-201511260245.ebuild (renamed from app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild)0
-rw-r--r--app-editors/adie/Manifest4
-rw-r--r--app-editors/adie/adie-1.6.50.ebuild (renamed from app-editors/adie/adie-1.7.45.ebuild)7
-rw-r--r--app-editors/adie/adie-1.7.53.ebuild (renamed from app-editors/adie/adie-1.7.47.ebuild)2
-rw-r--r--app-emulation/docker-compose/docker-compose-1.5.1.ebuild4
-rw-r--r--app-emulation/virt-manager/Manifest1
-rw-r--r--app-emulation/virt-manager/virt-manager-1.3.0.ebuild93
-rw-r--r--app-emulation/virt-manager/virt-manager-9999.ebuild2
-rw-r--r--app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch185
-rw-r--r--app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild8
-rw-r--r--app-text/xmlto/xmlto-0.0.26-r1.ebuild (renamed from app-text/xmlto/xmlto-0.0.26.ebuild)5
-rw-r--r--app-text/xmlto/xmlto-0.0.28-r1.ebuild (renamed from app-text/xmlto/xmlto-0.0.28.ebuild)5
-rw-r--r--dev-java/tomcat-servlet-api/Manifest1
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.29.ebuild36
-rw-r--r--dev-lang/go/go-1.5.1-r1.ebuild1
-rw-r--r--dev-lang/go/go-9999.ebuild31
-rw-r--r--dev-lang/mono/Manifest1
-rw-r--r--dev-lang/mono/mono-4.0.5.1.ebuild118
-rw-r--r--dev-lang/swi-prolog/Manifest3
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild128
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.2.3.ebuild128
-rw-r--r--dev-libs/libpcre/libpcre-8.38.ebuild2
-rw-r--r--dev-python/cssutils/cssutils-1.0.1.ebuild6
-rw-r--r--dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch32
-rw-r--r--dev-python/django/Manifest2
-rw-r--r--dev-python/django/django-1.7.11.ebuild105
-rw-r--r--dev-python/django/django-1.8.7.ebuild107
-rw-r--r--dev-python/google-api-python-client/Manifest1
-rw-r--r--dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild38
-rw-r--r--dev-python/pythondialog/Manifest1
-rw-r--r--dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild38
-rw-r--r--dev-python/reportlab/files/reportlab-no-pip.patch12
-rw-r--r--dev-python/reportlab/reportlab-3.1.44-r2.ebuild (renamed from dev-python/reportlab/reportlab-3.1.44-r1.ebuild)4
-rw-r--r--dev-python/reportlab/reportlab-3.2.0-r1.ebuild (renamed from dev-python/reportlab/reportlab-3.2.0.ebuild)4
-rw-r--r--dev-python/unidecode/unidecode-0.04.18.ebuild2
-rw-r--r--dev-ruby/mysql2/Manifest1
-rw-r--r--dev-ruby/mysql2/mysql2-0.4.2.ebuild35
-rw-r--r--dev-ruby/slop/Manifest1
-rw-r--r--dev-ruby/slop/slop-4.2.1.ebuild27
-rw-r--r--games-emulation/sdlmame/sdlmame-0.167.ebuild2
-rw-r--r--games-puzzle/atomix/atomix-3.18.0.ebuild7
-rw-r--r--media-sound/flacon/metadata.xml5
-rw-r--r--media-sound/pianobar/Manifest1
-rw-r--r--media-sound/pianobar/pianobar-2015.11.22.ebuild52
-rw-r--r--media-sound/pianobar/pianobar-9999.ebuild4
-rw-r--r--media-video/aegisub/aegisub-3.0.4.ebuild5
-rw-r--r--media-video/aegisub/aegisub-3.2.2.ebuild5
-rw-r--r--media-video/mpv/metadata.xml5
-rw-r--r--net-firewall/fwknop/fwknop-2.6.7-r1.ebuild2
-rw-r--r--net-firewall/fwknop/fwknop-2.6.7-r2.ebuild2
-rw-r--r--net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild2
-rw-r--r--net-libs/nghttp2/Manifest1
-rw-r--r--net-libs/nghttp2/nghttp2-1.0.5.ebuild2
-rw-r--r--net-libs/nghttp2/nghttp2-1.4.0.ebuild62
-rw-r--r--net-misc/curl/Manifest1
-rw-r--r--net-misc/curl/curl-7.44.0-r1.ebuild253
-rw-r--r--net-misc/curl/curl-7.44.0.ebuild245
-rw-r--r--net-misc/curl/curl-7.45.0.ebuild16
-rw-r--r--net-misc/dropbear/Manifest1
-rw-r--r--net-misc/dropbear/dropbear-2015.69.ebuild98
-rw-r--r--net-p2p/tribler/tribler-6.3.3-r1.ebuild2
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild76
-rw-r--r--net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch11
-rw-r--r--profiles/arch/sparc/package.use.mask4
-rw-r--r--profiles/base/package.use.mask5
-rw-r--r--profiles/default/linux/uclibc/package.use (renamed from profiles/default/linux/uclibc/mips/package.use)0
-rw-r--r--profiles/default/linux/uclibc/use.mask1
-rw-r--r--profiles/package.mask4
-rw-r--r--sys-libs/nss_wrapper/Manifest1
-rw-r--r--sys-libs/nss_wrapper/nss_wrapper-1.1.1.ebuild25
-rw-r--r--sys-process/procps/procps-3.3.10-r1.ebuild2
-rw-r--r--www-servers/tomcat/Manifest1
-rw-r--r--www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch265
-rw-r--r--www-servers/tomcat/tomcat-8.0.29.ebuild155
-rw-r--r--x11-drivers/xf86-input-wacom/Manifest1
-rw-r--r--x11-drivers/xf86-input-wacom/xf86-input-wacom-0.32.0.ebuild60
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild3
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild5
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild3
89 files changed, 2235 insertions, 850 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e064cbf5c00..a41d7b6ae7c 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,3 @@
DIST conky-1.10.0.tar.gz 342584 SHA256 f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb SHA512 08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf WHIRLPOOL 03f8f80b483c8db09096a10a8d95b20372cbd5fb3e284b9bcd072c4ec1a2a4f76335eb5e8016a3e6793f295c143c71268e65fb5e50fdea0b3e6ce187830a6c46
+DIST conky-1.10.1.tar.gz 343393 SHA256 b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21 SHA512 bcd3efa722fcd1d264157843fac0e9c5e5e0aa881f38b676cb1634efe57c3f07c535f063c0c9eba7bcd5deebf7b8e87099856fc5092cd01955c09b70e155cfd2 WHIRLPOOL 40ab9ecb135e15674a139aef5f98a8e229b38de995b0af7646813a422562b60566ed6125dad376560550e59d9b17f85f755c3f85034c78c6e02f857c966f4d26
DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
diff --git a/app-admin/conky/conky-1.10.1.ebuild b/app-admin/conky/conky-1.10.1.ebuild
new file mode 100644
index 00000000000..ddd8ee56b90
--- /dev/null
+++ b/app-admin/conky/conky-1.10.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils linux-info
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
+ ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+ ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar
+ weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+ X? (
+ imlib? ( media-libs/imlib2[X] )
+ lua-cairo? (
+ >=dev-lua/toluapp-1.0.93
+ x11-libs/cairo[X] )
+ lua-imlib? (
+ >=dev-lua/toluapp-1.0.93
+ media-libs/imlib2[X] )
+ lua-rsvg? (
+ >=dev-lua/toluapp-1.0.93
+ gnome-base/librsvg )
+ nvidia? ( media-video/nvidia-settings )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+ xmms2? ( media-sound/xmms2 )
+ )
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ eve? ( net-misc/curl dev-libs/libxml2 )
+ ical? ( dev-libs/libical )
+ iconv? ( virtual/libiconv )
+ irc? ( net-libs/libircclient )
+ mysql? ( >=virtual/mysql-5.0 )
+ ncurses? ( sys-libs/ncurses:= )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ >=dev-lang/lua-5.1.4-r8:0
+ "
+RDEPEND="
+ ${DEPEND_COMMON}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+ "
+DEPEND="
+ ${DEPEND_COMMON}
+ app-text/docbook2X
+ "
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README TODO ChangeLog NEWS AUTHORS )
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+ # Allow user patches #478482
+ epatch_user
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_X11=ON
+ -DOWN_WINDOW=ON
+ -DBUILD_XDAMAGE=ON
+ -DBUILD_XDBE=ON
+ $(cmake-utils_use_build truetype XFT)
+ $(cmake-utils_use_build imlib IMLIB2)
+ -DBUILD_XSHAPE=ON
+ -DBUILD_ARGB=ON
+ $(cmake-utils_use_build lua-cairo LUA_CAIRO)
+ $(cmake-utils_use_build lua-imlib LUA_IMLIB2)
+ $(cmake-utils_use_build lua-rsvg LUA_RSVG)
+ $(cmake-utils_use_build nvidia)
+ $(cmake-utils_use_build audacious)
+ $(cmake-utils_use_build xmms2)
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=OFF
+ -DBUILD_NVIDIA=OFF
+ -DBUILD_LUA_CAIRO=OFF
+ -DBUILD_LUA_IMLIB2=OFF
+ -DBUILD_LUA_RSVG=OFF
+ -DBUILD_AUDACIOUS=OFF
+ -DBUILD_XMMS2=OFF
+ )
+ fi
+
+ mycmakeargs+=(
+ $(cmake-utils_use_build apcupsd)
+ $(cmake-utils_use_build debug)
+ $(cmake-utils_use_build cmus)
+ $(cmake-utils_use_build curl)
+ $(cmake-utils_use_build eve)
+ $(cmake-utils_use_build hddtemp)
+ $(cmake-utils_use_build iostats)
+ $(cmake-utils_use_build ical)
+ $(cmake-utils_use_build iconv)
+ $(cmake-utils_use_build ipv6)
+ $(cmake-utils_use_build irc)
+ $(cmake-utils_use_build math)
+ $(cmake-utils_use_build moc)
+ $(cmake-utils_use_build mpd)
+ $(cmake-utils_use_build mysql)
+ $(cmake-utils_use_build ncurses)
+ $(cmake-utils_use_build portmon PORT_MONITORS)
+ $(cmake-utils_use_build rss)
+ $(cmake-utils_use_build thinkpad IBM)
+ $(cmake-utils_use_build weather-metar WEATHER_METAR)
+ $(cmake-utils_use_build weather-xoap WEATHER_XOAP)
+ $(cmake-utils_use_build webserver HTTP)
+ $(cmake-utils_use_build wifi WLAN)
+ -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_OLD_CONFIG=ON
+ -DBUILD_I18N=ON
+ -DMAINTAINER_MODE=ON
+ -DBUILD_AUDACIOUS_LEGACY=OFF
+ -DBUILD_BMPX=OFF
+ -DDOC_PATH=/usr/share/doc/${PF}
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+ elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf"
+ elog "and edit it to your liking."
+ elog
+ elog "There are pretty html docs available at the conky homepage"
+ elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
+ elog
+ elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+ elog
+ fi
+}
diff --git a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
index 93ce8110a64..5f6110797db 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r2.ebuild
@@ -10,9 +10,11 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
- http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="
+ https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
index 599d0c949dc..b39dca2df89 100644
--- a/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild
@@ -9,9 +9,11 @@ AUTOTOOLS_AUTORECONF=1
inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="http://netfilter.org/projects/ulogd/index.html"
-SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
- http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="
+ https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+"
LICENSE="GPL-2"
SLOT="0"
@@ -42,9 +44,10 @@ DEPEND="${RDEPEND}
)
"
+DOCS=( AUTHORS README TODO )
+
PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
-DOCS=( AUTHORS README TODO )
DOC_CONTENTS="
You must have at least one logging stack enabled to make ulogd work.
Please edit example configuration located at /etc/ulogd.conf
@@ -81,7 +84,7 @@ src_prepare() {
sed -i \
-e 's:var/log:var/log/ulogd:g' \
-e 's:tmp:run:g' \
- ulogd.conf.in || die 'sed on ulogd.conf.in failed'
+ ulogd.conf.in || die
append-lfs-flags
autotools-utils_src_prepare
@@ -126,12 +129,13 @@ src_install() {
use mysql && dodoc doc/mysql-*.sql
use postgres && dodoc doc/pgsql-*.sql
use sqlite && dodoc doc/sqlite3.table
+
doman ${PN}.8
insinto /etc
doins "${BUILD_DIR}/${PN}.conf"
- fowners root:ulogd /etc/ulogd.conf
- fperms 640 /etc/ulogd.conf
+ fowners root:ulogd /etc/${PN}.conf
+ fperms 640 /etc/${PN}.conf
newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 82aedea1d76..d1b73c9f7ae 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,2 +1,3 @@
DIST unace-nonfree_2.5-7.debian.tar.gz 16205 SHA256 9cc12ae2fe1af2356164800390316501a82293e1692268edc9781275058ff809 SHA512 f381e68fe27f9e892bf76b0b976e89b801829fdb7d25caf3bab758a7d4cc9cf6d5157d6cccf08df94fa895b5cf75c8c0b8f4a0f5bd87e2b71811f88ec4e94b12 WHIRLPOOL a27dfa86f5e58a970187307cfc846ed92198dbadad885df2b62b44506ddb66662a9bb2e1df6a4c58e3676db4381670cae04c4309311a28f55adfd1cf7242c152
+DIST unace-nonfree_2.5-8.debian.tar.xz 16312 SHA256 697ebcd1e2d20fea394b0ba40c097ff04d2b3b0f7d435e74f304b74c01c4c47b SHA512 8b8ce964aceee1c96040a1f0ca347c95c035fd688cc2501543543a48603513a9c9314920f899eb6c3122c44a77dd0e7c8bd67c41395c5028d5ca5fd0b42e9229 WHIRLPOOL 91a7f8782ad4f6c068c2fb7a347b6b5ad9f6f35d5a9624752bbd28c3bef6bf7c2634842fa0d42cf6c01530ee0e82e47aa4192cbd14d9a7e788f1292460e2f7df
DIST unace-nonfree_2.5.orig.tar.gz 122509 SHA256 5a85480ed0d39672962a05dc835efc0876be4f0d47b0fa7741b955ae7b148566 SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b WHIRLPOOL 9aaa3098ef45dad66a00c42d13cd916206751e37042ad5ce9cd5704a88219b0941bca69612a4c102acc2b6877d33b8b50f4fcbdc5b1853cadc2d7e3e5a1f3361
diff --git a/app-arch/unace/unace-2.5-r4.ebuild b/app-arch/unace/unace-2.5-r4.ebuild
new file mode 100644
index 00000000000..64691b9e02c
--- /dev/null
+++ b/app-arch/unace/unace-2.5-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DEB_VER="8"
+DESCRIPTION="ACE unarchiver"
+HOMEPAGE="http://www.winace.com/"
+SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
+ mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}-${DEB_VER}.debian.tar.xz"
+
+LICENSE="freedist"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE=""
+
+src_prepare() {
+ epatch $(sed 's:^:../debian/patches/:' "${WORKDIR}"/debian/patches/series)
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin unace
+ doman "${WORKDIR}"/debian/manpage/unace.1
+}
diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild
index 8c3700b24c9..2e00d75c9ea 100644
--- a/app-backup/backintime/backintime-1.1.4.ebuild
+++ b/app-backup/backintime/backintime-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="qt4"
RDEPEND="${PYTHON_DEPS}
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index bd50ad4b0f5..bea749ee1b2 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,3 +1,4 @@
DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
DIST cdrtools-3.01a31.tar.bz2 2097584 SHA256 183b5c12777779e78d8b69461aae52401f863768e7e7391d60730006f8cadc5a SHA512 455d7f3e1f4bbe79bb53f2fba4a8d5d8737eef8ce477a447d8687282dd2404a93cab07da1141292f8c26dd70963a26901486448db3c6a70a89aad47908fdf81c WHIRLPOOL 7a70464254645a0ce9ffaafbdb14a6ebb53a638310748a22c4a20c904059c92df746997fbd9b07d9a16876917bfd3b8b318acc5cd5494eac5e6b5d0ef66215e9
+DIST cdrtools-3.02a02.tar.bz2 2096499 SHA256 b5c33d6cfbe265806f24f365bdb885dfe35194ef716f4b6f809b4377ec159c05 SHA512 f61241006464b7055994ee040ec498e4cd47254501e55ea1e570a7ebc9db1422b46b47398373f7227904bcf6cc785fa1c8ae913cbb297cf839250ceccea18330 WHIRLPOOL 757c80f9b05697f0479edea61b74d2bc2c945f292fcef04ab3a41dda14d096881751d0e9b796b8ad73e227336a295c97182a91e37c48372718440509bbc2bfb7
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
new file mode 100644
index 00000000000..4e86b4bb4d3
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fcaps multilib eutils toolchain-funcs flag-o-matic gnuconfig
+
+MY_P="${P/_alpha/a}"
+
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
+HOMEPAGE="http://sourceforge.net/projects/cdrtools/"
+SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="acl caps nls unicode"
+
+RDEPEND="acl? ( virtual/acl )
+ caps? ( sys-libs/libcap )
+ nls? ( virtual/libintl )
+ !app-cdr/cdrkit"
+DEPEND="${RDEPEND}
+ x11-misc/makedepend
+ nls? ( >=sys-devel/gettext-0.18.1.1 )"
+
+S=${WORKDIR}/${P/_alpha[0-9][0-9]}
+
+FILECAPS=(
+ cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
+ cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
+ cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
+)
+
+cdrtools_os() {
+ local os="linux"
+ [[ ${CHOST} == *-darwin* ]] && os="mac-os10"
+ [[ ${CHOST} == *-freebsd* ]] && os="freebsd"
+ echo "${os}"
+}
+
+src_prepare() {
+ gnuconfig_update
+
+ # Remove profiled make files.
+ find -name '*_p.mk' -delete
+
+ # Adjusting hardcoded paths.
+ sed -i -e "s|opt/schily|usr|" \
+ $(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
+ || die "sed opt/schily"
+
+ sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
+ $(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
+ || die "sed doc"
+
+ # Respect libdir.
+ sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
+ $(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
+ || die "sed multilib"
+
+ # Do not install static libraries.
+ sed -i -e "s|include\t\t.*rules.lib||" \
+ $(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
+ || die "sed rules"
+
+ # Enable verbose build.
+ sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
+ RULES/*.rul RULES/rules.prg RULES/rules.inc \
+ || die "sed verbose rules"
+
+ # Respect CC/CXX variables.
+ cd "${S}"/RULES
+ local tcCC=$(tc-getCC)
+ local tcCXX=$(tc-getCXX)
+ sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
+ rules1.top || die "sed rules1.top"
+ sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
+ -e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
+ -e "/COPTOPT=/s|-O||" \
+ -e 's|$(GCCOPTOPT)||' \
+ cc-gcc.rul || die "sed cc-gcc.rul"
+ sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
+ rules.cnf || die "sed rules.cnf"
+
+ # Schily make setup.
+ cd "${S}"/DEFAULTS
+ local os=$(cdrtools_os)
+
+ sed -i \
+ -e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
+ -e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
+ -e "s|^\(LDPATH=\).*|\1|" \
+ -e "s|^\(RUNPATH=\).*|\1|" \
+ -e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
+ -e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
+ -e "s|^\(DEFINSGRP=\).*|\1\t0|" \
+ -e '/^DEFUMASK/s,002,022,g' \
+ Defaults.${os} || die "sed Schily make setup"
+ # re DEFUMASK above:
+ # bug 486680: grsec TPE will block the exec if the directory is
+ # group-writable. This is painful with cdrtools, because it makes a bunch of
+ # group-writable directories during build. Change the umask on their
+ # creation to prevent this.
+}
+
+ac_cv_sizeof() {
+ cat <<-EOF >"${T}"/test.c
+ #include <inttypes.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+ int main () {
+ static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
+ test_array [0] = 0;
+ return test_array [0];
+ }
+ EOF
+
+ local i=1
+ while [[ ${i} -lt 20 ]] ; do
+ if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
+ echo ${i}
+ return 0
+ fi
+ : $(( i += 1 ))
+ done
+ return 1
+}
+
+src_configure() {
+ use acl || export ac_cv_header_sys_acl_h="no"
+ use caps || export ac_cv_lib_cap_cap_get_proc="no"
+
+ # skip obsolete configure script
+ if tc-is-cross-compiler ; then
+ # Cache known values for targets. #486680
+
+ tc-export CC
+ local var val t types=(
+ char "short int" int "long int" "long long"
+ "unsigned char" "unsigned short int" "unsigned int"
+ "unsigned long int" "unsigned long long"
+ float double "long double" size_t ssize_t ptrdiff_t
+ mode_t uid_t gid_t pid_t dev_t time_t wchar_t
+ "char *" "unsigned char *"
+ )
+ for t in "${types[@]}" ; do
+ var="ac_cv_sizeof_${t// /_}"
+ var=${var//[*]/p}
+ val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
+ export "${var}=${val}"
+ einfo "Computing sizeof(${t}) as ${val}"
+ done
+ # We don't have these types.
+ export ac_cv_sizeof___int64=0
+ export ac_cv_sizeof_unsigned___int64=0
+ export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
+ export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
+ export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
+
+ export ac_cv_type_prototypes="yes"
+ export ac_cv_func_mlock{,all}="yes"
+ export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
+ export ac_cv_func_dtoa_r="no"
+ export ac_cv_func_sys_siglist{,_def}="no"
+ export ac_cv_func_printf_{j,ll}="yes"
+ export ac_cv_realloc_null="yes"
+ export ac_cv_no_user_malloc="no"
+ export ac_cv_var_timezone="yes"
+ export ac_cv_var___progname{,_full}="yes"
+ export ac_cv_fnmatch_igncase="yes"
+ export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
+ export ac_cv_file__usr_src_linux_include="no"
+
+ case $(cdrtools_os) in
+ linux)
+ export ac_cv_func_bsd_{g,s}etpgrp="no"
+ export ac_cv_hard_symlinks="yes"
+ export ac_cv_link_nofollow="yes"
+ export ac_cv_access_e_ok="no"
+
+ export ac_cv_dev_minor_noncontig="yes"
+ case ${ac_cv_sizeof_long_int} in
+ 4) export ac_cv_dev_minor_bits="32";;
+ 8) export ac_cv_dev_minor_bits="44";;
+ esac
+
+ cat <<-EOF >"${T}"/test.c
+ struct {
+ char start[6];
+ unsigned char x1:4;
+ unsigned char x2:4;
+ char end[5];
+ } a = {
+ .start = {'S', 't', 'A', 'r', 'T', '_'},
+ .x1 = 5,
+ .x2 = 4,
+ .end = {'_', 'e', 'N', 'd', 'X'},
+ };
+ EOF
+ ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
+ if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
+ export ac_cv_c_bitfields_htol="no"
+ elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
+ export ac_cv_c_bitfields_htol="yes"
+ fi
+ ;;
+ esac
+ fi
+}
+
+src_compile() {
+ if use unicode; then
+ local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
+ if [[ -n ${flags} ]]; then
+ append-flags ${flags}
+ else
+ ewarn "Your compiler does not support the options required to build"
+ ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
+ fi
+ fi
+
+ # If not built with -j1, "sometimes" cdda2wav will not be built.
+ emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+ LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
+}
+
+src_install() {
+ # If not built with -j1, "sometimes" manpages are not installed.
+ emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
+ LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
+
+ # These symlinks are for compat with cdrkit.
+ dosym schily /usr/include/scsilib
+ dosym ../scg /usr/include/schily/scg
+
+ dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
+
+ cd "${S}"/cdda2wav
+ docinto cdda2wav
+ dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
+
+ cd "${S}"/mkisofs
+ docinto mkisofs
+ dodoc ChangeLog* TODO
+
+ # Remove man pages related to the build system
+ rm -rvf "${ED}"/usr/share/man/man5
+}
+
+pkg_postinst() {
+ fcaps_pkg_postinst
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ einfo
+ einfo "Darwin/OS X use the following device names:"
+ einfo
+ einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
+ einfo
+ einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
+ einfo
+ fi
+}
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index 2d6f4801988..a0c6695decb 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1 +1 @@
-DIST gentoo-keys-201501052117.tar.xz 28936 SHA256 168e430e9cbc2d720a53b2ba04fe1dd54ee667f12b75d8b51d60b8cb11a474f1 SHA512 7e48e4a13f3e431b0f2f48fc4ed4fdca4b8078b725b1a9d9ca30a551178cc229c5e4b6b9018cea5686c310c065091073c7f04ab8eb61a20be1ccd9956c1d8cee WHIRLPOOL bc4d1f71cc9517ba3741bae4727e10480641c81701cb2f91412e30fa055e6ee38ee46e0afed927214370be89308af2516bee311585b5aec8a690ccf3eac3c6e8
+DIST gentoo-keys-201511260245.tar.xz 31136 SHA256 8ab4b3c9d6542d85525e8287e74517f1906a0855ccba79ed9e8f48e8861907d6 SHA512 fc0f9bdf36c988146ea407f0788f98c78acb6ded1aba8f1471f740f49421a32005fa325550b57eb1d0520e838286a642c05c90edb264810a2906c6da73fc3c6b WHIRLPOOL ed4bda563a9e17fbb0cb0a963330ec1c403c5a5e8b04760210f22019ab5d1dd7c0afa57604fe2fb62d1a7ef0e67aac1c2bb45df27d4cb3bf46057be78ebab2ad
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201511260245.ebuild
index 0fec1e3570c..0fec1e3570c 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201511260245.ebuild
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
index a4319cfd067..e0d71046b18 100644
--- a/app-editors/adie/Manifest
+++ b/app-editors/adie/Manifest
@@ -1,4 +1,4 @@
DIST fox-1.6.49.tar.gz 4383152 SHA256 3679ecd23064958259fbef5898aabb048d63b2dcb796de1d8801fe0b51e5a90e SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8 WHIRLPOOL 1592d2560a7967c491dcfeda40e66a45d2811424e222c5f1e768b28c8ce147d7815f46d22006ac9809b967d0c825b7828aad206ab55bcb80cae064f646fd3608
-DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
-DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
+DIST fox-1.6.50.tar.gz 4381855 SHA256 342c751d2a7edab136ad26cb4483329da3c16c7abf2f283f318d666ef12d0887 SHA512 195751d223e9af7d76a3bd3192ae7566a129cfe254f0ba3035b4f7e189c68b43daa8276edad95ebf2b1b403b6212a755000eebf1716a11bb7f06845fde4aceae WHIRLPOOL e1b0d855f5b2105c3739f64dd4aac5388450cc9fa36f1739e2a917e6d7bec4ab5273f2d227bb14b3db78b6a58d0088d2bfff9d8cf37c47b33d1f8e7257d282c9
DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
+DIST fox-1.7.53.tar.gz 5366794 SHA256 2cde33d1e72c731ff2f31a8d55769536c5494376f8922833ba57b3f9c8f37340 SHA512 835117497e48fe66790be6e985bb8ef80ae1b34966585355b0d72f907863610de9d89792062ae91297488f0e24e77c08102afe253a59e67ca65a071b2a5890c4 WHIRLPOOL 508d25ba996aa5ea8be7e43b0771df32af2ea04bb37d84a7dc80362bc685032ac6f42d0c3b7eb36a4a9408a75c68bc927c00b1cb50a36375195b741fca6c0e5f
diff --git a/app-editors/adie/adie-1.7.45.ebuild b/app-editors/adie/adie-1.6.50.ebuild
index 82311927945..6f07963103d 100644
--- a/app-editors/adie/adie-1.7.45.ebuild
+++ b/app-editors/adie/adie-1.6.50.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI="5"
inherit fox
@@ -13,5 +13,6 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="~x11-libs/fox-${PV}"
+DEPEND="x11-libs/fox:1.6"
+
RDEPEND="${DEPEND}"
diff --git a/app-editors/adie/adie-1.7.47.ebuild b/app-editors/adie/adie-1.7.53.ebuild
index 1f4af4a8943..add7ddb2c91 100644
--- a/app-editors/adie/adie-1.7.47.ebuild
+++ b/app-editors/adie/adie-1.7.53.ebuild
@@ -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$
diff --git a/app-emulation/docker-compose/docker-compose-1.5.1.ebuild b/app-emulation/docker-compose/docker-compose-1.5.1.ebuild
index e988d1938a4..e20684f2665 100644
--- a/app-emulation/docker-compose/docker-compose-1.5.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.5.1.ebuild
@@ -36,13 +36,13 @@ CDEPEND="
<dev-python/texttable-0.9[${PYTHON_USEDEP}]
>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
"
DEPEND="
test? (
${CDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
- $(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
)
"
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 9dde0f24c65..8dccb60c417 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,2 +1,3 @@
DIST virt-manager-1.1.0.tar.gz 2509440 SHA256 ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 SHA512 8c3aa56e13f1ec4a67e353b15b4f61bdc067300dbc459790b04e5f5258bf526694ec712a9f74d7af48ddd271081d48ae98d576f4bc5ed139e046620a9aa64e2d WHIRLPOOL aaffdf75b313c88a10648503bf552357139aff2a1624da1b17cac3975fec21ad6c3ccce00999ef8f4f1f4731aabf5ae2c07e70e453785caefe932c3b0deab456
DIST virt-manager-1.2.1.tar.gz 2524812 SHA256 74bba80e72e5e1b4d84f1d5b7211b874e9c4ae00a0a44149d1721acab38ce6be SHA512 b99144f498bc2f28c98bb2395e0a9c2fe244a3da476892698ff0f1fd4a6d36a8ddf53e13561593c5e94932ce8176a27092c818ed218634fc5201666ad6792791 WHIRLPOOL d2402087453ec720add0a815433e9feda1bd36e253178dfe1cf27f52e0ad41a13e1e1d6a9977b63485ed8acc257d93c903625b775c6ab130ea7235e52be0e8fc
+DIST virt-manager-1.3.0.tar.gz 2564090 SHA256 a6ebec0dd695b195778c5d710c7b6f1cd28d3ccb8b128fa006eebb35b156a315 SHA512 8cba9ad45aa3b070e29ec72cc45c5eb88231dfb0ef2a24cdc913acdf30158d29cc0b18e23f168fb5eafa4d890b5cd286a04669210b1411701adc912e29274101 WHIRLPOOL 379c54e1541b2186b1c218849758a917a8913e92603f8c492e707c206ef1fb7084bb7f21c474d6829e613b5ba524684562c1b3d696823478909f2a9d5a0f780f
diff --git a/app-emulation/virt-manager/virt-manager-1.3.0.ebuild b/app-emulation/virt-manager/virt-manager-1.3.0.ebuild
new file mode 100644
index 00000000000..e1ba253e4a1
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-1.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-2
+ SRC_URI=""
+ KEYWORDS=""
+ EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+else
+ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
+ >=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ dev-libs/libxml2[python,${PYTHON_USEDEP}]
+ dev-python/ipaddr[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=sys-libs/libosinfo-0.2.10[introspection]
+ gtk? (
+ x11-libs/gtk+:3[introspection]
+ gnome-base/dconf
+ >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+ net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
+ net-misc/x11-ssh-askpass
+ x11-libs/vte:2.90[introspection]
+ gnome-keyring? ( dev-python/gnome-keyring-python )
+ policykit? ( sys-auth/polkit[introspection] )
+ x11-themes/gnome-icon-theme
+ )"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-util/intltool"
+
+DOCS=( README NEWS )
+
+src_prepare() {
+ distutils-r1_src_prepare
+}
+
+distutils-r1_python_compile() {
+ local defgraphics=
+
+ esetup.py configure \
+ --qemu-user=qemu \
+ --default-graphics=spice
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ python_fix_shebang \
+ "${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
+}
+
+pkg_preinst() {
+ if use gtk; then
+ gnome2_pkg_preinst
+
+ cd "${ED}"
+ export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+ else
+ rm -rf "${ED}/usr/share/virt-manager/virtManager"
+ rm -f "${ED}/usr/share/virt-manager/virt-manager"
+ rm -rf "${ED}/usr/share/virt-manager/ui/"
+ rm -rf "${ED}/usr/share/virt-manager/icons/"
+ rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+ rm -rf "${ED}/usr/share/icons/"
+ rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+ rm -rf "${ED}/usr/bin/virt-manager"
+ fi
+}
+
+pkg_postinst() {
+ use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 87e7fde7cb3..e1ba253e4a1 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="!app-emulation/virtinst
gtk? (
x11-libs/gtk+:3[introspection]
gnome-base/dconf
- >=net-libs/gtk-vnc-0.3.8[gtk3,introspection]
+ >=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
net-misc/x11-ssh-askpass
x11-libs/vte:2.90[introspection]
diff --git a/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch
new file mode 100644
index 00000000000..76256da0f37
--- /dev/null
+++ b/app-text/linuxdoc-tools/files/linuxdoc-tools-0.9.71-fix-parallel-doc-build.patch
@@ -0,0 +1,185 @@
+See https://gitlab.com/agmartin/linuxdoc-tools/issues/4
+
+diff --git a/Makefile.in b/Makefile.in
+index adb85d0..7038d97 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -83,13 +83,14 @@ ifneq ($(BUILDDOC_FORMATS),)
+ # -- Build documentation
+ @echo "Building documentation ..."
+ (cd doc; \
++ MAKE="$(MAKE)" \
+ PREFIX=$(prefix) \
+ BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \
+ BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \
+- PKGPERL5LIB=$(CURDIR)/perl5lib \
+- PKGDATADIR=$(CURDIR)/lib \
++ PKGPERL5LIB=$(CURDIR)/perl5lib \
++ PKGDATADIR=$(CURDIR)/lib \
+ PKGENTITYMAPDIR=$(CURDIR)/entity-map \
+- BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
++ BUILDDOC_FORMATS="$(BUILDDOC_FORMATS)" \
+ sh Makedoc.sh)
+ endif
+
+diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
+index b7e2efb..da4be99 100644
+--- a/doc/Makedoc.sh
++++ b/doc/Makedoc.sh
+@@ -33,7 +33,7 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; then
+ # Create a modified EntityMap.pm with entity-map location in doc
+ # build temporary dir. Need to properly install entity-map there.
+ mkdir $TMPDIR/Text
+- make -C ../entity-map install DESTDIR="$TMPDIR"
++ ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR"
+ sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \
+ -e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \
+ -e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g'
+@@ -49,7 +49,7 @@ fi
+ if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then
+ # --without-installed-iso-entities: Install iso-entities in
+ # "$TMPDIR/usr" and set it as iso-entities prefix.
+- make -C ../iso-entities install DESTDIR="$TMPDIR"
++ ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR"
+ ISOENTITIES_PREFIX="${TMPDIR}/usr"
+ else
+ # --with-installed-iso-entities: Use system prefix.
+@@ -88,45 +88,42 @@ fi
+
+ # Build actual documentation
+ echo "- Building documentation for formats: ${BUILDDOC_FORMATS}" >&2
++BUILDDOC_MAKE=""
+ for docformat in ${BUILDDOC_FORMATS}; do
+ case ${docformat} in
+ txt)
+- echo "- Building txt docs" >&2
+ if [ -n "`which groff`" ]; then
+- $TMPDIR/linuxdoc --backend=txt --filter --blanks=1 ./guide.sgml
++ echo "- Add to build list: guide.txt" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.txt"
+ else
+ echo "- ++ Warning: groff not available, cannot build \"${docformat}\" format." >&2
+ fi
+ ;;
+ pdf)
+- echo "- Building pdf docs" >&2
+- $TMPDIR/linuxdoc --backend=latex --output=pdf \
+- --pass="\usepackage{times}" ./guide.sgml
++ echo "- Add to build list: guide.pdf" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.pdf"
+ ;;
+ info)
+- echo "- Building info docs" >&2
+- $TMPDIR/linuxdoc --backend=info ./guide.sgml
++ echo "- Add to build list: guide.info" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.info"
+ ;;
+ lyx)
+- echo "- Building lyx docs" >&2
+- $TMPDIR/linuxdoc --backend=lyx ./guide.sgml
++ echo "- Add to build list: guide.lyx" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.lyx"
+ ;;
+ html)
+- echo "- Building html docs" >&2
+- $TMPDIR/linuxdoc --imagebuttons --backend=html ./guide.sgml \
+- && mv -f ./guide*.html ./html
++ echo "- Add to build list: guide.html" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} html/guide.html"
+ ;;
+ rtf)
+- echo "- Building rtf docs" >&2
+- $TMPDIR/linuxdoc --backend=rtf ./guide.sgml && if [ ! -d ./rtf ]; \
+- then mkdir -m 755 ./rtf; fi && mv -f ./guide*.rtf ./rtf
++ echo "- Add to build list: guide.rtf" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} rtf/guide.rtf"
+ ;;
+ dvi+ps)
+ echo "- Building latex docs" >&2
+ if [ -n "`which latex`" ]; then
+- echo "- Building dvi docs" >&2
+- $TMPDIR/linuxdoc --backend=latex --output=dvi \
+- --pass="\usepackage{times}" ./guide.sgml
++ echo "- Add to build list: guide.dvi" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.dvi"
+
+ if [ -n "`which dvips`" ]; then
+ echo " + dvips" >&2
+@@ -137,9 +134,13 @@ for docformat in ${BUILDDOC_FORMATS}; do
+ DVIPS_PAPER="letter"
+ fi
+ fi
+- dvips -t ${DVIPS_PAPER} -o ./guide.ps ./guide.dvi
+- if [ -n "`which gzip`" -a -f ./guide.ps ]; then
+- gzip -fn ./guide.ps
++
++ if [ -n "`which gzip`" ]; then
++ echo "- Add to build list: guide.ps.gz" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps.gz"
++ else
++ echo "- Add to build list: guide.ps" >&2
++ BUILDDOC_MAKE="${BUILDDOC_MAKE} guide.ps"
+ fi
+ else
+ echo "- ++ Warning: dvips not available, cannot build \"guide.ps\"." >&2
+@@ -156,7 +157,9 @@ for docformat in ${BUILDDOC_FORMATS}; do
+ esac
+ done
+
++${MAKE} TMPDIR="${TMPDIR}" DVIPS_PAPER="${DVIPS_PAPER}" ${BUILDDOC_MAKE}
++
+ # Remove temporary directory.
+-rm -rf $TMPDIR
++rm -rf "${TMPDIR}"
+
+ exit 0
+diff --git a/doc/Makefile b/doc/Makefile
+new file mode 100644
+index 0000000..79c5382
+--- /dev/null
++++ b/doc/Makefile
+@@ -0,0 +1,44 @@
++
++
++%.txt: %.sgml
++ @echo "- Building txt docs" >&2
++ $(TMPDIR)/linuxdoc --backend=txt --filter --blanks=1 $<
++
++%.pdf: %.sgml
++ @echo "- Building pdf docs" >&2
++ $(TMPDIR)/linuxdoc --backend=latex \
++ --output=pdf \
++ --pass="\usepackage{times}" $<
++
++%.info: %.sgml
++ @echo "- Building info docs" >&2
++ $(TMPDIR)/linuxdoc --backend=info $<
++
++%.lyx: %.sgml
++ @echo "- Building lyx docs" >&2
++ $(TMPDIR)/linuxdoc --backend=lyx $<
++
++html/%.html: %.sgml
++ @echo "- Building html docs" >&2
++ $(TMPDIR)/linuxdoc --imagebuttons --backend=html $<
++ mv -f ./guide*.html ./html
++
++rtf/%.rtf: %.sgml
++ @echo "- Building rtf docs" >&2
++ $(TMPDIR)/linuxdoc --backend=rtf $<
++ mkdir -m 755 -p ./rtf
++ mv -f ./guide*.rtf ./rtf
++
++%.dvi: %.sgml
++ @echo "- Building dvi docs" >&2
++ $(TMPDIR)/linuxdoc --backend=latex \
++ --output=dvi \
++ --pass="\usepackage{times}" $<
++
++%.ps: %.dvi
++ @echo "- Building ps docs" >&2
++ dvips -t $(DVIPS_PAPER) -o $@ $<
++
++%.ps.gz: %.ps
++ @echo "- Building ps.gz docs" >&2
++ gzip -fn $<
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
index b9883e767e8..528386280a6 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild
@@ -37,14 +37,14 @@ DEPEND="${RDEPEND}
DOCS=( ChangeLog README )
-S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
+PATCHES=( "${FILESDIR}/${P}-fix-parallel-doc-build.patch" )
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
+S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}"
src_prepare() {
# Use Gentoo doc install path.
sed -i \
- -e "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \
+ -e "s%/share/doc/${PN}%/share/doc/${PF}%" \
Makefile.in || die
autotools-utils_src_prepare
@@ -75,6 +75,8 @@ src_install() {
autotools-utils_src_install
}
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
+
pkg_postinst() {
latex-package_pkg_postinst
sgml-catalog_pkg_postinst
diff --git a/app-text/xmlto/xmlto-0.0.26.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
index 0d423a6dbf1..50d6509554c 100644
--- a/app-text/xmlto/xmlto-0.0.26.ebuild
+++ b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
inherit eutils
-DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
+DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
HOMEPAGE="https://fedorahosted.org/xmlto/"
SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
@@ -16,12 +16,13 @@ IUSE="latex"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
app-text/docbook-xml-dtd:4.2
- app-shells/bash
+ app-shells/bash:0
dev-libs/libxslt
sys-apps/sed
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|| ( sys-apps/util-linux app-misc/getopt )
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
+ || ( virtual/w3m www-client/lynx www-client/links )
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
# We only depend on flex when we patch the imput lexer.
DEPEND="${RDEPEND}"
diff --git a/app-text/xmlto/xmlto-0.0.28.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 44dc5f34a09..4078641e1b8 100644
--- a/app-text/xmlto/xmlto-0.0.28.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
inherit eutils
-DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
+DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
HOMEPAGE="https://fedorahosted.org/xmlto/"
SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
@@ -16,12 +16,13 @@ IUSE="latex"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
app-text/docbook-xml-dtd:4.2
- app-shells/bash:0=
+ app-shells/bash:0
dev-libs/libxslt
sys-apps/sed
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|| ( sys-apps/util-linux app-misc/getopt )
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
+ || ( virtual/w3m www-client/lynx www-client/elinks )
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
# We only depend on flex when we patch the imput lexer.
DEPEND="${RDEPEND}"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 16757595731..12c7c21ec5e 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,4 +11,5 @@ DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 184b0d8bda512204a2e565f9175a
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
+DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.29.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.29.ebuild
new file mode 100644
index 00000000000..1c1c74f6bb4
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.29.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/go/go-1.5.1-r1.ebuild b/dev-lang/go/go-1.5.1-r1.ebuild
index 29d8207f78f..23d37172ec0 100644
--- a/dev-lang/go/go-1.5.1-r1.ebuild
+++ b/dev-lang/go/go-1.5.1-r1.ebuild
@@ -171,7 +171,6 @@ src_install()
fi
for x in ${bin_path}/*; do
f=${x##*/}
- einfo dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
done
dodoc AUTHORS CONTRIBUTORS PATENTS README.md
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 8d4c7158d82..ed766ec3876 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -54,6 +54,7 @@ go_arch()
local portage_arch=$(tc-arch $@)
case "${portage_arch}" in
x86) echo 386;;
+ x64-*) echo amd64;;
*) echo "${portage_arch}";;
esac
}
@@ -150,28 +151,28 @@ src_test()
src_install()
{
- local bin_path="${GOBIN}"
- if go_cross_compile; then
- bin_path="${GOBIN}/$(go_tuple)"
- fi
- dobin "${bin_path}"/*
- dodoc AUTHORS CONTRIBUTORS PATENTS README.md
+ local bin_path f x
- dodir /usr/lib/go /usr/lib/go/pkg /usr/lib/go/pkg/tool
+ dodir /usr/lib/go
insinto /usr/lib/go
# There is a known issue which requires the source tree to be installed [1].
# Once this is fixed, we can consider using the doc use flag to control
# installing the doc and src directories.
# [1] https://golang.org/issue/2775
- doins -r doc lib src
-
- # Selectively install pkg directory to exclude the bootstrap build
- insinto /usr/lib/go/pkg
- doins -r pkg/include "pkg/$(go_tuple)"
- insinto /usr/lib/go/pkg/tool
- doins -r "pkg/tool/$(go_tuple)"
- fperms -R +x /usr/lib/go/pkg/tool
+ doins -r bin doc lib pkg src
+ fperms -R +x /usr/lib/go/bin /usr/lib/go/pkg/tool
+
+ if go_cross_compile; then
+ bin_path="bin/$(go_tuple)"
+ else
+ bin_path=bin
+ fi
+ for x in ${bin_path}/*; do
+ f=${x##*/}
+ dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+ done
+ dodoc AUTHORS CONTRIBUTORS PATENTS README.md
}
pkg_preinst()
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index eeb4e091845..8f07bd3944c 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,3 +1,4 @@
DIST mono-2.10.9.tar.bz2 34038017 SHA256 541038cd4edd4a1c485638d49697d45015ef7483bcb21bb6165e4d7eb770c9a5 SHA512 426881873e7f9aaf01e1306bed7b3ac220082ca40dce91fa4f4f331944e8d91453b3cdcc4918882ab039ed694ae8819eeb787edf6a2ad42cc661614076725c01 WHIRLPOOL 93f54fbbf032fb60467fd4317630588d349c3dfb50158bad478bd3e2650fd3e8f12d45be372873b57626d4ac48f798646c3650590bbf731dc2f005ee618b8548
DIST mono-3.12.1.tar.bz2 73487974 SHA256 5d8cf153af2948c06bc9fbf5088f6834868e4db8e5f41c7cff76da173732b60d SHA512 7ff87d95c347186347dc7a9ffb767112717de2b808f8f1b612c56c9eb70fdcc0c8f586989be44444509a2768e71854d8195567196c992cc2c5b184ecbe5ac190 WHIRLPOOL fe3a6cdb8bf4602ad1d1e43099b2a552005c315a232a7d2bddf0081a68e882228712af5301f18d3a890f454041c4a34d6f0926aaba34401ecfa702eecd9415c8
DIST mono-4.0.3.20.tar.bz2 95987018 SHA256 976c0be3ab9b66361f48e8133c60b1b2942b88c44a7a11a19cd98f5ff64313fc SHA512 bbf65abb4d91aa65fd467a59dcc7c290f779ab9f8df9d82b56957893556ad8d13dc3cc85f3128145e0dd15aaa8b0ea872c4b66af4fd211243d368514f10a07cd WHIRLPOOL 9e7730c234dbf34a81637789a3ffee4ce37a1eaef6748f28a79875411d3c1d97cfbdce6146abfa7dde245e821fe52b2766bb7240637a8b8272788dffc5fd21ae
+DIST mono-4.0.5.1.tar.bz2 96533206 SHA256 c2f42944dded3196c6449f90e79990f1951070a361a0dcc2350fc56e945bc229 SHA512 c0783f7b2e344ca00ea354d2723821636a2594345f7e1fd93bf84e9ba1b5501848d4f49b1538279aac9f6f333d296394322e08a9749fe2208340104aa594cd09 WHIRLPOOL ae9b0758c019003fc9ecdbd051974d547c59c24a4505e71c1fc7db8095bc98cdb486405e2ba1794bfb34ecc6bebeb8b5165a97ba8f596897887eb7f2da806b89
diff --git a/dev-lang/mono/mono-4.0.5.1.ebuild b/dev-lang/mono/mono-4.0.5.1.ebuild
new file mode 100644
index 00000000000..2675538530f
--- /dev/null
+++ b/dev-lang/mono/mono-4.0.5.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+AUTOTOOLS_AUTORECONF=1
+
+inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils versionator
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="http://www.mono-project.com/Main_Page"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+COMMONDEPEND="
+ !minimal? ( >=dev-dotnet/libgdiplus-2.10 )
+ ia64? ( sys-libs/libunwind )
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}
+ || ( www-client/links www-client/lynx )
+"
+DEPEND="${COMMONDEPEND}
+ sys-devel/bc
+ virtual/yacc
+ pax_kernel? ( sys-apps/elfix )
+ !dev-lang/mono-basic
+"
+
+MAKEOPTS="${MAKEOPTS} -j1" #nowarn
+S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
+
+pkg_pretend() {
+ # If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
+ # See https://bugs.gentoo.org/261869 for more info."
+ CONFIG_CHECK="SYSVIPC"
+ use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ mono-env_pkg_setup
+}
+
+src_prepare() {
+ # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+ # get killed in the build proces when MPROTECT is enable. #286280
+ # RANDMMAP kill the build proces to #347365
+ # use paxmark.sh to get PT/XT logic #532244
+ if use pax_kernel ; then
+ ewarn "We are disabling MPROTECT on the mono binary."
+
+ # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+ sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+ fi
+
+ # mono build system can fail otherwise
+ strip-flags
+
+ # Fix VB targets
+ # http://osdir.com/ml/general/2015-05/msg20808.html
+ epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
+
+ # Fix build on big-endian machines
+ # https://bugzilla.xamarin.com/show_bug.cgi?id=31779
+ epatch "${FILESDIR}/${PN}-4.0.2.5-fix-decimal-ms-on-big-endian.patch"
+
+ # Fix build when sgen disabled
+ # https://bugzilla.xamarin.com/show_bug.cgi?id=32015
+ epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
+
+ # Fix atomic_add_i4 support for 32-bit ppc
+ # https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
+ epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
+
+ autotools-utils_src_prepare
+
+ epatch "${FILESDIR}/systemweb3.patch"
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-silent-rules
+ $(use_with xen xen_opt)
+ --without-ikvm-native
+ --disable-dtrace
+ $(use_with doc mcs-docs)
+ $(use_enable nls)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+}
+
+src_test() {
+ cd mcs/tests || die
+ emake check
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+ # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+ # for reference.
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 57b230ac02a..bbc4669d733 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,12 +1,9 @@
DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
-DIST swi-prolog-7.2.2-gentoo-patchset-0.tar.gz 1414 SHA256 145f585828da45d89c6abebb7707ef224334a6e102dd50302b1af549d8d8a3c8 SHA512 32642e5e133971fbcec777791c050dd548545050353e23e08e0457487d3b5ec46e9491be4cdfb8d0a0a8af613dc64b569969aaa31a0d8691e0c3fdd9b5c645d0 WHIRLPOOL f394d4da284e31e4f431cda1af54d3dd4f2995bf04de985750c7b0f89f2ad6ed2fca8c921ffe711ae83b8f0d478c864bf81b531a9fe71ab9be73df20083e5c21
-DIST swi-prolog-7.2.3-gentoo-patchset-0.tar.gz 1418 SHA256 b8cca09211889c3fdca47bcc3093f0811b773553d457b6d4cd423d0a3483ac8b SHA512 6fe185bc6a015bdb0c1466818f2e45897c098d98c091854cb86f1756458585724a8d17c1c8a5593ee054cbe0400c322b27bf107194aa1ba91d478623ff468e39 WHIRLPOOL aa9df0ddc7a01e776074c32f381b92f2738c86ac7a3462749cb24954549e1979c5c8c17038a3161772e41c7f39637ee3547efcda52ef2362e03d814af4cd885b
DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
DIST swi-prolog-7.3.10-gentoo-patchset-1.tar.gz 1117 SHA256 e3596515edc419cca5fed53410d4edbc8bb95eeff206274260916fb348c97f0d SHA512 2be89c25e9980785760305c9d443a92388ce0bfb09e1f64e5a8029341e9d7cc97bafa32992382c303aa51cf741f989e64bc675f5fdd31d09dac7442ee9b3d3ad WHIRLPOOL a2d206a564652bff73bd946f9aee386da7b76647e6f93d55c33cf45c8331d8d2afd980746e4a25f40825f6258fc53c926a94279d75e66053e2c21d80dda0eeb8
DIST swi-prolog-7.3.11-gentoo-patchset-0.tar.gz 338 SHA256 9440ba227c09708255790dce8797d79a258592dd0ea47853b273f45a1682a2ba SHA512 40e5b92b2491835a255b5666b43c4f9b4f24ad8df3d5fb7f7eaae51ee6582209cfe256c4ebdede72d3101838df1ee5d48c91c36ec7b5988555c2bcdd00cb8501 WHIRLPOOL 1e5983899f6acb4cb22102c445020b1d328ad2621745f9d30f1f84dc1b4f6498ad0d4043f078cb7de12d9acc11ceff925a4f28d004f48944c7afddf3876976ff
DIST swi-prolog-7.3.9-gentoo-patchset-0.tar.gz 1507 SHA256 029541109cc60d176b65d12903ee2e06f209c38ff29421674e660d31d6ee44d4 SHA512 357df9c6e5ce5b046e4ceb7d65b358bd191ff8c912812deba918fe3b76c48a46c9f89f28ddc950de151e47ec57d654c53f537024da5f7f2f373f7466f07f914f WHIRLPOOL 5ac911d2950d4ccffe1db959467215fc8d074b9a842e79aea7d8bc0d14587dce6388707b2c06e3d94474eed8feb939398daa616160642883192e6dbfe7034da2
-DIST swipl-7.2.2.tar.gz 16179490 SHA256 c137bbe1d652a6aaa003278045e592637cd9fd5f1d52b05f9f0751bfd9449c8d SHA512 b25ed01e49628d9b463acd0e3687eaef0e3f74e8f834a1442e66913fabf948ae6f6d662c21e3cbb1ca5793ceb96701be31c3b1d2d3a0a9694ea4706f9a64939e WHIRLPOOL 1309284a4d610cb37196aca678d4823bba384ba04a84ef1212c3580bad40da3359fbe4035a13cbfdd21a4eca75df2b8a3c398a1da9061a71ba8da8276c2b17dd
DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
DIST swipl-7.3.10.tar.gz 16093869 SHA256 caa2774963122cb57fb04370ea08d6a3c3ed5a5e98d92eb9865953e6b20baf5f SHA512 0f7113f20679a85e048f8d1892777a4bd78d60787b834d2200137cbad767618ca942dd152cf69a3496577f10ce85555f4d694d22394b5ae31244b7cfa8d07e01 WHIRLPOOL 797a8c0b5cd524e502de1ade9f33bfb8b8f9de1454bf3233643aea4870a8ed14c17ffb097edcd943dfbea1d9f50dd78a304beb55b15d4960224c4110c2e4dccc
DIST swipl-7.3.11.tar.gz 16114511 SHA256 d5f65705454a72450214aca612b78d99a63d7820a9c875b4131badb67cc565f9 SHA512 d310062fbc41a4ae527265fa9acade0eeb81ee84bf4372c1af1892937ecd4b8b60a7409ba7a7a17474bee0c5a2429190f797ba0fe365a9b6b46d4be478e79a78 WHIRLPOOL d12f177b4021e571bcd16282e4ef518781c726b1a75a5c188b006a8ef256e4e73d13c226727bc117b0a04f96b8151429277ef7bab8249ddf62c22704946c257c
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild
deleted file mode 100644
index 55e2a4878ac..00000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.3.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3.ebuild
deleted file mode 100644
index 55e2a4878ac..00000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.2.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild
index 7cf1f69ac89..e4696e87d7c 100644
--- a/dev-libs/libpcre/libpcre-8.38.ebuild
+++ b/dev-libs/libpcre/libpcre-8.38.ebuild
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild
index 60fc7418d09..c2be49f955b 100644
--- a/dev-python/cssutils/cssutils-1.0.1.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.1.ebuild
@@ -20,6 +20,10 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+PATCHES=(
+ "${FILESDIR}"/${P}-pypy-test-backport.patch
+)
+
python_prepare_all() {
# Disable test failing with dev-python/pyxml installed.
if has_version dev-python/pyxml; then
@@ -35,8 +39,6 @@ python_prepare_all() {
}
python_test() {
- # https://bitbucket.org/cthedot/cssutils/issues/55
- [[ "${EPYTHON}" =~ "pypy" ]] && return
ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
# esetup.py test
# exclude tests that connect to the network
diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
new file mode 100644
index 00000000000..89c7608d324
--- /dev/null
+++ b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Daniel <kingdread@gmx.de>
+# Date 1448482419 -3600
+# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d
+# Parent 3a01bd18118a6466ad93aa23caaa4164528b59ac
+Fix tests on PyPy 2
+
+Tests fail because of the extra "u" prefix in the error message
+
+diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py
+--- a/src/cssutils/tests/test_profiles.py
++++ b/src/cssutils/tests/test_profiles.py
+@@ -2,6 +2,7 @@
+ __version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'
+
+ import sys
++import platform
+ import basetest
+ import cssutils
+
+@@ -124,6 +125,11 @@
+ expmsg = u"invalid literal for int(): x"
+ elif sys.platform.startswith('java'):
+ expmsg = u"invalid literal for int() with base 10: x"
++ # PyPy adds the u prefix, but only in versions lower than Python 3
++ elif (platform.python_implementation() == "PyPy" and
++ sys.version_info < (3, 0)):
++ expmsg = u"invalid literal for int() with base 10: u'x'"
++
+
+ self.assertRaisesMsg(Exception, expmsg,
+ cssutils.profile.validate, u'-test-funcval', u'x')
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index aea0f1dbbc8..afae027acc2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,5 +2,7 @@ DIST Django-1.4.22.tar.gz 7802249 SHA256 d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb9
DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa
DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
DIST Django-1.7.10.tar.gz 7584312 SHA256 b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 SHA512 ef9c8f3f5db17474970805bd5a3956c65766362d883013c19d32cb0fcc795de74a831758d66d18103255e5c510b2ee384099f08e12d75c567caad2d80404cc20 WHIRLPOOL 380f05ff7f51dfc50f578f946b5b83ae36ab8a96a10ccce9c62642f5b2434c2ba9de2d1d9bc57859db003e4569fa0c3e118cf51cd80a9fe40c04c49fdf213999
+DIST Django-1.7.11.tar.gz 7586798 SHA256 2039144fce8f1b603d03fa5a5643578df1ad007c4ed41a617f02a3943f7059a1 SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee WHIRLPOOL 8797862021c6acdfcba5752f6f5f2d567a564812fc5089678a9d00b9d8f1cb13c03bd0cb9b369b68ce1d1f1dc1522f05d41778f5181aef9c7d49783afc280e7c
DIST Django-1.8.5.tar.gz 7270297 SHA256 2d174e4a3f54708d0d5b6ff1bf54ae71652e83bb06d7576b3b20d916b29c3653 SHA512 91a8788ec6a9f3592615da55948d080719425a2135e241e7b5014c6b9c354daa53c2caeadd9ac3d991730c8ef8fba579a0aa4f3094a1e83b0600811e9a3bd20b WHIRLPOOL af7037d853f6d9ea67df412589aab22113a8f4fb41c79d9f42e9b8fa0184b273a75815a558dddfeb8650f14532f77fc9585fc3c72912beaa152a932e667fcb06
DIST Django-1.8.6.tar.gz 7341303 SHA256 359d56f55a033a92831eab1f7ec47db3f9ad8e07f28ead9035d961886d54459a SHA512 bab5dbc83e73413b12aabc78e686d912775c881c9f9d4dee70bcec66782ae3a564019b0bbc62f8b3d4f642167f9e31c9083364debbe4b9c862be82e7ca654794 WHIRLPOOL 4a3e3b83be74b4b74fa6d27b58e5c3066a9d3179c05e507071072bde3bed6eef7e08fdf1f254af8e8ea485acfcbf78015daaa1615d34d2511ac22ad86dea984b
+DIST Django-1.8.7.tar.gz 7276831 SHA256 17a66de5cf59b5ee81c3dc57609b145bb45adddc0dc06937b998597d6e7b4523 SHA512 74b89efd4fd2d19542a30e0fa0648652aa85ea309804afadae1162b1cac3492e599beaf5ea868d67bcef5f016283952dcc869726cbf6f15141f0816a0377b041 WHIRLPOOL adae3d00ceab8bb3e526107068270d53de968b782d5e37a64f59ecaf75e8933d3895dc6de5c934ea180c8436a88acb4949f7f4f8bba56c13c92d08874596c784
diff --git a/dev-python/django/django-1.7.11.ebuild b/dev-python/django/django-1.7.11.ebuild
new file mode 100644
index 00000000000..3a7c4eaabb8
--- /dev/null
+++ b/dev-python/django/django-1.7.11.ebuild
@@ -0,0 +1,105 @@
+# 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} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+ test? (
+ ${PYTHON_DEPS//sqlite?/sqlite}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/numpy[$(python_gen_usedep 'python*')]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ )"
+
+# dev-python/python-sqlparse[${PYTHON_USEDEP}]
+# dev-python/bcrypt[${PYTHON_USEDEP}]
+# dev-python/selenium[${PYTHON_USEDEP}]
+# sci-libs/gdal[geos,${PYTHON_USEDEP}]
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+python_prepare_all() {
+ # Prevent d'loading in the doc build
+ sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+ distutils-r1_src_install
+ webapp_src_install
+
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+ optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ echo ""
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ if use doc; then
+ rm -fr docs/_build/html/_sources || die
+ local HTML_DOCS=( docs/_build/html/. )
+ fi
+
+ insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+ doins -r django/contrib/admin/static/admin/.
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "A copy of the admin media is available to webapp-config for installation in a"
+ elog "webroot, as well as the traditional location in python's site-packages dir"
+ elog "for easy development."
+ webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-1.8.7.ebuild b/dev-python/django/django-1.8.7.ebuild
new file mode 100644
index 00000000000..9225bd91170
--- /dev/null
+++ b/dev-python/django/django-1.8.7.ebuild
@@ -0,0 +1,107 @@
+# 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 )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+ https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+ mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+ "
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+ test? (
+ ${PYTHON_DEPS//sqlite?/sqlite}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/numpy[$(python_gen_usedep 'python*')]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+python_prepare_all() {
+ # Prevent d'loading in the doc build
+ sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ if use doc; then
+ rm -fr docs/_build/html/_sources || die
+ local HTML_DOCS=( docs/_build/html/. )
+ fi
+
+ insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+ doins -r django/contrib/admin/static/admin/.
+ distutils-r1_python_install_all
+}
+
+src_install() {
+ distutils-r1_src_install
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+ optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+ echo ""
+ elog "A copy of the admin media is available to webapp-config for installation in a"
+ elog "webroot, as well as the traditional location in python's site-packages dir"
+ elog "for easy development."
+ webapp_pkg_postinst
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 392f7b8446e..53ea9c59557 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1,3 @@
DIST google-api-python-client-1.1.tar.gz 71178 SHA256 bc88cae1c40446f22d58923fc5a8dbac77da29d6efbe4ae2276cc2f30f724617 SHA512 750c482e90f83d0b2d53f7d655db9a476686158b5e380cab7a5e92af1b521b26871dcda08a2ee946cd09035f65ca50ad8dcffa8f766d3671fceae009fbdb831e WHIRLPOOL 62d2ebb7f51f58c76b45f748fe79b031cda5f11fd6088d8ea947e7ab9b9b754688e004773f99169cc65fdd2789002faa486bed7717fc07dea0b25994cbede0da
DIST google-api-python-client-1.3.1.tar.gz 1480269 SHA256 5137c4d6e853cda1a2e32b7f1b1ce28b66f5d62e464d91386be22492c276b1f8 SHA512 385377bd99f006154f90bed2b6f55cb25786032d28ac7f15b9859882670cc8bf94acbfbd8485c4cf89abd665908f1a7f46f74e84f05faba992a62fe4b9fd5bd1 WHIRLPOOL cda6825e502738f6d3035e524494aadc159ac8d41ae12d3f682236f8c344dc41e2ecf03aee6b247233c5b9aa8c756ac8d598c98c95333dc8a8929901c3a82327
+DIST google-api-python-client-1.4.2.tar.gz 2289731 SHA256 dfb7feab9733ae99952545927b5d87dda24cea308b2040fba2c505e7f0c57696 SHA512 ab5ce56142d96ed9b38d00294133e188dfeaf70aac78054f093f03fce7c4aee5b7b99f18ee27190aaef14b7fbe2bc8d0a4e2526ff6f166e41eb0b4b050e7c6b5 WHIRLPOOL 006e24d1a4e5d2bfabcbf2503fa163d6b0a3a28a839396014bf0a91a463454f02140f38dd179a141010a03e268711c2d22c9aa3158b594e5b465d9032997e7b9
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
new file mode 100644
index 00000000000..bd55bbb1a89
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-1.4.2.ebuild
@@ -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=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://code.google.com/p/google-api-python-client/ https://github.com/google/google-api-python-client"
+SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+ dev-python/oauth2client[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/uritemplate[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all(){
+ export SKIP_GOOGLEAPICLIENT_COMPAT_CHECK=true
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests --verbosity=3 || die
+}
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index a7df16bf9e5..0fc60b727ed 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,2 +1,3 @@
+DIST python2-pythondialog-3.3.0.tar.gz 1906527 SHA256 3e6f593fead98f8a526bc3e306933533236e33729f552f52896ea504f55313fa SHA512 65ce7f9305e20b0c5e0d4588a241e0f14907ecad64f8a6bb3899a2d6e0245fdd848a8c4fb1da3465f03810a1e408fa97c46d9ec082c4ebba0c04a41293a23ea8 WHIRLPOOL 5fc43839b302956a42110e0d2e64bfb9f9b5ccada90cb69579afbb1211b7f117233a25f5bbb970c8b5033413c5c274e27c689e72c83a5887307fa11abc4dc6b8
DIST python3-pythondialog-3.2.2.tar.bz2 1412368 SHA256 bb104bd0512f9eda046b0cda53b5607d68de72b585cd8d5a1eebd549d8f2af99 SHA512 58b84c0dd7b71ec9d1e60c4802cfc8e6cc72f79b8b6accd387553c685a92367d242746065bac6cb1c9d501ac291d9307cb2bb6b26694e9f24a3c5d6637a5bb8e WHIRLPOOL 8e899f910eaaa5112403aed8adcd2e8fc9db371a5023bafdb5d2645b2ade716710b1c826d9208055fc510e8777751f8a43ef501db11c04827b93cb3040f4d793
DIST python3-pythondialog-3.3.0.tar.bz2 1827891 SHA256 e4ace5b09d712992b7327249e375e49608127666679b2ca9fd48141e218ec998 SHA512 b651593f077f6679be030182ac5f14a02d8bad86206c2733ba8b655d346809a32ea391de91e35101d400c55d9e8ecefaf6f1ba25fec036246186e13530f43a1f WHIRLPOOL 267a2ee4215fd53d7faaf88a02ee544e88eafdd5b1f4c45c4ba535fe46dbed41a1ebae72b0dae00fedb30cfb1fcd245e0439077f538d128137e8c8caca6bba70
diff --git a/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
new file mode 100644
index 00000000000..e1f504e9066
--- /dev/null
+++ b/dev-python/pythondialog/pythondialog-3.3.0-r200.ebuild
@@ -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 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module for making simple text/console-mode user interfaces"
+HOMEPAGE="http://pythondialog.sourceforge.net/ https://pypi.python.org/pypi/python2-pythondialog"
+SRC_URI="mirror://pypi/${PN:0:1}/python2-${PN}/python2-${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="python-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-util/dialog"
+DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/python2-${P}
+
+python_prepare_all() {
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/reportlab/files/reportlab-no-pip.patch b/dev-python/reportlab/files/reportlab-no-pip.patch
new file mode 100644
index 00000000000..332878e24dc
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-no-pip.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -538,7 +538,7 @@
+ ],
+
+ #this probably only works for setuptools, but distutils seems to ignore it
+- install_requires=['pillow>=2.4.0','pip>=1.4.1', 'setuptools>=2.2'],
++ install_requires=['pillow>=2.4.0'],
+ )
+ print()
+ print('########## SUMMARY INFO #########')
diff --git a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild b/dev-python/reportlab/reportlab-3.1.44-r2.ebuild
index da7f69bed81..2f49105817a 100644
--- a/dev-python/reportlab/reportlab-3.1.44-r1.ebuild
+++ b/dev-python/reportlab/reportlab-3.1.44-r2.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
app-arch/unzip
"
+PATCHES=(
+ "${FILESDIR}"/reportlab-no-pip.patch
+)
+
src_unpack() {
unpack ${P}.tar.gz
cd ${P}/src/reportlab/fonts || die
diff --git a/dev-python/reportlab/reportlab-3.2.0.ebuild b/dev-python/reportlab/reportlab-3.2.0-r1.ebuild
index fc3505fedca..01f702bccdc 100644
--- a/dev-python/reportlab/reportlab-3.2.0.ebuild
+++ b/dev-python/reportlab/reportlab-3.2.0-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
app-arch/unzip
"
+PATCHES=(
+ "${FILESDIR}"/reportlab-no-pip.patch
+)
+
src_unpack() {
unpack ${P}.tar.gz
cd ${P}/src/reportlab/fonts || die
diff --git a/dev-python/unidecode/unidecode-0.04.18.ebuild b/dev-python/unidecode/unidecode-0.04.18.ebuild
index b45f3af2e87..3e4525b6f3e 100644
--- a/dev-python/unidecode/unidecode-0.04.18.ebuild
+++ b/dev-python/unidecode/unidecode-0.04.18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc sparc x86"
S=${WORKDIR}/${MY_P}
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index 6603a481803..763ee4b6e69 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,3 +1,4 @@
DIST mysql2-0.3.19.gem 52224 SHA256 d34c6804e1916361ff352da0f0f57e615909cad0edcbf18d9aba78e1ddc2918a SHA512 1486e6016854776307a42b8edd1b51f222c9ec4a3aa769aba03579c132e778673ed5cd788d129fecb73085a01989adf9813d36d20ff292573b6db041354270f5 WHIRLPOOL 12db1a0c0b8260bae189590094978038903e871e1e91cf9d502117a05807344a60d9b40be0c8a45e5be74f027eefbf7e2c2ab5d5ba2d8e9bcdabaf6b41c8024b
DIST mysql2-0.3.20.gem 52224 SHA256 37166b21ca4b92a7af9bea566d78884b05391cfc14f786c18e7f264b422f0758 SHA512 65088e57b3693cb2b28cd37fc595de43edb85dba14421c1c43cd0c4e41efc0a8a39bd541213170af95e712998b44411a4212d9b96750207ed9d7292aa1e66c91 WHIRLPOOL 23e9852f3f9ee76e4463c4397b1e96288e2f8575030f33540c7c8cc8ca8fc106be2aec1c117dd008e4026872850731b4396babbbbeb971e8dacf523fe33387c9
DIST mysql2-0.4.1.gem 71680 SHA256 1ba5e782424a7a8d9ed75456c0df22d4196d6ca84a3a8a1ba3d009c5783d0fe2 SHA512 6abd2e63c5a24fa935d706afecba1a14b6fbb408a1a5e88b78b19a034426d7dbaaa82646b471d5d3965547d8377b196031f1a00e86a0da54665e485aa051ce7c WHIRLPOOL 21e6aa216a564335dd9e980e93ee29bd29a5958392c759d6e86c8a88f35d843eb8b9292c904ec3102c079e023757d0555a7faf8c9bb028151815bb68ad0024a2
+DIST mysql2-0.4.2.gem 72704 SHA256 0a12414109d6f1c328ed29a2157daff265eab81f1b3bce7794fcb4804fdaeb66 SHA512 d6883149dbd505c5d7f73c657a5fd2eebaeff9f78d411ac2fcb9bf78dc7f45866290067f20af2dd40a1851a26b09f1af404bc7aba3c60dd979475b7db81e2dae WHIRLPOOL 999b87d21acb6f8dfeb33770c27dc0b00d4576edc5e14311e543bca09be79bf56fe8d9aa93b881dca99ed5a21634c2bb1328cb0f0877ee7f0573013bb0688284
diff --git a/dev-ruby/mysql2/mysql2-0.4.2.ebuild b/dev-ruby/mysql2/mysql2-0.4.2.ebuild
new file mode 100644
index 00000000000..3b15943db4b
--- /dev/null
+++ b/dev-ruby/mysql2/mysql2-0.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# Tests require a live MySQL database but should all pass.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
+HOMEPAGE="https://github.com/brianmario/mysql2"
+
+LICENSE="MIT"
+SLOT="0.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} virtual/libmysqlclient"
+RDEPEND="${RDEPEND} virtual/libmysqlclient:="
+
+each_ruby_configure() {
+ ${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config "${EPREFIX}/usr/bin/mysqlconfig" || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/mysql2
+ cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
+}
diff --git a/dev-ruby/slop/Manifest b/dev-ruby/slop/Manifest
index 5314dbcd14d..762ef0214d9 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,3 +1,4 @@
DIST slop-3.6.0.tgz 19570 SHA256 8fdb0e81e0636f7a266b5f12e1fa419c27bf1b529f0c48addaaa9b02bcccf1ca SHA512 48bc2f56070a6f65b865b76dd5ba2e0e434c2ac5f9efef89301833746c0d01e5d9769ae02cdff8a4cfb0ed67d4306d921eafe086f49dafa0af8521d14bcee2a6 WHIRLPOOL c33dfb201a24c07e3abc56fa5c0944caff55814ac42d462e607a63c7d60e7fb02ba80accd020f572331c0bd9abd823446538e81b8039fdf5bab6bfa26d24e5d4
DIST slop-4.1.0.tgz 12644 SHA256 d07e6bb256cc1392ddeafcd071bd6407c469af4496de9e429333a50514281a33 SHA512 b1dfa808821b210681917e2cec6878482287e3be0e8ea1a1b3b311bf94e53a109e9b77524bca0030600904545c3e7a5b2ad3850210e53c7ee5bbff1efd8adef2 WHIRLPOOL ebdca4c84c7dc9997be8a1a492389c43b907a4d8c1f7bbad74ebff9335459d83f989b6e1a3e04ca76926c08737f1244abdd461ae8fc72d87532bf9003af30427
DIST slop-4.2.0.tgz 13291 SHA256 72fb5cc0d3847d44b3e4a6eba6ce7c0042819db3b952fc91ce662146b7797f49 SHA512 5857b749cee508a5ac94b1c247b23cb9b0dd23bb51ade3909472f597ee1c4a73571afb499731a7b55e65125c5555ee83d9ce582b87a10f68086debc30e70f044 WHIRLPOOL 5a881a86ba79925174d0f88933302fcabe79889f1570b6bc14ee3c20d9b1cadae761641d499de86c5cb82cc0a2dd71a5f87082026758d474001db5f0e0804887
+DIST slop-4.2.1.tgz 13788 SHA256 a825f9a6e9a450e5d1968b52cb4c1b662d678a94063e0d5f3d6ae50a4f788b62 SHA512 698c8dc10aa450486b43d2a2d2447616bc7dc42a6ea6b0b5db4aa0be651641d780f002161ab6fd6f6d1b4b6fb59ac38a8b56a4b27daa80680c5f2a94e13fbb11 WHIRLPOOL 8539c9308edb0744fd74170c945bcf44564daaebcfdb7347769932747e7167ac4edddc365eb4e058b26a08850809cbaa91d2e645c6f027e5145123baff09a6d0
diff --git a/dev-ruby/slop/slop-4.2.1.ebuild b/dev-ruby/slop/slop-4.2.1.ebuild
new file mode 100644
index 00000000000..f75b19d07e5
--- /dev/null
+++ b/dev-ruby/slop/slop-4.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
+HOMEPAGE="https://github.com/injekt/slop"
+SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ sed -i -e '/git ls-files/d' slop.gemspec || die
+}
diff --git a/games-emulation/sdlmame/sdlmame-0.167.ebuild b/games-emulation/sdlmame/sdlmame-0.167.ebuild
index 83c4ce6a36c..d2371fed9e5 100644
--- a/games-emulation/sdlmame/sdlmame-0.167.ebuild
+++ b/games-emulation/sdlmame/sdlmame-0.167.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mamedev/mame/releases/download/mame${MY_PV}/mame${MY
LICENSE="XMAME"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE="X alsa +arcade debug +mess opengl tools"
REQUIRED_USE="|| ( arcade mess )
debug? ( X )"
diff --git a/games-puzzle/atomix/atomix-3.18.0.ebuild b/games-puzzle/atomix/atomix-3.18.0.ebuild
index 1f6705641a0..405c3ffd9a9 100644
--- a/games-puzzle/atomix/atomix-3.18.0.ebuild
+++ b/games-puzzle/atomix/atomix-3.18.0.ebuild
@@ -15,13 +15,10 @@ IUSE=""
RDEPEND="
>=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.4.23
>=x11-libs/gdk-pixbuf-2.0.5:2
- >=x11-libs/gtk+-3.10:3
-"
+ >=x11-libs/gtk+-3.10:3"
DEPEND="${RDEPEND}
dev-libs/appstream-glib
>=dev-util/intltool-0.40
sys-devel/gettext
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index 249648044e8..ecc017d7665 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -10,6 +10,11 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <email>itumaykin+gentoo@gmail.com</email>
+ <name>Coacher</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
<use>
<flag name="mac">Add support for Monkey's Audio files</flag>
<flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag>
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index d293cf19fe9..3810f3338bd 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1 +1,2 @@
DIST pianobar-2014.09.28.tar.bz2 51810 SHA256 6bd10218ad5d68c4c761e02c729627d2581b4a6db559190e7e52dc5df177e68f SHA512 3a9a508eaa4f1060ab456c4e28cd5447ed0a2e6a15b7694bf711ffa363d86c27483b1956da7f90919c9111c48752a99b9f704e721924903c017355dd577bc905 WHIRLPOOL 35db2f53b194d61c8601f27a787319036e5a59d86734ffd6ee00762fb66b2265c0f5b99aeea7ebffc9ebf5f8aa1430acc136e3486e6fa8cd2b355c439e96b68b
+DIST pianobar-2015.11.22.tar.bz2 45973 SHA256 23fbc9e6f55b3277dba7a0f68ff721bad7f1eeea504c616ba008841686de322b SHA512 cd8f7307f0d7bd0359954202d2fc3b6d9fdcdc7238a2057c1541f85d62d69fafb22c4a6466d873c35727c1ad1576755ac2f9224dd5ce4ccba2d9c1c8b9a0205a WHIRLPOOL 30c6a43b2cad991d28ca7de981a950debed1f7b6097f71346ea181857e9599a3bf362153ffd040dbed1bc2a1b3459e96e48e5b963ffcb5a87d19157cf6d96ba8
diff --git a/media-sound/pianobar/pianobar-2015.11.22.ebuild b/media-sound/pianobar/pianobar-2015.11.22.ebuild
new file mode 100644
index 00000000000..0b27aa69c6e
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2015.11.22.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+else
+ SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libao
+ net-misc/curl
+ dev-libs/libgcrypt:0=
+ dev-libs/json-c
+ >=virtual/ffmpeg-9"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -e '/@echo /d' \
+ -e 's/@${CC}/${CC}/' \
+ -i Makefile || die
+}
+
+src_compile() {
+ append-cflags -std=c99
+ tc-export CC
+ emake DYNLINK=1
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+ dodoc ChangeLog README.md
+
+ use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
+
+ docinto contrib
+ dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+ docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index 4c492a8cea9..0b27aa69c6e 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -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$
@@ -21,7 +21,7 @@ SLOT="0"
IUSE="static-libs"
RDEPEND="media-libs/libao
- net-libs/gnutls
+ net-misc/curl
dev-libs/libgcrypt:0=
dev-libs/json-c
>=virtual/ffmpeg-9"
diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild
index f94961aeff9..6320424e2c3 100644
--- a/media-video/aegisub/aegisub-3.0.4.ebuild
+++ b/media-video/aegisub/aegisub-3.0.4.ebuild
@@ -13,7 +13,10 @@ inherit autotools-utils fdo-mime gnome2-utils l10n wxwidgets
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
+SRC_URI="
+ http://ftp.aegisub.org/pub/releases/${P}.tar.xz
+ ftp://ftp.aegisub.org/pub/releases/${P}.tar.xz
+"
LICENSE="BSD"
SLOT="0"
diff --git a/media-video/aegisub/aegisub-3.2.2.ebuild b/media-video/aegisub/aegisub-3.2.2.ebuild
index e6f23ec43cf..185e7f1d35a 100644
--- a/media-video/aegisub/aegisub-3.2.2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2.ebuild
@@ -13,7 +13,10 @@ inherit autotools-utils fdo-mime gnome2-utils l10n toolchain-funcs wxwidgets
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
-SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
+SRC_URI="
+ http://ftp.aegisub.org/pub/releases/${P}.tar.xz
+ ftp://ftp.aegisub.org/pub/releases/${P}.tar.xz
+"
LICENSE="BSD"
SLOT="0"
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 036d2accb52..1bead13bde4 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -9,6 +9,11 @@
<email>maksbotan@gentoo.org</email>
</maintainer>
<maintainer>
+ <email>itumaykin+gentoo@gmail.com</email>
+ <name>Coacher</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer>
<email>nikoli@gmx.us</email>
</maintainer>
<herd>video</herd>
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
index 1a798bd79f1..006ebd0a056 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
@@ -15,7 +15,7 @@ PYTHON_COMPAT=( python2_7 )
inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 18c6e9075a3..46dbcae8657 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -15,7 +15,7 @@ PYTHON_COMPAT=( python2_7 )
inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/"
+HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild
index 9ca7cf4070a..0cb790b1941 100644
--- a/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild
+++ b/net-irc/irc-server/irc-server-2.11.1_p1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
LICENSE="GPL-1"
SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="zlib ipv6"
RDEPEND="sys-libs/ncurses
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index eb8b28a2c41..3e781d5b4e9 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -2,3 +2,4 @@ DIST nghttp2-1.0.5.tar.gz 1356748 SHA256 64e066816606178188bfaf0aa7298e1f44cef94
DIST nghttp2-1.2.1.tar.gz 1399177 SHA256 133451219eacbdd7e37438dd63296e037621a3323d5c8446c35f0c89ab665c7e SHA512 3d7621243f037f4ec6143dcc3f0ad3489faf3a94ce409909eea47dbb59f2a1d80eaf295c59f7fccc2501f26d706c2355c4c26d8c9649c1479dbc4feac2846800 WHIRLPOOL 9a83045f5f619700db7715f048e0e0958552abfc2248f398880b85d278c12b5789810596a724823d903993f39025f49f7e68ce386220ed6fbfa35bd914a549a5
DIST nghttp2-1.3.2.tar.gz 1824304 SHA256 aeafb76acf246352cc0638fbfb8eff999fef7cf18a5bf01a6a77b0af35d14b28 SHA512 85cc1be056dae8c479c6e45d69b52ad575d7e82c271ed8c27548639d5a167c79986a2bb4ffdbe4a0112732b57635c8f6ca38436b5b19faadbe2e8d5dc7b1d8f5 WHIRLPOOL badd7a0062ae6a4400a8a7ef3381b36844c22d44ac84de718ffea0d305bc402fd105452a482f7e8e607c88d674193f015d66b868e0d9c26ff2fe20465bbc1eb2
DIST nghttp2-1.3.4.tar.gz 1836736 SHA256 70da762f021ca6a56912da112f414da8100b035e635bfb056fcf35289229e9ce SHA512 ef47d25f1f214a4f79b4873567f799ec1f9ebb432e57b5f1106fcf0f1a1c0365176125273c7c7a36e826ede43c356413d143f09204206c41dc90c33a1ce33801 WHIRLPOOL e426530bb98a8006dd3ffcd57a151f6c4952c203500c34ee6ebe3ded8a4a44d2d5582763aeb80d373fbd602e0df3e0eefb852d8b98e24b8aa6f3fd68894752a3
+DIST nghttp2-1.4.0.tar.gz 1966441 SHA256 e310ac7a3e9e9d117d5b8bfcd7268bfa3aa5ee888c1503cf5abb9e5b240672a9 SHA512 cadf76ebe02ce90fc5aeee063b597cc13d2352458efd2b86822638137ae6e3c0a384ee9f1de839d64305afc58a96654781c1b9f4bac3b3663fc67e4fa33d3815 WHIRLPOOL 042f9ac0906219116d635c4837573be5d4a96a86560c55eb3485a93f2f64624607b8eb547152a658268abd5e5ccb707d70bd58bb39276ab9a6f36ba252584869
diff --git a/net-libs/nghttp2/nghttp2-1.0.5.ebuild b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
index a19e2eb2e49..fb9316967c0 100644
--- a/net-libs/nghttp2/nghttp2-1.0.5.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.0.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-2
else
SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
- 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"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-libs/nghttp2/nghttp2-1.4.0.ebuild b/net-libs/nghttp2/nghttp2-1.4.0.ebuild
new file mode 100644
index 00000000000..7ef717f44ed
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.4.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ !libressl? ( >=dev-libs/openssl-1.0.2:0 )
+ libressl? ( dev-libs/libressl )
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index d1476aea005..ac58e7f6e6a 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,2 @@
DIST curl-7.43.0.tar.bz2 3363770 SHA256 baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9 SHA512 0b06ec078680619f56a458ac115142546134917331b71b73ed2c0371c480034dac7ed848814be0dd1e752154c53e48b9e0276b83f75a690df6cfb480ab331272 WHIRLPOOL e5c97b3cbf0f9915f62a100ce2972e6cffcabae753770c2f0a1fc3bcef3a66c0a2d4d7e361b00f442d62eca3b0d9526eb34f6b043fb655648180e81ef630a527
-DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd
DIST curl-7.45.0.tar.bz2 3473632 SHA256 65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea SHA512 71c557c69eb8d160f74a9b76ef83a46ce33ef4e8a66a261699329583dadf10205b4ba4783f92d4e6c8724f6610ffade5b0a9f189b0a7b9169ff839dfc8980481 WHIRLPOOL afc1627cebb64c9111f943fe63d95c8a998934fd02e3b8d12f061d23b174b7475c48451ecc1713ce54771455a6465238aa3b818b0eb9ba5c86ffd06eb1f2bc76
diff --git a/net-misc/curl/curl-7.44.0-r1.ebuild b/net-misc/curl/curl-7.44.0-r1.ebuild
deleted file mode 100644
index 93ba07323aa..00000000000
--- a/net-misc/curl/curl-7.44.0-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- ssl? (
- curl_ssl_axtls? (
- >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- curl_ssl_gnutls? (
- || (
- (
- >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
- )
- (
- =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
- )
- (
- =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
- )
- )
- app-misc/ca-certificates
- )
- curl_ssl_libressl? (
- dev-libs/libressl[static-libs?,${MULTILIB_USEDEP}]
- )
- curl_ssl_openssl? (
- >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
- )
- curl_ssl_nss? (
- >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- curl_ssl_polarssl? (
- >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
- idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-# ssl providers to be added:
-# fbopenssl $(use_with spnego)
-
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- test? (
- sys-apps/diffutils
- dev-lang/perl
- )"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
- curl_ssl_winssl? ( elibc_Winnt )
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_axtls
- curl_ssl_gnutls
- curl_ssl_libressl
- curl_ssl_openssl
- curl_ssl_nss
- curl_ssl_polarssl
- curl_ssl_winssl
- )
- )"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
- docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
- "${FILESDIR}"/${PN}-respect-cflags-3.patch \
- "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
- epatch_user
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- einfo "\033[1;32m**************************************************\033[00m"
-
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- local myconf=()
- myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- if use ssl ; then
- if use curl_ssl_axtls; then
- einfo "SSL provided by axtls"
- einfo "NOTE: axtls is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-axtls )
- fi
- if use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
- einfo "gnutls compiled with dev-libs/nettle"
- myconf+=( --with-gnutls --with-nettle )
- else
- einfo "gnutls compiled with dev-libs/libgcrypt"
- myconf+=( --with-gnutls --without-nettle )
- fi
- fi
- if use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use curl_ssl_polarssl; then
- einfo "SSL provided by polarssl"
- einfo "NOTE: polarssl is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-polarssl )
- fi
- if use curl_ssl_libressl; then
- einfo "SSL provided by LibreSSL"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use curl_ssl_winssl; then
- einfo "SSL provided by Windows"
- myconf+=( --with-winssl )
- fi
- else
- einfo "SSL disabled"
- fi
- einfo "\033[1;32m**************************************************\033[00m"
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dict \
- --enable-file \
- --enable-ftp \
- --enable-gopher \
- --enable-http \
- --enable-imap \
- $(use_enable ldap) \
- $(use_enable ldap ldaps) \
- --enable-pop3 \
- --enable-rt \
- --enable-rtsp \
- $(use_enable samba smb) \
- $(use_with ssh libssh2) \
- --enable-smtp \
- --enable-telnet \
- --enable-tftp \
- $(use_enable adns ares) \
- --enable-cookies \
- --enable-hidden-symbols \
- $(use_enable ipv6) \
- --enable-largefile \
- --enable-manual \
- --enable-proxy \
- --disable-soname-bump \
- --disable-sspi \
- $(use_enable static-libs static) \
- $(use_enable threads threaded-resolver) \
- --disable-versioned-symbols \
- --without-cyassl \
- --without-darwinssl \
- $(use_with idn libidn) \
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \
- --without-krb4 \
- $(use_with metalink libmetalink) \
- $(use_with http2 nghttp2) \
- $(use_with rtmp librtmp) \
- --without-spnego \
- --without-winidn \
- --with-zlib \
- "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- rm -rf "${ED}"/etc/
-
- # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
- insinto /usr/share/aclocal
- doins docs/libcurl/libcurl.m4
-}
diff --git a/net-misc/curl/curl-7.44.0.ebuild b/net-misc/curl/curl-7.44.0.ebuild
deleted file mode 100644
index 0ebbfc4c1c9..00000000000
--- a/net-misc/curl/curl-7.44.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="http://curl.haxx.se/"
-SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- ssl? (
- curl_ssl_axtls? (
- >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- curl_ssl_gnutls? (
- || (
- (
- >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
- )
- (
- =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
- )
- (
- =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
- )
- )
- app-misc/ca-certificates
- )
- curl_ssl_openssl? (
- >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
- )
- curl_ssl_nss? (
- >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- curl_ssl_polarssl? (
- >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
- idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
- adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
- rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
- ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
-# rtmp? (
-# media-video/rtmpdump
-# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
-# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
-# )
-
-# ssl providers to be added:
-# fbopenssl $(use_with spnego)
-
-# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
-
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- test? (
- sys-apps/diffutils
- dev-lang/perl
- )"
-
-# c-ares must be disabled for threads
-# only one ssl provider can be enabled
-REQUIRED_USE="
- curl_ssl_winssl? ( elibc_Winnt )
- threads? ( !adns )
- ssl? (
- ^^ (
- curl_ssl_axtls
- curl_ssl_gnutls
- curl_ssl_openssl
- curl_ssl_nss
- curl_ssl_polarssl
- curl_ssl_winssl
- )
- )"
-
-DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \
- docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/curl/curlbuild.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/curl-config
-)
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-7.30.0-prefix.patch \
- "${FILESDIR}"/${PN}-respect-cflags-3.patch \
- "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
-
- sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
-
- epatch_user
- eprefixify curl-config.in
- eautoreconf
-}
-
-multilib_src_configure() {
- einfo "\033[1;32m**************************************************\033[00m"
-
- # We make use of the fact that later flags override earlier ones
- # So start with all ssl providers off until proven otherwise
- local myconf=()
- myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl )
- myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt )
- if use ssl ; then
- if use curl_ssl_axtls; then
- einfo "SSL provided by axtls"
- einfo "NOTE: axtls is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-axtls )
- fi
- if use curl_ssl_gnutls; then
- einfo "SSL provided by gnutls"
- if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
- einfo "gnutls compiled with dev-libs/nettle"
- myconf+=( --with-gnutls --with-nettle )
- else
- einfo "gnutls compiled with dev-libs/libgcrypt"
- myconf+=( --with-gnutls --without-nettle )
- fi
- fi
- if use curl_ssl_nss; then
- einfo "SSL provided by nss"
- myconf+=( --with-nss )
- fi
- if use curl_ssl_polarssl; then
- einfo "SSL provided by polarssl"
- einfo "NOTE: polarssl is meant for embedded systems and"
- einfo "may not be the best choice as an ssl provider"
- myconf+=( --with-polarssl )
- fi
- if use curl_ssl_openssl; then
- einfo "SSL provided by openssl"
- myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
- fi
- if use curl_ssl_winssl; then
- einfo "SSL provided by Windows"
- myconf+=( --with-winssl )
- fi
- else
- einfo "SSL disabled"
- fi
- einfo "\033[1;32m**************************************************\033[00m"
-
- # These configuration options are organized alphabetically
- # within each category. This should make it easier if we
- # ever decide to make any of them contingent on USE flags:
- # 1) protocols first. To see them all do
- # 'grep SUPPORT_PROTOCOLS configure.ac'
- # 2) --enable/disable options second.
- # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
- # 3) --with/without options third.
- # grep -- --with configure | grep Check | awk '{ print $4 }' | sort
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dict \
- --enable-file \
- --enable-ftp \
- --enable-gopher \
- --enable-http \
- --enable-imap \
- $(use_enable ldap) \
- $(use_enable ldap ldaps) \
- --enable-pop3 \
- --enable-rt \
- --enable-rtsp \
- $(use_enable samba smb) \
- $(use_with ssh libssh2) \
- --enable-smtp \
- --enable-telnet \
- --enable-tftp \
- $(use_enable adns ares) \
- --enable-cookies \
- --enable-hidden-symbols \
- $(use_enable ipv6) \
- --enable-largefile \
- --enable-manual \
- --enable-proxy \
- --disable-soname-bump \
- --disable-sspi \
- $(use_enable static-libs static) \
- $(use_enable threads threaded-resolver) \
- --disable-versioned-symbols \
- --without-cyassl \
- --without-darwinssl \
- $(use_with idn libidn) \
- $(use_with kerberos gssapi "${EPREFIX}"/usr) \
- --without-krb4 \
- $(use_with metalink libmetalink) \
- $(use_with http2 nghttp2) \
- $(use_with rtmp librtmp) \
- --without-spnego \
- --without-winidn \
- --with-zlib \
- "${myconf[@]}"
-
- if ! multilib_is_native_abi; then
- # avoid building the client
- sed -i -e '/SUBDIRS/s:src::' Makefile || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- rm -rf "${ED}"/etc/
-
- # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976
- insinto /usr/share/aclocal
- doins docs/libcurl/libcurl.m4
-}
diff --git a/net-misc/curl/curl-7.45.0.ebuild b/net-misc/curl/curl-7.45.0.ebuild
index 93ba07323aa..ad3e1d4bc8f 100644
--- a/net-misc/curl/curl-7.45.0.ebuild
+++ b/net-misc/curl/curl-7.45.0.ebuild
@@ -27,20 +27,8 @@ RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
app-misc/ca-certificates
)
curl_ssl_gnutls? (
- || (
- (
- >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
- )
- (
- =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
- )
- (
- =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
- >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
- )
- )
+ >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
app-misc/ca-certificates
)
curl_ssl_libressl? (
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 7f98dcb6799..6878a7769f5 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,3 +1,4 @@
DIST dropbear-2014.66.tar.bz2 1604981 SHA256 ab3fe2670a517cc0bbe398ff5d15e9ca12cd14f2fc18930a8111ae2baa64ab76 SHA512 3005f754ad97e5eb84221740577f4dd962e38f38b3f6ba84dbb0811a7a35d487069c35b30055e129541c224769fe0a7e594084a9b0f1cc667029ad43d4988149 WHIRLPOOL c077328bf5c21faa655f3a2e6fe1aa775b046eec7cf0f527a86c0ec01b62ab9c6ae3530fcdf49db19be8208ea22f8cd198cd3ab6a5eb605a55daf0bf0c40e4ff
DIST dropbear-2015.67.tar.bz2 1606312 SHA256 7e690594645dfde5787065c78a5d2e4d15e288babfa06e140197ce05f698c8e5 SHA512 6a23f7dbe8ccd39683488a16ce4db39cdba529e9d302165742eb818d3cf520a3793660ff6c8ce0520ddb87dcac726ff34ed3dbcb7efa83115deafad2c6c0a5f3 WHIRLPOOL c1103be19c86a0b40ca262715646244911032e97aba52279be1f7a0382367554c34455497b604dacacb69da0873fd26d3d457abeb7d265e6ca6bdff8938dc065
DIST dropbear-2015.68.tar.bz2 1611161 SHA256 55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446 SHA512 7725cd4077a3968684db3646f6013c6202977e79d281619e029366e45fca9c4e33e271812626237b6e33938eeb4c8b260902fe2b57cff085086bf930713a934a WHIRLPOOL a80d3907528b0d754f1a474846794ac9ba48003bbb723164c7db84c9b46263b47631712b15e29b863e64ad924d889976250e8af98b2b1ca91fb586ff0a1d4186
+DIST dropbear-2015.69.tar.bz2 1613320 SHA256 5d4f5362fc102a0d7cdf1c8cd908c3c4c5cf5c8772936ed639774a08e27517c9 SHA512 0c9e1e7400e8f6dadf58252263308e1435c92154cf7223b55ee7e1a71c92e991d37a2fd54fa27fd3e953b7f42b2a5de0ca21a311f3a87ee2c8545a0e86fa9601 WHIRLPOOL a307d34c27964c4996199c958cb42a0d85fa03818607a66622d43388547685af36d2d435ce62a7c5b7d982c1035a5870d5be069f7c69642f3ae5440c8aaeb17b
diff --git a/net-misc/dropbear/dropbear-2015.69.ebuild b/net-misc/dropbear/dropbear-2015.69.ebuild
new file mode 100644
index 00000000000..d0d661e358e
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2015.69.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+ http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+ dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+set_options() {
+ progs=(
+ dropbear dbclient dropbearkey
+ $(usex minimal "" "dropbearconvert scp")
+ )
+ makeopts=(
+ MULTI=$(usex multicall 1 0)
+ STATIC=$(usex static 1 0)
+ )
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+ sed -i \
+ -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+ options.h || die
+ sed -i \
+ -e '/pam_start/s:sshd:dropbear:' \
+ svr-authpam.c || die
+ restore_config options.h
+}
+
+src_configure() {
+ # XXX: Need to add libtomcrypt to the tree and re-enable this.
+ # --disable-bundled-libtom
+ econf \
+ $(use_enable zlib) \
+ $(use_enable pam) \
+ $(use_enable !bsdpty openpty) \
+ $(use_enable shadow) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+ doman *.8
+ newinitd "${FILESDIR}"/dropbear.init.d dropbear
+ newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+ dodoc CHANGES README TODO SMALL MULTI
+
+ # The multi install target does not install the links right.
+ if use multicall ; then
+ cd "${ED}"/usr/bin
+ local x
+ for x in "${progs[@]}" ; do
+ ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+ done
+ rm -f dropbear
+ dodir /usr/sbin
+ dosym ../bin/dropbearmulti /usr/sbin/dropbear
+ cd "${S}"
+ fi
+ save_config options.h
+
+ if ! use minimal ; then
+ mv "${ED}"/usr/bin/{,db}scp || die
+ fi
+
+ pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+ enewgroup sshd 22
+ enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-p2p/tribler/tribler-6.3.3-r1.ebuild b/net-p2p/tribler/tribler-6.3.3-r1.ebuild
index cf59f787deb..7a9b74c771b 100644
--- a/net-p2p/tribler/tribler-6.3.3-r1.ebuild
+++ b/net-p2p/tribler/tribler-6.3.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2.1+ PSF-2.4 openssl wxWinLL-3.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="vlc"
RDEPEND="
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild
new file mode 100644
index 00000000000..485905359d2
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
+HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+ amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+ http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_setup() {
+ # bug #300570
+ # NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+ # make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+ # b43 via udev rules. Moreover, previous fix broke binpkgs support.
+ CONFIG_CHECK="~!B43 ~!BCMA ~!SSB"
+ CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+ ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+ ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
+ ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+ ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+ ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+ ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+ ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+ if kernel_is ge 3 8 8; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+ elif kernel_is ge 2 6 32; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+ elif kernel_is ge 2 6 31; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+ elif kernel_is ge 2 6 29; then
+ CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
+ else
+ CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+ fi
+
+ linux-mod_pkg_setup
+
+ BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+ BUILD_TARGETS="wl.ko"
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
+ "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
+ "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
+ "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" \
+ "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \
+ "${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3.patch"
+
+ epatch_user
+}
+
+src_install() {
+ linux-mod_src_install
+
+ dodoc "${DISTDIR}/README-${P}.txt"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch
new file mode 100644
index 00000000000..ae0dc561464
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-linux-4.3.patch
@@ -0,0 +1,11 @@
+--- a/src/shared/linux_osl.c 2015-09-19 00:47:15.000000000 +0200
++++ b/src/shared/linux_osl.c 2015-11-09 17:02:22.000000000 +0100
+@@ -932,7 +932,7 @@
+ uint cycles;
+
+ #if defined(__i386__)
+- rdtscl(cycles);
++ cycles = (u32)native_read_tsc();
+ #else
+ cycles = 0;
+ #endif
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index fecfa8d66cd..f62dedc6e7a 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Anthony G. Basile <blueness@gentoo.org> (25 Nov 2015)
+# mask http2 on net-misc/curl until stabilized, bug #558734
+net-misc/curl http2
+
# Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
# requires dev-python/restkit which requires
# dev-python/socketpool which requires dev-python/gevent which requires
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ae90c6fe86a..e738d553ee0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -121,11 +121,6 @@ dev-java/oracle-jre-bin javafx nsplugin
app-text/cmigemo emacs
www-client/w3m migemo
-# Anthony G. Basile <blueness@gentoo.org> (04 Jul 2015)
-# USE=http2 depends on net-libs/nghttp2 which was recently
-# added to the tree and is still not stable. Bug #552618.
-net-misc/curl http2
-
# Gilles Dartiguelongue <eva@gentoo.org> (25 May 2015)
# webkit fails to build with USE=wayland, bug #549228
# https://bugs.webkit.org/show_bug.cgi?id=142879
diff --git a/profiles/default/linux/uclibc/mips/package.use b/profiles/default/linux/uclibc/package.use
index d19ce9937a3..d19ce9937a3 100644
--- a/profiles/default/linux/uclibc/mips/package.use
+++ b/profiles/default/linux/uclibc/package.use
diff --git a/profiles/default/linux/uclibc/use.mask b/profiles/default/linux/uclibc/use.mask
index 421c0bcbd34..03acc65fd71 100644
--- a/profiles/default/linux/uclibc/use.mask
+++ b/profiles/default/linux/uclibc/use.mask
@@ -9,3 +9,4 @@ pam
-elibc_uclibc
elibc_glibc
+elibc_musl
diff --git a/profiles/package.mask b/profiles/package.mask
index 90e7da4abf4..6550b5a97b4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -657,8 +657,8 @@ dev-java/sun-jce-bin
# Julian Ospald <hasufell@gentoo.org> (26 Jun 2013)
# Depends on masked dev-lang/lua-5.2
->=games-emulation/sdlmame-0.149
->=games-emulation/sdlmess-0.149
+=games-emulation/sdlmame-0.149
+=games-emulation/sdlmess-0.149
# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (25 Jun 2013)
# Mask new ptlib/opal for breakage, tracked in bug #474742
diff --git a/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 46dcc689dfe..959f0f5b5c9 100644
--- a/sys-libs/nss_wrapper/Manifest
+++ b/sys-libs/nss_wrapper/Manifest
@@ -1,2 +1,3 @@
DIST nss_wrapper-1.0.3.tar.gz 42535 SHA256 285427ff84020f804b738c1e7154407b4f7017748bce48ce94c0a6b8656cda2f SHA512 3d921b1529e225d4060193ed8b491557d71c172d13d76188f2c9eaeef90f2a5f999ed1cc5b5be1feebf705147371d333355a5587049ecb66f39049a8da1dbf8d WHIRLPOOL ea643931f56e9449f6dce4d9ece943ba9701d758f7a893aae05fa0b5c0f924ba34a046b1cb3392e37c43de6e7ea60ec84db224e83bc111a321135b81addcb1d4
DIST nss_wrapper-1.1.0.tar.gz 52804 SHA256 c495e3546762a1930ecc23aa852e25b96913ce4beea3059b1b27d7c2ac72fe39 SHA512 16e773a1c1af91bbed17fbfb0c554455bfef1420d55ab99ae127057677a0974d84a6a66276faf92745aa6f5f2d1a3d9e3c1539a1725f64a9f3052b313b1cc1d1 WHIRLPOOL 0ad94304676a89adc8199f1fe955bc6f26e3b1f747c485f60280e04cf9af8951894650e8f19d45f66092178785bbda690df142e1e4431bc523d37a68a01ea39d
+DIST nss_wrapper-1.1.1.tar.gz 52820 SHA256 9f5bda4f5bbfa26cf69816c6ef312b399ab9ca33675dd122aef0d744328d4938 SHA512 493b9fc52896d23a113b27328a61cfcd9473044c86c36a6be9354204236fac632be37b71fb2ac7d602f31eb88869e2e1d7994221c7bcb4139fc0fa859ac359c1 WHIRLPOOL 0a098f6e9af67972eeb50a12252a96de6d9c1c65049cdd391d19b1ee789d6e1e62e5895d8d121bd5144cce4df1eb1481af3b5ea2a82251363a9721893f693848
diff --git a/sys-libs/nss_wrapper/nss_wrapper-1.1.1.ebuild b/sys-libs/nss_wrapper/nss_wrapper-1.1.1.ebuild
new file mode 100644
index 00000000000..028028a54c4
--- /dev/null
+++ b/sys-libs/nss_wrapper/nss_wrapper-1.1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib
+
+DESCRIPTION="A wrapper for the user, group and hosts NSS API"
+HOMEPAGE="https://cwrap.org/nss_wrapper.html"
+SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+ local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+ cmake-utils_src_configure
+}
diff --git a/sys-process/procps/procps-3.3.10-r1.ebuild b/sys-process/procps/procps-3.3.10-r1.ebuild
index c480af8382c..f254f340a15 100644
--- a/sys-process/procps/procps-3.3.10-r1.ebuild
+++ b/sys-process/procps/procps-3.3.10-r1.ebuild
@@ -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/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 6e88e73ed43..0ea45d7111b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 d805dec3b387a244c4285ce1f9fc
DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb WHIRLPOOL 3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
+DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
diff --git a/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch
new file mode 100644
index 00000000000..1923d23ba50
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.29-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml 2015-07-01 21:25:21.000000000 +0100
++++ apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+ <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${servlet-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.servlet-api"
+ manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+ notice="${tomcat.manifests}/servlet-api.jar.notice"
+ license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+ <!-- JSP 2.3 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${jsp-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.jsp-api"
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+
+ <!-- EL 3.0 Implementation JAR File -->
++<!--
+ <jarIt jarfile="${el-api.jar}"
+ filesDir="${tomcat.classes}"
+ filesId="files.el-api"
+ manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+
+ <!-- WebSocket 1.1 API JAR File -->
+ <jarIt jarfile="${websocket-api.jar}"
+@@ -982,14 +987,14 @@
+
+ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+ description="Default. Builds a working Tomcat instance">
+-
++<!--
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+ file="${tomcat-native.tar.gz}" />
+ <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+ file="${commons-daemon.native.src.tgz}" />
+
+ <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+ <!-- Copy scripts -->
+ <copy todir="${tomcat.build}/bin">
+ <fileset dir="bin">
+@@ -1049,7 +1054,7 @@
+ <exclude name="${jdt.jar.filename}"/>
+ </fileset>
+ </delete>
+- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+@@ -1083,7 +1088,7 @@
+ </javac>
+ </target>
+
+- <target name="build-tomcat-jdbc" depends="package">
++ <target name="build-tomcat-jdbc" depends="package" unless="noget">
+ <!-- build the jdbc-pool jar and source jar-->
+ <echo message="Building Tomcat JDBC pool libraries"/>
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1098,7 +1103,7 @@
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+- <target name="build-tomcat-jdbc-src">
++ <target name="build-tomcat-jdbc-src" unless="noget">
+ <!-- build the jdbc-pool source jar-->
+ <echo message="Building Tomcat JDBC pool src JAR"/>
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1202,10 +1207,11 @@
+
+ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+ <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+ failonerror="false"/>
+ <copy file="${jdt.jar}" todir="${tomcat.embed}" />
+-
++-->
+ <!-- Note the meta-inf below will work as long as there is only one JAR
+ that needs to add entries. If there is more than one a more complex
+ solution will be required. -->
+@@ -1542,7 +1548,7 @@
+
+ <target name="extras-commons-logging-prepare"
+ depends="extras-prepare"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+@@ -1681,7 +1687,7 @@
+
+ <target name="extras-webservices-prepare"
+ depends="extras-prepare"
+- description="Prepare to build web services extras package">
++ description="Prepare to build web services extras package" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1882,6 +1888,7 @@
+
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+ description="Create the Tomcat javadoc" >
++<!--
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+@@ -1940,6 +1947,7 @@
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
++-->
+ <javadoc packagenames="javax.websocket.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1970,15 +1978,17 @@
+ docencoding="UTF-8"
+ charset="UTF-8"
+ additionalparam="-breakiterator -notimestamp"
+- maxmemory="256m" >
++ maxmemory="512m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
++<!--
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
++-->
+ <link href="../websocketapi"/>
+ <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+ <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+ </target>
+
+ <target name="download-compile"
+- description="Download (and build) components necessary to compile" >
++ description="Download (and build) components necessary to compile" unless="noget">
+
+ <antcall target="downloadfile-2">
+ <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2773,7 +2783,7 @@
+ </target>
+
+ <target name="download-test-compile"
+- description="Download additional components for the tests" >
++ description="Download additional components for the tests" unless="noget">
+
+ <antcall target="downloadfile">
+ <param name="sourcefile" value="${junit.loc}"/>
+@@ -2819,7 +2829,7 @@
+ </target>
+
+ <target name="download-dist"
+- description="Download additional components for a distribution" >
++ description="Download additional components for a distribution" unless="noget">
+
+ <antcall target="downloadzip-2">
+ <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+@@ -2845,18 +2855,18 @@
+
+ <!-- =============== Utility Targets to support downloads ================ -->
+
+- <target name="setproxy" if="${proxy.use}">
++ <target name="setproxy" if="${proxy.use}" unless="noget">
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+- <target name="testexist">
++ <target name="testexist" unless="noget">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+- <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++ <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2868,7 +2878,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadgz-2" unless="exist" depends="testexist">
++ <target name="downloadgz-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2887,7 +2897,7 @@
+ <delete file="${temp.file}.tar.gz"/>
+ </target>
+
+- <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++ <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+ <!-- Download and extract the package -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2898,7 +2908,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadzip-2" unless="exist" depends="testexist">
++ <target name="downloadzip-2" unless="noget" depends="testexist">
+ <!-- Download and extract the package from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2916,7 +2926,7 @@
+ <delete file="${temp.file}"/>
+ </target>
+
+- <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++ <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+ <!-- Download the file -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2926,7 +2936,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="downloadfile-2" unless="exist" depends="testexist">
++ <target name="downloadfile-2" unless="noget" depends="testexist">
+ <!-- Download the file from the two alternative locations -->
+ <local name="temp.file"/>
+ <mkdir dir="${base.path}"/>
+@@ -2949,7 +2959,7 @@
+ <move file="${temp.file}" tofile="${destfile}"/>
+ </target>
+
+- <target name="trydownload.check" depends="setproxy">
++ <target name="trydownload.check" depends="setproxy" unless="noget">
+ <condition property="trydownload.run">
+ <and>
+ <not>
+@@ -2960,7 +2970,7 @@
+ </condition>
+ </target>
+
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+ <!-- Downloads a file if not yet downloaded and the source URL is available -->
+ <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+ </target>
+@@ -2971,7 +2981,7 @@
+
+ <target name="ide-eclipse"
+ depends="download-compile, extras-webservices-prepare, download-test-compile"
+- description="Prepares the source tree to be built in Eclipse">
++ description="Prepares the source tree to be built in Eclipse" unless="noget">
+
+ <!-- Copy the sample project files into the root directory -->
+ <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.29.ebuild b/www-servers/tomcat/tomcat-8.0.29.ebuild
new file mode 100644
index 00000000000..3595c5707fe
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.29.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.4"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+ dev-java/oracle-javamail:0
+ dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+ !<dev-java/tomcat-native-1.1.24
+ >=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+ app-admin/pwgen
+ >=virtual/jdk-1.7
+ test? (
+ >=dev-java/ant-junit-1.9:0
+ dev-java/easymock:3.2
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -type f -delete -print || die
+
+ # Remove bundled javamail, servlet-api
+ rm -rv java/javax/{el,mail,servlet} || die
+
+ epatch "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ # add missing docBase
+ local apps="host-manager manager"
+ for app in ${apps}; do
+ sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+ output/build/webapps/${app}/META-INF/context.xml || die
+ done
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # create "logs" directory in $CATALINA_BASE
+ # and set correct perms, see #458890
+ dodir "${dest}"/logs
+ fperms 0750 "${dest}"/logs
+
+ # replace the default pw with a random one, see #92281
+ local randpw="$(pwgen -s -B 15 1)"
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ # prepend gentoo.classpath to common.loader, see #453212
+ sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+ newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 8e420d7e701..83c6f0e4fe4 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -2,3 +2,4 @@ DIST xf86-input-wacom-0.24.0.tar.bz2 581176 SHA256 96478b26c125938245d386f50b528
DIST xf86-input-wacom-0.29.0.tar.bz2 589495 SHA256 88507e76f1eb98a20c4381806e03c694adcff88ac0028f93892019a7a6fc8b96 SHA512 26035a0b49f15f1782ab0ffe4c24383db84f203f0e8c2e82a9e1f4fa015bc3272b6e7250ee2c25eaa1bba4c4eeb71775f2adc331d0df957bbb952dbe1c6766a4 WHIRLPOOL 68a89ea73370bcd7b9b79a7c17c6c10edf603c80300d3ea0b6092731bb9fff767fe4cc454a1f60585fa273165ce7706e72a6a07cf9d287867a504c385dcff8f1
DIST xf86-input-wacom-0.30.0.tar.bz2 591648 SHA256 8ad4e479a4fc6d3c18e680958a8f42c3c87f15fdf8d2561810ca01a0a78841f5 SHA512 115e87715e736d77ad4e45e29287c855289cea5871983b7ad2e7e1e64954078de184d1b78157e958a0c9e7b949061b4c5599e2b11e87d5019a843bcaa34e0381 WHIRLPOOL 92f93b8694760c5dfbfb0182909e5b2ec3a8c197143962249c032f51483f3b194db12ad522cdfe8401b7368f99395dbf0b941b73a9691cea19cc156a180e6fb6
DIST xf86-input-wacom-0.31.0.tar.bz2 592564 SHA256 e7e9723f048071adabc878bf6139342ea39dea5e3a8134452df5a33bef2e3f76 SHA512 6c24394038585d90b9b30c594b773b36b5ea26ea5eaab73519cd2e1b56eb2ad3e1f3991ca3962a70468da32e83105c9619f524afbf4e6c500661c7c62b4261e8 WHIRLPOOL d84326730a73a50c420876c2e81adc836dcf657d746e09b614902c879390230c43d657f748fd015f874ebe11f277c9b586ddaf762e1aac551ff05a74321c48ff
+DIST xf86-input-wacom-0.32.0.tar.bz2 594080 SHA256 8c97ac9afc8150a7c45426e2ccb00fe22eb52671024d41884899e55ce21e870d SHA512 57991c8ba69281e85c14a23f4a2e7403f550118ac6cdee3c72798bc4342b5964318eeb5404302296fb7046d9dc49e167d2ed4d2e9441a28e39558e5e575dc21b WHIRLPOOL 1c9412126f21f1cbea4fe90195d1f9d0cd0ac62dc8469d73c8b830c8c750580b6bd951ee2cca7a0e7983d36596a257300c190f3ec4fc2422eb84f950e3383e74
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.32.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.32.0.ebuild
new file mode 100644
index 00000000000..8ec78b81c76
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.32.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+# depend on libwacom for its udev rules, bug #389633
+RDEPEND="dev-libs/libwacom
+ virtual/udev
+ >=x11-base/xorg-server-1.7
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+ x11-proto/randrproto"
+
+pkg_setup() {
+ linux-info_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable debug)
+ )
+}
+
+src_install() {
+ xorg-2_src_install
+
+ rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+ linux-info_pkg_setup
+
+ if ! linux_config_exists \
+ || ! linux_chkconfig_present TABLET_USB_WACOM \
+ || ! linux_chkconfig_present INPUT_EVDEV; then
+ echo
+ ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+ ewarn " Device Drivers --->"
+ ewarn " Input device support --->"
+ ewarn " <*> Event interface"
+ ewarn " [*] Tablets --->"
+ ewarn " <*> Wacom Intuos/Graphire tablet support (USB)"
+ echo
+ fi
+}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild
index 2faf4782c53..b13a50e98ba 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2-r1.ebuild
@@ -23,8 +23,7 @@ RDEPEND="dev-util/desktop-file-utils
x11-apps/xprop
x11-apps/xset
perl? ( dev-perl/File-MimeInfo )"
-DEPEND="app-text/xmlto
- || ( www-client/links www-client/lynx virtual/w3m )"
+DEPEND=">=app-text/xmlto-0.0.26-r1"
DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild
index 766e6f48940..25b7a025561 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.0_rc2.ebuild
@@ -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$
@@ -21,8 +21,7 @@ RDEPEND="dev-util/desktop-file-utils
x11-apps/xprop
x11-apps/xset
perl? ( dev-perl/File-MimeInfo )"
-DEPEND="app-text/xmlto
- || ( www-client/links www-client/lynx virtual/w3m )"
+DEPEND=">=app-text/xmlto-0.0.26-r1"
DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
index 19afc2ef21b..b5e36faf1ff 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1.ebuild
@@ -24,8 +24,7 @@ RDEPEND="dev-util/desktop-file-utils
x11-apps/xprop
x11-apps/xset
perl? ( dev-perl/File-MimeInfo )"
-DEPEND="app-text/xmlto
- || ( www-client/links www-client/lynx virtual/w3m )"
+DEPEND=">=app-text/xmlto-0.0.26-r1"
DOCS="README RELEASE_NOTES TODO" # ChangeLog is bogus, see git instead