summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-backup/backintime/backintime-1.1.4.ebuild2
-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-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--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/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--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.4.0.ebuild62
-rw-r--r--net-p2p/tribler/tribler-6.3.3-r1.ebuild2
-rw-r--r--sys-libs/nss_wrapper/Manifest1
-rw-r--r--sys-libs/nss_wrapper/nss_wrapper-1.1.1.ebuild25
31 files changed, 674 insertions, 17 deletions
diff --git a/app-backup/backintime/backintime-1.1.4.ebuild b/app-backup/backintime/backintime-1.1.4.ebuild
index 8c3700b24c90..2e00d75c9eae 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-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index 2d6f48019889..a0c6695decbb 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 0fec1e3570cd..0fec1e3570cd 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201501052117.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201511260245.ebuild
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 000000000000..76256da0f37a
--- /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 b9883e767e8a..528386280a67 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/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild
index 7cf1f69ac89d..e4696e87d7c9 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 60fc7418d096..c2be49f955b6 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 000000000000..89c7608d3244
--- /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 aea0f1dbbc88..afae027acc28 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 000000000000..3a7c4eaabb83
--- /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 000000000000..9225bd911701
--- /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/unidecode/unidecode-0.04.18.ebuild b/dev-python/unidecode/unidecode-0.04.18.ebuild
index b45f3af2e87a..3e4525b6f3ec 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 6603a4818039..763ee4b6e69e 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 000000000000..3b15943db4bc
--- /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 5314dbcd14db..762ef0214d92 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 000000000000..f75b19d07e53
--- /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/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index 249648044e80..ecc017d76658 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 d293cf19fe94..3810f3338bde 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 000000000000..0b27aa69c6e4
--- /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 4c492a8cea9d..0b27aa69c6e4 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 f94961aeff93..6320424e2c32 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 e6f23ec43cf4..185e7f1d35a3 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 036d2accb52f..1bead13bde4c 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 1a798bd79f1f..006ebd0a0569 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 18c6e9075a39..46dbcae86577 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 9ca7cf4070a6..0cb790b19414 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 eb8b28a2c418..3e781d5b4e99 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.4.0.ebuild b/net-libs/nghttp2/nghttp2-1.4.0.ebuild
new file mode 100644
index 000000000000..7ef717f44ed6
--- /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-p2p/tribler/tribler-6.3.3-r1.ebuild b/net-p2p/tribler/tribler-6.3.3-r1.ebuild
index cf59f787debe..7a9b74c771b5 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/sys-libs/nss_wrapper/Manifest b/sys-libs/nss_wrapper/Manifest
index 46dcc689dfe0..959f0f5b5c94 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 000000000000..028028a54c4f
--- /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
+}