[gentoo-commits] repo/gentoo:master commit in: media-libs/devil/, media-libs/devil/files/

[Michael Sterrett]

commit: bbec455c85cfdd85ae529cc407ede34277127c91
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Sep  3 15:01:03 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Sep  3 15:06:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbec455c

fix building with gcc-5.2 with patch from Sven Eden via bug 552370

Package-Manager: portage-2.2.20.1

 media-libs/devil/devil-1.7.8-r2.ebuild|  2 +-
 media-libs/devil/files/devil-1.7.8-restrict.patch | 23 +++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild 
b/media-libs/devil/devil-1.7.8-r2.ebuild
index 1f03c57..8be0281 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
X? ( x11-proto/xextproto )"
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT}.patch
+   epatch 
"${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch
eautoreconf
 }
 

diff --git a/media-libs/devil/files/devil-1.7.8-restrict.patch 
b/media-libs/devil/files/devil-1.7.8-restrict.patch
new file mode 100644
index 000..d99ccb3
--- /dev/null
+++ b/media-libs/devil/files/devil-1.7.8-restrict.patch
@@ -0,0 +1,23 @@
+Patch from Sven Eden via bug 552370
+https://bugs.gentoo.org/show_bug.cgi?id=552370
+
+--- a/include/IL/il.h  2009-03-08 08:10:08.0 +0100
 b/include/IL/il.h  2015-09-03 16:22:04.056637044 +0200
+@@ -63,13 +63,13 @@
+   #endif
+ #endif
+ 
+-#ifdef RESTRICT_KEYWORD
+-#define RESTRICT restrict
+-#define CONST_RESTRICT const restrict
++#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
++#define RESTRICT __restrict__
++#define CONST_RESTRICT const __restrict__
+ #else
+ #define RESTRICT
+ #define CONST_RESTRICT const
+-#endif
++#endif // RESTRICT keyword and not C++
+ 
+ #include 
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-java/antenna/files/, dev-java/antenna/

[Patrice Clement]

commit: b4215f48cf2db00fe0d3db0f58cb0f63dc28522d
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 13:45:07 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 13:47:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4215f48

dev-java/antenna: Package removal wrt bug 556460.

Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/antenna/Manifest   |   1 -
 dev-java/antenna/antenna-1.0.2-r1.ebuild|  68 ---
 dev-java/antenna/antenna-1.0.2-r2.ebuild|  67 ---
 dev-java/antenna/files/antenna-0.9.13-ant.patch | 107 
 dev-java/antenna/metadata.xml   |   8 --
 5 files changed, 251 deletions(-)

diff --git a/dev-java/antenna/Manifest b/dev-java/antenna/Manifest
deleted file mode 100644
index a6ae0ae..000
--- a/dev-java/antenna/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST antenna-src-1.0.2.zip 1502020 SHA256 
a6a15d257ae2af8805cf002e51675246b119cb34f23bf3cc15398acaca0bcfe8 SHA512 
38ff589b82f2298e17846b2437981ffe549e35129624b36f439bfeb9943fe5a6577ef2ec4aba7314f59c8c4f30fb8c45cd6e3c675af0196ac4248a4d256e48d7
 WHIRLPOOL 
e1d958ac110e5f97caad2160df3e6cd019640a5ed36697f373115b8850cdbd8ac5d070860a5dea476d31baf6bd484a13282b5aba9c1380a0805a888e23b095d5

diff --git a/dev-java/antenna/antenna-1.0.2-r1.ebuild 
b/dev-java/antenna/antenna-1.0.2-r1.ebuild
deleted file mode 100644
index 17a28ab..000
--- a/dev-java/antenna/antenna-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${DISTDIR}/${PN}-src-${PV}.zip
-
-DESCRIPTION="Ant task for J2ME"
-HOMEPAGE="http://antenna.sourceforge.net/;
-SRC_URI="mirror://sourceforge/antenna/${PN}-src-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/ant-core:0
-   dev-java/antlr:0
-   java-virtuals/servlet-api:2.4"
-DEPEND=">=virtual/jdk-1.4
-   app-arch/unzip
-   ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-   ${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-   default
-   unzip -n lib/preprocessor-src-1.1.zip
-}
-
-java_prepare() {
-   rm -rf lib
-   java-ant_bsfix_one build.xml
-   java-ant_rewrite-classpath build.xml
-}
-
-src_compile() {
-   local cp="ant-core,antlr,servlet-api-2.4"
-   EANT_GENTOO_CLASSPATH="${cp}" \
-   EANT_BUILD_TARGET="init compile package" \
-   EANT_DOC_TARGET="" java-pkg-2_src_compile
-   if use doc; then
-   javadoc -encoding latin1 -d api $(find src -name "*.java") \
-   -classpath $(java-pkg_getjars "${cp}") \
-   || die "javadoc failed"
-   fi
-}
-
-src_install() {
-   java-pkg_newjar dist/${PN}-bin-${PV}.jar
-   java-pkg_register-ant-task
-
-   if use doc; then
-   java-pkg_dohtml doc/*
-   java-pkg_dojavadoc api
-   fi
-   use source && java-pkg_dosrc src/*
-   use examples && java-pkg_doexamples samples
-}

diff --git a/dev-java/antenna/antenna-1.0.2-r2.ebuild 
b/dev-java/antenna/antenna-1.0.2-r2.ebuild
deleted file mode 100644
index 4765b98..000
--- a/dev-java/antenna/antenna-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${DISTDIR}/${PN}-src-${PV}.zip
-
-DESCRIPTION="Ant task for J2ME"
-HOMEPAGE="http://antenna.sourceforge.net/;
-SRC_URI="mirror://sourceforge/antenna/${PN}-src-${PV}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/ant-core:0
-   dev-java/antlr:0
-   java-virtuals/servlet-api:3.0"
-DEPEND=">=virtual/jdk-1.4
-   app-arch/unzip
-   ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-   ${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-JAVA_PKG_BSFIX="off"
-
-java_prepare() {
-   unzip -n lib/preprocessor-src-1.1.zip || die "can't unzip 
preprocessor-src-1.1.zip"
-   rm -rf lib || die "can't remove lib directory"
-
-   java-ant_bsfix_one build.xml
-   java-ant_rewrite-classpath build.xml
-}
-
-src_compile() {
-   local cp="ant-core,antlr,servlet-api-3.0"
-
-   EANT_GENTOO_CLASSPATH="${cp}" \
-   EANT_BUILD_TARGET="init compile package" \
-   EANT_DOC_TARGET="" java-pkg-2_src_compile
-
-   if use doc; then
-   javadoc -encoding latin1 -d api $(find src -name "*.java") \
-   -classpath $(java-pkg_getjars "${cp}") \
-   || die "javadoc failed"
-   fi
-}
-
-src_install() {
-   java-pkg_newjar dist/${PN}-bin-${PV}.jar
-   

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/

[Matt Thode]

commit: a691cc7ccf2c222866ec5d64c05221f8fd5ba0bb
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 14:27:20 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 14:28:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a691cc7c

sys-cluster/nova: cleaning up for bug 559376

Package-Manager: portage-2.2.20.1

 sys-cluster/nova/nova-2015.1.1-r2.ebuild | 253 ---
 1 file changed, 253 deletions(-)

diff --git a/sys-cluster/nova/nova-2015.1.1-r2.ebuild 
b/sys-cluster/nova/nova-2015.1.1-r2.ebuild
deleted file mode 100644
index 2629472..000
--- a/sys-cluster/nova/nova-2015.1.1-r2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info multilib user
-
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) 
written in Python"
-HOMEPAGE="https://launchpad.net/nova;
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz;
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy 
openvswitch postgres +rabbitmq sqlite test xen"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-   compute-only? ( compute 
!rabbitmq !memcached !mysql !postgres !sqlite )
-   compute? ( ^^ ( kvm xen ) )"
-
-DEPEND="
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-   =dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-   =dev-python/coverage-3.6[${PYTHON_USEDEP}]
-   >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-   =dev-python/mock-1.0[${PYTHON_USEDEP}]
-   =dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-   =dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
-   =dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
-   =dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-   >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-   >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-   !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-   =dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-   =dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-   =dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-   >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-   !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-   =dev-python/suds-0.4[${PYTHON_USEDEP}]
-   >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-   

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

[Patrice Clement]

commit: 09c67e49adc22ec8cd4ec79e91eb38fb12a02ffa
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 14:04:59 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 14:30:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09c67e49

dev-java/easymock: Keyword for ppc+ppc64. Fixes bug 538380.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/easymock/easymock-3.2-r1.ebuild | 2 +-
 dev-java/easymock/easymock-3.3.1.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/easymock/easymock-3.2-r1.ebuild 
b/dev-java/easymock/easymock-3.2-r1.ebuild
index 4f1e6c5..cbefa0d 100644
--- a/dev-java/easymock/easymock-3.2-r1.ebuild
+++ b/dev-java/easymock/easymock-3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="3.2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
 IUSE=""
 
 CDEPEND="dev-java/junit:4

diff --git a/dev-java/easymock/easymock-3.3.1.ebuild 
b/dev-java/easymock/easymock-3.3.1.ebuild
index 9625ed7..446f885 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
 IUSE=""
 
 COMMON_DEPEND="

[gentoo-commits] proj/catalyst:pending commit in: catalyst/, catalyst/targets/, catalyst/base/

[Brian Dolbec]

commit: 171e7e154c2629d85cd9979bd31f03d639fe8182
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jun 15 16:33:29 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 15:12:38 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=171e7e15

DeComp bug fixes

 catalyst/base/genbase.py |  2 +-
 catalyst/base/stagebase.py   | 14 +-
 catalyst/main.py |  5 +++--
 catalyst/targets/snapshot.py | 34 +-
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index e818781..c05b36d 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -24,7 +24,7 @@ class GenBase(object):
array=keys.keys()
array.sort()
for j in array:
-   contents = 
contents_map.generate_contents(file, j,
+   contents = contents_map.contents(file, 
j,
verbose="VERBOSE" in 
self.settings)
if contents:
myf.write(contents)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 7231303..e0e9023 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -10,7 +10,7 @@ from stat import ST_UID, ST_GID, ST_MODE
 # for convienience
 pjoin = os.path.join
 
-from decomp.compress import CompressMap
+from DeComp.compress import CompressMap
 
 from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS,
PORT_LOGDIR_CLEAN)
@@ -38,10 +38,11 @@ class StageBase(TargetBase, ClearBase, GenBase):

self.required_values.extend(["version_stamp","target","subarch",\
"rel_type","profile","snapshot","source_subpath"])
 
-   self.valid_values.extend(["version_stamp","target","subarch",\
-   
"rel_type","profile","snapshot","source_subpath","portage_confdir",\
-   
"cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay",\
-   
"distcc_hosts","makeopts","pkgcache_path","kerncache_path"])
+   self.valid_values.extend(["version_stamp","target","subarch",
+   
"rel_type","profile","snapshot","source_subpath","portage_confdir",
+   
"cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay",
+   
"distcc_hosts","makeopts","pkgcache_path","kerncache_path",
+   "compression_mode", "decompression_mode"])
 
self.set_valid_build_kernel_vars(addlargs)
TargetBase.__init__(self, myspec, addlargs)
@@ -1371,6 +1372,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
# lists in arch/amd64.py and friends.  If we wanted 
self.settigs[var]
# of any depth, we should make this function recursive.
elif type(self.settings[x]) == types.DictType:
+   if x in ["compress_definitions",
+   "decompress_definitions"]:
+   continue
self.env[varname] = 
string.join(self.settings[x].keys())
for y in self.settings[x].keys():
varname2 = 
"clst_"+string.replace(y,"/","_")

diff --git a/catalyst/main.py b/catalyst/main.py
index 7e3b55e..dc9342b 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -13,11 +13,12 @@ import os.path
 
 __selfpath__ = os.path.abspath(os.path.dirname(__file__))
 
-from decomp.compress import COMPRESS_DEFINITIONS, DECOMPRESS_DEFINITIONS
+from DeComp.definitions import (COMPRESS_DEFINITIONS, DECOMPRESS_DEFINITIONS,
+   CONTENTS_DEFINITIONS)
+from DeComp.contents import ContentsMap
 
 import catalyst.config
 import catalyst.util
-from catalyst.contents import ContentsMap, CONTENTS_DEFINITIONS
 from catalyst.defaults import confdefaults, option_messages
 from catalyst.hash_utils import HashMap, HASH_DEFINITIONS
 from catalyst.lock import LockInUse

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index 1887110..ad96d37 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -6,18 +6,21 @@ import os
 import shutil
 from stat import ST_UID, ST_GID, ST_MODE
 
+from DeComp.compress import CompressMap
 
 from catalyst.support import normpath, cmd
 from catalyst.base.targetbase import TargetBase
 from catalyst.base.genbase import GenBase
 from catalyst.fileops import ensure_dirs
+
+
 class snapshot(TargetBase, GenBase):
"""
Builder class for snapshots.
"""
def 

[gentoo-commits] proj/catalyst:pending commit in: targets/stage1/

[Brian Dolbec]

commit: 306d797509244bf3508def0aa6c1bbcdfb6e1257
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:50:33 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:50:33 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=306d7975

remove stray bindist use flag setting from stage1 chroot, this is handled by 
setup_pkgmgr early enough

 targets/stage1/stage1-chroot.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 028089e..91ab1fa 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -7,8 +7,6 @@ export clst_buildpkgs="$(/tmp/build.py)"
 
 # Setup our environment
 BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
 
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/

[Brian Dolbec]

commit: da114f314109977bca344179ed7c3aa648837afd
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:22:01 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:22:01 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=da114f31

fix minor typo

 catalyst/base/stagebase.py  | 2 +-
 targets/support/chroot-functions.sh | 9 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c0bafc2..23491aa 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
 
if myusevars:
-   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# buidling in addition to what is provided by the 
profile.\n")
+   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# building in addition to what is provided by the 
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5e046cb..5dd542e 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
+   # Set bindist USE flag if clst_BINDIST is set
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
@@ -268,9 +271,6 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
 
-   # Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +287,6 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
 
emerge ${clst_myemergeopts} $@ || exit 1
-
-   # Clean-up USE again
-   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/

[Brian Dolbec]

commit: 75cdef7e4593d3de0c407610ae2f3a55b1859336
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:23:10 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:23:10 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=75cdef7e

fix minor typo

 catalyst/base/stagebase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index c0bafc2..23491aa 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
 
if myusevars:
-   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# buidling in addition to what is provided by the 
profile.\n")
+   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# building in addition to what is provided by the 
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, catalyst/base/

[Brian Dolbec]

commit: cec4889344a5c5de7fa02ade0253808dc73f3008
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:22:38 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:22:38 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cec48893

Revert "fix minor typo"

This reverts commit da114f314109977bca344179ed7c3aa648837afd.

bad commit

 catalyst/base/stagebase.py  | 2 +-
 targets/support/chroot-functions.sh | 9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..c0bafc2 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1097,7 +1097,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
myusevars.extend(self.settings["use"])
 
if myusevars:
-   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# building in addition to what is provided by the 
profile.\n")
+   myf.write("# These are the USE and USE_EXPAND 
flags that were used for\n# buidling in addition to what is provided by the 
profile.\n")
myusevars = sorted(set(myusevars))
myf.write('USE="'+string.join(myusevars)+'"\n')
if '-*' in myusevars:

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5dd542e..5e046cb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,9 +166,6 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
-   # Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
@@ -271,6 +268,9 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
 
+   # Set bindist USE flag if clst_BINDIST is set
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,6 +287,9 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
 
emerge ${clst_myemergeopts} $@ || exit 1
+
+   # Clean-up USE again
+   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:pending commit in: targets/support/

[Brian Dolbec]

commit: 9bdb0512140496d53f97f7ef4592921306056d6b
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:25:24 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:25:24 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9bdb0512

shuffle where bindist is being set

set USE=bindist in setup_pkgmgr and remove it in cleanup_stage

 targets/support/chroot-functions.sh | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 5e046cb..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
+   # Set bindist USE flag if clst_BINDIST is set
+   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could
# just let emerge @system could merge it.
@@ -228,6 +231,9 @@ cleanup_stages() {
;;
esac
 
+   # Remove bindist from use
+   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+
rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
@@ -268,9 +274,6 @@ run_merge() {
export EPAUSE_IGNORE=0
export CONFIG_PROTECT="-*"
 
-   # Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
if [ -n "${clst_VERBOSE}" ]
then
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +290,6 @@ run_merge() {
echo "emerge ${clst_myemergeopts} $@" || exit 1
 
emerge ${clst_myemergeopts} $@ || exit 1
-
-   # Clean-up USE again
-   sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

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

[Patrice Clement]

commit: 95e8eceb067dfafdf9f7b0cf62cfc8c6205e2453
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 13:50:57 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 13:50:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95e8eceb

profiles: Clean up old entries in package.mask.

Signed-off-by: Patrice Clement  gentoo.org>

 profiles/package.mask | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 149ce15..95df78d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -192,27 +192,12 @@ dev-perl/gtk2-fu
 # Bugs: 478174, 546192, 556200.
 sys-apps/systemd-ui
 
-# Patrice Clement  (3 Aug 2015)
-# Broken and no releases in 10 years (!).
-# Removal in 30 days. See bug #451790.
-www-servers/skunkweb
-
 # Sergei Trofimovich  (2 Aug 2015)
 # This package is a part of >=dev-lang/ghc-7.4. Gentoo
 # ebuilds use that. You can safely uninstall dev-haskell/deepseq
 # and fix leftovers with 'haskell-updater' run.
 dev-haskell/deepseq
 
-# Patrice Clement  (1 Aug 2015)
-# Package relying on j2me. Not useful anymore since j2me has long been removed.
-# Removal in 30 days. See bug #556460.
-dev-java/antenna
-
-# Patrice Clement  (30 Jul 2015)
-# Broken and upstream dead isn't always a good mix.
-# Removal in 30 days. See bug #368049.
-dev-java/jjtraveler
-
 # Pawel Hajdan, Jr.  (28 Jul 2015)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.

[gentoo-commits] repo/gentoo:master commit in: dev-java/jjtraveler/, dev-java/jjtraveler/files/

[Patrice Clement]

commit: 0bda332c8a1a7b3570e33d43e666344554febdaa
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 13:46:28 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 13:47:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bda332c

dev-java/antenna: Package removal wrt bug 368049.

Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/jjtraveler/Manifest  |  1 -
 dev-java/jjtraveler/files/0.4.3-makefile.am.patch | 20 
 dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild| 59 ---
 dev-java/jjtraveler/metadata.xml  | 10 
 4 files changed, 90 deletions(-)

diff --git a/dev-java/jjtraveler/Manifest b/dev-java/jjtraveler/Manifest
deleted file mode 100644
index 5e89abb..000
--- a/dev-java/jjtraveler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST JJTraveler-0.4.3.tar.gz 219594 SHA256 
e873a57e59661b557bd73181c398c88efa1898dbb277df791cebc6ba6c8a1ad0 SHA512 
fcaa2bbc736af95a0477f1d9a39d7d1410505c02214759baf3bed77b45d8bc9667cacbb7fdd954925038b6c67535bcf7af6c264347af18b150240d9796372c32
 WHIRLPOOL 
1ab5857492393843c7ba44024a165b8dd6a022c04a7a8e71ac3f02d98ac6e86b82c9b05efbfefd124a898a598eb80462606f3829d0a13027e6b6118ac902e94c

diff --git a/dev-java/jjtraveler/files/0.4.3-makefile.am.patch 
b/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
deleted file mode 100644
index a15e304..000
--- a/dev-java/jjtraveler/files/0.4.3-makefile.am.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru JJTraveler-0.4.3-vanilla/Makefile.am 
JJTraveler-0.4.3-patched/Makefile.am
 JJTraveler-0.4.3-vanilla/Makefile.am   2004-04-14 08:55:45.0 
-0400
-+++ JJTraveler-0.4.3-patched/Makefile.am   2007-02-26 09:12:28.0 
-0500
-@@ -26,5 +26,4 @@
- noinst_SCRIPTS = ${PACKAGE}-${VERSION}.pkg
- 
- ${PACKAGE}-${VERSION}.pkg: ${PACKAGE}.pkg Makefile
--  sed 's#__VERSION__#${VERSION}#g;\
-- s#__PACKAGE__#${PACKAGE}#g' < $< > $@
-+  sed 's#__VERSION__#${VERSION}#g;s#__PACKAGE__#${PACKAGE}#g' < $< > $@
-diff -ru JJTraveler-0.4.3-vanilla/scripts/Makefile.am 
JJTraveler-0.4.3-patched/scripts/Makefile.am
 JJTraveler-0.4.3-vanilla/scripts/Makefile.am   2004-02-02 
10:12:10.0 -0500
-+++ JJTraveler-0.4.3-patched/scripts/Makefile.am   2007-02-26 
09:11:03.0 -0500
-@@ -5,5 +5,4 @@
- EXTRA_DIST = jjtraveler-config.sh.src
- 
- % : %.sh.src Makefile
--  sed 's@__PREFIX__@${prefix}@g;\
-- s@__VERSION__@${VERSION}@g;' < $< > $@ && chmod +x $@
-+  sed 's@__PREFIX__@${prefix}@g;s@__VERSION__@${VERSION}@g;' < $< > $@ && 
chmod +x $@

diff --git a/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild 
b/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
deleted file mode 100644
index 665943d..000
--- a/dev-java/jjtraveler/jjtraveler-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source doc"
-
-inherit autotools java-pkg-2
-
-DESCRIPTION="A visitor combinator framework for Java"
-HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary;
-MY_P=JJTraveler-${PV}
-SRC_URI="http://www.cwi.nl/projects/MetaEnv/jjtraveler/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-S=${WORKDIR}/${MY_P}
-
-DEPEND="
-   >=virtual/jdk-1.4
-   =dev-java/junit-3.8*"
-RDEPEND=">=virtual/jre-1.4
-   =dev-java/junit-3.8*"
-
-src_unpack() {
-   unpack ${A}
-   cd "${S}"
-   epatch "${FILESDIR}/0.4.3-makefile.am.patch"
-   eautoreconf
-
-   (
-   echo "#!/bin/sh"
-   echo "java-config -p ${PN}"
-   ) > "${S}/jjtraveler-config"
-
-   rm -v jars/*.jar || die
-   cd jars
-   java-pkg_jar-from junit
-}
-
-src_compile() {
-   econf \
-   --with-javac-flags="$(java-pkg_javac-args)"
-   emake || die "emake failed"
-   if use doc; then
-   cd src/jjtraveler
-   make htmljava.stamp || die "Failed to create javadoc"
-   fi
-}
-
-src_install() {
-   java-pkg_newjar ./src/${P}.jar
-
-   dobin jjtraveler-config || die
-   dodoc AUTHORS ChangeLog NEWS README TODO || die
-
-   use source && java-pkg_dosrc src/jjtraveler
-   use doc && java-pkg_dojavadoc src/jjtraveler/doc
-}

diff --git a/dev-java/jjtraveler/metadata.xml b/dev-java/jjtraveler/metadata.xml
deleted file mode 100644
index 1fa958f..000
--- a/dev-java/jjtraveler/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
-java
-
-
-JJTraveler: a visitor combinator framework for Java.
-
-

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

[Patrice Clement]

commit: 2dc83148270e0470c0a9333d538800cd6f8bbcaf
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 13:52:51 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 13:52:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dc83148

www-servers/skunkweb: Package removal wrt bug 451790.

Signed-off-by: Patrice Clement  gentoo.org>

 www-servers/skunkweb/Manifest  |  1 -
 www-servers/skunkweb/files/100_mod_skunkweb.conf   | 50 --
 .../skunkweb/files/skunkweb-cron-cache_cleaner |  4 --
 www-servers/skunkweb/files/skunkweb-init   | 21 --
 www-servers/skunkweb/metadata.xml  | 14 
 www-servers/skunkweb/skunkweb-3.4.4.ebuild | 80 --
 6 files changed, 170 deletions(-)

diff --git a/www-servers/skunkweb/Manifest b/www-servers/skunkweb/Manifest
deleted file mode 100644
index 5b04d02..000
--- a/www-servers/skunkweb/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST skunkweb-3.4.4.tar.gz 1411045 SHA256 
a7f0bc47788cdb01882d53f433599fc1837013f45b7d13ea67d60a81f8c6f1e0

diff --git a/www-servers/skunkweb/files/100_mod_skunkweb.conf 
b/www-servers/skunkweb/files/100_mod_skunkweb.conf
deleted file mode 100644
index 032..000
--- a/www-servers/skunkweb/files/100_mod_skunkweb.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-   
-   LoadModule skunkweb_module modules/mod_skunkweb.so
-   
-
-   # This tells apache to call our module for EVERY request
-
-   SetHandler skunkweb-handler
-   
-
-   # Socket address of SkunkWeb.  Either a path to a unix domain socket or
-   # a host:port pair for a TCP socket
-   SkunkWebSocketAddress localhost:9888
-
-   # Number of times to retry accessing the SkunkWeb
-   SkunkWebRetries 3   
-
-   # The location of the error page which gets displayed when SkunkWeb is
-   # not accessible
-   SkunkWebErrorDoc /usr/share/skunkweb/share/skunk/modskunkweb_error.html
-
-   # The list of users to receive critical error emails. Should be a list
-   # of space separated entries
-   SkunkWebErrorEmails root@localhost
-
-   # List of uri prefixes for which should be handled in the normal way by
-   # apache and *not* by SkunkWeb.
-   #
-   # THIS OPTION IS NO LONGER SUPPORTED UNDER APACHE 2 AND MAY GO AWAY FOR
-   # APACHE 1.x AS YOU CAN DO THE SAME THING VIA  directives
-   #
-   # SkunkWebExclude /foo/ /bar/
-
-   # In the event that we cannot reach a server running on 
SkunkWebSocketAddress,
-   # randomly pick socketaddresses from the following list and try to 
connect to
-   # them instead until we run out of retries (set by SkunkWebRetries).  
-   #
-   # SkunkWebFailoverHosts unixsocketaddr otherhost2:port
-
-   # The number of milliseconds we should wait attempting to connect 
before 
-   # bailing out retrying, since otherwise, we'd wait the default amount 
for TCP
-   # which is 2 minutes -- BLEAH!  (default is 1 second = 1000 
milliseconds)
-   #
-   # SkunkWebConnectTimeout 1000
-
-   # Whether or not to include SkunkWeb/ in the Server header of 
Apache
-   # Default is On
-   # SkunkWebExpose On
-

diff --git a/www-servers/skunkweb/files/skunkweb-cron-cache_cleaner 
b/www-servers/skunkweb/files/skunkweb-cron-cache_cleaner
deleted file mode 100644
index 0ac9bdf..000
--- a/www-servers/skunkweb/files/skunkweb-cron-cache_cleaner
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/sh
-
-nice -n 5 /usr/share/skunkweb/util/cache_reaper.py -c /var/lib/skunkweb/cache 
> /dev/null 2>&1
-

diff --git a/www-servers/skunkweb/files/skunkweb-init 
b/www-servers/skunkweb/files/skunkweb-init
deleted file mode 100644
index c32cc0f..000
--- a/www-servers/skunkweb/files/skunkweb-init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-DAEMON_CMD=/usr/bin/swmgr
-opts="${opts} configtest"
-
-configtest() {
-   ${DAEMON_CMD} configtest
-}
-start() {
-   ebegin "Starting skunkweb"
-   ${DAEMON_CMD} start > /dev/null 2>&1
-   eend $?
-}
-stop() {
-   ebegin "Stopping skunkweb"
-   ${DAEMON_CMD} stop > /dev/null 2>&1
-   eend $?
-}

diff --git a/www-servers/skunkweb/metadata.xml 
b/www-servers/skunkweb/metadata.xml
deleted file mode 100644
index 52dd098..000
--- a/www-servers/skunkweb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   python
-   
-   SkunkWeb is a multi-process application server written in 
python,
-   extensively using 'pickle' for caching. Ships with its own web 
server,
-   or can be deployed with apache and mod-python. Includes 
server-side form
-   management libraries (docs in cvs).
-   
-   
- 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/

[Andrey Grozin]

commit: b5c632a81fc9457bd1af77f07c87961deb888bb2
Author: Andrey Grozin  gentoo  org>
AuthorDate: Thu Sep  3 14:22:01 2015 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Thu Sep  3 14:22:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c632a8

sci-mathematics/maxima: version bump

Package-Manager: portage-2.2.20.1

 sci-mathematics/maxima/Manifest|   1 +
 sci-mathematics/maxima/files/clisp-1.patch |  19 +++
 sci-mathematics/maxima/files/clozurecl-2.patch |  27 
 sci-mathematics/maxima/files/cmucl-1.patch |  19 +++
 sci-mathematics/maxima/files/ecls-2.patch  |  35 +
 sci-mathematics/maxima/files/sbcl-1.patch  |  18 +++
 sci-mathematics/maxima/maxima-5.37.1.ebuild| 190 +
 7 files changed, 309 insertions(+)

diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 221c53c..edee4ea 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -1,2 +1,3 @@
 DIST maxima-5.34.1.tar.gz 29469851 SHA256 
20ca416ca912c8d3d99299f2ef45342a1beb2f077cf501c6a647de46bfdb89b7 SHA512 
24a9ce0d2bfb0fa107460bbeec561869f9d3f2ce2623e39ab16b810dbf2712981bbf98ceee9c30f4e70fdec7f918a7743b5fb8cf26b67313e1d367dd8f2a1823
 WHIRLPOOL 
0f59cfe14391686a543027bb5cab8669439d0e36b016924872662f61e36cf05663480f8a3f942d7deccbe39ec7f45ed77deeb8a3c84241189ac0f1993537c47a
 DIST maxima-5.36.1.tar.gz 29615673 SHA256 
400bf83000b84d280d75e200e078582fe44f23220824562cc06c589d8a993974 SHA512 
10e090230ab408777a1145ad90daef6bf237ba38ae31a654ba4d464e7a27e1f48baac5202ce8fb39e4c04ec9a6c9916ac83a58bd071b676ea5a989ea7db87d4c
 WHIRLPOOL 
ee7738085ae9e5b156b89afbf724b3ae5ef70b74550bee43cf3ab763f569d5ac51ea9c0e5aad67070f4b71f480b079aad8e4fd44ded34525a1f84cbeeb2d28b0
+DIST maxima-5.37.1.tar.gz 29952404 SHA256 
511477cbdf4645a6abd49596d59ed449ec8e012f90b59b1ddffc783c697bf744 SHA512 
523f2768e18e7e368dee63f5f6350afc87c3f5a51ef317b1bf3d9c662c1326a40a5035c09c44ed2e1388d31b5450802b802088e95dc7a3e10343bc55daefd878
 WHIRLPOOL 
0d7fad832a145d38fc0106540ba17d270da64495b2c739c215c07fcefeba2ecb769e609a2e7c1dd516e58b8e128776f5365bf10273c5031f5750b5c250d78bc2

diff --git a/sci-mathematics/maxima/files/clisp-1.patch 
b/sci-mathematics/maxima/files/clisp-1.patch
new file mode 100644
index 000..9dc8dfd
--- /dev/null
+++ b/sci-mathematics/maxima/files/clisp-1.patch
@@ -0,0 +1,19 @@
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.0 +0600
 maxima-5.37.1/src/maxima.in2015-09-03 16:08:22.467930422 +0600
+@@ -135,5 +135,5 @@
+   if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" 
$MAXIMA_LISP_OPTIONS -q "" -- "$@"
++exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" 
$MAXIMA_LISP_OPTIONS -q -norc "" -- "$@"
+   else
+-  exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" 
$MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" "" -- "$@"
++  exec "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/@CLISP_RUNTIME@" 
$MAXIMA_LISP_OPTIONS -q -norc -M "$maxima_image_base.mem" "" -- "$@"
+   fi
+@@ -141,5 +141,5 @@
+   if [ -x "$maxima_image_base" ]; then
+-exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -q  "" -- "$@"
++exec "$maxima_image_base"  $MAXIMA_LISP_OPTIONS -q -norc  "" -- "$@"
+   else
+-  exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -M "$maxima_image_base.mem" 
"" -- "$@"
++  exec "@CLISP_NAME@" $MAXIMA_LISP_OPTIONS -q -norc -M 
"$maxima_image_base.mem" "" -- "$@"
+   fi

diff --git a/sci-mathematics/maxima/files/clozurecl-2.patch 
b/sci-mathematics/maxima/files/clozurecl-2.patch
new file mode 100644
index 000..5c5189c
--- /dev/null
+++ b/sci-mathematics/maxima/files/clozurecl-2.patch
@@ -0,0 +1,27 @@
+diff -r -U1 maxima-5.37.1.orig/configure.ac maxima-5.37.1/configure.ac
+--- maxima-5.37.1.orig/configure.ac2015-09-01 02:28:02.0 +0600
 maxima-5.37.1/configure.ac 2015-09-03 18:11:54.335618720 +0600
+@@ -386,3 +386,3 @@
+ dnl n.b. openmcl_default_name is hardcoded in "with" message
+-openmcl_default_name=openmcl
++openmcl_default_name=ccl
+ AC_ARG_ENABLE(openmcl,
+diff -r -U1 maxima-5.37.1.orig/src/Makefile.am maxima-5.37.1/src/Makefile.am
+--- maxima-5.37.1.orig/src/Makefile.am 2015-08-11 02:44:21.0 +0600
 maxima-5.37.1/src/Makefile.am  2015-09-03 17:26:12.849734012 +0600
+@@ -338,3 +338,3 @@
+ 
+-EXECUTEOPENMCL = $(OPENMCL_NAME) -e
++EXECUTEOPENMCL = $(OPENMCL_NAME) --no-init -e
+ BUILT_FILES += $(OPENMCL_MAXIMA)
+diff -r -U1 maxima-5.37.1.orig/src/maxima.in maxima-5.37.1/src/maxima.in
+--- maxima-5.37.1.orig/src/maxima.in   2015-05-22 04:40:03.0 +0600
 maxima-5.37.1/src/maxima.in2015-09-03 17:22:31.841743306 +0600
+@@ -182,5 +182,5 @@
+ if [ -x "$MAXIMA_IMAGESDIR/binary-$MAXIMA_LISP/maxima" ]; then
+-  exec 

[gentoo-commits] proj/catalyst:pending commit in: targets/support/

[Brian Dolbec]

commit: 44919839b30fff5176e5c261340baf6af173c033
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:47:28 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:47:28 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44919839

scratch that, tinderbox does not run cleanup

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2986ae7..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-   [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log 
/var/log/portage/elog/*
+   rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
 update_env_settings(){

[gentoo-commits] proj/catalyst:pending commit in: catalyst/

[Brian Dolbec]

commit: 6428baba7e9f7aa6fc4ede457804adbe793c3ac4
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun May 24 07:38:32 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 15:09:02 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6428baba

catalyst/main.py: Comment out the try: except: pair for target.run()

 catalyst/main.py | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/catalyst/main.py b/catalyst/main.py
index 0ba81b9..7e3b55e 100644
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -163,12 +163,12 @@ def build_target(addlargs):
"Target \"%s\" not available." % target,
print_traceback=True)
 
-   try:
-   target.run()
-   except:
-   print "!!! catalyst: Error encountered during run of target " + 
\
-   addlargs["target"]
-   sys.exit(1)
+   #try:
+   target.run()
+   #except:
+   #print "!!! catalyst: Error encountered during run of target " 
+ \
+   #   addlargs["target"]
+   #sys.exit(1)
 
 def main():
 

[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/

[Brian Dolbec]

commit: 827a9cd7ea1863242920651752a8265acc8d57ad
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Wed Sep  2 21:52:48 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Wed Sep  2 21:52:48 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=827a9cd7

support setting/overriding fcflags and fflags, specifically for use with 
CFLAGS=-frecord-gcc-switches

 catalyst/base/stagebase.py | 26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 23491aa..d898e95 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -38,7 +38,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
self.valid_values.extend(["version_stamp","target","subarch",\

"rel_type","profile","snapshot","source_subpath","portage_confdir",\
-   
"cflags","cxxflags","ldflags","cbuild","hostuse","portage_overlay",\
+   
"cflags","cxxflags","fcflags","fflags","ldflags","cbuild","hostuse","portage_overlay",\

"distcc_hosts","makeopts","pkgcache_path","kerncache_path"])
 
self.set_valid_build_kernel_vars(addlargs)
@@ -280,6 +280,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
if "CXXFLAGS" in self.makeconf:
self.settings["CXXFLAGS"]=self.makeconf["CXXFLAGS"]
 
+   def override_fcflags(self):
+   if "FCFLAGS" in self.makeconf:
+   self.settings["FCFLAGS"]=self.makeconf["FCFLAGS"]
+
+   def override_fflags(self):
+   if "FFLAGS" in self.makeconf:
+   self.settings["FFLAGS"]=self.makeconf["FFLAGS"]
+
def override_ldflags(self):
if "LDFLAGS" in self.makeconf:
self.settings["LDFLAGS"]=self.makeconf["LDFLAGS"]
@@ -1020,6 +1028,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.override_chost()
self.override_cflags()
self.override_cxxflags()
+   self.override_fcflags()
+   self.override_fflags()
self.override_ldflags()
if "autoresume" in self.settings["options"] \
and self.resume.is_enabled("chroot_setup"):
@@ -1077,6 +1087,20 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write('CXXFLAGS="${CFLAGS}"\n')
else:
myf.write('CXXFLAGS="${CFLAGS}"\n')
+   if "FCFLAGS" in self.settings:
+   if 
self.settings["FCFLAGS"]!=self.settings["CFLAGS"]:
+   
myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n')
+   else:
+   myf.write('FCFLAGS="${CFLAGS}"\n')
+   else:
+   myf.write('FCFLAGS="${CFLAGS}"\n')
+   if "FFLAGS" in self.settings:
+   if 
self.settings["FFLAGS"]!=self.settings["CFLAGS"]:
+   
myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n')
+   else:
+   myf.write('FFLAGS="${CFLAGS}"\n')
+   else:
+   myf.write('FFLAGS="${CFLAGS}"\n')
 
if "LDFLAGS" in self.settings:
myf.write("# LDFLAGS is unsupported.  USE AT 
YOUR OWN RISK!\n")

[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/, catalyst/targets/, etc/, examples/, catalyst/

[Brian Dolbec]

commit: e1beae5aee64b474b73a68c790b612c732c0b835
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun May 24 07:36:49 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 15:09:02 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e1beae5a

apply new compress code, normalize paths

 catalyst/base/stagebase.py   | 171 +++
 catalyst/defaults.py |   4 +
 catalyst/main.py |   8 ++
 catalyst/targets/grp.py  |   2 +-
 catalyst/targets/livecd_stage1.py|   2 +-
 catalyst/targets/livecd_stage2.py|   6 +-
 catalyst/targets/netboot.py  |   8 +-
 catalyst/targets/netboot2.py |   2 +-
 catalyst/targets/stage2.py   |   8 +-
 etc/catalyst.conf|  11 ++-
 examples/generic_stage_template.spec |  32 ++-
 11 files changed, 159 insertions(+), 95 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index d898e95..aba330e 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -10,6 +10,8 @@ from stat import ST_UID, ST_GID, ST_MODE
 # for convienience
 pjoin = os.path.join
 
+from decomp.compress import CompressMap
+
 from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS,
PORT_LOGDIR_CLEAN)
 from catalyst.support import (CatalystError, msg, file_locate, normpath,
@@ -264,6 +266,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.env["PORT_LOGDIR"] = self.settings["port_logdir"]
self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN
 
+   # Initialize our (de)compressor's)
+   self.decompressor = 
CompressMap(self.settings["decompress_definitions"],
+   env=self.env,
+   search_order=self.settings["decompressor_search_order"])
+
+   # save resources, it is not always needed
+   self.compressor = None
+
def override_cbuild(self):
if "CBUILD" in self.makeconf:
self.settings["CBUILD"]=self.makeconf["CBUILD"]
@@ -332,11 +342,11 @@ class StageBase(TargetBase, ClearBase, GenBase):

normpath(self.settings["kerncache_path"])
else:

self.settings["kerncache_path"]=normpath(self.settings["storedir"]+\
-   
"/kerncache/"+self.settings["target_subpath"]+"/")
+   "/kerncache/"+self.settings["target_subpath"])
 
def set_target_path(self):

self.settings["target_path"]=normpath(self.settings["storedir"]+\
-   
"/builds/"+self.settings["target_subpath"].rstrip('/')+".tar.bz2")
+   "/builds/"+self.settings["target_subpath"])
if "autoresume" in self.settings["options"]\
and self.resume.is_enabled("setup_target_path"):
print \
@@ -420,7 +430,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
"/tmp/" + self.settings["source_subpath"] + "/")
else:

self.settings["source_path"]=normpath(self.settings["storedir"]+\
-   
"/builds/"+self.settings["source_subpath"].rstrip('/')+".tar.bz2")
+   "/builds/"+self.settings["source_subpath"])
if os.path.isfile(self.settings["source_path"]):
# XXX: Is this even necessary if the previous 
check passes?
if os.path.exists(self.settings["source_path"]):
@@ -435,7 +445,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
print "\tseedcache in the options of catalyst.conf the 
source path"
print "\twill then be "+\
normpath(self.settings["storedir"]+"/builds/"+\
-   
self.settings["source_subpath"].rstrip('/')+".tar.bz2\n")
+   self.settings["source_subpath"]+"\n")
 
def set_dest_path(self):
if "root_path" in self.settings:
@@ -462,7 +472,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
else:

self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
"/snapshots/" + self.settings["snapshot_name"] +
-   
self.settings["snapshot"].rstrip('/')+".tar.bz2")
+   self.settings["snapshot"])
 
if os.path.exists(self.settings["snapshot_path"]):
self.settings["snapshot_path_hash"] = \
@@ -472,6 +482,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
verbose = False)
 
def 

[gentoo-commits] proj/catalyst:pending commit in: targets/embedded/

[Brian Dolbec]

commit: 182ea27a454746f256b04991aeb6f710b8c90a91
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:53:08 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:53:08 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=182ea27a

run setup_pkgmgr to setup portage and use flags properly for embedded target

 targets/embedded/embedded-chroot.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/embedded/embedded-chroot.sh 
b/targets/embedded/embedded-chroot.sh
index 2fbba27..56d40a4 100755
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -6,6 +6,8 @@ source /tmp/chroot-functions.sh
 export DESTROOT="${clst_root_path}"
 export clst_root_path="/"
 
+setup_pkgmgr
+
 echo "Installing dependencies into ${DESTROOT}..."
 run_merge -o "${clst_embedded_packages}"
 

[gentoo-commits] proj/catalyst:pending commit in: targets/tinderbox/, targets/support/

[Brian Dolbec]

commit: 4aad35c671e5d70207e3c7ac879abf70770114b6
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:55:33 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:55:33 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4aad35c6

make tinderbox use cleanup stage, modify cleanup stage to not wipe logs for 
tinderbox target

 targets/support/chroot-functions.sh|  2 +-
 targets/tinderbox/tinderbox-preclean-chroot.sh | 10 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-   rm -f /var/log/emerge.log /var/log/portage/elog/*
+   [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log 
/var/log/portage/elog/*
 }
 
 update_env_settings(){

diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh 
b/targets/tinderbox/tinderbox-preclean-chroot.sh
index 240e2cb..5353f67 100755
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.sh
@@ -2,12 +2,4 @@
 
 source /tmp/chroot-functions.sh
 
-if [ -n "${clst_DISTCC}" ]
-then
-   cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
-   cleanup_icecream
-fi
+cleanup_stages

[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/

[Brian Dolbec]

commit: fc30e2ab67dd74c6f52a042587a32d528fa576cf
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jun 15 16:31:33 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 15:09:02 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fc30e2ab

catalyst/base/stagebase.py: Fix "Creating stage tarball..." print()

 catalyst/base/stagebase.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index aba330e..7231303 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1307,7 +1307,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = 
".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
 
-   print "Creating stage tarball..."
+   print("Creating stage tarball... mode:",
+   self.settings["compression_mode"])
 
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit: b97e75598be0ab265fa206d57e4ea918d78cbd38
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun May 24 16:07:36 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 15:01:46 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b97e7559

testpath: Add pyDeComp path

 testpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname 
${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: targets/support/, targets/stage4/

[Brian Dolbec]

commit: e8ee4a518a2dc48d845e2f6bd09e0ce2cc62996e
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 01:46:06 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 01:46:06 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8ee4a51

use the cleanup_stage function instead of manual cleanup for stage4, do not 
wipe log directories for tinderbox

 targets/stage4/stage4-preclean-chroot.sh | 10 +-
 targets/support/chroot-functions.sh  |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/targets/stage4/stage4-preclean-chroot.sh 
b/targets/stage4/stage4-preclean-chroot.sh
index 8f2e894..a22b6c1 100755
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -7,12 +7,4 @@ source /tmp/chroot-functions.sh
 update_env_settings
 show_debug
 
-if [ -n "${clst_DISTCC}" ]
-then
-   cleanup_distcc
-fi
-
-if [ -n "${clst_ICECREAM}" ]
-then
-   cleanup_icecream
-fi
+cleanup_stages

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index b8ab8d2..2986ae7 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
# Remove bindist from use
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-   rm -f /var/log/emerge.log /var/log/portage/elog/*
+   [ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log 
/var/log/portage/elog/*
 }
 
 update_env_settings(){

[gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/, catalyst/base/

[Brian Dolbec]

commit: 07d13a24c6b28369c63c9cfcc955df6547300243
Author: Brian Dolbec  gentoo  org>
AuthorDate: Mon Jun 15 23:10:50 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 15:12:39 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=07d13a24

Fix a couple print() uses back to print statements for consistency

 catalyst/base/stagebase.py   | 4 ++--
 catalyst/targets/snapshot.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index e0e9023..f774ce8 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1308,8 +1308,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
target_filename = 
".".join([self.settings["target_path"],
self.compressor.extension(pack_info['mode'])])
 
-   print("Creating stage tarball... mode:",
-   self.settings["compression_mode"])
+   print "Creating stage tarball... mode:", \
+   self.settings["compression_mode"]
 
if self.compressor.compress(pack_info):
self.gen_contents_file(target_filename)

diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index ad96d37..1edcd02 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -72,11 +72,11 @@ class snapshot(TargetBase, GenBase):
auto_extension=True
)
if not compressor.compress(infodict):
-   print("Snapshot compression failure")
+   print "Snapshot compression failure"
else:
filename = '.'.join([self.settings["snapshot_path"],

compressor.extension(self.settings["compression_mode"])])
-   print("COMPRESSOR success filename", filename)
+   print "COMPRESSOR success filename", filename
self.gen_contents_file(filename)
self.gen_digest_file(filename)
 

[gentoo-commits] proj/catalyst:pending commit in: catalyst/base/

[Brian Dolbec]

commit: 99fc43024db4be08fbfbff3a6a79c90db920e927
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Tue Sep  1 19:40:15 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue Sep  1 19:40:15 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=99fc4302

drop --selinux switch from tar

tar --selinux isn't support unless you are on selinux, and in that case
things are still not likely to be right do to the dark magic that is selinux.
>From the head of the selinux team:
<@SwifT> Zero_Chaos: let's not use tar --selinux right now until we have 
updated catalyst to create selinux-enabled chroots

 catalyst/base/stagebase.py | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 6adc3b9..25e5b6c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) 
...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
-   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux 
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
-   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux 
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of "+\
self.settings["source_path"]+" to "+\
@@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["chroot_path"]+\
" (This may take some time) ...\n"
if "bz2" == self.settings["chroot_path"][-3:]:
-   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux 
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
-   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux 
-I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 
-xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
error_msg="Tarball extraction of 
"+self.settings["source_path"]+\
" to "+self.settings["chroot_path"]+" failed."
@@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
"catalyst-hash")
destdir=self.settings["snapshot_cache_path"]
if "bz2" == self.settings["chroot_path"][-3:]:
-   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux 
-I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags -I lbzip2 
-xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
-   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux 
-xpf "+self.settings["snapshot_path"]+" -C "+destdir
+   unpack_cmd="tar --xattrs 
--xattrs-include=security.capability --xattrs-include=user.pax.flags -xpf 
"+self.settings["snapshot_path"]+" -C "+destdir
unpack_errmsg="Error unpacking snapshot"
cleanup_msg="Cleaning up invalid snapshot cache at 
\n\t"+\
self.settings["snapshot_cache_path"]+\
@@ -825,10 

[gentoo-commits] proj/catalyst:master commit in: targets/support/, targets/stage1/

[Richard Farina]

commit: 6d795daf6d86779b17206f8a558bfcac44822a6b
Author: Rick Farina (Zero_Chaos)  gentoo  org>
AuthorDate: Thu Sep  3 16:49:55 2015 +
Commit: Richard Farina  gentoo  org>
CommitDate: Thu Sep  3 16:49:55 2015 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6d795daf

handle clst_BINDIST properly in stage1

revert 306d797509244bf3508def0aa6c1bbcdfb6e1257 and avoid double setting
bindist during stage1 (cleanliness)

 targets/stage1/stage1-chroot.sh | 3 ++-
 targets/support/chroot-functions.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 91ab1fa..f77bd9f 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,8 @@ source /tmp/chroot-functions.sh
 export clst_buildpkgs="$(/tmp/build.py)"
 
 # Setup our environment
-BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}"
 
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 2986ae7..91a2b5f 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -167,7 +167,8 @@ setup_gcc(){
 
 setup_pkgmgr(){
# Set bindist USE flag if clst_BINDIST is set
-   [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo 
"USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+   [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \
+   && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" 
>> "${clst_make_conf}"
 
# We need to merge our package manager with USE="build" set in case it 
is
# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, 
we could

[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/

[Miroslav Šulc]

commit: f121bc37665c8ee7428ee826e9ed01c997c4cdb6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep  3 16:45:39 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep  3 16:46:07 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f121bc37

dev-java/tomcat-servlet-api: version bump

Package-Manager: portage-2.2.20.1

 dev-java/tomcat-servlet-api/Manifest   |  1 +
 .../tomcat-servlet-api-7.0.64.ebuild   | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/dev-java/tomcat-servlet-api/Manifest 
b/dev-java/tomcat-servlet-api/Manifest
index 89f0146..7f88c33 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,6 +4,7 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 
a52e7f2abf0fbdd9665ca398d2b3
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
 WHIRLPOOL 
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
 WHIRLPOOL 
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 
443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 
677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a
 WHIRLPOOL 
a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
+DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
 WHIRLPOOL 
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
 WHIRLPOOL 
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
 DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild 
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
new file mode 100644
index 000..eee41e5
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.64.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/;
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd 
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+   cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace 
build.xml"
+   rm -fR */*/build.xml ||die
+   find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + 
|| die
+}
+
+src_install() {
+   java-pkg_dojar "${S}"/output/build/lib/*.jar
+   use source && java-pkg_dosrc java/javax/servlet/
+}

[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-opengl/

[Chí-Thanh Christopher Nguyễn]

commit: ed562955446863c388b148db4099a53b54b6c20e
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Thu Sep  3 16:55:43 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Thu Sep  3 16:57:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed562955

app-eselect/eselect-opengl: make list of blockers more explicit

Package-Manager: portage-2.2.20.1

 app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild| 2 ++
 app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild | 6 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild 
b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
index be23fff..d223eac 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
@@ -33,6 +33,8 @@ RDEPEND=">=app-admin/eselect-1.2.4
 !=media-libs/mesa-10.3.5-r1
 !>=media-libs/mesa-10.3.7-r2
 !>=x11-proto/glproto-1.4.17-r1
+!=x11-base/xorg-server-1.12.4-r6
+!=x11-base/xorg-server-1.15.2-r3
 !=x11-base/xorg-server-1.16.4-r1
 !>=x11-base/xorg-server-1.16.4-r4"
 

diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild 
b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
index 2185e0e..5548068 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -30,7 +30,11 @@ RDEPEND=">=app-admin/eselect-1.2.4
 !=media-libs/mesa-10.3.5
 !=media-libs/mesa-10.3.7-r1
 !

[gentoo-commits] repo/gentoo:master commit in: games-rpg/freedink/

[Michael Sterrett]

commit: cd2871a0297f5a647741030912f03a7496b12b94
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Sep  3 18:04:25 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Sep  3 18:04:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd2871a0

seems like the code is fragile (bug #559548) so drop down to very conservative 
CFLAGS

Package-Manager: portage-2.2.20.1

 games-rpg/freedink/freedink-108.4.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-rpg/freedink/freedink-108.4.ebuild 
b/games-rpg/freedink/freedink-108.4.ebuild
index 8d47573..dafba42 100644
--- a/games-rpg/freedink/freedink-108.4.ebuild
+++ b/games-rpg/freedink/freedink-108.4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit games
+inherit flag-o-matic games
 
 DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to 
Zelda (2D top view)"
 HOMEPAGE="http://www.freedink.org/;
@@ -32,6 +32,9 @@ src_prepare() {
sed -i \
-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
share/Makefile.in || die
+   # seems like the code is fragile (bug #559548)
+   filter-flags
+   replace-flags -O? -O0
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/wxmaxima/

[Andrey Grozin]

commit: 9fe51b3e036df4f145ce86dbf7348c404ff4d304
Author: Andrey Grozin  gentoo  org>
AuthorDate: Thu Sep  3 18:09:51 2015 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Thu Sep  3 18:09:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe51b3e

sci-mathematics/wxmaxima: version bump

Package-Manager: portage-2.2.20.1

 sci-mathematics/wxmaxima/Manifest|  2 +
 sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild | 77 
 2 files changed, 79 insertions(+)

diff --git a/sci-mathematics/wxmaxima/Manifest 
b/sci-mathematics/wxmaxima/Manifest
index c48162b..5b02cb4 100644
--- a/sci-mathematics/wxmaxima/Manifest
+++ b/sci-mathematics/wxmaxima/Manifest
@@ -2,3 +2,5 @@ DIST wxMaxima-13.04.2.tar.gz 1652680 SHA256 
29352db75dd3ff27393ab0971543fd0b3c3a
 DIST wxmaxima-15.04.0.tar.gz 4990313 SHA256 
c178067a2f75d91dd378f88b4d0f87af6b2705ca32bea509d63e7347b2a1d21e SHA512 
1a899259698da38f97a1859ba0526406cbc654a130dc1d18e01cf248ac4d7292c82cb00dd92ce2fac2c3cfc002788fdef0a6a4f95eca54b9096efc73c6aa45b7
 WHIRLPOOL 
225456c073b1aa87d2e599b9c63244ff7c97378fb6b5a60fcb8730655d193a0f032b27a1264e12eefb4abf08389f2337a11c380b6d89af2de9a4fb6e14f614dc
 DIST wxmaxima-15.08.0-missing.tar.bz2 16172 SHA256 
d39d1a7937db05a4ae3e6a6d38a4079e93fb95b5533db7254de7dec7d24527db SHA512 
195de1bcc4b469094716e0e417cf6431abe9f67e467c71fe51c4bed9990c613d5487cbcdda18d1df7f50e5e1b0abec7578e1091cc4999d95ba6a5f8849d826e2
 WHIRLPOOL 
34964f7ba5a1c9e5f2ab05b857c31b441eee43a127dc123337174509c71b7f80313e111b967abba47579021c52f27c71812c85efdf7a8429ad4e1e6c51f62db8
 DIST wxmaxima-15.08.0.tar.gz 560 SHA256 
e6905b8e306b575e8e38b02a0e81de38be6d154d1349a455e01fbec28b21b27c SHA512 
b13df571978c354ef420c613717149e3235bd5343746c12f2193eb0599f417b04cdb01e87e97ef2ed72bfd090b6ec6871c834fdb74074a3d5fb0f68bbe942263
 WHIRLPOOL 
a2a1ae200eebb6d54a3c96cbd1c304b37c4a759ccc15983b3910d3aad1864d6c80d39e7e688198d4f3dd7c36bb9a8b2795a9610475858207b90482887219906a
+DIST wxmaxima-15.08.1-missing.tar.bz2 14699 SHA256 
62a84bf32e61d39f66787a7fb2cdbf67f322ddee2d7734c23650739476e97b17 SHA512 
de64163643652a288fd6f65076df94074a28895a13ae8766a1913e12833d3dbb1ae4bbdbcd6a69221e5bde7000b93e3a86a223b1320d25581d32c61ea6ab3b98
 WHIRLPOOL 
e96dac6ffd227597721a7e8fa200d99422e722ec5d3c1733c29904fdf1f6e2bae2ba1a2c8e98e217e7a089c5857c1ccf5d10950bd98cdbde0dfb19039a60262d
+DIST wxmaxima-15.08.1.tar.gz 5577228 SHA256 
82ad5314a88e53ff41dc431afb44ef1a47738686786e8cc8b4c48e0c147f4ffd SHA512 
4ab7a8e992904e18e571b716d35f0d5286363b287853e3ebacc64e63df901fe192abdef16db8dc8defabb26a25f8f8956a7bad466862ee0d19d8846d4e3fec94
 WHIRLPOOL 
492c6ccf79640c9bfdb8d7aad283f5e0941bba8b38d037285712603112026e0feaf8873025657486df44ff718e559d9e690076e78f86e560f5d6b73ecd096ad9

diff --git a/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild 
b/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
new file mode 100644
index 000..cdbdbcd
--- /dev/null
+++ b/sci-mathematics/wxmaxima/wxmaxima-15.08.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils gnome2-utils wxwidgets fdo-mime
+
+DESCRIPTION="Graphical frontend to Maxima, using the wxWidgets toolkit"
+HOMEPAGE="http://andrejv.github.io/wxmaxima/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+   https://dev.gentoo.org/~grozin/${P}-missing.tar.bz2;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="
+   dev-libs/libxml2:2
+   x11-libs/wxGTK:${WX_GTK_VER}"
+RDEPEND="${DEPEND}
+   media-fonts/jsmath
+   sci-visualization/gnuplot[wxwidgets]
+   sci-mathematics/maxima"
+
+src_prepare() {
+   local i
+
+   # consistent package names
+   sed -e "s:\${datadir}/wxMaxima:\${datadir}/${PN}:g" \
+   -i Makefile.in data/Makefile.in test/Makefile.in || die "sed 
failed"
+
+   sed -e 's:share/wxMaxima:share/wxmaxima:g' \
+   -i src/wxMaxima.cpp src/wxMaximaFrame.cpp src/Dirstructure.cpp 
src/Dirstructure.h \
+   || die "sed failed"
+
+   # correct gettext behavior
+   if [[ -n "${LINGUAS+x}" ]] ; then
+   for i in $(cd "${S}"/locales ; echo *.mo) ; do
+   if ! has ${i%.mo} ${LINGUAS} ; then
+   sed -i \
+   -e "/^WXMAXIMA_LINGUAS/s# ${i%.mo}##" \
+   -e "/^WXWIN_LINGUAS/s# ${i%.mo}##" \
+   locales/Makefile.in || die
+   fi
+   done
+   fi
+}
+
+src_configure() {
+   econf \
+   --enable-printing \
+   --with-wx-config=${WX_CONFIG}
+}
+
+src_install () {
+   default
+   doicon -s 128 data/wxmaxima.png
+   make_desktop_entry wxmaxima wxMaxima wxmaxima
+   dosym /usr/share/${PN}/README /usr/share/doc/${PF}/README
+}
+

[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Mike Frysinger]

commit: 19b17fa0ecd633e2e0d759bc03a74c88c261b44b
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Sep  3 18:00:09 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Sep  3 18:00:09 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=19b17fa0

Scheduler: clean up PORTAGE_TMPDIR warning message

The current textwrap logic produces bad output when expanding the user's
PORTAGE_TMPDIR variable.  It's customary to not wrap literal values like
this, especially when it's a user setting, so drop the use of textwrap.

Before:
 * The directory specified in your PORTAGE_TMPDIR variable, '/var/tmp/som
 * e/really/long/path/that/looks/bad/when/you/break/it/up/but/do/it/anywa
 * ys', does not exist. Please create this directory or correct your
 * PORTAGE_TMPDIR setting.

After:
 * The directory specified in your PORTAGE_TMPDIR variable does not exist:
 * 
/var/tmp/some/really/long/path/that/looks/bad/when/you/break/it/up/but/do/it/anyways
 * Please create this directory or correct your PORTAGE_TMPDIR setting.

 pym/_emerge/Scheduler.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 13abc92..8eeef06 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -963,11 +963,11 @@ class Scheduler(PollScheduler):
# for ensuring sane $PWD (bug #239560) and storing elog 
messages.
tmpdir = root_config.settings.get("PORTAGE_TMPDIR", "")
if not tmpdir or not os.path.isdir(tmpdir):
-   msg = "The directory specified in your " + \
-   "PORTAGE_TMPDIR variable, '%s', " % 
tmpdir + \
-   "does not exist. Please create this " + \
-   "directory or correct your PORTAGE_TMPDIR 
setting."
-   msg = textwrap.wrap(msg, 70)
+   msg = (
+   'The directory specified in your 
PORTAGE_TMPDIR variable does not exist:',
+   tmpdir,
+   'Please create this directory or 
correct your PORTAGE_TMPDIR setting.',
+   )
out = portage.output.EOutput()
for l in msg:
out.eerror(l)

[gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/

[Michael Sterrett]

commit: 7442516a9e82c154de48ff3812fa58d5f632217e
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Sep  3 18:25:21 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Sep  3 18:25:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7442516a

fix building with gcc52 with patch from Sven Eden via bug #559472

Package-Manager: portage-2.2.20.1

 dev-games/ogre/files/ogre-1.9.0-gcc52.patch| 63 ++
 .../ogre-1.9.0-remove_media_path_to_bindir.patch   |  4 +-
 ...ogre-1.9.0-remove_resource_path_to_bindir.patch |  4 +-
 dev-games/ogre/ogre-1.9.0-r1.ebuild|  6 ++-
 4 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/dev-games/ogre/files/ogre-1.9.0-gcc52.patch 
b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
new file mode 100644
index 000..030368d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.9.0-gcc52.patch
@@ -0,0 +1,63 @@
+--- a/OgreMain/include/OgreProgressiveMeshGenerator.h
 b/OgreMain/include/OgreProgressiveMeshGenerator.h
+@@ -215,7 +215,40 @@
+   void tuneContainerSize();
+   void addVertexData(VertexData* vertexData, bool useSharedVertexLookup);
+   template
+-  void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, 
VertexLookupList& lookup, unsigned short submeshID);
++  void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, 
VertexLookupList& lookup, unsigned short submeshID)
++  {
++
++  // Loop through all triangles and connect them to the vertices.
++  for (; iPos < iEnd; iPos += 3) {
++  // It should never reallocate or every pointer will be 
invalid.
++  OgreAssert(mTriangleList.capacity() > 
mTriangleList.size(), "");
++  mTriangleList.push_back(PMTriangle());
++  PMTriangle* tri = ();
++  tri->isRemoved = false;
++  tri->submeshID = submeshID;
++  for (int i = 0; i < 3; i++) {
++  // Invalid index: Index is bigger then vertex 
buffer size.
++  OgreAssert(iPos[i] < lookup.size(), "");
++  tri->vertexID[i] = iPos[i];
++  tri->vertex[i] = lookup[iPos[i]];
++  }
++  if (tri->isMalformed()) {
++#if OGRE_DEBUG_MODE
++  stringstream str;
++  str << "In " << mMeshName << " malformed 
triangle found with ID: " << getTriangleID(tri) << ". " <<
++  std::endl;
++  printTriangle(tri, str);
++  str << "It will be excluded from LOD level 
calculations.";
++  LogManager::getSingleton().stream() << 
str.str();
++#endif
++  tri->isRemoved = true;
++  mIndexBufferInfoList[tri->submeshID].indexCount 
-= 3;
++  continue;
++  }
++  tri->computeNormal();
++  addTriangleToEdges(tri);
++  }
++  }
+   void addIndexData(IndexData* indexData, bool useSharedVertexLookup, 
unsigned short submeshID);
+ 
+   void computeCosts();
+--- a/OgreMain/src/OgreProgressiveMeshGenerator.cpp
 b/OgreMain/src/OgreProgressiveMeshGenerator.cpp
+@@ -219,6 +219,8 @@
+   }
+   vbuf->unlock();
+ }
++/// Called from OgreQueuedProgressiveMeshGenerator.cpp, so it can not be 
defined in here.
++#if 0
+ template
+ void ProgressiveMeshGenerator::addIndexDataImpl(IndexType* iPos, const 
IndexType* iEnd,
+ VertexLookupList& lookup,
+@@ -256,6 +258,7 @@
+   addTriangleToEdges(tri);
+   }
+ }
++#endif // 0
+ 
+ void ProgressiveMeshGenerator::addIndexData(IndexData* indexData, bool 
useSharedVertexLookup, unsigned short submeshID)
+ {

diff --git a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch 
b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
index 9af7685..bb2ca55 100644
--- a/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_media_path_to_bindir.patch
@@ -1,5 +1,5 @@
 a/CMake/InstallResources.cmake 2014-10-29 12:43:49.0 +0100
-+++ b/CMake/InstallResources.cmake 2014-10-29 12:46:10.017611431 +0100
+--- a/CMake/InstallResources.cmake
 b/CMake/InstallResources.cmake
 @@ -178,10 +178,6 @@
  
  # CREATE CONFIG FILES - BUILD DIR VERSIONS

diff --git 
a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch 
b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
index d737628..a26aa3f 100644
--- a/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
+++ b/dev-games/ogre/files/ogre-1.9.0-remove_resource_path_to_bindir.patch
@@ 

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-nm/

[Michael Palimaka]

commit: 9ff3b40acc97daeaace8b3bb496d0e55732eded5
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Sep  2 15:42:50 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 19:25:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff3b40a

kde-plasma/plasma-nm: Fix RDEPEND !{kde-base => kde-misc}/plasma-nm

File collisions:

/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement-kded.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo

Package-Manager: portage-2.2.20.1

 kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
index 258e568..8c6fb4c 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.0.ebuild
@@ -50,7 +50,7 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}
-   !kde-base/plasma-nm
+   !kde-misc/plasma-nm
 "
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/kde-apps-meta/

[Michael Palimaka]

commit: 9597cff6608c95a091b81a7734e04000d502521c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep  3 18:55:11 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 18:55:11 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9597cff6

kde-apps/kde-apps-meta: kdetoys is gone

Package-Manager: portage-2.2.20.1

 kde-apps/kde-apps-meta/kde-apps-meta-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild 
b/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
index 208f017..4fde36e 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
$(add_kdeapps_dep kdegraphics-meta)
$(add_kdeapps_dep kdemultimedia-meta)
$(add_kdeapps_dep kdenetwork-meta)
-   $(add_kdeapps_dep kdetoys-meta)
$(add_kdeapps_dep kdeutils-meta)
accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
nls? (

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/

[Andrey Grozin]

commit: 88b4c5c1a694ab3af8b93f07dcdedd594746a229
Author: Andrey Grozin  gentoo  org>
AuthorDate: Thu Sep  3 18:52:51 2015 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Thu Sep  3 18:52:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88b4c5c1

sci-mathematics/maxima: removing the unfixed version

 sci-mathematics/maxima/maxima-5.37.1.ebuild | 190 
 1 file changed, 190 deletions(-)

diff --git a/sci-mathematics/maxima/maxima-5.37.1.ebuild 
b/sci-mathematics/maxima/maxima-5.37.1.ebuild
deleted file mode 100644
index a0988d8..000
--- a/sci-mathematics/maxima/maxima-5.37.1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Free computer algebra environment based on Macsyma"
-HOMEPAGE="http://maxima.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-# Supported lisps
-LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
-#  supports readline: . - no, y - yes
-SUPP_RL=(   .. y   .. y )
-# . - just --enable-,  - --enable-
-CONF_FLAG=( .. .   ecl  ccl   . )
-# patch file version; . - no patch
-PATCH_V=(   11 .   22 1 )
-
-IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
-
-# Languages
-LANGS="es pt pt_BR"
-for lang in ${LANGS}; do
-   IUSE="${IUSE} linguas_${lang}"
-done
-
-RDEPEND="X? ( x11-misc/xdg-utils
-sci-visualization/gnuplot[gd]
-tk? ( dev-lang/tk:0 ) )
-   latex? ( virtual/latex-base )
-   emacs? ( virtual/emacs
-   latex? ( app-emacs/auctex ) )
-   xemacs? ( app-editors/xemacs
-   latex? ( app-emacs/auctex ) )"
-
-PDEPEND="emacs? ( app-emacs/imaxima )"
-
-# generating lisp dependencies
-depends() {
-   local LISP DEP
-   LISP=${LISPS[$1]}
-   DEP="dev-lisp/${LISP}:="
-   if [ "${SUPP_RL[$1]}" = "." ]; then
-   DEP="${DEP} app-misc/rlwrap"
-   fi
-   echo ${DEP}
-}
-
-n=${#LISPS[*]}
-for ((n--; n >= 0; n--)); do
-   LISP=${LISPS[${n}]}
-   RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
-   if (( ${n} > 0 )); then
-   DEF_DEP="${DEF_DEP} !${LISP}? ( "
-   fi
-done
-
-# default lisp
-if use arm; then
-   DEF_LISP=2 # gcl
-else
-   DEF_LISP=0 # sbcl
-fi
-
-DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
-
-n=${#LISPS[*]}
-for ((n--; n > 0; n--)); do
-   DEF_DEP="${DEF_DEP} )"
-done
-
-unset LISP
-
-RDEPEND="${RDEPEND}
-   ${DEF_DEP}"
-
-DEPEND="${RDEPEND}
-   sys-apps/texinfo"
-
-TEXMF="${EPREFIX}"/usr/share/texmf-site
-
-pkg_setup() {
-   local n=${#LISPS[*]}
-
-   for ((n--; n >= 0; n--)); do
-   use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
-   done
-
-   if [ -z "${NLISPS}" ]; then
-   ewarn "No lisp specified in USE flags, choosing 
${LISPS[${DEF_LISP}]} as default"
-   NLISPS=${DEF_LISP}
-   fi
-}
-
-src_prepare() {
-   local n PATCHES v
-   PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 )
-
-   n=${#PATCHES[*]}
-   for ((n--; n >= 0; n--)); do
-   epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
-   done
-
-   n=${#LISPS[*]}
-   for ((n--; n >= 0; n--)); do
-   v=${PATCH_V[${n}]}
-   if [ "${v}" != "." ]; then
-   epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
-   fi
-   done
-
-   # bug #343331
-   rm share/Makefile.in || die
-   rm src/Makefile.in || die
-   touch src/*.mk
-   touch src/Makefile.am
-   eautoreconf
-}
-
-src_configure() {
-   local CONFS CONF n lang
-   for n in ${NLISPS}; do
-   CONF=${CONF_FLAG[${n}]}
-   if [ ${CONF} = . ]; then
-   CONF=${LISPS[${n}]}
-   fi
-   CONFS="${CONFS} --enable-${CONF}"
-   done
-
-   # enable existing translated doc
-   if use nls; then
-   for lang in ${LANGS}; do
-   if use "linguas_${lang}"; then
-   CONFS="${CONFS} --enable-lang-${lang}"
-   use unicode && CONFS="${CONFS} 
--enable-lang-${lang}-utf8"
-   fi
-   done
-   fi
-
-   econf ${CONFS} $(use_with tk wish) 
--with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
-}
-
-src_install() {
-   docompress -x /usr/share/info
-   emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
-
-   use tk && make_desktop_entry xmaxima xmaxima \
-   /usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
-   "Science;Math;Education"
-
-   if use latex; 

[gentoo-commits] repo/gentoo:master commit in: net-nds/openldap/files/, net-nds/openldap/

[Matt Thode]

commit: 35b5e4a0bd2ca82f81da2a2aabe9d233a308cd43
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 19:33:41 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 19:34:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b5e4a0

net-nds/openldap: bumping for release, also fixes bug 549614

Package-Manager: portage-2.2.20.1

 net-nds/openldap/Manifest  |   1 +
 .../files/openldap-2.4.42-mdb-unbundle.patch   | 136 
 net-nds/openldap/openldap-2.4.42.ebuild| 809 +
 3 files changed, 946 insertions(+)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 501255d..f19bc7d 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -2,4 +2,5 @@ DIST openldap-2.3.43.tgz 3803011 SHA256 
d7d2dea05362c8ac7e11bb7bf1da4cdeb07225ba
 DIST openldap-2.4.38.tgz 5506085 SHA256 
88209a3599ec5d9354fc09bbe29b99db1ffa1b612127c06bad0c5265d0b31fd1 SHA512 
df7b6b2b84102ba996f84575396c7505ada851b5f09841fd821d34fd8d62580f85ecc655e2cd3965730b44d6919d64864f56b23791f38b411d142d345f250666
 WHIRLPOOL 
bb6a19b353f9dcde07afe78052ce9d5db5a2aaa09236b69d22da0879e74c4de8587312bad66939702db30af779f7ee9720ad792b73d225f004a1a90d80a6fed1
 DIST openldap-2.4.39.tgz 5509060 SHA256 
8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7 SHA512 
7b5ef2a69f79f0901a06f8be4ab50afc3b3e98ab1ea74a421569443d32cb43d3cf773d3f028fb5fb39908c09ee172cb4770ecc5882754877a59d29bf8f8cc059
 WHIRLPOOL 
90ac4cff185855d569a8033a3e35a251d75e4a2805bcfa5ba5b3605ec88b2fc244b0e95aabd33c47c9846f29c95a17e1be43650442987f6abc043667e06f15cd
 DIST openldap-2.4.40.tgz 5641865 SHA256 
d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb SHA512 
c803c4a82878891d60414d64dcb54a7c3f08675106ba13f50cba06034a97b3eee1c238761dd5ddad97d8c3f6675d9bbbec176d0340eb4a3bcd808f940baabab5
 WHIRLPOOL 
82cb6033798ac69faf4a0d1f5d7716316f5fbfc67e0f3a013b5bae461a01e3029aa6fb7d510bc14eed4f40ef83632561a3fa39aebf2be2785e3d0e0038db048c
+DIST openldap-2.4.42.tgz 5645925 SHA256 
eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63 SHA512 
52d6af7610c4fdc8f965ebea04d09c38f73773a02c2e484dc00f3d472f8b2f766ca32d9c80f5815a57745095cc7c33ad62d9165eec5b9e252ae172e7782c
 WHIRLPOOL 
e151c63bfd10f5e96c60f216925315ed788d426ba2c15ee2793a4de4bb25d01717e7bb5144814a0e6a053a5d5a0aab75213a495aa47aa13f7c3e70716c01633e
 DIST rfc2307bis.schema-20140524 12262 SHA256 
6cd8154ad86be1d6bb88a79c303dc10a49bce4ce7d21bb417a951d6496df30b1 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 WHIRLPOOL 
40cef24529fb4bfc1661d03088eccdb17d9056d696b2bf0e698fa248d03f508ba776784bf8abbaffb5f4c2c59b59b29525b4be2babc978fed681e5e3c88073de

diff --git a/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch 
b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
new file mode 100644
index 000..9265a01
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.42-mdb-unbundle.patch
@@ -0,0 +1,136 @@
+--- ./build/top.mk.orig2014-10-24 14:34:59.260827298 +0200
 ./build/top.mk 2014-10-24 14:35:25.281168893 +0200
+@@ -160,6 +160,7 @@
+ LTHREAD_LIBS = @LTHREAD_LIBS@
+ 
+ BDB_LIBS = @BDB_LIBS@
++MDB_LIBS = @MDB_LIBS@
+ SLAPD_NDB_LIBS = @SLAPD_NDB_LIBS@
+ 
+ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
+--- ./build/openldap.m4.orig   2014-10-24 10:52:02.837221734 +0200
 ./build/openldap.m42014-10-24 11:31:02.748087966 +0200
+@@ -563,6 +563,38 @@
+   ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+ ])
+ 
++dnl 
++dnl Check for version compatility with back-mdb
++AC_DEFUN([OL_MDB_COMPAT],
++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], 
[ol_cv_mdb_compat],[
++  AC_EGREP_CPP(__mdb_version_compat,[
++#include 
++
++/* require 0.9.14 or later */
++#if MDB_VERSION_FULL >= 0x0009000E
++  __mdb_version_compat
++#endif
++  ], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])])
++])
++
++dnl
++dnl 
++dnl Find any MDB
++AC_DEFUN([OL_MDB],
++[ol_cv_mdb=no
++AC_CHECK_HEADERS(lmdb.h)
++if test $ac_cv_header_lmdb_h = yes; then
++  OL_MDB_COMPAT
++
++  if test $ol_cv_mdb_compat != yes ; then
++  AC_MSG_ERROR([LMDB version incompatible with MDB backends])
++  fi
++
++  ol_cv_lib_mdb=-llmdb
++  ol_cv_mdb=yes
++fi
++])
++
+ dnl
+ dnl 
+ dnl Check POSIX Thread version 
+--- ./servers/slapd/back-mdb/Makefile.in.orig  2014-10-24 10:31:30.860931076 
+0200
 ./servers/slapd/back-mdb/Makefile.in   2014-10-24 14:33:33.803705424 
+0200
+@@ -25,11 +25,10 @@
+   extended.lo operational.lo \
+   attr.lo index.lo key.lo filterindex.lo \
+   dn2entry.lo dn2id.lo id2entry.lo idl.lo \
+-

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/maxima/, sci-mathematics/maxima/files/

[Andrey Grozin]

commit: b4984251d983fd2bab88c967a452a5b251937a87
Author: Andrey Grozin  gentoo  org>
AuthorDate: Thu Sep  3 18:42:17 2015 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Thu Sep  3 18:42:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4984251

sci-mathematics/maxima: fixing a bug in clozurecl maxima

Package-Manager: portage-2.2.20.1

 sci-mathematics/maxima/files/db-0.patch|  20 +++
 sci-mathematics/maxima/maxima-5.37.1-r1.ebuild | 190 +
 2 files changed, 210 insertions(+)

diff --git a/sci-mathematics/maxima/files/db-0.patch 
b/sci-mathematics/maxima/files/db-0.patch
new file mode 100644
index 000..d6cc186
--- /dev/null
+++ b/sci-mathematics/maxima/files/db-0.patch
@@ -0,0 +1,20 @@
+diff -r -U2 maxima-5.37.1.orig/src/db.lisp maxima-5.37.1/src/db.lisp
+--- maxima-5.37.1.orig/src/db.lisp 2015-08-11 01:01:13.0 +0600
 maxima-5.37.1/src/db.lisp  2015-09-04 00:21:43.596685564 +0600
+@@ -389,10 +389,14 @@
+ 
+ (defmfun isp (pat)
+-  (let ((isp 'unknown))
++  (let ((isp 'unknown) #+ccl (err t))
+ (ignore-errors
+   (setq isp
+   (cond ((truep pat))
+ ((falsep pat) nil)
+-(t 'unknown
++(t 'unknown)))
++  (setq err nil))
++#+ccl
++(when err
++  (setq +labs nil))
+ isp))
+ 

diff --git a/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild 
b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
new file mode 100644
index 000..8f2f164
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.37.1-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
+#  supports readline: . - no, y - yes
+SUPP_RL=(   .. y   .. y )
+# . - just --enable-,  - --enable-
+CONF_FLAG=( .. .   ecl  ccl   . )
+# patch file version; . - no patch
+PATCH_V=(   11 .   22 1 )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+   IUSE="${IUSE} linguas_${lang}"
+done
+
+RDEPEND="X? ( x11-misc/xdg-utils
+sci-visualization/gnuplot[gd]
+tk? ( dev-lang/tk:0 ) )
+   latex? ( virtual/latex-base )
+   emacs? ( virtual/emacs
+   latex? ( app-emacs/auctex ) )
+   xemacs? ( app-editors/xemacs
+   latex? ( app-emacs/auctex ) )"
+
+PDEPEND="emacs? ( app-emacs/imaxima )"
+
+# generating lisp dependencies
+depends() {
+   local LISP DEP
+   LISP=${LISPS[$1]}
+   DEP="dev-lisp/${LISP}:="
+   if [ "${SUPP_RL[$1]}" = "." ]; then
+   DEP="${DEP} app-misc/rlwrap"
+   fi
+   echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+   LISP=${LISPS[${n}]}
+   RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+   if (( ${n} > 0 )); then
+   DEF_DEP="${DEF_DEP} !${LISP}? ( "
+   fi
+done
+
+# default lisp
+if use arm; then
+   DEF_LISP=2 # gcl
+else
+   DEF_LISP=0 # sbcl
+fi
+
+DEF_DEP="${DEF_DEP} `depends ${DEF_LISP}`"
+
+n=${#LISPS[*]}
+for ((n--; n > 0; n--)); do
+   DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+   ${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+   sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+   local n=${#LISPS[*]}
+
+   for ((n--; n >= 0; n--)); do
+   use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+   done
+
+   if [ -z "${NLISPS}" ]; then
+   ewarn "No lisp specified in USE flags, choosing 
${LISPS[${DEF_LISP}]} as default"
+   NLISPS=${DEF_LISP}
+   fi
+}
+
+src_prepare() {
+   local n PATCHES v
+   PATCHES=( imaxima-0 rmaxima-0 wish-1 xdg-utils-0 db-0 )
+
+   n=${#PATCHES[*]}
+   for ((n--; n >= 0; n--)); do
+   epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+   done
+
+   n=${#LISPS[*]}
+   for ((n--; n >= 0; n--)); do
+   v=${PATCH_V[${n}]}
+   if [ "${v}" != "." ]; then
+   epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+   fi
+   done
+
+   # bug #343331
+   rm share/Makefile.in || die
+   rm src/Makefile.in || die
+   touch src/*.mk
+   touch src/Makefile.am
+   eautoreconf
+}
+
+src_configure() {
+   local CONFS CONF n lang
+   for n in ${NLISPS}; do
+   CONF=${CONF_FLAG[${n}]}
+   if [ ${CONF} = . ]; then
+   

[gentoo-commits] repo/gentoo:master commit in: games-roguelike/adom/

[Michael Sterrett]

commit: 794fbbe7ad3a6846abc73e69c25bc0484aac958c
Author: Michael Sterrett  gentoo  org>
AuthorDate: Thu Sep  3 18:59:51 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Thu Sep  3 19:00:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794fbbe7

make sure we get ncurses5 api (bug #559072) with inline patch from Sergei 
Trofimovich

Package-Manager: portage-2.2.20.1

 games-roguelike/adom/adom-1.1.1-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild 
b/games-roguelike/adom/adom-1.1.1-r1.ebuild
index af8ecd1..83d5f81 100644
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ b/games-roguelike/adom/adom-1.1.1-r1.ebuild
@@ -16,7 +16,9 @@ IUSE=""
 RESTRICT="strip" #bug #137340
 QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]"
+RDEPEND="|| (
+   >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)]
+   >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )"
 
 S=${WORKDIR}/${PN}
 

[gentoo-commits] proj/kde:master commit in: /

[Michael Palimaka]

commit: ebf77c4ff452d362597823304985cf0faee3f393
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep  3 19:02:05 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 19:02:12 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ebf77c4f

.travis.yml: only report failures.

For testing the new notification bot.

 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 73030e3..a273e62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ script:
 # You can append own scripts after this line
 notifications:
   irc:
+on_success: never
+on_failure: always
 channels:
   - "chat.freenode.net#gentoo-kde"
 template:

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-nm/

[Michael Palimaka]

commit: baa1be65ffefce5bbd9b7b186de3eb3e6117e7e6
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Sep  3 19:28:01 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 19:28:47 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=baa1be65

kde-plasma/plasma-nm: Fix RDEPEND !{kde-base => kde-misc}/plasma-nm

File collisions:

/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement-kded.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_l2tpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openconnectui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_openvpnui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_pptpui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_strongswanui.mo
/usr/share/locale/${lingua}/LC_MESSAGES/plasmanetworkmanagement_vpncui.mo

Package-Manager: portage-2.2.20.1

 kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild | 2 +-
 kde-plasma/plasma-nm/plasma-nm-.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild 
b/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
index 77a0fd7..d26481f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.4.49..ebuild
@@ -50,7 +50,7 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}
-   !kde-base/plasma-nm
+   !kde-misc/plasma-nm
 "
 
 src_configure() {

diff --git a/kde-plasma/plasma-nm/plasma-nm-.ebuild 
b/kde-plasma/plasma-nm/plasma-nm-.ebuild
index 77a0fd7..d26481f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-.ebuild
@@ -50,7 +50,7 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}
-   !kde-base/plasma-nm
+   !kde-misc/plasma-nm
 "
 
 src_configure() {

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

[Matt Thode]

commit: 10d73ac32c4fe566efc1653cc34ee4242d9e2ff2
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 19:38:26 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 19:38:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d73ac3

dev-python/fasteners: adding metadata.xml

Package-Manager: portage-2.2.20.1

 dev-python/fasteners/metadata.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/dev-python/fasteners/metadata.xml 
b/dev-python/fasteners/metadata.xml
new file mode 100644
index 000..d5dfd32
--- /dev/null
+++ b/dev-python/fasteners/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   prometheanf...@gentoo.org
+   Matthew Thode
+   
+   
+   
+

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

[Patrice Clement]

commit: 7d20c1e914f31c905f1abea76c7caf4d04591c55
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 15:23:03 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 16:00:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d20c1e9

www-servers/resin: Drop old.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 www-servers/resin/resin-4.0.44-r1.ebuild | 199 ---
 1 file changed, 199 deletions(-)

diff --git a/www-servers/resin/resin-4.0.44-r1.ebuild 
b/www-servers/resin/resin-4.0.44-r1.ebuild
deleted file mode 100644
index 5518667..000
--- a/www-servers/resin/resin-4.0.44-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
-
-DESCRIPTION="A fast Servlet and JSP engine"
-HOMEPAGE="http://www.caucho.com;
-SRC_URI="http://www.caucho.com/download/${P}-src.zip;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin doc"
-
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/resin-servlet-api:3.0
-   dev-java/jsr101:0
-   dev-java/mojarra:1.2
-   dev-java/oracle-javamail:0
-   dev-java/validation-api:1.0
-   dev-java/glassfish-xmlrpc-api:0
-   dev-java/glassfish-deployment-api:1.2"
-
-RDEPEND=">=virtual/jre-1.6
-   ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-   app-arch/unzip
-   dev-libs/openssl
-   dev-java/ant-core:0
-   ${CDEPEND}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-jsr101
-mojarra-1.2
-oracle-javamail
-validation-api-1.0
-glassfish-xmlrpc-api
-resin-servlet-api-3.0
-glassfish-deployment-api-1.2"
-
-PATCHES=(
-   "${FILESDIR}"/"${PV}"/resin-compile.patch
-   "${FILESDIR}"/"${PV}"/build.xml.patch
-)
-
-pkg_setup() {
-   java-pkg-2_pkg_setup
-   enewgroup resin
-   enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
-   local vm_version=$(java-pkg_get-vm-version)
-
-   # #558442.
-   if [[ "${vm_version}" == "1.8" ]]; then
-   PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
-   fi
-
-   epatch "${PATCHES[@]}"
-
-   # No bundled JARs!
-   rm -f "${S}/modules/ext/"*.jar || die
-   rm -rf "${S}/project-jars" || die
-
-   java-ant_bsfix_one "${S}/build.xml"
-   java-ant_bsfix_one "${S}/build-common.xml"
-
-   rm -rf lib/* || die
-
-   java-pkg_jar-from --into lib jsr101
-   java-pkg_jar-from --into lib mojarra-1.2
-   java-pkg_jar-from --into lib oracle-javamail
-   java-pkg_jar-from --into lib validation-api-1.0
-   java-pkg_jar-from --into lib glassfish-xmlrpc-api
-   java-pkg_jar-from --into lib glassfish-deployment-api-1.2
-   java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
-
-   ln -s $(java-config --jdk-home)/lib/tools.jar || die
-}
-
-src_configure() {
-   append-flags -fPIC -DPIC
-
-   chmod 755 "${S}/configure" || die
-   econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
-   einfo "Building libraries..."
-   emake || die "make failed"
-
-   einfo "Building jars..."
-   eant || die "ant failed"
-}
-
-src_install() {
-   emake DESTDIR="${D}" install || die "Install failed"
-
-   einfo "Moving configuration to /etc ..."
-   dodir /etc/
-   mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
-   dosym /etc/resin ${RESIN_HOME}/conf
-
-   einfo "Rewriting resin.xml ..."
-   sed -i \
-   -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
-   -e 's,${resin.root}/doc/admin,webapps/admin,' \
-   "${D}/etc/resin/resin.xml" || die
-
-   einfo "Fixing log directory ..."
-   rm -rf "${D}/${RESIN_HOME}/log" || die
-   keepdir /var/log/resin
-   dosym /var/log/resin ${RESIN_HOME}/log
-
-   einfo "Installing basic documentation ..."
-   dodoc README "${S}"/conf/*.xml
-
-   einfo "Installing init.d script ..."
-   newinitd "${FILESDIR}/${PV}/resin.init" resin
-   newconfd "${FILESDIR}/${PV}/resin.conf" resin
-
-   sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || 
die
-
-   einfo "Fixing location of jars ..."
-   rm -f "${S}/lib/tools.jar" || die
-   java-pkg_dojar "${S}"/lib/*.jar
-   rm -fr "${D}/${RESIN_HOME}/lib" || die
-   dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
-   einfo "Symlinking directories from /var/lib/resin ..."
-   rm -rf "${D}/${RESIN_HOME}/resin-data" || die
-   rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
-   dodir /var/lib/resin/webapps
-   keepdir /var/lib/resin/hosts
-   keepdir /var/lib/resin/resin-data
-   keepdir /var/lib/resin/watchdog-data
-   mv 

[gentoo-commits] repo/gentoo:master commit in: dev-java/mojarra/files/, dev-java/mojarra/

[Patrice Clement]

commit: da8f2314bd0b6df70a4016918e4450d632c24aff
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 15:52:55 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 16:00:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8f2314

dev-java/mojarra: Version bump. Fixes security bug 501280.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/mojarra/Manifest  |  1 +
 .../mojarra/files/mojarra-2.2.12-Util.java.patch   | 25 
 dev-java/mojarra/mojarra-2.2.12.ebuild | 46 ++
 3 files changed, 72 insertions(+)

diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index 9332e5a..21cd8dd 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,3 +1,4 @@
+DIST javax.faces-2.2.12-sources.jar 3105808 SHA256 
503c0a1c6a270429798a6507d477ee2114f0de5204c64d5660a11796c498ab61 SHA512 
b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
 WHIRLPOOL 
98a5473c8c7841cf5baae4b879d2b0a9e1b64d3666b820aa7c1aeece43d3689fc8b93766c280906f19dd23d3e13436c6514b533a3d810bdb96e88d4d78666a87
 DIST javax.faces-2.2.9-sources.jar 3098257 SHA256 
f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512 
a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3
 WHIRLPOOL 
040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
 DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256 
c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512 
125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac
 WHIRLPOOL 
62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
 DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256 
8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512 
6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144
 WHIRLPOOL 
c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559

diff --git a/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch 
b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
new file mode 100644
index 000..23033f6
--- /dev/null
+++ b/dev-java/mojarra/files/mojarra-2.2.12-Util.java.patch
@@ -0,0 +1,25 @@
+--- src/com/sun/faces/util/Util.java.orig  2015-09-03 14:43:30.953486000 
+
 src/com/sun/faces/util/Util.java   2015-09-03 14:43:57.692486000 +
+@@ -354,13 +354,15 @@
+ // as the same adapter in a standalone program works as one might 
expect.
+ // So, for now, if the classname starts with '[', then use 
Class.forName()
+ // to avoid CR 643419 and for all other cases, use 
ClassLoader.loadClass().
+-if (loader.getClass() == 
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) 
{
+-if (name.charAt(0) == '[') {
+-return Class.forName(name, true, loader);
+-} else {
+-return loader.loadClass(name);
+-}
+-}
++//
++// Disable Groovy support.
++// if (loader.getClass() == 
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) 
{
++// if (name.charAt(0) == '[') {
++// return Class.forName(name, true, loader);
++// } else {
++// return loader.loadClass(name);
++// }
++// }
+ return Class.forName(name, true, loader);
+ }
+ 

diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild 
b/dev-java/mojarra/mojarra-2.2.12.ebuild
new file mode 100644
index 000..8a94ed4
--- /dev/null
+++ b/dev-java/mojarra/mojarra-2.2.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces 
API"
+HOMEPAGE="https://javaserverfaces.dev.java.net/;
+SRC_URI="https://maven.java.net/content/repositories/releases/org/glassfish/javax.faces/${PV}/javax.faces-${PV}-sources.jar;
+
+LICENSE="CDDL"
+SLOT="2.2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+CDEPEND="dev-java/glassfish-persistence:0
+   dev-java/glassfish-ejb-api:0
+   java-virtuals/servlet-api:3.0
+   dev-java/tomcat-jstl-spec:1.2.5
+   dev-java/tomcat-jstl-impl:1.2.5
+   dev-java/validation-api:1.0
+   dev-java/javax-inject:0
+   dev-java/cdi-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/mojarra/files/, dev-java/mojarra/

[Patrice Clement]

commit: c8d1617a77572f397ad51cc546a4a06639359614
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 15:57:56 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 16:00:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d1617a

dev-java/mojarra: Remove vulnerable versions. Fixes bug 501280.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/mojarra/Manifest  |  3 -
 .../mojarra/files/mojarra-2.2.9-Util.java.patch| 26 ---
 dev-java/mojarra/mojarra-1.2.15-r2.ebuild  | 85 --
 dev-java/mojarra/mojarra-2.2.9.ebuild  | 46 
 4 files changed, 160 deletions(-)

diff --git a/dev-java/mojarra/Manifest b/dev-java/mojarra/Manifest
index 21cd8dd..4e68f51 100644
--- a/dev-java/mojarra/Manifest
+++ b/dev-java/mojarra/Manifest
@@ -1,4 +1 @@
 DIST javax.faces-2.2.12-sources.jar 3105808 SHA256 
503c0a1c6a270429798a6507d477ee2114f0de5204c64d5660a11796c498ab61 SHA512 
b2bc2ce38d72af38a4b2fdb5aec790600ca41a5d7f6340bf6be671a901c9fe664d50d9d13f021694e85e0e145a2031e2d8b61dd6d6ccebb544f2512a91ff670a
 WHIRLPOOL 
98a5473c8c7841cf5baae4b879d2b0a9e1b64d3666b820aa7c1aeece43d3689fc8b93766c280906f19dd23d3e13436c6514b533a3d810bdb96e88d4d78666a87
-DIST javax.faces-2.2.9-sources.jar 3098257 SHA256 
f3ba4bcafcdac5e92bd784574e3f0b35ff4b7c56d07dda628a8e0246d1a40b27 SHA512 
a398c7edd483af59e59c52896dfd6fbf67948cb9778940bb5045c6c4ee2e0549e24ee321dcf7a8bdadbbec82c7e533840bc42669e79664fa864627744b6cc0e3
 WHIRLPOOL 
040768e9aba1575137e4a1ef7bbf587fea71ff46119066a0fe5b72a9c0a1da647fbef1a712952efa0d59d51ca346366eefc0f79b7912cc7d071d695a39edf48c
-DIST mojarra-1.2_15-b01-FCS-patch.bz2 4369 SHA256 
c8495b51225201bf23033a01bb853abf1cc0a40214aa6a68c7dd1c30812e6cd1 SHA512 
125e511b052d4c70314a069c47ce72b51e4dd9d1c6826def6c1a8c0bf72f6c711a9fb9f05065a5f1f46dce8462b701198f67d257b1f0aa683b494b31d90205ac
 WHIRLPOOL 
62efb9f165d40be7ba94be04046867b342d2ba39f340443bceb3f8b421c9be2c8c312ea9e04d7c743e6440fe124bd8566fa383013a9654b7758f180f659234c4
-DIST mojarra-1.2_15-b01-FCS-source.zip 5091287 SHA256 
8678db1e93a2f605b696ae3a04e145bc14dd46409301ae230dc6ee4477ccb343 SHA512 
6e8d8278aac36d3971bef523f8ec90a4959c0d6ec69642d5edd10379c2cdbe13242ad197475abda887b886f166b8c7ea762be5560a746f2426cec9c6a25c0144
 WHIRLPOOL 
c5b2ab6a568468c2570d61d5cf8bc5f7147b403c9f7718c2ea32eda783605f48aa41c9f8a96cf48e13c10e5859061a527f40c003d7ff48a66571be6a69472559

diff --git a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch 
b/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
deleted file mode 100644
index d73ee9c..000
--- a/dev-java/mojarra/files/mojarra-2.2.9-Util.java.patch
+++ /dev/null
@@ -1,26 +0,0 @@
 src/com/sun/faces/util/Util.java.orig  2015-06-08 21:08:39.77000 
+
-+++ src/com/sun/faces/util/Util.java   2015-06-08 21:10:12.71900 +
-@@ -315,13 +315,16 @@
- // as the same adapter in a standalone program works as one might 
expect.
- // So, for now, if the classname starts with '[', then use 
Class.forName()
- // to avoid CR 643419 and for all other cases, use 
ClassLoader.loadClass().
--if (loader.getClass() == 
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) 
{
--if (name.charAt(0) == '[') {
--return Class.forName(name, true, loader);
--} else {
--return loader.loadClass(name);
--}
--}
-+//
-+// Disable Groovy stuff for the time being 
-+// since groovy 2.4 hasn't hit the tree... yet.
-+// if (loader.getClass() == 
com.sun.faces.scripting.groovy.GroovyHelperImpl.MojarraGroovyClassLoader.class) 
{
-+// if (name.charAt(0) == '[') {
-+// return Class.forName(name, true, loader);
-+// } else {
-+// return loader.loadClass(name);
-+// }
-+// }
- return Class.forName(name, true, loader);
- }
- 

diff --git a/dev-java/mojarra/mojarra-1.2.15-r2.ebuild 
b/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
deleted file mode 100644
index 300ac12..000
--- a/dev-java/mojarra/mojarra-1.2.15-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-WANT_ANT_TASKS="ant-trax"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="$(get_version_component_range 1-2)_$(get_version_component_range 
3)-b01-FCS"
-
-DESCRIPTION="Project Mojarra - GlassFish's Implementation for JavaServer Faces 
API"
-HOMEPAGE="https://javaserverfaces.dev.java.net/;
-SRC_URI="https://javaserverfaces.dev.java.net/files/documents/1866/151669/${PN}-${MY_PV}-source.zip
-   mirror://gentoo/${PN}-${MY_PV}-patch.bz2"
-
-LICENSE="CDDL"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="
-   

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

[Patrice Clement]

commit: 071ff6141aa2a1fda4153eada61a179706c733dc
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Sep  3 15:11:23 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Sep  3 16:00:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071ff614

www-servers/resin: Bump dev-java/mojarra SLOT to 2.2. Fixes security bug 501280.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 www-servers/resin/resin-4.0.44-r2.ebuild | 199 +++
 1 file changed, 199 insertions(+)

diff --git a/www-servers/resin/resin-4.0.44-r2.ebuild 
b/www-servers/resin/resin-4.0.44-r2.ebuild
new file mode 100644
index 000..a02ac24
--- /dev/null
+++ b/www-servers/resin/resin-4.0.44-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com;
+SRC_URI="http://www.caucho.com/download/${P}-src.zip;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/resin-servlet-api:3.0
+   dev-java/jsr101:0
+   dev-java/mojarra:2.2
+   dev-java/oracle-javamail:0
+   dev-java/validation-api:1.0
+   dev-java/glassfish-xmlrpc-api:0
+   dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+   ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+   app-arch/unzip
+   dev-libs/openssl
+   dev-java/ant-core:0
+   ${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.0
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+   "${FILESDIR}"/"${PV}"/resin-compile.patch
+   "${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+   java-pkg-2_pkg_setup
+   enewgroup resin
+   enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+   local vm_version=$(java-pkg_get-vm-version)
+
+   # #558442.
+   if [[ "${vm_version}" == "1.8" ]]; then
+   PATCHES+=("${FILESDIR}"/"${PV}"/VarType.java.patch)
+   fi
+
+   epatch "${PATCHES[@]}"
+
+   # No bundled JARs!
+   rm -f "${S}/modules/ext/"*.jar || die
+   rm -rf "${S}/project-jars" || die
+
+   java-ant_bsfix_one "${S}/build.xml"
+   java-ant_bsfix_one "${S}/build-common.xml"
+
+   rm -rf lib/* || die
+
+   java-pkg_jar-from --into lib jsr101
+   java-pkg_jar-from --into lib mojarra-1.2
+   java-pkg_jar-from --into lib oracle-javamail
+   java-pkg_jar-from --into lib validation-api-1.0
+   java-pkg_jar-from --into lib glassfish-xmlrpc-api
+   java-pkg_jar-from --into lib glassfish-deployment-api-1.2
+   java-pkg_jar-from --into lib resin-servlet-api-3.0 resin-servlet-api.jar
+
+   ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+   append-flags -fPIC -DPIC
+
+   chmod 755 "${S}/configure" || die
+   econf --prefix=${RESIN_HOME} || die "econf failed"
+}
+
+src_compile() {
+   einfo "Building libraries..."
+   emake || die "make failed"
+
+   einfo "Building jars..."
+   eant || die "ant failed"
+}
+
+src_install() {
+   emake DESTDIR="${D}" install || die "Install failed"
+
+   einfo "Moving configuration to /etc ..."
+   dodir /etc/
+   mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
+   dosym /etc/resin ${RESIN_HOME}/conf
+
+   einfo "Rewriting resin.xml ..."
+   sed -i \
+   -e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
+   -e 's,${resin.root}/doc/admin,webapps/admin,' \
+   "${D}/etc/resin/resin.xml" || die
+
+   einfo "Fixing log directory ..."
+   rm -rf "${D}/${RESIN_HOME}/log" || die
+   keepdir /var/log/resin
+   dosym /var/log/resin ${RESIN_HOME}/log
+
+   einfo "Installing basic documentation ..."
+   dodoc README "${S}"/conf/*.xml
+
+   einfo "Installing init.d script ..."
+   newinitd "${FILESDIR}/${PV}/resin.init" resin
+   newconfd "${FILESDIR}/${PV}/resin.conf" resin
+
+   sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/resin" || 
die
+
+   einfo "Fixing location of jars ..."
+   rm -f "${S}/lib/tools.jar" || die
+   java-pkg_dojar "${S}"/lib/*.jar
+   rm -fr "${D}/${RESIN_HOME}/lib" || die
+   dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+   einfo "Symlinking directories from /var/lib/resin ..."
+   rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+   rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+   dodir /var/lib/resin/webapps
+   keepdir /var/lib/resin/hosts
+   keepdir /var/lib/resin/resin-data
+   keepdir 

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

[Miroslav Šulc]

commit: 2ac41e1e261320e2436dff0f929dada02f7f50fd
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep  3 16:55:00 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep  3 16:55:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac41e1e

www-servers/tomcat: version bump

Package-Manager: portage-2.2.20.1

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-8.0.26-build.xml.patch | 265 +
 www-servers/tomcat/tomcat-8.0.26.ebuild| 147 
 3 files changed, 413 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c486b11..ce0df3b 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -4,3 +4,4 @@ DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 
443aa92f2668906fb24cc43ba952
 DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
 WHIRLPOOL 
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
 WHIRLPOOL 
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
+DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc

diff --git a/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch 
b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
new file mode 100644
index 000..1923d23
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.26-build.xml.patch
@@ -0,0 +1,265 @@
+diff -Naur apache-tomcat-8.0.24-src.orig/build.xml 
apache-tomcat-8.0.24-src/build.xml
+--- apache-tomcat-8.0.24-src.orig/build.xml2015-07-01 21:25:21.0 
+0100
 apache-tomcat-8.0.24-src/build.xml 2015-08-22 21:17:05.825564599 +0100
+@@ -697,24 +697,29 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+-
++
+ 
+ 
+   
+@@ -1049,7 +1054,7 @@
+ 
+   
+ 
+-
++
+ 
+ 
+ 
+@@ -1083,7 +1088,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+ 
++
+ 
+@@ -1542,7 +1548,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1681,7 +1687,7 @@
+ 
+   
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1882,6 +1888,7 @@
+ 
+   
++
+ 
++  maxmemory="512m" >
+   
+ 
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2739,7 +2749,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2773,7 +2783,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2819,7 +2829,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   
+@@ -2845,18 +2855,18 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2868,7 +2878,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2887,7 +2897,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2898,7 +2908,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2916,7 +2926,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2926,7 +2936,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+ 
+@@ -2949,7 +2959,7 @@
+ 
+   
+ 
+-  
++  
+ 
+   
+ 
+@@ -2960,7 +2970,7 @@
+ 
+   
+ 
+-  
++  
+ 
+ 
+   
+@@ -2971,7 +2981,7 @@
+ 
+   
++  

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

[Chí-Thanh Christopher Nguyễn]

commit: 9695eae2fcfd4e20f418a488729639dce3556376
Author: Chí-Thanh Christopher Nguyễn  gentoo  org>
AuthorDate: Thu Sep  3 15:56:58 2015 +
Commit: Chí-Thanh Christopher Nguyễn  gentoo  org>
CommitDate: Thu Sep  3 15:56:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9695eae2

x11-base/xorg-server: add patches for CVE-2015-3164

Bug: https://bugs.gentoo.org/show_bug.cgi?id=551680

Package-Manager: portage-2.2.20.1

 .../files/xorg-server-1.17-cve-2015-3164-1.patch   |  33 +++
 .../files/xorg-server-1.17-cve-2015-3164-2.patch   | 246 +++
 .../files/xorg-server-1.17-cve-2015-3164-3.patch   |  34 +++
 x11-base/xorg-server/xorg-server-1.16.4-r3.ebuild  | 261 +
 x11-base/xorg-server/xorg-server-1.16.4-r4.ebuild  | 236 +++
 5 files changed, 810 insertions(+)

diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch 
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
new file mode 100644
index 000..a9f8030
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-1.patch
@@ -0,0 +1,33 @@
+From c4534a38b68aa07fb82318040dc8154fb48a9588 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Tue, 5 May 2015 16:43:42 -0400
+Subject: xwayland: Enable access control on open sockets [CVE-2015-3164 1/3]
+
+Xwayland currently allows wide-open access to the X sockets
+it listens on, ignoring Xauth access control.
+
+This commit makes sure to enable access control on the sockets,
+so one user can't snoop on another user's X-over-wayland
+applications.
+
+Signed-off-by: Ray Strode 
+Reviewed-by: Daniel Stone 
+Reviewed-by: Alan Coopersmith 
+Signed-off-by: Keith Packard 
+
+diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
+index 7e8d667..c5bee77 100644
+--- a/hw/xwayland/xwayland.c
 b/hw/xwayland/xwayland.c
+@@ -483,7 +483,7 @@ listen_on_fds(struct xwl_screen *xwl_screen)
+ int i;
+ 
+ for (i = 0; i < xwl_screen->listen_fd_count; i++)
+-ListenOnOpenFD(xwl_screen->listen_fds[i], TRUE);
++ListenOnOpenFD(xwl_screen->listen_fds[i], FALSE);
+ }
+ 
+ static void
+-- 
+cgit v0.10.2
+

diff --git a/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch 
b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
new file mode 100644
index 000..47b323f
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.17-cve-2015-3164-2.patch
@@ -0,0 +1,246 @@
+From 4b4b9086d02b80549981d205fb1f495edc373538 Mon Sep 17 00:00:00 2001
+From: Ray Strode 
+Date: Tue, 5 May 2015 16:43:43 -0400
+Subject: os: support new implicit local user access mode [CVE-2015-3164 2/3]
+
+If the X server is started without a '-auth' argument, then
+it gets started wide open to all local users on the system.
+
+This isn't a great default access model, but changing it in
+Xorg at this point would break backward compatibility.
+
+Xwayland, on the other hand is new, and much more targeted
+in scope.  It could, in theory, be changed to allow the much
+more secure default of a "user who started X server can connect
+clients to that server."
+
+This commit paves the way for that change, by adding a mechanism
+for DDXs to opt-in to that behavior.  They merely need to call
+
+LocalAccessScopeUser()
+
+in their init functions.
+
+A subsequent commit will add that call for Xwayland.
+
+Signed-off-by: Ray Strode 
+Reviewed-by: Daniel Stone 
+Reviewed-by: Alan Coopersmith 
+Signed-off-by: Keith Packard 
+
+diff --git a/include/os.h b/include/os.h
+index 6638c84..b2b96c8 100644
+--- a/include/os.h
 b/include/os.h
+@@ -431,11 +431,28 @@ extern _X_EXPORT void
+ ResetHosts(const char *display);
+ 
+ extern _X_EXPORT void
++EnableLocalAccess(void);
++
++extern _X_EXPORT void
++DisableLocalAccess(void);
++
++extern _X_EXPORT void
+ EnableLocalHost(void);
+ 
+ extern _X_EXPORT void
+ DisableLocalHost(void);
+ 
++#ifndef NO_LOCAL_CLIENT_CRED
++extern _X_EXPORT void
++EnableLocalUser(void);
++
++extern _X_EXPORT void
++DisableLocalUser(void);
++
++extern _X_EXPORT void
++LocalAccessScopeUser(void);
++#endif
++
+ extern _X_EXPORT void
+ AccessUsingXdmcp(void);
+ 
+diff --git a/os/access.c b/os/access.c
+index 8fa028e..75e7a69 100644
+--- a/os/access.c
 b/os/access.c
+@@ -102,6 +102,10 @@ SOFTWARE.
+ #include 
+ #include 
+ 
++#ifndef NO_LOCAL_CLIENT_CRED
++#include 
++#endif
++
+ #if defined(TCPCONN) || defined(STREAMSCONN)
+ #include 
+ #endif  /* TCPCONN || STREAMSCONN */
+@@ -225,6 +229,13 @@ static int LocalHostEnabled = FALSE;
+ static int LocalHostRequested = FALSE;
+ static int UsingXdmcp = FALSE;
+ 
++static enum {
++LOCAL_ACCESS_SCOPE_HOST = 0,
++#ifndef NO_LOCAL_CLIENT_CRED
++LOCAL_ACCESS_SCOPE_USER,

[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/

[Miroslav Šulc]

commit: c985fa1bcd24e35b90d3d510c83efe43ec8c014b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep  3 16:39:54 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep  3 16:39:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c985fa1b

dev-java/tomcat-servlet-api: version bump

Package-Manager: portage-2.2.20.1

 dev-java/tomcat-servlet-api/Manifest   |  1 +
 .../tomcat-servlet-api-8.0.26.ebuild   | 36 ++
 2 files changed, 37 insertions(+)

diff --git a/dev-java/tomcat-servlet-api/Manifest 
b/dev-java/tomcat-servlet-api/Manifest
index 51c5cf4..89f0146 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -6,4 +6,5 @@ DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e
 DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 
443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 
677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a
 WHIRLPOOL 
a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
 WHIRLPOOL 
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8
+DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 
3725621a73501a6e09438f177acfab7ce11fabeb2b0380a909273410f3b50b3b SHA512 
70ef253889916bcca309a8f80675c4c588fef1cc5dc0360c45347107fb56fd546a334ca01e1109775410f7642acf6c75d9887f9403ad4c1d0e30f041f9ce34fb
 WHIRLPOOL 
3c29a5418dfefc12157d8656dfa15a2937668f52d18c21f6dd4a278d2bc4c84d5b6d542daf6244040eabeab57cb759a510b7b1d0e41440a2d9ad62586723dafc
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 
404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 
7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 WHIRLPOOL 
beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild 
b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
new file mode 100644
index 000..1c1c74f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/;
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux 
~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+   cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace 
build.xml"
+   rm -fR */*/build.xml
+   einfo "Removing bundled jars and classes"
+   find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+   java-pkg_dojar "${S}"/output/build/lib/*.jar
+   use source && java-pkg_dosrc java/javax/servlet/
+}

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

[Matt Thode]

commit: 3e2dbedfc36253a1e7ee40f53ed42c1d3923397e
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 16:43:50 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 16:44:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2dbedf

dev-python/python-heatclient: bup for liberty

Package-Manager: portage-2.2.20.1

 dev-python/python-heatclient/Manifest  |   4 +-
 .../python-heatclient-0.2.12.ebuild| 129 -
 .../python-heatclient-0.2.9.ebuild |  57 -
 ...0.3.0.ebuild => python-heatclient-0.7.0.ebuild} |  44 +++
 4 files changed, 25 insertions(+), 209 deletions(-)

diff --git a/dev-python/python-heatclient/Manifest 
b/dev-python/python-heatclient/Manifest
index 46f3413..ea5f5fd 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,6 +1,4 @@
-DIST python-heatclient-0.2.12.tar.gz 99919 SHA256 
e9d5b74206b322ce30184a1b132a78b8be1806be85c77361fb72a966c4c48afe SHA512 
49d28e63bf9e7c227443cf58c6870900f2fb23d6f4e0457b97cfdf615af01b95c046759c4d763e8c9ab702f5a85fe79925aa19d905bbb2c4e94eea48e4ca066e
 WHIRLPOOL 
712aacc7dae4114cd61e02ab22ff50a61b85ddde35cfcfa26fbe02c46ae63808e0c95a13beb5cec9724e3b0fd3b68970123dc679d6cfb765aa0ec57d5d430c82
-DIST python-heatclient-0.2.9.tar.gz 81470 SHA256 
8cc6d99f86529633b8b5d99417358fd7c023223572f190ae3e1da09ff435420f SHA512 
05fc3a5ff8e738fdc3ac2c5d8221c9be932467aa9109e1138c4a96053f7e68d8ba77b13f50968f05a37e94b60bd5ff2e798faf0c5b145ae80c2a0a6f7f68313a
 WHIRLPOOL 
1c77ac1329c6f5dc1c207670d5864ea44046d6a0686b12c373ad2a26560999fc0bdc011b8efaf431f9c6f5379d19eb9bb65b68fb08a7297f12ec6e0313ce1846
-DIST python-heatclient-0.3.0.tar.gz 95621 SHA256 
c3fe26b69610dcd1540f5ab2c8ae59183c3df09d9ede52a5bb704977345f29ad SHA512 
f550e785ce21e1a1ad8dedfb1fc94bdaf4e0d9b5902c05a704b73c72e3e49ac6e35f79acbbc8ac511bca329d5032f796447899dfa737da0f7b8b376e5983153a
 WHIRLPOOL 
9a02d508401600a659f552d2c7b46d7a4c94500514ff3763bd47ecfefa2fcc89cf49b20bbfbdb859a04fe4c719bcbdceb29d15cc793f631c89192a03642a2b3f
 DIST python-heatclient-0.4.0.tar.gz 104613 SHA256 
1b71e2bb5c380ac6b2e1f07b48b7b3e82e7364cc43255ed696c795ab5f8d5a1d SHA512 
f1235e40d6407fc05f53dfa1592d4f1fa72c10c6aa17fcbb78a7a8bf999cf803f4a42f9f7672f403d336006bdb72f3960d849474c398e592085f1d637a28faed
 WHIRLPOOL 
680af36f92f9674667cf1ad97167248e3b30b4fc828065bd9f2dd7ecef4fd7dcd03729c5d257d8f31ce42184764bcea1d4c4aaee37d53ac63e1e44183c694f84
 DIST python-heatclient-0.5.0.tar.gz 104320 SHA256 
b64eadecea1ecab5b69c1f51ddd157d53d218dea1360c201843f28a052cb3dbf SHA512 
97ac1bb3ef1ca82730650e42dffa5dec2f1f37fac63c38a8c2de87b2ccf772b905749f4e9211831ec92871ebaee57a5094a4a1005e7391823a6dee27b0592dd8
 WHIRLPOOL 
fc90b7a21d70c9044cdb39d626584192dcc347f531f0dc83b5b349d8731b7e3e0278586f5dcec32d9be10d02a6a6cb53175c6088fc43857b9b874a979da77de2
 DIST python-heatclient-0.6.0.tar.gz 109553 SHA256 
fe293e11d145d86b92649063eb50d1f599dab88a327707d76a72b12022b77bbb SHA512 
04b8836c212a8825b6ffb839715df881189a08e3c587762a661744bdd730d6aaf99c9e3497642011b0696692c856e12131bc8d1ff6a69cb88ae5b48aa3872b39
 WHIRLPOOL 
683497a0363ce636499af5866838242ef1fc2769c54d5ddf32e8dcfd5d0d2f3b648d46c0bb59c14bf1043875bf65ec99b090add1a289c9c95d383ce5ba918e3f
+DIST python-heatclient-0.7.0.tar.gz 119131 SHA256 
6f58a3c759056dbcbf071e1707d6649e6d15cfc710daa1b98e9703b83a4a01c2 SHA512 
5c9f12b08abaa9ff07a0dd72ceef7b205ae2afeb4d8900b2e1c3f709fc6df63f56f9d31b45acc17cfb51a1ec849bd3cd271877d9489c40d665488346531c97f0
 WHIRLPOOL 
0c911dca2dd48229c83ff83bcfa699d07e0ea39b3bbfff5bd3e3e7fbe62fa747ade252bb7ad320334c4bc9fd481c2c528058368d8828e56c20c0254105559035

diff --git a/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild 
b/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
deleted file mode 100644
index 9212361..000
--- a/dev-python/python-heatclient/python-heatclient-0.2.12.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-DISTUTILS_IN_SOURCE_BUILD=TRUE  # Needed due to versioned test patches
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Orchestration API Client Library"
-HOMEPAGE="http://www.openstack.org/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# NOTE: doc is broken due to pbr requiring a git checkout
-
-# NOTE: dev-python/discover is not used in tests
-# dev-python/discover[${PYTHON_USEDEP}]
-
-CDEPEND="
-   >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-   !~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-   https://bugs.launchpad.net/python-heatclient/+bug/1313257
-   ebegin 'patching heatclient/tests/test_common_http.py'
-   sed \
-   -e '651,/def/ d' \
-   -i heatclient/tests/test_common_http.py
-   STATUS=$?

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

[Brian Dolbec]

commit: a76e5418e340a9012bcb87b75d6c2a5f355e03af
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Sep  3 16:49:37 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Sep  3 16:53:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a76e5418

dev-python/pyDeComp: New package, initial live ebuild

Package-Manager: portage-2.2.20

 dev-python/pyDeComp/metadata.xml | 18 +
 dev-python/pyDeComp/pyDeComp-.ebuild | 45 
 2 files changed, 63 insertions(+)

diff --git a/dev-python/pyDeComp/metadata.xml b/dev-python/pyDeComp/metadata.xml
new file mode 100644
index 000..5b985b6
--- /dev/null
+++ b/dev-python/pyDeComp/metadata.xml
@@ -0,0 +1,18 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   releng
+   
+   dol...@gentoo.org
+   Brian Dolbec
+   
+   A python interface library for common compression ,
+   decompression and contents generation.  It aims to create a 
simple,
+   easily extended and configurable common interface to various 
compressison
+   routines.  It can easily be extended with with custom 
compression,
+   decompression, and contents definitions.
+   
+   
+   dol-sen/pyDeComp
+   
+

diff --git a/dev-python/pyDeComp/pyDeComp-.ebuild 
b/dev-python/pyDeComp/pyDeComp-.ebuild
new file mode 100644
index 000..bce3935
--- /dev/null
+++ b/dev-python/pyDeComp/pyDeComp-.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+
+EGIT_BRANCH="master"
+
+inherit distutils-r1 python-r1 git-2
+
+EGIT_REPO_URI="git://github.com/dol-sen/pyDeComp.git"
+
+DESCRIPTION="A python interface library for common compression, decompression 
and contents handling"
+HOMEPAGE="https://github.com/dol-sen/pyDeComp;
+SRC_URI=""
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+KEYWORDS=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+   "
+
+python_install_all() {
+   distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+   einfo
+   einfo "This is experimental software."
+   einfo "The API's it installs should be considered unstable"
+   einfo "and are subject to change."
+   einfo
+   einfo "Please file any enhancement requests, or bugs"
+   einfo "at https://github.com/dol-sen/pyDeComp/issues;
+   einfo "I am also on IRC @ #gentoo-releng of the freenode network"
+   einfo
+   ewarn "There may be some python 3 compatibility issues still."
+   ewarn "Please help debug/fix/report them in github or bugzilla."
+}

[gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/, pym/portage/util/, pym/portage/tests/util/, bin/

[Mike Frysinger]

commit: 717fc43b3b1daa021eca606bbaa59dea5f456163
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Oct 16 20:48:58 2013 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Sep  3 17:41:46 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=717fc43b

xattr: centralize the various shims in one place

Rather than each module implementing its own shim around the various
methods for accessing extended attributes, start a dedicated module
that exports a consistent API.

 bin/quickpkg |  12 +-
 bin/xattr-helper.py  |  11 +-
 pym/portage/dbapi/vartree.py |  10 +-
 pym/portage/tests/util/test_xattr.py | 178 +++
 pym/portage/util/_xattr.py   | 228 +++
 pym/portage/util/movefile.py | 100 ---
 pym/portage/util/xattr.py|  20 ---
 7 files changed, 441 insertions(+), 118 deletions(-)

diff --git a/bin/quickpkg b/bin/quickpkg
index 726abff..262fda4 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -21,8 +21,8 @@ from portage.dbapi.dep_expand import dep_expand
 from portage.dep import Atom, use_reduce
 from portage.exception import (AmbiguousPackageName, InvalidAtom, InvalidData,
InvalidDependString, PackageSetNotFound, PermissionDenied)
-from portage.util import ConfigProtect, ensure_dirs, shlex_split
-import portage.util.xattr as _xattr
+from portage.util import ConfigProtect, ensure_dirs, shlex_split, _xattr
+xattr = _xattr.xattr
 from portage.dbapi.vartree import dblink, tar_contents
 from portage.checksum import perform_md5
 from portage._sets import load_default_config, SETPREFIX
@@ -36,7 +36,7 @@ def quickpkg_atom(options, infos, arg, eout):
vartree = trees["vartree"]
vardb = vartree.dbapi
bintree = trees["bintree"]
-   xattr = 'xattr' in settings.features
+   xattrs = 'xattr' in settings.features
 
include_config = options.include_config == "y"
include_unmodified_config = options.include_unmodified_config == "y"
@@ -137,8 +137,8 @@ def quickpkg_atom(options, infos, arg, eout):
# The tarfile module will write pax headers holding the
# xattrs only if PAX_FORMAT is specified here.
tar = tarfile.open(binpkg_tmpfile, "w:bz2",
-   format=tarfile.PAX_FORMAT if xattr else 
tarfile.DEFAULT_FORMAT)
-   tar_contents(contents, root, tar, protect=protect, 
xattr=xattr)
+   format=tarfile.PAX_FORMAT if xattrs else 
tarfile.DEFAULT_FORMAT)
+   tar_contents(contents, root, tar, protect=protect, 
xattrs=xattrs)
tar.close()
xpak.tbz2(binpkg_tmpfile).recompose_mem(xpdata)
finally:
@@ -238,7 +238,7 @@ def quickpkg_main(options, args, eout):
eout.eerror("No write access to '%s'" % bintree.pkgdir)
return errno.EACCES
 
-   if 'xattr' in portage.settings.features and not hasattr(_xattr, 
'getxattr'):
+   if 'xattr' in portage.settings.features and not _xattr.XATTRS_WORKS:
eout.eerror("No xattr support library was found, "
"so xattrs will not be preserved!")
portage.settings.unlock()

diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py
index 3e9b81e..19f25f9 100755
--- a/bin/xattr-helper.py
+++ b/bin/xattr-helper.py
@@ -19,16 +19,7 @@ import re
 import sys
 
 from portage.util._argparse import ArgumentParser
-
-if hasattr(os, "getxattr"):
-
-   class xattr(object):
-   get = os.getxattr
-   set = os.setxattr
-   list = os.listxattr
-
-else:
-   import xattr
+from portage.util._xattr import xattr
 
 
 _UNQUOTE_RE = re.compile(br'\\[0-7]{3}')

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 927c645..5ba8d9d 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -35,7 +35,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.util.movefile:movefile',
'portage.util.path:first_existing,iter_parents',
'portage.util.writeable_check:get_ro_checker',
-   'portage.util:xattr@_xattr',
+   'portage.util._xattr:xattr',
'portage.util._dyn_libs.PreservedLibsRegistry:PreservedLibsRegistry',
'portage.util._dyn_libs.LinkageMapELF:LinkageMapELF@LinkageMap',
'portage.util._async.SchedulerInterface:SchedulerInterface',
@@ -5268,7 +5268,7 @@ def write_contents(contents, root, f):
f.write(line)
 
 def tar_contents(contents, root, tar, protect=None, onProgress=None,
-   xattr=False):
+   xattrs=False):
os = _os_merge
encoding = _encodings['merge']
 
@@ -5390,13 +5390,13 @@ def tar_contents(contents, root, tar, protect=None, 
onProgress=None,

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

[Miroslav Šulc]

commit: c65a30c63935be2101dd2b2e33f861ecbe92fe63
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep  3 16:50:32 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep  3 16:50:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65a30c6

www-servers/tomcat: version bump

Package-Manager: portage-2.2.20.1

 www-servers/tomcat/Manifest|   1 +
 .../tomcat/files/tomcat-7.0.64-build.xml.patch | 149 +
 www-servers/tomcat/tomcat-7.0.64.ebuild| 146 
 3 files changed, 296 insertions(+)

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1b82f42..c486b11 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,6 @@
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
 WHIRLPOOL 
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 
3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 
acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb
 WHIRLPOOL 
4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-7.0.63-src.tar.gz 4577737 SHA256 
443aa92f2668906fb24cc43ba952068240f445df637a6e5da8d4661527536657 SHA512 
677b28aa0131d309aed83afc73a778c16fd27a187e971ea6929b9b6b65268caa2a67cc468b15565a7d5944a60e8528cc26c82437b476ebc41ff9556367349d8a
 WHIRLPOOL 
a208ac63ed6f7ce7ac23674d8bb20d523b3fb5d10dfb46d292004f9b296986c4cab690f0252ad53bb4c625c3f58e04b9ddcda5a580fdafea20118b93f544760c
+DIST apache-tomcat-7.0.64-src.tar.gz 4592198 SHA256 
d805dec3b387a244c4285ce1f9fc5028bb836716db52f1b1b5036a97dd9ec4dc SHA512 
180479b0f5b5604597f850676235fab1f3e63051b503cfa3b4da1e6820505dece73f502249b6e032cfaaad18c9e2d4c057c9854ae5cbf088b214b51e0687ed8c
 WHIRLPOOL 
a461d7deae890227052bd83ac97c698821b1f6d6ff97c179b124de9b1b7ccdf1498651a391a03008b840fac730c080682f207db4d44e76d15dba63b266ddee51
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 
6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 
cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c
 WHIRLPOOL 
b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 DIST apache-tomcat-8.0.24-src.tar.gz 4888751 SHA256 
184b0d8bda512204a2e565f9175a13f9772a9d13185e1aa228394b45c641474c SHA512 
af5619a63db3d1f6d39eb0290c83a38272c31803ee39a40aebfba5f7a0cf67d830ffcbebe518aff8de4a1f8eb44021975d7e43d45b4bd9804e8ca9cfbfc4904a
 WHIRLPOOL 
4d37f4d1fe3ee138252813bd4a65025d0ccceea8aec57aa0c9474ad4902f85938627277f6e4ece30793326c31d7790b0ca0b8d99d7b21857519d7c22c28794e8

diff --git a/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch 
b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
new file mode 100644
index 000..481591f
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.64-build.xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.63-src.orig/build.xml 
apache-tomcat-7.0.63-src/build.xml
+--- apache-tomcat-7.0.63-src.orig/build.xml2015-06-30 09:15:44.0 
+0100
 apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100
+@@ -660,12 +660,14 @@
+   
+ 
+ 
++
+ 
+   
+ 
+@@ -721,26 +723,32 @@
+   manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+ 
++
+ 
+ 
++
+ 
+ 
++
+ 
+ 
+ 
+ 
++
+ 
+ 
+ 
+@@ -1051,14 +1061,15 @@
+ 
+   
+ 
++
+ 
+ 
+-
++
+ 
+ 
+ 
++  description="Prepare to build web services extras package" 
unless="noget">
+ 
+ 
+   
+@@ -1886,6 +1897,7 @@
+ description="Create the Tomcat javadoc" >
+ 
++
+ 
+ 
+   
++
+   
+   http://docs.oracle.com/javase/7/docs/api/"/>
+   http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2642,7 +2657,7 @@
+   
+ 
+   
++  description="Download (and build) components necessary to compile" 
unless="noget">
+ 
+ 
+   
+@@ -2699,7 +2714,7 @@
+   
+ 
+   
++  description="Download additional components for the tests" 
unless="noget">
+ 
+ 
+   
+@@ -2727,7 +2742,7 @@
+   
+ 
+   
++  description="Download additional components for a distribution" 
unless="noget">
+ 
+ 
+   

diff --git a/www-servers/tomcat/tomcat-7.0.64.ebuild 
b/www-servers/tomcat/tomcat-7.0.64.ebuild
new file mode 100644
index 000..ec08f2d
--- /dev/null
+++ 

[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/

[Andrey Grozin]

commit: 3fa0482341d1a9711700e5eaee060e0d5397acd4
Author: Andrey Grozin  gentoo  org>
AuthorDate: Thu Sep  3 16:38:02 2015 +
Commit: Andrey Grozin  gentoo  org>
CommitDate: Thu Sep  3 16:54:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa04823

sci-geosciences/qmapshack: initial import

Package-Manager: portage-2.2.20.1

 sci-geosciences/qmapshack/Manifest   |  1 +
 sci-geosciences/qmapshack/metadata.xml   | 15 +++
 sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild | 21 +
 3 files changed, 37 insertions(+)

diff --git a/sci-geosciences/qmapshack/Manifest 
b/sci-geosciences/qmapshack/Manifest
new file mode 100644
index 000..085cd02
--- /dev/null
+++ b/sci-geosciences/qmapshack/Manifest
@@ -0,0 +1 @@
+DIST qmapshack-1.3.0.tar.gz 4306608 SHA256 
8eb9b07e2170d435aa086930e8c12f53cc9f89e7617adcf6a73b5a76f4081b0d SHA512 
bf58bc7a2b9612cddb63801737c31b5910f8cbf255ebbc4abac42cb7404040074436ac6fa9a85982a31c1499cedc21fb13885e4daa650eb3567f8115528db385
 WHIRLPOOL 
d85bbc15df93a9d86c57126f8b8c85dce5e10fcac1ca2b9bb8c32b8abd9f8796e3e4c415d712bf7dc8aa9c8542715f45ca81aca9cfd6d67685fe6984180c5ddd

diff --git a/sci-geosciences/qmapshack/metadata.xml 
b/sci-geosciences/qmapshack/metadata.xml
new file mode 100644
index 000..b9960f6
--- /dev/null
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+sci
+
+  gro...@gentoo.org
+  Andrey Grozin
+
+
+  Use QMapShack to plan your next outdoor trip or to visualize and archive
+  all the GPS recordings of your past exciting adventures.
+  QMapShack is the next generation of the famous QLandkarte GT application.
+  And of course it's even better and easier to use.
+
+

diff --git a/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild 
b/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
new file mode 100644
index 000..9a118c7
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home;
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz;
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebkit:5
+   dev-qt/linguist-tools:5
+   dev-qt/qtscript:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtdbus:5
+   sci-libs/gdal
+   sci-libs/proj"
+DEPEND="${RDEPEND}"

[gentoo-commits] proj/portage:master commit in: /

[Mike Frysinger]

commit: 2b334c2424d669677037c1b82acbc3a464f8012a
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Sep  3 17:55:44 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Sep  3 17:55:44 2015 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=2b334c24

runtests: fix typo in help

 runtests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtests b/runtests
index d1f7b6f..36243c6 100755
--- a/runtests
+++ b/runtests
@@ -82,7 +82,7 @@ List all the available unittests.
 $ %(prog)s --list
 
 Run against specific versions of python.
-$ %(prog)s --python-version '2.7 3.3'
+$ %(prog)s --python-versions '2.7 3.3'
 
 Run just one unittest.
 $ %(prog)s pym/portage/tests/xpak/test_decodeint.py

[gentoo-commits] proj/tinderbox-cluster:master commit in: pym/tbc/

[Magnus Granberg]

commit: aac3ed04e3bc5d555b2432ea40dd262335dfd776
Author: Magnus Granberg  gentoo  org>
AuthorDate: Thu Sep  3 21:02:29 2015 +
Commit: Magnus Granberg  gentoo  org>
CommitDate: Thu Sep  3 21:02:29 2015 +
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=aac3ed04

Add support move from cvs to git

 pym/tbc/db_mapping.py |  7 ++--
 pym/tbc/package.py| 91 ++-
 pym/tbc/qachecks.py   | 97 ---
 pym/tbc/sync.py   | 17 -
 4 files changed, 44 insertions(+), 168 deletions(-)

diff --git a/pym/tbc/db_mapping.py b/pym/tbc/db_mapping.py
index dbae5a8..82318a1 100644
--- a/pym/tbc/db_mapping.py
+++ b/pym/tbc/db_mapping.py
@@ -103,7 +103,7 @@ class PackagesEmails(Base):
 class PackagesMetadata(Base):
Id = Column('id', Integer, primary_key=True)
PackageId = Column('package_id', Integer, 
ForeignKey('packages.package_id'))
-   Changlog = Column('changlog', Text)
+   Gitlog = Column('gitlog', Text)
Descriptions = Column('descriptions', Text)
__tablename__ = 'packages_metadata'
 
@@ -278,6 +278,7 @@ class EbuildsKeywords(Base):
 class EbuildsMetadata(Base):
Id =  Column('id', Integer, primary_key=True)
EbuildId = Column('ebuild_id', ForeignKey('ebuilds.ebuild_id'))
-   Revision = Column('revision', String(30))
-   Descriptions = Column('descriptions', String(200))
+   Commit = Column('commit', String(100))
+   New = Column('new', Boolean, default=False)
+   Descriptions = Column('descriptions', Text)
__tablename__ = 'ebuilds_metadata'

diff --git a/pym/tbc/package.py b/pym/tbc/package.py
index 980b089..6224846 100644
--- a/pym/tbc/package.py
+++ b/pym/tbc/package.py
@@ -5,12 +5,13 @@ from __future__ import print_function
 import re
 import hashlib
 import os
+import git
 import portage
 from portage.xml.metadata import MetaDataXML
 from tbc.flags import tbc_use_flags
 from tbc.text import get_ebuild_cvs_revision, get_log_text_dict
 from tbc.flags import tbc_use_flags
-from tbc.qachecks import digestcheck, check_repoman
+from tbc.qachecks import check_repoman
 from tbc.build_log import check_repoman_full
 from tbc.sqlquerys import add_logs, get_package_info, get_config_info, \
add_new_build_job, add_new_ebuild_sql, get_ebuild_id_list, 
add_old_ebuild, \
@@ -99,9 +100,10 @@ class tbc_package(object):
add_logs(self._session, log_msg, "info", 
self._config_id)
log_msg = "C %s:%s ... Fail." % (cpv, repo)
add_logs(self._session, log_msg, "info", 
self._config_id)
-   ebuild_version_cvs_revision_tree = '0'
+   git_commit = '0'
else:
-   ebuild_version_cvs_revision_tree = 
get_ebuild_cvs_revision(pkgdir + "/" + package + "-" + ebuild_version_tree + 
".ebuild")
+   git_commit = '0'
+   #FIXME The git commit need to be fixed or when $ID get fixed
 
# Get the ebuild metadata
ebuild_version_metadata_tree = self.get_ebuild_metadata(cpv, 
repo)
@@ -123,7 +125,8 @@ class tbc_package(object):
attDict['checksum']= ebuild_version_checksum_tree
attDict['ebuild_version_metadata_tree'] = 
ebuild_version_metadata_tree
#attDict['ebuild_version_text_tree'] = 
ebuild_version_text_tree[0]
-   attDict['ebuild_version_revision_tree'] = 
ebuild_version_cvs_revision_tree
+   attDict['git_commit'] = git_commit
+   attDict['New'] = False
attDict['ebuild_version_descriptions_tree'] = 
ebuild_version_metadata_tree[7]
return attDict
 
@@ -161,33 +164,12 @@ class tbc_package(object):
add_logs(self._session, 
log_msg, "info", self._config_id)
i = i +1
 
-   def get_changelog_text(self, pkgdir):
-   changelog_text_dict, max_text_lines = get_log_text_dict(pkgdir 
+ "/ChangeLog")
-   spec = 3
-   spec_tmp = 1
-   changelog_text_tree = ''
-   for index, text_line in changelog_text_dict.items():
-   if index == max_text_lines:
-   if not re.search('^\n', text_line):
-   changelog_text_tree = 
changelog_text_tree + text_line
-   break
-   elif re.search('^#', text_line):
-   pass
-   elif re.search('^\n', text_line) and re.search('^#', 
changelog_text_dict[index - 1]):
-   pass
-   elif re.search('^\n', text_line) and re.search('^\*', 
changelog_text_dict[index + 1]):
-   changelog_text_tree = 

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

[Anthony G. Basile]

commit: d692db1678bbce6b887c79f79bd25b793095a662
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Sep  3 21:36:47 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Sep  3 21:36:47 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d692db16

dev-libs/openssl: stable on ppc, bug #555176

Package-Manager: portage-2.2.20.1

 dev-libs/openssl/openssl-1.0.2d.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/openssl/openssl-1.0.2d.ebuild 
b/dev-libs/openssl/openssl-1.0.2d.ebuild
index 37fe1cd..6b42774 100644
--- a/dev-libs/openssl/openssl-1.0.2d.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2d.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh ~sparc 
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc 
~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs 
test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 

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

[Matt Thode]

commit: 37b98f859821ea5b9171e9dc078da20ecf262b6c
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:56:42 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 22:00:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b98f85

dev-python/oslo-messaging: bup for liberty v2

Package-Manager: portage-2.2.20.1

 .../oslo-messaging/oslo-messaging-2.4.0.ebuild | 43 --
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild 
b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
index 0a0b6d9..f1332c9 100644
--- a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1
 
@@ -23,18 +23,15 @@ CDEPEND="
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
-   >=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-   =dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-   >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+   >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+   >=dev-python/mock-1.2[${PYTHON_USEDEP}]
>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-   >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-   !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-   >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-   dev-python/qpid-python[${PYTHON_USEDEP}]
+   >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+   dev-python/qpid-python[$(python_gen_usedep 'python2*')]
>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
@@ -45,24 +42,32 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
)"
 RDEPEND="
${CDEPEND}
-   >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-   >=dev-python/oslo-context-0.2.0
-   >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+   >=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/oslo-service-0.6.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-   >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+   >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-   >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-   !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+   >=dev-python/cachetools-1.0.0[${PYTHON_USEDEP}]
+   >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+   >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-   >=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-   >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-   >=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
+   >=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
+   >=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+   >=dev-python/oslo-middleware-2.4.0[${PYTHON_USEDEP}]
+   !~dev-python/oslo-middleware-2.6.0[${PYTHON_USEDEP}]
>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
 "
 
-# This time half the doc files are missing; Do you want them?
+python_prepare_all() {
+   sed -i '/^hacking/d' test-requirements.txt || die
+   distutils-r1_python_prepare_all
+}
 
 python_test() {
nosetests tests/ || die "test failed under ${EPYTHON}"

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

[Matt Thode]

commit: b76edcf26a2a43d76f9205771bc8459a1f43d914
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:55:42 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 22:00:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76edcf2

dev-python/oslo-service: adding for liberty

 dev-python/oslo-service/Manifest  |  1 +
 dev-python/oslo-service/metadata.xml  | 10 
 dev-python/oslo-service/oslo-service-0.9.0.ebuild | 58 +++
 3 files changed, 69 insertions(+)

diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
new file mode 100644
index 000..5889a76
--- /dev/null
+++ b/dev-python/oslo-service/Manifest
@@ -0,0 +1 @@
+DIST oslo.service-0.9.0.tar.gz 57558 SHA256 
f77753910391a1b2bd7fd9b5b863d7230b1ff727443dd2efcb725ce937ffb566 SHA512 
6e17d1e28682732c8866e43f509a7fd7f69d2718493de3dab939600207e56fd0622036ff62928b9855b6219729e1173e62e1a1c949959a5d2d58eeeded97a1e2
 WHIRLPOOL 
be645ac0d461056d5df4d17bbfe6f3819d6eba4fd2764459d287badf056d5c962e2c690b64fceba72160094ca1d29ff5f6c7708fef90bd192faa8ba532a4d4bb

diff --git a/dev-python/oslo-service/metadata.xml 
b/dev-python/oslo-service/metadata.xml
new file mode 100644
index 000..d5dfd32
--- /dev/null
+++ b/dev-python/oslo-service/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   prometheanf...@gentoo.org
+   Matthew Thode
+   
+   
+   
+

diff --git a/dev-python/oslo-service/oslo-service-0.9.0.ebuild 
b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
new file mode 100644
index 000..9b1f4f6
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-0.9.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
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for running OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.service;
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   >=dev-python/pbr-1.3[${PYTHON_USEDEP}]
+   

[gentoo-commits] proj/musl:master commit in: net-misc/openssh/, net-misc/openssh/files/

[Anthony G. Basile]

commit: e9d6a1e0b883f7766516f48c1c097393ce8230ad
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Sep  3 21:58:22 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Sep  3 21:58:22 2015 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=e9d6a1e0

net-misc/openssh: 6.9 fails on ppc because of __stack_chk_fail_local.

Package-Manager: portage-2.2.20.1
RepoMan-Options: --force
Manifest-Sign-Key: 0x9384FA6EF52D4BBA

 net-misc/openssh/Manifest  |  20 +-
 .../openssh/files/openssh-6.4_p1-x509-glue.patch   |  30 --
 .../openssh-6.4p1-fix-typo-construct_utmpx.patch   |  21 -
 .../files/openssh-6.4p1-missing-sys_param_h.patch  |  67 
 .../files/openssh-6.7_p1-sctp-x509-glue.patch  |  42 --
 .../openssh-6.7_p1-sshd-gssapi-multihomed.patch| 162 
 .../openssh/files/openssh-6.7_p1-x509-glue.patch   |  46 ---
 .../openssh/files/openssh-6.7p1-avoid-exit.patch   | 441 -
 .../openssh-6.8_p1-ssl-engine-configure.patch  |  33 ++
 ...6.7_p1-r99.ebuild => openssh-6.9_p1-r99.ebuild} | 198 +
 10 files changed, 131 insertions(+), 929 deletions(-)

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 7ec1e09..93e1dc2 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,23 +1,17 @@
 AUX openssh-4.7_p1-GSSAPI-dns.patch 4494 SHA256 
88a08f349258d4be5b2faa838a89fe1aa0196502990b745ac0e3a70dda30a0d7 SHA512 
4d00a9ed79f66b92502c3e5ee580523f63d7b3643fe1bd330ff97994acce527d4d285d38199cef66eddc0ef68afabf7b268abc60cba871bac5d2e99045d4ac11
 WHIRLPOOL 
2f118fd2f016c529dbc31e8f2b6b418931e6770ab02c28b7feeaba93e84e7fcd1c742f4420a43a9fec0bdfaa4d4bc7cf14fb860c0a56c68a30e7b136fb60bcdb
 AUX openssh-6.3_p1-x509-hpn14v2-glue.patch 1451 SHA256 
d7179b3c16edd065977aaf56a410e2b9b237206fb619474f312972b430b73c8d SHA512 
02577e3f718ff994bb4e962189f17048b4c03104d0a1981683f3c6a1d6d30701db368e132102c8396da2c0f5eb2f6602b26f32f74d19382af34bd9a93fc508f3
 WHIRLPOOL 
b7d224d71634f380bd31b3a1dd3e588a29582255f717a6a308738ad58b485b693d827a53704479995ec2ebca53c9dc9b2113d8de52a1336b67ce83943f946b77
-AUX openssh-6.4_p1-x509-glue.patch 1445 SHA256 
cf18f17b12514692a4e33d5fb995f5ba1bc1ea258c80babb38516d8def7d0bc3 SHA512 
e5c51fd639e95ca9c7820974684117861cc58cf5172c7c44deaaca106c1e91a931421720cb210652aef30ffa41bc96efe04dbedf996120b40143080fc6b2b47d
 WHIRLPOOL 
7c7065a22cc6237a927e6d6c0f7b4bfa7b57e32ffd8b3d70ed9e70b9a882a95ce40478873374460a6173cc5a33c22ddfbbded783568049f1b4fccb5f5253d4bf
-AUX openssh-6.4p1-fix-typo-construct_utmpx.patch 796 SHA256 
844bfa729eb63cd4c05c1dc518d34263f4da4e0f1510c39b27b8c15c0a23459c SHA512 
d7d5dcee89b1b427098bcd8ff44d99aebb4ab077af450b89aa432796a4398e1516fe4a75fdb2ae6ef71b702ad1af5766af040316e37d3f71bce65de5be59830e
 WHIRLPOOL 
c01570bdcde7ca2c03df0db62c1c59486cf94380e6ce27104a897407d90c862e6f88ef3584f28c3c59a3744c64ad9405c6daf1053d241354bdc064d77520b03e
-AUX openssh-6.4p1-missing-sys_param_h.patch 2139 SHA256 
0be81f4fbcabb1e8a5459f4b41f179498cef5e3411435c16fc9b36e3f619d79e SHA512 
c7f997a5351d464b9d86f1b5ae221a9788a0c77ccaf7a4d2a4e266033fc58d0dede9c7fca8cfee36cfad328513d9ba6bb735be0e778a8ce489ad98d81110f579
 WHIRLPOOL 
1355becb4460a4749145fcc786fd45c260d779176761ae37e27de81072f8c84fdd16f2f1c6ea0d7576ba09e048d8be85a0449987ef2097ed5c5defca8ebb5b26
 AUX openssh-6.7_p1-openssl-ignore-status.patch 765 SHA256 
b068cc30d4bce5c457cea78233396c9793864ec909f810dd0be87d913673433a SHA512 
ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb9691a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7
 WHIRLPOOL 
c0a4ff69d65eeb40c1ace8d5be6f8e59044a8f16dc6b37e87393e79ab80935abf30a9d2a6babc043aba0477f5f79412e1ae5d373daba580178fd85ca1f60e60b
-AUX openssh-6.7_p1-sctp-x509-glue.patch 1326 SHA256 
42eb87eda1685e19add23c1304f17dabd99a1a38a57bfe2bfbb70ab85f6d385e SHA512 
7f014e2b1893a5240680e2e14475d61b9b6047d1be3fe404d5971a899c122cc624546e9e5b31bfee5905cf7b4605a0871c3b00ed5c2bd28d84755a49392e1a69
 WHIRLPOOL 
8d6888163068dbc486bc4eff0dd7d4053f68b9848347eb520dd7d382b0b8c74e3016f7f3ed401c2c2dfd48e73a9077fb9777d39c0f236cc500c53393be426b42
-AUX openssh-6.7_p1-sshd-gssapi-multihomed.patch 5489 SHA256 
d2a1735b523709a4b4ceaa57862ecb21a95656678bacc5b7da59dc46187ad997 SHA512 
a8b8d2c2ab4520c8c7315f6130ee44fec48935a129ce7c7e51a068a4de2c7528980437246b61e4abc4cff614466f8054c554cdbaad4eb0d1f4afcfb434c30bbc
 WHIRLPOOL 
e4b97398c324360576a04792357f66be3ed9f17e4113f75275f8422ee0b7ecf28073c7cde01a63e24fa0901b14db822d22d7d2c5936bbee3bd5874a867066967
-AUX openssh-6.7_p1-x509-glue.patch 1633 SHA256 
58031e90e0bf220028934ab590af6ccfc45722629b2416df13d84f10c9b94478 SHA512 
364ca0280be5cc83d1dedf7727323fd5fc0093c6dbcf9cc8ccaa30ee754b866584be28da1166953f03faf8745d6364e33fad7daad9be9a29681a8674eb9d292b
 WHIRLPOOL 
b79a6cff897be78793bbf2ca03154103aa1380647b8c53e104155fd68122568a8e7dea23996213b192e4269f980b1035d3ca395dbd2c318fd81a45f44d110c31
-AUX openssh-6.7p1-avoid-exit.patch 9766 SHA256 

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

[Matt Thode]

commit: 12861beb24427df23ce72acb774c8ae5352aebde
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:44:20 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 22:00:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12861beb

dev-python/oslo-middleware: update for liberty

 dev-python/oslo-middleware/Manifest|  1 +
 .../oslo-middleware/oslo-middleware-2.8.0.ebuild   | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/dev-python/oslo-middleware/Manifest 
b/dev-python/oslo-middleware/Manifest
index 5b1ab12..135db26 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -4,3 +4,4 @@ DIST oslo.middleware-1.0.0.tar.gz 23209 SHA256 
5ccf160ae5ce23f3f59b86535352e3b5a
 DIST oslo.middleware-1.1.0.tar.gz 29957 SHA256 
0647456ebf1611e2a0efc445673af3583780b0ccf694f61a8830d54fb5d6f63c SHA512 
ae497098fe4edccf79ce93de1bd42967081616a81f7be8ec255a8732021943e8f377a6b57f6cc23c992506a5bed2641299d2653fcce6f6619d2ca1eff318cf71
 WHIRLPOOL 
410e422ea3b36e843e2ee91d64c23d84ffd86819bfca7e226fda3f1c2a6d11c9e8a8a4e7d5696764ce276a0b9984becf9361967861c17676b4fd9d77894baf82
 DIST oslo.middleware-1.2.0.tar.gz 29850 SHA256 
0597ae9df233ba58e3f58e03878ba1f1d34a30918895bb109ebe50d8760495b7 SHA512 
021836c40d096d96effc904a1ddd4889dde7f40e598aa435be3e8b5a0ff5dce013515bae878bf4eb05680fe01737c9fa20701de46bad151e7b795b229309e9db
 WHIRLPOOL 
627b3c968e806cb1256768286ea580aa2ff4edd37107e3873db52030224cddda19ae2a4b341616f6a103dc4c456260d5c02f6645be4bf805758587eb54fece68
 DIST oslo.middleware-1.3.0.tar.gz 29172 SHA256 
9e0fcf28f5d635c10e684bce26524e79a9da78a5c3d380c6759d2f419a0ff1c5 SHA512 
39f3ba43aac0839aa47112eb6406286ae5e9ff92c53b46540e456d885617ad583a5a1ec3d86bdd1f95be9bb31354b3dba061da1fe28e6174ce01adc75901e6c7
 WHIRLPOOL 
05d57f094c22cddae6982cd3cc45cbf2fb881b181eceb39fc7295e9f930425180d4c2e72ce0ee700c979dffd0f40bc65d4d83eaada424553cc047cb7a8123db3
+DIST oslo.middleware-2.8.0.tar.gz 35432 SHA256 
ec4c4da59abaa441814d85610f911df4be405a98f9c4af0482dc2fa03f3d2bac SHA512 
73c3d18a2d97a3a06436e31124a73c6196f874a3b99ca3e698bc73426461ab4402545e53eb12fa048030508f32d523c47978723b51d30490529686b7e119087f
 WHIRLPOOL 
419a21db7c26b31ec40fc7b28ba9b1fff600c3169e069184968af05a3631779f1e79e0159ce30752aee91f049b68b96add647d6d0988a70d0cd59776722f2538

diff --git a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild 
b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
new file mode 100644
index 000..76c6447
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library includes components to be injected into wsgi pipelines to 
intercept request/response flows."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware;
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
+S="${WORKDIR}/oslo.middleware-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+  >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+   

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

[Matt Thode]

commit: 1e62971f98f00ce34c1cc0c48762089a3381e5d7
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:25:24 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 21:28:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e62971f

dev-python/oslo-middleware: bup for liberty

 dev-python/oslo-messaging/Manifest |  1 +
 .../oslo-messaging/oslo-messaging-2.4.0.ebuild | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/dev-python/oslo-messaging/Manifest 
b/dev-python/oslo-messaging/Manifest
index 8e9ab44..742c183 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -6,3 +6,4 @@ DIST oslo.messaging-1.8.0.tar.gz 201858 SHA256 
afff6d8367e6723a64dcb518d709d4ed0
 DIST oslo.messaging-1.8.2.tar.gz 208688 SHA256 
31222c9afe3b5655401424a6229f633bebf20cfe5027e69d2e12f7e954556f1a SHA512 
a8940635fb1d08871675730d2eb841af74896963d1f9624fec6ecff03e99f280091f342abba683aa9a5eac209009e75618f637571e34c5ef76fd8617f4ffe525
 WHIRLPOOL 
0fa2f5531178763ff607b062b8741ba02d396e868cc41a4e668e2ec26ef119f12dfa4261da418ec314c915e36e90f2cbd8da88f1bf559460fa0e442cd4a9b0f1
 DIST oslo.messaging-1.8.3.tar.gz 208757 SHA256 
149d325431e2c4415edd5bdaec0cff4e9109c02e8f428382610cfa1a238692ea SHA512 
98fd93a4ae366ac413ec0ad0310b669d9e0dddf61a03b2da40bfdfb3aec63de95a187556bcdecc19a209c38398f2ed0359aa05c9024bbad429e4c79c35b91b01
 WHIRLPOOL 
22f2a4237f874f3a681d3ea6e87bea7ed9759f967dfe8abfa8c6dc0f68d362b248f54b98fb7e64ff388de7c406f0cde29861fd17fe2fef5a8a688855b67c436c
 DIST oslo.messaging-1.9.0.tar.gz 214963 SHA256 
ac5f58378515597e6d5759653cac3828eb2ee6bb11e2bbf94ee0d65a692990ed SHA512 
2e7de860fed55b0548f3cfa4a911cba0750889fd807ed7addb83192dd37f84997ceecd92faf480be97873e58286748865c8c57a09014ae0de97c60be826cd27f
 WHIRLPOOL 
8e331116313757c93b2add853a35929e0a0603b691f9ffb322f4e39c422e13d83ee757277e42ce9b0360cf9e5823bb066a48fadc8eb706f7ebca018b014e1e06
+DIST oslo.messaging-2.4.0.tar.gz 181234 SHA256 
6e505e86ebd2115992d41db2ab4e2e2b946d2a2699ef205f84d74f1a62c710bf SHA512 
2d3b8dd220307d97fcf5e06269771d2c8b1412ed69e08258f4e77791a9b43077e787b8f21248c8282e53630d57c461034d93aa91d8d129ffe5e6d9abe871a72f
 WHIRLPOOL 
99c023e230505b06a75ae51f63d67de60fadf4f44851a6a50466dd865b6a3f9b39c949ce31c36fdd35917281700b316edac6301d2d6d64b2440fc22ad61e1681

diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild 
b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
new file mode 100644
index 000..0a0b6d9
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over a number of 
different messaging transports"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging;
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+   >=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+   

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

[Matt Thode]

commit: 2a55ca54d1891689a295ec95a9f9f06416faa9aa
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:27:00 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 21:29:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a55ca54

dev-python/keystonemiddleware: bup for liberty

Package-Manager: portage-2.2.20.1

 dev-python/keystonemiddleware/Manifest |  1 +
 .../keystonemiddleware-2.2.0.ebuild| 83 ++
 2 files changed, 84 insertions(+)

diff --git a/dev-python/keystonemiddleware/Manifest 
b/dev-python/keystonemiddleware/Manifest
index a035330..9b65ac9 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,2 +1,3 @@
 DIST keystonemiddleware-1.5.0.tar.gz 176315 SHA256 
73e98aab8bceb7843b6cc8aba2cbff824a379428519e2f9ffbb8e32578b38fe8 SHA512 
365643f7eba633587d8055204df04cfb40bdcc28c57d7ecf8c4ed67803b9b027b6334f868a1bc634d9beefd7410d74da08a7ed599637ec1656e6ef6196043dab
 WHIRLPOOL 
da7014869d3fc1ac5339671344542e33c22ac07adfb76ad00144cdcf4e1e26c60eea7ca7867cea6c6e105af1d05be64eff7d55ae1b3cf5114597da966b756b55
 DIST keystonemiddleware-1.5.2.tar.gz 176172 SHA256 
5f443162157946d2f33c4729d0bde55291f12963b0f1ee553984aedd8a509d51 SHA512 
172143f2e80860de3d89f53667bf670c1986cfc63a21392bf977b3beaa5669db76f46997d6939952856cb4abc970b57920810980d00db7e7cd711bdbede5908e
 WHIRLPOOL 
99a4553778b5dae07a710e78f816c8b30def42bfc7024cac7d6be8d8b6f76326383ed72935c6526758ac65fb26945937869985cba167d8804fe3a7cf2e3c4208
+DIST keystonemiddleware-2.2.0.tar.gz 179743 SHA256 
e3fca3fdc093d7fd3817bbd767faca7f0aa221b54155808694eb1286fae469f9 SHA512 
9aa498aa0bceec1774c70dc7fc4ce8c398e72721d33e715594b3396e160f9b60dfc3533687f0706eb272abd812b44d31b2a76fece739a2ccad33039b37f3fca5
 WHIRLPOOL 
a1b348e3e2f004038afa6b2b06d018d2e1130af1b2eb0e5740ea6a716dabaa98fe7a58cfd6e5100e5cdd6c7297fb150f4d9cc45dd8c831b7ca54a265b0d56662

diff --git a/dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild 
b/dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild
new file mode 100644
index 000..816e379
--- /dev/null
+++ b/dev-python/keystonemiddleware/keystonemiddleware-2.2.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+#PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A middleware for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/keystonemiddleware;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+   >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+   

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

[Matt Thode]

commit: 458d0e24114637c2333e9dacb4ea6051dcfbe90e
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:02:39 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 21:28:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458d0e24

dev-python/python-memcached: bup for openstack liberty

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

diff --git a/dev-python/python-memcached/Manifest 
b/dev-python/python-memcached/Manifest
index 47088fe..16f144d 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,2 +1,3 @@
 DIST python-memcached-1.53.tar.gz 35025 SHA256 
af04ea031b271a54f085166773e028fe053fc1d9a58cd8b3c3a57945990bfb48 SHA512 
33ffd2778025a8e15beddf1660c4b5c9f1ba144adab5c36fd679e15508015c00e3e1185b5cc179cfcfc556b7c3ab44ed9914089e5ce9db66a04d0a658dd38bb3
 WHIRLPOOL 
81b80a05010eec576ce8eb00ac4c799213bfc82af4dd3d3da138d02337d28dcb5fbefcbdf11e8d9344b307ba8b1ab2a770b8130fce2f732e484f283e2fe85aae
 DIST python-memcached-1.54.tar.gz 36662 SHA256 
df21d1431424c512901ecc3cd244039833aebc4bc7d345af403d4abdace20081 SHA512 
e66684fba5ac638efef971df14f4049f1aeae1a84a9c530f26560c1150d7b136746daa164754a0e451ee1caf0b24fd856083aa23f42be1bd4e90a6943d9e45ad
 WHIRLPOOL 
a2d1c60fba41002c03718a75659ff1c3944e32b3c900643af2ed227e6280af2635f068f27923ed1722ae1407cd3a1e9696e6c628e4898aaf73451105846c31cb
+DIST python-memcached-1.57.tar.gz 22620 SHA256 
3b689a135afb2fdb6da2298d5213780f43a3f210cf8c960d50b252acb3f62902 SHA512 
1862d9a5c7c29c8956384e1b951b59dba1fb2bbaeb1c3a99b1b917a93e04e0d86f4b38022a4b0146889448a2d2152e7282cdf33d0240126350dc88d34f216ad4
 WHIRLPOOL 
cda22d597848bf2ca138f0cc9cfedb9d1b58cf217568d6bf8ffe6b7ca2b9771f079db76e1b0fc577b079e717fd851007ec65859454ae6fc5eb369394bc205a6b

diff --git a/dev-python/python-memcached/python-memcached-1.57.ebuild 
b/dev-python/python-memcached/python-memcached-1.57.ebuild
new file mode 100644
index 000..77c2b9c
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.57.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=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ 
https://pypi.python.org/pypi/python-memcached;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+   test? (
+   net-misc/memcached
+   dev-python/nose[${PYTHON_USEDEP}]
+   )"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+# Tests try to connect to memcached via TCP/IP. Please do not re-enable
+# until you get them all to pass properly while using the UNIX socket
+# only and not even trying to connect to memcached over TCP/IP.
+RESTRICT=test
+
+python_test() {
+   # Note: partial. Needs fixing. Stuff like that.
+
+   cd "${TMPDIR}" || die
+
+   local memcached_opts=( -d -P memcached.pid -s memcached.socket )
+   [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+
+   memcached "${memached_opts[@]}" || die
+
+   "${PYTHON}" memcache.py --do-unix || die "Tests fail with ${EPYTHON}"
+
+   kill "$(

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

[Matt Thode]

commit: 4a5f1c0e277732566b6b105b260c6531c514c7da
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:24:23 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 21:28:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5f1c0e

dev-python/futurist: adding for liberty

 dev-python/futurist/Manifest  |  1 +
 dev-python/futurist/futurist-0.4.0.ebuild | 30 ++
 dev-python/futurist/metadata.xml  | 10 ++
 3 files changed, 41 insertions(+)

diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
new file mode 100644
index 000..7b9e62a
--- /dev/null
+++ b/dev-python/futurist/Manifest
@@ -0,0 +1 @@
+DIST futurist-0.4.0.tar.gz 27870 SHA256 
a0c97c7dc7bd8fa1abe0012c129a303ba652074709bfed6c71730bbfce6f18bf SHA512 
0ff6be28a5ce45458e9af4957ce17f55fbe2eb5971d365fe23b3e58486b702167fb9f0d2709d86c4eb3cbc92693e6a4de9ca7b858c5be083180c5bb34e331e6a
 WHIRLPOOL 
6b1694bd839c1c43602de50f3a2557f5ed3b16c9cc0c7b0a40a8a09b247e8df3ac486ff67e62ccf0de80ef1934e6925d38c34f6c7b0c46050d94f25b2078e6a5

diff --git a/dev-python/futurist/futurist-0.4.0.ebuild 
b/dev-python/futurist/futurist-0.4.0.ebuild
new file mode 100644
index 000..8a9f1b0
--- /dev/null
+++ b/dev-python/futurist/futurist-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful additions to futures, from the future."
+HOMEPAGE="https://pypi.python.org/pypi/futurist;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+   >=dev-python/pbr-1.4[${PYTHON_USEDEP}]
+   
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   prometheanf...@gentoo.org
+   Matthew Thode
+   
+   
+   
+

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

[Matt Thode]

commit: 3dca3ff446c3cc287ecf764abc896b9db8f4b71b
Author: Matthew Thode  mthode  org>
AuthorDate: Thu Sep  3 21:17:35 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Sep  3 21:28:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dca3ff4

dev-python/cachetools: adding for openstack-liberty

 dev-python/cachetools/Manifest|  1 +
 dev-python/cachetools/cachetools-1.1.0.ebuild | 21 +
 dev-python/cachetools/metadata.xml| 10 ++
 3 files changed, 32 insertions(+)

diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
new file mode 100644
index 000..1b667a3
--- /dev/null
+++ b/dev-python/cachetools/Manifest
@@ -0,0 +1 @@
+DIST cachetools-1.1.0.tar.gz 12901 SHA256 
089aca268864a5d1fd77ad96f51ef6afe011d7df55df21ca586968e2a24d68dd SHA512 
271b5ba5a373165cfccb47b50c3ffa384577e53a85eb58327e9ef716036a6129e0ad0f1ef16603817666eb7ab4cd781b7731ce8ea88dce47965b4e8e61fc3dab
 WHIRLPOOL 
1ce4c23bd974ed43ae0df6179a9bb8b3fd62705e63392a0f53ea054524afd6e93f753ba4ae6cccbb1fa44d7e7ffaf94493ef902dc81f3edaf7d6fb4ca4b5e9d3

diff --git a/dev-python/cachetools/cachetools-1.1.0.ebuild 
b/dev-python/cachetools/cachetools-1.1.0.ebuild
new file mode 100644
index 000..69dfd7e
--- /dev/null
+++ b/dev-python/cachetools/cachetools-1.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.python.org/pypi/cachetools;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"

diff --git a/dev-python/cachetools/metadata.xml 
b/dev-python/cachetools/metadata.xml
new file mode 100644
index 000..d5dfd32
--- /dev/null
+++ b/dev-python/cachetools/metadata.xml
@@ -0,0 +1,10 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   prometheanf...@gentoo.org
+   Matthew Thode
+   
+   
+   
+

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

[Justin Lecher]

commit: 4b405ca8f44ec99476647803b2d6a64e4e376e49
Author: Justin Lecher  gentoo  org>
AuthorDate: Wed Sep  2 13:32:30 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 05:52:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b405ca8

licenses: Update to new license text

Signed-off-by: Justin Lecher  gentoo.org>

 licenses/Intel-SDP | 902 +
 1 file changed, 837 insertions(+), 65 deletions(-)

diff --git a/licenses/Intel-SDP b/licenses/Intel-SDP
index d9a1794..e8bc8b6 100644
--- a/licenses/Intel-SDP
+++ b/licenses/Intel-SDP
@@ -1,74 +1,846 @@
-IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
-Do not copy, install, or use the Materials provided under this license 
agreement ("Agreement"), until you have carefully read the following terms and 
conditions.
+Note: There are multiple End User License Agreements in this document. Please 
read to the end:
 
-By copying, installing, or otherwise using the Materials, you agree to be 
bound by the terms of this Agreement.  If you do not agree to the terms of this 
Agreement, do not copy, install, or use the Materials.
+IMPORTANT - READ BEFORE COPYING, INSTALLING OR USING.
+Do not copy, install, distribute, publicly display, or use the Materials (as
+defined below) provided under this license agreement ("Agreement") until you
+("You" or "Your") have carefully read and agreed to the following terms and
+conditions.
+
+This Agreement forms a legally binding contract between You and Intel
+Corporation ("Intel") regarding Your use of the Materials.  By copying,
+installing, distributing, publicly displaying, or otherwise using the 
Materials,
+You agree to be bound by the terms of this Agreement.  If You do not agree to
+the terms of this Agreement, do not copy, install, distribute, publicly 
display,
+or use the Materials.
+
+If You are agreeing to the terms and conditions of this Agreement on behalf of 
a
+company or other legal entity, You represent and warrant that You have the 
legal
+authority to bind that legal entity to the Agreement, in which case, "You" or
+"Your" will mean such entity.
+
+Third Party Programs (as defined below), even if included with the distribution
+of the Materials, are governed by separate third party license terms, including
+without limitation, open source software license terms. Such third party 
license
+terms (and not this Agreement) govern Your use of the Third Party Programs, and
+Intel is not liable for the Third Party Programs.
 
 End User License Agreement for the Intel(R) Software Development Products
+(Version March 2015)
+
+
+1. LICENSE DEFINITIONS:
+
+   A. "Confidential Information" means all Materials (as defined below),
+   including without limitation, any Pre-Release Materials, that are identified
+   (in the product release notes, on Intel's download website for the Materials
+   or elsewhere) or labeled as Intel confidential information or a similar
+   legend.
+
+   B. "Excluded License" means a license that requires, as a condition of use,
+   modification, or distribution, that the licensed software or other software
+   incorporated into, derived from or distributed with such software (a) be
+   disclosed or distributed in Source Code form; (b) be licensed by the user to
+   third parties for the purpose of making and/or distributing derivative 
works;
+   or (c) be redistributable at no charge.  Excluded Licenses include, without
+   limitation, licenses that license or distribute software under any of the
+   following licenses or distribution models, or licenses or distribution 
models
+   substantially similar to any of the following: (a) GNU's General Public
+   License (GPL) or Lesser/Library GPL (LGPL), (b) the Artistic License (e.g.,
+   PERL), (c) the Mozilla Public License, (d) the Netscape Public License, (e)
+   the Sun Community Source License (SCSL), (f) the Sun Industry Source License
+   (SISL), and (g) the Common Public License (CPL).
+   
+   C. "IPP Sample Source" is the Source Code file(s) that: (i) demonstrates
+   certain limited functions included in the binary libraries of the Intel(R)
+   Integrated Performance Primitives ("Intel(R) IPP"); (ii) is identified as
+   Intel IPP sample source code; (iii) is obtained separately from Intel after
+   You register Your copy of the Intel(R) IPP product with Intel; and (iv) is
+   subject to all of the terms and conditions of this Agreement.
+   
+   D. "Licensed Patent Claims" means the claims of Intel's patents that are
+   necessarily and directly infringed by the reproduction and distribution of
+   the Materials that is authorized in Section 2 below, when the Materials is 
in
+   its unmodified form as delivered by Intel to You and not modified or 
combined
+   with anything else.  Licensed Patent Claims are only those claims that Intel
+   can license without paying, or getting the consent of, a third 

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

[Justin Lecher]

commit: c35ee2746e3f200d4f2d7472b13920d3dad4284d
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Sep  3 06:06:22 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 06:06:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35ee274

eclass: Exchange obsolete and depreacted Python ABIs in documentation

Signed-off-by: Justin Lecher  gentoo.org>

 eclass/python-any-r1.eclass|  8 
 eclass/python-r1.eclass| 24 
 eclass/python-single-r1.eclass | 27 ---
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index e4eb2ed..0f641a8 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -191,10 +191,10 @@ _python_build_set_globals
 #  
dev-python/baz[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] 
)
 #  )
 #  (
-#  dev-lang/python:2.6
-#  
dev-python/foo[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
-#  || ( 
dev-python/bar[python_targets_python2_6(-)?,python_single_target_python2_6(+)?]
-#  
dev-python/baz[python_targets_python2_6(-)?,python_single_target_python2_6(+)?] 
)
+#  dev-lang/python:3.3
+#  
dev-python/foo[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
+#  || ( 
dev-python/bar[python_targets_python3_3(-)?,python_single_target_python3_3(+)?]
+#  
dev-python/baz[python_targets_python3_3(-)?,python_single_target_python3_3(+)?] 
)
 #  )
 # )
 # @CODE

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 82016c5..7113cfa 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -74,12 +74,12 @@ inherit multibuild python-utils-r1
 #
 # Example:
 # @CODE
-# PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+# PYTHON_COMPAT=( python2_7 python3_3 python3_4} )
 # @CODE
 #
 # Please note that you can also use bash brace expansion if you like:
 # @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python2_7 python3_{3,4} )
 # @CODE
 if ! declare -p PYTHON_COMPAT &>/dev/null; then
die 'PYTHON_COMPAT not declared.'
@@ -139,8 +139,8 @@ fi
 # Example value:
 # @CODE
 # dev-lang/python-exec:=
-# python_targets_python2_6? ( dev-lang/python:2.6[gdbm] )
 # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] )
+# python_targets_pypy? ( virtual/pypy[gdbm] )
 # @CODE
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
@@ -160,7 +160,7 @@ fi
 #
 # Example value:
 # @CODE
-# python_targets_python2_6(-)?,python_targets_python2_7(-)?
+# python_targets_python2_7(-)?,python_targets_python3_4(-)?
 # @CODE
 
 # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
@@ -178,7 +178,7 @@ fi
 #
 # Example value:
 # @CODE
-# || ( python_targets_python2_6 python_targets_python2_7 )
+# || ( python_targets_python2_7 python_targets_python3_4 )
 # @CODE
 
 _python_set_globals() {
@@ -355,17 +355,17 @@ python_gen_useflags() {
 #
 # Example:
 # @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
 # RDEPEND="$(python_gen_cond_dep \
-#   'dev-python/unittest2[${PYTHON_USEDEP}]' python{2_5,2_6})"
+#   'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )"
 # @CODE
 #
 # It will cause the variable to look like:
 # @CODE
-# RDEPEND="python_targets_python2_5? (
-# dev-python/unittest2[python_targets_python2_5?] )
-#  python_targets_python2_6? (
-# dev-python/unittest2[python_targets_python2_6?] )"
+# RDEPEND="python_targets_python2_7? (
+# dev-python/unittest2[python_targets_python2_7?] )
+#  python_targets_pypy? (
+# dev-python/unittest2[python_targets_pypy?] )"
 # @CODE
 python_gen_cond_dep() {
debug-print-function ${FUNCNAME} "${@}"
@@ -410,7 +410,7 @@ python_gen_cond_dep() {
 #
 # Example value:
 # @CODE
-# ${WORKDIR}/foo-1.3-python2_6
+# ${WORKDIR}/foo-1.3-python2_7
 # @CODE
 
 # @FUNCTION: python_copy_sources

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 4dec9f9..132d407 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -88,7 +88,12 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 #
 # Example:
 # @CODE
-# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# PYTHON_COMPAT=( python2_7 python3_3 python3_4} )
+# @CODE
+#
+# Please note that you can also use bash brace expansion if you like:
+# @CODE
+# PYTHON_COMPAT=( python2_7 python3_{3,4} )
 # @CODE
 if ! declare -p PYTHON_COMPAT &>/dev/null; then
die 'PYTHON_COMPAT not declared.'
@@ -131,8 +136,8 @@ fi
 # Example value:
 # @CODE
 # dev-lang/python-exec:=
-# python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] )
 # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
+# python_single_target_pypy? ( virtual/pypy[gdbm] )
 # @CODE
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
@@ -152,7 +157,7 @@ fi
 #
 # Example value:
 # 

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

[George Shapovalov]

commit: 603123ee43212d6c088d9bf5f55d0dd34fcaa388
Author: George Shapovalov  gentoo  org>
AuthorDate: Thu Sep  3 06:29:53 2015 +
Commit: George Shapovalov  gentoo  org>
CommitDate: Thu Sep  3 06:29:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=603123ee

dev-lang/gnat-gcc: fixed ncurses SLOT dep to :0

As per discussion on -dev list. Also revbumped to updated VDB.

Acked-by: hasufell  gentoo.org>

Package-Manager: portage-2.2.20.1

 dev-lang/gnat-gcc/gnat-gcc-4.3.6-r1.ebuild | 65 +
 dev-lang/gnat-gcc/gnat-gcc-4.4.7-r1.ebuild | 64 +
 dev-lang/gnat-gcc/gnat-gcc-4.5.4-r1.ebuild | 76 ++
 dev-lang/gnat-gcc/gnat-gcc-4.6.4-r1.ebuild | 62 
 4 files changed, 267 insertions(+)

diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.3.6-r1.ebuild 
b/dev-lang/gnat-gcc/gnat-gcc-4.3.6-r1.ebuild
new file mode 100644
index 000..19c9a5a
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.3.6-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="https://gcc.gnu.org/;
+LICENSE="GMGPL"
+
+IUSE="doc lto" # doc and lto from gnatbuild.eclass
+
+# SLOT is set in gnatbuild.eclass, depends only on PV (basically 
SLOT=GCCBRANCH)
+# so the URI's are static.
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
+   ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
+   amd64? ( 
https://dev.gentoo.org/~george/src/gnatboot-${SLOT}-amd64.tar.bz2 )
+   x86?   ( 
https://dev.gentoo.org/~george/src/gnatboot-${SLOT}-i686.tar.bz2 )
+   ppc?   ( https://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 )"
+#  sparc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 )
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# starting with 4.3.0 gnat needs these libs
+RDEPEND=">=dev-libs/mpfr-2.3.1:*
+   >=dev-libs/gmp-4.2.2:*
+   >=sys-libs/zlib-1.1.4
+   >=sys-libs/ncurses-5.2-r2:0"
+
+DEPEND="${RDEPEND}
+   =sys-devel/bison-1.875
+   >=sys-libs/glibc-2.8
+   >=sys-devel/binutils-2.15.94"
+
+#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
+#  ${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
+
+src_unpack() {
+   gnatbuild_src_unpack
+
+   # newly added zlib dir is processed by configure even with
+   # --with-systtem-zlib passed, causing toruble on multilib
+   rm -rf "${S}"/zlib
+
+   #fixup some hardwired flags
+   cd "${S}"/gcc/ada
+
+   # universal gcc -> gnatgcc substitution occasionally produces lines too 
long
+   # and then build halts on the style check.
+   #
+   # The sed in makegpr.adb is actually not for the line length but rather 
to
+   # "undo" the fixing, Last3 is matching just that - the last three 
characters
+   # of the compiler name.
+   sed -i -e 's:(Last3 = "gnatgcc"):(Last3 = "gcc"):' makegpr.adb &&
+   sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads ||
+   die "reversing [gnat]gcc substitution in comments failed"
+}
+
+src_compile() {
+   # looks like gnatlib_and_tools and gnatlib_shared have become part of
+   # bootstrap
+   gnatbuild_src_compile configure make-tools bootstrap
+}

diff --git a/dev-lang/gnat-gcc/gnat-gcc-4.4.7-r1.ebuild 
b/dev-lang/gnat-gcc/gnat-gcc-4.4.7-r1.ebuild
new file mode 100644
index 000..e9875e3
--- /dev/null
+++ b/dev-lang/gnat-gcc/gnat-gcc-4.4.7-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnatbuild
+
+DESCRIPTION="GNAT Ada Compiler - gcc version"
+HOMEPAGE="https://gcc.gnu.org/;
+LICENSE="GMGPL"
+
+IUSE=""
+
+BOOT_SLOT="4.3"
+
+# SLOT is set in gnatbuild.eclass, depends only on PV (basically 
SLOT=GCCBRANCH)
+# so the URI's are static.
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
+   ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
+   amd64? ( 
https://dev.gentoo.org/~george/src/gnatboot-${SLOT}-amd64.tar.bz2 )
+   sparc? ( 
https://dev.gentoo.org/~george/src/gnatboot-${SLOT}-sparc.tar.bz2 )
+   x86?   ( 
https://dev.gentoo.org/~george/src/gnatboot-${SLOT}-i686.tar.bz2 )"
+#  ppc?   ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
+
+KEYWORDS="~amd64 ~x86"
+
+# starting with 4.3.0 gnat needs these libs
+RDEPEND=">=dev-libs/mpfr-3.0.1
+   >=dev-libs/gmp-5.0
+   >=sys-libs/zlib-1.2
+   >=sys-libs/ncurses-5.7:0"
+
+DEPEND="${RDEPEND}
+   =sys-devel/bison-1.875
+   >=sys-libs/glibc-2.8
+   >=sys-devel/binutils-2.20"
+
+#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
+#  ${LIBEXECPATH:1}/gnat1 

[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/

[Lars Wendler]

commit: fcfd7cedc94f990ab0de44c5df69ae95c7356fd6
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep  3 06:25:43 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep  3 06:25:43 2015 +
URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=fcfd7ced

seamonkey: re-added zh-CN langpack.

 www-client/seamonkey/Manifest   | 1 +
 www-client/seamonkey/seamonkey-2.35_pre3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 9cdafa0..231cfac 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -79,5 +79,6 @@ DIST seamonkey-2.35_pre3-sk.xpi 857092 SHA256 
0fc80d929764e091ab12849878a15fdf6b
 DIST seamonkey-2.35_pre3-sv-SE.xpi 825057 SHA256 
72a3152ddce1748ee0afbb37c72aeed6da725d91e775ce6e51bbb2459aff14a7 SHA512 
63b464e4949d7db4026c46d28ef25c42036b60dc899a399308628bd76e054aace62439133fc51ba9433f480565a795f9db54d575befb906a8bd686becb2f0666
 WHIRLPOOL 
ec4e8d9187fbfee6ff4ed10feb9bf6379a06a87790dce995d6ea8867908d69c355b9ce4f97f08b4447d659fa6139d5476081b68df0ed4be278179b9a298601a1
 DIST seamonkey-2.35_pre3-tr.xpi 808778 SHA256 
598b5399fb18ef6fcee8e48682f5a70ae9de95b6735601086e1c661bdc72e993 SHA512 
8919b576d0e70ddae76248a9519b2bea8c5bf46adfe4f70b7446e7ae0b136a4b09dc1dff05af7c60cd1961024e6f2e97f805f4b24b37f55a24fc7a2a230aab88
 WHIRLPOOL 
85b8bc2b93d44eadc86f5a140601a04068582855fff02020d1054b27d7c7a9f8d28a086cee5d931711afa558ced5bc3c203081bc4b4c29d693ed5d51e24605d0
 DIST seamonkey-2.35_pre3-uk.xpi 874302 SHA256 
fce8928dd186da0685c4e9516f35e9edb40a57a632131db3cbaaed6394a628ce SHA512 
2a03b5915d61000aebecdb1f90fc09b45bbc03ff2eb171778dc30084c3ee8ac7bbf1abef72074e6c294b0a778b8ab2d17f6a8c189f3295a9e73a73b9fac4d4d1
 WHIRLPOOL 
5040b9e47d7ea8c1d57a898b1a8d9234c5b36278b69d1d6566c7f03b9cee1e671eee543656b0a5e9aba8133815ac0c77b642898c29ddd27090ca6c6b56c53839
+DIST seamonkey-2.35_pre3-zh-CN.xpi 836554 SHA256 
40f469d1b0df9a3c7dd2c6d765f9ccdcae3dca211b81ed2985d97c20cdc61a3b SHA512 
97714a166a3af31aabf3ccf39c77e4cf8aa09a8c9803acdfe75660cddf2d8d4504bad9ed71293174c7ef484e6a13c9e94f86897f73eff306aa1a61d532fdf979
 WHIRLPOOL 
7d269108e45baeb3192890ef4c9dc0dbfbe228a85cf962c87c2c191c039718180e7461274ca4da9d13f3a0e9019e4adbdb5dd7164d705324331210836f76d3bd
 DIST seamonkey-2.35_pre3-zh-TW.xpi 860776 SHA256 
5e6e23d891f08b9b55ccd55ae4d2ce8c5ea9e32232bcadb31749e199dc55b59d SHA512 
4f9d791ea3f00b1f7827ba87c33d9ce09f3351fea970ae29393c38f9185ebb928275973aa55bc945154d4850c804367798c40f9d413862e26bd250259ba7e8f9
 WHIRLPOOL 
8d6dd5feeaa1eacbe51014e90b49651c262ccd44c5aec7b0907ae044630f3c3137f9c9304d3b88b94c158b8f9fb2ad22d40a4f15befaec6fcaf896195c04b90b
 DIST seamonkey-2.35_pre3.source.tar.bz2 204983795 SHA256 
2096a1f3d57cfe83e6c1f24a6262fafbab336e979bae732212f005e6e2ce2072 SHA512 
84b70cc1ba85c263ff88c4edbe3def76628c46c1e1e65a8c42055bbb7f5d6e6d85de67b5e006781533caa0fe12a112d1344b4799bb292ae01d65717137e1fc83
 WHIRLPOOL 
96b988a20bf27834c6e2ae496edbf91516690df9b299120cb9ab2b08d2022c19c76df506b17865b95c6db595653b1b389fa0a61d91a6905ce6d1e14c0c339638

diff --git a/www-client/seamonkey/seamonkey-2.35_pre3.ebuild 
b/www-client/seamonkey/seamonkey-2.35_pre3.ebuild
index cb82781..6eb19ab 100644
--- a/www-client/seamonkey/seamonkey-2.35_pre3.ebuild
+++ b/www-client/seamonkey/seamonkey-2.35_pre3.ebuild
@@ -7,7 +7,7 @@ WANT_AUTOCONF="2.1"
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
-   pl pt-PT ru sk sv-SE tr uk zh-TW)
+   pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
 
 MOZ_PV="${PV/_pre*}"
 MOZ_PV="${MOZ_PV/_alpha/a}"

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/glusterfs/

[Alexys Jacob]

commit: f847ec84e53e7929d16a19667fbc47e149ac7a10
Author: Ultrabug  gentoo  org>
AuthorDate: Thu Sep  3 08:46:19 2015 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Thu Sep  3 08:46:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f847ec84

sys-cluster/glusterfs: change elog upgrade link thx to Bernd Feige,eige, fix 
#559396

Package-Manager: portage-2.2.20.1

 sys-cluster/glusterfs/glusterfs-3.6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild 
b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
index 5015ae8..c159fda 100644
--- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
@@ -173,7 +173,7 @@ pkg_postinst() {
 
elog
elog "If you are upgrading from a previous version of ${PN}, please 
read:"
-   elog "  
http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.5;
+   elog "  
http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.6;
 
use emacs && elisp-site-regen
 }

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/

[James Le Cuirot]

commit: df55bfe44b585e517e5ee6d0573c24ae7ac8baba
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep  3 08:57:21 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  3 08:57:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df55bfe4

app-admin/collectd: Use the Java eclasses wrt but #558310

Java team needs to remove java-config-wrapper, which this erroneously
depends on. The existing ebuild does not make use of the Java
eclasses, which can lead to problems. I have:

 * Made use of java-pkg-opt-2.
 * Added a DEPEND on virtual/jdk.
 * Used sed against the Java Makefile.am to set proper javac flags.
 * Used the eclasses to properly set JAVA_HOME.
 * Registered the installed jars so that Gentoo metadata is created.

Package-Manager: portage-2.2.20.1

 app-admin/collectd/collectd-5.4.1-r2.ebuild | 388 
 1 file changed, 388 insertions(+)

diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild 
b/app-admin/collectd/collectd-5.4.1-r2.ebuild
new file mode 100644
index 000..5b6a955
--- /dev/null
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app 
python-single-r1 systemd user
+
+DESCRIPTION="A a daemon which collects system statistic and provides 
mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org;
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux 
static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in 
gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
+   tape write_redis zfs_arc"
+
+# Plugins that have been (compile) tested and can be enabled via 
COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
+   conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df 
disk dns
+   email entropy ethstat exec filecount fscache gmond hddtemp interface 
ipmi
+   iptables irq java libvirt load logfile lvm madwifi match_empty_counter
+   match_hashed match_regex match_timediff match_value mbmon md memcachec 
memcached
+   memory multimeter mysql netlink network network nfs nginx notify_desktop
+   notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping 
postgresql
+   powerdns processes protocols python python routeros rrdcached rrdcached 
rrdtool
+   sensors serial snmp statsd swap syslog table tail target_notification
+   target_replace target_scale target_set tcpconns teamspeak2 ted thermal 
threshold
+   tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+   write_graphite write_http write_mongodb"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} 
${COLLECTD_UNTESTED_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+   IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+   dev-libs/libgcrypt:0
+   sys-devel/libtool
+   perl?   ( dev-lang/perl:=[ithreads] )
+   collectd_plugins_apache?( net-misc/curl )
+   collectd_plugins_ascent?( net-misc/curl 
dev-libs/libxml2 )
+   collectd_plugins_bind?  ( dev-libs/libxml2 )
+   collectd_plugins_curl?  ( net-misc/curl )
+   collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
+   collectd_plugins_curl_xml?  ( net-misc/curl 
dev-libs/libxml2 )
+   collectd_plugins_dbi?   ( dev-db/libdbi )
+   collectd_plugins_dns?   ( net-libs/libpcap )
+   collectd_plugins_gmond? ( sys-cluster/ganglia )
+   collectd_plugins_ipmi?  ( >=sys-libs/openipmi-2.0.16-r1 
)
+   collectd_plugins_iptables?  ( 
>=net-firewall/iptables-1.4.13 )
+   collectd_plugins_libvirt?   ( app-emulation/libvirt 
dev-libs/libxml2 )
+   collectd_plugins_lvm?   ( sys-fs/lvm2 )
+   collectd_plugins_memcachec? ( dev-libs/libmemcached )
+   collectd_plugins_mysql? ( >=virtual/mysql-5.0 )
+   collectd_plugins_netlink?   ( net-libs/libmnl )
+   collectd_plugins_nginx?

[gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/

[James Le Cuirot]

commit: 07c66554e03e557e567120737131cc9dce8560c8
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Sep  3 09:00:14 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  3 09:00:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c66554

app-admin/collectd: Remove old

Package-Manager: portage-2.2.20.1

 app-admin/collectd/Manifest|   1 -
 app-admin/collectd/collectd-5.4.0.ebuild   | 374 
 app-admin/collectd/collectd-5.4.1-r1.ebuild| 379 -
 app-admin/collectd/collectd-5.4.1.ebuild   | 372 
 .../collectd/files/collectd-4.10.2-libocci.patch   |  20 --
 .../collectd/files/collectd-4.10.2-nohal.patch |  23 --
 .../collectd/files/collectd-5.1.0-libperl.patch|  30 --
 app-admin/collectd/files/collectd-5.1.1-lt.patch   |  32 --
 8 files changed, 1231 deletions(-)

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 6698b99..3bb23b2 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,2 +1 @@
-DIST collectd-5.4.0.tar.bz2 1506520 SHA256 
90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e SHA512 
10de94d082e6bf2e0a8e2f0b179868c0f25b223c61cb8a5fda641d01f90d6332062459410d54d74a4d666f7149bb429976e9542dabeda988ed6772df9001b222
 WHIRLPOOL 
19db89217dfaf38fd358a60a64155e01bd68d4c8ca4fad13b97667eb3e4e4d8dbe4e9cae8568e970d8d6fe5e8dde960b06159b3026d1a554fad7a455f973ff0a
 DIST collectd-5.4.1.tar.bz2 1521907 SHA256 
75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512 
96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492
 WHIRLPOOL 
2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16

diff --git a/app-admin/collectd/collectd-5.4.0.ebuild 
b/app-admin/collectd/collectd-5.4.0.ebuild
deleted file mode 100644
index 6e56ffb..000
--- a/app-admin/collectd/collectd-5.4.0.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools base eutils linux-info multilib perl-app systemd user
-
-DESCRIPTION="A a daemon which collects system statistic and provides 
mechanisms to store the values"
-
-HOMEPAGE="http://collectd.org;
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux 
static-libs"
-
-# The plugin lists have to follow here since they extend IUSE
-
-# Plugins that to my knowledge cannot be supported (eg. dependencies not in 
gentoo)
-COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok xmms"
-
-# Plugins that still need some work
-COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus redis
-   tape write_redis zfs_arc"
-
-# Plugins that have been (compile) tested and can be enabled via 
COLLECTD_PLUGINS
-COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind cgroups
-   conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df 
disk dns
-   email entropy ethstat exec filecount fscache gmond hddtemp interface 
ipmi
-   iptables irq java libvirt load logfile lvm madwifi match_empty_counter
-   match_hashed match_regex match_timediff match_value mbmon md memcachec 
memcached
-   memory multimeter mysql netlink network network nfs nginx notify_desktop
-   notify_email ntpd numa nut olsrd onewire openvpn oracle perl perl ping 
postgresql
-   powerdns processes protocols python python routeros rrdcached rrdcached 
rrdtool
-   sensors serial snmp statsd swap syslog table tail target_notification
-   target_replace target_scale target_set tcpconns teamspeak2 ted thermal 
threshold
-   tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
-   write_graphite write_http write_mongodb"
-
-COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} 
${COLLECTD_UNTESTED_PLUGINS}"
-
-COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
-
-for plugin in ${COLLECTD_ALL_PLUGINS}; do
-   IUSE="${IUSE} collectd_plugins_${plugin}"
-done
-unset plugin
-
-# Now come the dependencies.
-
-COMMON_DEPEND="
-   dev-libs/libgcrypt:0
-   sys-devel/libtool
-   perl?   ( dev-lang/perl:=[ithreads] )
-   collectd_plugins_apache?( net-misc/curl )
-   collectd_plugins_ascent?( net-misc/curl 
dev-libs/libxml2 )
-   collectd_plugins_bind?  ( dev-libs/libxml2 )
-   collectd_plugins_curl?  ( net-misc/curl )
-   collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl )
-   collectd_plugins_curl_xml?  ( net-misc/curl 

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

[Justin Lecher]

commit: 971b2599e1756c163d38b5f73b8fd796fb05c6df
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Sep  3 07:28:04 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 07:28:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971b2599

dev-python/netaddr: Add RTD to HOMEPAGE

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/netaddr/netaddr-0.7.17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/netaddr/netaddr-0.7.17.ebuild 
b/dev-python/netaddr/netaddr-0.7.17.ebuild
index 5639cdd..d043d03 100644
--- a/dev-python/netaddr/netaddr-0.7.17.ebuild
+++ b/dev-python/netaddr/netaddr-0.7.17.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} )
 inherit distutils-r1
 
 DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr 
https://pypi.python.org/pypi/netaddr;
+HOMEPAGE="https://github.com/drkjam/netaddr 
https://pypi.python.org/pypi/netaddr https://netaddr.readthedocs.org;
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"

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

[Bernard Cafarelli]

commit: 2d7ca7324ff83eaf64ee7f4498ebb186c2f0d99a
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Sep  3 07:57:10 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Sep  3 08:02:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7ca732

net-misc/nxplayer: version bump

Package-Manager: portage-2.2.20.1

 net-misc/nxplayer/Manifest| 4 ++--
 .../nxplayer/{nxplayer-4.6.3.13.ebuild => nxplayer-4.6.16.1.ebuild}   | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/nxplayer/Manifest b/net-misc/nxplayer/Manifest
index af34d68..9f5fabf 100644
--- a/net-misc/nxplayer/Manifest
+++ b/net-misc/nxplayer/Manifest
@@ -1,4 +1,4 @@
 DIST nomachine-enterprise-client_4.6.12_7_i686.tar.gz 45504 SHA256 
066cab4676426c9631c281ab38111d41326592c63ce3c189b4e93d3f05c89073 SHA512 
04bf0112688a969ec1a68c1a083bdc3f365fbf439a1d9555cb2b7edc9032981ee9c37d659893c0acc4548f892f2a18eba980f450ed44f581f7c532f485f31649
 WHIRLPOOL 
a6513bd5b731d889ad311d77cc9af9e5ca3c727f9694c0fc7f8b03a111b63d9690f1981c9285bee25815da025d89a850943a38a008a301f23c8fd07d4deec1bd
 DIST nomachine-enterprise-client_4.6.12_7_x86_64.tar.gz 24170379 SHA256 
2dc1ad80a2ad829346009ad4f8aa9d3d3b097b70d8f929100fb79e01fcb4b403 SHA512 
fbbc9dac184b14a025807d82aa4d4e28654f2e1aed2f76adb83885719a4ebf0b91f68befb798662bf55e9dacbcf3db2e533d2901e5bce2e094f486dbb4df61e7
 WHIRLPOOL 
63449a1c130dce99936748048f6b84c14122000edb3f2da6f5daa46e67d555036341aa180c446af76363188490e3951e5d2d3bb63d3d7ce1e58a2db5548f5058
-DIST nomachine-enterprise-client_4.6.3_13_i686.tar.gz 45394 SHA256 
f7b364e338c74a7d1f56c45d0f56d4f91f1e3639915a51d38a6bf322ccdf6ab8 SHA512 
366f007270a13b12ad47c8d1333f29c9632dfa2cab9f50317657470457d7ea842eab650258f77f0d7b44953d4e6b8d54342d6ba1f459c4a06ed17d8b62dea4ef
 WHIRLPOOL 
2e7d5265a2a687fe151f70197331bd9878b4a0cc5e32bd18f91258cf626c68320e63b7b4ae9ac3c924845b4b7a4c42ad2b436d735ea1d490259756054c1ba421
-DIST nomachine-enterprise-client_4.6.3_13_x86_64.tar.gz 24158842 SHA256 
3b15e058bcdfa25459bb01be4b81fd84e48b94f07a3e5cb13b7b3a840903cf8e SHA512 
2b11ed7c6a4bef0b9f8b549f61de7c79402a6e848ebd0dd3e7b6096f4ae3307779f0d3b2e1e114bddaba6d27f4c395ca7a523ac7e61aae8e99d0c582d45eb642
 WHIRLPOOL 
05fd422a2b9695c681f300372045ffd2374069b95ea9d7ac29b9279ed5322f37f49503a203f7470d5468f11e8b2f879e940d8cb105d4a45d59f128b9f1a67720
+DIST nomachine-enterprise-client_4.6.16_1_i686.tar.gz 23265721 SHA256 
57c9f8516f93194dd5df00e3ce531c0fc6a23fbe200b46b716aad8518aece6fc SHA512 
3a60deafdf6798f1386c2bdc61fbde66abc252b419ecd7cd8822b7e3af08e43c75d186fcd4d4a8e19452502f42aedf7318adb6f8b91af8b5b25c7522ed204ff6
 WHIRLPOOL 
8d54ede57c7dd17054d776255a3783e1dd40b2f436ea77cb8215bf08031df05e8dfcd6d61937b9da800dcbf3733ef6ee3b50872d2e5b950ace869ca72910e3ad
+DIST nomachine-enterprise-client_4.6.16_1_x86_64.tar.gz 24175782 SHA256 
9e3cff9a1ab3f7c2fcae47e9aae9af95a8f981db02d15060355aefa76150af68 SHA512 
9658f52127a5ca1702772492b1761418b923243b98bb4bb7c86bdd89a7f413732e0f5660f8392630b082d79856041f2ae91f2cc0cb3a24fa5d11dc688d1178fc
 WHIRLPOOL 
9690e2b21d9653a83a2b2c5490359557efcf739c34ef0a49784f346bf18335f287aca7908f83ff2085b51b05b1330663db5d55b33fdc762d5e430cf6d2d4e314

diff --git a/net-misc/nxplayer/nxplayer-4.6.3.13.ebuild 
b/net-misc/nxplayer/nxplayer-4.6.16.1.ebuild
similarity index 100%
rename from net-misc/nxplayer/nxplayer-4.6.3.13.ebuild
rename to net-misc/nxplayer/nxplayer-4.6.16.1.ebuild

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

[Jeroen Roovers]

commit: 03efc5f8d859f9d6b5d9174ad94c811a82042027
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Sep  3 06:35:12 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Sep  3 06:35:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03efc5f8

profiles/arch/hppa: Mask USE=video_cards_amdgpu (bug #559368).

 profiles/arch/hppa/use.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index aae668a..34b8b68 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -225,6 +225,7 @@ dri
 
 # 2006/02/05 Donnie Berkholz 
 # Modular X: mask for architectures on which they aren't available
+video_cards_amdgpu
 video_cards_apm
 video_cards_ark
 video_cards_ast

[gentoo-commits] repo/gentoo:master commit in: media-gfx/argyllcms/

[Bernard Cafarelli]

commit: 19315b4cf30689405f0347825d45d0b4de674625
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Sep  3 08:15:39 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Sep  3 08:15:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19315b4c

media-gfx/argyllcms: version bump

Includes support for some new hardware, bug fixes

Package-Manager: portage-2.2.20.1

 media-gfx/argyllcms/Manifest   |  1 +
 media-gfx/argyllcms/argyllcms-1.8.0.ebuild | 91 ++
 2 files changed, 92 insertions(+)

diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 16e4087..9d94081 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -3,3 +3,4 @@ DIST Argyll_V1.5.1_src.zip 9693168 SHA256 
7c65055e577da5a3344b3949e52c3e66fe6339
 DIST Argyll_V1.6.2_src.zip 10291838 SHA256 
c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f SHA512 
98484eb7985482c132532c2aedb24afeb20576a6417c89718d58e5e35e36bd4feb270aa7ea8c86b31dc218c82d99de3500c47346c75159a79de9df57d2019fcd
 WHIRLPOOL 
fbc4b766bd45d47b33f56b8662c7681c251aab0c978ff71f3079b83f9eeb8052725b77446035ce91589f11553283f84b43f24602e3b4127bc1b5f37672d3
 DIST Argyll_V1.6.3_src.zip 10338488 SHA256 
188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84 SHA512 
7c350c73492d7e2e27354814cfcb172bf1e4bb6ee8f3f71f2003a7d44ed4be9890a6c80d6a69228495645be11a327c0f7c2ab68d6f6621dd938744a1cd7ebe95
 WHIRLPOOL 
a854ebcca1950f3e654ae85fff3189bae17c511c26e2f3dd8104d9b55ddb83022659276fae201899f51a2a27b00c1cf98f157261e50d0fd48f1a8044923e11c6
 DIST Argyll_V1.7.0_src.zip 13935712 SHA256 
dac51cf5d8f6d04bb02f2f5b119fa0e8b773a010e6377116768b082ef018f663 SHA512 
644683c8a73d36583d607b5d51c543dca8f1e3fb3db8138a164f9ed7f994df7739ee7d810b7136a7cf0eba7b54fe53b35ffbdd4e6915ec20b271325119ce369c
 WHIRLPOOL 
e08c6e311856716ee6b49e37c583d8d4275629fb746f018e0d7c768d4c907644dc60545ff2c709217988c668b198dfc95396af3fdf0ccd40d320514854b1c087
+DIST Argyll_V1.8.0_src.zip 13931190 SHA256 
02440060b224bf8e42bd7eabe0c857e1311546839391d94bb250dda60e4db13b SHA512 
959a581aaf3514a130cae3aa133c385591b53d11e5ee6bb11349ee8614f392baa5f5799ede4d10dda8a3c182fc69a186a5a1738070649acdfb9987aa52f83976
 WHIRLPOOL 
6b43e3ecff4cde12fa1d6fe51f0a9612019ac1f452eed66e32ce8a834f127ee84119fdbb436cf1266e4e586f534acbf74df1102215d311d69a7f4f723d77a286

diff --git a/media-gfx/argyllcms/argyllcms-1.8.0.ebuild 
b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
new file mode 100644
index 000..c59a59a
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-1.8.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit base flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/;
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip;
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc"
+
+RDEPEND="
+   media-libs/tiff:0
+   sys-libs/zlib
+   virtual/jpeg:0
+   x11-libs/libX11
+   x11-libs/libXau
+   x11-libs/libXdmcp
+   x11-libs/libXext
+   x11-libs/libXinerama
+   x11-libs/libXrandr
+   x11-libs/libXxf86vm
+   x11-libs/libXScrnSaver"
+DEPEND="${RDEPEND}
+   app-arch/unzip
+   dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+   )
+
+src_compile() {
+   # Make it respect LDFLAGS
+   echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+   # Evil hack to get --as-needed working. The build system unfortunately 
lists all
+   # the shared libraries by default on the command line _before_ the 
object to be built...
+   echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr 
-lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+   append-cflags -DUNIX -D_THREAD_SAFE
+
+   sed \
+   -e 's:CCFLAGS:CFLAGS:g' \
+   -e "s:ar rusc:$(tc-getAR) rusc:g" \
+   -i Jambase || die
+
+   tc-export CC RANLIB
+
+   jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+   jam -dx -fJambase install || die
+
+   rm bin/License.txt || die
+
+   pushd bin > /dev/null
+   local binname
+   for binname in * ; do
+   newbin ${binname} argyll-${binname}
+   done
+   popd > /dev/null
+
+   use doc && dohtml doc/*
+
+   dodoc log.txt Readme.txt ttbd.txt notes.txt
+
+   insinto /usr/share/${PN}
+   doins -r ref
+
+   udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+   elog "If you have a Spyder2 you need to extract the firmware"
+   elog "from the CVSpyder.dll of the windows driver package"
+   elog "and store it as /usr/share/color/spyd2PLD.bin"
+   echo
+   elog "For further info on setting up instrument access read"
+   elog 

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmbattery/

[Bernard Cafarelli]

commit: 6a027881c0a971bca7603cdd4916c14289bf8ed7
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Sep  3 08:45:24 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Sep  3 08:45:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a027881

x11-plugins/wmbattery: version bump

Package-Manager: portage-2.2.20.1

 x11-plugins/wmbattery/Manifest  |  1 +
 x11-plugins/wmbattery/wmbattery-2.50.ebuild | 36 +
 2 files changed, 37 insertions(+)

diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index f50acf6..e7c3841 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1,3 +1,4 @@
 DIST wmbattery-2.48.tar.gz 41301 SHA256 
874d62c209efd98471b72ef2756d608a957d5106cbf92a6761985a934008661a SHA512 
d1ce3824557d34104087abf77262d46ce603d204332eb585c2fec3777abaa4c8d796787fd8f9b8b9c9b583d01f561f98f57dcdb21db22e9d92b27905627053b3
 WHIRLPOOL 
cf113d45f6232031d72a44dbd6cda3cf6db8dabba91d525943139397058a7070149daf29a41e3f434643f09953351c0e05414f4592f0e731da5261fa2ef616d3
 DIST wmbattery-2.49.tar.gz 40810 SHA256 
3fdb024179409056c14c6906e218736d7464824ad102721c53d6450d5535935f SHA512 
4f146d6bb9374c813568b0b1fc12a585efac317ea6f144a750437115f3b09ffe46cd2d3b2405007456a5eea254ce634d8de445195e56cfb7be11a042a1ec
 WHIRLPOOL 
7797716bed44c4fd631a6722d93ee5d53dbd9771e7db15336328e8a2fc7c07a6fc3452a94c62ce0a54e4275f4474ebb1cebad1ce83202ccc019a257e6664ed00
+DIST wmbattery-2.50.tar.gz 40938 SHA256 
6179f33911ae642835c9ec456b422d5c72ffb74d7fcca2a70fa5f23929fa04d5 SHA512 
f96b98d2819a9ecf189b9ebc60c107abc6715cf76bb73c98f1d3649dd2ef6112e052559f13fc5620ec7d71466f2e4d6a5e7e86b0f5f0675e02d6e038a9411794
 WHIRLPOOL 
6735904c44a2e5c67998c0b11ea422d8a9a14956739f7b9eefe75de1f1a7fe9cf8b22dd7684756520c0c223cfdd93cd548f3ef5013d52941cf3c9a698c48e0bc
 DIST wmbattery_2.44.tar.gz 39278 SHA256 
aa0a1312922ba4f0abca5f2e8abbf285363bf4a1c8862d89fe2921e74c832cae SHA512 
ce6eb3a7b9028d8923d920fe831203a9bd0c2cd3a02df0cf5074296d55dcace9750edfd8237faa9397003ed97b0305ef8e91d029261593a54269c17d0b7b3717
 WHIRLPOOL 
cae6d6027f8bafa1966ab6b7d377fa817e767e23726e907932f7da74e46a081729568df069df5d1f01b7f7e06740bfcb8cab90ac4ba10e93b3e09fe04cba5e1a

diff --git a/x11-plugins/wmbattery/wmbattery-2.50.ebuild 
b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
new file mode 100644
index 000..6c156a95
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.50.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmbattery;
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE="apm +upower"
+
+RDEPEND="apm? ( sys-apps/apmd )
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXpm
+   upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+   sed -i \
+   -e '/^icondir/s:icons:pixmaps:' \
+   autoconf/makeinfo.in || die
+
+   use upower || { sed -i -e 's:USE_UPOWER = 1:#&:' autoconf/makeinfo.in 
|| die; }
+
+   eautoreconf
+}

[gentoo-commits] repo/gentoo:master commit in: www-client/opera/

[Jeroen Roovers]

commit: e6636efde898a9137cead2f1f1bf361f091a
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Sep  3 06:49:11 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Sep  3 06:49:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6636efd

www-client/opera: Depend on x11-libs/libnotify (bug #557528 by Jérôme Borme).

Package-Manager: portage-2.2.20.1

 www-client/opera/Manifest   |  1 -
 www-client/opera/opera-31.0.1889.174.ebuild |  1 +
 www-client/opera/opera-31.0.1889.99.ebuild  | 84 -
 3 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c71f370..f8598ed 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -3,4 +3,3 @@ DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 
dcd80ea7a8f090a47007fc
 DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 
df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 
a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
 WHIRLPOOL 
ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
 DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 
b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 
c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
 WHIRLPOOL 
539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
 DIST opera-stable_31.0.1889.174_amd64.deb 41977716 SHA256 
4459bfa8b4469fe2ef68373dfd61616919266c87a18125973afee60c06beaf29 SHA512 
ac6c12a992637d79d67c0b48a276f0424c67de73bb8ea210eaca807e21fc7d2d20944737d6250094f690e014fff3fa58d9f79e128fbb5c5ccc18b793c8c43ab5
 WHIRLPOOL 
cf65cb6f7e09e3a31121b64a096ef9b2bd5010ecc9fd075fa6709989bf0dab28977f36357edcbc1062f782b72d0e1c4d2e0b51e0e69e14d7b76c81b6b2e5b9f1
-DIST opera-stable_31.0.1889.99_amd64.deb 42518088 SHA256 
51dc961957cd1b7169c6922f5433feee2320300f7c52f96bf349fa478b2b9745 SHA512 
7acb4b03850925b1b3d9083cdb436f7d3de13d73e95baf68294343cc0af9da2e6217d6cd685cdc0acdea1bb1173fe06065d9c7f1eedde98b4c0e8e14cc196656
 WHIRLPOOL 
83e2af8acafd9ad0c69b8b667fadcb34c9b6a0cabcacfa8adcc1a1f96d9680395d9190c3319e27d4b205eea5e27f018bb862110e6a96f0d7da68cf92b7ac52f3

diff --git a/www-client/opera/opera-31.0.1889.174.ebuild 
b/www-client/opera/opera-31.0.1889.174.ebuild
index cc6ee26..eb73eb4 100644
--- a/www-client/opera/opera-31.0.1889.174.ebuild
+++ b/www-client/opera/opera-31.0.1889.174.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXtst
+   x11-libs/libnotify
x11-libs/pango[X]
 "
 

diff --git a/www-client/opera/opera-31.0.1889.99.ebuild 
b/www-client/opera/opera-31.0.1889.99.ebuild
deleted file mode 100644
index cc6ee26..000
--- a/www-client/opera/opera-31.0.1889.99.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
-   af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy 
gd
-   hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru 
sk
-   sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/;
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/;
-SRC_URI="
-   amd64? ( 
"${SRC_URI_BASE}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb" )
-"
-KEYWORDS="~amd64"
-
-RDEPEND="
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   >=dev-libs/openssl-1.0.1:0
-   gnome-base/gconf:2
-   media-libs/alsa-lib
-   media-libs/fontconfig
-   media-libs/freetype
-   net-misc/curl
-   net-print/cups
-   sys-apps/dbus
-   sys-libs/libcap
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf
-   x11-libs/gtk+:2
-   x11-libs/libX11
-   x11-libs/libXScrnSaver
-   x11-libs/libXcomposite
-   x11-libs/libXcursor
-   x11-libs/libXdamage
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXi
-   x11-libs/libXrandr
-   x11-libs/libXrender
-   x11-libs/libXtst
-   x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
-   unpack_deb ${A}
-}
-
-src_prepare() {
-   mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
-   rm -r usr/lib || die
-
-   rm usr/bin/${PN} || die
-
-   rm usr/share/doc/${PN}-stable/copyright || die
-   mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
-
-   pushd 

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

[Anthony G. Basile]

commit: 30af9daa5f5febccafd7b767db2ebdc13dd226fc
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Sep  3 07:09:36 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Sep  3 07:13:19 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30af9daa

www-servers/monkeyd: version bump to 1.6.2

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest |   1 +
 www-servers/monkeyd/monkeyd-1.6.2.ebuild | 139 +++
 2 files changed, 140 insertions(+)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index ff2c241..abe7245 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -2,3 +2,4 @@ DIST monkey-1.5.3.tar.gz 892478 SHA256 
0ac300e04f052818bc26b7da0183c3c5cd13be809
 DIST monkey-1.5.5.tar.gz 898602 SHA256 
5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 
faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920
 WHIRLPOOL 
26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
 DIST monkey-1.5.6.tar.gz 902636 SHA256 
7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 
4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c
 WHIRLPOOL 
aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 DIST monkey-1.6.1.tar.gz 1916812 SHA256 
acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512 
c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619
 WHIRLPOOL 
70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0
+DIST monkey-1.6.2.tar.gz 1913867 SHA256 
d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512 
2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b
 WHIRLPOOL 
1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a

diff --git a/www-servers/monkeyd/monkeyd-1.6.2.ebuild 
b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
new file mode 100644
index 000..e0f0159
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.6.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic toolchain-funcs multilib
+
+DESCRIPTION="A small, fast, and scalable web server"
+HOMEPAGE="http://www.monkey-project.com/;
+MY_P="${PN/d}-${PV}"
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/monkey/monkey.git;
+   inherit git-2
+   KEYWORDS=""
+else
+   SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz;
+   KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Currently monkeyd_plugins_tls is off.  It provides mbed TLS (formerly 
PolarSSL).
+# jemalloc is also off until we figure out how to work CMakeLists.txt magic.
+#PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah 
monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger 
monkeyd_plugins_mandril monkeyd_plugins_tls"
+#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah 
monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger 
monkeyd_plugins_mandril"
+IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+REQUIRED_USE="
+   elibc_uclibc? ( !debug )
+   cgi? ( php )"
+
+#DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+DEPEND="dev-util/cmake"
+RDEPEND="
+   php? ( dev-lang/php )
+   cgi? ( dev-lang/php[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+   if use debug; then
+   ewarn
+   ewarn 
"\033[1;33m**\033[00m"
+   ewarn "Do not use debug in production!"
+   ewarn 
"\033[1;33m**\033[00m"
+   ewarn
+   fi
+}
+
+src_prepare() {
+   # Unconditionally get rid of the bundled jemalloc and mbedTLS
+   rm -rf "${S}"/deps
+}
+
+src_configure() {
+   local myconf=""
+
+   use elibc_uclibc && myconf+=" --uclib-mode"
+   use elibc_musl && myconf+=" --musl-mode"
+
+   #use jemalloc || myconf+=" --malloc-libc"
+   myconf+=" --malloc-libc"
+
+   if use debug; then
+   myconf+=" --debug --trace"
+   

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

[Anthony G. Basile]

commit: 4a081c7208cc3cee88197e22690c550e80d0cc91
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Thu Sep  3 07:13:05 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Thu Sep  3 07:13:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a081c72

www-servers/monkeyd: remove older versions.

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/Manifest |   3 -
 www-servers/monkeyd/monkeyd-1.5.3.ebuild | 144 ---
 www-servers/monkeyd/monkeyd-1.5.5.ebuild | 144 ---
 www-servers/monkeyd/monkeyd-1.6.1.ebuild | 139 -
 4 files changed, 430 deletions(-)

diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index abe7245..29e9b39 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,5 +1,2 @@
-DIST monkey-1.5.3.tar.gz 892478 SHA256 
0ac300e04f052818bc26b7da0183c3c5cd13be8090aaabd3505838587be8c0ec SHA512 
6a55ba580bfde3c11329e94055d287e341990e4db4cb5ab12e40b8bab57b4b51fd57cd33fc5aa9d864127f235888f818593be26fe93daa34ca3c40fa8936465f
 WHIRLPOOL 
4038bd2f0b39f6068ab69dc98dec4d5b29feca388c18361f57b653db86c38469d69072ae803ddd565e57350163247072334835216a13d014956a27b91c8a42b6
-DIST monkey-1.5.5.tar.gz 898602 SHA256 
5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 
faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920
 WHIRLPOOL 
26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
 DIST monkey-1.5.6.tar.gz 902636 SHA256 
7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 
4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c
 WHIRLPOOL 
aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
-DIST monkey-1.6.1.tar.gz 1916812 SHA256 
acf2ba04578c362b2b1c509ee4a998b6b2951e51b16bd339d300743de1752961 SHA512 
c7c0f83bb74193bfd7008a0327012a45474b65befb47ac514d3a10095c41aeb2ec49067249377d18cc3a6ec77eb14c5ae25e36d2550e47971a43e156ef24d619
 WHIRLPOOL 
70545f343b6675d456b4ed426ad27435302c0e122f1b26640e3aa65343a5912af4c431d799f018fe19f3183c904a876fc157f5f0e257f6dcf9b76cf2422ed1f0
 DIST monkey-1.6.2.tar.gz 1913867 SHA256 
d26ff514d64bb2de503a9a4d61fce20d89deff0f2f9f958977db4b98e44ece3e SHA512 
2fe3b82386d580974509b03ea66caa05adec76178296d736d994ff7f4aedd52fcd298fad083050c59378b1a6cc37cbe8fd34c437a95830fd78304c710bb16b8b
 WHIRLPOOL 
1b1bc34b0534130ce489040e2283d9b074c43ca58f9005832ceb92be92d38e70e482daf405022e1933a9300b782231747d91f937a5b2468a44f0eaa5a4fb984a

diff --git a/www-servers/monkeyd/monkeyd-1.5.3.ebuild 
b/www-servers/monkeyd/monkeyd-1.5.3.ebuild
deleted file mode 100644
index dc0aeca..000
--- a/www-servers/monkeyd/monkeyd-1.5.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit toolchain-funcs depend.php multilib
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/;
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-
-# ssl is broken, so we turn it off until fixed
-IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth 
monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi 
+monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
-
-# uclibc is often compiled without backtrace info so we should
-# force this off.  If someone complains, consider relaxing it.
-# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
-REQUIRED_USE="elibc_uclibc? ( !debug )"
-
-DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
-RDEPEND="php? ( dev-lang/php )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-   use php && require_php_cgi
-
-   if use debug; then
-   ewarn
-   ewarn 
"\033[1;33m**\033[00m"
-   ewarn "Do not use debug in production!"
-   ewarn 
"\033[1;33m**\033[00m"
-   ewarn
-   fi
-}
-
-src_prepare() {
-   # Unconditionally get rid of the bundled jemalloc
-   rm -rf "${S}"/deps
-   epatch "${FILESDIR}"/${PN}-1.5.2-use-system-jemalloc.patch
-   epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.patch
-
-   # Don't install the banana script, we use ${FILESDIR}/monkeyd.initd 
instead
-   sed -i '/Creating bin\/banana/d' configure || die "No configure file"
-   sed -i '/create_banana_script bindir/d' configure || die "No configure 
file"
-
-  

[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/

[Lars Wendler]

commit: c722ee5b3b5d4b4ec54dbc6a8c30f1ed494a77bd
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep  3 07:18:12 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep  3 07:18:12 2015 +
URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=c722ee5b

seamonkey: Move from release candidate to final release.

 www-client/seamonkey/Manifest  | 52 +++---
 ...nkey-2.35_pre3.ebuild => seamonkey-2.35.ebuild} |  0
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 231cfac..80efdea 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -29,6 +29,32 @@ DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 
5f40259490b909023b318fa633fb8f549071c
 DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 
1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 
16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5
 WHIRLPOOL 
36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0
 DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 
b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 
51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f
 WHIRLPOOL 
df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28
 DIST seamonkey-2.33.1.source.tar.bz2 203015246 SHA256 
b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08 SHA512 
2fcd2833c140504a176da145b3fd519a22135c273ce8ea87d39e45a6255533e59dccb24367e3fc9b0575cfc7a7fe2b777296a067edafc83a3397d6916d9e3803
 WHIRLPOOL 
c20f1dc667375608a94899546339c22134d09f74f3eae55b048ac21a6c024acbf7998d437d137963cf231b9ee07e6e69bc7b34ca7267a4ab3d3f6c51d09c4840
+DIST seamonkey-2.35-be.xpi 844271 SHA256 
c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 
2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644
 WHIRLPOOL 
f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf
+DIST seamonkey-2.35-ca.xpi 835414 SHA256 
6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 
7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df49526d8f42083b0b6b712362005d3e7332a4d74b053360d56beb22f922e6917471f42e81386b7cc5d9b6d0
 WHIRLPOOL 
8aa4bc9e1d662c3488fe27b490b4bc42536931a82340b5b133b9886efd10836b64da3c7f253cfd83e561f0d9b2ed03cae922a836c9bb0f927a4c28dabd1de64f
+DIST seamonkey-2.35-cs.xpi 830496 SHA256 
f1ac05c2f4e123a12697f094c8c336c887f573640e766b63744dc98cea7c224a SHA512 
e7b32870956654f59905e31bfed47e54c1c81eef42b33150b9d697319c9aea54955b425a1d0f8899241a3b1747b7561414b17e8ae3bc1825d9a9eb88454ccdd4
 WHIRLPOOL 
ba14199497b61ede105e5f7eebd28da0c6804ac1e67c770aebbfc694e0f046a064b43c9a2ce234f1b26bee6fb35daa820f111c417be14169ae61a63eaf769222
+DIST seamonkey-2.35-de.xpi 838035 SHA256 
5a9f9a542f8e815c4263f04e107e489dc6d8bae6b6464cd5f7af2966e9513acf SHA512 
ffcd97d184df2d7b0b25bf8bf04055585826675100048d9ccdc453c67030cd20ed5a9adefed79388fc4e507e359233e27d31e6a6bd000b8e62496538da479e60
 WHIRLPOOL 
8b271aabdae9d8be8f3ab103d489fe5902c0f38caff003c5fc6d9e3840c106e3176ae47f2b207212d2ccd7b68dc52c64f63ac1f3e8f37d4bb3b0b2434591aeed
+DIST seamonkey-2.35-en-GB.xpi 804302 SHA256 
e3db5141e431ea31f7d1f1d5a01aa9e0499d49bda0828b4ebfc77802ee365771 SHA512 
eb67fa8ff2a1fa2f3649214e29daf56c866ee1ad26809229044ca3a1a9ea5493dbd7c00d3de09ea3c3e46e468ea3e5ffa8878b4d59e8b3aa3be0a67458694b94
 WHIRLPOOL 
e52c054da0f9cacc5565bfeeb84a3cb6a16f09410b56f601920cc3f7e9e8d85c36d8fe94597a383f4cca13a2a71d4347a25b828ece1b19f14b99b649a5d7ec2b
+DIST seamonkey-2.35-es-AR.xpi 852042 SHA256 
74c6c241aa7a1395435539b8969e0e9c4f3fcf957f7c6e8e73f5f61fae211575 SHA512 
f055a4b759e8a5ab7f46fc5f263b7a351aba8f7249a36e6a3b0922aceb5ce1c40913c2a8dbd10cfb2b19231a8b9f85d6c4fdaa9d7d5a61827e9d8f2a9405b9a2
 WHIRLPOOL 
5599ffaed17c1630887cd1f5ff3ee4d8e46b886e6a360acdf546f9382810eae41017522175eb67a27708898d55eb048e9c9506fca2ff23dedc160e85b7b3186b
+DIST seamonkey-2.35-es-ES.xpi 830454 SHA256 
c242cfb3406ad6048d7f855e22afdb58bd4d6f8d918eb2e96ddfcf64a0b445ad SHA512 
bf03b245974264e8c9fa64c679b68b4f2a67b3bab76c07b7cb1478bf8fa071110fe129bd6f42bb878105c1c017672f5c6c2076f0a39bdf5500f5ba3adfe62fa2
 WHIRLPOOL 
fe32e889f67a0e531a28451928cbea897d5b272a62943c9d6b8d39d239857553aaae31d428399d9e309dd8643fe243944cc0cc11c554bbc8a9346d2e5b417910
+DIST seamonkey-2.35-fi.xpi 802373 SHA256 
92b7764676bc98f88ec4d9014f4f60577e78ae804ad610a5d6fe1493b554e555 SHA512 
4938a8285170f5ebfaa46859aaa8a43e9efc49180a8ae3b79b189d94b660868212a34a83090043ee59b89ef89e10b608390db3692739fc64c95c0af518035b10
 WHIRLPOOL 

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

[Agostino Sarubbo]

commit: fd56c127706e8d67facaff4b7548f43f45eaca7b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:23:45 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:23:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd56c127

www-client/firefox: amd64 stable wrt bug #559186

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 www-client/firefox/firefox-38.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/firefox/firefox-38.2.1.ebuild 
b/www-client/firefox/firefox-38.2.1.ebuild
index c47f43f..c34ad39 100644
--- a/www-client/firefox/firefox-38.2.1.ebuild
+++ b/www-client/firefox/firefox-38.2.1.ebuild
@@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils 
gnome2-utils mozconfig-v6
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox;
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"

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

[Agostino Sarubbo]

commit: 5613c32014df1e7e7540ee47aec1e42cf3d6d172
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:23:10 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:23:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5613c320

net-libs/polarssl: amd64 stable wrt bug #528130

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

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

diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild 
b/net-libs/polarssl/polarssl-1.3.9.ebuild
index e6a1408..e8c6460 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://polarssl.org/download/${P}-gpl.tgz;
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/

[Agostino Sarubbo]

commit: 93c06c55431efa199c9f5561b62b443eab7cc873
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:21:35 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:21:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c06c55

www-client/chromium: amd64 stable wrt bug #559384

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 www-client/chromium/chromium-45.0.2454.85.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild 
b/www-client/chromium/chromium-45.0.2454.85.ebuild
index d521ed9..ca5083e 100644
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ b/www-client/chromium/chromium-45.0.2454.85.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD hotwording? ( no-source-code )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic 
+proprietary-codecs pulseaudio selinux +tcmalloc"
 RESTRICT="proprietary-codecs? ( bindist )"
 

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

[Agostino Sarubbo]

commit: 6b766a09f68d43992bb2ca3f9919bf111d7ef994
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:23:59 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:23:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b766a09

x11-libs/gdk-pixbuf: amd64 stable wrt bug #556314

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
index b01f16e..7e1e092 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/;
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/

[Agostino Sarubbo]

commit: e5427955ff009484c0f3aa4bb155ccc7ad43b3ee
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:23:50 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:23:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5427955

www-client/firefox-bin: amd64 stable wrt bug #559186

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 www-client/firefox-bin/firefox-bin-38.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild 
b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
index 76b8401..6598a28 100644
--- a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 HOMEPAGE="http://www.mozilla.com/firefox;
 RESTRICT="strip mirror"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="selinux startup-notification"

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/

[Agostino Sarubbo]

commit: 705fd913079585c19d28bb0b876d470dc21f28a2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:22:55 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:22:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=705fd913

sys-cluster/nova: amd64 stable wrt bug #559376

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 sys-cluster/nova/nova-2015.1.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/nova/nova-2015.1.1-r3.ebuild 
b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
index fadb780..0cfba33 100644
--- a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
+++ b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy 
openvswitch postgres +rabbitmq sqlite test xen"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
compute-only? ( compute 
!rabbitmq !memcached !mysql !postgres !sqlite )

[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/

[Agostino Sarubbo]

commit: 33fe9f9de2f291c899afdd64d0cb9bb94cb754bc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:25:09 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:25:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33fe9f9d

www-client/chromium: x86 stable wrt bug #559384

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 www-client/chromium/chromium-45.0.2454.85.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/chromium/chromium-45.0.2454.85.ebuild 
b/www-client/chromium/chromium-45.0.2454.85.ebuild
index ca5083e..70baec6 100644
--- a/www-client/chromium/chromium-45.0.2454.85.ebuild
+++ b/www-client/chromium/chromium-45.0.2454.85.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD hotwording? ( no-source-code )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="cups gnome gnome-keyring hidpi hotwording kerberos neon pic 
+proprietary-codecs pulseaudio selinux +tcmalloc"
 RESTRICT="proprietary-codecs? ( bindist )"
 

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/

[Agostino Sarubbo]

commit: e9ae7a865cc15adf0c6bbe37a3defdd96a41b5ec
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:25:16 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:25:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ae7a86

sys-cluster/nova: x86 stable wrt bug #559376

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 sys-cluster/nova/nova-2015.1.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/nova/nova-2015.1.1-r3.ebuild 
b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
index 0cfba33..e5f49c9 100644
--- a/sys-cluster/nova/nova-2015.1.1-r3.ebuild
+++ b/sys-cluster/nova/nova-2015.1.1-r3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy 
openvswitch postgres +rabbitmq sqlite test xen"
 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
compute-only? ( compute 
!rabbitmq !memcached !mysql !postgres !sqlite )

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

[Agostino Sarubbo]

commit: f102cbf01ac326719a362f0f7944243f2310508d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:25:40 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:25:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f102cbf0

x11-libs/gdk-pixbuf: x86 stable wrt bug #556314

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild 
b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
index 7e1e092..192d7fb 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/;
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox-bin/

[Agostino Sarubbo]

commit: 6ed48de67dfd448398893fa2ef5c44cb4a179557
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:25:34 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:25:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed48de6

www-client/firefox-bin: x86 stable wrt bug #559186

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 www-client/firefox-bin/firefox-bin-38.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild 
b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
index 6598a28..218bcb6 100644
--- a/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-38.2.1.ebuild
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 HOMEPAGE="http://www.mozilla.com/firefox;
 RESTRICT="strip mirror"
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="selinux startup-notification"

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

[Agostino Sarubbo]

commit: c52c5879dcc56c459085730bf8de6796d5200c4f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:25:29 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:25:29 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52c5879

www-client/firefox: x86 stable wrt bug #559186

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

 www-client/firefox/firefox-38.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/firefox/firefox-38.2.1.ebuild 
b/www-client/firefox/firefox-38.2.1.ebuild
index c34ad39..1703a33 100644
--- a/www-client/firefox/firefox-38.2.1.ebuild
+++ b/www-client/firefox/firefox-38.2.1.ebuild
@@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils 
gnome2-utils mozconfig-v6
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox;
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"

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

[Agostino Sarubbo]

commit: 120a35fdc2baaa620cedb1467f8a209f8e49
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep  3 08:25:21 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep  3 08:25:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120a35fd

net-libs/polarssl: x86 stable wrt bug #528130

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"

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

diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild 
b/net-libs/polarssl/polarssl-1.3.9.ebuild
index e8c6460..53e1121 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://polarssl.org/download/${P}-gpl.tgz;
 
 LICENSE="GPL-2"
 SLOT="0/7"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
 
 RDEPEND="

[gentoo-commits] proj/kde:master commit in: kde-frameworks/kapidox/

[Michael Palimaka]

commit: 340391a6bf4d93c10fb8e4479ea3e01e6bc0722c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep  3 09:37:33 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 09:37:33 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=340391a6

kde-frameworks/kapidox: enable DISTUTILS_SINGLE_IMPL since media-gfx/graphviz 
is still that way.

Package-Manager: portage-2.2.20.1

 kde-frameworks/kapidox/kapidox-.ebuild | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/kde-frameworks/kapidox/kapidox-.ebuild 
b/kde-frameworks/kapidox/kapidox-.ebuild
index a5cca66..e633812 100644
--- a/kde-frameworks/kapidox/kapidox-.ebuild
+++ b/kde-frameworks/kapidox/kapidox-.ebuild
@@ -7,7 +7,8 @@ EAPI=5
 KDE_DEBUG="false"
 KDE_DOXYGEN="false"
 KDE_TEST="false"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
 inherit kde5 distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format 
and style"
@@ -19,8 +20,10 @@ RDEPEND="
app-doc/doxygen
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
-   media-gfx/graphviz[python]
+   media-gfx/graphviz[python,${PYTHON_USEDEP}]
 "
-# graphviz is currently python-single-r1 so we can't enforce a USE dep yet
-# and things will break if you try to generate a dependency diagram with a
-# different python version
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}

[gentoo-commits] proj/kde:master commit in: kde-frameworks/kdelibs4support/

[Michael Palimaka]

commit: f37bbdd1f4a8d462c8cd3daf0e63c4f755891e87
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep  3 09:57:34 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 09:57:34 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f37bbdd1

kde-frameworks/kdelibs4support: restrict tests.

Package-Manager: portage-2.2.20.1

 kde-frameworks/kdelibs4support/kdelibs4support-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild 
b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
index d3f6926..7f86ece 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-.ebuild
@@ -72,6 +72,8 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
+RESTRICT="test"
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

[gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/

[Lars Wendler]

commit: 700a31387ba2b13c77a28dfc609a2a1f81f86fb3
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep  3 09:59:55 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep  3 10:00:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700a3138

www-client/seamonkey: Bump to version 2.35

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler  gentoo.org>

 www-client/seamonkey/Manifest  |  27 +++
 www-client/seamonkey/metadata.xml  |   3 +
 www-client/seamonkey/seamonkey-2.35.ebuild | 356 +
 3 files changed, 386 insertions(+)

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 2de6918..4e5a200 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,5 +1,6 @@
 DIST enigmail-1.8.2.tar.gz 1604159 SHA256 
1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 
51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11
 WHIRLPOOL 
e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
 DIST firefox-36.0-patches-01.tar.xz 4420 SHA256 
9ebde39a67c05b3bd1053f16cc6ef9a9795940871da39456685cff0093c72812 SHA512 
e5edc318acd367ae71bbeac554a01276be09301c052ed8054ce420f8026e11501cb853a81f05ce48df3642d5cec4e56c70502cf07c45fc514662f24177714ba1
 WHIRLPOOL 
7f2cda02552f9cbb4aeedcc8928ee2c624133d220fda86d3e526c97ada7d1def6ca3393c6368a70c5892b188bb3b47589c3365a66adf697464277438644d0cc9
+DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 
bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 
a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520
 WHIRLPOOL 
3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
 DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256 
1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512 
0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392
 WHIRLPOOL 
4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507
 DIST seamonkey-2.33.1-be.xpi 842837 SHA256 
bd6ccc1b70c8fe41d43b5f0f05137454f425e572a631ac9641bd7549375ede34 SHA512 
a1a264e1cb794a25d22926ed4995028cf94f21fc1083d28491cf4616d9905cbf22dd006fa9298453c3349c6d9b8d3661a376513f95e3b18697d43845e7214afa
 WHIRLPOOL 
295bf608cfa2142c9fb1ab85f1c122df2b4d27b3a6cd39c2e50f23159037165f126afe9938ce07a986c4bc2915ec3e944f3b52f5d13f3b7545d462c5966580a5
 DIST seamonkey-2.33.1-ca.xpi 834200 SHA256 
f46880e8582a63d6af332c76d988fabb5077fba92affc1881ab8e3d24bf6b331 SHA512 
c050cb3f86c78212dfbd40343e817685965d72a90b519879e5b4291f62a4371175352b08fb2fd3aa7834fd27e263404b2bf7473a9588fcbc61f09b9f658e4777
 WHIRLPOOL 
7202ea355b122da09df204198373b997a683761e8ddc04568ee2cab213907b9ca3ea38cb1490268b13344462a76d26a7f007a67501d51bfc3e6696c2dbe4c4ba
@@ -27,3 +28,29 @@ DIST seamonkey-2.33.1-uk.xpi 874106 SHA256 
5f40259490b909023b318fa633fb8f549071c
 DIST seamonkey-2.33.1-zh-CN.xpi 834422 SHA256 
1e07dbcfc5739a5e76b13b07327ce81a753e7bfe503a3abd9d5f656d12f918aa SHA512 
16a1d1ad2993e0f89027a2fad52f09abe083d283d57a7e9d5f2eddaa3f4ac9f331f179da2b3a4e5d3d437b375cee579cb2c5bafe7a2d49c8e7e898dbb43963a5
 WHIRLPOOL 
36eb19c03ff8a21b86e23c372c382f6ad63165c658b9fb3152175fa1941562ba8ed41f05c51cd6e36e7fd35f1bf6d691a3ba7f0a4f08c56eead0a783e6ff6cf0
 DIST seamonkey-2.33.1-zh-TW.xpi 860687 SHA256 
b0c382d9fc410b7a2c4219511c461ca0cd9df14f5a8ac799cfa46d236af5d636 SHA512 
51a4955f8cd7af954bd123388aa130c0ee705bf75311dac520b7b87b1b409b1e2e1093b1e5a75e63ba0a3168eb8ad6f204c935cf421eb89b3ce7529fd659b89f
 WHIRLPOOL 
df6ddde364b4276c9f6c78a462a79af9b70cd1c755a517b914b33b05260defb62beb54f74a813226c025d83bf0a87bcdbda209b98b9f8b8a7be4c713f85e7c28
 DIST seamonkey-2.33.1.source.tar.bz2 203015246 SHA256 
b29779cfd4b334ed21a8265ec13327aa7f35ef2895c38a971e41f3e63c85af08 SHA512 
2fcd2833c140504a176da145b3fd519a22135c273ce8ea87d39e45a6255533e59dccb24367e3fc9b0575cfc7a7fe2b777296a067edafc83a3397d6916d9e3803
 WHIRLPOOL 
c20f1dc667375608a94899546339c22134d09f74f3eae55b048ac21a6c024acbf7998d437d137963cf231b9ee07e6e69bc7b34ca7267a4ab3d3f6c51d09c4840
+DIST seamonkey-2.35-be.xpi 844271 SHA256 
c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512 
2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644
 WHIRLPOOL 
f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf
+DIST seamonkey-2.35-ca.xpi 835414 SHA256 
6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512 

[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/

[Lars Wendler]

commit: 20c4e02abc9561bafa9e9552a6f2f20c28ff5bee
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Sep  3 10:01:44 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Sep  3 10:01:44 2015 +
URL:https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=20c4e02a

seamonkey: sync with ebuild from portage.

 www-client/seamonkey/seamonkey-2.35.ebuild | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/www-client/seamonkey/seamonkey-2.35.ebuild 
b/www-client/seamonkey/seamonkey-2.35.ebuild
index 6eb19ab..c7ba3fd 100644
--- a/www-client/seamonkey/seamonkey-2.35.ebuild
+++ b/www-client/seamonkey/seamonkey-2.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Id: 185037f356356bfdd329a8211c71d1ff4348c705 $
 
 EAPI=5
 WANT_AUTOCONF="2.1"
@@ -53,9 +53,9 @@ IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal 
pulseaudio +roaming selinux
 
 SRC_URI="${SRC_URI}
${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
-   https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+   https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
-   crypt? ( 
http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
+   crypt? ( 
https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
 
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
@@ -119,12 +119,9 @@ src_prepare() {
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/seamonkey"
 
-   epatch "${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch
-
# browser patches go here
pushd "${S}"/mozilla &>/dev/null || die
-   EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
-   8002_jemalloc_configure_unbashify.patch" \
+   EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch" \
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
@@ -191,9 +188,7 @@ src_configure() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
 
-   if use chatzilla ; then
-   MEXTENSIONS+=",irc"
-   else
+   if ! use chatzilla ; then
MEXTENSIONS+=",-irc"
fi
if ! use roaming ; then

[gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/

[Michael Palimaka]

commit: 7f9ada54cb358916796ea3108ef72d371542134f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep  3 10:53:35 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  3 10:53:35 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f9ada54

kde-plasma/kwin: introduce gstreamer USE flag by popular request.

Package-Manager: portage-2.2.20.1

 kde-plasma/kwin/files/kwin-gstreamer-optional.patch | 15 +++
 kde-plasma/kwin/kwin-5.4.49..ebuild | 10 --
 kde-plasma/kwin/kwin-.ebuild| 10 --
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/kwin/files/kwin-gstreamer-optional.patch 
b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
new file mode 100644
index 000..d9ace47
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
@@ -0,0 +1,15 @@
+Disable the effect video button if gstreamer is missing.
+
+diff --git a/kcmkwin/kwincompositing/qml/Effect.qml 
b/kcmkwin/kwincompositing/qml/Effect.qml
+index fcd5e8a..2331da2 100644
+--- a/kcmkwin/kwincompositing/qml/Effect.qml
 b/kcmkwin/kwincompositing/qml/Effect.qml
+@@ -144,7 +144,7 @@ Rectangle {
+ 
+ Button {
+ id: videoButton
+-visible: model.VideoRole.toString() !== ""
++visible: false
+ iconName: "video"
+ onClicked: videoItem.showHide()
+ }

diff --git a/kde-plasma/kwin/kwin-5.4.49..ebuild 
b/kde-plasma/kwin/kwin-5.4.49..ebuild
index 02c64a7..aad35e3 100644
--- a/kde-plasma/kwin/kwin-5.4.49..ebuild
+++ b/kde-plasma/kwin/kwin-5.4.49..ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
 KEYWORDS=""
-IUSE="gles2 wayland"
+IUSE="gles2 gstreamer wayland"
 
 COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5[gles2=,opengl(+)]
-   dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
@@ -64,6 +63,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
+   gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
!kde-base/kwin
!kde-base/systemsettings
 "
@@ -75,6 +75,12 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
 "
 
+src_prepare() {
+   kde5_src_prepare
+
+   use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland)

diff --git a/kde-plasma/kwin/kwin-.ebuild b/kde-plasma/kwin/kwin-.ebuild
index 6b00476..29049e5 100644
--- a/kde-plasma/kwin/kwin-.ebuild
+++ b/kde-plasma/kwin/kwin-.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="KDE window manager"
 LICENSE="GPL-2+"
 KEYWORDS=""
-IUSE="gles2"
+IUSE="gles2 gstreamer"
 
 COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -44,7 +44,6 @@ COMMON_DEPEND="
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5[gles2=,opengl(+)]
-   dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwayland:5
dev-qt/qtwidgets:5
@@ -62,6 +61,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
+   gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
!kde-base/kwin
!kde-base/systemsettings
 "
@@ -72,3 +72,9 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
test? ( x11-libs/xcb-util-wm )
 "
+
+src_prepare() {
+   kde5_src_prepare
+
+   use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}

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

[Bernard Cafarelli]

commit: e5e4a51c1ad737aaef386f618a34e53a7b74e7d5
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Sep  3 09:44:17 2015 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Sep  3 09:44:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5e4a51c

profiles: unmask sys-devel/llvm-3.7.0

 profiles/package.mask | 5 -
 1 file changed, 5 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 11d09b0..149ce15 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -62,11 +62,6 @@ app-emulation/kvm-kmod
 # last version does not compile. Bug #543644
 sys-devel/dragonegg
 
-# Bernard Cafarelli  (24 Aug 2015)
-# New llvm version for testing
-=sys-devel/llvm-3.7.0*
-=sys-devel/clang-3.7.0*
-
 # Andreas Sturmlechner  (24 Aug 2015)
 # Masked until >=sys-auth/consolekit-0.9.2 gets unmasked
 =x11-misc/sddm-0.11.0-r2

[gentoo-commits] proj/sci:master commit in: sci-chemistry/NMRdyn/files/, sci-chemistry/NMRdyn/

[Justin Lecher]

commit: e20bb16d953a7ab13121fff12f30309c14d61c43
Author: Justin Lecher  gentoo  org>
AuthorDate: Thu Sep  3 11:04:13 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Thu Sep  3 11:04:13 2015 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=e20bb16d

sci-chemistry/NMRdyn: New package, ebuild written by me

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher  gentoo.org>

 sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild   | 79 ++
 .../NMRdyn/files/NMRdyn-3.2.5-redefinition.patch   | 19 ++
 sci-chemistry/NMRdyn/metadata.xml  |  8 +++
 3 files changed, 106 insertions(+)

diff --git a/sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild 
b/sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild
new file mode 100644
index 000..8b6445f
--- /dev/null
+++ b/sci-chemistry/NMRdyn/NMRdyn-3.2.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic qmake-utils toolchain-funcs
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="NMR relaxation studies of protein association"
+HOMEPAGE="http://sourceforge.net/projects/nmrdyn/;
+SRC_URI="${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+qt4"
+
+RDEPEND="
+   sci-libs/gsl
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+"
+
+RESTRICT="mirror fetch"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_nofetch() {
+   elog "Please contact the authors and get ${A}"
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-redefinition.patch
+   append-cppflags "$($(tc-getPKG_CONFIG) --cflags gsl)"
+   if use qt4; then
+   cd src/NMRdynGUI || die
+   cat >> NMRdynGUI.pro <<- EOF
+   INCLUDEPATH += "${S}"/src/algorithm/src
+   LIBS += $($(tc-getPKG_CONFIG) --libs gsl)
+   MOC_DIR = moc/
+   OBJECTS += ../objects/*.o
+   EOF
+   fi
+}
+
+src_configure() {
+   if use qt4; then
+   cd src/NMRdynGUI || die
+   eqmake4 NMRdynGUI.pro
+   fi
+}
+
+src_compile() {
+   emake \
+   -C src/algorithm \
+   CXX="$(tc-getCXX)" \
+   CPPFLAGS="${CPPFLAGS}" \
+   CXXFLAGS="${CXXFLAGS}" \
+   LDFLAGS="${LDFLAGS}" \
+   LIBS="$($(tc-getPKG_CONFIG) --libs gsl)"
+
+   if use qt4; then
+   cd src/NMRdynGUI || die
+   emake
+   fi
+}
+
+src_install() {
+   dobin ${PN} r1r2
+   use qt4 && dobin src/NMRdynGUI/${PN}GUI
+   dodoc HISTORY README_LINUX.txt NMRdynManual.doc README_gridsearch.txt
+}

diff --git a/sci-chemistry/NMRdyn/files/NMRdyn-3.2.5-redefinition.patch 
b/sci-chemistry/NMRdyn/files/NMRdyn-3.2.5-redefinition.patch
new file mode 100644
index 000..f943dd8
--- /dev/null
+++ b/sci-chemistry/NMRdyn/files/NMRdyn-3.2.5-redefinition.patch
@@ -0,0 +1,19 @@
+ src/NMRdynGUI/src/BatchWizard.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/NMRdynGUI/src/BatchWizard.cpp 
b/src/NMRdynGUI/src/BatchWizard.cpp
+index 653d8e6..e4a8c73 100755
+--- a/src/NMRdynGUI/src/BatchWizard.cpp
 b/src/NMRdynGUI/src/BatchWizard.cpp
+@@ -159,9 +159,9 @@ bool
+ BatchInputPage::isComplete ()
+ {
+int n = workBook->count ();
+-   for (int i = 0; i < n; i++)
++   for (int k = 0; k < n; k++)
+{
+- WorkSheet *worksheet = workBook->getWorkSheet (i);
++ WorkSheet *worksheet = workBook->getWorkSheet (k);
+  int nRows = worksheet->rowCount();
+  int nCols = worksheet->columnCount();
+  int i, j;

diff --git a/sci-chemistry/NMRdyn/metadata.xml 
b/sci-chemistry/NMRdyn/metadata.xml
new file mode 100644
index 000..c166166
--- /dev/null
+++ b/sci-chemistry/NMRdyn/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   j...@gentoo.org
+   Justin Lecher
+   
+