[gentoo-commits] repo/gentoo:master commit in: profiles/arch/sparc/

2015-11-08 Thread Julian Ospald 
commit: 4a8ba7ea8bab265ad684e98c8a77408a6b533ab2
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Nov  8 14:12:14 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Nov  8 14:12:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8ba7ea

profiles: mask websocket USE flag for net-im/jabberd2 on sparc

 profiles/arch/sparc/package.use.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/arch/sparc/package.use.mask 
b/profiles/arch/sparc/package.use.mask
index 669c685..6bfa424 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$
 
+# Julian Ospald <hasuf...@gentoo.org> (08 Nov 2015)
+# Requires net-libs/http-parser
+net-im/jabberd2 websocket
+
 # Davide Pesavento <p...@gentoo.org> (26 Oct 2015)
 # Tests require non-keyworded qt5
 dev-qt/qtchooser test

[gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/, net-im/jabberd2/files/

2015-11-08 Thread Julian Ospald 
commit: 4cb2fcb5bc035a5e7e1d694449ff81166d9eaf7d
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Nov  8 14:07:02 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Nov  8 14:08:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb2fcb5

net-im/jabberd2: version bump to 2.3.4

 net-im/jabberd2/Manifest   |   1 +
 .../files/jabberd2-2.3.4-optimization.patch|  21 +++
 .../jabberd2/files/jabberd2-2.3.4-websocket.patch  |  31 
 net-im/jabberd2/jabberd2-2.3.4.ebuild  | 180 +
 net-im/jabberd2/metadata.xml   |   4 +-
 5 files changed, 235 insertions(+), 2 deletions(-)

diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 176fa40..6398f31 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,3 +1,4 @@
 DIST jabberd-2.3.1.tar.xz 1460088 SHA256 
feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 
93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c
 WHIRLPOOL 
667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
 DIST jabberd-2.3.2.tar.xz 1473436 SHA256 
ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 
10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03
 WHIRLPOOL 
42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
 DIST jabberd-2.3.3.tar.xz 1457340 SHA256 
c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 
c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da
 WHIRLPOOL 
0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463
+DIST jabberd-2.3.4.tar.xz 1482736 SHA256 
9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 SHA512 
593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f
 WHIRLPOOL 
67a0e96a872a08975d981e1697fab5cf154b4cbea4c698d41d250c1314bc7303a3c15e871fc8b3c4f3769acd91773734ef61b880900132e435d17f9bde587b08

diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch 
b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
new file mode 100644
index 000..4808162
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
@@ -0,0 +1,21 @@
+Re-allow the use of O3/Os, since it seems to have been an old compiler
+bug.
+
+See https://github.com/jabberd2/jabberd2/issues/34
+
+--- configure.ac
 configure.ac
+@@ -23,13 +23,6 @@
+ LIBS="$LIBS $lt_cv_dlopen_libs"
+ fi
+ 
+-# check for optimisation level
+-AC_MSG_CHECKING([CFLAGS optimization level])
+-[if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then]
+-AC_MSG_ERROR([maximum allowed optimization level is -O2])
+-fi
+-AC_MSG_RESULT([fine])
+-
+ # extra paths
+ AC_ARG_WITH([extra_include_path], AC_HELP_STRING([--with-extra-include-path],
+[use additional include paths]),

diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch 
b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
new file mode 100644
index 000..a6f932c
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
@@ -0,0 +1,31 @@
+From b861b9c72adc732cbdfbac4eb8a4205126227f6b Mon Sep 17 00:00:00 2001
+From: Tomasz Sterna <to...@xiaoka.com>
+Date: Fri, 30 Oct 2015 12:40:32 +0100
+Subject: [PATCH] Enable USE_WEBSOCKET check in SX plugins
+
+---
+ sx/plugins.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sx/plugins.h b/sx/plugins.h
+index b5d3934..65dae93 100644
+--- a/sx/plugins.h
 b/sx/plugins.h
+@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st {
+ JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
+ 
+ /* websocket wrapper plugin */
+-//#ifdef USE_WEBSOCKET
++#ifdef USE_WEBSOCKET
+ #include 
+ #include 
+ 
+@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st {
+ xht headers;
+ void*frame;
+ } *_sx_websocket_conn_t;
+-//#endif
++#endif
+ 
+ #ifdef __cplusplus
+ }

diff --git a/net-im/jabberd2/jabberd2-2.3.4.ebuild 
b/net-im/jabberd2/jabberd2-2.3.4.ebuild
new file mode 100644
index 000..ee6f078
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.4.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 autotools db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org;
+SRC_URI="ht

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

2015-11-07 Thread Julian Ospald 
commit: 7c542248554decc41c16b19269158c70e819d08f
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Nov  3 20:57:46 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sat Nov  7 13:20:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c542248

net-libs/nodejs: version bump to 5.0.0

Gentoo-Bug: 564594

 net-libs/nodejs/Manifest|   1 +
 net-libs/nodejs/nodejs-5.0.0.ebuild | 156 
 2 files changed, 157 insertions(+)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 67a118a..1306a7c 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,3 +2,4 @@ DIST node-v0.12.6.tar.gz 19750717 SHA256 
7a3b5ac351973a9dee8edbf0684bc8d0dea44b2
 DIST node-v0.12.7.tar.gz 20063992 SHA256 
b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 
0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606
 WHIRLPOOL 
647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525
 DIST node-v4.1.1.tar.xz 12818088 SHA256 
f7ca9ceb0b7cc49b12f28a652c908a1f0ffbf34cec73ad0805fe717b14996bb9 SHA512 
1b38df92f0349e3da6c50d90b74500bfdaac479d93ad68e5f8f49b3c865867df637a642086669ed5c0b6561cf02716ebddb53888bd1b82e6324bd42f70915680
 WHIRLPOOL 
e6ab82b9f61c2ab3e43949a150e51d9505ef72833516bc60e6a929a3c403928ec6fe3ee2bb55cf6d73eea38defcae7abe2935a44ff27b80e0cd8709d4a55c629
 DIST node-v4.2.2.tar.xz 12791572 SHA256 
b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 SHA512 
fe6563ca641581afa4ba7fda1b25175eae474aeb196504cd82a6486bf9dfe6c753c554b31d9aa3b6453c509aa792615e897343de69a0b8bfd26759efaea2e1cb
 WHIRLPOOL 
2c2927697370c17cc3178e8dfbfe5819f5a406f84b28da4813507033b14d20616fe610e161618a6aea1463ac499c2d5a559360b97f236005db60ae9879ea8167
+DIST node-v5.0.0.tar.xz 12863764 SHA256 
cf4f261618e19517c8cbf2fdde00d0b5160e271760abee00f387b11a0b3ca834 SHA512 
5b07af6b77a25924e3028257a511f035df943b854c694168e24c20f6aa735cde72546fc231d63a491367e16232ee9b6622d1f748624bf3e99e0d0468528e96c3
 WHIRLPOOL 
8958da059e0bc8e196d9b5f1b079f6d1927a3707b466fdc6e87ece676f981a7f22c4fa485bdb6de9879305cf2deb578d49840dee6d69d1cddba698e070b19923

diff --git a/net-libs/nodejs/nodejs-5.0.0.ebuild 
b/net-libs/nodejs/nodejs-5.0.0.ebuild
new file mode 100644
index 000..c47c090
--- /dev/null
+++ b/net-libs/nodejs/nodejs-5.0.0.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/;
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz;
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( >=dev-libs/icu-55:= )
+   ${PYTHON_DEPS}
+   >=net-libs/http-parser-2.5:=
+   >=dev-libs/libuv-1.6.1:=
+   >=dev-libs/openssl-1.0.2d:0=[-bindist]
+   sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+   !!net-libs/iojs"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != "binary" ]] ; then
+   if ! test-flag-CXX -std=c++11 ; then
+   die "Your compiler doesn't support C++11. Use GCC 4.8, 
Clang 3.3 or newer."
+   fi
+   fi
+}
+
+src_prepare() {
+   tc-export CC CXX PKG_CONFIG
+   export V=1 # Verbose build
+   export BUILDTYPE=Release
+
+   # fix compilation on Darwin
+   # https://code.google.com/p/gyp/issues/detail?id=260
+   sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || 
die
+
+   # make sure we use python2.* while using gyp
+   sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp 
|| die
+   sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" 
deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+   # less verbose install output (stating the same as portage, basically)
+   sed -i -e "/print/d" tools/install.py || die
+
+   # proper libdir, hat tip @ryanpcmcquen 
https://github.com/iojs/io.js/issues/504
+   local LIBDIR=$(get_libdir)
+   sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+   sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+   sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+   # Avoid a test that I've only been able to reproduce from emerge. It 
doesnt
+   # seem sandbox related either (invoking it from a sandbox work

[gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/

2015-11-07 Thread Julian Ospald 
commit: 7f2c2ca5c86f58ac12bf2d326b4f52c53f164eb2
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Nov  3 20:57:24 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sat Nov  7 13:20:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2c2ca5

net-libs/nodejs: version bump to 4.2.2

Gentoo-Bug: 564594

 net-libs/nodejs/Manifest|   1 +
 net-libs/nodejs/nodejs-4.2.2.ebuild | 156 
 2 files changed, 157 insertions(+)

diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 4083186..67a118a 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,3 +1,4 @@
 DIST node-v0.12.6.tar.gz 19750717 SHA256 
7a3b5ac351973a9dee8edbf0684bc8d0dea44b231e42274ffb008141ffa19ad2 SHA512 
a7f1c88d8df0f65d986e283b859466a34459f8ebdd3232f4906f5ebd53c1a019a553eadcc50bcb5fe8252441c567692b9ada36e8b158ed818971cd927bf1b29f
 WHIRLPOOL 
3677bee6016647282e877f4676fc3731ca49d9b5ccda6d99f8fc3f16e56fcf30072adb494539b9714d0b3afb657457a16fecab682ab62fd501e789f008255380
 DIST node-v0.12.7.tar.gz 20063992 SHA256 
b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d SHA512 
0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606
 WHIRLPOOL 
647391b8c49fda868c14bd4eb3089cac139f50e710ac6b141ea82e1013c4ff7d40cdb0e88d69604d06e3bd07775876c754211a2b099685cb7353ae5708812525
 DIST node-v4.1.1.tar.xz 12818088 SHA256 
f7ca9ceb0b7cc49b12f28a652c908a1f0ffbf34cec73ad0805fe717b14996bb9 SHA512 
1b38df92f0349e3da6c50d90b74500bfdaac479d93ad68e5f8f49b3c865867df637a642086669ed5c0b6561cf02716ebddb53888bd1b82e6324bd42f70915680
 WHIRLPOOL 
e6ab82b9f61c2ab3e43949a150e51d9505ef72833516bc60e6a929a3c403928ec6fe3ee2bb55cf6d73eea38defcae7abe2935a44ff27b80e0cd8709d4a55c629
+DIST node-v4.2.2.tar.xz 12791572 SHA256 
b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 SHA512 
fe6563ca641581afa4ba7fda1b25175eae474aeb196504cd82a6486bf9dfe6c753c554b31d9aa3b6453c509aa792615e897343de69a0b8bfd26759efaea2e1cb
 WHIRLPOOL 
2c2927697370c17cc3178e8dfbfe5819f5a406f84b28da4813507033b14d20616fe610e161618a6aea1463ac499c2d5a559360b97f236005db60ae9879ea8167

diff --git a/net-libs/nodejs/nodejs-4.2.2.ebuild 
b/net-libs/nodejs/nodejs-4.2.2.ebuild
new file mode 100644
index 000..c47c090
--- /dev/null
+++ b/net-libs/nodejs/nodejs-4.2.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="Evented IO for V8 Javascript"
+HOMEPAGE="http://nodejs.org/;
+SRC_URI="http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz;
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="debug icu +npm snapshot +ssl"
+
+RDEPEND="icu? ( >=dev-libs/icu-55:= )
+   ${PYTHON_DEPS}
+   >=net-libs/http-parser-2.5:=
+   >=dev-libs/libuv-1.6.1:=
+   >=dev-libs/openssl-1.0.2d:0=[-bindist]
+   sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+   !!net-libs/iojs"
+
+S="${WORKDIR}/node-v${PV}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != "binary" ]] ; then
+   if ! test-flag-CXX -std=c++11 ; then
+   die "Your compiler doesn't support C++11. Use GCC 4.8, 
Clang 3.3 or newer."
+   fi
+   fi
+}
+
+src_prepare() {
+   tc-export CC CXX PKG_CONFIG
+   export V=1 # Verbose build
+   export BUILDTYPE=Release
+
+   # fix compilation on Darwin
+   # https://code.google.com/p/gyp/issues/detail?id=260
+   sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || 
die
+
+   # make sure we use python2.* while using gyp
+   sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp 
|| die
+   sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" 
deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+   # less verbose install output (stating the same as portage, basically)
+   sed -i -e "/print/d" tools/install.py || die
+
+   # proper libdir, hat tip @ryanpcmcquen 
https://github.com/iojs/io.js/issues/504
+   local LIBDIR=$(get_libdir)
+   sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+   sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+   sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+   # Avoid a test that I've only been able to reproduce from emerge. It 
doesnt
+   # seem sandbox related either (invoking it from a sandbox works fine).
+   # The issue is that no stdin handle is openened when asked

[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/

2015-11-07 Thread Julian Ospald 
commit: b80cf973d108302eff58d2a7ab264cd74cdef72b
Author: mschubert  gmail  com>
AuthorDate: Fri Nov  6 13:32:08 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Nov  6 13:32:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80cf973

net-libs/http-parser: respect ${EPREFIX}

 net-libs/http-parser/http-parser-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/http-parser/http-parser-2.6.0.ebuild 
b/net-libs/http-parser/http-parser-2.6.0.ebuild
index 186c880..7a5bcfe 100644
--- a/net-libs/http-parser/http-parser-2.6.0.ebuild
+++ b/net-libs/http-parser/http-parser-2.6.0.ebuild
@@ -40,6 +40,6 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-   emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" install
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" 
LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
use static-libs && dolib.a libhttp_parser.a
 }

[gentoo-commits] repo/gentoo:master commit in: /

2015-11-07 Thread Julian Ospald 
commit: 9efd3bf8f1941073dcc333fa53057bd51aa1de89
Author: Julian Ospald  gentoo  org>
AuthorDate: Sat Nov  7 20:24:36 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sat Nov  7 20:24:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efd3bf8

Merge remote-tracking branch 'github/pr/331'

 net-libs/http-parser/http-parser-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] repo/gentoo:master commit in: net-libs/http-parser/, net-libs/http-parser/files/

2015-11-02 Thread Julian Ospald 
commit: 2dcfb00c893c3190165f76a9b592fcf25b813809
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Nov  2 16:04:10 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Nov  2 16:05:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dcfb00c

net-libs/http-parser: version bump

This also fixes the upstream build system instead of working around
it.

It also fixes missing CFLAGS in linking commands.

 net-libs/http-parser/Manifest  |  1 +
 .../files/0001-makefile-fix-DESTDIR-usage.patch| 64 ++
 .../files/0002-makefile-quote-variables.patch  | 50 +
 ...x-SONAME-symlink-it-should-not-be-a-full-.patch | 35 
 ...04-makefile-add-CFLAGS-to-linking-command.patch | 31 +++
 ...0005-makefile-fix-install-rule-dependency.patch | 33 +++
 net-libs/http-parser/http-parser-2.6.0.ebuild  | 45 +++
 7 files changed, 259 insertions(+)

diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 2d8af53..10f268e 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -2,3 +2,4 @@ DIST http-parser-2.3.tar.gz 42538 SHA256 
3bfe6b4ab7656c86e48b4a43a7a08aee7fd72c1
 DIST http-parser-2.4.1.tar.gz 44724 SHA256 
4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 
f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8
 WHIRLPOOL 
1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb
 DIST http-parser-2.4.2.tar.gz 44814 SHA256 
d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 
fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab
 WHIRLPOOL 
cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff
 DIST http-parser-2.5.0.tar.gz 46070 SHA256 
e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 
da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f
 WHIRLPOOL 
933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254
+DIST http-parser-2.6.0.tar.gz 47598 SHA256 
a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 SHA512 
e7bd34ed8270192e55f5e7495972afc9fe2adc36d85df4f09be4958bbf7f93872a056bb8db268cdc1068a9eb79ad9aefc2a8502bda92bac8a2490e08435f09e1
 WHIRLPOOL 
2bef86db5140c04a2d7e2191e5669c905368a1180c357c512a66a65907b23b317bd2466aa9b1a47c1287e9def7aecdab48c151343b1700d99514b47915df7bf5

diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch 
b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch
new file mode 100644
index 000..a819cf4
--- /dev/null
+++ b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch
@@ -0,0 +1,64 @@
+From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001
+From: hasufell <hasuf...@hasufell.de>
+Date: Mon, 2 Nov 2015 16:24:43 +0100
+Subject: [PATCH 1/4] makefile: fix DESTDIR usage
+
+DESTDIR is not supposed to be set inside other variables. It is
+standard to have this variable in install/uninstall rules, so it
+can be reliably set separately no matter what other variables are set
+to.
+This also avoids potential bugs with setting SONAME or seds on
+installed files (like pkgconfig) which then might include the
+temporary DESTDIR directory.
+
+DESTDIR is really just for installing into a temporary directory or
+a chroot, mostly used by package managers.
+---
+ Makefile | 20 ++--
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 33c8ba0..76153a0 100644
+--- a/Makefile
 b/Makefile
+@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
+ LDFLAGS_LIB = $(LDFLAGS) -shared
+ 
+ INSTALL ?= install
+-PREFIX ?= $(DESTDIR)/usr/local
++PREFIX ?= /usr/local
+ LIBDIR = $(PREFIX)/lib
+ INCLUDEDIR = $(PREFIX)/include
+ 
+@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c
+   ctags $^
+ 
+ install: library
+-  $(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
+-  $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
+-  ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
++  $(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
++  $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++  ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)
+ 
+ install-strip: library
+-  $(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
+-  $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
+-  ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
++  $(INSTALL) -D  http_parser.h $(DESTDIR)

[gentoo-commits] repo/gentoo:master commit in: www-servers/hiawatha/

2015-10-28 Thread Julian Ospald 
commit: 37b558603ef1bf50fc6bbcf9edeff6c3bde6a6cf
Author: Julian Ospald  gentoo  org>
AuthorDate: Wed Oct 28 15:40:14 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Wed Oct 28 15:44:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b55860

www-servers/hiawatha: add myself as maintainer

 www-servers/hiawatha/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www-servers/hiawatha/metadata.xml 
b/www-servers/hiawatha/metadata.xml
index f9fc424..2cc59f2 100644
--- a/www-servers/hiawatha/metadata.xml
+++ b/www-servers/hiawatha/metadata.xml
@@ -2,7 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   maintainer-nee...@gentoo.org
+   hasuf...@gentoo.org
+       Julian Ospald


Enable caching of content.

[gentoo-commits] repo/gentoo:master commit in: www-servers/hiawatha/files/, www-servers/hiawatha/

2015-10-28 Thread Julian Ospald 
commit: 6726730f1297aaad5ec7d98cde271c9c5d491a94
Author: Julian Ospald  gentoo  org>
AuthorDate: Wed Oct 28 15:44:35 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Wed Oct 28 15:44:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6726730f

www-servers/hiawatha: version bump to 9.15

Fixes: 558532

 www-servers/hiawatha/Manifest|   1 +
 www-servers/hiawatha/files/hiawatha.initd-r1 |  26 +
 www-servers/hiawatha/hiawatha-9.15.ebuild| 145 +++
 www-servers/hiawatha/metadata.xml|  13 ++-
 4 files changed, 180 insertions(+), 5 deletions(-)

diff --git a/www-servers/hiawatha/Manifest b/www-servers/hiawatha/Manifest
index d351f96..9a62e6a 100644
--- a/www-servers/hiawatha/Manifest
+++ b/www-servers/hiawatha/Manifest
@@ -1,2 +1,3 @@
 DIST hiawatha-9.14.tar.gz 891930 SHA256 
79c92587cd86a0461d952c99036f5615dacdcaccabe0a9a29359e6044d809bfa SHA512 
66ad77c132d34daa5eb597ce67d7b26581c59534e5cf83dd65f78567a9a1798030cd42fef2d612bd1935243db979a2ef1df873f01b0d0a009395ef3da1dca6e6
 WHIRLPOOL 
8dbeb2c33e9111a27b76f3e5e307872314e85c481a600c39a1e02e7f9e08e1cc0d64f79838dad92a4a5a555cb86334487dd247efb56f0ef9c15a7735da27ddae
+DIST hiawatha-9.15.tar.gz 869922 SHA256 
e9252133a1114095d1a9a89144b88828ee3b9754f435bd88270f7bf444dd9421 SHA512 
e5f0459475863c7cb2d15bdf2a9712f13c96ac450f349fd89e60fd600aad9010f25182aa6353a3014069a9798544a56ef79695918613946b63fecd3806b1982b
 WHIRLPOOL 
80840072765430b05ecaf1ec631d3f1981c6f420edc18b4bcc7957f53f28ed2800170bbcec943c287da2968e6ac769514843fc54aa2a927d7d451057ed76d4d3
 DIST hiawatha-9.8.tar.gz 888977 SHA256 
6fe9bd408361bc07b47fe6eeaf98d6b644e1cd258b3470da3e70aba510e83b64 SHA512 
f55b6065e0dd1dab11ccbbb44e981944aab5b542077fc2b4a03ec8c055be80bedb7b639fe9c52ccf0fc279648b9f4bfc0cbfa018b195b155907810bdfc4ec51a
 WHIRLPOOL 
342c19df23dbe4eef7056f2424d53badede5a8dcf8bb713e7d3892f21e1061ae5e1a0c985f1fc824b10f25eb9fcc9cf0cbf8d384240bf814df4f9dca45dd96f2

diff --git a/www-servers/hiawatha/files/hiawatha.initd-r1 
b/www-servers/hiawatha/files/hiawatha.initd-r1
new file mode 100644
index 000..5635aba
--- /dev/null
+++ b/www-servers/hiawatha/files/hiawatha.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+   need net
+}
+
+start() {
+   ebegin "Starting ${SVCNAME}"
+   start-stop-daemon \
+   --start \
+   --exec "/usr/sbin/hiawatha" \
+   --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid"
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping ${SVCNAME}"
+   start-stop-daemon \
+   --stop \
+   --exec "/usr/sbin/hiawatha" \
+   --pidfile "@HIAWATHA_PID_DIR@/hiawatha.pid"
+   eend $?
+}

diff --git a/www-servers/hiawatha/hiawatha-9.15.ebuild 
b/www-servers/hiawatha/hiawatha-9.15.ebuild
new file mode 100644
index 000..3165070
--- /dev/null
+++ b/www-servers/hiawatha/hiawatha-9.15.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.2"
+
+inherit cmake-utils eutils systemd user
+
+DESCRIPTION="Advanced and secure webserver"
+HOMEPAGE="http://www.hiawatha-webserver.org;
+SRC_URI="http://www.hiawatha-webserver.org/files/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cache ipv6 monitor +rewrite +rproxy +ssl tomahawk +xslt"
+
+RDEPEND="
+   sys-libs/zlib
+   ssl? ( >=net-libs/mbedtls-2.0[threads] )
+   xslt? ( dev-libs/libxslt
+   dev-libs/libxml2 )"
+DEPEND="${RDEPEND}"
+PDEPEND="monitor? ( www-apps/hiawatha-monitor )"
+
+# set these in the environment of your PM if you want to use different values
+HIAWATHA_CONFIG_DIR="${HIAWATHA_CONFIG_DIR:-/etc/hiawatha}"
+HIAWATHA_LOG_DIR="${HIAWATHA_LOG_DIR:-/var/log/hiawatha}"
+HIAWATHA_PID_DIR="${HIAWATHA_PID_DIR:-/var/run}"
+HIAWATHA_WEBROOT_DIR="${HIAWATHA_WEBROOT_DIR:-/var/www/hiawatha}"
+HIAWATHA_WORK_DIR="${HIAWATHA_WORK_DIR:-/var/lib/hiawatha}"
+HIAWATHA_USER="${HIAWATHA_USER:-hiawatha}"
+HIAWATHA_GROUP="${HIAWATHA_GROUP:-hiawatha}"
+
+safe_sed() {
+   local replace_of=$1
+   local replace_with=$2
+   local file=$3
+   # optional
+   local outfile=$4
+
+   grep -E "${replace_of}" "${file}" 1>/dev/null \
+   || die "\"${replace_of}\" not found in ${file}!"
+
+   if [[ -n ${outfile} ]] ; then
+   einfo "Sedding ${file} into ${outfile}"
+   sed -r \
+   -e "s|${replace_of}|${replace_w

[gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-viewer/

2015-10-27 Thread Julian Ospald 
commit: b6b942cdc109812d23a1a01f6153e5025c6286be
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 12:52:46 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 12:52:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b942cd

net-misc/youtube-viewer: remove video player dependencies

And rather tell the user to install a compatible video player.
Since these are not strictly limited, it doesn't make sense
to list them all in RDEPEND.

 net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild | 14 ++
 net-misc/youtube-viewer/youtube-viewer-.ebuild  | 14 ++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild 
b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
index 59041b3..8a99343 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
@@ -21,8 +21,6 @@ RDEPEND="
dev-perl/JSON
dev-perl/libwww-perl[ssl]
dev-perl/Term-ReadLine-Gnu
-   || ( media-video/mplayer[network]
-   media-video/mpv )
virtual/perl-Encode
virtual/perl-File-Path
virtual/perl-File-Spec
@@ -72,7 +70,7 @@ pkg_preinst() {
 
 pkg_postinst() {
use gtk && gnome2_icon_cache_update
-   einfo
+   elog
elog "optional dependencies:"
elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
@@ -81,7 +79,15 @@ pkg_postinst() {
elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
elog "format (--fixed-width, -W))"
elog "  virtual/perl-threads (threads support)"
-   einfo
+   elog
+   elog "You also need a compatible video player, possible choices are:"
+   elog "  media-video/gnome-mplayer"
+   elog "  media-video/mplayer[network]"
+   elog "  media-video/mpv"
+   elog "  media-video/smplayer"
+   elog "  media-video/vlc"
+   elog "Also check the configuration file in ~/.config/youtube-viewer/"
+   elog "and configure your video player backend."
 }
 
 pkg_postrm() {

diff --git a/net-misc/youtube-viewer/youtube-viewer-.ebuild 
b/net-misc/youtube-viewer/youtube-viewer-.ebuild
index 68d8ce7..9290df1 100644
--- a/net-misc/youtube-viewer/youtube-viewer-.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-.ebuild
@@ -22,8 +22,6 @@ RDEPEND="
dev-perl/JSON
dev-perl/libwww-perl[ssl]
dev-perl/Term-ReadLine-Gnu
-   || ( media-video/mplayer[network]
-   media-video/mpv )
virtual/perl-Encode
virtual/perl-File-Path
virtual/perl-File-Spec
@@ -73,7 +71,7 @@ pkg_preinst() {
 
 pkg_postinst() {
use gtk && gnome2_icon_cache_update
-   einfo
+   elog
elog "optional dependencies:"
elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
@@ -82,7 +80,15 @@ pkg_postinst() {
elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
elog "format (--fixed-width, -W))"
elog "  virtual/perl-threads (threads support)"
-   einfo
+   elog
+   elog "You also need a compatible video player, possible choices are:"
+   elog "  media-video/gnome-mplayer"
+   elog "  media-video/mplayer[network]"
+   elog "  media-video/mpv"
+   elog "  media-video/smplayer"
+   elog "  media-video/vlc"
+   elog "Also check the configuration file in ~/.config/youtube-viewer/"
+   elog "and configure your video player backend."
 }
 
 pkg_postrm() {

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyuv/

2015-10-27 Thread Julian Ospald 
commit: f89c61ff67ed9869a1071793f6e492771bd486d5
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 13:31:02 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 13:31:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89c61ff

dev-python/pyuv: initial import of version 1.2.0

Gentoo-Bug: 531734

 dev-python/pyuv/Manifest  |  1 +
 dev-python/pyuv/metadata.xml  | 44 +++
 dev-python/pyuv/pyuv-1.2.0.ebuild | 29 ++
 3 files changed, 74 insertions(+)

diff --git a/dev-python/pyuv/Manifest b/dev-python/pyuv/Manifest
new file mode 100644
index 000..33e2d1b
--- /dev/null
+++ b/dev-python/pyuv/Manifest
@@ -0,0 +1 @@
+DIST pyuv-1.2.0.tar.gz 98578 SHA256 
9df91c86519574f65e4465884db20565d4ad4287cd6cd651ee0137430b0dd4a7 SHA512 
10a8448700c609b6e9844c6bc9bd6428920a455c94bee79569006f783c7f5d2683abe46c4692d0f0016a621d0c6d0ef2decc42a9f0418e1242b79ab0f06ee9f2
 WHIRLPOOL 
11989f713ba205ff0fa5b76dd742a7c3eb66b00fb6c97e0a0a5aa2e2b3c041a1d35b2bfd950a54fb0a7adb9ae1c5753c97ee4c6278518e46a345a462827835eb

diff --git a/dev-python/pyuv/metadata.xml b/dev-python/pyuv/metadata.xml
new file mode 100644
index 000..bd1f47a
--- /dev/null
+++ b/dev-python/pyuv/metadata.xml
@@ -0,0 +1,44 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   hasuf...@gentoo.org
+       Julian Ospald
+   
+   
+   pyuv is a Python module which provides an interface to
+   dev-libs/libuv.
+   libuv is a high performance asynchronous networking and platform
+   abstraction library.
+
+   libuv is built on top of epoll/kequeue/event ports/etc on Unix 
and
+   IOCP on Windows systems providing a consistent API on top of 
them.
+
+   pyuv's features:
+   * Non-blocking TCP sockets
+   * Non-blocking named pipes
+   * UDP support (including multicast)
+   * Timers
+   * Child process spawning
+   * Asynchronous DNS resolution (getaddrinfo)
+   * Asynchronous file system APIs
+   * High resolution time
+   * System memory information
+   * System CPUs information
+   * Network interfaces information
+   * Thread pool scheduling
+   * ANSI escape code controlled TTY
+   * File system events (inotify style and stat based)
+   * IPC and TCP socket sharing between processes
+   * Arbitrary file descriptor polling
+   * Thread synchronization primitives
+   
+   
+   
+   sag...@gmail.com
+   Saúl Ibarra Corretgé
+   
+   saghul/pyuv
+   pyuv
+   
+

diff --git a/dev-python/pyuv/pyuv-1.2.0.ebuild 
b/dev-python/pyuv/pyuv-1.2.0.ebuild
new file mode 100644
index 000..ab665ca
--- /dev/null
+++ b/dev-python/pyuv/pyuv-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# 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,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for libuv"
+HOMEPAGE="https://pyuv.readthedocs.org/en;
+SRC_URI="https://github.com/saghul/pyuv/archive/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# https://github.com/saghul/pyuv/blob/v1.x/setup_libuv.py#L117
+RDEPEND=">=dev-libs/libuv-1.7.3:0/1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/pyuv-pyuv-${PV}"
+
+src_configure() {
+   mydistutilsargs=( build_ext --use-system-libuv )
+   distutils-r1_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-viewer/

2015-10-27 Thread Julian Ospald 
commit: 14b6a859299cfcc81428e892e9718211280ca7d7
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 12:36:30 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 12:36:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b6a859

net-misc/youtube-viewer: version bump to 3.1.9

 net-misc/youtube-viewer/Manifest   |  1 +
 .../youtube-viewer/youtube-viewer-3.1.9.ebuild | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 286ca46..1ebf539 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1 +1,2 @@
 DIST youtube-viewer-3.1.1.tar.gz 210183 SHA256 
416289dac7c4bb29ad046e41bbf49faaca31f1827379e9e0082f5b282186531d SHA512 
1c7236cde68f21a80bb1f3ac29e19f86f52732c784adb70f6fc07177d74ada3a6ae1652e604fc12f62ce8ddf0c172593dd85a419a6d7d804f980fc09afda90f0
 WHIRLPOOL 
9045cc344bd627806526594daafbd8e17cfefa0e7aaf456c5c3a0c7ebec4bdd53f8ec708e051b37706ac3e1e29af3379e1df8ea21bfd370ca367950e6accf886
+DIST youtube-viewer-3.1.9.tar.gz 76 SHA256 
9b7ba2b50cea054898024bc871e231673269ab50db0526ee3f1a7ae62a51e8d2 SHA512 
60ff81defd4d8d1bc1f6b5bceaa03c9bbe64e8fea2083ce60b04b6c14d8b13ded6da255b9aa46bfcb1b76cf33121ddb738d0f0c159e4bd207999ca558a43e86e
 WHIRLPOOL 
2e6a79992c7760d93c2e28f1e4f5c14861b6fefed8e0bebb9a7d88c6cf27000904971b12274a972ca66471ffee7c3bfee8c90218c16ddd0ec96cc8f46779bffd

diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild 
b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
new file mode 100644
index 000..59041b3
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.1.9.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome2-utils eutils perl-module vcs-snapshot
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizen.googlecode.com;
+SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+   >=dev-lang/perl-5.16.0
+   dev-perl/Data-Dump
+   dev-perl/JSON
+   dev-perl/libwww-perl[ssl]
+   dev-perl/Term-ReadLine-Gnu
+   || ( media-video/mplayer[network]
+   media-video/mpv )
+   virtual/perl-Encode
+   virtual/perl-File-Path
+   virtual/perl-File-Spec
+   virtual/perl-Getopt-Long
+   virtual/perl-Scalar-List-Utils
+   virtual/perl-Term-ANSIColor
+   virtual/perl-Term-ReadLine
+   virtual/perl-Text-ParseWords
+   virtual/perl-Text-Tabs+Wrap
+   gtk? (
+   dev-perl/File-ShareDir
+   >=dev-perl/gtk2-perl-1.244.0
+   virtual/freedesktop-icon-theme
+   x11-libs/gdk-pixbuf:2[X,jpeg]
+   )"
+DEPEND="dev-perl/Module-Build"
+
+SRC_TEST="do"
+
+src_prepare() {
+   perl-module_src_prepare
+}
+
+# build system installs files on "perl Build.PL" too
+# do all the work in src_install
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+   local myconf
+   if use gtk ; then
+   myconf="--gtk-youtube-viewer"
+   fi
+   perl-module_src_configure
+   perl-module_src_install
+
+   if use gtk ; then
+   domenu share/gtk-youtube-viewer.desktop
+   doicon share/icons/gtk-youtube-viewer.png
+   fi
+}
+
+pkg_preinst() {
+   use gtk && gnome2_icon_savelist
+   perl_set_version
+}
+
+pkg_postinst() {
+   use gtk && gnome2_icon_cache_update
+   einfo
+   elog "optional dependencies:"
+   elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
+   elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
+   elog "  dev-perl/JSON-XS (faster JSON to HASH conversion)"
+   elog "  dev-perl/Mozilla-CA (just in case if there are SSL problems)"
+   elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
+   elog "format (--fixed-width, -W))"
+   elog "  virtual/perl-threads (threads support)"
+   einfo
+}
+
+pkg_postrm() {
+   use gtk && gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-viewer/

2015-10-27 Thread Julian Ospald 
commit: 1b0fa3b0475c2fa701add17916ede8dfd404ba54
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 12:28:26 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 12:35:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0fa3b0

net-misc/youtube-viewer: update live ebuild

* switch to git-r3
* sync with stable ebuild
* fix dependencies

 net-misc/youtube-viewer/youtube-viewer-.ebuild | 48 ++
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/net-misc/youtube-viewer/youtube-viewer-.ebuild 
b/net-misc/youtube-viewer/youtube-viewer-.ebuild
index c1d99f7..68d8ce7 100644
--- a/net-misc/youtube-viewer/youtube-viewer-.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit perl-module git-2
+inherit gnome2-utils eutils perl-module git-r3
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
 HOMEPAGE="https://trizen.googlecode.com;
@@ -19,13 +19,18 @@ IUSE="gtk"
 RDEPEND="
>=dev-lang/perl-5.16.0
dev-perl/Data-Dump
-   dev-perl/libwww-perl
-   || ( media-video/mplayer[X,network]
-   media-video/mplayer2[X,network]
-   media-video/mpv[X] )
+   dev-perl/JSON
+   dev-perl/libwww-perl[ssl]
+   dev-perl/Term-ReadLine-Gnu
+   || ( media-video/mplayer[network]
+   media-video/mpv )
+   virtual/perl-Encode
+   virtual/perl-File-Path
virtual/perl-File-Spec
virtual/perl-Getopt-Long
+   virtual/perl-Scalar-List-Utils
virtual/perl-Term-ANSIColor
+   virtual/perl-Term-ReadLine
virtual/perl-Text-ParseWords
virtual/perl-Text-Tabs+Wrap
gtk? (
@@ -36,11 +41,12 @@ RDEPEND="
)"
 DEPEND="dev-perl/Module-Build"
 
-EGIT_SOURCEDIR="${WORKDIR}"
-S=${WORKDIR}/WWW-YoutubeViewer
-
 SRC_TEST="do"
 
+src_prepare() {
+   perl-module_src_prepare
+}
+
 # build system installs files on "perl Build.PL" too
 # do all the work in src_install
 src_configure() { :; }
@@ -53,22 +59,32 @@ src_install() {
fi
perl-module_src_configure
perl-module_src_install
+
+   if use gtk ; then
+   domenu share/gtk-youtube-viewer.desktop
+   doicon share/icons/gtk-youtube-viewer.png
+   fi
+}
+
+pkg_preinst() {
+   use gtk && gnome2_icon_savelist
+   perl_set_version
 }
 
 pkg_postinst() {
+   use gtk && gnome2_icon_cache_update
einfo
elog "optional dependencies:"
-   elog "  dev-perl/LWP-Protocol-https or dev-perl/libwww-perl[ssl]"
-   elog "  and virtual/perl-MIME-Base64"
-   elog "(for HTTPS protocol and login support)"
+   elog "  dev-perl/LWP-UserAgent-Cached (cache support)"
elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
+   elog "  dev-perl/JSON-XS (faster JSON to HASH conversion)"
+   elog "  dev-perl/Mozilla-CA (just in case if there are SSL problems)"
elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
elog "format (--fixed-width, -W))"
-   elog "  dev-perl/XML-Fast (faster XML to HASH conversion)"
-   elog "  net-misc/gcap (for retrieving Youtube closed captions)"
-   elog "  virtual/perl-File-Temp (for posting comments)"
-   elog "  virtual/perl-Scalar-List-Utils (to shuffle the playlists"
-   elog "(--shuffle, -s))"
elog "  virtual/perl-threads (threads support)"
einfo
 }
+
+pkg_postrm() {
+   use gtk && gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-viewer/

2015-10-27 Thread Julian Ospald 
commit: 51cbdcd2357f096462e35aeef0c851b80077c322
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 12:26:14 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 12:36:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51cbdcd2

net-misc/youtube-viewer: add proxied maintainer

 net-misc/youtube-viewer/metadata.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/net-misc/youtube-viewer/metadata.xml 
b/net-misc/youtube-viewer/metadata.xml
index 0153788..8bfc8bf 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -4,6 +4,12 @@

hasuf...@gentoo.org
    Julian Ospald
+   Primary maintainer, assign him on 
bugs.
+   
+   
+   zol...@sinustrom.info
+   Zoltan Puskas
+   Proxied maintainer, CC him on bugs.

[gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-viewer/

2015-10-27 Thread Julian Ospald 
commit: adb867154820efa3ef967544e6df792d557dc9db
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 11:55:55 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 11:56:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb86715

net-misc/youtube-viewer: update metadata.xml

 net-misc/youtube-viewer/metadata.xml | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-misc/youtube-viewer/metadata.xml 
b/net-misc/youtube-viewer/metadata.xml
index 6bf16cf..0153788 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -2,7 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   maintainer-nee...@gentoo.org
+   hasuf...@gentoo.org
+       Julian Ospald



@@ -11,9 +12,13 @@

https://github.com/trizen/youtube-viewer/issues
trizen/youtube-viewer

+   
+   Install the gtk GUI, called 
gtk-youtube-viewer
+   

-   Youtube Viewer is a CLI application dedicated for searching and 
streaming
-   Youtube Videos with MPlayer. It has been written in Perl and 
plays videos
-   from Youtube at the best quality available without using a 
flash player. 
+   Youtube Viewer is a CLI application dedicated for searching and
+   streaming Youtube Videos with MPlayer. It has been written in 
Perl
+   and plays videos from Youtube at the best quality available 
without
+   using a flash player.

[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/

2015-10-27 Thread Julian Ospald 
commit: 40963c7a3b19f965bf5090e47ee25db769cab16b
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 21:32:10 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 21:32:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40963c7a

dev-libs/angelscript: add subslot

 dev-libs/angelscript/Manifest | 2 --
 dev-libs/angelscript/angelscript-2.30.2-r1.ebuild | 2 +-
 dev-libs/angelscript/metadata.xml | 6 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 71be1c6..a1b7bde 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,3 +1 @@
-DIST angelscript_2.29.2.zip 1583192 SHA256 
c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b SHA512 
76537a35bfa8f5f90d48a601f4cf1ff6cf8cd648c93b2ea17d3f0fbc7ccaa3d915bbe49d758916d0626a026ece8ecd1646bbb99db41d5a4c9f7c87d915c0d4ff
 WHIRLPOOL 
1f24f56c7601b5f731a4e631f995668f268c26d57dce93944a758c5efd86ed651fd842b16419dad73eb8e7df641ccc5b4a226ccfc99fe1cc9a4c736e5d3076eb
-DIST angelscript_2.30.1.zip 1859238 SHA256 
a492331d3ede33f96a3b882bb09fff0f71e6e9479f9b5d78fdcf08585038d583 SHA512 
7669e6b9814e3fc913e84018786d5c142b5a60c5e3d5f4d01bfc2e794cf97e1fc347cb7258d7266a3b1d1f813fc6c1a2781680fbe1c1d2275e3fa1ed2a416e52
 WHIRLPOOL 
fff8df92f53f18789d36f3023cdaeb91bbe804dd3e4f6e3ebb54f602a35b6421d0d400850d9bc4bb079cb2e1c25578e1443ecab524ba68b22af4c1f29f0a6429
 DIST angelscript_2.30.2.zip 1640151 SHA256 
8c08774bc1ca683124b4996ab4459f4b2b10bdacd860e76f28fb5b504332d7d7 SHA512 
a95d1d0050cc18d71ecb20655e74c196654c69b34ae3d1ade6d3a90b952b20851a6255c7285f019046e22d4c3fd1a6100c917a66a7c0d4e00636e4a2c6003bd5
 WHIRLPOOL 
157f724736bfea7dc31549cb76e88107108eccf046016e848a282cfe70b3bb8968e60424df192c8235eae8b663b0bc6dfea572a68b0404d7e61ea3eaa56d30e2

diff --git a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild 
b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
index 14ec9e9..1b57bb8 100644
--- a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
+++ b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.angelcode.com/angelscript/;
 SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip;
 
 LICENSE="ZLIB"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc static-libs"
 

diff --git a/dev-libs/angelscript/metadata.xml 
b/dev-libs/angelscript/metadata.xml
index e96e35b..0b11ed9 100644
--- a/dev-libs/angelscript/metadata.xml
+++ b/dev-libs/angelscript/metadata.xml
@@ -4,5 +4,11 @@

maintainer-nee...@gentoo.org

+   
+   
+   Reflects ABI compatibility of libangelscript.so.
+   Since there is practically no compatibility, this is 
$PV.
+   
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/

2015-10-27 Thread Julian Ospald 
commit: 06087d22d8a07963eefcb836236167fff0038863
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 27 22:05:55 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 27 22:05:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06087d22

dev-libs/angelscript: update metadata.xml

 dev-libs/angelscript/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/angelscript/metadata.xml 
b/dev-libs/angelscript/metadata.xml
index 0b11ed9..e0a9408 100644
--- a/dev-libs/angelscript/metadata.xml
+++ b/dev-libs/angelscript/metadata.xml
@@ -2,7 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   maintainer-nee...@gentoo.org
+   hasuf...@gentoo.org
+       Julian Ospald

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-26 Thread Julian Ospald 
commit: c5567ca2bdb7e12514c98ab6dd88607acd797efe
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 21:35:28 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 21:35:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5567ca2

intel-sdp.eclass: add missing '|| die' on pushd/popd

Reviewed-By: Justin Lecher  gentoo.org>

 eclass/intel-sdp.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass
index 1366717..00e52a0 100644
--- a/eclass/intel-sdp.eclass
+++ b/eclass/intel-sdp.eclass
@@ -172,7 +172,7 @@ QA_PREBUILT="${INTEL_SDP_DIR}/*"
 # Creating necessary links to use intel compiler with eclipse
 _isdp_link_eclipse_plugins() {
local c f
-   pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null
+   pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die
for c in cdt*; do
local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1))
if has_version "dev-util/eclipse-sdk:${ev}"; then
@@ -189,7 +189,7 @@ _isdp_link_eclipse_plugins() {
done
fi
done
-   popd > /dev/null
+   popd > /dev/null || die
 }
 
 # @FUNCTION: _isdp_big-warning

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libuv/

2015-10-26 Thread Julian Ospald 
commit: d940c49d0afe8648befa584c757ce9e9ae0a2d13
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 12:25:20 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 12:25:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d940c49d

dev-libs/libuv: restrict tests, they are constantly broken

It seems libuv tests are not really mocked, but require a real
internet connection and may randomly fail depending on your
connection.

Gentoo-Bug: 542770

 dev-libs/libuv/libuv-1.4.2.ebuild | 1 +
 dev-libs/libuv/libuv-1.5.0.ebuild | 1 +
 dev-libs/libuv/libuv-1.6.1.ebuild | 1 +
 dev-libs/libuv/libuv-1.7.0.ebuild | 1 +
 dev-libs/libuv/libuv-1.7.5.ebuild | 1 +
 5 files changed, 5 insertions(+)

diff --git a/dev-libs/libuv/libuv-1.4.2.ebuild 
b/dev-libs/libuv/libuv-1.4.2.ebuild
index c4d4c09..4e45c02 100644
--- a/dev-libs/libuv/libuv-1.4.2.ebuild
+++ b/dev-libs/libuv/libuv-1.4.2.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="
sys-devel/libtool

diff --git a/dev-libs/libuv/libuv-1.5.0.ebuild 
b/dev-libs/libuv/libuv-1.5.0.ebuild
index f1f71e4..b96636d 100644
--- a/dev-libs/libuv/libuv-1.5.0.ebuild
+++ b/dev-libs/libuv/libuv-1.5.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
virtual/pkgconfig[${MULTILIB_USEDEP}]"

diff --git a/dev-libs/libuv/libuv-1.6.1.ebuild 
b/dev-libs/libuv/libuv-1.6.1.ebuild
index 33f5eaa..0e9fd95 100644
--- a/dev-libs/libuv/libuv-1.6.1.ebuild
+++ b/dev-libs/libuv/libuv-1.6.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
virtual/pkgconfig[${MULTILIB_USEDEP}]"

diff --git a/dev-libs/libuv/libuv-1.7.0.ebuild 
b/dev-libs/libuv/libuv-1.7.0.ebuild
index 33f5eaa..0e9fd95 100644
--- a/dev-libs/libuv/libuv-1.7.0.ebuild
+++ b/dev-libs/libuv/libuv-1.7.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
virtual/pkgconfig[${MULTILIB_USEDEP}]"

diff --git a/dev-libs/libuv/libuv-1.7.5.ebuild 
b/dev-libs/libuv/libuv-1.7.5.ebuild
index adde423..2e3f46d 100644
--- a/dev-libs/libuv/libuv-1.7.5.ebuild
+++ b/dev-libs/libuv/libuv-1.7.5.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD BSD-2 ISC MIT"
 SLOT="0/1"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
+RESTRICT="test"
 
 DEPEND="sys-devel/libtool
virtual/pkgconfig[${MULTILIB_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

2015-10-26 Thread Julian Ospald 
commit: a51e027ecd9511fdc2249c9d689b4097c4d0a4bf
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 17:59:42 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 18:00:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51e027e

games-strategy/0ad: rm old

 games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild | 154 --
 games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild | 154 --
 2 files changed, 308 deletions(-)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild 
b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
deleted file mode 100644
index 654bb3d..000
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/;
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
-   dev-libs/boost
-   dev-libs/icu:=
-   dev-libs/libxml2
-   dev-libs/nspr
-   ~games-strategy/0ad-data-${PV}
-   media-libs/libpng:0
-   media-libs/libsdl2[X,opengl,video]
-   net-libs/enet:1.3
-   net-libs/miniupnpc:=
-   net-misc/curl
-   sys-libs/zlib
-   virtual/jpeg:62
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libXcursor
-   editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-   lobby? ( net-libs/gloox )
-   nvtt? ( media-gfx/nvidia-texture-tools )
-   sound? ( media-libs/libvorbis
-   media-libs/openal )"
-DEPEND="${RDEPEND}
-   ${PYTHON_DEPS}
-   virtual/pkgconfig
-   test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-   games_pkg_setup
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-gentoo.patch
-   epatch "${FILESDIR}"/${P}-miniupnpc14.patch
-}
-
-src_configure() {
-   local myconf=(
-   --with-system-nvtt
-   --with-system-miniupnpc
-   --minimal-flags
-   --sdl2
-   $(usex nvtt "" "--without-nvtt")
-   $(usex pch "" "--without-pch")
-   $(usex test "" "--without-tests")
-   $(usex sound "" "--without-audio")
-   $(usex editor "--atlas" "")
-   $(usex lobby "" "--without-lobby")
-   --collada
-   --bindir="${GAMES_BINDIR}"
-   --libdir="$(games_get_libdir)"/${PN}
-   --datadir="${GAMES_DATADIR}"/${PN}
-   )
-
-   # stock premake4 does not work, use the shipped one
-   emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-   # regenerate scripts.c so our patch applies
-   cd "${S}"/build/premake/premake4 || die
-   "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-   # rebuild premake again... this is the most stupid build system
-   emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-   emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-   # run premake to create build scripts
-   cd "${S}"/build/premake || die
-   "${S}"/build/premake/premake4/bin/release/premake4 \
-   --file="premake4.lua" \
-   --outpath="../workspaces/gcc/" \
-   --platform=$(usex amd64 "x64" "x32") \
-   --os=linux \
-   "${myconf[@]}" \
-   gmake || die "Premake failed"
-}
-
-src_compile() {
-   tc-export AR
-
-   # build bundled and patched spidermonkey
-   cd libraries/source/spidermonkey || die
-   JOBS="${MAKEOPTS}" ./build.sh || die
-   cd "${S}" || die
-
-   # build 3rd party fcollada
-   emake -C libraries/source/fcollada/src
-
-   # build 0ad
-   emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-   cd binaries/system || die
-   ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-   newgamesbin binaries/system/pyrogenesis 0ad
-   use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
-

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

2015-10-26 Thread Julian Ospald 
commit: 84e3985f307d91f4ad57ba3d5ec4e7076e763b09
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 17:59:12 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 18:00:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e3985f

games-strategy/0ad: fix virtual/jpeg SLOT

 games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild | 154 ++
 1 file changed, 154 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild 
b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
new file mode 100644
index 000..5bd3321
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/;
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+   dev-libs/boost
+   dev-libs/icu:=
+   dev-libs/libxml2
+   dev-libs/nspr
+   ~games-strategy/0ad-data-${PV}
+   media-libs/libpng:0
+   media-libs/libsdl2[X,opengl,video]
+   net-libs/enet:1.3
+   net-libs/miniupnpc:=
+   net-misc/curl
+   sys-libs/zlib
+   virtual/jpeg:0
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXcursor
+   editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+   lobby? ( net-libs/gloox )
+   nvtt? ( media-gfx/nvidia-texture-tools )
+   sound? ( media-libs/libvorbis
+   media-libs/openal )"
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+   games_pkg_setup
+   python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-gentoo.patch
+   epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+   local myconf=(
+   --with-system-nvtt
+   --with-system-miniupnpc
+   --minimal-flags
+   --sdl2
+   $(usex nvtt "" "--without-nvtt")
+   $(usex pch "" "--without-pch")
+   $(usex test "" "--without-tests")
+   $(usex sound "" "--without-audio")
+   $(usex editor "--atlas" "")
+   $(usex lobby "" "--without-lobby")
+   --collada
+   --bindir="${GAMES_BINDIR}"
+   --libdir="$(games_get_libdir)"/${PN}
+   --datadir="${GAMES_DATADIR}"/${PN}
+   )
+
+   # stock premake4 does not work, use the shipped one
+   emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+   # regenerate scripts.c so our patch applies
+   cd "${S}"/build/premake/premake4 || die
+   "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+   # rebuild premake again... this is the most stupid build system
+   emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+   emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+   # run premake to create build scripts
+   cd "${S}"/build/premake || die
+   "${S}"/build/premake/premake4/bin/release/premake4 \
+   --file="premake4.lua" \
+   --outpath="../workspaces/gcc/" \
+   --platform=$(usex amd64 "x64" "x32") \
+   --os=linux \
+   "${myconf[@]}" \
+   gmake || die "Premake failed"
+}
+
+src_compile() {
+   tc-export AR
+
+   # build bundled and patched spidermonkey
+   cd libraries/source/spidermonkey || die
+   JOBS="${MAKEOPTS}" ./build.sh || die
+   cd "${S}" || die
+
+   # build 3rd party fcollada
+   emake -C libraries/source/fcollada/src
+
+   # build 0ad
+   emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+   cd binaries/system || die
+   ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+   newgamesbin binaries/system/pyrogenesis 0ad
+   use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+   insinto "${GAMES_DATADIR}"/${PN}
+

[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/

2015-10-26 Thread Julian Ospald 
commit: a36823d5f86a959f46ff6d01b05e2de1bf4ee12e
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 17:31:40 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 17:32:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36823d5

games-strategy/0ad: use x11-libs/wxGTK:3.0

Gentoo-Bug: 563328

 games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild | 154 ++
 1 file changed, 154 insertions(+)

diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild 
b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
new file mode 100644
index 000..8052103
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/;
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+   dev-libs/boost
+   dev-libs/icu:=
+   dev-libs/libxml2
+   dev-libs/nspr
+   ~games-strategy/0ad-data-${PV}
+   media-libs/libpng:0
+   media-libs/libsdl2[X,opengl,video]
+   net-libs/enet:1.3
+   net-libs/miniupnpc:=
+   net-misc/curl
+   sys-libs/zlib
+   virtual/jpeg:62
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXcursor
+   editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+   lobby? ( net-libs/gloox )
+   nvtt? ( media-gfx/nvidia-texture-tools )
+   sound? ( media-libs/libvorbis
+   media-libs/openal )"
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
+   test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+   games_pkg_setup
+   python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-gentoo.patch
+   epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+   local myconf=(
+   --with-system-nvtt
+   --with-system-miniupnpc
+   --minimal-flags
+   --sdl2
+   $(usex nvtt "" "--without-nvtt")
+   $(usex pch "" "--without-pch")
+   $(usex test "" "--without-tests")
+   $(usex sound "" "--without-audio")
+   $(usex editor "--atlas" "")
+   $(usex lobby "" "--without-lobby")
+   --collada
+   --bindir="${GAMES_BINDIR}"
+   --libdir="$(games_get_libdir)"/${PN}
+   --datadir="${GAMES_DATADIR}"/${PN}
+   )
+
+   # stock premake4 does not work, use the shipped one
+   emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+   # regenerate scripts.c so our patch applies
+   cd "${S}"/build/premake/premake4 || die
+   "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+   # rebuild premake again... this is the most stupid build system
+   emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+   emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+   # run premake to create build scripts
+   cd "${S}"/build/premake || die
+   "${S}"/build/premake/premake4/bin/release/premake4 \
+   --file="premake4.lua" \
+   --outpath="../workspaces/gcc/" \
+   --platform=$(usex amd64 "x64" "x32") \
+   --os=linux \
+   "${myconf[@]}" \
+   gmake || die "Premake failed"
+}
+
+src_compile() {
+   tc-export AR
+
+   # build bundled and patched spidermonkey
+   cd libraries/source/spidermonkey || die
+   JOBS="${MAKEOPTS}" ./build.sh || die
+   cd "${S}" || die
+
+   # build 3rd party fcollada
+   emake -C libraries/source/fcollada/src
+
+   # build 0ad
+   emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+   cd binaries/system || die
+   ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+   newgamesbin binaries/system/pyrogenesis 0ad
+   use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+   insinto "${GAMES_DATADIR}"/${PN}
+

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-26 Thread Julian Ospald 
commit: a8eb4667f5dc47d62dbc23287c9b997e2f14d3c4
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 17:09:45 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 17:09:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8eb4667

ruby-fakegem.eclass: add missing '|| die' on pushd/popd

Reviewed-By: Hans de Graaff  gentoo.org>

 eclass/ruby-fakegem.eclass | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index ed392b5..7f2b075 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -406,13 +406,13 @@ all_ruby_unpack() {
eend $?
 
mkdir "${S}"
-   pushd "${S}" &>/dev/null
+   pushd "${S}" &>/dev/null || die
 
ebegin "Unpacking data.tar.gz"
tar -mxf "${my_WORKDIR}"/data.tar.gz || die
eend $?
 
-   popd &>/dev/null
+   popd &>/dev/null || die
;;
*.patch.bz2)
# We apply the patches with RUBY_PATCHES 
directly from DISTDIR,
@@ -498,9 +498,9 @@ all_fakegem_install() {
for dir in ${RUBY_FAKEGEM_DOCDIR}; do
[[ -d ${dir} ]] || continue
 
-   pushd ${dir} &>/dev/null
+   pushd ${dir} &>/dev/null || die
dohtml -r * || die "failed to install documentation"
-   popd &>/dev/null
+   popd &>/dev/null || die
done
fi
 
@@ -514,12 +514,12 @@ all_fakegem_install() {
local bindir=$(find "${D}" -type d -path 
"*/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}/bin" -print -quit)
 
if [[ -d "${bindir}" ]]; then
-   pushd "${bindir}" &>/dev/null
+   pushd "${bindir}" &>/dev/null || die
local binaries=$(eval ls ${RUBY_FAKEGEM_BINWRAP})
for binary in $binaries; do
ruby_fakegem_binwrapper $binary
done
-   popd &>/dev/null
+   popd &>/dev/null || die
fi
fi
 }

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-26 Thread Julian Ospald 
commit: 6fb9fa1eccb810caa338259a690c5f43ca052590
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 26 17:10:13 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 26 17:10:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb9fa1e

ruby-ng.eclass: add missing '|| die' on pushd/popd

Reviewed-By: Hans de Graaff  gentoo.org>

 eclass/ruby-ng.eclass | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d560ba8..ad25456 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -324,9 +324,9 @@ _ruby_invoke_environment() {
eqawarn "Using * expansion of S is deprecated. 
Use EAPI and RUBY_S instead."
;;
esac
-   pushd "${WORKDIR}"/all &>/dev/null
+   pushd "${WORKDIR}"/all &>/dev/null || die
sub_S=$(eval ls -d "${sub_S}" 2>/dev/null)
-   popd &>/dev/null
+   popd &>/dev/null || die
fi
 
environment=$1; shift
@@ -335,16 +335,16 @@ _ruby_invoke_environment() {
S="${my_WORKDIR}"/"${sub_S}"
 
if [[ -d "${S}" ]]; then
-   pushd "$S" &>/dev/null
+   pushd "$S" &>/dev/null || die
elif [[ -d "${my_WORKDIR}" ]]; then
-   pushd "${my_WORKDIR}" &>/dev/null
+   pushd "${my_WORKDIR}" &>/dev/null || die
else
-   pushd "${WORKDIR}" &>/dev/null
+   pushd "${WORKDIR}" &>/dev/null || die
fi
 
ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment"
"$@"
-   popd &>/dev/null
+   popd &>/dev/null || die
 
S=${old_S}
 }
@@ -392,7 +392,7 @@ ruby-ng_pkg_setup() {
 # Unpack the source archive.
 ruby-ng_src_unpack() {
mkdir "${WORKDIR}"/all
-   pushd "${WORKDIR}"/all &>/dev/null
+   pushd "${WORKDIR}"/all &>/dev/null || die
 
# We don't support an each-unpack, it's either all or nothing!
if type all_ruby_unpack &>/dev/null; then
@@ -401,7 +401,7 @@ ruby-ng_src_unpack() {
[[ -n ${A} ]] && unpack ${A}
fi
 
-   popd &>/dev/null
+   popd &>/dev/null || die
 }
 
 _ruby_apply_patches() {

[gentoo-commits] repo/gentoo:master commit in: dev-lang/elixir/

2015-10-25 Thread Julian Ospald 
commit: 7e35ba12e13f3412ed6af5c120853bd52c32bf5f
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 21:32:51 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 21:32:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e35ba12

dev-lang/elixir: rm old

 dev-lang/elixir/Manifest|  1 -
 dev-lang/elixir/elixir-1.1.0.ebuild | 28 
 2 files changed, 29 deletions(-)

diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 2890789..665b714 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,3 +1,2 @@
 DIST elixir-1.0.5.tar.gz 1043275 SHA256 
5ce5c226b3d11d751b41ad79b915b86f13f8a1b89ef3e733321d3f46ff4d81b8 SHA512 
1f621e1a3939433dc91a0e2f7e62512b074ce2e8dc7190535570056875f82eda2001a333a51627e39b0f710e104409c8d17aea9635235b0963265d39b32c9f6c
 WHIRLPOOL 
eea70416f08132654e9cc4b65342971cdd7793b45d97fbe5cb1b8e6739a3befb16d72ce15b485a8c2a3204462c8b54afc9c2d934c924863e3a6342e8067644fe
-DIST elixir-1.1.0.tar.gz 1094212 SHA256 
6be4f083df230f901975df3a3bb32d3bd1e70a4d0a072aabc5972113b37ebb3b SHA512 
1a87914aa12fa6fcf6d16d3a6de0cc92c65ca1fe8061a632463ad3da8d1dcadd8f08cdd34b15ec13356bbb4771456a982a5dad3c0463dc7e7ce6b982eacab547
 WHIRLPOOL 
731869a24f144ed8cf6fb3a75c3db2a5c31ffa011c6de3eee7b35666f7d3cf80711056d071581014f6765487563f9a8cabb864ba7fbeb7b96862b7c799375e7c
 DIST elixir-1.1.1.tar.gz 1094432 SHA256 
3b7d6e4fdbcc82d19fa76f4e384f8a87535abcd00ef04528dc6b6706f32a106a SHA512 
24b1ccf6877098cf5539607a13d4c408314c01b3bac8aaa9cfda59299113affd173cb29606f57110e44104095360ca81f084cceb561fc30e795c0d15d6140772
 WHIRLPOOL 
7bf3dd5ed2b95bed8eca5eddfd97666e69e024395e7f8a684f69d36249230f0775d80c3be6c587a8a884cdf94dd3ba29e94fd5f61b4c7d150e4bce39be076f98

diff --git a/dev-lang/elixir/elixir-1.1.0.ebuild 
b/dev-lang/elixir/elixir-1.1.0.ebuild
deleted file mode 100644
index 77a909a..000
--- a/dev-lang/elixir/elixir-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="http://elixir-lang.org;
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/erlang-17"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-   emake Q=""
-}
-
-src_install() {
-   emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
-   dodoc README.md CHANGELOG.md CONTRIBUTING.md
-}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/elixir/

2015-10-25 Thread Julian Ospald 
commit: 3080714a23d0c80f56d48168ba7bc65cbb7610f4
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 21:32:31 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 21:32:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3080714a

dev-lang/elixir: version bump to 1.1.1

 dev-lang/elixir/Manifest|  1 +
 dev-lang/elixir/elixir-1.1.1.ebuild | 28 
 2 files changed, 29 insertions(+)

diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index e88a59e..2890789 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,2 +1,3 @@
 DIST elixir-1.0.5.tar.gz 1043275 SHA256 
5ce5c226b3d11d751b41ad79b915b86f13f8a1b89ef3e733321d3f46ff4d81b8 SHA512 
1f621e1a3939433dc91a0e2f7e62512b074ce2e8dc7190535570056875f82eda2001a333a51627e39b0f710e104409c8d17aea9635235b0963265d39b32c9f6c
 WHIRLPOOL 
eea70416f08132654e9cc4b65342971cdd7793b45d97fbe5cb1b8e6739a3befb16d72ce15b485a8c2a3204462c8b54afc9c2d934c924863e3a6342e8067644fe
 DIST elixir-1.1.0.tar.gz 1094212 SHA256 
6be4f083df230f901975df3a3bb32d3bd1e70a4d0a072aabc5972113b37ebb3b SHA512 
1a87914aa12fa6fcf6d16d3a6de0cc92c65ca1fe8061a632463ad3da8d1dcadd8f08cdd34b15ec13356bbb4771456a982a5dad3c0463dc7e7ce6b982eacab547
 WHIRLPOOL 
731869a24f144ed8cf6fb3a75c3db2a5c31ffa011c6de3eee7b35666f7d3cf80711056d071581014f6765487563f9a8cabb864ba7fbeb7b96862b7c799375e7c
+DIST elixir-1.1.1.tar.gz 1094432 SHA256 
3b7d6e4fdbcc82d19fa76f4e384f8a87535abcd00ef04528dc6b6706f32a106a SHA512 
24b1ccf6877098cf5539607a13d4c408314c01b3bac8aaa9cfda59299113affd173cb29606f57110e44104095360ca81f084cceb561fc30e795c0d15d6140772
 WHIRLPOOL 
7bf3dd5ed2b95bed8eca5eddfd97666e69e024395e7f8a684f69d36249230f0775d80c3be6c587a8a884cdf94dd3ba29e94fd5f61b4c7d150e4bce39be076f98

diff --git a/dev-lang/elixir/elixir-1.1.1.ebuild 
b/dev-lang/elixir/elixir-1.1.1.ebuild
new file mode 100644
index 000..77a909a
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="http://elixir-lang.org;
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-17"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+   emake Q=""
+}
+
+src_install() {
+   emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
+   dodoc README.md CHANGELOG.md CONTRIBUTING.md
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/elixir/

2015-10-25 Thread Julian Ospald 
commit: 26c9129f6bfc9ac14fc09e3e497f40cebd1cdade
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 21:30:07 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 21:30:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c9129f

dev-lang/elixir: version bump to 1.1.0

Gentoo-Bug: 564054

 dev-lang/elixir/Manifest|  1 +
 dev-lang/elixir/elixir-1.1.0.ebuild | 28 
 2 files changed, 29 insertions(+)

diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 0466efa..e88a59e 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1 +1,2 @@
 DIST elixir-1.0.5.tar.gz 1043275 SHA256 
5ce5c226b3d11d751b41ad79b915b86f13f8a1b89ef3e733321d3f46ff4d81b8 SHA512 
1f621e1a3939433dc91a0e2f7e62512b074ce2e8dc7190535570056875f82eda2001a333a51627e39b0f710e104409c8d17aea9635235b0963265d39b32c9f6c
 WHIRLPOOL 
eea70416f08132654e9cc4b65342971cdd7793b45d97fbe5cb1b8e6739a3befb16d72ce15b485a8c2a3204462c8b54afc9c2d934c924863e3a6342e8067644fe
+DIST elixir-1.1.0.tar.gz 1094212 SHA256 
6be4f083df230f901975df3a3bb32d3bd1e70a4d0a072aabc5972113b37ebb3b SHA512 
1a87914aa12fa6fcf6d16d3a6de0cc92c65ca1fe8061a632463ad3da8d1dcadd8f08cdd34b15ec13356bbb4771456a982a5dad3c0463dc7e7ce6b982eacab547
 WHIRLPOOL 
731869a24f144ed8cf6fb3a75c3db2a5c31ffa011c6de3eee7b35666f7d3cf80711056d071581014f6765487563f9a8cabb864ba7fbeb7b96862b7c799375e7c

diff --git a/dev-lang/elixir/elixir-1.1.0.ebuild 
b/dev-lang/elixir/elixir-1.1.0.ebuild
new file mode 100644
index 000..77a909a
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="http://elixir-lang.org;
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-17"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+   emake Q=""
+}
+
+src_install() {
+   emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
+   dodoc README.md CHANGELOG.md CONTRIBUTING.md
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libuv/

2015-10-25 Thread Julian Ospald 
commit: 7a3d1a691de9151bb6174425c201f8d2b486df44
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 21:12:32 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 21:13:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3d1a69

dev-libs/libuv: version bump to 1.7.5

Also drop useless autotools-utils.

 dev-libs/libuv/Manifest   |  1 +
 dev-libs/libuv/libuv-1.7.5.ebuild | 43 +++
 2 files changed, 44 insertions(+)

diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 9879d1b..0edabf3 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -5,3 +5,4 @@ DIST libuv-1.4.2.tar.gz 1017992 SHA256 
b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4
 DIST libuv-1.5.0.tar.gz 1023438 SHA256 
f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 
b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6
 WHIRLPOOL 
aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4
 DIST libuv-1.6.1.tar.gz 1027771 SHA256 
f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 
3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3
 WHIRLPOOL 
0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4
 DIST libuv-1.7.0.tar.gz 1035932 SHA256 
27a66f944c8cf1baf0fb53f5cfe11f01035cc80622d8ecc8e18bd1b2ae35ef5f SHA512 
01ad2f7aedea5f7076a183fdb0a59f7d091cb7125466e3e243e646f4a88729790a63823d8892e7121cd3a7a293cc9e2b35a6c3e3e89960d4ddfc4bdcd44a0ede
 WHIRLPOOL 
6f6abf004fab3a10b76f16aedd2f73c07a47505e8b850975b315a91c41fed6f5ed58072fe43e1479bf8185d56115ebae93342722fe0c938e86c82a09046b853a
+DIST libuv-1.7.5.tar.gz 1041054 SHA256 
11d10f12d68fa655fff18c6021e8e45bc610e7baee006f17247b1830ee316093 SHA512 
fb79ba02d09460d3f269fb171ea9abe7a32d9ec765672cd7a2e3b93073df3ead2e88742730325adbb83a541c93ffe22574a7bfc92a3c1b7b43f3dfe7f8812c77
 WHIRLPOOL 
3421214df56d227ab88f1e16d212ef6a38507ed35db743e82f1667ce5817d1ec1b49555ddd78f96678385491e482408bdcd879219e1ccaa802ee978d710aee36

diff --git a/dev-libs/libuv/libuv-1.7.5.ebuild 
b/dev-libs/libuv/libuv-1.7.5.ebuild
new file mode 100644
index 000..adde423
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.7.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv;
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool
+   virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+   echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+   > m4/libuv-extra-automake-flags.m4 || die
+
+   eautoreconf
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf \
+   cc_cv_cflags__g=no \
+   $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+   mkdir "${BUILD_DIR}"/test || die
+   cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+   default
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libuv/

2015-10-25 Thread Julian Ospald 
commit: 0058a824f2a854c0a5a89ece5dbcb9b4b194da95
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 21:19:53 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 21:19:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0058a824

dev-libs/libuv: add subslots description

 dev-libs/libuv/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index fc03810..e1eed6d 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -31,4 +31,7 @@
https://github.com/libuv/libuv/issues
libuv/libuv

+   
+   Reflect ABI compatibility of libuv.so.
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libuv/, dev-libs/libuv/files/

2015-10-25 Thread Julian Ospald 
commit: 49d2ae8762c90af1364383e368f50e9a367974ab
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 21:18:43 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 21:18:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49d2ae87

dev-libs/libuv: cleanup old

 dev-libs/libuv/Manifest   |  3 -
 dev-libs/libuv/files/01-libuv-0.11.25-tests.patch | 84 ---
 dev-libs/libuv/files/02-libuv-0.11.25-tests.patch | 44 
 dev-libs/libuv/libuv-0.11.25-r1.ebuild| 43 
 dev-libs/libuv/libuv-0.11.29.ebuild   | 41 ---
 dev-libs/libuv/libuv-1.1.0.ebuild | 45 
 6 files changed, 260 deletions(-)

diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 0edabf3..5631aad 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,6 +1,3 @@
-DIST libuv-0.11.25.tar.gz 393814 SHA256 
b95a3e5eca9554998b7423ee786205e52731e82e2d24cbbd4f65af763de542fb SHA512 
7e2b5befb76ee7b0c86e6a459ef276386fe60b511b64c33d01e656cbcf8ff833244c8601b7b83963bf00d64a999a5a186f14937308eed35b1496e0c829b37380
 WHIRLPOOL 
23d844d92100b49b598790a98cbac132c453f683fedf9c089cabf3bcafe1b9c064fab579fe5e7d95459de0046ac8f9d8b133ff79bd71efa5294e203a1c7afc6b
-DIST libuv-0.11.29.tar.gz 486768 SHA256 
fac45e72c2df30ddc9cbdf5002fc1363281d0e433831e3d43acb1036c2cabfc6 SHA512 
91439c47b3af90a71c15ffcaf296b515c2723b2a4cd329b529b6d37a4d05d12bdf6ad6bca87079d17c9b79aab02634afddbcf53c70afcc1765dcaf49b9dd28b2
 WHIRLPOOL 
d010c5f6e3c1a4262195b50087bc3408c6df726adbcd23abc27cf64ec1da6b159049a6d4f9d46c3cebaaa333b667cefe339d4fec6b1379a38940ee7f4376ec40
-DIST libuv-1.1.0.tar.gz 1010640 SHA256 
e4ff513c18a6322898972b0b6ce986445bcd2c13710f4a46b10baf80b28599cf SHA512 
2d801b8b12e6f9b179f62084d1c260b6443ae34523c12dbea8317ff34aa0a76f3df2ee38fb161aa6fd4092b6280a53c7ed599d04eb7ed0d250c1e60b4e584dea
 WHIRLPOOL 
6d6b3eea2ddb54322d20125f1a0a61b8a00b1771ccb8bc0d7829229cabb3e363adc6f85b2d1ae2f506410a543c92404df9f545a57805ac278fab560d5a24de5e
 DIST libuv-1.4.2.tar.gz 1017992 SHA256 
b9e424f69db0d1c3035c5f871cd9d7a3f4bace0a4db3e974bdbfa0cf95f6b741 SHA512 
a2ee23d957b4b2c486c01a8ca0814cb42853d3496edcf2c39228fe9259317699954bd222abbcc4e7fda81b936ecfd64be3472230b319e8caab8e4bba0c835ced
 WHIRLPOOL 
53727ec56b274523e445b23160a6a42d8b7fdf5b298480f0819a0cd4a19d811b59d00756eec2c9d69a34d8add96ff6103b44752df06d1346a13f2c979f52cc4a
 DIST libuv-1.5.0.tar.gz 1023438 SHA256 
f9c6ad4b7a2c90d93c8e09d2e739bb46d199639c4d884ba30323359521b09367 SHA512 
b6f6e685e66b72a0439eda35297fe5f98db598abd83deff0e9f614ef1f52ffc36717ded5e28aa2c32054c52f396ae826651c04e958f13e409a701558d777cee6
 WHIRLPOOL 
aea128f28d336160cb2b616cd5a6dd479504be612d7b805c6bdcee529530dfb49b9bace254df9bbfceccdaed1086589defc94888b99657709c79299a13aa47e4
 DIST libuv-1.6.1.tar.gz 1027771 SHA256 
f558ede285878d6a69f6a6d43b5df0241f3c35d62ac989477bdbd418badd83d7 SHA512 
3fe53352de312666c02ee6523bd0da3e8a8fb1704eb8c5016490ad3a2275aa1a529123e00173ea626afc284d9863cf5cb5ef4a114655c55925f46632ca5ad0d3
 WHIRLPOOL 
0ea59068acdc9c9a86521a5ae61148f182d14f39643b1c6df523e79faa249d5a6ab2bbb964bef6a0aff9bbf67d4119a801848421d0029a8f11d1a698213619a4

diff --git a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch 
b/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch
deleted file mode 100644
index 12eabc2..000
--- a/dev-libs/libuv/files/01-libuv-0.11.25-tests.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From f58b02f2cf068e1bed10bf9f632bad396d907de9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <sag...@gmail.com>
-Date: Fri, 23 May 2014 09:25:23 +0200
-Subject: [PATCH] unix, windows: fix parsing scoped IPv6 addresses
-

- src/inet.c | 37 +
- 1 file changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/src/inet.c b/src/inet.c
-index 0eb9438..36457f4 100644
 a/src/inet.c
-+++ b/src/inet.c
-@@ -17,6 +17,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #if defined(_MSC_VER) && _MSC_VER < 1600
- # include "stdint-msvc2008.h"
-@@ -159,11 +160,27 @@ static int inet_ntop6(const unsigned char *src, char 
*dst, size_t size) {
- 
- 
- int uv_inet_pton(int af, const char* src, void* dst) {
-+  if (src == NULL || dst == NULL)
-+return UV_EINVAL;
-+
-   switch (af) {
-   case AF_INET:
- return (inet_pton4(src, dst));
--  case AF_INET6:
--return (inet_pton6(src, dst));
-+  case AF_INET6: {
-+int len;
-+char tmp[UV__INET6_ADDRSTRLEN], *s, *p;
-+s = (char*) src;
-+p = strchr(src, '%');
-+if (p != NULL) {
-+  s = tmp;
-+  len = p - src;
-+  if (len > UV__INET6_ADDRSTRLEN-1)
-+len = UV__INET6_ADDRSTRLEN-1;
-+  memcpy(s, src, len);
-+  s[len] = '\0';
-+}
-+return inet_pton6(s, dst);
-+  }
-   default:
- return UV_EAFNOSUPPORT;
-   }
-@@ -228,7 +245,7 @@ static int inet_pton6(const char *src, uns

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-25 Thread Julian Ospald 
commit: 83cd0574e1b3f5b23499767ceaff0792f472ff56
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 18:17:42 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 18:17:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cd0574

xorg-2.eclass: add missing '|| die' on pushd/popd

Reviewed-By: Michał Górny  gentoo.org>

 eclass/xorg-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
index 91b83ae..437265a 100644
--- a/eclass/xorg-2.eclass
+++ b/eclass/xorg-2.eclass
@@ -516,9 +516,9 @@ xorg-2_src_install() {
fi
 
if [[ -n ${GIT_ECLASS} ]]; then
-   pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null
+   pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null || die
git log ${EGIT_COMMIT} > "${S}"/ChangeLog
-   popd > /dev/null
+   popd > /dev/null || die
fi
 
if [[ -e "${S}"/ChangeLog ]]; then

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-25 Thread Julian Ospald 
commit: 67a6620144235b427852f93ca030b38651a43024
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 19:21:13 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 19:22:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a66201

java-ant-2.eclass: add missing '|| die' on pushd/popd

Reviewed-By: James Le Cuirot  gentoo.org>
Reviewed-By: Patrice Clement  gentoo.org>

 eclass/java-ant-2.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 64dca0a..1f5734f 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -154,7 +154,7 @@ java-ant_bsfix() {
echo "QA Notice: Package is using java-ant, but doesn't depend 
on a Java VM"
fi
 
-   pushd "${S}" >/dev/null
+   pushd "${S}" >/dev/null || die
 
local find_args=""
[[ "${JAVA_PKG_BSFIX_ALL}" == "yes" ]] || find_args="-maxdepth 1"
@@ -172,7 +172,7 @@ java-ant_bsfix() {
 
[[ "${bsfix_these// /}" ]] && eval java-ant_bsfix_files ${bsfix_these}
 
-   popd > /dev/null
+   popd > /dev/null || die
 }
 
 _bsfix_die() {

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-25 Thread Julian Ospald 
commit: 07d1cbdb022146ea547ae070727bf889788c3f52
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 18:18:30 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 18:18:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d1cbdb

git-2.eclass: add missing '|| die' on pushd/popd

Reviewed-By: Michał Górny  gentoo.org>

 eclass/git-2.eclass | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index eae6ba1..3cb6079 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -180,7 +180,7 @@ git-2_submodules() {
fi
 
debug-print "${FUNCNAME}: working in \"${1}\""
-   pushd "${EGIT_DIR}" > /dev/null
+   pushd "${EGIT_DIR}" > /dev/null || die
 
debug-print "${FUNCNAME}: git submodule init"
git submodule init || die
@@ -189,7 +189,7 @@ git-2_submodules() {
debug-print "${FUNCNAME}: git submodule update"
git submodule update || die
 
-   popd > /dev/null
+   popd > /dev/null || die
fi
 }
 
@@ -204,7 +204,7 @@ git-2_branch() {
local branchname src
 
debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\""
-   pushd "${EGIT_SOURCEDIR}" > /dev/null
+   pushd "${EGIT_SOURCEDIR}" > /dev/null || die
 
local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
@@ -215,7 +215,7 @@ git-2_branch() {
git checkout -b ${branchname} ${src} \
|| die "${FUNCNAME}: changing the branch failed"
 
-   popd > /dev/null
+   popd > /dev/null || die
 }
 
 # @FUNCTION: git-2_gc
@@ -228,13 +228,13 @@ git-2_gc() {
local args
 
if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then
-   pushd "${EGIT_DIR}" > /dev/null
+   pushd "${EGIT_DIR}" > /dev/null || die
ebegin "Garbage collecting the repository"
[[ ${EGIT_PRUNE} ]] && args='--prune'
debug-print "${FUNCNAME}: git gc ${args}"
git gc ${args}
eend $?
-   popd > /dev/null
+   popd > /dev/null || die
fi
 }
 
@@ -306,12 +306,12 @@ git-2_move_source() {
debug-print-function ${FUNCNAME} "$@"
 
debug-print "${FUNCNAME}: ${MOVE_COMMAND} \"${EGIT_DIR}\" 
\"${EGIT_SOURCEDIR}\""
-   pushd "${EGIT_DIR}" > /dev/null
+   pushd "${EGIT_DIR}" > /dev/null || die
mkdir -p "${EGIT_SOURCEDIR}" \
|| die "${FUNCNAME}: failed to create ${EGIT_SOURCEDIR}"
${MOVE_COMMAND} "${EGIT_SOURCEDIR}" \
|| die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
-   popd > /dev/null
+   popd > /dev/null || die
 }
 
 # @FUNCTION: git-2_initial_clone
@@ -388,22 +388,22 @@ git-2_fetch() {
 
if [[ ! -d ${EGIT_DIR} ]]; then
git-2_initial_clone
-   pushd "${EGIT_DIR}" > /dev/null
+   pushd "${EGIT_DIR}" > /dev/null || die
cursha=$(git rev-parse ${UPSTREAM_BRANCH})
echo "GIT NEW clone -->"
echo "   repository:   ${EGIT_REPO_URI_SELECTED}"
echo "   at the commit:${cursha}"
 
-   popd > /dev/null
+   popd > /dev/null || die
elif [[ ${EVCS_OFFLINE} ]]; then
-   pushd "${EGIT_DIR}" > /dev/null
+   pushd "${EGIT_DIR}" > /dev/null || die
cursha=$(git rev-parse ${UPSTREAM_BRANCH})
echo "GIT offline update -->"
echo "   repository:   $(git config 
remote.origin.url)"
echo "   at the commit:${cursha}"
-   popd > /dev/null
+   popd > /dev/null || die
else
-   pushd "${EGIT_DIR}" > /dev/null
+   pushd "${EGIT_DIR}" > /dev/null || die
oldsha=$(git rev-parse ${UPSTREAM_BRANCH})
git-2_update_repo
cursha=$(git rev-parse ${UPSTREAM_BRANCH})
@@ -421,7 +421,7 @@ git-2_fetch() {
 
# print nice statistic of what was changed
git --no-pager diff --stat ${oldsha}..${UPSTREAM_BRANCH}
-   popd > /dev/null
+   popd > /dev/null || die
fi
# export the version the reposito

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-25 Thread Julian Ospald 
commit: a413cb15f841e85c2800cb68321d1d0c7d791039
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 25 19:21:26 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 25 19:22:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a413cb15

java-utils-2.eclass: add missing '|| die' on pushd/popd

Reviewed-By: James Le Cuirot  gentoo.org>
Reviewed-By: Patrice Clement  gentoo.org>

 eclass/java-utils-2.eclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index deab51d..f7a6a86 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -720,7 +720,7 @@ java-pkg_dosrc() {
if [[ ${result} != 12 && ${result} != 0 ]]; then
die "failed to zip ${dir_name}"
fi
-   popd >/dev/null
+   popd >/dev/null || die
done
 
# Install the zip
@@ -1033,11 +1033,11 @@ java-pkg_jar-from() {
java-pkg_record-jar_ --build-only 
"${target_pkg}" "${jar}"
fi
fi
-   popd > /dev/null
+   popd > /dev/null || die
return 0
fi
done
-   popd > /dev/null
+   popd > /dev/null || die
# if no target was specified, we're ok
if [[ -z "${target_jar}" ]] ; then
return 0
@@ -2487,9 +2487,9 @@ java-pkg_append_() {
 # @CODE
 # @RETURN: path to $1's parent directory
 java-pkg_expand_dir_() {
-   pushd "$(dirname "${1}")" >/dev/null 2>&1
+   pushd "$(dirname "${1}")" >/dev/null 2>&1 || die
pwd
-   popd >/dev/null 2>&1
+   popd >/dev/null 2>&1 || die
 }
 
 # @FUNCTION: java-pkg_func-exists

[gentoo-commits] repo/gentoo:master commit in: eclass/

2015-10-23 Thread Julian Ospald 
commit: 0136b88a78b53daa22f4cd246e3fb203c3d3dc42
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 23 11:32:40 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 23 11:32:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0136b88a

Revert "bitcoincore: DEPEND on net-libs/miniupnpc without known security vulns"

This reverts commit 10df61505856da197cac35574d74a09d6dd389fa.

 eclass/bitcoincore.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index 0b4a2d2..0362c8c 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -162,7 +162,7 @@ bitcoincore_common_depend_use() {
in_bcc_iuse "$1" || return
BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} $1? ( $2 )"
 }
-bitcoincore_common_depend_use upnp '>net-libs/miniupnpc-1.9.20150915'
+bitcoincore_common_depend_use upnp net-libs/miniupnpc
 bitcoincore_common_depend_use wallet "${WALLET_DEPEND}"
 bitcoincore_common_depend_use zeromq net-libs/zeromq
 RDEPEND="${RDEPEND} ${BITCOINCORE_COMMON_DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-cli/, net-p2p/bitcoin-qt/, net-p2p/bitcoind/, eclass/

2015-10-23 Thread Julian Ospald 
commit: 0ccb863ab3587ccdf2a645443ec44e33c306b011
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 23 11:33:31 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 23 11:33:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccb863a

Revert "bitcoincore 0.11.1 & : hasufell's suggestions"

This reverts commit 5be824adbd39361d273f6d7c08a15a5574ceec24.

 eclass/bitcoincore.eclass |  1 -
 net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild |  2 +-
 net-p2p/bitcoin-cli/bitcoin-cli-.ebuild   |  2 +-
 net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild   | 12 
 net-p2p/bitcoin-qt/bitcoin-qt-.ebuild | 12 
 net-p2p/bitcoind/bitcoind-0.11.1.ebuild   |  2 +-
 net-p2p/bitcoind/bitcoind-.ebuild |  2 +-
 7 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index 0362c8c..0cebdb5 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -213,7 +213,6 @@ bitcoincore_pkg_pretend() {
 }
 
 bitcoincore_prepare() {
-   local mypolicy
if [ -n "${BITCOINCORE_NO_SYSLIBS}" ]; then
true
elif [ "${PV}" = "" ]; then

diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild 
b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
index 13e5eda..17d993f 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 src_prepare() {
-   sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind 
\(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion || die
+   sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind \)bitcoind 
\(bitcoin-cli\)$/\1\2/' contrib/bitcoind.bash-completion
bitcoincore_src_prepare
 }
 

diff --git a/net-p2p/bitcoin-cli/bitcoin-cli-.ebuild 
b/net-p2p/bitcoin-cli/bitcoin-cli-.ebuild
index 3c7b4d5..4904ce4 100644
--- a/net-p2p/bitcoin-cli/bitcoin-cli-.ebuild
+++ b/net-p2p/bitcoin-cli/bitcoin-cli-.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=""
 
 src_prepare() {
bitcoincore_prepare
-   sed -i 's/bitcoin-tx//' src/Makefile.am || die
+   sed -i 's/bitcoin-tx//' src/Makefile.am
bitcoincore_autoreconf
 }
 

diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild 
b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
index 46d4f07..d2618cf 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild
@@ -38,7 +38,7 @@ REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 src_prepare() {
bitcoincore_prepare
 
-   local filt= yeslang= nolang= lan ts x
+   local filt= yeslang= nolang=
 
for lan in $LANGS; do
if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -52,15 +52,15 @@ src_prepare() {
x="${x/.ts/}"
if ! use "linguas_$x"; then
nolang="$nolang $x"
-   rm "$ts" || die
+   rm "$ts"
filt="$filt\\|$x"
else
yeslang="$yeslang $x"
fi
done
filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)"
-   sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die
-   sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
+   sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc'
+   sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include'
einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
 
bitcoincore_autoreconf
@@ -89,10 +89,6 @@ src_install() {
fi
 }
 
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
 update_caches() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update

diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-.ebuild 
b/net-p2p/bitcoin-qt/bitcoin-qt-.ebuild
index 902b6ae..6f9997e 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-.ebuild
@@ -35,7 +35,7 @@ REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
 src_prepare() {
bitcoincore_prepare
 
-   local filt= yeslang= nolang= lan ts x
+   local filt= yeslang= nolang=
 
for lan in $LANGS; do
if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
@@ -49,15 +49,15 @@ src_prepare() {
x="${x/.ts/}"
if ! use "linguas_$x"; then
nolang="$nolang $x"
-   rm "$ts" || die
+   rm "$ts"
filt="$filt\\|$x"
else

[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-cli/, net-p2p/bitcoin-qt/, net-libs/libbitcoinconsensus/, ...

2015-10-23 Thread Julian Ospald 
commit: 2e7be44a1f4a20f5b9495127c89ca78a438e6cbc
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 23 11:33:41 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 23 11:33:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7be44a

Revert "bitcoincore: Bump to 0.11.1"

This reverts commit f0eac2dfbd1498bff1f03350c97d2d12e63e2711.

 dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild   |  21 -
 eclass/bitcoincore.eclass  |  19 ++--
 .../libbitcoinconsensus-0.11.1.ebuild  |  27 --
 net-p2p/bitcoin-cli/bitcoin-cli-0.11.1.ebuild  |  33 ---
 net-p2p/bitcoin-qt/bitcoin-qt-0.11.1.ebuild| 104 -
 net-p2p/bitcoind/bitcoind-0.11.1.ebuild|  77 ---
 6 files changed, 6 insertions(+), 275 deletions(-)

diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild 
b/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
deleted file mode 100644
index 5885033..000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.11.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2010-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="cf33f196e79b1e61d6266f8e5190a0c4bfae7224"
-BITCOINCORE_LJR_DATE="20150921"
-BITCOINCORE_IUSE=""
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bitcoincore
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-src_configure() {
-   bitcoincore_conf \
-   --enable-util-tx
-}

diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass
index 0cebdb5..69ed9d6 100644
--- a/eclass/bitcoincore.eclass
+++ b/eclass/bitcoincore.eclass
@@ -91,11 +91,8 @@ case "${PV}" in
 0.11*)
BITCOINCORE_SERIES="0.11.x"
LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423"
-   # RBF is bundled with ljr patchset since 0.11.1
-   if [ "${PVR}" = "0.11.0" ]; then
-   
BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
-   BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
-   fi
+   
BITCOINCORE_RBF_DIFF="5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e"
+   BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch"
;;
 *)
BITCOINCORE_SERIES=""
@@ -125,7 +122,7 @@ else
BITCOINXT_PATCHFILE="${MyPN}xt-v${PV}.patch"
SRC_URI="${SRC_URI} xt? ( 
https://github.com/bitcoinxt/bitcoinxt/compare/${BITCOINCORE_XT_DIFF}.diff -> 
${BITCOINXT_PATCHFILE} )"
fi
-   if in_bcc_policy rbf && [ -n "${BITCOINCORE_RBF_DIFF}" ]; then
+   if in_bcc_policy rbf; then
SRC_URI="${SRC_URI} bitcoin_policy_rbf? ( 
https://github.com/petertodd/bitcoin/compare/${BITCOINCORE_RBF_DIFF}.diff -> 
${BITCOINCORE_RBF_PATCHFILE} )"
fi
S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
@@ -207,8 +204,8 @@ bitcoincore_pkg_pretend() {
"Replace By Fee policy is enabled: Your node will 
preferentially mine and relay transactions paying the highest fee, regardless 
of receive order." \
"Replace By Fee policy is disabled: Your node will only accept 
the first transaction seen consuming a conflicting input, regardless of fee 
offered by later ones."
bitcoincore_policymsg spamfilter \
-   "Enhanced spam filter policy is enabled: Your node will 
identify notorious spam scripts and avoid assisting them. This may impact your 
ability to use some services (see link for a list)." \
-   "Enhanced spam filter policy is disabled: Your node will not be 
checking for notorious spam scripts, and may assist them."
+   "Enhanced spam filter is enabled: A blacklist (seen as 
controversial by some) will be used by your node. This may impact your ability 
to use some services (see link for a list)." \
+   "Enhanced spam filter is disabled: Your node will not be 
checking for notorious spammers, and may assist them."
$bitcoincore_policymsg_flag && einfo "For more information on any of 
the above, see ${LJR_PATCH_DESC}"
 }
 
@@ -242,11 +239,7 @@ bitcoincore_prepare() {
use bitcoin_policy_${mypolicy} || continue
case "${mypolicy}" in
rbf)
-   if [ -n "${BITCOINCORE_RBF_PATCHFILE}" ]; then
-   epatch "${DISTDIR}/${BITCOINCORE_RBF_PATCHFILE}"
-   else

[gentoo-commits] repo/gentoo:master commit in: dev-java/juel/

2015-10-23 Thread Julian Ospald 
commit: bb31a9a0d96438ce74443afdba7753769bdded3d
Author: Julian Ospald  gentoo  org>
AuthorDate: Sat Oct 24 00:32:54 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sat Oct 24 00:32:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb31a9a0

dev-java/juel: fix revbump version

-r0 is implicit when no -rX is given, so this is a duplicate version id
and an uninstallable ebuild revision.

 dev-java/juel/{juel-2.1.0-r0.ebuild => juel-2.1.0-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-java/juel/juel-2.1.0-r0.ebuild 
b/dev-java/juel/juel-2.1.0-r1.ebuild
similarity index 100%
rename from dev-java/juel/juel-2.1.0-r0.ebuild
rename to dev-java/juel/juel-2.1.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/

2015-10-22 Thread Julian Ospald 
commit: 8992c5f585b8ef496d16ab78266125c8a974bd68
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct 22 12:45:00 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct 22 12:45:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8992c5f5

net-dns/dnscrypt-proxy: update metadata.xml

* fix formatting
* add myself as maintainer

 net-dns/dnscrypt-proxy/metadata.xml | 40 ++---
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/metadata.xml 
b/net-dns/dnscrypt-proxy/metadata.xml
index 03ba21e..ad41b6a 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -1,20 +1,28 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-proxy-maintainers
-
-   amesi...@gmail.com
-   Jiajun Wang
-   Primary Maintainer, Assign bugs
-
-
-dnscrypt-proxy provides local service which can be used directly as your local 
resolver
-or as a DNS forwarder, encrypting and authenticating requests using the 
DNSCrypt protocol
-and passing them to an upstream server.
-
-
-   Use net-libs/ldns for DNSSEC/SSHFP 
validation
-   Enable plugin support to inspect and modify 
queries and responses
-   Use systemd's socket activation instead of 
creating the sockets itself
-
+   
+   hasuf...@gentoo.org
+       Julian Ospald
+   Primary Maintainer, assign bugs to 
him
+   
+   
+   amesi...@gmail.com
+   Jiajun Wang
+   Proxied maintainer, CC on bugs
+   
+   
+   dnscrypt-proxy provides local service which can be used 
directly as your
+   local resolver or as a DNS forwarder, encrypting and 
authenticating
+   requests using the DNSCrypt protocol and passing them to an 
upstream
+   server.
+   
+   
+   Use net-libs/ldns for DNSSEC/SSHFP
+   validation
+   Enable plugin support to inspect and modify
+   queries and responses
+   Use systemd's socket activation instead of
+   creating the sockets itself
+

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/

2015-10-22 Thread Julian Ospald 
commit: 231001d252cd81974b8745d07a4440d4f59bced7
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct 22 12:14:25 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct 22 12:45:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231001d2

net-dns/dnscrypt-proxy: add missing quotes to dnscrypt-proxy.initd

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd 
b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 3ef60f9..8e231e4 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -21,8 +21,8 @@ start() {
if [ ! -d "${rundir}" ]; then
mkdir "${rundir}"
if [ -n "${runas_user}" ]; then
-   touch  ${DNSCRYPT_LOGFILE}
-   chown ${runas_user}:${runas_group} ${DNSCRYPT_LOGFILE}
+   touch "${DNSCRYPT_LOGFILE}"
+   chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
chown -R ${runas_user}:${runas_group} "${rundir}"
fi
fi
@@ -31,8 +31,8 @@ start() {
start-stop-daemon --start --quiet \
--exec /usr/sbin/dnscrypt-proxy \
-- \
-   --pidfile=${pidfile} \
-   --logfile=${DNSCRYPT_LOGFILE} \
+   --pidfile="${pidfile}" \
+   --logfile="${DNSCRYPT_LOGFILE}" \
--daemonize --user=${runas_user} \
--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \

--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/

2015-10-22 Thread Julian Ospald 
commit: 0a1505c64ea80a4ed92dc7c478230233773abb93
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct 22 12:42:07 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct 22 12:45:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1505c6

net-dns/dnscrypt-proxy: version bump to 1.6.0 and various fixes

* remove unused eutils inherit
* fix dependency on sys-apps/systemd (it's not just RDEPEND)
* add missing DEPEND on virtual/pkgconfig
* remove automagic dependency on ldns to avoid dependency
  breakage and depend on it unconditionally (there is no
  build-system switch)
* don't install COPYING, it's already in LICENSE variable,
  also simplify DOCS string
* add pkg_postinst() information on usage
* minor cosmetic changes

 net-dns/dnscrypt-proxy/Manifest|  1 +
 net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild | 58 ++
 2 files changed, 59 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 09b1a79..c6b84c9 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,2 +1,3 @@
 DIST dnscrypt-proxy-1.4.2.tar.gz 1592962 SHA256 
1d519068c30868bb60a151908f0e300a1754b234f7bc2ad1d749ad9d0d977076 SHA512 
ecb81b5d20cf88a610421bb1266861a2f5dd34d0ce916c54507507ca5dbe5d9e49e95916f76fa7997b112860f2bc37793f075ed812c75b2904adf6cdf32cac17
 WHIRLPOOL 
ddfa3da3de933f6cbb8721ccd6435e97b9e893d32311e1c3badbc23b6a0547b6cb0f8d6037baaf0027ca1eb972c4be167dc9ce56194f7f6fa54fac974ca0bd24
 DIST dnscrypt-proxy-1.4.3.tar.gz 1560345 SHA256 
f10f10c18e25ced3c5ec5d0c4145d33270f9cfa991fd1b18d5d9af00e4d9b68e SHA512 
3aae9f20bc06087b0860a24488bcda117010a34218d7aef3c68a0f155f8164ce06a88865a9caf1ce5c5eaa8588518ccc2c8a61a97cc39f527f7b2b14cdf8c118
 WHIRLPOOL 
49915b0f95d340828c79febc9b7d94c4f0c444e016b9f78d134e05f43945b446ab71bbc6a230d6e15d5f1f4c0b97d9f671b6001314cc157cdcd419b01bf23550
+DIST dnscrypt-proxy-1.6.0.tar.gz 1579293 SHA256 
7703a41a1040fc30b19fdfbbaba36b411e66d998584b0e2fa5088f734f4f86be SHA512 
1937a80ab0e6e5786b0d004fef1c007d9d8a4df335542ae6f96c1eac7739920f2ff4b469d30abac774c12a41d275c2a8bf31b5514d7af446028cedeeb3efcf02
 WHIRLPOOL 
b24eb58bca1ff8fa55fec3836399a3ee5c66823d8b459e5f8ce7aa653454407dc3b80d7dc050b76e5c0595fc0e2d854478a6f949ef859b149f6b20e127c98274

diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild 
b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
new file mode 100644
index 000..1957f9f
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit systemd user
+
+DESCRIPTION="A tool for securing communications between a client and a DNS 
resolver"
+HOMEPAGE="http://dnscrypt.org/;
+SRC_URI="http://download.dnscrypt.org/${PN}/${P}.tar.gz;
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins systemd"
+
+CDEPEND="
+   dev-libs/libsodium
+   net-libs/ldns
+   systemd? ( sys-apps/systemd )"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+   virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README* TECHNOTES THANKS"
+
+pkg_setup() {
+   enewgroup dnscrypt
+   enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_configure() {
+   econf \
+   $(use_enable plugins) \
+   $(use_with systemd)
+}
+
+src_install() {
+   default
+
+   newinitd "${FILESDIR}"/${PN}.initd ${PN}
+   newconfd "${FILESDIR}"/${PN}.confd ${PN}
+   systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+   elog "After starting the service you will need to update your"
+   elog "/etc/resolv.conf and replace your current set of resolvers"
+   elog "with:"
+   elog
+   elog "nameserver "
+   elog
+   elog "where  is what you supplied in"
+   elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
+   elog
+   elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage.;
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/wget/

2015-10-22 Thread Julian Ospald 
commit: c9611fab7b30402b3f9cc9803324b9d3184b5d3d
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct 22 13:01:09 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct 22 13:01:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9611fab

net-misc/wget: lift the REQUIRED_USE constraints for libressl

'libressl' USE flag is only for switching the openssl-provider
and shouldn't introduce additional REQUIRED_USE complexity.

 net-misc/wget/wget-1.16.3-r2.ebuild | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/net-misc/wget/wget-1.16.3-r2.ebuild 
b/net-misc/wget/wget-1.16.3-r2.ebuild
index 26d60ba..a44cd52 100644
--- a/net-misc/wget/wget-1.16.3-r2.ebuild
+++ b/net-misc/wget/wget-1.16.3-r2.ebuild
@@ -15,18 +15,16 @@ LICENSE="GPL-3"
 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 
~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE="
-   ntlm? ( !gnutls ssl )
-   libressl? ( !gnutls ssl )
-   gnutls? ( !libressl ssl )
-"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
 LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
pcre? ( dev-libs/libpcre[static-libs(+)] )
ssl? (
gnutls? ( net-libs/gnutls[static-libs(+)] )
-   libressl? ( dev-libs/libressl[static-libs(+)] )
-   !gnutls? ( !libressl? ( dev-libs/openssl:0[static-libs(+)] ) )
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+   libressl? ( dev-libs/libressl[static-libs(+)] )
+   )
)
uuid? ( sys-apps/util-linux[static-libs(+)] )
zlib? ( sys-libs/zlib[static-libs(+)] )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/

2015-10-20 Thread Julian Ospald 
commit: e7cf37200ee1f2985bcd065be65020c9adcede4b
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 20 14:35:12 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 14:39:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cf3720

dev-libs/angelscript: fix SONAME

 dev-libs/angelscript/angelscript-2.30.2-r1.ebuild | 41 +++
 1 file changed, 41 insertions(+)

diff --git a/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild 
b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
new file mode 100644
index 000..14ec9e9
--- /dev/null
+++ b/dev-libs/angelscript/angelscript-2.30.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/;
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip;
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+
+pkg_setup() {
+   tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+   multilib_copy_sources
+}
+
+multilib_src_compile() {
+   emake -C ${PN}/projects/gnuc LIBRARYDEST=
+}
+
+multilib_src_install() {
+   emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ 
INCLUDEDEST="${D}"/usr/include/ install
+   use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || 
die ; }
+}
+
+multilib_src_install_all() {
+   use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/files/, dev-libs/angelscript/

2015-10-20 Thread Julian Ospald 
commit: adf5347202f926ad3391a3eb6019ab5fa081056f
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 20 14:35:41 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 14:39:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf53472

dev-libs/angelscript: rm old

 dev-libs/angelscript/angelscript-2.29.2.ebuild | 57 --
 dev-libs/angelscript/angelscript-2.30.1.ebuild | 41 
 dev-libs/angelscript/angelscript-2.30.2.ebuild | 41 
 .../files/angelscript-2.29.2-execstack.patch   | 13 -
 4 files changed, 152 deletions(-)

diff --git a/dev-libs/angelscript/angelscript-2.29.2.ebuild 
b/dev-libs/angelscript/angelscript-2.29.2.ebuild
deleted file mode 100644
index 930c79d..000
--- a/dev-libs/angelscript/angelscript-2.29.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/;
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip;
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/sdk
-S2=${WORKDIR}/sdk_static
-
-pkg_setup() {
-   tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-   if use static-libs ; then
-   cp -pR "${WORKDIR}"/sdk "${S2}"/ || die
-   fi
-   epatch "${FILESDIR}"/${P}-execstack.patch
-   multilib_copy_sources
-}
-
-multilib_src_compile() {
-   einfo "Shared build"
-   emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV}
-
-   if use static-libs ; then
-   einfo "Static build"
-   emake -C ${PN}/projects/gnuc
-   fi
-}
-
-multilib_src_install() {
-   doheader ${PN}/include/angelscript.h
-   dolib.so ${PN}/lib/libangelscript-${PV}.so
-   dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so
-
-   if use static-libs ; then
-dolib.a ${PN}/lib/libangelscript.a
-   fi
-}
-
-multilib_src_install_all() {
-   use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
-}

diff --git a/dev-libs/angelscript/angelscript-2.30.1.ebuild 
b/dev-libs/angelscript/angelscript-2.30.1.ebuild
deleted file mode 100644
index 09f40c9..000
--- a/dev-libs/angelscript/angelscript-2.30.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/;
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip;
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/sdk
-
-pkg_setup() {
-   tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-   multilib_copy_sources
-}
-
-multilib_src_compile() {
-   emake -C ${PN}/projects/gnuc
-}
-
-multilib_src_install() {
-   emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ 
INCLUDEDEST="${D}"/usr/include/ install
-   use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || 
die ; }
-}
-
-multilib_src_install_all() {
-   use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
-}

diff --git a/dev-libs/angelscript/angelscript-2.30.2.ebuild 
b/dev-libs/angelscript/angelscript-2.30.2.ebuild
deleted file mode 100644
index 09f40c9..000
--- a/dev-libs/angelscript/angelscript-2.30.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="A flexible, cross-platform scripting library"
-HOMEPAGE="http://www.angelcode.com/angelscript/;
-SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip;
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/sdk
-
-pkg_setup() {
-   tc-export CXX AR RANLIB
-}
-
-src_prepare() {
-   multilib_copy_sources
-}
-
-multilib_src_compile() {
-   emake -C ${PN}/projects/gnuc
-}
-
-multilib_src_install() {
-   emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ 
INCLUDEDEST="${D}"/usr/include/ install
-   use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript

[gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/

2015-10-20 Thread Julian Ospald 
commit: be025a1e5978b492173906470e02485aa35936cc
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 20:53:10 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 23:16:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be025a1e

x11-libs/wxGTK: add SLOT description to metadata.xml

 x11-libs/wxGTK/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
index bacea1a..aa7aa5e 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/metadata.xml
@@ -22,4 +22,8 @@

wxpython

+   
+   Slots reflect MAJOR.MINOR versions which can
+   be installed in parallel.
+

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/

2015-10-20 Thread Julian Ospald 
commit: 0bd0209923924bff899a5addb736da72ea00bade
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 20:43:02 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 23:16:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd02099

app-text/poppler: add SLOT description to metadata.xml

 app-text/poppler/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 9124e13..67846d6 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -11,4 +11,8 @@
Enable GObject introspection.
Install command-line PDF converters and various 
utilities.
 
+
+   Reflects ABI compatibility of libpoppler.so only,
+   NOT libpoppler-{glib,qt4,cpp}.so!
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/libpng/

2015-10-20 Thread Julian Ospald 
commit: 65f33e6cc8ba1ac578ee0924aa57fe05d00aa5e5
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 20:53:52 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 23:16:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f33e6c

media-libs/libpng: add SLOT description to metadata.xml

 media-libs/libpng/metadata.xml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index ead4d1c..4cbaf67 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -9,4 +9,13 @@
cpe:/a:libpng:libpng
apng

+   
+   For building against. This is the only slot
+   that provides headers and command line tools.
+   For binary compatibility, provides 
libpng12.so.0
+   only.
+   For binary compatibility, provides 
libpng15.so.15
+   only.
+   Reflect ABI compatibility for libpng.so.
+

[gentoo-commits] repo/gentoo:master commit in: virtual/jpeg/

2015-10-20 Thread Julian Ospald 
commit: 9cf66f8421d4a93ace1e8af20b1e4cdda813bb77
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 20:42:34 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 23:16:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf66f84

virtual/jpeg: add SLOT description to metadata.xml

 virtual/jpeg/metadata.xml | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/virtual/jpeg/metadata.xml b/virtual/jpeg/metadata.xml
index 9be90a2..07d7201 100644
--- a/virtual/jpeg/metadata.xml
+++ b/virtual/jpeg/metadata.xml
@@ -1,5 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  graphics
+   graphics
+   
+   For building against. This is the only slot
+   that provides headers and command line tools.
+   For binary compatibility, provides
+   libjpeg.so.62 only.
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/

2015-10-20 Thread Julian Ospald 
commit: d9c112bf8c2fc7cd6079b95f81777441bd17b733
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 20:42:53 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 20 23:16:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c112bf

dev-libs/openssl: add SLOT description to metadata.xml

 dev-libs/openssl/metadata.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index 5e30a85..f457065 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -12,4 +12,10 @@
 
  cpe:/a:openssl:openssl
 
+
+ For building against. This is the only slot
+  that provides headers and command line tools.
+ For binary compatibility, provides libcrypto.so.0.9.8
+  and libssl.so.0.9.8 only.
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/couchdb/

2015-10-19 Thread Julian Ospald 
commit: 7deee818dbffc935cb90daf11733a74e59c4d46b
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 19 11:11:47 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 19 11:12:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7deee818

dev-db/couchdb: add missing inherit on autotools

Gentoo-Bug: 561436

 dev-db/couchdb/couchdb-1.6.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild 
b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
index 506dabe..3f57ed7 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib pax-utils user
+inherit autotools eutils multilib pax-utils user
 
 DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free 
document-oriented database."
 HOMEPAGE="http://couchdb.apache.org/;

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libressl/

2015-10-19 Thread Julian Ospald 
commit: e2695f6729f891e3ee663c658b509859e24996f1
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 19 21:06:48 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 19 21:07:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2695f67

dev-libs/libressl: add sub-SLOT description to metadata.xml

 dev-libs/libressl/metadata.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dev-libs/libressl/metadata.xml b/dev-libs/libressl/metadata.xml
index 4c35a8a..116564b 100644
--- a/dev-libs/libressl/metadata.xml
+++ b/dev-libs/libressl/metadata.xml
@@ -20,4 +20,9 @@

https://github.com/libressl-portable/portable/issues
libressl-portable/portable

+   
+   
+   Reflect ABI of libcrypto.so and libssl.so only, NOT 
libtls.so.
+   
+

[gentoo-commits] repo/gentoo:master commit in: net-p2p/pybitmessage/

2015-10-18 Thread Julian Ospald 
commit: 9cc176f00bf6f2374d54e16aa287efe7cd8b64f8
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 14:32:28 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 18 14:35:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc176f0

net-p2p/pybitmessage: add missing "|| die"

 net-p2p/pybitmessage/pybitmessage-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/pybitmessage/pybitmessage-.ebuild 
b/net-p2p/pybitmessage/pybitmessage-.ebuild
index 0abf343..3d72433 100644
--- a/net-p2p/pybitmessage/pybitmessage-.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-.ebuild
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 src_compile() { :; }
 
 src_install () {
-   cat >> "${T}"/${PN}-wrapper <<-EOF
+   cat >> "${T}"/${PN}-wrapper <<-EOF || die
#!/usr/bin/env python
import os
import sys

[gentoo-commits] repo/gentoo:master commit in: net-p2p/pybitmessage/

2015-10-18 Thread Julian Ospald 
commit: 696559e37a7ffc1ef108142590a49e501842e26b
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 14:57:06 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 18 14:57:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696559e3

net-p2p/pybitmessage: add maintainer

 net-p2p/pybitmessage/metadata.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net-p2p/pybitmessage/metadata.xml 
b/net-p2p/pybitmessage/metadata.xml
index ada6833..e6bddbf 100644
--- a/net-p2p/pybitmessage/metadata.xml
+++ b/net-p2p/pybitmessage/metadata.xml
@@ -2,7 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   maintainer-nee...@gentoo.org
+   hasuf...@gentoo.org
+       Julian Ospald


Bitmessage is a P2P communications protocol used to send 
encrypted

[gentoo-commits] repo/gentoo:master commit in: net-p2p/pybitmessage/

2015-10-18 Thread Julian Ospald 
commit: fb460e21108fd87dc867e47f4f4ce11fd1a272ac
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 14:32:07 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 18 14:35:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb460e21

net-p2p/pybitmessage: live ebuild: switch to git-r3

 net-p2p/pybitmessage/pybitmessage-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/pybitmessage/pybitmessage-.ebuild 
b/net-p2p/pybitmessage/pybitmessage-.ebuild
index bcb8143..0abf343 100644
--- a/net-p2p/pybitmessage/pybitmessage-.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils python-r1 gnome2-utils git-2
+inherit eutils python-r1 gnome2-utils git-r3
 
 DESCRIPTION="P2P communications protocol"
 HOMEPAGE="https://bitmessage.org;

[gentoo-commits] repo/gentoo:master commit in: net-p2p/pybitmessage/

2015-10-18 Thread Julian Ospald 
commit: 94fbcd980121be85991d4db2e2a4fce9a1d8
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 14:31:19 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 18 14:35:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94fb

net-p2p/pybitmessage: version bump to 0.4.4

Gentoo-Bug: 526572

 net-p2p/pybitmessage/Manifest  |  1 +
 net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index 0d802d1..6107159 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,2 +1,3 @@
 DIST pybitmessage-0.4.2.tar.gz 547565 SHA256 
c69cef72adbdfa2a0ff8c5c7e5d15e640bf3283b9089c388ea48e893d564a573 SHA512 
5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
 WHIRLPOOL 
22c1ca5e5132248dc8492bd1ea327e81b8567b0ec271c774a07141579a63365dd4cc7fbd066dbba6153ce471057cead1f0763b4ae209789991b7c3b2cb5ebaa4
 DIST pybitmessage-0.4.3.tar.gz 605581 SHA256 
0a0825b554aef4e6eba3e4c4eb89e03ee86bda6f3068a69f4314f26ad24a6e5d SHA512 
d7d5db360e3fef88f9d9168464f6256fb44e207afabd2f9c31d85c264eab0b8a9d89f7e52aca1190f854beaf7b5ee48bd05c079cd31b775fa84b6e10612e8cee
 WHIRLPOOL 
cbe800ca83ffc213f8335a97aa6d534b41a968c76fcdff59a245694a84312e27f926b2e143bfb904036917c91bce7a27a5cfbbc83aa19005f3a41109c3efd53a
+DIST pybitmessage-0.4.4.tar.gz 611490 SHA256 
2fe2b1ad4d7426c8777fb429129b7a07c717ea5f00cc3041a03ac19fd3259b3a SHA512 
977d901525864557fcb6deada27d45a0cc90a40090f9f70f7a1cf27ffcc93ab69ef3d369375414988c519211b6d19a1ad7a0e9b38eec26f3fea02b386c652711
 WHIRLPOOL 
d3da00d5b1bfe5ae9361a78d8a251567d2a06cd7009da9f1af58e0d06f3d2830f0133fc559b16cd10620cc5933292027bebc6f20abe026f5a63e6cfc1057bc28

diff --git a/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild 
b/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild
new file mode 100644
index 000..782c2ce
--- /dev/null
+++ b/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-r1 gnome2-utils
+
+DESCRIPTION="P2P communications protocol"
+HOMEPAGE="https://bitmessage.org;
+SRC_URI="https://github.com/Bitmessage/PyBitmessage/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+   !libressl? ( dev-libs/openssl:0[-bindist] )
+   libressl? ( dev-libs/libressl )
+   dev-python/PyQt4[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/PyBitmessage-${PV}
+
+src_compile() { :; }
+
+src_install () {
+   cat >> "${T}"/${PN}-wrapper <<-EOF || die
+   #!/usr/bin/env python
+   import os
+   import sys
+   sys.path.append("@SITEDIR@")
+   os.chdir("@SITEDIR@")
+   os.execl('@PYTHON@', '@EPYTHON@', '@SITEDIR@/bitmessagemain.py')
+   EOF
+
+   touch src/__init__.py || die
+
+   install_python() {
+   local python_moduleroot=${PN}
+   python_domodule src/*
+   sed \
+   -e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
+   -e "s#@EPYTHON@#${EPYTHON}#" \
+   -e "s#@PYTHON@#${PYTHON}#" \
+   "${T}"/${PN}-wrapper > ${PN} || die
+   python_doscript ${PN}
+   }
+
+   python_foreach_impl install_python
+
+   dodoc README.md debian/changelog
+   doman man/*
+
+   newicon -s 24 desktop/icon24.png ${PN}.png
+   newicon -s scalable desktop/can-icon.svg ${PN}.svg
+   domenu desktop/${PN}.desktop
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/pybitmessage/

2015-10-18 Thread Julian Ospald 
commit: 415997b60b3ba37462fbd8c1decdea594901886a
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 14:32:49 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 18 14:35:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415997b6

net-p2p/pybitmessage: remove nonfatal usage

Gentoo-Bug: 551186

 net-p2p/pybitmessage/pybitmessage-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-p2p/pybitmessage/pybitmessage-.ebuild 
b/net-p2p/pybitmessage/pybitmessage-.ebuild
index 3d72433..b994ca0 100644
--- a/net-p2p/pybitmessage/pybitmessage-.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-.ebuild
@@ -52,12 +52,12 @@ src_install () {
 
python_foreach_impl install_python
 
-   nonfatal dodoc README.md debian/changelog
-   nonfatal doman man/*
+   dodoc README.md debian/changelog
+   doman man/*
 
-   nonfatal newicon -s 24 desktop/icon24.png ${PN}.png
-   nonfatal newicon -s scalable desktop/can-icon.svg ${PN}.svg
-   nonfatal domenu desktop/${PN}.desktop
+   newicon -s 24 desktop/icon24.png ${PN}.png
+   newicon -s scalable desktop/can-icon.svg ${PN}.svg
+   domenu desktop/${PN}.desktop
 }
 
 pkg_preinst() {

[gentoo-commits] repo/gentoo:master commit in: games-strategy/openra/

2015-10-18 Thread Julian Ospald 
commit: 95d7bbec5ad3de15bb1f374a4d30b5b6ece44d40
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct 18 17:02:25 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sun Oct 18 17:04:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d7bbec

games-strategy/openra: fix virtual/jpeg SLOT

 .../openra/{openra-20120630.ebuild => openra-20120630-r1.ebuild}| 2 +-
 .../openra/{openra-20130514-r1.ebuild => openra-20130514-r2.ebuild} | 2 +-
 .../openra/{openra-20131223-r1.ebuild => openra-20131223-r2.ebuild} | 2 +-
 .../openra/{openra-20140608.ebuild => openra-20140608-r1.ebuild}| 2 +-
 .../openra/{openra-20140722.ebuild => openra-20140722-r1.ebuild}| 2 +-
 .../openra/{openra-20141029-r1.ebuild => openra-20141029-r2.ebuild} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/games-strategy/openra/openra-20120630.ebuild 
b/games-strategy/openra/openra-20120630-r1.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20120630.ebuild
rename to games-strategy/openra/openra-20120630-r1.ebuild
index 99175b9..9ca4e47 100644
--- a/games-strategy/openra/openra-20120630.ebuild
+++ b/games-strategy/openra/openra-20120630-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-dotnet/libgdiplus
media-libs/freetype:2[X]
media-libs/libsdl[X,opengl,video]
media-libs/openal
-   virtual/jpeg
+   virtual/jpeg:0
virtual/opengl
cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
 RDEPEND="${DEPEND}"

diff --git a/games-strategy/openra/openra-20130514-r1.ebuild 
b/games-strategy/openra/openra-20130514-r2.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20130514-r1.ebuild
rename to games-strategy/openra/openra-20130514-r2.ebuild
index 198236e..b09e397 100644
--- a/games-strategy/openra/openra-20130514-r1.ebuild
+++ b/games-strategy/openra/openra-20130514-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-dotnet/libgdiplus
media-libs/freetype:2[X]
media-libs/libsdl[X,opengl,video]
media-libs/openal
-   virtual/jpeg
+   virtual/jpeg:0
virtual/opengl
cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
 RDEPEND="${DEPEND}"

diff --git a/games-strategy/openra/openra-20131223-r1.ebuild 
b/games-strategy/openra/openra-20131223-r2.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20131223-r1.ebuild
rename to games-strategy/openra/openra-20131223-r2.ebuild
index a6d7ef3..515437b 100644
--- a/games-strategy/openra/openra-20131223-r1.ebuild
+++ b/games-strategy/openra/openra-20131223-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-dotnet/libgdiplus
media-libs/libsdl2[X,opengl,video]
)
media-libs/openal
-   virtual/jpeg
+   virtual/jpeg:0
virtual/opengl"
 RDEPEND="${DEPEND}"
 

diff --git a/games-strategy/openra/openra-20140608.ebuild 
b/games-strategy/openra/openra-20140608-r1.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20140608.ebuild
rename to games-strategy/openra/openra-20140608-r1.ebuild
index dec5437..a40add8 100644
--- a/games-strategy/openra/openra-20140608.ebuild
+++ b/games-strategy/openra/openra-20140608-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-dotnet/libgdiplus
media-libs/freetype:2[X]
media-libs/libsdl2[X,opengl,video]
media-libs/openal
-   virtual/jpeg
+   virtual/jpeg:0
virtual/opengl"
 RDEPEND="${DEPEND}"
 

diff --git a/games-strategy/openra/openra-20140722.ebuild 
b/games-strategy/openra/openra-20140722-r1.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20140722.ebuild
rename to games-strategy/openra/openra-20140722-r1.ebuild
index deca771..2b71893 100644
--- a/games-strategy/openra/openra-20140722.ebuild
+++ b/games-strategy/openra/openra-20140722-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-dotnet/libgdiplus
media-libs/freetype:2[X]
media-libs/libsdl2[X,opengl,video]
media-libs/openal
-   virtual/jpeg
+   virtual/jpeg:0
virtual/opengl"
 RDEPEND="${DEPEND}"
 

diff --git a/games-strategy/openra/openra-20141029-r1.ebuild 
b/games-strategy/openra/openra-20141029-r2.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20141029-r1.ebuild
rename to games-strategy/openra/openra-20141029-r2.ebuild
index 5cec47c..86bec96 100644
--- a/games-strategy/openra/openra-20141029-r1.ebuild
+++ b/games-strategy/openra/openra-20141029-r2.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-dotnet/libgdiplus
media-libs/freetype:2[X]
media-libs/libsdl2[X,opengl,video]
media-libs/openal
-   virtual/jpeg
+   virtual/jpeg:0
virtual/opengl"
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: media-video/libav/

2015-10-17 Thread Julian Ospald 
commit: 97619fe996cd0638683e3ad05cfe707b088cfb29
Author: Julian Ospald  gentoo  org>
AuthorDate: Sat Oct 17 11:54:11 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sat Oct 17 13:30:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97619fe9

media-video/libav: add libressl support

 .../libav/{libav-11..ebuild => libav-11.3-r1.ebuild}   | 10 --
 media-video/libav/libav-11..ebuild |  7 +--
 media-video/libav/libav-.ebuild|  7 +--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/media-video/libav/libav-11..ebuild 
b/media-video/libav/libav-11.3-r1.ebuild
similarity index 97%
copy from media-video/libav/libav-11..ebuild
copy to media-video/libav/libav-11.3-r1.ebuild
index 98af3cc..4034d60 100644
--- a/media-video/libav/libav-11..ebuild
+++ b/media-video/libav/libav-11.3-r1.ebuild
@@ -22,6 +22,7 @@ elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
SRC_URI="https://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz;
 else # Official release
SRC_URI="https://libav.org/releases/${P}.tar.xz;
+   SRC_URI+=" 
https://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz;
 fi
 #  does not have fate-*.tar.xz
 [[ ${PV%} != "" ]] && SRC_URI+=" test? ( 
https://dev.gentoo.org/~lu_zero/libav/fate-${PV%%.*}.tar.xz )"
@@ -31,7 +32,7 @@ SLOT="0/11"
 [[ ${PV} == * ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc 
+encode faac fdk
-   frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+   frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k 
libressl mp3
+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
static-libs test theora threads tools truetype twolame v4l vaapi vdpau 
vorbis vpx X
wavpack webp x264 x265 xvid +zlib"
@@ -87,7 +88,10 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
ssl? (
-   openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+   openssl? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
@@ -150,6 +154,8 @@ src_unpack() {
 src_prepare() {
epatch_user
 
+   epatch "${WORKDIR}/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch"
+
# if we have snapshot then we need to hardcode the version
if [[ ${PV%_p*} != ${PV} ]]; then
sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die

diff --git a/media-video/libav/libav-11..ebuild 
b/media-video/libav/libav-11..ebuild
index 98af3cc..5970b53 100644
--- a/media-video/libav/libav-11..ebuild
+++ b/media-video/libav/libav-11..ebuild
@@ -31,7 +31,7 @@ SLOT="0/11"
 [[ ${PV} == * ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc 
+encode faac fdk
-   frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+   frei0r fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k 
libressl mp3
+network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
static-libs test theora threads tools truetype twolame v4l vaapi vdpau 
vorbis vpx X
wavpack webp x264 x265 xvid +zlib"
@@ -87,7 +87,10 @@ RDEPEND="
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
ssl? (
-   openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+   openssl? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
)
sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )

diff --git a/media-video/libav/libav-.ebuild 
b/media-video/libav/libav-.ebuild
index 09447da

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/

2015-10-17 Thread Julian Ospald 
commit: a15a75fb0f63c7019cc807faefda1ffc042c5441
Author: Julian Ospald  gentoo  org>
AuthorDate: Sat Oct 17 13:37:07 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Sat Oct 17 13:37:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15a75fb

dev-qt/qtcore:4: add libressl support

Gentoo-Bug: 562048

 dev-qt/qtcore/qtcore-4.8.7-r1.ebuild | 92 
 1 file changed, 92 insertions(+)

diff --git a/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild 
b/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
new file mode 100644
index 000..c2d986b
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.7-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-build-multilib
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT4_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+IUSE="+glib iconv icu libressl qt3support ssl"
+
+DEPEND="
+   >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+   glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+   iconv? ( >=virtual/libiconv-0-r2[${MULTILIB_USEDEP}] )
+   icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] 
)
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+   ~dev-qt/qttranslations-${PV}
+   qt3support? ( 
~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support,${MULTILIB_USEDEP}] )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+   /usr/include/qt4/Qt/qconfig.h
+   /usr/include/qt4/QtCore/qconfig.h
+)
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.8.5-moc-boost-lexical-cast.patch"
+   
"${FILESDIR}/${PN}-4.8.5-honor-ExcludeSocketNotifiers-in-glib-event-loop.patch" 
# bug 514968
+   "${FILESDIR}/${PN}-4.8.5-qeventdispatcher-recursive.patch" # bug 514968
+)
+
+QT4_TARGET_DIRECTORIES="
+   src/tools/bootstrap
+   src/tools/moc
+   src/tools/rcc
+   src/tools/uic
+   src/corelib
+   src/network
+   src/xml
+   src/plugins/codecs/cn
+   src/plugins/codecs/jp
+   src/plugins/codecs/kr
+   src/plugins/codecs/tw
+   tools/linguist/lconvert
+   tools/linguist/lrelease
+   tools/linguist/lupdate"
+
+QCONFIG_DEFINE="QT_ZLIB"
+
+src_prepare() {
+   qt4-build-multilib_src_prepare
+
+   # bug 172219
+   sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+   -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+   qmake/Makefile.unix || die "sed qmake/Makefile.unix failed"
+
+   # bug 427782
+   sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
+   qmake/Makefile.unix || die "sed CPPFLAGS in qmake/Makefile.unix 
failed"
+   sed -i -e 's/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set 
QMAKE_CFLAGS_RELEASE/' \
+   -e 's/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set 
QMAKE_CXXFLAGS_RELEASE/' \
+   configure || die "sed configure setBootstrapVariable failed"
+}
+
+multilib_src_configure() {
+   local myconf=(
+   -no-accessibility -no-xmlpatterns -no-multimedia 
-no-audio-backend -no-phonon
+   -no-phonon-backend -no-svg -no-webkit -no-script 
-no-scripttools -no-declarative
+   -system-zlib -no-gif -no-libtiff -no-libpng -no-libmng 
-no-libjpeg
+   -no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl 
-no-openvg
+   -no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor 
-no-xfixes
+   -no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype 
-no-xinput -no-xkb
+   $(qt_use glib)
+   $(qt_use iconv)
+   $(qt_use icu)
+   $(use ssl && echo -openssl-linked || echo -no-openssl)
+   $(qt_use qt3support)
+   )
+   qt4_multilib_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/

2015-10-16 Thread Julian Ospald 
commit: 4611e73baf38a00855a105e1b0a7fdf0957aa132
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 16 19:24:13 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 16 19:28:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4611e73b

net-im/jabberd2: add libressl support

 net-im/jabberd2/jabberd2-2.3.3-r1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild 
b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
index 62311a9..46f641a 100644
--- a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/ja
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl 
test zlib"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres 
sqlite ssl test zlib"
 REQUIRED_USE="memdebug? ( debug )"
 
 # broken
@@ -28,7 +28,10 @@ DEPEND="dev-libs/expat
mysql? ( virtual/mysql )
pam? ( virtual/pam )
postgres? ( dev-db/postgresql:* )
-   ssl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+   libressl? ( dev-libs/libressl )
+   )
sqlite? ( dev-db/sqlite:3 )
zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/

2015-10-16 Thread Julian Ospald 
commit: 7f11f335b062d10a0a9369bbd7d503f0d37e5234
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 16 19:20:36 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 16 19:28:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f11f335

net-im/jabberd2: add missing [-bindist] to dev-libs/openssl

Gentoo-Bug: 563268

 net-im/jabberd2/jabberd2-2.3.3-r1.ebuild | 157 +++
 1 file changed, 157 insertions(+)

diff --git a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild 
b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
new file mode 100644
index 000..62311a9
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org;
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl 
test zlib"
+REQUIRED_USE="memdebug? ( debug )"
+
+# broken
+RESTRICT="test"
+
+DEPEND="dev-libs/expat
+   net-libs/udns
+   net-dns/libidn
+   virtual/gsasl
+   berkdb? ( >=sys-libs/db-4.1.25:* )
+   ldap? ( net-nds/openldap )
+   mysql? ( virtual/mysql )
+   pam? ( virtual/pam )
+   postgres? ( dev-db/postgresql:* )
+   ssl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+   sqlite? ( dev-db/sqlite:3 )
+   zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+   >=net-im/jabber-base-0.01"
+DEPEND="${DEPEND}
+   app-arch/xz-utils
+   virtual/pkgconfig
+   test? ( dev-libs/check )"
+
+DOCS=( AUTHORS README )
+
+S=${WORKDIR}/jabberd-${PV}
+
+src_prepare() {
+   # Fix some default directory locations
+   sed -i \
+   -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
+   -e 
's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
+   -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
+   -e 
's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
+   -e 's,@localstatedir@,/var/spool,g' \
+   -e 's,@package@,jabber,g' \
+   etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default 
directory locations failed!"
+
+   # If the package wasn't merged with sqlite then default to use berkdb
+   use sqlite ||
+   sed -i \
+   -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db,g' \
+   etc/{c2s,sm}.xml.dist.in || die "setting berkdb as 
default failed!"
+
+   # avoid file collision with x11-misc/screen-message wrt #453994
+   sed -i \
+   -e 's/@jabberd_router_bin@/jabberd2-router/' \
+   -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
+   -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
+   -e 's/@jabberd_sm_bin@/jabberd2-sm/' \
+   etc/jabberd*.in || die "fixing file collisions failed!"
+
+   # rename pid files wrt #241472
+   sed -i \
+   -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
+   -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+   -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+   -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+   etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+   # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+   # https://github.com/jabberd2/jabberd2/issues/34
+   replace-flags -O[3s] -O2
+
+   # --enable-pool-debug is currently broken
+   econf \
+   --sysconfdir=/etc/jabber \
+   $(usex debug "--enable-debug" "") \
+   $(usex memdebug "--enable-nad-debug" "") \
+   $(use_enable ssl) \
+   $(use_enable mysql) \
+   $(use_enable postgres pgsql) \
+   $(use_enable sqlite) \
+   $(use_enable berkdb db) \
+   $(use_enable ldap) \
+   $(use_enable pam) \
+   --enable-pipe \
+   --enable-anon \
+   --enable-fs \
+   $(use_enable experimental) \
+   $(use_enable test tests) \
+   $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
+   $(use_with zlib)
+}
+
+src_install() {
+   local i
+
+   default
+   prune_libtool_files --modules
+
+   keepdir /var/spool/jabber/{fs,db}
+   fowners jabber:jabber /usr/bin/{jabberd,router,s

[gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/

2015-10-16 Thread Julian Ospald 
commit: e4cb298d2de5f3b24f154cf0a5612a8f06ef4df9
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 16 19:20:57 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 16 19:28:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cb298d

net-im/jabberd2: rm old 2.3.3

 net-im/jabberd2/jabberd2-2.3.3.ebuild | 157 --
 1 file changed, 157 deletions(-)

diff --git a/net-im/jabberd2/jabberd2-2.3.3.ebuild 
b/net-im/jabberd2/jabberd2-2.3.3.ebuild
deleted file mode 100644
index af82c89..000
--- a/net-im/jabberd2/jabberd2-2.3.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit db-use eutils flag-o-matic pam
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.org;
-SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl 
test zlib"
-REQUIRED_USE="memdebug? ( debug )"
-
-# broken
-RESTRICT="test"
-
-DEPEND="dev-libs/expat
-   net-libs/udns
-   net-dns/libidn
-   virtual/gsasl
-   berkdb? ( >=sys-libs/db-4.1.25:* )
-   ldap? ( net-nds/openldap )
-   mysql? ( virtual/mysql )
-   pam? ( virtual/pam )
-   postgres? ( dev-db/postgresql:* )
-   ssl? ( >=dev-libs/openssl-1.0.1:0 )
-   sqlite? ( dev-db/sqlite:3 )
-   zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-   >=net-im/jabber-base-0.01"
-DEPEND="${DEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   test? ( dev-libs/check )"
-
-DOCS=( AUTHORS README )
-
-S=${WORKDIR}/jabberd-${PV}
-
-src_prepare() {
-   # Fix some default directory locations
-   sed -i \
-   -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \
-   -e 
's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \
-   -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \
-   -e 
's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \
-   -e 's,@localstatedir@,/var/spool,g' \
-   -e 's,@package@,jabber,g' \
-   etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default 
directory locations failed!"
-
-   # If the package wasn't merged with sqlite then default to use berkdb
-   use sqlite ||
-   sed -i \
-   -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db,g' \
-   etc/{c2s,sm}.xml.dist.in || die "setting berkdb as 
default failed!"
-
-   # avoid file collision with x11-misc/screen-message wrt #453994
-   sed -i \
-   -e 's/@jabberd_router_bin@/jabberd2-router/' \
-   -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \
-   -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \
-   -e 's/@jabberd_sm_bin@/jabberd2-sm/' \
-   etc/jabberd*.in || die "fixing file collisions failed!"
-
-   # rename pid files wrt #241472
-   sed -i \
-   -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \
-   -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
-   -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
-   -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
-   etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
-   # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
-   # https://github.com/jabberd2/jabberd2/issues/34
-   replace-flags -O[3s] -O2
-
-   # --enable-pool-debug is currently broken
-   econf \
-   --sysconfdir=/etc/jabber \
-   $(usex debug "--enable-debug" "") \
-   $(usex memdebug "--enable-nad-debug" "") \
-   $(use_enable ssl) \
-   $(use_enable mysql) \
-   $(use_enable postgres pgsql) \
-   $(use_enable sqlite) \
-   $(use_enable berkdb db) \
-   $(use_enable ldap) \
-   $(use_enable pam) \
-   --enable-pipe \
-   --enable-anon \
-   --enable-fs \
-   $(use_enable experimental) \
-   $(use_enable test tests) \
-   $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
-   $(use_with zlib)
-}
-
-src_install() {
-   local i
-
-   default
-   prune_libtool_files --modules
-
-   keepdir /var/spool/jabber/{fs,db}
-   fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \
-   /var/spool/jabber/{fs,db}
-   fperms 7

[gentoo-commits] repo/gentoo:master commit in: profiles/

2015-10-16 Thread Julian Ospald 
commit: 805b0f0e12ca4072fdbf28d3cafc0308cc32b723
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 16 13:58:37 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 16 13:59:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=805b0f0e

profiles: mask net-misc/iputils-20150815-r1

Gentoo-Bug: 563244

 profiles/package.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index d4d6ae7..212951e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -289,6 +289,7 @@ app-emulation/kvm-kmod
 # Lars Wendler <polynomia...@gentoo.org> (20 Aug 2015)
 # Masked for testing
 =net-misc/iputils-20150815
+=net-misc/iputils-20150815-r1
 
 # Brian Evans <grkni...@gentoo.org> (16 Aug 2015)
 # Mask new PEAR installer as it is likely to break

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libressl/

2015-10-16 Thread Julian Ospald 
commit: 01b218d46346e441cd768f2f8e985abb14bbb6ab
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 16 13:51:36 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 16 13:51:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b218d4

dev-libs/libressl: security cleanup of 2.2.3

 dev-libs/libressl/Manifest  |  1 -
 dev-libs/libressl/libressl-2.2.3.ebuild | 48 -
 2 files changed, 49 deletions(-)

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 3870554..b6de318 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,2 +1 @@
-DIST libressl-2.2.3.tar.gz 2967547 SHA256 
a1ccc21adf91d60e99246031b99c930c9af5e1b1b5a61b1bec87beef6f16d882 SHA512 
79f0cd57d2f1202e7d1213a9f9e0665bce11d1c1e5a4ba48c98b81f94e09a8c72733a5dfb0a5626b91db146641cfbec79acb9a5cbb437a60924b7f028d224500
 WHIRLPOOL 
1e8a49f7c491af558052257c0456b5c4d965abcfc8c7c274f7c42670f4f06a46d3e0360359fd19ecbbaf2fa461b80457e692eb2cb7b1a4bd92d0ad9a68e6663a
 DIST libressl-2.2.4.tar.gz 2966157 SHA256 
6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 
390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5
 WHIRLPOOL 
44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43

diff --git a/dev-libs/libressl/libressl-2.2.3.ebuild 
b/dev-libs/libressl/libressl-2.2.3.ebuild
deleted file mode 100644
index e3b97b5..000
--- a/dev-libs/libressl/libressl-2.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/;
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz;
-
-LICENSE="ISC openssl"
-SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-   touch crypto/Makefile.in
-
-   sed -i \
-   -e '/^[ \t]*CFLAGS=/s#-g ##' \
-   -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-   -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-   -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-   -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-   -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-   configure || die "fixing CFLAGS failed"
-}
-
-multilib_src_configure() {
-   ECONF_SOURCE="${S}" econf \
-   $(use_enable asm) \
-   $(use_enable static-libs static)
-}
-
-multilib_src_test() {
-   emake check
-}
-
-multilib_src_install_all() {
-   einstalldocs
-   prune_libtool_files
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libressl/

2015-10-16 Thread Julian Ospald 
commit: 0171d63fb6075caf0db45f1d26ff18556afb5ab5
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct 16 13:49:49 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct 16 13:51:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0171d63f

dev-libs/libressl: security version bump to 2.2.4

Gentoo-Bug: 563236

 dev-libs/libressl/Manifest  |  1 +
 dev-libs/libressl/libressl-2.2.4.ebuild | 48 +
 2 files changed, 49 insertions(+)

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index c94beec..3870554 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1 +1,2 @@
 DIST libressl-2.2.3.tar.gz 2967547 SHA256 
a1ccc21adf91d60e99246031b99c930c9af5e1b1b5a61b1bec87beef6f16d882 SHA512 
79f0cd57d2f1202e7d1213a9f9e0665bce11d1c1e5a4ba48c98b81f94e09a8c72733a5dfb0a5626b91db146641cfbec79acb9a5cbb437a60924b7f028d224500
 WHIRLPOOL 
1e8a49f7c491af558052257c0456b5c4d965abcfc8c7c274f7c42670f4f06a46d3e0360359fd19ecbbaf2fa461b80457e692eb2cb7b1a4bd92d0ad9a68e6663a
+DIST libressl-2.2.4.tar.gz 2966157 SHA256 
6b409859be8654afc3862549494e097017e64c8d167f12584383586306ef9a7e SHA512 
390fbf4f531976c873a0a1163fd57f33097686c6956ec4d3eb69e8271a4e40abfec76d65172b34ae50af8936dd8b5c3ca5fefee9d8686ca468a5577d432c3fe5
 WHIRLPOOL 
44d36b582efad0cff8015e507ea7c95befd5a44f2beaf69b534454cee4288681d55390a9d4c41ded8a535f0ad6c210348f365534fe3d82725e6b918a89b99e43

diff --git a/dev-libs/libressl/libressl-2.2.4.ebuild 
b/dev-libs/libressl/libressl-2.2.4.ebuild
new file mode 100644
index 000..e3b97b5
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="http://www.libressl.org/;
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz;
+
+LICENSE="ISC openssl"
+SLOT="0/35" # reflects ABI of libcrypto.so and libssl.so
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+   touch crypto/Makefile.in
+
+   sed -i \
+   -e '/^[ \t]*CFLAGS=/s#-g ##' \
+   -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+   -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+   -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+   -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+   -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+   configure || die "fixing CFLAGS failed"
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE="${S}" econf \
+   $(use_enable asm) \
+   $(use_enable static-libs static)
+}
+
+multilib_src_test() {
+   emake check
+}
+
+multilib_src_install_all() {
+   einstalldocs
+   prune_libtool_files
+}

[gentoo-commits] repo/gentoo:master commit in: metadata/

2015-10-14 Thread Julian Ospald 
commit: debbe85d139172725f2461ef700b6119bd198b5e
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 13 22:34:41 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Wed Oct 14 14:55:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debbe85d

metadata: deprecated EAPI=4

Council log: https://projects.gentoo.org/council/meeting-logs/20151011.txt

 metadata/layout.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata/layout.conf b/metadata/layout.conf
index 7060c93..fd10e5a 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -5,8 +5,9 @@ manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
 # 2013-04-09 gentoo's council says to deprecate EAPIs 1 and 2 (bug #470670).
 # 2014-02-25 council meeting deprecated EAPIs 0 and 3.
+# 2015-10-11 council meeting deprecated EAPI 4.
 #eapis-banned = 1
-eapis-deprecated = 0 1 2 3
+eapis-deprecated = 0 1 2 3 4
 
 # Bug #337853 - gentoo's council says to enable
 # --echangelog by default for the "gentoo" repo

[gentoo-commits] repo/gentoo:master commit in: /

2015-10-13 Thread Julian Ospald 
commit: 3f83c6f91e3b03590781df5de76244cd7d6fa5d1
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct 13 10:44:07 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 13 10:50:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f83c6f9

Merge branch 'master' of git://github.com/alunduil/gentoo

 dev-python/torment/Manifest   | 2 +-
 dev-python/torment/{torment-2.0.3.ebuild => torment-3.0.0.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[gentoo-commits] repo/gentoo:master commit in: dev-python/torment/

2015-10-13 Thread Julian Ospald 
commit: 64296be908b266f69ed43d4a1a0750a8255e52ee
Author: Alex Brandt  alunduil  com>
AuthorDate: Mon Oct 12 23:59:00 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 12 23:59:00 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64296be9

dev-python/torment: remove version 2.0.3

Package-Manager: portage-2.2.23

 dev-python/torment/Manifest |  1 -
 dev-python/torment/torment-2.0.3.ebuild | 46 -
 2 files changed, 47 deletions(-)

diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index cdb5cc9..f29ff74 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,4 +1,3 @@
-DIST torment-2.0.3.tar.gz 23457 SHA256 
577fb8227087100ec1e3c29fc422dfab8813f77881f74b7f68b41a7a9abde9ca SHA512 
a112fdd20da24ecf2ac0d8acb50e226bdc60cd78ce2b90cde20fa78c593e31ff5ef9922c0b9f5cd32ac5c910ee287f2534ff5669cd21b12a66a485d0f409
 WHIRLPOOL 
060fa7ec2200b7fd1fd128ca09ad0f30314707da7cf393e30c614f894169f3724c51ab4e2c2627ba51a1345a6079b804c5ce0f02f2dae54090bbd2b20cb9
 DIST torment-2.0.4.tar.gz 27980 SHA256 
1968ffe76f4e759c0857828eff30074fbdcff72c2ff23ef13023c1cdd7608037 SHA512 
aa6689387648b0c659487c99dbdfac14e2bdb9dfdaf5d1b777ccb50755bbf5ce0c576ed4682bb9ebcd55ed8babc4c5727e01b9843206bee26561b0b930a0d4c4
 WHIRLPOOL 
27c50a9dc61108ddc2feaa5c88fbde8a4eb6032b2fdbdf9eb7aaa1b2ad6d7a8c5700e48bba1e5aaa5b2fd679e150881827e4622ce3f65cc601093691a7a2aca0
 DIST torment-2.1.0.tar.gz 30608 SHA256 
d8d21efd1a30c0bb964b43e47b41cc261d4b2417b09fd3945090bf48fd3d0248 SHA512 
502a61372f61d653f98ed20e0d074d1c411cc33be08ae91fec4e7606b1d3d3b78fd4fee8b1908b4fc721e7fe6029400063e9a94830a589e572baf824e7e0a261
 WHIRLPOOL 
7fe54b057ea89823b1b861c61e771f02a8a66a755f5667c89728bfab8e52006524cc960fece75f77d00b1aa894e0f3853df59a79cddf70a28b27b08d31de856b
 DIST torment-3.0.0.tar.gz 33898 SHA256 
ad3ead69f1c9e5ec1dc92a83bceca186f0d6a4544f983222c32c4d0a5e7f3b45 SHA512 
1fac30a0e97a6505c7e9cbbfaa141e2378cf26345fd4679d6eff75a4472054771b2421b044f9ff0daa8671e1b27989508e7a9885dfb98e3a07bd3e842d4bbb77
 WHIRLPOOL 
353cd7a8b66f2936c5476e8e50e2f6428bdc6f4e0bdbb2ea99c93018ebe6587ad4d3c6310fd55fe21cbdefc3174425a34d10aa072cbc27ebcbe3f5f114f4c913

diff --git a/dev-python/torment/torment-2.0.3.ebuild 
b/dev-python/torment/torment-2.0.3.ebuild
deleted file mode 100644
index f890bde..000
--- a/dev-python/torment/torment-2.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Study in Fixture Based Testing Frameworking"
-HOMEPAGE="https://github.com/kumoru/torment;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   doc? (
-   dev-python/sphinx[${PYTHON_USEDEP}]
-   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-   )
-   test? (
-   ${CDEPEND}
-   dev-python/coverage[${PYTHON_USEDEP}]
-   dev-python/nose[${PYTHON_USEDEP}]
-   )
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-   use doc && esetup.py build_sphinx
-}
-
-python_test() {
-   nosetests || die "Tests failed on ${EPYTHON}"
-}
-
-python_install_all() {
-   use doc && local HTML_DOCS=( docs/_build/html/. )
-
-   distutils-r1_python_install_all
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/torment/

2015-10-13 Thread Julian Ospald 
commit: 1524f7fbb5dc5b977d51ba486c64e57fa0c5a4b6
Author: Alex Brandt  alunduil  com>
AuthorDate: Mon Oct 12 23:58:11 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 12 23:58:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1524f7fb

dev-python/torment: add version 3.0.0

Package-Manager: portage-2.2.23

 dev-python/torment/Manifest |  1 +
 dev-python/torment/torment-3.0.0.ebuild | 46 +
 2 files changed, 47 insertions(+)

diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index b14cbbc..cdb5cc9 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,4 @@
 DIST torment-2.0.3.tar.gz 23457 SHA256 
577fb8227087100ec1e3c29fc422dfab8813f77881f74b7f68b41a7a9abde9ca SHA512 
a112fdd20da24ecf2ac0d8acb50e226bdc60cd78ce2b90cde20fa78c593e31ff5ef9922c0b9f5cd32ac5c910ee287f2534ff5669cd21b12a66a485d0f409
 WHIRLPOOL 
060fa7ec2200b7fd1fd128ca09ad0f30314707da7cf393e30c614f894169f3724c51ab4e2c2627ba51a1345a6079b804c5ce0f02f2dae54090bbd2b20cb9
 DIST torment-2.0.4.tar.gz 27980 SHA256 
1968ffe76f4e759c0857828eff30074fbdcff72c2ff23ef13023c1cdd7608037 SHA512 
aa6689387648b0c659487c99dbdfac14e2bdb9dfdaf5d1b777ccb50755bbf5ce0c576ed4682bb9ebcd55ed8babc4c5727e01b9843206bee26561b0b930a0d4c4
 WHIRLPOOL 
27c50a9dc61108ddc2feaa5c88fbde8a4eb6032b2fdbdf9eb7aaa1b2ad6d7a8c5700e48bba1e5aaa5b2fd679e150881827e4622ce3f65cc601093691a7a2aca0
 DIST torment-2.1.0.tar.gz 30608 SHA256 
d8d21efd1a30c0bb964b43e47b41cc261d4b2417b09fd3945090bf48fd3d0248 SHA512 
502a61372f61d653f98ed20e0d074d1c411cc33be08ae91fec4e7606b1d3d3b78fd4fee8b1908b4fc721e7fe6029400063e9a94830a589e572baf824e7e0a261
 WHIRLPOOL 
7fe54b057ea89823b1b861c61e771f02a8a66a755f5667c89728bfab8e52006524cc960fece75f77d00b1aa894e0f3853df59a79cddf70a28b27b08d31de856b
+DIST torment-3.0.0.tar.gz 33898 SHA256 
ad3ead69f1c9e5ec1dc92a83bceca186f0d6a4544f983222c32c4d0a5e7f3b45 SHA512 
1fac30a0e97a6505c7e9cbbfaa141e2378cf26345fd4679d6eff75a4472054771b2421b044f9ff0daa8671e1b27989508e7a9885dfb98e3a07bd3e842d4bbb77
 WHIRLPOOL 
353cd7a8b66f2936c5476e8e50e2f6428bdc6f4e0bdbb2ea99c93018ebe6587ad4d3c6310fd55fe21cbdefc3174425a34d10aa072cbc27ebcbe3f5f114f4c913

diff --git a/dev-python/torment/torment-3.0.0.ebuild 
b/dev-python/torment/torment-3.0.0.ebuild
new file mode 100644
index 000..bafdaac
--- /dev/null
+++ b/dev-python/torment/torment-3.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Study in Fixture Based Testing Frameworking"
+HOMEPAGE="https://github.com/kumoru/torment;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="dev-python/mypy[${PYTHON_USEDEP}]"
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   doc? (
+   dev-python/sphinx[${PYTHON_USEDEP}]
+   dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+   )
+   test? (
+   ${CDEPEND}
+   dev-python/coverage[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}]
+   )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+   use doc && esetup.py build_sphinx
+}
+
+python_test() {
+   nosetests || die "Tests failed on ${EPYTHON}"
+}
+
+python_install_all() {
+   use doc && local HTML_DOCS=( docs/_build/html/. )
+
+   distutils-r1_python_install_all
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3/, dev-python/pypy3/files/

2015-10-13 Thread Julian Ospald 
commit: 0edfac4a30fb6b007940e336cbfd4aad57a9910e
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 12 20:39:16 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct 13 17:01:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0edfac4a

dev-python/pypy3: add libressl support

 dev-python/pypy3/files/pypy3-2.4.0-libressl.patch | 187 ++
 dev-python/pypy3/pypy3-2.4.0.ebuild   |   6 +-
 2 files changed, 191 insertions(+), 2 deletions(-)

diff --git a/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch 
b/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch
new file mode 100644
index 000..5852939
--- /dev/null
+++ b/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch
@@ -0,0 +1,187 @@
+From 66bef80988c9efe60b61c6bc05f3206b4c3df7e8 Mon Sep 17 00:00:00 2001
+From: hasufell <hasuf...@gentoo.org>
+Date: Mon, 12 Oct 2015 20:43:50 +0200
+Subject: [PATCH] Add LibreSSL support, patches backported from upstream
+
+https://bitbucket.org/pypy/pypy/pull-requests/333/deal-with-platforms-without-rand_egd-take/diff
+---
+ pypy/module/_ssl/interp_ssl.py | 34 +++---
+ pypy/module/_ssl/test/test_ssl.py  |  8 +++---
+ rpython/rlib/ropenssl.py   |  6 -
+ rpython/rtyper/tool/rffi_platform.py   | 12 ++---
+ rpython/rtyper/tool/test/test_rffi_platform.py | 24 +-
+ 5 files changed, 61 insertions(+), 23 deletions(-)
+
+diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
+index 0cac165..f210167 100644
+--- a/pypy/module/_ssl/interp_ssl.py
 b/pypy/module/_ssl/interp_ssl.py
+@@ -310,20 +310,26 @@ if HAVE_OPENSSL_RAND:
+ res = libssl_RAND_status()
+ return space.wrap(res)
+ 
+-@unwrap_spec(path=str)
+-def RAND_egd(space, path):
+-"""RAND_egd(path) -> bytes
+-
+-Queries the entropy gather daemon (EGD) on socket path.  Returns 
number
+-of bytes read.  Raises socket.sslerror if connection to EGD fails or
+-if it does provide enough data to seed PRNG."""
+-with rffi.scoped_str2charp(path) as socket_path:
+-bytes = libssl_RAND_egd(socket_path)
+-if bytes == -1:
+-raise ssl_error(space,
+-"EGD connection failed or EGD did not return "
+-"enough data to seed the PRNG")
+-return space.wrap(bytes)
++if HAVE_OPENSSL_RAND_EGD:
++@unwrap_spec(path=str)
++def RAND_egd(space, path):
++"""RAND_egd(path) -> bytes
++
++Queries the entropy gather daemon (EGD) on socket path.  Returns 
number
++of bytes read.  Raises socket.sslerror if connection to EGD fails 
or
++if it does provide enough data to seed PRNG."""
++with rffi.scoped_str2charp(path) as socket_path:
++bytes = libssl_RAND_egd(socket_path)
++if bytes == -1:
++raise ssl_error(space,
++"EGD connection failed or EGD did not return "
++"enough data to seed the PRNG")
++return space.wrap(bytes)
++else:
++# Dummy func for platforms missing RAND_egd(). Most likely LibreSSL.
++@unwrap_spec(path=str)
++def RAND_egd(space, path):
++raise ssl_error(space, "RAND_egd unavailable")
+ 
+ 
+ class SSLSocket(W_Root):
+diff --git a/pypy/module/_ssl/test/test_ssl.py 
b/pypy/module/_ssl/test/test_ssl.py
+index 3204610..9722fd5 100644
+--- a/pypy/module/_ssl/test/test_ssl.py
 b/pypy/module/_ssl/test/test_ssl.py
+@@ -33,7 +33,8 @@ class AppTestSSL:
+ assert isinstance(_ssl.OPENSSL_VERSION_INFO, tuple)
+ assert len(_ssl.OPENSSL_VERSION_INFO) == 5
+ assert isinstance(_ssl.OPENSSL_VERSION, str)
+-assert 'openssl' in _ssl.OPENSSL_VERSION.lower()
++lower_version = _ssl.OPENSSL_VERSION.lower()
++assert 'openssl' in lower_version or "libressl" in lower_version
+ 
+ def test_RAND_add(self):
+ import _ssl
+@@ -64,8 +65,9 @@ class AppTestSSL:
+ 
+ def test_sslwrap(self):
+ import ssl, _socket, sys, gc
+-if sys.platform == 'darwin' or 'freebsd' in sys.platform:
+-skip("hangs indefinitely on OSX & FreeBSD (also on CPython)")
++if sys.platform == 'darwin' or 'freebsd' in sys.platform or \
++'openbsd' in sys.platform:
++skip("hangs indefinitely on OSX & BSD (also on CPython)")
+ s = _socket.socket()
+ ss = ssl.wrap_socket(s)
+ 
+diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
+index c36779d..6fe45d0 100644
+--- a/rpython/rlib/ropenssl.py
 b/rpython/rlib/ropenssl.py
+@@ -168,6 +168,9 @@ OB

[gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/

2015-10-12 Thread Julian Ospald 
commit: c3260f63564e73c9c8ecdc72376de83c194b80f3
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct 12 22:41:28 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct 12 22:41:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3260f63

x11-base/xorg-server: add libressl support

 x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild | 246 ++
 1 file changed, 246 insertions(+)

diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild 
b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
new file mode 100644
index 000..3001951
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd 
tslib +udev unwind wayland"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   media-libs/freetype
+   >=x11-apps/iceauth-1.0.2
+   >=x11-apps/rgb-1.0.3
+   >=x11-apps/xauth-1.0.3
+   x11-apps/xkbcomp
+   >=x11-libs/libdrm-2.4.46
+   >=x11-libs/libpciaccess-0.12.901
+   >=x11-libs/libXau-1.0.4
+   >=x11-libs/libXdmcp-1.0.2
+   >=x11-libs/libXfont-1.4.2
+   >=x11-libs/libxkbfile-1.0.4
+   >=x11-libs/libxshmfence-1.1
+   >=x11-libs/pixman-0.27.2
+   >=x11-libs/xtrans-1.3.5
+   >=x11-misc/xbitmaps-1.0.1
+   >=x11-misc/xkeyboard-config-2.4.1-r3
+   dmx? (
+   x11-libs/libXt
+   >=x11-libs/libdmx-1.0.99.1
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXaw-1.0.4
+   >=x11-libs/libXext-1.0.99.4
+   >=x11-libs/libXfixes-5.0
+   >=x11-libs/libXi-1.2.99.1
+   >=x11-libs/libXmu-1.0.3
+   x11-libs/libXrender
+   >=x11-libs/libXres-1.0.3
+   >=x11-libs/libXtst-1.0.99.2
+   )
+   glamor? (
+   media-libs/libepoxy
+   >=media-libs/mesa-10.3.4-r1[egl,gbm]
+   !x11-libs/glamor
+   )
+   kdrive? (
+   >=x11-libs/libXext-1.0.5
+   x11-libs/libXv
+   )
+   xephyr? (
+   x11-libs/libxcb
+   x11-libs/xcb-util
+   x11-libs/xcb-util-image
+   x11-libs/xcb-util-keysyms
+   x11-libs/xcb-util-renderutil
+   x11-libs/xcb-util-wm
+   )
+   !minimal? (
+   >=x11-libs/libX11-1.1.5
+   >=x11-libs/libXext-1.0.5
+   >=media-libs/mesa-10.3.4-r1[nptl=]
+   )
+   tslib? ( >=x11-libs/tslib-1.0 )
+   udev? ( >=virtual/udev-150 )
+   unwind? ( sys-libs/libunwind )
+   wayland? (
+   >=dev-libs/wayland-1.3.0
+   media-libs/libepoxy
+   )
+   >=x11-apps/xinit-1.3.3-r1
+   systemd? (
+   sys-apps/dbus
+   sys-apps/systemd
+   )"
+
+DEPEND="${CDEPEND}
+   sys-devel/flex
+   >=x11-proto/bigreqsproto-1.1.0
+   >=x11-proto/compositeproto-0.4
+   >=x11-proto/damageproto-1.1
+   >=x11-proto/fixesproto-5.0
+   >=x11-proto/fontsproto-2.1.3
+   >=x11-proto/glproto-1.4.17-r1
+   >=x11-proto/inputproto-2.2.99.1
+   >=x11-proto/kbproto-1.0.3
+   >=x11-proto/randrproto-1.4.0
+   >=x11-proto/recordproto-1.13.99.1
+   >=x11-proto/renderproto-0.11
+   >=x11-proto/resourceproto-1.2.0
+   >=x11-proto/scrnsaverproto-1.1
+   >=x11-proto/trapproto-3.4.3
+   >=x11-proto/videoproto-2.2.2
+   >=x11-proto/xcmiscproto-1.2.0
+   >=x11-proto/xextproto-7.2.99.901
+   >=x11-proto/xf86dgaproto-2.0.99.1
+   >=x11-proto/xf86rushproto-1.1.2
+   >=x11-proto/xf86vidmodeproto-2.2.99.1
+   >=x11-proto/xineramaproto-1.1.3
+   >=x11-proto/xproto-7.0.26
+   >=x11-proto/presentproto-1.0
+   >=x11-proto/dri3proto-1.0
+   dmx? (
+   >=x11-proto/dmxproto-2.2.99.1
+   doc? (
+   || (
+   www-client/links
+   www-client/lynx
+   www-client/w3m
+   )
+   )
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/karlyriceditor/

2015-10-09 Thread Julian Ospald 
commit: 11b8966adc40534d6fb2c2516a6b08cf5e86180c
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct  9 22:47:02 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct  9 22:47:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b8966a

media-sound/karlyriceditor: add missing sound USE flag to libsdl dep

 .../{karlyriceditor-1.11.ebuild => karlyriceditor-1.11-r1.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/karlyriceditor/karlyriceditor-1.11.ebuild 
b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
similarity index 96%
rename from media-sound/karlyriceditor/karlyriceditor-1.11.ebuild
rename to media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
index 358c3c9..6f968fa 100644
--- a/media-sound/karlyriceditor/karlyriceditor-1.11.ebuild
+++ b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
dev-libs/openssl:0
dev-qt/qtcore:4
dev-qt/qtgui:4
-   media-libs/libsdl
+   media-libs/libsdl[sound]
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
 "

[gentoo-commits] repo/gentoo:master commit in: net-im/dianara/

2015-10-09 Thread Julian Ospald 
commit: c15d52d9d17b0ec9d5967ba8d0ca720a25fa2e97
Author: Julian Ospald  gentoo  org>
AuthorDate: Fri Oct  9 13:47:32 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Fri Oct  9 13:47:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c15d52d9

net-im/dianara: revbump

Because 40ef80d0fd08b05a21ca217310859f6d30b60ac2
assumed dynamic dependencies, which is wrong.

 net-im/dianara/{dianara-1.3.1.ebuild => dianara-1.3.1-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-im/dianara/dianara-1.3.1.ebuild 
b/net-im/dianara/dianara-1.3.1-r1.ebuild
similarity index 100%
rename from net-im/dianara/dianara-1.3.1.ebuild
rename to net-im/dianara/dianara-1.3.1-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/

2015-10-08 Thread Julian Ospald 
commit: 769245b868ad148eb4f44f463c8190641c311781
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct  8 21:47:06 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct  8 21:48:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769245b8

net-libs/mbedtls: security version bump

Gentoo-Bug: 562608

 net-libs/mbedtls/Manifest |  1 +
 net-libs/mbedtls/mbedtls-2.1.2.ebuild | 94 +++
 2 files changed, 95 insertions(+)

diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index daf1559..47a5d25 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,3 +1,4 @@
 DIST mbedtls-2.0.0.tar.gz 1737179 SHA256 
2af7f064580d7b7845c0a430b8111bd2ccc06d79d94589680f811c4c1091a1a1 SHA512 
fd9f7e684a67f249512651727a84e5f327975ce05100d865fef8d5078e813eb2fb8d036d47fc2b15c7712e4900719e58718a6fd2a6592836c273f3b38f06eb0f
 WHIRLPOOL 
b73dc273ee18f035d25532e537cfdb21223613514f125cfa8e392d838da8f1c1a250915ab51d63b02d52d37a7e68ca21afc97c27388c60d455654238e3a7abc0
 DIST mbedtls-2.1.0.tar.gz 1770972 SHA256 
2d95eaed5c2ecc7acf04afe5cdb5895b6feb31c4040a55020a314b5a0182a27a SHA512 
b581bcafcd76cd5830c84f4b8b23196d1e5db06399fe5578368468eea3ab4f9b814e107cc552ab94f62ffbe3054cac3071bac5ce72484cb7bf30209e9f497eee
 WHIRLPOOL 
0cb3399c35c7181b4ea7c6585616bc488be9faa75c5ae6010248e9a516a125c95c344d132f0ae5a0fdf57008fbb7a360035ed4fef9aba9c216753ed7d675850f
 DIST mbedtls-2.1.1.tar.gz 1774848 SHA256 
ae458a4987f36819bdf1d39519212f4063780fe448d4155878fccf4e782a715f SHA512 
af49762f583d5063d1629498d5161ce58753cf2c05145d8b6c9e653bc99cc49e45bbab1d3b27f20ac8cc5ee937fb3b7aa4dbeba9fc8da6a8fa6253d3cbce3aef
 WHIRLPOOL 
2586dafefb3ad992c32ab17462100c16f806eb75488461290d4fe2a99759001451bff2115eeb2b98a9eee11069c38ce564421cef99ab376b12014b9499708f4d
+DIST mbedtls-2.1.2.tar.gz 1775666 SHA256 
c51c7e1dd91d7ef2115e9382b8d1cfabcb3f54063fe8198e9ee9d0fe839cceed SHA512 
36a6cdb1a403ac36cb723bf93f6a8a84da0c7b177aa18d984072dca40a024f7265c4788852e115a8fe724c5913c2d93fa07559a5ee67a8ddacdc005396d53cd8
 WHIRLPOOL 
9475f75a56b6b4402f72a185fd8a2fa62774efca9b56353f30b1c1682dd35b7fd3b2c6104c93c7109876951ee00021ade9f79a975fdb0e18486ea9180a4709a0

diff --git a/net-libs/mbedtls/mbedtls-2.1.2.ebuild 
b/net-libs/mbedtls/mbedtls-2.1.2.ebuild
new file mode 100644
index 000..58b18a5
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.1.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/;
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz;
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+
+RDEPEND="
+   programs? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen media-gfx/graphviz )
+   test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${PN}-${P}
+
+enable_mbedtls_option() {
+   local myopt="$@"
+   # check that config.h syntax is the same at version bump
+   sed -i \
+   -e "s://#define ${myopt}:#define ${myopt}:" \
+   include/mbedtls/config.h || die
+}
+
+src_prepare() {
+   use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+   use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+   use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+   use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+   use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   $(multilib_is_native_abi && cmake-utils_use_enable programs 
PROGRAMS \
+   || echo -DENABLE_PROGRAMS=OFF)
+   $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
+   -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+   $(cmake-utils_use_enable test TESTING)
+   -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+   -DINSTALL_MBEDTLS_HEADERS=ON
+   -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+   )
+
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+   use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+   LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+   cmake-utils_src_test
+}
+
+multilib_src_i

[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/

2015-10-08 Thread Julian Ospald 
commit: a8e6d5bf813b88ed5cc43bbfb5d2aaa72cfe4cc5
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct  8 21:47:54 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct  8 21:48:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e6d5bf

net-libs/mbedtls: rm old vulnerable versions

Gentoo-Bug: 562608

 net-libs/mbedtls/Manifest|  3 -
 net-libs/mbedtls/mbedtls-2.0.0.ebuild| 91 ---
 net-libs/mbedtls/mbedtls-2.1.0.ebuild| 91 ---
 net-libs/mbedtls/mbedtls-2.1.1-r1.ebuild | 94 
 net-libs/mbedtls/mbedtls-2.1.1.ebuild| 91 ---
 5 files changed, 370 deletions(-)

diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 47a5d25..3b30536 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -1,4 +1 @@
-DIST mbedtls-2.0.0.tar.gz 1737179 SHA256 
2af7f064580d7b7845c0a430b8111bd2ccc06d79d94589680f811c4c1091a1a1 SHA512 
fd9f7e684a67f249512651727a84e5f327975ce05100d865fef8d5078e813eb2fb8d036d47fc2b15c7712e4900719e58718a6fd2a6592836c273f3b38f06eb0f
 WHIRLPOOL 
b73dc273ee18f035d25532e537cfdb21223613514f125cfa8e392d838da8f1c1a250915ab51d63b02d52d37a7e68ca21afc97c27388c60d455654238e3a7abc0
-DIST mbedtls-2.1.0.tar.gz 1770972 SHA256 
2d95eaed5c2ecc7acf04afe5cdb5895b6feb31c4040a55020a314b5a0182a27a SHA512 
b581bcafcd76cd5830c84f4b8b23196d1e5db06399fe5578368468eea3ab4f9b814e107cc552ab94f62ffbe3054cac3071bac5ce72484cb7bf30209e9f497eee
 WHIRLPOOL 
0cb3399c35c7181b4ea7c6585616bc488be9faa75c5ae6010248e9a516a125c95c344d132f0ae5a0fdf57008fbb7a360035ed4fef9aba9c216753ed7d675850f
-DIST mbedtls-2.1.1.tar.gz 1774848 SHA256 
ae458a4987f36819bdf1d39519212f4063780fe448d4155878fccf4e782a715f SHA512 
af49762f583d5063d1629498d5161ce58753cf2c05145d8b6c9e653bc99cc49e45bbab1d3b27f20ac8cc5ee937fb3b7aa4dbeba9fc8da6a8fa6253d3cbce3aef
 WHIRLPOOL 
2586dafefb3ad992c32ab17462100c16f806eb75488461290d4fe2a99759001451bff2115eeb2b98a9eee11069c38ce564421cef99ab376b12014b9499708f4d
 DIST mbedtls-2.1.2.tar.gz 1775666 SHA256 
c51c7e1dd91d7ef2115e9382b8d1cfabcb3f54063fe8198e9ee9d0fe839cceed SHA512 
36a6cdb1a403ac36cb723bf93f6a8a84da0c7b177aa18d984072dca40a024f7265c4788852e115a8fe724c5913c2d93fa07559a5ee67a8ddacdc005396d53cd8
 WHIRLPOOL 
9475f75a56b6b4402f72a185fd8a2fa62774efca9b56353f30b1c1682dd35b7fd3b2c6104c93c7109876951ee00021ade9f79a975fdb0e18486ea9180a4709a0

diff --git a/net-libs/mbedtls/mbedtls-2.0.0.ebuild 
b/net-libs/mbedtls/mbedtls-2.0.0.ebuild
deleted file mode 100644
index 3aafc18..000
--- a/net-libs/mbedtls/mbedtls-2.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="https://tls.mbed.org/;
-SRC_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
-IUSE="cpu_flags_x86_sse2 doc havege programs test threads zlib"
-
-RDEPEND="
-   programs? ( dev-libs/openssl:0 )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen media-gfx/graphviz )
-   test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${PN}-${P}
-
-enable_mbedtls_option() {
-   local myopt="$@"
-   # check that config.h syntax is the same at version bump
-   sed -i \
-   -e "s://#define ${myopt}:#define ${myopt}:" \
-   include/mbedtls/config.h || die
-}
-
-src_prepare() {
-   use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
-   use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
-   use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
-   use threads && enable_mbedtls_option MBEDTLS_THREADING_C
-   use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
-}
-
-multilib_src_configure() {
-   local mycmakeargs=(
-   $(multilib_is_native_abi && cmake-utils_use_enable programs 
PROGRAMS \
-   || echo -DENABLE_PROGRAMS=OFF)
-   $(cmake-utils_use_enable zlib ZLIB_SUPPORT)
-   -DUSE_STATIC_MBEDTLS_LIBRARY=OFF
-   $(cmake-utils_use_enable test TESTING)
-   -DUSE_SHARED_MBEDTLS_LIBRARY=ON
-   -DINSTALL_MBEDTLS_HEADERS=ON
-   -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-   )
-
-   cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-   use doc && multilib_is_native_abi && emake apidoc
-}
-
-multil

[gentoo-commits] repo/gentoo:master commit in: net-libs/mbedtls/

2015-10-08 Thread Julian Ospald 
commit: 99a41a8cd36d18f498a36ebfe6b224a4c084db9c
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct  8 21:53:37 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct  8 21:53:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a41a8c

net-libs/mbedtls: add eutils.eclass inherit explicitly

Since we call 'einstalldocs'.

 net-libs/mbedtls/mbedtls-2.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-libs/mbedtls/mbedtls-2.1.2.ebuild 
b/net-libs/mbedtls/mbedtls-2.1.2.ebuild
index 58b18a5..ec6bd00 100644
--- a/net-libs/mbedtls/mbedtls-2.1.2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit multilib cmake-utils multilib-minimal
+inherit eutils multilib cmake-utils multilib-minimal
 
 DESCRIPTION="Cryptographic library for embedded systems"
 HOMEPAGE="https://tls.mbed.org/;

[gentoo-commits] repo/gentoo:master commit in: xfce-extra/xfce4-whiskermenu-plugin/

2015-10-08 Thread Julian Ospald 
commit: 49b7769ab913f75f3eed958c0801430227a922d2
Author: Julian Ospald  gentoo  org>
AuthorDate: Thu Oct  8 21:56:56 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Thu Oct  8 21:56:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b7769a

xfce-extra/xfce4-whiskermenu-plugin: version bump to 1.5.1

 xfce-extra/xfce4-whiskermenu-plugin/Manifest   |  1 +
 .../xfce4-whiskermenu-plugin-1.5.1.ebuild  | 66 ++
 2 files changed, 67 insertions(+)

diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest 
b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 44f5563..b122762 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1 +1,2 @@
 DIST xfce4-whiskermenu-plugin-1.5.0-src.tar.bz2 145549 SHA256 
da82bdbc899a9935b560323aac9037d44f37fb110509b80ec293196722671851 SHA512 
2cfbade2926fc7ff936ae2d5be2ef1d6a49e9ffc79fc9d9b78ba75070b70e7978ce4ae20df08b7d1089f016741231be029f92cd4b53cbaf7dfec08c97ad60028
 WHIRLPOOL 
fc6e9a32e6fc6e0a8127b214899c743712503fff0a117e993b3c8049004b75519690948e4bf664a6200ae54e29c1cd70ab919dfd5953acee02e11aa77537768d
+DIST xfce4-whiskermenu-plugin-1.5.1-src.tar.bz2 148050 SHA256 
1c7650562322867513370ab575536b67aa3712329bb60a0c91a0a70e23a8945a SHA512 
ae1ea2395d574fc942dc83303e768be776968b5f6cd69310450c2c4f291c9639e430c8a65282da8587be930baa503905eaf69bbab5b86c552d4de7689dd2ae79
 WHIRLPOOL 
eafefc8da4fa38f2e82a6ec44d5448152633a19850a26e92a5ebd601564485988fd696358bb55709bc78c828a06269af9aa3cd66a74d40d8efeeb825fc3d95fb

diff --git 
a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1.ebuild 
b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1.ebuild
new file mode 100644
index 000..376f10a
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.5.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome2-utils cmake-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="http://gottcode.org/xfce4-whiskermenu-plugin/;
+SRC_URI="http://gottcode.org/xfce4-whiskermenu-plugin/${P}-src.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   x11-libs/gtk+:2=
+   xfce-base/exo:=
+   xfce-base/garcon:=
+   xfce-base/libxfce4ui:=
+   xfce-base/libxfce4util:=
+   xfce-base/xfce4-panel:=
+   virtual/libintl:="
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   sys-devel/gettext"
+
+src_prepare() {
+   local i
+   cd po || die
+   if [[ -n "${LINGUAS+x}" ]] ; then
+   for i in *.po ; do
+   einfo "removing ${i%.po} linguas"
+   has ${i%.po} ${LINGUAS} || { rm ${i} || die ; }
+   done
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_AS_NEEDED=OFF
+   -DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+   -DENABLE_DEVELOPER_MODE=OFF
+   )
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   dodoc ChangeLog NEWS README
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/

2015-10-06 Thread Julian Ospald 
commit: 068a16463b2cb57a5ba9d80fce431fee8436a4fa
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct  6 09:58:51 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct  6 10:25:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068a1646

app-emulation/virtualbox: add libressl support

 .../virtualbox/virtualbox-5.0.6-r1.ebuild  | 432 +
 1 file changed, 432 insertions(+)

diff --git a/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild 
b/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild
new file mode 100644
index 000..7619b88
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-5.0.6-r1.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib 
pax-utils python-single-r1 qt4-r2 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+   
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.2-patches-01.tar.xz;
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as 
well as home use"
+HOMEPAGE="http://www.virtualbox.org/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java libressl pam pulseaudio +opengl python +qt4 +sdk 
+udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+   ~app-emulation/virtualbox-modules-${PV}
+   dev-libs/libIDL
+   >=dev-libs/libxslt-1.1.19
+   net-misc/curl
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   dev-libs/libxml2
+   media-libs/libpng:0=
+   media-libs/libvpx
+   sys-libs/zlib
+   !headless? (
+   qt4? (
+   dev-qt/qtgui:4
+   dev-qt/qtcore:4
+   opengl? ( dev-qt/qtopengl:4 )
+   x11-libs/libXinerama
+   )
+   opengl? ( virtual/opengl media-libs/freeglut )
+   x11-libs/libX11
+   x11-libs/libXcursor
+   x11-libs/libXext
+   x11-libs/libXmu
+   x11-libs/libXt
+   media-libs/libsdl:0[X,video]
+   )
+
+   java? ( >=virtual/jre-1.6:= )
+   udev? ( >=virtual/udev-171 )
+   vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+   >=dev-util/kbuild-0.1.9998_pre20131130
+   >=dev-lang/yasm-0.6.2
+   sys-devel/bin86
+   sys-power/iasl
+   pam? ( sys-libs/pam )
+   sys-libs/libcap
+   doc? (
+   dev-texlive/texlive-basic
+   dev-texlive/texlive-latex
+   dev-texlive/texlive-latexrecommended
+   dev-texlive/texlive-latexextra
+   dev-texlive/texlive-fontsrecommended
+   dev-texlive/texlive-fontsextra
+   )
+   java? ( >=virtual/jre-1.6:= )
+   virtual/pkgconfig
+   alsa? ( >=media-libs/alsa-lib-1.0.13 )
+   !headless? ( x11-libs/libXinerama )
+   pulseaudio? ( media-sound/pulseaudio )
+   vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+   ${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+   usr/lib/virtualbox/VBoxSDL.so
+   usr/lib/virtualbox/VBoxSharedFolders.so
+   usr/lib/virtualbox/VBoxDD2.so
+   usr/lib/virtualbox/VBoxOGLrenderspu.so
+   usr/lib/virtualbox/VBoxPython.so
+   usr/lib/virtualbox/VBoxDD.so
+   usr/lib/virtualbox/VBoxDDU.so
+   usr/lib/virtualbox/VBoxREM64.so
+   usr/lib/virtualbox/VBoxSharedClipboard.so
+   usr/lib/virtualbox/VBoxHeadless.so
+   usr/lib/virtualbox/VBoxRT.so
+   usr/lib/virtualbox/VBoxREM.so
+   usr/lib/virtualbox/VBoxSettings.so
+   usr/lib/virtualbox/VBoxKeyboard.so
+   usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+   usr/lib/virtualbox/VBoxVMM.so
+   usr/lib/virtualbox/VirtualBox.so
+   usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+   usr/lib/virtualbox/components/VBoxC.so
+   usr/lib/virtualbox/components/VBoxSVCM.so
+   usr/lib/virtualbox/components/VBoxDDU.so
+   usr/lib/virtualbox/components/VBoxRT.so
+   usr/lib/virtualbox/components/VBoxREM.so
+   usr/lib/virtualbox/components/VBoxVMM.so
+   usr/lib/virtualbox/VBoxREM32.so
+   usr/lib/virtualbox/VBoxPython2_4.so
+   usr/lib/virtualbox/VBoxPython2_5.so
+   usr/lib/virtualbox/VBoxPython2_6.so
+   usr/lib/virtualbox/VBoxPython2_7.so
+   usr/lib/virtualbox/VBoxXPCOMC.so
+   usr/lib/virtualbox/VBoxOGLhostcrutil.so
+   usr/lib/virtualbox/VBoxNetDHCP.so
+   usr/lib

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/hsopenssl/

2015-10-06 Thread Julian Ospald 
commit: 23d8ca99c627a1b32eb9feb8bef00d42e46d869b
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct  6 10:22:35 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct  6 10:25:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d8ca99

dev-haskell/hsopenssl: add libressl support

This also fixes the incorrect slot operator on dev-libs/openssl.

 dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild | 50 ++
 1 file changed, 50 insertions(+)

diff --git a/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild 
b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
new file mode 100644
index 000..1f9732a
--- /dev/null
+++ b/dev-haskell/hsopenssl/hsopenssl-0.11.1.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HsOpenSSL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Partial OpenSSL binding for Haskell"
+HOMEPAGE="https://github.com/phonohawk/HsOpenSSL;
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fast-bignum libressl"
+
+RESTRICT=test # whoops, not good
+
+RDEPEND=">=dev-haskell/network-2.1:=[profile?] 
=dev-haskell/old-locale-1.0:=[profile?] 
=dev-lang/ghc-7.4.1:=
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.8
+   test? ( >=dev-haskell/hunit-1.0 =dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 
https://github.com/phonohawk/HsOpenSSL/issues/36
+   [[ $(ghc-version) == 7.10.* ]] && fbn_flag=-f-fast-bignum
+
+   haskell-cabal_src_configure \
+   ${fbn_flag}
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/python-sipsimple/

2015-10-06 Thread Julian Ospald 
commit: b8f0fd5e552f8e81fab2d3f0584146ec5ef263b1
Author: Julian Ospald  gentoo  org>
AuthorDate: Tue Oct  6 12:58:33 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Tue Oct  6 12:58:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f0fd5e

dev-python/python-sipsimple: fix openssl dep

Gentoo-Bug: 562404

 ...ython-sipsimple-2.5.1-r1.ebuild => python-sipsimple-2.5.1-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r1.ebuild 
b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
similarity index 96%
rename from dev-python/python-sipsimple/python-sipsimple-2.5.1-r1.ebuild
rename to dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
index f3e5e3c..855904f 100644
--- a/dev-python/python-sipsimple/python-sipsimple-2.5.1-r1.ebuild
+++ b/dev-python/python-sipsimple/python-sipsimple-2.5.1-r2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 
 CDEPEND="
dev-db/sqlite:3
-   !libressl? ( dev-libs/openssl:0 )
+   !libressl? ( dev-libs/openssl:0[-bindist] )
libressl? ( dev-libs/libressl )
dev-python/python-application[${PYTHON_USEDEP}]
media-libs/alsa-lib

[gentoo-commits] repo/gentoo:master commit in: dev-libs/pkcs11-helper/

2015-10-05 Thread Julian Ospald 
commit: 427804d3e91c13559ff4de53ef864cbc5bdcf9cd
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:39:00 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:45:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427804d3

dev-libs/pkcs11-helper: add libressl support

 .../pkcs11-helper/pkcs11-helper-1.11-r1.ebuild | 37 ++
 1 file changed, 37 insertions(+)

diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.11-r1.ebuild 
b/dev-libs/pkcs11-helper/pkcs11-helper-1.11-r1.ebuild
new file mode 100644
index 000..739b3c1
--- /dev/null
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.11-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="PKCS#11 helper library"
+HOMEPAGE="http://www.opensc-project.org/opensc/wiki/pkcs11-helper;
+SRC_URI="mirror://sourceforge/opensc/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnutls libressl nss static-libs"
+
+RDEPEND="
+   !libressl? ( >=dev-libs/openssl-0.9.7:0 )
+   libressl? ( dev-libs/libressl )
+   gnutls? ( >=net-libs/gnutls-1.4.4 )
+   nss? ( dev-libs/nss )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   doc? ( >=app-doc/doxygen-1.4.7 )"
+
+src_configure() {
+   econf \
+   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+   $(use_enable doc) \
+   $(use_enable gnutls crypto-engine-gnutls) \
+   $(use_enable nss crypto-engine-nss) \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+   find "${ED}" -name '*.la' -exec rm -f {} +
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

2015-10-05 Thread Julian Ospald 
commit: d16540096668893d848cc45e93ba7e389d08b070
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:35:17 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:45:13 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1654009

net-misc/iputils: add libressl support

 ...-.ebuild => iputils-20150815-r1.ebuild} | 78 ++
 net-misc/iputils/iputils-.ebuild   |  7 +-
 2 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/net-misc/iputils/iputils-.ebuild 
b/net-misc/iputils/iputils-20150815-r1.ebuild
similarity index 62%
copy from net-misc/iputils/iputils-.ebuild
copy to net-misc/iputils/iputils-20150815-r1.ebuild
index 3957639..699c2d2 100644
--- a/net-misc/iputils/iputils-.ebuild
+++ b/net-misc/iputils/iputils-20150815-r1.ebuild
@@ -11,11 +11,11 @@ EAPI="4"
 
 inherit flag-o-matic eutils toolchain-funcs fcaps
 if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://www.linux-ipv6.org/gitroot/iputils"
-   inherit git-2
+   EGIT_REPO_URI="https://github.com/iputils/iputils.git;
+   inherit git-r3
 else
-   SRC_URI="http://www.skbuff.net/iputils/iputils-s${PV}.tar.bz2
-   mirror://gentoo/iputils-s${PV}-manpages.tar.bz2"
+   SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz;
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
@@ -24,16 +24,17 @@ 
HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputi
 
 LICENSE="BSD-4"
 SLOT="0"
-IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD 
ssl static tftpd tracepath traceroute"
+IUSE="arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd 
rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
ipv6? ( ssl? (
-   gnutls? (
-   net-libs/gnutls[openssl(+)]
-   net-libs/gnutls[static-libs(+)]
+   gcrypt? ( dev-libs/libgcrypt[static-libs(+)] )
+   nettle? ( dev-libs/nettle[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+   libressl? ( dev-libs/libressl[static-libs] )
)
-   !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
) )"
 RDEPEND="arping? ( !net-misc/arping )
rarpd? ( !net-misc/rarpd )
@@ -51,31 +52,48 @@ if [[ ${PV} == "" ]] ; then
"
 fi
 
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
 S=${WORKDIR}/${PN}-s${PV}
 
+PATCHES=(
+   "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
+   "${FILESDIR}/${PN}-20150815-ping_default_ipv4.patch"
+   "${FILESDIR}/${PN}-20150815-ping6_crypto.patch"
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-   epatch "${FILESDIR}"/${PN}--openssl.patch #335436
-   epatch "${FILESDIR}"/${PN}--tftpd-syslog.patch
-   epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
-   epatch "${FILESDIR}"/${PN}-20121221-parallel-doc.patch
-   epatch "${FILESDIR}"/${PN}-20121221-strtod.patch #472592
-   use SECURITY_HAZARD && epatch 
"${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
+   epatch ${PATCHES[@]}
+   use SECURITY_HAZARD && epatch 
"${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
 }
 
 src_configure() {
use static && append-ldflags -static
 
-   IPV4_TARGETS=(
+   TARGETS=(
ping
$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do 
usev ${v} ; done)
)
-   IPV6_TARGETS=(
-   ping6
-   $(usex tracepath 'tracepath6' '')
-   $(usex traceroute 'traceroute6' '')
+   if use ipv6 ; then
+   TARGETS+=(
+   $(usex tracepath 'tracepath6' '')
+   $(usex traceroute 'traceroute6' '')
+   )
+   fi
+
+   myconf=(
+   USE_CRYPTO=no
+   USE_GCRYPT=no
+   USE_NETTLE=no
)
-   use ipv6 || IPV6_TARGETS=()
+
+   if use ipv6 && use ssl ; then
+   myconf=(
+   USE_CRYPTO=$(usex openssl)
+   USE_GCRYPT=$(usex gcrypt)
+   USE_NETTLE=$(usex nettle)
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/

2015-10-05 Thread Julian Ospald 
commit: 1be55360957328366f0baa16cd65652ac716d8f3
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:44:27 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:45:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be55360

dev-libs/poco: add libressl support

 dev-libs/poco/poco-1.4.6_p4-r1.ebuild | 122 ++
 1 file changed, 122 insertions(+)

diff --git a/dev-libs/poco/poco-1.4.6_p4-r1.ebuild 
b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
new file mode 100644
index 000..0e0e4d4
--- /dev/null
+++ b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib versionator
+
+MY_P="${P/_}"
+MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-doc"
+
+DESCRIPTION="C++ class libraries to simplify the development of 
network-centric, portable applications"
+HOMEPAGE="http://pocoproject.org/;
+SRC_URI="http://pocoproject.org/releases/poco-$(get_version_component_range 
1-3)/${MY_P}-all.tar.bz2
+   doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples iodbc libressl mysql odbc sqlite ssl test"
+
+DEPEND=">=dev-libs/libpcre-8.13
+   dev-libs/expat
+   sys-libs/zlib
+   mysql? ( virtual/mysql )
+   odbc? ( iodbc? ( dev-db/libiodbc )
+   !iodbc? ( dev-db/unixODBC ) )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}-all"
+
+src_prepare() {
+   epatch \
+   "${FILESDIR}"/${PV}-gentoo.patch \
+   "${FILESDIR}"/poco-1.4.4-patch-for-libpcre-8.32.patch
+}
+
+src_configure() {
+   targets="libexecs"
+   odbc="unixodbc"
+
+   if use ssl; then
+   targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec"
+   echo NetSSL_OpenSSL >> components
+   echo Crypto >> components
+   fi
+   if use odbc; then
+   targets="${targets} Data/ODBC-libexec"
+   echo Data/ODBC >> components
+   if use iodbc; then
+   append-flags "-I/usr/include/iodbc"
+   odbc="iodbc"
+   fi
+   fi
+   if use sqlite; then
+   targets="${targets} Data/SQLite-libexec"
+   echo Data/SQLite >> components
+   fi
+   if use mysql; then
+   targets="${targets} Data/MySQL-libexec"
+   echo Data/MySQL >> components
+   fi
+
+   if use test; then
+   targets="${targets} cppunit tests"
+   echo CppUnit >> components
+   use ssl && targets="${targets} NetSSL_OpenSSL-tests 
Crypto-tests"
+   use odbc && targets="${targets} Data/ODBC-tests"
+   use sqlite && targets="${targets} Data/SQLite-tests"
+   use mysql && targets="${targets} Data/MySQL-tests"
+   fi
+
+   local myconf
+   use test || myconf="--no-tests"
+   # not autoconf
+   ./configure \
+   --no-samples ${myconf} \
+   --prefix=/usr \
+   --unbundled \
+   || die "configure failed"
+
+   sed -i \
+   -e 's|-O2||g' \
+   -e "s|CC  = .*|CC  = $(tc-getCC)|" \
+   -e "s|CXX = .*|CXX = $(tc-getCXX)|" \
+   -e "s|RANLIB  = .*|RANLIB  = $(tc-getRANLIB)|" \
+   -e "s|LIB = ar|LIB = $(tc-getAR)|" \
+   -e "s|STRIP   = .*|STRIP   = /bin/true|" \
+   -e "s|CFLAGS  = |CFLAGS  = ${CFLAGS}|" \
+   -e "s|CXXFLAGS= |CXXFLAGS= ${CXXFLAGS} |" \
+   -e "s|LINKFLAGS   =|LINKFLAGS   = ${LDFLAGS} |" \
+   -e "s|SHAREDOPT_LINK  = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK  
=|" \
+   build/config/Linux build/config/FreeBSD || die "sed failed"
+   sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die
+}
+
+src_compile() {
+   emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" 
${targets} || die "emake failed"
+}
+
+src_install() {
+   emake POCO_PREFIX=/usr LIBDIR="$(get_lib

[gentoo-commits] repo/gentoo:master commit in: sys-fs/cryptsetup/

2015-10-05 Thread Julian Ospald 
commit: 5fe90b36b9e62c5fa1136d5116132a45ae47d121
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 09:04:17 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 09:04:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe90b36

sys-fs/cryptsetup: add libressl support

 sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild | 106 +++
 1 file changed, 106 insertions(+)

diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild 
b/sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild
new file mode 100644
index 000..e264629
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.8-r1.ebuild
@@ -0,0 +1,106 @@
+# 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} )
+
+inherit autotools python-single-r1 linux-info libtool eutils versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md;
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 
1-2)/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward 
compatibility
+IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static 
static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   static? ( !gcrypt )" #496612
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+   dev-libs/popt[static-libs(+)]
+   sys-apps/util-linux[static-libs(+)]
+   gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+   nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+   openssl? (
+   !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+   libressl? ( dev-libs/libressl:=[static-libs(+)] )
+   )
+   pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+   sys-fs/lvm2[static-libs(+)]
+   udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+   ${LIB_DEPEND//\[static-libs\(+\)\]}
+   python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   static? ( ${LIB_DEPEND} )"
+
+pkg_setup() {
+   local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
+   local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for 
cryptsetup)\n"
+   local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for 
kernel 2.6.19)\n"
+   local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for 
cryptsetup)\n"
+   check_extra_config
+
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+   epatch_user && eautoreconf
+}
+
+src_configure() {
+   if use kernel ; then
+   ewarn "Note that kernel backend is very slow for this type of 
operation"
+   ewarn "and is provided mainly for embedded systems wanting to 
avoid"
+   ewarn "userspace crypto libraries."
+   fi
+
+   econf \
+   --sbindir=/sbin \
+   --enable-shared \
+   $(use_enable static static-cryptsetup) \
+   $(use_enable static-libs static) \
+   $(use_enable nls) \
+   $(use_enable pwquality) \
+   $(use_enable python) \
+   $(use_enable reencrypt cryptsetup-reencrypt) \
+   $(use_enable udev) \
+   $(use_enable !urandom dev-random) \
+   --with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do 
usev ${x} ; done)
+}
+
+src_test() {
+   if [[ ! -e /dev/mapper/control ]] ; then
+   ewarn "No /dev/mapper/control found -- skipping tests"
+   return 0
+   fi
+   local p
+   for p in /dev/mapper /dev/loop* ; do
+   addwrite ${p}
+   done
+   default
+}
+
+src_install() {
+   default
+   if use static ; then
+   mv "${ED}"/sbin/cryptsetup{.static,} || die
+   mv "${ED}"/sbin/veritysetup{.static,} || die
+   use reencrypt && { mv 
"${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+   fi
+   prune_libtool_files --modules
+
+   newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+   newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+}

[gentoo-commits] repo/gentoo:master commit in: net-libs/ldns/

2015-10-05 Thread Julian Ospald 
commit: d180ea34138d606a03396aec4a60403f19d3ec07
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:56:49 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:56:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d180ea34

net-libs/ldns: add libressl support

 net-libs/ldns/ldns-1.6.17-r1.ebuild | 98 +
 1 file changed, 98 insertions(+)

diff --git a/net-libs/ldns/ldns-1.6.17-r1.ebuild 
b/net-libs/ldns/ldns-1.6.17-r1.ebuild
new file mode 100644
index 000..cf6e735
--- /dev/null
+++ b/net-libs/ldns/ldns-1.6.17-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/;
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="dane doc +ecdsa gost libressl python +ssl static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="ecdsa? ( ssl )
+   python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+   dane? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+   ecdsa? ( >=dev-libs/openssl-1.0.1h-r2:0[-bindist,${MULTILIB_USEDEP}] )
+   gost? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+   python? ( ${PYTHON_DEPS} )
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] 
)
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   )
+"
+DEPEND="${RDEPEND}
+   python? ( dev-lang/swig )
+   doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/ldns-config
+)
+
+pkg_setup() {
+   use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/${P}_perl522.patch"
+}
+
+multilib_src_configure() {
+   ECONF_SOURCE=${S} \
+   econf \
+   $(use_enable static-libs static) \
+   $(use_enable ssl sha2) \
+   $(use_enable gost) \
+   $(use_enable ecdsa) \
+   $(use_enable dane) \
+   $(use_with ssl ssl "${EPREFIX}"/usr) \
+   $(multilib_native_use_with python pyldns) \
+   $(multilib_native_use_with python pyldnsx) \
+   --without-drill \
+   --without-examples \
+   --disable-rpath
+}
+
+multilib_src_compile() {
+   default
+
+   if multilib_is_native_abi && use doc ; then
+   emake doxygen
+   fi
+}
+
+multilib_src_install() {
+   default
+
+   if multilib_is_native_abi && use doc ; then
+   dohtml -r doc/html/.
+   fi
+}
+
+multilib_src_install_all() {
+   dodoc Changelog README*
+
+   prune_libtool_files --modules
+   use python && python_optimize
+
+   if use vim-syntax ; then
+   insinto /usr/share/vim/vimfiles/ftdetect
+   doins libdns.vim
+   fi
+
+   einfo
+   elog "Install net-dns/ldns-utils if you want drill and examples"
+   einfo
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/

2015-10-05 Thread Julian Ospald 
commit: eb8057024eb5d1150df901cdfdcb246b788349cd
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:51:49 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:51:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb805702

net-analyzer/nmap: add libressl support

 ...{nmap-.ebuild => nmap-6.49_beta2-r1.ebuild} | 28 +++---
 net-analyzer/nmap/nmap-.ebuild |  7 --
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
similarity index 81%
copy from net-analyzer/nmap/nmap-.ebuild
copy to net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
index 1185730..a3d9dc0 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-6.49_beta2-r1.ebuild
@@ -6,21 +6,23 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
 MY_P=${P/_beta/BETA}
 
 DESCRIPTION="A utility for network discovery and security auditing"
 HOMEPAGE="http://nmap.org/;
-
-EGIT_REPO_URI="https://github.com/nmap/nmap;
-SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png;
+SRC_URI="
+   http://nmap.org/dist/${MY_P}.tar.bz2
+   https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
 
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl 
zenmap"
+NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
 REQUIRED_USE="
@@ -41,7 +43,10 @@ RDEPEND="
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
-   ssl? ( dev-libs/openssl:0= )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
 "
 DEPEND="
${RDEPEND}
@@ -56,6 +61,11 @@ pkg_setup() {
fi
 }
 
+src_unpack() {
+   # prevent unpacking the logo
+   unpack ${MY_P}.tar.bz2
+}
+
 src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.75-nolua.patch \
@@ -65,8 +75,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
-   "${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch \
-   "${FILESDIR}"/${PN}-6.47-ncat-lua.patch
+   "${FILESDIR}"/${PN}-6.47-ncat-lua.patch \
+   "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch
 
if use nls; then
local lingua=''

diff --git a/net-analyzer/nmap/nmap-.ebuild 
b/net-analyzer/nmap/nmap-.ebuild
index 1185730..1e02fc0 100644
--- a/net-analyzer/nmap/nmap-.ebuild
+++ b/net-analyzer/nmap/nmap-.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png;
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="ipv6 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap"
+IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl 
zenmap"
 NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh )
 IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
 
@@ -41,7 +41,10 @@ RDEPEND="
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? ( dev-libs/apr dev-vcs/subversion )
-   ssl? ( dev-libs/openssl:0= )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
 "
 DEPEND="
${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/

2015-10-05 Thread Julian Ospald 
commit: 9931938d420d30a41ec1c94de73297098b9ff233
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 09:05:53 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 09:05:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9931938d

net-misc/iputils: fix bash substitution for libressl USE flag

 net-misc/iputils/iputils-20150815-r1.ebuild | 2 +-
 net-misc/iputils/iputils-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/iputils/iputils-20150815-r1.ebuild 
b/net-misc/iputils/iputils-20150815-r1.ebuild
index 699c2d2..a23f1b9 100644
--- a/net-misc/iputils/iputils-20150815-r1.ebuild
+++ b/net-misc/iputils/iputils-20150815-r1.ebuild
@@ -33,7 +33,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
nettle? ( dev-libs/nettle[static-libs(+)] )
openssl? (
!libressl? ( dev-libs/openssl:0[static-libs(+)] )
-   libressl? ( dev-libs/libressl[static-libs] )
+   libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
 RDEPEND="arping? ( !net-misc/arping )

diff --git a/net-misc/iputils/iputils-.ebuild 
b/net-misc/iputils/iputils-.ebuild
index 604bd94..0135191 100644
--- a/net-misc/iputils/iputils-.ebuild
+++ b/net-misc/iputils/iputils-.ebuild
@@ -35,7 +35,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
)
!gnutls? (
!libressl? ( dev-libs/openssl:0[static-libs(+)] )
-   libressl? ( dev-libs/libressl[static-libs] )
+   libressl? ( dev-libs/libressl[static-libs(+)] )
)
) )"
 RDEPEND="arping? ( !net-misc/arping )

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/

2015-10-05 Thread Julian Ospald 
commit: 91547e769e88e9b79e30eaf6d90ab10d53170178
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:53:48 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:53:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91547e76

net-analyzer/tcpdump: add libressl support

 .../{tcpdump-.ebuild => tcpdump-4.7.4-r1.ebuild}   | 14 +-
 net-analyzer/tcpdump/tcpdump-.ebuild   |  7 +--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/tcpdump/tcpdump-.ebuild 
b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
similarity index 80%
copy from net-analyzer/tcpdump/tcpdump-.ebuild
copy to net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
index 17b9895..003ab7b 100644
--- a/net-analyzer/tcpdump/tcpdump-.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.7.4-r1.ebuild
@@ -3,22 +3,26 @@
 # $Id$
 
 EAPI=5
-inherit eutils flag-o-matic git-r3 toolchain-funcs user
+inherit flag-o-matic toolchain-funcs user
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/;
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump;
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+   http://www.jp.tcpdump.org/release/${P}.tar.gz;
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="+drop-root smi ssl ipv6 samba suid test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+drop-root libressl smi ssl ipv6 samba suid test"
 
 RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
smi? ( net-libs/libsmi )
-   ssl? ( >=dev-libs/openssl-0.9.6m )
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+   libressl? ( dev-libs/libressl )
+   )
 "
 DEPEND="
${RDEPEND}

diff --git a/net-analyzer/tcpdump/tcpdump-.ebuild 
b/net-analyzer/tcpdump/tcpdump-.ebuild
index 17b9895..7ca9116 100644
--- a/net-analyzer/tcpdump/tcpdump-.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-.ebuild
@@ -12,13 +12,16 @@ EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump;
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+drop-root smi ssl ipv6 samba suid test"
+IUSE="+drop-root libressl smi ssl ipv6 samba suid test"
 
 RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
smi? ( net-libs/libsmi )
-   ssl? ( >=dev-libs/openssl-0.9.6m )
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-0.9.6m:0 )
+   libressl? ( dev-libs/libressl )
+   )
 "
 DEPEND="
${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: media-libs/opusfile/

2015-10-05 Thread Julian Ospald 
commit: e27dcd49336d661876bba52525389c157b3d
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 08:48:28 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 08:48:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27d

media-libs/opusfile: add libressl support

 media-libs/opusfile/opusfile-0.6-r1.ebuild | 36 ++
 1 file changed, 36 insertions(+)

diff --git a/media-libs/opusfile/opusfile-0.6-r1.ebuild 
b/media-libs/opusfile/opusfile-0.6-r1.ebuild
new file mode 100644
index 000..719011d
--- /dev/null
+++ b/media-libs/opusfile/opusfile-0.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A high-level decoding and seeking API for .opus files"
+HOMEPAGE="http://www.opus-codec.org/;
+SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc fixed-point +float +http libressl static-libs"
+
+RDEPEND="media-libs/libogg
+   media-libs/opus
+   http? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )"
+
+DEPEND="${RDEPEND}
+   doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="^^ ( fixed-point float )"
+
+src_configure() {
+   econf \
+   --docdir=/usr/share/doc/${PF} \
+   $(use_enable doc) \
+   $(use_enable fixed-point)\
+   $(use_enable float) \
+   $(use_enable http) \
+   $(use_enable static-libs static)
+}

[gentoo-commits] repo/gentoo:master commit in: net-mail/dovecot/

2015-10-05 Thread Julian Ospald 
commit: b7e25b1f72ec970b4eeef60e23b42e1452325e70
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 09:13:43 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 09:13:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e25b1f

net-mail/dovecot: add libressl support

 net-mail/dovecot/dovecot-2.2.18-r1.ebuild | 306 ++
 1 file changed, 306 insertions(+)

diff --git a/net-mail/dovecot/dovecot-2.2.18-r1.ebuild 
b/net-mail/dovecot/dovecot-2.2.18-r1.ebuild
new file mode 100644
index 000..5b195cb
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.18-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.8"
+if [[ ${PV} == *_rc* ]] ; then
+   rc_dir="rc/"
+else
+   rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+   sieve? (
+   
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+   )
+   managesieve? (
+   
http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+   ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/;
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve 
solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} 
${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+   caps? ( sys-libs/libcap )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   lucene? ( >=dev-cpp/clucene-2.3 )
+   lzma? ( app-arch/xz-utils )
+   lz4? ( app-arch/lz4 )
+   mysql? ( virtual/mysql )
+   pam? ( virtual/pam )
+   postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+   selinux? ( sec-policy/selinux-dovecot )
+   solr? ( net-misc/curl dev-libs/expat )
+   sqlite? ( dev-db/sqlite:* )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   tcpd? ( sys-apps/tcp-wrappers )
+   vpopmail? ( net-mail/vpopmail )
+   zlib? ( sys-libs/zlib )
+   virtual/libiconv
+   dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+   net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+   if use managesieve && ! use sieve; then
+   ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
+   ewarn "sieve USE flag will be turned on"
+   fi
+   # default internal user
+   enewgroup dovecot 97
+   enewuser dovecot 97 -1 /dev/null dovecot
+   # default login user
+   enewuser dovenull -1 -1 /dev/null
+   # add "mail" group for suid'ing. Better security isolation.
+   if use suid; then
+   enewgroup mail
+   fi
+}
+
+src_prepare() {
+   epatch "${FILESDIR}/${PN}-10-ssl.patch"
+
+   epatch_user
+}
+
+src_configure() {
+   local conf=""
+
+   if use postgres || use mysql || use sqlite; then
+   conf="${conf} --with-sql"
+   fi
+
+   local storages=""
+   for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+   use ${storage} && storages="${storage} ${storages}"
+   done
+   [ "${storages}" ] || storages="maildir"
+
+   # turn valgrind tests off. Bug #340791
+   VALGRIND=no econf \
+   --localstatedir="${EPREFIX}/var" \
+   --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+   --without-stemmer \
+   --with-storages="${storages}" \
+   --disable-rpath \
+   --with-icu \
+   $( systemd_with_unitdir ) \
+   $( use_with bzip2 bzlib ) \
+   $( use_with caps libcap ) \
+   $( use_with kerberos gssapi ) \
+   $( use_with ldap ) \
+   $( use_with lucene ) \
+   $( use_with lz4 ) \
+   $( use_with lzma ) \
+   $( use_with mysql ) \
+   $( use_with pam ) \

[gentoo-commits] repo/gentoo:master commit in: net-misc/tor/

2015-10-05 Thread Julian Ospald 
commit: 83d9dfd234b753cbfc2fe2d3d2ce06b9286b7bd7
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 09:16:35 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 09:16:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83d9dfd2

net-misc/tor: add libressl support

 net-misc/tor/tor-0.2.7.3_rc-r1.ebuild | 99 +++
 1 file changed, 99 insertions(+)

diff --git a/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild 
b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
new file mode 100644
index 000..940f951
--- /dev/null
+++ b/net-misc/tor/tor-0.2.7.3_rc-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic readme.gentoo systemd toolchain-funcs versionator 
user
+
+MY_PV="$(replace_version_separator 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/;
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+   https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz;
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd 
tor-hardening transparent-proxy test web"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   sys-libs/zlib
+   dev-libs/libevent
+   bufferevents? ( dev-libs/libevent[ssl] )
+   scrypt? ( app-crypt/libscrypt )
+   seccomp? ( sys-libs/libseccomp )
+   systemd? ( sys-apps/systemd )"
+RDEPEND="${DEPEND}
+   selinux? ( sec-policy/selinux-tor )"
+
+pkg_setup() {
+   enewgroup tor
+   enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.patch
+   epatch_user
+}
+
+src_configure() {
+   # Upstream isn't sure of all the user provided CFLAGS that
+   # will break tor, but does recommend against -fstrict-aliasing.
+   # We'll filter-flags them here as we encounter them.
+   filter-flags -fstrict-aliasing
+
+   econf \
+   --enable-system-torrc \
+   --enable-asciidoc \
+   --docdir=/usr/share/doc/${PF} \
+   $(use_enable stats instrument-downloads) \
+   $(use_enable bufferevents) \
+   $(use_enable scrypt libscrypt) \
+   $(use_enable seccomp) \
+   $(use_enable systemd) \
+   $(use_enable tor-hardening gcc-hardening) \
+   $(use_enable tor-hardening linker-hardening) \
+   $(use_enable transparent-proxy transparent) \
+   $(use_enable web tor2web-mode) \
+   $(use_enable test unittests) \
+   $(use_enable test coverage)
+}
+
+src_install() {
+   readme.gentoo_create_doc
+
+   newconfd "${FILESDIR}"/tor.confd tor
+   newinitd "${FILESDIR}"/tor.initd-r7 tor
+   systemd_dounit "${FILESDIR}/${PN}.service"
+   systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+   emake DESTDIR="${D}" install
+
+   keepdir /var/lib/tor
+
+   dodoc README ChangeLog ReleaseNotes doc/HACKING
+
+   fperms 750 /var/lib/tor
+   fowners tor:tor /var/lib/tor
+
+   insinto /etc/tor/
+   newins "${FILESDIR}"/torrc-r1 torrc
+}
+
+pkg_postinst() {
+   readme.gentoo_pkg_postinst
+
+   if [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -eq 8 && 
$(gcc-micro-version) -ge 1 ]] ; then
+   ewarn "Due to a bug in  >=gcc-4.8.1, compiling ${P} with -Os 
leads to an infinite"
+   ewarn "loop.  See:"
+   ewarn
+   ewarn "
https://trac.torproject.org/projects/tor/ticket/10259;
+   ewarn "https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59358;
+   ewarn
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/trousers/

2015-10-05 Thread Julian Ospald 
commit: f542bf4cc7a867cfecc0905425879d6fbded45a1
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 09:19:50 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 09:19:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f542bf4c

app-crypt/trousers: add libressl support

 app-crypt/trousers/trousers-0.3.13-r1.ebuild | 104 +++
 1 file changed, 104 insertions(+)

diff --git a/app-crypt/trousers/trousers-0.3.13-r1.ebuild 
b/app-crypt/trousers/trousers-0.3.13-r1.ebuild
new file mode 100644
index 000..e1055d2
--- /dev/null
+++ b/app-crypt/trousers/trousers-0.3.13-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils linux-info readme.gentoo systemd user udev
+
+#MY_P="${PN}-${PV%.*}-${PV##*.}"
+
+DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
+HOMEPAGE="http://trousers.sf.net;
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
+
+LICENSE="CPL-1.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE="doc libressl selinux" # gtk
+
+# gtk support presently does NOT compile.
+#  gtk? ( >=x11-libs/gtk+-2 )
+
+CDEPEND=">=dev-libs/glib-2
+   !libressl? ( >=dev-libs/openssl-0.9.7:0 )
+   libressl? ( dev-libs/libressl )
+"
+DEPEND="${CDEPEND}
+   virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-tcsd )"
+# S="${WORKDIR}/${P}git"
+
+DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
+
+DOC_CONTENTS="
+   If you have problems starting tcsd, please check permissions and
+   ownership on /dev/tpm* and ~tss/system.data
+"
+
+pkg_setup() {
+   # Check for driver (not sure it can be an rdep, because ot depends on 
the
+   # version of virtual/linux-sources... Is that supported by portage?)
+   linux-info_pkg_setup
+   local tpm_kernel_version tpm_kernel_present tpm_module
+   kernel_is ge 2 6 12 && tpm_kernel_version="yes"
+   if linux_config_exists; then
+   linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
+   else
+   ewarn "No kernel configuration could be found."
+   fi
+   has_version app-crypt/tpm-emulator && tpm_module="yes"
+   if [[ -n "${tpm_kernel_present}" ]]; then
+   einfo "Good, you seem to have in-kernel TPM support."
+   elif [[ -n "${tpm_module}" ]]; then
+   einfo "Good, you seem to have TPM support with the external 
module."
+   if [[ -n "${tpm_kernel_version}" ]]; then
+   elog
+   elog "Note that since you have a >=2.6.12 kernel, you 
could use"
+   elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
+   fi
+   elif [[ -n "${tpm_kernel_version}" ]]; then
+   eerror
+   eerror "To use this package, you will have to activate TPM 
support"
+   eerror "in your kernel configuration. That's at least 
CONFIG_TCG_TPM,"
+   eerror "plus probably a chip specific driver (like 
CONFIG_TCG_ATMEL)."
+   eerror
+   else
+   eerror
+   eerror "To use this package, you should install a TPM driver."
+   eerror "You can have the following options:"
+   eerror "  - install app-crypt/tpm-emulator"
+   eerror "  - switch to a >=2.6.12 kernel and compile the kernel 
module"
+   eerror
+   fi
+
+   # New user/group for the daemon
+   enewgroup tss
+   enewuser tss -1 -1 /var/lib/tpm tss
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-nouseradd.patch
+   epatch "${FILESDIR}"/${P}-build.patch
+   mv configure.in configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   # econf --with-gui=$(usex gtk gtk openssl)
+   econf --with-gui=openssl
+}
+
+src_install() {
+   keepdir /var/lib/tpm
+   default
+   use doc && dodoc doc/*
+   newinitd "${FILESDIR}"/tcsd.initd tcsd
+   newconfd "${FILESDIR}"/tcsd.confd tcsd
+   systemd_dounit "${FILESDIR}"/tcsd.service
+   udev_dorules "${FILESDIR}"/61-trousers.rules
+   fowners tss:tss /var/lib/tpm
+   prune_libtool_files
+   readme.gentoo_create_doc
+}

[gentoo-commits] repo/gentoo:master commit in: www-servers/lighttpd/

2015-10-05 Thread Julian Ospald 
commit: 0ebac15b88af3810838cf91779ccca0201fbe9a8
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 14:33:51 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 14:33:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebac15b

www-servers/lighttpd: add libressl support

Gentoo-Bug: 561854

 www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild | 217 +
 1 file changed, 217 insertions(+)

diff --git a/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild 
b/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild
new file mode 100644
index 000..8aa54dd
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.37-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit base autotools eutils depend.php readme.gentoo user systemd
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/;
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz;
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap 
memcache mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
+
+REQUIRED_USE="kerberos? ( ssl !libressl )"
+
+CDEPEND="
+   bzip2?( app-arch/bzip2 )
+   fam?  ( virtual/fam )
+   gdbm? ( sys-libs/gdbm )
+   ldap? ( >=net-nds/openldap-2.1.26 )
+   libev?( >=dev-libs/libev-4.01 )
+   lua?  ( >=dev-lang/lua-5.1:= )
+   memcache? ( dev-libs/libmemcache )
+   mysql?( >=virtual/mysql-4.0 )
+   pcre? ( >=dev-libs/libpcre-3.1 )
+   php?  ( dev-lang/php:*[cgi] )
+   rrdtool?  ( net-analyzer/rrdtool )
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
+   libressl? ( dev-libs/libressl:= )
+   )
+   webdav? (
+   dev-libs/libxml2
+   >=dev-db/sqlite-3
+   sys-fs/e2fsprogs
+   )
+   xattr? ( kernel_linux? ( sys-apps/attr ) )
+   zlib? ( >=sys-libs/zlib-1.1 )"
+
+DEPEND="${CDEPEND}
+   virtual/pkgconfig
+   doc?  ( dev-python/docutils )
+   test? (
+   virtual/perl-Test-Harness
+   dev-libs/fcgi
+   )"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+   local config="${D}/etc/lighttpd/lighttpd.conf"
+
+   # enable php/mod_fastcgi settings
+   use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || 
die; }
+
+   # enable stat() caching
+   use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+   # automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+   use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' 
${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+   local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+   # text docs
+   use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+   # non-essential modules
+   rm -f \
+   
${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+   # allow users to keep some based on USE flags
+   use pcre|| rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+   use webdav  || rm -f ${libdir}/mod_webdav.*
+   use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+   use lua || rm -f ${libdir}/mod_{cml,magnet}.*
+   use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+   use zlib|| rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+   if ! use pcre ; then
+   ewarn "It is highly recommended that you build ${PN}"
+   ewarn "with perl regular expressions support via USE=pcre."
+   ewarn "Otherwise you lose support for some core options such"
+   ewarn "as conditionals and modules such as mod_re{write,direct}"
+   ewarn "and mod_ssi."
+   fi
+   if use mmap; then
+   ewarn "You have enabled the mmap option. This option may allow"
+   ewarn "local users to trigger SIGBUG crashes. Use this option"
+   ewarn "with EXTRA care."
+   fi
+   enewgroup lighttpd
+   enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+
+   DOC_CONTENTS="IPv6 migration guide:\n
+   http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config;
+}
+
+src_prepare()

[gentoo-commits] repo/gentoo:master commit in: net-libs/openslp/

2015-10-05 Thread Julian Ospald 
commit: f0915e35abdc413f740957a423413c607d1ee431
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 14:17:28 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 14:28:25 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0915e35

net-libs/openslp: add libressl support

 net-libs/openslp/openslp-2.0.0-r1.ebuild | 37 
 1 file changed, 37 insertions(+)

diff --git a/net-libs/openslp/openslp-2.0.0-r1.ebuild 
b/net-libs/openslp/openslp-2.0.0-r1.ebuild
new file mode 100644
index 000..e4f8d64
--- /dev/null
+++ b/net-libs/openslp/openslp-2.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools systemd
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/;
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="libressl"
+RESTRICT="test"
+
+DEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-2.0.0-cflags.patch
+   eautoreconf
+}
+
+src_install() {
+   make DESTDIR="${D}" install || die "make install failed"
+   dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+   rm -rfv "${D}"/usr/doc
+   dohtml -r .
+   newinitd "${FILESDIR}"/slpd-init slpd
+   systemd_dounit "${FILESDIR}"/slpd.service
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/

2015-10-05 Thread Julian Ospald 
commit: 5489e6ac4ff415e800f03d7b624d91f5d16cb8bd
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 14:27:23 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 14:28:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5489e6ac

app-text/mupdf: add libressl support

 .../{mupdf-.ebuild => mupdf-1.7a-r1.ebuild}| 22 ++
 app-text/mupdf/mupdf-.ebuild   |  6 --
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app-text/mupdf/mupdf-.ebuild 
b/app-text/mupdf/mupdf-1.7a-r1.ebuild
similarity index 82%
copy from app-text/mupdf/mupdf-.ebuild
copy to app-text/mupdf/mupdf-1.7a-r1.ebuild
index 420f707..2bb7606 100644
--- a/app-text/mupdf/mupdf-.ebuild
+++ b/app-text/mupdf/mupdf-1.7a-r1.ebuild
@@ -4,27 +4,29 @@
 
 EAPI=5
 
-inherit eutils git-2 multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs vcs-snapshot
 
 DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="http://mupdf.com/;
-EGIT_REPO_URI="git://git.ghostscript.com/mupdf.git"
-#EGIT_HAS_SUBMODULES=1
+SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=987969ac033151810aade57d45c3d968dbf83d60;sf=tgz
 -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 MY_SOVER=1.7
 SLOT="0/${MY_SOVER}"
-KEYWORDS=""
-IUSE="X vanilla curl openssl static static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X vanilla +curl javascript libressl +openssl static static-libs"
 
-LIB_DEPEND="dev-libs/openssl[static-libs?]
+LIB_DEPEND="
+   !libressl? ( dev-libs/openssl:0[static-libs?] )
+   libressl? ( dev-libs/libressl[static-libs?] )
media-libs/freetype:2[static-libs?]
media-libs/jbig2dec[static-libs?]
media-libs/openjpeg:2[static-libs?]
net-misc/curl[static-libs?]
virtual/jpeg[static-libs?]
X? ( x11-libs/libX11[static-libs?]
-   x11-libs/libXext[static-libs?] )"
+   x11-libs/libXext[static-libs?] )
+   javascript? ( dev-lang/mujs )"
 RDEPEND="${LIB_DEPEND}"
 DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -42,7 +44,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.3-CFLAGS.patch \
"${FILESDIR}"/${PN}-1.5-old-debian-files.patch \
"${FILESDIR}"/${PN}-1.3-pkg-config.patch \
-   "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch
+   "${FILESDIR}"/${PN}-1.5-Makerules-openssl-curl.patch \
+   "${FILESDIR}"/${PN}-1.7a-system-mujs.patch
 
if has_version ">=media-libs/openjpeg-2.1:2" ; then
epatch \
@@ -72,6 +75,9 @@ src_prepare() {
-e "1iHAVE_X11 = $(usex X)" \
-e "1iWANT_OPENSSL = $(usex openssl)" \
-e "1iWANT_CURL = $(usex curl)" \
+   -e "1iHAVE_MUJS = $(usex javascript)" \
+   -e "1iMUJS_LIBS = -lmujs" \
+   -e "1iMUJS_CFLAGS =" \
-i Makerules || die
 
if use static-libs || use static ; then

diff --git a/app-text/mupdf/mupdf-.ebuild b/app-text/mupdf/mupdf-.ebuild
index 420f707..d275c29 100644
--- a/app-text/mupdf/mupdf-.ebuild
+++ b/app-text/mupdf/mupdf-.ebuild
@@ -15,9 +15,11 @@ LICENSE="AGPL-3"
 MY_SOVER=1.7
 SLOT="0/${MY_SOVER}"
 KEYWORDS=""
-IUSE="X vanilla curl openssl static static-libs"
+IUSE="X vanilla curl libressl openssl static static-libs"
 
-LIB_DEPEND="dev-libs/openssl[static-libs?]
+LIB_DEPEND="
+   !libressl? ( dev-libs/openssl:0[static-libs?] )
+   libressl? ( dev-libs/libressl[static-libs?] )
media-libs/freetype:2[static-libs?]
media-libs/jbig2dec[static-libs?]
media-libs/openjpeg:2[static-libs?]

[gentoo-commits] repo/gentoo:master commit in: net-libs/ptlib/

2015-10-05 Thread Julian Ospald 
commit: 82fadaf322e4f64b110c0fce1b940e5c4e23dd6e
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 14:21:53 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 14:28:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fadaf3

net-libs/ptlib: add libressl support

 net-libs/ptlib/ptlib-2.12.9-r1.ebuild | 226 ++
 1 file changed, 226 insertions(+)

diff --git a/net-libs/ptlib/ptlib-2.12.9-r1.ebuild 
b/net-libs/ptlib/ptlib-2.12.9-r1.ebuild
new file mode 100644
index 000..47029cf
--- /dev/null
+++ b/net-libs/ptlib/ptlib-2.12.9-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Network focused portable C++ class library providing high level 
functions"
+HOMEPAGE="http://www.opalvoip.org/;
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+   doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# default enabled are features from 'minsize', the most used according to ptlib
+IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
+xmpp ldap libressl lua mail odbc oss pch pulseaudio remote sasl sdl serial
+shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
+vxml wav xml xmlrpc"
+
+CDEPEND="
+   ldap? ( net-nds/openldap )
+   lua? ( dev-lang/lua )
+   odbc? ( dev-db/unixODBC )
+   pulseaudio? ( media-sound/pulseaudio )
+   sasl? ( dev-libs/cyrus-sasl:2 )
+   sdl? ( media-libs/libsdl )
+   sound? ( alsa? ( media-libs/alsa-lib ) )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   video? ( v4l? ( media-libs/libv4l ) )
+   xml? ( dev-libs/expat )
+   !!dev-libs/pwlib"
+RDEPEND="${CDEPEND}
+   ffmpeg? ( virtual/ffmpeg )"
+DEPEND="${CDEPEND}
+   virtual/pkgconfig
+   sys-devel/bison
+   sys-devel/flex
+   video? ( v4l? ( sys-kernel/linux-headers ) )"
+
+# NOTES:
+# media-libs/libdc1394:2 should be supported but headers location have changed
+# tools/ directory is ignored
+# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
+
+REQUIRED_USE="sdl? ( video )
+   xmpp? ( xml )
+   vxml? ( http tts xml )
+   xmlrpc? ( http xml )
+   soap? ( http xml )"
+
+src_prepare() {
+   epatch "${FILESDIR}/${PN}-2.10.9-svn_revision_override.patch" \
+   "${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
+   "${FILESDIR}/${PN}-2.12.4-respect_cxxflags.patch" \
+   "${FILESDIR}/${PN}-2.12.4-sdl-linking.patch"
+
+   if ! use telnet; then
+   epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"
+   fi
+
+   # remove visual studio related files from samples/
+   if use examples; then
+   rm -f samples/*/*.vcproj
+   rm -f samples/*/*.sln
+   rm -f samples/*/*.dsp
+   rm -f samples/*/*.dsw
+   fi
+
+   if [[ ! -z ${TARGET+set} ]]; then
+   ewarn "TARGET variable is set. Removing as it would break the 
build, bug #465722."
+   unset TARGET
+   fi
+}
+
+src_configure() {
+   local myconf=""
+
+   # plugins are disabled only if ! sound and ! video
+   if ! use sound && ! use video; then
+   myconf+=" --disable-plugins"
+   else
+   myconf+=" --enable-plugins"
+   fi
+
+   # minsize: presets of features (overwritten by use flags)
+   # ansi-bool, atomicity: there is no reason to disable those features
+   # internalregex: we want to use system one
+   # sunaudio and bsdvideo are respectively for SunOS and BSD's
+   # appshare, vfw: only for windows
+   # samples: no need to build samples
+   # avc: disabled, bug 276514, upstream bug 2821744
+   # mlib: SUN mediaLibs. Not in tree.
+   # pipechan, configfile, resolver, url: force enabling
+   econf ${myconf} \
+   --disable-minsize \
+   --enable-ansi-bool \
+   --enable-atomicity \
+   --disable-internalregex \
+   --disable-sunaudio \
+   --disable-bsdvideo \
+   --disable-appshare \
+   --disable-vfw \
+   --disable-samples \
+   --disable-avc \
+   --disable-mlib \
+   --enable-configfile \
+   --enable-pipechan \
+   --enable-resolver \
+   --enable-url \
+   $(use_enable alsa) \
+   $(use_enable as

[gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/

2015-10-05 Thread Julian Ospald 
commit: 32fd4ff79b5f67597169d638ddcdb69d3b0b173a
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 14:24:57 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 14:28:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fd4ff7

net-misc/freerdp: add libressl support

 ...erdp-.1.ebuild => freerdp-1.2.1_pre20150326-r1.ebuild} | 11 +++
 net-misc/freerdp/freerdp-.1.ebuild|  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net-misc/freerdp/freerdp-.1.ebuild 
b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
similarity index 88%
copy from net-misc/freerdp/freerdp-.1.ebuild
copy to net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
index 131105e..0ea2daf 100644
--- a/net-misc/freerdp/freerdp-.1.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils vcs-snapshot
 if [[ ${PV} != * ]]; then
COMMIT="aa2181dcf2dd98693767ba738c5b2ad8c3d742d4"
SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+   KEYWORDS="alpha amd64 arm ppc ppc64 x86"
 else
inherit git-r3
SRC_URI=""
@@ -23,10 +23,11 @@ HOMEPAGE="http://www.freerdp.com/;
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
 IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
-   neon pulseaudio server smartcard test usb wayland X xinerama xv"
+   libressl neon pulseaudio server smartcard test usb wayland X xinerama 
xv"
 
 RDEPEND="
-   dev-libs/openssl:0
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
@@ -46,7 +47,7 @@ RDEPEND="
xv? ( x11-libs/libXv )
)
)
-   ffmpeg? ( virtual/ffmpeg )
+   ffmpeg? ( >=virtual/ffmpeg-9 )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@@ -80,6 +81,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( README )
 
+PATCHES=( "${FILESDIR}/freerdp-armfp.patch" 
"${FILESDIR}/freerdp-ffmpeg29.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_with alsa ALSA)

diff --git a/net-misc/freerdp/freerdp-.1.ebuild 
b/net-misc/freerdp/freerdp-.1.ebuild
index 131105e..d38b4c4 100644
--- a/net-misc/freerdp/freerdp-.1.ebuild
+++ b/net-misc/freerdp/freerdp-.1.ebuild
@@ -23,10 +23,11 @@ HOMEPAGE="http://www.freerdp.com/;
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
 IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
-   neon pulseaudio server smartcard test usb wayland X xinerama xv"
+   libressl neon pulseaudio server smartcard test usb wayland X xinerama 
xv"
 
 RDEPEND="
-   dev-libs/openssl:0
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
sys-libs/zlib:0
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )

[gentoo-commits] repo/gentoo:master commit in: net-misc/openconnect/

2015-10-05 Thread Julian Ospald 
commit: 63663b29b377f7257ce28b753a921c9d1e761300
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 13:13:38 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 13:52:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63663b29

net-misc/openconnect: add libressl support

 net-misc/openconnect/openconnect-7.06-r2.ebuild | 138 
 1 file changed, 138 insertions(+)

diff --git a/net-misc/openconnect/openconnect-7.06-r2.ebuild 
b/net-misc/openconnect/openconnect-7.06-r2.ebuild
new file mode 100644
index 000..2a75168
--- /dev/null
+++ b/net-misc/openconnect/openconnect-7.06-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit eutils java-pkg-opt-2 linux-info python-any-r1 readme.gentoo
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="http://www.infradead.org/openconnect.html;
+VPNC_VER=20140806
+SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz
+   
ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz;
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc +gnutls gssapi java libressl libproxy nls static-libs"
+ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl 
tg ug uk zh_CN zh_TW"
+for lang in $ILINGUAS; do
+   IUSE="${IUSE} linguas_${lang}"
+done
+
+DEPEND="dev-libs/libxml2
+   sys-libs/zlib
+   !gnutls? (
+   !libressl? ( >=dev-libs/openssl-1.0.1h:0[static-libs?] )
+   libressl? ( dev-libs/libressl[static-libs?] )
+   )
+   gnutls? (
+   >=net-libs/gnutls-3[static-libs?] dev-libs/nettle
+   app-misc/ca-certificates
+   )
+   gssapi? ( virtual/krb5 )
+   libproxy? ( net-libs/libproxy )
+   nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+   sys-apps/iproute2
+   ! po/LINGUAS
+   if ! use doc; then
+   # If the python cannot be found, the docs will not build
+   sed -e 's#"${ac_cv_path_PYTHON}"#""#' -i configure || die
+   fi
+
+   # stoken and liboath not in portage
+   econf \
+   --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" \
+   $(use_enable static-libs static) \
+   $(use_enable nls ) \
+   $(use_with !gnutls openssl) \
+   $(use_with gnutls ) \
+   $(use_with libproxy) \
+   --without-stoken \
+   $(use_with gssapi) \
+   $(use_with java)
+}
+
+DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels.
+
+You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d
+instead of calling it directly:
+
+ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0
+
+You can then start the vpn tunnel like this:
+
+/etc/init.d/openconnect.vpn0 start
+
+If you would like to run preup, postup, predown, and/or postdown scripts,
+You need to create a directory in /etc/openconnect with the name of the vpn:
+
+mkdir /etc/openconnect/vpn0
+
+Then add executable shell files:
+
+mkdir /etc/openconnect/vpn0
+cd /etc/openconnect/vpn0
+echo '#!/bin/sh' > preup.sh
+cp preup.sh predown.sh
+cp preup.sh postup.sh
+cp preup.sh postdown.sh
+chmod 755 /etc/openconnect/vpn0/*
+"
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   dodoc AUTHORS TODO
+   newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect
+   dodir /etc/openconnect
+   insinto /etc/openconnect
+   newconfd "${FILESDIR}"/openconnect.conf.in openconnect
+   exeinto /etc/openconnect
+   newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh
+   insinto /etc/logrotate.d
+   newins "${FILESDIR}"/openconnect.logrotate openconnect
+   keepdir /var/log/openconnect
+
+   # Remove useless .la files
+   prune_libtool_files --all
+
+   readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+   readme.gentoo_print_elog
+   if [[ -z ${REPLACING_VERSIONS} ]]; then
+   elog
+   elog "You may want to consider installing the following 
optional packages."
+   optfeature "resolvconf support" net-dns/openresolv
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagios-plugins/

2015-10-05 Thread Julian Ospald 
commit: 15cd6c6fab2273359de5aee4ea98ac8023fa25c4
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 12:55:03 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 13:52:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15cd6c6f

net-analyzer/nagios-plugins: add libressl support

 .../nagios-plugins/nagios-plugins-2.1.1-r2.ebuild  | 102 +
 1 file changed, 102 insertions(+)

diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild 
b/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild
new file mode 100644
index 000..5768949
--- /dev/null
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.1.1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="Official plugins for Nagios"
+HOMEPAGE="http://nagios-plugins.org/;
+SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres 
samba selinux snmp ssh +ssl"
+
+# Most of the plugins use automagic dependencies, i.e. the plugin will
+# get built if the binary it uses is installed. For example, check_snmp
+# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is
+# installed. End result: most of our runtime dependencies are required
+# at build time as well.
+#
+# REAL_DEPEND contains the dependencies that are actually needed to
+# build. DEPEND contains those plus the automagic dependencies.
+#
+REAL_DEPEND="dev-lang/perl
+   ldap? ( net-nds/openldap )
+   mysql? ( virtual/mysql )
+   postgres? ( dev-db/postgresql:* )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )"
+
+DEPEND="${REAL_DEPEND}
+   nagios-dns? ( net-dns/bind-tools )
+   nagios-game? ( games-util/qstat )
+   nagios-ping? ( net-analyzer/fping )
+   samba? ( net-fs/samba )
+   ssh? ( net-misc/openssh )
+   snmp? ( dev-perl/Net-SNMP
+   net-analyzer/net-snmp[-minimal] )"
+
+# Basically everything collides with nagios-plugins.
+RDEPEND="${DEPEND}
+   !net-analyzer/monitoring-plugins
+   selinux? ( sec-policy/selinux-nagios )"
+
+# At least one test is interactive.
+RESTRICT="test"
+
+src_prepare() {
+   # Fix the path to our perl interpreter
+   sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \
+   "${S}"/plugins-scripts/*.pl || die
+}
+
+src_configure() {
+   # Use an array to prevent econf from mangling the ping args.
+   local myconf=()
+
+   if use ssl; then
+   myconf+=( $(use_with ssl openssl /usr) )
+   else
+   myconf+=( --without-openssl )
+   myconf+=( --without-gnutls )
+   fi
+
+   # The autodetection for these two commands can hang if localhost is
+   # down or ICMP traffic is filtered. Bug #468296.
+   myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" )
+
+   if use ipv6; then
+   myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d 
%s" )
+   fi
+
+   econf \
+   $(use_with mysql) \
+   $(use_with ipv6) \
+   $(use_with ldap) \
+   $(use_with postgres pgsql /usr) \
+   "${myconf[@]}" \
+   --libexecdir="/usr/$(get_libdir)/nagios/plugins" \
+   --sysconfdir="/etc/nagios"
+}
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \
+   NEWS README REQUIREMENTS SUPPORT THANKS )
+
+pkg_preinst() {
+   enewgroup nagios
+   enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+pkg_postinst() {
+   elog "This ebuild has a number of USE flags that determine what you"
+   elog "are able to monitor. Depending on what you want to monitor, some"
+   elog "or all of these USE flags need to be set."
+   elog
+   elog "The plugins are installed in 
${ROOT}usr/$(get_libdir)/nagios/plugins"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/

2015-10-05 Thread Julian Ospald 
commit: fa2718b44ce9b94ea4dec12a8333e096af6637b7
Author: Julian Ospald  gentoo  org>
AuthorDate: Mon Oct  5 12:44:51 2015 +
Commit:     Julian Ospald  gentoo  org>
CommitDate: Mon Oct  5 13:52:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2718b4

dev-scheme/gauche: add libressl support

 dev-scheme/gauche/gauche-0.9.4-r1.ebuild | 50 
 1 file changed, 50 insertions(+)

diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild 
b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
new file mode 100644
index 000..dda1916
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+MY_P="${P^g}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/;
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~x86-macos"
+IUSE="ipv6 libressl test"
+
+RDEPEND="sys-libs/gdbm"
+DEPEND="${RDEPEND}
+   test? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-rpath.diff
+   epatch "${FILESDIR}"/${PN}-gauche.m4.diff
+   epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
+   epatch "${FILESDIR}"/${PN}-xz-info.diff
+   epatch "${FILESDIR}"/${PN}-rfc.tls.diff
+   eautoconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable ipv6) \
+   --with-slib="${EPREFIX}"/usr/share/slib
+}
+
+src_test() {
+   emake -j1 -s check
+}
+
+src_install() {
+   emake -j1 DESTDIR="${D}" install-pkg install-doc
+   dodoc AUTHORS ChangeLog HACKING README
+}

  1   2   3   4   5   6   7   8   9   10   >